X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=low-can-binding%2Fbinding%2Fapplication.cpp;h=4c9641c47217d6d428a6eb381ef806c20d5c6cd0;hb=HEAD;hp=6f2310c1d848a0925425255fbe17bcdcf070aa09;hpb=6faef2305955b025c3cf1cfaf17a6aa073727c24;p=apps%2Fagl-service-can-low-level.git diff --git a/low-can-binding/binding/application.cpp b/low-can-binding/binding/application.cpp index 6f2310c1..4c9641c4 100644 --- a/low-can-binding/binding/application.cpp +++ b/low-can-binding/binding/application.cpp @@ -14,11 +14,21 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +#include + #include "application.hpp" #include "../utils/signals.hpp" #include "../utils/openxc-utils.hpp" -#include "low-can-socket.hpp" +#include "low-can-subscription.hpp" + +#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() @@ -32,7 +42,7 @@ can_bus_t& application_t::get_can_bus_manager() return can_bus_manager_; } -std::map >& application_t::get_can_devices() +std::map >& application_t::get_can_devices() { return can_devices_; } @@ -47,32 +57,79 @@ uint8_t application_t::get_active_message_set() const return active_message_set_; } -std::vector > application_t::get_can_message_set() +int application_t::add_message_set(std::shared_ptr 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 > application_t::get_message_set() { - return can_message_set_; + return message_set_; } -std::vector > application_t::get_all_can_signals() +vect_ptr_signal_t application_t::get_all_signals() { - return can_message_set_[active_message_set_]->get_all_can_signals(); + return message_set_[active_message_set_]->get_all_signals(); } -std::vector >& application_t::get_diagnostic_messages() +vect_ptr_diag_msg_t application_t::get_diagnostic_messages() { - return can_message_set_[active_message_set_]->get_diagnostic_messages(); + return message_set_[active_message_set_]->get_diagnostic_messages(); } -std::vector >& application_t::get_can_message_definition() +vect_ptr_msg_def_t application_t::get_messages_definition() { - return can_message_set_[active_message_set_]->get_can_message_definition(); + return message_set_[active_message_set_]->get_messages_definition(); } + +std::shared_ptr application_t::get_message_definition(uint32_t id) +{ + std::shared_ptr ret = nullptr; + vect_ptr_msg_def_t messages_definition = get_messages_definition(); + for(std::shared_ptr &msg_def : messages_definition) + { + if(msg_def->get_id() == id) + { + ret = msg_def; + break; + } + } + return ret; +} + + uint32_t application_t::get_signal_id(diagnostic_message_t& sig) const { return sig.get_pid(); } -uint32_t application_t::get_signal_id(can_signal_t& sig) const +uint32_t application_t::get_signal_id(signal_t& sig) const { return sig.get_message()->get_id(); } @@ -81,3 +138,81 @@ void application_t::set_active_message_set(uint8_t id) { active_message_set_ = id; } + +bool application_t::is_engine_on() +{ + struct utils::signals_found sf; + openxc_DynamicField search_key = build_DynamicField("engine.speed"); + sf = utils::signals_manager_t::instance().find_signals(search_key); + bool engine_on = false; + uint64_t last_timestamp_in_s; + + if(sf.signals.size() == 1) + { + last_timestamp_in_s = sf.signals.front()->get_last_value_with_timestamp().second + / MICROSECONDS_IN_SECOND; + + if(sf.signals.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 CAN signal found, but engine seems off"); + } + else + { + AFB_NOTICE("is_engine_on: Can't identify a useable engine.speed CAN signal"); + } + + if(sf.diagnostic_messages.size() == 1) + { + last_timestamp_in_s = sf.diagnostic_messages.front()->get_last_value_with_timestamp().second + / MICROSECONDS_IN_SECOND; + + 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 + { + AFB_NOTICE("is_engine_on: Can't identify a useable engine.speed diagnostic message"); + } + + return engine_on; +} + +void application_t::set_parents(std::shared_ptr new_message_set) +{ + vect_ptr_msg_def_t messages_definition = new_message_set->get_messages_definition(); + for(std::shared_ptr cmd : messages_definition) + { + cmd->set_parent(new_message_set); + std::vector> signals = cmd->get_signals(); + for(std::shared_ptr sig: signals) + sig->set_parent(cmd); + } + + std::vector> diagnostic_messages = new_message_set->get_diagnostic_messages(); + for(std::shared_ptr dm : diagnostic_messages) + dm->set_parent(new_message_set); +} + +#ifdef USE_FEATURE_J1939 +std::shared_ptr application_t::get_socket_address_claiming() +{ + return subscription_address_claiming_->get_socket(); +} + +std::shared_ptr application_t::get_subscription_address_claiming() +{ + return subscription_address_claiming_; +} + + +void application_t::set_subscription_address_claiming(std::shared_ptr new_subscription) +{ + subscription_address_claiming_ = new_subscription; +} + +#endif