Update function rx_filter_can for multi frame prevision.

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

diff --git a/low-can-binding/binding/low-can-cb.cpp b/low-can-binding/binding/low-can-cb.cpp
index 5fdd961..f3fe7c8 100644 (file)
--- a/low-can-binding/binding/low-can-cb.cpp
+++ b/low-can-binding/binding/low-can-cb.cpp
@@ -151,8 +151,7 @@ static int subscribe_unsubscribe_signal(afb_req_t request,
                }
 
                // Event doesn't exist , so let's create it
-               if (! subscription_exists &&
-                   (ret = can_subscription->subscribe(request)) < 0)
+               if ((ret = can_subscription->subscribe(request)) < 0)
                        return ret;
 
                if(! subscription_exists)
@@ -193,11 +192,11 @@ static int add_to_event_loop(std::shared_ptr<low_can_subscription_t>& can_subscr
 }
 
 static int subscribe_unsubscribe_diagnostic_messages(afb_req_t request,
-                                                    bool subscribe,
-                                                    std::vector<std::shared_ptr<diagnostic_message_t> > diagnostic_messages,
-                                                    struct event_filter_t& event_filter,
-                                                    std::map<int, std::shared_ptr<low_can_subscription_t> >& s,
-                                                    bool perm_rec_diag_req)
+                                                        bool subscribe,
+                                                        std::vector<std::shared_ptr<diagnostic_message_t> > diagnostic_messages,
+                                                        struct event_filter_t& event_filter,
+                                                        std::map<int, std::shared_ptr<low_can_subscription_t> >& s,
+                                                        bool perm_rec_diag_req)
 {
        int rets = 0;
        application_t& app = application_t::instance();
@@ -258,10 +257,10 @@ static int subscribe_unsubscribe_diagnostic_messages(afb_req_t request,
 }
 
 static int subscribe_unsubscribe_signals(afb_req_t request,
-                                            bool subscribe,
-                                            std::vector<std::shared_ptr<signal_t> > signals,
-                                            struct event_filter_t& event_filter,
-                                            std::map<int, std::shared_ptr<low_can_subscription_t> >& s)
+                                                bool subscribe,
+                                                std::vector<std::shared_ptr<signal_t> > signals,
+                                                struct event_filter_t& event_filter,
+                                                std::map<int, std::shared_ptr<low_can_subscription_t> >& s)
 {
        int rets = 0;
        for(const auto& sig: signals)
@@ -603,18 +602,18 @@ static void write_frame(afb_req_t request, const std::string& bus_name, json_obj
        AFB_DEBUG("JSON content %s",json_object_get_string(json_value));
 
        if(!wrap_json_unpack(json_value, "{si, si, so !}",
-                             "can_id", &id,
-                             "can_dlc", &length,
-                             "can_data", &can_data))
+                                 "can_id", &id,
+                                 "can_dlc", &length,
+                                 "can_data", &can_data))
        {
-               message = new can_message_t(CANFD_MAX_DLEN,(uint32_t)id,(uint32_t)length,message_format_t::STANDARD,false,0,data,0);
+               message = new can_message_t(0,(uint32_t)id,(uint32_t)length,message_format_t::STANDARD,false,0,data,0);
                write_raw_frame(request,bus_name,message,can_data,socket_type::BCM);
        }
 #ifdef USE_FEATURE_J1939
        else if(!wrap_json_unpack(json_value, "{si, si, so !}",
-                             "pgn", &id,
-                             "length", &length,
-                             "data", &can_data))
+                                 "pgn", &id,
+                                 "length", &length,
+                                 "data", &can_data))
        {
                message = new j1939_message_t(J1939_MAX_DLEN,(uint32_t)length,message_format_t::J1939,data,0,J1939_NO_NAME,(pgn_t)id,J1939_NO_ADDR);
                write_raw_frame(request,bus_name,message,can_data,socket_type::J1939);
@@ -670,7 +669,7 @@ static void write_signal(afb_req_t request, const std::string& name, json_object
        }
 
 //     cfd = encoder_t::build_frame(sig, value);
-       message_t *message = encoder_t::build_message(sig,value);
+       message_t *message = encoder_t::build_message(sig,value,false,false);
 
        if(! send_message(message, sig->get_message()->get_bus_device_name(), type) && send)
        {
@@ -702,8 +701,8 @@ void write(afb_req_t request)
 
        // Process about Raw CAN message on CAN bus directly
        if (args != NULL && ! wrap_json_unpack(args, "{ss, so !}",
-                                              "bus_name", &name,
-                                              "frame", &json_value))
+                                                  "bus_name", &name,
+                                                  "frame", &json_value))
                write_frame(request, name, json_value);
 
        // Search signal then encode value.