if(! tx_socket)
tx_socket.open(dm.get_bus_device_name());
- struct utils::bcm_msg bcm_msg;
+ struct bcm_msg bcm_msg;
struct can_frame cf;
struct timeval freq = current_adr->get_frequency_clock().get_timeval_from_period();
bcm_msg.frames[0] = cf;
- tx_socket << bcm_msg;
+
+ can_message_t msg = can_message_t();
+
+ msg.set_bcm_msg(bcm_msg);
+
+ tx_socket.write_message(msg);
if(tx_socket)
return true;
return false;
if(entry != nullptr)
{
if(diagnostic_request_equals(&entry->get_handle()->request, &request))
- {return entry;}
+ return entry;
}
}
return nullptr;
}
}
else
- { AFB_DEBUG("Can't add request, one already exists with same key");}
+ AFB_DEBUG("Can't add request, one already exists with same key");
return entry;
}
found_signals = utils::signals_manager_t::instance().find_signals(build_DynamicField((double) adr->get_pid()));
if(adr->get_decoder() != nullptr)
- {
value = adr->get_decoder()(&response, value);
- }
if((response.success && adr->get_name().size()) > 0)
{
}
if(adr->get_callback() != nullptr)
- {
adr->get_callback()(adr, &response, value);
- }
// Reset the completed flag handle to make sure that it will be reprocessed the next time.
adr->get_handle()->success = false;
/// @param[in] cm - A raw CAN message.
///
/// @return A pointer to a filled openxc_VehicleMessage or a nullptr if nothing has been found.
-openxc_VehicleMessage diagnostic_manager_t::relay_diagnostic_handle(active_diagnostic_request_t* entry, const can_message_t& cm)
+openxc_VehicleMessage diagnostic_manager_t::relay_diagnostic_handle(active_diagnostic_request_t* entry, std::shared_ptr<message_t> m)
{
- DiagnosticResponse response = diagnostic_receive_can_frame(&shims_, entry->get_handle(), cm.get_id(), cm.get_data(), cm.get_length());
+ DiagnosticResponse response = diagnostic_receive_can_frame(&shims_, entry->get_handle(), m->get_id(), m->get_data(), (uint8_t)m->get_length());
if(response.completed && entry->get_handle()->completed)
{
if(entry->get_handle()->success)
- return relay_diagnostic_response(entry, response, cm.get_timestamp());
+ return relay_diagnostic_response(entry, response, m->get_timestamp());
}
else if(!response.completed && response.multi_frame)
{
/// @param[in] cm - Raw CAN message received
///
/// @return VehicleMessage with decoded value.
-openxc_VehicleMessage diagnostic_manager_t::find_and_decode_adr(const can_message_t& cm)
+openxc_VehicleMessage diagnostic_manager_t::find_and_decode_adr(std::shared_ptr<message_t> m)
{
openxc_VehicleMessage vehicle_message = build_VehicleMessage();
for ( auto entry : non_recurring_requests_)
{
- vehicle_message = relay_diagnostic_handle(entry, cm);
+ vehicle_message = relay_diagnostic_handle(entry, m);
if (is_valid(vehicle_message))
return vehicle_message;
}
for ( auto entry : recurring_requests_)
{
- vehicle_message = relay_diagnostic_handle(entry, cm);
+ vehicle_message = relay_diagnostic_handle(entry, m);
if (is_valid(vehicle_message))
return vehicle_message;
}
/// @param[in] cm - CAN message received from the socket.
///
/// @return True if the active diagnostic request match the response.
-bool diagnostic_manager_t::is_diagnostic_response(const can_message_t& cm)
+bool diagnostic_manager_t::is_diagnostic_response(std::shared_ptr<message_t> m)
{
- if (cm.get_id() >= 0x7e8 && cm.get_id() <= 0x7ef)
- return true;
+ if(m->get_id() & CAN_SFF_MASK || m->get_id() & CAN_EFF_MASK)
+ {
+ if (m->get_id() >= 0x7e8 && m->get_id() <= 0x7ef)
+ return true;
+ }
return false;
}