From 4becc6d7986cf656f10f02ecdd5202b5b0fdddf1 Mon Sep 17 00:00:00 2001 From: Jonathan Aillet Date: Thu, 1 Mar 2018 16:05:15 +0100 Subject: Delete obsolete references. Delete obsolote references such as use of acceptance filters, timers, etc. Signed-off-by: Jonathan Aillet --- low-can-binding/binding/application.hpp | 4 --- low-can-binding/can/can-bus.hpp | 5 --- low-can-binding/diagnostic/diagnostic-manager.cpp | 37 +++++++++-------------- low-can-binding/diagnostic/diagnostic-manager.hpp | 1 - 4 files changed, 14 insertions(+), 33 deletions(-) diff --git a/low-can-binding/binding/application.hpp b/low-can-binding/binding/application.hpp index c75a178..fa2204f 100644 --- a/low-can-binding/binding/application.hpp +++ b/low-can-binding/binding/application.hpp @@ -96,10 +96,6 @@ class application_t /// TODO: implement this function as method into can_bus class /// @brief Check if the device is connected to an active CAN bus, i.e. it's received a message in the recent past. /// @return true if a message was received on the CAN bus within CAN_ACTIVE_TIMEOUT_S seconds. - void logBusStatistics(can_bus_dev_t* buses, const int busCount); - /// TODO: implement this function as method into can_bus class - /// @brief Log transfer statistics about all active CAN buses to the debug log. - /// @param[in] buses An array of active CAN buses. bool isBusActive(can_bus_dev_t* bus); */ }; diff --git a/low-can-binding/can/can-bus.hpp b/low-can-binding/can/can-bus.hpp index 71abe41..1cf9574 100644 --- a/low-can-binding/can/can-bus.hpp +++ b/low-can-binding/can/can-bus.hpp @@ -30,11 +30,6 @@ #include "../utils/config-parser.hpp" #include "../binding/low-can-subscription.hpp" -// TODO actual max is 32 but dropped to 24 for memory considerations -#define MAX_ACCEPTANCE_FILTERS 24 -// TODO this takes up a ton of memory -#define MAX_DYNAMIC_MESSAGE_COUNT 12 - #define CAN_ACTIVE_TIMEOUT_S 30 class diagnostic_manager_t; diff --git a/low-can-binding/diagnostic/diagnostic-manager.cpp b/low-can-binding/diagnostic/diagnostic-manager.cpp index 0454a7e..448133e 100644 --- a/low-can-binding/diagnostic/diagnostic-manager.cpp +++ b/low-can-binding/diagnostic/diagnostic-manager.cpp @@ -149,10 +149,6 @@ void diagnostic_manager_t::shims_logger(const char* format, ...) va_end(args); } -/// @brief The type signature for a... OpenXC TODO: not used yet. -void diagnostic_manager_t::shims_timer() -{} - const std::string diagnostic_manager_t::get_bus_name() const { return bus_; @@ -272,8 +268,7 @@ active_diagnostic_request_t* diagnostic_manager_t::find_recurring_request(Diagno /// /// @param[in] request - The parameters for the request. /// @param[in] name - Human readable name this response, to be used when -/// publishing received responses. TODO: If the name is NULL, the published output -/// will use the raw OBD-II response format. +/// publishing received responses. /// @param[in] wait_for_multiple_responses - If false, When any response is received /// for this request it will be removed from the active list. If true, the /// request will remain active until the timeout clock expires, to allow it @@ -286,8 +281,7 @@ active_diagnostic_request_t* diagnostic_manager_t::find_recurring_request(Diagno /// response is received for this request. /// /// @return true if the request was added successfully. Returns false if there -/// wasn't a free active request entry, if the frequency was too high or if the -/// CAN acceptance filters could not be configured, +/// wasn't a free active request entry. active_diagnostic_request_t* diagnostic_manager_t::add_request(DiagnosticRequest* request, const std::string& name, bool wait_for_multiple_responses, const DiagnosticResponseDecoder decoder, const DiagnosticResponseCallback callback) @@ -298,22 +292,20 @@ active_diagnostic_request_t* diagnostic_manager_t::add_request(DiagnosticRequest if (non_recurring_requests_.size() <= MAX_SIMULTANEOUS_DIAG_REQUESTS) { - // TODO: implement Acceptance Filter - // if(updateRequiredAcceptanceFilters(bus, request)) { - active_diagnostic_request_t* entry = new active_diagnostic_request_t(bus_, request->arbitration_id, name, - wait_for_multiple_responses, decoder, callback, 0); - entry->set_handle(shims_, request); + active_diagnostic_request_t* entry = new active_diagnostic_request_t(bus_, request->arbitration_id, name, + wait_for_multiple_responses, decoder, callback, 0); + entry->set_handle(shims_, request); - char request_string[128] = {0}; - diagnostic_request_to_string(&entry->get_handle()->request, request_string, - sizeof(request_string)); + char request_string[128] = {0}; + diagnostic_request_to_string(&entry->get_handle()->request, request_string, + sizeof(request_string)); - // Erase any existing request not already cleaned. - cleanup_request(entry, true); - AFB_DEBUG("Added one-time diagnostic request on bus %s: %s", - bus_.c_str(), request_string); + // Erase any existing request not already cleaned. + cleanup_request(entry, true); + AFB_DEBUG("Added one-time diagnostic request on bus %s: %s", + bus_.c_str(), request_string); - non_recurring_requests_.push_back(entry); + non_recurring_requests_.push_back(entry); } else { @@ -364,8 +356,7 @@ bool diagnostic_manager_t::validate_optional_request_attributes(float frequencyH /// function return false. /// /// @return true if the request was added successfully. Returns false if there -/// was too much already running requests, if the frequency was too high TODO:or if the -/// CAN acceptance filters could not be configured, +/// was too much already running requests, or if the frequency was too high. active_diagnostic_request_t* diagnostic_manager_t::add_recurring_request(DiagnosticRequest* request, const char* name, bool wait_for_multiple_responses, const DiagnosticResponseDecoder decoder, const DiagnosticResponseCallback callback, float frequencyHz) diff --git a/low-can-binding/diagnostic/diagnostic-manager.hpp b/low-can-binding/diagnostic/diagnostic-manager.hpp index 1a6ae7e..ddbc97a 100644 --- a/low-can-binding/diagnostic/diagnostic-manager.hpp +++ b/low-can-binding/diagnostic/diagnostic-manager.hpp @@ -56,7 +56,6 @@ private: static bool shims_send(const uint32_t arbitration_id, const uint8_t* data, const uint8_t size); static void shims_logger(const char* m, ...); - static void shims_timer(); public: diagnostic_manager_t(); ~diagnostic_manager_t(); -- cgit 1.2.3-korg