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 d0ece06ade..4faaf8d7cc 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 Sun Oct 11 23:07:20 UTC 2020 +// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on hellen_cypress_gen_config.bat integration/rusefi_config.txt Mon Oct 19 12:05:57 UTC 2020 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -2960,7 +2960,11 @@ struct engine_configuration_s { /** * offset 2516 */ - uint8_t unused2516[24]; + pid_s etbWastegatePid; + /** + * offset 2536 + */ + uint8_t unused2536[4]; /** * per-cylinder timing correction * offset 2540 @@ -3737,4 +3741,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 Sun Oct 11 23:07:20 UTC 2020 +// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on hellen_cypress_gen_config.bat integration/rusefi_config.txt Mon Oct 19 12:05:57 UTC 2020 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 853855d200..b94ed5bad5 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 @@ -449,6 +449,14 @@ #define etbIo2_disablePin_offset 987 #define etbIo2_offset 984 #define etbNeutralPosition_offset 1471 +#define etbWastegatePid_dFactor_offset 2524 +#define etbWastegatePid_iFactor_offset 2520 +#define etbWastegatePid_maxValue_offset 2534 +#define etbWastegatePid_minValue_offset 2532 +#define etbWastegatePid_offset 2516 +#define etbWastegatePid_offset_offset 2528 +#define etbWastegatePid_periodMs_offset 2530 +#define etbWastegatePid_pFactor_offset 2516 #define externalKnockSenseAdc_offset 3103 #define extraInjectionOffset_offset 432 #define fanOffTemperature_offset 472 @@ -1172,8 +1180,8 @@ #define showHumanReadableWarning_offset 976 #define showSdCardWarning_offset 76 #define SIGNATURE_BOARD hellen_cypress -#define SIGNATURE_DATE 2020.10.11 -#define SIGNATURE_HASH 968846833 +#define SIGNATURE_DATE 2020.10.19 +#define SIGNATURE_HASH 1235335563 #define silentTriggerError_offset 1464 #define slowAdcAlpha_offset 2088 #define sparkDwellRpmBins_offset 332 @@ -1492,7 +1500,7 @@ #define ts_show_spi true #define ts_show_trigger_comparator false #define ts_show_tunerstudio_port true -#define TS_SIGNATURE "rusEFI 2020.10.11.hellen_cypress.968846833" +#define TS_SIGNATURE "rusEFI 2020.10.19.hellen_cypress.1235335563" #define TS_SINGLE_WRITE_COMMAND 'W' #define TS_SINGLE_WRITE_COMMAND_char W #define TS_TEST_COMMAND 't' // 0x74 @@ -1524,7 +1532,7 @@ #define unused244_2_offset 2424 #define unused244_3_offset 2428 #define unused2508_offset 2508 -#define unused2516_offset 2516 +#define unused2536_offset 2536 #define unused3288_offset 3288 #define unused6312_offset 6312 #define unused744b25_offset 744 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 056ec13d50..28d7659107 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 Sun Oct 11 23:07:18 UTC 2020 +// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Mon Oct 19 12:05:56 UTC 2020 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -2960,7 +2960,11 @@ struct engine_configuration_s { /** * offset 2516 */ - uint8_t unused2516[24]; + pid_s etbWastegatePid; + /** + * offset 2536 + */ + uint8_t unused2536[4]; /** * per-cylinder timing correction * offset 2540 @@ -3737,4 +3741,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 Sun Oct 11 23:07:18 UTC 2020 +// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Mon Oct 19 12:05:56 UTC 2020 diff --git a/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h b/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h index 997dd814a2..c1a12d8790 100644 --- a/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h +++ b/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h @@ -449,6 +449,14 @@ #define etbIo2_disablePin_offset 987 #define etbIo2_offset 984 #define etbNeutralPosition_offset 1471 +#define etbWastegatePid_dFactor_offset 2524 +#define etbWastegatePid_iFactor_offset 2520 +#define etbWastegatePid_maxValue_offset 2534 +#define etbWastegatePid_minValue_offset 2532 +#define etbWastegatePid_offset 2516 +#define etbWastegatePid_offset_offset 2528 +#define etbWastegatePid_periodMs_offset 2530 +#define etbWastegatePid_pFactor_offset 2516 #define externalKnockSenseAdc_offset 3103 #define extraInjectionOffset_offset 432 #define fanOffTemperature_offset 472 @@ -1172,8 +1180,8 @@ #define showHumanReadableWarning_offset 976 #define showSdCardWarning_offset 76 #define SIGNATURE_BOARD kin -#define SIGNATURE_DATE 2020.10.11 -#define SIGNATURE_HASH 1755535115 +#define SIGNATURE_DATE 2020.10.19 +#define SIGNATURE_HASH 415073137 #define silentTriggerError_offset 1464 #define slowAdcAlpha_offset 2088 #define sparkDwellRpmBins_offset 332 @@ -1492,7 +1500,7 @@ #define ts_show_spi true #define ts_show_trigger_comparator true #define ts_show_tunerstudio_port true -#define TS_SIGNATURE "rusEFI 2020.10.11.kin.1755535115" +#define TS_SIGNATURE "rusEFI 2020.10.19.kin.415073137" #define TS_SINGLE_WRITE_COMMAND 'W' #define TS_SINGLE_WRITE_COMMAND_char W #define TS_TEST_COMMAND 't' // 0x74 @@ -1524,7 +1532,7 @@ #define unused244_2_offset 2424 #define unused244_3_offset 2428 #define unused2508_offset 2508 -#define unused2516_offset 2516 +#define unused2536_offset 2536 #define unused3288_offset 3288 #define unused6312_offset 6312 #define unused744b25_offset 744 diff --git a/firmware/controllers/generated/engine_configuration_generated_structures.h b/firmware/controllers/generated/engine_configuration_generated_structures.h index 98fcd7ec63..b7952f8598 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 Sun Oct 11 23:07:00 UTC 2020 +// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Oct 19 12:05:36 UTC 2020 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -2960,7 +2960,11 @@ struct engine_configuration_s { /** * offset 2516 */ - uint8_t unused2516[24]; + pid_s etbWastegatePid; + /** + * offset 2536 + */ + uint8_t unused2536[4]; /** * per-cylinder timing correction * offset 2540 @@ -3737,4 +3741,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 Sun Oct 11 23:07:00 UTC 2020 +// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Oct 19 12:05:36 UTC 2020 diff --git a/firmware/controllers/generated/fsio_enums_generated.def b/firmware/controllers/generated/fsio_enums_generated.def index c679c21a5d..00c40af552 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 Sun Oct 11 23:07:00 UTC 2020 +// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Oct 19 12:05:36 UTC 2020 // by class com.rusefi.output.FileFsioSettingsConsumer FSIO_SETTING_FANONTEMPERATURE = 1000, @@ -14,15 +14,17 @@ FSIO_SETTING_IDLERPMPID_OFFSET = 1010, FSIO_SETTING_IDLERPMPID_MINVALUE = 1011, FSIO_SETTING_STARTUPFUELPUMPDURATION = 1012, - FSIO_SETTING_AUXPID1_OFFSET = 1013, - FSIO_SETTING_AUXPID1_MINVALUE = 1014, - FSIO_SETTING_AUXPID2_OFFSET = 1015, - FSIO_SETTING_AUXPID2_MINVALUE = 1016, - FSIO_SETTING_AUXPID3_OFFSET = 1017, - FSIO_SETTING_AUXPID3_MINVALUE = 1018, - FSIO_SETTING_AUXPID4_OFFSET = 1019, - FSIO_SETTING_AUXPID4_MINVALUE = 1020, - FSIO_SETTING_IDLETIMINGPID_OFFSET = 1021, - FSIO_SETTING_IDLETIMINGPID_MINVALUE = 1022, - FSIO_SETTING_IDLERPMPID2_OFFSET = 1023, - FSIO_SETTING_IDLERPMPID2_MINVALUE = 1024, + FSIO_SETTING_ETBWASTEGATEPID_OFFSET = 1013, + FSIO_SETTING_ETBWASTEGATEPID_MINVALUE = 1014, + FSIO_SETTING_AUXPID1_OFFSET = 1015, + FSIO_SETTING_AUXPID1_MINVALUE = 1016, + FSIO_SETTING_AUXPID2_OFFSET = 1017, + FSIO_SETTING_AUXPID2_MINVALUE = 1018, + FSIO_SETTING_AUXPID3_OFFSET = 1019, + FSIO_SETTING_AUXPID3_MINVALUE = 1020, + FSIO_SETTING_AUXPID4_OFFSET = 1021, + FSIO_SETTING_AUXPID4_MINVALUE = 1022, + FSIO_SETTING_IDLETIMINGPID_OFFSET = 1023, + FSIO_SETTING_IDLETIMINGPID_MINVALUE = 1024, + FSIO_SETTING_IDLERPMPID2_OFFSET = 1025, + FSIO_SETTING_IDLERPMPID2_MINVALUE = 1026, diff --git a/firmware/controllers/generated/fsio_getters.def b/firmware/controllers/generated/fsio_getters.def index 97430ffd1f..d642140166 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 Sun Oct 11 23:07:00 UTC 2020 +// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Oct 19 12:05:36 UTC 2020 // by class com.rusefi.output.FileFsioSettingsConsumer case FSIO_SETTING_FANONTEMPERATURE: @@ -27,6 +27,10 @@ return engineConfiguration->idleRpmPid.minValue; case FSIO_SETTING_STARTUPFUELPUMPDURATION: return engineConfiguration->startUpFuelPumpDuration; + case FSIO_SETTING_ETBWASTEGATEPID_OFFSET: + return engineConfiguration->etbWastegatePid.offset; + case FSIO_SETTING_ETBWASTEGATEPID_MINVALUE: + return engineConfiguration->etbWastegatePid.minValue; case FSIO_SETTING_AUXPID1_OFFSET: return engineConfiguration->auxPid[0].offset; case FSIO_SETTING_AUXPID1_MINVALUE: diff --git a/firmware/controllers/generated/fsio_names.def b/firmware/controllers/generated/fsio_names.def index c36266e517..76a0301574 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 Sun Oct 11 23:07:00 UTC 2020 +// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Oct 19 12:05:36 UTC 2020 // by class com.rusefi.output.FileFsioSettingsConsumer static LENameOrdinalPair lefanOnTemperature(FSIO_SETTING_FANONTEMPERATURE, "cfg_fanOnTemperature"); @@ -14,6 +14,8 @@ static LENameOrdinalPair leetb_minValue(FSIO_SETTING_ETB_MINVALUE, "cfg_etb_minV static LENameOrdinalPair leidleRpmPid_offset(FSIO_SETTING_IDLERPMPID_OFFSET, "cfg_idleRpmPid_offset"); static LENameOrdinalPair leidleRpmPid_minValue(FSIO_SETTING_IDLERPMPID_MINVALUE, "cfg_idleRpmPid_minValue"); static LENameOrdinalPair lestartUpFuelPumpDuration(FSIO_SETTING_STARTUPFUELPUMPDURATION, "cfg_startUpFuelPumpDuration"); +static LENameOrdinalPair leetbWastegatePid_offset(FSIO_SETTING_ETBWASTEGATEPID_OFFSET, "cfg_etbWastegatePid_offset"); +static LENameOrdinalPair leetbWastegatePid_minValue(FSIO_SETTING_ETBWASTEGATEPID_MINVALUE, "cfg_etbWastegatePid_minValue"); static LENameOrdinalPair leauxPid1_offset(FSIO_SETTING_AUXPID1_OFFSET, "cfg_auxPid1_offset"); static LENameOrdinalPair leauxPid1_minValue(FSIO_SETTING_AUXPID1_MINVALUE, "cfg_auxPid1_minValue"); static LENameOrdinalPair leauxPid2_offset(FSIO_SETTING_AUXPID2_OFFSET, "cfg_auxPid2_offset"); diff --git a/firmware/controllers/generated/fsio_strings.def b/firmware/controllers/generated/fsio_strings.def index 96086944f1..1cf34c9781 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 Sun Oct 11 23:07:00 UTC 2020 +// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Oct 19 12:05:36 UTC 2020 // by class com.rusefi.output.FileFsioSettingsConsumer case FSIO_SETTING_FANONTEMPERATURE: @@ -27,6 +27,10 @@ return "cfg_idleRpmPid_minValue"; case FSIO_SETTING_STARTUPFUELPUMPDURATION: return "cfg_startUpFuelPumpDuration"; + case FSIO_SETTING_ETBWASTEGATEPID_OFFSET: + return "cfg_etbWastegatePid_offset"; + case FSIO_SETTING_ETBWASTEGATEPID_MINVALUE: + return "cfg_etbWastegatePid_minValue"; case FSIO_SETTING_AUXPID1_OFFSET: return "cfg_auxPid1_offset"; case FSIO_SETTING_AUXPID1_MINVALUE: diff --git a/firmware/controllers/generated/rusefi_generated.h b/firmware/controllers/generated/rusefi_generated.h index 75a37db52d..40f855c6e2 100644 --- a/firmware/controllers/generated/rusefi_generated.h +++ b/firmware/controllers/generated/rusefi_generated.h @@ -449,6 +449,14 @@ #define etbIo2_disablePin_offset 987 #define etbIo2_offset 984 #define etbNeutralPosition_offset 1471 +#define etbWastegatePid_dFactor_offset 2524 +#define etbWastegatePid_iFactor_offset 2520 +#define etbWastegatePid_maxValue_offset 2534 +#define etbWastegatePid_minValue_offset 2532 +#define etbWastegatePid_offset 2516 +#define etbWastegatePid_offset_offset 2528 +#define etbWastegatePid_periodMs_offset 2530 +#define etbWastegatePid_pFactor_offset 2516 #define externalKnockSenseAdc_offset 3103 #define extraInjectionOffset_offset 432 #define fanOffTemperature_offset 472 @@ -1172,8 +1180,8 @@ #define showHumanReadableWarning_offset 976 #define showSdCardWarning_offset 76 #define SIGNATURE_BOARD all -#define SIGNATURE_DATE 2020.10.11 -#define SIGNATURE_HASH 2205707407 +#define SIGNATURE_DATE 2020.10.19 +#define SIGNATURE_HASH 4083595509 #define silentTriggerError_offset 1464 #define slowAdcAlpha_offset 2088 #define sparkDwellRpmBins_offset 332 @@ -1492,7 +1500,7 @@ #define ts_show_spi true #define ts_show_trigger_comparator false #define ts_show_tunerstudio_port true -#define TS_SIGNATURE "rusEFI 2020.10.11.all.2205707407" +#define TS_SIGNATURE "rusEFI 2020.10.19.all.4083595509" #define TS_SINGLE_WRITE_COMMAND 'W' #define TS_SINGLE_WRITE_COMMAND_char W #define TS_TEST_COMMAND 't' // 0x74 @@ -1524,7 +1532,7 @@ #define unused244_2_offset 2424 #define unused244_3_offset 2428 #define unused2508_offset 2508 -#define unused2516_offset 2516 +#define unused2536_offset 2536 #define unused3288_offset 3288 #define unused6312_offset 6312 #define unused744b25_offset 744 diff --git a/firmware/controllers/generated/signature_all.h b/firmware/controllers/generated/signature_all.h index 71cfcecdc2..a91a022e98 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 2020.10.11 -#define SIGNATURE_HASH 2205707407 -#define TS_SIGNATURE "rusEFI 2020.10.11.all.2205707407" +#define SIGNATURE_DATE 2020.10.19 +#define SIGNATURE_HASH 4083595509 +#define TS_SIGNATURE "rusEFI 2020.10.19.all.4083595509" diff --git a/firmware/controllers/generated/signature_frankenso_na6.h b/firmware/controllers/generated/signature_frankenso_na6.h index b41f6a5fe0..7335023e6b 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 2020.10.15 -#define SIGNATURE_HASH 1874496581 -#define TS_SIGNATURE "rusEFI 2020.10.15.frankenso_na6.1874496581" +#define SIGNATURE_DATE 2020.10.19 +#define SIGNATURE_HASH 530864191 +#define TS_SIGNATURE "rusEFI 2020.10.19.frankenso_na6.530864191" diff --git a/firmware/controllers/generated/signature_hellen_cypress.h b/firmware/controllers/generated/signature_hellen_cypress.h index 02941dc895..8678e9d855 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 2020.10.11 -#define SIGNATURE_HASH 968846833 -#define TS_SIGNATURE "rusEFI 2020.10.11.hellen_cypress.968846833" +#define SIGNATURE_DATE 2020.10.19 +#define SIGNATURE_HASH 1235335563 +#define TS_SIGNATURE "rusEFI 2020.10.19.hellen_cypress.1235335563" diff --git a/firmware/controllers/generated/signature_kin.h b/firmware/controllers/generated/signature_kin.h index 61a3e07aff..f8db6e915a 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 2020.10.11 -#define SIGNATURE_HASH 1755535115 -#define TS_SIGNATURE "rusEFI 2020.10.11.kin.1755535115" +#define SIGNATURE_DATE 2020.10.19 +#define SIGNATURE_HASH 415073137 +#define TS_SIGNATURE "rusEFI 2020.10.19.kin.415073137" diff --git a/firmware/controllers/generated/signature_mre_f4.h b/firmware/controllers/generated/signature_mre_f4.h index f04e69ed3c..b256081bbc 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 2020.10.15 -#define SIGNATURE_HASH 640748912 -#define TS_SIGNATURE "rusEFI 2020.10.15.mre_f4.640748912" +#define SIGNATURE_DATE 2020.10.19 +#define SIGNATURE_HASH 1445976330 +#define TS_SIGNATURE "rusEFI 2020.10.19.mre_f4.1445976330" diff --git a/firmware/controllers/generated/signature_mre_f7.h b/firmware/controllers/generated/signature_mre_f7.h index 78cc317410..380552a62e 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 2020.10.15 -#define SIGNATURE_HASH 640748912 -#define TS_SIGNATURE "rusEFI 2020.10.15.mre_f7.640748912" +#define SIGNATURE_DATE 2020.10.19 +#define SIGNATURE_HASH 1445976330 +#define TS_SIGNATURE "rusEFI 2020.10.19.mre_f7.1445976330" diff --git a/firmware/controllers/generated/signature_prometheus_405.h b/firmware/controllers/generated/signature_prometheus_405.h index ddc275cd39..60d6778569 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 2020.10.15 -#define SIGNATURE_HASH 1854343583 -#define TS_SIGNATURE "rusEFI 2020.10.15.prometheus_405.1854343583" +#define SIGNATURE_DATE 2020.10.19 +#define SIGNATURE_HASH 513400293 +#define TS_SIGNATURE "rusEFI 2020.10.19.prometheus_405.513400293" diff --git a/firmware/controllers/generated/signature_prometheus_469.h b/firmware/controllers/generated/signature_prometheus_469.h index 24a99ebee8..ca9d0ee66b 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 2020.10.15 -#define SIGNATURE_HASH 1854343583 -#define TS_SIGNATURE "rusEFI 2020.10.15.prometheus_469.1854343583" +#define SIGNATURE_DATE 2020.10.19 +#define SIGNATURE_HASH 513400293 +#define TS_SIGNATURE "rusEFI 2020.10.19.prometheus_469.513400293" diff --git a/firmware/controllers/generated/signature_proteus_f4.h b/firmware/controllers/generated/signature_proteus_f4.h index 61b552dea5..a629e33cde 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 2020.10.15 -#define SIGNATURE_HASH 1968121740 -#define TS_SIGNATURE "rusEFI 2020.10.15.proteus_f4.1968121740" +#define SIGNATURE_DATE 2020.10.19 +#define SIGNATURE_HASH 89256950 +#define TS_SIGNATURE "rusEFI 2020.10.19.proteus_f4.89256950" diff --git a/firmware/controllers/generated/signature_proteus_f7.h b/firmware/controllers/generated/signature_proteus_f7.h index 86731cdbad..64dc97d10d 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 2020.10.15 -#define SIGNATURE_HASH 1968121740 -#define TS_SIGNATURE "rusEFI 2020.10.15.proteus_f7.1968121740" +#define SIGNATURE_DATE 2020.10.19 +#define SIGNATURE_HASH 89256950 +#define TS_SIGNATURE "rusEFI 2020.10.19.proteus_f7.89256950" diff --git a/firmware/tunerstudio/generated/cache.zip b/firmware/tunerstudio/generated/cache.zip index 2f04e2f348..703c8e7035 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 ead3246a07..fd078a5f8e 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 2020.10.11.all.2205707407" + signature = "rusEFI 2020.10.19.all.4083595509" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2020.10.11.all.2205707407" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2020.10.19.all.4083595509" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -74,7 +74,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 Sun Oct 11 23:07:00 UTC 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Oct 19 12:05:36 UTC 2020 pageSize = 20000 page = 1 @@ -935,7 +935,14 @@ page = 1 auxTempSensor2_alignmentFill_at_29 = array, U08, 2505, [3], "units", 1.0, 0, -20, 100, 0 unused2508 = array, U08, 2508, [6], "units", 1.0, 0, -20, 100, 0 etbFreq = scalar, S16, 2514, "Hz", 1.0, 0, 0, 30000, 0 - unused2516 = array, U08, 2516, [24], "units", 1.0, 0, -20, 100, 0 + etbWastegatePid_pFactor = scalar, F32, 2516, "", 1.0, 0, -10000, 10000, 4 + etbWastegatePid_iFactor = scalar, F32, 2520, "", 1.0, 0, -10000, 10000, 4 + etbWastegatePid_dFactor = scalar, F32, 2524, "", 1.0, 0, -10000, 10000, 4 + etbWastegatePid_offset = scalar, S16, 2528, "", 1.0, 0, -1000, 1000, 0 + etbWastegatePid_periodMs = scalar, S16, 2530, "ms", 1.0, 0, 0, 3000, 0 + etbWastegatePid_minValue = scalar, S16, 2532, "", 1.0, 0, -30000, 30000.0, 0 + etbWastegatePid_maxValue = scalar, S16, 2534, "", 1.0, 0, -30000, 30000.0, 0 + unused2536 = array, U08, 2536, [4], "units", 1.0, 0, -20, 100, 0 timing_offset_cylinder1 = scalar, F32, 2540, "Val", 1, 0.0, -20000000, 20000000, 1 timing_offset_cylinder2 = scalar, F32, 2544, "Val", 1, 0.0, -20000000, 20000000, 1 timing_offset_cylinder3 = scalar, F32, 2548, "Val", 1, 0.0, -20000000, 20000000, 1 @@ -2687,7 +2694,8 @@ menuDialog = main menu = "&Advanced" subMenu = boostDialog, "Boost Control" - subMenu = boostPidDialog, "Closed Loop Boost", { boostType == 1 } + subMenu = boostPidDialog, "Closed Loop Boost", { isBoostControlEnabled && boostType == 1 } + subMenu = boostEtbPid, "ETB-style Wastegate Actuator", { isBoostControlEnabled } subMenu = std_separator subMenu = gppwm1, "General Purpose PWM 1" @@ -4340,7 +4348,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" ;Boost Closed Loop dialog = boostPidleft, "" - field = "P Gain", boostPid_pFactor, { isBoostControlEnabled && boostType == 1 } + field = "P Gain", boostPid_pFactor, { isBoostControlEnabled && boostType == 1 } field = "I Gain", boostPid_iFactor, { isBoostControlEnabled && boostType == 1 } field = "D Gain", boostPid_dFactor, { isBoostControlEnabled && boostType == 1 } field = "Control Period", boostPid_periodMs, { isBoostControlEnabled && boostType == 1 } @@ -4354,6 +4362,16 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" panel = boostPidleft, West panel = boostTableDialog, Center + dialog = boostEtbPid, "" + field = "!This section is for advanced users only!" + field = "H-Bridge #1 function", etbFunctions1 + field = "H-Bridge #2 function", etbFunctions2 + field = "P gain", etbWastegatePid_pFactor, { isBoostControlEnabled } + field = "I gain", etbWastegatePid_iFactor, { isBoostControlEnabled } + field = "D gain", etbWastegatePid_dFactor, { isBoostControlEnabled } + field = "PID min", etbWastegatePid_minValue, { isBoostControlEnabled } + field = "PID max", etbWastegatePid_maxValue, { isBoostControlEnabled } + help = veTableDialogHelp, "Volumetric Efficiency" text = "Volumetric Efficiency is used to calculate fuel in Speed Density mode" webHelp = "https://rusefi.com/s/fuel" diff --git a/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini b/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini index a40ea3e137..043774bd4d 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 2020.10.15.frankenso_na6.1874496581" + signature = "rusEFI 2020.10.19.frankenso_na6.530864191" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2020.10.15.frankenso_na6.1874496581" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2020.10.19.frankenso_na6.530864191" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -74,7 +74,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 Thu Oct 15 12:58:57 UTC 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Oct 19 12:05:48 UTC 2020 pageSize = 20000 page = 1 @@ -935,7 +935,14 @@ page = 1 auxTempSensor2_alignmentFill_at_29 = array, U08, 2505, [3], "units", 1.0, 0, -20, 100, 0 unused2508 = array, U08, 2508, [6], "units", 1.0, 0, -20, 100, 0 etbFreq = scalar, S16, 2514, "Hz", 1.0, 0, 0, 30000, 0 - unused2516 = array, U08, 2516, [24], "units", 1.0, 0, -20, 100, 0 + etbWastegatePid_pFactor = scalar, F32, 2516, "", 1.0, 0, -10000, 10000, 4 + etbWastegatePid_iFactor = scalar, F32, 2520, "", 1.0, 0, -10000, 10000, 4 + etbWastegatePid_dFactor = scalar, F32, 2524, "", 1.0, 0, -10000, 10000, 4 + etbWastegatePid_offset = scalar, S16, 2528, "", 1.0, 0, -1000, 1000, 0 + etbWastegatePid_periodMs = scalar, S16, 2530, "ms", 1.0, 0, 0, 3000, 0 + etbWastegatePid_minValue = scalar, S16, 2532, "", 1.0, 0, -30000, 30000.0, 0 + etbWastegatePid_maxValue = scalar, S16, 2534, "", 1.0, 0, -30000, 30000.0, 0 + unused2536 = array, U08, 2536, [4], "units", 1.0, 0, -20, 100, 0 timing_offset_cylinder1 = scalar, F32, 2540, "Val", 1, 0.0, -20000000, 20000000, 1 timing_offset_cylinder2 = scalar, F32, 2544, "Val", 1, 0.0, -20000000, 20000000, 1 timing_offset_cylinder3 = scalar, F32, 2548, "Val", 1, 0.0, -20000000, 20000000, 1 @@ -2687,7 +2694,8 @@ menuDialog = main menu = "&Advanced" subMenu = boostDialog, "Boost Control" - subMenu = boostPidDialog, "Closed Loop Boost", { boostType == 1 } + subMenu = boostPidDialog, "Closed Loop Boost", { isBoostControlEnabled && boostType == 1 } + subMenu = boostEtbPid, "ETB-style Wastegate Actuator", { isBoostControlEnabled } subMenu = std_separator subMenu = gppwm1, "General Purpose PWM 1" @@ -4340,7 +4348,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" ;Boost Closed Loop dialog = boostPidleft, "" - field = "P Gain", boostPid_pFactor, { isBoostControlEnabled && boostType == 1 } + field = "P Gain", boostPid_pFactor, { isBoostControlEnabled && boostType == 1 } field = "I Gain", boostPid_iFactor, { isBoostControlEnabled && boostType == 1 } field = "D Gain", boostPid_dFactor, { isBoostControlEnabled && boostType == 1 } field = "Control Period", boostPid_periodMs, { isBoostControlEnabled && boostType == 1 } @@ -4354,6 +4362,16 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" panel = boostPidleft, West panel = boostTableDialog, Center + dialog = boostEtbPid, "" + field = "!This section is for advanced users only!" + field = "H-Bridge #1 function", etbFunctions1 + field = "H-Bridge #2 function", etbFunctions2 + field = "P gain", etbWastegatePid_pFactor, { isBoostControlEnabled } + field = "I gain", etbWastegatePid_iFactor, { isBoostControlEnabled } + field = "D gain", etbWastegatePid_dFactor, { isBoostControlEnabled } + field = "PID min", etbWastegatePid_minValue, { isBoostControlEnabled } + field = "PID max", etbWastegatePid_maxValue, { isBoostControlEnabled } + help = veTableDialogHelp, "Volumetric Efficiency" text = "Volumetric Efficiency is used to calculate fuel in Speed Density mode" webHelp = "https://rusefi.com/s/fuel" diff --git a/firmware/tunerstudio/generated/rusefi_hellen_cypress.ini b/firmware/tunerstudio/generated/rusefi_hellen_cypress.ini index aedd8f59ea..da99ed522d 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 2020.10.11.hellen_cypress.968846833" + signature = "rusEFI 2020.10.19.hellen_cypress.1235335563" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2020.10.11.hellen_cypress.968846833" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2020.10.19.hellen_cypress.1235335563" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -74,7 +74,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 Sun Oct 11 23:07:20 UTC 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on hellen_cypress_gen_config.bat integration/rusefi_config.txt Mon Oct 19 12:05:57 UTC 2020 pageSize = 20000 page = 1 @@ -935,7 +935,14 @@ page = 1 auxTempSensor2_alignmentFill_at_29 = array, U08, 2505, [3], "units", 1.0, 0, -20, 100, 0 unused2508 = array, U08, 2508, [6], "units", 1.0, 0, -20, 100, 0 etbFreq = scalar, S16, 2514, "Hz", 1.0, 0, 0, 30000, 0 - unused2516 = array, U08, 2516, [24], "units", 1.0, 0, -20, 100, 0 + etbWastegatePid_pFactor = scalar, F32, 2516, "", 1.0, 0, -10000, 10000, 4 + etbWastegatePid_iFactor = scalar, F32, 2520, "", 1.0, 0, -10000, 10000, 4 + etbWastegatePid_dFactor = scalar, F32, 2524, "", 1.0, 0, -10000, 10000, 4 + etbWastegatePid_offset = scalar, S16, 2528, "", 1.0, 0, -1000, 1000, 0 + etbWastegatePid_periodMs = scalar, S16, 2530, "ms", 1.0, 0, 0, 3000, 0 + etbWastegatePid_minValue = scalar, S16, 2532, "", 1.0, 0, -30000, 30000.0, 0 + etbWastegatePid_maxValue = scalar, S16, 2534, "", 1.0, 0, -30000, 30000.0, 0 + unused2536 = array, U08, 2536, [4], "units", 1.0, 0, -20, 100, 0 timing_offset_cylinder1 = scalar, F32, 2540, "Val", 1, 0.0, -20000000, 20000000, 1 timing_offset_cylinder2 = scalar, F32, 2544, "Val", 1, 0.0, -20000000, 20000000, 1 timing_offset_cylinder3 = scalar, F32, 2548, "Val", 1, 0.0, -20000000, 20000000, 1 @@ -2687,7 +2694,8 @@ menuDialog = main menu = "&Advanced" subMenu = boostDialog, "Boost Control" - subMenu = boostPidDialog, "Closed Loop Boost", { boostType == 1 } + subMenu = boostPidDialog, "Closed Loop Boost", { isBoostControlEnabled && boostType == 1 } + subMenu = boostEtbPid, "ETB-style Wastegate Actuator", { isBoostControlEnabled } subMenu = std_separator subMenu = gppwm1, "General Purpose PWM 1" @@ -4340,7 +4348,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" ;Boost Closed Loop dialog = boostPidleft, "" - field = "P Gain", boostPid_pFactor, { isBoostControlEnabled && boostType == 1 } + field = "P Gain", boostPid_pFactor, { isBoostControlEnabled && boostType == 1 } field = "I Gain", boostPid_iFactor, { isBoostControlEnabled && boostType == 1 } field = "D Gain", boostPid_dFactor, { isBoostControlEnabled && boostType == 1 } field = "Control Period", boostPid_periodMs, { isBoostControlEnabled && boostType == 1 } @@ -4354,6 +4362,16 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" panel = boostPidleft, West panel = boostTableDialog, Center + dialog = boostEtbPid, "" + field = "!This section is for advanced users only!" + field = "H-Bridge #1 function", etbFunctions1 + field = "H-Bridge #2 function", etbFunctions2 + field = "P gain", etbWastegatePid_pFactor, { isBoostControlEnabled } + field = "I gain", etbWastegatePid_iFactor, { isBoostControlEnabled } + field = "D gain", etbWastegatePid_dFactor, { isBoostControlEnabled } + field = "PID min", etbWastegatePid_minValue, { isBoostControlEnabled } + field = "PID max", etbWastegatePid_maxValue, { isBoostControlEnabled } + help = veTableDialogHelp, "Volumetric Efficiency" text = "Volumetric Efficiency is used to calculate fuel in Speed Density mode" webHelp = "https://rusefi.com/s/fuel" diff --git a/firmware/tunerstudio/generated/rusefi_kinetis.ini b/firmware/tunerstudio/generated/rusefi_kinetis.ini index adc713302c..889075bcd3 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 2020.10.11.kin.1755535115" + signature = "rusEFI 2020.10.19.kin.415073137" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2020.10.11.kin.1755535115" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2020.10.19.kin.415073137" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -74,7 +74,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 Sun Oct 11 23:07:18 UTC 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Mon Oct 19 12:05:56 UTC 2020 pageSize = 20000 page = 1 @@ -935,7 +935,14 @@ page = 1 auxTempSensor2_alignmentFill_at_29 = array, U08, 2505, [3], "units", 1.0, 0, -20, 100, 0 unused2508 = array, U08, 2508, [6], "units", 1.0, 0, -20, 100, 0 etbFreq = scalar, S16, 2514, "Hz", 1.0, 0, 0, 30000, 0 - unused2516 = array, U08, 2516, [24], "units", 1.0, 0, -20, 100, 0 + etbWastegatePid_pFactor = scalar, F32, 2516, "", 1.0, 0, -10000, 10000, 4 + etbWastegatePid_iFactor = scalar, F32, 2520, "", 1.0, 0, -10000, 10000, 4 + etbWastegatePid_dFactor = scalar, F32, 2524, "", 1.0, 0, -10000, 10000, 4 + etbWastegatePid_offset = scalar, S16, 2528, "", 1.0, 0, -1000, 1000, 0 + etbWastegatePid_periodMs = scalar, S16, 2530, "ms", 1.0, 0, 0, 3000, 0 + etbWastegatePid_minValue = scalar, S16, 2532, "", 1.0, 0, -30000, 30000.0, 0 + etbWastegatePid_maxValue = scalar, S16, 2534, "", 1.0, 0, -30000, 30000.0, 0 + unused2536 = array, U08, 2536, [4], "units", 1.0, 0, -20, 100, 0 timing_offset_cylinder1 = scalar, F32, 2540, "Val", 1, 0.0, -20000000, 20000000, 1 timing_offset_cylinder2 = scalar, F32, 2544, "Val", 1, 0.0, -20000000, 20000000, 1 timing_offset_cylinder3 = scalar, F32, 2548, "Val", 1, 0.0, -20000000, 20000000, 1 @@ -2687,7 +2694,8 @@ menuDialog = main menu = "&Advanced" subMenu = boostDialog, "Boost Control" - subMenu = boostPidDialog, "Closed Loop Boost", { boostType == 1 } + subMenu = boostPidDialog, "Closed Loop Boost", { isBoostControlEnabled && boostType == 1 } + subMenu = boostEtbPid, "ETB-style Wastegate Actuator", { isBoostControlEnabled } subMenu = std_separator subMenu = gppwm1, "General Purpose PWM 1" @@ -4341,7 +4349,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" ;Boost Closed Loop dialog = boostPidleft, "" - field = "P Gain", boostPid_pFactor, { isBoostControlEnabled && boostType == 1 } + field = "P Gain", boostPid_pFactor, { isBoostControlEnabled && boostType == 1 } field = "I Gain", boostPid_iFactor, { isBoostControlEnabled && boostType == 1 } field = "D Gain", boostPid_dFactor, { isBoostControlEnabled && boostType == 1 } field = "Control Period", boostPid_periodMs, { isBoostControlEnabled && boostType == 1 } @@ -4355,6 +4363,16 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" panel = boostPidleft, West panel = boostTableDialog, Center + dialog = boostEtbPid, "" + field = "!This section is for advanced users only!" + field = "H-Bridge #1 function", etbFunctions1 + field = "H-Bridge #2 function", etbFunctions2 + field = "P gain", etbWastegatePid_pFactor, { isBoostControlEnabled } + field = "I gain", etbWastegatePid_iFactor, { isBoostControlEnabled } + field = "D gain", etbWastegatePid_dFactor, { isBoostControlEnabled } + field = "PID min", etbWastegatePid_minValue, { isBoostControlEnabled } + field = "PID max", etbWastegatePid_maxValue, { isBoostControlEnabled } + help = veTableDialogHelp, "Volumetric Efficiency" text = "Volumetric Efficiency is used to calculate fuel in Speed Density mode" webHelp = "https://rusefi.com/s/fuel" diff --git a/firmware/tunerstudio/generated/rusefi_mre_f4.ini b/firmware/tunerstudio/generated/rusefi_mre_f4.ini index bcf0cc39ba..a31f6e6c94 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 2020.10.15.mre_f4.640748912" + signature = "rusEFI 2020.10.19.mre_f4.1445976330" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2020.10.15.mre_f4.640748912" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2020.10.19.mre_f4.1445976330" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -74,7 +74,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 Thu Oct 15 12:58:56 UTC 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Oct 19 12:05:46 UTC 2020 pageSize = 20000 page = 1 @@ -935,7 +935,14 @@ page = 1 auxTempSensor2_alignmentFill_at_29 = array, U08, 2505, [3], "units", 1.0, 0, -20, 100, 0 unused2508 = array, U08, 2508, [6], "units", 1.0, 0, -20, 100, 0 etbFreq = scalar, S16, 2514, "Hz", 1.0, 0, 0, 30000, 0 - unused2516 = array, U08, 2516, [24], "units", 1.0, 0, -20, 100, 0 + etbWastegatePid_pFactor = scalar, F32, 2516, "", 1.0, 0, -10000, 10000, 4 + etbWastegatePid_iFactor = scalar, F32, 2520, "", 1.0, 0, -10000, 10000, 4 + etbWastegatePid_dFactor = scalar, F32, 2524, "", 1.0, 0, -10000, 10000, 4 + etbWastegatePid_offset = scalar, S16, 2528, "", 1.0, 0, -1000, 1000, 0 + etbWastegatePid_periodMs = scalar, S16, 2530, "ms", 1.0, 0, 0, 3000, 0 + etbWastegatePid_minValue = scalar, S16, 2532, "", 1.0, 0, -30000, 30000.0, 0 + etbWastegatePid_maxValue = scalar, S16, 2534, "", 1.0, 0, -30000, 30000.0, 0 + unused2536 = array, U08, 2536, [4], "units", 1.0, 0, -20, 100, 0 timing_offset_cylinder1 = scalar, F32, 2540, "Val", 1, 0.0, -20000000, 20000000, 1 timing_offset_cylinder2 = scalar, F32, 2544, "Val", 1, 0.0, -20000000, 20000000, 1 timing_offset_cylinder3 = scalar, F32, 2548, "Val", 1, 0.0, -20000000, 20000000, 1 @@ -2687,7 +2694,8 @@ menuDialog = main menu = "&Advanced" subMenu = boostDialog, "Boost Control" - subMenu = boostPidDialog, "Closed Loop Boost", { boostType == 1 } + subMenu = boostPidDialog, "Closed Loop Boost", { isBoostControlEnabled && boostType == 1 } + subMenu = boostEtbPid, "ETB-style Wastegate Actuator", { isBoostControlEnabled } subMenu = std_separator subMenu = gppwm1, "General Purpose PWM 1" @@ -4315,7 +4323,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" ;Boost Closed Loop dialog = boostPidleft, "" - field = "P Gain", boostPid_pFactor, { isBoostControlEnabled && boostType == 1 } + field = "P Gain", boostPid_pFactor, { isBoostControlEnabled && boostType == 1 } field = "I Gain", boostPid_iFactor, { isBoostControlEnabled && boostType == 1 } field = "D Gain", boostPid_dFactor, { isBoostControlEnabled && boostType == 1 } field = "Control Period", boostPid_periodMs, { isBoostControlEnabled && boostType == 1 } @@ -4329,6 +4337,16 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" panel = boostPidleft, West panel = boostTableDialog, Center + dialog = boostEtbPid, "" + field = "!This section is for advanced users only!" + field = "H-Bridge #1 function", etbFunctions1 + field = "H-Bridge #2 function", etbFunctions2 + field = "P gain", etbWastegatePid_pFactor, { isBoostControlEnabled } + field = "I gain", etbWastegatePid_iFactor, { isBoostControlEnabled } + field = "D gain", etbWastegatePid_dFactor, { isBoostControlEnabled } + field = "PID min", etbWastegatePid_minValue, { isBoostControlEnabled } + field = "PID max", etbWastegatePid_maxValue, { isBoostControlEnabled } + help = veTableDialogHelp, "Volumetric Efficiency" text = "Volumetric Efficiency is used to calculate fuel in Speed Density mode" webHelp = "https://rusefi.com/s/fuel" diff --git a/firmware/tunerstudio/generated/rusefi_mre_f7.ini b/firmware/tunerstudio/generated/rusefi_mre_f7.ini index 93ecd27519..3313e9a1eb 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 2020.10.15.mre_f7.640748912" + signature = "rusEFI 2020.10.19.mre_f7.1445976330" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2020.10.15.mre_f7.640748912" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2020.10.19.mre_f7.1445976330" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -74,7 +74,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 Thu Oct 15 12:58:53 UTC 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Oct 19 12:05:43 UTC 2020 pageSize = 20000 page = 1 @@ -935,7 +935,14 @@ page = 1 auxTempSensor2_alignmentFill_at_29 = array, U08, 2505, [3], "units", 1.0, 0, -20, 100, 0 unused2508 = array, U08, 2508, [6], "units", 1.0, 0, -20, 100, 0 etbFreq = scalar, S16, 2514, "Hz", 1.0, 0, 0, 30000, 0 - unused2516 = array, U08, 2516, [24], "units", 1.0, 0, -20, 100, 0 + etbWastegatePid_pFactor = scalar, F32, 2516, "", 1.0, 0, -10000, 10000, 4 + etbWastegatePid_iFactor = scalar, F32, 2520, "", 1.0, 0, -10000, 10000, 4 + etbWastegatePid_dFactor = scalar, F32, 2524, "", 1.0, 0, -10000, 10000, 4 + etbWastegatePid_offset = scalar, S16, 2528, "", 1.0, 0, -1000, 1000, 0 + etbWastegatePid_periodMs = scalar, S16, 2530, "ms", 1.0, 0, 0, 3000, 0 + etbWastegatePid_minValue = scalar, S16, 2532, "", 1.0, 0, -30000, 30000.0, 0 + etbWastegatePid_maxValue = scalar, S16, 2534, "", 1.0, 0, -30000, 30000.0, 0 + unused2536 = array, U08, 2536, [4], "units", 1.0, 0, -20, 100, 0 timing_offset_cylinder1 = scalar, F32, 2540, "Val", 1, 0.0, -20000000, 20000000, 1 timing_offset_cylinder2 = scalar, F32, 2544, "Val", 1, 0.0, -20000000, 20000000, 1 timing_offset_cylinder3 = scalar, F32, 2548, "Val", 1, 0.0, -20000000, 20000000, 1 @@ -2687,7 +2694,8 @@ menuDialog = main menu = "&Advanced" subMenu = boostDialog, "Boost Control" - subMenu = boostPidDialog, "Closed Loop Boost", { boostType == 1 } + subMenu = boostPidDialog, "Closed Loop Boost", { isBoostControlEnabled && boostType == 1 } + subMenu = boostEtbPid, "ETB-style Wastegate Actuator", { isBoostControlEnabled } subMenu = std_separator subMenu = gppwm1, "General Purpose PWM 1" @@ -4315,7 +4323,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" ;Boost Closed Loop dialog = boostPidleft, "" - field = "P Gain", boostPid_pFactor, { isBoostControlEnabled && boostType == 1 } + field = "P Gain", boostPid_pFactor, { isBoostControlEnabled && boostType == 1 } field = "I Gain", boostPid_iFactor, { isBoostControlEnabled && boostType == 1 } field = "D Gain", boostPid_dFactor, { isBoostControlEnabled && boostType == 1 } field = "Control Period", boostPid_periodMs, { isBoostControlEnabled && boostType == 1 } @@ -4329,6 +4337,16 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" panel = boostPidleft, West panel = boostTableDialog, Center + dialog = boostEtbPid, "" + field = "!This section is for advanced users only!" + field = "H-Bridge #1 function", etbFunctions1 + field = "H-Bridge #2 function", etbFunctions2 + field = "P gain", etbWastegatePid_pFactor, { isBoostControlEnabled } + field = "I gain", etbWastegatePid_iFactor, { isBoostControlEnabled } + field = "D gain", etbWastegatePid_dFactor, { isBoostControlEnabled } + field = "PID min", etbWastegatePid_minValue, { isBoostControlEnabled } + field = "PID max", etbWastegatePid_maxValue, { isBoostControlEnabled } + help = veTableDialogHelp, "Volumetric Efficiency" text = "Volumetric Efficiency is used to calculate fuel in Speed Density mode" webHelp = "https://rusefi.com/s/fuel" diff --git a/firmware/tunerstudio/generated/rusefi_prometheus_405.ini b/firmware/tunerstudio/generated/rusefi_prometheus_405.ini index 1838340aa4..6216d6aa7b 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 2020.10.15.prometheus_405.1854343583" + signature = "rusEFI 2020.10.19.prometheus_405.513400293" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2020.10.15.prometheus_405.1854343583" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2020.10.19.prometheus_405.513400293" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -74,7 +74,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 Thu Oct 15 12:59:01 UTC 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Oct 19 12:05:51 UTC 2020 pageSize = 20000 page = 1 @@ -935,7 +935,14 @@ page = 1 auxTempSensor2_alignmentFill_at_29 = array, U08, 2505, [3], "units", 1.0, 0, -20, 100, 0 unused2508 = array, U08, 2508, [6], "units", 1.0, 0, -20, 100, 0 etbFreq = scalar, S16, 2514, "Hz", 1.0, 0, 0, 30000, 0 - unused2516 = array, U08, 2516, [24], "units", 1.0, 0, -20, 100, 0 + etbWastegatePid_pFactor = scalar, F32, 2516, "", 1.0, 0, -10000, 10000, 4 + etbWastegatePid_iFactor = scalar, F32, 2520, "", 1.0, 0, -10000, 10000, 4 + etbWastegatePid_dFactor = scalar, F32, 2524, "", 1.0, 0, -10000, 10000, 4 + etbWastegatePid_offset = scalar, S16, 2528, "", 1.0, 0, -1000, 1000, 0 + etbWastegatePid_periodMs = scalar, S16, 2530, "ms", 1.0, 0, 0, 3000, 0 + etbWastegatePid_minValue = scalar, S16, 2532, "", 1.0, 0, -30000, 30000.0, 0 + etbWastegatePid_maxValue = scalar, S16, 2534, "", 1.0, 0, -30000, 30000.0, 0 + unused2536 = array, U08, 2536, [4], "units", 1.0, 0, -20, 100, 0 timing_offset_cylinder1 = scalar, F32, 2540, "Val", 1, 0.0, -20000000, 20000000, 1 timing_offset_cylinder2 = scalar, F32, 2544, "Val", 1, 0.0, -20000000, 20000000, 1 timing_offset_cylinder3 = scalar, F32, 2548, "Val", 1, 0.0, -20000000, 20000000, 1 @@ -2687,7 +2694,8 @@ menuDialog = main menu = "&Advanced" subMenu = boostDialog, "Boost Control" - subMenu = boostPidDialog, "Closed Loop Boost", { boostType == 1 } + subMenu = boostPidDialog, "Closed Loop Boost", { isBoostControlEnabled && boostType == 1 } + subMenu = boostEtbPid, "ETB-style Wastegate Actuator", { isBoostControlEnabled } subMenu = std_separator subMenu = gppwm1, "General Purpose PWM 1" @@ -4336,7 +4344,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" ;Boost Closed Loop dialog = boostPidleft, "" - field = "P Gain", boostPid_pFactor, { isBoostControlEnabled && boostType == 1 } + field = "P Gain", boostPid_pFactor, { isBoostControlEnabled && boostType == 1 } field = "I Gain", boostPid_iFactor, { isBoostControlEnabled && boostType == 1 } field = "D Gain", boostPid_dFactor, { isBoostControlEnabled && boostType == 1 } field = "Control Period", boostPid_periodMs, { isBoostControlEnabled && boostType == 1 } @@ -4350,6 +4358,16 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" panel = boostPidleft, West panel = boostTableDialog, Center + dialog = boostEtbPid, "" + field = "!This section is for advanced users only!" + field = "H-Bridge #1 function", etbFunctions1 + field = "H-Bridge #2 function", etbFunctions2 + field = "P gain", etbWastegatePid_pFactor, { isBoostControlEnabled } + field = "I gain", etbWastegatePid_iFactor, { isBoostControlEnabled } + field = "D gain", etbWastegatePid_dFactor, { isBoostControlEnabled } + field = "PID min", etbWastegatePid_minValue, { isBoostControlEnabled } + field = "PID max", etbWastegatePid_maxValue, { isBoostControlEnabled } + help = veTableDialogHelp, "Volumetric Efficiency" text = "Volumetric Efficiency is used to calculate fuel in Speed Density mode" webHelp = "https://rusefi.com/s/fuel" diff --git a/firmware/tunerstudio/generated/rusefi_prometheus_469.ini b/firmware/tunerstudio/generated/rusefi_prometheus_469.ini index b5adc369ac..9ba7435889 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 2020.10.15.prometheus_469.1854343583" + signature = "rusEFI 2020.10.19.prometheus_469.513400293" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2020.10.15.prometheus_469.1854343583" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2020.10.19.prometheus_469.513400293" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -74,7 +74,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 Thu Oct 15 12:58:59 UTC 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Oct 19 12:05:49 UTC 2020 pageSize = 20000 page = 1 @@ -935,7 +935,14 @@ page = 1 auxTempSensor2_alignmentFill_at_29 = array, U08, 2505, [3], "units", 1.0, 0, -20, 100, 0 unused2508 = array, U08, 2508, [6], "units", 1.0, 0, -20, 100, 0 etbFreq = scalar, S16, 2514, "Hz", 1.0, 0, 0, 30000, 0 - unused2516 = array, U08, 2516, [24], "units", 1.0, 0, -20, 100, 0 + etbWastegatePid_pFactor = scalar, F32, 2516, "", 1.0, 0, -10000, 10000, 4 + etbWastegatePid_iFactor = scalar, F32, 2520, "", 1.0, 0, -10000, 10000, 4 + etbWastegatePid_dFactor = scalar, F32, 2524, "", 1.0, 0, -10000, 10000, 4 + etbWastegatePid_offset = scalar, S16, 2528, "", 1.0, 0, -1000, 1000, 0 + etbWastegatePid_periodMs = scalar, S16, 2530, "ms", 1.0, 0, 0, 3000, 0 + etbWastegatePid_minValue = scalar, S16, 2532, "", 1.0, 0, -30000, 30000.0, 0 + etbWastegatePid_maxValue = scalar, S16, 2534, "", 1.0, 0, -30000, 30000.0, 0 + unused2536 = array, U08, 2536, [4], "units", 1.0, 0, -20, 100, 0 timing_offset_cylinder1 = scalar, F32, 2540, "Val", 1, 0.0, -20000000, 20000000, 1 timing_offset_cylinder2 = scalar, F32, 2544, "Val", 1, 0.0, -20000000, 20000000, 1 timing_offset_cylinder3 = scalar, F32, 2548, "Val", 1, 0.0, -20000000, 20000000, 1 @@ -2687,7 +2694,8 @@ menuDialog = main menu = "&Advanced" subMenu = boostDialog, "Boost Control" - subMenu = boostPidDialog, "Closed Loop Boost", { boostType == 1 } + subMenu = boostPidDialog, "Closed Loop Boost", { isBoostControlEnabled && boostType == 1 } + subMenu = boostEtbPid, "ETB-style Wastegate Actuator", { isBoostControlEnabled } subMenu = std_separator subMenu = gppwm1, "General Purpose PWM 1" @@ -4336,7 +4344,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" ;Boost Closed Loop dialog = boostPidleft, "" - field = "P Gain", boostPid_pFactor, { isBoostControlEnabled && boostType == 1 } + field = "P Gain", boostPid_pFactor, { isBoostControlEnabled && boostType == 1 } field = "I Gain", boostPid_iFactor, { isBoostControlEnabled && boostType == 1 } field = "D Gain", boostPid_dFactor, { isBoostControlEnabled && boostType == 1 } field = "Control Period", boostPid_periodMs, { isBoostControlEnabled && boostType == 1 } @@ -4350,6 +4358,16 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" panel = boostPidleft, West panel = boostTableDialog, Center + dialog = boostEtbPid, "" + field = "!This section is for advanced users only!" + field = "H-Bridge #1 function", etbFunctions1 + field = "H-Bridge #2 function", etbFunctions2 + field = "P gain", etbWastegatePid_pFactor, { isBoostControlEnabled } + field = "I gain", etbWastegatePid_iFactor, { isBoostControlEnabled } + field = "D gain", etbWastegatePid_dFactor, { isBoostControlEnabled } + field = "PID min", etbWastegatePid_minValue, { isBoostControlEnabled } + field = "PID max", etbWastegatePid_maxValue, { isBoostControlEnabled } + help = veTableDialogHelp, "Volumetric Efficiency" text = "Volumetric Efficiency is used to calculate fuel in Speed Density mode" webHelp = "https://rusefi.com/s/fuel" diff --git a/firmware/tunerstudio/generated/rusefi_proteus_f4.ini b/firmware/tunerstudio/generated/rusefi_proteus_f4.ini index 7a931e5391..f9d87cfbf2 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 2020.10.15.proteus_f4.1968121740" + signature = "rusEFI 2020.10.19.proteus_f4.89256950" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2020.10.15.proteus_f4.1968121740" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2020.10.19.proteus_f4.89256950" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -74,7 +74,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 Thu Oct 15 12:59:04 UTC 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Oct 19 12:05:54 UTC 2020 pageSize = 20000 page = 1 @@ -935,7 +935,14 @@ page = 1 auxTempSensor2_alignmentFill_at_29 = array, U08, 2505, [3], "units", 1.0, 0, -20, 100, 0 unused2508 = array, U08, 2508, [6], "units", 1.0, 0, -20, 100, 0 etbFreq = scalar, S16, 2514, "Hz", 1.0, 0, 0, 30000, 0 - unused2516 = array, U08, 2516, [24], "units", 1.0, 0, -20, 100, 0 + etbWastegatePid_pFactor = scalar, F32, 2516, "", 1.0, 0, -10000, 10000, 4 + etbWastegatePid_iFactor = scalar, F32, 2520, "", 1.0, 0, -10000, 10000, 4 + etbWastegatePid_dFactor = scalar, F32, 2524, "", 1.0, 0, -10000, 10000, 4 + etbWastegatePid_offset = scalar, S16, 2528, "", 1.0, 0, -1000, 1000, 0 + etbWastegatePid_periodMs = scalar, S16, 2530, "ms", 1.0, 0, 0, 3000, 0 + etbWastegatePid_minValue = scalar, S16, 2532, "", 1.0, 0, -30000, 30000.0, 0 + etbWastegatePid_maxValue = scalar, S16, 2534, "", 1.0, 0, -30000, 30000.0, 0 + unused2536 = array, U08, 2536, [4], "units", 1.0, 0, -20, 100, 0 timing_offset_cylinder1 = scalar, F32, 2540, "Val", 1, 0.0, -20000000, 20000000, 1 timing_offset_cylinder2 = scalar, F32, 2544, "Val", 1, 0.0, -20000000, 20000000, 1 timing_offset_cylinder3 = scalar, F32, 2548, "Val", 1, 0.0, -20000000, 20000000, 1 @@ -2687,7 +2694,8 @@ menuDialog = main menu = "&Advanced" subMenu = boostDialog, "Boost Control" - subMenu = boostPidDialog, "Closed Loop Boost", { boostType == 1 } + subMenu = boostPidDialog, "Closed Loop Boost", { isBoostControlEnabled && boostType == 1 } + subMenu = boostEtbPid, "ETB-style Wastegate Actuator", { isBoostControlEnabled } subMenu = std_separator subMenu = gppwm1, "General Purpose PWM 1" @@ -4307,7 +4315,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" ;Boost Closed Loop dialog = boostPidleft, "" - field = "P Gain", boostPid_pFactor, { isBoostControlEnabled && boostType == 1 } + field = "P Gain", boostPid_pFactor, { isBoostControlEnabled && boostType == 1 } field = "I Gain", boostPid_iFactor, { isBoostControlEnabled && boostType == 1 } field = "D Gain", boostPid_dFactor, { isBoostControlEnabled && boostType == 1 } field = "Control Period", boostPid_periodMs, { isBoostControlEnabled && boostType == 1 } @@ -4321,6 +4329,16 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" panel = boostPidleft, West panel = boostTableDialog, Center + dialog = boostEtbPid, "" + field = "!This section is for advanced users only!" + field = "H-Bridge #1 function", etbFunctions1 + field = "H-Bridge #2 function", etbFunctions2 + field = "P gain", etbWastegatePid_pFactor, { isBoostControlEnabled } + field = "I gain", etbWastegatePid_iFactor, { isBoostControlEnabled } + field = "D gain", etbWastegatePid_dFactor, { isBoostControlEnabled } + field = "PID min", etbWastegatePid_minValue, { isBoostControlEnabled } + field = "PID max", etbWastegatePid_maxValue, { isBoostControlEnabled } + help = veTableDialogHelp, "Volumetric Efficiency" text = "Volumetric Efficiency is used to calculate fuel in Speed Density mode" webHelp = "https://rusefi.com/s/fuel" diff --git a/firmware/tunerstudio/generated/rusefi_proteus_f7.ini b/firmware/tunerstudio/generated/rusefi_proteus_f7.ini index 06529a0a60..3616b7d294 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 2020.10.15.proteus_f7.1968121740" + signature = "rusEFI 2020.10.19.proteus_f7.89256950" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2020.10.15.proteus_f7.1968121740" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2020.10.19.proteus_f7.89256950" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -74,7 +74,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 Thu Oct 15 12:59:03 UTC 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Oct 19 12:05:53 UTC 2020 pageSize = 20000 page = 1 @@ -935,7 +935,14 @@ page = 1 auxTempSensor2_alignmentFill_at_29 = array, U08, 2505, [3], "units", 1.0, 0, -20, 100, 0 unused2508 = array, U08, 2508, [6], "units", 1.0, 0, -20, 100, 0 etbFreq = scalar, S16, 2514, "Hz", 1.0, 0, 0, 30000, 0 - unused2516 = array, U08, 2516, [24], "units", 1.0, 0, -20, 100, 0 + etbWastegatePid_pFactor = scalar, F32, 2516, "", 1.0, 0, -10000, 10000, 4 + etbWastegatePid_iFactor = scalar, F32, 2520, "", 1.0, 0, -10000, 10000, 4 + etbWastegatePid_dFactor = scalar, F32, 2524, "", 1.0, 0, -10000, 10000, 4 + etbWastegatePid_offset = scalar, S16, 2528, "", 1.0, 0, -1000, 1000, 0 + etbWastegatePid_periodMs = scalar, S16, 2530, "ms", 1.0, 0, 0, 3000, 0 + etbWastegatePid_minValue = scalar, S16, 2532, "", 1.0, 0, -30000, 30000.0, 0 + etbWastegatePid_maxValue = scalar, S16, 2534, "", 1.0, 0, -30000, 30000.0, 0 + unused2536 = array, U08, 2536, [4], "units", 1.0, 0, -20, 100, 0 timing_offset_cylinder1 = scalar, F32, 2540, "Val", 1, 0.0, -20000000, 20000000, 1 timing_offset_cylinder2 = scalar, F32, 2544, "Val", 1, 0.0, -20000000, 20000000, 1 timing_offset_cylinder3 = scalar, F32, 2548, "Val", 1, 0.0, -20000000, 20000000, 1 @@ -2687,7 +2694,8 @@ menuDialog = main menu = "&Advanced" subMenu = boostDialog, "Boost Control" - subMenu = boostPidDialog, "Closed Loop Boost", { boostType == 1 } + subMenu = boostPidDialog, "Closed Loop Boost", { isBoostControlEnabled && boostType == 1 } + subMenu = boostEtbPid, "ETB-style Wastegate Actuator", { isBoostControlEnabled } subMenu = std_separator subMenu = gppwm1, "General Purpose PWM 1" @@ -4307,7 +4315,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" ;Boost Closed Loop dialog = boostPidleft, "" - field = "P Gain", boostPid_pFactor, { isBoostControlEnabled && boostType == 1 } + field = "P Gain", boostPid_pFactor, { isBoostControlEnabled && boostType == 1 } field = "I Gain", boostPid_iFactor, { isBoostControlEnabled && boostType == 1 } field = "D Gain", boostPid_dFactor, { isBoostControlEnabled && boostType == 1 } field = "Control Period", boostPid_periodMs, { isBoostControlEnabled && boostType == 1 } @@ -4321,6 +4329,16 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" panel = boostPidleft, West panel = boostTableDialog, Center + dialog = boostEtbPid, "" + field = "!This section is for advanced users only!" + field = "H-Bridge #1 function", etbFunctions1 + field = "H-Bridge #2 function", etbFunctions2 + field = "P gain", etbWastegatePid_pFactor, { isBoostControlEnabled } + field = "I gain", etbWastegatePid_iFactor, { isBoostControlEnabled } + field = "D gain", etbWastegatePid_dFactor, { isBoostControlEnabled } + field = "PID min", etbWastegatePid_minValue, { isBoostControlEnabled } + field = "PID max", etbWastegatePid_maxValue, { isBoostControlEnabled } + help = veTableDialogHelp, "Volumetric Efficiency" text = "Volumetric Efficiency is used to calculate fuel in Speed Density mode" webHelp = "https://rusefi.com/s/fuel" 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 c91560b14e..99836e3dd3 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 Sun Oct 11 23:07:00 UTC 2020 +// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Oct 19 12:05:36 UTC 2020 // by class com.rusefi.output.FileJavaFieldsConsumer import com.rusefi.config.*; @@ -430,6 +430,14 @@ public class Fields { public static final int etbIo2_disablePin_offset = 987; public static final int etbIo2_offset = 984; public static final int etbNeutralPosition_offset = 1471; + public static final int etbWastegatePid_dFactor_offset = 2524; + public static final int etbWastegatePid_iFactor_offset = 2520; + public static final int etbWastegatePid_maxValue_offset = 2534; + public static final int etbWastegatePid_minValue_offset = 2532; + public static final int etbWastegatePid_offset = 2516; + public static final int etbWastegatePid_offset_offset = 2528; + public static final int etbWastegatePid_periodMs_offset = 2530; + public static final int etbWastegatePid_pFactor_offset = 2516; public static final int externalKnockSenseAdc_offset = 3103; public static final int extraInjectionOffset_offset = 432; public static final int fanOffTemperature_offset = 472; @@ -1397,7 +1405,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 2020.10.11.all.2205707407"; + public static final String TS_SIGNATURE = "rusEFI 2020.10.19.all.4083595509"; public static final char TS_SINGLE_WRITE_COMMAND = 'W'; public static final int TT_TT_60_2_VW = 20; public static final int TT_TT_ONE = 18; @@ -1426,7 +1434,7 @@ public class Fields { public static final int unused244_2_offset = 2424; public static final int unused244_3_offset = 2428; public static final int unused2508_offset = 2508; - public static final int unused2516_offset = 2516; + public static final int unused2536_offset = 2536; public static final int unused3288_offset = 3288; public static final int unused6312_offset = 6312; public static final int unused744b25_offset = 744; @@ -2388,6 +2396,13 @@ public class Fields { public static final Field AUXTEMPSENSOR2_BIAS_RESISTOR = Field.create("AUXTEMPSENSOR2_BIAS_RESISTOR", 2500, FieldType.FLOAT); public static final Field AUXTEMPSENSOR2_ADCCHANNEL = Field.create("AUXTEMPSENSOR2_ADCCHANNEL", 2504, FieldType.INT8, adc_channel_e); public static final Field ETBFREQ = Field.create("ETBFREQ", 2514, FieldType.INT16); + public static final Field ETBWASTEGATEPID_PFACTOR = Field.create("ETBWASTEGATEPID_PFACTOR", 2516, FieldType.FLOAT); + public static final Field ETBWASTEGATEPID_IFACTOR = Field.create("ETBWASTEGATEPID_IFACTOR", 2520, FieldType.FLOAT); + public static final Field ETBWASTEGATEPID_DFACTOR = Field.create("ETBWASTEGATEPID_DFACTOR", 2524, FieldType.FLOAT); + public static final Field ETBWASTEGATEPID_OFFSET = Field.create("ETBWASTEGATEPID_OFFSET", 2528, FieldType.INT16); + public static final Field ETBWASTEGATEPID_PERIODMS = Field.create("ETBWASTEGATEPID_PERIODMS", 2530, FieldType.INT16); + public static final Field ETBWASTEGATEPID_MINVALUE = Field.create("ETBWASTEGATEPID_MINVALUE", 2532, FieldType.INT16); + public static final Field ETBWASTEGATEPID_MAXVALUE = Field.create("ETBWASTEGATEPID_MAXVALUE", 2534, FieldType.INT16); public static final Field TIMING_OFFSET_CYLINDER1 = Field.create("TIMING_OFFSET_CYLINDER1", 2540, FieldType.INT); public static final Field TIMING_OFFSET_CYLINDER2 = Field.create("TIMING_OFFSET_CYLINDER2", 2544, FieldType.INT); public static final Field TIMING_OFFSET_CYLINDER3 = Field.create("TIMING_OFFSET_CYLINDER3", 2548, FieldType.INT); @@ -3429,6 +3444,13 @@ public class Fields { AUXTEMPSENSOR2_BIAS_RESISTOR, AUXTEMPSENSOR2_ADCCHANNEL, ETBFREQ, + ETBWASTEGATEPID_PFACTOR, + ETBWASTEGATEPID_IFACTOR, + ETBWASTEGATEPID_DFACTOR, + ETBWASTEGATEPID_OFFSET, + ETBWASTEGATEPID_PERIODMS, + ETBWASTEGATEPID_MINVALUE, + ETBWASTEGATEPID_MAXVALUE, TIMING_OFFSET_CYLINDER1, TIMING_OFFSET_CYLINDER2, TIMING_OFFSET_CYLINDER3, diff --git a/java_console/rusefi.xml b/java_console/rusefi.xml index 0a49b2c8cf..abed09bd51 100644 --- a/java_console/rusefi.xml +++ b/java_console/rusefi.xml @@ -1,6 +1,6 @@ - +