low_can_subscription: Add msg_def and create_rx for message

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

diff --git a/low-can-binding/binding/low-can-subscription.cpp b/low-can-binding/binding/low-can-subscription.cpp
index 0f1d1da..99f209b 100644 (file)
--- a/low-can-binding/binding/low-can-subscription.cpp
+++ b/low-can-binding/binding/low-can-subscription.cpp
@@ -102,12 +102,9 @@ int low_can_subscription_t::set_event()
 int low_can_subscription_t::subscribe(afb_req_t request)
 {
        if(! afb_event_is_valid(event_))
-       {
                if(set_event() < 0)
-               {
                        return -1;
-               }
-       }
+
        return afb_req_subscribe(request, event_);
 }
 
@@ -175,12 +172,9 @@ const vect_ptr_diag_msg_t low_can_subscription_t::get_diagnostic_message() const
 const std::shared_ptr<diagnostic_message_t> low_can_subscription_t::get_diagnostic_message(uint32_t pid) const
 {
        for(const auto& diag: diagnostic_message_)
-       {
                if(diag->get_pid() == pid)
-               {
                        return diag;
-               }
-       }
+
        return nullptr;
 }
 
@@ -190,12 +184,9 @@ const std::shared_ptr<diagnostic_message_t> low_can_subscription_t::get_diagnost
 const std::shared_ptr<diagnostic_message_t> low_can_subscription_t::get_diagnostic_message(const std::string& name) const
 {
        for(const auto& diag: diagnostic_message_)
-       {
                if(diag->get_name() == name)
-               {
                        return diag;
-               }
-       }
+
        return nullptr;
 }
 
@@ -254,6 +245,11 @@ float low_can_subscription_t::get_max() const
        return event_filter_.max;
 }
 
