summaryrefslogtreecommitdiffstats
path: root/CAN-binder/low-can-binding/binding
diff options
context:
space:
mode:
authorRomain Forlot <romain.forlot@iot.bzh>2017-05-16 17:37:07 +0200
committerRomain Forlot <romain.forlot@iot.bzh>2017-05-19 11:36:43 +0200
commitd91f5f743bc6f6ec9aadfe96187b45dc93043f61 (patch)
treee79bb26cb4ad4c97c07941ab6f31bb6b7c3fde22 /CAN-binder/low-can-binding/binding
parentfd3978709abbb3ed46caaf48c1d2f45b2c74fa89 (diff)
Include diagnostic_message_t into can_message_set.
Change-Id: I7372e469752dd8e90dc9431b9e5c67df12f56c29 Signed-off-by: Romain Forlot <romain.forlot@iot.bzh>
Diffstat (limited to 'CAN-binder/low-can-binding/binding')
-rw-r--r--CAN-binder/low-can-binding/binding/configuration-generated.cpp16
-rw-r--r--CAN-binder/low-can-binding/binding/configuration.cpp2
-rw-r--r--CAN-binder/low-can-binding/binding/configuration.hpp2
3 files changed, 9 insertions, 11 deletions
diff --git a/CAN-binder/low-can-binding/binding/configuration-generated.cpp b/CAN-binder/low-can-binding/binding/configuration-generated.cpp
index 584fc39..a97b9ee 100644
--- a/CAN-binder/low-can-binding/binding/configuration-generated.cpp
+++ b/CAN-binder/low-can-binding/binding/configuration-generated.cpp
@@ -96,13 +96,10 @@ configuration_t::configuration_t()
decoder_t::booleanDecoder,
nullptr,
false
- })}
- }
- })}
- }}
- }
- , diagnostic_messages_
- {
+ })} // end can_signals entry
+ } // end can_signals vector
+ })} // end can_message_definition entry
+ }, // end can_message_definition vector
{
{std::make_shared<diagnostic_message_t>(diagnostic_message_t{
4,
@@ -324,8 +321,9 @@ configuration_t::configuration_t()
nullptr,
true
})}
- }
- }
+ } // end diagnostic_messages_ vector
+ }// end can_message_set entry
+ } // end can_message_set vector
{}
const std::string configuration_t::get_diagnostic_bus() const
diff --git a/CAN-binder/low-can-binding/binding/configuration.cpp b/CAN-binder/low-can-binding/binding/configuration.cpp
index 6e2ccc4..7f53c62 100644
--- a/CAN-binder/low-can-binding/binding/configuration.cpp
+++ b/CAN-binder/low-can-binding/binding/configuration.cpp
@@ -54,7 +54,7 @@ std::vector<std::shared_ptr<can_signal_t> > configuration_t::get_can_signals()
std::vector<std::shared_ptr<diagnostic_message_t> > configuration_t::get_diagnostic_messages()
{
- return diagnostic_messages_[active_message_set_];
+ return can_message_set_[active_message_set_].get_diagnostic_messages();
}
std::vector<std::shared_ptr<can_message_definition_t> > configuration_t::get_can_message_definition()
diff --git a/CAN-binder/low-can-binding/binding/configuration.hpp b/CAN-binder/low-can-binding/binding/configuration.hpp
index ab6a793..409c4cd 100644
--- a/CAN-binder/low-can-binding/binding/configuration.hpp
+++ b/CAN-binder/low-can-binding/binding/configuration.hpp
@@ -50,7 +50,7 @@ class configuration_t
std::vector<can_message_set_t> can_message_set_; ///< Vector holding all message set from JSON signals description file
//std::vector<std::vector<can_message_definition_t>> can_message_definition_; ///< Vector of vector holding all can message definition from JSON signals description file. This describe a CAN message. First vector map to message set
//std::vector<std::vector<can_signal_t>> can_signals_; ///< Vector of vector holding all can signasl from JSON signals description file. A CAN signal is a part of a CAN message. First vector map to message set
- std::vector<std::vector<std::shared_ptr<diagnostic_message_t> > > diagnostic_messages_; ///< Vector of vector holding all diagnostics messages from JSON signals description file. First vector map to message set
+ //std::vector<std::vector<std::shared_ptr<diagnostic_message_t> > > diagnostic_messages_; ///< Vector of vector holding all diagnostics messages from JSON signals description file. First vector map to message set
configuration_t(); ///< Private constructor with implementation generated by the AGL generator.