X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fconfiguration.cpp;h=b9d78c0b7e6bb60263e987c455289e4d2b07fbd0;hb=ccd244c10988cd59d6f0b35e1b83a5eebd7bfb01;hp=de06a65f9394683d3e25b977d75b8f93a343fe3b;hpb=2049aca0927b55f2a256fd60ff686616b73eecb7;p=apps%2Flow-level-can-service.git

diff --git a/src/configuration.cpp b/src/configuration.cpp
index de06a65..b9d78c0 100644
--- a/src/configuration.cpp
+++ b/src/configuration.cpp
@@ -19,10 +19,8 @@
 
 #define OBD2_FUNCTIONAL_BROADCAST_ID 0x7df
 
-/*
-* Pre-defined OBD-II PIDs to query for if supported by the vehicle.
-*/
- std::vector<obd2_signals_t> OBD2_PIDS = {
+// Pre-defined OBD-II PIDs to query for if supported by the vehicle.
+ std::vector<obd2_signal_t> OBD2_PIDS = {
 	{ 0x04, "obd2.engine.load", 0, 100, POURCENT, 5, false},
 	{ 0x05, "obd2.engine.coolant.temperature", -40, 215, DEGREES_CELSIUS, 1, false},
 	{ 0x0a, "obd2.fuel.pressure", 0, 765, KPA, 1, false},
@@ -44,28 +42,67 @@
 	{ 0x63, "obd2.engine.torque", 0, 65535, NM, 1, false}
 };
 
-std::vector<can_message_set_t> CAN_MESSAGE_SET =
-{
-	{0, "example_messages", 1, 2, 2, 0, 19},
-};
+// Dumb signals and message implementation. To get compile.
+std::vector<can_message_set_t> CAN_MESSAGE_SET;
 
-std::vector<std::vector<can_message_definition_t>> CAN_MESSAGES_DEFINTION = {
-	{
-		{0x620, CanMessageFormat::STANDARD, {10, 0, nullptr}, false, (uint8_t)NULL},
-		{0x442, CanMessageFormat::STANDARD, {10, 0, nullptr}, false, (uint8_t)NULL},
-	},
-};
+std::vector<std::vector<can_message_definition_t>> CAN_MESSAGES_DEFINTION;
 
-/**
- * @brief Dumb SIGNALS array. It is composed by CanMessageSet
- * SIGNALS[MESSAGE_SET_ID][CanSignal]
- */
-std::vector<std::vector<can_signal_t>> SIGNALS = {
-	{
-		{&(CAN_MESSAGES_DEFINTION[MESSAGE_SET_ID][0]), "can.driver_door.open", 2, 4, 1.000000, 0.000000, 0.000000, 0.000000, {10, 0, nullptr}, false, true, nullptr, 0, false, decoder_t::booleanDecoder, nullptr, false, 0.0},
-		{&(CAN_MESSAGES_DEFINTION[MESSAGE_SET_ID][1]), "can.driver_door.close", 0, 4, 1.000000, 0.000000, 0.000000, 0.000000, {10, 0, nullptr}, false, true, nullptr, 0, false, decoder_t::booleanDecoder, nullptr, false, 0.0}
-	},
-};
+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}
\ No newline at end of file
+	: obd2_signals_{OBD2_PIDS}, can_message_set_{CAN_MESSAGE_SET}, can_signals_{SIGNALS}, can_message_definition_{CAN_MESSAGES_DEFINTION}
+
+configuration_t& configuration_t::get_configuration()
+{ 
+	return *this;
+}
+
+can_bus_t& configuration_t::get_can_bus_manager()
+{
+	return can_bus_manager_;
+}
+
+diagnostic_manager_t& configuration_t::get_diagnostic_manager() const
+{
+	return diagnostic_manager_;
+}
+
+uint8_t configuration_t::get_active_message_set() const
+{
+	return active_message_set_;
+}
+
+const std::vector<can_message_set_t>& configuration_t::get_can_message_set() const
+{
+	return can_message_set_;
+}
+
+const std::vector<can_signal_t>& configuration_t::get_can_signals() const
+{
+	return can_signals_[active_message_set_];
+}
+
+const std::vector<can_message_definition_t>& configuration_t::get_can_message_definition() const
+{
+	return can_message_definition_[active_message_set_];
+}
+
+const std::vector<obd2_signal_t>& configuration_t::get_obd2_signals() const
+{
+	return obd2_signals_;
+}
+
+uint32_t configuration_t::get_signal_id(obd2_signal_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();
+}
+
+void configuration_t::set_active_message_set(uint8_t id)
+{
+	active_message_set_ = id;
+}
\ No newline at end of file