Move some functions to configuration class.

[apps/agl-service-can-low-level.git] / src / diagnostic / diagnostic-message.hpp

diff --git a/src/diagnostic/diagnostic-message.hpp b/src/diagnostic/diagnostic-message.hpp
index 1ee9d96..9dca770 100644 (file)
--- a/src/diagnostic/diagnostic-message.hpp
+++ b/src/diagnostic/diagnostic-message.hpp
@@ -65,25 +65,23 @@ typedef struct _Obd2Pid {
  * @brief - Object to handle obd2 session with pre-scan of supported pid
  * then request them regularly
  */
-class obd2_signals_t {
+class obd2_signal_t {
        private:
-               uint8_t pid_;
-               const char* generic_name_;
-               const int min_;
-               const int max_;
-               enum UNIT unit_;
-               int frequency_;
-               bool supported_;
+               uint8_t pid_; /*!< pid - The 1 byte PID.*/
+               std::string generic_name_; /*!< generic_name_ - A human readable name to use for this PID when published.*/
+               int min_; /*!< min_ - Minimum value that can take this pid */
+               int max_; /*!< max_ - Maximum value that can take this pid */
+               enum UNIT unit_; /*!< unit_ : Which unit system is used by that pid. See enum UNIT above.*/
+               int frequency_; /*!< frequency - The frequency to request this PID if supported by the vehicle when automatic, recurring OBD-II requests are enabled.*/
+               bool supported_; /*!< supported_ - boolean indicating whether this pid is supported by the vehicle or not.*/
 
        public:
-               obd2_signals_t(uint8_t pid, const char* generic_name, const int min_, const int max_, enum UNIT unit, int frequency, bool supported);
+               const char* generic_name = generic_name_.c_str();
+               obd2_signal_t(uint8_t pid, const char* generic_name, const int min_, const int max_, enum UNIT unit, int frequency, bool supported);
 
-               void init_diagnostic_shims(can_bus_dev_t& can_bus_dev);
-               void add_request(int pid);
-               std::vector<Obd2Pid>& get_obd2_signals();
+               uint32_t get_pid();
 
-               uint32_t get_signal_id(const Obd2Pid& sig);
-               void find_obd2_signals(const openxc_DynamicField &key, std::vector<Obd2Pid*>& found_signals);
+               void add_request(int pid);
 
 
                bool is_obd2_response(can_message_t can_message);