+bool low_can_subscription_t::get_promisc() const
+{
+       return event_filter_.promisc;
+}
+
 /**
  * @brief Getter of the rx_id of the event_filter
  *
@@ -284,6 +280,11 @@ std::shared_ptr<utils::socketcan_t> low_can_subscription_t::get_socket()
        return socket_;
 }
 
+std::shared_ptr<message_definition_t> low_can_subscription_t::get_message_definition()
+{
+       return message_;
+}
+
 /**
  * @brief Setter for the frequency of the event_filter
  *
@@ -314,6 +315,11 @@ void low_can_subscription_t::set_max(float max)
        event_filter_.max = max;
 }
 
+void low_can_subscription_t::set_promisc(bool promisc)
+{
+       event_filter_.promisc = promisc;
+}
+
 /**
  * @brief Setter for the rx_id of the event_filter
  *
@@ -354,6 +360,10 @@ void low_can_subscription_t::set_signal(std::shared_ptr<signal_t> signal)
        signal_ = signal;
 }
 
+void low_can_subscription_t::set_message_definition(std::shared_ptr<message_definition_t> message)
+{
+       message_ = message;
+}
 
 /// @brief Based upon which object is a subscribed CAN signal or diagnostic message
 /// it will open the socket with the required CAN bus device name.
@@ -370,7 +380,7 @@ int low_can_subscription_t::open_socket(low_can_subscription_t &subscription, co
                        if( subscription.signal_ )
                                ret = subscription.socket_->open(subscription.signal_->get_message()->get_bus_device_name());
                        else if(! subscription.diagnostic_message_.empty())
-                               ret = subscription.socket_->open(application_t::instance().get_diagnostic_manager().get_bus_name());
+                               ret = subscription.socket_->open(application_t::instance().get_diagnostic_manager().get_bus_device_name());
                        else if(! bus_name.empty())
                                ret = subscription.socket_->open(bus_name);
 
@@ -409,30 +419,30 @@ int low_can_subscription_t::open_socket(low_can_subscription_t &subscription, co
                else if(flags & J1939_ADDR_CLAIM_PROTOCOL)
                {
                        pgn_t pgn = J1939_NO_PGN;
+                       std::shared_ptr<utils::socketcan_j1939_addressclaiming_t> socket = std::make_shared<utils::socketcan_j1939_addressclaiming_t>();
                        if(!bus_name.empty())
-                       {
-                               std::shared_ptr<utils::socketcan_j1939_addressclaiming_t> socket = std::make_shared<utils::socketcan_j1939_addressclaiming_t>();
                                ret = socket->open(bus_name, pgn);
-                               subscription.socket_ = socket;
-                       }
+                       subscription.socket_ = socket;
                        subscription.index_ = (int)subscription.socket_->socket();
                }
                else if(flags & J1939_PROTOCOL)
                {
                        pgn_t pgn = J1939_NO_PGN;
+                       std::shared_ptr<utils::socketcan_j1939_data_t> socket = std::make_shared<utils::socketcan_j1939_data_t>();
                        if(subscription.signal_)
                        {
                                pgn = subscription.signal_->get_message()->get_id();
-                               std::shared_ptr<utils::socketcan_j1939_data_t> socket = std::make_shared<utils::socketcan_j1939_data_t>();
                                ret = socket->open(subscription.signal_->get_message()->get_bus_device_name(), pgn);
-                               subscription.socket_ = socket;
                        }
                        else if(!bus_name.empty())
                        {
-                               std::shared_ptr<utils::socketcan_j1939_data_t> socket = std::make_shared<utils::socketcan_j1939_data_t>();
                                ret = socket->open(bus_name, pgn);
-                               subscription.socket_ = socket;
                        }
+
+                       if(ret)
+                               socket->define_opt(!j1939_pgn_is_pdu1(pgn),subscription.event_filter_.promisc);
+
+                       subscription.socket_ = socket;
                        subscription.index_ = (int)subscription.socket_->socket();
                }
 #endif
@@ -606,6 +616,35 @@ int low_can_subscription_t::create_rx_filter_can(low_can_subscription_t &subscri
        return create_rx_filter_bcm(subscription, bcm_msg);
 }
 
+
+int low_can_subscription_t::create_rx_filter(std::shared_ptr<message_definition_t> msg)
+{
+       std::shared_ptr<signal_t> signal_message =
+               std::make_shared<signal_t>(signal_t{msg->get_name(),
+                                                   0,
+                                                   msg->get_length() * 8,
+                                                   1.00000f,
+                                                   0.00000f,
+                                                   0,
+                                                   0,
+                                                   frequency_clock_t(0.00000f),
+                                                   true,
+                                                   false,
+                                                   {},
+                                                   true,
+                                                   nullptr,
+                                                   nullptr,
+                                                   false,
+                                                   std::make_pair<bool, int>(false, 0),
+                                                   static_cast<sign_t>(0),
+                                                   -1,
+                                                   ""});
+
+       signal_message->set_parent(msg);
+       return create_rx_filter(signal_message);
+}
+
+
 /**
  * @brief Create the good socket to read message
  * depending on the signal
@@ -616,26 +655,17 @@ int low_can_subscription_t::create_rx_filter_can(low_can_subscription_t &subscri
 int low_can_subscription_t::create_rx_filter(std::shared_ptr<signal_t> sig)
 {
        if(!sig->get_message()->is_isotp() && !sig->get_message()->is_j1939())
-       {
                return low_can_subscription_t::create_rx_filter_can(*this, sig);
-       }
 #ifdef USE_FEATURE_ISOTP
        else if(sig->get_message()->is_isotp())
-       {
                return low_can_subscription_t::create_rx_filter_isotp(*this, sig);
-       }
 #endif
 #ifdef USE_FEATURE_J1939
        else if(sig->get_message()->is_j1939())
-       {
                return low_can_subscription_t::create_rx_filter_j1939(*this, sig);
-       }
 #endif
-       else
-       {
-               AFB_ERROR("Signal can't be j1939 and isotp");
-               return -1;
-       }
+       AFB_ERROR("Signal can't be created (check config)");
+       return -1;
 }