* limitations under the License.
*/
-#include <string>
-#include <vector>
-#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(openxc_DynamicField *key)
+size_t getSignalCount()
{
- int n_signals, i;
- std::vector <CanSignal> ret_signals;
+ return SIGNALS[MESSAGE_SET_ID].size();
+}
- n_signals = SIGNALS.size();
+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(match((std::string*)key->string_value, (std::string*)SIGNALS[i]->genericName))
- ret_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)
- ret_signals.insert(&SIGNALS[i])
+ CanMessageDefinition *msg_def = s.message;
+ if(msg_def->id == key.numeric_value)
+ signals.push_back(s);
}
break;
default:
- 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 &ret_signals;
+ return signals;
}
\ No newline at end of file