From 7779d5b7f428b134217df0583dd35f85f8a095fd Mon Sep 17 00:00:00 2001 From: Matthew Kennedy Date: Thu, 30 Apr 2020 13:05:20 -0700 Subject: [PATCH 1/5] fsio settings -> 2 decimals (#1388) Co-authored-by: Matthew Kennedy --- firmware/integration/rusefi_config.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/firmware/integration/rusefi_config.txt b/firmware/integration/rusefi_config.txt index 649df5e309..29a08d05cc 100644 --- a/firmware/integration/rusefi_config.txt +++ b/firmware/integration/rusefi_config.txt @@ -765,7 +765,7 @@ custom fsio_pwm_freq_t 2 scalar, U16, @OFFSET@, "Hz", 1, 0, fsio_pwm_freq_t[FSIO_COMMAND_COUNT iterate] fsioFrequency; -custom fsio_setting_t 4 scalar, F32, @OFFSET@, "Val", 1, 0, 0, 18000, 4 +custom fsio_setting_t 4 scalar, F32, @OFFSET@, "Val", 1, 0, 0, 18000, 2 fsio_setting_t[FSIO_COMMAND_COUNT iterate] fsio_setting; ! todo: migrate to spi_pins & combine with spi pin modes From ace48c2653a12b76d8629df29e494185ab39a983 Mon Sep 17 00:00:00 2001 From: rusefi Date: Thu, 30 Apr 2020 16:39:12 -0400 Subject: [PATCH 2/5] Fresh generated - auto --- firmware/tunerstudio/rusefi.ini | 34 ++++---- firmware/tunerstudio/rusefi_frankenso.ini | 34 ++++---- firmware/tunerstudio/rusefi_kinetis.ini | 86 ++++++++++++--------- firmware/tunerstudio/rusefi_microrusefi.ini | 34 ++++---- firmware/tunerstudio/rusefi_prometheus.ini | 34 ++++---- firmware/tunerstudio/rusefi_proteus.ini | 34 ++++---- 6 files changed, 134 insertions(+), 122 deletions(-) diff --git a/firmware/tunerstudio/rusefi.ini b/firmware/tunerstudio/rusefi.ini index 6a80ca9fab..63bfb562e0 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 Wed Apr 29 22:58:08 EDT 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.bat integration\rusefi_config.txt Thu Apr 30 16:38:24 EDT 2020 pageSize = 20000 page = 1 @@ -484,22 +484,22 @@ page = 1 fsioFrequency14 = scalar, U16, 858, "Hz", 1, 0, 0, 3000, 0 fsioFrequency15 = scalar, U16, 860, "Hz", 1, 0, 0, 3000, 0 fsioFrequency16 = scalar, U16, 862, "Hz", 1, 0, 0, 3000, 0 - fsio_setting1 = scalar, F32, 864, "Val", 1, 0, 0, 18000, 4 - fsio_setting2 = scalar, F32, 868, "Val", 1, 0, 0, 18000, 4 - fsio_setting3 = scalar, F32, 872, "Val", 1, 0, 0, 18000, 4 - fsio_setting4 = scalar, F32, 876, "Val", 1, 0, 0, 18000, 4 - fsio_setting5 = scalar, F32, 880, "Val", 1, 0, 0, 18000, 4 - fsio_setting6 = scalar, F32, 884, "Val", 1, 0, 0, 18000, 4 - fsio_setting7 = scalar, F32, 888, "Val", 1, 0, 0, 18000, 4 - fsio_setting8 = scalar, F32, 892, "Val", 1, 0, 0, 18000, 4 - fsio_setting9 = scalar, F32, 896, "Val", 1, 0, 0, 18000, 4 - fsio_setting10 = scalar, F32, 900, "Val", 1, 0, 0, 18000, 4 - fsio_setting11 = scalar, F32, 904, "Val", 1, 0, 0, 18000, 4 - fsio_setting12 = scalar, F32, 908, "Val", 1, 0, 0, 18000, 4 - fsio_setting13 = scalar, F32, 912, "Val", 1, 0, 0, 18000, 4 - fsio_setting14 = scalar, F32, 916, "Val", 1, 0, 0, 18000, 4 - fsio_setting15 = scalar, F32, 920, "Val", 1, 0, 0, 18000, 4 - fsio_setting16 = scalar, F32, 924, "Val", 1, 0, 0, 18000, 4 + fsio_setting1 = scalar, F32, 864, "Val", 1, 0, 0, 18000, 2 + fsio_setting2 = scalar, F32, 868, "Val", 1, 0, 0, 18000, 2 + fsio_setting3 = scalar, F32, 872, "Val", 1, 0, 0, 18000, 2 + fsio_setting4 = scalar, F32, 876, "Val", 1, 0, 0, 18000, 2 + fsio_setting5 = scalar, F32, 880, "Val", 1, 0, 0, 18000, 2 + fsio_setting6 = scalar, F32, 884, "Val", 1, 0, 0, 18000, 2 + fsio_setting7 = scalar, F32, 888, "Val", 1, 0, 0, 18000, 2 + fsio_setting8 = scalar, F32, 892, "Val", 1, 0, 0, 18000, 2 + fsio_setting9 = scalar, F32, 896, "Val", 1, 0, 0, 18000, 2 + fsio_setting10 = scalar, F32, 900, "Val", 1, 0, 0, 18000, 2 + fsio_setting11 = scalar, F32, 904, "Val", 1, 0, 0, 18000, 2 + fsio_setting12 = scalar, F32, 908, "Val", 1, 0, 0, 18000, 2 + fsio_setting13 = scalar, F32, 912, "Val", 1, 0, 0, 18000, 2 + fsio_setting14 = scalar, F32, 916, "Val", 1, 0, 0, 18000, 2 + fsio_setting15 = scalar, F32, 920, "Val", 1, 0, 0, 18000, 2 + fsio_setting16 = scalar, F32, 924, "Val", 1, 0, 0, 18000, 2 spi1mosiPin = bits, U08, 928, [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" spi1misoPin = bits, U08, 929, [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" spi1sckPin = bits, U08, 930, [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" diff --git a/firmware/tunerstudio/rusefi_frankenso.ini b/firmware/tunerstudio/rusefi_frankenso.ini index 6b7b78eae1..47687a43af 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 Wed Apr 29 22:58:16 EDT 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.bat integration\rusefi_config.txt Thu Apr 30 16:38:47 EDT 2020 pageSize = 20000 page = 1 @@ -484,22 +484,22 @@ page = 1 fsioFrequency14 = scalar, U16, 858, "Hz", 1, 0, 0, 3000, 0 fsioFrequency15 = scalar, U16, 860, "Hz", 1, 0, 0, 3000, 0 fsioFrequency16 = scalar, U16, 862, "Hz", 1, 0, 0, 3000, 0 - fsio_setting1 = scalar, F32, 864, "Val", 1, 0, 0, 18000, 4 - fsio_setting2 = scalar, F32, 868, "Val", 1, 0, 0, 18000, 4 - fsio_setting3 = scalar, F32, 872, "Val", 1, 0, 0, 18000, 4 - fsio_setting4 = scalar, F32, 876, "Val", 1, 0, 0, 18000, 4 - fsio_setting5 = scalar, F32, 880, "Val", 1, 0, 0, 18000, 4 - fsio_setting6 = scalar, F32, 884, "Val", 1, 0, 0, 18000, 4 - fsio_setting7 = scalar, F32, 888, "Val", 1, 0, 0, 18000, 4 - fsio_setting8 = scalar, F32, 892, "Val", 1, 0, 0, 18000, 4 - fsio_setting9 = scalar, F32, 896, "Val", 1, 0, 0, 18000, 4 - fsio_setting10 = scalar, F32, 900, "Val", 1, 0, 0, 18000, 4 - fsio_setting11 = scalar, F32, 904, "Val", 1, 0, 0, 18000, 4 - fsio_setting12 = scalar, F32, 908, "Val", 1, 0, 0, 18000, 4 - fsio_setting13 = scalar, F32, 912, "Val", 1, 0, 0, 18000, 4 - fsio_setting14 = scalar, F32, 916, "Val", 1, 0, 0, 18000, 4 - fsio_setting15 = scalar, F32, 920, "Val", 1, 0, 0, 18000, 4 - fsio_setting16 = scalar, F32, 924, "Val", 1, 0, 0, 18000, 4 + fsio_setting1 = scalar, F32, 864, "Val", 1, 0, 0, 18000, 2 + fsio_setting2 = scalar, F32, 868, "Val", 1, 0, 0, 18000, 2 + fsio_setting3 = scalar, F32, 872, "Val", 1, 0, 0, 18000, 2 + fsio_setting4 = scalar, F32, 876, "Val", 1, 0, 0, 18000, 2 + fsio_setting5 = scalar, F32, 880, "Val", 1, 0, 0, 18000, 2 + fsio_setting6 = scalar, F32, 884, "Val", 1, 0, 0, 18000, 2 + fsio_setting7 = scalar, F32, 888, "Val", 1, 0, 0, 18000, 2 + fsio_setting8 = scalar, F32, 892, "Val", 1, 0, 0, 18000, 2 + fsio_setting9 = scalar, F32, 896, "Val", 1, 0, 0, 18000, 2 + fsio_setting10 = scalar, F32, 900, "Val", 1, 0, 0, 18000, 2 + fsio_setting11 = scalar, F32, 904, "Val", 1, 0, 0, 18000, 2 + fsio_setting12 = scalar, F32, 908, "Val", 1, 0, 0, 18000, 2 + fsio_setting13 = scalar, F32, 912, "Val", 1, 0, 0, 18000, 2 + fsio_setting14 = scalar, F32, 916, "Val", 1, 0, 0, 18000, 2 + fsio_setting15 = scalar, F32, 920, "Val", 1, 0, 0, 18000, 2 + fsio_setting16 = scalar, F32, 924, "Val", 1, 0, 0, 18000, 2 spi1mosiPin = bits, U08, 928, [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" spi1misoPin = bits, U08, 929, [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" spi1sckPin = bits, U08, 930, [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" diff --git a/firmware/tunerstudio/rusefi_kinetis.ini b/firmware/tunerstudio/rusefi_kinetis.ini index 399f4fbd85..9d70b0b5bd 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 Wed Apr 29 16:41:41 EDT 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on kineris_gen_config.bat integration/rusefi_config.txt Thu Apr 30 16:38:56 EDT 2020 pageSize = 20000 page = 1 @@ -484,22 +484,22 @@ page = 1 fsioFrequency14 = scalar, U16, 858, "Hz", 1, 0, 0, 3000, 0 fsioFrequency15 = scalar, U16, 860, "Hz", 1, 0, 0, 3000, 0 fsioFrequency16 = scalar, U16, 862, "Hz", 1, 0, 0, 3000, 0 - fsio_setting1 = scalar, F32, 864, "Val", 1, 0, 0, 18000, 4 - fsio_setting2 = scalar, F32, 868, "Val", 1, 0, 0, 18000, 4 - fsio_setting3 = scalar, F32, 872, "Val", 1, 0, 0, 18000, 4 - fsio_setting4 = scalar, F32, 876, "Val", 1, 0, 0, 18000, 4 - fsio_setting5 = scalar, F32, 880, "Val", 1, 0, 0, 18000, 4 - fsio_setting6 = scalar, F32, 884, "Val", 1, 0, 0, 18000, 4 - fsio_setting7 = scalar, F32, 888, "Val", 1, 0, 0, 18000, 4 - fsio_setting8 = scalar, F32, 892, "Val", 1, 0, 0, 18000, 4 - fsio_setting9 = scalar, F32, 896, "Val", 1, 0, 0, 18000, 4 - fsio_setting10 = scalar, F32, 900, "Val", 1, 0, 0, 18000, 4 - fsio_setting11 = scalar, F32, 904, "Val", 1, 0, 0, 18000, 4 - fsio_setting12 = scalar, F32, 908, "Val", 1, 0, 0, 18000, 4 - fsio_setting13 = scalar, F32, 912, "Val", 1, 0, 0, 18000, 4 - fsio_setting14 = scalar, F32, 916, "Val", 1, 0, 0, 18000, 4 - fsio_setting15 = scalar, F32, 920, "Val", 1, 0, 0, 18000, 4 - fsio_setting16 = scalar, F32, 924, "Val", 1, 0, 0, 18000, 4 + fsio_setting1 = scalar, F32, 864, "Val", 1, 0, 0, 18000, 2 + fsio_setting2 = scalar, F32, 868, "Val", 1, 0, 0, 18000, 2 + fsio_setting3 = scalar, F32, 872, "Val", 1, 0, 0, 18000, 2 + fsio_setting4 = scalar, F32, 876, "Val", 1, 0, 0, 18000, 2 + fsio_setting5 = scalar, F32, 880, "Val", 1, 0, 0, 18000, 2 + fsio_setting6 = scalar, F32, 884, "Val", 1, 0, 0, 18000, 2 + fsio_setting7 = scalar, F32, 888, "Val", 1, 0, 0, 18000, 2 + fsio_setting8 = scalar, F32, 892, "Val", 1, 0, 0, 18000, 2 + fsio_setting9 = scalar, F32, 896, "Val", 1, 0, 0, 18000, 2 + fsio_setting10 = scalar, F32, 900, "Val", 1, 0, 0, 18000, 2 + fsio_setting11 = scalar, F32, 904, "Val", 1, 0, 0, 18000, 2 + fsio_setting12 = scalar, F32, 908, "Val", 1, 0, 0, 18000, 2 + fsio_setting13 = scalar, F32, 912, "Val", 1, 0, 0, 18000, 2 + fsio_setting14 = scalar, F32, 916, "Val", 1, 0, 0, 18000, 2 + fsio_setting15 = scalar, F32, 920, "Val", 1, 0, 0, 18000, 2 + fsio_setting16 = scalar, F32, 924, "Val", 1, 0, 0, 18000, 2 spi1mosiPin = bits, U08, 928, [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" spi1misoPin = bits, U08, 929, [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" spi1sckPin = bits, U08, 930, [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" @@ -1326,6 +1326,7 @@ page = 1 gppwm4_loadAxis = "Selects the load axis to use for the table." +; SettingContextHelpEnd ; CONFIG_DEFINITION_END idleRpmPid_offset = "Constant base value" idleRpmPid_periodMs = "PID recalculation period" @@ -2643,8 +2644,9 @@ menuDialog = main subMenu = connection, "Connection" subMenu = tle8888, "TLE8888" - subMenu = allPins1, "Full pinout 1/2" - subMenu = allPins2, "Full pinout 2/2" + subMenu = allPins1, "Full pinout 1/3" + subMenu = allPins2, "Full pinout 2/3" + subMenu = allPins3_1_and_2 "Full pinout 3/3" subMenu = std_separator @@ -3080,23 +3082,24 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00" field = "A/C Switch", acSwitchAdc field = "Aux Temperature #1", auxTempSensor1_adcChannel field = "Aux Temperature #2", auxTempSensor2_adcChannel + field = "Aux Fast Analog", auxFastSensor1_adcChannel + + dialog = allPinsMC33, "MC33816" + field = "Chip Select", mc33816_cs + field = rstb, mc33816_rstb + field = flag0, mc33816_flag0 + field = mc33816_driven, mc33816_driven + field = mc33816spiDevice, mc33816spiDevice dialog = allPins1_1 - field = mc33816_cs, mc33816_cs - field = mc33816_rstb, mc33816_rstb - field = mc33816_flag0, mc33816_flag0 field = "trigger stimulator pin #1", triggerSimulatorPins1 field = "trigger stimulator pin #2", triggerSimulatorPins2 field = "trigger stimulator pin #2", triggerSimulatorPins3 field = high_fuel_pressure_sensor_1, high_fuel_pressure_sensor_1 field = high_fuel_pressure_sensor_2, high_fuel_pressure_sensor_2 - field = mc33816_driven, mc33816_driven - field = mc33816spiDevice, mc33816spiDevice field = "Warning Led", warningLedPin field = "tle6240_cs", tle6240_cs field = "tle6240 SPI", tle6240spiDevice - field = "mc33972_cs", mc33972_cs - panel = allPinsSensors dialog = allPins1_2 field = "Tachometer output Pin", tachOutputPin @@ -3118,16 +3121,10 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00" field = "ETB#2 Disable", etbIo2_disablePin field = "SD CS Pin", sdCardCsPin field = "MIL / Check Engine Pin", malfunctionIndicatorPin - field = "Aux Pin #1", auxPidPins1 - field = "Aux Pin #2", auxPidPins2 - field = "Aux Pin #3", auxPidPins3 - field = "Aux Pin #4", auxPidPins4 field = "test557pin", test557pin field = "Fan Pin", fanPin field = "Main Relay Pin", mainRelayPin field = "Starter Relay Pin", starterRelayDisablePin - field = "aux valve #1", auxValves1 - field = "aux valve #2", auxValves2 dialog = allPins2_1 field = "Injection Pin 1", injectionPins1 @@ -3197,7 +3194,7 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00" field = "LCD D6 pin", HD44780_db6 field = "LCD D7 pin", HD44780_db7 field = "Debug Trigger Sync", debugTriggerSync - field = "Aux Fast Analog", auxFastSensor1_adcChannel + panel = allPinsMC33 dialog = allPins1_3 field = "FSIO ADC #1", fsioAdc1 @@ -3223,22 +3220,37 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00" field = "Saab CDM knock", cdmInputPin field = "comm status light", communicationLedPin field = "running status light", runningLedPin - field = "TLE8888 Chip Select", tle8888_cs - field = "TLE 8888 spi", tle8888spiDevice + + + dialog = allPins3_1 + panel = allPinsSensors + + dialog = allPins3_2 field = "servo#1", servoOutputPins1 field = "servo#2", servoOutputPins2 field = "servo#3", servoOutputPins3 field = "servo#4", servoOutputPins4 field = "servo#5", servoOutputPins5 + field = "Aux Pin #1", auxPidPins1 + field = "Aux Pin #2", auxPidPins2 + field = "Aux Pin #3", auxPidPins3 + field = "Aux Pin #4", auxPidPins4 + field = "Aux Valve #1", auxValves1 + field = "Aux Valve #2", auxValves2 + field = "TLE8888 Chip Select", tle8888_cs + field = "TLE 8888 spi", tle8888spiDevice field = "AUX Serial TX", auxSerialTxPin field = "AUX Serial RX", auxSerialRxPin + dialog = allPins3_1_and_2, "All Pins 3/3", xAxis + panel = allPins3_1 + panel = allPins3_2 dialog = allPins1_1_and_2, "", xAxis panel = allPins1_1 panel = allPins1_2 - dialog = allPins1, "All Pins 1/2", xAxis + dialog = allPins1, "All Pins 1/3", xAxis panel = allPins1_1_and_2 panel = allPins1_3 @@ -3246,7 +3258,7 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00" panel = allPins2_1 panel = allPins2_2 - dialog = allPins2, "All Pins 2/2", xAxis + dialog = allPins2, "All Pins 2/3", xAxis panel = allPins2_1_and_2 panel = allPins2_3 diff --git a/firmware/tunerstudio/rusefi_microrusefi.ini b/firmware/tunerstudio/rusefi_microrusefi.ini index 3391c4987e..6b20a0fb13 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 Wed Apr 29 22:58:14 EDT 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.bat integration\rusefi_config.txt Thu Apr 30 16:38:33 EDT 2020 pageSize = 20000 page = 1 @@ -484,22 +484,22 @@ page = 1 fsioFrequency14 = scalar, U16, 858, "Hz", 1, 0, 0, 3000, 0 fsioFrequency15 = scalar, U16, 860, "Hz", 1, 0, 0, 3000, 0 fsioFrequency16 = scalar, U16, 862, "Hz", 1, 0, 0, 3000, 0 - fsio_setting1 = scalar, F32, 864, "Val", 1, 0, 0, 18000, 4 - fsio_setting2 = scalar, F32, 868, "Val", 1, 0, 0, 18000, 4 - fsio_setting3 = scalar, F32, 872, "Val", 1, 0, 0, 18000, 4 - fsio_setting4 = scalar, F32, 876, "Val", 1, 0, 0, 18000, 4 - fsio_setting5 = scalar, F32, 880, "Val", 1, 0, 0, 18000, 4 - fsio_setting6 = scalar, F32, 884, "Val", 1, 0, 0, 18000, 4 - fsio_setting7 = scalar, F32, 888, "Val", 1, 0, 0, 18000, 4 - fsio_setting8 = scalar, F32, 892, "Val", 1, 0, 0, 18000, 4 - fsio_setting9 = scalar, F32, 896, "Val", 1, 0, 0, 18000, 4 - fsio_setting10 = scalar, F32, 900, "Val", 1, 0, 0, 18000, 4 - fsio_setting11 = scalar, F32, 904, "Val", 1, 0, 0, 18000, 4 - fsio_setting12 = scalar, F32, 908, "Val", 1, 0, 0, 18000, 4 - fsio_setting13 = scalar, F32, 912, "Val", 1, 0, 0, 18000, 4 - fsio_setting14 = scalar, F32, 916, "Val", 1, 0, 0, 18000, 4 - fsio_setting15 = scalar, F32, 920, "Val", 1, 0, 0, 18000, 4 - fsio_setting16 = scalar, F32, 924, "Val", 1, 0, 0, 18000, 4 + fsio_setting1 = scalar, F32, 864, "Val", 1, 0, 0, 18000, 2 + fsio_setting2 = scalar, F32, 868, "Val", 1, 0, 0, 18000, 2 + fsio_setting3 = scalar, F32, 872, "Val", 1, 0, 0, 18000, 2 + fsio_setting4 = scalar, F32, 876, "Val", 1, 0, 0, 18000, 2 + fsio_setting5 = scalar, F32, 880, "Val", 1, 0, 0, 18000, 2 + fsio_setting6 = scalar, F32, 884, "Val", 1, 0, 0, 18000, 2 + fsio_setting7 = scalar, F32, 888, "Val", 1, 0, 0, 18000, 2 + fsio_setting8 = scalar, F32, 892, "Val", 1, 0, 0, 18000, 2 + fsio_setting9 = scalar, F32, 896, "Val", 1, 0, 0, 18000, 2 + fsio_setting10 = scalar, F32, 900, "Val", 1, 0, 0, 18000, 2 + fsio_setting11 = scalar, F32, 904, "Val", 1, 0, 0, 18000, 2 + fsio_setting12 = scalar, F32, 908, "Val", 1, 0, 0, 18000, 2 + fsio_setting13 = scalar, F32, 912, "Val", 1, 0, 0, 18000, 2 + fsio_setting14 = scalar, F32, 916, "Val", 1, 0, 0, 18000, 2 + fsio_setting15 = scalar, F32, 920, "Val", 1, 0, 0, 18000, 2 + fsio_setting16 = scalar, F32, 924, "Val", 1, 0, 0, 18000, 2 spi1mosiPin = bits, U08, 928, [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" spi1misoPin = bits, U08, 929, [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" spi1sckPin = bits, U08, 930, [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" diff --git a/firmware/tunerstudio/rusefi_prometheus.ini b/firmware/tunerstudio/rusefi_prometheus.ini index 19eba02548..2700f46313 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 Wed Apr 29 22:58:20 EDT 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.bat integration\rusefi_config.txt Thu Apr 30 16:38:51 EDT 2020 pageSize = 20000 page = 1 @@ -484,22 +484,22 @@ page = 1 fsioFrequency14 = scalar, U16, 858, "Hz", 1, 0, 0, 3000, 0 fsioFrequency15 = scalar, U16, 860, "Hz", 1, 0, 0, 3000, 0 fsioFrequency16 = scalar, U16, 862, "Hz", 1, 0, 0, 3000, 0 - fsio_setting1 = scalar, F32, 864, "Val", 1, 0, 0, 18000, 4 - fsio_setting2 = scalar, F32, 868, "Val", 1, 0, 0, 18000, 4 - fsio_setting3 = scalar, F32, 872, "Val", 1, 0, 0, 18000, 4 - fsio_setting4 = scalar, F32, 876, "Val", 1, 0, 0, 18000, 4 - fsio_setting5 = scalar, F32, 880, "Val", 1, 0, 0, 18000, 4 - fsio_setting6 = scalar, F32, 884, "Val", 1, 0, 0, 18000, 4 - fsio_setting7 = scalar, F32, 888, "Val", 1, 0, 0, 18000, 4 - fsio_setting8 = scalar, F32, 892, "Val", 1, 0, 0, 18000, 4 - fsio_setting9 = scalar, F32, 896, "Val", 1, 0, 0, 18000, 4 - fsio_setting10 = scalar, F32, 900, "Val", 1, 0, 0, 18000, 4 - fsio_setting11 = scalar, F32, 904, "Val", 1, 0, 0, 18000, 4 - fsio_setting12 = scalar, F32, 908, "Val", 1, 0, 0, 18000, 4 - fsio_setting13 = scalar, F32, 912, "Val", 1, 0, 0, 18000, 4 - fsio_setting14 = scalar, F32, 916, "Val", 1, 0, 0, 18000, 4 - fsio_setting15 = scalar, F32, 920, "Val", 1, 0, 0, 18000, 4 - fsio_setting16 = scalar, F32, 924, "Val", 1, 0, 0, 18000, 4 + fsio_setting1 = scalar, F32, 864, "Val", 1, 0, 0, 18000, 2 + fsio_setting2 = scalar, F32, 868, "Val", 1, 0, 0, 18000, 2 + fsio_setting3 = scalar, F32, 872, "Val", 1, 0, 0, 18000, 2 + fsio_setting4 = scalar, F32, 876, "Val", 1, 0, 0, 18000, 2 + fsio_setting5 = scalar, F32, 880, "Val", 1, 0, 0, 18000, 2 + fsio_setting6 = scalar, F32, 884, "Val", 1, 0, 0, 18000, 2 + fsio_setting7 = scalar, F32, 888, "Val", 1, 0, 0, 18000, 2 + fsio_setting8 = scalar, F32, 892, "Val", 1, 0, 0, 18000, 2 + fsio_setting9 = scalar, F32, 896, "Val", 1, 0, 0, 18000, 2 + fsio_setting10 = scalar, F32, 900, "Val", 1, 0, 0, 18000, 2 + fsio_setting11 = scalar, F32, 904, "Val", 1, 0, 0, 18000, 2 + fsio_setting12 = scalar, F32, 908, "Val", 1, 0, 0, 18000, 2 + fsio_setting13 = scalar, F32, 912, "Val", 1, 0, 0, 18000, 2 + fsio_setting14 = scalar, F32, 916, "Val", 1, 0, 0, 18000, 2 + fsio_setting15 = scalar, F32, 920, "Val", 1, 0, 0, 18000, 2 + fsio_setting16 = scalar, F32, 924, "Val", 1, 0, 0, 18000, 2 spi1mosiPin = bits, U08, 928, [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" spi1misoPin = bits, U08, 929, [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" spi1sckPin = bits, U08, 930, [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" diff --git a/firmware/tunerstudio/rusefi_proteus.ini b/firmware/tunerstudio/rusefi_proteus.ini index e34f4a8b59..87395553c3 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 Wed Apr 29 22:58:32 EDT 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.bat integration\rusefi_config.txt Thu Apr 30 16:38:53 EDT 2020 pageSize = 20000 page = 1 @@ -484,22 +484,22 @@ page = 1 fsioFrequency14 = scalar, U16, 858, "Hz", 1, 0, 0, 3000, 0 fsioFrequency15 = scalar, U16, 860, "Hz", 1, 0, 0, 3000, 0 fsioFrequency16 = scalar, U16, 862, "Hz", 1, 0, 0, 3000, 0 - fsio_setting1 = scalar, F32, 864, "Val", 1, 0, 0, 18000, 4 - fsio_setting2 = scalar, F32, 868, "Val", 1, 0, 0, 18000, 4 - fsio_setting3 = scalar, F32, 872, "Val", 1, 0, 0, 18000, 4 - fsio_setting4 = scalar, F32, 876, "Val", 1, 0, 0, 18000, 4 - fsio_setting5 = scalar, F32, 880, "Val", 1, 0, 0, 18000, 4 - fsio_setting6 = scalar, F32, 884, "Val", 1, 0, 0, 18000, 4 - fsio_setting7 = scalar, F32, 888, "Val", 1, 0, 0, 18000, 4 - fsio_setting8 = scalar, F32, 892, "Val", 1, 0, 0, 18000, 4 - fsio_setting9 = scalar, F32, 896, "Val", 1, 0, 0, 18000, 4 - fsio_setting10 = scalar, F32, 900, "Val", 1, 0, 0, 18000, 4 - fsio_setting11 = scalar, F32, 904, "Val", 1, 0, 0, 18000, 4 - fsio_setting12 = scalar, F32, 908, "Val", 1, 0, 0, 18000, 4 - fsio_setting13 = scalar, F32, 912, "Val", 1, 0, 0, 18000, 4 - fsio_setting14 = scalar, F32, 916, "Val", 1, 0, 0, 18000, 4 - fsio_setting15 = scalar, F32, 920, "Val", 1, 0, 0, 18000, 4 - fsio_setting16 = scalar, F32, 924, "Val", 1, 0, 0, 18000, 4 + fsio_setting1 = scalar, F32, 864, "Val", 1, 0, 0, 18000, 2 + fsio_setting2 = scalar, F32, 868, "Val", 1, 0, 0, 18000, 2 + fsio_setting3 = scalar, F32, 872, "Val", 1, 0, 0, 18000, 2 + fsio_setting4 = scalar, F32, 876, "Val", 1, 0, 0, 18000, 2 + fsio_setting5 = scalar, F32, 880, "Val", 1, 0, 0, 18000, 2 + fsio_setting6 = scalar, F32, 884, "Val", 1, 0, 0, 18000, 2 + fsio_setting7 = scalar, F32, 888, "Val", 1, 0, 0, 18000, 2 + fsio_setting8 = scalar, F32, 892, "Val", 1, 0, 0, 18000, 2 + fsio_setting9 = scalar, F32, 896, "Val", 1, 0, 0, 18000, 2 + fsio_setting10 = scalar, F32, 900, "Val", 1, 0, 0, 18000, 2 + fsio_setting11 = scalar, F32, 904, "Val", 1, 0, 0, 18000, 2 + fsio_setting12 = scalar, F32, 908, "Val", 1, 0, 0, 18000, 2 + fsio_setting13 = scalar, F32, 912, "Val", 1, 0, 0, 18000, 2 + fsio_setting14 = scalar, F32, 916, "Val", 1, 0, 0, 18000, 2 + fsio_setting15 = scalar, F32, 920, "Val", 1, 0, 0, 18000, 2 + fsio_setting16 = scalar, F32, 924, "Val", 1, 0, 0, 18000, 2 spi1mosiPin = bits, U08, 928, [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" spi1misoPin = bits, U08, 929, [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" spi1sckPin = bits, U08, 930, [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" From 6c15d6b2e899b746a18403e57a9e7ffb9bb6d211 Mon Sep 17 00:00:00 2001 From: Matthew Kennedy Date: Thu, 30 Apr 2020 15:03:56 -0700 Subject: [PATCH 3/5] Trigger dialog cleanup (#1389) * trigger dialog simplify * more cleanup Co-authored-by: Matthew Kennedy --- firmware/tunerstudio/rusefi.input | 36 ++++++++++++++++--------------- 1 file changed, 19 insertions(+), 17 deletions(-) diff --git a/firmware/tunerstudio/rusefi.input b/firmware/tunerstudio/rusefi.input index cda902b2b0..79edc4913a 100644 --- a/firmware/tunerstudio/rusefi.input +++ b/firmware/tunerstudio/rusefi.input @@ -1238,6 +1238,7 @@ menuDialog = main menu = "&Base &Engine" subMenu = engineChars, "Base engine" subMenu = triggerConfiguration, "Trigger" + subMenu = triggerConfiguration_IO, "Advanced Trigger" subMenu = std_separator subMenu = energySystems, "Battery and alternator" subMenu = std_separator @@ -1354,7 +1355,6 @@ menuDialog = main menu = "&Sensors" # Base analog input settings - subMenu = triggerInputs, "Trigger inputs" subMenu = otherSensorInputs, "Misc sensors" subMenu = analogInputSettings, "Analog input settings" subMenu = std_separator @@ -1631,9 +1631,12 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00" field = "Firing Order", firingOrder ; Engine->Trigger configuration - dialog = triggerConfiguration_settings, "Settings Trigger" + dialog = triggerConfiguration_settings, "Trigger Pattern" field = "!https://rusefi.com/s/trigger" field = "Trigger type", trigger_type + field = "Total tooth count", trigger_customTotalToothCount, {trigger_type == 0}, {trigger_type == 0} + field = "Missing/skipped tooth count", trigger_customSkippedToothCount, {trigger_type == 0}, {trigger_type == 0} + ; see also in firmware '[doesTriggerImplyOperationMode]' tag field = "Operation mode / speed", ambiguousOperationMode field = "With VR sensors only rising edge has reliable position" @@ -1642,11 +1645,8 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00" field = "!For well-known trigger types use '0' trigger angle offset" field = "Trigger Angle Offset", globalTriggerAngleOffset field = "Display only interesting", displayLogicLevelsInEngineSniffer - field = "#Custom Trigger" - field = "total Tooth Count", trigger_customTotalToothCount, {trigger_type == 0} - field = "skipped Tooth Count", trigger_customSkippedToothCount, {trigger_type == 0} - dialog = triggerConfiguration_IO, "Settings I/O" + dialog = triggerConfiguration_IO, "Advanced Trigger" field = "!https://rusefi.com/s/vvt" field = "VVT mode", vvtMode, {trigger_type != 80} field = "VVT use rise front", vvtCamSensorUseRise, {trigger_type != 80} @@ -1655,9 +1655,21 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00" field = "print verbose sync details to console",verboseTriggerSynchDetails field = "Do not print messages in case of sync error", silentTriggerError field = "Enable noise filtering", useNoiselessTriggerDecoder, {trigger_type == @@TRIGGER_TYPE_60_2@@ || trigger_type == @@TRIGGER_TYPE_36_1@@} + + dialog = triggerInputs, "Trigger Inputs" + field = "!ECU reboot needed to apply these settings" + field = "#Cam is primary if you have cam sensor" + field = "Primary channel", triggerInputPins1 + field = "Invert Primary", invertPrimaryTriggerSignal + field = "Secondary channel", triggerInputPins2, { trigger_type != 0 && trigger_type != 8 && trigger_type != 9 && trigger_type != 18 && trigger_type != 20} + field = "Invert Secondary", invertSecondaryTriggerSignal, { trigger_type != 0 && trigger_type != 8 && trigger_type != 9 && trigger_type != 18 && trigger_type != 20} + field = "Cam Sync/VVT input", camInputs1 + panel = triggerInputComparator @@if_ts_show_trigger_comparator + + dialog = triggerConfiguration panel = triggerConfiguration_settings, North - panel = triggerConfiguration_IO, South + panel = triggerInputs, South ; Engine->Injection Settings dialog = injChars, "Injector Settings", yAxis @@ -1810,16 +1822,6 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00" field = "Comparator hysteresis voltage (Max)", triggerCompHystMax field = "VR-sensor saturation RPM", triggerCompSensorSatRpm - dialog = triggerInputs, "Trigger Inputs" - field = "!ECU reboot needed to apply these settings" - field = "#Cam is primary if you have cam sensor" - field = "Primary channel", triggerInputPins1 - field = "Invert Primary", invertPrimaryTriggerSignal - field = "Secondary channel", triggerInputPins2, { trigger_type != 0 && trigger_type != 8 && trigger_type != 9 && trigger_type != 18 && trigger_type != 20} - field = "Invert Secondary", invertSecondaryTriggerSignal, { trigger_type != 0 && trigger_type != 8 && trigger_type != 9 && trigger_type != 18 && trigger_type != 20} - field = "Cam Sync/VVT input", camInputs1 - panel = triggerInputComparator @@if_ts_show_trigger_comparator - ; ; allXXX sections allows a quick overview of used I/O in order to address conflicts mostly, not really to ; configure the features. From b17198a5416e1e98c586da54dda1acf2267d3d81 Mon Sep 17 00:00:00 2001 From: Matthew Kennedy Date: Thu, 30 Apr 2020 15:44:34 -0700 Subject: [PATCH 4/5] Add raw gauges to sensor config pages (#1390) * clt * iat * minor cranking * fix * oilp too Co-authored-by: Matthew Kennedy --- firmware/integration/rusefi_config.txt | 4 +-- firmware/tunerstudio/rusefi.input | 39 +++++++++++++++++--------- 2 files changed, 27 insertions(+), 16 deletions(-) diff --git a/firmware/integration/rusefi_config.txt b/firmware/integration/rusefi_config.txt index 29a08d05cc..32526bcfa6 100644 --- a/firmware/integration/rusefi_config.txt +++ b/firmware/integration/rusefi_config.txt @@ -1125,8 +1125,8 @@ tle8888_mode_e tle8888mode; float autoTuneTpsRocThreshold; float autoTuneTpsQuietPeriod; float unused2432; - float postCrankingFactor;Fuel multiplier taper, see also postCrankingDurationSec;"mult", 1, 0, 0, 100, 4 - float postCrankingDurationSec;See also postCrankingFactor;"seconds", 1, 0, 0, 100, 2 + float postCrankingFactor;+Fuel multiplier (enrichment) immediately after engine start;"mult", 1, 0, 0, 100, 4 + float postCrankingDurationSec;+Time over which to taper out after start enrichment;"seconds", 1, 0, 0, 100, 2 ThermistorConf auxTempSensor1;todo: finish implementation #332 ThermistorConf auxTempSensor2;todo: finish implementation #332 int16_t fuelClosedLoopCltThreshold;;"C", 1, 0, 0, 100, 0 diff --git a/firmware/tunerstudio/rusefi.input b/firmware/tunerstudio/rusefi.input index 79edc4913a..164246a1d7 100644 --- a/firmware/tunerstudio/rusefi.input +++ b/firmware/tunerstudio/rusefi.input @@ -2035,8 +2035,8 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00" field = "Input channel", clt_adcChannel field = "Bias resistor", clt_bias_resistor, {clt_adcChannel != 16} - field = "#Here is three pairs of thermistor temperature and resistance." - field = "#Typical temperatures is -40 deg C, 0 deg C and 100 deg C" + field = "#Input three pairs of thermistor temperature and resistance." + field = "#Typical temperatures are -40 deg C, 0 deg C and 100 deg C" field = "" field = "Lowest temperature", clt_tempC_1, {clt_adcChannel != 16} field = "Resistance @ LT", clt_resistance_1, {clt_adcChannel != 16} @@ -2049,17 +2049,21 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00" field = "" field = "Linear characteristic", useLinearCltSensor, {clt_adcChannel != 16} - dialog = cltSensor, "", xAxis - panel = clt_thermistor + dialog = cltGauges gauge = CLTGauge + gauge = rawCltGauge + + dialog = cltSensor, "CLT Sensor", border + panel = clt_thermistor, West + panel = cltGauges, East ; Sensors->IAT sensor dialog = iat_thermistor, "IAT sensor" field = "Input channel", iat_adcChannel field = "Bias resistor", iat_bias_resistor, {iat_adcChannel != 16} - field = "#Here is three pairs of thermistor temperature and resistance." - field = "#Typical temperatures is -40 deg C, 0 deg C and 100 deg C" + field = "#Input three pairs of thermistor temperature and resistance." + field = "#Typical temperatures are -40 deg C, 0 deg C and 100 deg C" field = "" field = "Lowest temperature", iat_tempC_1, {iat_adcChannel != 16} field = "Resistance @ LT", iat_resistance_1, {iat_adcChannel != 16} @@ -2072,21 +2076,29 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00" field = "" field = "Linear characteristic", useLinearIatSensor, {iat_adcChannel != 16} - dialog = iatSensor, "", xAxis - panel = iat_thermistor + dialog = iatGauges gauge = IATGauge + gauge = rawIatGauge + + dialog = iatSensor, "IAT Sensor", border + panel = iat_thermistor, West + panel = iatGauges, East ; Sensors->Oil pressure sensor - dialog = oilp_settings, "Oil pressure sensor" + dialog = oilp_settings, "Oil Pressure Sensor" field = "Oil Pressure ADC input", oilPressure_hwChannel field = "low voltage", oilPressure_v1, {oilPressure_hwChannel != 16} field = "low pressure", oilPressure_value1, {oilPressure_hwChannel != 16} field = "high voltage", oilPressure_v2, {oilPressure_hwChannel != 16} field = "high pressure", oilPressure_value2, {oilPressure_hwChannel != 16} - dialog = oilPressureSensor, "", xAxis - panel = oilp_settings + dialog = oilPressureGauges gauge = OilPressGauge + gauge = rawOilPressureGauge + + dialog = oilPressureSensor, "", border + panel = oilp_settings, West + panel = oilPressureGauges, East ; Sensors->MAP sensor dialog = mapSensorAnalog, "MAP sensor", yAxis @@ -2562,10 +2574,9 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00" dialog = crankingFuel, "Fuel" field = "Injection mode", crankingInjectionMode - field = "!Value '1' is currently recommended" field = "Fuel Source For Cranking", useRunningMathForCranking field = "Base fuel pulse width", cranking_baseFuel, {useRunningMathForCranking == 0} - + dialog = crankingIAC, "IAC" field = "Cranking IAC position", crankingIACposition field = "After cranking IAC taper duration", afterCrankingIACtaperDuration @@ -2579,7 +2590,7 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00" field = "Fixed Cranking Dwell", ignitionDwellForCrankingMs, {useConstantDwellDuringCranking == 1} field = "Cranking Dwell Angle", crankingChargeAngle, {useConstantDwellDuringCranking == 0} - dialog = postCrankingEnrichment, "Post-cranking short-time fuel enrichment (NOT IMPLEMENTED #331)" + dialog = postCrankingEnrichment, "After start enrichment" field = "Post-Cranking factor", postCrankingFactor field = "Duration", postCrankingDurationSec From 901c61eba5d0b6e187d381f31d749b8eaa6c9275 Mon Sep 17 00:00:00 2001 From: rusefi Date: Thu, 30 Apr 2020 19:43:31 -0400 Subject: [PATCH 5/5] Fresh generated - auto --- ...ngine_configuration_generated_structures.h | 8 +- ...ngine_configuration_generated_structures.h | 8 +- firmware/tunerstudio/rusefi.ini | 77 ++++++++++-------- firmware/tunerstudio/rusefi_frankenso.ini | 77 ++++++++++-------- firmware/tunerstudio/rusefi_kinetis.ini | 79 +++++++++++-------- firmware/tunerstudio/rusefi_microrusefi.ini | 77 ++++++++++-------- firmware/tunerstudio/rusefi_prometheus.ini | 77 ++++++++++-------- firmware/tunerstudio/rusefi_proteus.ini | 77 ++++++++++-------- 8 files changed, 285 insertions(+), 195 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 54e6fd9df3..cf499ea195 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 Tue Apr 28 20:11:11 EDT 2020 +// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on kineris_gen_config.bat integration/rusefi_config.txt Thu Apr 30 19:42:32 EDT 2020 // by class com.rusefi.output.CHeaderConsumer // begin #ifndef CONFIG_BOARDS_KINETIS_CONFIG_CONTROLLERS_ALGO_ENGINE_CONFIGURATION_GENERATED_STRUCTURES_H @@ -2652,12 +2652,12 @@ struct engine_configuration_s { */ float unused2432; /** - * Fuel multiplier taper, see also postCrankingDurationSec + * Fuel multiplier (enrichment) immediately after engine start * offset 2436 */ float postCrankingFactor; /** - * See also postCrankingFactor + * Time over which to taper out after start enrichment * offset 2440 */ float postCrankingDurationSec; @@ -3415,4 +3415,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 Tue Apr 28 20:11:11 EDT 2020 +// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on kineris_gen_config.bat integration/rusefi_config.txt Thu Apr 30 19:42:32 EDT 2020 diff --git a/firmware/controllers/generated/engine_configuration_generated_structures.h b/firmware/controllers/generated/engine_configuration_generated_structures.h index 9ba255f215..e3514aee6f 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 Tue Apr 28 20:10:00 EDT 2020 +// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.bat integration\rusefi_config.txt Thu Apr 30 19:40:29 EDT 2020 // by class com.rusefi.output.CHeaderConsumer // begin #ifndef CONTROLLERS_GENERATED_ENGINE_CONFIGURATION_GENERATED_STRUCTURES_H @@ -2652,12 +2652,12 @@ struct engine_configuration_s { */ float unused2432; /** - * Fuel multiplier taper, see also postCrankingDurationSec + * Fuel multiplier (enrichment) immediately after engine start * offset 2436 */ float postCrankingFactor; /** - * See also postCrankingFactor + * Time over which to taper out after start enrichment * offset 2440 */ float postCrankingDurationSec; @@ -3415,4 +3415,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 Tue Apr 28 20:10:00 EDT 2020 +// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.bat integration\rusefi_config.txt Thu Apr 30 19:40:29 EDT 2020 diff --git a/firmware/tunerstudio/rusefi.ini b/firmware/tunerstudio/rusefi.ini index 63bfb562e0..3c01052e83 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 Thu Apr 30 16:38:24 EDT 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.bat integration\rusefi_config.txt Thu Apr 30 19:40:29 EDT 2020 pageSize = 20000 page = 1 @@ -1280,6 +1280,8 @@ page = 1 debugMode = "See http://rusefi.com/s/debugmode\n\nset debug_mode X" dizzySparkOutputPin = "This implementation makes a pulse every time one of the coils is charged, using coil dwell for pulse width. See also tachOutputPin" crankingIACposition = "This is the IAC position during cranking, some engines start better if given more air during cranking to improve cylinder filling." + postCrankingFactor = "Fuel multiplier (enrichment) immediately after engine start" + postCrankingDurationSec = "Time over which to taper out after start enrichment" auxTempSensor1_bias_resistor = "Pull-up resistor value on your board" auxTempSensor2_bias_resistor = "Pull-up resistor value on your board" spi1MosiMode = "Modes count be used for 3v<>5v integration using pull-ups/pull-downs etc." @@ -2473,6 +2475,7 @@ menuDialog = main menu = "&Base &Engine" subMenu = engineChars, "Base engine" subMenu = triggerConfiguration, "Trigger" + subMenu = triggerConfiguration_IO, "Advanced Trigger" subMenu = std_separator subMenu = energySystems, "Battery and alternator" subMenu = std_separator @@ -2589,7 +2592,6 @@ menuDialog = main menu = "&Sensors" # Base analog input settings - subMenu = triggerInputs, "Trigger inputs" subMenu = otherSensorInputs, "Misc sensors" subMenu = analogInputSettings, "Analog input settings" subMenu = std_separator @@ -2866,9 +2868,12 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00" field = "Firing Order", firingOrder ; Engine->Trigger configuration - dialog = triggerConfiguration_settings, "Settings Trigger" + dialog = triggerConfiguration_settings, "Trigger Pattern" field = "!https://rusefi.com/s/trigger" field = "Trigger type", trigger_type + field = "Total tooth count", trigger_customTotalToothCount, {trigger_type == 0}, {trigger_type == 0} + field = "Missing/skipped tooth count", trigger_customSkippedToothCount, {trigger_type == 0}, {trigger_type == 0} + ; see also in firmware '[doesTriggerImplyOperationMode]' tag field = "Operation mode / speed", ambiguousOperationMode field = "With VR sensors only rising edge has reliable position" @@ -2877,11 +2882,8 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00" field = "!For well-known trigger types use '0' trigger angle offset" field = "Trigger Angle Offset", globalTriggerAngleOffset field = "Display only interesting", displayLogicLevelsInEngineSniffer - field = "#Custom Trigger" - field = "total Tooth Count", trigger_customTotalToothCount, {trigger_type == 0} - field = "skipped Tooth Count", trigger_customSkippedToothCount, {trigger_type == 0} - dialog = triggerConfiguration_IO, "Settings I/O" + dialog = triggerConfiguration_IO, "Advanced Trigger" field = "!https://rusefi.com/s/vvt" field = "VVT mode", vvtMode, {trigger_type != 80} field = "VVT use rise front", vvtCamSensorUseRise, {trigger_type != 80} @@ -2890,9 +2892,20 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00" field = "print verbose sync details to console",verboseTriggerSynchDetails field = "Do not print messages in case of sync error", silentTriggerError field = "Enable noise filtering", useNoiselessTriggerDecoder, {trigger_type == 8 || trigger_type == 9} + + dialog = triggerInputs, "Trigger Inputs" + field = "!ECU reboot needed to apply these settings" + field = "#Cam is primary if you have cam sensor" + field = "Primary channel", triggerInputPins1 + field = "Invert Primary", invertPrimaryTriggerSignal + field = "Secondary channel", triggerInputPins2, { trigger_type != 0 && trigger_type != 8 && trigger_type != 9 && trigger_type != 18 && trigger_type != 20} + field = "Invert Secondary", invertSecondaryTriggerSignal, { trigger_type != 0 && trigger_type != 8 && trigger_type != 9 && trigger_type != 18 && trigger_type != 20} + field = "Cam Sync/VVT input", camInputs1 + + dialog = triggerConfiguration panel = triggerConfiguration_settings, North - panel = triggerConfiguration_IO, South + panel = triggerInputs, South ; Engine->Injection Settings dialog = injChars, "Injector Settings", yAxis @@ -3045,15 +3058,6 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00" field = "Comparator hysteresis voltage (Max)", triggerCompHystMax field = "VR-sensor saturation RPM", triggerCompSensorSatRpm - dialog = triggerInputs, "Trigger Inputs" - field = "!ECU reboot needed to apply these settings" - field = "#Cam is primary if you have cam sensor" - field = "Primary channel", triggerInputPins1 - field = "Invert Primary", invertPrimaryTriggerSignal - field = "Secondary channel", triggerInputPins2, { trigger_type != 0 && trigger_type != 8 && trigger_type != 9 && trigger_type != 18 && trigger_type != 20} - field = "Invert Secondary", invertSecondaryTriggerSignal, { trigger_type != 0 && trigger_type != 8 && trigger_type != 9 && trigger_type != 18 && trigger_type != 20} - field = "Cam Sync/VVT input", camInputs1 - ; ; allXXX sections allows a quick overview of used I/O in order to address conflicts mostly, not really to ; configure the features. @@ -3267,8 +3271,8 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00" field = "Input channel", clt_adcChannel field = "Bias resistor", clt_bias_resistor, {clt_adcChannel != 16} - field = "#Here is three pairs of thermistor temperature and resistance." - field = "#Typical temperatures is -40 deg C, 0 deg C and 100 deg C" + field = "#Input three pairs of thermistor temperature and resistance." + field = "#Typical temperatures are -40 deg C, 0 deg C and 100 deg C" field = "" field = "Lowest temperature", clt_tempC_1, {clt_adcChannel != 16} field = "Resistance @ LT", clt_resistance_1, {clt_adcChannel != 16} @@ -3281,17 +3285,21 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00" field = "" field = "Linear characteristic", useLinearCltSensor, {clt_adcChannel != 16} - dialog = cltSensor, "", xAxis - panel = clt_thermistor + dialog = cltGauges gauge = CLTGauge + gauge = rawCltGauge + + dialog = cltSensor, "CLT Sensor", border + panel = clt_thermistor, West + panel = cltGauges, East ; Sensors->IAT sensor dialog = iat_thermistor, "IAT sensor" field = "Input channel", iat_adcChannel field = "Bias resistor", iat_bias_resistor, {iat_adcChannel != 16} - field = "#Here is three pairs of thermistor temperature and resistance." - field = "#Typical temperatures is -40 deg C, 0 deg C and 100 deg C" + field = "#Input three pairs of thermistor temperature and resistance." + field = "#Typical temperatures are -40 deg C, 0 deg C and 100 deg C" field = "" field = "Lowest temperature", iat_tempC_1, {iat_adcChannel != 16} field = "Resistance @ LT", iat_resistance_1, {iat_adcChannel != 16} @@ -3304,21 +3312,29 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00" field = "" field = "Linear characteristic", useLinearIatSensor, {iat_adcChannel != 16} - dialog = iatSensor, "", xAxis - panel = iat_thermistor + dialog = iatGauges gauge = IATGauge + gauge = rawIatGauge + + dialog = iatSensor, "IAT Sensor", border + panel = iat_thermistor, West + panel = iatGauges, East ; Sensors->Oil pressure sensor - dialog = oilp_settings, "Oil pressure sensor" + dialog = oilp_settings, "Oil Pressure Sensor" field = "Oil Pressure ADC input", oilPressure_hwChannel field = "low voltage", oilPressure_v1, {oilPressure_hwChannel != 16} field = "low pressure", oilPressure_value1, {oilPressure_hwChannel != 16} field = "high voltage", oilPressure_v2, {oilPressure_hwChannel != 16} field = "high pressure", oilPressure_value2, {oilPressure_hwChannel != 16} - dialog = oilPressureSensor, "", xAxis - panel = oilp_settings + dialog = oilPressureGauges gauge = OilPressGauge + gauge = rawOilPressureGauge + + dialog = oilPressureSensor, "", border + panel = oilp_settings, West + panel = oilPressureGauges, East ; Sensors->MAP sensor dialog = mapSensorAnalog, "MAP sensor", yAxis @@ -3794,10 +3810,9 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00" dialog = crankingFuel, "Fuel" field = "Injection mode", crankingInjectionMode - field = "!Value '1' is currently recommended" field = "Fuel Source For Cranking", useRunningMathForCranking field = "Base fuel pulse width", cranking_baseFuel, {useRunningMathForCranking == 0} - + dialog = crankingIAC, "IAC" field = "Cranking IAC position", crankingIACposition field = "After cranking IAC taper duration", afterCrankingIACtaperDuration @@ -3811,7 +3826,7 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00" field = "Fixed Cranking Dwell", ignitionDwellForCrankingMs, {useConstantDwellDuringCranking == 1} field = "Cranking Dwell Angle", crankingChargeAngle, {useConstantDwellDuringCranking == 0} - dialog = postCrankingEnrichment, "Post-cranking short-time fuel enrichment (NOT IMPLEMENTED #331)" + dialog = postCrankingEnrichment, "After start enrichment" field = "Post-Cranking factor", postCrankingFactor field = "Duration", postCrankingDurationSec diff --git a/firmware/tunerstudio/rusefi_frankenso.ini b/firmware/tunerstudio/rusefi_frankenso.ini index 47687a43af..b87c9f8aaa 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 Thu Apr 30 16:38:47 EDT 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.bat integration\rusefi_config.txt Thu Apr 30 19:42:20 EDT 2020 pageSize = 20000 page = 1 @@ -1280,6 +1280,8 @@ page = 1 debugMode = "See http://rusefi.com/s/debugmode\n\nset debug_mode X" dizzySparkOutputPin = "This implementation makes a pulse every time one of the coils is charged, using coil dwell for pulse width. See also tachOutputPin" crankingIACposition = "This is the IAC position during cranking, some engines start better if given more air during cranking to improve cylinder filling." + postCrankingFactor = "Fuel multiplier (enrichment) immediately after engine start" + postCrankingDurationSec = "Time over which to taper out after start enrichment" auxTempSensor1_bias_resistor = "Pull-up resistor value on your board" auxTempSensor2_bias_resistor = "Pull-up resistor value on your board" spi1MosiMode = "Modes count be used for 3v<>5v integration using pull-ups/pull-downs etc." @@ -2473,6 +2475,7 @@ menuDialog = main menu = "&Base &Engine" subMenu = engineChars, "Base engine" subMenu = triggerConfiguration, "Trigger" + subMenu = triggerConfiguration_IO, "Advanced Trigger" subMenu = std_separator subMenu = energySystems, "Battery and alternator" subMenu = std_separator @@ -2589,7 +2592,6 @@ menuDialog = main menu = "&Sensors" # Base analog input settings - subMenu = triggerInputs, "Trigger inputs" subMenu = otherSensorInputs, "Misc sensors" subMenu = analogInputSettings, "Analog input settings" subMenu = std_separator @@ -2866,9 +2868,12 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00" field = "Firing Order", firingOrder ; Engine->Trigger configuration - dialog = triggerConfiguration_settings, "Settings Trigger" + dialog = triggerConfiguration_settings, "Trigger Pattern" field = "!https://rusefi.com/s/trigger" field = "Trigger type", trigger_type + field = "Total tooth count", trigger_customTotalToothCount, {trigger_type == 0}, {trigger_type == 0} + field = "Missing/skipped tooth count", trigger_customSkippedToothCount, {trigger_type == 0}, {trigger_type == 0} + ; see also in firmware '[doesTriggerImplyOperationMode]' tag field = "Operation mode / speed", ambiguousOperationMode field = "With VR sensors only rising edge has reliable position" @@ -2877,11 +2882,8 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00" field = "!For well-known trigger types use '0' trigger angle offset" field = "Trigger Angle Offset", globalTriggerAngleOffset field = "Display only interesting", displayLogicLevelsInEngineSniffer - field = "#Custom Trigger" - field = "total Tooth Count", trigger_customTotalToothCount, {trigger_type == 0} - field = "skipped Tooth Count", trigger_customSkippedToothCount, {trigger_type == 0} - dialog = triggerConfiguration_IO, "Settings I/O" + dialog = triggerConfiguration_IO, "Advanced Trigger" field = "!https://rusefi.com/s/vvt" field = "VVT mode", vvtMode, {trigger_type != 80} field = "VVT use rise front", vvtCamSensorUseRise, {trigger_type != 80} @@ -2890,9 +2892,20 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00" field = "print verbose sync details to console",verboseTriggerSynchDetails field = "Do not print messages in case of sync error", silentTriggerError field = "Enable noise filtering", useNoiselessTriggerDecoder, {trigger_type == 8 || trigger_type == 9} + + dialog = triggerInputs, "Trigger Inputs" + field = "!ECU reboot needed to apply these settings" + field = "#Cam is primary if you have cam sensor" + field = "Primary channel", triggerInputPins1 + field = "Invert Primary", invertPrimaryTriggerSignal + field = "Secondary channel", triggerInputPins2, { trigger_type != 0 && trigger_type != 8 && trigger_type != 9 && trigger_type != 18 && trigger_type != 20} + field = "Invert Secondary", invertSecondaryTriggerSignal, { trigger_type != 0 && trigger_type != 8 && trigger_type != 9 && trigger_type != 18 && trigger_type != 20} + field = "Cam Sync/VVT input", camInputs1 + + dialog = triggerConfiguration panel = triggerConfiguration_settings, North - panel = triggerConfiguration_IO, South + panel = triggerInputs, South ; Engine->Injection Settings dialog = injChars, "Injector Settings", yAxis @@ -3045,15 +3058,6 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00" field = "Comparator hysteresis voltage (Max)", triggerCompHystMax field = "VR-sensor saturation RPM", triggerCompSensorSatRpm - dialog = triggerInputs, "Trigger Inputs" - field = "!ECU reboot needed to apply these settings" - field = "#Cam is primary if you have cam sensor" - field = "Primary channel", triggerInputPins1 - field = "Invert Primary", invertPrimaryTriggerSignal - field = "Secondary channel", triggerInputPins2, { trigger_type != 0 && trigger_type != 8 && trigger_type != 9 && trigger_type != 18 && trigger_type != 20} - field = "Invert Secondary", invertSecondaryTriggerSignal, { trigger_type != 0 && trigger_type != 8 && trigger_type != 9 && trigger_type != 18 && trigger_type != 20} - field = "Cam Sync/VVT input", camInputs1 - ; ; allXXX sections allows a quick overview of used I/O in order to address conflicts mostly, not really to ; configure the features. @@ -3267,8 +3271,8 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00" field = "Input channel", clt_adcChannel field = "Bias resistor", clt_bias_resistor, {clt_adcChannel != 16} - field = "#Here is three pairs of thermistor temperature and resistance." - field = "#Typical temperatures is -40 deg C, 0 deg C and 100 deg C" + field = "#Input three pairs of thermistor temperature and resistance." + field = "#Typical temperatures are -40 deg C, 0 deg C and 100 deg C" field = "" field = "Lowest temperature", clt_tempC_1, {clt_adcChannel != 16} field = "Resistance @ LT", clt_resistance_1, {clt_adcChannel != 16} @@ -3281,17 +3285,21 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00" field = "" field = "Linear characteristic", useLinearCltSensor, {clt_adcChannel != 16} - dialog = cltSensor, "", xAxis - panel = clt_thermistor + dialog = cltGauges gauge = CLTGauge + gauge = rawCltGauge + + dialog = cltSensor, "CLT Sensor", border + panel = clt_thermistor, West + panel = cltGauges, East ; Sensors->IAT sensor dialog = iat_thermistor, "IAT sensor" field = "Input channel", iat_adcChannel field = "Bias resistor", iat_bias_resistor, {iat_adcChannel != 16} - field = "#Here is three pairs of thermistor temperature and resistance." - field = "#Typical temperatures is -40 deg C, 0 deg C and 100 deg C" + field = "#Input three pairs of thermistor temperature and resistance." + field = "#Typical temperatures are -40 deg C, 0 deg C and 100 deg C" field = "" field = "Lowest temperature", iat_tempC_1, {iat_adcChannel != 16} field = "Resistance @ LT", iat_resistance_1, {iat_adcChannel != 16} @@ -3304,21 +3312,29 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00" field = "" field = "Linear characteristic", useLinearIatSensor, {iat_adcChannel != 16} - dialog = iatSensor, "", xAxis - panel = iat_thermistor + dialog = iatGauges gauge = IATGauge + gauge = rawIatGauge + + dialog = iatSensor, "IAT Sensor", border + panel = iat_thermistor, West + panel = iatGauges, East ; Sensors->Oil pressure sensor - dialog = oilp_settings, "Oil pressure sensor" + dialog = oilp_settings, "Oil Pressure Sensor" field = "Oil Pressure ADC input", oilPressure_hwChannel field = "low voltage", oilPressure_v1, {oilPressure_hwChannel != 16} field = "low pressure", oilPressure_value1, {oilPressure_hwChannel != 16} field = "high voltage", oilPressure_v2, {oilPressure_hwChannel != 16} field = "high pressure", oilPressure_value2, {oilPressure_hwChannel != 16} - dialog = oilPressureSensor, "", xAxis - panel = oilp_settings + dialog = oilPressureGauges gauge = OilPressGauge + gauge = rawOilPressureGauge + + dialog = oilPressureSensor, "", border + panel = oilp_settings, West + panel = oilPressureGauges, East ; Sensors->MAP sensor dialog = mapSensorAnalog, "MAP sensor", yAxis @@ -3794,10 +3810,9 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00" dialog = crankingFuel, "Fuel" field = "Injection mode", crankingInjectionMode - field = "!Value '1' is currently recommended" field = "Fuel Source For Cranking", useRunningMathForCranking field = "Base fuel pulse width", cranking_baseFuel, {useRunningMathForCranking == 0} - + dialog = crankingIAC, "IAC" field = "Cranking IAC position", crankingIACposition field = "After cranking IAC taper duration", afterCrankingIACtaperDuration @@ -3811,7 +3826,7 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00" field = "Fixed Cranking Dwell", ignitionDwellForCrankingMs, {useConstantDwellDuringCranking == 1} field = "Cranking Dwell Angle", crankingChargeAngle, {useConstantDwellDuringCranking == 0} - dialog = postCrankingEnrichment, "Post-cranking short-time fuel enrichment (NOT IMPLEMENTED #331)" + dialog = postCrankingEnrichment, "After start enrichment" field = "Post-Cranking factor", postCrankingFactor field = "Duration", postCrankingDurationSec diff --git a/firmware/tunerstudio/rusefi_kinetis.ini b/firmware/tunerstudio/rusefi_kinetis.ini index 9d70b0b5bd..eaa29ceed5 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 Thu Apr 30 16:38:56 EDT 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on kineris_gen_config.bat integration/rusefi_config.txt Thu Apr 30 19:42:32 EDT 2020 pageSize = 20000 page = 1 @@ -1280,6 +1280,8 @@ page = 1 debugMode = "See http://rusefi.com/s/debugmode\n\nset debug_mode X" dizzySparkOutputPin = "This implementation makes a pulse every time one of the coils is charged, using coil dwell for pulse width. See also tachOutputPin" crankingIACposition = "This is the IAC position during cranking, some engines start better if given more air during cranking to improve cylinder filling." + postCrankingFactor = "Fuel multiplier (enrichment) immediately after engine start" + postCrankingDurationSec = "Time over which to taper out after start enrichment" auxTempSensor1_bias_resistor = "Pull-up resistor value on your board" auxTempSensor2_bias_resistor = "Pull-up resistor value on your board" spi1MosiMode = "Modes count be used for 3v<>5v integration using pull-ups/pull-downs etc." @@ -2473,6 +2475,7 @@ menuDialog = main menu = "&Base &Engine" subMenu = engineChars, "Base engine" subMenu = triggerConfiguration, "Trigger" + subMenu = triggerConfiguration_IO, "Advanced Trigger" subMenu = std_separator subMenu = energySystems, "Battery and alternator" subMenu = std_separator @@ -2589,7 +2592,6 @@ menuDialog = main menu = "&Sensors" # Base analog input settings - subMenu = triggerInputs, "Trigger inputs" subMenu = otherSensorInputs, "Misc sensors" subMenu = analogInputSettings, "Analog input settings" subMenu = std_separator @@ -2866,9 +2868,12 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00" field = "Firing Order", firingOrder ; Engine->Trigger configuration - dialog = triggerConfiguration_settings, "Settings Trigger" + dialog = triggerConfiguration_settings, "Trigger Pattern" field = "!https://rusefi.com/s/trigger" field = "Trigger type", trigger_type + field = "Total tooth count", trigger_customTotalToothCount, {trigger_type == 0}, {trigger_type == 0} + field = "Missing/skipped tooth count", trigger_customSkippedToothCount, {trigger_type == 0}, {trigger_type == 0} + ; see also in firmware '[doesTriggerImplyOperationMode]' tag field = "Operation mode / speed", ambiguousOperationMode field = "With VR sensors only rising edge has reliable position" @@ -2877,11 +2882,8 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00" field = "!For well-known trigger types use '0' trigger angle offset" field = "Trigger Angle Offset", globalTriggerAngleOffset field = "Display only interesting", displayLogicLevelsInEngineSniffer - field = "#Custom Trigger" - field = "total Tooth Count", trigger_customTotalToothCount, {trigger_type == 0} - field = "skipped Tooth Count", trigger_customSkippedToothCount, {trigger_type == 0} - dialog = triggerConfiguration_IO, "Settings I/O" + dialog = triggerConfiguration_IO, "Advanced Trigger" field = "!https://rusefi.com/s/vvt" field = "VVT mode", vvtMode, {trigger_type != 80} field = "VVT use rise front", vvtCamSensorUseRise, {trigger_type != 80} @@ -2890,9 +2892,21 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00" field = "print verbose sync details to console",verboseTriggerSynchDetails field = "Do not print messages in case of sync error", silentTriggerError field = "Enable noise filtering", useNoiselessTriggerDecoder, {trigger_type == 8 || trigger_type == 9} + + dialog = triggerInputs, "Trigger Inputs" + field = "!ECU reboot needed to apply these settings" + field = "#Cam is primary if you have cam sensor" + field = "Primary channel", triggerInputPins1 + field = "Invert Primary", invertPrimaryTriggerSignal + field = "Secondary channel", triggerInputPins2, { trigger_type != 0 && trigger_type != 8 && trigger_type != 9 && trigger_type != 18 && trigger_type != 20} + field = "Invert Secondary", invertSecondaryTriggerSignal, { trigger_type != 0 && trigger_type != 8 && trigger_type != 9 && trigger_type != 18 && trigger_type != 20} + field = "Cam Sync/VVT input", camInputs1 + panel = triggerInputComparator + + dialog = triggerConfiguration panel = triggerConfiguration_settings, North - panel = triggerConfiguration_IO, South + panel = triggerInputs, South ; Engine->Injection Settings dialog = injChars, "Injector Settings", yAxis @@ -3045,16 +3059,6 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00" field = "Comparator hysteresis voltage (Max)", triggerCompHystMax field = "VR-sensor saturation RPM", triggerCompSensorSatRpm - dialog = triggerInputs, "Trigger Inputs" - field = "!ECU reboot needed to apply these settings" - field = "#Cam is primary if you have cam sensor" - field = "Primary channel", triggerInputPins1 - field = "Invert Primary", invertPrimaryTriggerSignal - field = "Secondary channel", triggerInputPins2, { trigger_type != 0 && trigger_type != 8 && trigger_type != 9 && trigger_type != 18 && trigger_type != 20} - field = "Invert Secondary", invertSecondaryTriggerSignal, { trigger_type != 0 && trigger_type != 8 && trigger_type != 9 && trigger_type != 18 && trigger_type != 20} - field = "Cam Sync/VVT input", camInputs1 - panel = triggerInputComparator - ; ; allXXX sections allows a quick overview of used I/O in order to address conflicts mostly, not really to ; configure the features. @@ -3268,8 +3272,8 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00" field = "Input channel", clt_adcChannel field = "Bias resistor", clt_bias_resistor, {clt_adcChannel != 16} - field = "#Here is three pairs of thermistor temperature and resistance." - field = "#Typical temperatures is -40 deg C, 0 deg C and 100 deg C" + field = "#Input three pairs of thermistor temperature and resistance." + field = "#Typical temperatures are -40 deg C, 0 deg C and 100 deg C" field = "" field = "Lowest temperature", clt_tempC_1, {clt_adcChannel != 16} field = "Resistance @ LT", clt_resistance_1, {clt_adcChannel != 16} @@ -3282,17 +3286,21 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00" field = "" field = "Linear characteristic", useLinearCltSensor, {clt_adcChannel != 16} - dialog = cltSensor, "", xAxis - panel = clt_thermistor + dialog = cltGauges gauge = CLTGauge + gauge = rawCltGauge + + dialog = cltSensor, "CLT Sensor", border + panel = clt_thermistor, West + panel = cltGauges, East ; Sensors->IAT sensor dialog = iat_thermistor, "IAT sensor" field = "Input channel", iat_adcChannel field = "Bias resistor", iat_bias_resistor, {iat_adcChannel != 16} - field = "#Here is three pairs of thermistor temperature and resistance." - field = "#Typical temperatures is -40 deg C, 0 deg C and 100 deg C" + field = "#Input three pairs of thermistor temperature and resistance." + field = "#Typical temperatures are -40 deg C, 0 deg C and 100 deg C" field = "" field = "Lowest temperature", iat_tempC_1, {iat_adcChannel != 16} field = "Resistance @ LT", iat_resistance_1, {iat_adcChannel != 16} @@ -3305,21 +3313,29 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00" field = "" field = "Linear characteristic", useLinearIatSensor, {iat_adcChannel != 16} - dialog = iatSensor, "", xAxis - panel = iat_thermistor + dialog = iatGauges gauge = IATGauge + gauge = rawIatGauge + + dialog = iatSensor, "IAT Sensor", border + panel = iat_thermistor, West + panel = iatGauges, East ; Sensors->Oil pressure sensor - dialog = oilp_settings, "Oil pressure sensor" + dialog = oilp_settings, "Oil Pressure Sensor" field = "Oil Pressure ADC input", oilPressure_hwChannel field = "low voltage", oilPressure_v1, {oilPressure_hwChannel != 16} field = "low pressure", oilPressure_value1, {oilPressure_hwChannel != 16} field = "high voltage", oilPressure_v2, {oilPressure_hwChannel != 16} field = "high pressure", oilPressure_value2, {oilPressure_hwChannel != 16} - dialog = oilPressureSensor, "", xAxis - panel = oilp_settings + dialog = oilPressureGauges gauge = OilPressGauge + gauge = rawOilPressureGauge + + dialog = oilPressureSensor, "", border + panel = oilp_settings, West + panel = oilPressureGauges, East ; Sensors->MAP sensor dialog = mapSensorAnalog, "MAP sensor", yAxis @@ -3795,10 +3811,9 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00" dialog = crankingFuel, "Fuel" field = "Injection mode", crankingInjectionMode - field = "!Value '1' is currently recommended" field = "Fuel Source For Cranking", useRunningMathForCranking field = "Base fuel pulse width", cranking_baseFuel, {useRunningMathForCranking == 0} - + dialog = crankingIAC, "IAC" field = "Cranking IAC position", crankingIACposition field = "After cranking IAC taper duration", afterCrankingIACtaperDuration @@ -3812,7 +3827,7 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00" field = "Fixed Cranking Dwell", ignitionDwellForCrankingMs, {useConstantDwellDuringCranking == 1} field = "Cranking Dwell Angle", crankingChargeAngle, {useConstantDwellDuringCranking == 0} - dialog = postCrankingEnrichment, "Post-cranking short-time fuel enrichment (NOT IMPLEMENTED #331)" + dialog = postCrankingEnrichment, "After start enrichment" field = "Post-Cranking factor", postCrankingFactor field = "Duration", postCrankingDurationSec diff --git a/firmware/tunerstudio/rusefi_microrusefi.ini b/firmware/tunerstudio/rusefi_microrusefi.ini index 6b20a0fb13..87b785dd08 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 Thu Apr 30 16:38:33 EDT 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.bat integration\rusefi_config.txt Thu Apr 30 19:41:28 EDT 2020 pageSize = 20000 page = 1 @@ -1280,6 +1280,8 @@ page = 1 debugMode = "See http://rusefi.com/s/debugmode\n\nset debug_mode X" dizzySparkOutputPin = "This implementation makes a pulse every time one of the coils is charged, using coil dwell for pulse width. See also tachOutputPin" crankingIACposition = "This is the IAC position during cranking, some engines start better if given more air during cranking to improve cylinder filling." + postCrankingFactor = "Fuel multiplier (enrichment) immediately after engine start" + postCrankingDurationSec = "Time over which to taper out after start enrichment" auxTempSensor1_bias_resistor = "Pull-up resistor value on your board" auxTempSensor2_bias_resistor = "Pull-up resistor value on your board" spi1MosiMode = "Modes count be used for 3v<>5v integration using pull-ups/pull-downs etc." @@ -2473,6 +2475,7 @@ menuDialog = main menu = "&Base &Engine" subMenu = engineChars, "Base engine" subMenu = triggerConfiguration, "Trigger" + subMenu = triggerConfiguration_IO, "Advanced Trigger" subMenu = std_separator subMenu = energySystems, "Battery and alternator" subMenu = std_separator @@ -2589,7 +2592,6 @@ menuDialog = main menu = "&Sensors" # Base analog input settings - subMenu = triggerInputs, "Trigger inputs" subMenu = otherSensorInputs, "Misc sensors" subMenu = analogInputSettings, "Analog input settings" subMenu = std_separator @@ -2857,9 +2859,12 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00" field = "Firing Order", firingOrder ; Engine->Trigger configuration - dialog = triggerConfiguration_settings, "Settings Trigger" + dialog = triggerConfiguration_settings, "Trigger Pattern" field = "!https://rusefi.com/s/trigger" field = "Trigger type", trigger_type + field = "Total tooth count", trigger_customTotalToothCount, {trigger_type == 0}, {trigger_type == 0} + field = "Missing/skipped tooth count", trigger_customSkippedToothCount, {trigger_type == 0}, {trigger_type == 0} + ; see also in firmware '[doesTriggerImplyOperationMode]' tag field = "Operation mode / speed", ambiguousOperationMode field = "With VR sensors only rising edge has reliable position" @@ -2868,11 +2873,8 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00" field = "!For well-known trigger types use '0' trigger angle offset" field = "Trigger Angle Offset", globalTriggerAngleOffset field = "Display only interesting", displayLogicLevelsInEngineSniffer - field = "#Custom Trigger" - field = "total Tooth Count", trigger_customTotalToothCount, {trigger_type == 0} - field = "skipped Tooth Count", trigger_customSkippedToothCount, {trigger_type == 0} - dialog = triggerConfiguration_IO, "Settings I/O" + dialog = triggerConfiguration_IO, "Advanced Trigger" field = "!https://rusefi.com/s/vvt" field = "VVT mode", vvtMode, {trigger_type != 80} field = "VVT use rise front", vvtCamSensorUseRise, {trigger_type != 80} @@ -2881,9 +2883,20 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00" field = "print verbose sync details to console",verboseTriggerSynchDetails field = "Do not print messages in case of sync error", silentTriggerError field = "Enable noise filtering", useNoiselessTriggerDecoder, {trigger_type == 8 || trigger_type == 9} + + dialog = triggerInputs, "Trigger Inputs" + field = "!ECU reboot needed to apply these settings" + field = "#Cam is primary if you have cam sensor" + field = "Primary channel", triggerInputPins1 + field = "Invert Primary", invertPrimaryTriggerSignal + field = "Secondary channel", triggerInputPins2, { trigger_type != 0 && trigger_type != 8 && trigger_type != 9 && trigger_type != 18 && trigger_type != 20} + field = "Invert Secondary", invertSecondaryTriggerSignal, { trigger_type != 0 && trigger_type != 8 && trigger_type != 9 && trigger_type != 18 && trigger_type != 20} + field = "Cam Sync/VVT input", camInputs1 + + dialog = triggerConfiguration panel = triggerConfiguration_settings, North - panel = triggerConfiguration_IO, South + panel = triggerInputs, South ; Engine->Injection Settings dialog = injChars, "Injector Settings", yAxis @@ -3036,15 +3049,6 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00" field = "Comparator hysteresis voltage (Max)", triggerCompHystMax field = "VR-sensor saturation RPM", triggerCompSensorSatRpm - dialog = triggerInputs, "Trigger Inputs" - field = "!ECU reboot needed to apply these settings" - field = "#Cam is primary if you have cam sensor" - field = "Primary channel", triggerInputPins1 - field = "Invert Primary", invertPrimaryTriggerSignal - field = "Secondary channel", triggerInputPins2, { trigger_type != 0 && trigger_type != 8 && trigger_type != 9 && trigger_type != 18 && trigger_type != 20} - field = "Invert Secondary", invertSecondaryTriggerSignal, { trigger_type != 0 && trigger_type != 8 && trigger_type != 9 && trigger_type != 18 && trigger_type != 20} - field = "Cam Sync/VVT input", camInputs1 - ; ; allXXX sections allows a quick overview of used I/O in order to address conflicts mostly, not really to ; configure the features. @@ -3234,8 +3238,8 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00" field = "Input channel", clt_adcChannel field = "Bias resistor", clt_bias_resistor, {clt_adcChannel != 16} - field = "#Here is three pairs of thermistor temperature and resistance." - field = "#Typical temperatures is -40 deg C, 0 deg C and 100 deg C" + field = "#Input three pairs of thermistor temperature and resistance." + field = "#Typical temperatures are -40 deg C, 0 deg C and 100 deg C" field = "" field = "Lowest temperature", clt_tempC_1, {clt_adcChannel != 16} field = "Resistance @ LT", clt_resistance_1, {clt_adcChannel != 16} @@ -3248,17 +3252,21 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00" field = "" field = "Linear characteristic", useLinearCltSensor, {clt_adcChannel != 16} - dialog = cltSensor, "", xAxis - panel = clt_thermistor + dialog = cltGauges gauge = CLTGauge + gauge = rawCltGauge + + dialog = cltSensor, "CLT Sensor", border + panel = clt_thermistor, West + panel = cltGauges, East ; Sensors->IAT sensor dialog = iat_thermistor, "IAT sensor" field = "Input channel", iat_adcChannel field = "Bias resistor", iat_bias_resistor, {iat_adcChannel != 16} - field = "#Here is three pairs of thermistor temperature and resistance." - field = "#Typical temperatures is -40 deg C, 0 deg C and 100 deg C" + field = "#Input three pairs of thermistor temperature and resistance." + field = "#Typical temperatures are -40 deg C, 0 deg C and 100 deg C" field = "" field = "Lowest temperature", iat_tempC_1, {iat_adcChannel != 16} field = "Resistance @ LT", iat_resistance_1, {iat_adcChannel != 16} @@ -3271,21 +3279,29 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00" field = "" field = "Linear characteristic", useLinearIatSensor, {iat_adcChannel != 16} - dialog = iatSensor, "", xAxis - panel = iat_thermistor + dialog = iatGauges gauge = IATGauge + gauge = rawIatGauge + + dialog = iatSensor, "IAT Sensor", border + panel = iat_thermistor, West + panel = iatGauges, East ; Sensors->Oil pressure sensor - dialog = oilp_settings, "Oil pressure sensor" + dialog = oilp_settings, "Oil Pressure Sensor" field = "Oil Pressure ADC input", oilPressure_hwChannel field = "low voltage", oilPressure_v1, {oilPressure_hwChannel != 16} field = "low pressure", oilPressure_value1, {oilPressure_hwChannel != 16} field = "high voltage", oilPressure_v2, {oilPressure_hwChannel != 16} field = "high pressure", oilPressure_value2, {oilPressure_hwChannel != 16} - dialog = oilPressureSensor, "", xAxis - panel = oilp_settings + dialog = oilPressureGauges gauge = OilPressGauge + gauge = rawOilPressureGauge + + dialog = oilPressureSensor, "", border + panel = oilp_settings, West + panel = oilPressureGauges, East ; Sensors->MAP sensor dialog = mapSensorAnalog, "MAP sensor", yAxis @@ -3753,10 +3769,9 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00" dialog = crankingFuel, "Fuel" field = "Injection mode", crankingInjectionMode - field = "!Value '1' is currently recommended" field = "Fuel Source For Cranking", useRunningMathForCranking field = "Base fuel pulse width", cranking_baseFuel, {useRunningMathForCranking == 0} - + dialog = crankingIAC, "IAC" field = "Cranking IAC position", crankingIACposition field = "After cranking IAC taper duration", afterCrankingIACtaperDuration @@ -3770,7 +3785,7 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00" field = "Fixed Cranking Dwell", ignitionDwellForCrankingMs, {useConstantDwellDuringCranking == 1} field = "Cranking Dwell Angle", crankingChargeAngle, {useConstantDwellDuringCranking == 0} - dialog = postCrankingEnrichment, "Post-cranking short-time fuel enrichment (NOT IMPLEMENTED #331)" + dialog = postCrankingEnrichment, "After start enrichment" field = "Post-Cranking factor", postCrankingFactor field = "Duration", postCrankingDurationSec diff --git a/firmware/tunerstudio/rusefi_prometheus.ini b/firmware/tunerstudio/rusefi_prometheus.ini index 2700f46313..4ecf05f710 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 Thu Apr 30 16:38:51 EDT 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.bat integration\rusefi_config.txt Thu Apr 30 19:42:26 EDT 2020 pageSize = 20000 page = 1 @@ -1280,6 +1280,8 @@ page = 1 debugMode = "See http://rusefi.com/s/debugmode\n\nset debug_mode X" dizzySparkOutputPin = "This implementation makes a pulse every time one of the coils is charged, using coil dwell for pulse width. See also tachOutputPin" crankingIACposition = "This is the IAC position during cranking, some engines start better if given more air during cranking to improve cylinder filling." + postCrankingFactor = "Fuel multiplier (enrichment) immediately after engine start" + postCrankingDurationSec = "Time over which to taper out after start enrichment" auxTempSensor1_bias_resistor = "Pull-up resistor value on your board" auxTempSensor2_bias_resistor = "Pull-up resistor value on your board" spi1MosiMode = "Modes count be used for 3v<>5v integration using pull-ups/pull-downs etc." @@ -2473,6 +2475,7 @@ menuDialog = main menu = "&Base &Engine" subMenu = engineChars, "Base engine" subMenu = triggerConfiguration, "Trigger" + subMenu = triggerConfiguration_IO, "Advanced Trigger" subMenu = std_separator subMenu = energySystems, "Battery and alternator" subMenu = std_separator @@ -2589,7 +2592,6 @@ menuDialog = main menu = "&Sensors" # Base analog input settings - subMenu = triggerInputs, "Trigger inputs" subMenu = otherSensorInputs, "Misc sensors" subMenu = analogInputSettings, "Analog input settings" subMenu = std_separator @@ -2862,9 +2864,12 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00" field = "Firing Order", firingOrder ; Engine->Trigger configuration - dialog = triggerConfiguration_settings, "Settings Trigger" + dialog = triggerConfiguration_settings, "Trigger Pattern" field = "!https://rusefi.com/s/trigger" field = "Trigger type", trigger_type + field = "Total tooth count", trigger_customTotalToothCount, {trigger_type == 0}, {trigger_type == 0} + field = "Missing/skipped tooth count", trigger_customSkippedToothCount, {trigger_type == 0}, {trigger_type == 0} + ; see also in firmware '[doesTriggerImplyOperationMode]' tag field = "Operation mode / speed", ambiguousOperationMode field = "With VR sensors only rising edge has reliable position" @@ -2873,11 +2878,8 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00" field = "!For well-known trigger types use '0' trigger angle offset" field = "Trigger Angle Offset", globalTriggerAngleOffset field = "Display only interesting", displayLogicLevelsInEngineSniffer - field = "#Custom Trigger" - field = "total Tooth Count", trigger_customTotalToothCount, {trigger_type == 0} - field = "skipped Tooth Count", trigger_customSkippedToothCount, {trigger_type == 0} - dialog = triggerConfiguration_IO, "Settings I/O" + dialog = triggerConfiguration_IO, "Advanced Trigger" field = "!https://rusefi.com/s/vvt" field = "VVT mode", vvtMode, {trigger_type != 80} field = "VVT use rise front", vvtCamSensorUseRise, {trigger_type != 80} @@ -2886,9 +2888,20 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00" field = "print verbose sync details to console",verboseTriggerSynchDetails field = "Do not print messages in case of sync error", silentTriggerError field = "Enable noise filtering", useNoiselessTriggerDecoder, {trigger_type == 8 || trigger_type == 9} + + dialog = triggerInputs, "Trigger Inputs" + field = "!ECU reboot needed to apply these settings" + field = "#Cam is primary if you have cam sensor" + field = "Primary channel", triggerInputPins1 + field = "Invert Primary", invertPrimaryTriggerSignal + field = "Secondary channel", triggerInputPins2, { trigger_type != 0 && trigger_type != 8 && trigger_type != 9 && trigger_type != 18 && trigger_type != 20} + field = "Invert Secondary", invertSecondaryTriggerSignal, { trigger_type != 0 && trigger_type != 8 && trigger_type != 9 && trigger_type != 18 && trigger_type != 20} + field = "Cam Sync/VVT input", camInputs1 + + dialog = triggerConfiguration panel = triggerConfiguration_settings, North - panel = triggerConfiguration_IO, South + panel = triggerInputs, South ; Engine->Injection Settings dialog = injChars, "Injector Settings", yAxis @@ -3041,15 +3054,6 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00" field = "Comparator hysteresis voltage (Max)", triggerCompHystMax field = "VR-sensor saturation RPM", triggerCompSensorSatRpm - dialog = triggerInputs, "Trigger Inputs" - field = "!ECU reboot needed to apply these settings" - field = "#Cam is primary if you have cam sensor" - field = "Primary channel", triggerInputPins1 - field = "Invert Primary", invertPrimaryTriggerSignal - field = "Secondary channel", triggerInputPins2, { trigger_type != 0 && trigger_type != 8 && trigger_type != 9 && trigger_type != 18 && trigger_type != 20} - field = "Invert Secondary", invertSecondaryTriggerSignal, { trigger_type != 0 && trigger_type != 8 && trigger_type != 9 && trigger_type != 18 && trigger_type != 20} - field = "Cam Sync/VVT input", camInputs1 - ; ; allXXX sections allows a quick overview of used I/O in order to address conflicts mostly, not really to ; configure the features. @@ -3263,8 +3267,8 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00" field = "Input channel", clt_adcChannel field = "Bias resistor", clt_bias_resistor, {clt_adcChannel != 16} - field = "#Here is three pairs of thermistor temperature and resistance." - field = "#Typical temperatures is -40 deg C, 0 deg C and 100 deg C" + field = "#Input three pairs of thermistor temperature and resistance." + field = "#Typical temperatures are -40 deg C, 0 deg C and 100 deg C" field = "" field = "Lowest temperature", clt_tempC_1, {clt_adcChannel != 16} field = "Resistance @ LT", clt_resistance_1, {clt_adcChannel != 16} @@ -3277,17 +3281,21 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00" field = "" field = "Linear characteristic", useLinearCltSensor, {clt_adcChannel != 16} - dialog = cltSensor, "", xAxis - panel = clt_thermistor + dialog = cltGauges gauge = CLTGauge + gauge = rawCltGauge + + dialog = cltSensor, "CLT Sensor", border + panel = clt_thermistor, West + panel = cltGauges, East ; Sensors->IAT sensor dialog = iat_thermistor, "IAT sensor" field = "Input channel", iat_adcChannel field = "Bias resistor", iat_bias_resistor, {iat_adcChannel != 16} - field = "#Here is three pairs of thermistor temperature and resistance." - field = "#Typical temperatures is -40 deg C, 0 deg C and 100 deg C" + field = "#Input three pairs of thermistor temperature and resistance." + field = "#Typical temperatures are -40 deg C, 0 deg C and 100 deg C" field = "" field = "Lowest temperature", iat_tempC_1, {iat_adcChannel != 16} field = "Resistance @ LT", iat_resistance_1, {iat_adcChannel != 16} @@ -3300,21 +3308,29 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00" field = "" field = "Linear characteristic", useLinearIatSensor, {iat_adcChannel != 16} - dialog = iatSensor, "", xAxis - panel = iat_thermistor + dialog = iatGauges gauge = IATGauge + gauge = rawIatGauge + + dialog = iatSensor, "IAT Sensor", border + panel = iat_thermistor, West + panel = iatGauges, East ; Sensors->Oil pressure sensor - dialog = oilp_settings, "Oil pressure sensor" + dialog = oilp_settings, "Oil Pressure Sensor" field = "Oil Pressure ADC input", oilPressure_hwChannel field = "low voltage", oilPressure_v1, {oilPressure_hwChannel != 16} field = "low pressure", oilPressure_value1, {oilPressure_hwChannel != 16} field = "high voltage", oilPressure_v2, {oilPressure_hwChannel != 16} field = "high pressure", oilPressure_value2, {oilPressure_hwChannel != 16} - dialog = oilPressureSensor, "", xAxis - panel = oilp_settings + dialog = oilPressureGauges gauge = OilPressGauge + gauge = rawOilPressureGauge + + dialog = oilPressureSensor, "", border + panel = oilp_settings, West + panel = oilPressureGauges, East ; Sensors->MAP sensor dialog = mapSensorAnalog, "MAP sensor", yAxis @@ -3790,10 +3806,9 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00" dialog = crankingFuel, "Fuel" field = "Injection mode", crankingInjectionMode - field = "!Value '1' is currently recommended" field = "Fuel Source For Cranking", useRunningMathForCranking field = "Base fuel pulse width", cranking_baseFuel, {useRunningMathForCranking == 0} - + dialog = crankingIAC, "IAC" field = "Cranking IAC position", crankingIACposition field = "After cranking IAC taper duration", afterCrankingIACtaperDuration @@ -3807,7 +3822,7 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00" field = "Fixed Cranking Dwell", ignitionDwellForCrankingMs, {useConstantDwellDuringCranking == 1} field = "Cranking Dwell Angle", crankingChargeAngle, {useConstantDwellDuringCranking == 0} - dialog = postCrankingEnrichment, "Post-cranking short-time fuel enrichment (NOT IMPLEMENTED #331)" + dialog = postCrankingEnrichment, "After start enrichment" field = "Post-Cranking factor", postCrankingFactor field = "Duration", postCrankingDurationSec diff --git a/firmware/tunerstudio/rusefi_proteus.ini b/firmware/tunerstudio/rusefi_proteus.ini index 87395553c3..7b977bde6c 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 Thu Apr 30 16:38:53 EDT 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.bat integration\rusefi_config.txt Thu Apr 30 19:42:29 EDT 2020 pageSize = 20000 page = 1 @@ -1280,6 +1280,8 @@ page = 1 debugMode = "See http://rusefi.com/s/debugmode\n\nset debug_mode X" dizzySparkOutputPin = "This implementation makes a pulse every time one of the coils is charged, using coil dwell for pulse width. See also tachOutputPin" crankingIACposition = "This is the IAC position during cranking, some engines start better if given more air during cranking to improve cylinder filling." + postCrankingFactor = "Fuel multiplier (enrichment) immediately after engine start" + postCrankingDurationSec = "Time over which to taper out after start enrichment" auxTempSensor1_bias_resistor = "Pull-up resistor value on your board" auxTempSensor2_bias_resistor = "Pull-up resistor value on your board" spi1MosiMode = "Modes count be used for 3v<>5v integration using pull-ups/pull-downs etc." @@ -2473,6 +2475,7 @@ menuDialog = main menu = "&Base &Engine" subMenu = engineChars, "Base engine" subMenu = triggerConfiguration, "Trigger" + subMenu = triggerConfiguration_IO, "Advanced Trigger" subMenu = std_separator subMenu = energySystems, "Battery and alternator" subMenu = std_separator @@ -2589,7 +2592,6 @@ menuDialog = main menu = "&Sensors" # Base analog input settings - subMenu = triggerInputs, "Trigger inputs" subMenu = otherSensorInputs, "Misc sensors" subMenu = analogInputSettings, "Analog input settings" subMenu = std_separator @@ -2857,9 +2859,12 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00" field = "Firing Order", firingOrder ; Engine->Trigger configuration - dialog = triggerConfiguration_settings, "Settings Trigger" + dialog = triggerConfiguration_settings, "Trigger Pattern" field = "!https://rusefi.com/s/trigger" field = "Trigger type", trigger_type + field = "Total tooth count", trigger_customTotalToothCount, {trigger_type == 0}, {trigger_type == 0} + field = "Missing/skipped tooth count", trigger_customSkippedToothCount, {trigger_type == 0}, {trigger_type == 0} + ; see also in firmware '[doesTriggerImplyOperationMode]' tag field = "Operation mode / speed", ambiguousOperationMode field = "With VR sensors only rising edge has reliable position" @@ -2868,11 +2873,8 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00" field = "!For well-known trigger types use '0' trigger angle offset" field = "Trigger Angle Offset", globalTriggerAngleOffset field = "Display only interesting", displayLogicLevelsInEngineSniffer - field = "#Custom Trigger" - field = "total Tooth Count", trigger_customTotalToothCount, {trigger_type == 0} - field = "skipped Tooth Count", trigger_customSkippedToothCount, {trigger_type == 0} - dialog = triggerConfiguration_IO, "Settings I/O" + dialog = triggerConfiguration_IO, "Advanced Trigger" field = "!https://rusefi.com/s/vvt" field = "VVT mode", vvtMode, {trigger_type != 80} field = "VVT use rise front", vvtCamSensorUseRise, {trigger_type != 80} @@ -2881,9 +2883,20 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00" field = "print verbose sync details to console",verboseTriggerSynchDetails field = "Do not print messages in case of sync error", silentTriggerError field = "Enable noise filtering", useNoiselessTriggerDecoder, {trigger_type == 8 || trigger_type == 9} + + dialog = triggerInputs, "Trigger Inputs" + field = "!ECU reboot needed to apply these settings" + field = "#Cam is primary if you have cam sensor" + field = "Primary channel", triggerInputPins1 + field = "Invert Primary", invertPrimaryTriggerSignal + field = "Secondary channel", triggerInputPins2, { trigger_type != 0 && trigger_type != 8 && trigger_type != 9 && trigger_type != 18 && trigger_type != 20} + field = "Invert Secondary", invertSecondaryTriggerSignal, { trigger_type != 0 && trigger_type != 8 && trigger_type != 9 && trigger_type != 18 && trigger_type != 20} + field = "Cam Sync/VVT input", camInputs1 + + dialog = triggerConfiguration panel = triggerConfiguration_settings, North - panel = triggerConfiguration_IO, South + panel = triggerInputs, South ; Engine->Injection Settings dialog = injChars, "Injector Settings", yAxis @@ -3036,15 +3049,6 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00" field = "Comparator hysteresis voltage (Max)", triggerCompHystMax field = "VR-sensor saturation RPM", triggerCompSensorSatRpm - dialog = triggerInputs, "Trigger Inputs" - field = "!ECU reboot needed to apply these settings" - field = "#Cam is primary if you have cam sensor" - field = "Primary channel", triggerInputPins1 - field = "Invert Primary", invertPrimaryTriggerSignal - field = "Secondary channel", triggerInputPins2, { trigger_type != 0 && trigger_type != 8 && trigger_type != 9 && trigger_type != 18 && trigger_type != 20} - field = "Invert Secondary", invertSecondaryTriggerSignal, { trigger_type != 0 && trigger_type != 8 && trigger_type != 9 && trigger_type != 18 && trigger_type != 20} - field = "Cam Sync/VVT input", camInputs1 - ; ; allXXX sections allows a quick overview of used I/O in order to address conflicts mostly, not really to ; configure the features. @@ -3242,8 +3246,8 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00" field = "Input channel", clt_adcChannel field = "Bias resistor", clt_bias_resistor, {clt_adcChannel != 16} - field = "#Here is three pairs of thermistor temperature and resistance." - field = "#Typical temperatures is -40 deg C, 0 deg C and 100 deg C" + field = "#Input three pairs of thermistor temperature and resistance." + field = "#Typical temperatures are -40 deg C, 0 deg C and 100 deg C" field = "" field = "Lowest temperature", clt_tempC_1, {clt_adcChannel != 16} field = "Resistance @ LT", clt_resistance_1, {clt_adcChannel != 16} @@ -3256,17 +3260,21 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00" field = "" field = "Linear characteristic", useLinearCltSensor, {clt_adcChannel != 16} - dialog = cltSensor, "", xAxis - panel = clt_thermistor + dialog = cltGauges gauge = CLTGauge + gauge = rawCltGauge + + dialog = cltSensor, "CLT Sensor", border + panel = clt_thermistor, West + panel = cltGauges, East ; Sensors->IAT sensor dialog = iat_thermistor, "IAT sensor" field = "Input channel", iat_adcChannel field = "Bias resistor", iat_bias_resistor, {iat_adcChannel != 16} - field = "#Here is three pairs of thermistor temperature and resistance." - field = "#Typical temperatures is -40 deg C, 0 deg C and 100 deg C" + field = "#Input three pairs of thermistor temperature and resistance." + field = "#Typical temperatures are -40 deg C, 0 deg C and 100 deg C" field = "" field = "Lowest temperature", iat_tempC_1, {iat_adcChannel != 16} field = "Resistance @ LT", iat_resistance_1, {iat_adcChannel != 16} @@ -3279,21 +3287,29 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00" field = "" field = "Linear characteristic", useLinearIatSensor, {iat_adcChannel != 16} - dialog = iatSensor, "", xAxis - panel = iat_thermistor + dialog = iatGauges gauge = IATGauge + gauge = rawIatGauge + + dialog = iatSensor, "IAT Sensor", border + panel = iat_thermistor, West + panel = iatGauges, East ; Sensors->Oil pressure sensor - dialog = oilp_settings, "Oil pressure sensor" + dialog = oilp_settings, "Oil Pressure Sensor" field = "Oil Pressure ADC input", oilPressure_hwChannel field = "low voltage", oilPressure_v1, {oilPressure_hwChannel != 16} field = "low pressure", oilPressure_value1, {oilPressure_hwChannel != 16} field = "high voltage", oilPressure_v2, {oilPressure_hwChannel != 16} field = "high pressure", oilPressure_value2, {oilPressure_hwChannel != 16} - dialog = oilPressureSensor, "", xAxis - panel = oilp_settings + dialog = oilPressureGauges gauge = OilPressGauge + gauge = rawOilPressureGauge + + dialog = oilPressureSensor, "", border + panel = oilp_settings, West + panel = oilPressureGauges, East ; Sensors->MAP sensor dialog = mapSensorAnalog, "MAP sensor", yAxis @@ -3761,10 +3777,9 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00" dialog = crankingFuel, "Fuel" field = "Injection mode", crankingInjectionMode - field = "!Value '1' is currently recommended" field = "Fuel Source For Cranking", useRunningMathForCranking field = "Base fuel pulse width", cranking_baseFuel, {useRunningMathForCranking == 0} - + dialog = crankingIAC, "IAC" field = "Cranking IAC position", crankingIACposition field = "After cranking IAC taper duration", afterCrankingIACtaperDuration @@ -3778,7 +3793,7 @@ cmd_set_engine_type_default = "w\x00\x31\x00\x00" field = "Fixed Cranking Dwell", ignitionDwellForCrankingMs, {useConstantDwellDuringCranking == 1} field = "Cranking Dwell Angle", crankingChargeAngle, {useConstantDwellDuringCranking == 0} - dialog = postCrankingEnrichment, "Post-cranking short-time fuel enrichment (NOT IMPLEMENTED #331)" + dialog = postCrankingEnrichment, "After start enrichment" field = "Post-Cranking factor", postCrankingFactor field = "Duration", postCrankingDurationSec