rusefi
/
rusefi-1
mirror of https://github.com/rusefi/rusefi-1.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

auto-sync

This commit is contained in:
rusEfi 2015-12-11 16:01:41 -05:00
parent 412d4843d9
commit a254a66d56
6 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
firmware/controllers/algo/engine_configuration_generated_structures.h
View File

@ -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 // begin
#include "rusefi_types.h" #include "rusefi_types.h"
typedef struct { typedef struct {
@ -884,7 +884,7 @@ typedef struct {
*/ */
angle_t injectionOffset; angle_t injectionOffset;
/** /**
* Timing advance while cranking enginee * Timing advance while cranking engine
* offset 440 * offset 440
*/ */
angle_t crankingTimingAngle; angle_t crankingTimingAngle;
@ -1592,4 +1592,4 @@ typedef struct {
} persistent_config_s; } persistent_config_s;
// end // 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

2
firmware/controllers/algo/malfunction_central.c
View File

@ -2,6 +2,8 @@
* @file malfunction_central.c * @file malfunction_central.c
* @brief This data structure holds current malfunction codes * @brief This data structure holds current malfunction codes
* *
* todo: make this a class
*
* @date Dec 20, 2013 * @date Dec 20, 2013
* @author Andrey Belomutskiy, (c) 2012-2015 * @author Andrey Belomutskiy, (c) 2012-2015
*/ */

2
firmware/controllers/algo/rusefi_generated.h
View File

@ -1,5 +1,5 @@
#define LE_COMMAND_LENGTH 200 #define LE_COMMAND_LENGTH 200
#define TS_FILE_VERSION 20150625 #define TS_FILE_VERSION 20151201
#define MAP_ANGLE_SIZE 8 #define MAP_ANGLE_SIZE 8
#define MAP_WINDOW_SIZE 8 #define MAP_WINDOW_SIZE 8
#define CLT_CURVE_SIZE 16 #define CLT_CURVE_SIZE 16

4
firmware/integration/rusefi_config.txt
View File

@ -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 ! 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 #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 crankingInjectionMode;
injection_mode_e injectionMode; 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 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" custom ignition_mode_e 4 bits, U32, @OFFSET@, [0:1], "One coil", "Individual Coils", "Wasted", "INVALID"
ignition_mode_e ignitionMode; ignition_mode_e ignitionMode;

2
firmware/rusefi.cpp
View File

@ -275,5 +275,5 @@ int getRusEfiVersion(void) {
return 123; // this is here to make the compiler happy about the unused array return 123; // this is here to make the compiler happy about the unused array
if (UNUSED_CCM_SIZE[0] * 0 != 0) if (UNUSED_CCM_SIZE[0] * 0 != 0)
return 3211; // this is here to make the compiler happy about the unused array return 3211; // this is here to make the compiler happy about the unused array
return 20151201; return 20151208;
} }

5
firmware/tunerstudio/rusefi.ini
View File

@ -47,7 +47,7 @@ enable2ndByteCanID = false
; see PAGE_0_SIZE in C source code ; see PAGE_0_SIZE in C source code
; CONFIG_DEFINITION_START ; 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 pageSize = 16088
page = 1 page = 1
@ -615,7 +615,7 @@ page = 1
[OutputChannels] [OutputChannels]
; see TS_FILE_VERSION in firmware code ; see TS_FILE_VERSION in firmware code
fileVersion = { 20150625 } fileVersion = { 20151201 }
#if CAN_COMMANDS #if CAN_COMMANDS
;full version that works anywhere - be sure to change the no. bytes requested ;full version that works anywhere - be sure to change the no. bytes requested
@ -1127,6 +1127,7 @@ fileVersion = { 20150625 }
dialog = injChars, "Injector Settings", yAxis dialog = injChars, "Injector Settings", yAxis
field = "Injector Open Time", injector_lag field = "Injector Open Time", injector_lag
field = "Injector Flow", injector_flow field = "Injector Flow", injector_flow
field = "phase offset", injectionOffset
field = "Engine Cycle", engineCycleDuration field = "Engine Cycle", engineCycleDuration
dialog = injIO, "Injector Output", yAxis dialog = injIO, "Injector Output", yAxis