Raw import openXC function to detect obd2 response.

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

diff --git a/src/can-signals.cpp b/src/can-signals.cpp
index 10935ab..07689a0 100644 (file)
--- a/src/can-signals.cpp
+++ b/src/can-signals.cpp
@@ -19,6 +19,8 @@
 
 #include <fnmatch.h>
 
+#include "signals.hpp"
+#include "obd2-signals.hpp"
 #include "can-decoder.hpp"
 #include "low-can-binding.hpp"
 
@@ -35,88 +37,65 @@ std::vector<std::vector<CanMessageDefinition>> CAN_MESSAGES = {
  */
 std::vector<std::vector<CanSignal>> SIGNALS = {
        {
-               {&(CAN_MESSAGES[MESSAGE_SET_ID][0]), "can.driver_door.open", 2, 4, 1.000000, 0.000000, 0.000000, 0.000000, {10, 0, nullptr}, false, true, nullptr, 0, false, decoder_t::booleanDecoder, nullptr, false, (float)NULL},
-               {&(CAN_MESSAGES[MESSAGE_SET_ID][1]), "can.driver_door.close", 2, 4, 1.000000, 0.000000, 0.000000, 0.000000, {10, 0, nullptr}, false, true, nullptr, 0, false, decoder_t::booleanDecoder, nullptr, false, (float)NULL}
+               {&(CAN_MESSAGES[MESSAGE_SET_ID][0]), "can.driver_door.open", 2, 4, 1.000000, 0.000000, 0.000000, 0.000000, {10, 0, nullptr}, false, true, nullptr, 0, false, decoder_t::booleanDecoder, nullptr, false, 0.0},
+               {&(CAN_MESSAGES[MESSAGE_SET_ID][1]), "can.driver_door.close", 0, 4, 1.000000, 0.000000, 0.000000, 0.000000, {10, 0, nullptr}, false, true, nullptr, 0, false, decoder_t::booleanDecoder, nullptr, false, 0.0}
        },
 };
 
-/** 
- * @brief Can signal event map making access to afb_event
- * externaly to an openxc existing structure.
+/**
+ * @fn std::vector<CanSignal>& get_can_signals()
  *
- * @desc Event map is making relation between CanSignal generic name
- * and the afb_event struct used by application framework to pushed
- * to the subscriber.
+ * @return A reference to a vector of signals
  */
-std::map<std::string, struct afb_event> subscribed_signals;
-
-/**
-* @brief Mutex allowing safe manipulation on subscribed_signals map.
-* @desc To ensure that the map object isn't modified when we read it, you
-*  have to set this mutex before use subscribed_signals map object.
-*/
-std::mutex subscribed_signals_mutex;
-
-std::mutex& get_subscribed_signals_mutex()
-{
-       return subscribed_signals_mutex;
-}
-
-std::map<std::string, struct afb_event>& get_subscribed_signals()
-{
-       DEBUG(binder_interface, "Here are the first subscribed_signals: %s", subscribed_signals.begin()->first.c_str() );
-       return subscribed_signals;
-}
-
-const std::vector<CanSignal>& getSignals()
+std::vector<CanSignal>& get_can_signals()
 {
        return SIGNALS[MESSAGE_SET_ID];
 }
 
+/**
+ * @fn size_t getSignalCount()
+ *
+ * @return the length of the array returned by get_can_signals().
+ */
 size_t getSignalCount()
 {
        return SIGNALS[MESSAGE_SET_ID].size();
 }
 
-std::vector<CanSignal> find_can_signals(const openxc_DynamicField &key)
+/**
+ * @brief Retrieve can arbitration id of a given CanSignal
+ *
+ * @param[in] CanSignal& - a const reference to a CanSignal
+ *
+ * @return uint32_t - unsigned integer representing the arbitration id.
+ */
+uint32_t get_signal_id(const CanSignal& sig)
 {
-       std::vector<CanSignal> found_signals = {};
-       std::vector<CanSignal> active_signals = getSignals();
-       /* STL container my love ! Welcome to the printf debugging venerable technique !
-        * use those DEBUG message if you need to ! 
-       DEBUG(binder_interface, "We get %d signal(s) to process", (int)active_signals.size()); */
+       return sig.message->id;
+}
 
+/**
+ * @fn void find_can_signals(const openxc_DynamicField& key, std::vector<CanSignal*>& found_signals)
+ * @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.
+ * @param[out] std::vector<CanSignal*>& found_signals : provided vector to fill with ponter to signals matched.
+ *
+ */
+void find_can_signals(const openxc_DynamicField& key, std::vector<CanSignal*>& found_signals)
+{
        switch(key.type)
        {
                case openxc_DynamicField_Type::openxc_DynamicField_Type_STRING:
-                       for(const CanSignal& s : active_signals)
-                       {
-                               //DEBUG(binder_interface, "Processing signal: %s", s.genericName);
-                               if(::fnmatch(key.string_value, s.genericName, FNM_CASEFOLD) == 0)
-                               {
-                                       //DEBUG(binder_interface, "Matched signal: %s", s.genericName);
-                                       found_signals.push_back(s);
-                               }
-                       }
+                       lookup_signals_by_name(key.string_value, get_can_signals(), found_signals);
                        break;
                case openxc_DynamicField_Type::openxc_DynamicField_Type_NUM:
-                       for(const CanSignal& s : active_signals)
-                       {
-                               CanMessageDefinition *msg_def = s.message;
-                               if(msg_def->id == key.numeric_value)
-                                       found_signals.push_back(s);
-                       }
+                       lookup_signals_by_id(key.numeric_value, get_can_signals(), found_signals);
                        break;
                default:
-                       ERROR(binder_interface, "find_can_signals: wrong openxc_DynamicField specified. Use openxc_DynamicField_Type_NUM or openxc_DynamicField_Type_STRING type only.");
-                       return found_signals;
+                       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 found_signals;
 }
-
-inline uint32_t get_CanSignal_id(const CanSignal& sig)
-{
-       return sig.message->id;
-}
\ No newline at end of file