summaryrefslogtreecommitdiffstats
path: root/src/can
diff options
context:
space:
mode:
authorRomain Forlot <romain.forlot@iot.bzh>2017-03-13 09:45:01 +0100
committerRomain Forlot <romain.forlot@iot.bzh>2017-03-16 17:15:55 +0100
commitb606db2b74d5c92d33a126071062c9eb2a548beb (patch)
tree26e0edc377c35521bba345a5f162809894751376 /src/can
parent37bf83a16cbd07b168b8c4f5a2c05cbf281d8fad (diff)
Change the way to check signal type making prefix_
attribute as static with a static class method which will check that the beginning of string argument matches the prefix. Change-Id: Idb129c7179391da61447996560957b2791aa9383 Signed-off-by: Romain Forlot <romain.forlot@iot.bzh>
Diffstat (limited to 'src/can')
-rw-r--r--src/can/can-signals.cpp2
-rw-r--r--src/can/can-signals.hpp2
2 files changed, 3 insertions, 1 deletions
diff --git a/src/can/can-signals.cpp b/src/can/can-signals.cpp
index 00b6ee0..27a7df9 100644
--- a/src/can/can-signals.cpp
+++ b/src/can/can-signals.cpp
@@ -25,6 +25,8 @@
#include "../obd2/obd2-signals.hpp"
#include "../low-can-binding.hpp"
+std::string can_signal_t::prefix_ = "messages.";
+
can_message_definition_t& can_signal_t::get_message()
{
return message_;
diff --git a/src/can/can-signals.hpp b/src/can/can-signals.hpp
index c1d07ee..7708461 100644
--- a/src/can/can-signals.hpp
+++ b/src/can/can-signals.hpp
@@ -77,7 +77,7 @@ 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.*/
- std::string prefix_ = "messages."; /*!< prefix_ - generic_name_ will be prefixed with it. It has to reflect the used protocol.
+ 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