X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fconfiguration.cpp;h=52ddde428d11fb9d5b18cf01fc36dc0d6342f099;hb=809e12504c16f280e2e8bf1ca5a9a4d53ed0e8ab;hp=de5cc3bad2efca87a84fc3b514bc759a15ddfbf6;hpb=a0e0cb5ac95e779cd2746d8c1f0740e141bbcc41;p=apps%2Fagl-service-can-low-level.git

diff --git a/src/configuration.cpp b/src/configuration.cpp
index de5cc3ba..52ddde42 100644
--- a/src/configuration.cpp
+++ b/src/configuration.cpp
@@ -42,7 +42,7 @@ can_bus_t& configuration_t::get_can_bus_manager()
 	return can_bus_manager_;
 }
 
-const std::vector<std::shared_ptr<can_bus_dev_t>>& configuration_t::get_can_bus_devices()
+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();
 }
@@ -67,9 +67,9 @@ std::vector<can_signal_t>& configuration_t::get_can_signals()
 	return can_signals_[active_message_set_];
 }
 
-std::vector<obd2_signal_t>& configuration_t::get_obd2_signals()
+std::vector<diagnostic_message_t>& configuration_t::get_diagnostic_messages()
 {
-	return obd2_signals_[active_message_set_];
+	return diagnostic_messages_[active_message_set_];
 }
 
 const std::vector<std::string>& configuration_t::get_signals_prefix() const
@@ -82,7 +82,7 @@ const std::vector<can_message_definition_t>& configuration_t::get_can_message_de
 	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();
 }
@@ -100,34 +100,34 @@ void configuration_t::set_active_message_set(uint8_t 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 
+ *
+ * @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. 
+ * @return Vector of signals name found.
  */
-void configuration_t::find_obd2_signals(const openxc_DynamicField &key, std::vector<obd2_signal_t*>& found_signals)
+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, obd2_signals_[active_message_set_], found_signals);
+				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, obd2_signals_[active_message_set_], found_signals);
+				lookup_signals_by_id(key.numeric_value, diagnostic_messages_[active_message_set_], found_signals);
 			break;
 		default:
-			ERROR(binder_interface, "find_obd2_signals: wrong openxc_DynamicField specified. Use openxc_DynamicField_Type_NUM or openxc_DynamicField_Type_STRING type only.");
+			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, "Found %d signal(s)", (int)found_signals.size());
+	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 
+ *
+ * @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.
  *
@@ -146,5 +146,5 @@ void configuration_t::find_can_signals(const openxc_DynamicField& key, std::vect
 			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, "Found %d signal(s)", (int)found_signals.size());
+	DEBUG(binder_interface, "find_can_signals: Found %d signal(s)", (int)found_signals.size());
 }
\ No newline at end of file