/*
- * Copyright (C) 2015, 2016 "IoT.bzh"
+ * Copyright (C) 2015, 2018 "IoT.bzh"
* Author "Romain Forlot" <romain.forlot@iot.bzh>
*
* Licensed under the Apache License, Version 2.0 (the "License");
#include "../utils/signals.hpp"
#include "../utils/openxc-utils.hpp"
+/// @brief Class destructor
+///
+/// @param[in] conf_file - Stop threads and unlock them to correctly finish them
+/// even without any activity on the CAN bus.
+can_bus_t::~can_bus_t()
+{
+ stop_threads();
+ new_can_message_cv_.notify_one();
+}
+
/// @brief Class constructor
///
/// @param[in] conf_file - handle to the json configuration file.
: conf_file_{conf_file}
{}
-/// @brief Take a decoded message to determine if its value comply with the wanted
-/// filtering values.
+/// @brief Take a decoded message to determine if its value complies with the desired
+/// filters.
///
-/// @param[in] vehicle_message - A decoded message to analyze
+/// @param[in] vehicle_message - The decoded message to be analyzed.
/// @param[in] can_subscription - the subscription which will be notified depending
/// on its filtering values. Filtering values are stored in the event_filtermember.
///
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;
}
openxc_DynamicField decoded_message;
openxc_VehicleMessage vehicle_message;
- // First we have to found which can_signal_t it is
- std::shared_ptr<low_can_subscription_t> sig = s[subscription_id];
-
if( s.find(subscription_id) != s.end() && afb_event_is_valid(s[subscription_id]->get_event()))
{
bool send = true;
+ // First we have to found which can_signal_t it is
+ std::shared_ptr<low_can_subscription_t> sig = s[subscription_id];
+
decoded_message = decoder_t::translate_signal(*sig->get_can_signal(), can_message, &send);
openxc_SimpleMessage s_message = build_SimpleMessage(sig->get_name(), decoded_message);
vehicle_message = build_VehicleMessage(s_message, can_message.get_timestamp());
{
std::lock_guard<std::mutex> decoded_can_message_lock(decoded_can_message_mutex_);
push_new_vehicle_message(subscription_id, vehicle_message);
- AFB_DEBUG("%s CAN signals processed.", sig->get_name().c_str());
+ AFB_DEBUG("%s CAN signals processed.", sig->get_name().c_str());
}
}
}
}
can_message_lock.lock();
}
- new_decoded_can_message_.notify_one();
- can_message_lock.unlock();
+ new_decoded_can_message_.notify_one();
+ can_message_lock.unlock();
}
}