aboutsummaryrefslogtreecommitdiffstats
path: root/src/can
diff options
context:
space:
mode:
authorRomain Forlot <romain.forlot@iot.bzh>2017-03-13 17:46:50 +0100
committerRomain Forlot <romain.forlot@iot.bzh>2017-03-16 17:15:55 +0100
commita0e0cb5ac95e779cd2746d8c1f0740e141bbcc41 (patch)
tree8ee9cb0cdd5344321da8bc6b948243ae49a2e33b /src/can
parent7abe7ef5336d88736b20b015ae219731d5f42365 (diff)
Adding/Fix classes constructors to make them correspond
to the ones generated. Change-Id: I6b0b778f59ac52fe66e36a327f60ae58550ac271 Signed-off-by: Romain Forlot <romain.forlot@iot.bzh>
Diffstat (limited to 'src/can')
-rw-r--r--src/can/can-signals.cpp8
-rw-r--r--src/can/can-signals.hpp5
2 files changed, 13 insertions, 0 deletions
diff --git a/src/can/can-signals.cpp b/src/can/can-signals.cpp
index ce4e264..b7b311b 100644
--- a/src/can/can-signals.cpp
+++ b/src/can/can-signals.cpp
@@ -27,6 +27,14 @@
std::string can_signal_t::prefix_ = "messages";
+can_signal_t::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<int, std::string> states, bool writable, SignalDecoder decoder, SignalEncoder encoder, bool received)
+ : message_{message}, generic_name_{generic_name}, bit_position_{bit_position}, bit_size_{bit_size}, factor_{factor}, offset_{offset},
+ min_value_{min_value}, max_value_{max_value}, frequency_{frequency}, send_same_{send_same}, force_send_changed_{force_send_changed}, states_{states},
+ writable_{writable}, decoder_{decoder}, encoder_{encoder}, received_{received}, last_value_{(float)NULL}
+{}
+
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 7708461..53acd00 100644
--- a/src/can/can-signals.hpp
+++ b/src/can/can-signals.hpp
@@ -27,6 +27,7 @@
#include "../utils/timer.hpp"
#include "can-bus.hpp"
#include "can-message.hpp"
+#include "can-message-definition.hpp"
#include "../obd2/obd2-signals.hpp"
extern "C"
@@ -109,6 +110,10 @@ private:
* 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<int, std::string> states, bool writable, SignalDecoder decoder, SignalEncoder encoder, bool received);
+
can_message_definition_t& get_message();
const std::string& get_generic_name() const;
const std::string get_name() const;