diff --git a/firmware/controllers/algo/engine_configuration_generated_structures.h b/firmware/controllers/algo/engine_configuration_generated_structures.h index 4bddc7a4cc..202ade118a 100644 --- a/firmware/controllers/algo/engine_configuration_generated_structures.h +++ b/firmware/controllers/algo/engine_configuration_generated_structures.h @@ -1,9 +1,7 @@ -// this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Thu Jan 14 23:21:45 EST 2016 +// this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Fri Jan 22 21:25:54 EST 2016 // begin - #ifndef ENGINE_CONFIGURATION_GENERATED_H_ #define ENGINE_CONFIGURATION_GENERATED_H_ - #include "rusefi_types.h" typedef struct { /** @@ -1613,4 +1611,4 @@ typedef struct { #endif // end -// this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Thu Jan 14 23:21:45 EST 2016 +// this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Fri Jan 22 21:25:54 EST 2016 diff --git a/firmware/integration/rusefi.xml b/firmware/integration/rusefi.xml index a61cd31e06..830d615b33 100644 --- a/firmware/integration/rusefi.xml +++ b/firmware/integration/rusefi.xml @@ -132,7 +132,16 @@ - + +
+ + + + +
+
diff --git a/java_console/rusefi.xml b/java_console/rusefi.xml index e61ca337fe..2550c26014 100644 --- a/java_console/rusefi.xml +++ b/java_console/rusefi.xml @@ -132,7 +132,16 @@ - + +
+ + + + +
+
diff --git a/win32_functional_tests/simulator/boards.cpp b/win32_functional_tests/simulator/boards.cpp index 04aaf597a8..9dcc72c829 100644 --- a/win32_functional_tests/simulator/boards.cpp +++ b/win32_functional_tests/simulator/boards.cpp @@ -48,6 +48,10 @@ static void setMapVoltage(float voltage) { setVoltage(engineConfiguration->map.sensor.hwChannel, voltage); } +static void setVBattVoltage(float voltage) { + setVoltage(engineConfiguration->vbattAdcChannel, voltage); +} + void initFakeBoard(void) { addConsoleActionF("set_mock_clt_voltage", setCltVoltage); @@ -56,6 +60,7 @@ void initFakeBoard(void) { addConsoleActionF("set_mock_afr_voltage", setAfrVoltage); addConsoleActionF("set_mock_tps_voltage", setTpsVoltage); addConsoleActionF("set_mock_map_voltage", setMapVoltage); + addConsoleActionF("set_mock_vbatt_voltage", setVBattVoltage); }