Following change from configuration_t to application_t some
variable name doesn't correspond now : conf -> app
Change-Id: I56c3a83113777a43af9024a9bc9b53f705b60b0f
Signed-off-by: Romain Forlot <romain.forlot@iot.bzh>
int subscribe_unsubscribe_diagnostic_messages(struct afb_req request, bool subscribe, std::vector<std::shared_ptr<diagnostic_message_t> > diagnostic_messages, struct event_filter_t& event_filter)
{
int rets = 0;
int subscribe_unsubscribe_diagnostic_messages(struct afb_req request, bool subscribe, std::vector<std::shared_ptr<diagnostic_message_t> > diagnostic_messages, struct event_filter_t& event_filter)
{
int rets = 0;
- application_t& conf = application_t::instance();
- diagnostic_manager_t& diag_m = conf.get_diagnostic_manager();
+ application_t& app = application_t::instance();
+ diagnostic_manager_t& diag_m = app.get_diagnostic_manager();
for(const auto& sig : diagnostic_messages)
{
for(const auto& sig : diagnostic_messages)
{
- DiagnosticRequest* diag_req = conf.get_request_from_diagnostic_message(sig->get_name());
+ DiagnosticRequest* diag_req = app.get_request_from_diagnostic_message(sig->get_name());
float frequency = std::isnan(event_filter.frequency) ? sig->get_frequency() : event_filter.frequency;
// If the requested diagnostic message isn't supported by the car then unsubcribe it
float frequency = std::isnan(event_filter.frequency) ? sig->get_frequency() : event_filter.frequency;
// If the requested diagnostic message isn't supported by the car then unsubcribe it
int subscription_id = can_message.get_sub_id();
openxc_DynamicField decoded_message;
openxc_VehicleMessage vehicle_message;
int subscription_id = can_message.get_sub_id();
openxc_DynamicField decoded_message;
openxc_VehicleMessage vehicle_message;
- application_t& conf = application_t::instance();
utils::signals_manager_t& sm = utils::signals_manager_t::instance();
{
utils::signals_manager_t& sm = utils::signals_manager_t::instance();
{
if( s.find(subscription_id) != s.end() && afb_event_is_valid(s[subscription_id]->get_event()))
{
bool send = true;
if( s.find(subscription_id) != s.end() && afb_event_is_valid(s[subscription_id]->get_event()))
{
bool send = true;
- decoded_message = decoder_t::translateSignal(*sig->get_can_signal(), can_message, conf.get_all_can_signals(), &send);
+ decoded_message = decoder_t::translateSignal(*sig->get_can_signal(), can_message, application_t::instance().get_all_can_signals(), &send);
openxc_SimpleMessage s_message = build_SimpleMessage(sig->get_name(), decoded_message);
vehicle_message = build_VehicleMessage(s_message, can_message.get_timestamp());
openxc_SimpleMessage s_message = build_SimpleMessage(sig->get_name(), decoded_message);
vehicle_message = build_VehicleMessage(s_message, can_message.get_timestamp());
const openxc_VehicleMessage build_VehicleMessage(active_diagnostic_request_t* request, const DiagnosticResponse& response, float parsed_value)
{
openxc_VehicleMessage message;
const openxc_VehicleMessage build_VehicleMessage(active_diagnostic_request_t* request, const DiagnosticResponse& response, float parsed_value)
{
openxc_VehicleMessage message;
- application_t& conf = application_t::instance();
+ application_t& app = application_t::instance();
message.has_type = true;
message.type = openxc_VehicleMessage_Type::openxc_VehicleMessage_Type_DIAGNOSTIC;
message.has_diagnostic_response = true;
message.diagnostic_response.has_bus = true;
message.has_type = true;
message.type = openxc_VehicleMessage_Type::openxc_VehicleMessage_Type_DIAGNOSTIC;
message.has_diagnostic_response = true;
message.diagnostic_response.has_bus = true;
- message.diagnostic_response.bus = conf.get_can_bus_manager().get_can_device_index(
- conf.get_diagnostic_manager().get_bus_name());
+ message.diagnostic_response.bus = app.get_can_bus_manager().get_can_device_index(
+ app.get_diagnostic_manager().get_bus_name());
message.diagnostic_response.has_message_id = true;
if(request->get_id() != OBD2_FUNCTIONAL_BROADCAST_ID)
message.diagnostic_response.has_message_id = true;
if(request->get_id() != OBD2_FUNCTIONAL_BROADCAST_ID)