From 004fea843793ea8b0e42f8d440c23645cd77e40d Mon Sep 17 00:00:00 2001 From: rusefi Date: Fri, 29 May 2020 20:30:23 -0400 Subject: [PATCH 01/14] dreams? --- hardware/Breakout_134pin_7-967288-1-Connector/known_issues.txt | 1 + 1 file changed, 1 insertion(+) create mode 100644 hardware/Breakout_134pin_7-967288-1-Connector/known_issues.txt diff --git a/hardware/Breakout_134pin_7-967288-1-Connector/known_issues.txt b/hardware/Breakout_134pin_7-967288-1-Connector/known_issues.txt new file mode 100644 index 0000000000..660b0130a2 --- /dev/null +++ b/hardware/Breakout_134pin_7-967288-1-Connector/known_issues.txt @@ -0,0 +1 @@ +1) left and right side x9 pin section need much wider traces at least where possible - some of those are used for not smart coils thus higher current. From 4747d83e0fc1ad6d2dc619e33ea75f06be85cb70 Mon Sep 17 00:00:00 2001 From: rusefi Date: Fri, 29 May 2020 21:00:19 -0400 Subject: [PATCH 02/14] [Feature Request] Transmission Control #1454 two bytes of progress --- firmware/integration/rusefi_config.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/firmware/integration/rusefi_config.txt b/firmware/integration/rusefi_config.txt index 55dca19563..2feee1089b 100644 --- a/firmware/integration/rusefi_config.txt +++ b/firmware/integration/rusefi_config.txt @@ -1045,8 +1045,8 @@ int16_t tps2Max;Full throttle#2. tpsMax value as 10 bit ADC value. Not Voltage!\ brain_pin_e binarySerialRxPin; brain_pin_e[AUX_DIGITAL_VALVE_COUNT iterate] auxValves - brain_pin_e unusedConsoleSerialTxPin; todo: finish pin migration from hard-coded to configurable? - brain_pin_e unusedConsoleSerialRxPin;todo: finish pin migration from hard-coded to configurable? + switch_input_pin_e tcuUpshiftButtonPin + switch_input_pin_e tcuDownshiftButtonPin float[ENGINE_NOISE_CURVE_SIZE] knockNoise;Knock sensor output knock detection threshold depending on current RPM;"v", 1, 0, 0.0, 10, 2 From e34940fd6dcacf860c435c73b9e5a2b81988cdf9 Mon Sep 17 00:00:00 2001 From: rusefi Date: Fri, 29 May 2020 21:00:34 -0400 Subject: [PATCH 03/14] [Feature Request] Transmission Control #1454 two bytes of progress --- .../engine_configuration_generated_structures.h | 11 +++++------ .../engine_configuration_generated_structures.h | 11 +++++------ .../src/com/rusefi/config/generated/Fields.java | 14 +++++++------- 3 files changed, 17 insertions(+), 19 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 1dd2bc27e8..4ac5b6461b 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 Sat May 23 19:22:14 EDT 2020 +// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on kineris_gen_config.bat integration/rusefi_config.txt Fri May 29 20:38:54 EDT 2020 // by class com.rusefi.output.CHeaderConsumer // begin #ifndef CONFIG_BOARDS_KINETIS_CONFIG_CONTROLLERS_ALGO_ENGINE_CONFIGURATION_GENERATED_STRUCTURES_H @@ -1923,6 +1923,7 @@ struct engine_configuration_s { */ output_pin_e tcu_solenoid[TCU_SOLENOID_COUNT]; /** + * switch_input_pin_e startStopButtonPin * offset 1200 */ int unusedAtOldBoardConfigurationEnd[65]; @@ -2395,15 +2396,13 @@ struct engine_configuration_s { */ brain_pin_e auxValves[AUX_DIGITAL_VALVE_COUNT]; /** - * todo: finish pin migration from hard-coded to configurable? * offset 1818 */ - brain_pin_e unusedConsoleSerialTxPin; + switch_input_pin_e tcuUpshiftButtonPin; /** - * todo: finish pin migration from hard-coded to configurable? * offset 1819 */ - brain_pin_e unusedConsoleSerialRxPin; + switch_input_pin_e tcuDownshiftButtonPin; /** * Knock sensor output knock detection threshold depending on current RPM * offset 1820 @@ -3523,4 +3522,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 Sat May 23 19:22:14 EDT 2020 +// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on kineris_gen_config.bat integration/rusefi_config.txt Fri May 29 20:38:54 EDT 2020 diff --git a/firmware/controllers/generated/engine_configuration_generated_structures.h b/firmware/controllers/generated/engine_configuration_generated_structures.h index 32f3ff25bd..bb85547651 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 Sat May 23 10:54:57 EDT 2020 +// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.bat integration\rusefi_config.txt Fri May 29 20:38:41 EDT 2020 // by class com.rusefi.output.CHeaderConsumer // begin #ifndef CONTROLLERS_GENERATED_ENGINE_CONFIGURATION_GENERATED_STRUCTURES_H @@ -1923,6 +1923,7 @@ struct engine_configuration_s { */ output_pin_e tcu_solenoid[TCU_SOLENOID_COUNT]; /** + * switch_input_pin_e startStopButtonPin * offset 1200 */ int unusedAtOldBoardConfigurationEnd[65]; @@ -2395,15 +2396,13 @@ struct engine_configuration_s { */ brain_pin_e auxValves[AUX_DIGITAL_VALVE_COUNT]; /** - * todo: finish pin migration from hard-coded to configurable? * offset 1818 */ - brain_pin_e unusedConsoleSerialTxPin; + switch_input_pin_e tcuUpshiftButtonPin; /** - * todo: finish pin migration from hard-coded to configurable? * offset 1819 */ - brain_pin_e unusedConsoleSerialRxPin; + switch_input_pin_e tcuDownshiftButtonPin; /** * Knock sensor output knock detection threshold depending on current RPM * offset 1820 @@ -3523,4 +3522,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 Sat May 23 10:54:57 EDT 2020 +// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.bat integration\rusefi_config.txt Fri May 29 20:38:41 EDT 2020 diff --git a/java_console/models/src/com/rusefi/config/generated/Fields.java b/java_console/models/src/com/rusefi/config/generated/Fields.java index 19ce82d391..3b8f6379f0 100644 --- a/java_console/models/src/com/rusefi/config/generated/Fields.java +++ b/java_console/models/src/com/rusefi/config/generated/Fields.java @@ -1,6 +1,6 @@ package com.rusefi.config.generated; -// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.bat integration\rusefi_config.txt Thu May 28 17:58:11 EDT 2020 +// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.bat integration\rusefi_config.txt Fri May 29 20:38:41 EDT 2020 // by class com.rusefi.output.FileJavaFieldsConsumer import com.rusefi.config.*; @@ -1131,6 +1131,8 @@ public class Fields { public static final int tcu_solenoid7_offset = 1198; public static final int tcu_solenoid8_offset = 1199; public static final int TCU_SOLENOID_COUNT = 8; + public static final int tcuDownshiftButtonPin_offset = 1819; + public static final int tcuUpshiftButtonPin_offset = 1818; public static final int test557pin_offset = 3101; public static final int throttlePedalPositionAdcChannel_offset = 580; public static final int throttlePedalPositionSecondAdcChannel_offset = 683; @@ -1316,8 +1318,6 @@ public class Fields { public static final int unusedBit_283_30_offset = 976; public static final int unusedBit_283_31_offset = 976; public static final int unusedBit_34_31_offset = 76; - public static final int unusedConsoleSerialRxPin_offset = 1819; - public static final int unusedConsoleSerialTxPin_offset = 1818; public static final int unusedFlexFuelSensor_offset = 3100; public static final int unusedHere_offset = 761; public static final int unusedHereWeHave_offset = 1464; @@ -2085,8 +2085,8 @@ public class Fields { public static final Field BINARYSERIALRXPIN = Field.create("BINARYSERIALRXPIN", 1815, FieldType.INT8, brain_pin_e); public static final Field AUXVALVES1 = Field.create("AUXVALVES1", 1816, FieldType.INT8, brain_pin_e); public static final Field AUXVALVES2 = Field.create("AUXVALVES2", 1817, FieldType.INT8, brain_pin_e); - public static final Field UNUSEDCONSOLESERIALTXPIN = Field.create("UNUSEDCONSOLESERIALTXPIN", 1818, FieldType.INT8, brain_pin_e); - public static final Field UNUSEDCONSOLESERIALRXPIN = Field.create("UNUSEDCONSOLESERIALRXPIN", 1819, FieldType.INT8, brain_pin_e); + public static final Field TCUUPSHIFTBUTTONPIN = Field.create("TCUUPSHIFTBUTTONPIN", 1818, FieldType.INT8, switch_input_pin_e); + public static final Field TCUDOWNSHIFTBUTTONPIN = Field.create("TCUDOWNSHIFTBUTTONPIN", 1819, FieldType.INT8, switch_input_pin_e); public static final Field THROTTLEPEDALUPVOLTAGE = Field.create("THROTTLEPEDALUPVOLTAGE", 1884, FieldType.FLOAT); public static final Field THROTTLEPEDALWOTVOLTAGE = Field.create("THROTTLEPEDALWOTVOLTAGE", 1888, FieldType.FLOAT); public static final Field STARTUPFUELPUMPDURATION = Field.create("STARTUPFUELPUMPDURATION", 1892, FieldType.INT16); @@ -3078,8 +3078,8 @@ public class Fields { BINARYSERIALRXPIN, AUXVALVES1, AUXVALVES2, - UNUSEDCONSOLESERIALTXPIN, - UNUSEDCONSOLESERIALRXPIN, + TCUUPSHIFTBUTTONPIN, + TCUDOWNSHIFTBUTTONPIN, THROTTLEPEDALUPVOLTAGE, THROTTLEPEDALWOTVOLTAGE, STARTUPFUELPUMPDURATION, From c000a28d1aa65436350535352047c788710e0649 Mon Sep 17 00:00:00 2001 From: rusefi Date: Fri, 29 May 2020 21:23:59 -0400 Subject: [PATCH 04/14] Fresh generated - auto --- .../algo/engine_configuration_generated_structures.h | 5 ++--- .../kinetis/config/controllers/algo/rusefi_generated.h | 4 ++-- .../generated/engine_configuration_generated_structures.h | 5 ++--- firmware/controllers/generated/rusefi_generated.h | 4 ++-- firmware/tunerstudio/rusefi.ini | 6 +++--- firmware/tunerstudio/rusefi_frankenso.ini | 6 +++--- firmware/tunerstudio/rusefi_kinetis.ini | 6 +++--- firmware/tunerstudio/rusefi_microrusefi.ini | 6 +++--- firmware/tunerstudio/rusefi_prometheus.ini | 6 +++--- firmware/tunerstudio/rusefi_proteus.ini | 6 +++--- 10 files changed, 26 insertions(+), 28 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 4ac5b6461b..d2c8843766 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 29 20:38:54 EDT 2020 +// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on kineris_gen_config.bat integration/rusefi_config.txt Fri May 29 21:22:44 EDT 2020 // by class com.rusefi.output.CHeaderConsumer // begin #ifndef CONFIG_BOARDS_KINETIS_CONFIG_CONTROLLERS_ALGO_ENGINE_CONFIGURATION_GENERATED_STRUCTURES_H @@ -1923,7 +1923,6 @@ struct engine_configuration_s { */ output_pin_e tcu_solenoid[TCU_SOLENOID_COUNT]; /** - * switch_input_pin_e startStopButtonPin * offset 1200 */ int unusedAtOldBoardConfigurationEnd[65]; @@ -3522,4 +3521,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 29 20:38:54 EDT 2020 +// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on kineris_gen_config.bat integration/rusefi_config.txt Fri May 29 21:22:44 EDT 2020 diff --git a/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h b/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h index 411983b411..4a8a6f0a72 100644 --- a/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h +++ b/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h @@ -1149,6 +1149,8 @@ #define tcu_solenoid7_offset 1198 #define tcu_solenoid8_offset 1199 #define TCU_SOLENOID_COUNT 8 +#define tcuDownshiftButtonPin_offset 1819 +#define tcuUpshiftButtonPin_offset 1818 #define test557pin_offset 3101 #define throttlePedalPositionAdcChannel_offset 580 #define throttlePedalPositionSecondAdcChannel_offset 683 @@ -1353,8 +1355,6 @@ #define unusedBit_283_30_offset 976 #define unusedBit_283_31_offset 976 #define unusedBit_34_31_offset 76 -#define unusedConsoleSerialRxPin_offset 1819 -#define unusedConsoleSerialTxPin_offset 1818 #define unusedFlexFuelSensor_offset 3100 #define unusedHere_offset 761 #define unusedHereWeHave_offset 1464 diff --git a/firmware/controllers/generated/engine_configuration_generated_structures.h b/firmware/controllers/generated/engine_configuration_generated_structures.h index bb85547651..9d60992377 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 29 20:38:41 EDT 2020 +// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.bat integration\rusefi_config.txt Fri May 29 21:22:15 EDT 2020 // by class com.rusefi.output.CHeaderConsumer // begin #ifndef CONTROLLERS_GENERATED_ENGINE_CONFIGURATION_GENERATED_STRUCTURES_H @@ -1923,7 +1923,6 @@ struct engine_configuration_s { */ output_pin_e tcu_solenoid[TCU_SOLENOID_COUNT]; /** - * switch_input_pin_e startStopButtonPin * offset 1200 */ int unusedAtOldBoardConfigurationEnd[65]; @@ -3522,4 +3521,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 29 20:38:41 EDT 2020 +// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.bat integration\rusefi_config.txt Fri May 29 21:22:15 EDT 2020 diff --git a/firmware/controllers/generated/rusefi_generated.h b/firmware/controllers/generated/rusefi_generated.h index be9f90995e..ea9ef2d723 100644 --- a/firmware/controllers/generated/rusefi_generated.h +++ b/firmware/controllers/generated/rusefi_generated.h @@ -1149,6 +1149,8 @@ #define tcu_solenoid7_offset 1198 #define tcu_solenoid8_offset 1199 #define TCU_SOLENOID_COUNT 8 +#define tcuDownshiftButtonPin_offset 1819 +#define tcuUpshiftButtonPin_offset 1818 #define test557pin_offset 3101 #define throttlePedalPositionAdcChannel_offset 580 #define throttlePedalPositionSecondAdcChannel_offset 683 @@ -1353,8 +1355,6 @@ #define unusedBit_283_30_offset 976 #define unusedBit_283_31_offset 976 #define unusedBit_34_31_offset 76 -#define unusedConsoleSerialRxPin_offset 1819 -#define unusedConsoleSerialTxPin_offset 1818 #define unusedFlexFuelSensor_offset 3100 #define unusedHere_offset 761 #define unusedHereWeHave_offset 1464 diff --git a/firmware/tunerstudio/rusefi.ini b/firmware/tunerstudio/rusefi.ini index 53f830e0bf..782bc3e51d 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 Sun May 24 13:55:11 EDT 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.bat integration\rusefi_config.txt Fri May 29 21:22:15 EDT 2020 pageSize = 20000 page = 1 @@ -797,8 +797,8 @@ page = 1 binarySerialRxPin = bits, U08, 1815, [0:7], "NONE", "INVALID", "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", "PF0","PF1","PF2","PF3","PF4","PF5","PF6","PF7","PF8","PF9","PF10","PF11","PF12","PF13","PF14","PF15", "PG0","PG1","PG2","PG3","PG4","PG5","PG6","PG7","PG8","PG9","PG10","PG11","PG12","PG13","PG14","PG15", "PH0","PH1","PH2","PH3","PH4","PH5","PH6","PH7","PH8","PH9","PH10","PH11","PH12","PH13","PH14","PH15","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" auxValves1 = bits, U08, 1816, [0:7], "NONE", "INVALID", "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", "PF0","PF1","PF2","PF3","PF4","PF5","PF6","PF7","PF8","PF9","PF10","PF11","PF12","PF13","PF14","PF15", "PG0","PG1","PG2","PG3","PG4","PG5","PG6","PG7","PG8","PG9","PG10","PG11","PG12","PG13","PG14","PG15", "PH0","PH1","PH2","PH3","PH4","PH5","PH6","PH7","PH8","PH9","PH10","PH11","PH12","PH13","PH14","PH15","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" auxValves2 = bits, U08, 1817, [0:7], "NONE", "INVALID", "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", "PF0","PF1","PF2","PF3","PF4","PF5","PF6","PF7","PF8","PF9","PF10","PF11","PF12","PF13","PF14","PF15", "PG0","PG1","PG2","PG3","PG4","PG5","PG6","PG7","PG8","PG9","PG10","PG11","PG12","PG13","PG14","PG15", "PH0","PH1","PH2","PH3","PH4","PH5","PH6","PH7","PH8","PH9","PH10","PH11","PH12","PH13","PH14","PH15","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" - unusedConsoleSerialTxPin = bits, U08, 1818, [0:7], "NONE", "INVALID", "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", "PF0","PF1","PF2","PF3","PF4","PF5","PF6","PF7","PF8","PF9","PF10","PF11","PF12","PF13","PF14","PF15", "PG0","PG1","PG2","PG3","PG4","PG5","PG6","PG7","PG8","PG9","PG10","PG11","PG12","PG13","PG14","PG15", "PH0","PH1","PH2","PH3","PH4","PH5","PH6","PH7","PH8","PH9","PH10","PH11","PH12","PH13","PH14","PH15","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" - unusedConsoleSerialRxPin = bits, U08, 1819, [0:7], "NONE", "INVALID", "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", "PF0","PF1","PF2","PF3","PF4","PF5","PF6","PF7","PF8","PF9","PF10","PF11","PF12","PF13","PF14","PF15", "PG0","PG1","PG2","PG3","PG4","PG5","PG6","PG7","PG8","PG9","PG10","PG11","PG12","PG13","PG14","PG15", "PH0","PH1","PH2","PH3","PH4","PH5","PH6","PH7","PH8","PH9","PH10","PH11","PH12","PH13","PH14","PH15","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" + tcuUpshiftButtonPin = bits, U08, 1818, [0:7], "NONE", "INVALID", "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", "PF0","PF1","PF2","PF3","PF4","PF5","PF6","PF7","PF8","PF9","PF10","PF11","PF12","PF13","PF14","PF15", "PG0","PG1","PG2","PG3","PG4","PG5","PG6","PG7","PG8","PG9","PG10","PG11","PG12","PG13","PG14","PG15", "PH0","PH1","PH2","PH3","PH4","PH5","PH6","PH7","PH8","PH9","PH10","PH11","PH12","PH13","PH14","PH15","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" + tcuDownshiftButtonPin = bits, U08, 1819, [0:7], "NONE", "INVALID", "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", "PF0","PF1","PF2","PF3","PF4","PF5","PF6","PF7","PF8","PF9","PF10","PF11","PF12","PF13","PF14","PF15", "PG0","PG1","PG2","PG3","PG4","PG5","PG6","PG7","PG8","PG9","PG10","PG11","PG12","PG13","PG14","PG15", "PH0","PH1","PH2","PH3","PH4","PH5","PH6","PH7","PH8","PH9","PH10","PH11","PH12","PH13","PH14","PH15","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" knockNoise = array, F32, 1820, [8], "v", 1, 0, 0.0, 10, 2 knockNoiseRpmBins = array, F32, 1852, [8], "RPM", 1, 0, 0.0, 18000, 2 throttlePedalUpVoltage = scalar, F32, 1884, "voltage", 1, 0, -6, 6, 2 diff --git a/firmware/tunerstudio/rusefi_frankenso.ini b/firmware/tunerstudio/rusefi_frankenso.ini index dae855354a..bd7982a13b 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 Sun May 24 13:56:05 EDT 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.bat integration\rusefi_config.txt Fri May 29 21:22:29 EDT 2020 pageSize = 20000 page = 1 @@ -797,8 +797,8 @@ page = 1 binarySerialRxPin = bits, U08, 1815, [0:7], "NONE", "INVALID", "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", "PF0","PF1","PF2","PF3","PF4","PF5","PF6","PF7","PF8","PF9","PF10","PF11","PF12","PF13","PF14","PF15", "PG0","PG1","PG2","PG3","PG4","PG5","PG6","PG7","PG8","PG9","PG10","PG11","PG12","PG13","PG14","PG15", "PH0","PH1","PH2","PH3","PH4","PH5","PH6","PH7","PH8","PH9","PH10","PH11","PH12","PH13","PH14","PH15","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" auxValves1 = bits, U08, 1816, [0:7], "NONE", "INVALID", "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", "PF0","PF1","PF2","PF3","PF4","PF5","PF6","PF7","PF8","PF9","PF10","PF11","PF12","PF13","PF14","PF15", "PG0","PG1","PG2","PG3","PG4","PG5","PG6","PG7","PG8","PG9","PG10","PG11","PG12","PG13","PG14","PG15", "PH0","PH1","PH2","PH3","PH4","PH5","PH6","PH7","PH8","PH9","PH10","PH11","PH12","PH13","PH14","PH15","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" auxValves2 = bits, U08, 1817, [0:7], "NONE", "INVALID", "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", "PF0","PF1","PF2","PF3","PF4","PF5","PF6","PF7","PF8","PF9","PF10","PF11","PF12","PF13","PF14","PF15", "PG0","PG1","PG2","PG3","PG4","PG5","PG6","PG7","PG8","PG9","PG10","PG11","PG12","PG13","PG14","PG15", "PH0","PH1","PH2","PH3","PH4","PH5","PH6","PH7","PH8","PH9","PH10","PH11","PH12","PH13","PH14","PH15","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" - unusedConsoleSerialTxPin = bits, U08, 1818, [0:7], "NONE", "INVALID", "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", "PF0","PF1","PF2","PF3","PF4","PF5","PF6","PF7","PF8","PF9","PF10","PF11","PF12","PF13","PF14","PF15", "PG0","PG1","PG2","PG3","PG4","PG5","PG6","PG7","PG8","PG9","PG10","PG11","PG12","PG13","PG14","PG15", "PH0","PH1","PH2","PH3","PH4","PH5","PH6","PH7","PH8","PH9","PH10","PH11","PH12","PH13","PH14","PH15","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" - unusedConsoleSerialRxPin = bits, U08, 1819, [0:7], "NONE", "INVALID", "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", "PF0","PF1","PF2","PF3","PF4","PF5","PF6","PF7","PF8","PF9","PF10","PF11","PF12","PF13","PF14","PF15", "PG0","PG1","PG2","PG3","PG4","PG5","PG6","PG7","PG8","PG9","PG10","PG11","PG12","PG13","PG14","PG15", "PH0","PH1","PH2","PH3","PH4","PH5","PH6","PH7","PH8","PH9","PH10","PH11","PH12","PH13","PH14","PH15","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" + tcuUpshiftButtonPin = bits, U08, 1818, [0:7], "NONE", "INVALID", "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", "PF0","PF1","PF2","PF3","PF4","PF5","PF6","PF7","PF8","PF9","PF10","PF11","PF12","PF13","PF14","PF15", "PG0","PG1","PG2","PG3","PG4","PG5","PG6","PG7","PG8","PG9","PG10","PG11","PG12","PG13","PG14","PG15", "PH0","PH1","PH2","PH3","PH4","PH5","PH6","PH7","PH8","PH9","PH10","PH11","PH12","PH13","PH14","PH15","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" + tcuDownshiftButtonPin = bits, U08, 1819, [0:7], "NONE", "INVALID", "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", "PF0","PF1","PF2","PF3","PF4","PF5","PF6","PF7","PF8","PF9","PF10","PF11","PF12","PF13","PF14","PF15", "PG0","PG1","PG2","PG3","PG4","PG5","PG6","PG7","PG8","PG9","PG10","PG11","PG12","PG13","PG14","PG15", "PH0","PH1","PH2","PH3","PH4","PH5","PH6","PH7","PH8","PH9","PH10","PH11","PH12","PH13","PH14","PH15","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" knockNoise = array, F32, 1820, [8], "v", 1, 0, 0.0, 10, 2 knockNoiseRpmBins = array, F32, 1852, [8], "RPM", 1, 0, 0.0, 18000, 2 throttlePedalUpVoltage = scalar, F32, 1884, "voltage", 1, 0, -6, 6, 2 diff --git a/firmware/tunerstudio/rusefi_kinetis.ini b/firmware/tunerstudio/rusefi_kinetis.ini index 1fdfa4f922..7926a6ff76 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 Sun May 24 13:57:09 EDT 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on kineris_gen_config.bat integration/rusefi_config.txt Fri May 29 21:22:44 EDT 2020 pageSize = 20000 page = 1 @@ -797,8 +797,8 @@ page = 1 binarySerialRxPin = bits, U08, 1815, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PA16", "PA17", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PB16", "PB17", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PC16", "PC17", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PD16", "PD17", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PE16", "PE17", "TLE6240_1", "TLE6240_2", "TLE6240_3", "TLE6240_4", "TLE6240_5", "TLE6240_6", "TLE6240_7", "TLE6240_8", "TLE6240_9", "TLE6240_10", "TLE6240_11", "TLE6240_12", "TLE6240_13", "TLE6240_14", "TLE6240_15", "TLE6240_16" auxValves1 = bits, U08, 1816, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PA16", "PA17", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PB16", "PB17", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PC16", "PC17", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PD16", "PD17", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PE16", "PE17", "TLE6240_1", "TLE6240_2", "TLE6240_3", "TLE6240_4", "TLE6240_5", "TLE6240_6", "TLE6240_7", "TLE6240_8", "TLE6240_9", "TLE6240_10", "TLE6240_11", "TLE6240_12", "TLE6240_13", "TLE6240_14", "TLE6240_15", "TLE6240_16" auxValves2 = bits, U08, 1817, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PA16", "PA17", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PB16", "PB17", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PC16", "PC17", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PD16", "PD17", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PE16", "PE17", "TLE6240_1", "TLE6240_2", "TLE6240_3", "TLE6240_4", "TLE6240_5", "TLE6240_6", "TLE6240_7", "TLE6240_8", "TLE6240_9", "TLE6240_10", "TLE6240_11", "TLE6240_12", "TLE6240_13", "TLE6240_14", "TLE6240_15", "TLE6240_16" - unusedConsoleSerialTxPin = bits, U08, 1818, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PA16", "PA17", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PB16", "PB17", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PC16", "PC17", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PD16", "PD17", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PE16", "PE17", "TLE6240_1", "TLE6240_2", "TLE6240_3", "TLE6240_4", "TLE6240_5", "TLE6240_6", "TLE6240_7", "TLE6240_8", "TLE6240_9", "TLE6240_10", "TLE6240_11", "TLE6240_12", "TLE6240_13", "TLE6240_14", "TLE6240_15", "TLE6240_16" - unusedConsoleSerialRxPin = bits, U08, 1819, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PA16", "PA17", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PB16", "PB17", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PC16", "PC17", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PD16", "PD17", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PE16", "PE17", "TLE6240_1", "TLE6240_2", "TLE6240_3", "TLE6240_4", "TLE6240_5", "TLE6240_6", "TLE6240_7", "TLE6240_8", "TLE6240_9", "TLE6240_10", "TLE6240_11", "TLE6240_12", "TLE6240_13", "TLE6240_14", "TLE6240_15", "TLE6240_16" + tcuUpshiftButtonPin = bits, U08, 1818, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "N/A", "N/A", "PA10", "PA11", "PA12", "PA13", "N/A", "N/A", "N/A", "N/A", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "N/A", "N/A", "N/A", "N/A", "PB12", "PB13", "N/A", "N/A", "N/A", "N/A", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "N/A", "N/A", "N/A", "N/A", "PC14", "PC15", "PC16", "PC17", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "PD15", "PD16", "N/A", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A" + tcuDownshiftButtonPin = bits, U08, 1819, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "N/A", "N/A", "PA10", "PA11", "PA12", "PA13", "N/A", "N/A", "N/A", "N/A", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "N/A", "N/A", "N/A", "N/A", "PB12", "PB13", "N/A", "N/A", "N/A", "N/A", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "N/A", "N/A", "N/A", "N/A", "PC14", "PC15", "PC16", "PC17", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "PD15", "PD16", "N/A", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A" knockNoise = array, F32, 1820, [8], "v", 1, 0, 0.0, 10, 2 knockNoiseRpmBins = array, F32, 1852, [8], "RPM", 1, 0, 0.0, 18000, 2 throttlePedalUpVoltage = scalar, F32, 1884, "voltage", 1, 0, -6, 6, 2 diff --git a/firmware/tunerstudio/rusefi_microrusefi.ini b/firmware/tunerstudio/rusefi_microrusefi.ini index a2bfc14099..bff50c73d7 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 Sun May 24 13:55:45 EDT 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.bat integration\rusefi_config.txt Fri May 29 21:22:26 EDT 2020 pageSize = 20000 page = 1 @@ -797,8 +797,8 @@ page = 1 binarySerialRxPin = bits, U08, 1815, [0:7], "NONE", "INVALID", "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", "PF0","PF1","PF2","PF3","PF4","PF5","PF6","PF7","PF8","PF9","PF10","PF11","PF12","PF13","PF14","PF15", "PG0","PG1","PG2","PG3","PG4","PG5","PG6","PG7","PG8","PG9","PG10","PG11","PG12","PG13","PG14","PG15", "PH0","PH1","PH2","PH3","PH4","PH5","PH6","PH7","PH8","PH9","PH10","PH11","PH12","PH13","PH14","PH15","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" auxValves1 = bits, U08, 1816, [0:7], "NONE", "INVALID", "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", "PF0","PF1","PF2","PF3","PF4","PF5","PF6","PF7","PF8","PF9","PF10","PF11","PF12","PF13","PF14","PF15", "PG0","PG1","PG2","PG3","PG4","PG5","PG6","PG7","PG8","PG9","PG10","PG11","PG12","PG13","PG14","PG15", "PH0","PH1","PH2","PH3","PH4","PH5","PH6","PH7","PH8","PH9","PH10","PH11","PH12","PH13","PH14","PH15","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" auxValves2 = bits, U08, 1817, [0:7], "NONE", "INVALID", "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", "PF0","PF1","PF2","PF3","PF4","PF5","PF6","PF7","PF8","PF9","PF10","PF11","PF12","PF13","PF14","PF15", "PG0","PG1","PG2","PG3","PG4","PG5","PG6","PG7","PG8","PG9","PG10","PG11","PG12","PG13","PG14","PG15", "PH0","PH1","PH2","PH3","PH4","PH5","PH6","PH7","PH8","PH9","PH10","PH11","PH12","PH13","PH14","PH15","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" - unusedConsoleSerialTxPin = bits, U08, 1818, [0:7], "NONE", "INVALID", "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", "PF0","PF1","PF2","PF3","PF4","PF5","PF6","PF7","PF8","PF9","PF10","PF11","PF12","PF13","PF14","PF15", "PG0","PG1","PG2","PG3","PG4","PG5","PG6","PG7","PG8","PG9","PG10","PG11","PG12","PG13","PG14","PG15", "PH0","PH1","PH2","PH3","PH4","PH5","PH6","PH7","PH8","PH9","PH10","PH11","PH12","PH13","PH14","PH15","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" - unusedConsoleSerialRxPin = bits, U08, 1819, [0:7], "NONE", "INVALID", "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", "PF0","PF1","PF2","PF3","PF4","PF5","PF6","PF7","PF8","PF9","PF10","PF11","PF12","PF13","PF14","PF15", "PG0","PG1","PG2","PG3","PG4","PG5","PG6","PG7","PG8","PG9","PG10","PG11","PG12","PG13","PG14","PG15", "PH0","PH1","PH2","PH3","PH4","PH5","PH6","PH7","PH8","PH9","PH10","PH11","PH12","PH13","PH14","PH15","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" + tcuUpshiftButtonPin = bits, U08, 1818, [0:7], "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","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","Brake Switch","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","Clutch Switch","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","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","INVALID" + tcuDownshiftButtonPin = bits, U08, 1819, [0:7], "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","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","Brake Switch","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","Clutch Switch","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","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","INVALID" knockNoise = array, F32, 1820, [8], "v", 1, 0, 0.0, 10, 2 knockNoiseRpmBins = array, F32, 1852, [8], "RPM", 1, 0, 0.0, 18000, 2 throttlePedalUpVoltage = scalar, F32, 1884, "voltage", 1, 0, -6, 6, 2 diff --git a/firmware/tunerstudio/rusefi_prometheus.ini b/firmware/tunerstudio/rusefi_prometheus.ini index 3a45f4db7f..c8f3d79569 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 Sun May 24 13:56:41 EDT 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.bat integration\rusefi_config.txt Fri May 29 21:22:38 EDT 2020 pageSize = 20000 page = 1 @@ -797,8 +797,8 @@ page = 1 binarySerialRxPin = bits, U08, 1815, [0:7], "NONE", "INVALID", "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", "PF0","PF1","PF2","PF3","PF4","PF5","PF6","PF7","PF8","PF9","PF10","PF11","PF12","PF13","PF14","PF15", "PG0","PG1","PG2","PG3","PG4","PG5","PG6","PG7","PG8","PG9","PG10","PG11","PG12","PG13","PG14","PG15", "PH0","PH1","PH2","PH3","PH4","PH5","PH6","PH7","PH8","PH9","PH10","PH11","PH12","PH13","PH14","PH15","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" auxValves1 = bits, U08, 1816, [0:7], "NONE", "INVALID", "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", "PF0","PF1","PF2","PF3","PF4","PF5","PF6","PF7","PF8","PF9","PF10","PF11","PF12","PF13","PF14","PF15", "PG0","PG1","PG2","PG3","PG4","PG5","PG6","PG7","PG8","PG9","PG10","PG11","PG12","PG13","PG14","PG15", "PH0","PH1","PH2","PH3","PH4","PH5","PH6","PH7","PH8","PH9","PH10","PH11","PH12","PH13","PH14","PH15","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" auxValves2 = bits, U08, 1817, [0:7], "NONE", "INVALID", "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", "PF0","PF1","PF2","PF3","PF4","PF5","PF6","PF7","PF8","PF9","PF10","PF11","PF12","PF13","PF14","PF15", "PG0","PG1","PG2","PG3","PG4","PG5","PG6","PG7","PG8","PG9","PG10","PG11","PG12","PG13","PG14","PG15", "PH0","PH1","PH2","PH3","PH4","PH5","PH6","PH7","PH8","PH9","PH10","PH11","PH12","PH13","PH14","PH15","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" - unusedConsoleSerialTxPin = bits, U08, 1818, [0:7], "NONE", "INVALID", "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", "PF0","PF1","PF2","PF3","PF4","PF5","PF6","PF7","PF8","PF9","PF10","PF11","PF12","PF13","PF14","PF15", "PG0","PG1","PG2","PG3","PG4","PG5","PG6","PG7","PG8","PG9","PG10","PG11","PG12","PG13","PG14","PG15", "PH0","PH1","PH2","PH3","PH4","PH5","PH6","PH7","PH8","PH9","PH10","PH11","PH12","PH13","PH14","PH15","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" - unusedConsoleSerialRxPin = bits, U08, 1819, [0:7], "NONE", "INVALID", "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", "PF0","PF1","PF2","PF3","PF4","PF5","PF6","PF7","PF8","PF9","PF10","PF11","PF12","PF13","PF14","PF15", "PG0","PG1","PG2","PG3","PG4","PG5","PG6","PG7","PG8","PG9","PG10","PG11","PG12","PG13","PG14","PG15", "PH0","PH1","PH2","PH3","PH4","PH5","PH6","PH7","PH8","PH9","PH10","PH11","PH12","PH13","PH14","PH15","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" + tcuUpshiftButtonPin = bits, U08, 1818, [0:7], "NONE", "INVALID", "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", "PF0","PF1","PF2","PF3","PF4","PF5","PF6","PF7","PF8","PF9","PF10","PF11","PF12","PF13","PF14","PF15", "PG0","PG1","PG2","PG3","PG4","PG5","PG6","PG7","PG8","PG9","PG10","PG11","PG12","PG13","PG14","PG15", "PH0","PH1","PH2","PH3","PH4","PH5","PH6","PH7","PH8","PH9","PH10","PH11","PH12","PH13","PH14","PH15","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" + tcuDownshiftButtonPin = bits, U08, 1819, [0:7], "NONE", "INVALID", "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", "PF0","PF1","PF2","PF3","PF4","PF5","PF6","PF7","PF8","PF9","PF10","PF11","PF12","PF13","PF14","PF15", "PG0","PG1","PG2","PG3","PG4","PG5","PG6","PG7","PG8","PG9","PG10","PG11","PG12","PG13","PG14","PG15", "PH0","PH1","PH2","PH3","PH4","PH5","PH6","PH7","PH8","PH9","PH10","PH11","PH12","PH13","PH14","PH15","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" knockNoise = array, F32, 1820, [8], "v", 1, 0, 0.0, 10, 2 knockNoiseRpmBins = array, F32, 1852, [8], "RPM", 1, 0, 0.0, 18000, 2 throttlePedalUpVoltage = scalar, F32, 1884, "voltage", 1, 0, -6, 6, 2 diff --git a/firmware/tunerstudio/rusefi_proteus.ini b/firmware/tunerstudio/rusefi_proteus.ini index 60a1cfb52c..5be83e2894 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 Sun May 24 13:56:56 EDT 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.bat integration\rusefi_config.txt Fri May 29 21:22:40 EDT 2020 pageSize = 20000 page = 1 @@ -797,8 +797,8 @@ page = 1 binarySerialRxPin = bits, U08, 1815, [0:7], "NONE", "INVALID", "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", "PF0","PF1","PF2","PF3","PF4","PF5","PF6","PF7","PF8","PF9","PF10","PF11","PF12","PF13","PF14","PF15", "PG0","PG1","PG2","PG3","PG4","PG5","PG6","PG7","PG8","PG9","PG10","PG11","PG12","PG13","PG14","PG15", "PH0","PH1","PH2","PH3","PH4","PH5","PH6","PH7","PH8","PH9","PH10","PH11","PH12","PH13","PH14","PH15","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" auxValves1 = bits, U08, 1816, [0:7], "NONE", "INVALID", "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", "PF0","PF1","PF2","PF3","PF4","PF5","PF6","PF7","PF8","PF9","PF10","PF11","PF12","PF13","PF14","PF15", "PG0","PG1","PG2","PG3","PG4","PG5","PG6","PG7","PG8","PG9","PG10","PG11","PG12","PG13","PG14","PG15", "PH0","PH1","PH2","PH3","PH4","PH5","PH6","PH7","PH8","PH9","PH10","PH11","PH12","PH13","PH14","PH15","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" auxValves2 = bits, U08, 1817, [0:7], "NONE", "INVALID", "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", "PF0","PF1","PF2","PF3","PF4","PF5","PF6","PF7","PF8","PF9","PF10","PF11","PF12","PF13","PF14","PF15", "PG0","PG1","PG2","PG3","PG4","PG5","PG6","PG7","PG8","PG9","PG10","PG11","PG12","PG13","PG14","PG15", "PH0","PH1","PH2","PH3","PH4","PH5","PH6","PH7","PH8","PH9","PH10","PH11","PH12","PH13","PH14","PH15","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" - unusedConsoleSerialTxPin = bits, U08, 1818, [0:7], "NONE", "INVALID", "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", "PF0","PF1","PF2","PF3","PF4","PF5","PF6","PF7","PF8","PF9","PF10","PF11","PF12","PF13","PF14","PF15", "PG0","PG1","PG2","PG3","PG4","PG5","PG6","PG7","PG8","PG9","PG10","PG11","PG12","PG13","PG14","PG15", "PH0","PH1","PH2","PH3","PH4","PH5","PH6","PH7","PH8","PH9","PH10","PH11","PH12","PH13","PH14","PH15","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" - unusedConsoleSerialRxPin = bits, U08, 1819, [0:7], "NONE", "INVALID", "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", "PF0","PF1","PF2","PF3","PF4","PF5","PF6","PF7","PF8","PF9","PF10","PF11","PF12","PF13","PF14","PF15", "PG0","PG1","PG2","PG3","PG4","PG5","PG6","PG7","PG8","PG9","PG10","PG11","PG12","PG13","PG14","PG15", "PH0","PH1","PH2","PH3","PH4","PH5","PH6","PH7","PH8","PH9","PH10","PH11","PH12","PH13","PH14","PH15","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" + tcuUpshiftButtonPin = bits, U08, 1818, [0:7], "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","Digital 1","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","Digital 2","Digital 3","Digital 4","Digital 5","Digital 6","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","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","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID" + tcuDownshiftButtonPin = bits, U08, 1819, [0:7], "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","Digital 1","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","Digital 2","Digital 3","Digital 4","Digital 5","Digital 6","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","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","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID" knockNoise = array, F32, 1820, [8], "v", 1, 0, 0.0, 10, 2 knockNoiseRpmBins = array, F32, 1852, [8], "RPM", 1, 0, 0.0, 18000, 2 throttlePedalUpVoltage = scalar, F32, 1884, "voltage", 1, 0, -6, 6, 2 From 056bc631af1cff214e9ec87cc3f12305528c45be Mon Sep 17 00:00:00 2001 From: rusefi Date: Fri, 29 May 2020 23:05:16 -0400 Subject: [PATCH 05/14] [Feature Request] Transmission Control #1454 --- firmware/controllers/algo/engine.h | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/firmware/controllers/algo/engine.h b/firmware/controllers/algo/engine.h index dabc4526be..a5c3371399 100644 --- a/firmware/controllers/algo/engine.h +++ b/firmware/controllers/algo/engine.h @@ -49,6 +49,11 @@ class RpmCalculator; class IEtbController; +class TCU { +public: + gear_e currentGear = NEUTRAL; +}; + class Engine : public TriggerStateListener { public: explicit Engine(persistent_config_s *config); @@ -58,6 +63,8 @@ public: cyclic_buffer triggerErrorDetection; + TCU tcu; + #if EFI_SHAFT_POSITION_INPUT void OnTriggerStateDecodingError(); void OnTriggerStateProperState(efitick_t nowNt) override; From a20a1b5fe4b22b6548b9716079899b148ca95d56 Mon Sep 17 00:00:00 2001 From: rusefi Date: Sat, 30 May 2020 11:31:18 -0400 Subject: [PATCH 06/14] composite logger for console --- firmware/console/binary/tunerstudio.cpp | 12 +++ .../com/opensr5/ini/field/EnumIniField.java | 4 + .../opensr5/ini/test/IniFileReaderTest.java | 4 +- .../rusefi/binaryprotocol/BinaryProtocol.java | 18 +++- .../com/rusefi/composite/CompositeEvent.java | 37 ++++++++ .../com/rusefi/composite/CompositeParser.java | 85 +++++++++++++++++++ .../composite/test/CompositeParserTest.java | 23 +++++ 7 files changed, 178 insertions(+), 5 deletions(-) create mode 100644 java_console/models/src/com/rusefi/composite/CompositeEvent.java create mode 100644 java_console/models/src/com/rusefi/composite/CompositeParser.java create mode 100644 java_console/models/src/com/rusefi/composite/test/CompositeParserTest.java diff --git a/firmware/console/binary/tunerstudio.cpp b/firmware/console/binary/tunerstudio.cpp index b19c417813..f10a73a031 100644 --- a/firmware/console/binary/tunerstudio.cpp +++ b/firmware/console/binary/tunerstudio.cpp @@ -474,6 +474,7 @@ static bool isKnownCommand(char command) { || command == TS_GET_FILE_RANGE || command == TS_SET_LOGGER_SWITCH || command == TS_GET_LOGGER_GET_BUFFER + || command == TS_GET_COMPOSITE_BUFFER_DONE_DIFFERENTLY || command == TS_GET_TEXT || command == TS_CRC_CHECK_COMMAND || command == TS_GET_FIRMWARE_VERSION @@ -841,17 +842,28 @@ int tunerStudioHandleCrcCommand(ts_channel_s *tsChannel, char *data, int incomin break; case TS_GET_COMPOSITE_BUFFER_DONE_DIFFERENTLY: + { + EnableToothLoggerIfNotEnabled(); const uint8_t* const buffer = GetToothLoggerBuffer().Buffer; const uint8_t* const start = buffer + COMPOSITE_PACKET_SIZE * transmitted; int currentEnd = getCompositeRecordCount(); + // set debug_mode 40 + if (engineConfiguration->debugMode == DBG_40) { + tsOutputChannels.debugIntField1 = currentEnd; + tsOutputChannels.debugIntField2 = transmitted; + + } + if (currentEnd > transmitted) { // more normal case - tail after head sr5SendResponse(tsChannel, TS_CRC, start, COMPOSITE_PACKET_SIZE * (currentEnd - transmitted)); transmitted = currentEnd; + } else if (currentEnd == transmitted) { + sr5SendResponse(tsChannel, TS_CRC, start, 0); } else { // we are here if tail of buffer has reached the end of buffer and re-started from the start of buffer // sending end of the buffer, next transmission would take care of the rest diff --git a/java_console/inifile/src/com/opensr5/ini/field/EnumIniField.java b/java_console/inifile/src/com/opensr5/ini/field/EnumIniField.java index 4909a6bb94..9ce42f10fc 100644 --- a/java_console/inifile/src/com/opensr5/ini/field/EnumIniField.java +++ b/java_console/inifile/src/com/opensr5/ini/field/EnumIniField.java @@ -46,6 +46,10 @@ public class EnumIniField extends IniField { return enums.get(ordinal); } + public static boolean getBit(int ordinal, int bitPosition) { + return getBitRange(ordinal, bitPosition, 0) == 1; + } + public static int getBitRange(int ordinal, int bitPosition, int bitSize) { ordinal = ordinal >> bitPosition; ordinal = ordinal & ((1 << (bitSize + 1)) - 1); diff --git a/java_console/inifile/src/com/opensr5/ini/test/IniFileReaderTest.java b/java_console/inifile/src/com/opensr5/ini/test/IniFileReaderTest.java index 9fd769537e..ec5d2a5a38 100644 --- a/java_console/inifile/src/com/opensr5/ini/test/IniFileReaderTest.java +++ b/java_console/inifile/src/com/opensr5/ini/test/IniFileReaderTest.java @@ -108,9 +108,9 @@ public class IniFileReaderTest { assertEquals(0, EnumIniField.getBitRange(4, 0, 1)); assertEquals(3, EnumIniField.getBitRange(7, 0, 1)); - assertEquals(1, EnumIniField.getBitRange(0xff, 0, 0)); + assertEquals(true, EnumIniField.getBit(0xff, 0)); - assertEquals(1, EnumIniField.getBitRange(0xf0, 4, 0)); + assertEquals(true, EnumIniField.getBit(0xf0, 4)); assertEquals(2, EnumIniField.getBitRange(0xf0, 3, 1)); } diff --git a/java_console/io/src/com/rusefi/binaryprotocol/BinaryProtocol.java b/java_console/io/src/com/rusefi/binaryprotocol/BinaryProtocol.java index 9b6d027290..89be55b1c1 100644 --- a/java_console/io/src/com/rusefi/binaryprotocol/BinaryProtocol.java +++ b/java_console/io/src/com/rusefi/binaryprotocol/BinaryProtocol.java @@ -7,6 +7,8 @@ import com.opensr5.io.DataListener; import com.rusefi.ConfigurationImageDiff; import com.rusefi.FileLog; import com.rusefi.Timeouts; +import com.rusefi.composite.CompositeEvent; +import com.rusefi.composite.CompositeParser; import com.rusefi.config.generated.Fields; import com.rusefi.core.Pair; import com.rusefi.core.Sensor; @@ -18,10 +20,12 @@ import jssc.SerialPortException; import org.jetbrains.annotations.Nullable; import java.io.EOFException; +import java.io.FileWriter; import java.io.IOException; import java.nio.ByteBuffer; import java.nio.ByteOrder; import java.util.Arrays; +import java.util.List; import java.util.concurrent.ExecutionException; import java.util.concurrent.Future; import java.util.concurrent.TimeUnit; @@ -148,6 +152,7 @@ public class BinaryProtocol implements BinaryProtocolCommands { public void run() { if (requestOutputChannels()) ConnectionWatchdog.onDataArrived(); +// getComposite(); String text = requestPendingMessages(); if (text != null) listener.onDataArrived((text + "\r\n").getBytes()); @@ -446,15 +451,22 @@ public class BinaryProtocol implements BinaryProtocolCommands { } } - public void getComposite() throws IOException { + public void getComposite() { if (isClosed) return; byte packet[] = new byte[1]; packet[0] = Fields.TS_GET_COMPOSITE_BUFFER_DONE_DIFFERENTLY; -// executeCommand() - + byte[] response = executeCommand(packet, "composite log", true); + if (checkResponseCode(response, RESPONSE_OK)) { + List events = CompositeParser.parse(response); + try { + CompositeParser.writeVCD(events, new FileWriter("rusEFI.vcd")); + } catch (IOException e) { + throw new IllegalStateException(e); + } + } } public boolean requestOutputChannels() { diff --git a/java_console/models/src/com/rusefi/composite/CompositeEvent.java b/java_console/models/src/com/rusefi/composite/CompositeEvent.java new file mode 100644 index 0000000000..af347f138a --- /dev/null +++ b/java_console/models/src/com/rusefi/composite/CompositeEvent.java @@ -0,0 +1,37 @@ +package com.rusefi.composite; + +public class CompositeEvent { + private final int timestamp; + private final boolean primaryTrigger; + private final boolean secondaryTrigger; + private final boolean trg; + private final boolean sync; + + public CompositeEvent(int timestamp, boolean primaryTrigger, boolean secondaryTrigger, boolean trg, boolean sync) { + this.timestamp = timestamp; + this.primaryTrigger = primaryTrigger; + this.secondaryTrigger = secondaryTrigger; + this.trg = trg; + this.sync = sync; + } + + public int getTimestamp() { + return timestamp; + } + + public int isPrimaryTriggerAsInt() { + return primaryTrigger ? 1 : 0; + } + + public int isSecondaryTriggerAsInt() { + return secondaryTrigger ? 1 : 0; + } + + public int isSyncAsInt() { + return sync ? 1 : 0; + } + + public int isTrgAsInt() { + return trg ? 1 : 0; + } +} diff --git a/java_console/models/src/com/rusefi/composite/CompositeParser.java b/java_console/models/src/com/rusefi/composite/CompositeParser.java new file mode 100644 index 0000000000..ac0e0f7bce --- /dev/null +++ b/java_console/models/src/com/rusefi/composite/CompositeParser.java @@ -0,0 +1,85 @@ +package com.rusefi.composite; + +import com.opensr5.ini.field.EnumIniField; +import com.rusefi.config.generated.Fields; + +import java.io.FileWriter; +import java.io.IOException; +import java.io.StringWriter; +import java.io.Writer; +import java.nio.ByteBuffer; +import java.nio.ByteOrder; +import java.util.ArrayList; +import java.util.Date; +import java.util.List; + +public class CompositeParser { + + public static final String TAG_PRIMARY = "t"; + public static final String TAG_SECONDARY = "s"; + public static final String TAG_TRG = "r"; + public static final String TAG_SYNC = "y"; + + public static List parse(byte[] response) { + ByteBuffer byteBuffer = ByteBuffer.wrap(response); + byteBuffer.order(ByteOrder.BIG_ENDIAN); + System.out.println("Got composite " + response.length); + int ptr = 1; + + List events = new ArrayList<>(); + + while (ptr + Fields.COMPOSITE_PACKET_SIZE <= response.length) { + + int timestamp = byteBuffer.getInt(ptr); + byte flags = byteBuffer.get(ptr + 4); + System.out.println(timestamp + " " + flags); + + boolean primaryTrigger = EnumIniField.getBit(flags, 0); + boolean secondaryTrigger = EnumIniField.getBit(flags, 1); + boolean trg = EnumIniField.getBit(flags, 2); + boolean sync = EnumIniField.getBit(flags, 3); + + ptr += Fields.COMPOSITE_PACKET_SIZE; + + events.add(new CompositeEvent(timestamp, primaryTrigger, secondaryTrigger, trg, sync)); + } + return events; + } + + /** + * https://en.wikipedia.org/wiki/Value_change_dump + */ + public static void writeVCD(List events, Writer writer, Date date) throws IOException { + writer.write("$date\n"); + writer.write("\t" + date + "\n"); + writer.write("$end\n" + + "$version\n" + + " 1.0\n" + + "$end\n" + + "$timescale\n" + + " 1ps\n" + + "$end\n" + + "$scope module test $end\n" + + "$var wire 1 " + TAG_PRIMARY + " PRI_TRG $end\n" + + "$var wire 1 " + TAG_SECONDARY + " SEC_TRG $end\n" + + "$var wire 1 " + TAG_TRG + " TRG $end\n" + + "$var wire 1 " + TAG_SYNC + " SYNC $end\n" + + "$upscope $end\n" + + "$enddefinitions $end\n" + + "$dumpvars\n"); + + for (CompositeEvent event : events) { + writer.write("#" + event.getTimestamp() + "\n"); + writer.write(event.isPrimaryTriggerAsInt() + TAG_PRIMARY + "\n"); + writer.write(event.isSecondaryTriggerAsInt() + TAG_SECONDARY + "\n"); + writer.write(event.isTrgAsInt() + TAG_TRG + "\n"); + writer.write(event.isSyncAsInt() + TAG_SYNC + "\n"); + + } + writer.flush(); + } + + public static void writeVCD(List events, FileWriter fileWriter) throws IOException { + writeVCD(events, fileWriter, new Date()); + } +} diff --git a/java_console/models/src/com/rusefi/composite/test/CompositeParserTest.java b/java_console/models/src/com/rusefi/composite/test/CompositeParserTest.java new file mode 100644 index 0000000000..e53295a03f --- /dev/null +++ b/java_console/models/src/com/rusefi/composite/test/CompositeParserTest.java @@ -0,0 +1,23 @@ +package com.rusefi.composite.test; + +import com.rusefi.composite.CompositeEvent; +import com.rusefi.composite.CompositeParser; +import org.junit.Test; + +import java.io.IOException; +import java.io.StringWriter; +import java.util.Date; +import java.util.List; + +public class CompositeParserTest { + @Test + public void testParseAndExportToVCD() throws IOException { + byte[] input = {0, 1, 110, -101, 53, 58, 1, 110, -86, -43, 42, 1, 110, -78, 14, 10, 1, 110, -74, -67, 8, 1, 110, -23, -30, 9, 1}; + + List events = CompositeParser.parse(input); + + StringWriter writer = new StringWriter(); + //FileWriter writer = new FileWriter("rusEFI.vcd"); + CompositeParser.writeVCD(events, writer, new Date(1590847552574L)); + } +} From 0496ca941d06e50ded5450974b58dd31a85ce115 Mon Sep 17 00:00:00 2001 From: rusefi Date: Sat, 30 May 2020 11:46:02 -0400 Subject: [PATCH 07/14] README.html into logs folder --- java_console/logging/logging.iml | 1 + java_console/logging/src/com/rusefi/FileLog.java | 13 +++++++++++++ java_console/ui/src/com/rusefi/Launcher.java | 2 +- java_console/ui/src/com/rusefi/SensorLogger.java | 2 +- 4 files changed, 16 insertions(+), 2 deletions(-) diff --git a/java_console/logging/logging.iml b/java_console/logging/logging.iml index 63458f0353..561ebe6a05 100644 --- a/java_console/logging/logging.iml +++ b/java_console/logging/logging.iml @@ -9,5 +9,6 @@ + \ No newline at end of file diff --git a/java_console/logging/src/com/rusefi/FileLog.java b/java_console/logging/src/com/rusefi/FileLog.java index 512ef11063..1c596cf5ef 100644 --- a/java_console/logging/src/com/rusefi/FileLog.java +++ b/java_console/logging/src/com/rusefi/FileLog.java @@ -1,6 +1,7 @@ package com.rusefi; import com.opensr5.Logger; +import com.rusefi.util.LazyFile; import org.jetbrains.annotations.Nullable; import javax.swing.*; @@ -54,10 +55,22 @@ public enum FileLog { } catch (FileNotFoundException e) { throw new IllegalStateException(e); } + new Thread(FileLog::writeReadmeFile).start(); // a bit strange spot for this invocation for sure printOsInfo(); } + private static void writeReadmeFile() { + LazyFile file = new LazyFile(DIR + "README.html"); + file.write("
" + + "More info online
"); + try { + file.close(); + } catch (IOException e) { + // ignoring this one + } + } + private static void printOsInfo() { MAIN.logLine("OS name: " + getOsName()); MAIN.logLine("OS version: " + System.getProperty(OS_VERSION)); diff --git a/java_console/ui/src/com/rusefi/Launcher.java b/java_console/ui/src/com/rusefi/Launcher.java index 88a6411667..2bd208dd00 100644 --- a/java_console/ui/src/com/rusefi/Launcher.java +++ b/java_console/ui/src/com/rusefi/Launcher.java @@ -42,7 +42,7 @@ import static com.rusefi.ui.storage.PersistentConfiguration.getConfig; * @see EngineSnifferPanel */ public class Launcher { - public static final int CONSOLE_VERSION = 20200522; + public static final int CONSOLE_VERSION = 20200530; public static final String INPUT_FILES_PATH = System.getProperty("input_files_path", ".."); public static final String TOOLS_PATH = System.getProperty("tools_path", "."); public static final String TAB_INDEX = "main_tab"; diff --git a/java_console/ui/src/com/rusefi/SensorLogger.java b/java_console/ui/src/com/rusefi/SensorLogger.java index a541c8bc07..4e90817d0a 100644 --- a/java_console/ui/src/com/rusefi/SensorLogger.java +++ b/java_console/ui/src/com/rusefi/SensorLogger.java @@ -139,7 +139,7 @@ public class SensorLogger { private static void startSensorLogFile() { FileLog.createFolderIfNeeded(); - String fileName = FileLog.DIR + FileLog.getDate() + ".msl"; + String fileName = FileLog.DIR + "rusEFI_" + FileLog.getDate() + ".msl"; fileStartTime = System.currentTimeMillis(); try { From bd9a601ce6c00d796af8cabe1cc6ba53c464e2fa Mon Sep 17 00:00:00 2001 From: rusefi Date: Sat, 30 May 2020 12:23:27 -0400 Subject: [PATCH 08/14] extracting protocol constants --- .../boards/kinetis/config/controllers/algo/rusefi_generated.h | 2 ++ firmware/console/binary/tunerstudio.cpp | 4 ++-- firmware/controllers/generated/rusefi_generated.h | 2 ++ firmware/integration/rusefi_config.txt | 3 +++ .../models/src/com/rusefi/config/generated/Fields.java | 4 +++- 5 files changed, 12 insertions(+), 3 deletions(-) diff --git a/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h b/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h index 4a8a6f0a72..6a68d791a7 100644 --- a/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h +++ b/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h @@ -1274,6 +1274,8 @@ #define TS_BURN_COMMAND 'B' #define TS_CHUNK_WRITE_COMMAND 'C' #define TS_COMMAND_F 'F' +#define TS_COMPOSITE_DISABLE 2 +#define TS_COMPOSITE_ENABLE 1 #define TS_CRC_CHECK_COMMAND 'k' #define TS_EXECUTE 'E' #define TS_FILE_VERSION 20200310 diff --git a/firmware/console/binary/tunerstudio.cpp b/firmware/console/binary/tunerstudio.cpp index f10a73a031..83b3350be0 100644 --- a/firmware/console/binary/tunerstudio.cpp +++ b/firmware/console/binary/tunerstudio.cpp @@ -827,10 +827,10 @@ int tunerStudioHandleCrcCommand(ts_channel_s *tsChannel, char *data, int incomin #if EFI_TOOTH_LOGGER case TS_SET_LOGGER_SWITCH: switch(data[0]) { - case 0x01: + case TS_COMPOSITE_ENABLE: EnableToothLogger(); break; - case 0x02: + case TS_COMPOSITE_DISABLE: DisableToothLogger(); break; default: diff --git a/firmware/controllers/generated/rusefi_generated.h b/firmware/controllers/generated/rusefi_generated.h index ea9ef2d723..dcc9ee5e0d 100644 --- a/firmware/controllers/generated/rusefi_generated.h +++ b/firmware/controllers/generated/rusefi_generated.h @@ -1274,6 +1274,8 @@ #define TS_BURN_COMMAND 'B' #define TS_CHUNK_WRITE_COMMAND 'C' #define TS_COMMAND_F 'F' +#define TS_COMPOSITE_DISABLE 2 +#define TS_COMPOSITE_ENABLE 1 #define TS_CRC_CHECK_COMMAND 'k' #define TS_EXECUTE 'E' #define TS_FILE_VERSION 20200310 diff --git a/firmware/integration/rusefi_config.txt b/firmware/integration/rusefi_config.txt index 2feee1089b..29e07692d8 100644 --- a/firmware/integration/rusefi_config.txt +++ b/firmware/integration/rusefi_config.txt @@ -1578,6 +1578,9 @@ end_struct #define TS_GET_STRUCT '9' #define TS_GET_COMPOSITE_BUFFER_DONE_DIFFERENTLY '8' +#define TS_COMPOSITE_ENABLE 1 +#define TS_COMPOSITE_DISABLE 2 + // Performance tracing #define TS_PERF_TRACE_BEGIN 'r' #define TS_PERF_TRACE_GET_BUFFER 'b' diff --git a/java_console/models/src/com/rusefi/config/generated/Fields.java b/java_console/models/src/com/rusefi/config/generated/Fields.java index 3b8f6379f0..f5d058e87d 100644 --- a/java_console/models/src/com/rusefi/config/generated/Fields.java +++ b/java_console/models/src/com/rusefi/config/generated/Fields.java @@ -1,6 +1,6 @@ package com.rusefi.config.generated; -// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.bat integration\rusefi_config.txt Fri May 29 20:38:41 EDT 2020 +// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.bat integration\rusefi_config.txt Sat May 30 12:18:04 EDT 2020 // by class com.rusefi.output.FileJavaFieldsConsumer import com.rusefi.config.*; @@ -1255,6 +1255,8 @@ public class Fields { public static final char TS_BURN_COMMAND = 'B'; public static final char TS_CHUNK_WRITE_COMMAND = 'C'; public static final char TS_COMMAND_F = 'F'; + public static final int TS_COMPOSITE_DISABLE = 2; + public static final int TS_COMPOSITE_ENABLE = 1; public static final char TS_CRC_CHECK_COMMAND = 'k'; public static final char TS_EXECUTE = 'E'; public static final int TS_FILE_VERSION = 20200310; From 1aac0f88e795d2a9befa24ab8daf8957e723c1dc Mon Sep 17 00:00:00 2001 From: rusefi Date: Sat, 30 May 2020 13:01:59 -0400 Subject: [PATCH 09/14] sweet usability --- .../rusefi/binaryprotocol/BinaryProtocol.java | 47 +++++++++-- .../logging/src/com/rusefi/FileLog.java | 4 +- .../com/rusefi/binaryprotocol/StreamFile.java | 11 +++ .../rusefi/binaryprotocol/VcdStreamFile.java | 83 +++++++++++++++++++ .../com/rusefi/composite/CompositeParser.java | 41 +-------- .../ui/src/com/rusefi/SensorLogger.java | 2 +- 6 files changed, 141 insertions(+), 47 deletions(-) create mode 100644 java_console/models/src/com/rusefi/binaryprotocol/StreamFile.java create mode 100644 java_console/models/src/com/rusefi/binaryprotocol/VcdStreamFile.java diff --git a/java_console/io/src/com/rusefi/binaryprotocol/BinaryProtocol.java b/java_console/io/src/com/rusefi/binaryprotocol/BinaryProtocol.java index 89be55b1c1..0c73ef7128 100644 --- a/java_console/io/src/com/rusefi/binaryprotocol/BinaryProtocol.java +++ b/java_console/io/src/com/rusefi/binaryprotocol/BinaryProtocol.java @@ -67,12 +67,32 @@ public class BinaryProtocol implements BinaryProtocolCommands { private final Object imageLock = new Object(); private ConfigurationImage controller; + private static final int COMPOSITE_OFF_RPM = 300; + + /** + * Composite logging turns off after 10 seconds of RPM above 300 + */ + private boolean needCompositeLogger = true; + private boolean isCompositeLoggerEnabled; + private long lastLowRpmTime = System.currentTimeMillis(); + + private VcdStreamFile composite = new VcdStreamFile(); + public boolean isClosed; /** * Snapshot of current gauges status * @see BinaryProtocolCommands#COMMAND_OUTPUTS */ public byte[] currentOutputs; + private SensorCentral.SensorListener rpmListener = value -> { + if (value <= COMPOSITE_OFF_RPM) { + needCompositeLogger = true; + lastLowRpmTime = System.currentTimeMillis(); + } else if (System.currentTimeMillis() - lastLowRpmTime > 10 * Timeouts.SECOND) { + FileLog.MAIN.logLine("Time to turn off composite logging"); + needCompositeLogger = false; + } + }; protected BinaryProtocol(final Logger logger, IoStream stream) { this.logger = logger; @@ -134,6 +154,7 @@ public class BinaryProtocol implements BinaryProtocolCommands { return false; startTextPullThread(listener); + SensorCentral.getInstance().addListener(Sensor.RPM, rpmListener); return true; } @@ -152,7 +173,7 @@ public class BinaryProtocol implements BinaryProtocolCommands { public void run() { if (requestOutputChannels()) ConnectionWatchdog.onDataArrived(); -// getComposite(); + compositeLogic(); String text = requestPendingMessages(); if (text != null) listener.onDataArrived((text + "\r\n").getBytes()); @@ -170,6 +191,19 @@ public class BinaryProtocol implements BinaryProtocolCommands { tr.start(); } + private void compositeLogic() { + if (needCompositeLogger) { + getComposite(); + } else if (isCompositeLoggerEnabled) { + byte packet[] = new byte[2]; + packet[0] = Fields.TS_SET_LOGGER_SWITCH; + packet[1] = Fields.TS_COMPOSITE_DISABLE; + executeCommand(packet, "disable composite"); + isCompositeLoggerEnabled = false; + composite.close(); + } + } + public Logger getLogger() { return logger; } @@ -338,6 +372,7 @@ public class BinaryProtocol implements BinaryProtocolCommands { if (isClosed) return; isClosed = true; + SensorCentral.getInstance().removeListener(Sensor.RPM, rpmListener); stream.close(); } @@ -443,7 +478,6 @@ public class BinaryProtocol implements BinaryProtocolCommands { byte[] response = executeCommand(new byte[]{Fields.TS_GET_TEXT}, "text", true); if (response != null && response.length == 1) Thread.sleep(100); - // System.out.println(result); return new String(response, 1, response.length - 1); } catch (InterruptedException e) { FileLog.MAIN.log(e); @@ -457,15 +491,14 @@ public class BinaryProtocol implements BinaryProtocolCommands { byte packet[] = new byte[1]; packet[0] = Fields.TS_GET_COMPOSITE_BUFFER_DONE_DIFFERENTLY; + // get command would enable composite logging in controller but we need to turn it off from our end + // todo: actually if console gets disconnected composite logging might end up enabled in controller? + isCompositeLoggerEnabled = true; byte[] response = executeCommand(packet, "composite log", true); if (checkResponseCode(response, RESPONSE_OK)) { List events = CompositeParser.parse(response); - try { - CompositeParser.writeVCD(events, new FileWriter("rusEFI.vcd")); - } catch (IOException e) { - throw new IllegalStateException(e); - } + composite.append(events); } } diff --git a/java_console/logging/src/com/rusefi/FileLog.java b/java_console/logging/src/com/rusefi/FileLog.java index 1c596cf5ef..0e384e30af 100644 --- a/java_console/logging/src/com/rusefi/FileLog.java +++ b/java_console/logging/src/com/rusefi/FileLog.java @@ -22,6 +22,7 @@ public enum FileLog { public static final String LOG_INFO_TEXT = "Writing logs to '" + DIR + "'"; public static final String OS_VERSION = "os.version"; public static final String DATE_PATTERN = "yyyy-MM-dd_HH_mm_ss_SSS"; + private static final String WIKI_URL = "https://github.com/rusefi/rusefi/wiki/rusEFI-logs-folder"; public static String currentLogName; public static final String END_OF_TIMESTAND_TAG = ": "; public static final Logger LOGGER = new Logger() { @@ -62,8 +63,7 @@ public enum FileLog { private static void writeReadmeFile() { LazyFile file = new LazyFile(DIR + "README.html"); - file.write("
" + - "More info online
"); + file.write("
" + "More info online
"); try { file.close(); } catch (IOException e) { diff --git a/java_console/models/src/com/rusefi/binaryprotocol/StreamFile.java b/java_console/models/src/com/rusefi/binaryprotocol/StreamFile.java new file mode 100644 index 0000000000..9da9a46a40 --- /dev/null +++ b/java_console/models/src/com/rusefi/binaryprotocol/StreamFile.java @@ -0,0 +1,11 @@ +package com.rusefi.binaryprotocol; + +import com.rusefi.composite.CompositeEvent; + +import java.util.List; + +public interface StreamFile { + void append(List events); + + void close(); +} diff --git a/java_console/models/src/com/rusefi/binaryprotocol/VcdStreamFile.java b/java_console/models/src/com/rusefi/binaryprotocol/VcdStreamFile.java new file mode 100644 index 0000000000..c836e69dfd --- /dev/null +++ b/java_console/models/src/com/rusefi/binaryprotocol/VcdStreamFile.java @@ -0,0 +1,83 @@ +package com.rusefi.binaryprotocol; + +import com.rusefi.FileLog; +import com.rusefi.composite.CompositeEvent; + +import java.io.FileWriter; +import java.io.IOException; +import java.io.Writer; +import java.util.Date; +import java.util.List; + +/** + * https://en.wikipedia.org/wiki/Value_change_dump + * + * @see FileLog#WIKI_URL + */ +public class VcdStreamFile implements StreamFile { + private static final String TAG_PRIMARY = "t"; + private static final String TAG_SECONDARY = "s"; + private static final String TAG_TRG = "r"; + private static final String TAG_SYNC = "y"; + + private FileWriter writer; + + public static void writeHeader(Writer writer, Date date) throws IOException { + writer.write("$date\n"); + writer.write("\t" + date + "\n"); + writer.write("$end\n" + + "$version\n" + + " 1.0\n" + + "$end\n" + + "$timescale\n" + + " 1ps\n" + + "$end\n" + + "$scope module test $end\n" + + "$var wire 1 " + TAG_PRIMARY + " PRI_TRG $end\n" + + "$var wire 1 " + TAG_SECONDARY + " SEC_TRG $end\n" + + "$var wire 1 " + TAG_TRG + " TRG $end\n" + + "$var wire 1 " + TAG_SYNC + " SYNC $end\n" + + "$upscope $end\n" + + "$enddefinitions $end\n" + + "$dumpvars\n"); + } + + public static void appendEvents(List events, Writer writer) throws IOException { + for (CompositeEvent event : events) { + writer.write("#" + event.getTimestamp() + "\n"); + writer.write(event.isPrimaryTriggerAsInt() + TAG_PRIMARY + "\n"); + writer.write(event.isSecondaryTriggerAsInt() + TAG_SECONDARY + "\n"); + writer.write(event.isTrgAsInt() + TAG_TRG + "\n"); + writer.write(event.isSyncAsInt() + TAG_SYNC + "\n"); + + } + writer.flush(); + } + + + @Override + public void append(List events) { + try { + if (writer == null) { + String fileName = FileLog.DIR + "rusEFI_trigger_log_" + FileLog.getDate() + ".vcd"; + writer = new FileWriter(fileName); + writeHeader(writer, new Date()); + } + appendEvents(events, writer); + } catch (IOException e) { + // ignoring this one + } + } + + @Override + public void close() { + if (writer != null) { + try { + writer.close(); + } catch (IOException e) { + // ignoring this one + } + } + writer = null; + } +} diff --git a/java_console/models/src/com/rusefi/composite/CompositeParser.java b/java_console/models/src/com/rusefi/composite/CompositeParser.java index ac0e0f7bce..83a33984c4 100644 --- a/java_console/models/src/com/rusefi/composite/CompositeParser.java +++ b/java_console/models/src/com/rusefi/composite/CompositeParser.java @@ -1,11 +1,11 @@ package com.rusefi.composite; import com.opensr5.ini.field.EnumIniField; +import com.rusefi.binaryprotocol.VcdStreamFile; import com.rusefi.config.generated.Fields; import java.io.FileWriter; import java.io.IOException; -import java.io.StringWriter; import java.io.Writer; import java.nio.ByteBuffer; import java.nio.ByteOrder; @@ -15,11 +15,6 @@ import java.util.List; public class CompositeParser { - public static final String TAG_PRIMARY = "t"; - public static final String TAG_SECONDARY = "s"; - public static final String TAG_TRG = "r"; - public static final String TAG_SYNC = "y"; - public static List parse(byte[] response) { ByteBuffer byteBuffer = ByteBuffer.wrap(response); byteBuffer.order(ByteOrder.BIG_ENDIAN); @@ -46,40 +41,12 @@ public class CompositeParser { return events; } - /** - * https://en.wikipedia.org/wiki/Value_change_dump - */ public static void writeVCD(List events, Writer writer, Date date) throws IOException { - writer.write("$date\n"); - writer.write("\t" + date + "\n"); - writer.write("$end\n" + - "$version\n" + - " 1.0\n" + - "$end\n" + - "$timescale\n" + - " 1ps\n" + - "$end\n" + - "$scope module test $end\n" + - "$var wire 1 " + TAG_PRIMARY + " PRI_TRG $end\n" + - "$var wire 1 " + TAG_SECONDARY + " SEC_TRG $end\n" + - "$var wire 1 " + TAG_TRG + " TRG $end\n" + - "$var wire 1 " + TAG_SYNC + " SYNC $end\n" + - "$upscope $end\n" + - "$enddefinitions $end\n" + - "$dumpvars\n"); - - for (CompositeEvent event : events) { - writer.write("#" + event.getTimestamp() + "\n"); - writer.write(event.isPrimaryTriggerAsInt() + TAG_PRIMARY + "\n"); - writer.write(event.isSecondaryTriggerAsInt() + TAG_SECONDARY + "\n"); - writer.write(event.isTrgAsInt() + TAG_TRG + "\n"); - writer.write(event.isSyncAsInt() + TAG_SYNC + "\n"); - - } - writer.flush(); + VcdStreamFile.writeHeader(writer, date); + VcdStreamFile.appendEvents(events, writer); } public static void writeVCD(List events, FileWriter fileWriter) throws IOException { - writeVCD(events, fileWriter, new Date()); + writeVCD(events, fileWriter, new Date()); } } diff --git a/java_console/ui/src/com/rusefi/SensorLogger.java b/java_console/ui/src/com/rusefi/SensorLogger.java index 4e90817d0a..7d19d67e8b 100644 --- a/java_console/ui/src/com/rusefi/SensorLogger.java +++ b/java_console/ui/src/com/rusefi/SensorLogger.java @@ -139,7 +139,7 @@ public class SensorLogger { private static void startSensorLogFile() { FileLog.createFolderIfNeeded(); - String fileName = FileLog.DIR + "rusEFI_" + FileLog.getDate() + ".msl"; + String fileName = FileLog.DIR + "rusEFI_gauges_" + FileLog.getDate() + ".msl"; fileStartTime = System.currentTimeMillis(); try { From 84c877f71a43f85e7075679ed30be151c3b25b50 Mon Sep 17 00:00:00 2001 From: rusefi Date: Sat, 30 May 2020 13:43:41 -0400 Subject: [PATCH 10/14] typo --- hardware/frankenso/readme.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hardware/frankenso/readme.md b/hardware/frankenso/readme.md index ec5a6be6e3..d08a48ebdd 100644 --- a/hardware/frankenso/readme.md +++ b/hardware/frankenso/readme.md @@ -2,7 +2,7 @@ Our best ECU board ![Isometric Notes](frankenso_top-isometric_notes.png) -[Wikin manual page](https://rusefi.com/wiki/index.php?title=Manual:Hardware_Frankenso_board) +[Wiki manual page](https://rusefi.com/wiki/index.php?title=Manual:Hardware_Frankenso_board) [Forum thread](https://rusefi.com/forum/viewtopic.php?f=4&t=569) From 925c429a93d0f10c816b5a0d68ab6cb6b35e1833 Mon Sep 17 00:00:00 2001 From: rusefi Date: Sat, 30 May 2020 16:08:18 -0400 Subject: [PATCH 11/14] TSHighSpeedLog --- .../rusefi/binaryprotocol/BinaryProtocol.java | 8 ++-- .../com/rusefi/binaryprotocol/StreamFile.java | 32 +++++++++++-- .../rusefi/binaryprotocol/TSHighSpeedLog.java | 47 +++++++++++++++++++ .../rusefi/binaryprotocol/VcdStreamFile.java | 26 ++++------ .../com/rusefi/composite/CompositeParser.java | 8 ---- .../composite/test/CompositeParserTest.java | 3 +- .../models/src/com/rusefi/rusEFIVersion.java | 8 ++++ java_console/ui/src/com/rusefi/Launcher.java | 5 +- .../ui/util/DefaultExceptionHandler.java | 1 - 9 files changed, 102 insertions(+), 36 deletions(-) create mode 100644 java_console/models/src/com/rusefi/binaryprotocol/TSHighSpeedLog.java create mode 100644 java_console/models/src/com/rusefi/rusEFIVersion.java diff --git a/java_console/io/src/com/rusefi/binaryprotocol/BinaryProtocol.java b/java_console/io/src/com/rusefi/binaryprotocol/BinaryProtocol.java index 0c73ef7128..bd1aad2f1c 100644 --- a/java_console/io/src/com/rusefi/binaryprotocol/BinaryProtocol.java +++ b/java_console/io/src/com/rusefi/binaryprotocol/BinaryProtocol.java @@ -76,7 +76,7 @@ public class BinaryProtocol implements BinaryProtocolCommands { private boolean isCompositeLoggerEnabled; private long lastLowRpmTime = System.currentTimeMillis(); - private VcdStreamFile composite = new VcdStreamFile(); + private List compositeLogs = Arrays.asList(new VcdStreamFile(), new TSHighSpeedLog()); public boolean isClosed; /** @@ -200,7 +200,8 @@ public class BinaryProtocol implements BinaryProtocolCommands { packet[1] = Fields.TS_COMPOSITE_DISABLE; executeCommand(packet, "disable composite"); isCompositeLoggerEnabled = false; - composite.close(); + for (StreamFile composite : compositeLogs) + composite.close(); } } @@ -498,7 +499,8 @@ public class BinaryProtocol implements BinaryProtocolCommands { byte[] response = executeCommand(packet, "composite log", true); if (checkResponseCode(response, RESPONSE_OK)) { List events = CompositeParser.parse(response); - composite.append(events); + for (StreamFile composite : compositeLogs) + composite.append(events); } } diff --git a/java_console/models/src/com/rusefi/binaryprotocol/StreamFile.java b/java_console/models/src/com/rusefi/binaryprotocol/StreamFile.java index 9da9a46a40..85b31e14e4 100644 --- a/java_console/models/src/com/rusefi/binaryprotocol/StreamFile.java +++ b/java_console/models/src/com/rusefi/binaryprotocol/StreamFile.java @@ -2,10 +2,36 @@ package com.rusefi.binaryprotocol; import com.rusefi.composite.CompositeEvent; +import java.io.FileWriter; +import java.io.IOException; import java.util.List; -public interface StreamFile { - void append(List events); +public abstract class StreamFile { + protected FileWriter writer; - void close(); + public StreamFile() { + Runtime.getRuntime().addShutdownHook(new Thread(new Runnable() { + @Override + public void run() { + close(); + } + })); + } + + abstract void append(List events); + + public synchronized void close() { + if (writer != null) { + try { + writeFooter(writer); + writer.close(); + } catch (IOException e) { + // ignoring this one + } + } + writer = null; + } + + protected void writeFooter(FileWriter writer) throws IOException { + } } diff --git a/java_console/models/src/com/rusefi/binaryprotocol/TSHighSpeedLog.java b/java_console/models/src/com/rusefi/binaryprotocol/TSHighSpeedLog.java new file mode 100644 index 0000000000..3ced323a52 --- /dev/null +++ b/java_console/models/src/com/rusefi/binaryprotocol/TSHighSpeedLog.java @@ -0,0 +1,47 @@ +package com.rusefi.binaryprotocol; + +import com.rusefi.FileLog; +import com.rusefi.composite.CompositeEvent; +import com.rusefi.rusEFIVersion; +import sun.misc.Launcher; + +import java.io.FileWriter; +import java.io.IOException; +import java.io.Writer; +import java.util.List; + +public class TSHighSpeedLog extends StreamFile { + private int prevTime = 0; + + private static void writeHeader(Writer writer) throws IOException { + writer.write("#Firmware: console" + rusEFIVersion.CONSOLE_VERSION + " firmware " + rusEFIVersion.firmwareVersion.get() + "\n"); + writer.write("PriLevel,SecLevel,Trigger,Sync,Time,ToothTime\n" + + "Flag,Flag,Flag,Flag,ms,ms\n"); + } + + @Override + void append(List events) { + try { + if (writer == null) { + String fileName = FileLog.DIR + "rusEFI_trigger_log_" + FileLog.getDate() + ".csv"; + writer = new FileWriter(fileName); + writeHeader(writer); + } + for (CompositeEvent event : events) { + writer.write(event.isPrimaryTriggerAsInt() + "," + event.isSecondaryTriggerAsInt() + "," + event.isTrgAsInt() + "," + event.isSyncAsInt() + ","); + int delta = event.getTimestamp() - prevTime; + writer.write(event.getTimestamp() / 1000.0 + "," + delta / 1000.0 + "\n"); + prevTime = event.getTimestamp(); + } + writer.flush(); + + } catch (IOException e) { + // ignoring IO exceptions + } + } + + @Override + protected void writeFooter(FileWriter writer) throws IOException { + writer.write("MARK 028\n"); + } +} diff --git a/java_console/models/src/com/rusefi/binaryprotocol/VcdStreamFile.java b/java_console/models/src/com/rusefi/binaryprotocol/VcdStreamFile.java index c836e69dfd..3d90a86c0f 100644 --- a/java_console/models/src/com/rusefi/binaryprotocol/VcdStreamFile.java +++ b/java_console/models/src/com/rusefi/binaryprotocol/VcdStreamFile.java @@ -14,15 +14,13 @@ import java.util.List; * * @see FileLog#WIKI_URL */ -public class VcdStreamFile implements StreamFile { +public class VcdStreamFile extends StreamFile { private static final String TAG_PRIMARY = "t"; private static final String TAG_SECONDARY = "s"; private static final String TAG_TRG = "r"; private static final String TAG_SYNC = "y"; - private FileWriter writer; - - public static void writeHeader(Writer writer, Date date) throws IOException { + private static void writeHeader(Writer writer, Date date) throws IOException { writer.write("$date\n"); writer.write("\t" + date + "\n"); writer.write("$end\n" + @@ -54,6 +52,14 @@ public class VcdStreamFile implements StreamFile { writer.flush(); } + public static void writeVCD(List events, Writer writer, Date date) throws IOException { + writeHeader(writer, date); + appendEvents(events, writer); + } + + public static void writeVCD(List events, FileWriter fileWriter) throws IOException { + writeVCD(events, fileWriter, new Date()); + } @Override public void append(List events) { @@ -68,16 +74,4 @@ public class VcdStreamFile implements StreamFile { // ignoring this one } } - - @Override - public void close() { - if (writer != null) { - try { - writer.close(); - } catch (IOException e) { - // ignoring this one - } - } - writer = null; - } } diff --git a/java_console/models/src/com/rusefi/composite/CompositeParser.java b/java_console/models/src/com/rusefi/composite/CompositeParser.java index 83a33984c4..cc3ed38d4c 100644 --- a/java_console/models/src/com/rusefi/composite/CompositeParser.java +++ b/java_console/models/src/com/rusefi/composite/CompositeParser.java @@ -41,12 +41,4 @@ public class CompositeParser { return events; } - public static void writeVCD(List events, Writer writer, Date date) throws IOException { - VcdStreamFile.writeHeader(writer, date); - VcdStreamFile.appendEvents(events, writer); - } - - public static void writeVCD(List events, FileWriter fileWriter) throws IOException { - writeVCD(events, fileWriter, new Date()); - } } diff --git a/java_console/models/src/com/rusefi/composite/test/CompositeParserTest.java b/java_console/models/src/com/rusefi/composite/test/CompositeParserTest.java index e53295a03f..b2605082fa 100644 --- a/java_console/models/src/com/rusefi/composite/test/CompositeParserTest.java +++ b/java_console/models/src/com/rusefi/composite/test/CompositeParserTest.java @@ -1,5 +1,6 @@ package com.rusefi.composite.test; +import com.rusefi.binaryprotocol.VcdStreamFile; import com.rusefi.composite.CompositeEvent; import com.rusefi.composite.CompositeParser; import org.junit.Test; @@ -18,6 +19,6 @@ public class CompositeParserTest { StringWriter writer = new StringWriter(); //FileWriter writer = new FileWriter("rusEFI.vcd"); - CompositeParser.writeVCD(events, writer, new Date(1590847552574L)); + VcdStreamFile.writeVCD(events, writer, new Date(1590847552574L)); } } diff --git a/java_console/models/src/com/rusefi/rusEFIVersion.java b/java_console/models/src/com/rusefi/rusEFIVersion.java new file mode 100644 index 0000000000..87f955712e --- /dev/null +++ b/java_console/models/src/com/rusefi/rusEFIVersion.java @@ -0,0 +1,8 @@ +package com.rusefi; + +import java.util.concurrent.atomic.AtomicReference; + +public class rusEFIVersion { + public static final int CONSOLE_VERSION = 20200530; + public static AtomicReference firmwareVersion = new AtomicReference<>("N/A"); +} diff --git a/java_console/ui/src/com/rusefi/Launcher.java b/java_console/ui/src/com/rusefi/Launcher.java index 2bd208dd00..d046c3d724 100644 --- a/java_console/ui/src/com/rusefi/Launcher.java +++ b/java_console/ui/src/com/rusefi/Launcher.java @@ -41,8 +41,7 @@ import static com.rusefi.ui.storage.PersistentConfiguration.getConfig; * @see StartupFrame * @see EngineSnifferPanel */ -public class Launcher { - public static final int CONSOLE_VERSION = 20200530; +public class Launcher extends rusEFIVersion { public static final String INPUT_FILES_PATH = System.getProperty("input_files_path", ".."); public static final String TOOLS_PATH = System.getProperty("tools_path", "."); public static final String TAB_INDEX = "main_tab"; @@ -57,8 +56,6 @@ public class Launcher { public TabbedPanel tabbedPane = new TabbedPanel(); - public static AtomicReference firmwareVersion = new AtomicReference<>("N/A"); - private static Frame staticFrame; private MainFrame mainFrame = new MainFrame(tabbedPane); diff --git a/java_console/ui/src/com/rusefi/ui/util/DefaultExceptionHandler.java b/java_console/ui/src/com/rusefi/ui/util/DefaultExceptionHandler.java index fb2d7806eb..6510fcff9a 100644 --- a/java_console/ui/src/com/rusefi/ui/util/DefaultExceptionHandler.java +++ b/java_console/ui/src/com/rusefi/ui/util/DefaultExceptionHandler.java @@ -8,7 +8,6 @@ import java.io.ByteArrayOutputStream; import java.io.PrintStream; import static com.rusefi.Launcher.*; -import static javax.swing.JOptionPane.OK_OPTION; /** * 6/30/13 From 6d7d3f51e4523267fb719b73e63b8f6b33291359 Mon Sep 17 00:00:00 2001 From: rusefi Date: Sat, 30 May 2020 16:16:28 -0400 Subject: [PATCH 12/14] more channels into VCD --- .../com/rusefi/binaryprotocol/VcdStreamFile.java | 7 ++++++- .../src/com/rusefi/composite/CompositeEvent.java | 14 +++++++++++++- .../src/com/rusefi/composite/CompositeParser.java | 9 +++------ 3 files changed, 22 insertions(+), 8 deletions(-) diff --git a/java_console/models/src/com/rusefi/binaryprotocol/VcdStreamFile.java b/java_console/models/src/com/rusefi/binaryprotocol/VcdStreamFile.java index 3d90a86c0f..9057b711b6 100644 --- a/java_console/models/src/com/rusefi/binaryprotocol/VcdStreamFile.java +++ b/java_console/models/src/com/rusefi/binaryprotocol/VcdStreamFile.java @@ -19,6 +19,8 @@ public class VcdStreamFile extends StreamFile { private static final String TAG_SECONDARY = "s"; private static final String TAG_TRG = "r"; private static final String TAG_SYNC = "y"; + private static final String TAG_COIL = "c"; + private static final String TAG_INJ = "i"; private static void writeHeader(Writer writer, Date date) throws IOException { writer.write("$date\n"); @@ -35,6 +37,8 @@ public class VcdStreamFile extends StreamFile { "$var wire 1 " + TAG_SECONDARY + " SEC_TRG $end\n" + "$var wire 1 " + TAG_TRG + " TRG $end\n" + "$var wire 1 " + TAG_SYNC + " SYNC $end\n" + + "$var wire 1 " + TAG_COIL + " COIL $end\n" + + "$var wire 1 " + TAG_INJ + " INJ $end\n" + "$upscope $end\n" + "$enddefinitions $end\n" + "$dumpvars\n"); @@ -47,7 +51,8 @@ public class VcdStreamFile extends StreamFile { writer.write(event.isSecondaryTriggerAsInt() + TAG_SECONDARY + "\n"); writer.write(event.isTrgAsInt() + TAG_TRG + "\n"); writer.write(event.isSyncAsInt() + TAG_SYNC + "\n"); - + writer.write(event.isCoil() + TAG_COIL + "\n"); + writer.write(event.isInjector() + TAG_INJ + "\n"); } writer.flush(); } diff --git a/java_console/models/src/com/rusefi/composite/CompositeEvent.java b/java_console/models/src/com/rusefi/composite/CompositeEvent.java index af347f138a..366501b69c 100644 --- a/java_console/models/src/com/rusefi/composite/CompositeEvent.java +++ b/java_console/models/src/com/rusefi/composite/CompositeEvent.java @@ -6,13 +6,17 @@ public class CompositeEvent { private final boolean secondaryTrigger; private final boolean trg; private final boolean sync; + private final boolean coil; + private final boolean injector; - public CompositeEvent(int timestamp, boolean primaryTrigger, boolean secondaryTrigger, boolean trg, boolean sync) { + public CompositeEvent(int timestamp, boolean primaryTrigger, boolean secondaryTrigger, boolean trg, boolean sync, boolean coil, boolean injector) { this.timestamp = timestamp; this.primaryTrigger = primaryTrigger; this.secondaryTrigger = secondaryTrigger; this.trg = trg; this.sync = sync; + this.coil = coil; + this.injector = injector; } public int getTimestamp() { @@ -34,4 +38,12 @@ public class CompositeEvent { public int isTrgAsInt() { return trg ? 1 : 0; } + + public int isCoil() { + return coil ? 1 : 0; + } + + public int isInjector() { + return injector ? 1 : 0; + } } diff --git a/java_console/models/src/com/rusefi/composite/CompositeParser.java b/java_console/models/src/com/rusefi/composite/CompositeParser.java index cc3ed38d4c..8c605f5110 100644 --- a/java_console/models/src/com/rusefi/composite/CompositeParser.java +++ b/java_console/models/src/com/rusefi/composite/CompositeParser.java @@ -1,16 +1,11 @@ package com.rusefi.composite; import com.opensr5.ini.field.EnumIniField; -import com.rusefi.binaryprotocol.VcdStreamFile; import com.rusefi.config.generated.Fields; -import java.io.FileWriter; -import java.io.IOException; -import java.io.Writer; import java.nio.ByteBuffer; import java.nio.ByteOrder; import java.util.ArrayList; -import java.util.Date; import java.util.List; public class CompositeParser { @@ -33,10 +28,12 @@ public class CompositeParser { boolean secondaryTrigger = EnumIniField.getBit(flags, 1); boolean trg = EnumIniField.getBit(flags, 2); boolean sync = EnumIniField.getBit(flags, 3); + boolean coil = EnumIniField.getBit(flags, 4); + boolean injector = EnumIniField.getBit(flags, 5); ptr += Fields.COMPOSITE_PACKET_SIZE; - events.add(new CompositeEvent(timestamp, primaryTrigger, secondaryTrigger, trg, sync)); + events.add(new CompositeEvent(timestamp, primaryTrigger, secondaryTrigger, trg, sync, coil, injector)); } return events; } From 6dca66ab0a666c79abc35e5fb751c40efb9f7fdf Mon Sep 17 00:00:00 2001 From: rusefi Date: Sat, 30 May 2020 16:31:51 -0400 Subject: [PATCH 13/14] flexibility --- .../io/src/com/rusefi/binaryprotocol/BinaryProtocol.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/java_console/io/src/com/rusefi/binaryprotocol/BinaryProtocol.java b/java_console/io/src/com/rusefi/binaryprotocol/BinaryProtocol.java index bd1aad2f1c..b5ef8a33ae 100644 --- a/java_console/io/src/com/rusefi/binaryprotocol/BinaryProtocol.java +++ b/java_console/io/src/com/rusefi/binaryprotocol/BinaryProtocol.java @@ -48,6 +48,7 @@ public class BinaryProtocol implements BinaryProtocolCommands { private static final String USE_PLAIN_PROTOCOL_PROPERTY = "protocol.plain"; private static final String CONFIGURATION_RUSEFI_BINARY = "current_configuration.rusefi_binary"; private static final String CONFIGURATION_RUSEFI_XML = "current_configuration.msq"; + private static final int HIGH_RPM_DELAY = Integer.getInteger("high_speed_logger_time", 10); /** * This properly allows to switch to non-CRC32 mode * todo: finish this feature, assuming we even need it. @@ -88,7 +89,7 @@ public class BinaryProtocol implements BinaryProtocolCommands { if (value <= COMPOSITE_OFF_RPM) { needCompositeLogger = true; lastLowRpmTime = System.currentTimeMillis(); - } else if (System.currentTimeMillis() - lastLowRpmTime > 10 * Timeouts.SECOND) { + } else if (System.currentTimeMillis() - lastLowRpmTime > HIGH_RPM_DELAY * Timeouts.SECOND) { FileLog.MAIN.logLine("Time to turn off composite logging"); needCompositeLogger = false; } From 6c92a3ab3ebf3ffc3ca31a37e1c5c305ebe46a5f Mon Sep 17 00:00:00 2001 From: Matthew Kennedy Date: Sat, 30 May 2020 18:50:57 -0700 Subject: [PATCH 14/14] fix (#1476) --- firmware/console/status_loop.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/firmware/console/status_loop.cpp b/firmware/console/status_loop.cpp index efff1bb667..728e31835d 100644 --- a/firmware/console/status_loop.cpp +++ b/firmware/console/status_loop.cpp @@ -503,11 +503,11 @@ void updateTunerStudioState(TunerStudioOutputChannels *tsOutputChannels DECLARE_ SensorResult pedal = Sensor::get(SensorType::AcceleratorPedal); tsOutputChannels->pedalPosition = pedal.Value; // Only report fail if you have one (many people don't) - tsOutputChannels->isPedalError = !pedal.Valid && Sensor::hasSensor(SensorType::AcceleratorPedal); + tsOutputChannels->isPedalError = !pedal.Valid && Sensor::hasSensor(SensorType::AcceleratorPedalPrimary); // Set raw sensors - tsOutputChannels->rawTps1Primary = Sensor::getRaw(SensorType::Tps1); - tsOutputChannels->rawPpsPrimary = Sensor::getRaw(SensorType::AcceleratorPedal); + tsOutputChannels->rawTps1Primary = Sensor::getRaw(SensorType::Tps1Primary); + tsOutputChannels->rawPpsPrimary = Sensor::getRaw(SensorType::AcceleratorPedalPrimary); tsOutputChannels->rawClt = Sensor::getRaw(SensorType::Clt); tsOutputChannels->rawIat = Sensor::getRaw(SensorType::Iat); tsOutputChannels->rawOilPressure = Sensor::getRaw(SensorType::OilPressure);