* limitations under the License.
*/
-#include <map>
-#include <cerrno>
-#include <vector>
-#include <string>
#include <net/if.h>
#include <sys/socket.h>
#include <json-c/json.h>
#include <linux/can/raw.h>
+#include <map>
+#include <cerrno>
+#include <vector>
+#include <string>
+#include <algorithm>
#include "can-bus.hpp"
#include "can-signals.hpp"
#include "can-decoder.hpp"
-#include "../configuration.hpp"
+#include "../binding/configuration.hpp"
#include "../utils/signals.hpp"
#include "../utils/openxc-utils.hpp"
/// @param[in] can_message - a single CAN message from the CAN socket read, to be decode.
///
/// @return How many signals has been decoded.
-int can_bus_t::process_can_signals(can_message_t& can_message)
+int can_bus_t::process_can_signals(const can_message_t& can_message)
{
int processed_signals = 0;
- std::vector <can_signal_t*> signals;
+ struct utils::signals_found signals;
openxc_DynamicField search_key, decoded_message;
openxc_VehicleMessage vehicle_message;
+ configuration_t& conf = configuration_t::instance();
+ utils::signals_manager_t& sm = utils::signals_manager_t::instance();
// First we have to found which can_signal_t it is
search_key = build_DynamicField((double)can_message.get_id());
- configuration_t::instance().find_can_signals(search_key, signals);
+ signals = sm.find_signals(search_key);
// Decoding the message ! Don't kill the messenger !
- for(auto& sig : signals)
+ for(auto& sig : signals.can_signals)
{
- std::lock_guard<std::mutex> subscribed_signals_lock(get_subscribed_signals_mutex());
- std::map<std::string, struct afb_event>& s = get_subscribed_signals();
+ std::lock_guard<std::mutex> subscribed_signals_lock(sm.get_subscribed_signals_mutex());
+ std::map<std::string, struct afb_event>& s = sm.get_subscribed_signals();
// DEBUG message to make easier debugger STL containers...
//DEBUG(binder_interface, "Operator[] key char: %s, event valid? %d", sig.generic_name, afb_event_is_valid(s[sig.generic_name]));
//DEBUG(binder_interface, "Nb elt matched string: %d", (int)s.count(std::string(sig.generic_name));
if( s.find(sig->get_name()) != s.end() && afb_event_is_valid(s[sig->get_name()]))
{
- decoded_message = decoder_t::translateSignal(*sig, can_message, configuration_t::instance().get_can_signals());
+ bool send = true;
+ decoded_message = decoder_t::translateSignal(*sig, can_message, conf.get_can_signals(), &send);
- openxc_SimpleMessage s_message = build_SimpleMessage(sig->get_name(), decoded_message);
- vehicle_message = build_VehicleMessage(s_message);
+ if(send)
+ {
+ openxc_SimpleMessage s_message = build_SimpleMessage(sig->get_name(), decoded_message);
+ vehicle_message = build_VehicleMessage(s_message);
- std::lock_guard<std::mutex> decoded_can_message_lock(decoded_can_message_mutex_);
- push_new_vehicle_message(vehicle_message);
+ std::lock_guard<std::mutex> decoded_can_message_lock(decoded_can_message_mutex_);
+ push_new_vehicle_message(vehicle_message);
+ }
processed_signals++;
}
}
- DEBUG(binder_interface, "process_can_signals: %d/%d CAN signals processed.", processed_signals, (int)signals.size());
+ DEBUG(binder_interface, "%s: %d/%d CAN signals processed.", __FUNCTION__, processed_signals, (int)signals.can_signals.size());
return processed_signals;
}
{
int processed_signals = 0;
- std::lock_guard<std::mutex> subscribed_signals_lock(get_subscribed_signals_mutex());
- std::map<std::string, struct afb_event>& s = get_subscribed_signals();
+ 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<std::string, struct afb_event>& s = sm.get_subscribed_signals();
openxc_VehicleMessage vehicle_message = manager.find_and_decode_adr(can_message);
if( (vehicle_message.has_simple_message && vehicle_message.simple_message.has_name) &&
openxc_VehicleMessage v_message;
openxc_SimpleMessage s_message;
json_object* jo;
+ utils::signals_manager_t& sm = utils::signals_manager_t::instance();
while(is_pushing_)
{
s_message = get_simple_message(v_message);
{
- std::lock_guard<std::mutex> subscribed_signals_lock(get_subscribed_signals_mutex());
- std::map<std::string, struct afb_event>& s = get_subscribed_signals();
+ std::lock_guard<std::mutex> subscribed_signals_lock(sm.get_subscribed_signals_mutex());
+ std::map<std::string, struct afb_event>& s = sm.get_subscribed_signals();
if(s.find(std::string(s_message.name)) != s.end() && afb_event_is_valid(s[std::string(s_message.name)]))
{
jo = json_object_new_object();
for(const auto& device : devices_name)
{
can_bus_t::can_devices_[device] = std::make_shared<can_bus_dev_t>(device, i);
- if (can_bus_t::can_devices_[device]->open(true) >= 0)
+ if (can_bus_t::can_devices_[device]->open() >= 0)
{
- DEBUG(binder_interface, "Start reading thread");
- NOTICE(binder_interface, "%s device opened and reading", device.c_str());
- can_bus_t::can_devices_[device]->start_reading(*this);
+ can_bus_t::can_devices_[device]->configure();
+ DEBUG(binder_interface, "%s: Start reading thread", __FUNCTION__);
+ NOTICE(binder_interface, "%s: %s device opened and reading", __FUNCTION__, device.c_str());
+ //can_bus_t::can_devices_[device]->start_reading(*this);
i++;
}
else
{
- ERROR(binder_interface, "Can't open device %s", device.c_str());
+ ERROR(binder_interface, "%s: Can't open device %s", __FUNCTION__, device.c_str());
return 1;
}
}
- NOTICE(binder_interface, "Initialized %d/%d can bus device(s)", i, (int)t);
+ NOTICE(binder_interface, "%s: Initialized %d/%d can bus device(s)", __FUNCTION__, i, (int)t);
return 0;
}
- ERROR(binder_interface, "init_can_dev: Error at CAN device initialization. No devices read from configuration file");
+ ERROR(binder_interface, "%s: Error at CAN device initialization. No devices read from configuration file", __FUNCTION__);
return 1;
}
- ERROR(binder_interface, "init_can_dev: Can't read INI configuration file");
+ ERROR(binder_interface, "%s: Can't read INI configuration file", __FUNCTION__);
return 2;
}
{
can_msg = can_message_q_.front();
can_message_q_.pop();
- DEBUG(binder_interface, "next_can_message: Here is the next can message : id %X, length %X, data %02X%02X%02X%02X%02X%02X%02X%02X", can_msg.get_id(), can_msg.get_length(),
+ DEBUG(binder_interface, "%s: Here is the next can message : id %X, length %X, data %02X%02X%02X%02X%02X%02X%02X%02X", __FUNCTION__, can_msg.get_id(), can_msg.get_length(),
can_msg.get_data()[0], can_msg.get_data()[1], can_msg.get_data()[2], can_msg.get_data()[3], can_msg.get_data()[4], can_msg.get_data()[5], can_msg.get_data()[6], can_msg.get_data()[7]);
return can_msg;
}
{
v_msg = vehicle_message_q_.front();
vehicle_message_q_.pop();
- DEBUG(binder_interface, "next_vehicle_message: next vehicle message poped");
+ DEBUG(binder_interface, "%s: next vehicle message poped", __FUNCTION__);
return v_msg;
}
Code Review / apps / low-level-can-service.git / blobdiff