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_bus());
+ ret = subscription.socket_->open(application_t::instance().get_diagnostic_manager().get_bus_name());
else if(! bus_name.empty())
ret = subscription.socket_->open(bus_name);
rx = subscription.signal_->get_message()->get_id();
tx = subscription.get_tx_id();
}
- ret = socket->open(subscription.signal_->get_message()->get_bus_device_name(),rx,tx);
+ ret = socket->open(subscription.signal_->get_message()->get_bus_device_name(), rx, tx);
subscription.socket_ = socket;
}
else if(! bus_name.empty())
{
- ret = socket->open(bus_name, subscription.get_rx_id(),subscription.get_tx_id());
+ ret = socket->open(bus_name, subscription.get_rx_id(), subscription.get_tx_id());
subscription.socket_ = socket;
}
subscription.index_ = (int)subscription.socket_->socket();
void low_can_subscription_t::remove_last_bcm_frame(struct bcm_msg& bcm_msg)
{
struct canfd_frame cf;
- memset(&cf,0,sizeof(cf));
+ memset(&cf, 0, sizeof(cf));
bcm_msg.fd_frames[bcm_msg.msg_head.nframes] = cf;
bcm_msg.msg_head.nframes--;
}
// Make sure that socket is opened.
if(open_socket(subscription, "", J1939_PROTOCOL) < 0)
- {
return -1;
- }
+
return 0;
}
#endif
// Make sure that socket is opened.
if(open_socket(subscription, "", ISOTP_PROTOCOL|ISOTP_RECEIVE) < 0)
- {
return -1;
- }
+
return 0;
}
#ifdef USE_FEATURE_ISOTP
else if(sig->get_message()->is_isotp())
{
- return low_can_subscription_t::create_rx_filter_isotp(*this,sig);
+ return low_can_subscription_t::create_rx_filter_isotp(*this, sig);
}
#endif
#ifdef USE_FEATURE_J1939
{
// Make sure that socket is opened.
if(subscription.open_socket(subscription, "", BCM_PROTOCOL) < 0)
- {return -1;}
+ return -1;
// If it's not an OBD2 CAN ID then just add a simple RX_SETUP job
// else monitor all standard 8 CAN OBD2 ID response.
if(bcm_msg.msg_head.can_id != OBD2_FUNCTIONAL_BROADCAST_ID)
{
subscription.socket_->write_message(msg);
- if(! subscription.socket_)
- return -1;
+ if(! subscription.socket_)
+ return -1;
}
else
{
{
can_message_t *cm = static_cast<can_message_t*>(message);
- struct bcm_msg bcm_msg = subscription.make_bcm_head(TX_SEND, cm->get_id(),cm->get_flags()|TX_CP_CAN_ID); // TX_CP_CAN_ID -> copy in cfd the id of bcm
+ struct bcm_msg bcm_msg = subscription.make_bcm_head(TX_SEND, cm->get_id(), cm->get_flags()|TX_CP_CAN_ID); // TX_CP_CAN_ID -> copy in cfd the id of bcm
cm->set_bcm_msg(bcm_msg);
std::vector<canfd_frame> cfd_vect = cm->convert_to_canfd_frame_vector();
if(subscription.open_socket(subscription, bus_name, BCM_PROTOCOL) < 0)
- {
- return -1;
- }
+ return -1;
struct bcm_msg &bcm_cm = cm->get_bcm_msg();
//subscription.add_one_bcm_frame(cfd, bcm_msg);
if(subscription.open_socket(subscription, bus_name, J1939_PROTOCOL) < 0)
- {
return -1;
- }
j1939_message_t *jm = static_cast<j1939_message_t*>(message);
jm->set_sockname(jm->get_pgn(), J1939_NO_NAME, J1939_NO_ADDR);
//subscription.add_one_bcm_frame(cfd, bcm_msg);
if(subscription.open_socket(subscription, bus_name, ISOTP_PROTOCOL|ISOTP_SEND) < 0)
- {
return -1;
- }
can_message_t *cm = static_cast<can_message_t*>(message);
if(subscription.socket_->write_message(*cm) < 0)