From 7be4c750334d79912beaed244165ce6b4026aeda Mon Sep 17 00:00:00 2001 From: rusefi Date: Sat, 9 May 2020 18:59:03 -0400 Subject: [PATCH] Fresh generated - auto --- .../algo/engine_configuration_generated_structures.h | 11 +++++++---- .../engine_configuration_generated_structures.h | 11 +++++++---- firmware/tunerstudio/rusefi.ini | 10 ++++++++-- firmware/tunerstudio/rusefi_frankenso.ini | 10 ++++++++-- firmware/tunerstudio/rusefi_kinetis.ini | 10 ++++++++-- firmware/tunerstudio/rusefi_microrusefi.ini | 10 ++++++++-- firmware/tunerstudio/rusefi_prometheus.ini | 10 ++++++++-- firmware/tunerstudio/rusefi_proteus.ini | 10 ++++++++-- 8 files changed, 62 insertions(+), 20 deletions(-) diff --git a/firmware/config/boards/kinetis/config/controllers/algo/engine_configuration_generated_structures.h b/firmware/config/boards/kinetis/config/controllers/algo/engine_configuration_generated_structures.h index ecd02e474e..fa0e9d7ab4 100644 --- a/firmware/config/boards/kinetis/config/controllers/algo/engine_configuration_generated_structures.h +++ b/firmware/config/boards/kinetis/config/controllers/algo/engine_configuration_generated_structures.h @@ -1,4 +1,4 @@ -// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on kineris_gen_config.bat integration/rusefi_config.txt Fri May 08 22:00:16 EDT 2020 +// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on kineris_gen_config.bat integration/rusefi_config.txt Sat May 09 18:58:46 EDT 2020 // by class com.rusefi.output.CHeaderConsumer // begin #ifndef CONFIG_BOARDS_KINETIS_CONFIG_CONTROLLERS_ALGO_ENGINE_CONFIGURATION_GENERATED_STRUCTURES_H @@ -2351,12 +2351,15 @@ struct engine_configuration_s { */ float wwaeBeta; /** - * blue LED on discovery by default + * blue LED on many rusEFI boards. + * Blue Communication LED which is expected to blink at 50% duty cycle during normal board operation. + * If USB communication cable is connected Blue LED starts to blink faster. * offset 1812 */ brain_pin_e communicationLedPin; /** - * green LED on discovery by default + * Green LED on many rusEFI boards. + * Off if engine is stopped, blinks if engine is cranking, solid if engine is running. * offset 1813 */ brain_pin_e runningLedPin; @@ -3452,4 +3455,4 @@ typedef struct persistent_config_s persistent_config_s; #endif // end -// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on kineris_gen_config.bat integration/rusefi_config.txt Fri May 08 22:00:16 EDT 2020 +// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on kineris_gen_config.bat integration/rusefi_config.txt Sat May 09 18:58:46 EDT 2020 diff --git a/firmware/controllers/generated/engine_configuration_generated_structures.h b/firmware/controllers/generated/engine_configuration_generated_structures.h index a4a09dc6b6..ee88a2a55e 100644 --- a/firmware/controllers/generated/engine_configuration_generated_structures.h +++ b/firmware/controllers/generated/engine_configuration_generated_structures.h @@ -1,4 +1,4 @@ -// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.bat integration\rusefi_config.txt Fri May 08 22:00:03 EDT 2020 +// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.bat integration\rusefi_config.txt Sat May 09 18:58:34 EDT 2020 // by class com.rusefi.output.CHeaderConsumer // begin #ifndef CONTROLLERS_GENERATED_ENGINE_CONFIGURATION_GENERATED_STRUCTURES_H @@ -2351,12 +2351,15 @@ struct engine_configuration_s { */ float wwaeBeta; /** - * blue LED on discovery by default + * blue LED on many rusEFI boards. + * Blue Communication LED which is expected to blink at 50% duty cycle during normal board operation. + * If USB communication cable is connected Blue LED starts to blink faster. * offset 1812 */ brain_pin_e communicationLedPin; /** - * green LED on discovery by default + * Green LED on many rusEFI boards. + * Off if engine is stopped, blinks if engine is cranking, solid if engine is running. * offset 1813 */ brain_pin_e runningLedPin; @@ -3452,4 +3455,4 @@ typedef struct persistent_config_s persistent_config_s; #endif // end -// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.bat integration\rusefi_config.txt Fri May 08 22:00:03 EDT 2020 +// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.bat integration\rusefi_config.txt Sat May 09 18:58:34 EDT 2020 diff --git a/firmware/tunerstudio/rusefi.ini b/firmware/tunerstudio/rusefi.ini index 4e468831e5..0d096b970c 100644 --- a/firmware/tunerstudio/rusefi.ini +++ b/firmware/tunerstudio/rusefi.ini @@ -89,7 +89,7 @@ enable2ndByteCanID = false ; see PAGE_0_SIZE in C source code ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.bat integration\rusefi_config.txt Sat May 09 03:45:38 EDT 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.bat integration\rusefi_config.txt Sat May 09 18:58:34 EDT 2020 pageSize = 20000 page = 1 @@ -1284,6 +1284,8 @@ page = 1 tachPulseTriggerIndex = "Trigger cycle index at which we start tach pulse (performance consideration)" wwaeTau = "Length of time the deposited wall fuel takes to dissipate after the start of acceleration. " wwaeBeta = "0 = No fuel settling on port walls 1 = All the fuel settling on port walls setting this to 0 disables the wall wetting enrichment. " + communicationLedPin = "blue LED on many rusEFI boards.\nBlue Communication LED which is expected to blink at 50% duty cycle during normal board operation.\nIf USB communication cable is connected Blue LED starts to blink faster." + runningLedPin = "Green LED on many rusEFI boards.\nOff if engine is stopped, blinks if engine is cranking, solid if engine is running." throttlePedalWOTVoltage = "Pedal in the floor" startUpFuelPumpDuration = "on ECU start turn fuel pump on to build fuel pressure" targetVBatt = "This is the target battery voltage the alternator PID control will attempt to maintain" @@ -1560,7 +1562,9 @@ page = 1 ; calibation helpers calibrationValue = scalar, F32, 128, "", 1, 0 calibrationMode = scalar, U08, 132, "", 1, 0 - ; 3 bytes padding1 + ; 1 bytes padding1 + + engineMakeCodeNameCrc16= scalar, U16, 134, "crc16", 1, 0 ; Errors totalTriggerErrorCounter=scalar,U32, 136,"counter", 1, 0 @@ -2452,6 +2456,8 @@ gaugeCategory = Sensors - Raw entry = debugIntField5, "debug i5",int,"%d", { !enableLogDebugChannels } + entry = engineMakeCodeNameCrc16, "Engine CRC16",int,"%d" + entry = engineMode, "Engine Mode",int,"%d" entry = warningCounter, "warning: counter",int,"%d" entry = lastErrorCode, "warning: last",int,"%d" diff --git a/firmware/tunerstudio/rusefi_frankenso.ini b/firmware/tunerstudio/rusefi_frankenso.ini index 87c651c425..869c6a26c1 100644 --- a/firmware/tunerstudio/rusefi_frankenso.ini +++ b/firmware/tunerstudio/rusefi_frankenso.ini @@ -89,7 +89,7 @@ enable2ndByteCanID = false ; see PAGE_0_SIZE in C source code ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.bat integration\rusefi_config.txt Sat May 09 03:45:51 EDT 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.bat integration\rusefi_config.txt Sat May 09 18:58:40 EDT 2020 pageSize = 20000 page = 1 @@ -1284,6 +1284,8 @@ page = 1 tachPulseTriggerIndex = "Trigger cycle index at which we start tach pulse (performance consideration)" wwaeTau = "Length of time the deposited wall fuel takes to dissipate after the start of acceleration. " wwaeBeta = "0 = No fuel settling on port walls 1 = All the fuel settling on port walls setting this to 0 disables the wall wetting enrichment. " + communicationLedPin = "blue LED on many rusEFI boards.\nBlue Communication LED which is expected to blink at 50% duty cycle during normal board operation.\nIf USB communication cable is connected Blue LED starts to blink faster." + runningLedPin = "Green LED on many rusEFI boards.\nOff if engine is stopped, blinks if engine is cranking, solid if engine is running." throttlePedalWOTVoltage = "Pedal in the floor" startUpFuelPumpDuration = "on ECU start turn fuel pump on to build fuel pressure" targetVBatt = "This is the target battery voltage the alternator PID control will attempt to maintain" @@ -1560,7 +1562,9 @@ page = 1 ; calibation helpers calibrationValue = scalar, F32, 128, "", 1, 0 calibrationMode = scalar, U08, 132, "", 1, 0 - ; 3 bytes padding1 + ; 1 bytes padding1 + + engineMakeCodeNameCrc16= scalar, U16, 134, "crc16", 1, 0 ; Errors totalTriggerErrorCounter=scalar,U32, 136,"counter", 1, 0 @@ -2452,6 +2456,8 @@ gaugeCategory = Sensors - Raw entry = debugIntField5, "debug i5",int,"%d", { !enableLogDebugChannels } + entry = engineMakeCodeNameCrc16, "Engine CRC16",int,"%d" + entry = engineMode, "Engine Mode",int,"%d" entry = warningCounter, "warning: counter",int,"%d" entry = lastErrorCode, "warning: last",int,"%d" diff --git a/firmware/tunerstudio/rusefi_kinetis.ini b/firmware/tunerstudio/rusefi_kinetis.ini index 9bf3ae6fb1..10a9ee0fc4 100644 --- a/firmware/tunerstudio/rusefi_kinetis.ini +++ b/firmware/tunerstudio/rusefi_kinetis.ini @@ -89,7 +89,7 @@ enable2ndByteCanID = false ; see PAGE_0_SIZE in C source code ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on kineris_gen_config.bat integration/rusefi_config.txt Sat May 09 03:45:55 EDT 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on kineris_gen_config.bat integration/rusefi_config.txt Sat May 09 18:58:46 EDT 2020 pageSize = 20000 page = 1 @@ -1284,6 +1284,8 @@ page = 1 tachPulseTriggerIndex = "Trigger cycle index at which we start tach pulse (performance consideration)" wwaeTau = "Length of time the deposited wall fuel takes to dissipate after the start of acceleration. " wwaeBeta = "0 = No fuel settling on port walls 1 = All the fuel settling on port walls setting this to 0 disables the wall wetting enrichment. " + communicationLedPin = "blue LED on many rusEFI boards.\nBlue Communication LED which is expected to blink at 50% duty cycle during normal board operation.\nIf USB communication cable is connected Blue LED starts to blink faster." + runningLedPin = "Green LED on many rusEFI boards.\nOff if engine is stopped, blinks if engine is cranking, solid if engine is running." throttlePedalWOTVoltage = "Pedal in the floor" startUpFuelPumpDuration = "on ECU start turn fuel pump on to build fuel pressure" targetVBatt = "This is the target battery voltage the alternator PID control will attempt to maintain" @@ -1560,7 +1562,9 @@ page = 1 ; calibation helpers calibrationValue = scalar, F32, 128, "", 1, 0 calibrationMode = scalar, U08, 132, "", 1, 0 - ; 3 bytes padding1 + ; 1 bytes padding1 + + engineMakeCodeNameCrc16= scalar, U16, 134, "crc16", 1, 0 ; Errors totalTriggerErrorCounter=scalar,U32, 136,"counter", 1, 0 @@ -2452,6 +2456,8 @@ gaugeCategory = Sensors - Raw entry = debugIntField5, "debug i5",int,"%d", { !enableLogDebugChannels } + entry = engineMakeCodeNameCrc16, "Engine CRC16",int,"%d" + entry = engineMode, "Engine Mode",int,"%d" entry = warningCounter, "warning: counter",int,"%d" entry = lastErrorCode, "warning: last",int,"%d" diff --git a/firmware/tunerstudio/rusefi_microrusefi.ini b/firmware/tunerstudio/rusefi_microrusefi.ini index 3464a2fee0..7138eb1d97 100644 --- a/firmware/tunerstudio/rusefi_microrusefi.ini +++ b/firmware/tunerstudio/rusefi_microrusefi.ini @@ -89,7 +89,7 @@ enable2ndByteCanID = false ; see PAGE_0_SIZE in C source code ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.bat integration\rusefi_config.txt Sat May 09 03:45:49 EDT 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.bat integration\rusefi_config.txt Sat May 09 18:58:38 EDT 2020 pageSize = 20000 page = 1 @@ -1284,6 +1284,8 @@ page = 1 tachPulseTriggerIndex = "Trigger cycle index at which we start tach pulse (performance consideration)" wwaeTau = "Length of time the deposited wall fuel takes to dissipate after the start of acceleration. " wwaeBeta = "0 = No fuel settling on port walls 1 = All the fuel settling on port walls setting this to 0 disables the wall wetting enrichment. " + communicationLedPin = "blue LED on many rusEFI boards.\nBlue Communication LED which is expected to blink at 50% duty cycle during normal board operation.\nIf USB communication cable is connected Blue LED starts to blink faster." + runningLedPin = "Green LED on many rusEFI boards.\nOff if engine is stopped, blinks if engine is cranking, solid if engine is running." throttlePedalWOTVoltage = "Pedal in the floor" startUpFuelPumpDuration = "on ECU start turn fuel pump on to build fuel pressure" targetVBatt = "This is the target battery voltage the alternator PID control will attempt to maintain" @@ -1560,7 +1562,9 @@ page = 1 ; calibation helpers calibrationValue = scalar, F32, 128, "", 1, 0 calibrationMode = scalar, U08, 132, "", 1, 0 - ; 3 bytes padding1 + ; 1 bytes padding1 + + engineMakeCodeNameCrc16= scalar, U16, 134, "crc16", 1, 0 ; Errors totalTriggerErrorCounter=scalar,U32, 136,"counter", 1, 0 @@ -2452,6 +2456,8 @@ gaugeCategory = Sensors - Raw entry = debugIntField5, "debug i5",int,"%d", { !enableLogDebugChannels } + entry = engineMakeCodeNameCrc16, "Engine CRC16",int,"%d" + entry = engineMode, "Engine Mode",int,"%d" entry = warningCounter, "warning: counter",int,"%d" entry = lastErrorCode, "warning: last",int,"%d" diff --git a/firmware/tunerstudio/rusefi_prometheus.ini b/firmware/tunerstudio/rusefi_prometheus.ini index d0ecd48207..3c461efbc1 100644 --- a/firmware/tunerstudio/rusefi_prometheus.ini +++ b/firmware/tunerstudio/rusefi_prometheus.ini @@ -89,7 +89,7 @@ enable2ndByteCanID = false ; see PAGE_0_SIZE in C source code ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.bat integration\rusefi_config.txt Sat May 09 03:45:52 EDT 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.bat integration\rusefi_config.txt Sat May 09 18:58:42 EDT 2020 pageSize = 20000 page = 1 @@ -1284,6 +1284,8 @@ page = 1 tachPulseTriggerIndex = "Trigger cycle index at which we start tach pulse (performance consideration)" wwaeTau = "Length of time the deposited wall fuel takes to dissipate after the start of acceleration. " wwaeBeta = "0 = No fuel settling on port walls 1 = All the fuel settling on port walls setting this to 0 disables the wall wetting enrichment. " + communicationLedPin = "blue LED on many rusEFI boards.\nBlue Communication LED which is expected to blink at 50% duty cycle during normal board operation.\nIf USB communication cable is connected Blue LED starts to blink faster." + runningLedPin = "Green LED on many rusEFI boards.\nOff if engine is stopped, blinks if engine is cranking, solid if engine is running." throttlePedalWOTVoltage = "Pedal in the floor" startUpFuelPumpDuration = "on ECU start turn fuel pump on to build fuel pressure" targetVBatt = "This is the target battery voltage the alternator PID control will attempt to maintain" @@ -1560,7 +1562,9 @@ page = 1 ; calibation helpers calibrationValue = scalar, F32, 128, "", 1, 0 calibrationMode = scalar, U08, 132, "", 1, 0 - ; 3 bytes padding1 + ; 1 bytes padding1 + + engineMakeCodeNameCrc16= scalar, U16, 134, "crc16", 1, 0 ; Errors totalTriggerErrorCounter=scalar,U32, 136,"counter", 1, 0 @@ -2452,6 +2456,8 @@ gaugeCategory = Sensors - Raw entry = debugIntField5, "debug i5",int,"%d", { !enableLogDebugChannels } + entry = engineMakeCodeNameCrc16, "Engine CRC16",int,"%d" + entry = engineMode, "Engine Mode",int,"%d" entry = warningCounter, "warning: counter",int,"%d" entry = lastErrorCode, "warning: last",int,"%d" diff --git a/firmware/tunerstudio/rusefi_proteus.ini b/firmware/tunerstudio/rusefi_proteus.ini index 7a3c72d339..3032d4d3e9 100644 --- a/firmware/tunerstudio/rusefi_proteus.ini +++ b/firmware/tunerstudio/rusefi_proteus.ini @@ -89,7 +89,7 @@ enable2ndByteCanID = false ; see PAGE_0_SIZE in C source code ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.bat integration\rusefi_config.txt Sat May 09 03:45:53 EDT 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.bat integration\rusefi_config.txt Sat May 09 18:58:44 EDT 2020 pageSize = 20000 page = 1 @@ -1284,6 +1284,8 @@ page = 1 tachPulseTriggerIndex = "Trigger cycle index at which we start tach pulse (performance consideration)" wwaeTau = "Length of time the deposited wall fuel takes to dissipate after the start of acceleration. " wwaeBeta = "0 = No fuel settling on port walls 1 = All the fuel settling on port walls setting this to 0 disables the wall wetting enrichment. " + communicationLedPin = "blue LED on many rusEFI boards.\nBlue Communication LED which is expected to blink at 50% duty cycle during normal board operation.\nIf USB communication cable is connected Blue LED starts to blink faster." + runningLedPin = "Green LED on many rusEFI boards.\nOff if engine is stopped, blinks if engine is cranking, solid if engine is running." throttlePedalWOTVoltage = "Pedal in the floor" startUpFuelPumpDuration = "on ECU start turn fuel pump on to build fuel pressure" targetVBatt = "This is the target battery voltage the alternator PID control will attempt to maintain" @@ -1560,7 +1562,9 @@ page = 1 ; calibation helpers calibrationValue = scalar, F32, 128, "", 1, 0 calibrationMode = scalar, U08, 132, "", 1, 0 - ; 3 bytes padding1 + ; 1 bytes padding1 + + engineMakeCodeNameCrc16= scalar, U16, 134, "crc16", 1, 0 ; Errors totalTriggerErrorCounter=scalar,U32, 136,"counter", 1, 0 @@ -2452,6 +2456,8 @@ gaugeCategory = Sensors - Raw entry = debugIntField5, "debug i5",int,"%d", { !enableLogDebugChannels } + entry = engineMakeCodeNameCrc16, "Engine CRC16",int,"%d" + entry = engineMode, "Engine Mode",int,"%d" entry = warningCounter, "warning: counter",int,"%d" entry = lastErrorCode, "warning: last",int,"%d"