diff --git a/firmware/controllers/algo/engine_configuration_generated_structures.h b/firmware/controllers/algo/engine_configuration_generated_structures.h index dae4ae0f63..aea7ffbc6e 100644 --- a/firmware/controllers/algo/engine_configuration_generated_structures.h +++ b/firmware/controllers/algo/engine_configuration_generated_structures.h @@ -1,4 +1,4 @@ -// this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Tue Dec 01 20:29:19 EST 2015 +// this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Tue Dec 08 10:02:06 EST 2015 // begin #include "rusefi_types.h" typedef struct { @@ -884,7 +884,7 @@ typedef struct { */ angle_t injectionOffset; /** - * Timing advance while cranking enginee + * Timing advance while cranking engine * offset 440 */ angle_t crankingTimingAngle; @@ -1592,4 +1592,4 @@ typedef struct { } persistent_config_s; // end -// this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Tue Dec 01 20:29:19 EST 2015 +// this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Tue Dec 08 10:02:06 EST 2015 diff --git a/firmware/controllers/algo/malfunction_central.c b/firmware/controllers/algo/malfunction_central.c index 141083aa7d..d892f2cf7c 100644 --- a/firmware/controllers/algo/malfunction_central.c +++ b/firmware/controllers/algo/malfunction_central.c @@ -2,6 +2,8 @@ * @file malfunction_central.c * @brief This data structure holds current malfunction codes * + * todo: make this a class + * * @date Dec 20, 2013 * @author Andrey Belomutskiy, (c) 2012-2015 */ diff --git a/firmware/controllers/algo/rusefi_generated.h b/firmware/controllers/algo/rusefi_generated.h index 7684b23b00..d0c888080c 100644 --- a/firmware/controllers/algo/rusefi_generated.h +++ b/firmware/controllers/algo/rusefi_generated.h @@ -1,5 +1,5 @@ #define LE_COMMAND_LENGTH 200 -#define TS_FILE_VERSION 20150625 +#define TS_FILE_VERSION 20151201 #define MAP_ANGLE_SIZE 8 #define MAP_WINDOW_SIZE 8 #define CLT_CURVE_SIZE 16 diff --git a/firmware/integration/rusefi_config.txt b/firmware/integration/rusefi_config.txt index 5ec53bbe28..3c6eee403f 100644 --- a/firmware/integration/rusefi_config.txt +++ b/firmware/integration/rusefi_config.txt @@ -20,7 +20,7 @@ struct_no_prefix engine_configuration_s ! ! this is used to confirm that firmware and TunerStudio are using the same rusefi.ini version ! -#define TS_FILE_VERSION 20150625 +#define TS_FILE_VERSION 20151201 #define MAP_ANGLE_SIZE 8 @@ -203,7 +203,7 @@ custom injection_mode_e 4 bits, U32, @OFFSET@, [0:1], "Simultaneous", "Sequentia injection_mode_e crankingInjectionMode; injection_mode_e injectionMode; angle_t injectionOffset;this is about deciding when the injector starts it's squirt\nSee also injectionPhase map;"deg", 1, 0.0, -720, 720, 2 -angle_t crankingTimingAngle;Timing advance while cranking enginee; "deg", 1, 0.0, -360, 360, 2 +angle_t crankingTimingAngle;Timing advance while cranking engine; "deg", 1, 0.0, -360, 360, 2 custom ignition_mode_e 4 bits, U32, @OFFSET@, [0:1], "One coil", "Individual Coils", "Wasted", "INVALID" ignition_mode_e ignitionMode; diff --git a/firmware/rusefi.cpp b/firmware/rusefi.cpp index 4565e41ba4..f8f65ee616 100644 --- a/firmware/rusefi.cpp +++ b/firmware/rusefi.cpp @@ -275,5 +275,5 @@ int getRusEfiVersion(void) { return 123; // this is here to make the compiler happy about the unused array if (UNUSED_CCM_SIZE[0] * 0 != 0) return 3211; // this is here to make the compiler happy about the unused array - return 20151201; + return 20151208; } diff --git a/firmware/tunerstudio/rusefi.ini b/firmware/tunerstudio/rusefi.ini index 636c79cd78..bdb23a0f68 100644 --- a/firmware/tunerstudio/rusefi.ini +++ b/firmware/tunerstudio/rusefi.ini @@ -47,7 +47,7 @@ enable2ndByteCanID = false ; see PAGE_0_SIZE in C source code ; CONFIG_DEFINITION_START -; this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Tue Dec 01 20:29:19 EST 2015 +; this section was generated automatically by ConfigDefinition.jar based on rusefi_config.txt Tue Dec 08 10:02:06 EST 2015 pageSize = 16088 page = 1 @@ -615,7 +615,7 @@ page = 1 [OutputChannels] ; see TS_FILE_VERSION in firmware code -fileVersion = { 20150625 } +fileVersion = { 20151201 } #if CAN_COMMANDS ;full version that works anywhere - be sure to change the no. bytes requested @@ -1127,6 +1127,7 @@ fileVersion = { 20150625 } dialog = injChars, "Injector Settings", yAxis field = "Injector Open Time", injector_lag field = "Injector Flow", injector_flow + field = "phase offset", injectionOffset field = "Engine Cycle", engineCycleDuration dialog = injIO, "Injector Output", yAxis