Sort and comment the code

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

diff --git a/src/can-signals.hpp b/src/can-signals.hpp
index a95b3a3..250ff19 100644 (file)
--- a/src/can-signals.hpp
+++ b/src/can-signals.hpp
@@ -23,6 +23,7 @@
 #include <vector>
 #include <string>
 
+#include "obd2-signals.hpp"
 #include "timer.hpp"
 #include "openxc.pb.h"
 #include "can-bus.hpp"
@@ -99,7 +100,7 @@ typedef struct CanSignalState CanSignalState;
  */
 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) */
@@ -132,29 +133,10 @@ struct CanSignal {
 };
 typedef struct CanSignal CanSignal;
 
-/* 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(). */
 size_t getSignalCount();
 
-/**
- * @brief Find one or many signals based on its name or id
- * passed through openxc_DynamicField.
- *
- * @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.
- */
-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
- *
- * @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);
\ No newline at end of file
+uint32_t get_signal_id(const CanSignal& sig);
\ No newline at end of file