#include <mutex>
#include <vector>
#include <thread>
+#include <algorithm>
#include <wrap-json.h>
#include <systemd/sd-event.h>
#include <ctl-config.h>
CtlConfigT *ctrlConfig;
ctrlConfig = (CtlConfigT *) afb_api_get_userdata(apiHandle);
- if(!ctrlConfig)
+ if(! ctrlConfig)
return -1;
- if(!section->handle)
+ if(! ctrlConfig->external)
return -1;
- application_t *application = (application_t*) section->handle;
-
+ application_t *application = (application_t*) ctrlConfig->external;
int active_message_set;
const char *diagnotic_bus = nullptr;
.loadCB=PluginConfig,
.handle=nullptr,
.actions=nullptr},
+ [2]={.key=nullptr , .uid=nullptr, .info=nullptr,
+ .loadCB=nullptr,
+ .handle=nullptr,
+ .actions=nullptr},
};
///*****************************************************************************
cd[bus_name]->set_signal(signal);
- if(flags&BCM_PROTOCOL)
+ if(flags&CAN_PROTOCOL)
return low_can_subscription_t::tx_send(*cd[bus_name], message, bus_name);
#ifdef USE_FEATURE_ISOTP
else if(flags&ISOTP_PROTOCOL)
if( !sf.signals.empty() )
{
AFB_DEBUG("ID WRITE RAW : %d", sf.signals.front()->get_message()->get_id());
- if(flags & BCM_PROTOCOL)
+ if(flags & CAN_PROTOCOL)
{
if(sf.signals.front()->get_message()->is_fd())
{
AFB_DEBUG("CANFD_MAX_DLEN");
- message->set_flags(CAN_FD_FRAME);
+ message->set_flags(CAN_PROTOCOL_WITH_FD_FRAME);
message->set_maxdlen(CANFD_MAX_DLEN);
}
else
}
else
{
- if(flags&BCM_PROTOCOL)
+ if(flags&CAN_PROTOCOL)
afb_req_fail(request, "Invalid", "Frame BCM");
else if(flags&J1939_PROTOCOL)
afb_req_fail(request, "Invalid", "Frame J1939");
"can_data", &can_data))
{
message = new can_message_t(0, id, length, false, 0, data, 0);
- write_raw_frame(request, bus_name, message, can_data, BCM_PROTOCOL, event_filter);
+ write_raw_frame(request, bus_name, message, can_data, CAN_PROTOCOL, event_filter);
}
#ifdef USE_FEATURE_J1939
else if(!wrap_json_unpack(json_value, "{si, si, so !}",
else if(sig->get_message()->is_isotp())
flags = ISOTP_PROTOCOL;
else
- flags = BCM_PROTOCOL;
+ flags = CAN_PROTOCOL;
// cfd = encoder_t::build_frame(sig, value);
message_t *message = encoder_t::build_message(sig, value, false, false);
return -1;
}
-
can_bus_manager.set_can_devices();
can_bus_manager.start_threads();
utils::signals_manager_t& sm = utils::signals_manager_t::instance();
return ret;
}
-int load_conf(afb_api_t api)
+int load_config(afb_api_t api)
{
int ret = 0;
CtlConfigT *ctlConfig;