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 84a48895de..9037cbf780 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 Thu Nov 04 23:47:25 UTC 2021 +// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on hellen_cypress_gen_config.bat integration/rusefi_config.txt Fri Nov 05 03:01:49 UTC 2021 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -3708,10 +3708,34 @@ struct engine_configuration_s { */ uint16_t cltRevLimitRpm[CLT_LIMITER_CURVE_SIZE]; /** - units * offset 3340 */ - uint8_t unused3328[524]; + gppwm_note_t scriptCurveName[SCRIPT_CURVE_COUNT]; + /** + x + * offset 3436 + */ + float scriptCurve5Bins[FSIO_CURVE_8]; + /** + y + * offset 3468 + */ + float scriptCurve5[FSIO_CURVE_8]; + /** + x + * offset 3500 + */ + float scriptCurve6Bins[FSIO_CURVE_8]; + /** + y + * offset 3532 + */ + float scriptCurve6[FSIO_CURVE_8]; + /** + units + * offset 3564 + */ + uint8_t unused3328[300]; /** Min tCharge Coeff. * offset 3864 @@ -4410,4 +4434,4 @@ struct 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 Thu Nov 04 23:47:25 UTC 2021 +// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on hellen_cypress_gen_config.bat integration/rusefi_config.txt Fri Nov 05 03:01:49 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 a5242f1c1d..4dd08a352d 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 @@ -1774,6 +1774,17 @@ #define RPM_1_BYTE_PACKING_MULT 50 #define rpmHardLimit_offset 416 #define runningLedPin_offset 1813 +#define SCRIPT_CURVE_COUNT 6 +#define scriptCurve5_offset 3468 +#define scriptCurve5Bins_offset 3436 +#define scriptCurve6_offset 3532 +#define scriptCurve6Bins_offset 3500 +#define scriptCurveName1_offset 3340 +#define scriptCurveName2_offset 3356 +#define scriptCurveName3_offset 3372 +#define scriptCurveName4_offset 3388 +#define scriptCurveName5_offset 3404 +#define scriptCurveName6_offset 3420 #define sdCardCsPin_offset 707 #define sdCardCsPinMode_offset 2226 #define sdCardPeriodMs_offset 804 @@ -1804,8 +1815,8 @@ #define showHumanReadableWarning_offset 976 #define showSdCardWarning_offset 76 #define SIGNATURE_BOARD hellen_cypress -#define SIGNATURE_DATE 2021.11.04 -#define SIGNATURE_HASH 2602924992 +#define SIGNATURE_DATE 2021.11.05 +#define SIGNATURE_HASH 2689211556 #define silentTriggerError_offset 1464 #define slowAdcAlpha_offset 2088 #define sparkDwellRpmBins_offset 332 @@ -2313,7 +2324,7 @@ #define ts_show_spi true #define ts_show_trigger_comparator false #define ts_show_tunerstudio_port true -#define TS_SIGNATURE "rusEFI 2021.11.04.hellen_cypress.2602924992" +#define TS_SIGNATURE "rusEFI 2021.11.05.hellen_cypress.2689211556" #define TS_SINGLE_WRITE_COMMAND 'W' #define TS_SINGLE_WRITE_COMMAND_char W #define TS_TEST_COMMAND 't' @@ -2351,7 +2362,7 @@ #define unused2508_offset 2511 #define unused2536_offset 2539 #define unused3103_offset 3103 -#define unused3328_offset 3340 +#define unused3328_offset 3564 #define unused3942_offset 3992 #define unused3988_offset 3988 #define unused4028_offset 4028 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 4b5145a9ac..2b76a25d75 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 Thu Nov 04 23:47:22 UTC 2021 +// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Fri Nov 05 03:01:47 UTC 2021 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -3702,10 +3702,34 @@ struct engine_configuration_s { */ uint16_t cltRevLimitRpm[CLT_LIMITER_CURVE_SIZE]; /** - units * offset 3312 */ - uint8_t unused3328[524]; + gppwm_note_t scriptCurveName[SCRIPT_CURVE_COUNT]; + /** + x + * offset 3408 + */ + float scriptCurve5Bins[FSIO_CURVE_8]; + /** + y + * offset 3440 + */ + float scriptCurve5[FSIO_CURVE_8]; + /** + x + * offset 3472 + */ + float scriptCurve6Bins[FSIO_CURVE_8]; + /** + y + * offset 3504 + */ + float scriptCurve6[FSIO_CURVE_8]; + /** + units + * offset 3536 + */ + uint8_t unused3328[300]; /** Min tCharge Coeff. * offset 3836 @@ -4404,4 +4428,4 @@ struct persistent_config_s { }; // end -// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Thu Nov 04 23:47:22 UTC 2021 +// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Fri Nov 05 03:01:47 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 3093cfbf4f..1ccb143f3f 100644 --- a/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h +++ b/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h @@ -1759,6 +1759,17 @@ #define RPM_1_BYTE_PACKING_MULT 50 #define rpmHardLimit_offset 416 #define runningLedPin_offset 1813 +#define SCRIPT_CURVE_COUNT 6 +#define scriptCurve5_offset 3440 +#define scriptCurve5Bins_offset 3408 +#define scriptCurve6_offset 3504 +#define scriptCurve6Bins_offset 3472 +#define scriptCurveName1_offset 3312 +#define scriptCurveName2_offset 3328 +#define scriptCurveName3_offset 3344 +#define scriptCurveName4_offset 3360 +#define scriptCurveName5_offset 3376 +#define scriptCurveName6_offset 3392 #define sdCardCsPin_offset 707 #define sdCardCsPinMode_offset 2223 #define sdCardPeriodMs_offset 804 @@ -1789,8 +1800,8 @@ #define showHumanReadableWarning_offset 976 #define showSdCardWarning_offset 76 #define SIGNATURE_BOARD kin -#define SIGNATURE_DATE 2021.11.04 -#define SIGNATURE_HASH 1686157116 +#define SIGNATURE_DATE 2021.11.05 +#define SIGNATURE_HASH 1609551960 #define silentTriggerError_offset 1464 #define slowAdcAlpha_offset 2088 #define sparkDwellRpmBins_offset 332 @@ -2298,7 +2309,7 @@ #define ts_show_spi true #define ts_show_trigger_comparator true #define ts_show_tunerstudio_port true -#define TS_SIGNATURE "rusEFI 2021.11.04.kin.1686157116" +#define TS_SIGNATURE "rusEFI 2021.11.05.kin.1609551960" #define TS_SINGLE_WRITE_COMMAND 'W' #define TS_SINGLE_WRITE_COMMAND_char W #define TS_TEST_COMMAND 't' @@ -2336,7 +2347,7 @@ #define unused2508_offset 2503 #define unused2536_offset 2531 #define unused3103_offset 3075 -#define unused3328_offset 3312 +#define unused3328_offset 3536 #define unused3942_offset 3964 #define unused3988_offset 3960 #define unused4028_offset 4000 diff --git a/firmware/config/boards/subaru_eg33/config/controllers/algo/engine_configuration_generated_structures.h b/firmware/config/boards/subaru_eg33/config/controllers/algo/engine_configuration_generated_structures.h index 1c4b00592a..6c923ea65e 100644 --- a/firmware/config/boards/subaru_eg33/config/controllers/algo/engine_configuration_generated_structures.h +++ b/firmware/config/boards/subaru_eg33/config/controllers/algo/engine_configuration_generated_structures.h @@ -1,4 +1,4 @@ -// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on config/boards/subaru_eg33/config/gen_config.sh integration/rusefi_config.txt Thu Nov 04 23:47:28 UTC 2021 +// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on config/boards/subaru_eg33/config/gen_config.sh integration/rusefi_config.txt Fri Nov 05 03:01:52 UTC 2021 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -3708,10 +3708,34 @@ struct engine_configuration_s { */ uint16_t cltRevLimitRpm[CLT_LIMITER_CURVE_SIZE]; /** - units * offset 3340 */ - uint8_t unused3328[524]; + gppwm_note_t scriptCurveName[SCRIPT_CURVE_COUNT]; + /** + x + * offset 3436 + */ + float scriptCurve5Bins[FSIO_CURVE_8]; + /** + y + * offset 3468 + */ + float scriptCurve5[FSIO_CURVE_8]; + /** + x + * offset 3500 + */ + float scriptCurve6Bins[FSIO_CURVE_8]; + /** + y + * offset 3532 + */ + float scriptCurve6[FSIO_CURVE_8]; + /** + units + * offset 3564 + */ + uint8_t unused3328[300]; /** Min tCharge Coeff. * offset 3864 @@ -4410,4 +4434,4 @@ struct persistent_config_s { }; // end -// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on config/boards/subaru_eg33/config/gen_config.sh integration/rusefi_config.txt Thu Nov 04 23:47:28 UTC 2021 +// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on config/boards/subaru_eg33/config/gen_config.sh integration/rusefi_config.txt Fri Nov 05 03:01:52 UTC 2021 diff --git a/firmware/config/boards/subaru_eg33/config/controllers/algo/rusefi_generated.h b/firmware/config/boards/subaru_eg33/config/controllers/algo/rusefi_generated.h index 072cb54401..bded3e75de 100644 --- a/firmware/config/boards/subaru_eg33/config/controllers/algo/rusefi_generated.h +++ b/firmware/config/boards/subaru_eg33/config/controllers/algo/rusefi_generated.h @@ -1786,6 +1786,17 @@ #define RPM_1_BYTE_PACKING_MULT 50 #define rpmHardLimit_offset 416 #define runningLedPin_offset 1813 +#define SCRIPT_CURVE_COUNT 6 +#define scriptCurve5_offset 3468 +#define scriptCurve5Bins_offset 3436 +#define scriptCurve6_offset 3532 +#define scriptCurve6Bins_offset 3500 +#define scriptCurveName1_offset 3340 +#define scriptCurveName2_offset 3356 +#define scriptCurveName3_offset 3372 +#define scriptCurveName4_offset 3388 +#define scriptCurveName5_offset 3404 +#define scriptCurveName6_offset 3420 #define sdCardCsPin_offset 707 #define sdCardCsPinMode_offset 2226 #define sdCardPeriodMs_offset 804 @@ -1817,8 +1828,8 @@ #define showHumanReadableWarning_offset 976 #define showSdCardWarning_offset 76 #define SIGNATURE_BOARD subaru_eg33_f7 -#define SIGNATURE_DATE 2021.11.04 -#define SIGNATURE_HASH 1288915827 +#define SIGNATURE_DATE 2021.11.05 +#define SIGNATURE_HASH 2008820759 #define silentTriggerError_offset 1464 #define slowAdcAlpha_offset 2088 #define sparkDwellRpmBins_offset 332 @@ -2326,7 +2337,7 @@ #define ts_show_spi true #define ts_show_trigger_comparator false #define ts_show_tunerstudio_port false -#define TS_SIGNATURE "rusEFI 2021.11.04.subaru_eg33_f7.1288915827" +#define TS_SIGNATURE "rusEFI 2021.11.05.subaru_eg33_f7.2008820759" #define TS_SINGLE_WRITE_COMMAND 'W' #define TS_SINGLE_WRITE_COMMAND_char W #define TS_TEST_COMMAND 't' @@ -2364,7 +2375,7 @@ #define unused2508_offset 2511 #define unused2536_offset 2539 #define unused3103_offset 3103 -#define unused3328_offset 3340 +#define unused3328_offset 3564 #define unused3942_offset 3992 #define unused3988_offset 3988 #define unused4028_offset 4028 diff --git a/firmware/controllers/generated/engine_configuration_generated_structures.h b/firmware/controllers/generated/engine_configuration_generated_structures.h index 7e29ac98c1..c82a3f04d8 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 Thu Nov 04 23:47:19 UTC 2021 +// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Fri Nov 05 03:01:44 UTC 2021 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -3708,10 +3708,34 @@ struct engine_configuration_s { */ uint16_t cltRevLimitRpm[CLT_LIMITER_CURVE_SIZE]; /** - units * offset 3340 */ - uint8_t unused3328[524]; + gppwm_note_t scriptCurveName[SCRIPT_CURVE_COUNT]; + /** + x + * offset 3436 + */ + float scriptCurve5Bins[FSIO_CURVE_8]; + /** + y + * offset 3468 + */ + float scriptCurve5[FSIO_CURVE_8]; + /** + x + * offset 3500 + */ + float scriptCurve6Bins[FSIO_CURVE_8]; + /** + y + * offset 3532 + */ + float scriptCurve6[FSIO_CURVE_8]; + /** + units + * offset 3564 + */ + uint8_t unused3328[300]; /** Min tCharge Coeff. * offset 3864 @@ -4410,4 +4434,4 @@ struct persistent_config_s { }; // end -// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Nov 04 23:47:19 UTC 2021 +// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Fri Nov 05 03:01:44 UTC 2021 diff --git a/firmware/controllers/generated/fsio_enums_generated.def b/firmware/controllers/generated/fsio_enums_generated.def index ee1710077e..b3a4d97772 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 Thu Nov 04 23:47:19 UTC 2021 +// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Fri Nov 05 03:01:44 UTC 2021 // by class com.rusefi.output.FileFsioSettingsConsumer FSIO_SETTING_ACIDLEEXTRAOFFSET = 1000, diff --git a/firmware/controllers/generated/fsio_getters.def b/firmware/controllers/generated/fsio_getters.def index 8915efcd59..bfce6ab25f 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 Thu Nov 04 23:47:19 UTC 2021 +// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Fri Nov 05 03:01:44 UTC 2021 // by class com.rusefi.output.FileFsioSettingsConsumer case FSIO_SETTING_ACIDLEEXTRAOFFSET: diff --git a/firmware/controllers/generated/fsio_names.def b/firmware/controllers/generated/fsio_names.def index dc0ac15a93..42c7dd941a 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 Thu Nov 04 23:47:19 UTC 2021 +// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Fri Nov 05 03:01:44 UTC 2021 // by class com.rusefi.output.FileFsioSettingsConsumer static LENameOrdinalPair leacIdleExtraOffset(FSIO_SETTING_ACIDLEEXTRAOFFSET, "cfg_acIdleExtraOffset"); diff --git a/firmware/controllers/generated/fsio_strings.def b/firmware/controllers/generated/fsio_strings.def index b2f322b273..b4752d5c97 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 Thu Nov 04 23:47:19 UTC 2021 +// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Fri Nov 05 03:01:44 UTC 2021 // by class com.rusefi.output.FileFsioSettingsConsumer case FSIO_SETTING_ACIDLEEXTRAOFFSET: diff --git a/firmware/controllers/generated/rusefi_generated.h b/firmware/controllers/generated/rusefi_generated.h index 56b843e8bd..993b5eb12b 100644 --- a/firmware/controllers/generated/rusefi_generated.h +++ b/firmware/controllers/generated/rusefi_generated.h @@ -1774,6 +1774,17 @@ #define RPM_1_BYTE_PACKING_MULT 50 #define rpmHardLimit_offset 416 #define runningLedPin_offset 1813 +#define SCRIPT_CURVE_COUNT 6 +#define scriptCurve5_offset 3468 +#define scriptCurve5Bins_offset 3436 +#define scriptCurve6_offset 3532 +#define scriptCurve6Bins_offset 3500 +#define scriptCurveName1_offset 3340 +#define scriptCurveName2_offset 3356 +#define scriptCurveName3_offset 3372 +#define scriptCurveName4_offset 3388 +#define scriptCurveName5_offset 3404 +#define scriptCurveName6_offset 3420 #define sdCardCsPin_offset 707 #define sdCardCsPinMode_offset 2226 #define sdCardPeriodMs_offset 804 @@ -1804,8 +1815,8 @@ #define showHumanReadableWarning_offset 976 #define showSdCardWarning_offset 76 #define SIGNATURE_BOARD all -#define SIGNATURE_DATE 2021.11.04 -#define SIGNATURE_HASH 3646529552 +#define SIGNATURE_DATE 2021.11.05 +#define SIGNATURE_HASH 3795240820 #define silentTriggerError_offset 1464 #define slowAdcAlpha_offset 2088 #define sparkDwellRpmBins_offset 332 @@ -2313,7 +2324,7 @@ #define ts_show_spi true #define ts_show_trigger_comparator false #define ts_show_tunerstudio_port true -#define TS_SIGNATURE "rusEFI 2021.11.04.all.3646529552" +#define TS_SIGNATURE "rusEFI 2021.11.05.all.3795240820" #define TS_SINGLE_WRITE_COMMAND 'W' #define TS_SINGLE_WRITE_COMMAND_char W #define TS_TEST_COMMAND 't' @@ -2351,7 +2362,7 @@ #define unused2508_offset 2511 #define unused2536_offset 2539 #define unused3103_offset 3103 -#define unused3328_offset 3340 +#define unused3328_offset 3564 #define unused3942_offset 3992 #define unused3988_offset 3988 #define unused4028_offset 4028 diff --git a/firmware/controllers/generated/signature_all.h b/firmware/controllers/generated/signature_all.h index 403daaad68..5076e782a8 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.11.04 -#define SIGNATURE_HASH 3646529552 -#define TS_SIGNATURE "rusEFI 2021.11.04.all.3646529552" +#define SIGNATURE_DATE 2021.11.05 +#define SIGNATURE_HASH 3795240820 +#define TS_SIGNATURE "rusEFI 2021.11.05.all.3795240820" diff --git a/firmware/controllers/generated/signature_atlas.h b/firmware/controllers/generated/signature_atlas.h index 7b0232bd64..1d92e7081d 100644 --- a/firmware/controllers/generated/signature_atlas.h +++ b/firmware/controllers/generated/signature_atlas.h @@ -3,6 +3,6 @@ // #define SIGNATURE_BOARD atlas -#define SIGNATURE_DATE 2021.11.04 -#define SIGNATURE_HASH 3314767159 -#define TS_SIGNATURE "rusEFI 2021.11.04.atlas.3314767159" +#define SIGNATURE_DATE 2021.11.05 +#define SIGNATURE_HASH 4277940819 +#define TS_SIGNATURE "rusEFI 2021.11.05.atlas.4277940819" diff --git a/firmware/controllers/generated/signature_f429-discovery.h b/firmware/controllers/generated/signature_f429-discovery.h index 02e401568b..141d249767 100644 --- a/firmware/controllers/generated/signature_f429-discovery.h +++ b/firmware/controllers/generated/signature_f429-discovery.h @@ -3,6 +3,6 @@ // #define SIGNATURE_BOARD f429-discovery -#define SIGNATURE_DATE 2021.11.04 -#define SIGNATURE_HASH 3646529552 -#define TS_SIGNATURE "rusEFI 2021.11.04.f429-discovery.3646529552" +#define SIGNATURE_DATE 2021.11.05 +#define SIGNATURE_HASH 3795240820 +#define TS_SIGNATURE "rusEFI 2021.11.05.f429-discovery.3795240820" diff --git a/firmware/controllers/generated/signature_frankenso_na6.h b/firmware/controllers/generated/signature_frankenso_na6.h index bef2d0fcff..2221a0fb95 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.11.04 -#define SIGNATURE_HASH 2741761529 -#define TS_SIGNATURE "rusEFI 2021.11.04.frankenso_na6.2741761529" +#define SIGNATURE_DATE 2021.11.05 +#define SIGNATURE_HASH 2550436509 +#define TS_SIGNATURE "rusEFI 2021.11.05.frankenso_na6.2550436509" diff --git a/firmware/controllers/generated/signature_hellen-nb1.h b/firmware/controllers/generated/signature_hellen-nb1.h index e6eeb013b5..1e02906dcb 100644 --- a/firmware/controllers/generated/signature_hellen-nb1.h +++ b/firmware/controllers/generated/signature_hellen-nb1.h @@ -3,6 +3,6 @@ // #define SIGNATURE_BOARD hellen-nb1 -#define SIGNATURE_DATE 2021.11.04 -#define SIGNATURE_HASH 3204326969 -#define TS_SIGNATURE "rusEFI 2021.11.04.hellen-nb1.3204326969" +#define SIGNATURE_DATE 2021.11.05 +#define SIGNATURE_HASH 2240889181 +#define TS_SIGNATURE "rusEFI 2021.11.05.hellen-nb1.2240889181" diff --git a/firmware/controllers/generated/signature_hellen121nissan.h b/firmware/controllers/generated/signature_hellen121nissan.h index 744c590abb..db9f7f6fab 100644 --- a/firmware/controllers/generated/signature_hellen121nissan.h +++ b/firmware/controllers/generated/signature_hellen121nissan.h @@ -3,6 +3,6 @@ // #define SIGNATURE_BOARD hellen121nissan -#define SIGNATURE_DATE 2021.11.04 -#define SIGNATURE_HASH 1386805330 -#define TS_SIGNATURE "rusEFI 2021.11.04.hellen121nissan.1386805330" +#define SIGNATURE_DATE 2021.11.05 +#define SIGNATURE_HASH 1774690102 +#define TS_SIGNATURE "rusEFI 2021.11.05.hellen121nissan.1774690102" diff --git a/firmware/controllers/generated/signature_hellen121vag.h b/firmware/controllers/generated/signature_hellen121vag.h index 07fae6acf7..a4e1097de8 100644 --- a/firmware/controllers/generated/signature_hellen121vag.h +++ b/firmware/controllers/generated/signature_hellen121vag.h @@ -3,6 +3,6 @@ // #define SIGNATURE_BOARD hellen121vag -#define SIGNATURE_DATE 2021.11.04 -#define SIGNATURE_HASH 2327134294 -#define TS_SIGNATURE "rusEFI 2021.11.04.hellen121vag.2327134294" +#define SIGNATURE_DATE 2021.11.05 +#define SIGNATURE_HASH 2983864114 +#define TS_SIGNATURE "rusEFI 2021.11.05.hellen121vag.2983864114" diff --git a/firmware/controllers/generated/signature_hellen128.h b/firmware/controllers/generated/signature_hellen128.h index 519bbad0ac..30c185d349 100644 --- a/firmware/controllers/generated/signature_hellen128.h +++ b/firmware/controllers/generated/signature_hellen128.h @@ -3,6 +3,6 @@ // #define SIGNATURE_BOARD hellen128 -#define SIGNATURE_DATE 2021.11.04 -#define SIGNATURE_HASH 257538240 -#define TS_SIGNATURE "rusEFI 2021.11.04.hellen128.257538240" +#define SIGNATURE_DATE 2021.11.05 +#define SIGNATURE_HASH 876011428 +#define TS_SIGNATURE "rusEFI 2021.11.05.hellen128.876011428" diff --git a/firmware/controllers/generated/signature_hellen154hyundai.h b/firmware/controllers/generated/signature_hellen154hyundai.h index 32b08e7818..a357714db4 100644 --- a/firmware/controllers/generated/signature_hellen154hyundai.h +++ b/firmware/controllers/generated/signature_hellen154hyundai.h @@ -3,6 +3,6 @@ // #define SIGNATURE_BOARD hellen154hyundai -#define SIGNATURE_DATE 2021.11.04 -#define SIGNATURE_HASH 2636514858 -#define TS_SIGNATURE "rusEFI 2021.11.04.hellen154hyundai.2636514858" +#define SIGNATURE_DATE 2021.11.05 +#define SIGNATURE_HASH 2789826894 +#define TS_SIGNATURE "rusEFI 2021.11.05.hellen154hyundai.2789826894" diff --git a/firmware/controllers/generated/signature_hellen72.h b/firmware/controllers/generated/signature_hellen72.h index e649803b7f..568cdcbd67 100644 --- a/firmware/controllers/generated/signature_hellen72.h +++ b/firmware/controllers/generated/signature_hellen72.h @@ -3,6 +3,6 @@ // #define SIGNATURE_BOARD hellen72 -#define SIGNATURE_DATE 2021.11.04 -#define SIGNATURE_HASH 3217866807 -#define TS_SIGNATURE "rusEFI 2021.11.04.hellen72.3217866807" +#define SIGNATURE_DATE 2021.11.05 +#define SIGNATURE_HASH 2225317715 +#define TS_SIGNATURE "rusEFI 2021.11.05.hellen72.2225317715" diff --git a/firmware/controllers/generated/signature_hellen88bmw.h b/firmware/controllers/generated/signature_hellen88bmw.h index c6077a027e..601aceb6a7 100644 --- a/firmware/controllers/generated/signature_hellen88bmw.h +++ b/firmware/controllers/generated/signature_hellen88bmw.h @@ -3,6 +3,6 @@ // #define SIGNATURE_BOARD hellen88bmw -#define SIGNATURE_DATE 2021.11.04 -#define SIGNATURE_HASH 802774269 -#define TS_SIGNATURE "rusEFI 2021.11.04.hellen88bmw.802774269" +#define SIGNATURE_DATE 2021.11.05 +#define SIGNATURE_HASH 347487129 +#define TS_SIGNATURE "rusEFI 2021.11.05.hellen88bmw.347487129" diff --git a/firmware/controllers/generated/signature_hellenNA6.h b/firmware/controllers/generated/signature_hellenNA6.h index 4f9142f14b..16da12c812 100644 --- a/firmware/controllers/generated/signature_hellenNA6.h +++ b/firmware/controllers/generated/signature_hellenNA6.h @@ -3,6 +3,6 @@ // #define SIGNATURE_BOARD hellenNA6 -#define SIGNATURE_DATE 2021.11.04 -#define SIGNATURE_HASH 1744939294 -#define TS_SIGNATURE "rusEFI 2021.11.04.hellenNA6.1744939294" +#define SIGNATURE_DATE 2021.11.05 +#define SIGNATURE_HASH 1399770746 +#define TS_SIGNATURE "rusEFI 2021.11.05.hellenNA6.1399770746" diff --git a/firmware/controllers/generated/signature_hellen_cypress.h b/firmware/controllers/generated/signature_hellen_cypress.h index 931bc78052..0daf1cc616 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.11.04 -#define SIGNATURE_HASH 2602924992 -#define TS_SIGNATURE "rusEFI 2021.11.04.hellen_cypress.2602924992" +#define SIGNATURE_DATE 2021.11.05 +#define SIGNATURE_HASH 2689211556 +#define TS_SIGNATURE "rusEFI 2021.11.05.hellen_cypress.2689211556" diff --git a/firmware/controllers/generated/signature_kin.h b/firmware/controllers/generated/signature_kin.h index 8c5b01cfa4..db14e9aa08 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.11.04 -#define SIGNATURE_HASH 1686157116 -#define TS_SIGNATURE "rusEFI 2021.11.04.kin.1686157116" +#define SIGNATURE_DATE 2021.11.05 +#define SIGNATURE_HASH 1609551960 +#define TS_SIGNATURE "rusEFI 2021.11.05.kin.1609551960" diff --git a/firmware/controllers/generated/signature_mre_f4.h b/firmware/controllers/generated/signature_mre_f4.h index b9d86dc1fc..4456654471 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.11.04 -#define SIGNATURE_HASH 1372174212 -#define TS_SIGNATURE "rusEFI 2021.11.04.mre_f4.1372174212" +#define SIGNATURE_DATE 2021.11.05 +#define SIGNATURE_HASH 1789317344 +#define TS_SIGNATURE "rusEFI 2021.11.05.mre_f4.1789317344" diff --git a/firmware/controllers/generated/signature_mre_f7.h b/firmware/controllers/generated/signature_mre_f7.h index 9862c6a0d8..36e8bcdcbf 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.11.04 -#define SIGNATURE_HASH 1372174212 -#define TS_SIGNATURE "rusEFI 2021.11.04.mre_f7.1372174212" +#define SIGNATURE_DATE 2021.11.05 +#define SIGNATURE_HASH 1789317344 +#define TS_SIGNATURE "rusEFI 2021.11.05.mre_f7.1789317344" diff --git a/firmware/controllers/generated/signature_prometheus_405.h b/firmware/controllers/generated/signature_prometheus_405.h index 67e29403df..ac8ed07587 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.11.04 -#define SIGNATURE_HASH 2310240758 -#define TS_SIGNATURE "rusEFI 2021.11.04.prometheus_405.2310240758" +#define SIGNATURE_DATE 2021.11.05 +#define SIGNATURE_HASH 3000770194 +#define TS_SIGNATURE "rusEFI 2021.11.05.prometheus_405.3000770194" diff --git a/firmware/controllers/generated/signature_prometheus_469.h b/firmware/controllers/generated/signature_prometheus_469.h index f84f500624..ec2933f7d3 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.11.04 -#define SIGNATURE_HASH 2310240758 -#define TS_SIGNATURE "rusEFI 2021.11.04.prometheus_469.2310240758" +#define SIGNATURE_DATE 2021.11.05 +#define SIGNATURE_HASH 3000770194 +#define TS_SIGNATURE "rusEFI 2021.11.05.prometheus_469.3000770194" diff --git a/firmware/controllers/generated/signature_proteus_f4.h b/firmware/controllers/generated/signature_proteus_f4.h index 8d67c8e83b..55bb347dec 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.11.04 -#define SIGNATURE_HASH 1203628236 -#define TS_SIGNATURE "rusEFI 2021.11.04.proteus_f4.1203628236" +#define SIGNATURE_DATE 2021.11.05 +#define SIGNATURE_HASH 2094174120 +#define TS_SIGNATURE "rusEFI 2021.11.05.proteus_f4.2094174120" diff --git a/firmware/controllers/generated/signature_proteus_f7.h b/firmware/controllers/generated/signature_proteus_f7.h index 1dc90aafe3..35f7bf0d1c 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.11.04 -#define SIGNATURE_HASH 1203628236 -#define TS_SIGNATURE "rusEFI 2021.11.04.proteus_f7.1203628236" +#define SIGNATURE_DATE 2021.11.05 +#define SIGNATURE_HASH 2094174120 +#define TS_SIGNATURE "rusEFI 2021.11.05.proteus_f7.2094174120" diff --git a/firmware/controllers/generated/signature_subaru_eg33_f7.h b/firmware/controllers/generated/signature_subaru_eg33_f7.h index 0638ab934c..23d4906d31 100644 --- a/firmware/controllers/generated/signature_subaru_eg33_f7.h +++ b/firmware/controllers/generated/signature_subaru_eg33_f7.h @@ -3,6 +3,6 @@ // #define SIGNATURE_BOARD subaru_eg33_f7 -#define SIGNATURE_DATE 2021.11.04 -#define SIGNATURE_HASH 1288915827 -#define TS_SIGNATURE "rusEFI 2021.11.04.subaru_eg33_f7.1288915827" +#define SIGNATURE_DATE 2021.11.05 +#define SIGNATURE_HASH 2008820759 +#define TS_SIGNATURE "rusEFI 2021.11.05.subaru_eg33_f7.2008820759" diff --git a/firmware/tunerstudio/generated/cache.zip b/firmware/tunerstudio/generated/cache.zip index 2b8c640f09..19697c5eeb 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 5d0eb81c0a..96e9cfe455 100644 --- a/firmware/tunerstudio/generated/rusefi.ini +++ b/firmware/tunerstudio/generated/rusefi.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2021.11.04.all.3646529552" + signature = "rusEFI 2021.11.05.all.3795240820" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.11.04.all.3646529552" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.11.05.all.3795240820" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -85,7 +85,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 Nov 04 23:47:19 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Fri Nov 05 03:01:44 UTC 2021 pageSize = 20000 page = 1 @@ -1087,7 +1087,17 @@ lowPressureFuel_v2 = scalar, F32, 3320, "volts", 1, 0, 0, 10, 2 lowPressureFuel_value2 = scalar, F32, 3324, "kPa", 1, 0, 0, 1000000, 2 cltRevLimitRpmBins = array, S08, 3328, [4], "C", 1, 0, -70, 120, 0 cltRevLimitRpm = array, U16, 3332, [4], "", 1, 0, 0, 8000, 0 -unused3328 = array, U08, 3340, [524], "units", 1, 0, -20, 100, 0 +scriptCurveName1 = string, ASCII, 3340, 16 +scriptCurveName2 = string, ASCII, 3356, 16 +scriptCurveName3 = string, ASCII, 3372, 16 +scriptCurveName4 = string, ASCII, 3388, 16 +scriptCurveName5 = string, ASCII, 3404, 16 +scriptCurveName6 = string, ASCII, 3420, 16 +scriptCurve5Bins = array, F32, 3436, [8], "x", 1, 0, -999, 1000, 3 +scriptCurve5 = array, F32, 3468, [8], "y", 1, 0, -999, 1000, 3 +scriptCurve6Bins = array, F32, 3500, [8], "x", 1, 0, -999, 1000, 3 +scriptCurve6 = array, F32, 3532, [8], "y", 1, 0, -999, 1000, 3 +unused3328 = array, U08, 3564, [300], "units", 1, 0, -20, 100, 0 tChargeAirCoefMin = scalar, F32, 3864, "Min tCharge Coeff.", 1, 0, 0, 1, 4 tChargeAirCoefMax = scalar, F32, 3868, "Max tCharge Coeff.", 1, 0, 0, 1, 4 tChargeAirFlowMax = scalar, F32, 3872, "Max Air Flow (kg/h)", 1, 0, 0, 1000, 1 @@ -2314,33 +2324,53 @@ fsioTable4RpmBins = array, F32, 19968, [8], "RPM", 1, 0, 0, 25500, 2 gauge = afr1Gauge #endif - curve = fsioCurve1, "FSIO Curve #1" + curve = fsioCurve1, "Script Curve #1" columnLabel = "X", "Y" xAxis = 0, 128, 10 yAxis = -155, 150, 10 xBins = fsioCurve1Bins yBins = fsioCurve1 - - curve = fsioCurve2, "FSIO Curve #2" + showTextValues = true + + curve = fsioCurve2, "Script Curve #2" columnLabel = "X", "Y" xAxis = 0, 128, 10 yAxis = -150, 150, 10 xBins = fsioCurve2Bins yBins = fsioCurve2 + showTextValues = true - curve = fsioCurve3, "FSIO Curve #3" + curve = fsioCurve3, "Script Curve #3" columnLabel = "X", "Y" xAxis = 0, 128, 10 yAxis = -5, 5, 10 xBins = fsioCurve3Bins yBins = fsioCurve3 + showTextValues = true - curve = fsioCurve4, "FSIO Curve #4" + curve = fsioCurve4, "Script Curve #4" columnLabel = "X", "Y" xAxis = 0, 128, 10 yAxis = -5, 5, 10 xBins = fsioCurve4Bins yBins = fsioCurve4 + showTextValues = true + + curve = scriptCurve5, "Script Curve #5" + columnLabel = "X", "Y" + xAxis = 0, 128, 10 + yAxis = -5, 5, 10 + xBins = scriptCurve5Bins + yBins = scriptCurve5 + showTextValues = true + + curve = scriptCurve6, "Script Curve #6" + columnLabel = "X", "Y" + xAxis = 0, 128, 10 + yAxis = -5, 5, 10 + xBins = scriptCurve6Bins + yBins = scriptCurve6 + showTextValues = true curve = mapAccelTaper, "Engine Load Acceleration Enrichment Taper" columnLabel = "Distance", "Multiplier" @@ -3286,14 +3316,16 @@ menuDialog = main subMenu = fsioFormulas, "FSIO Formulas" subMenu = std_separator - subMenu = fsioTable1Tbl, "FSIO Table #1" - subMenu = fsioTable2Tbl, "FSIO Table #2" - subMenu = fsioTable3Tbl, "FSIO Table #3" - subMenu = fsioTable4Tbl, "FSIO Table #4" - subMenu = fsioCurve1, "FSIO Curve #1" - subMenu = fsioCurve2, "FSIO Curve #2" - subMenu = fsioCurve3, "FSIO Curve #3" - subMenu = fsioCurve4, "FSIO Curve #4" + subMenu = fsioTable1Tbl, "Script Table #1" + subMenu = fsioTable2Tbl, "Script Table #2" + subMenu = fsioTable3Tbl, "Script Table #3" + subMenu = fsioTable4Tbl, "Script Table #4" + subMenu = scriptCurve1Settings, "Script Curve #1" + subMenu = scriptCurve2Settings, "Script Curve #2" + subMenu = scriptCurve3Settings, "Script Curve #3" + subMenu = scriptCurve4Settings, "Script Curve #4" + subMenu = scriptCurve5Settings, "Script Curve #5" + subMenu = scriptCurve6Settings, "Script Curve #6" subMenu = std_separator subMenu = luaOutputs, "Lua PWM Outputs" @@ -3574,6 +3606,30 @@ cmd_set_engine_type_8888_test = "Z\x00\x30\x00\x3B" cmd_set_engine_type_default = "Z\x00\x31\x00\x00" [UserDefined] + dialog = scriptCurve1Settings, "", yAxis + field = "Name", scriptCurveName4 + panel = fsioCurve1 + + dialog = scriptCurve2Settings, "", yAxis + field = "Name", scriptCurveName4 + panel = fsioCurve2 + + dialog = scriptCurve3Settings, "", yAxis + field = "Name", scriptCurveName4 + panel = fsioCurve3 + + dialog = scriptCurve4Settings, "", yAxis + field = "Name", scriptCurveName4 + panel = fsioCurve4 + + dialog = scriptCurve5Settings, "", yAxis + field = "Name", scriptCurveName5 + panel = scriptCurve5 + + dialog = scriptCurve6Settings, "", yAxis + field = "Name", scriptCurveName6 + panel = scriptCurve6 + dialog = tChargeRpmTpsSettings, "RPM+TPS Mode Settings" field = "We use these coefficients to approximate air/fuel charge temperate" field = "based on CLT and IAT, depending on RPM and TPM" diff --git a/firmware/tunerstudio/generated/rusefi_atlas.ini b/firmware/tunerstudio/generated/rusefi_atlas.ini index 31c4d527ce..fca6f57641 100644 --- a/firmware/tunerstudio/generated/rusefi_atlas.ini +++ b/firmware/tunerstudio/generated/rusefi_atlas.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2021.11.04.atlas.3314767159" + signature = "rusEFI 2021.11.05.atlas.4277940819" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.11.04.atlas.3314767159" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.11.05.atlas.4277940819" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -85,7 +85,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 Nov 04 23:47:16 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Fri Nov 05 03:01:41 UTC 2021 pageSize = 20000 page = 1 @@ -1087,7 +1087,17 @@ lowPressureFuel_v2 = scalar, F32, 3320, "volts", 1, 0, 0, 10, 2 lowPressureFuel_value2 = scalar, F32, 3324, "kPa", 1, 0, 0, 1000000, 2 cltRevLimitRpmBins = array, S08, 3328, [4], "C", 1, 0, -70, 120, 0 cltRevLimitRpm = array, U16, 3332, [4], "", 1, 0, 0, 8000, 0 -unused3328 = array, U08, 3340, [524], "units", 1, 0, -20, 100, 0 +scriptCurveName1 = string, ASCII, 3340, 16 +scriptCurveName2 = string, ASCII, 3356, 16 +scriptCurveName3 = string, ASCII, 3372, 16 +scriptCurveName4 = string, ASCII, 3388, 16 +scriptCurveName5 = string, ASCII, 3404, 16 +scriptCurveName6 = string, ASCII, 3420, 16 +scriptCurve5Bins = array, F32, 3436, [8], "x", 1, 0, -999, 1000, 3 +scriptCurve5 = array, F32, 3468, [8], "y", 1, 0, -999, 1000, 3 +scriptCurve6Bins = array, F32, 3500, [8], "x", 1, 0, -999, 1000, 3 +scriptCurve6 = array, F32, 3532, [8], "y", 1, 0, -999, 1000, 3 +unused3328 = array, U08, 3564, [300], "units", 1, 0, -20, 100, 0 tChargeAirCoefMin = scalar, F32, 3864, "Min tCharge Coeff.", 1, 0, 0, 1, 4 tChargeAirCoefMax = scalar, F32, 3868, "Max tCharge Coeff.", 1, 0, 0, 1, 4 tChargeAirFlowMax = scalar, F32, 3872, "Max Air Flow (kg/h)", 1, 0, 0, 1000, 1 @@ -2314,33 +2324,53 @@ fsioTable4RpmBins = array, F32, 19968, [8], "RPM", 1, 0, 0, 25500, 2 gauge = afr1Gauge #endif - curve = fsioCurve1, "FSIO Curve #1" + curve = fsioCurve1, "Script Curve #1" columnLabel = "X", "Y" xAxis = 0, 128, 10 yAxis = -155, 150, 10 xBins = fsioCurve1Bins yBins = fsioCurve1 - - curve = fsioCurve2, "FSIO Curve #2" + showTextValues = true + + curve = fsioCurve2, "Script Curve #2" columnLabel = "X", "Y" xAxis = 0, 128, 10 yAxis = -150, 150, 10 xBins = fsioCurve2Bins yBins = fsioCurve2 + showTextValues = true - curve = fsioCurve3, "FSIO Curve #3" + curve = fsioCurve3, "Script Curve #3" columnLabel = "X", "Y" xAxis = 0, 128, 10 yAxis = -5, 5, 10 xBins = fsioCurve3Bins yBins = fsioCurve3 + showTextValues = true - curve = fsioCurve4, "FSIO Curve #4" + curve = fsioCurve4, "Script Curve #4" columnLabel = "X", "Y" xAxis = 0, 128, 10 yAxis = -5, 5, 10 xBins = fsioCurve4Bins yBins = fsioCurve4 + showTextValues = true + + curve = scriptCurve5, "Script Curve #5" + columnLabel = "X", "Y" + xAxis = 0, 128, 10 + yAxis = -5, 5, 10 + xBins = scriptCurve5Bins + yBins = scriptCurve5 + showTextValues = true + + curve = scriptCurve6, "Script Curve #6" + columnLabel = "X", "Y" + xAxis = 0, 128, 10 + yAxis = -5, 5, 10 + xBins = scriptCurve6Bins + yBins = scriptCurve6 + showTextValues = true curve = mapAccelTaper, "Engine Load Acceleration Enrichment Taper" columnLabel = "Distance", "Multiplier" @@ -3286,14 +3316,16 @@ menuDialog = main subMenu = fsioFormulas, "FSIO Formulas" subMenu = std_separator - subMenu = fsioTable1Tbl, "FSIO Table #1" - subMenu = fsioTable2Tbl, "FSIO Table #2" - subMenu = fsioTable3Tbl, "FSIO Table #3" - subMenu = fsioTable4Tbl, "FSIO Table #4" - subMenu = fsioCurve1, "FSIO Curve #1" - subMenu = fsioCurve2, "FSIO Curve #2" - subMenu = fsioCurve3, "FSIO Curve #3" - subMenu = fsioCurve4, "FSIO Curve #4" + subMenu = fsioTable1Tbl, "Script Table #1" + subMenu = fsioTable2Tbl, "Script Table #2" + subMenu = fsioTable3Tbl, "Script Table #3" + subMenu = fsioTable4Tbl, "Script Table #4" + subMenu = scriptCurve1Settings, "Script Curve #1" + subMenu = scriptCurve2Settings, "Script Curve #2" + subMenu = scriptCurve3Settings, "Script Curve #3" + subMenu = scriptCurve4Settings, "Script Curve #4" + subMenu = scriptCurve5Settings, "Script Curve #5" + subMenu = scriptCurve6Settings, "Script Curve #6" subMenu = std_separator subMenu = luaOutputs, "Lua PWM Outputs" @@ -3574,6 +3606,30 @@ cmd_set_engine_type_8888_test = "Z\x00\x30\x00\x3B" cmd_set_engine_type_default = "Z\x00\x31\x00\x00" [UserDefined] + dialog = scriptCurve1Settings, "", yAxis + field = "Name", scriptCurveName4 + panel = fsioCurve1 + + dialog = scriptCurve2Settings, "", yAxis + field = "Name", scriptCurveName4 + panel = fsioCurve2 + + dialog = scriptCurve3Settings, "", yAxis + field = "Name", scriptCurveName4 + panel = fsioCurve3 + + dialog = scriptCurve4Settings, "", yAxis + field = "Name", scriptCurveName4 + panel = fsioCurve4 + + dialog = scriptCurve5Settings, "", yAxis + field = "Name", scriptCurveName5 + panel = scriptCurve5 + + dialog = scriptCurve6Settings, "", yAxis + field = "Name", scriptCurveName6 + panel = scriptCurve6 + dialog = tChargeRpmTpsSettings, "RPM+TPS Mode Settings" field = "We use these coefficients to approximate air/fuel charge temperate" field = "based on CLT and IAT, depending on RPM and TPM" diff --git a/firmware/tunerstudio/generated/rusefi_f429-discovery.ini b/firmware/tunerstudio/generated/rusefi_f429-discovery.ini index 71b9758816..f417f4a3f6 100644 --- a/firmware/tunerstudio/generated/rusefi_f429-discovery.ini +++ b/firmware/tunerstudio/generated/rusefi_f429-discovery.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2021.11.04.f429-discovery.3646529552" + signature = "rusEFI 2021.11.05.f429-discovery.3795240820" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.11.04.f429-discovery.3646529552" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.11.05.f429-discovery.3795240820" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -85,7 +85,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 Nov 04 23:46:26 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Fri Nov 05 03:00:53 UTC 2021 pageSize = 20000 page = 1 @@ -1087,7 +1087,17 @@ lowPressureFuel_v2 = scalar, F32, 3320, "volts", 1, 0, 0, 10, 2 lowPressureFuel_value2 = scalar, F32, 3324, "kPa", 1, 0, 0, 1000000, 2 cltRevLimitRpmBins = array, S08, 3328, [4], "C", 1, 0, -70, 120, 0 cltRevLimitRpm = array, U16, 3332, [4], "", 1, 0, 0, 8000, 0 -unused3328 = array, U08, 3340, [524], "units", 1, 0, -20, 100, 0 +scriptCurveName1 = string, ASCII, 3340, 16 +scriptCurveName2 = string, ASCII, 3356, 16 +scriptCurveName3 = string, ASCII, 3372, 16 +scriptCurveName4 = string, ASCII, 3388, 16 +scriptCurveName5 = string, ASCII, 3404, 16 +scriptCurveName6 = string, ASCII, 3420, 16 +scriptCurve5Bins = array, F32, 3436, [8], "x", 1, 0, -999, 1000, 3 +scriptCurve5 = array, F32, 3468, [8], "y", 1, 0, -999, 1000, 3 +scriptCurve6Bins = array, F32, 3500, [8], "x", 1, 0, -999, 1000, 3 +scriptCurve6 = array, F32, 3532, [8], "y", 1, 0, -999, 1000, 3 +unused3328 = array, U08, 3564, [300], "units", 1, 0, -20, 100, 0 tChargeAirCoefMin = scalar, F32, 3864, "Min tCharge Coeff.", 1, 0, 0, 1, 4 tChargeAirCoefMax = scalar, F32, 3868, "Max tCharge Coeff.", 1, 0, 0, 1, 4 tChargeAirFlowMax = scalar, F32, 3872, "Max Air Flow (kg/h)", 1, 0, 0, 1000, 1 @@ -2314,33 +2324,53 @@ fsioTable4RpmBins = array, F32, 19968, [8], "RPM", 1, 0, 0, 25500, 2 gauge = afr1Gauge #endif - curve = fsioCurve1, "FSIO Curve #1" + curve = fsioCurve1, "Script Curve #1" columnLabel = "X", "Y" xAxis = 0, 128, 10 yAxis = -155, 150, 10 xBins = fsioCurve1Bins yBins = fsioCurve1 - - curve = fsioCurve2, "FSIO Curve #2" + showTextValues = true + + curve = fsioCurve2, "Script Curve #2" columnLabel = "X", "Y" xAxis = 0, 128, 10 yAxis = -150, 150, 10 xBins = fsioCurve2Bins yBins = fsioCurve2 + showTextValues = true - curve = fsioCurve3, "FSIO Curve #3" + curve = fsioCurve3, "Script Curve #3" columnLabel = "X", "Y" xAxis = 0, 128, 10 yAxis = -5, 5, 10 xBins = fsioCurve3Bins yBins = fsioCurve3 + showTextValues = true - curve = fsioCurve4, "FSIO Curve #4" + curve = fsioCurve4, "Script Curve #4" columnLabel = "X", "Y" xAxis = 0, 128, 10 yAxis = -5, 5, 10 xBins = fsioCurve4Bins yBins = fsioCurve4 + showTextValues = true + + curve = scriptCurve5, "Script Curve #5" + columnLabel = "X", "Y" + xAxis = 0, 128, 10 + yAxis = -5, 5, 10 + xBins = scriptCurve5Bins + yBins = scriptCurve5 + showTextValues = true + + curve = scriptCurve6, "Script Curve #6" + columnLabel = "X", "Y" + xAxis = 0, 128, 10 + yAxis = -5, 5, 10 + xBins = scriptCurve6Bins + yBins = scriptCurve6 + showTextValues = true curve = mapAccelTaper, "Engine Load Acceleration Enrichment Taper" columnLabel = "Distance", "Multiplier" @@ -3286,14 +3316,16 @@ menuDialog = main subMenu = fsioFormulas, "FSIO Formulas" subMenu = std_separator - subMenu = fsioTable1Tbl, "FSIO Table #1" - subMenu = fsioTable2Tbl, "FSIO Table #2" - subMenu = fsioTable3Tbl, "FSIO Table #3" - subMenu = fsioTable4Tbl, "FSIO Table #4" - subMenu = fsioCurve1, "FSIO Curve #1" - subMenu = fsioCurve2, "FSIO Curve #2" - subMenu = fsioCurve3, "FSIO Curve #3" - subMenu = fsioCurve4, "FSIO Curve #4" + subMenu = fsioTable1Tbl, "Script Table #1" + subMenu = fsioTable2Tbl, "Script Table #2" + subMenu = fsioTable3Tbl, "Script Table #3" + subMenu = fsioTable4Tbl, "Script Table #4" + subMenu = scriptCurve1Settings, "Script Curve #1" + subMenu = scriptCurve2Settings, "Script Curve #2" + subMenu = scriptCurve3Settings, "Script Curve #3" + subMenu = scriptCurve4Settings, "Script Curve #4" + subMenu = scriptCurve5Settings, "Script Curve #5" + subMenu = scriptCurve6Settings, "Script Curve #6" subMenu = std_separator subMenu = luaOutputs, "Lua PWM Outputs" @@ -3574,6 +3606,30 @@ cmd_set_engine_type_8888_test = "Z\x00\x30\x00\x3B" cmd_set_engine_type_default = "Z\x00\x31\x00\x00" [UserDefined] + dialog = scriptCurve1Settings, "", yAxis + field = "Name", scriptCurveName4 + panel = fsioCurve1 + + dialog = scriptCurve2Settings, "", yAxis + field = "Name", scriptCurveName4 + panel = fsioCurve2 + + dialog = scriptCurve3Settings, "", yAxis + field = "Name", scriptCurveName4 + panel = fsioCurve3 + + dialog = scriptCurve4Settings, "", yAxis + field = "Name", scriptCurveName4 + panel = fsioCurve4 + + dialog = scriptCurve5Settings, "", yAxis + field = "Name", scriptCurveName5 + panel = scriptCurve5 + + dialog = scriptCurve6Settings, "", yAxis + field = "Name", scriptCurveName6 + panel = scriptCurve6 + dialog = tChargeRpmTpsSettings, "RPM+TPS Mode Settings" field = "We use these coefficients to approximate air/fuel charge temperate" field = "based on CLT and IAT, depending on RPM and TPM" diff --git a/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini b/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini index 660c3a69e2..56b1559a68 100644 --- a/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini +++ b/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2021.11.04.frankenso_na6.2741761529" + signature = "rusEFI 2021.11.05.frankenso_na6.2550436509" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.11.04.frankenso_na6.2741761529" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.11.05.frankenso_na6.2550436509" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -85,7 +85,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 Nov 04 23:47:01 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Fri Nov 05 03:01:26 UTC 2021 pageSize = 20000 page = 1 @@ -1087,7 +1087,17 @@ lowPressureFuel_v2 = scalar, F32, 3320, "volts", 1, 0, 0, 10, 2 lowPressureFuel_value2 = scalar, F32, 3324, "kPa", 1, 0, 0, 1000000, 2 cltRevLimitRpmBins = array, S08, 3328, [4], "C", 1, 0, -70, 120, 0 cltRevLimitRpm = array, U16, 3332, [4], "", 1, 0, 0, 8000, 0 -unused3328 = array, U08, 3340, [524], "units", 1, 0, -20, 100, 0 +scriptCurveName1 = string, ASCII, 3340, 16 +scriptCurveName2 = string, ASCII, 3356, 16 +scriptCurveName3 = string, ASCII, 3372, 16 +scriptCurveName4 = string, ASCII, 3388, 16 +scriptCurveName5 = string, ASCII, 3404, 16 +scriptCurveName6 = string, ASCII, 3420, 16 +scriptCurve5Bins = array, F32, 3436, [8], "x", 1, 0, -999, 1000, 3 +scriptCurve5 = array, F32, 3468, [8], "y", 1, 0, -999, 1000, 3 +scriptCurve6Bins = array, F32, 3500, [8], "x", 1, 0, -999, 1000, 3 +scriptCurve6 = array, F32, 3532, [8], "y", 1, 0, -999, 1000, 3 +unused3328 = array, U08, 3564, [300], "units", 1, 0, -20, 100, 0 tChargeAirCoefMin = scalar, F32, 3864, "Min tCharge Coeff.", 1, 0, 0, 1, 4 tChargeAirCoefMax = scalar, F32, 3868, "Max tCharge Coeff.", 1, 0, 0, 1, 4 tChargeAirFlowMax = scalar, F32, 3872, "Max Air Flow (kg/h)", 1, 0, 0, 1000, 1 @@ -2314,33 +2324,53 @@ fsioTable4RpmBins = array, F32, 19968, [8], "RPM", 1, 0, 0, 25500, 2 gauge = afr1Gauge #endif - curve = fsioCurve1, "FSIO Curve #1" + curve = fsioCurve1, "Script Curve #1" columnLabel = "X", "Y" xAxis = 0, 128, 10 yAxis = -155, 150, 10 xBins = fsioCurve1Bins yBins = fsioCurve1 - - curve = fsioCurve2, "FSIO Curve #2" + showTextValues = true + + curve = fsioCurve2, "Script Curve #2" columnLabel = "X", "Y" xAxis = 0, 128, 10 yAxis = -150, 150, 10 xBins = fsioCurve2Bins yBins = fsioCurve2 + showTextValues = true - curve = fsioCurve3, "FSIO Curve #3" + curve = fsioCurve3, "Script Curve #3" columnLabel = "X", "Y" xAxis = 0, 128, 10 yAxis = -5, 5, 10 xBins = fsioCurve3Bins yBins = fsioCurve3 + showTextValues = true - curve = fsioCurve4, "FSIO Curve #4" + curve = fsioCurve4, "Script Curve #4" columnLabel = "X", "Y" xAxis = 0, 128, 10 yAxis = -5, 5, 10 xBins = fsioCurve4Bins yBins = fsioCurve4 + showTextValues = true + + curve = scriptCurve5, "Script Curve #5" + columnLabel = "X", "Y" + xAxis = 0, 128, 10 + yAxis = -5, 5, 10 + xBins = scriptCurve5Bins + yBins = scriptCurve5 + showTextValues = true + + curve = scriptCurve6, "Script Curve #6" + columnLabel = "X", "Y" + xAxis = 0, 128, 10 + yAxis = -5, 5, 10 + xBins = scriptCurve6Bins + yBins = scriptCurve6 + showTextValues = true curve = mapAccelTaper, "Engine Load Acceleration Enrichment Taper" columnLabel = "Distance", "Multiplier" @@ -3286,14 +3316,16 @@ menuDialog = main subMenu = fsioFormulas, "FSIO Formulas" subMenu = std_separator - subMenu = fsioTable1Tbl, "FSIO Table #1" - subMenu = fsioTable2Tbl, "FSIO Table #2" - subMenu = fsioTable3Tbl, "FSIO Table #3" - subMenu = fsioTable4Tbl, "FSIO Table #4" - subMenu = fsioCurve1, "FSIO Curve #1" - subMenu = fsioCurve2, "FSIO Curve #2" - subMenu = fsioCurve3, "FSIO Curve #3" - subMenu = fsioCurve4, "FSIO Curve #4" + subMenu = fsioTable1Tbl, "Script Table #1" + subMenu = fsioTable2Tbl, "Script Table #2" + subMenu = fsioTable3Tbl, "Script Table #3" + subMenu = fsioTable4Tbl, "Script Table #4" + subMenu = scriptCurve1Settings, "Script Curve #1" + subMenu = scriptCurve2Settings, "Script Curve #2" + subMenu = scriptCurve3Settings, "Script Curve #3" + subMenu = scriptCurve4Settings, "Script Curve #4" + subMenu = scriptCurve5Settings, "Script Curve #5" + subMenu = scriptCurve6Settings, "Script Curve #6" subMenu = std_separator subMenu = luaOutputs, "Lua PWM Outputs" @@ -3574,6 +3606,30 @@ cmd_set_engine_type_8888_test = "Z\x00\x30\x00\x3B" cmd_set_engine_type_default = "Z\x00\x31\x00\x00" [UserDefined] + dialog = scriptCurve1Settings, "", yAxis + field = "Name", scriptCurveName4 + panel = fsioCurve1 + + dialog = scriptCurve2Settings, "", yAxis + field = "Name", scriptCurveName4 + panel = fsioCurve2 + + dialog = scriptCurve3Settings, "", yAxis + field = "Name", scriptCurveName4 + panel = fsioCurve3 + + dialog = scriptCurve4Settings, "", yAxis + field = "Name", scriptCurveName4 + panel = fsioCurve4 + + dialog = scriptCurve5Settings, "", yAxis + field = "Name", scriptCurveName5 + panel = scriptCurve5 + + dialog = scriptCurve6Settings, "", yAxis + field = "Name", scriptCurveName6 + panel = scriptCurve6 + dialog = tChargeRpmTpsSettings, "RPM+TPS Mode Settings" field = "We use these coefficients to approximate air/fuel charge temperate" field = "based on CLT and IAT, depending on RPM and TPM" diff --git a/firmware/tunerstudio/generated/rusefi_hellen-nb1.ini b/firmware/tunerstudio/generated/rusefi_hellen-nb1.ini index f20ed64e09..ca9f29b6d8 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen-nb1.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen-nb1.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2021.11.04.hellen-nb1.3204326969" + signature = "rusEFI 2021.11.05.hellen-nb1.2240889181" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.11.04.hellen-nb1.3204326969" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.11.05.hellen-nb1.2240889181" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -85,7 +85,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 Nov 04 23:46:48 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Fri Nov 05 03:01:14 UTC 2021 pageSize = 20000 page = 1 @@ -1087,7 +1087,17 @@ lowPressureFuel_v2 = scalar, F32, 3320, "volts", 1, 0, 0, 10, 2 lowPressureFuel_value2 = scalar, F32, 3324, "kPa", 1, 0, 0, 1000000, 2 cltRevLimitRpmBins = array, S08, 3328, [4], "C", 1, 0, -70, 120, 0 cltRevLimitRpm = array, U16, 3332, [4], "", 1, 0, 0, 8000, 0 -unused3328 = array, U08, 3340, [524], "units", 1, 0, -20, 100, 0 +scriptCurveName1 = string, ASCII, 3340, 16 +scriptCurveName2 = string, ASCII, 3356, 16 +scriptCurveName3 = string, ASCII, 3372, 16 +scriptCurveName4 = string, ASCII, 3388, 16 +scriptCurveName5 = string, ASCII, 3404, 16 +scriptCurveName6 = string, ASCII, 3420, 16 +scriptCurve5Bins = array, F32, 3436, [8], "x", 1, 0, -999, 1000, 3 +scriptCurve5 = array, F32, 3468, [8], "y", 1, 0, -999, 1000, 3 +scriptCurve6Bins = array, F32, 3500, [8], "x", 1, 0, -999, 1000, 3 +scriptCurve6 = array, F32, 3532, [8], "y", 1, 0, -999, 1000, 3 +unused3328 = array, U08, 3564, [300], "units", 1, 0, -20, 100, 0 tChargeAirCoefMin = scalar, F32, 3864, "Min tCharge Coeff.", 1, 0, 0, 1, 4 tChargeAirCoefMax = scalar, F32, 3868, "Max tCharge Coeff.", 1, 0, 0, 1, 4 tChargeAirFlowMax = scalar, F32, 3872, "Max Air Flow (kg/h)", 1, 0, 0, 1000, 1 @@ -2314,33 +2324,53 @@ fsioTable4RpmBins = array, F32, 19968, [8], "RPM", 1, 0, 0, 25500, 2 gauge = afr1Gauge #endif - curve = fsioCurve1, "FSIO Curve #1" + curve = fsioCurve1, "Script Curve #1" columnLabel = "X", "Y" xAxis = 0, 128, 10 yAxis = -155, 150, 10 xBins = fsioCurve1Bins yBins = fsioCurve1 - - curve = fsioCurve2, "FSIO Curve #2" + showTextValues = true + + curve = fsioCurve2, "Script Curve #2" columnLabel = "X", "Y" xAxis = 0, 128, 10 yAxis = -150, 150, 10 xBins = fsioCurve2Bins yBins = fsioCurve2 + showTextValues = true - curve = fsioCurve3, "FSIO Curve #3" + curve = fsioCurve3, "Script Curve #3" columnLabel = "X", "Y" xAxis = 0, 128, 10 yAxis = -5, 5, 10 xBins = fsioCurve3Bins yBins = fsioCurve3 + showTextValues = true - curve = fsioCurve4, "FSIO Curve #4" + curve = fsioCurve4, "Script Curve #4" columnLabel = "X", "Y" xAxis = 0, 128, 10 yAxis = -5, 5, 10 xBins = fsioCurve4Bins yBins = fsioCurve4 + showTextValues = true + + curve = scriptCurve5, "Script Curve #5" + columnLabel = "X", "Y" + xAxis = 0, 128, 10 + yAxis = -5, 5, 10 + xBins = scriptCurve5Bins + yBins = scriptCurve5 + showTextValues = true + + curve = scriptCurve6, "Script Curve #6" + columnLabel = "X", "Y" + xAxis = 0, 128, 10 + yAxis = -5, 5, 10 + xBins = scriptCurve6Bins + yBins = scriptCurve6 + showTextValues = true curve = mapAccelTaper, "Engine Load Acceleration Enrichment Taper" columnLabel = "Distance", "Multiplier" @@ -3286,14 +3316,16 @@ menuDialog = main subMenu = fsioFormulas, "FSIO Formulas" subMenu = std_separator - subMenu = fsioTable1Tbl, "FSIO Table #1" - subMenu = fsioTable2Tbl, "FSIO Table #2" - subMenu = fsioTable3Tbl, "FSIO Table #3" - subMenu = fsioTable4Tbl, "FSIO Table #4" - subMenu = fsioCurve1, "FSIO Curve #1" - subMenu = fsioCurve2, "FSIO Curve #2" - subMenu = fsioCurve3, "FSIO Curve #3" - subMenu = fsioCurve4, "FSIO Curve #4" + subMenu = fsioTable1Tbl, "Script Table #1" + subMenu = fsioTable2Tbl, "Script Table #2" + subMenu = fsioTable3Tbl, "Script Table #3" + subMenu = fsioTable4Tbl, "Script Table #4" + subMenu = scriptCurve1Settings, "Script Curve #1" + subMenu = scriptCurve2Settings, "Script Curve #2" + subMenu = scriptCurve3Settings, "Script Curve #3" + subMenu = scriptCurve4Settings, "Script Curve #4" + subMenu = scriptCurve5Settings, "Script Curve #5" + subMenu = scriptCurve6Settings, "Script Curve #6" subMenu = std_separator subMenu = luaOutputs, "Lua PWM Outputs" @@ -3570,6 +3602,30 @@ cmd_set_engine_type_8888_test = "Z\x00\x30\x00\x3B" cmd_set_engine_type_default = "Z\x00\x31\x00\x00" [UserDefined] + dialog = scriptCurve1Settings, "", yAxis + field = "Name", scriptCurveName4 + panel = fsioCurve1 + + dialog = scriptCurve2Settings, "", yAxis + field = "Name", scriptCurveName4 + panel = fsioCurve2 + + dialog = scriptCurve3Settings, "", yAxis + field = "Name", scriptCurveName4 + panel = fsioCurve3 + + dialog = scriptCurve4Settings, "", yAxis + field = "Name", scriptCurveName4 + panel = fsioCurve4 + + dialog = scriptCurve5Settings, "", yAxis + field = "Name", scriptCurveName5 + panel = scriptCurve5 + + dialog = scriptCurve6Settings, "", yAxis + field = "Name", scriptCurveName6 + panel = scriptCurve6 + dialog = tChargeRpmTpsSettings, "RPM+TPS Mode Settings" field = "We use these coefficients to approximate air/fuel charge temperate" field = "based on CLT and IAT, depending on RPM and TPM" diff --git a/firmware/tunerstudio/generated/rusefi_hellen121nissan.ini b/firmware/tunerstudio/generated/rusefi_hellen121nissan.ini index 65ba3efc1d..4a8a7209d3 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen121nissan.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen121nissan.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2021.11.04.hellen121nissan.1386805330" + signature = "rusEFI 2021.11.05.hellen121nissan.1774690102" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.11.04.hellen121nissan.1386805330" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.11.05.hellen121nissan.1774690102" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -85,7 +85,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 Nov 04 23:46:36 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Fri Nov 05 03:01:02 UTC 2021 pageSize = 20000 page = 1 @@ -1087,7 +1087,17 @@ lowPressureFuel_v2 = scalar, F32, 3320, "volts", 1, 0, 0, 10, 2 lowPressureFuel_value2 = scalar, F32, 3324, "kPa", 1, 0, 0, 1000000, 2 cltRevLimitRpmBins = array, S08, 3328, [4], "C", 1, 0, -70, 120, 0 cltRevLimitRpm = array, U16, 3332, [4], "", 1, 0, 0, 8000, 0 -unused3328 = array, U08, 3340, [524], "units", 1, 0, -20, 100, 0 +scriptCurveName1 = string, ASCII, 3340, 16 +scriptCurveName2 = string, ASCII, 3356, 16 +scriptCurveName3 = string, ASCII, 3372, 16 +scriptCurveName4 = string, ASCII, 3388, 16 +scriptCurveName5 = string, ASCII, 3404, 16 +scriptCurveName6 = string, ASCII, 3420, 16 +scriptCurve5Bins = array, F32, 3436, [8], "x", 1, 0, -999, 1000, 3 +scriptCurve5 = array, F32, 3468, [8], "y", 1, 0, -999, 1000, 3 +scriptCurve6Bins = array, F32, 3500, [8], "x", 1, 0, -999, 1000, 3 +scriptCurve6 = array, F32, 3532, [8], "y", 1, 0, -999, 1000, 3 +unused3328 = array, U08, 3564, [300], "units", 1, 0, -20, 100, 0 tChargeAirCoefMin = scalar, F32, 3864, "Min tCharge Coeff.", 1, 0, 0, 1, 4 tChargeAirCoefMax = scalar, F32, 3868, "Max tCharge Coeff.", 1, 0, 0, 1, 4 tChargeAirFlowMax = scalar, F32, 3872, "Max Air Flow (kg/h)", 1, 0, 0, 1000, 1 @@ -2314,33 +2324,53 @@ fsioTable4RpmBins = array, F32, 19968, [8], "RPM", 1, 0, 0, 25500, 2 gauge = afr1Gauge #endif - curve = fsioCurve1, "FSIO Curve #1" + curve = fsioCurve1, "Script Curve #1" columnLabel = "X", "Y" xAxis = 0, 128, 10 yAxis = -155, 150, 10 xBins = fsioCurve1Bins yBins = fsioCurve1 - - curve = fsioCurve2, "FSIO Curve #2" + showTextValues = true + + curve = fsioCurve2, "Script Curve #2" columnLabel = "X", "Y" xAxis = 0, 128, 10 yAxis = -150, 150, 10 xBins = fsioCurve2Bins yBins = fsioCurve2 + showTextValues = true - curve = fsioCurve3, "FSIO Curve #3" + curve = fsioCurve3, "Script Curve #3" columnLabel = "X", "Y" xAxis = 0, 128, 10 yAxis = -5, 5, 10 xBins = fsioCurve3Bins yBins = fsioCurve3 + showTextValues = true - curve = fsioCurve4, "FSIO Curve #4" + curve = fsioCurve4, "Script Curve #4" columnLabel = "X", "Y" xAxis = 0, 128, 10 yAxis = -5, 5, 10 xBins = fsioCurve4Bins yBins = fsioCurve4 + showTextValues = true + + curve = scriptCurve5, "Script Curve #5" + columnLabel = "X", "Y" + xAxis = 0, 128, 10 + yAxis = -5, 5, 10 + xBins = scriptCurve5Bins + yBins = scriptCurve5 + showTextValues = true + + curve = scriptCurve6, "Script Curve #6" + columnLabel = "X", "Y" + xAxis = 0, 128, 10 + yAxis = -5, 5, 10 + xBins = scriptCurve6Bins + yBins = scriptCurve6 + showTextValues = true curve = mapAccelTaper, "Engine Load Acceleration Enrichment Taper" columnLabel = "Distance", "Multiplier" @@ -3286,14 +3316,16 @@ menuDialog = main subMenu = fsioFormulas, "FSIO Formulas" subMenu = std_separator - subMenu = fsioTable1Tbl, "FSIO Table #1" - subMenu = fsioTable2Tbl, "FSIO Table #2" - subMenu = fsioTable3Tbl, "FSIO Table #3" - subMenu = fsioTable4Tbl, "FSIO Table #4" - subMenu = fsioCurve1, "FSIO Curve #1" - subMenu = fsioCurve2, "FSIO Curve #2" - subMenu = fsioCurve3, "FSIO Curve #3" - subMenu = fsioCurve4, "FSIO Curve #4" + subMenu = fsioTable1Tbl, "Script Table #1" + subMenu = fsioTable2Tbl, "Script Table #2" + subMenu = fsioTable3Tbl, "Script Table #3" + subMenu = fsioTable4Tbl, "Script Table #4" + subMenu = scriptCurve1Settings, "Script Curve #1" + subMenu = scriptCurve2Settings, "Script Curve #2" + subMenu = scriptCurve3Settings, "Script Curve #3" + subMenu = scriptCurve4Settings, "Script Curve #4" + subMenu = scriptCurve5Settings, "Script Curve #5" + subMenu = scriptCurve6Settings, "Script Curve #6" subMenu = std_separator subMenu = luaOutputs, "Lua PWM Outputs" @@ -3570,6 +3602,30 @@ cmd_set_engine_type_8888_test = "Z\x00\x30\x00\x3B" cmd_set_engine_type_default = "Z\x00\x31\x00\x00" [UserDefined] + dialog = scriptCurve1Settings, "", yAxis + field = "Name", scriptCurveName4 + panel = fsioCurve1 + + dialog = scriptCurve2Settings, "", yAxis + field = "Name", scriptCurveName4 + panel = fsioCurve2 + + dialog = scriptCurve3Settings, "", yAxis + field = "Name", scriptCurveName4 + panel = fsioCurve3 + + dialog = scriptCurve4Settings, "", yAxis + field = "Name", scriptCurveName4 + panel = fsioCurve4 + + dialog = scriptCurve5Settings, "", yAxis + field = "Name", scriptCurveName5 + panel = scriptCurve5 + + dialog = scriptCurve6Settings, "", yAxis + field = "Name", scriptCurveName6 + panel = scriptCurve6 + dialog = tChargeRpmTpsSettings, "RPM+TPS Mode Settings" field = "We use these coefficients to approximate air/fuel charge temperate" field = "based on CLT and IAT, depending on RPM and TPM" diff --git a/firmware/tunerstudio/generated/rusefi_hellen121vag.ini b/firmware/tunerstudio/generated/rusefi_hellen121vag.ini index 5ca1ee4e32..1555db41dd 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen121vag.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen121vag.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2021.11.04.hellen121vag.2327134294" + signature = "rusEFI 2021.11.05.hellen121vag.2983864114" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.11.04.hellen121vag.2327134294" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.11.05.hellen121vag.2983864114" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -85,7 +85,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 Nov 04 23:46:33 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Fri Nov 05 03:00:59 UTC 2021 pageSize = 20000 page = 1 @@ -1087,7 +1087,17 @@ lowPressureFuel_v2 = scalar, F32, 3320, "volts", 1, 0, 0, 10, 2 lowPressureFuel_value2 = scalar, F32, 3324, "kPa", 1, 0, 0, 1000000, 2 cltRevLimitRpmBins = array, S08, 3328, [4], "C", 1, 0, -70, 120, 0 cltRevLimitRpm = array, U16, 3332, [4], "", 1, 0, 0, 8000, 0 -unused3328 = array, U08, 3340, [524], "units", 1, 0, -20, 100, 0 +scriptCurveName1 = string, ASCII, 3340, 16 +scriptCurveName2 = string, ASCII, 3356, 16 +scriptCurveName3 = string, ASCII, 3372, 16 +scriptCurveName4 = string, ASCII, 3388, 16 +scriptCurveName5 = string, ASCII, 3404, 16 +scriptCurveName6 = string, ASCII, 3420, 16 +scriptCurve5Bins = array, F32, 3436, [8], "x", 1, 0, -999, 1000, 3 +scriptCurve5 = array, F32, 3468, [8], "y", 1, 0, -999, 1000, 3 +scriptCurve6Bins = array, F32, 3500, [8], "x", 1, 0, -999, 1000, 3 +scriptCurve6 = array, F32, 3532, [8], "y", 1, 0, -999, 1000, 3 +unused3328 = array, U08, 3564, [300], "units", 1, 0, -20, 100, 0 tChargeAirCoefMin = scalar, F32, 3864, "Min tCharge Coeff.", 1, 0, 0, 1, 4 tChargeAirCoefMax = scalar, F32, 3868, "Max tCharge Coeff.", 1, 0, 0, 1, 4 tChargeAirFlowMax = scalar, F32, 3872, "Max Air Flow (kg/h)", 1, 0, 0, 1000, 1 @@ -2314,33 +2324,53 @@ fsioTable4RpmBins = array, F32, 19968, [8], "RPM", 1, 0, 0, 25500, 2 gauge = afr1Gauge #endif - curve = fsioCurve1, "FSIO Curve #1" + curve = fsioCurve1, "Script Curve #1" columnLabel = "X", "Y" xAxis = 0, 128, 10 yAxis = -155, 150, 10 xBins = fsioCurve1Bins yBins = fsioCurve1 - - curve = fsioCurve2, "FSIO Curve #2" + showTextValues = true + + curve = fsioCurve2, "Script Curve #2" columnLabel = "X", "Y" xAxis = 0, 128, 10 yAxis = -150, 150, 10 xBins = fsioCurve2Bins yBins = fsioCurve2 + showTextValues = true - curve = fsioCurve3, "FSIO Curve #3" + curve = fsioCurve3, "Script Curve #3" columnLabel = "X", "Y" xAxis = 0, 128, 10 yAxis = -5, 5, 10 xBins = fsioCurve3Bins yBins = fsioCurve3 + showTextValues = true - curve = fsioCurve4, "FSIO Curve #4" + curve = fsioCurve4, "Script Curve #4" columnLabel = "X", "Y" xAxis = 0, 128, 10 yAxis = -5, 5, 10 xBins = fsioCurve4Bins yBins = fsioCurve4 + showTextValues = true + + curve = scriptCurve5, "Script Curve #5" + columnLabel = "X", "Y" + xAxis = 0, 128, 10 + yAxis = -5, 5, 10 + xBins = scriptCurve5Bins + yBins = scriptCurve5 + showTextValues = true + + curve = scriptCurve6, "Script Curve #6" + columnLabel = "X", "Y" + xAxis = 0, 128, 10 + yAxis = -5, 5, 10 + xBins = scriptCurve6Bins + yBins = scriptCurve6 + showTextValues = true curve = mapAccelTaper, "Engine Load Acceleration Enrichment Taper" columnLabel = "Distance", "Multiplier" @@ -3286,14 +3316,16 @@ menuDialog = main subMenu = fsioFormulas, "FSIO Formulas" subMenu = std_separator - subMenu = fsioTable1Tbl, "FSIO Table #1" - subMenu = fsioTable2Tbl, "FSIO Table #2" - subMenu = fsioTable3Tbl, "FSIO Table #3" - subMenu = fsioTable4Tbl, "FSIO Table #4" - subMenu = fsioCurve1, "FSIO Curve #1" - subMenu = fsioCurve2, "FSIO Curve #2" - subMenu = fsioCurve3, "FSIO Curve #3" - subMenu = fsioCurve4, "FSIO Curve #4" + subMenu = fsioTable1Tbl, "Script Table #1" + subMenu = fsioTable2Tbl, "Script Table #2" + subMenu = fsioTable3Tbl, "Script Table #3" + subMenu = fsioTable4Tbl, "Script Table #4" + subMenu = scriptCurve1Settings, "Script Curve #1" + subMenu = scriptCurve2Settings, "Script Curve #2" + subMenu = scriptCurve3Settings, "Script Curve #3" + subMenu = scriptCurve4Settings, "Script Curve #4" + subMenu = scriptCurve5Settings, "Script Curve #5" + subMenu = scriptCurve6Settings, "Script Curve #6" subMenu = std_separator subMenu = luaOutputs, "Lua PWM Outputs" @@ -3570,6 +3602,30 @@ cmd_set_engine_type_8888_test = "Z\x00\x30\x00\x3B" cmd_set_engine_type_default = "Z\x00\x31\x00\x00" [UserDefined] + dialog = scriptCurve1Settings, "", yAxis + field = "Name", scriptCurveName4 + panel = fsioCurve1 + + dialog = scriptCurve2Settings, "", yAxis + field = "Name", scriptCurveName4 + panel = fsioCurve2 + + dialog = scriptCurve3Settings, "", yAxis + field = "Name", scriptCurveName4 + panel = fsioCurve3 + + dialog = scriptCurve4Settings, "", yAxis + field = "Name", scriptCurveName4 + panel = fsioCurve4 + + dialog = scriptCurve5Settings, "", yAxis + field = "Name", scriptCurveName5 + panel = scriptCurve5 + + dialog = scriptCurve6Settings, "", yAxis + field = "Name", scriptCurveName6 + panel = scriptCurve6 + dialog = tChargeRpmTpsSettings, "RPM+TPS Mode Settings" field = "We use these coefficients to approximate air/fuel charge temperate" field = "based on CLT and IAT, depending on RPM and TPM" diff --git a/firmware/tunerstudio/generated/rusefi_hellen128mercedes.ini b/firmware/tunerstudio/generated/rusefi_hellen128mercedes.ini index a636d2be64..39180aab15 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen128mercedes.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen128mercedes.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2021.11.04.hellen128.257538240" + signature = "rusEFI 2021.11.05.hellen128.876011428" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.11.04.hellen128.257538240" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.11.05.hellen128.876011428" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -85,7 +85,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 Nov 04 23:46:30 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Fri Nov 05 03:00:56 UTC 2021 pageSize = 20000 page = 1 @@ -1087,7 +1087,17 @@ lowPressureFuel_v2 = scalar, F32, 3320, "volts", 1, 0, 0, 10, 2 lowPressureFuel_value2 = scalar, F32, 3324, "kPa", 1, 0, 0, 1000000, 2 cltRevLimitRpmBins = array, S08, 3328, [4], "C", 1, 0, -70, 120, 0 cltRevLimitRpm = array, U16, 3332, [4], "", 1, 0, 0, 8000, 0 -unused3328 = array, U08, 3340, [524], "units", 1, 0, -20, 100, 0 +scriptCurveName1 = string, ASCII, 3340, 16 +scriptCurveName2 = string, ASCII, 3356, 16 +scriptCurveName3 = string, ASCII, 3372, 16 +scriptCurveName4 = string, ASCII, 3388, 16 +scriptCurveName5 = string, ASCII, 3404, 16 +scriptCurveName6 = string, ASCII, 3420, 16 +scriptCurve5Bins = array, F32, 3436, [8], "x", 1, 0, -999, 1000, 3 +scriptCurve5 = array, F32, 3468, [8], "y", 1, 0, -999, 1000, 3 +scriptCurve6Bins = array, F32, 3500, [8], "x", 1, 0, -999, 1000, 3 +scriptCurve6 = array, F32, 3532, [8], "y", 1, 0, -999, 1000, 3 +unused3328 = array, U08, 3564, [300], "units", 1, 0, -20, 100, 0 tChargeAirCoefMin = scalar, F32, 3864, "Min tCharge Coeff.", 1, 0, 0, 1, 4 tChargeAirCoefMax = scalar, F32, 3868, "Max tCharge Coeff.", 1, 0, 0, 1, 4 tChargeAirFlowMax = scalar, F32, 3872, "Max Air Flow (kg/h)", 1, 0, 0, 1000, 1 @@ -2314,33 +2324,53 @@ fsioTable4RpmBins = array, F32, 19968, [8], "RPM", 1, 0, 0, 25500, 2 gauge = afr1Gauge #endif - curve = fsioCurve1, "FSIO Curve #1" + curve = fsioCurve1, "Script Curve #1" columnLabel = "X", "Y" xAxis = 0, 128, 10 yAxis = -155, 150, 10 xBins = fsioCurve1Bins yBins = fsioCurve1 - - curve = fsioCurve2, "FSIO Curve #2" + showTextValues = true + + curve = fsioCurve2, "Script Curve #2" columnLabel = "X", "Y" xAxis = 0, 128, 10 yAxis = -150, 150, 10 xBins = fsioCurve2Bins yBins = fsioCurve2 + showTextValues = true - curve = fsioCurve3, "FSIO Curve #3" + curve = fsioCurve3, "Script Curve #3" columnLabel = "X", "Y" xAxis = 0, 128, 10 yAxis = -5, 5, 10 xBins = fsioCurve3Bins yBins = fsioCurve3 + showTextValues = true - curve = fsioCurve4, "FSIO Curve #4" + curve = fsioCurve4, "Script Curve #4" columnLabel = "X", "Y" xAxis = 0, 128, 10 yAxis = -5, 5, 10 xBins = fsioCurve4Bins yBins = fsioCurve4 + showTextValues = true + + curve = scriptCurve5, "Script Curve #5" + columnLabel = "X", "Y" + xAxis = 0, 128, 10 + yAxis = -5, 5, 10 + xBins = scriptCurve5Bins + yBins = scriptCurve5 + showTextValues = true + + curve = scriptCurve6, "Script Curve #6" + columnLabel = "X", "Y" + xAxis = 0, 128, 10 + yAxis = -5, 5, 10 + xBins = scriptCurve6Bins + yBins = scriptCurve6 + showTextValues = true curve = mapAccelTaper, "Engine Load Acceleration Enrichment Taper" columnLabel = "Distance", "Multiplier" @@ -3286,14 +3316,16 @@ menuDialog = main subMenu = fsioFormulas, "FSIO Formulas" subMenu = std_separator - subMenu = fsioTable1Tbl, "FSIO Table #1" - subMenu = fsioTable2Tbl, "FSIO Table #2" - subMenu = fsioTable3Tbl, "FSIO Table #3" - subMenu = fsioTable4Tbl, "FSIO Table #4" - subMenu = fsioCurve1, "FSIO Curve #1" - subMenu = fsioCurve2, "FSIO Curve #2" - subMenu = fsioCurve3, "FSIO Curve #3" - subMenu = fsioCurve4, "FSIO Curve #4" + subMenu = fsioTable1Tbl, "Script Table #1" + subMenu = fsioTable2Tbl, "Script Table #2" + subMenu = fsioTable3Tbl, "Script Table #3" + subMenu = fsioTable4Tbl, "Script Table #4" + subMenu = scriptCurve1Settings, "Script Curve #1" + subMenu = scriptCurve2Settings, "Script Curve #2" + subMenu = scriptCurve3Settings, "Script Curve #3" + subMenu = scriptCurve4Settings, "Script Curve #4" + subMenu = scriptCurve5Settings, "Script Curve #5" + subMenu = scriptCurve6Settings, "Script Curve #6" subMenu = std_separator subMenu = luaOutputs, "Lua PWM Outputs" @@ -3570,6 +3602,30 @@ cmd_set_engine_type_8888_test = "Z\x00\x30\x00\x3B" cmd_set_engine_type_default = "Z\x00\x31\x00\x00" [UserDefined] + dialog = scriptCurve1Settings, "", yAxis + field = "Name", scriptCurveName4 + panel = fsioCurve1 + + dialog = scriptCurve2Settings, "", yAxis + field = "Name", scriptCurveName4 + panel = fsioCurve2 + + dialog = scriptCurve3Settings, "", yAxis + field = "Name", scriptCurveName4 + panel = fsioCurve3 + + dialog = scriptCurve4Settings, "", yAxis + field = "Name", scriptCurveName4 + panel = fsioCurve4 + + dialog = scriptCurve5Settings, "", yAxis + field = "Name", scriptCurveName5 + panel = scriptCurve5 + + dialog = scriptCurve6Settings, "", yAxis + field = "Name", scriptCurveName6 + panel = scriptCurve6 + dialog = tChargeRpmTpsSettings, "RPM+TPS Mode Settings" field = "We use these coefficients to approximate air/fuel charge temperate" field = "based on CLT and IAT, depending on RPM and TPM" diff --git a/firmware/tunerstudio/generated/rusefi_hellen154hyundai.ini b/firmware/tunerstudio/generated/rusefi_hellen154hyundai.ini index 8a7b8ef820..5b41f92d76 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen154hyundai.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen154hyundai.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2021.11.04.hellen154hyundai.2636514858" + signature = "rusEFI 2021.11.05.hellen154hyundai.2789826894" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.11.04.hellen154hyundai.2636514858" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.11.05.hellen154hyundai.2789826894" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -85,7 +85,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 Nov 04 23:46:39 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Fri Nov 05 03:01:05 UTC 2021 pageSize = 20000 page = 1 @@ -1087,7 +1087,17 @@ lowPressureFuel_v2 = scalar, F32, 3320, "volts", 1, 0, 0, 10, 2 lowPressureFuel_value2 = scalar, F32, 3324, "kPa", 1, 0, 0, 1000000, 2 cltRevLimitRpmBins = array, S08, 3328, [4], "C", 1, 0, -70, 120, 0 cltRevLimitRpm = array, U16, 3332, [4], "", 1, 0, 0, 8000, 0 -unused3328 = array, U08, 3340, [524], "units", 1, 0, -20, 100, 0 +scriptCurveName1 = string, ASCII, 3340, 16 +scriptCurveName2 = string, ASCII, 3356, 16 +scriptCurveName3 = string, ASCII, 3372, 16 +scriptCurveName4 = string, ASCII, 3388, 16 +scriptCurveName5 = string, ASCII, 3404, 16 +scriptCurveName6 = string, ASCII, 3420, 16 +scriptCurve5Bins = array, F32, 3436, [8], "x", 1, 0, -999, 1000, 3 +scriptCurve5 = array, F32, 3468, [8], "y", 1, 0, -999, 1000, 3 +scriptCurve6Bins = array, F32, 3500, [8], "x", 1, 0, -999, 1000, 3 +scriptCurve6 = array, F32, 3532, [8], "y", 1, 0, -999, 1000, 3 +unused3328 = array, U08, 3564, [300], "units", 1, 0, -20, 100, 0 tChargeAirCoefMin = scalar, F32, 3864, "Min tCharge Coeff.", 1, 0, 0, 1, 4 tChargeAirCoefMax = scalar, F32, 3868, "Max tCharge Coeff.", 1, 0, 0, 1, 4 tChargeAirFlowMax = scalar, F32, 3872, "Max Air Flow (kg/h)", 1, 0, 0, 1000, 1 @@ -2314,33 +2324,53 @@ fsioTable4RpmBins = array, F32, 19968, [8], "RPM", 1, 0, 0, 25500, 2 gauge = afr1Gauge #endif - curve = fsioCurve1, "FSIO Curve #1" + curve = fsioCurve1, "Script Curve #1" columnLabel = "X", "Y" xAxis = 0, 128, 10 yAxis = -155, 150, 10 xBins = fsioCurve1Bins yBins = fsioCurve1 - - curve = fsioCurve2, "FSIO Curve #2" + showTextValues = true + + curve = fsioCurve2, "Script Curve #2" columnLabel = "X", "Y" xAxis = 0, 128, 10 yAxis = -150, 150, 10 xBins = fsioCurve2Bins yBins = fsioCurve2 + showTextValues = true - curve = fsioCurve3, "FSIO Curve #3" + curve = fsioCurve3, "Script Curve #3" columnLabel = "X", "Y" xAxis = 0, 128, 10 yAxis = -5, 5, 10 xBins = fsioCurve3Bins yBins = fsioCurve3 + showTextValues = true - curve = fsioCurve4, "FSIO Curve #4" + curve = fsioCurve4, "Script Curve #4" columnLabel = "X", "Y" xAxis = 0, 128, 10 yAxis = -5, 5, 10 xBins = fsioCurve4Bins yBins = fsioCurve4 + showTextValues = true + + curve = scriptCurve5, "Script Curve #5" + columnLabel = "X", "Y" + xAxis = 0, 128, 10 + yAxis = -5, 5, 10 + xBins = scriptCurve5Bins + yBins = scriptCurve5 + showTextValues = true + + curve = scriptCurve6, "Script Curve #6" + columnLabel = "X", "Y" + xAxis = 0, 128, 10 + yAxis = -5, 5, 10 + xBins = scriptCurve6Bins + yBins = scriptCurve6 + showTextValues = true curve = mapAccelTaper, "Engine Load Acceleration Enrichment Taper" columnLabel = "Distance", "Multiplier" @@ -3286,14 +3316,16 @@ menuDialog = main subMenu = fsioFormulas, "FSIO Formulas" subMenu = std_separator - subMenu = fsioTable1Tbl, "FSIO Table #1" - subMenu = fsioTable2Tbl, "FSIO Table #2" - subMenu = fsioTable3Tbl, "FSIO Table #3" - subMenu = fsioTable4Tbl, "FSIO Table #4" - subMenu = fsioCurve1, "FSIO Curve #1" - subMenu = fsioCurve2, "FSIO Curve #2" - subMenu = fsioCurve3, "FSIO Curve #3" - subMenu = fsioCurve4, "FSIO Curve #4" + subMenu = fsioTable1Tbl, "Script Table #1" + subMenu = fsioTable2Tbl, "Script Table #2" + subMenu = fsioTable3Tbl, "Script Table #3" + subMenu = fsioTable4Tbl, "Script Table #4" + subMenu = scriptCurve1Settings, "Script Curve #1" + subMenu = scriptCurve2Settings, "Script Curve #2" + subMenu = scriptCurve3Settings, "Script Curve #3" + subMenu = scriptCurve4Settings, "Script Curve #4" + subMenu = scriptCurve5Settings, "Script Curve #5" + subMenu = scriptCurve6Settings, "Script Curve #6" subMenu = std_separator subMenu = luaOutputs, "Lua PWM Outputs" @@ -3570,6 +3602,30 @@ cmd_set_engine_type_8888_test = "Z\x00\x30\x00\x3B" cmd_set_engine_type_default = "Z\x00\x31\x00\x00" [UserDefined] + dialog = scriptCurve1Settings, "", yAxis + field = "Name", scriptCurveName4 + panel = fsioCurve1 + + dialog = scriptCurve2Settings, "", yAxis + field = "Name", scriptCurveName4 + panel = fsioCurve2 + + dialog = scriptCurve3Settings, "", yAxis + field = "Name", scriptCurveName4 + panel = fsioCurve3 + + dialog = scriptCurve4Settings, "", yAxis + field = "Name", scriptCurveName4 + panel = fsioCurve4 + + dialog = scriptCurve5Settings, "", yAxis + field = "Name", scriptCurveName5 + panel = scriptCurve5 + + dialog = scriptCurve6Settings, "", yAxis + field = "Name", scriptCurveName6 + panel = scriptCurve6 + dialog = tChargeRpmTpsSettings, "RPM+TPS Mode Settings" field = "We use these coefficients to approximate air/fuel charge temperate" field = "based on CLT and IAT, depending on RPM and TPM" diff --git a/firmware/tunerstudio/generated/rusefi_hellen72.ini b/firmware/tunerstudio/generated/rusefi_hellen72.ini index 611b3f58b1..8eaf4b200a 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen72.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen72.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2021.11.04.hellen72.3217866807" + signature = "rusEFI 2021.11.05.hellen72.2225317715" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.11.04.hellen72.3217866807" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.11.05.hellen72.2225317715" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -85,7 +85,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 Nov 04 23:46:45 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Fri Nov 05 03:01:11 UTC 2021 pageSize = 20000 page = 1 @@ -1087,7 +1087,17 @@ lowPressureFuel_v2 = scalar, F32, 3320, "volts", 1, 0, 0, 10, 2 lowPressureFuel_value2 = scalar, F32, 3324, "kPa", 1, 0, 0, 1000000, 2 cltRevLimitRpmBins = array, S08, 3328, [4], "C", 1, 0, -70, 120, 0 cltRevLimitRpm = array, U16, 3332, [4], "", 1, 0, 0, 8000, 0 -unused3328 = array, U08, 3340, [524], "units", 1, 0, -20, 100, 0 +scriptCurveName1 = string, ASCII, 3340, 16 +scriptCurveName2 = string, ASCII, 3356, 16 +scriptCurveName3 = string, ASCII, 3372, 16 +scriptCurveName4 = string, ASCII, 3388, 16 +scriptCurveName5 = string, ASCII, 3404, 16 +scriptCurveName6 = string, ASCII, 3420, 16 +scriptCurve5Bins = array, F32, 3436, [8], "x", 1, 0, -999, 1000, 3 +scriptCurve5 = array, F32, 3468, [8], "y", 1, 0, -999, 1000, 3 +scriptCurve6Bins = array, F32, 3500, [8], "x", 1, 0, -999, 1000, 3 +scriptCurve6 = array, F32, 3532, [8], "y", 1, 0, -999, 1000, 3 +unused3328 = array, U08, 3564, [300], "units", 1, 0, -20, 100, 0 tChargeAirCoefMin = scalar, F32, 3864, "Min tCharge Coeff.", 1, 0, 0, 1, 4 tChargeAirCoefMax = scalar, F32, 3868, "Max tCharge Coeff.", 1, 0, 0, 1, 4 tChargeAirFlowMax = scalar, F32, 3872, "Max Air Flow (kg/h)", 1, 0, 0, 1000, 1 @@ -2314,33 +2324,53 @@ fsioTable4RpmBins = array, F32, 19968, [8], "RPM", 1, 0, 0, 25500, 2 gauge = afr1Gauge #endif - curve = fsioCurve1, "FSIO Curve #1" + curve = fsioCurve1, "Script Curve #1" columnLabel = "X", "Y" xAxis = 0, 128, 10 yAxis = -155, 150, 10 xBins = fsioCurve1Bins yBins = fsioCurve1 - - curve = fsioCurve2, "FSIO Curve #2" + showTextValues = true + + curve = fsioCurve2, "Script Curve #2" columnLabel = "X", "Y" xAxis = 0, 128, 10 yAxis = -150, 150, 10 xBins = fsioCurve2Bins yBins = fsioCurve2 + showTextValues = true - curve = fsioCurve3, "FSIO Curve #3" + curve = fsioCurve3, "Script Curve #3" columnLabel = "X", "Y" xAxis = 0, 128, 10 yAxis = -5, 5, 10 xBins = fsioCurve3Bins yBins = fsioCurve3 + showTextValues = true - curve = fsioCurve4, "FSIO Curve #4" + curve = fsioCurve4, "Script Curve #4" columnLabel = "X", "Y" xAxis = 0, 128, 10 yAxis = -5, 5, 10 xBins = fsioCurve4Bins yBins = fsioCurve4 + showTextValues = true + + curve = scriptCurve5, "Script Curve #5" + columnLabel = "X", "Y" + xAxis = 0, 128, 10 + yAxis = -5, 5, 10 + xBins = scriptCurve5Bins + yBins = scriptCurve5 + showTextValues = true + + curve = scriptCurve6, "Script Curve #6" + columnLabel = "X", "Y" + xAxis = 0, 128, 10 + yAxis = -5, 5, 10 + xBins = scriptCurve6Bins + yBins = scriptCurve6 + showTextValues = true curve = mapAccelTaper, "Engine Load Acceleration Enrichment Taper" columnLabel = "Distance", "Multiplier" @@ -3286,14 +3316,16 @@ menuDialog = main subMenu = fsioFormulas, "FSIO Formulas" subMenu = std_separator - subMenu = fsioTable1Tbl, "FSIO Table #1" - subMenu = fsioTable2Tbl, "FSIO Table #2" - subMenu = fsioTable3Tbl, "FSIO Table #3" - subMenu = fsioTable4Tbl, "FSIO Table #4" - subMenu = fsioCurve1, "FSIO Curve #1" - subMenu = fsioCurve2, "FSIO Curve #2" - subMenu = fsioCurve3, "FSIO Curve #3" - subMenu = fsioCurve4, "FSIO Curve #4" + subMenu = fsioTable1Tbl, "Script Table #1" + subMenu = fsioTable2Tbl, "Script Table #2" + subMenu = fsioTable3Tbl, "Script Table #3" + subMenu = fsioTable4Tbl, "Script Table #4" + subMenu = scriptCurve1Settings, "Script Curve #1" + subMenu = scriptCurve2Settings, "Script Curve #2" + subMenu = scriptCurve3Settings, "Script Curve #3" + subMenu = scriptCurve4Settings, "Script Curve #4" + subMenu = scriptCurve5Settings, "Script Curve #5" + subMenu = scriptCurve6Settings, "Script Curve #6" subMenu = std_separator subMenu = luaOutputs, "Lua PWM Outputs" @@ -3570,6 +3602,30 @@ cmd_set_engine_type_8888_test = "Z\x00\x30\x00\x3B" cmd_set_engine_type_default = "Z\x00\x31\x00\x00" [UserDefined] + dialog = scriptCurve1Settings, "", yAxis + field = "Name", scriptCurveName4 + panel = fsioCurve1 + + dialog = scriptCurve2Settings, "", yAxis + field = "Name", scriptCurveName4 + panel = fsioCurve2 + + dialog = scriptCurve3Settings, "", yAxis + field = "Name", scriptCurveName4 + panel = fsioCurve3 + + dialog = scriptCurve4Settings, "", yAxis + field = "Name", scriptCurveName4 + panel = fsioCurve4 + + dialog = scriptCurve5Settings, "", yAxis + field = "Name", scriptCurveName5 + panel = scriptCurve5 + + dialog = scriptCurve6Settings, "", yAxis + field = "Name", scriptCurveName6 + panel = scriptCurve6 + dialog = tChargeRpmTpsSettings, "RPM+TPS Mode Settings" field = "We use these coefficients to approximate air/fuel charge temperate" field = "based on CLT and IAT, depending on RPM and TPM" diff --git a/firmware/tunerstudio/generated/rusefi_hellen88bmw.ini b/firmware/tunerstudio/generated/rusefi_hellen88bmw.ini index a882f46df9..d8f2f5a0f5 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen88bmw.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen88bmw.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2021.11.04.hellen88bmw.802774269" + signature = "rusEFI 2021.11.05.hellen88bmw.347487129" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.11.04.hellen88bmw.802774269" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.11.05.hellen88bmw.347487129" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -85,7 +85,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 Nov 04 23:46:42 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Fri Nov 05 03:01:08 UTC 2021 pageSize = 20000 page = 1 @@ -1087,7 +1087,17 @@ lowPressureFuel_v2 = scalar, F32, 3320, "volts", 1, 0, 0, 10, 2 lowPressureFuel_value2 = scalar, F32, 3324, "kPa", 1, 0, 0, 1000000, 2 cltRevLimitRpmBins = array, S08, 3328, [4], "C", 1, 0, -70, 120, 0 cltRevLimitRpm = array, U16, 3332, [4], "", 1, 0, 0, 8000, 0 -unused3328 = array, U08, 3340, [524], "units", 1, 0, -20, 100, 0 +scriptCurveName1 = string, ASCII, 3340, 16 +scriptCurveName2 = string, ASCII, 3356, 16 +scriptCurveName3 = string, ASCII, 3372, 16 +scriptCurveName4 = string, ASCII, 3388, 16 +scriptCurveName5 = string, ASCII, 3404, 16 +scriptCurveName6 = string, ASCII, 3420, 16 +scriptCurve5Bins = array, F32, 3436, [8], "x", 1, 0, -999, 1000, 3 +scriptCurve5 = array, F32, 3468, [8], "y", 1, 0, -999, 1000, 3 +scriptCurve6Bins = array, F32, 3500, [8], "x", 1, 0, -999, 1000, 3 +scriptCurve6 = array, F32, 3532, [8], "y", 1, 0, -999, 1000, 3 +unused3328 = array, U08, 3564, [300], "units", 1, 0, -20, 100, 0 tChargeAirCoefMin = scalar, F32, 3864, "Min tCharge Coeff.", 1, 0, 0, 1, 4 tChargeAirCoefMax = scalar, F32, 3868, "Max tCharge Coeff.", 1, 0, 0, 1, 4 tChargeAirFlowMax = scalar, F32, 3872, "Max Air Flow (kg/h)", 1, 0, 0, 1000, 1 @@ -2314,33 +2324,53 @@ fsioTable4RpmBins = array, F32, 19968, [8], "RPM", 1, 0, 0, 25500, 2 gauge = afr1Gauge #endif - curve = fsioCurve1, "FSIO Curve #1" + curve = fsioCurve1, "Script Curve #1" columnLabel = "X", "Y" xAxis = 0, 128, 10 yAxis = -155, 150, 10 xBins = fsioCurve1Bins yBins = fsioCurve1 - - curve = fsioCurve2, "FSIO Curve #2" + showTextValues = true + + curve = fsioCurve2, "Script Curve #2" columnLabel = "X", "Y" xAxis = 0, 128, 10 yAxis = -150, 150, 10 xBins = fsioCurve2Bins yBins = fsioCurve2 + showTextValues = true - curve = fsioCurve3, "FSIO Curve #3" + curve = fsioCurve3, "Script Curve #3" columnLabel = "X", "Y" xAxis = 0, 128, 10 yAxis = -5, 5, 10 xBins = fsioCurve3Bins yBins = fsioCurve3 + showTextValues = true - curve = fsioCurve4, "FSIO Curve #4" + curve = fsioCurve4, "Script Curve #4" columnLabel = "X", "Y" xAxis = 0, 128, 10 yAxis = -5, 5, 10 xBins = fsioCurve4Bins yBins = fsioCurve4 + showTextValues = true + + curve = scriptCurve5, "Script Curve #5" + columnLabel = "X", "Y" + xAxis = 0, 128, 10 + yAxis = -5, 5, 10 + xBins = scriptCurve5Bins + yBins = scriptCurve5 + showTextValues = true + + curve = scriptCurve6, "Script Curve #6" + columnLabel = "X", "Y" + xAxis = 0, 128, 10 + yAxis = -5, 5, 10 + xBins = scriptCurve6Bins + yBins = scriptCurve6 + showTextValues = true curve = mapAccelTaper, "Engine Load Acceleration Enrichment Taper" columnLabel = "Distance", "Multiplier" @@ -3286,14 +3316,16 @@ menuDialog = main subMenu = fsioFormulas, "FSIO Formulas" subMenu = std_separator - subMenu = fsioTable1Tbl, "FSIO Table #1" - subMenu = fsioTable2Tbl, "FSIO Table #2" - subMenu = fsioTable3Tbl, "FSIO Table #3" - subMenu = fsioTable4Tbl, "FSIO Table #4" - subMenu = fsioCurve1, "FSIO Curve #1" - subMenu = fsioCurve2, "FSIO Curve #2" - subMenu = fsioCurve3, "FSIO Curve #3" - subMenu = fsioCurve4, "FSIO Curve #4" + subMenu = fsioTable1Tbl, "Script Table #1" + subMenu = fsioTable2Tbl, "Script Table #2" + subMenu = fsioTable3Tbl, "Script Table #3" + subMenu = fsioTable4Tbl, "Script Table #4" + subMenu = scriptCurve1Settings, "Script Curve #1" + subMenu = scriptCurve2Settings, "Script Curve #2" + subMenu = scriptCurve3Settings, "Script Curve #3" + subMenu = scriptCurve4Settings, "Script Curve #4" + subMenu = scriptCurve5Settings, "Script Curve #5" + subMenu = scriptCurve6Settings, "Script Curve #6" subMenu = std_separator subMenu = luaOutputs, "Lua PWM Outputs" @@ -3570,6 +3602,30 @@ cmd_set_engine_type_8888_test = "Z\x00\x30\x00\x3B" cmd_set_engine_type_default = "Z\x00\x31\x00\x00" [UserDefined] + dialog = scriptCurve1Settings, "", yAxis + field = "Name", scriptCurveName4 + panel = fsioCurve1 + + dialog = scriptCurve2Settings, "", yAxis + field = "Name", scriptCurveName4 + panel = fsioCurve2 + + dialog = scriptCurve3Settings, "", yAxis + field = "Name", scriptCurveName4 + panel = fsioCurve3 + + dialog = scriptCurve4Settings, "", yAxis + field = "Name", scriptCurveName4 + panel = fsioCurve4 + + dialog = scriptCurve5Settings, "", yAxis + field = "Name", scriptCurveName5 + panel = scriptCurve5 + + dialog = scriptCurve6Settings, "", yAxis + field = "Name", scriptCurveName6 + panel = scriptCurve6 + dialog = tChargeRpmTpsSettings, "RPM+TPS Mode Settings" field = "We use these coefficients to approximate air/fuel charge temperate" field = "based on CLT and IAT, depending on RPM and TPM" diff --git a/firmware/tunerstudio/generated/rusefi_hellenNA6.ini b/firmware/tunerstudio/generated/rusefi_hellenNA6.ini index 4b4512cda0..6baf2dea68 100644 --- a/firmware/tunerstudio/generated/rusefi_hellenNA6.ini +++ b/firmware/tunerstudio/generated/rusefi_hellenNA6.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2021.11.04.hellenNA6.1744939294" + signature = "rusEFI 2021.11.05.hellenNA6.1399770746" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.11.04.hellenNA6.1744939294" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.11.05.hellenNA6.1399770746" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -85,7 +85,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 Nov 04 23:46:52 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Fri Nov 05 03:01:17 UTC 2021 pageSize = 20000 page = 1 @@ -1087,7 +1087,17 @@ lowPressureFuel_v2 = scalar, F32, 3320, "volts", 1, 0, 0, 10, 2 lowPressureFuel_value2 = scalar, F32, 3324, "kPa", 1, 0, 0, 1000000, 2 cltRevLimitRpmBins = array, S08, 3328, [4], "C", 1, 0, -70, 120, 0 cltRevLimitRpm = array, U16, 3332, [4], "", 1, 0, 0, 8000, 0 -unused3328 = array, U08, 3340, [524], "units", 1, 0, -20, 100, 0 +scriptCurveName1 = string, ASCII, 3340, 16 +scriptCurveName2 = string, ASCII, 3356, 16 +scriptCurveName3 = string, ASCII, 3372, 16 +scriptCurveName4 = string, ASCII, 3388, 16 +scriptCurveName5 = string, ASCII, 3404, 16 +scriptCurveName6 = string, ASCII, 3420, 16 +scriptCurve5Bins = array, F32, 3436, [8], "x", 1, 0, -999, 1000, 3 +scriptCurve5 = array, F32, 3468, [8], "y", 1, 0, -999, 1000, 3 +scriptCurve6Bins = array, F32, 3500, [8], "x", 1, 0, -999, 1000, 3 +scriptCurve6 = array, F32, 3532, [8], "y", 1, 0, -999, 1000, 3 +unused3328 = array, U08, 3564, [300], "units", 1, 0, -20, 100, 0 tChargeAirCoefMin = scalar, F32, 3864, "Min tCharge Coeff.", 1, 0, 0, 1, 4 tChargeAirCoefMax = scalar, F32, 3868, "Max tCharge Coeff.", 1, 0, 0, 1, 4 tChargeAirFlowMax = scalar, F32, 3872, "Max Air Flow (kg/h)", 1, 0, 0, 1000, 1 @@ -2314,33 +2324,53 @@ fsioTable4RpmBins = array, F32, 19968, [8], "RPM", 1, 0, 0, 25500, 2 gauge = afr1Gauge #endif - curve = fsioCurve1, "FSIO Curve #1" + curve = fsioCurve1, "Script Curve #1" columnLabel = "X", "Y" xAxis = 0, 128, 10 yAxis = -155, 150, 10 xBins = fsioCurve1Bins yBins = fsioCurve1 - - curve = fsioCurve2, "FSIO Curve #2" + showTextValues = true + + curve = fsioCurve2, "Script Curve #2" columnLabel = "X", "Y" xAxis = 0, 128, 10 yAxis = -150, 150, 10 xBins = fsioCurve2Bins yBins = fsioCurve2 + showTextValues = true - curve = fsioCurve3, "FSIO Curve #3" + curve = fsioCurve3, "Script Curve #3" columnLabel = "X", "Y" xAxis = 0, 128, 10 yAxis = -5, 5, 10 xBins = fsioCurve3Bins yBins = fsioCurve3 + showTextValues = true - curve = fsioCurve4, "FSIO Curve #4" + curve = fsioCurve4, "Script Curve #4" columnLabel = "X", "Y" xAxis = 0, 128, 10 yAxis = -5, 5, 10 xBins = fsioCurve4Bins yBins = fsioCurve4 + showTextValues = true + + curve = scriptCurve5, "Script Curve #5" + columnLabel = "X", "Y" + xAxis = 0, 128, 10 + yAxis = -5, 5, 10 + xBins = scriptCurve5Bins + yBins = scriptCurve5 + showTextValues = true + + curve = scriptCurve6, "Script Curve #6" + columnLabel = "X", "Y" + xAxis = 0, 128, 10 + yAxis = -5, 5, 10 + xBins = scriptCurve6Bins + yBins = scriptCurve6 + showTextValues = true curve = mapAccelTaper, "Engine Load Acceleration Enrichment Taper" columnLabel = "Distance", "Multiplier" @@ -3286,14 +3316,16 @@ menuDialog = main subMenu = fsioFormulas, "FSIO Formulas" subMenu = std_separator - subMenu = fsioTable1Tbl, "FSIO Table #1" - subMenu = fsioTable2Tbl, "FSIO Table #2" - subMenu = fsioTable3Tbl, "FSIO Table #3" - subMenu = fsioTable4Tbl, "FSIO Table #4" - subMenu = fsioCurve1, "FSIO Curve #1" - subMenu = fsioCurve2, "FSIO Curve #2" - subMenu = fsioCurve3, "FSIO Curve #3" - subMenu = fsioCurve4, "FSIO Curve #4" + subMenu = fsioTable1Tbl, "Script Table #1" + subMenu = fsioTable2Tbl, "Script Table #2" + subMenu = fsioTable3Tbl, "Script Table #3" + subMenu = fsioTable4Tbl, "Script Table #4" + subMenu = scriptCurve1Settings, "Script Curve #1" + subMenu = scriptCurve2Settings, "Script Curve #2" + subMenu = scriptCurve3Settings, "Script Curve #3" + subMenu = scriptCurve4Settings, "Script Curve #4" + subMenu = scriptCurve5Settings, "Script Curve #5" + subMenu = scriptCurve6Settings, "Script Curve #6" subMenu = std_separator subMenu = luaOutputs, "Lua PWM Outputs" @@ -3570,6 +3602,30 @@ cmd_set_engine_type_8888_test = "Z\x00\x30\x00\x3B" cmd_set_engine_type_default = "Z\x00\x31\x00\x00" [UserDefined] + dialog = scriptCurve1Settings, "", yAxis + field = "Name", scriptCurveName4 + panel = fsioCurve1 + + dialog = scriptCurve2Settings, "", yAxis + field = "Name", scriptCurveName4 + panel = fsioCurve2 + + dialog = scriptCurve3Settings, "", yAxis + field = "Name", scriptCurveName4 + panel = fsioCurve3 + + dialog = scriptCurve4Settings, "", yAxis + field = "Name", scriptCurveName4 + panel = fsioCurve4 + + dialog = scriptCurve5Settings, "", yAxis + field = "Name", scriptCurveName5 + panel = scriptCurve5 + + dialog = scriptCurve6Settings, "", yAxis + field = "Name", scriptCurveName6 + panel = scriptCurve6 + dialog = tChargeRpmTpsSettings, "RPM+TPS Mode Settings" field = "We use these coefficients to approximate air/fuel charge temperate" field = "based on CLT and IAT, depending on RPM and TPM" diff --git a/firmware/tunerstudio/generated/rusefi_hellen_cypress.ini b/firmware/tunerstudio/generated/rusefi_hellen_cypress.ini index 5744579310..ee4b04f102 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen_cypress.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen_cypress.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2021.11.04.hellen_cypress.2602924992" + signature = "rusEFI 2021.11.05.hellen_cypress.2689211556" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.11.04.hellen_cypress.2602924992" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.11.05.hellen_cypress.2689211556" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -85,7 +85,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 Thu Nov 04 23:47:25 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on hellen_cypress_gen_config.bat integration/rusefi_config.txt Fri Nov 05 03:01:49 UTC 2021 pageSize = 20000 page = 1 @@ -1087,7 +1087,17 @@ lowPressureFuel_v2 = scalar, F32, 3320, "volts", 1, 0, 0, 10, 2 lowPressureFuel_value2 = scalar, F32, 3324, "kPa", 1, 0, 0, 1000000, 2 cltRevLimitRpmBins = array, S08, 3328, [4], "C", 1, 0, -70, 120, 0 cltRevLimitRpm = array, U16, 3332, [4], "", 1, 0, 0, 8000, 0 -unused3328 = array, U08, 3340, [524], "units", 1, 0, -20, 100, 0 +scriptCurveName1 = string, ASCII, 3340, 16 +scriptCurveName2 = string, ASCII, 3356, 16 +scriptCurveName3 = string, ASCII, 3372, 16 +scriptCurveName4 = string, ASCII, 3388, 16 +scriptCurveName5 = string, ASCII, 3404, 16 +scriptCurveName6 = string, ASCII, 3420, 16 +scriptCurve5Bins = array, F32, 3436, [8], "x", 1, 0, -999, 1000, 3 +scriptCurve5 = array, F32, 3468, [8], "y", 1, 0, -999, 1000, 3 +scriptCurve6Bins = array, F32, 3500, [8], "x", 1, 0, -999, 1000, 3 +scriptCurve6 = array, F32, 3532, [8], "y", 1, 0, -999, 1000, 3 +unused3328 = array, U08, 3564, [300], "units", 1, 0, -20, 100, 0 tChargeAirCoefMin = scalar, F32, 3864, "Min tCharge Coeff.", 1, 0, 0, 1, 4 tChargeAirCoefMax = scalar, F32, 3868, "Max tCharge Coeff.", 1, 0, 0, 1, 4 tChargeAirFlowMax = scalar, F32, 3872, "Max Air Flow (kg/h)", 1, 0, 0, 1000, 1 @@ -2314,33 +2324,53 @@ fsioTable4RpmBins = array, F32, 19968, [8], "RPM", 1, 0, 0, 25500, 2 gauge = afr1Gauge #endif - curve = fsioCurve1, "FSIO Curve #1" + curve = fsioCurve1, "Script Curve #1" columnLabel = "X", "Y" xAxis = 0, 128, 10 yAxis = -155, 150, 10 xBins = fsioCurve1Bins yBins = fsioCurve1 - - curve = fsioCurve2, "FSIO Curve #2" + showTextValues = true + + curve = fsioCurve2, "Script Curve #2" columnLabel = "X", "Y" xAxis = 0, 128, 10 yAxis = -150, 150, 10 xBins = fsioCurve2Bins yBins = fsioCurve2 + showTextValues = true - curve = fsioCurve3, "FSIO Curve #3" + curve = fsioCurve3, "Script Curve #3" columnLabel = "X", "Y" xAxis = 0, 128, 10 yAxis = -5, 5, 10 xBins = fsioCurve3Bins yBins = fsioCurve3 + showTextValues = true - curve = fsioCurve4, "FSIO Curve #4" + curve = fsioCurve4, "Script Curve #4" columnLabel = "X", "Y" xAxis = 0, 128, 10 yAxis = -5, 5, 10 xBins = fsioCurve4Bins yBins = fsioCurve4 + showTextValues = true + + curve = scriptCurve5, "Script Curve #5" + columnLabel = "X", "Y" + xAxis = 0, 128, 10 + yAxis = -5, 5, 10 + xBins = scriptCurve5Bins + yBins = scriptCurve5 + showTextValues = true + + curve = scriptCurve6, "Script Curve #6" + columnLabel = "X", "Y" + xAxis = 0, 128, 10 + yAxis = -5, 5, 10 + xBins = scriptCurve6Bins + yBins = scriptCurve6 + showTextValues = true curve = mapAccelTaper, "Engine Load Acceleration Enrichment Taper" columnLabel = "Distance", "Multiplier" @@ -3286,14 +3316,16 @@ menuDialog = main subMenu = fsioFormulas, "FSIO Formulas" subMenu = std_separator - subMenu = fsioTable1Tbl, "FSIO Table #1" - subMenu = fsioTable2Tbl, "FSIO Table #2" - subMenu = fsioTable3Tbl, "FSIO Table #3" - subMenu = fsioTable4Tbl, "FSIO Table #4" - subMenu = fsioCurve1, "FSIO Curve #1" - subMenu = fsioCurve2, "FSIO Curve #2" - subMenu = fsioCurve3, "FSIO Curve #3" - subMenu = fsioCurve4, "FSIO Curve #4" + subMenu = fsioTable1Tbl, "Script Table #1" + subMenu = fsioTable2Tbl, "Script Table #2" + subMenu = fsioTable3Tbl, "Script Table #3" + subMenu = fsioTable4Tbl, "Script Table #4" + subMenu = scriptCurve1Settings, "Script Curve #1" + subMenu = scriptCurve2Settings, "Script Curve #2" + subMenu = scriptCurve3Settings, "Script Curve #3" + subMenu = scriptCurve4Settings, "Script Curve #4" + subMenu = scriptCurve5Settings, "Script Curve #5" + subMenu = scriptCurve6Settings, "Script Curve #6" subMenu = std_separator subMenu = luaOutputs, "Lua PWM Outputs" @@ -3574,6 +3606,30 @@ cmd_set_engine_type_8888_test = "Z\x00\x30\x00\x3B" cmd_set_engine_type_default = "Z\x00\x31\x00\x00" [UserDefined] + dialog = scriptCurve1Settings, "", yAxis + field = "Name", scriptCurveName4 + panel = fsioCurve1 + + dialog = scriptCurve2Settings, "", yAxis + field = "Name", scriptCurveName4 + panel = fsioCurve2 + + dialog = scriptCurve3Settings, "", yAxis + field = "Name", scriptCurveName4 + panel = fsioCurve3 + + dialog = scriptCurve4Settings, "", yAxis + field = "Name", scriptCurveName4 + panel = fsioCurve4 + + dialog = scriptCurve5Settings, "", yAxis + field = "Name", scriptCurveName5 + panel = scriptCurve5 + + dialog = scriptCurve6Settings, "", yAxis + field = "Name", scriptCurveName6 + panel = scriptCurve6 + dialog = tChargeRpmTpsSettings, "RPM+TPS Mode Settings" field = "We use these coefficients to approximate air/fuel charge temperate" field = "based on CLT and IAT, depending on RPM and TPM" diff --git a/firmware/tunerstudio/generated/rusefi_kinetis.ini b/firmware/tunerstudio/generated/rusefi_kinetis.ini index ecf0c6fc4c..ad69536dc1 100644 --- a/firmware/tunerstudio/generated/rusefi_kinetis.ini +++ b/firmware/tunerstudio/generated/rusefi_kinetis.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2021.11.04.kin.1686157116" + signature = "rusEFI 2021.11.05.kin.1609551960" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.11.04.kin.1686157116" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.11.05.kin.1609551960" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -85,7 +85,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 Thu Nov 04 23:47:22 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Fri Nov 05 03:01:47 UTC 2021 pageSize = 19972 page = 1 @@ -1065,7 +1065,17 @@ lowPressureFuel_v2 = scalar, F32, 3292, "volts", 1, 0, 0, 10, 2 lowPressureFuel_value2 = scalar, F32, 3296, "kPa", 1, 0, 0, 1000000, 2 cltRevLimitRpmBins = array, S08, 3300, [4], "C", 1, 0, -70, 120, 0 cltRevLimitRpm = array, U16, 3304, [4], "", 1, 0, 0, 8000, 0 -unused3328 = array, U08, 3312, [524], "units", 1, 0, -20, 100, 0 +scriptCurveName1 = string, ASCII, 3312, 16 +scriptCurveName2 = string, ASCII, 3328, 16 +scriptCurveName3 = string, ASCII, 3344, 16 +scriptCurveName4 = string, ASCII, 3360, 16 +scriptCurveName5 = string, ASCII, 3376, 16 +scriptCurveName6 = string, ASCII, 3392, 16 +scriptCurve5Bins = array, F32, 3408, [8], "x", 1, 0, -999, 1000, 3 +scriptCurve5 = array, F32, 3440, [8], "y", 1, 0, -999, 1000, 3 +scriptCurve6Bins = array, F32, 3472, [8], "x", 1, 0, -999, 1000, 3 +scriptCurve6 = array, F32, 3504, [8], "y", 1, 0, -999, 1000, 3 +unused3328 = array, U08, 3536, [300], "units", 1, 0, -20, 100, 0 tChargeAirCoefMin = scalar, F32, 3836, "Min tCharge Coeff.", 1, 0, 0, 1, 4 tChargeAirCoefMax = scalar, F32, 3840, "Max tCharge Coeff.", 1, 0, 0, 1, 4 tChargeAirFlowMax = scalar, F32, 3844, "Max Air Flow (kg/h)", 1, 0, 0, 1000, 1 @@ -2280,33 +2290,53 @@ fsioTable4RpmBins = array, F32, 19940, [8], "RPM", 1, 0, 0, 25500, 2 gauge = afr1Gauge #endif - curve = fsioCurve1, "FSIO Curve #1" + curve = fsioCurve1, "Script Curve #1" columnLabel = "X", "Y" xAxis = 0, 128, 10 yAxis = -155, 150, 10 xBins = fsioCurve1Bins yBins = fsioCurve1 - - curve = fsioCurve2, "FSIO Curve #2" + showTextValues = true + + curve = fsioCurve2, "Script Curve #2" columnLabel = "X", "Y" xAxis = 0, 128, 10 yAxis = -150, 150, 10 xBins = fsioCurve2Bins yBins = fsioCurve2 + showTextValues = true - curve = fsioCurve3, "FSIO Curve #3" + curve = fsioCurve3, "Script Curve #3" columnLabel = "X", "Y" xAxis = 0, 128, 10 yAxis = -5, 5, 10 xBins = fsioCurve3Bins yBins = fsioCurve3 + showTextValues = true - curve = fsioCurve4, "FSIO Curve #4" + curve = fsioCurve4, "Script Curve #4" columnLabel = "X", "Y" xAxis = 0, 128, 10 yAxis = -5, 5, 10 xBins = fsioCurve4Bins yBins = fsioCurve4 + showTextValues = true + + curve = scriptCurve5, "Script Curve #5" + columnLabel = "X", "Y" + xAxis = 0, 128, 10 + yAxis = -5, 5, 10 + xBins = scriptCurve5Bins + yBins = scriptCurve5 + showTextValues = true + + curve = scriptCurve6, "Script Curve #6" + columnLabel = "X", "Y" + xAxis = 0, 128, 10 + yAxis = -5, 5, 10 + xBins = scriptCurve6Bins + yBins = scriptCurve6 + showTextValues = true curve = mapAccelTaper, "Engine Load Acceleration Enrichment Taper" columnLabel = "Distance", "Multiplier" @@ -3252,14 +3282,16 @@ menuDialog = main subMenu = fsioFormulas, "FSIO Formulas" subMenu = std_separator - subMenu = fsioTable1Tbl, "FSIO Table #1" - subMenu = fsioTable2Tbl, "FSIO Table #2" - subMenu = fsioTable3Tbl, "FSIO Table #3" - subMenu = fsioTable4Tbl, "FSIO Table #4" - subMenu = fsioCurve1, "FSIO Curve #1" - subMenu = fsioCurve2, "FSIO Curve #2" - subMenu = fsioCurve3, "FSIO Curve #3" - subMenu = fsioCurve4, "FSIO Curve #4" + subMenu = fsioTable1Tbl, "Script Table #1" + subMenu = fsioTable2Tbl, "Script Table #2" + subMenu = fsioTable3Tbl, "Script Table #3" + subMenu = fsioTable4Tbl, "Script Table #4" + subMenu = scriptCurve1Settings, "Script Curve #1" + subMenu = scriptCurve2Settings, "Script Curve #2" + subMenu = scriptCurve3Settings, "Script Curve #3" + subMenu = scriptCurve4Settings, "Script Curve #4" + subMenu = scriptCurve5Settings, "Script Curve #5" + subMenu = scriptCurve6Settings, "Script Curve #6" subMenu = std_separator subMenu = luaOutputs, "Lua PWM Outputs" @@ -3540,6 +3572,30 @@ cmd_set_engine_type_8888_test = "Z\x00\x30\x00\x3B" cmd_set_engine_type_default = "Z\x00\x31\x00\x00" [UserDefined] + dialog = scriptCurve1Settings, "", yAxis + field = "Name", scriptCurveName4 + panel = fsioCurve1 + + dialog = scriptCurve2Settings, "", yAxis + field = "Name", scriptCurveName4 + panel = fsioCurve2 + + dialog = scriptCurve3Settings, "", yAxis + field = "Name", scriptCurveName4 + panel = fsioCurve3 + + dialog = scriptCurve4Settings, "", yAxis + field = "Name", scriptCurveName4 + panel = fsioCurve4 + + dialog = scriptCurve5Settings, "", yAxis + field = "Name", scriptCurveName5 + panel = scriptCurve5 + + dialog = scriptCurve6Settings, "", yAxis + field = "Name", scriptCurveName6 + panel = scriptCurve6 + dialog = tChargeRpmTpsSettings, "RPM+TPS Mode Settings" field = "We use these coefficients to approximate air/fuel charge temperate" field = "based on CLT and IAT, depending on RPM and TPM" diff --git a/firmware/tunerstudio/generated/rusefi_mre_f4.ini b/firmware/tunerstudio/generated/rusefi_mre_f4.ini index 80ea8655f7..9222b627b5 100644 --- a/firmware/tunerstudio/generated/rusefi_mre_f4.ini +++ b/firmware/tunerstudio/generated/rusefi_mre_f4.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2021.11.04.mre_f4.1372174212" + signature = "rusEFI 2021.11.05.mre_f4.1789317344" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.11.04.mre_f4.1372174212" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.11.05.mre_f4.1789317344" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -85,7 +85,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 Nov 04 23:46:58 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Fri Nov 05 03:01:23 UTC 2021 pageSize = 20000 page = 1 @@ -1087,7 +1087,17 @@ lowPressureFuel_v2 = scalar, F32, 3320, "volts", 1, 0, 0, 10, 2 lowPressureFuel_value2 = scalar, F32, 3324, "kPa", 1, 0, 0, 1000000, 2 cltRevLimitRpmBins = array, S08, 3328, [4], "C", 1, 0, -70, 120, 0 cltRevLimitRpm = array, U16, 3332, [4], "", 1, 0, 0, 8000, 0 -unused3328 = array, U08, 3340, [524], "units", 1, 0, -20, 100, 0 +scriptCurveName1 = string, ASCII, 3340, 16 +scriptCurveName2 = string, ASCII, 3356, 16 +scriptCurveName3 = string, ASCII, 3372, 16 +scriptCurveName4 = string, ASCII, 3388, 16 +scriptCurveName5 = string, ASCII, 3404, 16 +scriptCurveName6 = string, ASCII, 3420, 16 +scriptCurve5Bins = array, F32, 3436, [8], "x", 1, 0, -999, 1000, 3 +scriptCurve5 = array, F32, 3468, [8], "y", 1, 0, -999, 1000, 3 +scriptCurve6Bins = array, F32, 3500, [8], "x", 1, 0, -999, 1000, 3 +scriptCurve6 = array, F32, 3532, [8], "y", 1, 0, -999, 1000, 3 +unused3328 = array, U08, 3564, [300], "units", 1, 0, -20, 100, 0 tChargeAirCoefMin = scalar, F32, 3864, "Min tCharge Coeff.", 1, 0, 0, 1, 4 tChargeAirCoefMax = scalar, F32, 3868, "Max tCharge Coeff.", 1, 0, 0, 1, 4 tChargeAirFlowMax = scalar, F32, 3872, "Max Air Flow (kg/h)", 1, 0, 0, 1000, 1 @@ -2314,33 +2324,53 @@ fsioTable4RpmBins = array, F32, 19968, [8], "RPM", 1, 0, 0, 25500, 2 gauge = afr1Gauge #endif - curve = fsioCurve1, "FSIO Curve #1" + curve = fsioCurve1, "Script Curve #1" columnLabel = "X", "Y" xAxis = 0, 128, 10 yAxis = -155, 150, 10 xBins = fsioCurve1Bins yBins = fsioCurve1 - - curve = fsioCurve2, "FSIO Curve #2" + showTextValues = true + + curve = fsioCurve2, "Script Curve #2" columnLabel = "X", "Y" xAxis = 0, 128, 10 yAxis = -150, 150, 10 xBins = fsioCurve2Bins yBins = fsioCurve2 + showTextValues = true - curve = fsioCurve3, "FSIO Curve #3" + curve = fsioCurve3, "Script Curve #3" columnLabel = "X", "Y" xAxis = 0, 128, 10 yAxis = -5, 5, 10 xBins = fsioCurve3Bins yBins = fsioCurve3 + showTextValues = true - curve = fsioCurve4, "FSIO Curve #4" + curve = fsioCurve4, "Script Curve #4" columnLabel = "X", "Y" xAxis = 0, 128, 10 yAxis = -5, 5, 10 xBins = fsioCurve4Bins yBins = fsioCurve4 + showTextValues = true + + curve = scriptCurve5, "Script Curve #5" + columnLabel = "X", "Y" + xAxis = 0, 128, 10 + yAxis = -5, 5, 10 + xBins = scriptCurve5Bins + yBins = scriptCurve5 + showTextValues = true + + curve = scriptCurve6, "Script Curve #6" + columnLabel = "X", "Y" + xAxis = 0, 128, 10 + yAxis = -5, 5, 10 + xBins = scriptCurve6Bins + yBins = scriptCurve6 + showTextValues = true curve = mapAccelTaper, "Engine Load Acceleration Enrichment Taper" columnLabel = "Distance", "Multiplier" @@ -3286,14 +3316,16 @@ menuDialog = main subMenu = fsioFormulas, "FSIO Formulas" subMenu = std_separator - subMenu = fsioTable1Tbl, "FSIO Table #1" - subMenu = fsioTable2Tbl, "FSIO Table #2" - subMenu = fsioTable3Tbl, "FSIO Table #3" - subMenu = fsioTable4Tbl, "FSIO Table #4" - subMenu = fsioCurve1, "FSIO Curve #1" - subMenu = fsioCurve2, "FSIO Curve #2" - subMenu = fsioCurve3, "FSIO Curve #3" - subMenu = fsioCurve4, "FSIO Curve #4" + subMenu = fsioTable1Tbl, "Script Table #1" + subMenu = fsioTable2Tbl, "Script Table #2" + subMenu = fsioTable3Tbl, "Script Table #3" + subMenu = fsioTable4Tbl, "Script Table #4" + subMenu = scriptCurve1Settings, "Script Curve #1" + subMenu = scriptCurve2Settings, "Script Curve #2" + subMenu = scriptCurve3Settings, "Script Curve #3" + subMenu = scriptCurve4Settings, "Script Curve #4" + subMenu = scriptCurve5Settings, "Script Curve #5" + subMenu = scriptCurve6Settings, "Script Curve #6" subMenu = std_separator subMenu = luaOutputs, "Lua PWM Outputs" @@ -3570,6 +3602,30 @@ cmd_set_engine_type_8888_test = "Z\x00\x30\x00\x3B" cmd_set_engine_type_default = "Z\x00\x31\x00\x00" [UserDefined] + dialog = scriptCurve1Settings, "", yAxis + field = "Name", scriptCurveName4 + panel = fsioCurve1 + + dialog = scriptCurve2Settings, "", yAxis + field = "Name", scriptCurveName4 + panel = fsioCurve2 + + dialog = scriptCurve3Settings, "", yAxis + field = "Name", scriptCurveName4 + panel = fsioCurve3 + + dialog = scriptCurve4Settings, "", yAxis + field = "Name", scriptCurveName4 + panel = fsioCurve4 + + dialog = scriptCurve5Settings, "", yAxis + field = "Name", scriptCurveName5 + panel = scriptCurve5 + + dialog = scriptCurve6Settings, "", yAxis + field = "Name", scriptCurveName6 + panel = scriptCurve6 + dialog = tChargeRpmTpsSettings, "RPM+TPS Mode Settings" field = "We use these coefficients to approximate air/fuel charge temperate" field = "based on CLT and IAT, depending on RPM and TPM" diff --git a/firmware/tunerstudio/generated/rusefi_mre_f7.ini b/firmware/tunerstudio/generated/rusefi_mre_f7.ini index 87dc6fc094..20fc05f6ad 100644 --- a/firmware/tunerstudio/generated/rusefi_mre_f7.ini +++ b/firmware/tunerstudio/generated/rusefi_mre_f7.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2021.11.04.mre_f7.1372174212" + signature = "rusEFI 2021.11.05.mre_f7.1789317344" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.11.04.mre_f7.1372174212" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.11.05.mre_f7.1789317344" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -85,7 +85,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 Nov 04 23:46:55 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Fri Nov 05 03:01:20 UTC 2021 pageSize = 20000 page = 1 @@ -1087,7 +1087,17 @@ lowPressureFuel_v2 = scalar, F32, 3320, "volts", 1, 0, 0, 10, 2 lowPressureFuel_value2 = scalar, F32, 3324, "kPa", 1, 0, 0, 1000000, 2 cltRevLimitRpmBins = array, S08, 3328, [4], "C", 1, 0, -70, 120, 0 cltRevLimitRpm = array, U16, 3332, [4], "", 1, 0, 0, 8000, 0 -unused3328 = array, U08, 3340, [524], "units", 1, 0, -20, 100, 0 +scriptCurveName1 = string, ASCII, 3340, 16 +scriptCurveName2 = string, ASCII, 3356, 16 +scriptCurveName3 = string, ASCII, 3372, 16 +scriptCurveName4 = string, ASCII, 3388, 16 +scriptCurveName5 = string, ASCII, 3404, 16 +scriptCurveName6 = string, ASCII, 3420, 16 +scriptCurve5Bins = array, F32, 3436, [8], "x", 1, 0, -999, 1000, 3 +scriptCurve5 = array, F32, 3468, [8], "y", 1, 0, -999, 1000, 3 +scriptCurve6Bins = array, F32, 3500, [8], "x", 1, 0, -999, 1000, 3 +scriptCurve6 = array, F32, 3532, [8], "y", 1, 0, -999, 1000, 3 +unused3328 = array, U08, 3564, [300], "units", 1, 0, -20, 100, 0 tChargeAirCoefMin = scalar, F32, 3864, "Min tCharge Coeff.", 1, 0, 0, 1, 4 tChargeAirCoefMax = scalar, F32, 3868, "Max tCharge Coeff.", 1, 0, 0, 1, 4 tChargeAirFlowMax = scalar, F32, 3872, "Max Air Flow (kg/h)", 1, 0, 0, 1000, 1 @@ -2314,33 +2324,53 @@ fsioTable4RpmBins = array, F32, 19968, [8], "RPM", 1, 0, 0, 25500, 2 gauge = afr1Gauge #endif - curve = fsioCurve1, "FSIO Curve #1" + curve = fsioCurve1, "Script Curve #1" columnLabel = "X", "Y" xAxis = 0, 128, 10 yAxis = -155, 150, 10 xBins = fsioCurve1Bins yBins = fsioCurve1 - - curve = fsioCurve2, "FSIO Curve #2" + showTextValues = true + + curve = fsioCurve2, "Script Curve #2" columnLabel = "X", "Y" xAxis = 0, 128, 10 yAxis = -150, 150, 10 xBins = fsioCurve2Bins yBins = fsioCurve2 + showTextValues = true - curve = fsioCurve3, "FSIO Curve #3" + curve = fsioCurve3, "Script Curve #3" columnLabel = "X", "Y" xAxis = 0, 128, 10 yAxis = -5, 5, 10 xBins = fsioCurve3Bins yBins = fsioCurve3 + showTextValues = true - curve = fsioCurve4, "FSIO Curve #4" + curve = fsioCurve4, "Script Curve #4" columnLabel = "X", "Y" xAxis = 0, 128, 10 yAxis = -5, 5, 10 xBins = fsioCurve4Bins yBins = fsioCurve4 + showTextValues = true + + curve = scriptCurve5, "Script Curve #5" + columnLabel = "X", "Y" + xAxis = 0, 128, 10 + yAxis = -5, 5, 10 + xBins = scriptCurve5Bins + yBins = scriptCurve5 + showTextValues = true + + curve = scriptCurve6, "Script Curve #6" + columnLabel = "X", "Y" + xAxis = 0, 128, 10 + yAxis = -5, 5, 10 + xBins = scriptCurve6Bins + yBins = scriptCurve6 + showTextValues = true curve = mapAccelTaper, "Engine Load Acceleration Enrichment Taper" columnLabel = "Distance", "Multiplier" @@ -3286,14 +3316,16 @@ menuDialog = main subMenu = fsioFormulas, "FSIO Formulas" subMenu = std_separator - subMenu = fsioTable1Tbl, "FSIO Table #1" - subMenu = fsioTable2Tbl, "FSIO Table #2" - subMenu = fsioTable3Tbl, "FSIO Table #3" - subMenu = fsioTable4Tbl, "FSIO Table #4" - subMenu = fsioCurve1, "FSIO Curve #1" - subMenu = fsioCurve2, "FSIO Curve #2" - subMenu = fsioCurve3, "FSIO Curve #3" - subMenu = fsioCurve4, "FSIO Curve #4" + subMenu = fsioTable1Tbl, "Script Table #1" + subMenu = fsioTable2Tbl, "Script Table #2" + subMenu = fsioTable3Tbl, "Script Table #3" + subMenu = fsioTable4Tbl, "Script Table #4" + subMenu = scriptCurve1Settings, "Script Curve #1" + subMenu = scriptCurve2Settings, "Script Curve #2" + subMenu = scriptCurve3Settings, "Script Curve #3" + subMenu = scriptCurve4Settings, "Script Curve #4" + subMenu = scriptCurve5Settings, "Script Curve #5" + subMenu = scriptCurve6Settings, "Script Curve #6" subMenu = std_separator subMenu = luaOutputs, "Lua PWM Outputs" @@ -3570,6 +3602,30 @@ cmd_set_engine_type_8888_test = "Z\x00\x30\x00\x3B" cmd_set_engine_type_default = "Z\x00\x31\x00\x00" [UserDefined] + dialog = scriptCurve1Settings, "", yAxis + field = "Name", scriptCurveName4 + panel = fsioCurve1 + + dialog = scriptCurve2Settings, "", yAxis + field = "Name", scriptCurveName4 + panel = fsioCurve2 + + dialog = scriptCurve3Settings, "", yAxis + field = "Name", scriptCurveName4 + panel = fsioCurve3 + + dialog = scriptCurve4Settings, "", yAxis + field = "Name", scriptCurveName4 + panel = fsioCurve4 + + dialog = scriptCurve5Settings, "", yAxis + field = "Name", scriptCurveName5 + panel = scriptCurve5 + + dialog = scriptCurve6Settings, "", yAxis + field = "Name", scriptCurveName6 + panel = scriptCurve6 + dialog = tChargeRpmTpsSettings, "RPM+TPS Mode Settings" field = "We use these coefficients to approximate air/fuel charge temperate" field = "based on CLT and IAT, depending on RPM and TPM" diff --git a/firmware/tunerstudio/generated/rusefi_prometheus_405.ini b/firmware/tunerstudio/generated/rusefi_prometheus_405.ini index f10092946e..43f2ce6110 100644 --- a/firmware/tunerstudio/generated/rusefi_prometheus_405.ini +++ b/firmware/tunerstudio/generated/rusefi_prometheus_405.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2021.11.04.prometheus_405.2310240758" + signature = "rusEFI 2021.11.05.prometheus_405.3000770194" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.11.04.prometheus_405.2310240758" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.11.05.prometheus_405.3000770194" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -85,7 +85,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 Nov 04 23:47:07 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Fri Nov 05 03:01:32 UTC 2021 pageSize = 20000 page = 1 @@ -1087,7 +1087,17 @@ lowPressureFuel_v2 = scalar, F32, 3320, "volts", 1, 0, 0, 10, 2 lowPressureFuel_value2 = scalar, F32, 3324, "kPa", 1, 0, 0, 1000000, 2 cltRevLimitRpmBins = array, S08, 3328, [4], "C", 1, 0, -70, 120, 0 cltRevLimitRpm = array, U16, 3332, [4], "", 1, 0, 0, 8000, 0 -unused3328 = array, U08, 3340, [524], "units", 1, 0, -20, 100, 0 +scriptCurveName1 = string, ASCII, 3340, 16 +scriptCurveName2 = string, ASCII, 3356, 16 +scriptCurveName3 = string, ASCII, 3372, 16 +scriptCurveName4 = string, ASCII, 3388, 16 +scriptCurveName5 = string, ASCII, 3404, 16 +scriptCurveName6 = string, ASCII, 3420, 16 +scriptCurve5Bins = array, F32, 3436, [8], "x", 1, 0, -999, 1000, 3 +scriptCurve5 = array, F32, 3468, [8], "y", 1, 0, -999, 1000, 3 +scriptCurve6Bins = array, F32, 3500, [8], "x", 1, 0, -999, 1000, 3 +scriptCurve6 = array, F32, 3532, [8], "y", 1, 0, -999, 1000, 3 +unused3328 = array, U08, 3564, [300], "units", 1, 0, -20, 100, 0 tChargeAirCoefMin = scalar, F32, 3864, "Min tCharge Coeff.", 1, 0, 0, 1, 4 tChargeAirCoefMax = scalar, F32, 3868, "Max tCharge Coeff.", 1, 0, 0, 1, 4 tChargeAirFlowMax = scalar, F32, 3872, "Max Air Flow (kg/h)", 1, 0, 0, 1000, 1 @@ -2314,33 +2324,53 @@ fsioTable4RpmBins = array, F32, 19968, [8], "RPM", 1, 0, 0, 25500, 2 gauge = afr1Gauge #endif - curve = fsioCurve1, "FSIO Curve #1" + curve = fsioCurve1, "Script Curve #1" columnLabel = "X", "Y" xAxis = 0, 128, 10 yAxis = -155, 150, 10 xBins = fsioCurve1Bins yBins = fsioCurve1 - - curve = fsioCurve2, "FSIO Curve #2" + showTextValues = true + + curve = fsioCurve2, "Script Curve #2" columnLabel = "X", "Y" xAxis = 0, 128, 10 yAxis = -150, 150, 10 xBins = fsioCurve2Bins yBins = fsioCurve2 + showTextValues = true - curve = fsioCurve3, "FSIO Curve #3" + curve = fsioCurve3, "Script Curve #3" columnLabel = "X", "Y" xAxis = 0, 128, 10 yAxis = -5, 5, 10 xBins = fsioCurve3Bins yBins = fsioCurve3 + showTextValues = true - curve = fsioCurve4, "FSIO Curve #4" + curve = fsioCurve4, "Script Curve #4" columnLabel = "X", "Y" xAxis = 0, 128, 10 yAxis = -5, 5, 10 xBins = fsioCurve4Bins yBins = fsioCurve4 + showTextValues = true + + curve = scriptCurve5, "Script Curve #5" + columnLabel = "X", "Y" + xAxis = 0, 128, 10 + yAxis = -5, 5, 10 + xBins = scriptCurve5Bins + yBins = scriptCurve5 + showTextValues = true + + curve = scriptCurve6, "Script Curve #6" + columnLabel = "X", "Y" + xAxis = 0, 128, 10 + yAxis = -5, 5, 10 + xBins = scriptCurve6Bins + yBins = scriptCurve6 + showTextValues = true curve = mapAccelTaper, "Engine Load Acceleration Enrichment Taper" columnLabel = "Distance", "Multiplier" @@ -3282,14 +3312,16 @@ menuDialog = main subMenu = fsioFormulas, "FSIO Formulas" subMenu = std_separator - subMenu = fsioTable1Tbl, "FSIO Table #1" - subMenu = fsioTable2Tbl, "FSIO Table #2" - subMenu = fsioTable3Tbl, "FSIO Table #3" - subMenu = fsioTable4Tbl, "FSIO Table #4" - subMenu = fsioCurve1, "FSIO Curve #1" - subMenu = fsioCurve2, "FSIO Curve #2" - subMenu = fsioCurve3, "FSIO Curve #3" - subMenu = fsioCurve4, "FSIO Curve #4" + subMenu = fsioTable1Tbl, "Script Table #1" + subMenu = fsioTable2Tbl, "Script Table #2" + subMenu = fsioTable3Tbl, "Script Table #3" + subMenu = fsioTable4Tbl, "Script Table #4" + subMenu = scriptCurve1Settings, "Script Curve #1" + subMenu = scriptCurve2Settings, "Script Curve #2" + subMenu = scriptCurve3Settings, "Script Curve #3" + subMenu = scriptCurve4Settings, "Script Curve #4" + subMenu = scriptCurve5Settings, "Script Curve #5" + subMenu = scriptCurve6Settings, "Script Curve #6" subMenu = std_separator subMenu = luaOutputs, "Lua PWM Outputs" @@ -3569,6 +3601,30 @@ cmd_set_engine_type_8888_test = "Z\x00\x30\x00\x3B" cmd_set_engine_type_default = "Z\x00\x31\x00\x00" [UserDefined] + dialog = scriptCurve1Settings, "", yAxis + field = "Name", scriptCurveName4 + panel = fsioCurve1 + + dialog = scriptCurve2Settings, "", yAxis + field = "Name", scriptCurveName4 + panel = fsioCurve2 + + dialog = scriptCurve3Settings, "", yAxis + field = "Name", scriptCurveName4 + panel = fsioCurve3 + + dialog = scriptCurve4Settings, "", yAxis + field = "Name", scriptCurveName4 + panel = fsioCurve4 + + dialog = scriptCurve5Settings, "", yAxis + field = "Name", scriptCurveName5 + panel = scriptCurve5 + + dialog = scriptCurve6Settings, "", yAxis + field = "Name", scriptCurveName6 + panel = scriptCurve6 + dialog = tChargeRpmTpsSettings, "RPM+TPS Mode Settings" field = "We use these coefficients to approximate air/fuel charge temperate" field = "based on CLT and IAT, depending on RPM and TPM" diff --git a/firmware/tunerstudio/generated/rusefi_prometheus_469.ini b/firmware/tunerstudio/generated/rusefi_prometheus_469.ini index 1fb2a0cef7..4a9afcaa9c 100644 --- a/firmware/tunerstudio/generated/rusefi_prometheus_469.ini +++ b/firmware/tunerstudio/generated/rusefi_prometheus_469.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2021.11.04.prometheus_469.2310240758" + signature = "rusEFI 2021.11.05.prometheus_469.3000770194" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.11.04.prometheus_469.2310240758" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.11.05.prometheus_469.3000770194" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -85,7 +85,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 Nov 04 23:47:04 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Fri Nov 05 03:01:29 UTC 2021 pageSize = 20000 page = 1 @@ -1087,7 +1087,17 @@ lowPressureFuel_v2 = scalar, F32, 3320, "volts", 1, 0, 0, 10, 2 lowPressureFuel_value2 = scalar, F32, 3324, "kPa", 1, 0, 0, 1000000, 2 cltRevLimitRpmBins = array, S08, 3328, [4], "C", 1, 0, -70, 120, 0 cltRevLimitRpm = array, U16, 3332, [4], "", 1, 0, 0, 8000, 0 -unused3328 = array, U08, 3340, [524], "units", 1, 0, -20, 100, 0 +scriptCurveName1 = string, ASCII, 3340, 16 +scriptCurveName2 = string, ASCII, 3356, 16 +scriptCurveName3 = string, ASCII, 3372, 16 +scriptCurveName4 = string, ASCII, 3388, 16 +scriptCurveName5 = string, ASCII, 3404, 16 +scriptCurveName6 = string, ASCII, 3420, 16 +scriptCurve5Bins = array, F32, 3436, [8], "x", 1, 0, -999, 1000, 3 +scriptCurve5 = array, F32, 3468, [8], "y", 1, 0, -999, 1000, 3 +scriptCurve6Bins = array, F32, 3500, [8], "x", 1, 0, -999, 1000, 3 +scriptCurve6 = array, F32, 3532, [8], "y", 1, 0, -999, 1000, 3 +unused3328 = array, U08, 3564, [300], "units", 1, 0, -20, 100, 0 tChargeAirCoefMin = scalar, F32, 3864, "Min tCharge Coeff.", 1, 0, 0, 1, 4 tChargeAirCoefMax = scalar, F32, 3868, "Max tCharge Coeff.", 1, 0, 0, 1, 4 tChargeAirFlowMax = scalar, F32, 3872, "Max Air Flow (kg/h)", 1, 0, 0, 1000, 1 @@ -2314,33 +2324,53 @@ fsioTable4RpmBins = array, F32, 19968, [8], "RPM", 1, 0, 0, 25500, 2 gauge = afr1Gauge #endif - curve = fsioCurve1, "FSIO Curve #1" + curve = fsioCurve1, "Script Curve #1" columnLabel = "X", "Y" xAxis = 0, 128, 10 yAxis = -155, 150, 10 xBins = fsioCurve1Bins yBins = fsioCurve1 - - curve = fsioCurve2, "FSIO Curve #2" + showTextValues = true + + curve = fsioCurve2, "Script Curve #2" columnLabel = "X", "Y" xAxis = 0, 128, 10 yAxis = -150, 150, 10 xBins = fsioCurve2Bins yBins = fsioCurve2 + showTextValues = true - curve = fsioCurve3, "FSIO Curve #3" + curve = fsioCurve3, "Script Curve #3" columnLabel = "X", "Y" xAxis = 0, 128, 10 yAxis = -5, 5, 10 xBins = fsioCurve3Bins yBins = fsioCurve3 + showTextValues = true - curve = fsioCurve4, "FSIO Curve #4" + curve = fsioCurve4, "Script Curve #4" columnLabel = "X", "Y" xAxis = 0, 128, 10 yAxis = -5, 5, 10 xBins = fsioCurve4Bins yBins = fsioCurve4 + showTextValues = true + + curve = scriptCurve5, "Script Curve #5" + columnLabel = "X", "Y" + xAxis = 0, 128, 10 + yAxis = -5, 5, 10 + xBins = scriptCurve5Bins + yBins = scriptCurve5 + showTextValues = true + + curve = scriptCurve6, "Script Curve #6" + columnLabel = "X", "Y" + xAxis = 0, 128, 10 + yAxis = -5, 5, 10 + xBins = scriptCurve6Bins + yBins = scriptCurve6 + showTextValues = true curve = mapAccelTaper, "Engine Load Acceleration Enrichment Taper" columnLabel = "Distance", "Multiplier" @@ -3282,14 +3312,16 @@ menuDialog = main subMenu = fsioFormulas, "FSIO Formulas" subMenu = std_separator - subMenu = fsioTable1Tbl, "FSIO Table #1" - subMenu = fsioTable2Tbl, "FSIO Table #2" - subMenu = fsioTable3Tbl, "FSIO Table #3" - subMenu = fsioTable4Tbl, "FSIO Table #4" - subMenu = fsioCurve1, "FSIO Curve #1" - subMenu = fsioCurve2, "FSIO Curve #2" - subMenu = fsioCurve3, "FSIO Curve #3" - subMenu = fsioCurve4, "FSIO Curve #4" + subMenu = fsioTable1Tbl, "Script Table #1" + subMenu = fsioTable2Tbl, "Script Table #2" + subMenu = fsioTable3Tbl, "Script Table #3" + subMenu = fsioTable4Tbl, "Script Table #4" + subMenu = scriptCurve1Settings, "Script Curve #1" + subMenu = scriptCurve2Settings, "Script Curve #2" + subMenu = scriptCurve3Settings, "Script Curve #3" + subMenu = scriptCurve4Settings, "Script Curve #4" + subMenu = scriptCurve5Settings, "Script Curve #5" + subMenu = scriptCurve6Settings, "Script Curve #6" subMenu = std_separator subMenu = luaOutputs, "Lua PWM Outputs" @@ -3569,6 +3601,30 @@ cmd_set_engine_type_8888_test = "Z\x00\x30\x00\x3B" cmd_set_engine_type_default = "Z\x00\x31\x00\x00" [UserDefined] + dialog = scriptCurve1Settings, "", yAxis + field = "Name", scriptCurveName4 + panel = fsioCurve1 + + dialog = scriptCurve2Settings, "", yAxis + field = "Name", scriptCurveName4 + panel = fsioCurve2 + + dialog = scriptCurve3Settings, "", yAxis + field = "Name", scriptCurveName4 + panel = fsioCurve3 + + dialog = scriptCurve4Settings, "", yAxis + field = "Name", scriptCurveName4 + panel = fsioCurve4 + + dialog = scriptCurve5Settings, "", yAxis + field = "Name", scriptCurveName5 + panel = scriptCurve5 + + dialog = scriptCurve6Settings, "", yAxis + field = "Name", scriptCurveName6 + panel = scriptCurve6 + dialog = tChargeRpmTpsSettings, "RPM+TPS Mode Settings" field = "We use these coefficients to approximate air/fuel charge temperate" field = "based on CLT and IAT, depending on RPM and TPM" diff --git a/firmware/tunerstudio/generated/rusefi_proteus_f4.ini b/firmware/tunerstudio/generated/rusefi_proteus_f4.ini index d23c7e18e8..352644b22c 100644 --- a/firmware/tunerstudio/generated/rusefi_proteus_f4.ini +++ b/firmware/tunerstudio/generated/rusefi_proteus_f4.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2021.11.04.proteus_f4.1203628236" + signature = "rusEFI 2021.11.05.proteus_f4.2094174120" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.11.04.proteus_f4.1203628236" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.11.05.proteus_f4.2094174120" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -85,7 +85,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 Nov 04 23:47:13 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Fri Nov 05 03:01:38 UTC 2021 pageSize = 20000 page = 1 @@ -1087,7 +1087,17 @@ lowPressureFuel_v2 = scalar, F32, 3320, "volts", 1, 0, 0, 10, 2 lowPressureFuel_value2 = scalar, F32, 3324, "kPa", 1, 0, 0, 1000000, 2 cltRevLimitRpmBins = array, S08, 3328, [4], "C", 1, 0, -70, 120, 0 cltRevLimitRpm = array, U16, 3332, [4], "", 1, 0, 0, 8000, 0 -unused3328 = array, U08, 3340, [524], "units", 1, 0, -20, 100, 0 +scriptCurveName1 = string, ASCII, 3340, 16 +scriptCurveName2 = string, ASCII, 3356, 16 +scriptCurveName3 = string, ASCII, 3372, 16 +scriptCurveName4 = string, ASCII, 3388, 16 +scriptCurveName5 = string, ASCII, 3404, 16 +scriptCurveName6 = string, ASCII, 3420, 16 +scriptCurve5Bins = array, F32, 3436, [8], "x", 1, 0, -999, 1000, 3 +scriptCurve5 = array, F32, 3468, [8], "y", 1, 0, -999, 1000, 3 +scriptCurve6Bins = array, F32, 3500, [8], "x", 1, 0, -999, 1000, 3 +scriptCurve6 = array, F32, 3532, [8], "y", 1, 0, -999, 1000, 3 +unused3328 = array, U08, 3564, [300], "units", 1, 0, -20, 100, 0 tChargeAirCoefMin = scalar, F32, 3864, "Min tCharge Coeff.", 1, 0, 0, 1, 4 tChargeAirCoefMax = scalar, F32, 3868, "Max tCharge Coeff.", 1, 0, 0, 1, 4 tChargeAirFlowMax = scalar, F32, 3872, "Max Air Flow (kg/h)", 1, 0, 0, 1000, 1 @@ -2314,33 +2324,53 @@ fsioTable4RpmBins = array, F32, 19968, [8], "RPM", 1, 0, 0, 25500, 2 gauge = afr1Gauge #endif - curve = fsioCurve1, "FSIO Curve #1" + curve = fsioCurve1, "Script Curve #1" columnLabel = "X", "Y" xAxis = 0, 128, 10 yAxis = -155, 150, 10 xBins = fsioCurve1Bins yBins = fsioCurve1 - - curve = fsioCurve2, "FSIO Curve #2" + showTextValues = true + + curve = fsioCurve2, "Script Curve #2" columnLabel = "X", "Y" xAxis = 0, 128, 10 yAxis = -150, 150, 10 xBins = fsioCurve2Bins yBins = fsioCurve2 + showTextValues = true - curve = fsioCurve3, "FSIO Curve #3" + curve = fsioCurve3, "Script Curve #3" columnLabel = "X", "Y" xAxis = 0, 128, 10 yAxis = -5, 5, 10 xBins = fsioCurve3Bins yBins = fsioCurve3 + showTextValues = true - curve = fsioCurve4, "FSIO Curve #4" + curve = fsioCurve4, "Script Curve #4" columnLabel = "X", "Y" xAxis = 0, 128, 10 yAxis = -5, 5, 10 xBins = fsioCurve4Bins yBins = fsioCurve4 + showTextValues = true + + curve = scriptCurve5, "Script Curve #5" + columnLabel = "X", "Y" + xAxis = 0, 128, 10 + yAxis = -5, 5, 10 + xBins = scriptCurve5Bins + yBins = scriptCurve5 + showTextValues = true + + curve = scriptCurve6, "Script Curve #6" + columnLabel = "X", "Y" + xAxis = 0, 128, 10 + yAxis = -5, 5, 10 + xBins = scriptCurve6Bins + yBins = scriptCurve6 + showTextValues = true curve = mapAccelTaper, "Engine Load Acceleration Enrichment Taper" columnLabel = "Distance", "Multiplier" @@ -3286,14 +3316,16 @@ menuDialog = main subMenu = fsioFormulas, "FSIO Formulas" subMenu = std_separator - subMenu = fsioTable1Tbl, "FSIO Table #1" - subMenu = fsioTable2Tbl, "FSIO Table #2" - subMenu = fsioTable3Tbl, "FSIO Table #3" - subMenu = fsioTable4Tbl, "FSIO Table #4" - subMenu = fsioCurve1, "FSIO Curve #1" - subMenu = fsioCurve2, "FSIO Curve #2" - subMenu = fsioCurve3, "FSIO Curve #3" - subMenu = fsioCurve4, "FSIO Curve #4" + subMenu = fsioTable1Tbl, "Script Table #1" + subMenu = fsioTable2Tbl, "Script Table #2" + subMenu = fsioTable3Tbl, "Script Table #3" + subMenu = fsioTable4Tbl, "Script Table #4" + subMenu = scriptCurve1Settings, "Script Curve #1" + subMenu = scriptCurve2Settings, "Script Curve #2" + subMenu = scriptCurve3Settings, "Script Curve #3" + subMenu = scriptCurve4Settings, "Script Curve #4" + subMenu = scriptCurve5Settings, "Script Curve #5" + subMenu = scriptCurve6Settings, "Script Curve #6" subMenu = std_separator subMenu = luaOutputs, "Lua PWM Outputs" @@ -3567,6 +3599,30 @@ cmd_set_engine_type_8888_test = "Z\x00\x30\x00\x3B" cmd_set_engine_type_default = "Z\x00\x31\x00\x00" [UserDefined] + dialog = scriptCurve1Settings, "", yAxis + field = "Name", scriptCurveName4 + panel = fsioCurve1 + + dialog = scriptCurve2Settings, "", yAxis + field = "Name", scriptCurveName4 + panel = fsioCurve2 + + dialog = scriptCurve3Settings, "", yAxis + field = "Name", scriptCurveName4 + panel = fsioCurve3 + + dialog = scriptCurve4Settings, "", yAxis + field = "Name", scriptCurveName4 + panel = fsioCurve4 + + dialog = scriptCurve5Settings, "", yAxis + field = "Name", scriptCurveName5 + panel = scriptCurve5 + + dialog = scriptCurve6Settings, "", yAxis + field = "Name", scriptCurveName6 + panel = scriptCurve6 + dialog = tChargeRpmTpsSettings, "RPM+TPS Mode Settings" field = "We use these coefficients to approximate air/fuel charge temperate" field = "based on CLT and IAT, depending on RPM and TPM" diff --git a/firmware/tunerstudio/generated/rusefi_proteus_f7.ini b/firmware/tunerstudio/generated/rusefi_proteus_f7.ini index d3a1ba33b0..63665a674c 100644 --- a/firmware/tunerstudio/generated/rusefi_proteus_f7.ini +++ b/firmware/tunerstudio/generated/rusefi_proteus_f7.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2021.11.04.proteus_f7.1203628236" + signature = "rusEFI 2021.11.05.proteus_f7.2094174120" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.11.04.proteus_f7.1203628236" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.11.05.proteus_f7.2094174120" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -85,7 +85,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 Nov 04 23:47:10 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Fri Nov 05 03:01:35 UTC 2021 pageSize = 20000 page = 1 @@ -1087,7 +1087,17 @@ lowPressureFuel_v2 = scalar, F32, 3320, "volts", 1, 0, 0, 10, 2 lowPressureFuel_value2 = scalar, F32, 3324, "kPa", 1, 0, 0, 1000000, 2 cltRevLimitRpmBins = array, S08, 3328, [4], "C", 1, 0, -70, 120, 0 cltRevLimitRpm = array, U16, 3332, [4], "", 1, 0, 0, 8000, 0 -unused3328 = array, U08, 3340, [524], "units", 1, 0, -20, 100, 0 +scriptCurveName1 = string, ASCII, 3340, 16 +scriptCurveName2 = string, ASCII, 3356, 16 +scriptCurveName3 = string, ASCII, 3372, 16 +scriptCurveName4 = string, ASCII, 3388, 16 +scriptCurveName5 = string, ASCII, 3404, 16 +scriptCurveName6 = string, ASCII, 3420, 16 +scriptCurve5Bins = array, F32, 3436, [8], "x", 1, 0, -999, 1000, 3 +scriptCurve5 = array, F32, 3468, [8], "y", 1, 0, -999, 1000, 3 +scriptCurve6Bins = array, F32, 3500, [8], "x", 1, 0, -999, 1000, 3 +scriptCurve6 = array, F32, 3532, [8], "y", 1, 0, -999, 1000, 3 +unused3328 = array, U08, 3564, [300], "units", 1, 0, -20, 100, 0 tChargeAirCoefMin = scalar, F32, 3864, "Min tCharge Coeff.", 1, 0, 0, 1, 4 tChargeAirCoefMax = scalar, F32, 3868, "Max tCharge Coeff.", 1, 0, 0, 1, 4 tChargeAirFlowMax = scalar, F32, 3872, "Max Air Flow (kg/h)", 1, 0, 0, 1000, 1 @@ -2314,33 +2324,53 @@ fsioTable4RpmBins = array, F32, 19968, [8], "RPM", 1, 0, 0, 25500, 2 gauge = afr1Gauge #endif - curve = fsioCurve1, "FSIO Curve #1" + curve = fsioCurve1, "Script Curve #1" columnLabel = "X", "Y" xAxis = 0, 128, 10 yAxis = -155, 150, 10 xBins = fsioCurve1Bins yBins = fsioCurve1 - - curve = fsioCurve2, "FSIO Curve #2" + showTextValues = true + + curve = fsioCurve2, "Script Curve #2" columnLabel = "X", "Y" xAxis = 0, 128, 10 yAxis = -150, 150, 10 xBins = fsioCurve2Bins yBins = fsioCurve2 + showTextValues = true - curve = fsioCurve3, "FSIO Curve #3" + curve = fsioCurve3, "Script Curve #3" columnLabel = "X", "Y" xAxis = 0, 128, 10 yAxis = -5, 5, 10 xBins = fsioCurve3Bins yBins = fsioCurve3 + showTextValues = true - curve = fsioCurve4, "FSIO Curve #4" + curve = fsioCurve4, "Script Curve #4" columnLabel = "X", "Y" xAxis = 0, 128, 10 yAxis = -5, 5, 10 xBins = fsioCurve4Bins yBins = fsioCurve4 + showTextValues = true + + curve = scriptCurve5, "Script Curve #5" + columnLabel = "X", "Y" + xAxis = 0, 128, 10 + yAxis = -5, 5, 10 + xBins = scriptCurve5Bins + yBins = scriptCurve5 + showTextValues = true + + curve = scriptCurve6, "Script Curve #6" + columnLabel = "X", "Y" + xAxis = 0, 128, 10 + yAxis = -5, 5, 10 + xBins = scriptCurve6Bins + yBins = scriptCurve6 + showTextValues = true curve = mapAccelTaper, "Engine Load Acceleration Enrichment Taper" columnLabel = "Distance", "Multiplier" @@ -3286,14 +3316,16 @@ menuDialog = main subMenu = fsioFormulas, "FSIO Formulas" subMenu = std_separator - subMenu = fsioTable1Tbl, "FSIO Table #1" - subMenu = fsioTable2Tbl, "FSIO Table #2" - subMenu = fsioTable3Tbl, "FSIO Table #3" - subMenu = fsioTable4Tbl, "FSIO Table #4" - subMenu = fsioCurve1, "FSIO Curve #1" - subMenu = fsioCurve2, "FSIO Curve #2" - subMenu = fsioCurve3, "FSIO Curve #3" - subMenu = fsioCurve4, "FSIO Curve #4" + subMenu = fsioTable1Tbl, "Script Table #1" + subMenu = fsioTable2Tbl, "Script Table #2" + subMenu = fsioTable3Tbl, "Script Table #3" + subMenu = fsioTable4Tbl, "Script Table #4" + subMenu = scriptCurve1Settings, "Script Curve #1" + subMenu = scriptCurve2Settings, "Script Curve #2" + subMenu = scriptCurve3Settings, "Script Curve #3" + subMenu = scriptCurve4Settings, "Script Curve #4" + subMenu = scriptCurve5Settings, "Script Curve #5" + subMenu = scriptCurve6Settings, "Script Curve #6" subMenu = std_separator subMenu = luaOutputs, "Lua PWM Outputs" @@ -3567,6 +3599,30 @@ cmd_set_engine_type_8888_test = "Z\x00\x30\x00\x3B" cmd_set_engine_type_default = "Z\x00\x31\x00\x00" [UserDefined] + dialog = scriptCurve1Settings, "", yAxis + field = "Name", scriptCurveName4 + panel = fsioCurve1 + + dialog = scriptCurve2Settings, "", yAxis + field = "Name", scriptCurveName4 + panel = fsioCurve2 + + dialog = scriptCurve3Settings, "", yAxis + field = "Name", scriptCurveName4 + panel = fsioCurve3 + + dialog = scriptCurve4Settings, "", yAxis + field = "Name", scriptCurveName4 + panel = fsioCurve4 + + dialog = scriptCurve5Settings, "", yAxis + field = "Name", scriptCurveName5 + panel = scriptCurve5 + + dialog = scriptCurve6Settings, "", yAxis + field = "Name", scriptCurveName6 + panel = scriptCurve6 + dialog = tChargeRpmTpsSettings, "RPM+TPS Mode Settings" field = "We use these coefficients to approximate air/fuel charge temperate" field = "based on CLT and IAT, depending on RPM and TPM" diff --git a/firmware/tunerstudio/generated/rusefi_subaru_eg33_f7.ini b/firmware/tunerstudio/generated/rusefi_subaru_eg33_f7.ini index 744d30e464..fd35754d09 100644 --- a/firmware/tunerstudio/generated/rusefi_subaru_eg33_f7.ini +++ b/firmware/tunerstudio/generated/rusefi_subaru_eg33_f7.ini @@ -32,12 +32,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2021.11.04.subaru_eg33_f7.1288915827" + signature = "rusEFI 2021.11.05.subaru_eg33_f7.2008820759" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.11.04.subaru_eg33_f7.1288915827" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.11.05.subaru_eg33_f7.2008820759" ; signature is expected to be 7 or more characters. ; TS will try to use legacy temp units in some cases, showing "deg F" on a CLT gauge that's actually deg C useLegacyFTempUnits = false @@ -85,7 +85,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 config/boards/subaru_eg33/config/gen_config.sh integration/rusefi_config.txt Thu Nov 04 23:47:28 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on config/boards/subaru_eg33/config/gen_config.sh integration/rusefi_config.txt Fri Nov 05 03:01:52 UTC 2021 pageSize = 20000 page = 1 @@ -1087,7 +1087,17 @@ lowPressureFuel_v2 = scalar, F32, 3320, "volts", 1, 0, 0, 10, 2 lowPressureFuel_value2 = scalar, F32, 3324, "kPa", 1, 0, 0, 1000000, 2 cltRevLimitRpmBins = array, S08, 3328, [4], "C", 1, 0, -70, 120, 0 cltRevLimitRpm = array, U16, 3332, [4], "", 1, 0, 0, 8000, 0 -unused3328 = array, U08, 3340, [524], "units", 1, 0, -20, 100, 0 +scriptCurveName1 = string, ASCII, 3340, 16 +scriptCurveName2 = string, ASCII, 3356, 16 +scriptCurveName3 = string, ASCII, 3372, 16 +scriptCurveName4 = string, ASCII, 3388, 16 +scriptCurveName5 = string, ASCII, 3404, 16 +scriptCurveName6 = string, ASCII, 3420, 16 +scriptCurve5Bins = array, F32, 3436, [8], "x", 1, 0, -999, 1000, 3 +scriptCurve5 = array, F32, 3468, [8], "y", 1, 0, -999, 1000, 3 +scriptCurve6Bins = array, F32, 3500, [8], "x", 1, 0, -999, 1000, 3 +scriptCurve6 = array, F32, 3532, [8], "y", 1, 0, -999, 1000, 3 +unused3328 = array, U08, 3564, [300], "units", 1, 0, -20, 100, 0 tChargeAirCoefMin = scalar, F32, 3864, "Min tCharge Coeff.", 1, 0, 0, 1, 4 tChargeAirCoefMax = scalar, F32, 3868, "Max tCharge Coeff.", 1, 0, 0, 1, 4 tChargeAirFlowMax = scalar, F32, 3872, "Max Air Flow (kg/h)", 1, 0, 0, 1000, 1 @@ -2314,33 +2324,53 @@ fsioTable4RpmBins = array, F32, 19968, [8], "RPM", 1, 0, 0, 25500, 2 gauge = afr1Gauge #endif - curve = fsioCurve1, "FSIO Curve #1" + curve = fsioCurve1, "Script Curve #1" columnLabel = "X", "Y" xAxis = 0, 128, 10 yAxis = -155, 150, 10 xBins = fsioCurve1Bins yBins = fsioCurve1 - - curve = fsioCurve2, "FSIO Curve #2" + showTextValues = true + + curve = fsioCurve2, "Script Curve #2" columnLabel = "X", "Y" xAxis = 0, 128, 10 yAxis = -150, 150, 10 xBins = fsioCurve2Bins yBins = fsioCurve2 + showTextValues = true - curve = fsioCurve3, "FSIO Curve #3" + curve = fsioCurve3, "Script Curve #3" columnLabel = "X", "Y" xAxis = 0, 128, 10 yAxis = -5, 5, 10 xBins = fsioCurve3Bins yBins = fsioCurve3 + showTextValues = true - curve = fsioCurve4, "FSIO Curve #4" + curve = fsioCurve4, "Script Curve #4" columnLabel = "X", "Y" xAxis = 0, 128, 10 yAxis = -5, 5, 10 xBins = fsioCurve4Bins yBins = fsioCurve4 + showTextValues = true + + curve = scriptCurve5, "Script Curve #5" + columnLabel = "X", "Y" + xAxis = 0, 128, 10 + yAxis = -5, 5, 10 + xBins = scriptCurve5Bins + yBins = scriptCurve5 + showTextValues = true + + curve = scriptCurve6, "Script Curve #6" + columnLabel = "X", "Y" + xAxis = 0, 128, 10 + yAxis = -5, 5, 10 + xBins = scriptCurve6Bins + yBins = scriptCurve6 + showTextValues = true curve = mapAccelTaper, "Engine Load Acceleration Enrichment Taper" columnLabel = "Distance", "Multiplier" @@ -3286,14 +3316,16 @@ menuDialog = main subMenu = fsioFormulas, "FSIO Formulas" subMenu = std_separator - subMenu = fsioTable1Tbl, "FSIO Table #1" - subMenu = fsioTable2Tbl, "FSIO Table #2" - subMenu = fsioTable3Tbl, "FSIO Table #3" - subMenu = fsioTable4Tbl, "FSIO Table #4" - subMenu = fsioCurve1, "FSIO Curve #1" - subMenu = fsioCurve2, "FSIO Curve #2" - subMenu = fsioCurve3, "FSIO Curve #3" - subMenu = fsioCurve4, "FSIO Curve #4" + subMenu = fsioTable1Tbl, "Script Table #1" + subMenu = fsioTable2Tbl, "Script Table #2" + subMenu = fsioTable3Tbl, "Script Table #3" + subMenu = fsioTable4Tbl, "Script Table #4" + subMenu = scriptCurve1Settings, "Script Curve #1" + subMenu = scriptCurve2Settings, "Script Curve #2" + subMenu = scriptCurve3Settings, "Script Curve #3" + subMenu = scriptCurve4Settings, "Script Curve #4" + subMenu = scriptCurve5Settings, "Script Curve #5" + subMenu = scriptCurve6Settings, "Script Curve #6" subMenu = std_separator subMenu = luaOutputs, "Lua PWM Outputs" @@ -3570,6 +3602,30 @@ cmd_set_engine_type_8888_test = "Z\x00\x30\x00\x3B" cmd_set_engine_type_default = "Z\x00\x31\x00\x00" [UserDefined] + dialog = scriptCurve1Settings, "", yAxis + field = "Name", scriptCurveName4 + panel = fsioCurve1 + + dialog = scriptCurve2Settings, "", yAxis + field = "Name", scriptCurveName4 + panel = fsioCurve2 + + dialog = scriptCurve3Settings, "", yAxis + field = "Name", scriptCurveName4 + panel = fsioCurve3 + + dialog = scriptCurve4Settings, "", yAxis + field = "Name", scriptCurveName4 + panel = fsioCurve4 + + dialog = scriptCurve5Settings, "", yAxis + field = "Name", scriptCurveName5 + panel = scriptCurve5 + + dialog = scriptCurve6Settings, "", yAxis + field = "Name", scriptCurveName6 + panel = scriptCurve6 + dialog = tChargeRpmTpsSettings, "RPM+TPS Mode Settings" field = "We use these coefficients to approximate air/fuel charge temperate" field = "based on CLT and IAT, depending on RPM and TPM" 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 53a46c2c67..4f32d4917a 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 Thu Nov 04 23:47:19 UTC 2021 +// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Fri Nov 05 03:01:44 UTC 2021 // by class com.rusefi.output.FileJavaFieldsConsumer import com.rusefi.config.*; @@ -1708,6 +1708,17 @@ public class Fields { public static final int RPM_1_BYTE_PACKING_MULT = 50; public static final int rpmHardLimit_offset = 416; public static final int runningLedPin_offset = 1813; + public static final int SCRIPT_CURVE_COUNT = 6; + public static final int scriptCurve5_offset = 3468; + public static final int scriptCurve5Bins_offset = 3436; + public static final int scriptCurve6_offset = 3532; + public static final int scriptCurve6Bins_offset = 3500; + public static final int scriptCurveName1_offset = 3340; + public static final int scriptCurveName2_offset = 3356; + public static final int scriptCurveName3_offset = 3372; + public static final int scriptCurveName4_offset = 3388; + public static final int scriptCurveName5_offset = 3404; + public static final int scriptCurveName6_offset = 3420; public static final int sdCardCsPin_offset = 707; public static final int sdCardCsPinMode_offset = 2226; public static final int sdCardPeriodMs_offset = 804; @@ -2184,7 +2195,7 @@ public class Fields { public static final int TS_RESPONSE_UNDERRUN = 0x80; public static final int TS_RESPONSE_UNRECOGNIZED_COMMAND = 0x83; public static final char TS_SET_LOGGER_SWITCH = 'l'; - public static final String TS_SIGNATURE = "rusEFI 2021.11.04.all.3646529552"; + public static final String TS_SIGNATURE = "rusEFI 2021.11.05.all.3795240820"; public static final char TS_SINGLE_WRITE_COMMAND = 'W'; public static final char TS_TEST_COMMAND = 't'; public static final int tunerStudioSerialSpeed_offset = 728; @@ -2219,7 +2230,7 @@ public class Fields { public static final int unused2508_offset = 2511; public static final int unused2536_offset = 2539; public static final int unused3103_offset = 3103; - public static final int unused3328_offset = 3340; + public static final int unused3328_offset = 3564; public static final int unused3942_offset = 3992; public static final int unused3988_offset = 3988; public static final int unused4028_offset = 4028; @@ -3347,6 +3358,12 @@ public class Fields { public static final Field LOWPRESSUREFUEL_VALUE1 = Field.create("LOWPRESSUREFUEL_VALUE1", 3316, FieldType.FLOAT); public static final Field LOWPRESSUREFUEL_V2 = Field.create("LOWPRESSUREFUEL_V2", 3320, FieldType.FLOAT); public static final Field LOWPRESSUREFUEL_VALUE2 = Field.create("LOWPRESSUREFUEL_VALUE2", 3324, FieldType.FLOAT); + public static final Field SCRIPTCURVENAME1 = Field.create("SCRIPTCURVENAME1", 3340, 16, FieldType.STRING); + public static final Field SCRIPTCURVENAME2 = Field.create("SCRIPTCURVENAME2", 3356, 16, FieldType.STRING); + public static final Field SCRIPTCURVENAME3 = Field.create("SCRIPTCURVENAME3", 3372, 16, FieldType.STRING); + public static final Field SCRIPTCURVENAME4 = Field.create("SCRIPTCURVENAME4", 3388, 16, FieldType.STRING); + public static final Field SCRIPTCURVENAME5 = Field.create("SCRIPTCURVENAME5", 3404, 16, FieldType.STRING); + public static final Field SCRIPTCURVENAME6 = Field.create("SCRIPTCURVENAME6", 3420, 16, FieldType.STRING); public static final Field TCHARGEAIRCOEFMIN = Field.create("TCHARGEAIRCOEFMIN", 3864, FieldType.FLOAT); public static final Field TCHARGEAIRCOEFMAX = Field.create("TCHARGEAIRCOEFMAX", 3868, FieldType.FLOAT); public static final Field TCHARGEAIRFLOWMAX = Field.create("TCHARGEAIRFLOWMAX", 3872, FieldType.FLOAT); @@ -4459,6 +4476,12 @@ public class Fields { LOWPRESSUREFUEL_VALUE1, LOWPRESSUREFUEL_V2, LOWPRESSUREFUEL_VALUE2, + SCRIPTCURVENAME1, + SCRIPTCURVENAME2, + SCRIPTCURVENAME3, + SCRIPTCURVENAME4, + SCRIPTCURVENAME5, + SCRIPTCURVENAME6, TCHARGEAIRCOEFMIN, TCHARGEAIRCOEFMAX, TCHARGEAIRFLOWMAX, diff --git a/java_console/rusefi.xml b/java_console/rusefi.xml index b3316b2f55..1af30d0865 100644 --- a/java_console/rusefi.xml +++ b/java_console/rusefi.xml @@ -1,6 +1,6 @@ - +