Make diagnostic manager initialization processus.

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

diff --git a/src/diagnostic/diagnostic-message.cpp b/src/diagnostic/diagnostic-message.cpp
index 656a868..62e97b8 100644 (file)
--- a/src/diagnostic/diagnostic-message.cpp
+++ b/src/diagnostic/diagnostic-message.cpp
@@ -15,9 +15,10 @@
  * limitations under the License.
  */
 
-#include "obd2/obd2-signals.hpp"
+#include "obd2-signals.hpp"
 
-#include "utils/signals.hpp"
+#include "../configuration.hpp"
+#include "../utils/signals.hpp"
 
 const char *UNIT_NAMES[10] = {
        "POURCENT",
@@ -32,43 +33,37 @@ const char *UNIT_NAMES[10] = {
        "NM"
 };
 
-obd2_signals_t::obd2_signals_t(uint8_t pid, const char* generic_name, const int min, const int max, enum UNIT unit, int frequency, bool supported)
+obd2_signal_t::obd2_signal_t(uint8_t pid, const char* generic_name, const int min, const int max, enum UNIT unit, int frequency, bool supported)
        :       pid_{pid}, generic_name_{generic_name}, min_{min}, max_{max}, unit_{unit}, frequency_{frequency}, supported_{supported}
 {
 }
 
-uint32_t obd2_signals_t::get_pid()
+uint32_t obd2_signal_t::get_pid()
 {
        return (uint32_t)pid_;
 }
 
-/**
- * @fn std::vector<std::string> find_signals(const openxc_DynamicField &key)
- * @brief return signals name found searching through CAN_signals and OBD2 pid
- * 
- * @param[in] const openxc_DynamicField : can contain numeric or string value in order to search against 
- *   can signals or obd2 signals name.
- *
- * @return std::vector<std::string> Vector of signals name found. 
- */
-void obd2_signals_t::find_obd2_signals(const openxc_DynamicField &key, std::vector<obd2_signals_t*>& found_signals)
+const std::string& obd2_signal_t::get_generic_name() const
 {
-       switch(key.type)
-       {
-               case openxc_DynamicField_Type::openxc_DynamicField_Type_STRING:
-                               lookup_signals_by_name(key.string_value, get_obd2_signals(), found_signals);
-                       break;
-               case openxc_DynamicField_Type::openxc_DynamicField_Type_NUM:
-                               lookup_signals_by_id(key.numeric_value, get_obd2_signals(), found_signals);
-                       break;
-               default:
-                       ERROR(binder_interface, "find_signals: wrong openxc_DynamicField specified. Use openxc_DynamicField_Type_NUM or openxc_DynamicField_Type_STRING type only.");
-                       break;
-       }
-       DEBUG(binder_interface, "Found %d signal(s)", (int)found_signals.size());
+       return generic_name_;
+}
+
+const std::string obd2_signal_t::get_name() const
+{
+       return prefix_ + "." + generic_name_;
+}
+
+const std::string& obd2_signal_t::get_prefix() const
+{
+       return prefix_;
+}
+
+void obd2_signal_t::set_prefix(std::string val)
+{
+       prefix_ = val;
 }
 
-bool obd2_signals_t::is_obd2_response(can_message_t can_message)
+bool obd2_signal_t::is_obd2_response(can_message_t can_message)
 {
        /*
        if(can_message.get_id() >= 0x7E8 && can_message.get_id() <= 0x7EF)
@@ -109,13 +104,24 @@ bool obd2_signals_t::is_obd2_response(can_message_t can_message)
        }
        return false;
        */
-}
+       return false;
+}      
 
-void obd2_signals_t::add_request(int pid)
+/**
+ * @brief Build a DiagnosticRequest struct to be passed
+ *  to diagnostic manager instance.
+ */
+const DiagnosticRequest obd2_signal_t::build_diagnostic_request()
 {
-       DiagnosticRequest request = {
-       arbitration_id: OBD2_FUNCTIONAL_BROADCAST_ID,
-       mode: 0x1, has_pid: true, pid_ };
+       return {/*arbitration_id: */OBD2_FUNCTIONAL_BROADCAST_ID,
+                       /*mode: */0x1,
+                       /*has_pid: */true,
+                       /*pid: */pid_,
+                       /*pid_length: */0,
+                       /*payload[]: */{0},
+                       /*payload_length: */0,
+                       /*no_frame_padding: */false,
+                       /*DiagnosticRequestType: */DiagnosticRequestType::DIAGNOSTIC_REQUEST_TYPE_PID };
 }
 
 /**
@@ -123,7 +129,7 @@ void obd2_signals_t::add_request(int pid)
 *
 * @return true if the request is a mode 1 request and it has a 1 byte PID.
 */
-bool obd2_signals_t::is_obd2_request(DiagnosticRequest* request)
+bool obd2_signal_t::is_obd2_request(DiagnosticRequest* request)
 {
        return request->mode == 0x1 && request->has_pid && request->pid < 0xff;
 }
@@ -133,7 +139,7 @@ bool obd2_signals_t::is_obd2_request(DiagnosticRequest* request)
 * 
 * @return true if name began with obd2 else false.
 */
-bool obd2_signals_t::is_obd2_signal(const char *name)
+bool obd2_signal_t::is_obd2_signal(const char *name)
 {
        if(fnmatch("obd2.*", name, FNM_CASEFOLD) == 0)
                return true;
@@ -148,12 +154,12 @@ bool obd2_signals_t::is_obd2_signal(const char *name)
 * value of the PID, using the standard formulas (see
 * http://en.wikipedia.org/wiki/OBD-II_PIDs#Mode_01).
 *
-* @param[in] DiagnosticResponse response - the received DiagnosticResponse (the data is in response.payload,
+* @param[in] response - the received DiagnosticResponse (the data is in response.payload,
 *  a byte array). This is most often used when the byte order is
 *  signiticant, i.e. with many OBD-II PID formulas.
-* @param[in] float parsed_payload - the entire payload of the response parsed as an int.
+* @param[in] parsed_payload - the entire payload of the response parsed as an int.
 */
-float obd2_signals_t::decode_obd2_response(const DiagnosticResponse* response, float parsedPayload)
+float obd2_signal_t::decode_obd2_response(const DiagnosticResponse* response, float parsedPayload)
 {
        return diagnostic_decode_obd2_pid(response);
 }
\ No newline at end of file