diff options
author | Romain Forlot <romain.forlot@iot.bzh> | 2018-12-07 17:36:38 +0100 |
---|---|---|
committer | Romain Forlot <romain.forlot@iot.bzh> | 2018-12-14 08:59:41 +0000 |
commit | ff089ab8b009c81bcf92abf181faa00348eb62cd (patch) | |
tree | 34d34d14fd3813d65738a0e2ebab77be73cbe222 /low-can-binding/diagnostic | |
parent | ea35eabeadce57e4f5015797fea530c5bb219fff (diff) |
Cleaning the code for now unused functions
Also formating and retabulating some comments
Change-Id: I95eda93e78fabeb336ca02e94307364954ab2318
Signed-off-by: Romain Forlot <romain.forlot@iot.bzh>
Diffstat (limited to 'low-can-binding/diagnostic')
4 files changed, 4 insertions, 22 deletions
diff --git a/low-can-binding/diagnostic/active-diagnostic-request.cpp b/low-can-binding/diagnostic/active-diagnostic-request.cpp index 44ad47b4..c5af449b 100644 --- a/low-can-binding/diagnostic/active-diagnostic-request.cpp +++ b/low-can-binding/diagnostic/active-diagnostic-request.cpp @@ -121,22 +121,6 @@ void active_diagnostic_request_t::set_handle(DiagnosticShims& shims, DiagnosticR handle_ = new DiagnosticRequestHandle(generate_diagnostic_request(&shims, request, nullptr)); } -/// -/// @brief Check if requested signal name is a diagnostic message. If the name -/// begin with the diagnostic message prefix then true else false. -/// -/// @param[in] name - A signal name. -/// -/// @return true if name began with the diagnostic message prefix else false. -/// -bool active_diagnostic_request_t::is_diagnostic_signal(const std::string& name) -{ - const std::string p = active_diagnostic_request_t::prefix_ + "*"; - if(::fnmatch(p.c_str(), name.c_str(), FNM_CASEFOLD) == 0) - return true; - return false; -} - /// @brief Returns true if a sufficient response has been received for a /// diagnostic request. /// diff --git a/low-can-binding/diagnostic/active-diagnostic-request.hpp b/low-can-binding/diagnostic/active-diagnostic-request.hpp index e32792a1..effe9324 100644 --- a/low-can-binding/diagnostic/active-diagnostic-request.hpp +++ b/low-can-binding/diagnostic/active-diagnostic-request.hpp @@ -108,7 +108,5 @@ public: void set_handle(DiagnosticShims& shims, DiagnosticRequest* request); - static bool is_diagnostic_signal(const std::string& name); - bool response_received() const; }; diff --git a/low-can-binding/diagnostic/diagnostic-manager.cpp b/low-can-binding/diagnostic/diagnostic-manager.cpp index 8932f250..ba4b0c87 100644 --- a/low-can-binding/diagnostic/diagnostic-manager.cpp +++ b/low-can-binding/diagnostic/diagnostic-manager.cpp @@ -256,7 +256,7 @@ active_diagnostic_request_t* diagnostic_manager_t::find_recurring_request(Diagno } return nullptr; } - +/* /// @brief Add and send a new one-time diagnostic request. DON'T USED AT THIS TIME /// /// A one-time (aka non-recurring) request can existing in parallel with a @@ -313,7 +313,7 @@ active_diagnostic_request_t* diagnostic_manager_t::add_request(DiagnosticRequest } return entry; } - +*/ /// @brief Validate frequency asked don't get higher than the maximum of a classical /// CAN bus OBD2 request. /// diff --git a/low-can-binding/diagnostic/diagnostic-manager.hpp b/low-can-binding/diagnostic/diagnostic-manager.hpp index 896a2b60..26c869e2 100644 --- a/low-can-binding/diagnostic/diagnostic-manager.hpp +++ b/low-can-binding/diagnostic/diagnostic-manager.hpp @@ -74,9 +74,9 @@ public: active_diagnostic_request_t* find_recurring_request(DiagnosticRequest& request); // Subscription parts - active_diagnostic_request_t* add_request(DiagnosticRequest* request, const std::string& name, + /*active_diagnostic_request_t* add_request(DiagnosticRequest* request, const std::string& name, bool waitForMultipleResponses, const DiagnosticResponseDecoder decoder, - const DiagnosticResponseCallback callback); + const DiagnosticResponseCallback callback);*/ bool validate_optional_request_attributes(float frequencyHz); active_diagnostic_request_t* add_recurring_request(DiagnosticRequest* request, const char* name, bool waitForMultipleResponses, const DiagnosticResponseDecoder decoder, |