Revert accessing CAN device with a map indexing on dev name

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

diff --git a/src/can/can-signals.cpp b/src/can/can-signals.cpp
index 18f5f2a..d04c03a 100644 (file)
--- a/src/can/can-signals.cpp
+++ b/src/can/can-signals.cpp
@@ -15,37 +15,143 @@
  * limitations under the License.
  */
 
-#include "can/can-signals.hpp"
-
 #include <fnmatch.h>
 
-#include "utils/signals.hpp"
-#include "can/can-decoder.hpp"
-#include "obd2/obd2-signals.hpp"
-#include "low-can-binding.hpp"
-
-/**
- * @fn void find_can_signals(const openxc_DynamicField& key, std::vector<CanSignal*>& found_signals)
- * @brief return signals name found searching through CAN_signals and OBD2 pid
- * 
- * @param[in] key - can contain numeric or string value in order to search against 
- *   can signals or obd2 signals name.
- * @param[out] found_signals - provided vector to fill with ponter to signals matched.
- *
- */
-void find_can_signals(const openxc_DynamicField& key, std::vector<CanSignal*>& found_signals)
-{
-       switch(key.type)
-       {
-               case openxc_DynamicField_Type::openxc_DynamicField_Type_STRING:
-                       lookup_signals_by_name(key.string_value, get_can_signals(), found_signals);
-                       break;
-               case openxc_DynamicField_Type::openxc_DynamicField_Type_NUM:
-                       lookup_signals_by_id(key.numeric_value, get_can_signals(), found_signals);
-                       break;
-               default:
-                       ERROR(binder_interface, "find_signals: wrong openxc_DynamicField specified. Use openxc_DynamicField_Type_NUM or openxc_DynamicField_Type_STRING type only.");
-                       break;
-       }
-       DEBUG(binder_interface, "Found %d signal(s)", (int)found_signals.size());
+#include "can-signals.hpp"
+
+#include "../configuration.hpp"
+#include "../utils/signals.hpp"
+#include "can-decoder.hpp"
+#include "../obd2/obd2-signals.hpp"
+#include "../low-can-binding.hpp"
+
+std::string can_signal_t::prefix_ = "messages";
+
+can_signal_t::can_signal_t(can_message_definition_t& message, std::string generic_name, uint8_t bit_position, uint8_t bit_size,
+                        float factor, float offset, float min_value, float max_value, frequency_clock_t frequency, bool send_same, bool force_send_changed,
+                        std::vector<std::string> states, bool writable, SignalDecoder decoder, SignalEncoder encoder, bool received)
+       : message_{message}, generic_name_{generic_name}, bit_position_{bit_position}, bit_size_{bit_size}, factor_{factor}, offset_{offset},
+       min_value_{min_value}, max_value_{max_value}, frequency_{frequency}, send_same_{send_same}, force_send_changed_{force_send_changed}, states_{states},
+       writable_{writable}, decoder_{decoder}, encoder_{encoder}, received_{received}, last_value_{(float)NULL}
+{}
+
+can_message_definition_t& can_signal_t::get_message()
+{
+       return message_;
+}
+
+const std::string& can_signal_t::get_generic_name() const
+{
+       return generic_name_;
+}
+
+const std::string can_signal_t::get_name() const
+{
+       return prefix_ + "." + generic_name_;
+}
+
+const std::string& can_signal_t::get_prefix() const
+{
+       return prefix_;
+}
+
+uint8_t can_signal_t::get_bit_position() const
+{
+       return bit_position_;
+}
+
+uint8_t can_signal_t::get_bit_size() const
+{
+       return bit_size_;
+}
+
+float can_signal_t::get_factor() const
+{
+       return factor_;
+}
+
+float can_signal_t::get_offset() const
+{
+       return offset_;
+}
+
+float can_signal_t::get_min_value() const
+{
+       return min_value_;
+}      
+
+float can_signal_t::get_max_value() const
+{
+       return max_value_;
+}
+
+frequency_clock_t& can_signal_t::get_frequency()
+{
+       return frequency_;
+}
+
+bool can_signal_t::get_send_same() const
+{
+       return send_same_;
+}
+
+bool can_signal_t::get_force_send_changed() const
+{
+       return force_send_changed_;
+}
+
+const std::vector<std::string>& can_signal_t::get_states() const
+{
+       return states_;
+}
+
+const std::string can_signal_t::get_states(float value) const
+{
+       if (value < states_.size())
+               return states_[(int)value];
+       return std::string("");
+}
+
+size_t can_signal_t::get_state_count() const
+{
+       return states_.size();
+}
+
+bool can_signal_t::get_writable() const
+{
+       return writable_;
+}
+
+SignalDecoder& can_signal_t::get_decoder()
+{
+       return decoder_;
+}
+
+SignalEncoder& can_signal_t::get_encoder()
+{
+       return encoder_;
+}
+
+bool can_signal_t::get_received() const
+{
+       return received_;
+}
+float can_signal_t::get_last_value() const
+{
+       return last_value_;
+}
+
+void can_signal_t::set_prefix(std::string val)
+{
+       prefix_ = val;
+}
+
+void can_signal_t::set_received(bool r)
+{
+       received_ = r;
+}
+
+void can_signal_t::set_last_value(float val)
+{
+       last_value_ = val;
 }