* limitations under the License.
*/
-#include <configuration.hpp>
+#include "configuration.hpp"
-#define OBD2_FUNCTIONAL_BROADCAST_ID 0x7df
+#include "utils/signals.hpp"
// Dumb signals and message implementation. To get compile.
- std::vector<obd2_signal_t> OBD2_PIDS;
+/*std::vector<can_message_set_t> CAN_MESSAGE_SET;
-std::vector<can_message_set_t> CAN_MESSAGE_SET;
+std::vector<std::vector<can_message_definition_t>> CAN_MESSAGES_DEFINITION;
-std::vector<std::vector<can_message_definition_t>> CAN_MESSAGES_DEFINTION;
+std::vector<std::vector<can_signal_t>> SIGNALS;*/
-std::vector<std::vector<can_signal_t>> SIGNALS;
-
-configuration_t::configuration_t()
- : obd2_signals_{OBD2_PIDS}, can_message_set_{CAN_MESSAGE_SET}, can_signals_{SIGNALS}, can_message_definition_{CAN_MESSAGES_DEFINTION}
+configuration_t& configuration_t::instance()
+{
+ static configuration_t config;
+ return config;
+}
configuration_t& configuration_t::get_configuration()
-{
+{
return *this;
}
-can_bus_t& configuration_t::get_can_bus_manager() const
+can_bus_t& configuration_t::get_can_bus_manager()
{
return can_bus_manager_;
}
-diagnostic_manager_t& configuration_t::get_diagnostic_manager() const
+const std::map<std::string, std::shared_ptr<can_bus_dev_t>>& configuration_t::get_can_bus_devices()
+{
+ return can_bus_manager_.get_can_devices();
+}
+
+diagnostic_manager_t& configuration_t::get_diagnostic_manager()
{
return diagnostic_manager_;
}
return active_message_set_;
}
-const std::vector<can_message_set_t>& configuration_t::get_can_message_set() const
+const std::vector<can_message_set_t>& configuration_t::get_can_message_set()
{
return can_message_set_;
}
-const std::vector<can_signal_t>& configuration_t::get_can_signals() const
+std::vector<can_signal_t>& configuration_t::get_can_signals()
{
return can_signals_[active_message_set_];
}
-const std::vector<can_message_definition_t>& configuration_t::get_can_message_definition() const
+std::vector<diagnostic_message_t>& configuration_t::get_diagnostic_messages()
{
- return can_message_definition_[active_message_set_];
+ return diagnostic_messages_[active_message_set_];
+}
+
+const std::vector<std::string>& configuration_t::get_signals_prefix() const
+{
+ return signals_prefix_;
}
-const std::vector<obd2_signal_t>& configuration_t::get_obd2_signals() const
+const std::vector<can_message_definition_t>& configuration_t::get_can_message_definition()
{
- return obd2_signals_;
+ return can_message_definition_[active_message_set_];
}
-uint32_t configuration_t::get_signal_id(obd2_signal_t& sig) const
+uint32_t configuration_t::get_signal_id(diagnostic_message_t& sig) const
{
return sig.get_pid();
}
uint32_t configuration_t::get_signal_id(can_signal_t& sig) const
{
- return sig.get_message()->get_id();
+ return sig.get_message().get_id();
}
void configuration_t::set_active_message_set(uint8_t id)
{
active_message_set_ = id;
+}
+
+/**
+ * @fn std::vector<std::string> find_can_signals(const openxc_DynamicField &key)
+ * @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.
+ *
+ * @return Vector of signals name found.
+ */
+void configuration_t::find_diagnostic_messages(const openxc_DynamicField &key, std::vector<diagnostic_message_t*>& found_signals)
+{
+ switch(key.type)
+ {
+ case openxc_DynamicField_Type::openxc_DynamicField_Type_STRING:
+ lookup_signals_by_name(key.string_value, diagnostic_messages_[active_message_set_], found_signals);
+ break;
+ case openxc_DynamicField_Type::openxc_DynamicField_Type_NUM:
+ lookup_signals_by_id(key.numeric_value, diagnostic_messages_[active_message_set_], found_signals);
+ break;
+ default:
+ ERROR(binder_interface, "find_diagnostic_messages: wrong openxc_DynamicField specified. Use openxc_DynamicField_Type_NUM or openxc_DynamicField_Type_STRING type only.");
+ break;
+ }
+ DEBUG(binder_interface, "find_diagnostic_messages: Found %d signal(s)", (int)found_signals.size());
+}
+
+/**
+ * @fn void find_can_signals(const openxc_DynamicField& key, std::vector<can_signal_t*>& 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 configuration_t::find_can_signals(const openxc_DynamicField& key, std::vector<can_signal_t*>& found_signals)
+{
+ switch(key.type)
+ {
+ case openxc_DynamicField_Type::openxc_DynamicField_Type_STRING:
+ lookup_signals_by_name(std::string(key.string_value), can_signals_[active_message_set_], found_signals);
+ break;
+ case openxc_DynamicField_Type::openxc_DynamicField_Type_NUM:
+ lookup_signals_by_id(key.numeric_value, can_signals_[active_message_set_], found_signals);
+ break;
+ default:
+ ERROR(binder_interface, "find_can_signals: wrong openxc_DynamicField specified. Use openxc_DynamicField_Type_NUM or openxc_DynamicField_Type_STRING type only.");
+ break;
+ }
+ DEBUG(binder_interface, "find_can_signals: Found %d signal(s)", (int)found_signals.size());
}
\ No newline at end of file