Change way to find signals to make it a little bit more generic.

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

diff --git a/src/can-signals.cpp b/src/can-signals.cpp
index 1b0207c..bf6b4a4 100644 (file)
--- a/src/can-signals.cpp
+++ b/src/can-signals.cpp
@@ -15,57 +15,97 @@
  * limitations under the License.
  */
 
-#include <string>
-#include <vector>
+#include "can-signals.hpp"
+
 #include <fnmatch.h>
-#include "can-signals.h"
 
-/* Can signal event map making access to afb_event
- * external to openxc existing structure.
+#include "signals.hpp"
+#include "obd2-signals.hpp"
+#include "can-decoder.hpp"
+#include "low-can-binding.hpp"
+
+std::vector<std::vector<CanMessageDefinition>> CAN_MESSAGES = {
+       {
+               {0x620, CanMessageFormat::STANDARD, {10, 0, nullptr}, false, (uint8_t)NULL},
+               {0x442, CanMessageFormat::STANDARD, {10, 0, nullptr}, false, (uint8_t)NULL},
+       },
+};
+
+/**
+ * @brief Dumb SIGNALS array. It is composed by CanMessageSet
+ * SIGNALS[MESSAGE_SET_ID][CanSignal]
+ */
+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, 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.
+ *
+ * @desc Event map is making relation between CanSignal generic name
+ * and the afb_event struct used by application framework to pushed
+ * to the subscriber.
  */
-std::map <CanSignal, struct afb_event> subscribed_signals;
-std::map <CanSignal, struct afb_event>::iterator subscribed_signals_i;
+std::map<std::string, struct afb_event> subscribed_signals;
 
-/* Find one or many signals based on its name or id
-* passed through openxc_DynamicField.
+/**
+* @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:vector <CanSignal> find_can_signals(openxc_DynamicField *key)
+std::mutex subscribed_signals_mutex;
+
+std::mutex& get_subscribed_signals_mutex()
 {
-       std:vector <CanSignal> signals;
-       int n_signals, i;
+       return subscribed_signals_mutex;
+}
 
-       n_signals = getSignalCount();
+std::map<std::string, struct afb_event>& get_subscribed_signals()
+{
+       return subscribed_signals;
+}
+
+std::vector<CanSignal>& get_can_signals()
+{
+       return SIGNALS[MESSAGE_SET_ID];
+}
 
-       switch(key->type):
+size_t getSignalCount()
+{
+       return SIGNALS[MESSAGE_SET_ID].size();
+}
+
+uint32_t get_signal_id(const CanSignal& sig)
+{
+       return sig.message->id;
+}
+
+/**
+ * @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 find_can_signals(const openxc_DynamicField& key, std::vector<CanSignal*>& found_signals)
+{
+       switch(key.type)
        {
                case openxc_DynamicField_Type::openxc_DynamicField_Type_STRING:
-                       for(i=0; i<=n_signals; i++)
-                       {
-                               if(fnmatch(key->string_value, SIGNALS[i]->genericName) == 0)
-                                       signals.push_back(&SIGNALS[i]);
-                       }
+                       lookup_signals_by_name(key.string_value, get_can_signals(), found_signals);
                        break;
                case openxc_DynamicField_Type::openxc_DynamicField_Type_NUM:
-                       for(i=0; i<=n_signals; i++)
-                       {
-                               CanMessageDefinition *msg_def = SIGNALS[i]->message;
-                               if(msg_def->id == key->numeric_value)
-                                       signals.push_back(&SIGNALS[i])
-                       }
+                       lookup_signals_by_id(key.numeric_value, get_can_signals(), found_signals);
                        break;
                default:
-                       ERROR(interface, "find_signals: wrong openxc_DynamicField specified. Use openxc_DynamicField_Type_NUM or openxc_DynamicField_Type_STRING type only.");
-                       return NULL;
+                       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());
 }
-
-CanSignal* getSignals()
-{
-       return &SIGNALS;
-}
-
-int getSignalCount()
-{
-       return SIGNALS.size();
-}
\ No newline at end of file