Changed the decoding function

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

diff --git a/src/can-signals.hpp b/src/can-signals.hpp
index 6d15d8b..fb77df5 100644 (file)
--- a/src/can-signals.hpp
+++ b/src/can-signals.hpp
@@ -17,27 +17,43 @@
 
 #pragma once
 
+#include <map>
 #include <queue>
-#include <string>
 #include <vector>
-#include <fnmatch.h>
+#include <string>
+#include <thread>
 #include <linux/can.h>
+#include <mutex>
+#include <condition_variable>
 
+#include "timer.hpp"
+#include "openxc.pb.h"
 #include "can-utils.hpp"
-#include "low-can-binding.hpp"
 
 extern "C"
 {
+       #include <afb/afb-binding.h>
        #include <afb/afb-event-itf.h>
 }
 
-/**
- * @brief Dumb SIGNALS array. It is composed by CanMessageSet
- * SIGNALS[MESSAGE_SET_ID][CanSignal]
+#define MESSAGE_SET_ID 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::vector<std::vector<CanSignal>> SIGNALS {
-       {}// message set: example
-};
+static 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.
+*/
+extern std::mutex subscribed_signals_mutex;
 
 /** Public: Return the currently active CAN configuration. */
 CanMessageSet* getActiveMessageSet();
@@ -64,7 +80,7 @@ CanMessageDefinition* getMessages();
 
 /* Public: Return signals from an signals array filtered on name.
  */
-CanSignal* getSignals(std::string name);
+const std::vector<CanSignal> getSignals();
 
 /* Public: Return an array of all OpenXC CAN commands enabled in the active
  * configuration that can write back to CAN with a custom handler.
@@ -93,14 +109,25 @@ CanBus* getCanBuses();
  * @brief Find one or many signals based on its name or id
  * passed through openxc_DynamicField.
  *
- * params[openxc_DynamicField&] - a const reference with the key to search into signal.
+ * @param[in] openxc_DynamicField& - a const reference with the key to search into signal.
  * Key is either a signal name or its CAN arbitration id.
  *
- * return[std::vector<std::string>] return found CanSignal generic name vector.
+ * @return std::vector<std::string> return found CanSignal generic name vector.
  */
 std::vector<CanSignal> find_can_signals(const openxc_DynamicField &key);
 
-uint32_t get_CanSignal_id(const CanSignal& sig)
-{
-       return sig.message->id;
-}
\ No newline at end of file
+/**
+ * @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.
+ */
+inline uint32_t get_CanSignal_id(const CanSignal& sig);
+
+/**
+ * @brief return the subscribed_signals map.
+ * 
+ * return std::map<std::string, struct afb_event> - map of subscribed signals.
+ */
+const std::map<std::string, struct afb_event> get_subscribed_signals();
\ No newline at end of file