Multifixes: class and methods, typo, comments

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

diff --git a/src/can-signals.cpp b/src/can-signals.cpp
index 13ff30b..c6a8ae9 100644 (file)
--- a/src/can-signals.cpp
+++ b/src/can-signals.cpp
@@ -15,26 +15,65 @@
  * limitations under the License.
  */
 
-#include <string>
-#include "can-signals.h"
+#include "can-signals.hpp"
 
-bool match(const std::string &first, const std::string &second)
+const std::vector<CanSignal> getSignals()
 {
-
+       return SIGNALS[MESSAGE_SET_ID];
 }
 
-CanSignal* getSignals(std::string name)
+size_t getSignalCount()
 {
-       int n_signals, i;
-       CanSignal ret_signals[];
+       return SIGNALS[MESSAGE_SET_ID].size();
+}
 
-       n_signals = size(SIGNALS);
+std::vector<CanSignal> find_can_signals(openxc_DynamicField& key)
+{
+       std::vector<CanSignal> signals;
 
-       for(i=0; i<=n_signals; i++)
+       switch(key.type)
        {
-               if(SIGNALS[i].generic_name == name)
-                       return &SIGNALS[i];
-               i++;
+               case openxc_DynamicField_Type::openxc_DynamicField_Type_STRING:
+                       for(const CanSignal& s : getSignals())
+                       {
+                               if(fnmatch(key.string_value, s.genericName, FNM_CASEFOLD) == 0)
+                                       signals.push_back(s);
+                       }
+                       break;
+               case openxc_DynamicField_Type::openxc_DynamicField_Type_NUM:
+                       for(const CanSignal& s : getSignals())
+                       {
+                               CanMessageDefinition *msg_def = s.message;
+                               if(msg_def->id == key.numeric_value)
+                                       signals.push_back(s);
+                       }
+                       break;
+               default:
+                       ERROR(interface, "find_can_signals: wrong openxc_DynamicField specified. Use openxc_DynamicField_Type_NUM or openxc_DynamicField_Type_STRING type only.");
+                       CanSignal cs;
+                       ::memset(&cs, 0, sizeof(CanSignal));
+                       signals.push_back(cs);
+                       return signals;
+                       break;
        }
-       return 0;
+       return signals;
 }
+
+       struct CanMessageDefinition* message;
+       const char* genericName;
+       uint8_t bitPosition;
+       uint8_t bitSize;
+       float factor;
+       float offset;
+       float minValue;
+       float maxValue;
+       FrequencyClock frequencyClock;
+       bool sendSame;
+       bool forceSendChanged;
+       const CanSignalState* states;
+       uint8_t stateCount;
+       bool writable;
+       SignalDecoder decoder;
+       SignalEncoder encoder;
+       bool received;
+       float lastValue;
\ No newline at end of file