diff options
author | Romain Forlot <romain.forlot@iot.bzh> | 2017-03-15 23:16:59 +0100 |
---|---|---|
committer | Romain Forlot <romain.forlot@iot.bzh> | 2017-03-16 17:21:57 +0100 |
commit | 0a9f3524f442ff055fb1075f92bd85f9b4522910 (patch) | |
tree | a2aef99c4c596d13992173c015cb4d6f0d1a2fe0 /src/configuration.hpp | |
parent | 53cd923a034162273fea2f4fb045b28686f51df5 (diff) |
Rename class and 1:1 map to JSON description file
Added decoder and callback member that will be set by generator and taken
at submission to be used later, storing them into an active diagnostic
request instance, when response CAN message comes in.
Change-Id: I9ded05de3bb28ec55e4e007d72d0e1924141a6a6
Signed-off-by: Romain Forlot <romain.forlot@iot.bzh>
Diffstat (limited to 'src/configuration.hpp')
-rw-r--r-- | src/configuration.hpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/configuration.hpp b/src/configuration.hpp index 224672e..266f219 100644 --- a/src/configuration.hpp +++ b/src/configuration.hpp @@ -49,7 +49,7 @@ class configuration_t std::vector<can_message_set_t> can_message_set_; std::vector<std::vector<can_message_definition_t>> can_message_definition_; std::vector<std::vector<can_signal_t>> can_signals_; - std::vector<std::vector<obd2_signal_t>> obd2_signals_; + std::vector<std::vector<diagnostic_message_t>> diagnostic_messages_; /// Private constructor with implementation generated by the AGL generator. configuration_t(); @@ -73,19 +73,19 @@ class configuration_t std::vector<can_signal_t>& get_can_signals(); - std::vector<obd2_signal_t>& get_obd2_signals(); + std::vector<diagnostic_message_t>& get_diagnostic_messages(); const std::vector<std::string>& get_signals_prefix() const; const std::vector<can_message_definition_t>& get_can_message_definition(); - uint32_t get_signal_id(obd2_signal_t& sig) const; + uint32_t get_signal_id(diagnostic_message_t& sig) const; uint32_t get_signal_id(can_signal_t& sig) const; void set_active_message_set(uint8_t id); - void find_obd2_signals(const openxc_DynamicField &key, std::vector<obd2_signal_t*>& found_signals); + void find_diagnostic_messages(const openxc_DynamicField &key, std::vector<diagnostic_message_t*>& found_signals); void find_can_signals(const openxc_DynamicField &key, std::vector<can_signal_t*>& found_signals); @@ -114,4 +114,4 @@ class configuration_t }; // TEMP Function to access OBD2_PIDS vector -std::vector<obd2_signal_t> get_predefined_obd2(); +std::vector<diagnostic_message_t> get_predefined_obd2(); |