Fix CMakeLists file to get isotp correctly linked and adding

[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 a4f01eb..c1d07ee 100644 (file)
--- a/src/can/can-signals.hpp
+++ b/src/can/can-signals.hpp
@@ -24,10 +24,10 @@
 #include <string>
 
 #include "openxc.pb.h"
-#include "utils/timer.hpp"
-#include "can/can-bus.hpp"
-#include "can/can-message.hpp"
-#include "obd2/obd2-signals.hpp"
+#include "../utils/timer.hpp"
+#include "can-bus.hpp"
+#include "can-message.hpp"
+#include "../obd2/obd2-signals.hpp"
 
 extern "C"
 {
@@ -76,7 +76,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.*/
+       std::string prefix_ = "messages."; /*!< 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) */
@@ -87,7 +89,7 @@ private:
                                                        *       don't need an offset. */
        float min_value_; /*!< min_value_ - The minimum value for the processed signal.*/
        float max_value_; /*!< max_value_ - The maximum value for the processed signal. */
-       FrequencyClock frequency_; /*!< frequency_ - A FrequencyClock struct to control the maximum frequency to
+       frequency_clock_t frequency_; /*!< frequency_ - A frequency_clock_t struct to control the maximum frequency to
                                                                *       process and send this signal. To process every value, set the
                                                                *       clock's frequency to 0. */
        bool send_same_; /*!< send_same_ - If true, will re-send even if the value hasn't changed.*/
@@ -108,14 +110,16 @@ private:
 
 public:
        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;
        float get_offset() const;
        float get_min_value() const;
        float get_max_value() const;
-       FrequencyClock& get_frequency();
+       frequency_clock_t& get_frequency();
        bool get_send_same() const;
        bool get_force_send_changed() const;
        std::map<int, std::string> get_state() const;
@@ -126,7 +130,7 @@ public:
        bool get_received() const;
        float get_last_value() const;
 
+       void set_prefix(std::string val);
        void set_received(bool r);
-void find_can_signals(const openxc_DynamicField &key, std::vector<can_signal_t*>& found_signals);      void set_received(bool r);
        void set_last_value(float val);
 };
\ No newline at end of file