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_);
}
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;
}
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;
}
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
*
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.
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())
- {
ret = socket->open(bus_name, pgn);
- }
subscription.socket_ = socket;
subscription.index_ = (int)subscription.socket_->socket();
}
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
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;
}