From 13d19653e9750d72b373119bd4e8431f6f13af4e Mon Sep 17 00:00:00 2001 From: GitHub build-firmware Action Date: Sun, 14 Nov 2021 03:54:30 +0000 Subject: [PATCH] Auto-generated configs and docs --- ...ngine_configuration_generated_structures.h | 10 ++-- .../controllers/algo/rusefi_generated.h | 21 ++++--- ...ngine_configuration_generated_structures.h | 10 ++-- .../controllers/algo/rusefi_generated.h | 21 ++++--- ...ngine_configuration_generated_structures.h | 10 ++-- .../controllers/algo/rusefi_generated.h | 21 ++++--- ...ngine_configuration_generated_structures.h | 10 ++-- .../generated/fsio_enums_generated.def | 2 +- .../controllers/generated/fsio_getters.def | 2 +- firmware/controllers/generated/fsio_names.def | 2 +- .../controllers/generated/fsio_strings.def | 2 +- .../controllers/generated/rusefi_generated.h | 21 ++++--- .../controllers/generated/signature_all.h | 4 +- .../controllers/generated/signature_atlas.h | 4 +- .../generated/signature_f429-discovery.h | 4 +- .../generated/signature_frankenso_na6.h | 4 +- .../generated/signature_hellen-nb1.h | 4 +- .../generated/signature_hellen121nissan.h | 4 +- .../generated/signature_hellen121vag.h | 4 +- .../generated/signature_hellen128.h | 4 +- .../generated/signature_hellen154hyundai.h | 4 +- .../generated/signature_hellen72.h | 4 +- .../generated/signature_hellen88bmw.h | 4 +- .../generated/signature_hellenNA6.h | 4 +- .../generated/signature_hellen_cypress.h | 4 +- .../controllers/generated/signature_kin.h | 4 +- .../controllers/generated/signature_mre_f4.h | 4 +- .../controllers/generated/signature_mre_f7.h | 4 +- .../generated/signature_prometheus_405.h | 4 +- .../generated/signature_prometheus_469.h | 4 +- .../generated/signature_proteus_f4.h | 4 +- .../generated/signature_proteus_f7.h | 4 +- .../generated/signature_subaru_eg33_f7.h | 4 +- firmware/tunerstudio/generated/cache.zip | Bin 2133897 -> 2134464 bytes firmware/tunerstudio/generated/rusefi.ini | 38 +++++++------ .../tunerstudio/generated/rusefi_atlas.ini | 38 +++++++------ .../generated/rusefi_f429-discovery.ini | 38 +++++++------ .../generated/rusefi_frankenso_na6.ini | 38 +++++++------ .../generated/rusefi_hellen-nb1.ini | 38 +++++++------ .../generated/rusefi_hellen121nissan.ini | 38 +++++++------ .../generated/rusefi_hellen121vag.ini | 38 +++++++------ .../generated/rusefi_hellen128mercedes.ini | 38 +++++++------ .../generated/rusefi_hellen154hyundai.ini | 38 +++++++------ .../tunerstudio/generated/rusefi_hellen72.ini | 38 +++++++------ .../generated/rusefi_hellen88bmw.ini | 38 +++++++------ .../generated/rusefi_hellenNA6.ini | 38 +++++++------ .../generated/rusefi_hellen_cypress.ini | 38 +++++++------ .../tunerstudio/generated/rusefi_kinetis.ini | 38 +++++++------ .../tunerstudio/generated/rusefi_mre_f4.ini | 38 +++++++------ .../tunerstudio/generated/rusefi_mre_f7.ini | 38 +++++++------ .../generated/rusefi_prometheus_405.ini | 38 +++++++------ .../generated/rusefi_prometheus_469.ini | 38 +++++++------ .../generated/rusefi_proteus_f4.ini | 38 +++++++------ .../generated/rusefi_proteus_f7.ini | 38 +++++++------ .../generated/rusefi_subaru_eg33_f7.ini | 38 +++++++------ .../com/rusefi/config/generated/Fields.java | 52 ++++++++++-------- java_console/rusefi.xml | 2 +- 57 files changed, 564 insertions(+), 504 deletions(-) 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 86c133ebae..c2fe5687e3 100644 --- a/firmware/config/boards/hellen/cypress/config/controllers/algo/engine_configuration_generated_structures.h +++ b/firmware/config/boards/hellen/cypress/config/controllers/algo/engine_configuration_generated_structures.h @@ -1,4 +1,4 @@ -// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on hellen_cypress_gen_config.bat integration/rusefi_config.txt Sun Nov 14 03:00:46 UTC 2021 +// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on hellen_cypress_gen_config.bat integration/rusefi_config.txt Sun Nov 14 03:53:04 UTC 2021 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -1831,11 +1831,11 @@ struct engine_configuration_s { /** * offset 864 */ - fsio_setting_t fsio_setting[FSIO_COMMAND_COUNT]; + fsio_setting_t scriptSetting[SCRIPT_SETTING_COUNT]; /** - * offset 888 + * offset 896 */ - int unusedSettings[10]; + int unusedSettings[8]; /** * offset 928 */ @@ -4563,4 +4563,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 Sun Nov 14 03:00:46 UTC 2021 +// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on hellen_cypress_gen_config.bat integration/rusefi_config.txt Sun Nov 14 03:53:04 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 46c4e81df3..ff6405a302 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 @@ -962,12 +962,6 @@ #define FSIO_METHOD_FSIO_DIGITAL_INPUT "fsio_digital_input" #define FSIO_METHOD_FSIO_SETTING "fsio_setting" #define FSIO_METHOD_FSIO_TABLE "fsio_table" -#define fsio_setting1_offset 864 -#define fsio_setting2_offset 868 -#define fsio_setting3_offset 872 -#define fsio_setting4_offset 876 -#define fsio_setting5_offset 880 -#define fsio_setting6_offset 884 #define FSIO_TABLE_8 8 #define fsioDigitalInputs1_offset 952 #define fsioDigitalInputs2_offset 953 @@ -1795,6 +1789,7 @@ #define rpmHardLimit_offset 416 #define runningLedPin_offset 1813 #define SCRIPT_CURVE_COUNT 6 +#define SCRIPT_SETTING_COUNT 8 #define SCRIPT_TABLE_COUNT 4 #define scriptCurve1_offset 2780 #define scriptCurve1Bins_offset 2716 @@ -1814,6 +1809,14 @@ #define scriptCurveName4_offset 3388 #define scriptCurveName5_offset 3404 #define scriptCurveName6_offset 3420 +#define scriptSetting1_offset 864 +#define scriptSetting2_offset 868 +#define scriptSetting3_offset 872 +#define scriptSetting4_offset 876 +#define scriptSetting5_offset 880 +#define scriptSetting6_offset 884 +#define scriptSetting7_offset 888 +#define scriptSetting8_offset 892 #define scriptTableName1_offset 3564 #define scriptTableName2_offset 3580 #define scriptTableName3_offset 3596 @@ -1847,7 +1850,7 @@ #define show_test_presets true #define showHumanReadableWarning_offset 976 #define showSdCardWarning_offset 76 -#define SIGNATURE_HASH 2059243171 +#define SIGNATURE_HASH 2780582437 #define silentTriggerError_offset 1464 #define slowAdcAlpha_offset 2088 #define sparkDwellRpmBins_offset 332 @@ -2366,7 +2369,7 @@ #define ts_show_spi true #define ts_show_trigger_comparator false #define ts_show_tunerstudio_port true -#define TS_SIGNATURE "rusEFI 2021.11.14.hellen_cypress.2059243171" +#define TS_SIGNATURE "rusEFI 2021.11.14.hellen_cypress.2780582437" #define TS_SINGLE_WRITE_COMMAND 'W' #define TS_SINGLE_WRITE_COMMAND_char W #define TS_TEST_COMMAND 't' @@ -2477,7 +2480,7 @@ #define unusedOutputFreqWhereHere_offset 844 #define unusedOutputWhereHere_offset 794 #define unusedpinModesWhereHere_offset 779 -#define unusedSettings_offset 888 +#define unusedSettings_offset 896 #define unusedSpiPadding4_offset 2593 #define unusedSpiPadding8_offset 4010 #define unusedVvtOffsetWasHere_offset 2052 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 a5eb4f77dc..cc0ad0b331 100644 --- a/firmware/config/boards/kinetis/config/controllers/algo/engine_configuration_generated_structures.h +++ b/firmware/config/boards/kinetis/config/controllers/algo/engine_configuration_generated_structures.h @@ -1,4 +1,4 @@ -// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Sun Nov 14 03:00:44 UTC 2021 +// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Sun Nov 14 03:53:01 UTC 2021 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -1831,11 +1831,11 @@ struct engine_configuration_s { /** * offset 864 */ - fsio_setting_t fsio_setting[FSIO_COMMAND_COUNT]; + fsio_setting_t scriptSetting[SCRIPT_SETTING_COUNT]; /** - * offset 888 + * offset 896 */ - int unusedSettings[10]; + int unusedSettings[8]; /** * offset 928 */ @@ -4557,4 +4557,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 Sun Nov 14 03:00:44 UTC 2021 +// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Sun Nov 14 03:53:01 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 5bee97dcc6..b66d8e2293 100644 --- a/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h +++ b/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h @@ -947,12 +947,6 @@ #define FSIO_METHOD_FSIO_DIGITAL_INPUT "fsio_digital_input" #define FSIO_METHOD_FSIO_SETTING "fsio_setting" #define FSIO_METHOD_FSIO_TABLE "fsio_table" -#define fsio_setting1_offset 864 -#define fsio_setting2_offset 868 -#define fsio_setting3_offset 872 -#define fsio_setting4_offset 876 -#define fsio_setting5_offset 880 -#define fsio_setting6_offset 884 #define FSIO_TABLE_8 8 #define fsioDigitalInputs1_offset 952 #define fsioDigitalInputs2_offset 953 @@ -1780,6 +1774,7 @@ #define rpmHardLimit_offset 416 #define runningLedPin_offset 1813 #define SCRIPT_CURVE_COUNT 6 +#define SCRIPT_SETTING_COUNT 8 #define SCRIPT_TABLE_COUNT 4 #define scriptCurve1_offset 2752 #define scriptCurve1Bins_offset 2688 @@ -1799,6 +1794,14 @@ #define scriptCurveName4_offset 3360 #define scriptCurveName5_offset 3376 #define scriptCurveName6_offset 3392 +#define scriptSetting1_offset 864 +#define scriptSetting2_offset 868 +#define scriptSetting3_offset 872 +#define scriptSetting4_offset 876 +#define scriptSetting5_offset 880 +#define scriptSetting6_offset 884 +#define scriptSetting7_offset 888 +#define scriptSetting8_offset 892 #define scriptTableName1_offset 3536 #define scriptTableName2_offset 3552 #define scriptTableName3_offset 3568 @@ -1832,7 +1835,7 @@ #define show_test_presets true #define showHumanReadableWarning_offset 976 #define showSdCardWarning_offset 76 -#define SIGNATURE_HASH 2232959583 +#define SIGNATURE_HASH 1511628505 #define silentTriggerError_offset 1464 #define slowAdcAlpha_offset 2088 #define sparkDwellRpmBins_offset 332 @@ -2351,7 +2354,7 @@ #define ts_show_spi true #define ts_show_trigger_comparator true #define ts_show_tunerstudio_port true -#define TS_SIGNATURE "rusEFI 2021.11.14.kin.2232959583" +#define TS_SIGNATURE "rusEFI 2021.11.14.kin.1511628505" #define TS_SINGLE_WRITE_COMMAND 'W' #define TS_SINGLE_WRITE_COMMAND_char W #define TS_TEST_COMMAND 't' @@ -2462,7 +2465,7 @@ #define unusedOutputFreqWhereHere_offset 844 #define unusedOutputWhereHere_offset 794 #define unusedpinModesWhereHere_offset 779 -#define unusedSettings_offset 888 +#define unusedSettings_offset 896 #define unusedSpiPadding4_offset 2585 #define unusedSpiPadding8_offset 3982 #define unusedVvtOffsetWasHere_offset 2052 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 2e58e43427..d2d4a2cb56 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 Sun Nov 14 03:00:49 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 Sun Nov 14 03:53:07 UTC 2021 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -1831,11 +1831,11 @@ struct engine_configuration_s { /** * offset 864 */ - fsio_setting_t fsio_setting[FSIO_COMMAND_COUNT]; + fsio_setting_t scriptSetting[SCRIPT_SETTING_COUNT]; /** - * offset 888 + * offset 896 */ - int unusedSettings[10]; + int unusedSettings[8]; /** * offset 928 */ @@ -4563,4 +4563,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 Sun Nov 14 03:00:49 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 Sun Nov 14 03:53:07 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 93210ad8ff..036f91abdd 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 @@ -974,12 +974,6 @@ #define FSIO_METHOD_FSIO_DIGITAL_INPUT "fsio_digital_input" #define FSIO_METHOD_FSIO_SETTING "fsio_setting" #define FSIO_METHOD_FSIO_TABLE "fsio_table" -#define fsio_setting1_offset 864 -#define fsio_setting2_offset 868 -#define fsio_setting3_offset 872 -#define fsio_setting4_offset 876 -#define fsio_setting5_offset 880 -#define fsio_setting6_offset 884 #define FSIO_TABLE_8 8 #define fsioDigitalInputs1_offset 952 #define fsioDigitalInputs2_offset 953 @@ -1807,6 +1801,7 @@ #define rpmHardLimit_offset 416 #define runningLedPin_offset 1813 #define SCRIPT_CURVE_COUNT 6 +#define SCRIPT_SETTING_COUNT 8 #define SCRIPT_TABLE_COUNT 4 #define scriptCurve1_offset 2780 #define scriptCurve1Bins_offset 2716 @@ -1826,6 +1821,14 @@ #define scriptCurveName4_offset 3388 #define scriptCurveName5_offset 3404 #define scriptCurveName6_offset 3420 +#define scriptSetting1_offset 864 +#define scriptSetting2_offset 868 +#define scriptSetting3_offset 872 +#define scriptSetting4_offset 876 +#define scriptSetting5_offset 880 +#define scriptSetting6_offset 884 +#define scriptSetting7_offset 888 +#define scriptSetting8_offset 892 #define scriptTableName1_offset 3564 #define scriptTableName2_offset 3580 #define scriptTableName3_offset 3596 @@ -1860,7 +1863,7 @@ #define show_test_presets false #define showHumanReadableWarning_offset 976 #define showSdCardWarning_offset 76 -#define SIGNATURE_HASH 2213707599 +#define SIGNATURE_HASH 1559471049 #define silentTriggerError_offset 1464 #define slowAdcAlpha_offset 2088 #define sparkDwellRpmBins_offset 332 @@ -2379,7 +2382,7 @@ #define ts_show_spi true #define ts_show_trigger_comparator false #define ts_show_tunerstudio_port false -#define TS_SIGNATURE "rusEFI 2021.11.14.subaru_eg33_f7.2213707599" +#define TS_SIGNATURE "rusEFI 2021.11.14.subaru_eg33_f7.1559471049" #define TS_SINGLE_WRITE_COMMAND 'W' #define TS_SINGLE_WRITE_COMMAND_char W #define TS_TEST_COMMAND 't' @@ -2490,7 +2493,7 @@ #define unusedOutputFreqWhereHere_offset 844 #define unusedOutputWhereHere_offset 794 #define unusedpinModesWhereHere_offset 779 -#define unusedSettings_offset 888 +#define unusedSettings_offset 896 #define unusedSpiPadding4_offset 2593 #define unusedSpiPadding8_offset 4010 #define unusedVvtOffsetWasHere_offset 2052 diff --git a/firmware/controllers/generated/engine_configuration_generated_structures.h b/firmware/controllers/generated/engine_configuration_generated_structures.h index 8fd7264450..eb11b0431d 100644 --- a/firmware/controllers/generated/engine_configuration_generated_structures.h +++ b/firmware/controllers/generated/engine_configuration_generated_structures.h @@ -1,4 +1,4 @@ -// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Nov 14 03:00:42 UTC 2021 +// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Nov 14 03:52:58 UTC 2021 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -1831,11 +1831,11 @@ struct engine_configuration_s { /** * offset 864 */ - fsio_setting_t fsio_setting[FSIO_COMMAND_COUNT]; + fsio_setting_t scriptSetting[SCRIPT_SETTING_COUNT]; /** - * offset 888 + * offset 896 */ - int unusedSettings[10]; + int unusedSettings[8]; /** * offset 928 */ @@ -4563,4 +4563,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 Sun Nov 14 03:00:42 UTC 2021 +// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Nov 14 03:52:58 UTC 2021 diff --git a/firmware/controllers/generated/fsio_enums_generated.def b/firmware/controllers/generated/fsio_enums_generated.def index a5d3ce6414..2c7d7afa29 100644 --- a/firmware/controllers/generated/fsio_enums_generated.def +++ b/firmware/controllers/generated/fsio_enums_generated.def @@ -1,4 +1,4 @@ -// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Nov 14 03:00:42 UTC 2021 +// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Nov 14 03:52:58 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 0b9fc9c749..6f75cc7f47 100644 --- a/firmware/controllers/generated/fsio_getters.def +++ b/firmware/controllers/generated/fsio_getters.def @@ -1,4 +1,4 @@ -// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Nov 14 03:00:42 UTC 2021 +// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Nov 14 03:52:58 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 9e274c6fd7..506cf27c5a 100644 --- a/firmware/controllers/generated/fsio_names.def +++ b/firmware/controllers/generated/fsio_names.def @@ -1,4 +1,4 @@ -// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Nov 14 03:00:42 UTC 2021 +// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Nov 14 03:52:58 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 fa8d7ca748..28c31f2b21 100644 --- a/firmware/controllers/generated/fsio_strings.def +++ b/firmware/controllers/generated/fsio_strings.def @@ -1,4 +1,4 @@ -// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Nov 14 03:00:42 UTC 2021 +// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Nov 14 03:52:58 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 00a88255c4..b7ef4a6d7a 100644 --- a/firmware/controllers/generated/rusefi_generated.h +++ b/firmware/controllers/generated/rusefi_generated.h @@ -962,12 +962,6 @@ #define FSIO_METHOD_FSIO_DIGITAL_INPUT "fsio_digital_input" #define FSIO_METHOD_FSIO_SETTING "fsio_setting" #define FSIO_METHOD_FSIO_TABLE "fsio_table" -#define fsio_setting1_offset 864 -#define fsio_setting2_offset 868 -#define fsio_setting3_offset 872 -#define fsio_setting4_offset 876 -#define fsio_setting5_offset 880 -#define fsio_setting6_offset 884 #define FSIO_TABLE_8 8 #define fsioDigitalInputs1_offset 952 #define fsioDigitalInputs2_offset 953 @@ -1795,6 +1789,7 @@ #define rpmHardLimit_offset 416 #define runningLedPin_offset 1813 #define SCRIPT_CURVE_COUNT 6 +#define SCRIPT_SETTING_COUNT 8 #define SCRIPT_TABLE_COUNT 4 #define scriptCurve1_offset 2780 #define scriptCurve1Bins_offset 2716 @@ -1814,6 +1809,14 @@ #define scriptCurveName4_offset 3388 #define scriptCurveName5_offset 3404 #define scriptCurveName6_offset 3420 +#define scriptSetting1_offset 864 +#define scriptSetting2_offset 868 +#define scriptSetting3_offset 872 +#define scriptSetting4_offset 876 +#define scriptSetting5_offset 880 +#define scriptSetting6_offset 884 +#define scriptSetting7_offset 888 +#define scriptSetting8_offset 892 #define scriptTableName1_offset 3564 #define scriptTableName2_offset 3580 #define scriptTableName3_offset 3596 @@ -1847,7 +1850,7 @@ #define show_test_presets true #define showHumanReadableWarning_offset 976 #define showSdCardWarning_offset 76 -#define SIGNATURE_HASH 928134708 +#define SIGNATURE_HASH 3897813682 #define silentTriggerError_offset 1464 #define slowAdcAlpha_offset 2088 #define sparkDwellRpmBins_offset 332 @@ -2366,7 +2369,7 @@ #define ts_show_spi true #define ts_show_trigger_comparator false #define ts_show_tunerstudio_port true -#define TS_SIGNATURE "rusEFI 2021.11.14.all.928134708" +#define TS_SIGNATURE "rusEFI 2021.11.14.all.3897813682" #define TS_SINGLE_WRITE_COMMAND 'W' #define TS_SINGLE_WRITE_COMMAND_char W #define TS_TEST_COMMAND 't' @@ -2477,7 +2480,7 @@ #define unusedOutputFreqWhereHere_offset 844 #define unusedOutputWhereHere_offset 794 #define unusedpinModesWhereHere_offset 779 -#define unusedSettings_offset 888 +#define unusedSettings_offset 896 #define unusedSpiPadding4_offset 2593 #define unusedSpiPadding8_offset 4010 #define unusedVvtOffsetWasHere_offset 2052 diff --git a/firmware/controllers/generated/signature_all.h b/firmware/controllers/generated/signature_all.h index a9d3184a9e..f75c0d9d9a 100644 --- a/firmware/controllers/generated/signature_all.h +++ b/firmware/controllers/generated/signature_all.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt // -#define SIGNATURE_HASH 928134708 -#define TS_SIGNATURE "rusEFI 2021.11.14.all.928134708" +#define SIGNATURE_HASH 3897813682 +#define TS_SIGNATURE "rusEFI 2021.11.14.all.3897813682" diff --git a/firmware/controllers/generated/signature_atlas.h b/firmware/controllers/generated/signature_atlas.h index 60b7b82ab6..3fa6242b17 100644 --- a/firmware/controllers/generated/signature_atlas.h +++ b/firmware/controllers/generated/signature_atlas.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt // -#define SIGNATURE_HASH 731431699 -#define TS_SIGNATURE "rusEFI 2021.11.14.atlas.731431699" +#define SIGNATURE_HASH 4103675797 +#define TS_SIGNATURE "rusEFI 2021.11.14.atlas.4103675797" diff --git a/firmware/controllers/generated/signature_f429-discovery.h b/firmware/controllers/generated/signature_f429-discovery.h index 213a256eec..3a6ae84c08 100644 --- a/firmware/controllers/generated/signature_f429-discovery.h +++ b/firmware/controllers/generated/signature_f429-discovery.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt // -#define SIGNATURE_HASH 928134708 -#define TS_SIGNATURE "rusEFI 2021.11.14.f429-discovery.928134708" +#define SIGNATURE_HASH 3897813682 +#define TS_SIGNATURE "rusEFI 2021.11.14.f429-discovery.3897813682" diff --git a/firmware/controllers/generated/signature_frankenso_na6.h b/firmware/controllers/generated/signature_frankenso_na6.h index 94f76f5568..3d867c382e 100644 --- a/firmware/controllers/generated/signature_frankenso_na6.h +++ b/firmware/controllers/generated/signature_frankenso_na6.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt // -#define SIGNATURE_HASH 1298162653 -#define TS_SIGNATURE "rusEFI 2021.11.14.frankenso_na6.1298162653" +#define SIGNATURE_HASH 2455879515 +#define TS_SIGNATURE "rusEFI 2021.11.14.frankenso_na6.2455879515" diff --git a/firmware/controllers/generated/signature_hellen-nb1.h b/firmware/controllers/generated/signature_hellen-nb1.h index fc4d755b34..ed3edc6648 100644 --- a/firmware/controllers/generated/signature_hellen-nb1.h +++ b/firmware/controllers/generated/signature_hellen-nb1.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt // -#define SIGNATURE_HASH 2457863869 -#define TS_SIGNATURE "rusEFI 2021.11.14.hellen-nb1.2457863869" +#define SIGNATURE_HASH 1300355643 +#define TS_SIGNATURE "rusEFI 2021.11.14.hellen-nb1.1300355643" diff --git a/firmware/controllers/generated/signature_hellen121nissan.h b/firmware/controllers/generated/signature_hellen121nissan.h index af9df3138b..a422485712 100644 --- a/firmware/controllers/generated/signature_hellen121nissan.h +++ b/firmware/controllers/generated/signature_hellen121nissan.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt // -#define SIGNATURE_HASH 2362856597 -#define TS_SIGNATURE "rusEFI 2021.11.14.hellen121nissan.2362856597" +#define SIGNATURE_HASH 1406634003 +#define TS_SIGNATURE "rusEFI 2021.11.14.hellen121nissan.1406634003" diff --git a/firmware/controllers/generated/signature_hellen121vag.h b/firmware/controllers/generated/signature_hellen121vag.h index 189c91924f..85fc115ac2 100644 --- a/firmware/controllers/generated/signature_hellen121vag.h +++ b/firmware/controllers/generated/signature_hellen121vag.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt // -#define SIGNATURE_HASH 1760629310 -#define TS_SIGNATURE "rusEFI 2021.11.14.hellen121vag.1760629310" +#define SIGNATURE_HASH 3086012088 +#define TS_SIGNATURE "rusEFI 2021.11.14.hellen121vag.3086012088" diff --git a/firmware/controllers/generated/signature_hellen128.h b/firmware/controllers/generated/signature_hellen128.h index e0b19fbd64..aafb9f68e9 100644 --- a/firmware/controllers/generated/signature_hellen128.h +++ b/firmware/controllers/generated/signature_hellen128.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt // -#define SIGNATURE_HASH 2912181651 -#define TS_SIGNATURE "rusEFI 2021.11.14.hellen128.2912181651" +#define SIGNATURE_HASH 1922400533 +#define TS_SIGNATURE "rusEFI 2021.11.14.hellen128.1922400533" diff --git a/firmware/controllers/generated/signature_hellen154hyundai.h b/firmware/controllers/generated/signature_hellen154hyundai.h index 2496f0d015..68ae6d86fe 100644 --- a/firmware/controllers/generated/signature_hellen154hyundai.h +++ b/firmware/controllers/generated/signature_hellen154hyundai.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt // -#define SIGNATURE_HASH 361116818 -#define TS_SIGNATURE "rusEFI 2021.11.14.hellen154hyundai.361116818" +#define SIGNATURE_HASH 3397904404 +#define TS_SIGNATURE "rusEFI 2021.11.14.hellen154hyundai.3397904404" diff --git a/firmware/controllers/generated/signature_hellen72.h b/firmware/controllers/generated/signature_hellen72.h index 84e6c5febc..4408404280 100644 --- a/firmware/controllers/generated/signature_hellen72.h +++ b/firmware/controllers/generated/signature_hellen72.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt // -#define SIGNATURE_HASH 3287265668 -#define TS_SIGNATURE "rusEFI 2021.11.14.hellen72.3287265668" +#define SIGNATURE_HASH 485387522 +#define TS_SIGNATURE "rusEFI 2021.11.14.hellen72.485387522" diff --git a/firmware/controllers/generated/signature_hellen88bmw.h b/firmware/controllers/generated/signature_hellen88bmw.h index 2571da3341..5af923e1ef 100644 --- a/firmware/controllers/generated/signature_hellen88bmw.h +++ b/firmware/controllers/generated/signature_hellen88bmw.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt // -#define SIGNATURE_HASH 2526193515 -#define TS_SIGNATURE "rusEFI 2021.11.14.hellen88bmw.2526193515" +#define SIGNATURE_HASH 1234402285 +#define TS_SIGNATURE "rusEFI 2021.11.14.hellen88bmw.1234402285" diff --git a/firmware/controllers/generated/signature_hellenNA6.h b/firmware/controllers/generated/signature_hellenNA6.h index 8b0d79d359..b78c764978 100644 --- a/firmware/controllers/generated/signature_hellenNA6.h +++ b/firmware/controllers/generated/signature_hellenNA6.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt // -#define SIGNATURE_HASH 1097822364 -#define TS_SIGNATURE "rusEFI 2021.11.14.hellenNA6.1097822364" +#define SIGNATURE_HASH 2658053146 +#define TS_SIGNATURE "rusEFI 2021.11.14.hellenNA6.2658053146" diff --git a/firmware/controllers/generated/signature_hellen_cypress.h b/firmware/controllers/generated/signature_hellen_cypress.h index db3bcbc520..efe2a2acd7 100644 --- a/firmware/controllers/generated/signature_hellen_cypress.h +++ b/firmware/controllers/generated/signature_hellen_cypress.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on hellen_cypress_gen_config.bat integration/rusefi_config.txt // -#define SIGNATURE_HASH 2059243171 -#define TS_SIGNATURE "rusEFI 2021.11.14.hellen_cypress.2059243171" +#define SIGNATURE_HASH 2780582437 +#define TS_SIGNATURE "rusEFI 2021.11.14.hellen_cypress.2780582437" diff --git a/firmware/controllers/generated/signature_kin.h b/firmware/controllers/generated/signature_kin.h index da82858c9f..8411334d98 100644 --- a/firmware/controllers/generated/signature_kin.h +++ b/firmware/controllers/generated/signature_kin.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt // -#define SIGNATURE_HASH 2232959583 -#define TS_SIGNATURE "rusEFI 2021.11.14.kin.2232959583" +#define SIGNATURE_HASH 1511628505 +#define TS_SIGNATURE "rusEFI 2021.11.14.kin.1511628505" diff --git a/firmware/controllers/generated/signature_mre_f4.h b/firmware/controllers/generated/signature_mre_f4.h index 27f65585fd..6fa2bae906 100644 --- a/firmware/controllers/generated/signature_mre_f4.h +++ b/firmware/controllers/generated/signature_mre_f4.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt // -#define SIGNATURE_HASH 3154730389 -#define TS_SIGNATURE "rusEFI 2021.11.14.mre_f4.3154730389" +#define SIGNATURE_HASH 1661501715 +#define TS_SIGNATURE "rusEFI 2021.11.14.mre_f4.1661501715" diff --git a/firmware/controllers/generated/signature_mre_f7.h b/firmware/controllers/generated/signature_mre_f7.h index 5efec12d5d..3f99cd1e28 100644 --- a/firmware/controllers/generated/signature_mre_f7.h +++ b/firmware/controllers/generated/signature_mre_f7.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt // -#define SIGNATURE_HASH 3154730389 -#define TS_SIGNATURE "rusEFI 2021.11.14.mre_f7.3154730389" +#define SIGNATURE_HASH 1661501715 +#define TS_SIGNATURE "rusEFI 2021.11.14.mre_f7.1661501715" diff --git a/firmware/controllers/generated/signature_prometheus_405.h b/firmware/controllers/generated/signature_prometheus_405.h index a78afee9af..0c17310752 100644 --- a/firmware/controllers/generated/signature_prometheus_405.h +++ b/firmware/controllers/generated/signature_prometheus_405.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt // -#define SIGNATURE_HASH 1740173266 -#define TS_SIGNATURE "rusEFI 2021.11.14.prometheus_405.1740173266" +#define SIGNATURE_HASH 3099145044 +#define TS_SIGNATURE "rusEFI 2021.11.14.prometheus_405.3099145044" diff --git a/firmware/controllers/generated/signature_prometheus_469.h b/firmware/controllers/generated/signature_prometheus_469.h index a4da4a920e..04bccbcd4d 100644 --- a/firmware/controllers/generated/signature_prometheus_469.h +++ b/firmware/controllers/generated/signature_prometheus_469.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt // -#define SIGNATURE_HASH 1740173266 -#define TS_SIGNATURE "rusEFI 2021.11.14.prometheus_469.1740173266" +#define SIGNATURE_HASH 3099145044 +#define TS_SIGNATURE "rusEFI 2021.11.14.prometheus_469.3099145044" diff --git a/firmware/controllers/generated/signature_proteus_f4.h b/firmware/controllers/generated/signature_proteus_f4.h index 790f1d94c2..113bdde68c 100644 --- a/firmware/controllers/generated/signature_proteus_f4.h +++ b/firmware/controllers/generated/signature_proteus_f4.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt // -#define SIGNATURE_HASH 2620218805 -#define TS_SIGNATURE "rusEFI 2021.11.14.proteus_f4.2620218805" +#define SIGNATURE_HASH 1126990131 +#define TS_SIGNATURE "rusEFI 2021.11.14.proteus_f4.1126990131" diff --git a/firmware/controllers/generated/signature_proteus_f7.h b/firmware/controllers/generated/signature_proteus_f7.h index ce1ddeff27..014f371bb2 100644 --- a/firmware/controllers/generated/signature_proteus_f7.h +++ b/firmware/controllers/generated/signature_proteus_f7.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt // -#define SIGNATURE_HASH 2620218805 -#define TS_SIGNATURE "rusEFI 2021.11.14.proteus_f7.2620218805" +#define SIGNATURE_HASH 1126990131 +#define TS_SIGNATURE "rusEFI 2021.11.14.proteus_f7.1126990131" diff --git a/firmware/controllers/generated/signature_subaru_eg33_f7.h b/firmware/controllers/generated/signature_subaru_eg33_f7.h index 2c6627346a..2c284cb8d6 100644 --- a/firmware/controllers/generated/signature_subaru_eg33_f7.h +++ b/firmware/controllers/generated/signature_subaru_eg33_f7.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on config/boards/subaru_eg33/config/gen_config.sh integration/rusefi_config.txt // -#define SIGNATURE_HASH 2213707599 -#define TS_SIGNATURE "rusEFI 2021.11.14.subaru_eg33_f7.2213707599" +#define SIGNATURE_HASH 1559471049 +#define TS_SIGNATURE "rusEFI 2021.11.14.subaru_eg33_f7.1559471049" diff --git a/firmware/tunerstudio/generated/cache.zip b/firmware/tunerstudio/generated/cache.zip index 24955d1dc591f424e938c63ab67d7f936ceb62db..e81908fe016c91e75065a07a86e45fd55ced5122 100644 GIT binary patch delta 667312 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 aJ6Ch*gR4xo&19QN@s~2$wP&8v|Najux5W1V delta 667012 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 e!m`Dc`>P|KUY6@&o7*+5Z8kccbJ0 diff --git a/firmware/tunerstudio/generated/rusefi.ini b/firmware/tunerstudio/generated/rusefi.ini index 37b8a5e431..47d48ccbf1 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.14.all.928134708" + signature = "rusEFI 2021.11.14.all.3897813682" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.11.14.all.928134708" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.11.14.all.3897813682" ; 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 Sun Nov 14 03:00:42 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Nov 14 03:52:58 UTC 2021 pageSize = 20000 page = 1 @@ -467,13 +467,15 @@ fsioFrequency4 = scalar, U16, 838, "Hz", 1, 0, 0, 3000, 0 fsioFrequency5 = scalar, U16, 840, "Hz", 1, 0, 0, 3000, 0 fsioFrequency6 = scalar, U16, 842, "Hz", 1, 0, 0, 3000, 0 unusedOutputFreqWhereHere = array, S16, 844, [10], "", 1, 0, 0, 255, 0 -fsio_setting1 = scalar, F32, 864, "Val", 1, 0, 0, 18000, 2 -fsio_setting2 = scalar, F32, 868, "Val", 1, 0, 0, 18000, 2 -fsio_setting3 = scalar, F32, 872, "Val", 1, 0, 0, 18000, 2 -fsio_setting4 = scalar, F32, 876, "Val", 1, 0, 0, 18000, 2 -fsio_setting5 = scalar, F32, 880, "Val", 1, 0, 0, 18000, 2 -fsio_setting6 = scalar, F32, 884, "Val", 1, 0, 0, 18000, 2 -unusedSettings = array, S32, 888, [10], "", 1, 0, 0, 255, 0 +scriptSetting1 = scalar, F32, 864, "Val", 1, 0, 0, 18000, 2 +scriptSetting2 = scalar, F32, 868, "Val", 1, 0, 0, 18000, 2 +scriptSetting3 = scalar, F32, 872, "Val", 1, 0, 0, 18000, 2 +scriptSetting4 = scalar, F32, 876, "Val", 1, 0, 0, 18000, 2 +scriptSetting5 = scalar, F32, 880, "Val", 1, 0, 0, 18000, 2 +scriptSetting6 = scalar, F32, 884, "Val", 1, 0, 0, 18000, 2 +scriptSetting7 = scalar, F32, 888, "Val", 1, 0, 0, 18000, 2 +scriptSetting8 = scalar, F32, 892, "Val", 1, 0, 0, 18000, 2 +unusedSettings = array, S32, 896, [8], "", 1, 0, 0, 255, 0 spi1mosiPin = bits, U08, 928, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" spi1misoPin = bits, U08, 929, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" spi1sckPin = bits, U08, 930, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" @@ -5211,20 +5213,20 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" field = "" field = "" - dialog = fsioSetting, "Setting" + dialog = scriptSetting, "Setting" field = "Set number is not associated with the output number." field = "Set number, only the cell number with some numbers." - field = "set #1", fsio_setting1 - field = "set #2", fsio_setting2 - field = "set #3", fsio_setting3 - field = "set #4", fsio_setting4 - field = "set #5", fsio_setting5 - field = "set #6", fsio_setting6 + field = "set #1", scriptSetting1 + field = "set #2", scriptSetting2 + field = "set #3", scriptSetting3 + field = "set #4", scriptSetting4 + field = "set #5", scriptSetting5 + field = "set #6", scriptSetting6 dialog = fsioOutputsDialog, "FSIO outputs", border panel = fsioIO, West panel = fsioFrequency, Center - panel = fsioSetting, East + panel = scriptSetting, East dialog = fsioFormulas, "FSIO Formulas" field = "!FSIO uses Reverse Polish Notation. Please read http://rusefi.com/s/fsio" diff --git a/firmware/tunerstudio/generated/rusefi_atlas.ini b/firmware/tunerstudio/generated/rusefi_atlas.ini index 55c2584139..c171fdd785 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.14.atlas.731431699" + signature = "rusEFI 2021.11.14.atlas.4103675797" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.11.14.atlas.731431699" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.11.14.atlas.4103675797" ; 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 Sun Nov 14 03:00:39 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Nov 14 03:52:55 UTC 2021 pageSize = 20000 page = 1 @@ -467,13 +467,15 @@ fsioFrequency4 = scalar, U16, 838, "Hz", 1, 0, 0, 3000, 0 fsioFrequency5 = scalar, U16, 840, "Hz", 1, 0, 0, 3000, 0 fsioFrequency6 = scalar, U16, 842, "Hz", 1, 0, 0, 3000, 0 unusedOutputFreqWhereHere = array, S16, 844, [10], "", 1, 0, 0, 255, 0 -fsio_setting1 = scalar, F32, 864, "Val", 1, 0, 0, 18000, 2 -fsio_setting2 = scalar, F32, 868, "Val", 1, 0, 0, 18000, 2 -fsio_setting3 = scalar, F32, 872, "Val", 1, 0, 0, 18000, 2 -fsio_setting4 = scalar, F32, 876, "Val", 1, 0, 0, 18000, 2 -fsio_setting5 = scalar, F32, 880, "Val", 1, 0, 0, 18000, 2 -fsio_setting6 = scalar, F32, 884, "Val", 1, 0, 0, 18000, 2 -unusedSettings = array, S32, 888, [10], "", 1, 0, 0, 255, 0 +scriptSetting1 = scalar, F32, 864, "Val", 1, 0, 0, 18000, 2 +scriptSetting2 = scalar, F32, 868, "Val", 1, 0, 0, 18000, 2 +scriptSetting3 = scalar, F32, 872, "Val", 1, 0, 0, 18000, 2 +scriptSetting4 = scalar, F32, 876, "Val", 1, 0, 0, 18000, 2 +scriptSetting5 = scalar, F32, 880, "Val", 1, 0, 0, 18000, 2 +scriptSetting6 = scalar, F32, 884, "Val", 1, 0, 0, 18000, 2 +scriptSetting7 = scalar, F32, 888, "Val", 1, 0, 0, 18000, 2 +scriptSetting8 = scalar, F32, 892, "Val", 1, 0, 0, 18000, 2 +unusedSettings = array, S32, 896, [8], "", 1, 0, 0, 255, 0 spi1mosiPin = bits, U08, 928, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" spi1misoPin = bits, U08, 929, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" spi1sckPin = bits, U08, 930, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" @@ -5203,20 +5205,20 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" field = "" field = "" - dialog = fsioSetting, "Setting" + dialog = scriptSetting, "Setting" field = "Set number is not associated with the output number." field = "Set number, only the cell number with some numbers." - field = "set #1", fsio_setting1 - field = "set #2", fsio_setting2 - field = "set #3", fsio_setting3 - field = "set #4", fsio_setting4 - field = "set #5", fsio_setting5 - field = "set #6", fsio_setting6 + field = "set #1", scriptSetting1 + field = "set #2", scriptSetting2 + field = "set #3", scriptSetting3 + field = "set #4", scriptSetting4 + field = "set #5", scriptSetting5 + field = "set #6", scriptSetting6 dialog = fsioOutputsDialog, "FSIO outputs", border panel = fsioIO, West panel = fsioFrequency, Center - panel = fsioSetting, East + panel = scriptSetting, East dialog = fsioFormulas, "FSIO Formulas" field = "!FSIO uses Reverse Polish Notation. Please read http://rusefi.com/s/fsio" diff --git a/firmware/tunerstudio/generated/rusefi_f429-discovery.ini b/firmware/tunerstudio/generated/rusefi_f429-discovery.ini index 6cb0fb3592..4d52c9b7f7 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.14.f429-discovery.928134708" + signature = "rusEFI 2021.11.14.f429-discovery.3897813682" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.11.14.f429-discovery.928134708" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.11.14.f429-discovery.3897813682" ; 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 Sun Nov 14 02:59:56 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Nov 14 03:52:06 UTC 2021 pageSize = 20000 page = 1 @@ -467,13 +467,15 @@ fsioFrequency4 = scalar, U16, 838, "Hz", 1, 0, 0, 3000, 0 fsioFrequency5 = scalar, U16, 840, "Hz", 1, 0, 0, 3000, 0 fsioFrequency6 = scalar, U16, 842, "Hz", 1, 0, 0, 3000, 0 unusedOutputFreqWhereHere = array, S16, 844, [10], "", 1, 0, 0, 255, 0 -fsio_setting1 = scalar, F32, 864, "Val", 1, 0, 0, 18000, 2 -fsio_setting2 = scalar, F32, 868, "Val", 1, 0, 0, 18000, 2 -fsio_setting3 = scalar, F32, 872, "Val", 1, 0, 0, 18000, 2 -fsio_setting4 = scalar, F32, 876, "Val", 1, 0, 0, 18000, 2 -fsio_setting5 = scalar, F32, 880, "Val", 1, 0, 0, 18000, 2 -fsio_setting6 = scalar, F32, 884, "Val", 1, 0, 0, 18000, 2 -unusedSettings = array, S32, 888, [10], "", 1, 0, 0, 255, 0 +scriptSetting1 = scalar, F32, 864, "Val", 1, 0, 0, 18000, 2 +scriptSetting2 = scalar, F32, 868, "Val", 1, 0, 0, 18000, 2 +scriptSetting3 = scalar, F32, 872, "Val", 1, 0, 0, 18000, 2 +scriptSetting4 = scalar, F32, 876, "Val", 1, 0, 0, 18000, 2 +scriptSetting5 = scalar, F32, 880, "Val", 1, 0, 0, 18000, 2 +scriptSetting6 = scalar, F32, 884, "Val", 1, 0, 0, 18000, 2 +scriptSetting7 = scalar, F32, 888, "Val", 1, 0, 0, 18000, 2 +scriptSetting8 = scalar, F32, 892, "Val", 1, 0, 0, 18000, 2 +unusedSettings = array, S32, 896, [8], "", 1, 0, 0, 255, 0 spi1mosiPin = bits, U08, 928, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" spi1misoPin = bits, U08, 929, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" spi1sckPin = bits, U08, 930, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" @@ -5211,20 +5213,20 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" field = "" field = "" - dialog = fsioSetting, "Setting" + dialog = scriptSetting, "Setting" field = "Set number is not associated with the output number." field = "Set number, only the cell number with some numbers." - field = "set #1", fsio_setting1 - field = "set #2", fsio_setting2 - field = "set #3", fsio_setting3 - field = "set #4", fsio_setting4 - field = "set #5", fsio_setting5 - field = "set #6", fsio_setting6 + field = "set #1", scriptSetting1 + field = "set #2", scriptSetting2 + field = "set #3", scriptSetting3 + field = "set #4", scriptSetting4 + field = "set #5", scriptSetting5 + field = "set #6", scriptSetting6 dialog = fsioOutputsDialog, "FSIO outputs", border panel = fsioIO, West panel = fsioFrequency, Center - panel = fsioSetting, East + panel = scriptSetting, East dialog = fsioFormulas, "FSIO Formulas" field = "!FSIO uses Reverse Polish Notation. Please read http://rusefi.com/s/fsio" diff --git a/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini b/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini index 1d82f2d4a3..da9502cccb 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.14.frankenso_na6.1298162653" + signature = "rusEFI 2021.11.14.frankenso_na6.2455879515" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.11.14.frankenso_na6.1298162653" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.11.14.frankenso_na6.2455879515" ; 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 Sun Nov 14 03:00:26 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Nov 14 03:52:40 UTC 2021 pageSize = 20000 page = 1 @@ -467,13 +467,15 @@ fsioFrequency4 = scalar, U16, 838, "Hz", 1, 0, 0, 3000, 0 fsioFrequency5 = scalar, U16, 840, "Hz", 1, 0, 0, 3000, 0 fsioFrequency6 = scalar, U16, 842, "Hz", 1, 0, 0, 3000, 0 unusedOutputFreqWhereHere = array, S16, 844, [10], "", 1, 0, 0, 255, 0 -fsio_setting1 = scalar, F32, 864, "Val", 1, 0, 0, 18000, 2 -fsio_setting2 = scalar, F32, 868, "Val", 1, 0, 0, 18000, 2 -fsio_setting3 = scalar, F32, 872, "Val", 1, 0, 0, 18000, 2 -fsio_setting4 = scalar, F32, 876, "Val", 1, 0, 0, 18000, 2 -fsio_setting5 = scalar, F32, 880, "Val", 1, 0, 0, 18000, 2 -fsio_setting6 = scalar, F32, 884, "Val", 1, 0, 0, 18000, 2 -unusedSettings = array, S32, 888, [10], "", 1, 0, 0, 255, 0 +scriptSetting1 = scalar, F32, 864, "Val", 1, 0, 0, 18000, 2 +scriptSetting2 = scalar, F32, 868, "Val", 1, 0, 0, 18000, 2 +scriptSetting3 = scalar, F32, 872, "Val", 1, 0, 0, 18000, 2 +scriptSetting4 = scalar, F32, 876, "Val", 1, 0, 0, 18000, 2 +scriptSetting5 = scalar, F32, 880, "Val", 1, 0, 0, 18000, 2 +scriptSetting6 = scalar, F32, 884, "Val", 1, 0, 0, 18000, 2 +scriptSetting7 = scalar, F32, 888, "Val", 1, 0, 0, 18000, 2 +scriptSetting8 = scalar, F32, 892, "Val", 1, 0, 0, 18000, 2 +unusedSettings = array, S32, 896, [8], "", 1, 0, 0, 255, 0 spi1mosiPin = bits, U08, 928, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" spi1misoPin = bits, U08, 929, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" spi1sckPin = bits, U08, 930, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" @@ -5211,20 +5213,20 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" field = "" field = "" - dialog = fsioSetting, "Setting" + dialog = scriptSetting, "Setting" field = "Set number is not associated with the output number." field = "Set number, only the cell number with some numbers." - field = "set #1", fsio_setting1 - field = "set #2", fsio_setting2 - field = "set #3", fsio_setting3 - field = "set #4", fsio_setting4 - field = "set #5", fsio_setting5 - field = "set #6", fsio_setting6 + field = "set #1", scriptSetting1 + field = "set #2", scriptSetting2 + field = "set #3", scriptSetting3 + field = "set #4", scriptSetting4 + field = "set #5", scriptSetting5 + field = "set #6", scriptSetting6 dialog = fsioOutputsDialog, "FSIO outputs", border panel = fsioIO, West panel = fsioFrequency, Center - panel = fsioSetting, East + panel = scriptSetting, East dialog = fsioFormulas, "FSIO Formulas" field = "!FSIO uses Reverse Polish Notation. Please read http://rusefi.com/s/fsio" diff --git a/firmware/tunerstudio/generated/rusefi_hellen-nb1.ini b/firmware/tunerstudio/generated/rusefi_hellen-nb1.ini index 14ecc10830..04e477b22a 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.14.hellen-nb1.2457863869" + signature = "rusEFI 2021.11.14.hellen-nb1.1300355643" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.11.14.hellen-nb1.2457863869" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.11.14.hellen-nb1.1300355643" ; 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 Sun Nov 14 03:00:14 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Nov 14 03:52:27 UTC 2021 pageSize = 20000 page = 1 @@ -467,13 +467,15 @@ fsioFrequency4 = scalar, U16, 838, "Hz", 1, 0, 0, 3000, 0 fsioFrequency5 = scalar, U16, 840, "Hz", 1, 0, 0, 3000, 0 fsioFrequency6 = scalar, U16, 842, "Hz", 1, 0, 0, 3000, 0 unusedOutputFreqWhereHere = array, S16, 844, [10], "", 1, 0, 0, 255, 0 -fsio_setting1 = scalar, F32, 864, "Val", 1, 0, 0, 18000, 2 -fsio_setting2 = scalar, F32, 868, "Val", 1, 0, 0, 18000, 2 -fsio_setting3 = scalar, F32, 872, "Val", 1, 0, 0, 18000, 2 -fsio_setting4 = scalar, F32, 876, "Val", 1, 0, 0, 18000, 2 -fsio_setting5 = scalar, F32, 880, "Val", 1, 0, 0, 18000, 2 -fsio_setting6 = scalar, F32, 884, "Val", 1, 0, 0, 18000, 2 -unusedSettings = array, S32, 888, [10], "", 1, 0, 0, 255, 0 +scriptSetting1 = scalar, F32, 864, "Val", 1, 0, 0, 18000, 2 +scriptSetting2 = scalar, F32, 868, "Val", 1, 0, 0, 18000, 2 +scriptSetting3 = scalar, F32, 872, "Val", 1, 0, 0, 18000, 2 +scriptSetting4 = scalar, F32, 876, "Val", 1, 0, 0, 18000, 2 +scriptSetting5 = scalar, F32, 880, "Val", 1, 0, 0, 18000, 2 +scriptSetting6 = scalar, F32, 884, "Val", 1, 0, 0, 18000, 2 +scriptSetting7 = scalar, F32, 888, "Val", 1, 0, 0, 18000, 2 +scriptSetting8 = scalar, F32, 892, "Val", 1, 0, 0, 18000, 2 +unusedSettings = array, S32, 896, [8], "", 1, 0, 0, 255, 0 spi1mosiPin = bits, U08, 928, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" spi1misoPin = bits, U08, 929, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" spi1sckPin = bits, U08, 930, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" @@ -5188,20 +5190,20 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" field = "" field = "" - dialog = fsioSetting, "Setting" + dialog = scriptSetting, "Setting" field = "Set number is not associated with the output number." field = "Set number, only the cell number with some numbers." - field = "set #1", fsio_setting1 - field = "set #2", fsio_setting2 - field = "set #3", fsio_setting3 - field = "set #4", fsio_setting4 - field = "set #5", fsio_setting5 - field = "set #6", fsio_setting6 + field = "set #1", scriptSetting1 + field = "set #2", scriptSetting2 + field = "set #3", scriptSetting3 + field = "set #4", scriptSetting4 + field = "set #5", scriptSetting5 + field = "set #6", scriptSetting6 dialog = fsioOutputsDialog, "FSIO outputs", border panel = fsioIO, West panel = fsioFrequency, Center - panel = fsioSetting, East + panel = scriptSetting, East dialog = fsioFormulas, "FSIO Formulas" field = "!FSIO uses Reverse Polish Notation. Please read http://rusefi.com/s/fsio" diff --git a/firmware/tunerstudio/generated/rusefi_hellen121nissan.ini b/firmware/tunerstudio/generated/rusefi_hellen121nissan.ini index 2027e9b06c..cd07835275 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.14.hellen121nissan.2362856597" + signature = "rusEFI 2021.11.14.hellen121nissan.1406634003" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.11.14.hellen121nissan.2362856597" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.11.14.hellen121nissan.1406634003" ; 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 Sun Nov 14 03:00:04 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Nov 14 03:52:15 UTC 2021 pageSize = 20000 page = 1 @@ -467,13 +467,15 @@ fsioFrequency4 = scalar, U16, 838, "Hz", 1, 0, 0, 3000, 0 fsioFrequency5 = scalar, U16, 840, "Hz", 1, 0, 0, 3000, 0 fsioFrequency6 = scalar, U16, 842, "Hz", 1, 0, 0, 3000, 0 unusedOutputFreqWhereHere = array, S16, 844, [10], "", 1, 0, 0, 255, 0 -fsio_setting1 = scalar, F32, 864, "Val", 1, 0, 0, 18000, 2 -fsio_setting2 = scalar, F32, 868, "Val", 1, 0, 0, 18000, 2 -fsio_setting3 = scalar, F32, 872, "Val", 1, 0, 0, 18000, 2 -fsio_setting4 = scalar, F32, 876, "Val", 1, 0, 0, 18000, 2 -fsio_setting5 = scalar, F32, 880, "Val", 1, 0, 0, 18000, 2 -fsio_setting6 = scalar, F32, 884, "Val", 1, 0, 0, 18000, 2 -unusedSettings = array, S32, 888, [10], "", 1, 0, 0, 255, 0 +scriptSetting1 = scalar, F32, 864, "Val", 1, 0, 0, 18000, 2 +scriptSetting2 = scalar, F32, 868, "Val", 1, 0, 0, 18000, 2 +scriptSetting3 = scalar, F32, 872, "Val", 1, 0, 0, 18000, 2 +scriptSetting4 = scalar, F32, 876, "Val", 1, 0, 0, 18000, 2 +scriptSetting5 = scalar, F32, 880, "Val", 1, 0, 0, 18000, 2 +scriptSetting6 = scalar, F32, 884, "Val", 1, 0, 0, 18000, 2 +scriptSetting7 = scalar, F32, 888, "Val", 1, 0, 0, 18000, 2 +scriptSetting8 = scalar, F32, 892, "Val", 1, 0, 0, 18000, 2 +unusedSettings = array, S32, 896, [8], "", 1, 0, 0, 255, 0 spi1mosiPin = bits, U08, 928, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" spi1misoPin = bits, U08, 929, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" spi1sckPin = bits, U08, 930, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" @@ -5187,20 +5189,20 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" field = "" field = "" - dialog = fsioSetting, "Setting" + dialog = scriptSetting, "Setting" field = "Set number is not associated with the output number." field = "Set number, only the cell number with some numbers." - field = "set #1", fsio_setting1 - field = "set #2", fsio_setting2 - field = "set #3", fsio_setting3 - field = "set #4", fsio_setting4 - field = "set #5", fsio_setting5 - field = "set #6", fsio_setting6 + field = "set #1", scriptSetting1 + field = "set #2", scriptSetting2 + field = "set #3", scriptSetting3 + field = "set #4", scriptSetting4 + field = "set #5", scriptSetting5 + field = "set #6", scriptSetting6 dialog = fsioOutputsDialog, "FSIO outputs", border panel = fsioIO, West panel = fsioFrequency, Center - panel = fsioSetting, East + panel = scriptSetting, East dialog = fsioFormulas, "FSIO Formulas" field = "!FSIO uses Reverse Polish Notation. Please read http://rusefi.com/s/fsio" diff --git a/firmware/tunerstudio/generated/rusefi_hellen121vag.ini b/firmware/tunerstudio/generated/rusefi_hellen121vag.ini index 89808f785f..465a4098a0 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.14.hellen121vag.1760629310" + signature = "rusEFI 2021.11.14.hellen121vag.3086012088" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.11.14.hellen121vag.1760629310" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.11.14.hellen121vag.3086012088" ; 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 Sun Nov 14 03:00:01 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Nov 14 03:52:12 UTC 2021 pageSize = 20000 page = 1 @@ -467,13 +467,15 @@ fsioFrequency4 = scalar, U16, 838, "Hz", 1, 0, 0, 3000, 0 fsioFrequency5 = scalar, U16, 840, "Hz", 1, 0, 0, 3000, 0 fsioFrequency6 = scalar, U16, 842, "Hz", 1, 0, 0, 3000, 0 unusedOutputFreqWhereHere = array, S16, 844, [10], "", 1, 0, 0, 255, 0 -fsio_setting1 = scalar, F32, 864, "Val", 1, 0, 0, 18000, 2 -fsio_setting2 = scalar, F32, 868, "Val", 1, 0, 0, 18000, 2 -fsio_setting3 = scalar, F32, 872, "Val", 1, 0, 0, 18000, 2 -fsio_setting4 = scalar, F32, 876, "Val", 1, 0, 0, 18000, 2 -fsio_setting5 = scalar, F32, 880, "Val", 1, 0, 0, 18000, 2 -fsio_setting6 = scalar, F32, 884, "Val", 1, 0, 0, 18000, 2 -unusedSettings = array, S32, 888, [10], "", 1, 0, 0, 255, 0 +scriptSetting1 = scalar, F32, 864, "Val", 1, 0, 0, 18000, 2 +scriptSetting2 = scalar, F32, 868, "Val", 1, 0, 0, 18000, 2 +scriptSetting3 = scalar, F32, 872, "Val", 1, 0, 0, 18000, 2 +scriptSetting4 = scalar, F32, 876, "Val", 1, 0, 0, 18000, 2 +scriptSetting5 = scalar, F32, 880, "Val", 1, 0, 0, 18000, 2 +scriptSetting6 = scalar, F32, 884, "Val", 1, 0, 0, 18000, 2 +scriptSetting7 = scalar, F32, 888, "Val", 1, 0, 0, 18000, 2 +scriptSetting8 = scalar, F32, 892, "Val", 1, 0, 0, 18000, 2 +unusedSettings = array, S32, 896, [8], "", 1, 0, 0, 255, 0 spi1mosiPin = bits, U08, 928, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" spi1misoPin = bits, U08, 929, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" spi1sckPin = bits, U08, 930, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" @@ -5187,20 +5189,20 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" field = "" field = "" - dialog = fsioSetting, "Setting" + dialog = scriptSetting, "Setting" field = "Set number is not associated with the output number." field = "Set number, only the cell number with some numbers." - field = "set #1", fsio_setting1 - field = "set #2", fsio_setting2 - field = "set #3", fsio_setting3 - field = "set #4", fsio_setting4 - field = "set #5", fsio_setting5 - field = "set #6", fsio_setting6 + field = "set #1", scriptSetting1 + field = "set #2", scriptSetting2 + field = "set #3", scriptSetting3 + field = "set #4", scriptSetting4 + field = "set #5", scriptSetting5 + field = "set #6", scriptSetting6 dialog = fsioOutputsDialog, "FSIO outputs", border panel = fsioIO, West panel = fsioFrequency, Center - panel = fsioSetting, East + panel = scriptSetting, East dialog = fsioFormulas, "FSIO Formulas" field = "!FSIO uses Reverse Polish Notation. Please read http://rusefi.com/s/fsio" diff --git a/firmware/tunerstudio/generated/rusefi_hellen128mercedes.ini b/firmware/tunerstudio/generated/rusefi_hellen128mercedes.ini index 827f227ab7..79bbc6ad64 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.14.hellen128.2912181651" + signature = "rusEFI 2021.11.14.hellen128.1922400533" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.11.14.hellen128.2912181651" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.11.14.hellen128.1922400533" ; 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 Sun Nov 14 02:59:58 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Nov 14 03:52:09 UTC 2021 pageSize = 20000 page = 1 @@ -467,13 +467,15 @@ fsioFrequency4 = scalar, U16, 838, "Hz", 1, 0, 0, 3000, 0 fsioFrequency5 = scalar, U16, 840, "Hz", 1, 0, 0, 3000, 0 fsioFrequency6 = scalar, U16, 842, "Hz", 1, 0, 0, 3000, 0 unusedOutputFreqWhereHere = array, S16, 844, [10], "", 1, 0, 0, 255, 0 -fsio_setting1 = scalar, F32, 864, "Val", 1, 0, 0, 18000, 2 -fsio_setting2 = scalar, F32, 868, "Val", 1, 0, 0, 18000, 2 -fsio_setting3 = scalar, F32, 872, "Val", 1, 0, 0, 18000, 2 -fsio_setting4 = scalar, F32, 876, "Val", 1, 0, 0, 18000, 2 -fsio_setting5 = scalar, F32, 880, "Val", 1, 0, 0, 18000, 2 -fsio_setting6 = scalar, F32, 884, "Val", 1, 0, 0, 18000, 2 -unusedSettings = array, S32, 888, [10], "", 1, 0, 0, 255, 0 +scriptSetting1 = scalar, F32, 864, "Val", 1, 0, 0, 18000, 2 +scriptSetting2 = scalar, F32, 868, "Val", 1, 0, 0, 18000, 2 +scriptSetting3 = scalar, F32, 872, "Val", 1, 0, 0, 18000, 2 +scriptSetting4 = scalar, F32, 876, "Val", 1, 0, 0, 18000, 2 +scriptSetting5 = scalar, F32, 880, "Val", 1, 0, 0, 18000, 2 +scriptSetting6 = scalar, F32, 884, "Val", 1, 0, 0, 18000, 2 +scriptSetting7 = scalar, F32, 888, "Val", 1, 0, 0, 18000, 2 +scriptSetting8 = scalar, F32, 892, "Val", 1, 0, 0, 18000, 2 +unusedSettings = array, S32, 896, [8], "", 1, 0, 0, 255, 0 spi1mosiPin = bits, U08, 928, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" spi1misoPin = bits, U08, 929, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" spi1sckPin = bits, U08, 930, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" @@ -5187,20 +5189,20 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" field = "" field = "" - dialog = fsioSetting, "Setting" + dialog = scriptSetting, "Setting" field = "Set number is not associated with the output number." field = "Set number, only the cell number with some numbers." - field = "set #1", fsio_setting1 - field = "set #2", fsio_setting2 - field = "set #3", fsio_setting3 - field = "set #4", fsio_setting4 - field = "set #5", fsio_setting5 - field = "set #6", fsio_setting6 + field = "set #1", scriptSetting1 + field = "set #2", scriptSetting2 + field = "set #3", scriptSetting3 + field = "set #4", scriptSetting4 + field = "set #5", scriptSetting5 + field = "set #6", scriptSetting6 dialog = fsioOutputsDialog, "FSIO outputs", border panel = fsioIO, West panel = fsioFrequency, Center - panel = fsioSetting, East + panel = scriptSetting, East dialog = fsioFormulas, "FSIO Formulas" field = "!FSIO uses Reverse Polish Notation. Please read http://rusefi.com/s/fsio" diff --git a/firmware/tunerstudio/generated/rusefi_hellen154hyundai.ini b/firmware/tunerstudio/generated/rusefi_hellen154hyundai.ini index 6c64bcd194..fd7e78f5da 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.14.hellen154hyundai.361116818" + signature = "rusEFI 2021.11.14.hellen154hyundai.3397904404" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.11.14.hellen154hyundai.361116818" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.11.14.hellen154hyundai.3397904404" ; 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 Sun Nov 14 03:00:06 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Nov 14 03:52:18 UTC 2021 pageSize = 20000 page = 1 @@ -467,13 +467,15 @@ fsioFrequency4 = scalar, U16, 838, "Hz", 1, 0, 0, 3000, 0 fsioFrequency5 = scalar, U16, 840, "Hz", 1, 0, 0, 3000, 0 fsioFrequency6 = scalar, U16, 842, "Hz", 1, 0, 0, 3000, 0 unusedOutputFreqWhereHere = array, S16, 844, [10], "", 1, 0, 0, 255, 0 -fsio_setting1 = scalar, F32, 864, "Val", 1, 0, 0, 18000, 2 -fsio_setting2 = scalar, F32, 868, "Val", 1, 0, 0, 18000, 2 -fsio_setting3 = scalar, F32, 872, "Val", 1, 0, 0, 18000, 2 -fsio_setting4 = scalar, F32, 876, "Val", 1, 0, 0, 18000, 2 -fsio_setting5 = scalar, F32, 880, "Val", 1, 0, 0, 18000, 2 -fsio_setting6 = scalar, F32, 884, "Val", 1, 0, 0, 18000, 2 -unusedSettings = array, S32, 888, [10], "", 1, 0, 0, 255, 0 +scriptSetting1 = scalar, F32, 864, "Val", 1, 0, 0, 18000, 2 +scriptSetting2 = scalar, F32, 868, "Val", 1, 0, 0, 18000, 2 +scriptSetting3 = scalar, F32, 872, "Val", 1, 0, 0, 18000, 2 +scriptSetting4 = scalar, F32, 876, "Val", 1, 0, 0, 18000, 2 +scriptSetting5 = scalar, F32, 880, "Val", 1, 0, 0, 18000, 2 +scriptSetting6 = scalar, F32, 884, "Val", 1, 0, 0, 18000, 2 +scriptSetting7 = scalar, F32, 888, "Val", 1, 0, 0, 18000, 2 +scriptSetting8 = scalar, F32, 892, "Val", 1, 0, 0, 18000, 2 +unusedSettings = array, S32, 896, [8], "", 1, 0, 0, 255, 0 spi1mosiPin = bits, U08, 928, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" spi1misoPin = bits, U08, 929, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" spi1sckPin = bits, U08, 930, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" @@ -5187,20 +5189,20 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" field = "" field = "" - dialog = fsioSetting, "Setting" + dialog = scriptSetting, "Setting" field = "Set number is not associated with the output number." field = "Set number, only the cell number with some numbers." - field = "set #1", fsio_setting1 - field = "set #2", fsio_setting2 - field = "set #3", fsio_setting3 - field = "set #4", fsio_setting4 - field = "set #5", fsio_setting5 - field = "set #6", fsio_setting6 + field = "set #1", scriptSetting1 + field = "set #2", scriptSetting2 + field = "set #3", scriptSetting3 + field = "set #4", scriptSetting4 + field = "set #5", scriptSetting5 + field = "set #6", scriptSetting6 dialog = fsioOutputsDialog, "FSIO outputs", border panel = fsioIO, West panel = fsioFrequency, Center - panel = fsioSetting, East + panel = scriptSetting, East dialog = fsioFormulas, "FSIO Formulas" field = "!FSIO uses Reverse Polish Notation. Please read http://rusefi.com/s/fsio" diff --git a/firmware/tunerstudio/generated/rusefi_hellen72.ini b/firmware/tunerstudio/generated/rusefi_hellen72.ini index 0a878f4333..5e85dfcbe9 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.14.hellen72.3287265668" + signature = "rusEFI 2021.11.14.hellen72.485387522" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.11.14.hellen72.3287265668" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.11.14.hellen72.485387522" ; 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 Sun Nov 14 03:00:11 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Nov 14 03:52:24 UTC 2021 pageSize = 20000 page = 1 @@ -467,13 +467,15 @@ fsioFrequency4 = scalar, U16, 838, "Hz", 1, 0, 0, 3000, 0 fsioFrequency5 = scalar, U16, 840, "Hz", 1, 0, 0, 3000, 0 fsioFrequency6 = scalar, U16, 842, "Hz", 1, 0, 0, 3000, 0 unusedOutputFreqWhereHere = array, S16, 844, [10], "", 1, 0, 0, 255, 0 -fsio_setting1 = scalar, F32, 864, "Val", 1, 0, 0, 18000, 2 -fsio_setting2 = scalar, F32, 868, "Val", 1, 0, 0, 18000, 2 -fsio_setting3 = scalar, F32, 872, "Val", 1, 0, 0, 18000, 2 -fsio_setting4 = scalar, F32, 876, "Val", 1, 0, 0, 18000, 2 -fsio_setting5 = scalar, F32, 880, "Val", 1, 0, 0, 18000, 2 -fsio_setting6 = scalar, F32, 884, "Val", 1, 0, 0, 18000, 2 -unusedSettings = array, S32, 888, [10], "", 1, 0, 0, 255, 0 +scriptSetting1 = scalar, F32, 864, "Val", 1, 0, 0, 18000, 2 +scriptSetting2 = scalar, F32, 868, "Val", 1, 0, 0, 18000, 2 +scriptSetting3 = scalar, F32, 872, "Val", 1, 0, 0, 18000, 2 +scriptSetting4 = scalar, F32, 876, "Val", 1, 0, 0, 18000, 2 +scriptSetting5 = scalar, F32, 880, "Val", 1, 0, 0, 18000, 2 +scriptSetting6 = scalar, F32, 884, "Val", 1, 0, 0, 18000, 2 +scriptSetting7 = scalar, F32, 888, "Val", 1, 0, 0, 18000, 2 +scriptSetting8 = scalar, F32, 892, "Val", 1, 0, 0, 18000, 2 +unusedSettings = array, S32, 896, [8], "", 1, 0, 0, 255, 0 spi1mosiPin = bits, U08, 928, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" spi1misoPin = bits, U08, 929, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" spi1sckPin = bits, U08, 930, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" @@ -5188,20 +5190,20 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" field = "" field = "" - dialog = fsioSetting, "Setting" + dialog = scriptSetting, "Setting" field = "Set number is not associated with the output number." field = "Set number, only the cell number with some numbers." - field = "set #1", fsio_setting1 - field = "set #2", fsio_setting2 - field = "set #3", fsio_setting3 - field = "set #4", fsio_setting4 - field = "set #5", fsio_setting5 - field = "set #6", fsio_setting6 + field = "set #1", scriptSetting1 + field = "set #2", scriptSetting2 + field = "set #3", scriptSetting3 + field = "set #4", scriptSetting4 + field = "set #5", scriptSetting5 + field = "set #6", scriptSetting6 dialog = fsioOutputsDialog, "FSIO outputs", border panel = fsioIO, West panel = fsioFrequency, Center - panel = fsioSetting, East + panel = scriptSetting, East dialog = fsioFormulas, "FSIO Formulas" field = "!FSIO uses Reverse Polish Notation. Please read http://rusefi.com/s/fsio" diff --git a/firmware/tunerstudio/generated/rusefi_hellen88bmw.ini b/firmware/tunerstudio/generated/rusefi_hellen88bmw.ini index fdc87d3843..ad9fd366e8 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.14.hellen88bmw.2526193515" + signature = "rusEFI 2021.11.14.hellen88bmw.1234402285" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.11.14.hellen88bmw.2526193515" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.11.14.hellen88bmw.1234402285" ; 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 Sun Nov 14 03:00:09 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Nov 14 03:52:21 UTC 2021 pageSize = 20000 page = 1 @@ -467,13 +467,15 @@ fsioFrequency4 = scalar, U16, 838, "Hz", 1, 0, 0, 3000, 0 fsioFrequency5 = scalar, U16, 840, "Hz", 1, 0, 0, 3000, 0 fsioFrequency6 = scalar, U16, 842, "Hz", 1, 0, 0, 3000, 0 unusedOutputFreqWhereHere = array, S16, 844, [10], "", 1, 0, 0, 255, 0 -fsio_setting1 = scalar, F32, 864, "Val", 1, 0, 0, 18000, 2 -fsio_setting2 = scalar, F32, 868, "Val", 1, 0, 0, 18000, 2 -fsio_setting3 = scalar, F32, 872, "Val", 1, 0, 0, 18000, 2 -fsio_setting4 = scalar, F32, 876, "Val", 1, 0, 0, 18000, 2 -fsio_setting5 = scalar, F32, 880, "Val", 1, 0, 0, 18000, 2 -fsio_setting6 = scalar, F32, 884, "Val", 1, 0, 0, 18000, 2 -unusedSettings = array, S32, 888, [10], "", 1, 0, 0, 255, 0 +scriptSetting1 = scalar, F32, 864, "Val", 1, 0, 0, 18000, 2 +scriptSetting2 = scalar, F32, 868, "Val", 1, 0, 0, 18000, 2 +scriptSetting3 = scalar, F32, 872, "Val", 1, 0, 0, 18000, 2 +scriptSetting4 = scalar, F32, 876, "Val", 1, 0, 0, 18000, 2 +scriptSetting5 = scalar, F32, 880, "Val", 1, 0, 0, 18000, 2 +scriptSetting6 = scalar, F32, 884, "Val", 1, 0, 0, 18000, 2 +scriptSetting7 = scalar, F32, 888, "Val", 1, 0, 0, 18000, 2 +scriptSetting8 = scalar, F32, 892, "Val", 1, 0, 0, 18000, 2 +unusedSettings = array, S32, 896, [8], "", 1, 0, 0, 255, 0 spi1mosiPin = bits, U08, 928, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" spi1misoPin = bits, U08, 929, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" spi1sckPin = bits, U08, 930, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" @@ -5187,20 +5189,20 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" field = "" field = "" - dialog = fsioSetting, "Setting" + dialog = scriptSetting, "Setting" field = "Set number is not associated with the output number." field = "Set number, only the cell number with some numbers." - field = "set #1", fsio_setting1 - field = "set #2", fsio_setting2 - field = "set #3", fsio_setting3 - field = "set #4", fsio_setting4 - field = "set #5", fsio_setting5 - field = "set #6", fsio_setting6 + field = "set #1", scriptSetting1 + field = "set #2", scriptSetting2 + field = "set #3", scriptSetting3 + field = "set #4", scriptSetting4 + field = "set #5", scriptSetting5 + field = "set #6", scriptSetting6 dialog = fsioOutputsDialog, "FSIO outputs", border panel = fsioIO, West panel = fsioFrequency, Center - panel = fsioSetting, East + panel = scriptSetting, East dialog = fsioFormulas, "FSIO Formulas" field = "!FSIO uses Reverse Polish Notation. Please read http://rusefi.com/s/fsio" diff --git a/firmware/tunerstudio/generated/rusefi_hellenNA6.ini b/firmware/tunerstudio/generated/rusefi_hellenNA6.ini index 7e8bde22ab..18f21bc8bd 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.14.hellenNA6.1097822364" + signature = "rusEFI 2021.11.14.hellenNA6.2658053146" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.11.14.hellenNA6.1097822364" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.11.14.hellenNA6.2658053146" ; 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 Sun Nov 14 03:00:17 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Nov 14 03:52:31 UTC 2021 pageSize = 20000 page = 1 @@ -467,13 +467,15 @@ fsioFrequency4 = scalar, U16, 838, "Hz", 1, 0, 0, 3000, 0 fsioFrequency5 = scalar, U16, 840, "Hz", 1, 0, 0, 3000, 0 fsioFrequency6 = scalar, U16, 842, "Hz", 1, 0, 0, 3000, 0 unusedOutputFreqWhereHere = array, S16, 844, [10], "", 1, 0, 0, 255, 0 -fsio_setting1 = scalar, F32, 864, "Val", 1, 0, 0, 18000, 2 -fsio_setting2 = scalar, F32, 868, "Val", 1, 0, 0, 18000, 2 -fsio_setting3 = scalar, F32, 872, "Val", 1, 0, 0, 18000, 2 -fsio_setting4 = scalar, F32, 876, "Val", 1, 0, 0, 18000, 2 -fsio_setting5 = scalar, F32, 880, "Val", 1, 0, 0, 18000, 2 -fsio_setting6 = scalar, F32, 884, "Val", 1, 0, 0, 18000, 2 -unusedSettings = array, S32, 888, [10], "", 1, 0, 0, 255, 0 +scriptSetting1 = scalar, F32, 864, "Val", 1, 0, 0, 18000, 2 +scriptSetting2 = scalar, F32, 868, "Val", 1, 0, 0, 18000, 2 +scriptSetting3 = scalar, F32, 872, "Val", 1, 0, 0, 18000, 2 +scriptSetting4 = scalar, F32, 876, "Val", 1, 0, 0, 18000, 2 +scriptSetting5 = scalar, F32, 880, "Val", 1, 0, 0, 18000, 2 +scriptSetting6 = scalar, F32, 884, "Val", 1, 0, 0, 18000, 2 +scriptSetting7 = scalar, F32, 888, "Val", 1, 0, 0, 18000, 2 +scriptSetting8 = scalar, F32, 892, "Val", 1, 0, 0, 18000, 2 +unusedSettings = array, S32, 896, [8], "", 1, 0, 0, 255, 0 spi1mosiPin = bits, U08, 928, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" spi1misoPin = bits, U08, 929, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" spi1sckPin = bits, U08, 930, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" @@ -5188,20 +5190,20 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" field = "" field = "" - dialog = fsioSetting, "Setting" + dialog = scriptSetting, "Setting" field = "Set number is not associated with the output number." field = "Set number, only the cell number with some numbers." - field = "set #1", fsio_setting1 - field = "set #2", fsio_setting2 - field = "set #3", fsio_setting3 - field = "set #4", fsio_setting4 - field = "set #5", fsio_setting5 - field = "set #6", fsio_setting6 + field = "set #1", scriptSetting1 + field = "set #2", scriptSetting2 + field = "set #3", scriptSetting3 + field = "set #4", scriptSetting4 + field = "set #5", scriptSetting5 + field = "set #6", scriptSetting6 dialog = fsioOutputsDialog, "FSIO outputs", border panel = fsioIO, West panel = fsioFrequency, Center - panel = fsioSetting, East + panel = scriptSetting, East dialog = fsioFormulas, "FSIO Formulas" field = "!FSIO uses Reverse Polish Notation. Please read http://rusefi.com/s/fsio" diff --git a/firmware/tunerstudio/generated/rusefi_hellen_cypress.ini b/firmware/tunerstudio/generated/rusefi_hellen_cypress.ini index 0642aa11d1..5c3d16cf51 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.14.hellen_cypress.2059243171" + signature = "rusEFI 2021.11.14.hellen_cypress.2780582437" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.11.14.hellen_cypress.2059243171" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.11.14.hellen_cypress.2780582437" ; 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 Sun Nov 14 03:00:46 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on hellen_cypress_gen_config.bat integration/rusefi_config.txt Sun Nov 14 03:53:04 UTC 2021 pageSize = 20000 page = 1 @@ -467,13 +467,15 @@ fsioFrequency4 = scalar, U16, 838, "Hz", 1, 0, 0, 3000, 0 fsioFrequency5 = scalar, U16, 840, "Hz", 1, 0, 0, 3000, 0 fsioFrequency6 = scalar, U16, 842, "Hz", 1, 0, 0, 3000, 0 unusedOutputFreqWhereHere = array, S16, 844, [10], "", 1, 0, 0, 255, 0 -fsio_setting1 = scalar, F32, 864, "Val", 1, 0, 0, 18000, 2 -fsio_setting2 = scalar, F32, 868, "Val", 1, 0, 0, 18000, 2 -fsio_setting3 = scalar, F32, 872, "Val", 1, 0, 0, 18000, 2 -fsio_setting4 = scalar, F32, 876, "Val", 1, 0, 0, 18000, 2 -fsio_setting5 = scalar, F32, 880, "Val", 1, 0, 0, 18000, 2 -fsio_setting6 = scalar, F32, 884, "Val", 1, 0, 0, 18000, 2 -unusedSettings = array, S32, 888, [10], "", 1, 0, 0, 255, 0 +scriptSetting1 = scalar, F32, 864, "Val", 1, 0, 0, 18000, 2 +scriptSetting2 = scalar, F32, 868, "Val", 1, 0, 0, 18000, 2 +scriptSetting3 = scalar, F32, 872, "Val", 1, 0, 0, 18000, 2 +scriptSetting4 = scalar, F32, 876, "Val", 1, 0, 0, 18000, 2 +scriptSetting5 = scalar, F32, 880, "Val", 1, 0, 0, 18000, 2 +scriptSetting6 = scalar, F32, 884, "Val", 1, 0, 0, 18000, 2 +scriptSetting7 = scalar, F32, 888, "Val", 1, 0, 0, 18000, 2 +scriptSetting8 = scalar, F32, 892, "Val", 1, 0, 0, 18000, 2 +unusedSettings = array, S32, 896, [8], "", 1, 0, 0, 255, 0 spi1mosiPin = bits, U08, 928, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" spi1misoPin = bits, U08, 929, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" spi1sckPin = bits, U08, 930, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" @@ -5211,20 +5213,20 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" field = "" field = "" - dialog = fsioSetting, "Setting" + dialog = scriptSetting, "Setting" field = "Set number is not associated with the output number." field = "Set number, only the cell number with some numbers." - field = "set #1", fsio_setting1 - field = "set #2", fsio_setting2 - field = "set #3", fsio_setting3 - field = "set #4", fsio_setting4 - field = "set #5", fsio_setting5 - field = "set #6", fsio_setting6 + field = "set #1", scriptSetting1 + field = "set #2", scriptSetting2 + field = "set #3", scriptSetting3 + field = "set #4", scriptSetting4 + field = "set #5", scriptSetting5 + field = "set #6", scriptSetting6 dialog = fsioOutputsDialog, "FSIO outputs", border panel = fsioIO, West panel = fsioFrequency, Center - panel = fsioSetting, East + panel = scriptSetting, East dialog = fsioFormulas, "FSIO Formulas" field = "!FSIO uses Reverse Polish Notation. Please read http://rusefi.com/s/fsio" diff --git a/firmware/tunerstudio/generated/rusefi_kinetis.ini b/firmware/tunerstudio/generated/rusefi_kinetis.ini index 63b432d235..92e4a9bdd1 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.14.kin.2232959583" + signature = "rusEFI 2021.11.14.kin.1511628505" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.11.14.kin.2232959583" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.11.14.kin.1511628505" ; 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 Sun Nov 14 03:00:44 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Sun Nov 14 03:53:01 UTC 2021 pageSize = 19972 page = 1 @@ -464,13 +464,15 @@ fsioFrequency4 = scalar, U16, 838, "Hz", 1, 0, 0, 3000, 0 fsioFrequency5 = scalar, U16, 840, "Hz", 1, 0, 0, 3000, 0 fsioFrequency6 = scalar, U16, 842, "Hz", 1, 0, 0, 3000, 0 unusedOutputFreqWhereHere = array, S16, 844, [10], "", 1, 0, 0, 255, 0 -fsio_setting1 = scalar, F32, 864, "Val", 1, 0, 0, 18000, 2 -fsio_setting2 = scalar, F32, 868, "Val", 1, 0, 0, 18000, 2 -fsio_setting3 = scalar, F32, 872, "Val", 1, 0, 0, 18000, 2 -fsio_setting4 = scalar, F32, 876, "Val", 1, 0, 0, 18000, 2 -fsio_setting5 = scalar, F32, 880, "Val", 1, 0, 0, 18000, 2 -fsio_setting6 = scalar, F32, 884, "Val", 1, 0, 0, 18000, 2 -unusedSettings = array, S32, 888, [10], "", 1, 0, 0, 255, 0 +scriptSetting1 = scalar, F32, 864, "Val", 1, 0, 0, 18000, 2 +scriptSetting2 = scalar, F32, 868, "Val", 1, 0, 0, 18000, 2 +scriptSetting3 = scalar, F32, 872, "Val", 1, 0, 0, 18000, 2 +scriptSetting4 = scalar, F32, 876, "Val", 1, 0, 0, 18000, 2 +scriptSetting5 = scalar, F32, 880, "Val", 1, 0, 0, 18000, 2 +scriptSetting6 = scalar, F32, 884, "Val", 1, 0, 0, 18000, 2 +scriptSetting7 = scalar, F32, 888, "Val", 1, 0, 0, 18000, 2 +scriptSetting8 = scalar, F32, 892, "Val", 1, 0, 0, 18000, 2 +unusedSettings = array, S32, 896, [8], "", 1, 0, 0, 255, 0 spi1mosiPin = bits, U08, 928, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PA16", "PA17", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PB16", "PB17", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PC16", "PC17", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PD16", "PD17", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PE16", "PE17", "TLE6240_1", "TLE6240_2", "TLE6240_3", "TLE6240_4", "TLE6240_5", "TLE6240_6", "TLE6240_7", "TLE6240_8", "TLE6240_9", "TLE6240_10", "TLE6240_11", "TLE6240_12", "TLE6240_13", "TLE6240_14", "TLE6240_15", "TLE6240_16", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" spi1misoPin = bits, U08, 929, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PA16", "PA17", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PB16", "PB17", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PC16", "PC17", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PD16", "PD17", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PE16", "PE17", "TLE6240_1", "TLE6240_2", "TLE6240_3", "TLE6240_4", "TLE6240_5", "TLE6240_6", "TLE6240_7", "TLE6240_8", "TLE6240_9", "TLE6240_10", "TLE6240_11", "TLE6240_12", "TLE6240_13", "TLE6240_14", "TLE6240_15", "TLE6240_16", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" spi1sckPin = bits, U08, 930, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PA16", "PA17", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PB16", "PB17", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PC16", "PC17", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PD16", "PD17", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PE16", "PE17", "TLE6240_1", "TLE6240_2", "TLE6240_3", "TLE6240_4", "TLE6240_5", "TLE6240_6", "TLE6240_7", "TLE6240_8", "TLE6240_9", "TLE6240_10", "TLE6240_11", "TLE6240_12", "TLE6240_13", "TLE6240_14", "TLE6240_15", "TLE6240_16", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" @@ -5178,20 +5180,20 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" field = "" field = "" - dialog = fsioSetting, "Setting" + dialog = scriptSetting, "Setting" field = "Set number is not associated with the output number." field = "Set number, only the cell number with some numbers." - field = "set #1", fsio_setting1 - field = "set #2", fsio_setting2 - field = "set #3", fsio_setting3 - field = "set #4", fsio_setting4 - field = "set #5", fsio_setting5 - field = "set #6", fsio_setting6 + field = "set #1", scriptSetting1 + field = "set #2", scriptSetting2 + field = "set #3", scriptSetting3 + field = "set #4", scriptSetting4 + field = "set #5", scriptSetting5 + field = "set #6", scriptSetting6 dialog = fsioOutputsDialog, "FSIO outputs", border panel = fsioIO, West panel = fsioFrequency, Center - panel = fsioSetting, East + panel = scriptSetting, East dialog = fsioFormulas, "FSIO Formulas" field = "!FSIO uses Reverse Polish Notation. Please read http://rusefi.com/s/fsio" diff --git a/firmware/tunerstudio/generated/rusefi_mre_f4.ini b/firmware/tunerstudio/generated/rusefi_mre_f4.ini index 68fcc45865..bdaf7eca12 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.14.mre_f4.3154730389" + signature = "rusEFI 2021.11.14.mre_f4.1661501715" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.11.14.mre_f4.3154730389" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.11.14.mre_f4.1661501715" ; 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 Sun Nov 14 03:00:22 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Nov 14 03:52:37 UTC 2021 pageSize = 20000 page = 1 @@ -467,13 +467,15 @@ fsioFrequency4 = scalar, U16, 838, "Hz", 1, 0, 0, 3000, 0 fsioFrequency5 = scalar, U16, 840, "Hz", 1, 0, 0, 3000, 0 fsioFrequency6 = scalar, U16, 842, "Hz", 1, 0, 0, 3000, 0 unusedOutputFreqWhereHere = array, S16, 844, [10], "", 1, 0, 0, 255, 0 -fsio_setting1 = scalar, F32, 864, "Val", 1, 0, 0, 18000, 2 -fsio_setting2 = scalar, F32, 868, "Val", 1, 0, 0, 18000, 2 -fsio_setting3 = scalar, F32, 872, "Val", 1, 0, 0, 18000, 2 -fsio_setting4 = scalar, F32, 876, "Val", 1, 0, 0, 18000, 2 -fsio_setting5 = scalar, F32, 880, "Val", 1, 0, 0, 18000, 2 -fsio_setting6 = scalar, F32, 884, "Val", 1, 0, 0, 18000, 2 -unusedSettings = array, S32, 888, [10], "", 1, 0, 0, 255, 0 +scriptSetting1 = scalar, F32, 864, "Val", 1, 0, 0, 18000, 2 +scriptSetting2 = scalar, F32, 868, "Val", 1, 0, 0, 18000, 2 +scriptSetting3 = scalar, F32, 872, "Val", 1, 0, 0, 18000, 2 +scriptSetting4 = scalar, F32, 876, "Val", 1, 0, 0, 18000, 2 +scriptSetting5 = scalar, F32, 880, "Val", 1, 0, 0, 18000, 2 +scriptSetting6 = scalar, F32, 884, "Val", 1, 0, 0, 18000, 2 +scriptSetting7 = scalar, F32, 888, "Val", 1, 0, 0, 18000, 2 +scriptSetting8 = scalar, F32, 892, "Val", 1, 0, 0, 18000, 2 +unusedSettings = array, S32, 896, [8], "", 1, 0, 0, 255, 0 spi1mosiPin = bits, U08, 928, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" spi1misoPin = bits, U08, 929, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" spi1sckPin = bits, U08, 930, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" @@ -5186,20 +5188,20 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" field = "" field = "" - dialog = fsioSetting, "Setting" + dialog = scriptSetting, "Setting" field = "Set number is not associated with the output number." field = "Set number, only the cell number with some numbers." - field = "set #1", fsio_setting1 - field = "set #2", fsio_setting2 - field = "set #3", fsio_setting3 - field = "set #4", fsio_setting4 - field = "set #5", fsio_setting5 - field = "set #6", fsio_setting6 + field = "set #1", scriptSetting1 + field = "set #2", scriptSetting2 + field = "set #3", scriptSetting3 + field = "set #4", scriptSetting4 + field = "set #5", scriptSetting5 + field = "set #6", scriptSetting6 dialog = fsioOutputsDialog, "FSIO outputs", border panel = fsioIO, West panel = fsioFrequency, Center - panel = fsioSetting, East + panel = scriptSetting, East dialog = fsioFormulas, "FSIO Formulas" field = "!FSIO uses Reverse Polish Notation. Please read http://rusefi.com/s/fsio" diff --git a/firmware/tunerstudio/generated/rusefi_mre_f7.ini b/firmware/tunerstudio/generated/rusefi_mre_f7.ini index 130e14333b..94b02f20aa 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.14.mre_f7.3154730389" + signature = "rusEFI 2021.11.14.mre_f7.1661501715" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.11.14.mre_f7.3154730389" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.11.14.mre_f7.1661501715" ; 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 Sun Nov 14 03:00:20 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Nov 14 03:52:34 UTC 2021 pageSize = 20000 page = 1 @@ -467,13 +467,15 @@ fsioFrequency4 = scalar, U16, 838, "Hz", 1, 0, 0, 3000, 0 fsioFrequency5 = scalar, U16, 840, "Hz", 1, 0, 0, 3000, 0 fsioFrequency6 = scalar, U16, 842, "Hz", 1, 0, 0, 3000, 0 unusedOutputFreqWhereHere = array, S16, 844, [10], "", 1, 0, 0, 255, 0 -fsio_setting1 = scalar, F32, 864, "Val", 1, 0, 0, 18000, 2 -fsio_setting2 = scalar, F32, 868, "Val", 1, 0, 0, 18000, 2 -fsio_setting3 = scalar, F32, 872, "Val", 1, 0, 0, 18000, 2 -fsio_setting4 = scalar, F32, 876, "Val", 1, 0, 0, 18000, 2 -fsio_setting5 = scalar, F32, 880, "Val", 1, 0, 0, 18000, 2 -fsio_setting6 = scalar, F32, 884, "Val", 1, 0, 0, 18000, 2 -unusedSettings = array, S32, 888, [10], "", 1, 0, 0, 255, 0 +scriptSetting1 = scalar, F32, 864, "Val", 1, 0, 0, 18000, 2 +scriptSetting2 = scalar, F32, 868, "Val", 1, 0, 0, 18000, 2 +scriptSetting3 = scalar, F32, 872, "Val", 1, 0, 0, 18000, 2 +scriptSetting4 = scalar, F32, 876, "Val", 1, 0, 0, 18000, 2 +scriptSetting5 = scalar, F32, 880, "Val", 1, 0, 0, 18000, 2 +scriptSetting6 = scalar, F32, 884, "Val", 1, 0, 0, 18000, 2 +scriptSetting7 = scalar, F32, 888, "Val", 1, 0, 0, 18000, 2 +scriptSetting8 = scalar, F32, 892, "Val", 1, 0, 0, 18000, 2 +unusedSettings = array, S32, 896, [8], "", 1, 0, 0, 255, 0 spi1mosiPin = bits, U08, 928, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" spi1misoPin = bits, U08, 929, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" spi1sckPin = bits, U08, 930, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" @@ -5186,20 +5188,20 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" field = "" field = "" - dialog = fsioSetting, "Setting" + dialog = scriptSetting, "Setting" field = "Set number is not associated with the output number." field = "Set number, only the cell number with some numbers." - field = "set #1", fsio_setting1 - field = "set #2", fsio_setting2 - field = "set #3", fsio_setting3 - field = "set #4", fsio_setting4 - field = "set #5", fsio_setting5 - field = "set #6", fsio_setting6 + field = "set #1", scriptSetting1 + field = "set #2", scriptSetting2 + field = "set #3", scriptSetting3 + field = "set #4", scriptSetting4 + field = "set #5", scriptSetting5 + field = "set #6", scriptSetting6 dialog = fsioOutputsDialog, "FSIO outputs", border panel = fsioIO, West panel = fsioFrequency, Center - panel = fsioSetting, East + panel = scriptSetting, East dialog = fsioFormulas, "FSIO Formulas" field = "!FSIO uses Reverse Polish Notation. Please read http://rusefi.com/s/fsio" diff --git a/firmware/tunerstudio/generated/rusefi_prometheus_405.ini b/firmware/tunerstudio/generated/rusefi_prometheus_405.ini index 4cc7b919f3..a396834fa0 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.14.prometheus_405.1740173266" + signature = "rusEFI 2021.11.14.prometheus_405.3099145044" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.11.14.prometheus_405.1740173266" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.11.14.prometheus_405.3099145044" ; 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 Sun Nov 14 03:00:31 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Nov 14 03:52:46 UTC 2021 pageSize = 20000 page = 1 @@ -467,13 +467,15 @@ fsioFrequency4 = scalar, U16, 838, "Hz", 1, 0, 0, 3000, 0 fsioFrequency5 = scalar, U16, 840, "Hz", 1, 0, 0, 3000, 0 fsioFrequency6 = scalar, U16, 842, "Hz", 1, 0, 0, 3000, 0 unusedOutputFreqWhereHere = array, S16, 844, [10], "", 1, 0, 0, 255, 0 -fsio_setting1 = scalar, F32, 864, "Val", 1, 0, 0, 18000, 2 -fsio_setting2 = scalar, F32, 868, "Val", 1, 0, 0, 18000, 2 -fsio_setting3 = scalar, F32, 872, "Val", 1, 0, 0, 18000, 2 -fsio_setting4 = scalar, F32, 876, "Val", 1, 0, 0, 18000, 2 -fsio_setting5 = scalar, F32, 880, "Val", 1, 0, 0, 18000, 2 -fsio_setting6 = scalar, F32, 884, "Val", 1, 0, 0, 18000, 2 -unusedSettings = array, S32, 888, [10], "", 1, 0, 0, 255, 0 +scriptSetting1 = scalar, F32, 864, "Val", 1, 0, 0, 18000, 2 +scriptSetting2 = scalar, F32, 868, "Val", 1, 0, 0, 18000, 2 +scriptSetting3 = scalar, F32, 872, "Val", 1, 0, 0, 18000, 2 +scriptSetting4 = scalar, F32, 876, "Val", 1, 0, 0, 18000, 2 +scriptSetting5 = scalar, F32, 880, "Val", 1, 0, 0, 18000, 2 +scriptSetting6 = scalar, F32, 884, "Val", 1, 0, 0, 18000, 2 +scriptSetting7 = scalar, F32, 888, "Val", 1, 0, 0, 18000, 2 +scriptSetting8 = scalar, F32, 892, "Val", 1, 0, 0, 18000, 2 +unusedSettings = array, S32, 896, [8], "", 1, 0, 0, 255, 0 spi1mosiPin = bits, U08, 928, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" spi1misoPin = bits, U08, 929, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" spi1sckPin = bits, U08, 930, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" @@ -5206,20 +5208,20 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" field = "" field = "" - dialog = fsioSetting, "Setting" + dialog = scriptSetting, "Setting" field = "Set number is not associated with the output number." field = "Set number, only the cell number with some numbers." - field = "set #1", fsio_setting1 - field = "set #2", fsio_setting2 - field = "set #3", fsio_setting3 - field = "set #4", fsio_setting4 - field = "set #5", fsio_setting5 - field = "set #6", fsio_setting6 + field = "set #1", scriptSetting1 + field = "set #2", scriptSetting2 + field = "set #3", scriptSetting3 + field = "set #4", scriptSetting4 + field = "set #5", scriptSetting5 + field = "set #6", scriptSetting6 dialog = fsioOutputsDialog, "FSIO outputs", border panel = fsioIO, West panel = fsioFrequency, Center - panel = fsioSetting, East + panel = scriptSetting, East dialog = fsioFormulas, "FSIO Formulas" field = "!FSIO uses Reverse Polish Notation. Please read http://rusefi.com/s/fsio" diff --git a/firmware/tunerstudio/generated/rusefi_prometheus_469.ini b/firmware/tunerstudio/generated/rusefi_prometheus_469.ini index b8a6420bac..f07d36b23a 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.14.prometheus_469.1740173266" + signature = "rusEFI 2021.11.14.prometheus_469.3099145044" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.11.14.prometheus_469.1740173266" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.11.14.prometheus_469.3099145044" ; 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 Sun Nov 14 03:00:28 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Nov 14 03:52:43 UTC 2021 pageSize = 20000 page = 1 @@ -467,13 +467,15 @@ fsioFrequency4 = scalar, U16, 838, "Hz", 1, 0, 0, 3000, 0 fsioFrequency5 = scalar, U16, 840, "Hz", 1, 0, 0, 3000, 0 fsioFrequency6 = scalar, U16, 842, "Hz", 1, 0, 0, 3000, 0 unusedOutputFreqWhereHere = array, S16, 844, [10], "", 1, 0, 0, 255, 0 -fsio_setting1 = scalar, F32, 864, "Val", 1, 0, 0, 18000, 2 -fsio_setting2 = scalar, F32, 868, "Val", 1, 0, 0, 18000, 2 -fsio_setting3 = scalar, F32, 872, "Val", 1, 0, 0, 18000, 2 -fsio_setting4 = scalar, F32, 876, "Val", 1, 0, 0, 18000, 2 -fsio_setting5 = scalar, F32, 880, "Val", 1, 0, 0, 18000, 2 -fsio_setting6 = scalar, F32, 884, "Val", 1, 0, 0, 18000, 2 -unusedSettings = array, S32, 888, [10], "", 1, 0, 0, 255, 0 +scriptSetting1 = scalar, F32, 864, "Val", 1, 0, 0, 18000, 2 +scriptSetting2 = scalar, F32, 868, "Val", 1, 0, 0, 18000, 2 +scriptSetting3 = scalar, F32, 872, "Val", 1, 0, 0, 18000, 2 +scriptSetting4 = scalar, F32, 876, "Val", 1, 0, 0, 18000, 2 +scriptSetting5 = scalar, F32, 880, "Val", 1, 0, 0, 18000, 2 +scriptSetting6 = scalar, F32, 884, "Val", 1, 0, 0, 18000, 2 +scriptSetting7 = scalar, F32, 888, "Val", 1, 0, 0, 18000, 2 +scriptSetting8 = scalar, F32, 892, "Val", 1, 0, 0, 18000, 2 +unusedSettings = array, S32, 896, [8], "", 1, 0, 0, 255, 0 spi1mosiPin = bits, U08, 928, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" spi1misoPin = bits, U08, 929, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" spi1sckPin = bits, U08, 930, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" @@ -5206,20 +5208,20 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" field = "" field = "" - dialog = fsioSetting, "Setting" + dialog = scriptSetting, "Setting" field = "Set number is not associated with the output number." field = "Set number, only the cell number with some numbers." - field = "set #1", fsio_setting1 - field = "set #2", fsio_setting2 - field = "set #3", fsio_setting3 - field = "set #4", fsio_setting4 - field = "set #5", fsio_setting5 - field = "set #6", fsio_setting6 + field = "set #1", scriptSetting1 + field = "set #2", scriptSetting2 + field = "set #3", scriptSetting3 + field = "set #4", scriptSetting4 + field = "set #5", scriptSetting5 + field = "set #6", scriptSetting6 dialog = fsioOutputsDialog, "FSIO outputs", border panel = fsioIO, West panel = fsioFrequency, Center - panel = fsioSetting, East + panel = scriptSetting, East dialog = fsioFormulas, "FSIO Formulas" field = "!FSIO uses Reverse Polish Notation. Please read http://rusefi.com/s/fsio" diff --git a/firmware/tunerstudio/generated/rusefi_proteus_f4.ini b/firmware/tunerstudio/generated/rusefi_proteus_f4.ini index 6f7d810f12..4f252ee96b 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.14.proteus_f4.2620218805" + signature = "rusEFI 2021.11.14.proteus_f4.1126990131" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.11.14.proteus_f4.2620218805" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.11.14.proteus_f4.1126990131" ; 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 Sun Nov 14 03:00:36 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Nov 14 03:52:52 UTC 2021 pageSize = 20000 page = 1 @@ -467,13 +467,15 @@ fsioFrequency4 = scalar, U16, 838, "Hz", 1, 0, 0, 3000, 0 fsioFrequency5 = scalar, U16, 840, "Hz", 1, 0, 0, 3000, 0 fsioFrequency6 = scalar, U16, 842, "Hz", 1, 0, 0, 3000, 0 unusedOutputFreqWhereHere = array, S16, 844, [10], "", 1, 0, 0, 255, 0 -fsio_setting1 = scalar, F32, 864, "Val", 1, 0, 0, 18000, 2 -fsio_setting2 = scalar, F32, 868, "Val", 1, 0, 0, 18000, 2 -fsio_setting3 = scalar, F32, 872, "Val", 1, 0, 0, 18000, 2 -fsio_setting4 = scalar, F32, 876, "Val", 1, 0, 0, 18000, 2 -fsio_setting5 = scalar, F32, 880, "Val", 1, 0, 0, 18000, 2 -fsio_setting6 = scalar, F32, 884, "Val", 1, 0, 0, 18000, 2 -unusedSettings = array, S32, 888, [10], "", 1, 0, 0, 255, 0 +scriptSetting1 = scalar, F32, 864, "Val", 1, 0, 0, 18000, 2 +scriptSetting2 = scalar, F32, 868, "Val", 1, 0, 0, 18000, 2 +scriptSetting3 = scalar, F32, 872, "Val", 1, 0, 0, 18000, 2 +scriptSetting4 = scalar, F32, 876, "Val", 1, 0, 0, 18000, 2 +scriptSetting5 = scalar, F32, 880, "Val", 1, 0, 0, 18000, 2 +scriptSetting6 = scalar, F32, 884, "Val", 1, 0, 0, 18000, 2 +scriptSetting7 = scalar, F32, 888, "Val", 1, 0, 0, 18000, 2 +scriptSetting8 = scalar, F32, 892, "Val", 1, 0, 0, 18000, 2 +unusedSettings = array, S32, 896, [8], "", 1, 0, 0, 255, 0 spi1mosiPin = bits, U08, 928, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" spi1misoPin = bits, U08, 929, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" spi1sckPin = bits, U08, 930, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" @@ -5179,20 +5181,20 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" field = "" field = "" - dialog = fsioSetting, "Setting" + dialog = scriptSetting, "Setting" field = "Set number is not associated with the output number." field = "Set number, only the cell number with some numbers." - field = "set #1", fsio_setting1 - field = "set #2", fsio_setting2 - field = "set #3", fsio_setting3 - field = "set #4", fsio_setting4 - field = "set #5", fsio_setting5 - field = "set #6", fsio_setting6 + field = "set #1", scriptSetting1 + field = "set #2", scriptSetting2 + field = "set #3", scriptSetting3 + field = "set #4", scriptSetting4 + field = "set #5", scriptSetting5 + field = "set #6", scriptSetting6 dialog = fsioOutputsDialog, "FSIO outputs", border panel = fsioIO, West panel = fsioFrequency, Center - panel = fsioSetting, East + panel = scriptSetting, East dialog = fsioFormulas, "FSIO Formulas" field = "!FSIO uses Reverse Polish Notation. Please read http://rusefi.com/s/fsio" diff --git a/firmware/tunerstudio/generated/rusefi_proteus_f7.ini b/firmware/tunerstudio/generated/rusefi_proteus_f7.ini index e203fba2e7..dee768f4d6 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.14.proteus_f7.2620218805" + signature = "rusEFI 2021.11.14.proteus_f7.1126990131" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.11.14.proteus_f7.2620218805" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.11.14.proteus_f7.1126990131" ; 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 Sun Nov 14 03:00:34 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Nov 14 03:52:49 UTC 2021 pageSize = 20000 page = 1 @@ -467,13 +467,15 @@ fsioFrequency4 = scalar, U16, 838, "Hz", 1, 0, 0, 3000, 0 fsioFrequency5 = scalar, U16, 840, "Hz", 1, 0, 0, 3000, 0 fsioFrequency6 = scalar, U16, 842, "Hz", 1, 0, 0, 3000, 0 unusedOutputFreqWhereHere = array, S16, 844, [10], "", 1, 0, 0, 255, 0 -fsio_setting1 = scalar, F32, 864, "Val", 1, 0, 0, 18000, 2 -fsio_setting2 = scalar, F32, 868, "Val", 1, 0, 0, 18000, 2 -fsio_setting3 = scalar, F32, 872, "Val", 1, 0, 0, 18000, 2 -fsio_setting4 = scalar, F32, 876, "Val", 1, 0, 0, 18000, 2 -fsio_setting5 = scalar, F32, 880, "Val", 1, 0, 0, 18000, 2 -fsio_setting6 = scalar, F32, 884, "Val", 1, 0, 0, 18000, 2 -unusedSettings = array, S32, 888, [10], "", 1, 0, 0, 255, 0 +scriptSetting1 = scalar, F32, 864, "Val", 1, 0, 0, 18000, 2 +scriptSetting2 = scalar, F32, 868, "Val", 1, 0, 0, 18000, 2 +scriptSetting3 = scalar, F32, 872, "Val", 1, 0, 0, 18000, 2 +scriptSetting4 = scalar, F32, 876, "Val", 1, 0, 0, 18000, 2 +scriptSetting5 = scalar, F32, 880, "Val", 1, 0, 0, 18000, 2 +scriptSetting6 = scalar, F32, 884, "Val", 1, 0, 0, 18000, 2 +scriptSetting7 = scalar, F32, 888, "Val", 1, 0, 0, 18000, 2 +scriptSetting8 = scalar, F32, 892, "Val", 1, 0, 0, 18000, 2 +unusedSettings = array, S32, 896, [8], "", 1, 0, 0, 255, 0 spi1mosiPin = bits, U08, 928, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" spi1misoPin = bits, U08, 929, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" spi1sckPin = bits, U08, 930, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" @@ -5179,20 +5181,20 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" field = "" field = "" - dialog = fsioSetting, "Setting" + dialog = scriptSetting, "Setting" field = "Set number is not associated with the output number." field = "Set number, only the cell number with some numbers." - field = "set #1", fsio_setting1 - field = "set #2", fsio_setting2 - field = "set #3", fsio_setting3 - field = "set #4", fsio_setting4 - field = "set #5", fsio_setting5 - field = "set #6", fsio_setting6 + field = "set #1", scriptSetting1 + field = "set #2", scriptSetting2 + field = "set #3", scriptSetting3 + field = "set #4", scriptSetting4 + field = "set #5", scriptSetting5 + field = "set #6", scriptSetting6 dialog = fsioOutputsDialog, "FSIO outputs", border panel = fsioIO, West panel = fsioFrequency, Center - panel = fsioSetting, East + panel = scriptSetting, East dialog = fsioFormulas, "FSIO Formulas" field = "!FSIO uses Reverse Polish Notation. Please read http://rusefi.com/s/fsio" diff --git a/firmware/tunerstudio/generated/rusefi_subaru_eg33_f7.ini b/firmware/tunerstudio/generated/rusefi_subaru_eg33_f7.ini index df4e31a67d..1558d57581 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.14.subaru_eg33_f7.2213707599" + signature = "rusEFI 2021.11.14.subaru_eg33_f7.1559471049" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.11.14.subaru_eg33_f7.2213707599" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.11.14.subaru_eg33_f7.1559471049" ; 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 Sun Nov 14 03:00:49 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 Sun Nov 14 03:53:07 UTC 2021 pageSize = 20000 page = 1 @@ -467,13 +467,15 @@ fsioFrequency4 = scalar, U16, 838, "Hz", 1, 0, 0, 3000, 0 fsioFrequency5 = scalar, U16, 840, "Hz", 1, 0, 0, 3000, 0 fsioFrequency6 = scalar, U16, 842, "Hz", 1, 0, 0, 3000, 0 unusedOutputFreqWhereHere = array, S16, 844, [10], "", 1, 0, 0, 255, 0 -fsio_setting1 = scalar, F32, 864, "Val", 1, 0, 0, 18000, 2 -fsio_setting2 = scalar, F32, 868, "Val", 1, 0, 0, 18000, 2 -fsio_setting3 = scalar, F32, 872, "Val", 1, 0, 0, 18000, 2 -fsio_setting4 = scalar, F32, 876, "Val", 1, 0, 0, 18000, 2 -fsio_setting5 = scalar, F32, 880, "Val", 1, 0, 0, 18000, 2 -fsio_setting6 = scalar, F32, 884, "Val", 1, 0, 0, 18000, 2 -unusedSettings = array, S32, 888, [10], "", 1, 0, 0, 255, 0 +scriptSetting1 = scalar, F32, 864, "Val", 1, 0, 0, 18000, 2 +scriptSetting2 = scalar, F32, 868, "Val", 1, 0, 0, 18000, 2 +scriptSetting3 = scalar, F32, 872, "Val", 1, 0, 0, 18000, 2 +scriptSetting4 = scalar, F32, 876, "Val", 1, 0, 0, 18000, 2 +scriptSetting5 = scalar, F32, 880, "Val", 1, 0, 0, 18000, 2 +scriptSetting6 = scalar, F32, 884, "Val", 1, 0, 0, 18000, 2 +scriptSetting7 = scalar, F32, 888, "Val", 1, 0, 0, 18000, 2 +scriptSetting8 = scalar, F32, 892, "Val", 1, 0, 0, 18000, 2 +unusedSettings = array, S32, 896, [8], "", 1, 0, 0, 255, 0 spi1mosiPin = bits, U08, 928, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" spi1misoPin = bits, U08, 929, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" spi1sckPin = bits, U08, 930, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" @@ -5202,20 +5204,20 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" field = "" field = "" - dialog = fsioSetting, "Setting" + dialog = scriptSetting, "Setting" field = "Set number is not associated with the output number." field = "Set number, only the cell number with some numbers." - field = "set #1", fsio_setting1 - field = "set #2", fsio_setting2 - field = "set #3", fsio_setting3 - field = "set #4", fsio_setting4 - field = "set #5", fsio_setting5 - field = "set #6", fsio_setting6 + field = "set #1", scriptSetting1 + field = "set #2", scriptSetting2 + field = "set #3", scriptSetting3 + field = "set #4", scriptSetting4 + field = "set #5", scriptSetting5 + field = "set #6", scriptSetting6 dialog = fsioOutputsDialog, "FSIO outputs", border panel = fsioIO, West panel = fsioFrequency, Center - panel = fsioSetting, East + panel = scriptSetting, East dialog = fsioFormulas, "FSIO Formulas" field = "!FSIO uses Reverse Polish Notation. Please read http://rusefi.com/s/fsio" 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 2a7ee8998e..069c22f3c4 100644 --- a/java_console/models/src/main/java/com/rusefi/config/generated/Fields.java +++ b/java_console/models/src/main/java/com/rusefi/config/generated/Fields.java @@ -1,6 +1,6 @@ package com.rusefi.config.generated; -// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Nov 14 03:00:42 UTC 2021 +// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Nov 14 03:52:58 UTC 2021 // by class com.rusefi.output.FileJavaFieldsConsumer import com.rusefi.config.*; @@ -928,12 +928,6 @@ public class Fields { public static final String FSIO_METHOD_FSIO_DIGITAL_INPUT = "fsio_digital_input"; public static final String FSIO_METHOD_FSIO_SETTING = "fsio_setting"; public static final String FSIO_METHOD_FSIO_TABLE = "fsio_table"; - public static final int fsio_setting1_offset = 864; - public static final int fsio_setting2_offset = 868; - public static final int fsio_setting3_offset = 872; - public static final int fsio_setting4_offset = 876; - public static final int fsio_setting5_offset = 880; - public static final int fsio_setting6_offset = 884; public static final int FSIO_TABLE_8 = 8; public static final int fsioDigitalInputs1_offset = 952; public static final int fsioDigitalInputs2_offset = 953; @@ -1727,6 +1721,7 @@ public class Fields { 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 SCRIPT_SETTING_COUNT = 8; public static final int SCRIPT_TABLE_COUNT = 4; public static final int scriptCurve1_offset = 2780; public static final int scriptCurve1Bins_offset = 2716; @@ -1746,6 +1741,14 @@ public class Fields { 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 scriptSetting1_offset = 864; + public static final int scriptSetting2_offset = 868; + public static final int scriptSetting3_offset = 872; + public static final int scriptSetting4_offset = 876; + public static final int scriptSetting5_offset = 880; + public static final int scriptSetting6_offset = 884; + public static final int scriptSetting7_offset = 888; + public static final int scriptSetting8_offset = 892; public static final int scriptTableName1_offset = 3564; public static final int scriptTableName2_offset = 3580; public static final int scriptTableName3_offset = 3596; @@ -1774,7 +1777,6 @@ public class Fields { public static final int servoOutputPins8_offset = 3147; public static final int showHumanReadableWarning_offset = 976; public static final int showSdCardWarning_offset = 76; - public static final int SIGNATURE_HASH = 928134708; public static final int silentTriggerError_offset = 1464; public static final int slowAdcAlpha_offset = 2088; public static final int sparkDwellRpmBins_offset = 332; @@ -2238,7 +2240,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.14.all.928134708"; + public static final String TS_SIGNATURE = "rusEFI 2021.11.14.all.3897813682"; public static final char TS_SINGLE_WRITE_COMMAND = 'W'; public static final char TS_TEST_COMMAND = 't'; public static final int tunerStudioSerialSpeed_offset = 728; @@ -2346,7 +2348,7 @@ public class Fields { public static final int unusedOutputFreqWhereHere_offset = 844; public static final int unusedOutputWhereHere_offset = 794; public static final int unusedpinModesWhereHere_offset = 779; - public static final int unusedSettings_offset = 888; + public static final int unusedSettings_offset = 896; public static final int unusedSpiPadding4_offset = 2593; public static final int unusedSpiPadding8_offset = 4010; public static final int unusedVvtOffsetWasHere_offset = 2052; @@ -2843,13 +2845,15 @@ public class Fields { public static final Field FSIOFREQUENCY5 = Field.create("FSIOFREQUENCY5", 840, FieldType.INT16); public static final Field FSIOFREQUENCY6 = Field.create("FSIOFREQUENCY6", 842, FieldType.INT16); public static final Field UNUSEDOUTPUTFREQWHEREHERE = Field.create("UNUSEDOUTPUTFREQWHEREHERE", 844, FieldType.INT16); - public static final Field FSIO_SETTING1 = Field.create("FSIO_SETTING1", 864, FieldType.INT); - public static final Field FSIO_SETTING2 = Field.create("FSIO_SETTING2", 868, FieldType.INT); - public static final Field FSIO_SETTING3 = Field.create("FSIO_SETTING3", 872, FieldType.INT); - public static final Field FSIO_SETTING4 = Field.create("FSIO_SETTING4", 876, FieldType.INT); - public static final Field FSIO_SETTING5 = Field.create("FSIO_SETTING5", 880, FieldType.INT); - public static final Field FSIO_SETTING6 = Field.create("FSIO_SETTING6", 884, FieldType.INT); - public static final Field UNUSEDSETTINGS = Field.create("UNUSEDSETTINGS", 888, FieldType.INT); + public static final Field SCRIPTSETTING1 = Field.create("SCRIPTSETTING1", 864, FieldType.INT); + public static final Field SCRIPTSETTING2 = Field.create("SCRIPTSETTING2", 868, FieldType.INT); + public static final Field SCRIPTSETTING3 = Field.create("SCRIPTSETTING3", 872, FieldType.INT); + public static final Field SCRIPTSETTING4 = Field.create("SCRIPTSETTING4", 876, FieldType.INT); + public static final Field SCRIPTSETTING5 = Field.create("SCRIPTSETTING5", 880, FieldType.INT); + public static final Field SCRIPTSETTING6 = Field.create("SCRIPTSETTING6", 884, FieldType.INT); + public static final Field SCRIPTSETTING7 = Field.create("SCRIPTSETTING7", 888, FieldType.INT); + public static final Field SCRIPTSETTING8 = Field.create("SCRIPTSETTING8", 892, FieldType.INT); + public static final Field UNUSEDSETTINGS = Field.create("UNUSEDSETTINGS", 896, FieldType.INT); public static final Field SPI1MOSIPIN = Field.create("SPI1MOSIPIN", 928, FieldType.INT8, brain_pin_e); public static final Field SPI1MISOPIN = Field.create("SPI1MISOPIN", 929, FieldType.INT8, brain_pin_e); public static final Field SPI1SCKPIN = Field.create("SPI1SCKPIN", 930, FieldType.INT8, brain_pin_e); @@ -4145,12 +4149,14 @@ public class Fields { FSIOFREQUENCY5, FSIOFREQUENCY6, UNUSEDOUTPUTFREQWHEREHERE, - FSIO_SETTING1, - FSIO_SETTING2, - FSIO_SETTING3, - FSIO_SETTING4, - FSIO_SETTING5, - FSIO_SETTING6, + SCRIPTSETTING1, + SCRIPTSETTING2, + SCRIPTSETTING3, + SCRIPTSETTING4, + SCRIPTSETTING5, + SCRIPTSETTING6, + SCRIPTSETTING7, + SCRIPTSETTING8, UNUSEDSETTINGS, SPI1MOSIPIN, SPI1MISOPIN, diff --git a/java_console/rusefi.xml b/java_console/rusefi.xml index 6634cab828..0f584959a5 100644 --- a/java_console/rusefi.xml +++ b/java_console/rusefi.xml @@ -1,6 +1,6 @@ - +