diff --git a/firmware/config/boards/hellen/cypress/config/controllers/algo/engine_configuration_generated_structures.h b/firmware/config/boards/hellen/cypress/config/controllers/algo/engine_configuration_generated_structures.h index 09a53e7d4a..5292cab52b 100644 --- a/firmware/config/boards/hellen/cypress/config/controllers/algo/engine_configuration_generated_structures.h +++ b/firmware/config/boards/hellen/cypress/config/controllers/algo/engine_configuration_generated_structures.h @@ -1,4 +1,4 @@ -// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on hellen_cypress_gen_config.bat integration/rusefi_config.txt Fri Jan 01 16:20:19 UTC 2021 +// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on hellen_cypress_gen_config.bat integration/rusefi_config.txt Sat Jan 02 14:16:27 UTC 2021 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -3365,17 +3365,14 @@ struct engine_configuration_s { */ float etbIdleThrottleRange; /** + * Select which fuel correction bank this cylinder belongs to. Group cylinders that share the same O2 sensor * offset 4016 */ - uint8_t unusedvref[4]; + uint8_t cylinderBankSelect[INJECTION_PIN_COUNT]; /** - * offset 4020 + * offset 4028 */ - uint8_t unusedsw[4]; - /** - * offset 4024 - */ - int unused_alFIn[3]; + int unused4028[2]; /** * Trigger comparator center point voltage * offset 4036 @@ -3783,4 +3780,4 @@ struct persistent_config_s { typedef struct persistent_config_s persistent_config_s; // end -// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on hellen_cypress_gen_config.bat integration/rusefi_config.txt Fri Jan 01 16:20:19 UTC 2021 +// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on hellen_cypress_gen_config.bat integration/rusefi_config.txt Sat Jan 02 14:16:27 UTC 2021 diff --git a/firmware/config/boards/hellen/cypress/config/controllers/algo/rusefi_generated.h b/firmware/config/boards/hellen/cypress/config/controllers/algo/rusefi_generated.h index dfdbd05267..10dabf06f2 100644 --- a/firmware/config/boards/hellen/cypress/config/controllers/algo/rusefi_generated.h +++ b/firmware/config/boards/hellen/cypress/config/controllers/algo/rusefi_generated.h @@ -330,6 +330,18 @@ #define CRITICAL_PREFIX "CRITICAL" #define cutFuelOnHardLimit_offset 1464 #define cutSparkOnHardLimit_offset 1464 +#define cylinderBankSelect10_offset 4025 +#define cylinderBankSelect11_offset 4026 +#define cylinderBankSelect12_offset 4027 +#define cylinderBankSelect1_offset 4016 +#define cylinderBankSelect2_offset 4017 +#define cylinderBankSelect3_offset 4018 +#define cylinderBankSelect4_offset 4019 +#define cylinderBankSelect5_offset 4020 +#define cylinderBankSelect6_offset 4021 +#define cylinderBankSelect7_offset 4022 +#define cylinderBankSelect8_offset 4023 +#define cylinderBankSelect9_offset 4024 #define cylinderBore_offset 408 #define cylindersCount_offset 400 #define DBG_DBG_LOGIC_ANALYZER 45 @@ -1227,8 +1239,8 @@ #define showHumanReadableWarning_offset 976 #define showSdCardWarning_offset 76 #define SIGNATURE_BOARD hellen_cypress -#define SIGNATURE_DATE 2021.01.01 -#define SIGNATURE_HASH 1811040656 +#define SIGNATURE_DATE 2021.01.02 +#define SIGNATURE_HASH 3072019058 #define silentTriggerError_offset 1464 #define slowAdcAlpha_offset 2088 #define sparkDwellRpmBins_offset 332 @@ -1559,7 +1571,7 @@ #define ts_show_spi true #define ts_show_trigger_comparator false #define ts_show_tunerstudio_port true -#define TS_SIGNATURE "rusEFI 2021.01.01.hellen_cypress.1811040656" +#define TS_SIGNATURE "rusEFI 2021.01.02.hellen_cypress.3072019058" #define TS_SINGLE_WRITE_COMMAND 'W' #define TS_SINGLE_WRITE_COMMAND_char W #define TS_TEST_COMMAND 't' // 0x74 @@ -1626,6 +1638,7 @@ #define unused2508_offset 2508 #define unused2536_offset 2536 #define unused3328_offset 3328 +#define unused4028_offset 4028 #define unused541_offset 541 #define unused542_offset 542 #define unused6312_offset 6312 @@ -1640,7 +1653,6 @@ #define unused_1484_bit_29_offset 1476 #define unused_1484_bit_30_offset 1476 #define unused_1484_bit_31_offset 1476 -#define unused_alFIn_offset 4024 #define unusedAtOldBoardConfigurationEnd_offset 1204 #define unusedAuxVoltage1_TODO_332_offset 2713 #define unusedAuxVoltage2_TODO_332_offset 2714 @@ -1680,8 +1692,6 @@ #define unusedSpiPadding4_offset 2593 #define unusedSpiPadding5_offset 2715 #define unusedSpiPadding8_offset 4009 -#define unusedsw_offset 4020 -#define unusedvref_offset 4016 #define useAdvanceCorrectionsForCranking_offset 1476 #define useCicPidForIdle_offset 76 #define useConstantDwellDuringCranking_offset 1464 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 8278ad4ad4..1d5b6c29a4 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 kinetis_gen_config.bat integration/rusefi_config.txt Fri Jan 01 16:20:13 UTC 2021 +// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Sat Jan 02 14:16:18 UTC 2021 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -3365,17 +3365,14 @@ struct engine_configuration_s { */ float etbIdleThrottleRange; /** + * Select which fuel correction bank this cylinder belongs to. Group cylinders that share the same O2 sensor * offset 4016 */ - uint8_t unusedvref[4]; + uint8_t cylinderBankSelect[INJECTION_PIN_COUNT]; /** - * offset 4020 + * offset 4028 */ - uint8_t unusedsw[4]; - /** - * offset 4024 - */ - int unused_alFIn[3]; + int unused4028[2]; /** * Trigger comparator center point voltage * offset 4036 @@ -3783,4 +3780,4 @@ struct persistent_config_s { typedef struct persistent_config_s persistent_config_s; // end -// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Fri Jan 01 16:20:13 UTC 2021 +// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Sat Jan 02 14:16:18 UTC 2021 diff --git a/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h b/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h index e5f3044a7d..022a2a8d43 100644 --- a/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h +++ b/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h @@ -330,6 +330,18 @@ #define CRITICAL_PREFIX "CRITICAL" #define cutFuelOnHardLimit_offset 1464 #define cutSparkOnHardLimit_offset 1464 +#define cylinderBankSelect10_offset 4025 +#define cylinderBankSelect11_offset 4026 +#define cylinderBankSelect12_offset 4027 +#define cylinderBankSelect1_offset 4016 +#define cylinderBankSelect2_offset 4017 +#define cylinderBankSelect3_offset 4018 +#define cylinderBankSelect4_offset 4019 +#define cylinderBankSelect5_offset 4020 +#define cylinderBankSelect6_offset 4021 +#define cylinderBankSelect7_offset 4022 +#define cylinderBankSelect8_offset 4023 +#define cylinderBankSelect9_offset 4024 #define cylinderBore_offset 408 #define cylindersCount_offset 400 #define DBG_DBG_LOGIC_ANALYZER 45 @@ -1227,8 +1239,8 @@ #define showHumanReadableWarning_offset 976 #define showSdCardWarning_offset 76 #define SIGNATURE_BOARD kin -#define SIGNATURE_DATE 2021.01.01 -#define SIGNATURE_HASH 988705642 +#define SIGNATURE_DATE 2021.01.02 +#define SIGNATURE_HASH 3859247240 #define silentTriggerError_offset 1464 #define slowAdcAlpha_offset 2088 #define sparkDwellRpmBins_offset 332 @@ -1559,7 +1571,7 @@ #define ts_show_spi true #define ts_show_trigger_comparator true #define ts_show_tunerstudio_port true -#define TS_SIGNATURE "rusEFI 2021.01.01.kin.988705642" +#define TS_SIGNATURE "rusEFI 2021.01.02.kin.3859247240" #define TS_SINGLE_WRITE_COMMAND 'W' #define TS_SINGLE_WRITE_COMMAND_char W #define TS_TEST_COMMAND 't' // 0x74 @@ -1626,6 +1638,7 @@ #define unused2508_offset 2508 #define unused2536_offset 2536 #define unused3328_offset 3328 +#define unused4028_offset 4028 #define unused541_offset 541 #define unused542_offset 542 #define unused6312_offset 6312 @@ -1640,7 +1653,6 @@ #define unused_1484_bit_29_offset 1476 #define unused_1484_bit_30_offset 1476 #define unused_1484_bit_31_offset 1476 -#define unused_alFIn_offset 4024 #define unusedAtOldBoardConfigurationEnd_offset 1204 #define unusedAuxVoltage1_TODO_332_offset 2713 #define unusedAuxVoltage2_TODO_332_offset 2714 @@ -1680,8 +1692,6 @@ #define unusedSpiPadding4_offset 2593 #define unusedSpiPadding5_offset 2715 #define unusedSpiPadding8_offset 4009 -#define unusedsw_offset 4020 -#define unusedvref_offset 4016 #define useAdvanceCorrectionsForCranking_offset 1476 #define useCicPidForIdle_offset 76 #define useConstantDwellDuringCranking_offset 1464 diff --git a/firmware/controllers/generated/engine_configuration_generated_structures.h b/firmware/controllers/generated/engine_configuration_generated_structures.h index f2b7de1ffe..e463370318 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.sh integration/rusefi_config.txt Fri Jan 01 16:20:01 UTC 2021 +// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Jan 02 14:16:01 UTC 2021 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -3365,17 +3365,14 @@ struct engine_configuration_s { */ float etbIdleThrottleRange; /** + * Select which fuel correction bank this cylinder belongs to. Group cylinders that share the same O2 sensor * offset 4016 */ - uint8_t unusedvref[4]; + uint8_t cylinderBankSelect[INJECTION_PIN_COUNT]; /** - * offset 4020 + * offset 4028 */ - uint8_t unusedsw[4]; - /** - * offset 4024 - */ - int unused_alFIn[3]; + int unused4028[2]; /** * Trigger comparator center point voltage * offset 4036 @@ -3783,4 +3780,4 @@ struct persistent_config_s { typedef struct persistent_config_s persistent_config_s; // end -// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Fri Jan 01 16:20:01 UTC 2021 +// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Jan 02 14:16:01 UTC 2021 diff --git a/firmware/controllers/generated/fsio_enums_generated.def b/firmware/controllers/generated/fsio_enums_generated.def index 8296394fb2..1cb3fbd8dd 100644 --- a/firmware/controllers/generated/fsio_enums_generated.def +++ b/firmware/controllers/generated/fsio_enums_generated.def @@ -1,4 +1,4 @@ -// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Fri Jan 01 16:20:01 UTC 2021 +// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Jan 02 14:16:01 UTC 2021 // by class com.rusefi.output.FileFsioSettingsConsumer FSIO_SETTING_FANONTEMPERATURE = 1000, diff --git a/firmware/controllers/generated/fsio_getters.def b/firmware/controllers/generated/fsio_getters.def index f84e99bb7e..929a8fe60d 100644 --- a/firmware/controllers/generated/fsio_getters.def +++ b/firmware/controllers/generated/fsio_getters.def @@ -1,4 +1,4 @@ -// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Fri Jan 01 16:20:01 UTC 2021 +// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Jan 02 14:16:01 UTC 2021 // by class com.rusefi.output.FileFsioSettingsConsumer case FSIO_SETTING_FANONTEMPERATURE: diff --git a/firmware/controllers/generated/fsio_names.def b/firmware/controllers/generated/fsio_names.def index dd788100c3..5d7903b48a 100644 --- a/firmware/controllers/generated/fsio_names.def +++ b/firmware/controllers/generated/fsio_names.def @@ -1,4 +1,4 @@ -// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Fri Jan 01 16:20:01 UTC 2021 +// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Jan 02 14:16:01 UTC 2021 // by class com.rusefi.output.FileFsioSettingsConsumer static LENameOrdinalPair lefanOnTemperature(FSIO_SETTING_FANONTEMPERATURE, "cfg_fanOnTemperature"); diff --git a/firmware/controllers/generated/fsio_strings.def b/firmware/controllers/generated/fsio_strings.def index 15781929bc..5cca8a2847 100644 --- a/firmware/controllers/generated/fsio_strings.def +++ b/firmware/controllers/generated/fsio_strings.def @@ -1,4 +1,4 @@ -// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Fri Jan 01 16:20:01 UTC 2021 +// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Jan 02 14:16:01 UTC 2021 // by class com.rusefi.output.FileFsioSettingsConsumer case FSIO_SETTING_FANONTEMPERATURE: diff --git a/firmware/controllers/generated/rusefi_generated.h b/firmware/controllers/generated/rusefi_generated.h index 5b88e8a3cd..d204b87493 100644 --- a/firmware/controllers/generated/rusefi_generated.h +++ b/firmware/controllers/generated/rusefi_generated.h @@ -330,6 +330,18 @@ #define CRITICAL_PREFIX "CRITICAL" #define cutFuelOnHardLimit_offset 1464 #define cutSparkOnHardLimit_offset 1464 +#define cylinderBankSelect10_offset 4025 +#define cylinderBankSelect11_offset 4026 +#define cylinderBankSelect12_offset 4027 +#define cylinderBankSelect1_offset 4016 +#define cylinderBankSelect2_offset 4017 +#define cylinderBankSelect3_offset 4018 +#define cylinderBankSelect4_offset 4019 +#define cylinderBankSelect5_offset 4020 +#define cylinderBankSelect6_offset 4021 +#define cylinderBankSelect7_offset 4022 +#define cylinderBankSelect8_offset 4023 +#define cylinderBankSelect9_offset 4024 #define cylinderBore_offset 408 #define cylindersCount_offset 400 #define DBG_DBG_LOGIC_ANALYZER 45 @@ -1227,8 +1239,8 @@ #define showHumanReadableWarning_offset 976 #define showSdCardWarning_offset 76 #define SIGNATURE_BOARD all -#define SIGNATURE_DATE 2021.01.01 -#define SIGNATURE_HASH 2718166867 +#define SIGNATURE_DATE 2021.01.02 +#define SIGNATURE_HASH 2129325233 #define silentTriggerError_offset 1464 #define slowAdcAlpha_offset 2088 #define sparkDwellRpmBins_offset 332 @@ -1559,7 +1571,7 @@ #define ts_show_spi true #define ts_show_trigger_comparator false #define ts_show_tunerstudio_port true -#define TS_SIGNATURE "rusEFI 2021.01.01.all.2718166867" +#define TS_SIGNATURE "rusEFI 2021.01.02.all.2129325233" #define TS_SINGLE_WRITE_COMMAND 'W' #define TS_SINGLE_WRITE_COMMAND_char W #define TS_TEST_COMMAND 't' // 0x74 @@ -1626,6 +1638,7 @@ #define unused2508_offset 2508 #define unused2536_offset 2536 #define unused3328_offset 3328 +#define unused4028_offset 4028 #define unused541_offset 541 #define unused542_offset 542 #define unused6312_offset 6312 @@ -1640,7 +1653,6 @@ #define unused_1484_bit_29_offset 1476 #define unused_1484_bit_30_offset 1476 #define unused_1484_bit_31_offset 1476 -#define unused_alFIn_offset 4024 #define unusedAtOldBoardConfigurationEnd_offset 1204 #define unusedAuxVoltage1_TODO_332_offset 2713 #define unusedAuxVoltage2_TODO_332_offset 2714 @@ -1680,8 +1692,6 @@ #define unusedSpiPadding4_offset 2593 #define unusedSpiPadding5_offset 2715 #define unusedSpiPadding8_offset 4009 -#define unusedsw_offset 4020 -#define unusedvref_offset 4016 #define useAdvanceCorrectionsForCranking_offset 1476 #define useCicPidForIdle_offset 76 #define useConstantDwellDuringCranking_offset 1464 diff --git a/firmware/controllers/generated/signature_all.h b/firmware/controllers/generated/signature_all.h index d539e19e79..850fb8399c 100644 --- a/firmware/controllers/generated/signature_all.h +++ b/firmware/controllers/generated/signature_all.h @@ -3,6 +3,6 @@ // #define SIGNATURE_BOARD all -#define SIGNATURE_DATE 2021.01.01 -#define SIGNATURE_HASH 2718166867 -#define TS_SIGNATURE "rusEFI 2021.01.01.all.2718166867" +#define SIGNATURE_DATE 2021.01.02 +#define SIGNATURE_HASH 2129325233 +#define TS_SIGNATURE "rusEFI 2021.01.02.all.2129325233" diff --git a/firmware/controllers/generated/signature_frankenso_na6.h b/firmware/controllers/generated/signature_frankenso_na6.h index 98f8f973f2..c8317eef95 100644 --- a/firmware/controllers/generated/signature_frankenso_na6.h +++ b/firmware/controllers/generated/signature_frankenso_na6.h @@ -3,6 +3,6 @@ // #define SIGNATURE_BOARD frankenso_na6 -#define SIGNATURE_DATE 2021.01.01 -#define SIGNATURE_HASH 879976104 -#define TS_SIGNATURE "rusEFI 2021.01.01.frankenso_na6.879976104" +#define SIGNATURE_DATE 2021.01.02 +#define SIGNATURE_HASH 3902430538 +#define TS_SIGNATURE "rusEFI 2021.01.02.frankenso_na6.3902430538" diff --git a/firmware/controllers/generated/signature_hellen_cypress.h b/firmware/controllers/generated/signature_hellen_cypress.h index f6afe17669..bf3b6ca61f 100644 --- a/firmware/controllers/generated/signature_hellen_cypress.h +++ b/firmware/controllers/generated/signature_hellen_cypress.h @@ -3,6 +3,6 @@ // #define SIGNATURE_BOARD hellen_cypress -#define SIGNATURE_DATE 2021.01.01 -#define SIGNATURE_HASH 1811040656 -#define TS_SIGNATURE "rusEFI 2021.01.01.hellen_cypress.1811040656" +#define SIGNATURE_DATE 2021.01.02 +#define SIGNATURE_HASH 3072019058 +#define TS_SIGNATURE "rusEFI 2021.01.02.hellen_cypress.3072019058" diff --git a/firmware/controllers/generated/signature_kin.h b/firmware/controllers/generated/signature_kin.h index a37a2d473f..a81d38db62 100644 --- a/firmware/controllers/generated/signature_kin.h +++ b/firmware/controllers/generated/signature_kin.h @@ -3,6 +3,6 @@ // #define SIGNATURE_BOARD kin -#define SIGNATURE_DATE 2021.01.01 -#define SIGNATURE_HASH 988705642 -#define TS_SIGNATURE "rusEFI 2021.01.01.kin.988705642" +#define SIGNATURE_DATE 2021.01.02 +#define SIGNATURE_HASH 3859247240 +#define TS_SIGNATURE "rusEFI 2021.01.02.kin.3859247240" diff --git a/firmware/controllers/generated/signature_mre_f4.h b/firmware/controllers/generated/signature_mre_f4.h index 7647bae817..650b5c636d 100644 --- a/firmware/controllers/generated/signature_mre_f4.h +++ b/firmware/controllers/generated/signature_mre_f4.h @@ -3,6 +3,6 @@ // #define SIGNATURE_BOARD mre_f4 -#define SIGNATURE_DATE 2021.01.01 -#define SIGNATURE_HASH 3050516778 -#define TS_SIGNATURE "rusEFI 2021.01.01.mre_f4.3050516778" +#define SIGNATURE_DATE 2021.01.02 +#define SIGNATURE_HASH 1765421768 +#define TS_SIGNATURE "rusEFI 2021.01.02.mre_f4.1765421768" diff --git a/firmware/controllers/generated/signature_mre_f7.h b/firmware/controllers/generated/signature_mre_f7.h index 8c9de9b031..7b40aaae69 100644 --- a/firmware/controllers/generated/signature_mre_f7.h +++ b/firmware/controllers/generated/signature_mre_f7.h @@ -3,6 +3,6 @@ // #define SIGNATURE_BOARD mre_f7 -#define SIGNATURE_DATE 2021.01.01 -#define SIGNATURE_HASH 3050516778 -#define TS_SIGNATURE "rusEFI 2021.01.01.mre_f7.3050516778" +#define SIGNATURE_DATE 2021.01.02 +#define SIGNATURE_HASH 1765421768 +#define TS_SIGNATURE "rusEFI 2021.01.02.mre_f7.1765421768" diff --git a/firmware/controllers/generated/signature_prometheus_405.h b/firmware/controllers/generated/signature_prometheus_405.h index 06e8b16f32..c93822bf7b 100644 --- a/firmware/controllers/generated/signature_prometheus_405.h +++ b/firmware/controllers/generated/signature_prometheus_405.h @@ -3,6 +3,6 @@ // #define SIGNATURE_BOARD prometheus_405 -#define SIGNATURE_DATE 2021.01.01 -#define SIGNATURE_HASH 3772508418 -#define TS_SIGNATURE "rusEFI 2021.01.01.prometheus_405.3772508418" +#define SIGNATURE_DATE 2021.01.02 +#define SIGNATURE_HASH 1009969888 +#define TS_SIGNATURE "rusEFI 2021.01.02.prometheus_405.1009969888" diff --git a/firmware/controllers/generated/signature_prometheus_469.h b/firmware/controllers/generated/signature_prometheus_469.h index ccbd1bc271..9ca65dc61b 100644 --- a/firmware/controllers/generated/signature_prometheus_469.h +++ b/firmware/controllers/generated/signature_prometheus_469.h @@ -3,6 +3,6 @@ // #define SIGNATURE_BOARD prometheus_469 -#define SIGNATURE_DATE 2021.01.01 -#define SIGNATURE_HASH 3772508418 -#define TS_SIGNATURE "rusEFI 2021.01.01.prometheus_469.3772508418" +#define SIGNATURE_DATE 2021.01.02 +#define SIGNATURE_HASH 1009969888 +#define TS_SIGNATURE "rusEFI 2021.01.02.prometheus_469.1009969888" diff --git a/firmware/controllers/generated/signature_proteus_f4.h b/firmware/controllers/generated/signature_proteus_f4.h index 1270fcec6c..d4260c382f 100644 --- a/firmware/controllers/generated/signature_proteus_f4.h +++ b/firmware/controllers/generated/signature_proteus_f4.h @@ -3,6 +3,6 @@ // #define SIGNATURE_BOARD proteus_f4 -#define SIGNATURE_DATE 2021.01.01 -#define SIGNATURE_HASH 1806280077 -#define TS_SIGNATURE "rusEFI 2021.01.01.proteus_f4.1806280077" +#define SIGNATURE_DATE 2021.01.02 +#define SIGNATURE_HASH 3074467439 +#define TS_SIGNATURE "rusEFI 2021.01.02.proteus_f4.3074467439" diff --git a/firmware/controllers/generated/signature_proteus_f7.h b/firmware/controllers/generated/signature_proteus_f7.h index 74bf7608a7..6c402cdb82 100644 --- a/firmware/controllers/generated/signature_proteus_f7.h +++ b/firmware/controllers/generated/signature_proteus_f7.h @@ -3,6 +3,6 @@ // #define SIGNATURE_BOARD proteus_f7 -#define SIGNATURE_DATE 2021.01.01 -#define SIGNATURE_HASH 1806280077 -#define TS_SIGNATURE "rusEFI 2021.01.01.proteus_f7.1806280077" +#define SIGNATURE_DATE 2021.01.02 +#define SIGNATURE_HASH 3074467439 +#define TS_SIGNATURE "rusEFI 2021.01.02.proteus_f7.3074467439" diff --git a/firmware/tunerstudio/generated/cache.zip b/firmware/tunerstudio/generated/cache.zip index cdec5ac552..d58b83fee0 100644 Binary files a/firmware/tunerstudio/generated/cache.zip and b/firmware/tunerstudio/generated/cache.zip differ diff --git a/firmware/tunerstudio/generated/rusefi.ini b/firmware/tunerstudio/generated/rusefi.ini index fdac7465d3..9d2d85cdb8 100644 --- a/firmware/tunerstudio/generated/rusefi.ini +++ b/firmware/tunerstudio/generated/rusefi.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2021.01.01.all.2718166867" + signature = "rusEFI 2021.01.02.all.2129325233" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.01.01.all.2718166867" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.01.02.all.2129325233" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -77,7 +77,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.sh integration/rusefi_config.txt Fri Jan 01 16:20:01 UTC 2021 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Jan 02 14:16:01 UTC 2021 pageSize = 20000 page = 1 @@ -1101,9 +1101,19 @@ page = 1 mc33972spiDevice = bits,U32, 4008, [0:2], "Off", "SPI1", "SPI2", "SPI3", "SPI4", "INVALID", "INVALID", "INVALID" unusedSpiPadding8 = array, U08, 4009, [3], "units", 1.0, 0, -20, 100, 0 etbIdleThrottleRange = scalar, F32, 4012, "%", 1.0, 0, 0, 15, 0 - unusedvref = array, U08, 4016, [4], "units", 1.0, 0, -20, 100, 0 - unusedsw = array, U08, 4020, [4], "units", 1.0, 0, -20, 100, 0 - unused_alFIn = array, S32, 4024, [3], "units", 1.0, 0, -20, 100, 0 + cylinderBankSelect1 = scalar, U08, 4016, "", 1.0, 1, 1, 2, 0 + cylinderBankSelect2 = scalar, U08, 4017, "", 1.0, 1, 1, 2, 0 + cylinderBankSelect3 = scalar, U08, 4018, "", 1.0, 1, 1, 2, 0 + cylinderBankSelect4 = scalar, U08, 4019, "", 1.0, 1, 1, 2, 0 + cylinderBankSelect5 = scalar, U08, 4020, "", 1.0, 1, 1, 2, 0 + cylinderBankSelect6 = scalar, U08, 4021, "", 1.0, 1, 1, 2, 0 + cylinderBankSelect7 = scalar, U08, 4022, "", 1.0, 1, 1, 2, 0 + cylinderBankSelect8 = scalar, U08, 4023, "", 1.0, 1, 1, 2, 0 + cylinderBankSelect9 = scalar, U08, 4024, "", 1.0, 1, 1, 2, 0 + cylinderBankSelect10 = scalar, U08, 4025, "", 1.0, 1, 1, 2, 0 + cylinderBankSelect11 = scalar, U08, 4026, "", 1.0, 1, 1, 2, 0 + cylinderBankSelect12 = scalar, U08, 4027, "", 1.0, 1, 1, 2, 0 + unused4028 = array, S32, 4028, [2], "units", 1.0, 0, -20, 100, 0 triggerCompCenterVolt = scalar, U08, 4036, "V", 0.02, 0, 0.0, 5.1, 2 triggerCompHystMin = scalar, U08, 4037, "V", 0.02, 0, 0.0, 5.1, 2 triggerCompHystMax = scalar, U08, 4038, "V", 0.02, 0, 0.0, 5.1, 2 @@ -1435,6 +1445,18 @@ page = 1 tpsAccelFractionPeriod = "A delay in cycles between fuel-enrich. portions" tpsAccelFractionDivisor = "A fraction divisor: 1 or less = entire portion at once, or split into diminishing fractions" stoichRatioPrimary = "Stoichiometric ratio for your primary fuel." + cylinderBankSelect1 = "Select which fuel correction bank this cylinder belongs to. Group cylinders that share the same O2 sensor" + cylinderBankSelect2 = "Select which fuel correction bank this cylinder belongs to. Group cylinders that share the same O2 sensor" + cylinderBankSelect3 = "Select which fuel correction bank this cylinder belongs to. Group cylinders that share the same O2 sensor" + cylinderBankSelect4 = "Select which fuel correction bank this cylinder belongs to. Group cylinders that share the same O2 sensor" + cylinderBankSelect5 = "Select which fuel correction bank this cylinder belongs to. Group cylinders that share the same O2 sensor" + cylinderBankSelect6 = "Select which fuel correction bank this cylinder belongs to. Group cylinders that share the same O2 sensor" + cylinderBankSelect7 = "Select which fuel correction bank this cylinder belongs to. Group cylinders that share the same O2 sensor" + cylinderBankSelect8 = "Select which fuel correction bank this cylinder belongs to. Group cylinders that share the same O2 sensor" + cylinderBankSelect9 = "Select which fuel correction bank this cylinder belongs to. Group cylinders that share the same O2 sensor" + cylinderBankSelect10 = "Select which fuel correction bank this cylinder belongs to. Group cylinders that share the same O2 sensor" + cylinderBankSelect11 = "Select which fuel correction bank this cylinder belongs to. Group cylinders that share the same O2 sensor" + cylinderBankSelect12 = "Select which fuel correction bank this cylinder belongs to. Group cylinders that share the same O2 sensor" triggerCompCenterVolt = "Trigger comparator center point voltage" triggerCompHystMin = "Trigger comparator hysteresis voltage (Min)" triggerCompHystMax = "Trigger comparator hysteresis voltage (Max)" @@ -2910,6 +2932,7 @@ menuDialog = main subMenu = multisparkSettings, "Multispark", 0, {isIgnitionEnabled == 1} subMenu = mc33Dialog, "GDI Dreams" subMenu = widebandConfig, "rusEFI Wideband Controller", 0, { canReadEnabled && canWriteEnabled } + subMenu = cylinderBankSelect, "Cylinder Bank Selection" subMenu = std_separator subMenu = hipFunction, "HIP9011 settings (knock sensor) (alpha version)" @@ -3220,6 +3243,20 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" field = "" field = "injection Pin Mode", injectionPinMode, {isInjectionEnabled == 1} + dialog = cylinderBankSelect, "Cylinder Banks", yAxis + field = "Cylinder 1", cylinderBankSelect1, {isInjectionEnabled == 1} + field = "Cylinder 2", cylinderBankSelect2, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 1} + field = "Cylinder 3", cylinderBankSelect3, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 2} + field = "Cylinder 4", cylinderBankSelect4, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 3} + field = "Cylinder 5 ", cylinderBankSelect5, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 4} + field = "Cylinder 6 ", cylinderBankSelect6, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 5} + field = "Cylinder 7 ", cylinderBankSelect7, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 6} + field = "Cylinder 8 ", cylinderBankSelect8, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 7} + field = "Cylinder 9 ", cylinderBankSelect9, {isInjectionEnabled == 1 && cylindersCount > 8} + field = "Cylinder 10 ", cylinderBankSelect10, {isInjectionEnabled == 1 && cylindersCount > 9} + field = "Cylinder 11 ", cylinderBankSelect11, {isInjectionEnabled == 1 && cylindersCount > 10} + field = "Cylinder 12 ", cylinderBankSelect12, {isInjectionEnabled == 1 && cylindersCount > 11} + dialog = testFsio, "FSIO Test" commandButton = "FSIO#1", cmd_test_fsio1 commandButton = "FSIO#2", cmd_test_fsio2 diff --git a/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini b/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini index 6fef138858..052d6b3112 100644 --- a/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini +++ b/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2021.01.01.frankenso_na6.879976104" + signature = "rusEFI 2021.01.02.frankenso_na6.3902430538" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.01.01.frankenso_na6.879976104" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.01.02.frankenso_na6.3902430538" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -77,7 +77,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.sh integration/rusefi_config.txt Fri Jan 01 16:20:06 UTC 2021 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Jan 02 14:16:07 UTC 2021 pageSize = 20000 page = 1 @@ -1101,9 +1101,19 @@ page = 1 mc33972spiDevice = bits,U32, 4008, [0:2], "Off", "SPI1", "SPI2", "SPI3", "SPI4", "INVALID", "INVALID", "INVALID" unusedSpiPadding8 = array, U08, 4009, [3], "units", 1.0, 0, -20, 100, 0 etbIdleThrottleRange = scalar, F32, 4012, "%", 1.0, 0, 0, 15, 0 - unusedvref = array, U08, 4016, [4], "units", 1.0, 0, -20, 100, 0 - unusedsw = array, U08, 4020, [4], "units", 1.0, 0, -20, 100, 0 - unused_alFIn = array, S32, 4024, [3], "units", 1.0, 0, -20, 100, 0 + cylinderBankSelect1 = scalar, U08, 4016, "", 1.0, 1, 1, 2, 0 + cylinderBankSelect2 = scalar, U08, 4017, "", 1.0, 1, 1, 2, 0 + cylinderBankSelect3 = scalar, U08, 4018, "", 1.0, 1, 1, 2, 0 + cylinderBankSelect4 = scalar, U08, 4019, "", 1.0, 1, 1, 2, 0 + cylinderBankSelect5 = scalar, U08, 4020, "", 1.0, 1, 1, 2, 0 + cylinderBankSelect6 = scalar, U08, 4021, "", 1.0, 1, 1, 2, 0 + cylinderBankSelect7 = scalar, U08, 4022, "", 1.0, 1, 1, 2, 0 + cylinderBankSelect8 = scalar, U08, 4023, "", 1.0, 1, 1, 2, 0 + cylinderBankSelect9 = scalar, U08, 4024, "", 1.0, 1, 1, 2, 0 + cylinderBankSelect10 = scalar, U08, 4025, "", 1.0, 1, 1, 2, 0 + cylinderBankSelect11 = scalar, U08, 4026, "", 1.0, 1, 1, 2, 0 + cylinderBankSelect12 = scalar, U08, 4027, "", 1.0, 1, 1, 2, 0 + unused4028 = array, S32, 4028, [2], "units", 1.0, 0, -20, 100, 0 triggerCompCenterVolt = scalar, U08, 4036, "V", 0.02, 0, 0.0, 5.1, 2 triggerCompHystMin = scalar, U08, 4037, "V", 0.02, 0, 0.0, 5.1, 2 triggerCompHystMax = scalar, U08, 4038, "V", 0.02, 0, 0.0, 5.1, 2 @@ -1435,6 +1445,18 @@ page = 1 tpsAccelFractionPeriod = "A delay in cycles between fuel-enrich. portions" tpsAccelFractionDivisor = "A fraction divisor: 1 or less = entire portion at once, or split into diminishing fractions" stoichRatioPrimary = "Stoichiometric ratio for your primary fuel." + cylinderBankSelect1 = "Select which fuel correction bank this cylinder belongs to. Group cylinders that share the same O2 sensor" + cylinderBankSelect2 = "Select which fuel correction bank this cylinder belongs to. Group cylinders that share the same O2 sensor" + cylinderBankSelect3 = "Select which fuel correction bank this cylinder belongs to. Group cylinders that share the same O2 sensor" + cylinderBankSelect4 = "Select which fuel correction bank this cylinder belongs to. Group cylinders that share the same O2 sensor" + cylinderBankSelect5 = "Select which fuel correction bank this cylinder belongs to. Group cylinders that share the same O2 sensor" + cylinderBankSelect6 = "Select which fuel correction bank this cylinder belongs to. Group cylinders that share the same O2 sensor" + cylinderBankSelect7 = "Select which fuel correction bank this cylinder belongs to. Group cylinders that share the same O2 sensor" + cylinderBankSelect8 = "Select which fuel correction bank this cylinder belongs to. Group cylinders that share the same O2 sensor" + cylinderBankSelect9 = "Select which fuel correction bank this cylinder belongs to. Group cylinders that share the same O2 sensor" + cylinderBankSelect10 = "Select which fuel correction bank this cylinder belongs to. Group cylinders that share the same O2 sensor" + cylinderBankSelect11 = "Select which fuel correction bank this cylinder belongs to. Group cylinders that share the same O2 sensor" + cylinderBankSelect12 = "Select which fuel correction bank this cylinder belongs to. Group cylinders that share the same O2 sensor" triggerCompCenterVolt = "Trigger comparator center point voltage" triggerCompHystMin = "Trigger comparator hysteresis voltage (Min)" triggerCompHystMax = "Trigger comparator hysteresis voltage (Max)" @@ -2910,6 +2932,7 @@ menuDialog = main subMenu = multisparkSettings, "Multispark", 0, {isIgnitionEnabled == 1} subMenu = mc33Dialog, "GDI Dreams" subMenu = widebandConfig, "rusEFI Wideband Controller", 0, { canReadEnabled && canWriteEnabled } + subMenu = cylinderBankSelect, "Cylinder Bank Selection" subMenu = std_separator subMenu = hipFunction, "HIP9011 settings (knock sensor) (alpha version)" @@ -3220,6 +3243,20 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" field = "" field = "injection Pin Mode", injectionPinMode, {isInjectionEnabled == 1} + dialog = cylinderBankSelect, "Cylinder Banks", yAxis + field = "Cylinder 1", cylinderBankSelect1, {isInjectionEnabled == 1} + field = "Cylinder 2", cylinderBankSelect2, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 1} + field = "Cylinder 3", cylinderBankSelect3, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 2} + field = "Cylinder 4", cylinderBankSelect4, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 3} + field = "Cylinder 5 ", cylinderBankSelect5, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 4} + field = "Cylinder 6 ", cylinderBankSelect6, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 5} + field = "Cylinder 7 ", cylinderBankSelect7, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 6} + field = "Cylinder 8 ", cylinderBankSelect8, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 7} + field = "Cylinder 9 ", cylinderBankSelect9, {isInjectionEnabled == 1 && cylindersCount > 8} + field = "Cylinder 10 ", cylinderBankSelect10, {isInjectionEnabled == 1 && cylindersCount > 9} + field = "Cylinder 11 ", cylinderBankSelect11, {isInjectionEnabled == 1 && cylindersCount > 10} + field = "Cylinder 12 ", cylinderBankSelect12, {isInjectionEnabled == 1 && cylindersCount > 11} + dialog = testFsio, "FSIO Test" commandButton = "FSIO#1", cmd_test_fsio1 commandButton = "FSIO#2", cmd_test_fsio2 diff --git a/firmware/tunerstudio/generated/rusefi_hellen_cypress.ini b/firmware/tunerstudio/generated/rusefi_hellen_cypress.ini index 1432c43567..aee6ba9fde 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen_cypress.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen_cypress.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2021.01.01.hellen_cypress.1811040656" + signature = "rusEFI 2021.01.02.hellen_cypress.3072019058" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.01.01.hellen_cypress.1811040656" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.01.02.hellen_cypress.3072019058" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -77,7 +77,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 hellen_cypress_gen_config.bat integration/rusefi_config.txt Fri Jan 01 16:20:19 UTC 2021 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on hellen_cypress_gen_config.bat integration/rusefi_config.txt Sat Jan 02 14:16:27 UTC 2021 pageSize = 20000 page = 1 @@ -1101,9 +1101,19 @@ page = 1 mc33972spiDevice = bits,U32, 4008, [0:2], "Off", "SPI1", "SPI2", "SPI3", "SPI4", "INVALID", "INVALID", "INVALID" unusedSpiPadding8 = array, U08, 4009, [3], "units", 1.0, 0, -20, 100, 0 etbIdleThrottleRange = scalar, F32, 4012, "%", 1.0, 0, 0, 15, 0 - unusedvref = array, U08, 4016, [4], "units", 1.0, 0, -20, 100, 0 - unusedsw = array, U08, 4020, [4], "units", 1.0, 0, -20, 100, 0 - unused_alFIn = array, S32, 4024, [3], "units", 1.0, 0, -20, 100, 0 + cylinderBankSelect1 = scalar, U08, 4016, "", 1.0, 1, 1, 2, 0 + cylinderBankSelect2 = scalar, U08, 4017, "", 1.0, 1, 1, 2, 0 + cylinderBankSelect3 = scalar, U08, 4018, "", 1.0, 1, 1, 2, 0 + cylinderBankSelect4 = scalar, U08, 4019, "", 1.0, 1, 1, 2, 0 + cylinderBankSelect5 = scalar, U08, 4020, "", 1.0, 1, 1, 2, 0 + cylinderBankSelect6 = scalar, U08, 4021, "", 1.0, 1, 1, 2, 0 + cylinderBankSelect7 = scalar, U08, 4022, "", 1.0, 1, 1, 2, 0 + cylinderBankSelect8 = scalar, U08, 4023, "", 1.0, 1, 1, 2, 0 + cylinderBankSelect9 = scalar, U08, 4024, "", 1.0, 1, 1, 2, 0 + cylinderBankSelect10 = scalar, U08, 4025, "", 1.0, 1, 1, 2, 0 + cylinderBankSelect11 = scalar, U08, 4026, "", 1.0, 1, 1, 2, 0 + cylinderBankSelect12 = scalar, U08, 4027, "", 1.0, 1, 1, 2, 0 + unused4028 = array, S32, 4028, [2], "units", 1.0, 0, -20, 100, 0 triggerCompCenterVolt = scalar, U08, 4036, "V", 0.02, 0, 0.0, 5.1, 2 triggerCompHystMin = scalar, U08, 4037, "V", 0.02, 0, 0.0, 5.1, 2 triggerCompHystMax = scalar, U08, 4038, "V", 0.02, 0, 0.0, 5.1, 2 @@ -1435,6 +1445,18 @@ page = 1 tpsAccelFractionPeriod = "A delay in cycles between fuel-enrich. portions" tpsAccelFractionDivisor = "A fraction divisor: 1 or less = entire portion at once, or split into diminishing fractions" stoichRatioPrimary = "Stoichiometric ratio for your primary fuel." + cylinderBankSelect1 = "Select which fuel correction bank this cylinder belongs to. Group cylinders that share the same O2 sensor" + cylinderBankSelect2 = "Select which fuel correction bank this cylinder belongs to. Group cylinders that share the same O2 sensor" + cylinderBankSelect3 = "Select which fuel correction bank this cylinder belongs to. Group cylinders that share the same O2 sensor" + cylinderBankSelect4 = "Select which fuel correction bank this cylinder belongs to. Group cylinders that share the same O2 sensor" + cylinderBankSelect5 = "Select which fuel correction bank this cylinder belongs to. Group cylinders that share the same O2 sensor" + cylinderBankSelect6 = "Select which fuel correction bank this cylinder belongs to. Group cylinders that share the same O2 sensor" + cylinderBankSelect7 = "Select which fuel correction bank this cylinder belongs to. Group cylinders that share the same O2 sensor" + cylinderBankSelect8 = "Select which fuel correction bank this cylinder belongs to. Group cylinders that share the same O2 sensor" + cylinderBankSelect9 = "Select which fuel correction bank this cylinder belongs to. Group cylinders that share the same O2 sensor" + cylinderBankSelect10 = "Select which fuel correction bank this cylinder belongs to. Group cylinders that share the same O2 sensor" + cylinderBankSelect11 = "Select which fuel correction bank this cylinder belongs to. Group cylinders that share the same O2 sensor" + cylinderBankSelect12 = "Select which fuel correction bank this cylinder belongs to. Group cylinders that share the same O2 sensor" triggerCompCenterVolt = "Trigger comparator center point voltage" triggerCompHystMin = "Trigger comparator hysteresis voltage (Min)" triggerCompHystMax = "Trigger comparator hysteresis voltage (Max)" @@ -2910,6 +2932,7 @@ menuDialog = main subMenu = multisparkSettings, "Multispark", 0, {isIgnitionEnabled == 1} subMenu = mc33Dialog, "GDI Dreams" subMenu = widebandConfig, "rusEFI Wideband Controller", 0, { canReadEnabled && canWriteEnabled } + subMenu = cylinderBankSelect, "Cylinder Bank Selection" subMenu = std_separator subMenu = hipFunction, "HIP9011 settings (knock sensor) (alpha version)" @@ -3220,6 +3243,20 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" field = "" field = "injection Pin Mode", injectionPinMode, {isInjectionEnabled == 1} + dialog = cylinderBankSelect, "Cylinder Banks", yAxis + field = "Cylinder 1", cylinderBankSelect1, {isInjectionEnabled == 1} + field = "Cylinder 2", cylinderBankSelect2, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 1} + field = "Cylinder 3", cylinderBankSelect3, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 2} + field = "Cylinder 4", cylinderBankSelect4, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 3} + field = "Cylinder 5 ", cylinderBankSelect5, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 4} + field = "Cylinder 6 ", cylinderBankSelect6, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 5} + field = "Cylinder 7 ", cylinderBankSelect7, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 6} + field = "Cylinder 8 ", cylinderBankSelect8, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 7} + field = "Cylinder 9 ", cylinderBankSelect9, {isInjectionEnabled == 1 && cylindersCount > 8} + field = "Cylinder 10 ", cylinderBankSelect10, {isInjectionEnabled == 1 && cylindersCount > 9} + field = "Cylinder 11 ", cylinderBankSelect11, {isInjectionEnabled == 1 && cylindersCount > 10} + field = "Cylinder 12 ", cylinderBankSelect12, {isInjectionEnabled == 1 && cylindersCount > 11} + dialog = testFsio, "FSIO Test" commandButton = "FSIO#1", cmd_test_fsio1 commandButton = "FSIO#2", cmd_test_fsio2 diff --git a/firmware/tunerstudio/generated/rusefi_kinetis.ini b/firmware/tunerstudio/generated/rusefi_kinetis.ini index 3028052ab8..a489dee0c6 100644 --- a/firmware/tunerstudio/generated/rusefi_kinetis.ini +++ b/firmware/tunerstudio/generated/rusefi_kinetis.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2021.01.01.kin.988705642" + signature = "rusEFI 2021.01.02.kin.3859247240" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.01.01.kin.988705642" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.01.02.kin.3859247240" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -77,7 +77,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 kinetis_gen_config.bat integration/rusefi_config.txt Fri Jan 01 16:20:13 UTC 2021 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Sat Jan 02 14:16:18 UTC 2021 pageSize = 20000 page = 1 @@ -1101,9 +1101,19 @@ page = 1 mc33972spiDevice = bits,U32, 4008, [0:2], "Off", "SPI1", "SPI2", "SPI3", "SPI4", "INVALID", "INVALID", "INVALID" unusedSpiPadding8 = array, U08, 4009, [3], "units", 1.0, 0, -20, 100, 0 etbIdleThrottleRange = scalar, F32, 4012, "%", 1.0, 0, 0, 15, 0 - unusedvref = array, U08, 4016, [4], "units", 1.0, 0, -20, 100, 0 - unusedsw = array, U08, 4020, [4], "units", 1.0, 0, -20, 100, 0 - unused_alFIn = array, S32, 4024, [3], "units", 1.0, 0, -20, 100, 0 + cylinderBankSelect1 = scalar, U08, 4016, "", 1.0, 1, 1, 2, 0 + cylinderBankSelect2 = scalar, U08, 4017, "", 1.0, 1, 1, 2, 0 + cylinderBankSelect3 = scalar, U08, 4018, "", 1.0, 1, 1, 2, 0 + cylinderBankSelect4 = scalar, U08, 4019, "", 1.0, 1, 1, 2, 0 + cylinderBankSelect5 = scalar, U08, 4020, "", 1.0, 1, 1, 2, 0 + cylinderBankSelect6 = scalar, U08, 4021, "", 1.0, 1, 1, 2, 0 + cylinderBankSelect7 = scalar, U08, 4022, "", 1.0, 1, 1, 2, 0 + cylinderBankSelect8 = scalar, U08, 4023, "", 1.0, 1, 1, 2, 0 + cylinderBankSelect9 = scalar, U08, 4024, "", 1.0, 1, 1, 2, 0 + cylinderBankSelect10 = scalar, U08, 4025, "", 1.0, 1, 1, 2, 0 + cylinderBankSelect11 = scalar, U08, 4026, "", 1.0, 1, 1, 2, 0 + cylinderBankSelect12 = scalar, U08, 4027, "", 1.0, 1, 1, 2, 0 + unused4028 = array, S32, 4028, [2], "units", 1.0, 0, -20, 100, 0 triggerCompCenterVolt = scalar, U08, 4036, "V", 0.02, 0, 0.0, 5.1, 2 triggerCompHystMin = scalar, U08, 4037, "V", 0.02, 0, 0.0, 5.1, 2 triggerCompHystMax = scalar, U08, 4038, "V", 0.02, 0, 0.0, 5.1, 2 @@ -1435,6 +1445,18 @@ page = 1 tpsAccelFractionPeriod = "A delay in cycles between fuel-enrich. portions" tpsAccelFractionDivisor = "A fraction divisor: 1 or less = entire portion at once, or split into diminishing fractions" stoichRatioPrimary = "Stoichiometric ratio for your primary fuel." + cylinderBankSelect1 = "Select which fuel correction bank this cylinder belongs to. Group cylinders that share the same O2 sensor" + cylinderBankSelect2 = "Select which fuel correction bank this cylinder belongs to. Group cylinders that share the same O2 sensor" + cylinderBankSelect3 = "Select which fuel correction bank this cylinder belongs to. Group cylinders that share the same O2 sensor" + cylinderBankSelect4 = "Select which fuel correction bank this cylinder belongs to. Group cylinders that share the same O2 sensor" + cylinderBankSelect5 = "Select which fuel correction bank this cylinder belongs to. Group cylinders that share the same O2 sensor" + cylinderBankSelect6 = "Select which fuel correction bank this cylinder belongs to. Group cylinders that share the same O2 sensor" + cylinderBankSelect7 = "Select which fuel correction bank this cylinder belongs to. Group cylinders that share the same O2 sensor" + cylinderBankSelect8 = "Select which fuel correction bank this cylinder belongs to. Group cylinders that share the same O2 sensor" + cylinderBankSelect9 = "Select which fuel correction bank this cylinder belongs to. Group cylinders that share the same O2 sensor" + cylinderBankSelect10 = "Select which fuel correction bank this cylinder belongs to. Group cylinders that share the same O2 sensor" + cylinderBankSelect11 = "Select which fuel correction bank this cylinder belongs to. Group cylinders that share the same O2 sensor" + cylinderBankSelect12 = "Select which fuel correction bank this cylinder belongs to. Group cylinders that share the same O2 sensor" triggerCompCenterVolt = "Trigger comparator center point voltage" triggerCompHystMin = "Trigger comparator hysteresis voltage (Min)" triggerCompHystMax = "Trigger comparator hysteresis voltage (Max)" @@ -2910,6 +2932,7 @@ menuDialog = main subMenu = multisparkSettings, "Multispark", 0, {isIgnitionEnabled == 1} subMenu = mc33Dialog, "GDI Dreams" subMenu = widebandConfig, "rusEFI Wideband Controller", 0, { canReadEnabled && canWriteEnabled } + subMenu = cylinderBankSelect, "Cylinder Bank Selection" subMenu = std_separator subMenu = hipFunction, "HIP9011 settings (knock sensor) (alpha version)" @@ -3221,6 +3244,20 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" field = "" field = "injection Pin Mode", injectionPinMode, {isInjectionEnabled == 1} + dialog = cylinderBankSelect, "Cylinder Banks", yAxis + field = "Cylinder 1", cylinderBankSelect1, {isInjectionEnabled == 1} + field = "Cylinder 2", cylinderBankSelect2, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 1} + field = "Cylinder 3", cylinderBankSelect3, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 2} + field = "Cylinder 4", cylinderBankSelect4, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 3} + field = "Cylinder 5 ", cylinderBankSelect5, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 4} + field = "Cylinder 6 ", cylinderBankSelect6, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 5} + field = "Cylinder 7 ", cylinderBankSelect7, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 6} + field = "Cylinder 8 ", cylinderBankSelect8, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 7} + field = "Cylinder 9 ", cylinderBankSelect9, {isInjectionEnabled == 1 && cylindersCount > 8} + field = "Cylinder 10 ", cylinderBankSelect10, {isInjectionEnabled == 1 && cylindersCount > 9} + field = "Cylinder 11 ", cylinderBankSelect11, {isInjectionEnabled == 1 && cylindersCount > 10} + field = "Cylinder 12 ", cylinderBankSelect12, {isInjectionEnabled == 1 && cylindersCount > 11} + dialog = testFsio, "FSIO Test" commandButton = "FSIO#1", cmd_test_fsio1 commandButton = "FSIO#2", cmd_test_fsio2 diff --git a/firmware/tunerstudio/generated/rusefi_mre_f4.ini b/firmware/tunerstudio/generated/rusefi_mre_f4.ini index fa2d3e3fa4..de84327ac8 100644 --- a/firmware/tunerstudio/generated/rusefi_mre_f4.ini +++ b/firmware/tunerstudio/generated/rusefi_mre_f4.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2021.01.01.mre_f4.3050516778" + signature = "rusEFI 2021.01.02.mre_f4.1765421768" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.01.01.mre_f4.3050516778" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.01.02.mre_f4.1765421768" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -77,7 +77,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.sh integration/rusefi_config.txt Fri Jan 01 16:20:04 UTC 2021 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Jan 02 14:16:06 UTC 2021 pageSize = 20000 page = 1 @@ -1101,9 +1101,19 @@ page = 1 mc33972spiDevice = bits,U32, 4008, [0:2], "Off", "SPI1", "SPI2", "SPI3", "SPI4", "INVALID", "INVALID", "INVALID" unusedSpiPadding8 = array, U08, 4009, [3], "units", 1.0, 0, -20, 100, 0 etbIdleThrottleRange = scalar, F32, 4012, "%", 1.0, 0, 0, 15, 0 - unusedvref = array, U08, 4016, [4], "units", 1.0, 0, -20, 100, 0 - unusedsw = array, U08, 4020, [4], "units", 1.0, 0, -20, 100, 0 - unused_alFIn = array, S32, 4024, [3], "units", 1.0, 0, -20, 100, 0 + cylinderBankSelect1 = scalar, U08, 4016, "", 1.0, 1, 1, 2, 0 + cylinderBankSelect2 = scalar, U08, 4017, "", 1.0, 1, 1, 2, 0 + cylinderBankSelect3 = scalar, U08, 4018, "", 1.0, 1, 1, 2, 0 + cylinderBankSelect4 = scalar, U08, 4019, "", 1.0, 1, 1, 2, 0 + cylinderBankSelect5 = scalar, U08, 4020, "", 1.0, 1, 1, 2, 0 + cylinderBankSelect6 = scalar, U08, 4021, "", 1.0, 1, 1, 2, 0 + cylinderBankSelect7 = scalar, U08, 4022, "", 1.0, 1, 1, 2, 0 + cylinderBankSelect8 = scalar, U08, 4023, "", 1.0, 1, 1, 2, 0 + cylinderBankSelect9 = scalar, U08, 4024, "", 1.0, 1, 1, 2, 0 + cylinderBankSelect10 = scalar, U08, 4025, "", 1.0, 1, 1, 2, 0 + cylinderBankSelect11 = scalar, U08, 4026, "", 1.0, 1, 1, 2, 0 + cylinderBankSelect12 = scalar, U08, 4027, "", 1.0, 1, 1, 2, 0 + unused4028 = array, S32, 4028, [2], "units", 1.0, 0, -20, 100, 0 triggerCompCenterVolt = scalar, U08, 4036, "V", 0.02, 0, 0.0, 5.1, 2 triggerCompHystMin = scalar, U08, 4037, "V", 0.02, 0, 0.0, 5.1, 2 triggerCompHystMax = scalar, U08, 4038, "V", 0.02, 0, 0.0, 5.1, 2 @@ -1435,6 +1445,18 @@ page = 1 tpsAccelFractionPeriod = "A delay in cycles between fuel-enrich. portions" tpsAccelFractionDivisor = "A fraction divisor: 1 or less = entire portion at once, or split into diminishing fractions" stoichRatioPrimary = "Stoichiometric ratio for your primary fuel." + cylinderBankSelect1 = "Select which fuel correction bank this cylinder belongs to. Group cylinders that share the same O2 sensor" + cylinderBankSelect2 = "Select which fuel correction bank this cylinder belongs to. Group cylinders that share the same O2 sensor" + cylinderBankSelect3 = "Select which fuel correction bank this cylinder belongs to. Group cylinders that share the same O2 sensor" + cylinderBankSelect4 = "Select which fuel correction bank this cylinder belongs to. Group cylinders that share the same O2 sensor" + cylinderBankSelect5 = "Select which fuel correction bank this cylinder belongs to. Group cylinders that share the same O2 sensor" + cylinderBankSelect6 = "Select which fuel correction bank this cylinder belongs to. Group cylinders that share the same O2 sensor" + cylinderBankSelect7 = "Select which fuel correction bank this cylinder belongs to. Group cylinders that share the same O2 sensor" + cylinderBankSelect8 = "Select which fuel correction bank this cylinder belongs to. Group cylinders that share the same O2 sensor" + cylinderBankSelect9 = "Select which fuel correction bank this cylinder belongs to. Group cylinders that share the same O2 sensor" + cylinderBankSelect10 = "Select which fuel correction bank this cylinder belongs to. Group cylinders that share the same O2 sensor" + cylinderBankSelect11 = "Select which fuel correction bank this cylinder belongs to. Group cylinders that share the same O2 sensor" + cylinderBankSelect12 = "Select which fuel correction bank this cylinder belongs to. Group cylinders that share the same O2 sensor" triggerCompCenterVolt = "Trigger comparator center point voltage" triggerCompHystMin = "Trigger comparator hysteresis voltage (Min)" triggerCompHystMax = "Trigger comparator hysteresis voltage (Max)" @@ -2906,6 +2928,7 @@ menuDialog = main subMenu = multisparkSettings, "Multispark", 0, {isIgnitionEnabled == 1} subMenu = mc33Dialog, "GDI Dreams" subMenu = widebandConfig, "rusEFI Wideband Controller", 0, { canReadEnabled && canWriteEnabled } + subMenu = cylinderBankSelect, "Cylinder Bank Selection" subMenu = std_separator subMenu = softwareKnock, "Software Knock" @@ -3216,6 +3239,20 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" field = "" field = "injection Pin Mode", injectionPinMode, {isInjectionEnabled == 1} + dialog = cylinderBankSelect, "Cylinder Banks", yAxis + field = "Cylinder 1", cylinderBankSelect1, {isInjectionEnabled == 1} + field = "Cylinder 2", cylinderBankSelect2, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 1} + field = "Cylinder 3", cylinderBankSelect3, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 2} + field = "Cylinder 4", cylinderBankSelect4, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 3} + field = "Cylinder 5 ", cylinderBankSelect5, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 4} + field = "Cylinder 6 ", cylinderBankSelect6, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 5} + field = "Cylinder 7 ", cylinderBankSelect7, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 6} + field = "Cylinder 8 ", cylinderBankSelect8, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 7} + field = "Cylinder 9 ", cylinderBankSelect9, {isInjectionEnabled == 1 && cylindersCount > 8} + field = "Cylinder 10 ", cylinderBankSelect10, {isInjectionEnabled == 1 && cylindersCount > 9} + field = "Cylinder 11 ", cylinderBankSelect11, {isInjectionEnabled == 1 && cylindersCount > 10} + field = "Cylinder 12 ", cylinderBankSelect12, {isInjectionEnabled == 1 && cylindersCount > 11} + dialog = testFsio, "FSIO Test" commandButton = "FSIO#1", cmd_test_fsio1 commandButton = "FSIO#2", cmd_test_fsio2 diff --git a/firmware/tunerstudio/generated/rusefi_mre_f7.ini b/firmware/tunerstudio/generated/rusefi_mre_f7.ini index 64acd41f46..9244558a27 100644 --- a/firmware/tunerstudio/generated/rusefi_mre_f7.ini +++ b/firmware/tunerstudio/generated/rusefi_mre_f7.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2021.01.01.mre_f7.3050516778" + signature = "rusEFI 2021.01.02.mre_f7.1765421768" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.01.01.mre_f7.3050516778" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.01.02.mre_f7.1765421768" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -77,7 +77,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.sh integration/rusefi_config.txt Fri Jan 01 16:20:03 UTC 2021 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Jan 02 14:16:04 UTC 2021 pageSize = 20000 page = 1 @@ -1101,9 +1101,19 @@ page = 1 mc33972spiDevice = bits,U32, 4008, [0:2], "Off", "SPI1", "SPI2", "SPI3", "SPI4", "INVALID", "INVALID", "INVALID" unusedSpiPadding8 = array, U08, 4009, [3], "units", 1.0, 0, -20, 100, 0 etbIdleThrottleRange = scalar, F32, 4012, "%", 1.0, 0, 0, 15, 0 - unusedvref = array, U08, 4016, [4], "units", 1.0, 0, -20, 100, 0 - unusedsw = array, U08, 4020, [4], "units", 1.0, 0, -20, 100, 0 - unused_alFIn = array, S32, 4024, [3], "units", 1.0, 0, -20, 100, 0 + cylinderBankSelect1 = scalar, U08, 4016, "", 1.0, 1, 1, 2, 0 + cylinderBankSelect2 = scalar, U08, 4017, "", 1.0, 1, 1, 2, 0 + cylinderBankSelect3 = scalar, U08, 4018, "", 1.0, 1, 1, 2, 0 + cylinderBankSelect4 = scalar, U08, 4019, "", 1.0, 1, 1, 2, 0 + cylinderBankSelect5 = scalar, U08, 4020, "", 1.0, 1, 1, 2, 0 + cylinderBankSelect6 = scalar, U08, 4021, "", 1.0, 1, 1, 2, 0 + cylinderBankSelect7 = scalar, U08, 4022, "", 1.0, 1, 1, 2, 0 + cylinderBankSelect8 = scalar, U08, 4023, "", 1.0, 1, 1, 2, 0 + cylinderBankSelect9 = scalar, U08, 4024, "", 1.0, 1, 1, 2, 0 + cylinderBankSelect10 = scalar, U08, 4025, "", 1.0, 1, 1, 2, 0 + cylinderBankSelect11 = scalar, U08, 4026, "", 1.0, 1, 1, 2, 0 + cylinderBankSelect12 = scalar, U08, 4027, "", 1.0, 1, 1, 2, 0 + unused4028 = array, S32, 4028, [2], "units", 1.0, 0, -20, 100, 0 triggerCompCenterVolt = scalar, U08, 4036, "V", 0.02, 0, 0.0, 5.1, 2 triggerCompHystMin = scalar, U08, 4037, "V", 0.02, 0, 0.0, 5.1, 2 triggerCompHystMax = scalar, U08, 4038, "V", 0.02, 0, 0.0, 5.1, 2 @@ -1435,6 +1445,18 @@ page = 1 tpsAccelFractionPeriod = "A delay in cycles between fuel-enrich. portions" tpsAccelFractionDivisor = "A fraction divisor: 1 or less = entire portion at once, or split into diminishing fractions" stoichRatioPrimary = "Stoichiometric ratio for your primary fuel." + cylinderBankSelect1 = "Select which fuel correction bank this cylinder belongs to. Group cylinders that share the same O2 sensor" + cylinderBankSelect2 = "Select which fuel correction bank this cylinder belongs to. Group cylinders that share the same O2 sensor" + cylinderBankSelect3 = "Select which fuel correction bank this cylinder belongs to. Group cylinders that share the same O2 sensor" + cylinderBankSelect4 = "Select which fuel correction bank this cylinder belongs to. Group cylinders that share the same O2 sensor" + cylinderBankSelect5 = "Select which fuel correction bank this cylinder belongs to. Group cylinders that share the same O2 sensor" + cylinderBankSelect6 = "Select which fuel correction bank this cylinder belongs to. Group cylinders that share the same O2 sensor" + cylinderBankSelect7 = "Select which fuel correction bank this cylinder belongs to. Group cylinders that share the same O2 sensor" + cylinderBankSelect8 = "Select which fuel correction bank this cylinder belongs to. Group cylinders that share the same O2 sensor" + cylinderBankSelect9 = "Select which fuel correction bank this cylinder belongs to. Group cylinders that share the same O2 sensor" + cylinderBankSelect10 = "Select which fuel correction bank this cylinder belongs to. Group cylinders that share the same O2 sensor" + cylinderBankSelect11 = "Select which fuel correction bank this cylinder belongs to. Group cylinders that share the same O2 sensor" + cylinderBankSelect12 = "Select which fuel correction bank this cylinder belongs to. Group cylinders that share the same O2 sensor" triggerCompCenterVolt = "Trigger comparator center point voltage" triggerCompHystMin = "Trigger comparator hysteresis voltage (Min)" triggerCompHystMax = "Trigger comparator hysteresis voltage (Max)" @@ -2906,6 +2928,7 @@ menuDialog = main subMenu = multisparkSettings, "Multispark", 0, {isIgnitionEnabled == 1} subMenu = mc33Dialog, "GDI Dreams" subMenu = widebandConfig, "rusEFI Wideband Controller", 0, { canReadEnabled && canWriteEnabled } + subMenu = cylinderBankSelect, "Cylinder Bank Selection" subMenu = std_separator subMenu = softwareKnock, "Software Knock" @@ -3216,6 +3239,20 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" field = "" field = "injection Pin Mode", injectionPinMode, {isInjectionEnabled == 1} + dialog = cylinderBankSelect, "Cylinder Banks", yAxis + field = "Cylinder 1", cylinderBankSelect1, {isInjectionEnabled == 1} + field = "Cylinder 2", cylinderBankSelect2, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 1} + field = "Cylinder 3", cylinderBankSelect3, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 2} + field = "Cylinder 4", cylinderBankSelect4, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 3} + field = "Cylinder 5 ", cylinderBankSelect5, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 4} + field = "Cylinder 6 ", cylinderBankSelect6, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 5} + field = "Cylinder 7 ", cylinderBankSelect7, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 6} + field = "Cylinder 8 ", cylinderBankSelect8, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 7} + field = "Cylinder 9 ", cylinderBankSelect9, {isInjectionEnabled == 1 && cylindersCount > 8} + field = "Cylinder 10 ", cylinderBankSelect10, {isInjectionEnabled == 1 && cylindersCount > 9} + field = "Cylinder 11 ", cylinderBankSelect11, {isInjectionEnabled == 1 && cylindersCount > 10} + field = "Cylinder 12 ", cylinderBankSelect12, {isInjectionEnabled == 1 && cylindersCount > 11} + dialog = testFsio, "FSIO Test" commandButton = "FSIO#1", cmd_test_fsio1 commandButton = "FSIO#2", cmd_test_fsio2 diff --git a/firmware/tunerstudio/generated/rusefi_prometheus_405.ini b/firmware/tunerstudio/generated/rusefi_prometheus_405.ini index cbfe6c65d3..801af96fca 100644 --- a/firmware/tunerstudio/generated/rusefi_prometheus_405.ini +++ b/firmware/tunerstudio/generated/rusefi_prometheus_405.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2021.01.01.prometheus_405.3772508418" + signature = "rusEFI 2021.01.02.prometheus_405.1009969888" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.01.01.prometheus_405.3772508418" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.01.02.prometheus_405.1009969888" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -77,7 +77,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.sh integration/rusefi_config.txt Fri Jan 01 16:20:09 UTC 2021 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Jan 02 14:16:11 UTC 2021 pageSize = 20000 page = 1 @@ -1101,9 +1101,19 @@ page = 1 mc33972spiDevice = bits,U32, 4008, [0:2], "Off", "SPI1", "SPI2", "SPI3", "SPI4", "INVALID", "INVALID", "INVALID" unusedSpiPadding8 = array, U08, 4009, [3], "units", 1.0, 0, -20, 100, 0 etbIdleThrottleRange = scalar, F32, 4012, "%", 1.0, 0, 0, 15, 0 - unusedvref = array, U08, 4016, [4], "units", 1.0, 0, -20, 100, 0 - unusedsw = array, U08, 4020, [4], "units", 1.0, 0, -20, 100, 0 - unused_alFIn = array, S32, 4024, [3], "units", 1.0, 0, -20, 100, 0 + cylinderBankSelect1 = scalar, U08, 4016, "", 1.0, 1, 1, 2, 0 + cylinderBankSelect2 = scalar, U08, 4017, "", 1.0, 1, 1, 2, 0 + cylinderBankSelect3 = scalar, U08, 4018, "", 1.0, 1, 1, 2, 0 + cylinderBankSelect4 = scalar, U08, 4019, "", 1.0, 1, 1, 2, 0 + cylinderBankSelect5 = scalar, U08, 4020, "", 1.0, 1, 1, 2, 0 + cylinderBankSelect6 = scalar, U08, 4021, "", 1.0, 1, 1, 2, 0 + cylinderBankSelect7 = scalar, U08, 4022, "", 1.0, 1, 1, 2, 0 + cylinderBankSelect8 = scalar, U08, 4023, "", 1.0, 1, 1, 2, 0 + cylinderBankSelect9 = scalar, U08, 4024, "", 1.0, 1, 1, 2, 0 + cylinderBankSelect10 = scalar, U08, 4025, "", 1.0, 1, 1, 2, 0 + cylinderBankSelect11 = scalar, U08, 4026, "", 1.0, 1, 1, 2, 0 + cylinderBankSelect12 = scalar, U08, 4027, "", 1.0, 1, 1, 2, 0 + unused4028 = array, S32, 4028, [2], "units", 1.0, 0, -20, 100, 0 triggerCompCenterVolt = scalar, U08, 4036, "V", 0.02, 0, 0.0, 5.1, 2 triggerCompHystMin = scalar, U08, 4037, "V", 0.02, 0, 0.0, 5.1, 2 triggerCompHystMax = scalar, U08, 4038, "V", 0.02, 0, 0.0, 5.1, 2 @@ -1435,6 +1445,18 @@ page = 1 tpsAccelFractionPeriod = "A delay in cycles between fuel-enrich. portions" tpsAccelFractionDivisor = "A fraction divisor: 1 or less = entire portion at once, or split into diminishing fractions" stoichRatioPrimary = "Stoichiometric ratio for your primary fuel." + cylinderBankSelect1 = "Select which fuel correction bank this cylinder belongs to. Group cylinders that share the same O2 sensor" + cylinderBankSelect2 = "Select which fuel correction bank this cylinder belongs to. Group cylinders that share the same O2 sensor" + cylinderBankSelect3 = "Select which fuel correction bank this cylinder belongs to. Group cylinders that share the same O2 sensor" + cylinderBankSelect4 = "Select which fuel correction bank this cylinder belongs to. Group cylinders that share the same O2 sensor" + cylinderBankSelect5 = "Select which fuel correction bank this cylinder belongs to. Group cylinders that share the same O2 sensor" + cylinderBankSelect6 = "Select which fuel correction bank this cylinder belongs to. Group cylinders that share the same O2 sensor" + cylinderBankSelect7 = "Select which fuel correction bank this cylinder belongs to. Group cylinders that share the same O2 sensor" + cylinderBankSelect8 = "Select which fuel correction bank this cylinder belongs to. Group cylinders that share the same O2 sensor" + cylinderBankSelect9 = "Select which fuel correction bank this cylinder belongs to. Group cylinders that share the same O2 sensor" + cylinderBankSelect10 = "Select which fuel correction bank this cylinder belongs to. Group cylinders that share the same O2 sensor" + cylinderBankSelect11 = "Select which fuel correction bank this cylinder belongs to. Group cylinders that share the same O2 sensor" + cylinderBankSelect12 = "Select which fuel correction bank this cylinder belongs to. Group cylinders that share the same O2 sensor" triggerCompCenterVolt = "Trigger comparator center point voltage" triggerCompHystMin = "Trigger comparator hysteresis voltage (Min)" triggerCompHystMax = "Trigger comparator hysteresis voltage (Max)" @@ -2910,6 +2932,7 @@ menuDialog = main subMenu = multisparkSettings, "Multispark", 0, {isIgnitionEnabled == 1} subMenu = mc33Dialog, "GDI Dreams" subMenu = widebandConfig, "rusEFI Wideband Controller", 0, { canReadEnabled && canWriteEnabled } + subMenu = cylinderBankSelect, "Cylinder Bank Selection" subMenu = std_separator subMenu = std_separator @@ -3216,6 +3239,20 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" field = "" field = "injection Pin Mode", injectionPinMode, {isInjectionEnabled == 1} + dialog = cylinderBankSelect, "Cylinder Banks", yAxis + field = "Cylinder 1", cylinderBankSelect1, {isInjectionEnabled == 1} + field = "Cylinder 2", cylinderBankSelect2, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 1} + field = "Cylinder 3", cylinderBankSelect3, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 2} + field = "Cylinder 4", cylinderBankSelect4, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 3} + field = "Cylinder 5 ", cylinderBankSelect5, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 4} + field = "Cylinder 6 ", cylinderBankSelect6, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 5} + field = "Cylinder 7 ", cylinderBankSelect7, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 6} + field = "Cylinder 8 ", cylinderBankSelect8, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 7} + field = "Cylinder 9 ", cylinderBankSelect9, {isInjectionEnabled == 1 && cylindersCount > 8} + field = "Cylinder 10 ", cylinderBankSelect10, {isInjectionEnabled == 1 && cylindersCount > 9} + field = "Cylinder 11 ", cylinderBankSelect11, {isInjectionEnabled == 1 && cylindersCount > 10} + field = "Cylinder 12 ", cylinderBankSelect12, {isInjectionEnabled == 1 && cylindersCount > 11} + dialog = testFsio, "FSIO Test" commandButton = "FSIO#1", cmd_test_fsio1 commandButton = "FSIO#2", cmd_test_fsio2 diff --git a/firmware/tunerstudio/generated/rusefi_prometheus_469.ini b/firmware/tunerstudio/generated/rusefi_prometheus_469.ini index 2c7f19c131..838aead005 100644 --- a/firmware/tunerstudio/generated/rusefi_prometheus_469.ini +++ b/firmware/tunerstudio/generated/rusefi_prometheus_469.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2021.01.01.prometheus_469.3772508418" + signature = "rusEFI 2021.01.02.prometheus_469.1009969888" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.01.01.prometheus_469.3772508418" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.01.02.prometheus_469.1009969888" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -77,7 +77,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.sh integration/rusefi_config.txt Fri Jan 01 16:20:07 UTC 2021 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Jan 02 14:16:09 UTC 2021 pageSize = 20000 page = 1 @@ -1101,9 +1101,19 @@ page = 1 mc33972spiDevice = bits,U32, 4008, [0:2], "Off", "SPI1", "SPI2", "SPI3", "SPI4", "INVALID", "INVALID", "INVALID" unusedSpiPadding8 = array, U08, 4009, [3], "units", 1.0, 0, -20, 100, 0 etbIdleThrottleRange = scalar, F32, 4012, "%", 1.0, 0, 0, 15, 0 - unusedvref = array, U08, 4016, [4], "units", 1.0, 0, -20, 100, 0 - unusedsw = array, U08, 4020, [4], "units", 1.0, 0, -20, 100, 0 - unused_alFIn = array, S32, 4024, [3], "units", 1.0, 0, -20, 100, 0 + cylinderBankSelect1 = scalar, U08, 4016, "", 1.0, 1, 1, 2, 0 + cylinderBankSelect2 = scalar, U08, 4017, "", 1.0, 1, 1, 2, 0 + cylinderBankSelect3 = scalar, U08, 4018, "", 1.0, 1, 1, 2, 0 + cylinderBankSelect4 = scalar, U08, 4019, "", 1.0, 1, 1, 2, 0 + cylinderBankSelect5 = scalar, U08, 4020, "", 1.0, 1, 1, 2, 0 + cylinderBankSelect6 = scalar, U08, 4021, "", 1.0, 1, 1, 2, 0 + cylinderBankSelect7 = scalar, U08, 4022, "", 1.0, 1, 1, 2, 0 + cylinderBankSelect8 = scalar, U08, 4023, "", 1.0, 1, 1, 2, 0 + cylinderBankSelect9 = scalar, U08, 4024, "", 1.0, 1, 1, 2, 0 + cylinderBankSelect10 = scalar, U08, 4025, "", 1.0, 1, 1, 2, 0 + cylinderBankSelect11 = scalar, U08, 4026, "", 1.0, 1, 1, 2, 0 + cylinderBankSelect12 = scalar, U08, 4027, "", 1.0, 1, 1, 2, 0 + unused4028 = array, S32, 4028, [2], "units", 1.0, 0, -20, 100, 0 triggerCompCenterVolt = scalar, U08, 4036, "V", 0.02, 0, 0.0, 5.1, 2 triggerCompHystMin = scalar, U08, 4037, "V", 0.02, 0, 0.0, 5.1, 2 triggerCompHystMax = scalar, U08, 4038, "V", 0.02, 0, 0.0, 5.1, 2 @@ -1435,6 +1445,18 @@ page = 1 tpsAccelFractionPeriod = "A delay in cycles between fuel-enrich. portions" tpsAccelFractionDivisor = "A fraction divisor: 1 or less = entire portion at once, or split into diminishing fractions" stoichRatioPrimary = "Stoichiometric ratio for your primary fuel." + cylinderBankSelect1 = "Select which fuel correction bank this cylinder belongs to. Group cylinders that share the same O2 sensor" + cylinderBankSelect2 = "Select which fuel correction bank this cylinder belongs to. Group cylinders that share the same O2 sensor" + cylinderBankSelect3 = "Select which fuel correction bank this cylinder belongs to. Group cylinders that share the same O2 sensor" + cylinderBankSelect4 = "Select which fuel correction bank this cylinder belongs to. Group cylinders that share the same O2 sensor" + cylinderBankSelect5 = "Select which fuel correction bank this cylinder belongs to. Group cylinders that share the same O2 sensor" + cylinderBankSelect6 = "Select which fuel correction bank this cylinder belongs to. Group cylinders that share the same O2 sensor" + cylinderBankSelect7 = "Select which fuel correction bank this cylinder belongs to. Group cylinders that share the same O2 sensor" + cylinderBankSelect8 = "Select which fuel correction bank this cylinder belongs to. Group cylinders that share the same O2 sensor" + cylinderBankSelect9 = "Select which fuel correction bank this cylinder belongs to. Group cylinders that share the same O2 sensor" + cylinderBankSelect10 = "Select which fuel correction bank this cylinder belongs to. Group cylinders that share the same O2 sensor" + cylinderBankSelect11 = "Select which fuel correction bank this cylinder belongs to. Group cylinders that share the same O2 sensor" + cylinderBankSelect12 = "Select which fuel correction bank this cylinder belongs to. Group cylinders that share the same O2 sensor" triggerCompCenterVolt = "Trigger comparator center point voltage" triggerCompHystMin = "Trigger comparator hysteresis voltage (Min)" triggerCompHystMax = "Trigger comparator hysteresis voltage (Max)" @@ -2910,6 +2932,7 @@ menuDialog = main subMenu = multisparkSettings, "Multispark", 0, {isIgnitionEnabled == 1} subMenu = mc33Dialog, "GDI Dreams" subMenu = widebandConfig, "rusEFI Wideband Controller", 0, { canReadEnabled && canWriteEnabled } + subMenu = cylinderBankSelect, "Cylinder Bank Selection" subMenu = std_separator subMenu = std_separator @@ -3216,6 +3239,20 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" field = "" field = "injection Pin Mode", injectionPinMode, {isInjectionEnabled == 1} + dialog = cylinderBankSelect, "Cylinder Banks", yAxis + field = "Cylinder 1", cylinderBankSelect1, {isInjectionEnabled == 1} + field = "Cylinder 2", cylinderBankSelect2, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 1} + field = "Cylinder 3", cylinderBankSelect3, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 2} + field = "Cylinder 4", cylinderBankSelect4, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 3} + field = "Cylinder 5 ", cylinderBankSelect5, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 4} + field = "Cylinder 6 ", cylinderBankSelect6, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 5} + field = "Cylinder 7 ", cylinderBankSelect7, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 6} + field = "Cylinder 8 ", cylinderBankSelect8, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 7} + field = "Cylinder 9 ", cylinderBankSelect9, {isInjectionEnabled == 1 && cylindersCount > 8} + field = "Cylinder 10 ", cylinderBankSelect10, {isInjectionEnabled == 1 && cylindersCount > 9} + field = "Cylinder 11 ", cylinderBankSelect11, {isInjectionEnabled == 1 && cylindersCount > 10} + field = "Cylinder 12 ", cylinderBankSelect12, {isInjectionEnabled == 1 && cylindersCount > 11} + dialog = testFsio, "FSIO Test" commandButton = "FSIO#1", cmd_test_fsio1 commandButton = "FSIO#2", cmd_test_fsio2 diff --git a/firmware/tunerstudio/generated/rusefi_proteus_f4.ini b/firmware/tunerstudio/generated/rusefi_proteus_f4.ini index f9a29bcd71..4fa0290204 100644 --- a/firmware/tunerstudio/generated/rusefi_proteus_f4.ini +++ b/firmware/tunerstudio/generated/rusefi_proteus_f4.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2021.01.01.proteus_f4.1806280077" + signature = "rusEFI 2021.01.02.proteus_f4.3074467439" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.01.01.proteus_f4.1806280077" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.01.02.proteus_f4.3074467439" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -77,7 +77,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.sh integration/rusefi_config.txt Fri Jan 01 16:20:12 UTC 2021 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Jan 02 14:16:16 UTC 2021 pageSize = 20000 page = 1 @@ -1101,9 +1101,19 @@ page = 1 mc33972spiDevice = bits,U32, 4008, [0:2], "Off", "SPI1", "SPI2", "SPI3", "SPI4", "INVALID", "INVALID", "INVALID" unusedSpiPadding8 = array, U08, 4009, [3], "units", 1.0, 0, -20, 100, 0 etbIdleThrottleRange = scalar, F32, 4012, "%", 1.0, 0, 0, 15, 0 - unusedvref = array, U08, 4016, [4], "units", 1.0, 0, -20, 100, 0 - unusedsw = array, U08, 4020, [4], "units", 1.0, 0, -20, 100, 0 - unused_alFIn = array, S32, 4024, [3], "units", 1.0, 0, -20, 100, 0 + cylinderBankSelect1 = scalar, U08, 4016, "", 1.0, 1, 1, 2, 0 + cylinderBankSelect2 = scalar, U08, 4017, "", 1.0, 1, 1, 2, 0 + cylinderBankSelect3 = scalar, U08, 4018, "", 1.0, 1, 1, 2, 0 + cylinderBankSelect4 = scalar, U08, 4019, "", 1.0, 1, 1, 2, 0 + cylinderBankSelect5 = scalar, U08, 4020, "", 1.0, 1, 1, 2, 0 + cylinderBankSelect6 = scalar, U08, 4021, "", 1.0, 1, 1, 2, 0 + cylinderBankSelect7 = scalar, U08, 4022, "", 1.0, 1, 1, 2, 0 + cylinderBankSelect8 = scalar, U08, 4023, "", 1.0, 1, 1, 2, 0 + cylinderBankSelect9 = scalar, U08, 4024, "", 1.0, 1, 1, 2, 0 + cylinderBankSelect10 = scalar, U08, 4025, "", 1.0, 1, 1, 2, 0 + cylinderBankSelect11 = scalar, U08, 4026, "", 1.0, 1, 1, 2, 0 + cylinderBankSelect12 = scalar, U08, 4027, "", 1.0, 1, 1, 2, 0 + unused4028 = array, S32, 4028, [2], "units", 1.0, 0, -20, 100, 0 triggerCompCenterVolt = scalar, U08, 4036, "V", 0.02, 0, 0.0, 5.1, 2 triggerCompHystMin = scalar, U08, 4037, "V", 0.02, 0, 0.0, 5.1, 2 triggerCompHystMax = scalar, U08, 4038, "V", 0.02, 0, 0.0, 5.1, 2 @@ -1435,6 +1445,18 @@ page = 1 tpsAccelFractionPeriod = "A delay in cycles between fuel-enrich. portions" tpsAccelFractionDivisor = "A fraction divisor: 1 or less = entire portion at once, or split into diminishing fractions" stoichRatioPrimary = "Stoichiometric ratio for your primary fuel." + cylinderBankSelect1 = "Select which fuel correction bank this cylinder belongs to. Group cylinders that share the same O2 sensor" + cylinderBankSelect2 = "Select which fuel correction bank this cylinder belongs to. Group cylinders that share the same O2 sensor" + cylinderBankSelect3 = "Select which fuel correction bank this cylinder belongs to. Group cylinders that share the same O2 sensor" + cylinderBankSelect4 = "Select which fuel correction bank this cylinder belongs to. Group cylinders that share the same O2 sensor" + cylinderBankSelect5 = "Select which fuel correction bank this cylinder belongs to. Group cylinders that share the same O2 sensor" + cylinderBankSelect6 = "Select which fuel correction bank this cylinder belongs to. Group cylinders that share the same O2 sensor" + cylinderBankSelect7 = "Select which fuel correction bank this cylinder belongs to. Group cylinders that share the same O2 sensor" + cylinderBankSelect8 = "Select which fuel correction bank this cylinder belongs to. Group cylinders that share the same O2 sensor" + cylinderBankSelect9 = "Select which fuel correction bank this cylinder belongs to. Group cylinders that share the same O2 sensor" + cylinderBankSelect10 = "Select which fuel correction bank this cylinder belongs to. Group cylinders that share the same O2 sensor" + cylinderBankSelect11 = "Select which fuel correction bank this cylinder belongs to. Group cylinders that share the same O2 sensor" + cylinderBankSelect12 = "Select which fuel correction bank this cylinder belongs to. Group cylinders that share the same O2 sensor" triggerCompCenterVolt = "Trigger comparator center point voltage" triggerCompHystMin = "Trigger comparator hysteresis voltage (Min)" triggerCompHystMax = "Trigger comparator hysteresis voltage (Max)" @@ -2902,6 +2924,7 @@ menuDialog = main subMenu = multisparkSettings, "Multispark", 0, {isIgnitionEnabled == 1} subMenu = mc33Dialog, "GDI Dreams" subMenu = widebandConfig, "rusEFI Wideband Controller", 0, { canReadEnabled && canWriteEnabled } + subMenu = cylinderBankSelect, "Cylinder Bank Selection" subMenu = std_separator subMenu = softwareKnock, "Software Knock" @@ -3212,6 +3235,20 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" field = "" field = "injection Pin Mode", injectionPinMode, {isInjectionEnabled == 1} + dialog = cylinderBankSelect, "Cylinder Banks", yAxis + field = "Cylinder 1", cylinderBankSelect1, {isInjectionEnabled == 1} + field = "Cylinder 2", cylinderBankSelect2, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 1} + field = "Cylinder 3", cylinderBankSelect3, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 2} + field = "Cylinder 4", cylinderBankSelect4, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 3} + field = "Cylinder 5 ", cylinderBankSelect5, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 4} + field = "Cylinder 6 ", cylinderBankSelect6, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 5} + field = "Cylinder 7 ", cylinderBankSelect7, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 6} + field = "Cylinder 8 ", cylinderBankSelect8, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 7} + field = "Cylinder 9 ", cylinderBankSelect9, {isInjectionEnabled == 1 && cylindersCount > 8} + field = "Cylinder 10 ", cylinderBankSelect10, {isInjectionEnabled == 1 && cylindersCount > 9} + field = "Cylinder 11 ", cylinderBankSelect11, {isInjectionEnabled == 1 && cylindersCount > 10} + field = "Cylinder 12 ", cylinderBankSelect12, {isInjectionEnabled == 1 && cylindersCount > 11} + dialog = testFsio, "FSIO Test" commandButton = "FSIO#1", cmd_test_fsio1 commandButton = "FSIO#2", cmd_test_fsio2 diff --git a/firmware/tunerstudio/generated/rusefi_proteus_f7.ini b/firmware/tunerstudio/generated/rusefi_proteus_f7.ini index 7c4789bef0..49e8a14eea 100644 --- a/firmware/tunerstudio/generated/rusefi_proteus_f7.ini +++ b/firmware/tunerstudio/generated/rusefi_proteus_f7.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2021.01.01.proteus_f7.1806280077" + signature = "rusEFI 2021.01.02.proteus_f7.3074467439" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.01.01.proteus_f7.1806280077" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.01.02.proteus_f7.3074467439" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -77,7 +77,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.sh integration/rusefi_config.txt Fri Jan 01 16:20:10 UTC 2021 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Jan 02 14:16:14 UTC 2021 pageSize = 20000 page = 1 @@ -1101,9 +1101,19 @@ page = 1 mc33972spiDevice = bits,U32, 4008, [0:2], "Off", "SPI1", "SPI2", "SPI3", "SPI4", "INVALID", "INVALID", "INVALID" unusedSpiPadding8 = array, U08, 4009, [3], "units", 1.0, 0, -20, 100, 0 etbIdleThrottleRange = scalar, F32, 4012, "%", 1.0, 0, 0, 15, 0 - unusedvref = array, U08, 4016, [4], "units", 1.0, 0, -20, 100, 0 - unusedsw = array, U08, 4020, [4], "units", 1.0, 0, -20, 100, 0 - unused_alFIn = array, S32, 4024, [3], "units", 1.0, 0, -20, 100, 0 + cylinderBankSelect1 = scalar, U08, 4016, "", 1.0, 1, 1, 2, 0 + cylinderBankSelect2 = scalar, U08, 4017, "", 1.0, 1, 1, 2, 0 + cylinderBankSelect3 = scalar, U08, 4018, "", 1.0, 1, 1, 2, 0 + cylinderBankSelect4 = scalar, U08, 4019, "", 1.0, 1, 1, 2, 0 + cylinderBankSelect5 = scalar, U08, 4020, "", 1.0, 1, 1, 2, 0 + cylinderBankSelect6 = scalar, U08, 4021, "", 1.0, 1, 1, 2, 0 + cylinderBankSelect7 = scalar, U08, 4022, "", 1.0, 1, 1, 2, 0 + cylinderBankSelect8 = scalar, U08, 4023, "", 1.0, 1, 1, 2, 0 + cylinderBankSelect9 = scalar, U08, 4024, "", 1.0, 1, 1, 2, 0 + cylinderBankSelect10 = scalar, U08, 4025, "", 1.0, 1, 1, 2, 0 + cylinderBankSelect11 = scalar, U08, 4026, "", 1.0, 1, 1, 2, 0 + cylinderBankSelect12 = scalar, U08, 4027, "", 1.0, 1, 1, 2, 0 + unused4028 = array, S32, 4028, [2], "units", 1.0, 0, -20, 100, 0 triggerCompCenterVolt = scalar, U08, 4036, "V", 0.02, 0, 0.0, 5.1, 2 triggerCompHystMin = scalar, U08, 4037, "V", 0.02, 0, 0.0, 5.1, 2 triggerCompHystMax = scalar, U08, 4038, "V", 0.02, 0, 0.0, 5.1, 2 @@ -1435,6 +1445,18 @@ page = 1 tpsAccelFractionPeriod = "A delay in cycles between fuel-enrich. portions" tpsAccelFractionDivisor = "A fraction divisor: 1 or less = entire portion at once, or split into diminishing fractions" stoichRatioPrimary = "Stoichiometric ratio for your primary fuel." + cylinderBankSelect1 = "Select which fuel correction bank this cylinder belongs to. Group cylinders that share the same O2 sensor" + cylinderBankSelect2 = "Select which fuel correction bank this cylinder belongs to. Group cylinders that share the same O2 sensor" + cylinderBankSelect3 = "Select which fuel correction bank this cylinder belongs to. Group cylinders that share the same O2 sensor" + cylinderBankSelect4 = "Select which fuel correction bank this cylinder belongs to. Group cylinders that share the same O2 sensor" + cylinderBankSelect5 = "Select which fuel correction bank this cylinder belongs to. Group cylinders that share the same O2 sensor" + cylinderBankSelect6 = "Select which fuel correction bank this cylinder belongs to. Group cylinders that share the same O2 sensor" + cylinderBankSelect7 = "Select which fuel correction bank this cylinder belongs to. Group cylinders that share the same O2 sensor" + cylinderBankSelect8 = "Select which fuel correction bank this cylinder belongs to. Group cylinders that share the same O2 sensor" + cylinderBankSelect9 = "Select which fuel correction bank this cylinder belongs to. Group cylinders that share the same O2 sensor" + cylinderBankSelect10 = "Select which fuel correction bank this cylinder belongs to. Group cylinders that share the same O2 sensor" + cylinderBankSelect11 = "Select which fuel correction bank this cylinder belongs to. Group cylinders that share the same O2 sensor" + cylinderBankSelect12 = "Select which fuel correction bank this cylinder belongs to. Group cylinders that share the same O2 sensor" triggerCompCenterVolt = "Trigger comparator center point voltage" triggerCompHystMin = "Trigger comparator hysteresis voltage (Min)" triggerCompHystMax = "Trigger comparator hysteresis voltage (Max)" @@ -2902,6 +2924,7 @@ menuDialog = main subMenu = multisparkSettings, "Multispark", 0, {isIgnitionEnabled == 1} subMenu = mc33Dialog, "GDI Dreams" subMenu = widebandConfig, "rusEFI Wideband Controller", 0, { canReadEnabled && canWriteEnabled } + subMenu = cylinderBankSelect, "Cylinder Bank Selection" subMenu = std_separator subMenu = softwareKnock, "Software Knock" @@ -3212,6 +3235,20 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" field = "" field = "injection Pin Mode", injectionPinMode, {isInjectionEnabled == 1} + dialog = cylinderBankSelect, "Cylinder Banks", yAxis + field = "Cylinder 1", cylinderBankSelect1, {isInjectionEnabled == 1} + field = "Cylinder 2", cylinderBankSelect2, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 1} + field = "Cylinder 3", cylinderBankSelect3, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 2} + field = "Cylinder 4", cylinderBankSelect4, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 3} + field = "Cylinder 5 ", cylinderBankSelect5, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 4} + field = "Cylinder 6 ", cylinderBankSelect6, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 5} + field = "Cylinder 7 ", cylinderBankSelect7, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 6} + field = "Cylinder 8 ", cylinderBankSelect8, {isInjectionEnabled == 1 && injectionMode != 3 && cylindersCount > 7} + field = "Cylinder 9 ", cylinderBankSelect9, {isInjectionEnabled == 1 && cylindersCount > 8} + field = "Cylinder 10 ", cylinderBankSelect10, {isInjectionEnabled == 1 && cylindersCount > 9} + field = "Cylinder 11 ", cylinderBankSelect11, {isInjectionEnabled == 1 && cylindersCount > 10} + field = "Cylinder 12 ", cylinderBankSelect12, {isInjectionEnabled == 1 && cylindersCount > 11} + dialog = testFsio, "FSIO Test" commandButton = "FSIO#1", cmd_test_fsio1 commandButton = "FSIO#2", cmd_test_fsio2 diff --git a/java_console/models/src/main/java/com/rusefi/config/generated/Fields.java b/java_console/models/src/main/java/com/rusefi/config/generated/Fields.java index f19f8b96e4..9ee3b897a6 100644 --- a/java_console/models/src/main/java/com/rusefi/config/generated/Fields.java +++ b/java_console/models/src/main/java/com/rusefi/config/generated/Fields.java @@ -1,6 +1,6 @@ package com.rusefi.config.generated; -// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Fri Jan 01 16:20:01 UTC 2021 +// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sat Jan 02 14:16:01 UTC 2021 // by class com.rusefi.output.FileJavaFieldsConsumer import com.rusefi.config.*; @@ -320,6 +320,18 @@ public class Fields { public static final String CRITICAL_PREFIX = "CRITICAL"; public static final int cutFuelOnHardLimit_offset = 1464; public static final int cutSparkOnHardLimit_offset = 1464; + public static final int cylinderBankSelect10_offset = 4025; + public static final int cylinderBankSelect11_offset = 4026; + public static final int cylinderBankSelect12_offset = 4027; + public static final int cylinderBankSelect1_offset = 4016; + public static final int cylinderBankSelect2_offset = 4017; + public static final int cylinderBankSelect3_offset = 4018; + public static final int cylinderBankSelect4_offset = 4019; + public static final int cylinderBankSelect5_offset = 4020; + public static final int cylinderBankSelect6_offset = 4021; + public static final int cylinderBankSelect7_offset = 4022; + public static final int cylinderBankSelect8_offset = 4023; + public static final int cylinderBankSelect9_offset = 4024; public static final int cylinderBore_offset = 408; public static final int cylindersCount_offset = 400; public static final int DBG_DBG_LOGIC_ANALYZER = 45; @@ -1182,6 +1194,7 @@ public class Fields { public static final int servoOutputPins8_offset = 3147; public static final int showHumanReadableWarning_offset = 976; public static final int showSdCardWarning_offset = 76; + public static final int SIGNATURE_HASH = 2129325233; public static final int silentTriggerError_offset = 1464; public static final int slowAdcAlpha_offset = 2088; public static final int sparkDwellRpmBins_offset = 332; @@ -1462,7 +1475,7 @@ public class Fields { public static final char TS_SD_R_COMMAND = 'r'; public static final char TS_SD_W_COMMAND = 'w'; public static final char TS_SET_LOGGER_SWITCH = 'l'; - public static final String TS_SIGNATURE = "rusEFI 2021.01.01.all.2718166867"; + public static final String TS_SIGNATURE = "rusEFI 2021.01.02.all.2129325233"; public static final char TS_SINGLE_WRITE_COMMAND = 'W'; public static final int TT_TT_1_16 = 50; public static final int TT_TT_2JZ_1_12 = 29; @@ -1526,6 +1539,7 @@ public class Fields { public static final int unused2508_offset = 2508; public static final int unused2536_offset = 2536; public static final int unused3328_offset = 3328; + public static final int unused4028_offset = 4028; public static final int unused541_offset = 541; public static final int unused542_offset = 542; public static final int unused6312_offset = 6312; @@ -1540,7 +1554,6 @@ public class Fields { public static final int unused_1484_bit_29_offset = 1476; public static final int unused_1484_bit_30_offset = 1476; public static final int unused_1484_bit_31_offset = 1476; - public static final int unused_alFIn_offset = 4024; public static final int unusedAtOldBoardConfigurationEnd_offset = 1204; public static final int unusedAuxVoltage1_TODO_332_offset = 2713; public static final int unusedAuxVoltage2_TODO_332_offset = 2714; @@ -1580,8 +1593,6 @@ public class Fields { public static final int unusedSpiPadding4_offset = 2593; public static final int unusedSpiPadding5_offset = 2715; public static final int unusedSpiPadding8_offset = 4009; - public static final int unusedsw_offset = 4020; - public static final int unusedvref_offset = 4016; public static final int useAdvanceCorrectionsForCranking_offset = 1476; public static final int useCicPidForIdle_offset = 76; public static final int useConstantDwellDuringCranking_offset = 1464; @@ -2634,6 +2645,18 @@ public class Fields { public static final Field IDLERPMPID_ITERMMAX = Field.create("IDLERPMPID_ITERMMAX", 4006, FieldType.INT16); public static final Field MC33972SPIDEVICE = Field.create("MC33972SPIDEVICE", 4008, FieldType.INT8); public static final Field ETBIDLETHROTTLERANGE = Field.create("ETBIDLETHROTTLERANGE", 4012, FieldType.FLOAT); + public static final Field CYLINDERBANKSELECT1 = Field.create("CYLINDERBANKSELECT1", 4016, FieldType.INT8); + public static final Field CYLINDERBANKSELECT2 = Field.create("CYLINDERBANKSELECT2", 4017, FieldType.INT8); + public static final Field CYLINDERBANKSELECT3 = Field.create("CYLINDERBANKSELECT3", 4018, FieldType.INT8); + public static final Field CYLINDERBANKSELECT4 = Field.create("CYLINDERBANKSELECT4", 4019, FieldType.INT8); + public static final Field CYLINDERBANKSELECT5 = Field.create("CYLINDERBANKSELECT5", 4020, FieldType.INT8); + public static final Field CYLINDERBANKSELECT6 = Field.create("CYLINDERBANKSELECT6", 4021, FieldType.INT8); + public static final Field CYLINDERBANKSELECT7 = Field.create("CYLINDERBANKSELECT7", 4022, FieldType.INT8); + public static final Field CYLINDERBANKSELECT8 = Field.create("CYLINDERBANKSELECT8", 4023, FieldType.INT8); + public static final Field CYLINDERBANKSELECT9 = Field.create("CYLINDERBANKSELECT9", 4024, FieldType.INT8); + public static final Field CYLINDERBANKSELECT10 = Field.create("CYLINDERBANKSELECT10", 4025, FieldType.INT8); + public static final Field CYLINDERBANKSELECT11 = Field.create("CYLINDERBANKSELECT11", 4026, FieldType.INT8); + public static final Field CYLINDERBANKSELECT12 = Field.create("CYLINDERBANKSELECT12", 4027, FieldType.INT8); public static final Field TRIGGERCOMPCENTERVOLT = Field.create("TRIGGERCOMPCENTERVOLT", 4036, FieldType.INT8); public static final Field TRIGGERCOMPHYSTMIN = Field.create("TRIGGERCOMPHYSTMIN", 4037, FieldType.INT8); public static final Field TRIGGERCOMPHYSTMAX = Field.create("TRIGGERCOMPHYSTMAX", 4038, FieldType.INT8); @@ -3698,6 +3721,18 @@ public class Fields { IDLERPMPID_ITERMMAX, MC33972SPIDEVICE, ETBIDLETHROTTLERANGE, + CYLINDERBANKSELECT1, + CYLINDERBANKSELECT2, + CYLINDERBANKSELECT3, + CYLINDERBANKSELECT4, + CYLINDERBANKSELECT5, + CYLINDERBANKSELECT6, + CYLINDERBANKSELECT7, + CYLINDERBANKSELECT8, + CYLINDERBANKSELECT9, + CYLINDERBANKSELECT10, + CYLINDERBANKSELECT11, + CYLINDERBANKSELECT12, TRIGGERCOMPCENTERVOLT, TRIGGERCOMPHYSTMIN, TRIGGERCOMPHYSTMAX, diff --git a/java_console/rusefi.xml b/java_console/rusefi.xml index 523a6222b5..a6acc19644 100644 --- a/java_console/rusefi.xml +++ b/java_console/rusefi.xml @@ -1,6 +1,6 @@ - +