From 04b7efcdd1a8dfdf461c78d083aabee5445e54bd Mon Sep 17 00:00:00 2001 From: Romain Forlot Date: Wed, 20 Nov 2019 15:31:14 +0100 Subject: can-bus: Use configuration from JSON file Use configuration from JSON file instead of the old INI file. Now all configuration files lies within the binding tree. Bug-AGL: SPEC-2988 Change-Id: Id986d19751db958ad5cf3b7f2b2c5443d4ceb062 Signed-off-by: Romain Forlot --- low-can-binding/can/can-bus.hpp | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'low-can-binding/can/can-bus.hpp') diff --git a/low-can-binding/can/can-bus.hpp b/low-can-binding/can/can-bus.hpp index 6b0cc133..5aa7a1d5 100644 --- a/low-can-binding/can/can-bus.hpp +++ b/low-can-binding/can/can-bus.hpp @@ -26,7 +26,6 @@ #include #include "openxc.pb.h" #include "message/can-message.hpp" -#include "../utils/config-parser.hpp" #include "../binding/low-can-subscription.hpp" #define CAN_ACTIVE_TIMEOUT_S 30 @@ -43,8 +42,6 @@ class diagnostic_manager_t; class can_bus_t { 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 can_subscription); void process_signals(std::shared_ptr message, map_subscription& s); void process_diagnostic_signals(diagnostic_manager_t& manager, std::shared_ptr can_message, map_subscription& s); @@ -68,11 +65,12 @@ private: std::vector > can_devices_mapping_; ///< can_devices_mapping_ - holds a mapping between logical CAN devices names and linux CAN devices names. public: - explicit can_bus_t(utils::config_parser_t conf_file); + explicit can_bus_t(); can_bus_t(can_bus_t&&); ~can_bus_t(); - void set_can_devices(); + void set_can_devices(json_object *mapping); + int get_can_device_index(const std::string& bus_name) const; const std::string get_can_device_name(const std::string& id_name) const; -- cgit 1.2.3-korg