Make an extern get_signal_id() function plug to get_pid()

[apps/agl-service-can-low-level.git] / src / diagnostic / diagnostic-message.hpp

diff --git a/src/diagnostic/diagnostic-message.hpp b/src/diagnostic/diagnostic-message.hpp
index a8f21e0..cd4afd5 100644 (file)
--- a/src/diagnostic/diagnostic-message.hpp
+++ b/src/diagnostic/diagnostic-message.hpp
@@ -20,8 +20,8 @@
 #include <vector>
 
 #include "uds/uds.h"
-#include "can-bus.hpp"
-#include "can-message.hpp"
+#include "can/can-bus.hpp"
+#include "can/can-message.hpp"
 
 #include "low-can-binding.hpp"
 
@@ -76,19 +76,21 @@ class obd2_signals_t {
                bool supported_;
 
        public:
+               const char* generic_name = generic_name_;
                obd2_signals_t(uint8_t pid, const char* generic_name, const int min_, const int max_, enum UNIT unit, int frequency, bool supported);
 
-               void init_diagnostic_shims(can_bus_dev_t& can_bus_dev)
-               void add_request(int pid);
-               std::vector<Obd2Pid>& get_obd2_signals();
+               uint32_t get_pid();
 
-               uint32_t get_signal_id(const Obd2Pid& sig);
-               void find_obd2_signals(const openxc_DynamicField &key, std::vector<Obd2Pid*>& found_signals);
+               void add_request(int pid);
 
+               void find_obd2_signals(const openxc_DynamicField &key, std::vector<obd2_signals_t*>& found_signals);
 
                bool is_obd2_response(can_message_t can_message);
                bool is_obd2_request(DiagnosticRequest *request);
                bool is_obd2_signal(const char *name);
 
                float decode_obd2_response(const DiagnosticResponse* response, float parsedPayload);
-};
\ No newline at end of file
+};
+
+uint32_t get_signal_id(obd2_signals_t& sig);
+std::vector<obd2_signals_t>& get_obd2_signals();
\ No newline at end of file