bool send = false;
if(is_valid(vehicle_message))
{
- float min = std::isnan(can_subscription->get_min()) ? -INFINITY : can_subscription->get_min();
- float max = std::isnan(can_subscription->get_max()) ? INFINITY : can_subscription->get_max();
+ float min = can_subscription->get_min();
+ float max = can_subscription->get_max();
double value = get_numerical_from_DynamicField(vehicle_message);
- send = (value < min && value > max) ? false : true;
+ send = (value < min || value > max) ? false : true;
}
return send;
}
int subscription_id = can_message.get_sub_id();
openxc_VehicleMessage vehicle_message = manager.find_and_decode_adr(can_message);
+ if (can_message.get_timestamp())
+ {vehicle_message.timestamp = can_message.get_timestamp();}
if( (vehicle_message.has_simple_message && vehicle_message.simple_message.has_name) &&
s.find(subscription_id) != s.end() && afb_event_is_valid(s[subscription_id]->get_event()))
{
/// which are events that has to be pushed.
void can_bus_t::can_event_push()
{
- openxc_SimpleMessage s_message;
json_object* jo;
utils::signals_manager_t& sm = utils::signals_manager_t::instance();
{
std::lock_guard<std::mutex> subscribed_signals_lock(sm.get_subscribed_signals_mutex());
std::map<int, std::shared_ptr<low_can_subscription_t> >& s = sm.get_subscribed_signals();
- s_message = get_simple_message(v_message.second);
if(s.find(v_message.first) != s.end() && afb_event_is_valid(s[v_message.first]->get_event()))
{
jo = json_object_new_object();
- jsonify_simple(s_message, jo);
+ jsonify_vehicle(v_message.second, jo);
if(afb_event_push(s[v_message.first]->get_event(), jo) == 0)
{
if(v_message.second.has_diagnostic_response)