Implement check of supported diagnostic PID.

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

diff --git a/src/can/can-signals.hpp b/src/can/can-signals.hpp
index e906d26..b22bf7a 100644 (file)
--- a/src/can/can-signals.hpp
+++ b/src/can/can-signals.hpp
@@ -27,7 +27,8 @@
 #include "../utils/timer.hpp"
 #include "can-bus.hpp"
 #include "can-message.hpp"
-#include "../obd2/obd2-signals.hpp"
+#include "can-message-definition.hpp"
+#include "../diagnostic/diagnostic-message.hpp"
 
 extern "C"
 {
@@ -76,7 +77,9 @@ class can_signal_t
 {
 private:
        can_message_definition_t message_; /*!< message_ - The message this signal is a part of. */
-       std::string generic_name_; /*!< generic_name_ - The name of the signal to be output over USB.*/
+       std::string generic_name_; /*!< generic_name_ - The name of the signal to be output.*/
+       static std::string prefix_; /*!< prefix_ - generic_name_ will be prefixed with it. It has to reflect the used protocol.
+                                                 * which make easier to sort message when the come in.*/
        uint8_t bit_position_; /*!< bitPosition_ - The starting bit of the signal in its CAN message (assuming
                                                                                *       non-inverted bit numbering, i.e. the most significant bit of
                                                                                *       each byte is 0) */
@@ -92,23 +95,29 @@ private:
                                                                *       clock's frequency to 0. */
        bool send_same_; /*!< send_same_ - If true, will re-send even if the value hasn't changed.*/
        bool force_send_changed_; /*!< force_send_changed_ - If true, regardless of the frequency, it will send the
-                                                               *       value if it has changed. */
-       std::map<int, std::string> states_; /*!< states_ - A map of CAN signal state describing the mapping
-                                                                                                                                       * between numerical and string values for valid states. */
+                                                          * value if it has changed. */
+       std::map<uint8_t, std::string> states_; /*!< states_ - A map of CAN signal state describing the mapping
+                                                                                * between numerical and string values for valid states. */
        bool writable_; /*!< writable - True if the signal is allowed to be written from the USB host
-                                       *       back to CAN. Defaults to false.*/
+                                        *      back to CAN. Defaults to false.*/
        SignalDecoder decoder_; /*!< decoder_ - An optional function to decode a signal from the bus to a human
-                                                               * readable value. If NULL, the default numerical decoder is used. */
+                                                        * readable value. If NULL, the default numerical decoder is used. */
        SignalEncoder encoder_; /*!< encoder_ - An optional function to encode a signal value to be written to
                                                         * CAN into a byte array. If NULL, the default numerical encoder
                                                         * is used. */
        bool received_; /*!< received_ - True if this signal has ever been received.*/
        float last_value_; /*!< lastValue_ - The last received value of the signal. If 'received' is false,
-                                          *    this value is undefined. */
+                                               *       this value is undefined. */
 
 public:
+       can_signal_t(can_message_definition_t& message, std::string generic_name, uint8_t bit_position, uint8_t bit_size,
+                                float factor, float offset, float min_value, float max_value, frequency_clock_t frequency, bool send_same, bool force_send_changed,
+                                std::map<uint8_t, std::string> states, bool writable, SignalDecoder decoder, SignalEncoder encoder, bool received);
+
        can_message_definition_t& get_message();
-       std::string& get_generic_name();
+       const std::string& get_generic_name() const;
+       const std::string get_name() const;
+       const std::string& get_prefix() const;
        uint8_t get_bit_position() const;
        uint8_t get_bit_size() const;
        float get_factor() const;
@@ -118,7 +127,8 @@ public:
        frequency_clock_t& get_frequency();
        bool get_send_same() const;
        bool get_force_send_changed() const;
-       std::map<int, std::string> get_state() const;
+       const std::map<uint8_t, std::string>& get_states() const;
+       const std::string get_states(uint8_t value);
        size_t get_state_count() const;
        bool get_writable() const;
        SignalDecoder& get_decoder();
@@ -126,6 +136,7 @@ public:
        bool get_received() const;
        float get_last_value() const;
 
+       void set_prefix(std::string val);
        void set_received(bool r);
        void set_last_value(float val);
 };
\ No newline at end of file