From 6c0fec4c8e55079f14ff5493a8a2ae86917f8002 Mon Sep 17 00:00:00 2001 From: rusEfi Date: Thu, 28 May 2015 21:06:50 -0400 Subject: [PATCH] auto-sync --- .../algo/engine_configuration_generated_structures.h | 9 ++++++--- firmware/controllers/algo/rusefi_generated.h | 3 ++- firmware/integration/rusefi_config.txt | 4 ++-- firmware/rusefi.cpp | 2 +- firmware/tunerstudio/rusefi.ini | 5 +++-- 5 files changed, 14 insertions(+), 9 deletions(-) diff --git a/firmware/controllers/algo/engine_configuration_generated_structures.h b/firmware/controllers/algo/engine_configuration_generated_structures.h index 76bad5e976..0ca2cb2644 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 by config_definition.jar on Sun May 24 11:16:32 EDT 2015 +// this section was generated by config_definition.jar on Thu May 28 20:18:40 EDT 2015 // begin #include "rusefi_types.h" typedef struct { @@ -657,7 +657,7 @@ typedef struct { /** * offset 868 */ - int unused2342342; + brain_input_pin_e frequencyReportingMapInputPin; /** total size 872*/ } board_configuration_s; @@ -999,6 +999,9 @@ typedef struct { /** offset 1496 bit 17 */ bool_t cutSparkOnHardLimit : 1; + /** + offset 1496 bit 18 */ + bool_t hasFrequencyReportingMapSensor : 1; /** * offset 1500 */ @@ -1363,4 +1366,4 @@ typedef struct { } persistent_config_s; // end -// this section was generated by config_definition.jar on Sun May 24 11:16:32 EDT 2015 +// this section was generated by config_definition.jar on Thu May 28 20:18:40 EDT 2015 diff --git a/firmware/controllers/algo/rusefi_generated.h b/firmware/controllers/algo/rusefi_generated.h index 02eceba299..d588f2ffef 100644 --- a/firmware/controllers/algo/rusefi_generated.h +++ b/firmware/controllers/algo/rusefi_generated.h @@ -518,7 +518,7 @@ #define fsioDigitalInputs14_offset 1480 #define fsioDigitalInputs15_offset 1484 #define fsioDigitalInputs16_offset 1488 -#define unused2342342_offset 1492 +#define frequencyReportingMapInputPin_offset 1492 #define hasMapSensor_offset 1496 #define hasIatSensor_offset 1496 #define hasBaroSensor_offset 1496 @@ -537,6 +537,7 @@ #define hasTpsSensor_offset 1496 #define cutFuelOnHardLimit_offset 1496 #define cutSparkOnHardLimit_offset 1496 +#define hasFrequencyReportingMapSensor_offset 1496 #define hipOutputChannel_offset 1500 #define idleMode_offset 1504 #define isInjectionEnabled_offset 1508 diff --git a/firmware/integration/rusefi_config.txt b/firmware/integration/rusefi_config.txt index 3d4606ef4e..42dc9d460a 100644 --- a/firmware/integration/rusefi_config.txt +++ b/firmware/integration/rusefi_config.txt @@ -448,7 +448,7 @@ brain_input_pin_e vehicleSpeedSensorInputPin; pin_input_mode_e clutchUpPinMode; brain_pin_e[LE_COMMAND_COUNT iterate] fsioDigitalInputs;These input pins allow us to pull toggle buttons state; -int unused2342342; +brain_input_pin_e frequencyReportingMapInputPin; end_struct @@ -473,7 +473,7 @@ bit hasMapSensor;@see isMapAveragingEnabled bit hasTpsSensor bit cutFuelOnHardLimit bit cutSparkOnHardLimit - +bit hasFrequencyReportingMapSensor; adc_channel_e hipOutputChannel; idle_mode_e idleMode; diff --git a/firmware/rusefi.cpp b/firmware/rusefi.cpp index 457a2ac503..19f7489c70 100644 --- a/firmware/rusefi.cpp +++ b/firmware/rusefi.cpp @@ -291,5 +291,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 20150525; + return 20150528; } diff --git a/firmware/tunerstudio/rusefi.ini b/firmware/tunerstudio/rusefi.ini index 387d3d2b9a..dec17efa0a 100644 --- a/firmware/tunerstudio/rusefi.ini +++ b/firmware/tunerstudio/rusefi.ini @@ -41,7 +41,7 @@ enable2ndByteCanID = false ; see PAGE_0_SIZE in C source code ; CONFIG_DEFINITION_START -; this section was generated by ConfigDefinition.jar on Sun May 24 11:16:37 EDT 2015 +; this section was generated by ConfigDefinition.jar on Thu May 28 20:18:42 EDT 2015 pageSize = 15288 page = 1 @@ -369,7 +369,7 @@ page = 1 fsioDigitalInputs14 = bits, U32, 1480, [0:6], "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "NONE", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" fsioDigitalInputs15 = bits, U32, 1484, [0:6], "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "NONE", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" fsioDigitalInputs16 = bits, U32, 1488, [0:6], "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "NONE", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" -;skipping unused2342342 offset 1492 + frequencyReportingMapInputPin = bits, U32, 1492, [0:6], "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "PA5", "INVALID", "INVALID", "PA8", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "PC6", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "PE5", "INVALID", "PE7", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "NONE", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" hasMapSensor = bits, U32, 1496, [0:0], "false", "true" hasIatSensor = bits, U32, 1496, [1:1], "false", "true" hasBaroSensor = bits, U32, 1496, [2:2], "false", "true" @@ -388,6 +388,7 @@ page = 1 hasTpsSensor = bits, U32, 1496, [15:15], "false", "true" cutFuelOnHardLimit = bits, U32, 1496, [16:16], "false", "true" cutSparkOnHardLimit = bits, U32, 1496, [17:17], "false", "true" + hasFrequencyReportingMapSensor= bits, U32, 1496, [18:18], "false", "true" hipOutputChannel = bits, U32, 1500, [0:3] "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PB0", "PB1", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5" ;skipping idleMode offset 1504 isInjectionEnabled = bits, U32, 1508, [0:0], "false", "true"