aboutsummaryrefslogtreecommitdiffstats
path: root/low-can-binding/can/can-bus.hpp
diff options
context:
space:
mode:
authorRomain Forlot <romain.forlot@iot.bzh>2019-06-26 10:34:04 +0200
committerRomain Forlot <romain.forlot@iot.bzh>2019-06-26 17:55:06 +0200
commitd2d2620bbb8f0aad0181e67e9f6affc3d6cb4a51 (patch)
tree13e7c1069252dbadb2b430414f3722132d1d7013 /low-can-binding/can/can-bus.hpp
parent82b45e3de8c92816c8080178224c5bd4be60a091 (diff)
Change can_message_t class usage for new j1939
This commit transforms the class can_message_t as the base class and creates two derived classes: j1939_message_t and can_message_t. Bug-AGL: SPEC-2386 Change-Id: I6d3afd8e4f5abff2cd0ec4e9910bd52a2893de76 Signed-off-by: Arthur Guyader <arthur.guyader@iot.bzh> Signed-off-by: Stephane Desneux <stephane.desneux@iot.bzh> Signed-off-by: Romain Forlot <romain.forlot@iot.bzh>
Diffstat (limited to 'low-can-binding/can/can-bus.hpp')
-rw-r--r--low-can-binding/can/can-bus.hpp13
1 files changed, 6 insertions, 7 deletions
diff --git a/low-can-binding/can/can-bus.hpp b/low-can-binding/can/can-bus.hpp
index f1eb690f..2a798ca6 100644
--- a/low-can-binding/can/can-bus.hpp
+++ b/low-can-binding/can/can-bus.hpp
@@ -24,9 +24,8 @@
#include <thread>
#include <linux/can.h>
#include <condition_variable>
-
#include "openxc.pb.h"
-#include "can-message.hpp"
+#include "message/can-message.hpp"
#include "../utils/config-parser.hpp"
#include "../binding/low-can-subscription.hpp"
@@ -47,8 +46,8 @@ private:
utils::config_parser_t conf_file_; ///< configuration file handle used to initialize can_bus_dev_t objects.
bool apply_filter(const openxc_VehicleMessage& vehicle_message, std::shared_ptr<low_can_subscription_t> can_subscription);
- void process_can_signals(const can_message_t& can_message, std::map<int, std::shared_ptr<low_can_subscription_t> >& s);
- void process_diagnostic_signals(diagnostic_manager_t& manager, const can_message_t& can_message, std::map<int, std::shared_ptr<low_can_subscription_t> >& s);
+ void process_signals(const message_t& message, std::map<int, std::shared_ptr<low_can_subscription_t> >& s);
+ void process_diagnostic_signals(diagnostic_manager_t& manager, std::shared_ptr<message_t> message, std::map<int, std::shared_ptr<low_can_subscription_t> >& s);
void can_decode_message();
std::thread th_decoding_; ///< thread that will handle decoding a can frame
@@ -60,7 +59,7 @@ private:
std::condition_variable new_can_message_cv_; ///< condition_variable use to wait until there is a new CAN message to read
std::mutex can_message_mutex_; ///< mutex protecting the can_message_q_ queue.
- std::queue <can_message_t> can_message_q_; ///< queue that will store can_message_t to be decoded
+ std::queue <std::shared_ptr<message_t>> can_message_q_; ///< queue that will store can_message_t to be decoded
std::condition_variable new_decoded_can_message_; ///< condition_variable use to wait until there is a new vehicle message
/// to read from the queue vehicle_message_q_
@@ -80,8 +79,8 @@ public:
void start_threads();
void stop_threads();
- const can_message_t next_can_message();
- void push_new_can_message(const can_message_t& can_msg);
+ std::shared_ptr<message_t> next_can_message();
+ void push_new_can_message(std::shared_ptr<message_t> can_msg);
std::mutex& get_can_message_mutex();
std::condition_variable& get_new_can_message_cv();