diff options
9 files changed, 12 insertions, 20 deletions
diff --git a/CAN-binder/low-can-binding/can/can-bus-dev.cpp b/CAN-binder/low-can-binding/can/can-bus-dev.cpp index 6cd2264b..6b8d9144 100644 --- a/CAN-binder/low-can-binding/can/can-bus-dev.cpp +++ b/CAN-binder/low-can-binding/can/can-bus-dev.cpp @@ -21,8 +21,6 @@ #include <unistd.h> #include <linux/can/raw.h> #include <linux/can/bcm.h> - -#include "can-bus-dev.hpp" #include <cmath> #include "can-bus.hpp" @@ -31,6 +29,7 @@ #include "canutil/write.h" #define U64_DATA(p) (*(unsigned long long*)(p)->data) + /// @brief Class constructor /// /// @param[in] dev_name - String representing the device name into the linux /dev tree diff --git a/CAN-binder/low-can-binding/can/can-bus-dev.hpp b/CAN-binder/low-can-binding/can/can-bus-dev.hpp index 04914cec..d32f9a84 100644 --- a/CAN-binder/low-can-binding/can/can-bus-dev.hpp +++ b/CAN-binder/low-can-binding/can/can-bus-dev.hpp @@ -19,7 +19,6 @@ #pragma once #include <stdint.h> -#include <linux/can.h> #include <string> #include <thread> diff --git a/CAN-binder/low-can-binding/can/can-bus.hpp b/CAN-binder/low-can-binding/can/can-bus.hpp index 2194fa22..11b3b7af 100644 --- a/CAN-binder/low-can-binding/can/can-bus.hpp +++ b/CAN-binder/low-can-binding/can/can-bus.hpp @@ -29,8 +29,7 @@ #include "can-bus-dev.hpp" #include "can-signals.hpp" #include "../utils/config-parser.hpp" -#include "../diagnostic/active-diagnostic-request.hpp" - +#include "../diagnostic/diagnostic-manager.hpp" #include "../low-can-binding.hpp" // TODO actual max is 32 but dropped to 24 for memory considerations @@ -52,6 +51,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(can_message_t& can_message); + int process_diagnostic_signals(diagnostic_manager_t& manager, const can_message_t& can_message); + void can_decode_message(); std::thread th_decoding_; ///< thread that'll handle decoding a can frame bool is_decoding_ = false; ///< boolean member controling thread while loop @@ -80,9 +82,6 @@ public: void start_threads(); void stop_threads(); - int process_can_signals(can_message_t& can_message); - int process_diagnostic_signals(diagnostic_manager_t& manager, const can_message_t& can_message); - can_message_t next_can_message(); void push_new_can_message(const can_message_t& can_msg); std::mutex& get_can_message_mutex(); diff --git a/CAN-binder/low-can-binding/can/can-decoder.cpp b/CAN-binder/low-can-binding/can/can-decoder.cpp index a6c064db..902484e5 100644 --- a/CAN-binder/low-can-binding/can/can-decoder.cpp +++ b/CAN-binder/low-can-binding/can/can-decoder.cpp @@ -20,6 +20,8 @@ #include "canutil/read.h" #include "../utils/openxc-utils.hpp" +#include "../low-can-binding.hpp" + /// @brief Parse the signal's bitfield from the given data and return the raw /// value. /// diff --git a/CAN-binder/low-can-binding/can/can-message-definition.hpp b/CAN-binder/low-can-binding/can/can-message-definition.hpp index 7bc982d2..f0594b3d 100644 --- a/CAN-binder/low-can-binding/can/can-message-definition.hpp +++ b/CAN-binder/low-can-binding/can/can-message-definition.hpp @@ -28,7 +28,6 @@ #include <vector> #include <memory> -#include "can-bus-dev.hpp" #include "can-message.hpp" #include "../utils/timer.hpp" diff --git a/CAN-binder/low-can-binding/can/can-signals.hpp b/CAN-binder/low-can-binding/can/can-signals.hpp index 34ebeebd..50eb4ec5 100644 --- a/CAN-binder/low-can-binding/can/can-signals.hpp +++ b/CAN-binder/low-can-binding/can/can-signals.hpp @@ -25,7 +25,6 @@ #include "openxc.pb.h" #include "../utils/timer.hpp" -#include "can-bus.hpp" #include "can-message.hpp" #include "can-message-definition.hpp" #include "../diagnostic/diagnostic-message.hpp" diff --git a/CAN-binder/low-can-binding/diagnostic/diagnostic-manager.cpp b/CAN-binder/low-can-binding/diagnostic/diagnostic-manager.cpp index e2fc67d3..ec6ec587 100644 --- a/CAN-binder/low-can-binding/diagnostic/diagnostic-manager.cpp +++ b/CAN-binder/low-can-binding/diagnostic/diagnostic-manager.cpp @@ -105,7 +105,7 @@ void diagnostic_manager_t::shims_logger(const char* format, ...) char buffer[256]; vsnprintf(buffer, 256, format, args); - DEBUG(binder_interface, "%S: %s", __FUNCTION__, buffer); + DEBUG(binder_interface, "%s: %s", __FUNCTION__, buffer); } /// @brief The type signature for a... OpenXC TODO: not used yet. @@ -370,11 +370,6 @@ bool diagnostic_manager_t::add_recurring_request(DiagnosticRequest* request, con wait_for_multiple_responses, decoder, callback, frequencyHz); entry->set_handle(shims_, request); - //start_diagnostic_request(&shims_, entry->get_handle()); - //char request_string[128] = {0}; - //diagnostic_request_to_string(&entry->get_handle()->request, request_string, - // sizeof(request_string)); - uint64_t usec; sd_event_now(afb_daemon_get_event_loop(binder_interface->daemon), CLOCK_BOOTTIME, &usec); if(recurring_requests_.size() > 0) diff --git a/CAN-binder/low-can-binding/diagnostic/diagnostic-message.hpp b/CAN-binder/low-can-binding/diagnostic/diagnostic-message.hpp index 064904d2..e49acd90 100644 --- a/CAN-binder/low-can-binding/diagnostic/diagnostic-message.hpp +++ b/CAN-binder/low-can-binding/diagnostic/diagnostic-message.hpp @@ -41,7 +41,8 @@ enum UNIT { /// /// @brief - A representation of an OBD-II PID. /// -class diagnostic_message_t { +class diagnostic_message_t +{ private: uint8_t pid_; /*!< pid_ - The 1 byte PID.*/ std::string generic_name_; /*!< generic_name_ - A human readable name to use for this PID when published.*/ diff --git a/CAN-binder/low-can-binding/low-can-binding.cpp b/CAN-binder/low-can-binding/low-can-binding.cpp index d6e19441..365080bc 100644 --- a/CAN-binder/low-can-binding/low-can-binding.cpp +++ b/CAN-binder/low-can-binding/low-can-binding.cpp @@ -124,12 +124,11 @@ static int subscribe_unsubscribe_signal(struct afb_req request, bool subscribe, } /// -/// @fn static int subscribe_unsubscribe_signals(struct afb_req request, bool subscribe, const std::vector<can_signal_t>& signals) /// @brief subscribe to all signals in the vector signals /// /// @param[in] afb_req request : contain original request use to subscribe or unsubscribe /// @param[in] subscribe boolean value used to chose between a subscription operation or an unsubscription -/// @param[in] can_signal_t vector with can_signal_t to subscribe +/// @param[in] signals - struct containing vectors with can_signal_t and diagnostic_messages to subscribe /// /// @return Number of correctly subscribed signal /// @@ -145,7 +144,7 @@ static int subscribe_unsubscribe_signals(struct afb_req request, bool subscribe, { DiagnosticRequest* diag_req = conf.get_request_from_diagnostic_message(sig->get_name()); - // If the requested diagnostic message isn't supported by the car then unssubcribe. + // If the requested diagnostic message isn't supported by the car then unsubcribe it // no matter what we want, worse case will be a fail unsubscription but at least we don't // poll a PID for nothing. if(sig->get_supported() && subscribe) |