#include <vector>
#include <string>
+#include "obd2-signals.hpp"
#include "timer.hpp"
#include "openxc.pb.h"
#include "can-bus.hpp"
#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.
- */
-static std::map<std::string, struct afb_event> subscribed_signals;
-
+extern std::mutex subscribed_signals_mutex;
std::mutex& get_subscribed_signals_mutex();
+/**
+ * @brief return the subscribed_signals map.
+ *
+ * return std::map<std::string, struct afb_event> - map of subscribed signals.
+ */
+extern std::map<std::string, struct afb_event> subscribed_signals;
+std::map<std::string, struct afb_event>& get_subscribed_signals();
+
/**
* @brief The type signature for a CAN signal decoder.
*
*/
struct CanSignal {
struct CanMessageDefinition* message; /*!< message - The message this signal is a part of. */
- const char* genericName; /*!< genericName - The name of the signal to be output over USB.*/
+ const char* generic_name; /*!< generic_name - The name of the signal to be output over USB.*/
uint8_t bitPosition; /*!< bitPosition - The starting bit of the signal in its CAN message (assuming
* non-inverted bit numbering, i.e. the most significant bit of
* each byte is 0) */
};
typedef struct CanSignal CanSignal;
-/** Public: Return the currently active CAN configuration. */
-CanMessageSet* getActiveMessageSet();
-
-/** Public: Retrive a list of all possible CAN configurations.
- *
- * Returns a pointer to an array of all configurations.
- */
-CanMessageSet* getMessageSets();
-
-/** Public: Return the length of the array returned by getMessageSets() */
-int getMessageSetCount();
-
-/* Public: Return the number of CAN buses configured in the active
- * configuration. This is limited to 2, as the hardware controller only has 2
- * CAN channels.
- */
-int getCanBusCount();
-
-/* Public: Return an array of all CAN messages to be processed in the active
- * configuration.
- */
-CanMessageDefinition* getMessages();
-
/* Public: Return signals from an signals array filtered on name.
*/
-const std::vector<CanSignal> getSignals();
+std::vector<CanSignal>& get_can_signals();
-/* Public: Return the length of the array returned by getSignals(). */
+/* Public: Return the length of the array returned by get_can_signals(). */
size_t getSignalCount();
-/* Public: Return the length of the array returned by getMessages(). */
-int getMessageCount();
-
/**
* @brief Find one or many signals based on its name or id
* passed through openxc_DynamicField.
*
* @return std::vector<std::string> return found CanSignal generic name vector.
*/
-std::vector<CanSignal> find_can_signals(const openxc_DynamicField &key);
+void find_can_signals(const openxc_DynamicField &key, std::vector<CanSignal*>& found_signals);
/**
* @brief Retrieve can arbitration id of a given 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
+uint32_t get_signal_id(const CanSignal& sig);
\ No newline at end of file