Massive use of shared_ptr about signal and diag message. WIP

[apps/agl-service-can-low-level.git] / CAN-binder / low-can-binding / binding / configuration.cpp

diff --git a/CAN-binder/low-can-binding/binding/configuration.cpp b/CAN-binder/low-can-binding/binding/configuration.cpp
index 05d3696..005e662 100644 (file)
--- a/CAN-binder/low-can-binding/binding/configuration.cpp
+++ b/CAN-binder/low-can-binding/binding/configuration.cpp
@@ -17,8 +17,8 @@
 
 #include "configuration.hpp"
 
-#include "utils/signals.hpp"
-#include "utils/openxc-utils.hpp"
+#include "../utils/signals.hpp"
+#include "../utils/openxc-utils.hpp"
 
 /// @brief Return singleton instance of configuration object.
 configuration_t& configuration_t::instance()
@@ -52,24 +52,19 @@ const std::vector<can_message_set_t>& configuration_t::get_can_message_set()
        return can_message_set_;
 }
 
-std::vector<can_signal_t>& configuration_t::get_can_signals()
+std::vector<std::shared_ptr<can_signal_t> > configuration_t::get_can_signals()
 {
-       return can_signals_[active_message_set_];
+       return can_message_set_[active_message_set_].get_can_signals();
 }
 
-std::vector<diagnostic_message_t>& configuration_t::get_diagnostic_messages()
+std::vector<std::shared_ptr<diagnostic_message_t> > configuration_t::get_diagnostic_messages()
 {
        return diagnostic_messages_[active_message_set_];
 }
 
-const std::vector<can_message_definition_t>& configuration_t::get_can_message_definition()
+std::vector<std::shared_ptr<can_message_definition_t> > configuration_t::get_can_message_definition()
 {
-       return can_message_definition_[active_message_set_];
-}
-
-const can_message_definition_t& configuration_t::get_can_message_definition(std::uint8_t message_set_id, std::uint8_t message_id)
-{
-       return can_message_definition_[message_set_id][message_id];
+       return can_message_set_[active_message_set_].get_can_message_definition();
 }
 
 uint32_t configuration_t::get_signal_id(diagnostic_message_t& sig) const
@@ -79,7 +74,7 @@ uint32_t configuration_t::get_signal_id(diagnostic_message_t& sig) const
 
 uint32_t configuration_t::get_signal_id(can_signal_t& sig) const
 {
-       return sig.get_message().get_id();
+       return sig.get_message()->get_id();
 }
 
 void configuration_t::set_active_message_set(uint8_t id)
@@ -88,7 +83,7 @@ void configuration_t::set_active_message_set(uint8_t id)
 }
 
 
-diagnostic_message_t* configuration_t::get_diagnostic_message(std::string message_name) const
+std::shared_ptr<diagnostic_message_t> configuration_t::get_diagnostic_message(std::string message_name) const
 {
        struct utils::signals_found found;
         found = utils::signals_manager_t::instance().find_signals(build_DynamicField(message_name));
@@ -99,7 +94,7 @@ diagnostic_message_t* configuration_t::get_diagnostic_message(std::string messag
 
 DiagnosticRequest* configuration_t::get_request_from_diagnostic_message(std::string message_name) const
 {
-       diagnostic_message_t* diag_msg = get_diagnostic_message(message_name);
+       std::shared_ptr<diagnostic_message_t> diag_msg = get_diagnostic_message(message_name);
        if( diag_msg != nullptr && diag_msg->get_supported())
                return new DiagnosticRequest(diag_msg->build_diagnostic_request());
        return nullptr;