Revert accessing CAN device with a map indexing on dev name

[apps/agl-service-can-low-level.git] / src / diagnostic / active-diagnostic-request.cpp

diff --git a/src/diagnostic/active-diagnostic-request.cpp b/src/diagnostic/active-diagnostic-request.cpp
index 3e6ab14..fcdbc97 100644 (file)
--- a/src/diagnostic/active-diagnostic-request.cpp
+++ b/src/diagnostic/active-diagnostic-request.cpp
@@ -15,8 +15,15 @@
  * limitations under the License.
  */
 
+#include <fnmatch.h>
+#include <map>
+
 #include "active-diagnostic-request.hpp"
 
+#include "../configuration.hpp"
+
+std::string active_diagnostic_request_t::prefix_ = "diagnostic_messages";
+
 bool active_diagnostic_request_t::operator==(const active_diagnostic_request_t& b)
 {
        return (bus_ == b.bus_ && id_ == b.id_ && handle_ == b.handle_) ? true : false;
@@ -24,18 +31,21 @@ bool active_diagnostic_request_t::operator==(const active_diagnostic_request_t&
 
 active_diagnostic_request_t& active_diagnostic_request_t::operator=(const active_diagnostic_request_t& adr)
 {
-       bus_ = adr.bus_;
-       id_ = adr.id_;
-       handle_ = adr.handle_;
-       name_ = adr.name_;
-       decoder_ = adr.decoder_;
-       callback_ = adr.callback_;
-       recurring_ = adr.recurring_; 
-       wait_for_multiple_responses_ = adr.wait_for_multiple_responses_;
-       in_flight_ = adr.in_flight_;
-       frequency_clock_ = adr.frequency_clock_;
-       timeout_clock_ = adr.timeout_clock_;
-
+       if (this != &adr)
+       {
+               bus_ = adr.bus_;
+               id_ = adr.id_;
+               handle_ = adr.handle_;
+               name_ = adr.name_;
+               decoder_ = adr.decoder_;
+               callback_ = adr.callback_;
+               recurring_ = adr.recurring_; 
+               wait_for_multiple_responses_ = adr.wait_for_multiple_responses_;
+               in_flight_ = adr.in_flight_;
+               frequency_clock_ = adr.frequency_clock_;
+               timeout_clock_ = adr.timeout_clock_;
+       }
+       
        return *this;
 }
 
@@ -45,18 +55,22 @@ active_diagnostic_request_t::active_diagnostic_request_t()
          in_flight_{false}, frequency_clock_{frequency_clock_t()}, timeout_clock_{frequency_clock_t()}
 {}
 
-active_diagnostic_request_t::active_diagnostic_request_t(can_bus_dev_t* bus, DiagnosticRequest* request,
-               const std::string& name, bool wait_for_multiple_responses,
-               const DiagnosticResponseDecoder decoder,
+active_diagnostic_request_t::active_diagnostic_request_t(const std::string& bus, DiagnosticRequest* request,
+               const std::string& name, bool wait_for_multiple_responses, const DiagnosticResponseDecoder decoder,
                const DiagnosticResponseCallback callback, float frequencyHz)
        : bus_{bus}, id_{request->arbitration_id}, handle_{nullptr}, name_{name},
          decoder_{decoder}, callback_{callback}, recurring_{frequencyHz ? true : false}, wait_for_multiple_responses_{wait_for_multiple_responses},
          in_flight_{false}, frequency_clock_{frequency_clock_t(frequencyHz)}, timeout_clock_{frequency_clock_t(10)}
 {}
 
-can_bus_dev_t* active_diagnostic_request_t::get_can_bus_dev()
+uint32_t active_diagnostic_request_t::get_id() const
 {
-       return bus_;
+       return id_;
+}
+
+const std::shared_ptr<can_bus_dev_t> active_diagnostic_request_t::get_can_bus_dev() const
+{
+       return can_bus_t::get_can_device(bus_);
 }
 
 DiagnosticRequestHandle* active_diagnostic_request_t::get_handle()
@@ -64,6 +78,26 @@ DiagnosticRequestHandle* active_diagnostic_request_t::get_handle()
        return handle_;
 }
 
+const std::string active_diagnostic_request_t::get_name() const
+{
+       return active_diagnostic_request_t::prefix_ + "." + name_;
+}
+
+std::string& active_diagnostic_request_t::get_prefix()
+{
+       return active_diagnostic_request_t::prefix_;
+}
+
+DiagnosticResponseDecoder& active_diagnostic_request_t::get_decoder()
+{
+       return decoder_;
+}
+
+DiagnosticResponseCallback& active_diagnostic_request_t::get_callback()
+{
+       return callback_;
+}
+
 bool active_diagnostic_request_t::get_recurring() const
 {
        return recurring_;
@@ -74,6 +108,16 @@ bool active_diagnostic_request_t::get_in_flight() const
        return in_flight_;
 }
 
+frequency_clock_t& active_diagnostic_request_t::get_frequency_clock()
+{
+       return frequency_clock_;
+}
+
+frequency_clock_t& active_diagnostic_request_t::get_timeout_clock()
+{
+       return timeout_clock_;
+}
+
 void active_diagnostic_request_t::set_handle(DiagnosticShims& shims, DiagnosticRequest* request)
 {
        handle_ = new DiagnosticRequestHandle(generate_diagnostic_request(&shims, request, nullptr));
@@ -84,6 +128,26 @@ void active_diagnostic_request_t::set_in_flight(bool val)
        in_flight_ = val;
 }
 
+/**
+* @brief Check if requested signal name is an obd2 pid
+* 
+* @return true if name began with obd2 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;
+}
+
+bool active_diagnostic_request_t::should_send()
+{
+       return !get_in_flight() && (
+                       (!get_recurring() && !request_completed()) ||
+                       (get_recurring() && get_frequency_clock().elapsed(true)));
+}
+
 bool active_diagnostic_request_t::timed_out()
 {
        // don't use staggered start with the timeout clock