X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=CAN-binder%2Flow-can-binding%2Fcan%2Fcan-bus.hpp;h=b19519a8256e2f9c2bb185ed7f7622f62900007d;hb=2e66a10937ca8189498b540e3e28047d829021ad;hp=1d064b2b97ab2b5a3148cbeb0d78358616e94eeb;hpb=862a59747245529ae2b6039a00b639e747069aae;p=apps%2Fagl-service-can-low-level.git diff --git a/CAN-binder/low-can-binding/can/can-bus.hpp b/CAN-binder/low-can-binding/can/can-bus.hpp index 1d064b2b..b19519a8 100644 --- a/CAN-binder/low-can-binding/can/can-bus.hpp +++ b/CAN-binder/low-can-binding/can/can-bus.hpp @@ -29,6 +29,7 @@ #include "can-message.hpp" #include "../utils/config-parser.hpp" #include "../binding/low-can-hat.hpp" +#include "../binding/low-can-subscription.hpp" // TODO actual max is 32 but dropped to 24 for memory considerations #define MAX_ACCEPTANCE_FILTERS 24 @@ -51,8 +52,9 @@ class can_bus_t private: utils::config_parser_t conf_file_; ///< configuration file handle used to initialize can_bus_dev_t objects. - int process_can_signals(const can_message_t& can_message); - int process_diagnostic_signals(diagnostic_manager_t& manager, const can_message_t& can_message); + bool apply_filter(const openxc_VehicleMessage& vehicle_message, std::shared_ptr can_subscription); + void process_can_signals(const can_message_t& can_message, std::map >& s); + void process_diagnostic_signals(diagnostic_manager_t& manager, const can_message_t& can_message, std::map >& s); void can_decode_message(); std::thread th_decoding_; ///< thread that'll handle decoding a can frame