summaryrefslogtreecommitdiffstats
path: root/src/can/can-signals.hpp
diff options
context:
space:
mode:
authorRomain Forlot <romain.forlot@iot.bzh>2017-03-16 18:16:56 +0100
committerRomain Forlot <romain.forlot@iot.bzh>2017-03-16 18:16:56 +0100
commit8fc21efc5ec7669d38712f44d71d10056614ea64 (patch)
tree481362d3cb7c744699321fee3d7f346a038c0eee /src/can/can-signals.hpp
parent29a91626fe9445823ab26157c976b76856901588 (diff)
Use index number between objects to set their links.
Needed to use generator. Change-Id: I82b44fa1e53c55e2cd90ae7017906a22b7f0636e Signed-off-by: Loïc Collignon <loic.collignon@iot.bzh>
Diffstat (limited to 'src/can/can-signals.hpp')
-rw-r--r--src/can/can-signals.hpp26
1 files changed, 21 insertions, 5 deletions
diff --git a/src/can/can-signals.hpp b/src/can/can-signals.hpp
index b22bf7a2..aacb8883 100644
--- a/src/can/can-signals.hpp
+++ b/src/can/can-signals.hpp
@@ -76,7 +76,8 @@ typedef uint64_t (*SignalEncoder)(can_signal_t* signal,
class can_signal_t
{
private:
- can_message_definition_t message_; /*!< message_ - The message this signal is a part of. */
+ std::uint8_t message_set_id_;
+ std::uint8_t message_id_;
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.*/
@@ -110,11 +111,26 @@ 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<uint8_t, std::string> states, bool writable, SignalDecoder decoder, SignalEncoder encoder, bool received);
+ can_signal_t(
+ std::uint8_t message_set_id,
+ std::uint8_t message_id,
+ 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();
+ const can_message_definition_t& get_message() const;
const std::string& get_generic_name() const;
const std::string get_name() const;
const std::string& get_prefix() const;