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 8e3a1e6..c6a8ae9 100644 (file)
--- a/src/can-signals.cpp
+++ b/src/can-signals.cpp
@@ -15,56 +15,65 @@
  * limitations under the License.
  */
 
-#include <string>
-#include <vector>
-#include <fnmatch.h>
-#include "can-signals.h"
+#include "can-signals.hpp"
 
-/* Can signal event map making access to afb_event
- * external to openxc existing structure.
- */
-std::map <CanSignal, struct afb_event> subscribed_signals;
-std::map <CanSignal, struct afb_event>::iterator subscribed_signals_i;
+const std::vector<CanSignal> getSignals()
+{
+       return SIGNALS[MESSAGE_SET_ID];
+}
 
-/* Find one or many signals based on its name or id
-* passed through openxc_DynamicField.
-*/
-void find_signals(openxc_DynamicField *key, std:vector <CanSignal> *signals)
+size_t getSignalCount()
 {
-       int n_signals, i;
+       return SIGNALS[MESSAGE_SET_ID].size();
+}
 
-       n_signals = getSignalCount();
+std::vector<CanSignal> find_can_signals(openxc_DynamicField& key)
+{
+       std::vector<CanSignal> signals;
 
-       switch(key->type):
+       switch(key.type)
        {
                case openxc_DynamicField_Type::openxc_DynamicField_Type_STRING:
-                       for(i=0; i<=n_signals; i++)
+                       for(const CanSignal& s : getSignals())
                        {
-                               if(fnmatch(key->string_value, SIGNALS[i]->genericName) == 0)
-                                       signals.insert(&SIGNALS[i]);
+                               if(fnmatch(key.string_value, s.genericName, FNM_CASEFOLD) == 0)
+                                       signals.push_back(s);
                        }
                        break;
                case openxc_DynamicField_Type::openxc_DynamicField_Type_NUM:
-                       for(i=0; i<=n_signals; i++)
+                       for(const CanSignal& s : getSignals())
                        {
-                               CanMessageDefinition *msg_def = SIGNALS[i]->message;
-                               if(msg_def->id == key->numeric_value)
-                                       signals.insert(&SIGNALS[i])
+                               CanMessageDefinition *msg_def = s.message;
+                               if(msg_def->id == key.numeric_value)
+                                       signals.push_back(s);
                        }
                        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(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 signals;
 }
 
-CanSignal* getSignals()
-{
-       return &SIGNALS;
-}
-
-int getSignalCount()
-{
-       return SIGNALS.size();
-}
\ No newline at end of file
+       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