diff --git a/firmware/console/status_loop.cpp b/firmware/console/status_loop.cpp index f5afb753fe..49bee53c94 100644 --- a/firmware/console/status_loop.cpp +++ b/firmware/console/status_loop.cpp @@ -307,7 +307,7 @@ void updateDevConsoleState(void) { static void showFuelMap2(float rpm, float engineLoad) { float baseFuel = getBaseTableFuel((int) rpm, engineLoad); - scheduleMsg(&logger2, "algo=%d", engineConfiguration->algorithm); + scheduleMsg(&logger2, "algo=%s", algorithmToString(engineConfiguration->algorithm)); float iatCorrection = getIatCorrection(getIntakeAirTemperature()); float cltCorrection = getCltCorrection(getCoolantTemperature()); float injectorLag = getInjectorLag(getVBatt()); diff --git a/firmware/controllers/algo/enum_strings.cpp b/firmware/controllers/algo/enum_strings.cpp index 393db29898..a7d36b92eb 100644 --- a/firmware/controllers/algo/enum_strings.cpp +++ b/firmware/controllers/algo/enum_strings.cpp @@ -82,3 +82,18 @@ const char * pinModeToString(pin_output_mode_e mode) { return "unexpected"; } } + +const char * algorithmToString(engine_load_mode_e mode) { + switch(mode) { + case LM_TPS: + return "Alpha-N"; + case LM_MAF: + return "Maf"; + case LM_MAP: + return "pMap"; + case LM_SPEED_DENSITY: + return "SD"; + default: + return "unexpected"; + } +} diff --git a/firmware/controllers/algo/enum_strings.h b/firmware/controllers/algo/enum_strings.h index 5e52694cfd..237f2e527e 100644 --- a/firmware/controllers/algo/enum_strings.h +++ b/firmware/controllers/algo/enum_strings.h @@ -12,5 +12,6 @@ const char* getConfigurationName(engine_type_e engineType); const char * pinModeToString(pin_output_mode_e mode); +const char * algorithmToString(engine_load_mode_e mode); #endif /* ENUM_STRINGS_H_ */ diff --git a/firmware/rusefi.cpp b/firmware/rusefi.cpp index 76e7e34708..ba901b69a9 100644 --- a/firmware/rusefi.cpp +++ b/firmware/rusefi.cpp @@ -229,5 +229,5 @@ void firmwareError(const char *fmt, ...) { } int getRusEfiVersion(void) { - return 20140903; + return 20140904; } diff --git a/firmware/tunerstudio/rusefi.ini b/firmware/tunerstudio/rusefi.ini index 19af88302c..5aa2ac7c07 100644 --- a/firmware/tunerstudio/rusefi.ini +++ b/firmware/tunerstudio/rusefi.ini @@ -1,6 +1,6 @@ ; this is TunerStudio project for www.rusefi.com DIY engine management system -; version 20140831 +; version 20140904 ; this should stop TS from looking for the CAN ID in the 2nd byte location and allow the page reads to work correctly. enable2ndByteCanID = false @@ -108,7 +108,7 @@ enable2ndByteCanID = false fixedModeTiming = scalar, U32, 784, "RPM", 1, 0, 0, 3000.0, 0 ; size 4 engineType = bits, U32, 788, [0:2], "AUDI_AAN", "DODGE_NEON_1995", "FORD_ASPIRE_1996", "FORD_FIESTA", "NISSAN_PRIMERA", "HONDA_ACCORD", "FORD_INLINE_6_1995", "GY6_139QMB" - fuelKeyBins = array, F32, 792, [16], "V", 1, 0, 0.0, 10.0, 2; size 132 + fuelKeyBins = array, F32, 792, [16], "V", 1, 0, 0.0, 300.0, 2; size 132 fuelRpmBins = array, F32, 856, [16], "RPM", 1, 0, 0.0, 25500.0, 2; size 92 displacement = scalar, F32, 920, "°C", 1, 0, 0, 1000.0, 2 ; size 4 rpmHardLimit = scalar, U32, 924, "°C", 1, 0, 0, 10000.0, 2 ; size 4 diff --git a/win32_functional_tests/simulator/global.h b/win32_functional_tests/simulator/global.h index f9965336fc..3b54042660 100644 --- a/win32_functional_tests/simulator/global.h +++ b/win32_functional_tests/simulator/global.h @@ -5,6 +5,7 @@ #include #include "rusefi_enums.h" +#include "enum_strings.h" #include "obd_error_codes.h" #include "error_handling.h"