In class mutex and condition variable except for subscribed_signals map

[apps/agl-service-can-low-level.git] / src / obd2.cpp

diff --git a/src/obd2.cpp b/src/obd2.cpp
index 7db5d97..536df66 100644 (file)
--- a/src/obd2.cpp
+++ b/src/obd2.cpp
@@ -15,10 +15,11 @@
  * limitations under the License.
  */
 
+#include "obd2.hpp"
 
-void shims_logger(afb_binding_interface *itf)
+void shims_logger(const char* m, const struct afb_binding_interface *interface)
 {
-       //DEBUG(itf, "dd");
+       DEBUG(interface, "%s", m);
 }
 
 void shims_timer()
@@ -28,32 +29,40 @@ void shims_timer()
 /*
  * Will scan for supported Obd2 pids
  */
-Obd2Handler::Obd2Handler(afb_binding_interface *itf, CanBus_c cb)
+obd2_handler_t::obd2_handler_t(const struct afb_binding_interface *interface, can_bus_t can_bus)
+       : can_bus_{can_bus}
 {
-       CanBus_c can_bus = cb;
-       DiagnosticShims shims = diagnostic_init_shims(shims_logger, can_bus.send_can_message, NULL);
+       can_bus_t can_bus_ = can_bus;
+       DiagnosticShims shims_ = diagnostic_init_shims(shims_logger, can_bus.send_can_message, NULL);
 
-       int n_pids, i;
+       int n_pids_, i_;
 
-       n_pids = size(Obd2Pid);
-       for(i=0; i<=n_pids; i++)
+       n_pids_ = size(Obd2Pid);
+       for(i_=0; i_<=n_pids_; i_++)
        {
        }
 }
 
-Obd2Handler::add_request(int pid)
+void obd2_handler_t::add_request(int pid)
 {
        DiagnosticRequest request = {
        arbitration_id: OBD2_FUNCTIONAL_BROADCAST_ID,
        mode: 0x1, has_pid: true, pid: pid};
 }
 
-Obd2Handler::is_obd2_request(DiagnosticRequest* request)
+bool obd2_handler_t::is_obd2_request(DiagnosticRequest* request)
 {
        return request->mode == 0x1 && request->has_pid && request->pid < 0xff;
 }
 
-Obd2Handler::decode_obd2_response(DiagnosticResponse* responce)
+bool obd2_handler_t::is_obd2_signal(const char *name)
+{
+       if(fnmatch("obd2.*", name, FNM_CASEFOLD) == 0)
+               return true;
+       return false;
+}
+
+bool obd2_handler_t::decode_obd2_response(DiagnosticResponse* responce)
 {
        return diagnostic_decode_obd2_pid(response);
 }