Define predefined OBD2 signals by default.

Change-Id: Ide948c64fe2085b98acf7cdb70e6baf7b6a669ed
Signed-off-by: Romain Forlot <romain.forlot@iot.bzh>

diff --git a/src/configuration-generated.cpp b/src/configuration-generated.cpp
index 88f93bd..9e43794 100644 (file)
--- a/src/configuration-generated.cpp
+++ b/src/configuration-generated.cpp
@@ -7,30 +7,6 @@
 
 #define OBD2_FUNCTIONAL_BROADCAST_ID 0x7df
 
-/*
-* 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},
-       { 0x0b, "obd2.intake.manifold.pressure", 0, 255, KPA, 1, false},
-       { 0x0c, "obd2.engine.speed", 0, 16383, RPM, 5, false},
-       { 0x0d, "obd2.vehicle.speed", 0, 255, KM_H, 5, false},
-       { 0x0f, "obd2.intake.air.temperature", -40, 215, DEGREES_CELSIUS, 1, false},
-       { 0x10, "obd2.mass.airflow", 0, 655, GRAMS_SEC, 5, false},
-       { 0x11, "obd2.throttle.position", 0, 100, POURCENT, 5, false},
-       { 0x1f, "obd2.running.time", 0, 65535, SECONDS, 1, false},
-       { 0x2d, "obd2.EGR.error", -100, 99, POURCENT, 0, false},
-       { 0x2f, "obd2.fuel.level", 0, 100, POURCENT, 1, false},
-       { 0x33, "obd2.barometric.pressure", 0, 255, KPA, 1, false},
-       { 0x4c, "obd2.commanded.throttle.position", 0, 100, POURCENT, 1, false},
-       { 0x52, "obd2.ethanol.fuel.percentage", 0, 100, POURCENT, 1, false},
-       { 0x5a, "obd2.accelerator.pedal.position", 0, 100, POURCENT, 5, false},
-       { 0x5b, "obd2.hybrid.battery-pack.remaining.life", 0, 100, POURCENT, 5, false},
-       { 0x5c, "obd2.engine.oil.temperature",-40, 210, DEGREES_CELSIUS, 1, false},
-       { 0x63, "obd2.engine.torque", 0, 65535, NM, 1, false}
-};
 
 std::vector<can_message_set_t> CAN_MESSAGE_SET =
 {

diff --git a/src/configuration.cpp b/src/configuration.cpp
index f0f7909..673e4f4 100644 (file)
--- a/src/configuration.cpp
+++ b/src/configuration.cpp
@@ -19,9 +19,30 @@
 
 #define OBD2_FUNCTIONAL_BROADCAST_ID 0x7df
 
-// Dumb signals and message implementation. To get compile.
- std::vector<obd2_signal_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},
+       { 0x0b, "obd2.intake.manifold.pressure", 0, 255, KPA, 1, false},
+       { 0x0c, "obd2.engine.speed", 0, 16383, RPM, 5, false},
+       { 0x0d, "obd2.vehicle.speed", 0, 255, KM_H, 5, false},
+       { 0x0f, "obd2.intake.air.temperature", -40, 215, DEGREES_CELSIUS, 1, false},
+       { 0x10, "obd2.mass.airflow", 0, 655, GRAMS_SEC, 5, false},
+       { 0x11, "obd2.throttle.position", 0, 100, POURCENT, 5, false},
+       { 0x1f, "obd2.running.time", 0, 65535, SECONDS, 1, false},
+       { 0x2d, "obd2.EGR.error", -100, 99, POURCENT, 0, false},
+       { 0x2f, "obd2.fuel.level", 0, 100, POURCENT, 1, false},
+       { 0x33, "obd2.barometric.pressure", 0, 255, KPA, 1, false},
+       { 0x4c, "obd2.commanded.throttle.position", 0, 100, POURCENT, 1, false},
+       { 0x52, "obd2.ethanol.fuel.percentage", 0, 100, POURCENT, 1, false},
+       { 0x5a, "obd2.accelerator.pedal.position", 0, 100, POURCENT, 5, false},
+       { 0x5b, "obd2.hybrid.battery-pack.remaining.life", 0, 100, POURCENT, 5, false},
+       { 0x5c, "obd2.engine.oil.temperature",-40, 210, DEGREES_CELSIUS, 1, false},
+       { 0x63, "obd2.engine.torque", 0, 65535, NM, 1, false}
+};
 
+// 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;