Get diag manager's socket into subscription obj

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

diff --git a/CAN-binder/low-can-binding/can/can-bus.cpp b/CAN-binder/low-can-binding/can/can-bus.cpp
index 84f828e..78a823c 100644 (file)
--- a/CAN-binder/low-can-binding/can/can-bus.cpp
+++ b/CAN-binder/low-can-binding/can/can-bus.cpp
@@ -47,11 +47,15 @@ can_bus_t::can_bus_t(utils::config_parser_t conf_file)
 
 bool can_bus_t::apply_filter(const openxc_VehicleMessage& vehicle_message, std::shared_ptr<low_can_subscription_t> can_subscription)
 {
+       bool send = false;
        if(is_valid(vehicle_message))
        {
-               return true;
+               float min = std::isnan(can_subscription->get_min()) ? -INFINITY : can_subscription->get_min();
+               float max = std::isnan(can_subscription->get_max()) ? INFINITY : can_subscription->get_max();
+               double value = get_numerical_from_DynamicField(vehicle_message);
+               send = (value < min && value > max) ? false : true;
        }
-       return false;
+       return send;
 }
 
 /// @brief Will make the decoding operation on a classic CAN message. It will not
@@ -69,28 +73,27 @@ void can_bus_t::process_can_signals(const can_message_t& can_message)
        int subscription_id = can_message.get_sub_id();
        openxc_DynamicField decoded_message;
        openxc_VehicleMessage vehicle_message;
-       application_t& conf = application_t::instance();
        utils::signals_manager_t& sm = utils::signals_manager_t::instance();
 
        {
                std::lock_guard<std::mutex> subscribed_signals_lock(sm.get_subscribed_signals_mutex());
-               std::map<int, std::pair<std::shared_ptr<low_can_subscription_t>, struct afb_event> >& s = sm.get_subscribed_signals();
+               std::map<int, std::shared_ptr<low_can_subscription_t> >& s = sm.get_subscribed_signals();
 
                // First we have to found which can_signal_t it is
-               std::shared_ptr<low_can_subscription_t> sig = s[subscription_id].first;
+               std::shared_ptr<low_can_subscription_t> sig = s[subscription_id];
 
-               if( s.find(subscription_id) != s.end() && afb_event_is_valid(s[subscription_id].second))
+               if( s.find(subscription_id) != s.end() && afb_event_is_valid(s[subscription_id]->get_event()))
                {
                        bool send = true;
-                       decoded_message = decoder_t::translateSignal(*sig->get_can_signal(), can_message, conf.get_all_can_signals(), &send);
-                       openxc_SimpleMessage s_message = build_SimpleMessage(sig->get_sig_name(), decoded_message);
+                       decoded_message = decoder_t::translateSignal(*sig->get_can_signal(), can_message, application_t::instance().get_all_can_signals(), &send);
+                       openxc_SimpleMessage s_message = build_SimpleMessage(sig->get_name(), decoded_message);
                        vehicle_message = build_VehicleMessage(s_message, can_message.get_timestamp());
 
                        if(send && apply_filter(vehicle_message, sig))
                        {
                                std::lock_guard<std::mutex> decoded_can_message_lock(decoded_can_message_mutex_);
                                push_new_vehicle_message(subscription_id, vehicle_message);
-                               DEBUG(binder_interface, "%s: %s CAN signals processed.", __FUNCTION__,  sig->get_sig_name().c_str());
+                               DEBUG(binder_interface, "%s: %s CAN signals processed.", __FUNCTION__,  sig->get_name().c_str());
                        }
                }
        }
@@ -112,17 +115,17 @@ void can_bus_t::process_diagnostic_signals(diagnostic_manager_t& manager, const
 
        {
                std::lock_guard<std::mutex> subscribed_signals_lock(sm.get_subscribed_signals_mutex());
-               std::map<int, std::pair<std::shared_ptr<low_can_subscription_t>, struct afb_event> >& s = sm.get_subscribed_signals();
+               std::map<int, std::shared_ptr<low_can_subscription_t> >& s = sm.get_subscribed_signals();
 
                openxc_VehicleMessage vehicle_message = manager.find_and_decode_adr(can_message);
                if( (vehicle_message.has_simple_message && vehicle_message.simple_message.has_name) &&
-                       s.find(subscription_id) != s.end() && afb_event_is_valid(s[subscription_id].second))
+                       s.find(subscription_id) != s.end() && afb_event_is_valid(s[subscription_id]->get_event()))
                {
-                       if (apply_filter(vehicle_message, s[subscription_id].first))
+                       if (apply_filter(vehicle_message, s[subscription_id]))
                        {
                                std::lock_guard<std::mutex> decoded_can_message_lock(decoded_can_message_mutex_);
                                push_new_vehicle_message(subscription_id, vehicle_message);
-                               DEBUG(binder_interface, "%s: %s CAN signals processed.", __FUNCTION__,  s[subscription_id].first->get_diag_name().c_str());
+                               DEBUG(binder_interface, "%s: %s CAN signals processed.", __FUNCTION__,  s[subscription_id]->get_name().c_str());
                        }
                }
        }
@@ -180,13 +183,17 @@ void can_bus_t::can_event_push()
                        s_message = get_simple_message(v_message.second);
                        {
                                std::lock_guard<std::mutex> subscribed_signals_lock(sm.get_subscribed_signals_mutex());
-                               std::map<int, std::pair<std::shared_ptr<low_can_subscription_t>, struct afb_event> >& s = sm.get_subscribed_signals();
-                               if(s.find(v_message.first) != s.end() && afb_event_is_valid(s[v_message.first].second))
+                               std::map<int, std::shared_ptr<low_can_subscription_t> >& s = sm.get_subscribed_signals();
+                               if(s.find(v_message.first) != s.end() && afb_event_is_valid(s[v_message.first]->get_event()))
                                {
                                        jo = json_object_new_object();
                                        jsonify_simple(s_message, jo);
-                                       if(afb_event_push(s[v_message.first].second, jo) == 0)
-                                               on_no_clients(std::string(s_message.name));
+                                       if(afb_event_push(s[v_message.first]->get_event(), jo) == 0)
+                                       {
+                                               if(v_message.second.has_diagnostic_response)
+                                                       {on_no_clients(s[v_message.first], v_message.second.diagnostic_response.pid);}
+                                               on_no_clients(s[v_message.first]);
+                                       }
                                }
                        }
                }