diag_mngr: No diagnostic msg if no diagnostic_bus

[apps/agl-service-can-low-level.git] / low-can-binding / binding / application.cpp

diff --git a/low-can-binding/binding/application.cpp b/low-can-binding/binding/application.cpp
index f0f008c..c5dfa1b 100644 (file)
--- a/low-can-binding/binding/application.cpp
+++ b/low-can-binding/binding/application.cpp
@@ -25,6 +25,11 @@
 #define MICROSECONDS_IN_SECOND 1000000
 #define ENGINE_VALUE_TIMEOUT   5
 
+application_t::application_t()
+       : can_bus_manager_{}
+       , message_set_{}
+{}
+
 /// @brief Return singleton instance of configuration object.
 application_t& application_t::instance()
 {
@@ -52,22 +57,52 @@ uint8_t application_t::get_active_message_set() const
        return active_message_set_;
 }
 
+int application_t::add_message_set(std::shared_ptr<message_set_t> new_message_set)
+{
+       set_parents(new_message_set);
+
+       for(auto old_msg_set : message_set_)
+       {
+               if(old_msg_set->get_index() == new_message_set->get_index())
+               {
+                       for(auto new_msg_def : new_message_set->get_messages_definition())
+                       {
+                               if(old_msg_set->add_message_definition(new_msg_def) < 0)
+                                       return -1;
+                       }
+
+                       if(diagnostic_manager_.is_initialized())
+                       {
+                               for(auto new_diag_msg : new_message_set->get_diagnostic_messages())
+                               {
+                                       if(old_msg_set->add_diagnostic_message(new_diag_msg) < 0)
+                                               return -1;
+                               }
+                       }
+                       return 0;
+               }
+       }
+
+       message_set_.push_back(new_message_set);
+       return 0;
+}
+
 std::vector<std::shared_ptr<message_set_t> > application_t::get_message_set()
 {
        return message_set_;
 }
 
-std::vector<std::shared_ptr<signal_t> > application_t::get_all_signals()
+vect_ptr_signal_t application_t::get_all_signals()
 {
        return message_set_[active_message_set_]->get_all_signals();
 }
 
-std::vector<std::shared_ptr<diagnostic_message_t>> application_t::get_diagnostic_messages()
+vect_ptr_diag_msg_t application_t::get_diagnostic_messages()
 {
        return message_set_[active_message_set_]->get_diagnostic_messages();
 }
 
-std::vector<std::shared_ptr<message_definition_t>> application_t::get_messages_definition()
+vect_ptr_msg_def_t application_t::get_messages_definition()
 {
        return message_set_[active_message_set_]->get_messages_definition();
 }
@@ -76,7 +111,7 @@ std::vector<std::shared_ptr<message_definition_t>> application_t::get_messages_d
 std::shared_ptr<message_definition_t> application_t::get_message_definition(uint32_t id)
 {
        std::shared_ptr<message_definition_t> ret = nullptr;
-       std::vector<std::shared_ptr<message_definition_t>> messages_definition = get_messages_definition();
+       vect_ptr_msg_def_t messages_definition = get_messages_definition();
        for(std::shared_ptr<message_definition_t> &msg_def : messages_definition)
        {
                if(msg_def->get_id() == id)
@@ -104,7 +139,7 @@ void application_t::set_active_message_set(uint8_t id)
        active_message_set_ = id;
 }
 
-bool application_t::isEngineOn()
+bool application_t::is_engine_on()
 {
        struct utils::signals_found sf;
        openxc_DynamicField search_key = build_DynamicField("engine.speed");
@@ -139,13 +174,9 @@ bool application_t::isEngineOn()
 
                if(sf.diagnostic_messages.front()->get_last_value_with_timestamp().first > 0 &&
                   std::difftime(std::time(nullptr), last_timestamp_in_s) < ENGINE_VALUE_TIMEOUT)
-               {
                        engine_on = true;
-               }
                else
-               {
                        AFB_NOTICE("is_engine_on: engine.speed diagnostic message found, but engine seems off");
-               }
        }
        else
        {
@@ -154,3 +185,38 @@ bool application_t::isEngineOn()
 
        return engine_on;
 }
+
+void application_t::set_parents(std::shared_ptr<message_set_t> new_message_set)
+{
+       vect_ptr_msg_def_t messages_definition = new_message_set->get_messages_definition();
+       for(std::shared_ptr<message_definition_t> cmd : messages_definition)
+       {
+               cmd->set_parent(new_message_set);
+               std::vector<std::shared_ptr<signal_t>> signals = cmd->get_signals();
+               for(std::shared_ptr<signal_t> sig: signals)
+                       sig->set_parent(cmd);
+       }
+
+       std::vector<std::shared_ptr<diagnostic_message_t>> diagnostic_messages = new_message_set->get_diagnostic_messages();
+       for(std::shared_ptr<diagnostic_message_t> dm : diagnostic_messages)
+               dm->set_parent(new_message_set);
+}
+
+#ifdef USE_FEATURE_J1939
+std::shared_ptr<utils::socketcan_t> application_t::get_socket_address_claiming()
+{
+       return subscription_address_claiming_->get_socket();
+}
+
+std::shared_ptr<low_can_subscription_t> application_t::get_subscription_address_claiming()
+{
+       return subscription_address_claiming_;
+}
+
+
+void application_t::set_subscription_address_claiming(std::shared_ptr<low_can_subscription_t> new_subscription)
+{
+       subscription_address_claiming_ = new_subscription;
+}
+
+#endif