Enabling recurrent check of diagnostic requests.

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

diff --git a/src/diagnostic/diagnostic-message.cpp b/src/diagnostic/diagnostic-message.cpp
index 76b9799..5a8f9e5 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",
@@ -42,102 +43,46 @@ 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] key - can contain numeric or string value in order to search against 
- *   can signals or obd2 signals name.
- *
- * @return Vector of signals name found. 
- */
-void obd2_signal_t::find_obd2_signals(const openxc_DynamicField &key, std::vector<obd2_signal_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_;
 }
 
-bool obd2_signal_t::is_obd2_response(can_message_t can_message)
+const std::string obd2_signal_t::get_name() const
 {
-       /*
-       if(can_message.get_id() >= 0x7E8 && can_message.get_id() <= 0x7EF)
-       {
-               openxc_VehicleMessage message = {0};
-               message.has_type = true;
-               message.type = openxc_VehicleMessage_Type_DIAGNOSTIC;
-               message.has_diagnostic_response = true;
-               message.diagnostic_response = {0};
-               message.diagnostic_response.has_bus = true;
-               message.diagnostic_response.bus = bus->address;
-               message.diagnostic_response.has_message_id = true;
-               //7DF should respond with a random message id between 7e8 and 7ef
-               //7E0 through 7E7 should respond with a id that is 8 higher (7E0->7E8)
-               if(can_message.get_id() == 0x7DF)
-               {
-                       message.diagnostic_response.message_id = rand()%(0x7EF-0x7E8 + 1) + 0x7E8;
-               }
-               else if(commandRequest->message_id >= 0x7E0 && commandRequest->message_id <= 0x7E7)
-               {
-                       message.diagnostic_response.message_id = commandRequest->message_id + 8;
-               }
-               message.diagnostic_response.has_mode = true;
-               message.diagnostic_response.mode = commandRequest->mode;
-               if(commandRequest->has_pid)
-               {
-                       message.diagnostic_response.has_pid = true;
-                       message.diagnostic_response.pid = commandRequest->pid;
-               }
-               message.diagnostic_response.has_value = true;
-               message.diagnostic_response.value = rand() % 100;
-               pipeline::publish(&message, &getConfiguration()->pipeline);
-       }
-       else //If it's outside the range, the command_request will return false
-       {
-               debug("Sent message ID is outside the valid range for emulator (7DF to 7E7)");
-               status=false;
-       }
-       return false;
-       */
+       return active_diagnostic_request_t::get_prefix() + "." + generic_name_;
 }
 
-void obd2_signal_t::add_request(int pid)
+int obd2_signal_t::get_frequency() const
 {
-       DiagnosticRequest request = {
-       arbitration_id: OBD2_FUNCTIONAL_BROADCAST_ID,
-       mode: 0x1, has_pid: true, pid_ };
+       return frequency_;
 }
 
 /**
-* @brief Check if a request is an OBD-II PID request.
-*
-* @return true if the request is a mode 1 request and it has a 1 byte PID.
-*/
-bool obd2_signal_t::is_obd2_request(DiagnosticRequest* request)
+ * @brief Build a DiagnosticRequest struct to be passed
+ *  to diagnostic manager instance.
+ */
+const DiagnosticRequest obd2_signal_t::build_diagnostic_request()
 {
-       return request->mode == 0x1 && request->has_pid && request->pid < 0xff;
+       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 };
 }
 
 /**
-* @brief Check if requested signal name is an obd2 pid
-* 
-* @return true if name began with obd2 else false.
+* @brief Check if a request is an OBD-II PID request.
+*
+* @return true if the request is a mode 1 request and it has a 1 byte PID.
 */
-bool obd2_signal_t::is_obd2_signal(const char *name)
+bool obd2_signal_t::is_obd2_request(const DiagnosticRequest* request)
 {
-       if(fnmatch("obd2.*", name, FNM_CASEFOLD) == 0)
-               return true;
-       return false;
+       return request->mode == 0x1 && request->has_pid && request->pid < 0xff;
 }
 
 /**