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 cb06a0ec05..ad2a64cfb0 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 14:39:00 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 15:51:42 UTC 2021 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -2559,7 +2559,7 @@ struct engine_configuration_s { /** * offset 1512 */ - uint8_t unusedFsioInputs[20]; + uint8_t unused20Inputs[20]; /** count * offset 1532 @@ -3215,7 +3215,7 @@ struct engine_configuration_s { /** * offset 2248 */ - fsio_pwm_freq_t vvtOutputFrequency[CAMS_PER_BANK]; + pwm_freq_t vvtOutputFrequency[CAMS_PER_BANK]; /** * Additional idle % when fan #1 is active % @@ -4242,7 +4242,7 @@ struct persistent_config_s { /** * offset 6672 */ - le_formula_t fsioFormulas[FSIO_COMMAND_COUNT]; + le_formula_t fsioFormulas[6]; /** * offset 7872 */ @@ -4380,34 +4380,34 @@ struct persistent_config_s { value * offset 15776 */ - uint8_t vvtTable1[SCRIPT_TABLE__8][SCRIPT_TABLE__8]; + uint8_t vvtTable1[SCRIPT_TABLE_8][SCRIPT_TABLE_8]; /** L * offset 15840 */ - float vvtTable1LoadBins[SCRIPT_TABLE__8]; + float vvtTable1LoadBins[SCRIPT_TABLE_8]; /** * RPM is float and not integer in order to use unified methods for interpolation RPM * offset 15872 */ - float vvtTable1RpmBins[SCRIPT_TABLE__8]; + float vvtTable1RpmBins[SCRIPT_TABLE_8]; /** value * offset 15904 */ - uint8_t vvtTable2[SCRIPT_TABLE__8][SCRIPT_TABLE__8]; + uint8_t vvtTable2[SCRIPT_TABLE_8][SCRIPT_TABLE_8]; /** L * offset 15968 */ - float vvtTable2LoadBins[SCRIPT_TABLE__8]; + float vvtTable2LoadBins[SCRIPT_TABLE_8]; /** * RPM is float and not integer in order to use unified methods for interpolation RPM * offset 16000 */ - float vvtTable2RpmBins[SCRIPT_TABLE__8]; + float vvtTable2RpmBins[SCRIPT_TABLE_8]; /** L * offset 16032 @@ -4477,68 +4477,68 @@ struct persistent_config_s { value * offset 19296 */ - float scriptTable1[SCRIPT_TABLE__8][SCRIPT_TABLE__8]; + float scriptTable1[SCRIPT_TABLE_8][SCRIPT_TABLE_8]; /** L * offset 19552 */ - float scriptTable1LoadBins[SCRIPT_TABLE__8]; + float scriptTable1LoadBins[SCRIPT_TABLE_8]; /** * RPM is float and not integer in order to use unified methods for interpolation RPM * offset 19584 */ - float scriptTable1RpmBins[SCRIPT_TABLE__8]; + float scriptTable1RpmBins[SCRIPT_TABLE_8]; /** value * offset 19616 */ - uint8_t scriptTable2[SCRIPT_TABLE__8][SCRIPT_TABLE__8]; + uint8_t scriptTable2[SCRIPT_TABLE_8][SCRIPT_TABLE_8]; /** L * offset 19680 */ - float scriptTable2LoadBins[SCRIPT_TABLE__8]; + float scriptTable2LoadBins[SCRIPT_TABLE_8]; /** * RPM is float and not integer in order to use unified methods for interpolation RPM * offset 19712 */ - float scriptTable2RpmBins[SCRIPT_TABLE__8]; + float scriptTable2RpmBins[SCRIPT_TABLE_8]; /** value * offset 19744 */ - uint8_t scriptTable3[SCRIPT_TABLE__8][SCRIPT_TABLE__8]; + uint8_t scriptTable3[SCRIPT_TABLE_8][SCRIPT_TABLE_8]; /** L * offset 19808 */ - float scriptTable3LoadBins[SCRIPT_TABLE__8]; + float scriptTable3LoadBins[SCRIPT_TABLE_8]; /** * RPM is float and not integer in order to use unified methods for interpolation RPM * offset 19840 */ - float scriptTable3RpmBins[SCRIPT_TABLE__8]; + float scriptTable3RpmBins[SCRIPT_TABLE_8]; /** value * offset 19872 */ - uint8_t scriptTable4[SCRIPT_TABLE__8][SCRIPT_TABLE__8]; + uint8_t scriptTable4[SCRIPT_TABLE_8][SCRIPT_TABLE_8]; /** L * offset 19936 */ - float scriptTable4LoadBins[SCRIPT_TABLE__8]; + float scriptTable4LoadBins[SCRIPT_TABLE_8]; /** * RPM is float and not integer in order to use unified methods for interpolation RPM * offset 19968 */ - float scriptTable4RpmBins[SCRIPT_TABLE__8]; + float scriptTable4RpmBins[SCRIPT_TABLE_8]; /** total size 20000*/ }; // 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 14:39:00 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 15:51:42 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 137c6a2b66..a14486f3ee 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 @@ -954,33 +954,16 @@ #define fixedTiming_offset 2204 #define FLASH_DATA_VERSION 10003 #define flexSensorPin_offset 3100 -#define FSIO_ANALOG_INPUT_COUNT 4 -#define FSIO_COMMAND_COUNT 6 -#define SCRIPT_CURVE_16 16 -#define SCRIPT_CURVE_8 8 #define FSIO_METHOD_FSIO_ANALOG_INPUT "fsio_analog_input" #define FSIO_METHOD_FSIO_DIGITAL_INPUT "fsio_digital_input" #define FSIO_METHOD_FSIO_SETTING "fsio_setting" -#define FSIO_METHOD_SCRIPT_TABLE_ "SCRIPT_TABLE_" -#define SCRIPT_TABLE__8 8 +#define FSIO_METHOD_FSIO_TABLE "fsio_table" #define fsioFormulas1_offset 6672 #define fsioFormulas2_offset 6872 #define fsioFormulas3_offset 7072 #define fsioFormulas4_offset 7272 #define fsioFormulas5_offset 7472 #define fsioFormulas6_offset 7672 -#define scriptTable1_offset 19296 -#define scriptTable1LoadBins_offset 19552 -#define scriptTable1RpmBins_offset 19584 -#define scriptTable2_offset 19616 -#define scriptTable2LoadBins_offset 19680 -#define scriptTable2RpmBins_offset 19712 -#define scriptTable3_offset 19744 -#define scriptTable3LoadBins_offset 19808 -#define scriptTable3RpmBins_offset 19840 -#define scriptTable4_offset 19872 -#define scriptTable4LoadBins_offset 19936 -#define scriptTable4RpmBins_offset 19968 #define FUEL_LEVEL_TABLE_COUNT 8 #define FUEL_LOAD_COUNT 16 #define FUEL_RPM_COUNT 16 @@ -1758,8 +1741,11 @@ #define RPM_1_BYTE_PACKING_MULT 50 #define rpmHardLimit_offset 416 #define runningLedPin_offset 1813 +#define SCRIPT_CURVE_16 16 +#define SCRIPT_CURVE_8 8 #define SCRIPT_CURVE_COUNT 6 #define SCRIPT_SETTING_COUNT 8 +#define SCRIPT_TABLE_8 8 #define SCRIPT_TABLE_COUNT 4 #define scriptCurve1_offset 2780 #define scriptCurve1Bins_offset 2716 @@ -1787,6 +1773,18 @@ #define scriptSetting6_offset 884 #define scriptSetting7_offset 888 #define scriptSetting8_offset 892 +#define scriptTable1_offset 19296 +#define scriptTable1LoadBins_offset 19552 +#define scriptTable1RpmBins_offset 19584 +#define scriptTable2_offset 19616 +#define scriptTable2LoadBins_offset 19680 +#define scriptTable2RpmBins_offset 19712 +#define scriptTable3_offset 19744 +#define scriptTable3LoadBins_offset 19808 +#define scriptTable3RpmBins_offset 19840 +#define scriptTable4_offset 19872 +#define scriptTable4LoadBins_offset 19936 +#define scriptTable4RpmBins_offset 19968 #define scriptTableName1_offset 3564 #define scriptTableName2_offset 3580 #define scriptTableName3_offset 3596 @@ -1820,7 +1818,7 @@ #define show_test_presets true #define showHumanReadableWarning_offset 976 #define showSdCardWarning_offset 76 -#define SIGNATURE_HASH 3933246252 +#define SIGNATURE_HASH 2319440833 #define silentTriggerError_offset 1464 #define slowAdcAlpha_offset 2088 #define sparkDwellRpmBins_offset 332 @@ -2339,7 +2337,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.3933246252" +#define TS_SIGNATURE "rusEFI 2021.11.14.hellen_cypress.2319440833" #define TS_SINGLE_WRITE_COMMAND 'W' #define TS_SINGLE_WRITE_COMMAND_char W #define TS_TEST_COMMAND 't' @@ -2370,6 +2368,7 @@ #define unused1476b20_offset 1476 #define unused1476b3_offset 1476 #define unused1476b8_offset 1476 +#define unused20Inputs_offset 1512 #define unused2260_offset 2260 #define unused2432_offset 2432 #define unused244_2_offset 2424 @@ -2444,7 +2443,6 @@ #define unusedEL4_offset 2072 #define unusedExHpfp_offset 724 #define unusedFiller_4703_offset 4703 -#define unusedFsioInputs_offset 1512 #define unusedLuaWasHere_offset 16032 #define unusedOldBiquad_offset 2331 #define unusedOutputFreqWhereHere_offset 832 @@ -2461,7 +2459,6 @@ #define useFordRedundantTps_offset 76 #define useFSIO4ForSeriousEngineWarning_offset 1464 #define useFSIO5ForCriticalIssueEngineStop_offset 1464 -#define usescriptTableForCanSniffingFiltering_offset 76 #define useHbridgesToDriveIdleStepper_offset 976 #define useIacPidMultTable_offset 1476 #define useIacTableForCoasting_offset 744 @@ -2473,6 +2470,7 @@ #define useNoiselessTriggerDecoder_offset 744 #define useOnlyRisingEdgeForTrigger_offset 1476 #define useRunningMathForCranking_offset 76 +#define usescriptTableForCanSniffingFiltering_offset 76 #define useSeparateAdvanceForCranking_offset 1476 #define useSeparateAdvanceForIdle_offset 1476 #define useSeparateIdleTablesForCrankingTaper_offset 76 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 99773042a6..7be06c589e 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 14:38:57 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 15:51:40 UTC 2021 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -2559,7 +2559,7 @@ struct engine_configuration_s { /** * offset 1512 */ - uint8_t unusedFsioInputs[20]; + uint8_t unused20Inputs[20]; /** count * offset 1532 @@ -3209,7 +3209,7 @@ struct engine_configuration_s { /** * offset 2244 */ - fsio_pwm_freq_t vvtOutputFrequency[CAMS_PER_BANK]; + pwm_freq_t vvtOutputFrequency[CAMS_PER_BANK]; /** * Additional idle % when fan #1 is active % @@ -4236,7 +4236,7 @@ struct persistent_config_s { /** * offset 6644 */ - le_formula_t fsioFormulas[FSIO_COMMAND_COUNT]; + le_formula_t fsioFormulas[6]; /** * offset 7844 */ @@ -4374,34 +4374,34 @@ struct persistent_config_s { value * offset 15748 */ - uint8_t vvtTable1[SCRIPT_TABLE__8][SCRIPT_TABLE__8]; + uint8_t vvtTable1[SCRIPT_TABLE_8][SCRIPT_TABLE_8]; /** L * offset 15812 */ - float vvtTable1LoadBins[SCRIPT_TABLE__8]; + float vvtTable1LoadBins[SCRIPT_TABLE_8]; /** * RPM is float and not integer in order to use unified methods for interpolation RPM * offset 15844 */ - float vvtTable1RpmBins[SCRIPT_TABLE__8]; + float vvtTable1RpmBins[SCRIPT_TABLE_8]; /** value * offset 15876 */ - uint8_t vvtTable2[SCRIPT_TABLE__8][SCRIPT_TABLE__8]; + uint8_t vvtTable2[SCRIPT_TABLE_8][SCRIPT_TABLE_8]; /** L * offset 15940 */ - float vvtTable2LoadBins[SCRIPT_TABLE__8]; + float vvtTable2LoadBins[SCRIPT_TABLE_8]; /** * RPM is float and not integer in order to use unified methods for interpolation RPM * offset 15972 */ - float vvtTable2RpmBins[SCRIPT_TABLE__8]; + float vvtTable2RpmBins[SCRIPT_TABLE_8]; /** L * offset 16004 @@ -4471,68 +4471,68 @@ struct persistent_config_s { value * offset 19268 */ - float scriptTable1[SCRIPT_TABLE__8][SCRIPT_TABLE__8]; + float scriptTable1[SCRIPT_TABLE_8][SCRIPT_TABLE_8]; /** L * offset 19524 */ - float scriptTable1LoadBins[SCRIPT_TABLE__8]; + float scriptTable1LoadBins[SCRIPT_TABLE_8]; /** * RPM is float and not integer in order to use unified methods for interpolation RPM * offset 19556 */ - float scriptTable1RpmBins[SCRIPT_TABLE__8]; + float scriptTable1RpmBins[SCRIPT_TABLE_8]; /** value * offset 19588 */ - uint8_t scriptTable2[SCRIPT_TABLE__8][SCRIPT_TABLE__8]; + uint8_t scriptTable2[SCRIPT_TABLE_8][SCRIPT_TABLE_8]; /** L * offset 19652 */ - float scriptTable2LoadBins[SCRIPT_TABLE__8]; + float scriptTable2LoadBins[SCRIPT_TABLE_8]; /** * RPM is float and not integer in order to use unified methods for interpolation RPM * offset 19684 */ - float scriptTable2RpmBins[SCRIPT_TABLE__8]; + float scriptTable2RpmBins[SCRIPT_TABLE_8]; /** value * offset 19716 */ - uint8_t scriptTable3[SCRIPT_TABLE__8][SCRIPT_TABLE__8]; + uint8_t scriptTable3[SCRIPT_TABLE_8][SCRIPT_TABLE_8]; /** L * offset 19780 */ - float scriptTable3LoadBins[SCRIPT_TABLE__8]; + float scriptTable3LoadBins[SCRIPT_TABLE_8]; /** * RPM is float and not integer in order to use unified methods for interpolation RPM * offset 19812 */ - float scriptTable3RpmBins[SCRIPT_TABLE__8]; + float scriptTable3RpmBins[SCRIPT_TABLE_8]; /** value * offset 19844 */ - uint8_t scriptTable4[SCRIPT_TABLE__8][SCRIPT_TABLE__8]; + uint8_t scriptTable4[SCRIPT_TABLE_8][SCRIPT_TABLE_8]; /** L * offset 19908 */ - float scriptTable4LoadBins[SCRIPT_TABLE__8]; + float scriptTable4LoadBins[SCRIPT_TABLE_8]; /** * RPM is float and not integer in order to use unified methods for interpolation RPM * offset 19940 */ - float scriptTable4RpmBins[SCRIPT_TABLE__8]; + float scriptTable4RpmBins[SCRIPT_TABLE_8]; /** total size 19972*/ }; // end -// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Sun Nov 14 14:38:57 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 15:51:40 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 af9e8e7b66..ac44c52bd3 100644 --- a/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h +++ b/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h @@ -939,33 +939,16 @@ #define fixedTiming_offset 2204 #define FLASH_DATA_VERSION 10003 #define flexSensorPin_offset 3072 -#define FSIO_ANALOG_INPUT_COUNT 4 -#define FSIO_COMMAND_COUNT 6 -#define SCRIPT_CURVE_16 16 -#define SCRIPT_CURVE_8 8 #define FSIO_METHOD_FSIO_ANALOG_INPUT "fsio_analog_input" #define FSIO_METHOD_FSIO_DIGITAL_INPUT "fsio_digital_input" #define FSIO_METHOD_FSIO_SETTING "fsio_setting" -#define FSIO_METHOD_SCRIPT_TABLE_ "SCRIPT_TABLE_" -#define SCRIPT_TABLE__8 8 +#define FSIO_METHOD_FSIO_TABLE "fsio_table" #define fsioFormulas1_offset 6644 #define fsioFormulas2_offset 6844 #define fsioFormulas3_offset 7044 #define fsioFormulas4_offset 7244 #define fsioFormulas5_offset 7444 #define fsioFormulas6_offset 7644 -#define scriptTable1_offset 19268 -#define scriptTable1LoadBins_offset 19524 -#define scriptTable1RpmBins_offset 19556 -#define scriptTable2_offset 19588 -#define scriptTable2LoadBins_offset 19652 -#define scriptTable2RpmBins_offset 19684 -#define scriptTable3_offset 19716 -#define scriptTable3LoadBins_offset 19780 -#define scriptTable3RpmBins_offset 19812 -#define scriptTable4_offset 19844 -#define scriptTable4LoadBins_offset 19908 -#define scriptTable4RpmBins_offset 19940 #define FUEL_LEVEL_TABLE_COUNT 8 #define FUEL_LOAD_COUNT 16 #define FUEL_RPM_COUNT 16 @@ -1743,8 +1726,11 @@ #define RPM_1_BYTE_PACKING_MULT 50 #define rpmHardLimit_offset 416 #define runningLedPin_offset 1813 +#define SCRIPT_CURVE_16 16 +#define SCRIPT_CURVE_8 8 #define SCRIPT_CURVE_COUNT 6 #define SCRIPT_SETTING_COUNT 8 +#define SCRIPT_TABLE_8 8 #define SCRIPT_TABLE_COUNT 4 #define scriptCurve1_offset 2752 #define scriptCurve1Bins_offset 2688 @@ -1772,6 +1758,18 @@ #define scriptSetting6_offset 884 #define scriptSetting7_offset 888 #define scriptSetting8_offset 892 +#define scriptTable1_offset 19268 +#define scriptTable1LoadBins_offset 19524 +#define scriptTable1RpmBins_offset 19556 +#define scriptTable2_offset 19588 +#define scriptTable2LoadBins_offset 19652 +#define scriptTable2RpmBins_offset 19684 +#define scriptTable3_offset 19716 +#define scriptTable3LoadBins_offset 19780 +#define scriptTable3RpmBins_offset 19812 +#define scriptTable4_offset 19844 +#define scriptTable4LoadBins_offset 19908 +#define scriptTable4RpmBins_offset 19940 #define scriptTableName1_offset 3536 #define scriptTableName2_offset 3552 #define scriptTableName3_offset 3568 @@ -1805,7 +1803,7 @@ #define show_test_presets true #define showHumanReadableWarning_offset 976 #define showSdCardWarning_offset 76 -#define SIGNATURE_HASH 366305232 +#define SIGNATURE_HASH 1973032765 #define silentTriggerError_offset 1464 #define slowAdcAlpha_offset 2088 #define sparkDwellRpmBins_offset 332 @@ -2324,7 +2322,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.366305232" +#define TS_SIGNATURE "rusEFI 2021.11.14.kin.1973032765" #define TS_SINGLE_WRITE_COMMAND 'W' #define TS_SINGLE_WRITE_COMMAND_char W #define TS_TEST_COMMAND 't' @@ -2355,6 +2353,7 @@ #define unused1476b20_offset 1476 #define unused1476b3_offset 1476 #define unused1476b8_offset 1476 +#define unused20Inputs_offset 1512 #define unused2260_offset 2252 #define unused2432_offset 2424 #define unused244_2_offset 2416 @@ -2429,7 +2428,6 @@ #define unusedEL4_offset 2072 #define unusedExHpfp_offset 724 #define unusedFiller_4703_offset 4675 -#define unusedFsioInputs_offset 1512 #define unusedLuaWasHere_offset 16004 #define unusedOldBiquad_offset 2323 #define unusedOutputFreqWhereHere_offset 832 @@ -2446,7 +2444,6 @@ #define useFordRedundantTps_offset 76 #define useFSIO4ForSeriousEngineWarning_offset 1464 #define useFSIO5ForCriticalIssueEngineStop_offset 1464 -#define usescriptTableForCanSniffingFiltering_offset 76 #define useHbridgesToDriveIdleStepper_offset 976 #define useIacPidMultTable_offset 1476 #define useIacTableForCoasting_offset 744 @@ -2458,6 +2455,7 @@ #define useNoiselessTriggerDecoder_offset 744 #define useOnlyRisingEdgeForTrigger_offset 1476 #define useRunningMathForCranking_offset 76 +#define usescriptTableForCanSniffingFiltering_offset 76 #define useSeparateAdvanceForCranking_offset 1476 #define useSeparateAdvanceForIdle_offset 1476 #define useSeparateIdleTablesForCrankingTaper_offset 76 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 661bbaaee1..e705362b71 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 14:39:03 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 15:51:45 UTC 2021 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -2559,7 +2559,7 @@ struct engine_configuration_s { /** * offset 1512 */ - uint8_t unusedFsioInputs[20]; + uint8_t unused20Inputs[20]; /** count * offset 1532 @@ -3215,7 +3215,7 @@ struct engine_configuration_s { /** * offset 2248 */ - fsio_pwm_freq_t vvtOutputFrequency[CAMS_PER_BANK]; + pwm_freq_t vvtOutputFrequency[CAMS_PER_BANK]; /** * Additional idle % when fan #1 is active % @@ -4242,7 +4242,7 @@ struct persistent_config_s { /** * offset 6672 */ - le_formula_t fsioFormulas[FSIO_COMMAND_COUNT]; + le_formula_t fsioFormulas[6]; /** * offset 7872 */ @@ -4380,34 +4380,34 @@ struct persistent_config_s { value * offset 15776 */ - uint8_t vvtTable1[SCRIPT_TABLE__8][SCRIPT_TABLE__8]; + uint8_t vvtTable1[SCRIPT_TABLE_8][SCRIPT_TABLE_8]; /** L * offset 15840 */ - float vvtTable1LoadBins[SCRIPT_TABLE__8]; + float vvtTable1LoadBins[SCRIPT_TABLE_8]; /** * RPM is float and not integer in order to use unified methods for interpolation RPM * offset 15872 */ - float vvtTable1RpmBins[SCRIPT_TABLE__8]; + float vvtTable1RpmBins[SCRIPT_TABLE_8]; /** value * offset 15904 */ - uint8_t vvtTable2[SCRIPT_TABLE__8][SCRIPT_TABLE__8]; + uint8_t vvtTable2[SCRIPT_TABLE_8][SCRIPT_TABLE_8]; /** L * offset 15968 */ - float vvtTable2LoadBins[SCRIPT_TABLE__8]; + float vvtTable2LoadBins[SCRIPT_TABLE_8]; /** * RPM is float and not integer in order to use unified methods for interpolation RPM * offset 16000 */ - float vvtTable2RpmBins[SCRIPT_TABLE__8]; + float vvtTable2RpmBins[SCRIPT_TABLE_8]; /** L * offset 16032 @@ -4477,68 +4477,68 @@ struct persistent_config_s { value * offset 19296 */ - float scriptTable1[SCRIPT_TABLE__8][SCRIPT_TABLE__8]; + float scriptTable1[SCRIPT_TABLE_8][SCRIPT_TABLE_8]; /** L * offset 19552 */ - float scriptTable1LoadBins[SCRIPT_TABLE__8]; + float scriptTable1LoadBins[SCRIPT_TABLE_8]; /** * RPM is float and not integer in order to use unified methods for interpolation RPM * offset 19584 */ - float scriptTable1RpmBins[SCRIPT_TABLE__8]; + float scriptTable1RpmBins[SCRIPT_TABLE_8]; /** value * offset 19616 */ - uint8_t scriptTable2[SCRIPT_TABLE__8][SCRIPT_TABLE__8]; + uint8_t scriptTable2[SCRIPT_TABLE_8][SCRIPT_TABLE_8]; /** L * offset 19680 */ - float scriptTable2LoadBins[SCRIPT_TABLE__8]; + float scriptTable2LoadBins[SCRIPT_TABLE_8]; /** * RPM is float and not integer in order to use unified methods for interpolation RPM * offset 19712 */ - float scriptTable2RpmBins[SCRIPT_TABLE__8]; + float scriptTable2RpmBins[SCRIPT_TABLE_8]; /** value * offset 19744 */ - uint8_t scriptTable3[SCRIPT_TABLE__8][SCRIPT_TABLE__8]; + uint8_t scriptTable3[SCRIPT_TABLE_8][SCRIPT_TABLE_8]; /** L * offset 19808 */ - float scriptTable3LoadBins[SCRIPT_TABLE__8]; + float scriptTable3LoadBins[SCRIPT_TABLE_8]; /** * RPM is float and not integer in order to use unified methods for interpolation RPM * offset 19840 */ - float scriptTable3RpmBins[SCRIPT_TABLE__8]; + float scriptTable3RpmBins[SCRIPT_TABLE_8]; /** value * offset 19872 */ - uint8_t scriptTable4[SCRIPT_TABLE__8][SCRIPT_TABLE__8]; + uint8_t scriptTable4[SCRIPT_TABLE_8][SCRIPT_TABLE_8]; /** L * offset 19936 */ - float scriptTable4LoadBins[SCRIPT_TABLE__8]; + float scriptTable4LoadBins[SCRIPT_TABLE_8]; /** * RPM is float and not integer in order to use unified methods for interpolation RPM * offset 19968 */ - float scriptTable4RpmBins[SCRIPT_TABLE__8]; + float scriptTable4RpmBins[SCRIPT_TABLE_8]; /** total size 20000*/ }; // 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 14:39:03 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 15:51:45 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 9d232676a5..8ccc831b60 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 @@ -966,33 +966,16 @@ #define fixedTiming_offset 2204 #define FLASH_DATA_VERSION 10003 #define flexSensorPin_offset 3100 -#define FSIO_ANALOG_INPUT_COUNT 4 -#define FSIO_COMMAND_COUNT 6 -#define SCRIPT_CURVE_16 16 -#define SCRIPT_CURVE_8 8 #define FSIO_METHOD_FSIO_ANALOG_INPUT "fsio_analog_input" #define FSIO_METHOD_FSIO_DIGITAL_INPUT "fsio_digital_input" #define FSIO_METHOD_FSIO_SETTING "fsio_setting" -#define FSIO_METHOD_SCRIPT_TABLE_ "SCRIPT_TABLE_" -#define SCRIPT_TABLE__8 8 +#define FSIO_METHOD_FSIO_TABLE "fsio_table" #define fsioFormulas1_offset 6672 #define fsioFormulas2_offset 6872 #define fsioFormulas3_offset 7072 #define fsioFormulas4_offset 7272 #define fsioFormulas5_offset 7472 #define fsioFormulas6_offset 7672 -#define scriptTable1_offset 19296 -#define scriptTable1LoadBins_offset 19552 -#define scriptTable1RpmBins_offset 19584 -#define scriptTable2_offset 19616 -#define scriptTable2LoadBins_offset 19680 -#define scriptTable2RpmBins_offset 19712 -#define scriptTable3_offset 19744 -#define scriptTable3LoadBins_offset 19808 -#define scriptTable3RpmBins_offset 19840 -#define scriptTable4_offset 19872 -#define scriptTable4LoadBins_offset 19936 -#define scriptTable4RpmBins_offset 19968 #define FUEL_LEVEL_TABLE_COUNT 8 #define FUEL_LOAD_COUNT 16 #define FUEL_RPM_COUNT 16 @@ -1770,8 +1753,11 @@ #define RPM_1_BYTE_PACKING_MULT 50 #define rpmHardLimit_offset 416 #define runningLedPin_offset 1813 +#define SCRIPT_CURVE_16 16 +#define SCRIPT_CURVE_8 8 #define SCRIPT_CURVE_COUNT 6 #define SCRIPT_SETTING_COUNT 8 +#define SCRIPT_TABLE_8 8 #define SCRIPT_TABLE_COUNT 4 #define scriptCurve1_offset 2780 #define scriptCurve1Bins_offset 2716 @@ -1799,6 +1785,18 @@ #define scriptSetting6_offset 884 #define scriptSetting7_offset 888 #define scriptSetting8_offset 892 +#define scriptTable1_offset 19296 +#define scriptTable1LoadBins_offset 19552 +#define scriptTable1RpmBins_offset 19584 +#define scriptTable2_offset 19616 +#define scriptTable2LoadBins_offset 19680 +#define scriptTable2RpmBins_offset 19712 +#define scriptTable3_offset 19744 +#define scriptTable3LoadBins_offset 19808 +#define scriptTable3RpmBins_offset 19840 +#define scriptTable4_offset 19872 +#define scriptTable4LoadBins_offset 19936 +#define scriptTable4RpmBins_offset 19968 #define scriptTableName1_offset 3564 #define scriptTableName2_offset 3580 #define scriptTableName3_offset 3596 @@ -1833,7 +1831,7 @@ #define show_test_presets false #define showHumanReadableWarning_offset 976 #define showSdCardWarning_offset 76 -#define SIGNATURE_HASH 322921152 +#define SIGNATURE_HASH 1936730669 #define silentTriggerError_offset 1464 #define slowAdcAlpha_offset 2088 #define sparkDwellRpmBins_offset 332 @@ -2352,7 +2350,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.322921152" +#define TS_SIGNATURE "rusEFI 2021.11.14.subaru_eg33_f7.1936730669" #define TS_SINGLE_WRITE_COMMAND 'W' #define TS_SINGLE_WRITE_COMMAND_char W #define TS_TEST_COMMAND 't' @@ -2383,6 +2381,7 @@ #define unused1476b20_offset 1476 #define unused1476b3_offset 1476 #define unused1476b8_offset 1476 +#define unused20Inputs_offset 1512 #define unused2260_offset 2260 #define unused2432_offset 2432 #define unused244_2_offset 2424 @@ -2457,7 +2456,6 @@ #define unusedEL4_offset 2072 #define unusedExHpfp_offset 724 #define unusedFiller_4703_offset 4703 -#define unusedFsioInputs_offset 1512 #define unusedLuaWasHere_offset 16032 #define unusedOldBiquad_offset 2331 #define unusedOutputFreqWhereHere_offset 832 @@ -2474,7 +2472,6 @@ #define useFordRedundantTps_offset 76 #define useFSIO4ForSeriousEngineWarning_offset 1464 #define useFSIO5ForCriticalIssueEngineStop_offset 1464 -#define usescriptTableForCanSniffingFiltering_offset 76 #define useHbridgesToDriveIdleStepper_offset 976 #define useIacPidMultTable_offset 1476 #define useIacTableForCoasting_offset 744 @@ -2486,6 +2483,7 @@ #define useNoiselessTriggerDecoder_offset 744 #define useOnlyRisingEdgeForTrigger_offset 1476 #define useRunningMathForCranking_offset 76 +#define usescriptTableForCanSniffingFiltering_offset 76 #define useSeparateAdvanceForCranking_offset 1476 #define useSeparateAdvanceForIdle_offset 1476 #define useSeparateIdleTablesForCrankingTaper_offset 76 diff --git a/firmware/controllers/generated/engine_configuration_generated_structures.h b/firmware/controllers/generated/engine_configuration_generated_structures.h index b93e2f02bb..076a6bc12e 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 14:38:54 UTC 2021 +// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Nov 14 15:51:37 UTC 2021 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -2559,7 +2559,7 @@ struct engine_configuration_s { /** * offset 1512 */ - uint8_t unusedFsioInputs[20]; + uint8_t unused20Inputs[20]; /** count * offset 1532 @@ -4242,7 +4242,7 @@ struct persistent_config_s { /** * offset 6672 */ - le_formula_t fsioFormulas[FSIO_COMMAND_COUNT]; + le_formula_t fsioFormulas[6]; /** * offset 7872 */ @@ -4380,34 +4380,34 @@ struct persistent_config_s { value * offset 15776 */ - uint8_t vvtTable1[SCRIPT_TABLE__8][SCRIPT_TABLE__8]; + uint8_t vvtTable1[SCRIPT_TABLE_8][SCRIPT_TABLE_8]; /** L * offset 15840 */ - float vvtTable1LoadBins[SCRIPT_TABLE__8]; + float vvtTable1LoadBins[SCRIPT_TABLE_8]; /** * RPM is float and not integer in order to use unified methods for interpolation RPM * offset 15872 */ - float vvtTable1RpmBins[SCRIPT_TABLE__8]; + float vvtTable1RpmBins[SCRIPT_TABLE_8]; /** value * offset 15904 */ - uint8_t vvtTable2[SCRIPT_TABLE__8][SCRIPT_TABLE__8]; + uint8_t vvtTable2[SCRIPT_TABLE_8][SCRIPT_TABLE_8]; /** L * offset 15968 */ - float vvtTable2LoadBins[SCRIPT_TABLE__8]; + float vvtTable2LoadBins[SCRIPT_TABLE_8]; /** * RPM is float and not integer in order to use unified methods for interpolation RPM * offset 16000 */ - float vvtTable2RpmBins[SCRIPT_TABLE__8]; + float vvtTable2RpmBins[SCRIPT_TABLE_8]; /** L * offset 16032 @@ -4477,68 +4477,68 @@ struct persistent_config_s { value * offset 19296 */ - float scriptTable1[SCRIPT_TABLE__8][SCRIPT_TABLE__8]; + float scriptTable1[SCRIPT_TABLE_8][SCRIPT_TABLE_8]; /** L * offset 19552 */ - float scriptTable1LoadBins[SCRIPT_TABLE__8]; + float scriptTable1LoadBins[SCRIPT_TABLE_8]; /** * RPM is float and not integer in order to use unified methods for interpolation RPM * offset 19584 */ - float scriptTable1RpmBins[SCRIPT_TABLE__8]; + float scriptTable1RpmBins[SCRIPT_TABLE_8]; /** value * offset 19616 */ - uint8_t scriptTable2[SCRIPT_TABLE__8][SCRIPT_TABLE__8]; + uint8_t scriptTable2[SCRIPT_TABLE_8][SCRIPT_TABLE_8]; /** L * offset 19680 */ - float scriptTable2LoadBins[SCRIPT_TABLE__8]; + float scriptTable2LoadBins[SCRIPT_TABLE_8]; /** * RPM is float and not integer in order to use unified methods for interpolation RPM * offset 19712 */ - float scriptTable2RpmBins[SCRIPT_TABLE__8]; + float scriptTable2RpmBins[SCRIPT_TABLE_8]; /** value * offset 19744 */ - uint8_t scriptTable3[SCRIPT_TABLE__8][SCRIPT_TABLE__8]; + uint8_t scriptTable3[SCRIPT_TABLE_8][SCRIPT_TABLE_8]; /** L * offset 19808 */ - float scriptTable3LoadBins[SCRIPT_TABLE__8]; + float scriptTable3LoadBins[SCRIPT_TABLE_8]; /** * RPM is float and not integer in order to use unified methods for interpolation RPM * offset 19840 */ - float scriptTable3RpmBins[SCRIPT_TABLE__8]; + float scriptTable3RpmBins[SCRIPT_TABLE_8]; /** value * offset 19872 */ - uint8_t scriptTable4[SCRIPT_TABLE__8][SCRIPT_TABLE__8]; + uint8_t scriptTable4[SCRIPT_TABLE_8][SCRIPT_TABLE_8]; /** L * offset 19936 */ - float scriptTable4LoadBins[SCRIPT_TABLE__8]; + float scriptTable4LoadBins[SCRIPT_TABLE_8]; /** * RPM is float and not integer in order to use unified methods for interpolation RPM * offset 19968 */ - float scriptTable4RpmBins[SCRIPT_TABLE__8]; + float scriptTable4RpmBins[SCRIPT_TABLE_8]; /** total size 20000*/ }; // end -// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Nov 14 14:38:54 UTC 2021 +// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Nov 14 15:51:37 UTC 2021 diff --git a/firmware/controllers/generated/fsio_enums_generated.def b/firmware/controllers/generated/fsio_enums_generated.def index 8af52fae78..8722314a53 100644 --- a/firmware/controllers/generated/fsio_enums_generated.def +++ b/firmware/controllers/generated/fsio_enums_generated.def @@ -1,23 +1,3 @@ -// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Nov 14 14:38:54 UTC 2021 +// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Nov 14 15:51:37 UTC 2021 // by class com.rusefi.output.FileFsioSettingsConsumer - FSIO_SETTING_ACIDLEEXTRAOFFSET = 1000, - FSIO_SETTING_BOOSTPID_OFFSET = 1001, - FSIO_SETTING_BOOSTPID_MINVALUE = 1002, - FSIO_SETTING_ALTERNATORCONTROL_OFFSET = 1003, - FSIO_SETTING_ALTERNATORCONTROL_MINVALUE = 1004, - FSIO_SETTING_ETB_OFFSET = 1005, - FSIO_SETTING_ETB_MINVALUE = 1006, - FSIO_SETTING_IDLERPMPID_OFFSET = 1007, - FSIO_SETTING_IDLERPMPID_MINVALUE = 1008, - FSIO_SETTING_STARTUPFUELPUMPDURATION = 1009, - FSIO_SETTING_ETBWASTEGATEPID_OFFSET = 1010, - FSIO_SETTING_ETBWASTEGATEPID_MINVALUE = 1011, - FSIO_SETTING_AUXPID1_OFFSET = 1012, - FSIO_SETTING_AUXPID1_MINVALUE = 1013, - FSIO_SETTING_AUXPID2_OFFSET = 1014, - FSIO_SETTING_AUXPID2_MINVALUE = 1015, - FSIO_SETTING_IDLETIMINGPID_OFFSET = 1016, - FSIO_SETTING_IDLETIMINGPID_MINVALUE = 1017, - FSIO_SETTING_IDLERPMPID2_OFFSET = 1018, - FSIO_SETTING_IDLERPMPID2_MINVALUE = 1019, diff --git a/firmware/controllers/generated/fsio_getters.def b/firmware/controllers/generated/fsio_getters.def index 5aa6f29b56..8722314a53 100644 --- a/firmware/controllers/generated/fsio_getters.def +++ b/firmware/controllers/generated/fsio_getters.def @@ -1,43 +1,3 @@ -// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Nov 14 14:38:54 UTC 2021 +// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Nov 14 15:51:37 UTC 2021 // by class com.rusefi.output.FileFsioSettingsConsumer - case FSIO_SETTING_ACIDLEEXTRAOFFSET: - return engineConfiguration->acIdleExtraOffset; - case FSIO_SETTING_BOOSTPID_OFFSET: - return engineConfiguration->boostPid.offset; - case FSIO_SETTING_BOOSTPID_MINVALUE: - return engineConfiguration->boostPid.minValue; - case FSIO_SETTING_ALTERNATORCONTROL_OFFSET: - return engineConfiguration->alternatorControl.offset; - case FSIO_SETTING_ALTERNATORCONTROL_MINVALUE: - return engineConfiguration->alternatorControl.minValue; - case FSIO_SETTING_ETB_OFFSET: - return engineConfiguration->etb.offset; - case FSIO_SETTING_ETB_MINVALUE: - return engineConfiguration->etb.minValue; - case FSIO_SETTING_IDLERPMPID_OFFSET: - return engineConfiguration->idleRpmPid.offset; - case FSIO_SETTING_IDLERPMPID_MINVALUE: - return engineConfiguration->idleRpmPid.minValue; - case FSIO_SETTING_STARTUPFUELPUMPDURATION: - return engineConfiguration->startUpFuelPumpDuration; - case FSIO_SETTING_ETBWASTEGATEPID_OFFSET: - return engineConfiguration->etbWastegatePid.offset; - case FSIO_SETTING_ETBWASTEGATEPID_MINVALUE: - return engineConfiguration->etbWastegatePid.minValue; - case FSIO_SETTING_AUXPID1_OFFSET: - return engineConfiguration->auxPid[0].offset; - case FSIO_SETTING_AUXPID1_MINVALUE: - return engineConfiguration->auxPid[0].minValue; - case FSIO_SETTING_AUXPID2_OFFSET: - return engineConfiguration->auxPid[1].offset; - case FSIO_SETTING_AUXPID2_MINVALUE: - return engineConfiguration->auxPid[1].minValue; - case FSIO_SETTING_IDLETIMINGPID_OFFSET: - return engineConfiguration->idleTimingPid.offset; - case FSIO_SETTING_IDLETIMINGPID_MINVALUE: - return engineConfiguration->idleTimingPid.minValue; - case FSIO_SETTING_IDLERPMPID2_OFFSET: - return engineConfiguration->idleRpmPid2.offset; - case FSIO_SETTING_IDLERPMPID2_MINVALUE: - return engineConfiguration->idleRpmPid2.minValue; diff --git a/firmware/controllers/generated/fsio_names.def b/firmware/controllers/generated/fsio_names.def index 3be11aa6aa..8722314a53 100644 --- a/firmware/controllers/generated/fsio_names.def +++ b/firmware/controllers/generated/fsio_names.def @@ -1,23 +1,3 @@ -// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Nov 14 14:38:54 UTC 2021 +// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Nov 14 15:51:37 UTC 2021 // by class com.rusefi.output.FileFsioSettingsConsumer -static LENameOrdinalPair leacIdleExtraOffset(FSIO_SETTING_ACIDLEEXTRAOFFSET, "cfg_acIdleExtraOffset"); -static LENameOrdinalPair leboostPid_offset(FSIO_SETTING_BOOSTPID_OFFSET, "cfg_boostPid_offset"); -static LENameOrdinalPair leboostPid_minValue(FSIO_SETTING_BOOSTPID_MINVALUE, "cfg_boostPid_minValue"); -static LENameOrdinalPair lealternatorControl_offset(FSIO_SETTING_ALTERNATORCONTROL_OFFSET, "cfg_alternatorControl_offset"); -static LENameOrdinalPair lealternatorControl_minValue(FSIO_SETTING_ALTERNATORCONTROL_MINVALUE, "cfg_alternatorControl_minValue"); -static LENameOrdinalPair leetb_offset(FSIO_SETTING_ETB_OFFSET, "cfg_etb_offset"); -static LENameOrdinalPair leetb_minValue(FSIO_SETTING_ETB_MINVALUE, "cfg_etb_minValue"); -static LENameOrdinalPair leidleRpmPid_offset(FSIO_SETTING_IDLERPMPID_OFFSET, "cfg_idleRpmPid_offset"); -static LENameOrdinalPair leidleRpmPid_minValue(FSIO_SETTING_IDLERPMPID_MINVALUE, "cfg_idleRpmPid_minValue"); -static LENameOrdinalPair lestartUpFuelPumpDuration(FSIO_SETTING_STARTUPFUELPUMPDURATION, "cfg_startUpFuelPumpDuration"); -static LENameOrdinalPair leetbWastegatePid_offset(FSIO_SETTING_ETBWASTEGATEPID_OFFSET, "cfg_etbWastegatePid_offset"); -static LENameOrdinalPair leetbWastegatePid_minValue(FSIO_SETTING_ETBWASTEGATEPID_MINVALUE, "cfg_etbWastegatePid_minValue"); -static LENameOrdinalPair leauxPid1_offset(FSIO_SETTING_AUXPID1_OFFSET, "cfg_auxPid1_offset"); -static LENameOrdinalPair leauxPid1_minValue(FSIO_SETTING_AUXPID1_MINVALUE, "cfg_auxPid1_minValue"); -static LENameOrdinalPair leauxPid2_offset(FSIO_SETTING_AUXPID2_OFFSET, "cfg_auxPid2_offset"); -static LENameOrdinalPair leauxPid2_minValue(FSIO_SETTING_AUXPID2_MINVALUE, "cfg_auxPid2_minValue"); -static LENameOrdinalPair leidleTimingPid_offset(FSIO_SETTING_IDLETIMINGPID_OFFSET, "cfg_idleTimingPid_offset"); -static LENameOrdinalPair leidleTimingPid_minValue(FSIO_SETTING_IDLETIMINGPID_MINVALUE, "cfg_idleTimingPid_minValue"); -static LENameOrdinalPair leidleRpmPid2_offset(FSIO_SETTING_IDLERPMPID2_OFFSET, "cfg_idleRpmPid2_offset"); -static LENameOrdinalPair leidleRpmPid2_minValue(FSIO_SETTING_IDLERPMPID2_MINVALUE, "cfg_idleRpmPid2_minValue"); diff --git a/firmware/controllers/generated/fsio_strings.def b/firmware/controllers/generated/fsio_strings.def index d945c74f79..8722314a53 100644 --- a/firmware/controllers/generated/fsio_strings.def +++ b/firmware/controllers/generated/fsio_strings.def @@ -1,43 +1,3 @@ -// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Nov 14 14:38:54 UTC 2021 +// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Nov 14 15:51:37 UTC 2021 // by class com.rusefi.output.FileFsioSettingsConsumer - case FSIO_SETTING_ACIDLEEXTRAOFFSET: - return "cfg_acIdleExtraOffset"; - case FSIO_SETTING_BOOSTPID_OFFSET: - return "cfg_boostPid_offset"; - case FSIO_SETTING_BOOSTPID_MINVALUE: - return "cfg_boostPid_minValue"; - case FSIO_SETTING_ALTERNATORCONTROL_OFFSET: - return "cfg_alternatorControl_offset"; - case FSIO_SETTING_ALTERNATORCONTROL_MINVALUE: - return "cfg_alternatorControl_minValue"; - case FSIO_SETTING_ETB_OFFSET: - return "cfg_etb_offset"; - case FSIO_SETTING_ETB_MINVALUE: - return "cfg_etb_minValue"; - case FSIO_SETTING_IDLERPMPID_OFFSET: - return "cfg_idleRpmPid_offset"; - case FSIO_SETTING_IDLERPMPID_MINVALUE: - return "cfg_idleRpmPid_minValue"; - case FSIO_SETTING_STARTUPFUELPUMPDURATION: - return "cfg_startUpFuelPumpDuration"; - case FSIO_SETTING_ETBWASTEGATEPID_OFFSET: - return "cfg_etbWastegatePid_offset"; - case FSIO_SETTING_ETBWASTEGATEPID_MINVALUE: - return "cfg_etbWastegatePid_minValue"; - case FSIO_SETTING_AUXPID1_OFFSET: - return "cfg_auxPid1_offset"; - case FSIO_SETTING_AUXPID1_MINVALUE: - return "cfg_auxPid1_minValue"; - case FSIO_SETTING_AUXPID2_OFFSET: - return "cfg_auxPid2_offset"; - case FSIO_SETTING_AUXPID2_MINVALUE: - return "cfg_auxPid2_minValue"; - case FSIO_SETTING_IDLETIMINGPID_OFFSET: - return "cfg_idleTimingPid_offset"; - case FSIO_SETTING_IDLETIMINGPID_MINVALUE: - return "cfg_idleTimingPid_minValue"; - case FSIO_SETTING_IDLERPMPID2_OFFSET: - return "cfg_idleRpmPid2_offset"; - case FSIO_SETTING_IDLERPMPID2_MINVALUE: - return "cfg_idleRpmPid2_minValue"; diff --git a/firmware/controllers/generated/rusefi_generated.h b/firmware/controllers/generated/rusefi_generated.h index 0170a60d76..1984ef7404 100644 --- a/firmware/controllers/generated/rusefi_generated.h +++ b/firmware/controllers/generated/rusefi_generated.h @@ -954,33 +954,16 @@ #define fixedTiming_offset 2204 #define FLASH_DATA_VERSION 10003 #define flexSensorPin_offset 3100 -#define FSIO_ANALOG_INPUT_COUNT 4 -#define FSIO_COMMAND_COUNT 6 -#define SCRIPT_CURVE_16 16 -#define SCRIPT_CURVE_8 8 #define FSIO_METHOD_FSIO_ANALOG_INPUT "fsio_analog_input" #define FSIO_METHOD_FSIO_DIGITAL_INPUT "fsio_digital_input" #define FSIO_METHOD_FSIO_SETTING "fsio_setting" -#define FSIO_METHOD_SCRIPT_TABLE_ "SCRIPT_TABLE_" -#define SCRIPT_TABLE__8 8 +#define FSIO_METHOD_FSIO_TABLE "fsio_table" #define fsioFormulas1_offset 6672 #define fsioFormulas2_offset 6872 #define fsioFormulas3_offset 7072 #define fsioFormulas4_offset 7272 #define fsioFormulas5_offset 7472 #define fsioFormulas6_offset 7672 -#define scriptTable1_offset 19296 -#define scriptTable1LoadBins_offset 19552 -#define scriptTable1RpmBins_offset 19584 -#define scriptTable2_offset 19616 -#define scriptTable2LoadBins_offset 19680 -#define scriptTable2RpmBins_offset 19712 -#define scriptTable3_offset 19744 -#define scriptTable3LoadBins_offset 19808 -#define scriptTable3RpmBins_offset 19840 -#define scriptTable4_offset 19872 -#define scriptTable4LoadBins_offset 19936 -#define scriptTable4RpmBins_offset 19968 #define FUEL_LEVEL_TABLE_COUNT 8 #define FUEL_LOAD_COUNT 16 #define FUEL_RPM_COUNT 16 @@ -1758,8 +1741,11 @@ #define RPM_1_BYTE_PACKING_MULT 50 #define rpmHardLimit_offset 416 #define runningLedPin_offset 1813 +#define SCRIPT_CURVE_16 16 +#define SCRIPT_CURVE_8 8 #define SCRIPT_CURVE_COUNT 6 #define SCRIPT_SETTING_COUNT 8 +#define SCRIPT_TABLE_8 8 #define SCRIPT_TABLE_COUNT 4 #define scriptCurve1_offset 2780 #define scriptCurve1Bins_offset 2716 @@ -1787,6 +1773,18 @@ #define scriptSetting6_offset 884 #define scriptSetting7_offset 888 #define scriptSetting8_offset 892 +#define scriptTable1_offset 19296 +#define scriptTable1LoadBins_offset 19552 +#define scriptTable1RpmBins_offset 19584 +#define scriptTable2_offset 19616 +#define scriptTable2LoadBins_offset 19680 +#define scriptTable2RpmBins_offset 19712 +#define scriptTable3_offset 19744 +#define scriptTable3LoadBins_offset 19808 +#define scriptTable3RpmBins_offset 19840 +#define scriptTable4_offset 19872 +#define scriptTable4LoadBins_offset 19936 +#define scriptTable4RpmBins_offset 19968 #define scriptTableName1_offset 3564 #define scriptTableName2_offset 3580 #define scriptTableName3_offset 3596 @@ -1820,7 +1818,7 @@ #define show_test_presets true #define showHumanReadableWarning_offset 976 #define showSdCardWarning_offset 76 -#define SIGNATURE_HASH 2812226491 +#define SIGNATURE_HASH 2966043773 #define silentTriggerError_offset 1464 #define slowAdcAlpha_offset 2088 #define sparkDwellRpmBins_offset 332 @@ -2339,7 +2337,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.2812226491" +#define TS_SIGNATURE "rusEFI 2021.11.14.all.2966043773" #define TS_SINGLE_WRITE_COMMAND 'W' #define TS_SINGLE_WRITE_COMMAND_char W #define TS_TEST_COMMAND 't' @@ -2370,6 +2368,7 @@ #define unused1476b20_offset 1476 #define unused1476b3_offset 1476 #define unused1476b8_offset 1476 +#define unused20Inputs_offset 1512 #define unused2260_offset 2260 #define unused2432_offset 2432 #define unused244_2_offset 2424 @@ -2444,7 +2443,6 @@ #define unusedEL4_offset 2072 #define unusedExHpfp_offset 724 #define unusedFiller_4703_offset 4703 -#define unusedFsioInputs_offset 1512 #define unusedLuaWasHere_offset 16032 #define unusedOldBiquad_offset 2331 #define unusedOutputFreqWhereHere_offset 832 @@ -2461,7 +2459,6 @@ #define useFordRedundantTps_offset 76 #define useFSIO4ForSeriousEngineWarning_offset 1464 #define useFSIO5ForCriticalIssueEngineStop_offset 1464 -#define usescriptTableForCanSniffingFiltering_offset 76 #define useHbridgesToDriveIdleStepper_offset 976 #define useIacPidMultTable_offset 1476 #define useIacTableForCoasting_offset 744 @@ -2473,6 +2470,7 @@ #define useNoiselessTriggerDecoder_offset 744 #define useOnlyRisingEdgeForTrigger_offset 1476 #define useRunningMathForCranking_offset 76 +#define usescriptTableForCanSniffingFiltering_offset 76 #define useSeparateAdvanceForCranking_offset 1476 #define useSeparateAdvanceForIdle_offset 1476 #define useSeparateIdleTablesForCrankingTaper_offset 76 diff --git a/firmware/controllers/generated/signature_all.h b/firmware/controllers/generated/signature_all.h index 1b0c7f44de..8b02b6e913 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 1085810308 -#define TS_SIGNATURE "rusEFI 2021.11.14.all.1085810308" +#define SIGNATURE_HASH 2966043773 +#define TS_SIGNATURE "rusEFI 2021.11.14.all.2966043773" diff --git a/firmware/controllers/generated/signature_atlas.h b/firmware/controllers/generated/signature_atlas.h index da95ba7b36..bba5e24b73 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 1551029155 -#define TS_SIGNATURE "rusEFI 2021.11.14.atlas.1551029155" +#define SIGNATURE_HASH 2885732698 +#define TS_SIGNATURE "rusEFI 2021.11.14.atlas.2885732698" diff --git a/firmware/controllers/generated/signature_f429-discovery.h b/firmware/controllers/generated/signature_f429-discovery.h index 12faec65d5..54e017c10b 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 1085810308 -#define TS_SIGNATURE "rusEFI 2021.11.14.f429-discovery.1085810308" +#define SIGNATURE_HASH 2966043773 +#define TS_SIGNATURE "rusEFI 2021.11.14.f429-discovery.2966043773" diff --git a/firmware/controllers/generated/signature_frankenso_na6.h b/firmware/controllers/generated/signature_frankenso_na6.h index 2899d244b9..9b11af8944 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 982152045 -#define TS_SIGNATURE "rusEFI 2021.11.14.frankenso_na6.982152045" +#define SIGNATURE_HASH 3405277588 +#define TS_SIGNATURE "rusEFI 2021.11.14.frankenso_na6.3405277588" diff --git a/firmware/controllers/generated/signature_hellen-nb1.h b/firmware/controllers/generated/signature_hellen-nb1.h index f6b9446e30..fb518c1cf3 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 3848934925 -#define TS_SIGNATURE "rusEFI 2021.11.14.hellen-nb1.3848934925" +#define SIGNATURE_HASH 353897716 +#define TS_SIGNATURE "rusEFI 2021.11.14.hellen-nb1.353897716" diff --git a/firmware/controllers/generated/signature_hellen121nissan.h b/firmware/controllers/generated/signature_hellen121nissan.h index 060cf4ea7b..43c033e6c0 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 4215030821 -#define TS_SIGNATURE "rusEFI 2021.11.14.hellen121nissan.4215030821" +#define SIGNATURE_HASH 189685468 +#define TS_SIGNATURE "rusEFI 2021.11.14.hellen121nissan.189685468" diff --git a/firmware/controllers/generated/signature_hellen121vag.h b/firmware/controllers/generated/signature_hellen121vag.h index a9a8e6d526..c4363d9b81 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 521863822 -#define TS_SIGNATURE "rusEFI 2021.11.14.hellen121vag.521863822" +#define SIGNATURE_HASH 4016642167 +#define TS_SIGNATURE "rusEFI 2021.11.14.hellen121vag.4016642167" diff --git a/firmware/controllers/generated/signature_hellen128.h b/firmware/controllers/generated/signature_hellen128.h index 81e6360477..279a752a98 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 3665710371 -#define TS_SIGNATURE "rusEFI 2021.11.14.hellen128.3665710371" +#define SIGNATURE_HASH 705451994 +#define TS_SIGNATURE "rusEFI 2021.11.14.hellen128.705451994" diff --git a/firmware/controllers/generated/signature_hellen154hyundai.h b/firmware/controllers/generated/signature_hellen154hyundai.h index a049916507..a5b6a850ae 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 1651254306 -#define TS_SIGNATURE "rusEFI 2021.11.14.hellen154hyundai.1651254306" +#define SIGNATURE_HASH 2451455707 +#define TS_SIGNATURE "rusEFI 2021.11.14.hellen154hyundai.2451455707" diff --git a/firmware/controllers/generated/signature_hellen72.h b/firmware/controllers/generated/signature_hellen72.h index fafe5a4433..6ef37ecc94 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 3020267828 -#define TS_SIGNATURE "rusEFI 2021.11.14.hellen72.3020267828" +#define SIGNATURE_HASH 1148697549 +#define TS_SIGNATURE "rusEFI 2021.11.14.hellen72.1148697549" diff --git a/firmware/controllers/generated/signature_hellen88bmw.h b/firmware/controllers/generated/signature_hellen88bmw.h index 91edd53450..340830009a 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 3782784987 -#define TS_SIGNATURE "rusEFI 2021.11.14.hellen88bmw.3782784987" +#define SIGNATURE_HASH 285912354 +#define TS_SIGNATURE "rusEFI 2021.11.14.hellen88bmw.285912354" diff --git a/firmware/controllers/generated/signature_hellenNA6.h b/firmware/controllers/generated/signature_hellenNA6.h index d2652fe2b4..97e3be8c41 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 914710572 -#define TS_SIGNATURE "rusEFI 2021.11.14.hellenNA6.914710572" +#define SIGNATURE_HASH 3338107605 +#define TS_SIGNATURE "rusEFI 2021.11.14.hellenNA6.3338107605" diff --git a/firmware/controllers/generated/signature_hellen_cypress.h b/firmware/controllers/generated/signature_hellen_cypress.h index 28a35b12ef..f515b34d51 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 223845907 -#define TS_SIGNATURE "rusEFI 2021.11.14.hellen_cypress.223845907" +#define SIGNATURE_HASH 2319440833 +#define TS_SIGNATURE "rusEFI 2021.11.14.hellen_cypress.2319440833" diff --git a/firmware/controllers/generated/signature_kin.h b/firmware/controllers/generated/signature_kin.h index b39cedc019..8aca15abbf 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 4075967215 -#define TS_SIGNATURE "rusEFI 2021.11.14.kin.4075967215" +#define SIGNATURE_HASH 1973032765 +#define TS_SIGNATURE "rusEFI 2021.11.14.kin.1973032765" diff --git a/firmware/controllers/generated/signature_mre_f4.h b/firmware/controllers/generated/signature_mre_f4.h index a2f379c17d..56671c2e4a 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 3420671269 -#define TS_SIGNATURE "rusEFI 2021.11.14.mre_f4.3420671269" +#define SIGNATURE_HASH 999380956 +#define TS_SIGNATURE "rusEFI 2021.11.14.mre_f4.999380956" diff --git a/firmware/controllers/generated/signature_mre_f7.h b/firmware/controllers/generated/signature_mre_f7.h index 89d0e52ed1..0d72036b7c 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 3420671269 -#define TS_SIGNATURE "rusEFI 2021.11.14.mre_f7.3420671269" +#define SIGNATURE_HASH 999380956 +#define TS_SIGNATURE "rusEFI 2021.11.14.mre_f7.999380956" diff --git a/firmware/controllers/generated/signature_prometheus_405.h b/firmware/controllers/generated/signature_prometheus_405.h index fe139ce8d1..692ef8719b 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 273874786 -#define TS_SIGNATURE "rusEFI 2021.11.14.prometheus_405.273874786" +#define SIGNATURE_HASH 3760252315 +#define TS_SIGNATURE "rusEFI 2021.11.14.prometheus_405.3760252315" diff --git a/firmware/controllers/generated/signature_prometheus_469.h b/firmware/controllers/generated/signature_prometheus_469.h index eeb11da0a5..5def71ca16 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 273874786 -#define TS_SIGNATURE "rusEFI 2021.11.14.prometheus_469.273874786" +#define SIGNATURE_HASH 3760252315 +#define TS_SIGNATURE "rusEFI 2021.11.14.prometheus_469.3760252315" diff --git a/firmware/controllers/generated/signature_proteus_f4.h b/firmware/controllers/generated/signature_proteus_f4.h index 2a780f4626..2565876240 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 3955707141 -#define TS_SIGNATURE "rusEFI 2021.11.14.proteus_f4.3955707141" +#define SIGNATURE_HASH 464869372 +#define TS_SIGNATURE "rusEFI 2021.11.14.proteus_f4.464869372" diff --git a/firmware/controllers/generated/signature_proteus_f7.h b/firmware/controllers/generated/signature_proteus_f7.h index 6ba7bdfcc8..dbbb3317a9 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 3955707141 -#define TS_SIGNATURE "rusEFI 2021.11.14.proteus_f7.3955707141" +#define SIGNATURE_HASH 464869372 +#define TS_SIGNATURE "rusEFI 2021.11.14.proteus_f7.464869372" diff --git a/firmware/controllers/generated/signature_subaru_eg33_f7.h b/firmware/controllers/generated/signature_subaru_eg33_f7.h index 80ba98ca2e..4dea179778 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 4095242239 -#define TS_SIGNATURE "rusEFI 2021.11.14.subaru_eg33_f7.4095242239" +#define SIGNATURE_HASH 1936730669 +#define TS_SIGNATURE "rusEFI 2021.11.14.subaru_eg33_f7.1936730669" diff --git a/firmware/tunerstudio/generated/cache.zip b/firmware/tunerstudio/generated/cache.zip index f2a01738c1..d97c0e800a 100644 Binary files a/firmware/tunerstudio/generated/cache.zip and b/firmware/tunerstudio/generated/cache.zip differ diff --git a/firmware/tunerstudio/generated/rusefi.ini b/firmware/tunerstudio/generated/rusefi.ini index e1c0988f04..a93201dd86 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.1085810308" + signature = "rusEFI 2021.11.14.all.2966043773" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.11.14.all.1085810308" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.11.14.all.2966043773" ; 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 15:06: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 15:51:37 UTC 2021 pageSize = 20000 page = 1 @@ -121,7 +121,7 @@ useRunningMathForCranking = bits, U32, 76, [23:23], "Fixed", "Fuel Map" displayLogicLevelsInEngineSniffer = bits, U32, 76, [24:24], "false", "true" useTLE8888_stepper = bits, U32, 76, [25:25], "false", "true" enableMapEstimationTableFallback = bits, U32, 76, [26:26], "false", "true" -useFSIOTableForCanSniffingFiltering = bits, U32, 76, [27:27], "false", "true" +usescriptTableForCanSniffingFiltering = bits, U32, 76, [27:27], "false", "true" issue_294_29 = bits, U32, 76, [28:28], "false", "true" artificialTestMisfire = bits, U32, 76, [29:29], "No thank you", "Danger Mode" issue_294_31 = bits, U32, 76, [30:30], "nada_example", "si_example" @@ -707,7 +707,7 @@ warningPeriod = scalar, S16, 1498, "seconds", 1, 0, 0, 60, 0 knockDetectionWindowStart = scalar, F32, 1500, "angle", 1, 0, -1000, 1000, 2 knockDetectionWindowEnd = scalar, F32, 1504, "angle", 1, 0, -1000, 1000, 2 idleStepperReactionTime = scalar, F32, 1508, "ms", 1, 0, 1, 300, 0 -unusedFsioInputs = array, U08, 1512, [20], "", 1, 0, 0, 255, 0 +unused20Inputs = array, U08, 1512, [20], "", 1, 0, 0, 255, 0 idleStepperTotalSteps = scalar, S32, 1532, "count", 1, 0, 5, 3000, 0 noAccelAfterHardLimitPeriodSecs = scalar, F32, 1536, "sec", 1, 0, 0, 60, 0 mapAveragingSchedulingAtIndex = scalar, S32, 1540, "index", 1, 0, 0, 7000, 0 @@ -1340,18 +1340,18 @@ lambdaRpmBins = array, F32, 18912, [16], "RPM", 1, 0, 0, 18000, 2 tpsTpsAccelTable = array, F32, 18976, [8x8], "value", 1, 0, 0, 30000, 2 tpsTpsAccelFromRpmBins = array, F32, 19232, [8], "from", 1, 0, 0, 30000, 2 tpsTpsAccelToRpmBins = array, F32, 19264, [8], "to", 1, 0, 0, 25500, 2 -fsioTable1 = array, F32, 19296, [8x8], "value", 1, 0, 0, 30000, 2 -fsioTable1LoadBins = array, F32, 19552, [8], "L", 1, 0, 0, 30000, 2 -fsioTable1RpmBins = array, F32, 19584, [8], "RPM", 1, 0, 0, 25500, 2 -fsioTable2 = array, U08, 19616, [8x8], "value", 1, 0, 0, 255, 0 -fsioTable2LoadBins = array, F32, 19680, [8], "L", 1, 0, 0, 255, 0 -fsioTable2RpmBins = array, F32, 19712, [8], "RPM", 1, 0, 0, 25500, 2 -fsioTable3 = array, U08, 19744, [8x8], "value", 1, 0, 0, 255, 0 -fsioTable3LoadBins = array, F32, 19808, [8], "L", 1, 0, 0, 255, 0 -fsioTable3RpmBins = array, F32, 19840, [8], "RPM", 1, 0, 0, 25500, 2 -fsioTable4 = array, U08, 19872, [8x8], "value", 1, 0, 0, 255, 0 -fsioTable4LoadBins = array, F32, 19936, [8], "L", 1, 0, 0, 255, 0 -fsioTable4RpmBins = array, F32, 19968, [8], "RPM", 1, 0, 0, 25500, 2 +scriptTable1 = array, F32, 19296, [8x8], "value", 1, 0, 0, 30000, 2 +scriptTable1LoadBins = array, F32, 19552, [8], "L", 1, 0, 0, 30000, 2 +scriptTable1RpmBins = array, F32, 19584, [8], "RPM", 1, 0, 0, 25500, 2 +scriptTable2 = array, U08, 19616, [8x8], "value", 1, 0, 0, 255, 0 +scriptTable2LoadBins = array, F32, 19680, [8], "L", 1, 0, 0, 255, 0 +scriptTable2RpmBins = array, F32, 19712, [8], "RPM", 1, 0, 0, 25500, 2 +scriptTable3 = array, U08, 19744, [8x8], "value", 1, 0, 0, 255, 0 +scriptTable3LoadBins = array, F32, 19808, [8], "L", 1, 0, 0, 255, 0 +scriptTable3RpmBins = array, F32, 19840, [8], "RPM", 1, 0, 0, 25500, 2 +scriptTable4 = array, U08, 19872, [8x8], "value", 1, 0, 0, 255, 0 +scriptTable4LoadBins = array, F32, 19936, [8], "L", 1, 0, 0, 255, 0 +scriptTable4RpmBins = array, F32, 19968, [8], "RPM", 1, 0, 0, 25500, 2 ; total TS size = 20000 [SettingContextHelp] engineType = "http://rusefi.com/wiki/index.php?title=Manual:Engine_Type\nset engine_type X" @@ -1808,10 +1808,10 @@ fsioTable4RpmBins = array, F32, 19968, [8], "RPM", 1, 0, 0, 25500, 2 vvtTable1RpmBins = "RPM is float and not integer in order to use unified methods for interpolation" vvtTable2RpmBins = "RPM is float and not integer in order to use unified methods for interpolation" tpsTpsAccelToRpmBins = "RPM is float and not integer in order to use unified methods for interpolation" - fsioTable1RpmBins = "RPM is float and not integer in order to use unified methods for interpolation" - fsioTable2RpmBins = "RPM is float and not integer in order to use unified methods for interpolation" - fsioTable3RpmBins = "RPM is float and not integer in order to use unified methods for interpolation" - fsioTable4RpmBins = "RPM is float and not integer in order to use unified methods for interpolation" + scriptTable1RpmBins = "RPM is float and not integer in order to use unified methods for interpolation" + scriptTable2RpmBins = "RPM is float and not integer in order to use unified methods for interpolation" + scriptTable3RpmBins = "RPM is float and not integer in order to use unified methods for interpolation" + scriptTable4RpmBins = "RPM is float and not integer in order to use unified methods for interpolation" ; SettingContextHelpEnd @@ -2613,25 +2613,25 @@ fsioTable4RpmBins = array, F32, 19968, [8], "RPM", 1, 0, 0, 25500, 2 zBins = vvtTable2 - table = fsioTable1Tbl, fsioTable1Map, "FSIO Table #1", 1 - xBins = fsioTable1RpmBins, RPMValue - yBins = fsioTable1LoadBins, fuelingLoad - zBins = fsioTable1 + table = scriptTable1Tbl, scriptTable1Map, "FSIO Table #1", 1 + xBins = scriptTable1RpmBins, RPMValue + yBins = scriptTable1LoadBins, fuelingLoad + zBins = scriptTable1 - table = fsioTable2Tbl, fsioTable2Map, "FSIO Table #2", 1 - xBins = fsioTable2RpmBins, RPMValue - yBins = fsioTable2LoadBins, fuelingLoad - zBins = fsioTable2 + table = scriptTable2Tbl, scriptTable2Map, "FSIO Table #2", 1 + xBins = scriptTable2RpmBins, RPMValue + yBins = scriptTable2LoadBins, fuelingLoad + zBins = scriptTable2 - table = fsioTable3Tbl, fsioTable3Map, "FSIO Table #3", 1 - xBins = fsioTable3RpmBins, RPMValue - yBins = fsioTable3LoadBins, fuelingLoad - zBins = fsioTable3 + table = scriptTable3Tbl, scriptTable3Map, "FSIO Table #3", 1 + xBins = scriptTable3RpmBins, RPMValue + yBins = scriptTable3LoadBins, fuelingLoad + zBins = scriptTable3 - table = fsioTable4Tbl, fsioTable4Map, "FSIO Table #4", 1 - xBins = fsioTable4RpmBins, RPMValue - yBins = fsioTable4LoadBins, fuelingLoad - zBins = fsioTable4 + table = scriptTable4Tbl, scriptTable4Map, "FSIO Table #4", 1 + xBins = scriptTable4RpmBins, RPMValue + yBins = scriptTable4LoadBins, fuelingLoad + zBins = scriptTable4 table = baroCorrTbl, baroCorrMap, "Baro Correction", 1 ; constant, variable @@ -3326,10 +3326,10 @@ menuDialog = main subMenu = scriptSetting, "Lua Script Settings" subMenu = std_separator - subMenu = fsioTable1TblSettings, "Script Table #1" - subMenu = fsioTable2TblSettings, "Script Table #2" - subMenu = fsioTable3TblSettings, "Script Table #3" - subMenu = fsioTable4TblSettings, "Script Table #4" + subMenu = scriptTable1TblSettings, "Script Table #1" + subMenu = scriptTable2TblSettings, "Script Table #2" + subMenu = scriptTable3TblSettings, "Script Table #3" + subMenu = scriptTable4TblSettings, "Script Table #4" subMenu = scriptCurve1Settings, "Script Curve #1" subMenu = scriptCurve2Settings, "Script Curve #2" subMenu = scriptCurve3Settings, "Script Curve #3" @@ -3620,21 +3620,21 @@ cmd_set_engine_type_8888_test = "Z\x00\x30\x00\x3B" cmd_set_engine_type_default = "Z\x00\x31\x00\x00" [UserDefined] - dialog = fsioTable1TblSettings, "", yAxis + dialog = scriptTable1TblSettings, "", yAxis field = "Name", scriptTableName1 - panel = fsioTable1Tbl + panel = scriptTable1Tbl - dialog = fsioTable2TblSettings, "", yAxis + dialog = scriptTable2TblSettings, "", yAxis field = "Name", scriptTableName2 - panel = fsioTable2Tbl + panel = scriptTable2Tbl - dialog = fsioTable3TblSettings, "", yAxis + dialog = scriptTable3TblSettings, "", yAxis field = "Name", scriptTableName3 - panel = fsioTable3Tbl + panel = scriptTable3Tbl - dialog = fsioTable4TblSettings, "", yAxis + dialog = scriptTable4TblSettings, "", yAxis field = "Name", scriptTableName4 - panel = fsioTable4Tbl + panel = scriptTable4Tbl dialog = scriptCurve1Settings, "", yAxis field = "Name", scriptCurveName1 @@ -5504,7 +5504,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" field = "Warning Message", warning_message field = "Ford redundant TPS mode", useFordRedundantTps field = "consumeObdSensors", consumeObdSensors, { canReadEnabled == 1 && canWriteEnabled == 1} - field = "use FSIO Table CAN Sniffing Filtering",useFSIOTableForCanSniffingFiltering + field = "use FSIO Table CAN Sniffing Filtering",usescriptTableForCanSniffingFiltering field = "turbo speed sensor", turboSpeedSensorInputPin field = "turbo speed multiplier", turboSpeedSensorMultiplier field = "Artificial Misfire", artificialTestMisfire diff --git a/firmware/tunerstudio/generated/rusefi_atlas.ini b/firmware/tunerstudio/generated/rusefi_atlas.ini index 1246b6708b..d9b512a663 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.1551029155" + signature = "rusEFI 2021.11.14.atlas.2885732698" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.11.14.atlas.1551029155" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.11.14.atlas.2885732698" ; 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 15:06: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 15:51:34 UTC 2021 pageSize = 20000 page = 1 @@ -121,7 +121,7 @@ useRunningMathForCranking = bits, U32, 76, [23:23], "Fixed", "Fuel Map" displayLogicLevelsInEngineSniffer = bits, U32, 76, [24:24], "false", "true" useTLE8888_stepper = bits, U32, 76, [25:25], "false", "true" enableMapEstimationTableFallback = bits, U32, 76, [26:26], "false", "true" -useFSIOTableForCanSniffingFiltering = bits, U32, 76, [27:27], "false", "true" +usescriptTableForCanSniffingFiltering = bits, U32, 76, [27:27], "false", "true" issue_294_29 = bits, U32, 76, [28:28], "false", "true" artificialTestMisfire = bits, U32, 76, [29:29], "No thank you", "Danger Mode" issue_294_31 = bits, U32, 76, [30:30], "nada_example", "si_example" @@ -707,7 +707,7 @@ warningPeriod = scalar, S16, 1498, "seconds", 1, 0, 0, 60, 0 knockDetectionWindowStart = scalar, F32, 1500, "angle", 1, 0, -1000, 1000, 2 knockDetectionWindowEnd = scalar, F32, 1504, "angle", 1, 0, -1000, 1000, 2 idleStepperReactionTime = scalar, F32, 1508, "ms", 1, 0, 1, 300, 0 -unusedFsioInputs = array, U08, 1512, [20], "", 1, 0, 0, 255, 0 +unused20Inputs = array, U08, 1512, [20], "", 1, 0, 0, 255, 0 idleStepperTotalSteps = scalar, S32, 1532, "count", 1, 0, 5, 3000, 0 noAccelAfterHardLimitPeriodSecs = scalar, F32, 1536, "sec", 1, 0, 0, 60, 0 mapAveragingSchedulingAtIndex = scalar, S32, 1540, "index", 1, 0, 0, 7000, 0 @@ -1340,18 +1340,18 @@ lambdaRpmBins = array, F32, 18912, [16], "RPM", 1, 0, 0, 18000, 2 tpsTpsAccelTable = array, F32, 18976, [8x8], "value", 1, 0, 0, 30000, 2 tpsTpsAccelFromRpmBins = array, F32, 19232, [8], "from", 1, 0, 0, 30000, 2 tpsTpsAccelToRpmBins = array, F32, 19264, [8], "to", 1, 0, 0, 25500, 2 -fsioTable1 = array, F32, 19296, [8x8], "value", 1, 0, 0, 30000, 2 -fsioTable1LoadBins = array, F32, 19552, [8], "L", 1, 0, 0, 30000, 2 -fsioTable1RpmBins = array, F32, 19584, [8], "RPM", 1, 0, 0, 25500, 2 -fsioTable2 = array, U08, 19616, [8x8], "value", 1, 0, 0, 255, 0 -fsioTable2LoadBins = array, F32, 19680, [8], "L", 1, 0, 0, 255, 0 -fsioTable2RpmBins = array, F32, 19712, [8], "RPM", 1, 0, 0, 25500, 2 -fsioTable3 = array, U08, 19744, [8x8], "value", 1, 0, 0, 255, 0 -fsioTable3LoadBins = array, F32, 19808, [8], "L", 1, 0, 0, 255, 0 -fsioTable3RpmBins = array, F32, 19840, [8], "RPM", 1, 0, 0, 25500, 2 -fsioTable4 = array, U08, 19872, [8x8], "value", 1, 0, 0, 255, 0 -fsioTable4LoadBins = array, F32, 19936, [8], "L", 1, 0, 0, 255, 0 -fsioTable4RpmBins = array, F32, 19968, [8], "RPM", 1, 0, 0, 25500, 2 +scriptTable1 = array, F32, 19296, [8x8], "value", 1, 0, 0, 30000, 2 +scriptTable1LoadBins = array, F32, 19552, [8], "L", 1, 0, 0, 30000, 2 +scriptTable1RpmBins = array, F32, 19584, [8], "RPM", 1, 0, 0, 25500, 2 +scriptTable2 = array, U08, 19616, [8x8], "value", 1, 0, 0, 255, 0 +scriptTable2LoadBins = array, F32, 19680, [8], "L", 1, 0, 0, 255, 0 +scriptTable2RpmBins = array, F32, 19712, [8], "RPM", 1, 0, 0, 25500, 2 +scriptTable3 = array, U08, 19744, [8x8], "value", 1, 0, 0, 255, 0 +scriptTable3LoadBins = array, F32, 19808, [8], "L", 1, 0, 0, 255, 0 +scriptTable3RpmBins = array, F32, 19840, [8], "RPM", 1, 0, 0, 25500, 2 +scriptTable4 = array, U08, 19872, [8x8], "value", 1, 0, 0, 255, 0 +scriptTable4LoadBins = array, F32, 19936, [8], "L", 1, 0, 0, 255, 0 +scriptTable4RpmBins = array, F32, 19968, [8], "RPM", 1, 0, 0, 25500, 2 ; total TS size = 20000 [SettingContextHelp] engineType = "http://rusefi.com/wiki/index.php?title=Manual:Engine_Type\nset engine_type X" @@ -1808,10 +1808,10 @@ fsioTable4RpmBins = array, F32, 19968, [8], "RPM", 1, 0, 0, 25500, 2 vvtTable1RpmBins = "RPM is float and not integer in order to use unified methods for interpolation" vvtTable2RpmBins = "RPM is float and not integer in order to use unified methods for interpolation" tpsTpsAccelToRpmBins = "RPM is float and not integer in order to use unified methods for interpolation" - fsioTable1RpmBins = "RPM is float and not integer in order to use unified methods for interpolation" - fsioTable2RpmBins = "RPM is float and not integer in order to use unified methods for interpolation" - fsioTable3RpmBins = "RPM is float and not integer in order to use unified methods for interpolation" - fsioTable4RpmBins = "RPM is float and not integer in order to use unified methods for interpolation" + scriptTable1RpmBins = "RPM is float and not integer in order to use unified methods for interpolation" + scriptTable2RpmBins = "RPM is float and not integer in order to use unified methods for interpolation" + scriptTable3RpmBins = "RPM is float and not integer in order to use unified methods for interpolation" + scriptTable4RpmBins = "RPM is float and not integer in order to use unified methods for interpolation" ; SettingContextHelpEnd @@ -2613,25 +2613,25 @@ fsioTable4RpmBins = array, F32, 19968, [8], "RPM", 1, 0, 0, 25500, 2 zBins = vvtTable2 - table = fsioTable1Tbl, fsioTable1Map, "FSIO Table #1", 1 - xBins = fsioTable1RpmBins, RPMValue - yBins = fsioTable1LoadBins, fuelingLoad - zBins = fsioTable1 + table = scriptTable1Tbl, scriptTable1Map, "FSIO Table #1", 1 + xBins = scriptTable1RpmBins, RPMValue + yBins = scriptTable1LoadBins, fuelingLoad + zBins = scriptTable1 - table = fsioTable2Tbl, fsioTable2Map, "FSIO Table #2", 1 - xBins = fsioTable2RpmBins, RPMValue - yBins = fsioTable2LoadBins, fuelingLoad - zBins = fsioTable2 + table = scriptTable2Tbl, scriptTable2Map, "FSIO Table #2", 1 + xBins = scriptTable2RpmBins, RPMValue + yBins = scriptTable2LoadBins, fuelingLoad + zBins = scriptTable2 - table = fsioTable3Tbl, fsioTable3Map, "FSIO Table #3", 1 - xBins = fsioTable3RpmBins, RPMValue - yBins = fsioTable3LoadBins, fuelingLoad - zBins = fsioTable3 + table = scriptTable3Tbl, scriptTable3Map, "FSIO Table #3", 1 + xBins = scriptTable3RpmBins, RPMValue + yBins = scriptTable3LoadBins, fuelingLoad + zBins = scriptTable3 - table = fsioTable4Tbl, fsioTable4Map, "FSIO Table #4", 1 - xBins = fsioTable4RpmBins, RPMValue - yBins = fsioTable4LoadBins, fuelingLoad - zBins = fsioTable4 + table = scriptTable4Tbl, scriptTable4Map, "FSIO Table #4", 1 + xBins = scriptTable4RpmBins, RPMValue + yBins = scriptTable4LoadBins, fuelingLoad + zBins = scriptTable4 table = baroCorrTbl, baroCorrMap, "Baro Correction", 1 ; constant, variable @@ -3326,10 +3326,10 @@ menuDialog = main subMenu = scriptSetting, "Lua Script Settings" subMenu = std_separator - subMenu = fsioTable1TblSettings, "Script Table #1" - subMenu = fsioTable2TblSettings, "Script Table #2" - subMenu = fsioTable3TblSettings, "Script Table #3" - subMenu = fsioTable4TblSettings, "Script Table #4" + subMenu = scriptTable1TblSettings, "Script Table #1" + subMenu = scriptTable2TblSettings, "Script Table #2" + subMenu = scriptTable3TblSettings, "Script Table #3" + subMenu = scriptTable4TblSettings, "Script Table #4" subMenu = scriptCurve1Settings, "Script Curve #1" subMenu = scriptCurve2Settings, "Script Curve #2" subMenu = scriptCurve3Settings, "Script Curve #3" @@ -3620,21 +3620,21 @@ cmd_set_engine_type_8888_test = "Z\x00\x30\x00\x3B" cmd_set_engine_type_default = "Z\x00\x31\x00\x00" [UserDefined] - dialog = fsioTable1TblSettings, "", yAxis + dialog = scriptTable1TblSettings, "", yAxis field = "Name", scriptTableName1 - panel = fsioTable1Tbl + panel = scriptTable1Tbl - dialog = fsioTable2TblSettings, "", yAxis + dialog = scriptTable2TblSettings, "", yAxis field = "Name", scriptTableName2 - panel = fsioTable2Tbl + panel = scriptTable2Tbl - dialog = fsioTable3TblSettings, "", yAxis + dialog = scriptTable3TblSettings, "", yAxis field = "Name", scriptTableName3 - panel = fsioTable3Tbl + panel = scriptTable3Tbl - dialog = fsioTable4TblSettings, "", yAxis + dialog = scriptTable4TblSettings, "", yAxis field = "Name", scriptTableName4 - panel = fsioTable4Tbl + panel = scriptTable4Tbl dialog = scriptCurve1Settings, "", yAxis field = "Name", scriptCurveName1 @@ -5495,7 +5495,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" field = "Warning Message", warning_message field = "Ford redundant TPS mode", useFordRedundantTps field = "consumeObdSensors", consumeObdSensors, { canReadEnabled == 1 && canWriteEnabled == 1} - field = "use FSIO Table CAN Sniffing Filtering",useFSIOTableForCanSniffingFiltering + field = "use FSIO Table CAN Sniffing Filtering",usescriptTableForCanSniffingFiltering field = "turbo speed sensor", turboSpeedSensorInputPin field = "turbo speed multiplier", turboSpeedSensorMultiplier field = "Artificial Misfire", artificialTestMisfire diff --git a/firmware/tunerstudio/generated/rusefi_f429-discovery.ini b/firmware/tunerstudio/generated/rusefi_f429-discovery.ini index b0b97b002c..f35a431f8b 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.1085810308" + signature = "rusEFI 2021.11.14.f429-discovery.2966043773" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.11.14.f429-discovery.1085810308" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.11.14.f429-discovery.2966043773" ; 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 15:05:25 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Nov 14 15:50:46 UTC 2021 pageSize = 20000 page = 1 @@ -121,7 +121,7 @@ useRunningMathForCranking = bits, U32, 76, [23:23], "Fixed", "Fuel Map" displayLogicLevelsInEngineSniffer = bits, U32, 76, [24:24], "false", "true" useTLE8888_stepper = bits, U32, 76, [25:25], "false", "true" enableMapEstimationTableFallback = bits, U32, 76, [26:26], "false", "true" -useFSIOTableForCanSniffingFiltering = bits, U32, 76, [27:27], "false", "true" +usescriptTableForCanSniffingFiltering = bits, U32, 76, [27:27], "false", "true" issue_294_29 = bits, U32, 76, [28:28], "false", "true" artificialTestMisfire = bits, U32, 76, [29:29], "No thank you", "Danger Mode" issue_294_31 = bits, U32, 76, [30:30], "nada_example", "si_example" @@ -707,7 +707,7 @@ warningPeriod = scalar, S16, 1498, "seconds", 1, 0, 0, 60, 0 knockDetectionWindowStart = scalar, F32, 1500, "angle", 1, 0, -1000, 1000, 2 knockDetectionWindowEnd = scalar, F32, 1504, "angle", 1, 0, -1000, 1000, 2 idleStepperReactionTime = scalar, F32, 1508, "ms", 1, 0, 1, 300, 0 -unusedFsioInputs = array, U08, 1512, [20], "", 1, 0, 0, 255, 0 +unused20Inputs = array, U08, 1512, [20], "", 1, 0, 0, 255, 0 idleStepperTotalSteps = scalar, S32, 1532, "count", 1, 0, 5, 3000, 0 noAccelAfterHardLimitPeriodSecs = scalar, F32, 1536, "sec", 1, 0, 0, 60, 0 mapAveragingSchedulingAtIndex = scalar, S32, 1540, "index", 1, 0, 0, 7000, 0 @@ -1340,18 +1340,18 @@ lambdaRpmBins = array, F32, 18912, [16], "RPM", 1, 0, 0, 18000, 2 tpsTpsAccelTable = array, F32, 18976, [8x8], "value", 1, 0, 0, 30000, 2 tpsTpsAccelFromRpmBins = array, F32, 19232, [8], "from", 1, 0, 0, 30000, 2 tpsTpsAccelToRpmBins = array, F32, 19264, [8], "to", 1, 0, 0, 25500, 2 -fsioTable1 = array, F32, 19296, [8x8], "value", 1, 0, 0, 30000, 2 -fsioTable1LoadBins = array, F32, 19552, [8], "L", 1, 0, 0, 30000, 2 -fsioTable1RpmBins = array, F32, 19584, [8], "RPM", 1, 0, 0, 25500, 2 -fsioTable2 = array, U08, 19616, [8x8], "value", 1, 0, 0, 255, 0 -fsioTable2LoadBins = array, F32, 19680, [8], "L", 1, 0, 0, 255, 0 -fsioTable2RpmBins = array, F32, 19712, [8], "RPM", 1, 0, 0, 25500, 2 -fsioTable3 = array, U08, 19744, [8x8], "value", 1, 0, 0, 255, 0 -fsioTable3LoadBins = array, F32, 19808, [8], "L", 1, 0, 0, 255, 0 -fsioTable3RpmBins = array, F32, 19840, [8], "RPM", 1, 0, 0, 25500, 2 -fsioTable4 = array, U08, 19872, [8x8], "value", 1, 0, 0, 255, 0 -fsioTable4LoadBins = array, F32, 19936, [8], "L", 1, 0, 0, 255, 0 -fsioTable4RpmBins = array, F32, 19968, [8], "RPM", 1, 0, 0, 25500, 2 +scriptTable1 = array, F32, 19296, [8x8], "value", 1, 0, 0, 30000, 2 +scriptTable1LoadBins = array, F32, 19552, [8], "L", 1, 0, 0, 30000, 2 +scriptTable1RpmBins = array, F32, 19584, [8], "RPM", 1, 0, 0, 25500, 2 +scriptTable2 = array, U08, 19616, [8x8], "value", 1, 0, 0, 255, 0 +scriptTable2LoadBins = array, F32, 19680, [8], "L", 1, 0, 0, 255, 0 +scriptTable2RpmBins = array, F32, 19712, [8], "RPM", 1, 0, 0, 25500, 2 +scriptTable3 = array, U08, 19744, [8x8], "value", 1, 0, 0, 255, 0 +scriptTable3LoadBins = array, F32, 19808, [8], "L", 1, 0, 0, 255, 0 +scriptTable3RpmBins = array, F32, 19840, [8], "RPM", 1, 0, 0, 25500, 2 +scriptTable4 = array, U08, 19872, [8x8], "value", 1, 0, 0, 255, 0 +scriptTable4LoadBins = array, F32, 19936, [8], "L", 1, 0, 0, 255, 0 +scriptTable4RpmBins = array, F32, 19968, [8], "RPM", 1, 0, 0, 25500, 2 ; total TS size = 20000 [SettingContextHelp] engineType = "http://rusefi.com/wiki/index.php?title=Manual:Engine_Type\nset engine_type X" @@ -1808,10 +1808,10 @@ fsioTable4RpmBins = array, F32, 19968, [8], "RPM", 1, 0, 0, 25500, 2 vvtTable1RpmBins = "RPM is float and not integer in order to use unified methods for interpolation" vvtTable2RpmBins = "RPM is float and not integer in order to use unified methods for interpolation" tpsTpsAccelToRpmBins = "RPM is float and not integer in order to use unified methods for interpolation" - fsioTable1RpmBins = "RPM is float and not integer in order to use unified methods for interpolation" - fsioTable2RpmBins = "RPM is float and not integer in order to use unified methods for interpolation" - fsioTable3RpmBins = "RPM is float and not integer in order to use unified methods for interpolation" - fsioTable4RpmBins = "RPM is float and not integer in order to use unified methods for interpolation" + scriptTable1RpmBins = "RPM is float and not integer in order to use unified methods for interpolation" + scriptTable2RpmBins = "RPM is float and not integer in order to use unified methods for interpolation" + scriptTable3RpmBins = "RPM is float and not integer in order to use unified methods for interpolation" + scriptTable4RpmBins = "RPM is float and not integer in order to use unified methods for interpolation" ; SettingContextHelpEnd @@ -2613,25 +2613,25 @@ fsioTable4RpmBins = array, F32, 19968, [8], "RPM", 1, 0, 0, 25500, 2 zBins = vvtTable2 - table = fsioTable1Tbl, fsioTable1Map, "FSIO Table #1", 1 - xBins = fsioTable1RpmBins, RPMValue - yBins = fsioTable1LoadBins, fuelingLoad - zBins = fsioTable1 + table = scriptTable1Tbl, scriptTable1Map, "FSIO Table #1", 1 + xBins = scriptTable1RpmBins, RPMValue + yBins = scriptTable1LoadBins, fuelingLoad + zBins = scriptTable1 - table = fsioTable2Tbl, fsioTable2Map, "FSIO Table #2", 1 - xBins = fsioTable2RpmBins, RPMValue - yBins = fsioTable2LoadBins, fuelingLoad - zBins = fsioTable2 + table = scriptTable2Tbl, scriptTable2Map, "FSIO Table #2", 1 + xBins = scriptTable2RpmBins, RPMValue + yBins = scriptTable2LoadBins, fuelingLoad + zBins = scriptTable2 - table = fsioTable3Tbl, fsioTable3Map, "FSIO Table #3", 1 - xBins = fsioTable3RpmBins, RPMValue - yBins = fsioTable3LoadBins, fuelingLoad - zBins = fsioTable3 + table = scriptTable3Tbl, scriptTable3Map, "FSIO Table #3", 1 + xBins = scriptTable3RpmBins, RPMValue + yBins = scriptTable3LoadBins, fuelingLoad + zBins = scriptTable3 - table = fsioTable4Tbl, fsioTable4Map, "FSIO Table #4", 1 - xBins = fsioTable4RpmBins, RPMValue - yBins = fsioTable4LoadBins, fuelingLoad - zBins = fsioTable4 + table = scriptTable4Tbl, scriptTable4Map, "FSIO Table #4", 1 + xBins = scriptTable4RpmBins, RPMValue + yBins = scriptTable4LoadBins, fuelingLoad + zBins = scriptTable4 table = baroCorrTbl, baroCorrMap, "Baro Correction", 1 ; constant, variable @@ -3326,10 +3326,10 @@ menuDialog = main subMenu = scriptSetting, "Lua Script Settings" subMenu = std_separator - subMenu = fsioTable1TblSettings, "Script Table #1" - subMenu = fsioTable2TblSettings, "Script Table #2" - subMenu = fsioTable3TblSettings, "Script Table #3" - subMenu = fsioTable4TblSettings, "Script Table #4" + subMenu = scriptTable1TblSettings, "Script Table #1" + subMenu = scriptTable2TblSettings, "Script Table #2" + subMenu = scriptTable3TblSettings, "Script Table #3" + subMenu = scriptTable4TblSettings, "Script Table #4" subMenu = scriptCurve1Settings, "Script Curve #1" subMenu = scriptCurve2Settings, "Script Curve #2" subMenu = scriptCurve3Settings, "Script Curve #3" @@ -3620,21 +3620,21 @@ cmd_set_engine_type_8888_test = "Z\x00\x30\x00\x3B" cmd_set_engine_type_default = "Z\x00\x31\x00\x00" [UserDefined] - dialog = fsioTable1TblSettings, "", yAxis + dialog = scriptTable1TblSettings, "", yAxis field = "Name", scriptTableName1 - panel = fsioTable1Tbl + panel = scriptTable1Tbl - dialog = fsioTable2TblSettings, "", yAxis + dialog = scriptTable2TblSettings, "", yAxis field = "Name", scriptTableName2 - panel = fsioTable2Tbl + panel = scriptTable2Tbl - dialog = fsioTable3TblSettings, "", yAxis + dialog = scriptTable3TblSettings, "", yAxis field = "Name", scriptTableName3 - panel = fsioTable3Tbl + panel = scriptTable3Tbl - dialog = fsioTable4TblSettings, "", yAxis + dialog = scriptTable4TblSettings, "", yAxis field = "Name", scriptTableName4 - panel = fsioTable4Tbl + panel = scriptTable4Tbl dialog = scriptCurve1Settings, "", yAxis field = "Name", scriptCurveName1 @@ -5504,7 +5504,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" field = "Warning Message", warning_message field = "Ford redundant TPS mode", useFordRedundantTps field = "consumeObdSensors", consumeObdSensors, { canReadEnabled == 1 && canWriteEnabled == 1} - field = "use FSIO Table CAN Sniffing Filtering",useFSIOTableForCanSniffingFiltering + field = "use FSIO Table CAN Sniffing Filtering",usescriptTableForCanSniffingFiltering field = "turbo speed sensor", turboSpeedSensorInputPin field = "turbo speed multiplier", turboSpeedSensorMultiplier field = "Artificial Misfire", artificialTestMisfire diff --git a/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini b/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini index 3778ab3c35..f936df0064 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.982152045" + signature = "rusEFI 2021.11.14.frankenso_na6.3405277588" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.11.14.frankenso_na6.982152045" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.11.14.frankenso_na6.3405277588" ; 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 15:06: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 15:51:20 UTC 2021 pageSize = 20000 page = 1 @@ -121,7 +121,7 @@ useRunningMathForCranking = bits, U32, 76, [23:23], "Fixed", "Fuel Map" displayLogicLevelsInEngineSniffer = bits, U32, 76, [24:24], "false", "true" useTLE8888_stepper = bits, U32, 76, [25:25], "false", "true" enableMapEstimationTableFallback = bits, U32, 76, [26:26], "false", "true" -useFSIOTableForCanSniffingFiltering = bits, U32, 76, [27:27], "false", "true" +usescriptTableForCanSniffingFiltering = bits, U32, 76, [27:27], "false", "true" issue_294_29 = bits, U32, 76, [28:28], "false", "true" artificialTestMisfire = bits, U32, 76, [29:29], "No thank you", "Danger Mode" issue_294_31 = bits, U32, 76, [30:30], "nada_example", "si_example" @@ -707,7 +707,7 @@ warningPeriod = scalar, S16, 1498, "seconds", 1, 0, 0, 60, 0 knockDetectionWindowStart = scalar, F32, 1500, "angle", 1, 0, -1000, 1000, 2 knockDetectionWindowEnd = scalar, F32, 1504, "angle", 1, 0, -1000, 1000, 2 idleStepperReactionTime = scalar, F32, 1508, "ms", 1, 0, 1, 300, 0 -unusedFsioInputs = array, U08, 1512, [20], "", 1, 0, 0, 255, 0 +unused20Inputs = array, U08, 1512, [20], "", 1, 0, 0, 255, 0 idleStepperTotalSteps = scalar, S32, 1532, "count", 1, 0, 5, 3000, 0 noAccelAfterHardLimitPeriodSecs = scalar, F32, 1536, "sec", 1, 0, 0, 60, 0 mapAveragingSchedulingAtIndex = scalar, S32, 1540, "index", 1, 0, 0, 7000, 0 @@ -1340,18 +1340,18 @@ lambdaRpmBins = array, F32, 18912, [16], "RPM", 1, 0, 0, 18000, 2 tpsTpsAccelTable = array, F32, 18976, [8x8], "value", 1, 0, 0, 30000, 2 tpsTpsAccelFromRpmBins = array, F32, 19232, [8], "from", 1, 0, 0, 30000, 2 tpsTpsAccelToRpmBins = array, F32, 19264, [8], "to", 1, 0, 0, 25500, 2 -fsioTable1 = array, F32, 19296, [8x8], "value", 1, 0, 0, 30000, 2 -fsioTable1LoadBins = array, F32, 19552, [8], "L", 1, 0, 0, 30000, 2 -fsioTable1RpmBins = array, F32, 19584, [8], "RPM", 1, 0, 0, 25500, 2 -fsioTable2 = array, U08, 19616, [8x8], "value", 1, 0, 0, 255, 0 -fsioTable2LoadBins = array, F32, 19680, [8], "L", 1, 0, 0, 255, 0 -fsioTable2RpmBins = array, F32, 19712, [8], "RPM", 1, 0, 0, 25500, 2 -fsioTable3 = array, U08, 19744, [8x8], "value", 1, 0, 0, 255, 0 -fsioTable3LoadBins = array, F32, 19808, [8], "L", 1, 0, 0, 255, 0 -fsioTable3RpmBins = array, F32, 19840, [8], "RPM", 1, 0, 0, 25500, 2 -fsioTable4 = array, U08, 19872, [8x8], "value", 1, 0, 0, 255, 0 -fsioTable4LoadBins = array, F32, 19936, [8], "L", 1, 0, 0, 255, 0 -fsioTable4RpmBins = array, F32, 19968, [8], "RPM", 1, 0, 0, 25500, 2 +scriptTable1 = array, F32, 19296, [8x8], "value", 1, 0, 0, 30000, 2 +scriptTable1LoadBins = array, F32, 19552, [8], "L", 1, 0, 0, 30000, 2 +scriptTable1RpmBins = array, F32, 19584, [8], "RPM", 1, 0, 0, 25500, 2 +scriptTable2 = array, U08, 19616, [8x8], "value", 1, 0, 0, 255, 0 +scriptTable2LoadBins = array, F32, 19680, [8], "L", 1, 0, 0, 255, 0 +scriptTable2RpmBins = array, F32, 19712, [8], "RPM", 1, 0, 0, 25500, 2 +scriptTable3 = array, U08, 19744, [8x8], "value", 1, 0, 0, 255, 0 +scriptTable3LoadBins = array, F32, 19808, [8], "L", 1, 0, 0, 255, 0 +scriptTable3RpmBins = array, F32, 19840, [8], "RPM", 1, 0, 0, 25500, 2 +scriptTable4 = array, U08, 19872, [8x8], "value", 1, 0, 0, 255, 0 +scriptTable4LoadBins = array, F32, 19936, [8], "L", 1, 0, 0, 255, 0 +scriptTable4RpmBins = array, F32, 19968, [8], "RPM", 1, 0, 0, 25500, 2 ; total TS size = 20000 [SettingContextHelp] engineType = "http://rusefi.com/wiki/index.php?title=Manual:Engine_Type\nset engine_type X" @@ -1808,10 +1808,10 @@ fsioTable4RpmBins = array, F32, 19968, [8], "RPM", 1, 0, 0, 25500, 2 vvtTable1RpmBins = "RPM is float and not integer in order to use unified methods for interpolation" vvtTable2RpmBins = "RPM is float and not integer in order to use unified methods for interpolation" tpsTpsAccelToRpmBins = "RPM is float and not integer in order to use unified methods for interpolation" - fsioTable1RpmBins = "RPM is float and not integer in order to use unified methods for interpolation" - fsioTable2RpmBins = "RPM is float and not integer in order to use unified methods for interpolation" - fsioTable3RpmBins = "RPM is float and not integer in order to use unified methods for interpolation" - fsioTable4RpmBins = "RPM is float and not integer in order to use unified methods for interpolation" + scriptTable1RpmBins = "RPM is float and not integer in order to use unified methods for interpolation" + scriptTable2RpmBins = "RPM is float and not integer in order to use unified methods for interpolation" + scriptTable3RpmBins = "RPM is float and not integer in order to use unified methods for interpolation" + scriptTable4RpmBins = "RPM is float and not integer in order to use unified methods for interpolation" ; SettingContextHelpEnd @@ -2613,25 +2613,25 @@ fsioTable4RpmBins = array, F32, 19968, [8], "RPM", 1, 0, 0, 25500, 2 zBins = vvtTable2 - table = fsioTable1Tbl, fsioTable1Map, "FSIO Table #1", 1 - xBins = fsioTable1RpmBins, RPMValue - yBins = fsioTable1LoadBins, fuelingLoad - zBins = fsioTable1 + table = scriptTable1Tbl, scriptTable1Map, "FSIO Table #1", 1 + xBins = scriptTable1RpmBins, RPMValue + yBins = scriptTable1LoadBins, fuelingLoad + zBins = scriptTable1 - table = fsioTable2Tbl, fsioTable2Map, "FSIO Table #2", 1 - xBins = fsioTable2RpmBins, RPMValue - yBins = fsioTable2LoadBins, fuelingLoad - zBins = fsioTable2 + table = scriptTable2Tbl, scriptTable2Map, "FSIO Table #2", 1 + xBins = scriptTable2RpmBins, RPMValue + yBins = scriptTable2LoadBins, fuelingLoad + zBins = scriptTable2 - table = fsioTable3Tbl, fsioTable3Map, "FSIO Table #3", 1 - xBins = fsioTable3RpmBins, RPMValue - yBins = fsioTable3LoadBins, fuelingLoad - zBins = fsioTable3 + table = scriptTable3Tbl, scriptTable3Map, "FSIO Table #3", 1 + xBins = scriptTable3RpmBins, RPMValue + yBins = scriptTable3LoadBins, fuelingLoad + zBins = scriptTable3 - table = fsioTable4Tbl, fsioTable4Map, "FSIO Table #4", 1 - xBins = fsioTable4RpmBins, RPMValue - yBins = fsioTable4LoadBins, fuelingLoad - zBins = fsioTable4 + table = scriptTable4Tbl, scriptTable4Map, "FSIO Table #4", 1 + xBins = scriptTable4RpmBins, RPMValue + yBins = scriptTable4LoadBins, fuelingLoad + zBins = scriptTable4 table = baroCorrTbl, baroCorrMap, "Baro Correction", 1 ; constant, variable @@ -3326,10 +3326,10 @@ menuDialog = main subMenu = scriptSetting, "Lua Script Settings" subMenu = std_separator - subMenu = fsioTable1TblSettings, "Script Table #1" - subMenu = fsioTable2TblSettings, "Script Table #2" - subMenu = fsioTable3TblSettings, "Script Table #3" - subMenu = fsioTable4TblSettings, "Script Table #4" + subMenu = scriptTable1TblSettings, "Script Table #1" + subMenu = scriptTable2TblSettings, "Script Table #2" + subMenu = scriptTable3TblSettings, "Script Table #3" + subMenu = scriptTable4TblSettings, "Script Table #4" subMenu = scriptCurve1Settings, "Script Curve #1" subMenu = scriptCurve2Settings, "Script Curve #2" subMenu = scriptCurve3Settings, "Script Curve #3" @@ -3620,21 +3620,21 @@ cmd_set_engine_type_8888_test = "Z\x00\x30\x00\x3B" cmd_set_engine_type_default = "Z\x00\x31\x00\x00" [UserDefined] - dialog = fsioTable1TblSettings, "", yAxis + dialog = scriptTable1TblSettings, "", yAxis field = "Name", scriptTableName1 - panel = fsioTable1Tbl + panel = scriptTable1Tbl - dialog = fsioTable2TblSettings, "", yAxis + dialog = scriptTable2TblSettings, "", yAxis field = "Name", scriptTableName2 - panel = fsioTable2Tbl + panel = scriptTable2Tbl - dialog = fsioTable3TblSettings, "", yAxis + dialog = scriptTable3TblSettings, "", yAxis field = "Name", scriptTableName3 - panel = fsioTable3Tbl + panel = scriptTable3Tbl - dialog = fsioTable4TblSettings, "", yAxis + dialog = scriptTable4TblSettings, "", yAxis field = "Name", scriptTableName4 - panel = fsioTable4Tbl + panel = scriptTable4Tbl dialog = scriptCurve1Settings, "", yAxis field = "Name", scriptCurveName1 @@ -5504,7 +5504,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" field = "Warning Message", warning_message field = "Ford redundant TPS mode", useFordRedundantTps field = "consumeObdSensors", consumeObdSensors, { canReadEnabled == 1 && canWriteEnabled == 1} - field = "use FSIO Table CAN Sniffing Filtering",useFSIOTableForCanSniffingFiltering + field = "use FSIO Table CAN Sniffing Filtering",usescriptTableForCanSniffingFiltering field = "turbo speed sensor", turboSpeedSensorInputPin field = "turbo speed multiplier", turboSpeedSensorMultiplier field = "Artificial Misfire", artificialTestMisfire diff --git a/firmware/tunerstudio/generated/rusefi_hellen-nb1.ini b/firmware/tunerstudio/generated/rusefi_hellen-nb1.ini index 57ea5af53b..cde2421615 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.3848934925" + signature = "rusEFI 2021.11.14.hellen-nb1.353897716" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.11.14.hellen-nb1.3848934925" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.11.14.hellen-nb1.353897716" ; 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 15:05:48 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Nov 14 15:51:08 UTC 2021 pageSize = 20000 page = 1 @@ -121,7 +121,7 @@ useRunningMathForCranking = bits, U32, 76, [23:23], "Fixed", "Fuel Map" displayLogicLevelsInEngineSniffer = bits, U32, 76, [24:24], "false", "true" useTLE8888_stepper = bits, U32, 76, [25:25], "false", "true" enableMapEstimationTableFallback = bits, U32, 76, [26:26], "false", "true" -useFSIOTableForCanSniffingFiltering = bits, U32, 76, [27:27], "false", "true" +usescriptTableForCanSniffingFiltering = bits, U32, 76, [27:27], "false", "true" issue_294_29 = bits, U32, 76, [28:28], "false", "true" artificialTestMisfire = bits, U32, 76, [29:29], "No thank you", "Danger Mode" issue_294_31 = bits, U32, 76, [30:30], "nada_example", "si_example" @@ -707,7 +707,7 @@ warningPeriod = scalar, S16, 1498, "seconds", 1, 0, 0, 60, 0 knockDetectionWindowStart = scalar, F32, 1500, "angle", 1, 0, -1000, 1000, 2 knockDetectionWindowEnd = scalar, F32, 1504, "angle", 1, 0, -1000, 1000, 2 idleStepperReactionTime = scalar, F32, 1508, "ms", 1, 0, 1, 300, 0 -unusedFsioInputs = array, U08, 1512, [20], "", 1, 0, 0, 255, 0 +unused20Inputs = array, U08, 1512, [20], "", 1, 0, 0, 255, 0 idleStepperTotalSteps = scalar, S32, 1532, "count", 1, 0, 5, 3000, 0 noAccelAfterHardLimitPeriodSecs = scalar, F32, 1536, "sec", 1, 0, 0, 60, 0 mapAveragingSchedulingAtIndex = scalar, S32, 1540, "index", 1, 0, 0, 7000, 0 @@ -1340,18 +1340,18 @@ lambdaRpmBins = array, F32, 18912, [16], "RPM", 1, 0, 0, 18000, 2 tpsTpsAccelTable = array, F32, 18976, [8x8], "value", 1, 0, 0, 30000, 2 tpsTpsAccelFromRpmBins = array, F32, 19232, [8], "from", 1, 0, 0, 30000, 2 tpsTpsAccelToRpmBins = array, F32, 19264, [8], "to", 1, 0, 0, 25500, 2 -fsioTable1 = array, F32, 19296, [8x8], "value", 1, 0, 0, 30000, 2 -fsioTable1LoadBins = array, F32, 19552, [8], "L", 1, 0, 0, 30000, 2 -fsioTable1RpmBins = array, F32, 19584, [8], "RPM", 1, 0, 0, 25500, 2 -fsioTable2 = array, U08, 19616, [8x8], "value", 1, 0, 0, 255, 0 -fsioTable2LoadBins = array, F32, 19680, [8], "L", 1, 0, 0, 255, 0 -fsioTable2RpmBins = array, F32, 19712, [8], "RPM", 1, 0, 0, 25500, 2 -fsioTable3 = array, U08, 19744, [8x8], "value", 1, 0, 0, 255, 0 -fsioTable3LoadBins = array, F32, 19808, [8], "L", 1, 0, 0, 255, 0 -fsioTable3RpmBins = array, F32, 19840, [8], "RPM", 1, 0, 0, 25500, 2 -fsioTable4 = array, U08, 19872, [8x8], "value", 1, 0, 0, 255, 0 -fsioTable4LoadBins = array, F32, 19936, [8], "L", 1, 0, 0, 255, 0 -fsioTable4RpmBins = array, F32, 19968, [8], "RPM", 1, 0, 0, 25500, 2 +scriptTable1 = array, F32, 19296, [8x8], "value", 1, 0, 0, 30000, 2 +scriptTable1LoadBins = array, F32, 19552, [8], "L", 1, 0, 0, 30000, 2 +scriptTable1RpmBins = array, F32, 19584, [8], "RPM", 1, 0, 0, 25500, 2 +scriptTable2 = array, U08, 19616, [8x8], "value", 1, 0, 0, 255, 0 +scriptTable2LoadBins = array, F32, 19680, [8], "L", 1, 0, 0, 255, 0 +scriptTable2RpmBins = array, F32, 19712, [8], "RPM", 1, 0, 0, 25500, 2 +scriptTable3 = array, U08, 19744, [8x8], "value", 1, 0, 0, 255, 0 +scriptTable3LoadBins = array, F32, 19808, [8], "L", 1, 0, 0, 255, 0 +scriptTable3RpmBins = array, F32, 19840, [8], "RPM", 1, 0, 0, 25500, 2 +scriptTable4 = array, U08, 19872, [8x8], "value", 1, 0, 0, 255, 0 +scriptTable4LoadBins = array, F32, 19936, [8], "L", 1, 0, 0, 255, 0 +scriptTable4RpmBins = array, F32, 19968, [8], "RPM", 1, 0, 0, 25500, 2 ; total TS size = 20000 [SettingContextHelp] engineType = "http://rusefi.com/wiki/index.php?title=Manual:Engine_Type\nset engine_type X" @@ -1808,10 +1808,10 @@ fsioTable4RpmBins = array, F32, 19968, [8], "RPM", 1, 0, 0, 25500, 2 vvtTable1RpmBins = "RPM is float and not integer in order to use unified methods for interpolation" vvtTable2RpmBins = "RPM is float and not integer in order to use unified methods for interpolation" tpsTpsAccelToRpmBins = "RPM is float and not integer in order to use unified methods for interpolation" - fsioTable1RpmBins = "RPM is float and not integer in order to use unified methods for interpolation" - fsioTable2RpmBins = "RPM is float and not integer in order to use unified methods for interpolation" - fsioTable3RpmBins = "RPM is float and not integer in order to use unified methods for interpolation" - fsioTable4RpmBins = "RPM is float and not integer in order to use unified methods for interpolation" + scriptTable1RpmBins = "RPM is float and not integer in order to use unified methods for interpolation" + scriptTable2RpmBins = "RPM is float and not integer in order to use unified methods for interpolation" + scriptTable3RpmBins = "RPM is float and not integer in order to use unified methods for interpolation" + scriptTable4RpmBins = "RPM is float and not integer in order to use unified methods for interpolation" ; SettingContextHelpEnd @@ -2613,25 +2613,25 @@ fsioTable4RpmBins = array, F32, 19968, [8], "RPM", 1, 0, 0, 25500, 2 zBins = vvtTable2 - table = fsioTable1Tbl, fsioTable1Map, "FSIO Table #1", 1 - xBins = fsioTable1RpmBins, RPMValue - yBins = fsioTable1LoadBins, fuelingLoad - zBins = fsioTable1 + table = scriptTable1Tbl, scriptTable1Map, "FSIO Table #1", 1 + xBins = scriptTable1RpmBins, RPMValue + yBins = scriptTable1LoadBins, fuelingLoad + zBins = scriptTable1 - table = fsioTable2Tbl, fsioTable2Map, "FSIO Table #2", 1 - xBins = fsioTable2RpmBins, RPMValue - yBins = fsioTable2LoadBins, fuelingLoad - zBins = fsioTable2 + table = scriptTable2Tbl, scriptTable2Map, "FSIO Table #2", 1 + xBins = scriptTable2RpmBins, RPMValue + yBins = scriptTable2LoadBins, fuelingLoad + zBins = scriptTable2 - table = fsioTable3Tbl, fsioTable3Map, "FSIO Table #3", 1 - xBins = fsioTable3RpmBins, RPMValue - yBins = fsioTable3LoadBins, fuelingLoad - zBins = fsioTable3 + table = scriptTable3Tbl, scriptTable3Map, "FSIO Table #3", 1 + xBins = scriptTable3RpmBins, RPMValue + yBins = scriptTable3LoadBins, fuelingLoad + zBins = scriptTable3 - table = fsioTable4Tbl, fsioTable4Map, "FSIO Table #4", 1 - xBins = fsioTable4RpmBins, RPMValue - yBins = fsioTable4LoadBins, fuelingLoad - zBins = fsioTable4 + table = scriptTable4Tbl, scriptTable4Map, "FSIO Table #4", 1 + xBins = scriptTable4RpmBins, RPMValue + yBins = scriptTable4LoadBins, fuelingLoad + zBins = scriptTable4 table = baroCorrTbl, baroCorrMap, "Baro Correction", 1 ; constant, variable @@ -3326,10 +3326,10 @@ menuDialog = main subMenu = scriptSetting, "Lua Script Settings" subMenu = std_separator - subMenu = fsioTable1TblSettings, "Script Table #1" - subMenu = fsioTable2TblSettings, "Script Table #2" - subMenu = fsioTable3TblSettings, "Script Table #3" - subMenu = fsioTable4TblSettings, "Script Table #4" + subMenu = scriptTable1TblSettings, "Script Table #1" + subMenu = scriptTable2TblSettings, "Script Table #2" + subMenu = scriptTable3TblSettings, "Script Table #3" + subMenu = scriptTable4TblSettings, "Script Table #4" subMenu = scriptCurve1Settings, "Script Curve #1" subMenu = scriptCurve2Settings, "Script Curve #2" subMenu = scriptCurve3Settings, "Script Curve #3" @@ -3616,21 +3616,21 @@ cmd_set_engine_type_8888_test = "Z\x00\x30\x00\x3B" cmd_set_engine_type_default = "Z\x00\x31\x00\x00" [UserDefined] - dialog = fsioTable1TblSettings, "", yAxis + dialog = scriptTable1TblSettings, "", yAxis field = "Name", scriptTableName1 - panel = fsioTable1Tbl + panel = scriptTable1Tbl - dialog = fsioTable2TblSettings, "", yAxis + dialog = scriptTable2TblSettings, "", yAxis field = "Name", scriptTableName2 - panel = fsioTable2Tbl + panel = scriptTable2Tbl - dialog = fsioTable3TblSettings, "", yAxis + dialog = scriptTable3TblSettings, "", yAxis field = "Name", scriptTableName3 - panel = fsioTable3Tbl + panel = scriptTable3Tbl - dialog = fsioTable4TblSettings, "", yAxis + dialog = scriptTable4TblSettings, "", yAxis field = "Name", scriptTableName4 - panel = fsioTable4Tbl + panel = scriptTable4Tbl dialog = scriptCurve1Settings, "", yAxis field = "Name", scriptCurveName1 @@ -5468,7 +5468,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" field = "Warning Message", warning_message field = "Ford redundant TPS mode", useFordRedundantTps field = "consumeObdSensors", consumeObdSensors, { canReadEnabled == 1 && canWriteEnabled == 1} - field = "use FSIO Table CAN Sniffing Filtering",useFSIOTableForCanSniffingFiltering + field = "use FSIO Table CAN Sniffing Filtering",usescriptTableForCanSniffingFiltering field = "turbo speed sensor", turboSpeedSensorInputPin field = "turbo speed multiplier", turboSpeedSensorMultiplier field = "Artificial Misfire", artificialTestMisfire diff --git a/firmware/tunerstudio/generated/rusefi_hellen121nissan.ini b/firmware/tunerstudio/generated/rusefi_hellen121nissan.ini index f19ea998a5..93003b099d 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.4215030821" + signature = "rusEFI 2021.11.14.hellen121nissan.189685468" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.11.14.hellen121nissan.4215030821" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.11.14.hellen121nissan.189685468" ; 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 15:05:35 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Nov 14 15:50:56 UTC 2021 pageSize = 20000 page = 1 @@ -121,7 +121,7 @@ useRunningMathForCranking = bits, U32, 76, [23:23], "Fixed", "Fuel Map" displayLogicLevelsInEngineSniffer = bits, U32, 76, [24:24], "false", "true" useTLE8888_stepper = bits, U32, 76, [25:25], "false", "true" enableMapEstimationTableFallback = bits, U32, 76, [26:26], "false", "true" -useFSIOTableForCanSniffingFiltering = bits, U32, 76, [27:27], "false", "true" +usescriptTableForCanSniffingFiltering = bits, U32, 76, [27:27], "false", "true" issue_294_29 = bits, U32, 76, [28:28], "false", "true" artificialTestMisfire = bits, U32, 76, [29:29], "No thank you", "Danger Mode" issue_294_31 = bits, U32, 76, [30:30], "nada_example", "si_example" @@ -707,7 +707,7 @@ warningPeriod = scalar, S16, 1498, "seconds", 1, 0, 0, 60, 0 knockDetectionWindowStart = scalar, F32, 1500, "angle", 1, 0, -1000, 1000, 2 knockDetectionWindowEnd = scalar, F32, 1504, "angle", 1, 0, -1000, 1000, 2 idleStepperReactionTime = scalar, F32, 1508, "ms", 1, 0, 1, 300, 0 -unusedFsioInputs = array, U08, 1512, [20], "", 1, 0, 0, 255, 0 +unused20Inputs = array, U08, 1512, [20], "", 1, 0, 0, 255, 0 idleStepperTotalSteps = scalar, S32, 1532, "count", 1, 0, 5, 3000, 0 noAccelAfterHardLimitPeriodSecs = scalar, F32, 1536, "sec", 1, 0, 0, 60, 0 mapAveragingSchedulingAtIndex = scalar, S32, 1540, "index", 1, 0, 0, 7000, 0 @@ -1340,18 +1340,18 @@ lambdaRpmBins = array, F32, 18912, [16], "RPM", 1, 0, 0, 18000, 2 tpsTpsAccelTable = array, F32, 18976, [8x8], "value", 1, 0, 0, 30000, 2 tpsTpsAccelFromRpmBins = array, F32, 19232, [8], "from", 1, 0, 0, 30000, 2 tpsTpsAccelToRpmBins = array, F32, 19264, [8], "to", 1, 0, 0, 25500, 2 -fsioTable1 = array, F32, 19296, [8x8], "value", 1, 0, 0, 30000, 2 -fsioTable1LoadBins = array, F32, 19552, [8], "L", 1, 0, 0, 30000, 2 -fsioTable1RpmBins = array, F32, 19584, [8], "RPM", 1, 0, 0, 25500, 2 -fsioTable2 = array, U08, 19616, [8x8], "value", 1, 0, 0, 255, 0 -fsioTable2LoadBins = array, F32, 19680, [8], "L", 1, 0, 0, 255, 0 -fsioTable2RpmBins = array, F32, 19712, [8], "RPM", 1, 0, 0, 25500, 2 -fsioTable3 = array, U08, 19744, [8x8], "value", 1, 0, 0, 255, 0 -fsioTable3LoadBins = array, F32, 19808, [8], "L", 1, 0, 0, 255, 0 -fsioTable3RpmBins = array, F32, 19840, [8], "RPM", 1, 0, 0, 25500, 2 -fsioTable4 = array, U08, 19872, [8x8], "value", 1, 0, 0, 255, 0 -fsioTable4LoadBins = array, F32, 19936, [8], "L", 1, 0, 0, 255, 0 -fsioTable4RpmBins = array, F32, 19968, [8], "RPM", 1, 0, 0, 25500, 2 +scriptTable1 = array, F32, 19296, [8x8], "value", 1, 0, 0, 30000, 2 +scriptTable1LoadBins = array, F32, 19552, [8], "L", 1, 0, 0, 30000, 2 +scriptTable1RpmBins = array, F32, 19584, [8], "RPM", 1, 0, 0, 25500, 2 +scriptTable2 = array, U08, 19616, [8x8], "value", 1, 0, 0, 255, 0 +scriptTable2LoadBins = array, F32, 19680, [8], "L", 1, 0, 0, 255, 0 +scriptTable2RpmBins = array, F32, 19712, [8], "RPM", 1, 0, 0, 25500, 2 +scriptTable3 = array, U08, 19744, [8x8], "value", 1, 0, 0, 255, 0 +scriptTable3LoadBins = array, F32, 19808, [8], "L", 1, 0, 0, 255, 0 +scriptTable3RpmBins = array, F32, 19840, [8], "RPM", 1, 0, 0, 25500, 2 +scriptTable4 = array, U08, 19872, [8x8], "value", 1, 0, 0, 255, 0 +scriptTable4LoadBins = array, F32, 19936, [8], "L", 1, 0, 0, 255, 0 +scriptTable4RpmBins = array, F32, 19968, [8], "RPM", 1, 0, 0, 25500, 2 ; total TS size = 20000 [SettingContextHelp] engineType = "http://rusefi.com/wiki/index.php?title=Manual:Engine_Type\nset engine_type X" @@ -1808,10 +1808,10 @@ fsioTable4RpmBins = array, F32, 19968, [8], "RPM", 1, 0, 0, 25500, 2 vvtTable1RpmBins = "RPM is float and not integer in order to use unified methods for interpolation" vvtTable2RpmBins = "RPM is float and not integer in order to use unified methods for interpolation" tpsTpsAccelToRpmBins = "RPM is float and not integer in order to use unified methods for interpolation" - fsioTable1RpmBins = "RPM is float and not integer in order to use unified methods for interpolation" - fsioTable2RpmBins = "RPM is float and not integer in order to use unified methods for interpolation" - fsioTable3RpmBins = "RPM is float and not integer in order to use unified methods for interpolation" - fsioTable4RpmBins = "RPM is float and not integer in order to use unified methods for interpolation" + scriptTable1RpmBins = "RPM is float and not integer in order to use unified methods for interpolation" + scriptTable2RpmBins = "RPM is float and not integer in order to use unified methods for interpolation" + scriptTable3RpmBins = "RPM is float and not integer in order to use unified methods for interpolation" + scriptTable4RpmBins = "RPM is float and not integer in order to use unified methods for interpolation" ; SettingContextHelpEnd @@ -2613,25 +2613,25 @@ fsioTable4RpmBins = array, F32, 19968, [8], "RPM", 1, 0, 0, 25500, 2 zBins = vvtTable2 - table = fsioTable1Tbl, fsioTable1Map, "FSIO Table #1", 1 - xBins = fsioTable1RpmBins, RPMValue - yBins = fsioTable1LoadBins, fuelingLoad - zBins = fsioTable1 + table = scriptTable1Tbl, scriptTable1Map, "FSIO Table #1", 1 + xBins = scriptTable1RpmBins, RPMValue + yBins = scriptTable1LoadBins, fuelingLoad + zBins = scriptTable1 - table = fsioTable2Tbl, fsioTable2Map, "FSIO Table #2", 1 - xBins = fsioTable2RpmBins, RPMValue - yBins = fsioTable2LoadBins, fuelingLoad - zBins = fsioTable2 + table = scriptTable2Tbl, scriptTable2Map, "FSIO Table #2", 1 + xBins = scriptTable2RpmBins, RPMValue + yBins = scriptTable2LoadBins, fuelingLoad + zBins = scriptTable2 - table = fsioTable3Tbl, fsioTable3Map, "FSIO Table #3", 1 - xBins = fsioTable3RpmBins, RPMValue - yBins = fsioTable3LoadBins, fuelingLoad - zBins = fsioTable3 + table = scriptTable3Tbl, scriptTable3Map, "FSIO Table #3", 1 + xBins = scriptTable3RpmBins, RPMValue + yBins = scriptTable3LoadBins, fuelingLoad + zBins = scriptTable3 - table = fsioTable4Tbl, fsioTable4Map, "FSIO Table #4", 1 - xBins = fsioTable4RpmBins, RPMValue - yBins = fsioTable4LoadBins, fuelingLoad - zBins = fsioTable4 + table = scriptTable4Tbl, scriptTable4Map, "FSIO Table #4", 1 + xBins = scriptTable4RpmBins, RPMValue + yBins = scriptTable4LoadBins, fuelingLoad + zBins = scriptTable4 table = baroCorrTbl, baroCorrMap, "Baro Correction", 1 ; constant, variable @@ -3326,10 +3326,10 @@ menuDialog = main subMenu = scriptSetting, "Lua Script Settings" subMenu = std_separator - subMenu = fsioTable1TblSettings, "Script Table #1" - subMenu = fsioTable2TblSettings, "Script Table #2" - subMenu = fsioTable3TblSettings, "Script Table #3" - subMenu = fsioTable4TblSettings, "Script Table #4" + subMenu = scriptTable1TblSettings, "Script Table #1" + subMenu = scriptTable2TblSettings, "Script Table #2" + subMenu = scriptTable3TblSettings, "Script Table #3" + subMenu = scriptTable4TblSettings, "Script Table #4" subMenu = scriptCurve1Settings, "Script Curve #1" subMenu = scriptCurve2Settings, "Script Curve #2" subMenu = scriptCurve3Settings, "Script Curve #3" @@ -3616,21 +3616,21 @@ cmd_set_engine_type_8888_test = "Z\x00\x30\x00\x3B" cmd_set_engine_type_default = "Z\x00\x31\x00\x00" [UserDefined] - dialog = fsioTable1TblSettings, "", yAxis + dialog = scriptTable1TblSettings, "", yAxis field = "Name", scriptTableName1 - panel = fsioTable1Tbl + panel = scriptTable1Tbl - dialog = fsioTable2TblSettings, "", yAxis + dialog = scriptTable2TblSettings, "", yAxis field = "Name", scriptTableName2 - panel = fsioTable2Tbl + panel = scriptTable2Tbl - dialog = fsioTable3TblSettings, "", yAxis + dialog = scriptTable3TblSettings, "", yAxis field = "Name", scriptTableName3 - panel = fsioTable3Tbl + panel = scriptTable3Tbl - dialog = fsioTable4TblSettings, "", yAxis + dialog = scriptTable4TblSettings, "", yAxis field = "Name", scriptTableName4 - panel = fsioTable4Tbl + panel = scriptTable4Tbl dialog = scriptCurve1Settings, "", yAxis field = "Name", scriptCurveName1 @@ -5469,7 +5469,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" field = "Warning Message", warning_message field = "Ford redundant TPS mode", useFordRedundantTps field = "consumeObdSensors", consumeObdSensors, { canReadEnabled == 1 && canWriteEnabled == 1} - field = "use FSIO Table CAN Sniffing Filtering",useFSIOTableForCanSniffingFiltering + field = "use FSIO Table CAN Sniffing Filtering",usescriptTableForCanSniffingFiltering field = "turbo speed sensor", turboSpeedSensorInputPin field = "turbo speed multiplier", turboSpeedSensorMultiplier field = "Artificial Misfire", artificialTestMisfire diff --git a/firmware/tunerstudio/generated/rusefi_hellen121vag.ini b/firmware/tunerstudio/generated/rusefi_hellen121vag.ini index c58490dd1a..1c710c3ac4 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.521863822" + signature = "rusEFI 2021.11.14.hellen121vag.4016642167" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.11.14.hellen121vag.521863822" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.11.14.hellen121vag.4016642167" ; 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 15:05: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 15:50:52 UTC 2021 pageSize = 20000 page = 1 @@ -121,7 +121,7 @@ useRunningMathForCranking = bits, U32, 76, [23:23], "Fixed", "Fuel Map" displayLogicLevelsInEngineSniffer = bits, U32, 76, [24:24], "false", "true" useTLE8888_stepper = bits, U32, 76, [25:25], "false", "true" enableMapEstimationTableFallback = bits, U32, 76, [26:26], "false", "true" -useFSIOTableForCanSniffingFiltering = bits, U32, 76, [27:27], "false", "true" +usescriptTableForCanSniffingFiltering = bits, U32, 76, [27:27], "false", "true" issue_294_29 = bits, U32, 76, [28:28], "false", "true" artificialTestMisfire = bits, U32, 76, [29:29], "No thank you", "Danger Mode" issue_294_31 = bits, U32, 76, [30:30], "nada_example", "si_example" @@ -707,7 +707,7 @@ warningPeriod = scalar, S16, 1498, "seconds", 1, 0, 0, 60, 0 knockDetectionWindowStart = scalar, F32, 1500, "angle", 1, 0, -1000, 1000, 2 knockDetectionWindowEnd = scalar, F32, 1504, "angle", 1, 0, -1000, 1000, 2 idleStepperReactionTime = scalar, F32, 1508, "ms", 1, 0, 1, 300, 0 -unusedFsioInputs = array, U08, 1512, [20], "", 1, 0, 0, 255, 0 +unused20Inputs = array, U08, 1512, [20], "", 1, 0, 0, 255, 0 idleStepperTotalSteps = scalar, S32, 1532, "count", 1, 0, 5, 3000, 0 noAccelAfterHardLimitPeriodSecs = scalar, F32, 1536, "sec", 1, 0, 0, 60, 0 mapAveragingSchedulingAtIndex = scalar, S32, 1540, "index", 1, 0, 0, 7000, 0 @@ -1340,18 +1340,18 @@ lambdaRpmBins = array, F32, 18912, [16], "RPM", 1, 0, 0, 18000, 2 tpsTpsAccelTable = array, F32, 18976, [8x8], "value", 1, 0, 0, 30000, 2 tpsTpsAccelFromRpmBins = array, F32, 19232, [8], "from", 1, 0, 0, 30000, 2 tpsTpsAccelToRpmBins = array, F32, 19264, [8], "to", 1, 0, 0, 25500, 2 -fsioTable1 = array, F32, 19296, [8x8], "value", 1, 0, 0, 30000, 2 -fsioTable1LoadBins = array, F32, 19552, [8], "L", 1, 0, 0, 30000, 2 -fsioTable1RpmBins = array, F32, 19584, [8], "RPM", 1, 0, 0, 25500, 2 -fsioTable2 = array, U08, 19616, [8x8], "value", 1, 0, 0, 255, 0 -fsioTable2LoadBins = array, F32, 19680, [8], "L", 1, 0, 0, 255, 0 -fsioTable2RpmBins = array, F32, 19712, [8], "RPM", 1, 0, 0, 25500, 2 -fsioTable3 = array, U08, 19744, [8x8], "value", 1, 0, 0, 255, 0 -fsioTable3LoadBins = array, F32, 19808, [8], "L", 1, 0, 0, 255, 0 -fsioTable3RpmBins = array, F32, 19840, [8], "RPM", 1, 0, 0, 25500, 2 -fsioTable4 = array, U08, 19872, [8x8], "value", 1, 0, 0, 255, 0 -fsioTable4LoadBins = array, F32, 19936, [8], "L", 1, 0, 0, 255, 0 -fsioTable4RpmBins = array, F32, 19968, [8], "RPM", 1, 0, 0, 25500, 2 +scriptTable1 = array, F32, 19296, [8x8], "value", 1, 0, 0, 30000, 2 +scriptTable1LoadBins = array, F32, 19552, [8], "L", 1, 0, 0, 30000, 2 +scriptTable1RpmBins = array, F32, 19584, [8], "RPM", 1, 0, 0, 25500, 2 +scriptTable2 = array, U08, 19616, [8x8], "value", 1, 0, 0, 255, 0 +scriptTable2LoadBins = array, F32, 19680, [8], "L", 1, 0, 0, 255, 0 +scriptTable2RpmBins = array, F32, 19712, [8], "RPM", 1, 0, 0, 25500, 2 +scriptTable3 = array, U08, 19744, [8x8], "value", 1, 0, 0, 255, 0 +scriptTable3LoadBins = array, F32, 19808, [8], "L", 1, 0, 0, 255, 0 +scriptTable3RpmBins = array, F32, 19840, [8], "RPM", 1, 0, 0, 25500, 2 +scriptTable4 = array, U08, 19872, [8x8], "value", 1, 0, 0, 255, 0 +scriptTable4LoadBins = array, F32, 19936, [8], "L", 1, 0, 0, 255, 0 +scriptTable4RpmBins = array, F32, 19968, [8], "RPM", 1, 0, 0, 25500, 2 ; total TS size = 20000 [SettingContextHelp] engineType = "http://rusefi.com/wiki/index.php?title=Manual:Engine_Type\nset engine_type X" @@ -1808,10 +1808,10 @@ fsioTable4RpmBins = array, F32, 19968, [8], "RPM", 1, 0, 0, 25500, 2 vvtTable1RpmBins = "RPM is float and not integer in order to use unified methods for interpolation" vvtTable2RpmBins = "RPM is float and not integer in order to use unified methods for interpolation" tpsTpsAccelToRpmBins = "RPM is float and not integer in order to use unified methods for interpolation" - fsioTable1RpmBins = "RPM is float and not integer in order to use unified methods for interpolation" - fsioTable2RpmBins = "RPM is float and not integer in order to use unified methods for interpolation" - fsioTable3RpmBins = "RPM is float and not integer in order to use unified methods for interpolation" - fsioTable4RpmBins = "RPM is float and not integer in order to use unified methods for interpolation" + scriptTable1RpmBins = "RPM is float and not integer in order to use unified methods for interpolation" + scriptTable2RpmBins = "RPM is float and not integer in order to use unified methods for interpolation" + scriptTable3RpmBins = "RPM is float and not integer in order to use unified methods for interpolation" + scriptTable4RpmBins = "RPM is float and not integer in order to use unified methods for interpolation" ; SettingContextHelpEnd @@ -2613,25 +2613,25 @@ fsioTable4RpmBins = array, F32, 19968, [8], "RPM", 1, 0, 0, 25500, 2 zBins = vvtTable2 - table = fsioTable1Tbl, fsioTable1Map, "FSIO Table #1", 1 - xBins = fsioTable1RpmBins, RPMValue - yBins = fsioTable1LoadBins, fuelingLoad - zBins = fsioTable1 + table = scriptTable1Tbl, scriptTable1Map, "FSIO Table #1", 1 + xBins = scriptTable1RpmBins, RPMValue + yBins = scriptTable1LoadBins, fuelingLoad + zBins = scriptTable1 - table = fsioTable2Tbl, fsioTable2Map, "FSIO Table #2", 1 - xBins = fsioTable2RpmBins, RPMValue - yBins = fsioTable2LoadBins, fuelingLoad - zBins = fsioTable2 + table = scriptTable2Tbl, scriptTable2Map, "FSIO Table #2", 1 + xBins = scriptTable2RpmBins, RPMValue + yBins = scriptTable2LoadBins, fuelingLoad + zBins = scriptTable2 - table = fsioTable3Tbl, fsioTable3Map, "FSIO Table #3", 1 - xBins = fsioTable3RpmBins, RPMValue - yBins = fsioTable3LoadBins, fuelingLoad - zBins = fsioTable3 + table = scriptTable3Tbl, scriptTable3Map, "FSIO Table #3", 1 + xBins = scriptTable3RpmBins, RPMValue + yBins = scriptTable3LoadBins, fuelingLoad + zBins = scriptTable3 - table = fsioTable4Tbl, fsioTable4Map, "FSIO Table #4", 1 - xBins = fsioTable4RpmBins, RPMValue - yBins = fsioTable4LoadBins, fuelingLoad - zBins = fsioTable4 + table = scriptTable4Tbl, scriptTable4Map, "FSIO Table #4", 1 + xBins = scriptTable4RpmBins, RPMValue + yBins = scriptTable4LoadBins, fuelingLoad + zBins = scriptTable4 table = baroCorrTbl, baroCorrMap, "Baro Correction", 1 ; constant, variable @@ -3326,10 +3326,10 @@ menuDialog = main subMenu = scriptSetting, "Lua Script Settings" subMenu = std_separator - subMenu = fsioTable1TblSettings, "Script Table #1" - subMenu = fsioTable2TblSettings, "Script Table #2" - subMenu = fsioTable3TblSettings, "Script Table #3" - subMenu = fsioTable4TblSettings, "Script Table #4" + subMenu = scriptTable1TblSettings, "Script Table #1" + subMenu = scriptTable2TblSettings, "Script Table #2" + subMenu = scriptTable3TblSettings, "Script Table #3" + subMenu = scriptTable4TblSettings, "Script Table #4" subMenu = scriptCurve1Settings, "Script Curve #1" subMenu = scriptCurve2Settings, "Script Curve #2" subMenu = scriptCurve3Settings, "Script Curve #3" @@ -3616,21 +3616,21 @@ cmd_set_engine_type_8888_test = "Z\x00\x30\x00\x3B" cmd_set_engine_type_default = "Z\x00\x31\x00\x00" [UserDefined] - dialog = fsioTable1TblSettings, "", yAxis + dialog = scriptTable1TblSettings, "", yAxis field = "Name", scriptTableName1 - panel = fsioTable1Tbl + panel = scriptTable1Tbl - dialog = fsioTable2TblSettings, "", yAxis + dialog = scriptTable2TblSettings, "", yAxis field = "Name", scriptTableName2 - panel = fsioTable2Tbl + panel = scriptTable2Tbl - dialog = fsioTable3TblSettings, "", yAxis + dialog = scriptTable3TblSettings, "", yAxis field = "Name", scriptTableName3 - panel = fsioTable3Tbl + panel = scriptTable3Tbl - dialog = fsioTable4TblSettings, "", yAxis + dialog = scriptTable4TblSettings, "", yAxis field = "Name", scriptTableName4 - panel = fsioTable4Tbl + panel = scriptTable4Tbl dialog = scriptCurve1Settings, "", yAxis field = "Name", scriptCurveName1 @@ -5471,7 +5471,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" field = "Warning Message", warning_message field = "Ford redundant TPS mode", useFordRedundantTps field = "consumeObdSensors", consumeObdSensors, { canReadEnabled == 1 && canWriteEnabled == 1} - field = "use FSIO Table CAN Sniffing Filtering",useFSIOTableForCanSniffingFiltering + field = "use FSIO Table CAN Sniffing Filtering",usescriptTableForCanSniffingFiltering field = "turbo speed sensor", turboSpeedSensorInputPin field = "turbo speed multiplier", turboSpeedSensorMultiplier field = "Artificial Misfire", artificialTestMisfire diff --git a/firmware/tunerstudio/generated/rusefi_hellen128mercedes.ini b/firmware/tunerstudio/generated/rusefi_hellen128mercedes.ini index 46cec65f54..a92d095386 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.3665710371" + signature = "rusEFI 2021.11.14.hellen128.705451994" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.11.14.hellen128.3665710371" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.11.14.hellen128.705451994" ; 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 15:05: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 15:50:49 UTC 2021 pageSize = 20000 page = 1 @@ -121,7 +121,7 @@ useRunningMathForCranking = bits, U32, 76, [23:23], "Fixed", "Fuel Map" displayLogicLevelsInEngineSniffer = bits, U32, 76, [24:24], "false", "true" useTLE8888_stepper = bits, U32, 76, [25:25], "false", "true" enableMapEstimationTableFallback = bits, U32, 76, [26:26], "false", "true" -useFSIOTableForCanSniffingFiltering = bits, U32, 76, [27:27], "false", "true" +usescriptTableForCanSniffingFiltering = bits, U32, 76, [27:27], "false", "true" issue_294_29 = bits, U32, 76, [28:28], "false", "true" artificialTestMisfire = bits, U32, 76, [29:29], "No thank you", "Danger Mode" issue_294_31 = bits, U32, 76, [30:30], "nada_example", "si_example" @@ -707,7 +707,7 @@ warningPeriod = scalar, S16, 1498, "seconds", 1, 0, 0, 60, 0 knockDetectionWindowStart = scalar, F32, 1500, "angle", 1, 0, -1000, 1000, 2 knockDetectionWindowEnd = scalar, F32, 1504, "angle", 1, 0, -1000, 1000, 2 idleStepperReactionTime = scalar, F32, 1508, "ms", 1, 0, 1, 300, 0 -unusedFsioInputs = array, U08, 1512, [20], "", 1, 0, 0, 255, 0 +unused20Inputs = array, U08, 1512, [20], "", 1, 0, 0, 255, 0 idleStepperTotalSteps = scalar, S32, 1532, "count", 1, 0, 5, 3000, 0 noAccelAfterHardLimitPeriodSecs = scalar, F32, 1536, "sec", 1, 0, 0, 60, 0 mapAveragingSchedulingAtIndex = scalar, S32, 1540, "index", 1, 0, 0, 7000, 0 @@ -1340,18 +1340,18 @@ lambdaRpmBins = array, F32, 18912, [16], "RPM", 1, 0, 0, 18000, 2 tpsTpsAccelTable = array, F32, 18976, [8x8], "value", 1, 0, 0, 30000, 2 tpsTpsAccelFromRpmBins = array, F32, 19232, [8], "from", 1, 0, 0, 30000, 2 tpsTpsAccelToRpmBins = array, F32, 19264, [8], "to", 1, 0, 0, 25500, 2 -fsioTable1 = array, F32, 19296, [8x8], "value", 1, 0, 0, 30000, 2 -fsioTable1LoadBins = array, F32, 19552, [8], "L", 1, 0, 0, 30000, 2 -fsioTable1RpmBins = array, F32, 19584, [8], "RPM", 1, 0, 0, 25500, 2 -fsioTable2 = array, U08, 19616, [8x8], "value", 1, 0, 0, 255, 0 -fsioTable2LoadBins = array, F32, 19680, [8], "L", 1, 0, 0, 255, 0 -fsioTable2RpmBins = array, F32, 19712, [8], "RPM", 1, 0, 0, 25500, 2 -fsioTable3 = array, U08, 19744, [8x8], "value", 1, 0, 0, 255, 0 -fsioTable3LoadBins = array, F32, 19808, [8], "L", 1, 0, 0, 255, 0 -fsioTable3RpmBins = array, F32, 19840, [8], "RPM", 1, 0, 0, 25500, 2 -fsioTable4 = array, U08, 19872, [8x8], "value", 1, 0, 0, 255, 0 -fsioTable4LoadBins = array, F32, 19936, [8], "L", 1, 0, 0, 255, 0 -fsioTable4RpmBins = array, F32, 19968, [8], "RPM", 1, 0, 0, 25500, 2 +scriptTable1 = array, F32, 19296, [8x8], "value", 1, 0, 0, 30000, 2 +scriptTable1LoadBins = array, F32, 19552, [8], "L", 1, 0, 0, 30000, 2 +scriptTable1RpmBins = array, F32, 19584, [8], "RPM", 1, 0, 0, 25500, 2 +scriptTable2 = array, U08, 19616, [8x8], "value", 1, 0, 0, 255, 0 +scriptTable2LoadBins = array, F32, 19680, [8], "L", 1, 0, 0, 255, 0 +scriptTable2RpmBins = array, F32, 19712, [8], "RPM", 1, 0, 0, 25500, 2 +scriptTable3 = array, U08, 19744, [8x8], "value", 1, 0, 0, 255, 0 +scriptTable3LoadBins = array, F32, 19808, [8], "L", 1, 0, 0, 255, 0 +scriptTable3RpmBins = array, F32, 19840, [8], "RPM", 1, 0, 0, 25500, 2 +scriptTable4 = array, U08, 19872, [8x8], "value", 1, 0, 0, 255, 0 +scriptTable4LoadBins = array, F32, 19936, [8], "L", 1, 0, 0, 255, 0 +scriptTable4RpmBins = array, F32, 19968, [8], "RPM", 1, 0, 0, 25500, 2 ; total TS size = 20000 [SettingContextHelp] engineType = "http://rusefi.com/wiki/index.php?title=Manual:Engine_Type\nset engine_type X" @@ -1808,10 +1808,10 @@ fsioTable4RpmBins = array, F32, 19968, [8], "RPM", 1, 0, 0, 25500, 2 vvtTable1RpmBins = "RPM is float and not integer in order to use unified methods for interpolation" vvtTable2RpmBins = "RPM is float and not integer in order to use unified methods for interpolation" tpsTpsAccelToRpmBins = "RPM is float and not integer in order to use unified methods for interpolation" - fsioTable1RpmBins = "RPM is float and not integer in order to use unified methods for interpolation" - fsioTable2RpmBins = "RPM is float and not integer in order to use unified methods for interpolation" - fsioTable3RpmBins = "RPM is float and not integer in order to use unified methods for interpolation" - fsioTable4RpmBins = "RPM is float and not integer in order to use unified methods for interpolation" + scriptTable1RpmBins = "RPM is float and not integer in order to use unified methods for interpolation" + scriptTable2RpmBins = "RPM is float and not integer in order to use unified methods for interpolation" + scriptTable3RpmBins = "RPM is float and not integer in order to use unified methods for interpolation" + scriptTable4RpmBins = "RPM is float and not integer in order to use unified methods for interpolation" ; SettingContextHelpEnd @@ -2613,25 +2613,25 @@ fsioTable4RpmBins = array, F32, 19968, [8], "RPM", 1, 0, 0, 25500, 2 zBins = vvtTable2 - table = fsioTable1Tbl, fsioTable1Map, "FSIO Table #1", 1 - xBins = fsioTable1RpmBins, RPMValue - yBins = fsioTable1LoadBins, fuelingLoad - zBins = fsioTable1 + table = scriptTable1Tbl, scriptTable1Map, "FSIO Table #1", 1 + xBins = scriptTable1RpmBins, RPMValue + yBins = scriptTable1LoadBins, fuelingLoad + zBins = scriptTable1 - table = fsioTable2Tbl, fsioTable2Map, "FSIO Table #2", 1 - xBins = fsioTable2RpmBins, RPMValue - yBins = fsioTable2LoadBins, fuelingLoad - zBins = fsioTable2 + table = scriptTable2Tbl, scriptTable2Map, "FSIO Table #2", 1 + xBins = scriptTable2RpmBins, RPMValue + yBins = scriptTable2LoadBins, fuelingLoad + zBins = scriptTable2 - table = fsioTable3Tbl, fsioTable3Map, "FSIO Table #3", 1 - xBins = fsioTable3RpmBins, RPMValue - yBins = fsioTable3LoadBins, fuelingLoad - zBins = fsioTable3 + table = scriptTable3Tbl, scriptTable3Map, "FSIO Table #3", 1 + xBins = scriptTable3RpmBins, RPMValue + yBins = scriptTable3LoadBins, fuelingLoad + zBins = scriptTable3 - table = fsioTable4Tbl, fsioTable4Map, "FSIO Table #4", 1 - xBins = fsioTable4RpmBins, RPMValue - yBins = fsioTable4LoadBins, fuelingLoad - zBins = fsioTable4 + table = scriptTable4Tbl, scriptTable4Map, "FSIO Table #4", 1 + xBins = scriptTable4RpmBins, RPMValue + yBins = scriptTable4LoadBins, fuelingLoad + zBins = scriptTable4 table = baroCorrTbl, baroCorrMap, "Baro Correction", 1 ; constant, variable @@ -3326,10 +3326,10 @@ menuDialog = main subMenu = scriptSetting, "Lua Script Settings" subMenu = std_separator - subMenu = fsioTable1TblSettings, "Script Table #1" - subMenu = fsioTable2TblSettings, "Script Table #2" - subMenu = fsioTable3TblSettings, "Script Table #3" - subMenu = fsioTable4TblSettings, "Script Table #4" + subMenu = scriptTable1TblSettings, "Script Table #1" + subMenu = scriptTable2TblSettings, "Script Table #2" + subMenu = scriptTable3TblSettings, "Script Table #3" + subMenu = scriptTable4TblSettings, "Script Table #4" subMenu = scriptCurve1Settings, "Script Curve #1" subMenu = scriptCurve2Settings, "Script Curve #2" subMenu = scriptCurve3Settings, "Script Curve #3" @@ -3616,21 +3616,21 @@ cmd_set_engine_type_8888_test = "Z\x00\x30\x00\x3B" cmd_set_engine_type_default = "Z\x00\x31\x00\x00" [UserDefined] - dialog = fsioTable1TblSettings, "", yAxis + dialog = scriptTable1TblSettings, "", yAxis field = "Name", scriptTableName1 - panel = fsioTable1Tbl + panel = scriptTable1Tbl - dialog = fsioTable2TblSettings, "", yAxis + dialog = scriptTable2TblSettings, "", yAxis field = "Name", scriptTableName2 - panel = fsioTable2Tbl + panel = scriptTable2Tbl - dialog = fsioTable3TblSettings, "", yAxis + dialog = scriptTable3TblSettings, "", yAxis field = "Name", scriptTableName3 - panel = fsioTable3Tbl + panel = scriptTable3Tbl - dialog = fsioTable4TblSettings, "", yAxis + dialog = scriptTable4TblSettings, "", yAxis field = "Name", scriptTableName4 - panel = fsioTable4Tbl + panel = scriptTable4Tbl dialog = scriptCurve1Settings, "", yAxis field = "Name", scriptCurveName1 @@ -5469,7 +5469,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" field = "Warning Message", warning_message field = "Ford redundant TPS mode", useFordRedundantTps field = "consumeObdSensors", consumeObdSensors, { canReadEnabled == 1 && canWriteEnabled == 1} - field = "use FSIO Table CAN Sniffing Filtering",useFSIOTableForCanSniffingFiltering + field = "use FSIO Table CAN Sniffing Filtering",usescriptTableForCanSniffingFiltering field = "turbo speed sensor", turboSpeedSensorInputPin field = "turbo speed multiplier", turboSpeedSensorMultiplier field = "Artificial Misfire", artificialTestMisfire diff --git a/firmware/tunerstudio/generated/rusefi_hellen154hyundai.ini b/firmware/tunerstudio/generated/rusefi_hellen154hyundai.ini index 435911196e..11b6547889 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.1651254306" + signature = "rusEFI 2021.11.14.hellen154hyundai.2451455707" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.11.14.hellen154hyundai.1651254306" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.11.14.hellen154hyundai.2451455707" ; 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 15:05:38 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Nov 14 15:50:59 UTC 2021 pageSize = 20000 page = 1 @@ -121,7 +121,7 @@ useRunningMathForCranking = bits, U32, 76, [23:23], "Fixed", "Fuel Map" displayLogicLevelsInEngineSniffer = bits, U32, 76, [24:24], "false", "true" useTLE8888_stepper = bits, U32, 76, [25:25], "false", "true" enableMapEstimationTableFallback = bits, U32, 76, [26:26], "false", "true" -useFSIOTableForCanSniffingFiltering = bits, U32, 76, [27:27], "false", "true" +usescriptTableForCanSniffingFiltering = bits, U32, 76, [27:27], "false", "true" issue_294_29 = bits, U32, 76, [28:28], "false", "true" artificialTestMisfire = bits, U32, 76, [29:29], "No thank you", "Danger Mode" issue_294_31 = bits, U32, 76, [30:30], "nada_example", "si_example" @@ -707,7 +707,7 @@ warningPeriod = scalar, S16, 1498, "seconds", 1, 0, 0, 60, 0 knockDetectionWindowStart = scalar, F32, 1500, "angle", 1, 0, -1000, 1000, 2 knockDetectionWindowEnd = scalar, F32, 1504, "angle", 1, 0, -1000, 1000, 2 idleStepperReactionTime = scalar, F32, 1508, "ms", 1, 0, 1, 300, 0 -unusedFsioInputs = array, U08, 1512, [20], "", 1, 0, 0, 255, 0 +unused20Inputs = array, U08, 1512, [20], "", 1, 0, 0, 255, 0 idleStepperTotalSteps = scalar, S32, 1532, "count", 1, 0, 5, 3000, 0 noAccelAfterHardLimitPeriodSecs = scalar, F32, 1536, "sec", 1, 0, 0, 60, 0 mapAveragingSchedulingAtIndex = scalar, S32, 1540, "index", 1, 0, 0, 7000, 0 @@ -1340,18 +1340,18 @@ lambdaRpmBins = array, F32, 18912, [16], "RPM", 1, 0, 0, 18000, 2 tpsTpsAccelTable = array, F32, 18976, [8x8], "value", 1, 0, 0, 30000, 2 tpsTpsAccelFromRpmBins = array, F32, 19232, [8], "from", 1, 0, 0, 30000, 2 tpsTpsAccelToRpmBins = array, F32, 19264, [8], "to", 1, 0, 0, 25500, 2 -fsioTable1 = array, F32, 19296, [8x8], "value", 1, 0, 0, 30000, 2 -fsioTable1LoadBins = array, F32, 19552, [8], "L", 1, 0, 0, 30000, 2 -fsioTable1RpmBins = array, F32, 19584, [8], "RPM", 1, 0, 0, 25500, 2 -fsioTable2 = array, U08, 19616, [8x8], "value", 1, 0, 0, 255, 0 -fsioTable2LoadBins = array, F32, 19680, [8], "L", 1, 0, 0, 255, 0 -fsioTable2RpmBins = array, F32, 19712, [8], "RPM", 1, 0, 0, 25500, 2 -fsioTable3 = array, U08, 19744, [8x8], "value", 1, 0, 0, 255, 0 -fsioTable3LoadBins = array, F32, 19808, [8], "L", 1, 0, 0, 255, 0 -fsioTable3RpmBins = array, F32, 19840, [8], "RPM", 1, 0, 0, 25500, 2 -fsioTable4 = array, U08, 19872, [8x8], "value", 1, 0, 0, 255, 0 -fsioTable4LoadBins = array, F32, 19936, [8], "L", 1, 0, 0, 255, 0 -fsioTable4RpmBins = array, F32, 19968, [8], "RPM", 1, 0, 0, 25500, 2 +scriptTable1 = array, F32, 19296, [8x8], "value", 1, 0, 0, 30000, 2 +scriptTable1LoadBins = array, F32, 19552, [8], "L", 1, 0, 0, 30000, 2 +scriptTable1RpmBins = array, F32, 19584, [8], "RPM", 1, 0, 0, 25500, 2 +scriptTable2 = array, U08, 19616, [8x8], "value", 1, 0, 0, 255, 0 +scriptTable2LoadBins = array, F32, 19680, [8], "L", 1, 0, 0, 255, 0 +scriptTable2RpmBins = array, F32, 19712, [8], "RPM", 1, 0, 0, 25500, 2 +scriptTable3 = array, U08, 19744, [8x8], "value", 1, 0, 0, 255, 0 +scriptTable3LoadBins = array, F32, 19808, [8], "L", 1, 0, 0, 255, 0 +scriptTable3RpmBins = array, F32, 19840, [8], "RPM", 1, 0, 0, 25500, 2 +scriptTable4 = array, U08, 19872, [8x8], "value", 1, 0, 0, 255, 0 +scriptTable4LoadBins = array, F32, 19936, [8], "L", 1, 0, 0, 255, 0 +scriptTable4RpmBins = array, F32, 19968, [8], "RPM", 1, 0, 0, 25500, 2 ; total TS size = 20000 [SettingContextHelp] engineType = "http://rusefi.com/wiki/index.php?title=Manual:Engine_Type\nset engine_type X" @@ -1808,10 +1808,10 @@ fsioTable4RpmBins = array, F32, 19968, [8], "RPM", 1, 0, 0, 25500, 2 vvtTable1RpmBins = "RPM is float and not integer in order to use unified methods for interpolation" vvtTable2RpmBins = "RPM is float and not integer in order to use unified methods for interpolation" tpsTpsAccelToRpmBins = "RPM is float and not integer in order to use unified methods for interpolation" - fsioTable1RpmBins = "RPM is float and not integer in order to use unified methods for interpolation" - fsioTable2RpmBins = "RPM is float and not integer in order to use unified methods for interpolation" - fsioTable3RpmBins = "RPM is float and not integer in order to use unified methods for interpolation" - fsioTable4RpmBins = "RPM is float and not integer in order to use unified methods for interpolation" + scriptTable1RpmBins = "RPM is float and not integer in order to use unified methods for interpolation" + scriptTable2RpmBins = "RPM is float and not integer in order to use unified methods for interpolation" + scriptTable3RpmBins = "RPM is float and not integer in order to use unified methods for interpolation" + scriptTable4RpmBins = "RPM is float and not integer in order to use unified methods for interpolation" ; SettingContextHelpEnd @@ -2613,25 +2613,25 @@ fsioTable4RpmBins = array, F32, 19968, [8], "RPM", 1, 0, 0, 25500, 2 zBins = vvtTable2 - table = fsioTable1Tbl, fsioTable1Map, "FSIO Table #1", 1 - xBins = fsioTable1RpmBins, RPMValue - yBins = fsioTable1LoadBins, fuelingLoad - zBins = fsioTable1 + table = scriptTable1Tbl, scriptTable1Map, "FSIO Table #1", 1 + xBins = scriptTable1RpmBins, RPMValue + yBins = scriptTable1LoadBins, fuelingLoad + zBins = scriptTable1 - table = fsioTable2Tbl, fsioTable2Map, "FSIO Table #2", 1 - xBins = fsioTable2RpmBins, RPMValue - yBins = fsioTable2LoadBins, fuelingLoad - zBins = fsioTable2 + table = scriptTable2Tbl, scriptTable2Map, "FSIO Table #2", 1 + xBins = scriptTable2RpmBins, RPMValue + yBins = scriptTable2LoadBins, fuelingLoad + zBins = scriptTable2 - table = fsioTable3Tbl, fsioTable3Map, "FSIO Table #3", 1 - xBins = fsioTable3RpmBins, RPMValue - yBins = fsioTable3LoadBins, fuelingLoad - zBins = fsioTable3 + table = scriptTable3Tbl, scriptTable3Map, "FSIO Table #3", 1 + xBins = scriptTable3RpmBins, RPMValue + yBins = scriptTable3LoadBins, fuelingLoad + zBins = scriptTable3 - table = fsioTable4Tbl, fsioTable4Map, "FSIO Table #4", 1 - xBins = fsioTable4RpmBins, RPMValue - yBins = fsioTable4LoadBins, fuelingLoad - zBins = fsioTable4 + table = scriptTable4Tbl, scriptTable4Map, "FSIO Table #4", 1 + xBins = scriptTable4RpmBins, RPMValue + yBins = scriptTable4LoadBins, fuelingLoad + zBins = scriptTable4 table = baroCorrTbl, baroCorrMap, "Baro Correction", 1 ; constant, variable @@ -3326,10 +3326,10 @@ menuDialog = main subMenu = scriptSetting, "Lua Script Settings" subMenu = std_separator - subMenu = fsioTable1TblSettings, "Script Table #1" - subMenu = fsioTable2TblSettings, "Script Table #2" - subMenu = fsioTable3TblSettings, "Script Table #3" - subMenu = fsioTable4TblSettings, "Script Table #4" + subMenu = scriptTable1TblSettings, "Script Table #1" + subMenu = scriptTable2TblSettings, "Script Table #2" + subMenu = scriptTable3TblSettings, "Script Table #3" + subMenu = scriptTable4TblSettings, "Script Table #4" subMenu = scriptCurve1Settings, "Script Curve #1" subMenu = scriptCurve2Settings, "Script Curve #2" subMenu = scriptCurve3Settings, "Script Curve #3" @@ -3616,21 +3616,21 @@ cmd_set_engine_type_8888_test = "Z\x00\x30\x00\x3B" cmd_set_engine_type_default = "Z\x00\x31\x00\x00" [UserDefined] - dialog = fsioTable1TblSettings, "", yAxis + dialog = scriptTable1TblSettings, "", yAxis field = "Name", scriptTableName1 - panel = fsioTable1Tbl + panel = scriptTable1Tbl - dialog = fsioTable2TblSettings, "", yAxis + dialog = scriptTable2TblSettings, "", yAxis field = "Name", scriptTableName2 - panel = fsioTable2Tbl + panel = scriptTable2Tbl - dialog = fsioTable3TblSettings, "", yAxis + dialog = scriptTable3TblSettings, "", yAxis field = "Name", scriptTableName3 - panel = fsioTable3Tbl + panel = scriptTable3Tbl - dialog = fsioTable4TblSettings, "", yAxis + dialog = scriptTable4TblSettings, "", yAxis field = "Name", scriptTableName4 - panel = fsioTable4Tbl + panel = scriptTable4Tbl dialog = scriptCurve1Settings, "", yAxis field = "Name", scriptCurveName1 @@ -5468,7 +5468,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" field = "Warning Message", warning_message field = "Ford redundant TPS mode", useFordRedundantTps field = "consumeObdSensors", consumeObdSensors, { canReadEnabled == 1 && canWriteEnabled == 1} - field = "use FSIO Table CAN Sniffing Filtering",useFSIOTableForCanSniffingFiltering + field = "use FSIO Table CAN Sniffing Filtering",usescriptTableForCanSniffingFiltering field = "turbo speed sensor", turboSpeedSensorInputPin field = "turbo speed multiplier", turboSpeedSensorMultiplier field = "Artificial Misfire", artificialTestMisfire diff --git a/firmware/tunerstudio/generated/rusefi_hellen72.ini b/firmware/tunerstudio/generated/rusefi_hellen72.ini index 4cf4fe186b..f5c8903f8c 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.3020267828" + signature = "rusEFI 2021.11.14.hellen72.1148697549" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.11.14.hellen72.3020267828" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.11.14.hellen72.1148697549" ; 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 15:05:45 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Nov 14 15:51:04 UTC 2021 pageSize = 20000 page = 1 @@ -121,7 +121,7 @@ useRunningMathForCranking = bits, U32, 76, [23:23], "Fixed", "Fuel Map" displayLogicLevelsInEngineSniffer = bits, U32, 76, [24:24], "false", "true" useTLE8888_stepper = bits, U32, 76, [25:25], "false", "true" enableMapEstimationTableFallback = bits, U32, 76, [26:26], "false", "true" -useFSIOTableForCanSniffingFiltering = bits, U32, 76, [27:27], "false", "true" +usescriptTableForCanSniffingFiltering = bits, U32, 76, [27:27], "false", "true" issue_294_29 = bits, U32, 76, [28:28], "false", "true" artificialTestMisfire = bits, U32, 76, [29:29], "No thank you", "Danger Mode" issue_294_31 = bits, U32, 76, [30:30], "nada_example", "si_example" @@ -707,7 +707,7 @@ warningPeriod = scalar, S16, 1498, "seconds", 1, 0, 0, 60, 0 knockDetectionWindowStart = scalar, F32, 1500, "angle", 1, 0, -1000, 1000, 2 knockDetectionWindowEnd = scalar, F32, 1504, "angle", 1, 0, -1000, 1000, 2 idleStepperReactionTime = scalar, F32, 1508, "ms", 1, 0, 1, 300, 0 -unusedFsioInputs = array, U08, 1512, [20], "", 1, 0, 0, 255, 0 +unused20Inputs = array, U08, 1512, [20], "", 1, 0, 0, 255, 0 idleStepperTotalSteps = scalar, S32, 1532, "count", 1, 0, 5, 3000, 0 noAccelAfterHardLimitPeriodSecs = scalar, F32, 1536, "sec", 1, 0, 0, 60, 0 mapAveragingSchedulingAtIndex = scalar, S32, 1540, "index", 1, 0, 0, 7000, 0 @@ -1340,18 +1340,18 @@ lambdaRpmBins = array, F32, 18912, [16], "RPM", 1, 0, 0, 18000, 2 tpsTpsAccelTable = array, F32, 18976, [8x8], "value", 1, 0, 0, 30000, 2 tpsTpsAccelFromRpmBins = array, F32, 19232, [8], "from", 1, 0, 0, 30000, 2 tpsTpsAccelToRpmBins = array, F32, 19264, [8], "to", 1, 0, 0, 25500, 2 -fsioTable1 = array, F32, 19296, [8x8], "value", 1, 0, 0, 30000, 2 -fsioTable1LoadBins = array, F32, 19552, [8], "L", 1, 0, 0, 30000, 2 -fsioTable1RpmBins = array, F32, 19584, [8], "RPM", 1, 0, 0, 25500, 2 -fsioTable2 = array, U08, 19616, [8x8], "value", 1, 0, 0, 255, 0 -fsioTable2LoadBins = array, F32, 19680, [8], "L", 1, 0, 0, 255, 0 -fsioTable2RpmBins = array, F32, 19712, [8], "RPM", 1, 0, 0, 25500, 2 -fsioTable3 = array, U08, 19744, [8x8], "value", 1, 0, 0, 255, 0 -fsioTable3LoadBins = array, F32, 19808, [8], "L", 1, 0, 0, 255, 0 -fsioTable3RpmBins = array, F32, 19840, [8], "RPM", 1, 0, 0, 25500, 2 -fsioTable4 = array, U08, 19872, [8x8], "value", 1, 0, 0, 255, 0 -fsioTable4LoadBins = array, F32, 19936, [8], "L", 1, 0, 0, 255, 0 -fsioTable4RpmBins = array, F32, 19968, [8], "RPM", 1, 0, 0, 25500, 2 +scriptTable1 = array, F32, 19296, [8x8], "value", 1, 0, 0, 30000, 2 +scriptTable1LoadBins = array, F32, 19552, [8], "L", 1, 0, 0, 30000, 2 +scriptTable1RpmBins = array, F32, 19584, [8], "RPM", 1, 0, 0, 25500, 2 +scriptTable2 = array, U08, 19616, [8x8], "value", 1, 0, 0, 255, 0 +scriptTable2LoadBins = array, F32, 19680, [8], "L", 1, 0, 0, 255, 0 +scriptTable2RpmBins = array, F32, 19712, [8], "RPM", 1, 0, 0, 25500, 2 +scriptTable3 = array, U08, 19744, [8x8], "value", 1, 0, 0, 255, 0 +scriptTable3LoadBins = array, F32, 19808, [8], "L", 1, 0, 0, 255, 0 +scriptTable3RpmBins = array, F32, 19840, [8], "RPM", 1, 0, 0, 25500, 2 +scriptTable4 = array, U08, 19872, [8x8], "value", 1, 0, 0, 255, 0 +scriptTable4LoadBins = array, F32, 19936, [8], "L", 1, 0, 0, 255, 0 +scriptTable4RpmBins = array, F32, 19968, [8], "RPM", 1, 0, 0, 25500, 2 ; total TS size = 20000 [SettingContextHelp] engineType = "http://rusefi.com/wiki/index.php?title=Manual:Engine_Type\nset engine_type X" @@ -1808,10 +1808,10 @@ fsioTable4RpmBins = array, F32, 19968, [8], "RPM", 1, 0, 0, 25500, 2 vvtTable1RpmBins = "RPM is float and not integer in order to use unified methods for interpolation" vvtTable2RpmBins = "RPM is float and not integer in order to use unified methods for interpolation" tpsTpsAccelToRpmBins = "RPM is float and not integer in order to use unified methods for interpolation" - fsioTable1RpmBins = "RPM is float and not integer in order to use unified methods for interpolation" - fsioTable2RpmBins = "RPM is float and not integer in order to use unified methods for interpolation" - fsioTable3RpmBins = "RPM is float and not integer in order to use unified methods for interpolation" - fsioTable4RpmBins = "RPM is float and not integer in order to use unified methods for interpolation" + scriptTable1RpmBins = "RPM is float and not integer in order to use unified methods for interpolation" + scriptTable2RpmBins = "RPM is float and not integer in order to use unified methods for interpolation" + scriptTable3RpmBins = "RPM is float and not integer in order to use unified methods for interpolation" + scriptTable4RpmBins = "RPM is float and not integer in order to use unified methods for interpolation" ; SettingContextHelpEnd @@ -2613,25 +2613,25 @@ fsioTable4RpmBins = array, F32, 19968, [8], "RPM", 1, 0, 0, 25500, 2 zBins = vvtTable2 - table = fsioTable1Tbl, fsioTable1Map, "FSIO Table #1", 1 - xBins = fsioTable1RpmBins, RPMValue - yBins = fsioTable1LoadBins, fuelingLoad - zBins = fsioTable1 + table = scriptTable1Tbl, scriptTable1Map, "FSIO Table #1", 1 + xBins = scriptTable1RpmBins, RPMValue + yBins = scriptTable1LoadBins, fuelingLoad + zBins = scriptTable1 - table = fsioTable2Tbl, fsioTable2Map, "FSIO Table #2", 1 - xBins = fsioTable2RpmBins, RPMValue - yBins = fsioTable2LoadBins, fuelingLoad - zBins = fsioTable2 + table = scriptTable2Tbl, scriptTable2Map, "FSIO Table #2", 1 + xBins = scriptTable2RpmBins, RPMValue + yBins = scriptTable2LoadBins, fuelingLoad + zBins = scriptTable2 - table = fsioTable3Tbl, fsioTable3Map, "FSIO Table #3", 1 - xBins = fsioTable3RpmBins, RPMValue - yBins = fsioTable3LoadBins, fuelingLoad - zBins = fsioTable3 + table = scriptTable3Tbl, scriptTable3Map, "FSIO Table #3", 1 + xBins = scriptTable3RpmBins, RPMValue + yBins = scriptTable3LoadBins, fuelingLoad + zBins = scriptTable3 - table = fsioTable4Tbl, fsioTable4Map, "FSIO Table #4", 1 - xBins = fsioTable4RpmBins, RPMValue - yBins = fsioTable4LoadBins, fuelingLoad - zBins = fsioTable4 + table = scriptTable4Tbl, scriptTable4Map, "FSIO Table #4", 1 + xBins = scriptTable4RpmBins, RPMValue + yBins = scriptTable4LoadBins, fuelingLoad + zBins = scriptTable4 table = baroCorrTbl, baroCorrMap, "Baro Correction", 1 ; constant, variable @@ -3326,10 +3326,10 @@ menuDialog = main subMenu = scriptSetting, "Lua Script Settings" subMenu = std_separator - subMenu = fsioTable1TblSettings, "Script Table #1" - subMenu = fsioTable2TblSettings, "Script Table #2" - subMenu = fsioTable3TblSettings, "Script Table #3" - subMenu = fsioTable4TblSettings, "Script Table #4" + subMenu = scriptTable1TblSettings, "Script Table #1" + subMenu = scriptTable2TblSettings, "Script Table #2" + subMenu = scriptTable3TblSettings, "Script Table #3" + subMenu = scriptTable4TblSettings, "Script Table #4" subMenu = scriptCurve1Settings, "Script Curve #1" subMenu = scriptCurve2Settings, "Script Curve #2" subMenu = scriptCurve3Settings, "Script Curve #3" @@ -3616,21 +3616,21 @@ cmd_set_engine_type_8888_test = "Z\x00\x30\x00\x3B" cmd_set_engine_type_default = "Z\x00\x31\x00\x00" [UserDefined] - dialog = fsioTable1TblSettings, "", yAxis + dialog = scriptTable1TblSettings, "", yAxis field = "Name", scriptTableName1 - panel = fsioTable1Tbl + panel = scriptTable1Tbl - dialog = fsioTable2TblSettings, "", yAxis + dialog = scriptTable2TblSettings, "", yAxis field = "Name", scriptTableName2 - panel = fsioTable2Tbl + panel = scriptTable2Tbl - dialog = fsioTable3TblSettings, "", yAxis + dialog = scriptTable3TblSettings, "", yAxis field = "Name", scriptTableName3 - panel = fsioTable3Tbl + panel = scriptTable3Tbl - dialog = fsioTable4TblSettings, "", yAxis + dialog = scriptTable4TblSettings, "", yAxis field = "Name", scriptTableName4 - panel = fsioTable4Tbl + panel = scriptTable4Tbl dialog = scriptCurve1Settings, "", yAxis field = "Name", scriptCurveName1 @@ -5468,7 +5468,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" field = "Warning Message", warning_message field = "Ford redundant TPS mode", useFordRedundantTps field = "consumeObdSensors", consumeObdSensors, { canReadEnabled == 1 && canWriteEnabled == 1} - field = "use FSIO Table CAN Sniffing Filtering",useFSIOTableForCanSniffingFiltering + field = "use FSIO Table CAN Sniffing Filtering",usescriptTableForCanSniffingFiltering field = "turbo speed sensor", turboSpeedSensorInputPin field = "turbo speed multiplier", turboSpeedSensorMultiplier field = "Artificial Misfire", artificialTestMisfire diff --git a/firmware/tunerstudio/generated/rusefi_hellen88bmw.ini b/firmware/tunerstudio/generated/rusefi_hellen88bmw.ini index 537946034a..2c3743d44a 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.3782784987" + signature = "rusEFI 2021.11.14.hellen88bmw.285912354" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.11.14.hellen88bmw.3782784987" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.11.14.hellen88bmw.285912354" ; 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 15:05:41 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Nov 14 15:51:01 UTC 2021 pageSize = 20000 page = 1 @@ -121,7 +121,7 @@ useRunningMathForCranking = bits, U32, 76, [23:23], "Fixed", "Fuel Map" displayLogicLevelsInEngineSniffer = bits, U32, 76, [24:24], "false", "true" useTLE8888_stepper = bits, U32, 76, [25:25], "false", "true" enableMapEstimationTableFallback = bits, U32, 76, [26:26], "false", "true" -useFSIOTableForCanSniffingFiltering = bits, U32, 76, [27:27], "false", "true" +usescriptTableForCanSniffingFiltering = bits, U32, 76, [27:27], "false", "true" issue_294_29 = bits, U32, 76, [28:28], "false", "true" artificialTestMisfire = bits, U32, 76, [29:29], "No thank you", "Danger Mode" issue_294_31 = bits, U32, 76, [30:30], "nada_example", "si_example" @@ -707,7 +707,7 @@ warningPeriod = scalar, S16, 1498, "seconds", 1, 0, 0, 60, 0 knockDetectionWindowStart = scalar, F32, 1500, "angle", 1, 0, -1000, 1000, 2 knockDetectionWindowEnd = scalar, F32, 1504, "angle", 1, 0, -1000, 1000, 2 idleStepperReactionTime = scalar, F32, 1508, "ms", 1, 0, 1, 300, 0 -unusedFsioInputs = array, U08, 1512, [20], "", 1, 0, 0, 255, 0 +unused20Inputs = array, U08, 1512, [20], "", 1, 0, 0, 255, 0 idleStepperTotalSteps = scalar, S32, 1532, "count", 1, 0, 5, 3000, 0 noAccelAfterHardLimitPeriodSecs = scalar, F32, 1536, "sec", 1, 0, 0, 60, 0 mapAveragingSchedulingAtIndex = scalar, S32, 1540, "index", 1, 0, 0, 7000, 0 @@ -1340,18 +1340,18 @@ lambdaRpmBins = array, F32, 18912, [16], "RPM", 1, 0, 0, 18000, 2 tpsTpsAccelTable = array, F32, 18976, [8x8], "value", 1, 0, 0, 30000, 2 tpsTpsAccelFromRpmBins = array, F32, 19232, [8], "from", 1, 0, 0, 30000, 2 tpsTpsAccelToRpmBins = array, F32, 19264, [8], "to", 1, 0, 0, 25500, 2 -fsioTable1 = array, F32, 19296, [8x8], "value", 1, 0, 0, 30000, 2 -fsioTable1LoadBins = array, F32, 19552, [8], "L", 1, 0, 0, 30000, 2 -fsioTable1RpmBins = array, F32, 19584, [8], "RPM", 1, 0, 0, 25500, 2 -fsioTable2 = array, U08, 19616, [8x8], "value", 1, 0, 0, 255, 0 -fsioTable2LoadBins = array, F32, 19680, [8], "L", 1, 0, 0, 255, 0 -fsioTable2RpmBins = array, F32, 19712, [8], "RPM", 1, 0, 0, 25500, 2 -fsioTable3 = array, U08, 19744, [8x8], "value", 1, 0, 0, 255, 0 -fsioTable3LoadBins = array, F32, 19808, [8], "L", 1, 0, 0, 255, 0 -fsioTable3RpmBins = array, F32, 19840, [8], "RPM", 1, 0, 0, 25500, 2 -fsioTable4 = array, U08, 19872, [8x8], "value", 1, 0, 0, 255, 0 -fsioTable4LoadBins = array, F32, 19936, [8], "L", 1, 0, 0, 255, 0 -fsioTable4RpmBins = array, F32, 19968, [8], "RPM", 1, 0, 0, 25500, 2 +scriptTable1 = array, F32, 19296, [8x8], "value", 1, 0, 0, 30000, 2 +scriptTable1LoadBins = array, F32, 19552, [8], "L", 1, 0, 0, 30000, 2 +scriptTable1RpmBins = array, F32, 19584, [8], "RPM", 1, 0, 0, 25500, 2 +scriptTable2 = array, U08, 19616, [8x8], "value", 1, 0, 0, 255, 0 +scriptTable2LoadBins = array, F32, 19680, [8], "L", 1, 0, 0, 255, 0 +scriptTable2RpmBins = array, F32, 19712, [8], "RPM", 1, 0, 0, 25500, 2 +scriptTable3 = array, U08, 19744, [8x8], "value", 1, 0, 0, 255, 0 +scriptTable3LoadBins = array, F32, 19808, [8], "L", 1, 0, 0, 255, 0 +scriptTable3RpmBins = array, F32, 19840, [8], "RPM", 1, 0, 0, 25500, 2 +scriptTable4 = array, U08, 19872, [8x8], "value", 1, 0, 0, 255, 0 +scriptTable4LoadBins = array, F32, 19936, [8], "L", 1, 0, 0, 255, 0 +scriptTable4RpmBins = array, F32, 19968, [8], "RPM", 1, 0, 0, 25500, 2 ; total TS size = 20000 [SettingContextHelp] engineType = "http://rusefi.com/wiki/index.php?title=Manual:Engine_Type\nset engine_type X" @@ -1808,10 +1808,10 @@ fsioTable4RpmBins = array, F32, 19968, [8], "RPM", 1, 0, 0, 25500, 2 vvtTable1RpmBins = "RPM is float and not integer in order to use unified methods for interpolation" vvtTable2RpmBins = "RPM is float and not integer in order to use unified methods for interpolation" tpsTpsAccelToRpmBins = "RPM is float and not integer in order to use unified methods for interpolation" - fsioTable1RpmBins = "RPM is float and not integer in order to use unified methods for interpolation" - fsioTable2RpmBins = "RPM is float and not integer in order to use unified methods for interpolation" - fsioTable3RpmBins = "RPM is float and not integer in order to use unified methods for interpolation" - fsioTable4RpmBins = "RPM is float and not integer in order to use unified methods for interpolation" + scriptTable1RpmBins = "RPM is float and not integer in order to use unified methods for interpolation" + scriptTable2RpmBins = "RPM is float and not integer in order to use unified methods for interpolation" + scriptTable3RpmBins = "RPM is float and not integer in order to use unified methods for interpolation" + scriptTable4RpmBins = "RPM is float and not integer in order to use unified methods for interpolation" ; SettingContextHelpEnd @@ -2613,25 +2613,25 @@ fsioTable4RpmBins = array, F32, 19968, [8], "RPM", 1, 0, 0, 25500, 2 zBins = vvtTable2 - table = fsioTable1Tbl, fsioTable1Map, "FSIO Table #1", 1 - xBins = fsioTable1RpmBins, RPMValue - yBins = fsioTable1LoadBins, fuelingLoad - zBins = fsioTable1 + table = scriptTable1Tbl, scriptTable1Map, "FSIO Table #1", 1 + xBins = scriptTable1RpmBins, RPMValue + yBins = scriptTable1LoadBins, fuelingLoad + zBins = scriptTable1 - table = fsioTable2Tbl, fsioTable2Map, "FSIO Table #2", 1 - xBins = fsioTable2RpmBins, RPMValue - yBins = fsioTable2LoadBins, fuelingLoad - zBins = fsioTable2 + table = scriptTable2Tbl, scriptTable2Map, "FSIO Table #2", 1 + xBins = scriptTable2RpmBins, RPMValue + yBins = scriptTable2LoadBins, fuelingLoad + zBins = scriptTable2 - table = fsioTable3Tbl, fsioTable3Map, "FSIO Table #3", 1 - xBins = fsioTable3RpmBins, RPMValue - yBins = fsioTable3LoadBins, fuelingLoad - zBins = fsioTable3 + table = scriptTable3Tbl, scriptTable3Map, "FSIO Table #3", 1 + xBins = scriptTable3RpmBins, RPMValue + yBins = scriptTable3LoadBins, fuelingLoad + zBins = scriptTable3 - table = fsioTable4Tbl, fsioTable4Map, "FSIO Table #4", 1 - xBins = fsioTable4RpmBins, RPMValue - yBins = fsioTable4LoadBins, fuelingLoad - zBins = fsioTable4 + table = scriptTable4Tbl, scriptTable4Map, "FSIO Table #4", 1 + xBins = scriptTable4RpmBins, RPMValue + yBins = scriptTable4LoadBins, fuelingLoad + zBins = scriptTable4 table = baroCorrTbl, baroCorrMap, "Baro Correction", 1 ; constant, variable @@ -3326,10 +3326,10 @@ menuDialog = main subMenu = scriptSetting, "Lua Script Settings" subMenu = std_separator - subMenu = fsioTable1TblSettings, "Script Table #1" - subMenu = fsioTable2TblSettings, "Script Table #2" - subMenu = fsioTable3TblSettings, "Script Table #3" - subMenu = fsioTable4TblSettings, "Script Table #4" + subMenu = scriptTable1TblSettings, "Script Table #1" + subMenu = scriptTable2TblSettings, "Script Table #2" + subMenu = scriptTable3TblSettings, "Script Table #3" + subMenu = scriptTable4TblSettings, "Script Table #4" subMenu = scriptCurve1Settings, "Script Curve #1" subMenu = scriptCurve2Settings, "Script Curve #2" subMenu = scriptCurve3Settings, "Script Curve #3" @@ -3616,21 +3616,21 @@ cmd_set_engine_type_8888_test = "Z\x00\x30\x00\x3B" cmd_set_engine_type_default = "Z\x00\x31\x00\x00" [UserDefined] - dialog = fsioTable1TblSettings, "", yAxis + dialog = scriptTable1TblSettings, "", yAxis field = "Name", scriptTableName1 - panel = fsioTable1Tbl + panel = scriptTable1Tbl - dialog = fsioTable2TblSettings, "", yAxis + dialog = scriptTable2TblSettings, "", yAxis field = "Name", scriptTableName2 - panel = fsioTable2Tbl + panel = scriptTable2Tbl - dialog = fsioTable3TblSettings, "", yAxis + dialog = scriptTable3TblSettings, "", yAxis field = "Name", scriptTableName3 - panel = fsioTable3Tbl + panel = scriptTable3Tbl - dialog = fsioTable4TblSettings, "", yAxis + dialog = scriptTable4TblSettings, "", yAxis field = "Name", scriptTableName4 - panel = fsioTable4Tbl + panel = scriptTable4Tbl dialog = scriptCurve1Settings, "", yAxis field = "Name", scriptCurveName1 @@ -5466,7 +5466,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" field = "Warning Message", warning_message field = "Ford redundant TPS mode", useFordRedundantTps field = "consumeObdSensors", consumeObdSensors, { canReadEnabled == 1 && canWriteEnabled == 1} - field = "use FSIO Table CAN Sniffing Filtering",useFSIOTableForCanSniffingFiltering + field = "use FSIO Table CAN Sniffing Filtering",usescriptTableForCanSniffingFiltering field = "turbo speed sensor", turboSpeedSensorInputPin field = "turbo speed multiplier", turboSpeedSensorMultiplier field = "Artificial Misfire", artificialTestMisfire diff --git a/firmware/tunerstudio/generated/rusefi_hellenNA6.ini b/firmware/tunerstudio/generated/rusefi_hellenNA6.ini index 443170226d..70f27b0b02 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.914710572" + signature = "rusEFI 2021.11.14.hellenNA6.3338107605" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.11.14.hellenNA6.914710572" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.11.14.hellenNA6.3338107605" ; 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 15:05:51 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Nov 14 15:51:11 UTC 2021 pageSize = 20000 page = 1 @@ -121,7 +121,7 @@ useRunningMathForCranking = bits, U32, 76, [23:23], "Fixed", "Fuel Map" displayLogicLevelsInEngineSniffer = bits, U32, 76, [24:24], "false", "true" useTLE8888_stepper = bits, U32, 76, [25:25], "false", "true" enableMapEstimationTableFallback = bits, U32, 76, [26:26], "false", "true" -useFSIOTableForCanSniffingFiltering = bits, U32, 76, [27:27], "false", "true" +usescriptTableForCanSniffingFiltering = bits, U32, 76, [27:27], "false", "true" issue_294_29 = bits, U32, 76, [28:28], "false", "true" artificialTestMisfire = bits, U32, 76, [29:29], "No thank you", "Danger Mode" issue_294_31 = bits, U32, 76, [30:30], "nada_example", "si_example" @@ -707,7 +707,7 @@ warningPeriod = scalar, S16, 1498, "seconds", 1, 0, 0, 60, 0 knockDetectionWindowStart = scalar, F32, 1500, "angle", 1, 0, -1000, 1000, 2 knockDetectionWindowEnd = scalar, F32, 1504, "angle", 1, 0, -1000, 1000, 2 idleStepperReactionTime = scalar, F32, 1508, "ms", 1, 0, 1, 300, 0 -unusedFsioInputs = array, U08, 1512, [20], "", 1, 0, 0, 255, 0 +unused20Inputs = array, U08, 1512, [20], "", 1, 0, 0, 255, 0 idleStepperTotalSteps = scalar, S32, 1532, "count", 1, 0, 5, 3000, 0 noAccelAfterHardLimitPeriodSecs = scalar, F32, 1536, "sec", 1, 0, 0, 60, 0 mapAveragingSchedulingAtIndex = scalar, S32, 1540, "index", 1, 0, 0, 7000, 0 @@ -1340,18 +1340,18 @@ lambdaRpmBins = array, F32, 18912, [16], "RPM", 1, 0, 0, 18000, 2 tpsTpsAccelTable = array, F32, 18976, [8x8], "value", 1, 0, 0, 30000, 2 tpsTpsAccelFromRpmBins = array, F32, 19232, [8], "from", 1, 0, 0, 30000, 2 tpsTpsAccelToRpmBins = array, F32, 19264, [8], "to", 1, 0, 0, 25500, 2 -fsioTable1 = array, F32, 19296, [8x8], "value", 1, 0, 0, 30000, 2 -fsioTable1LoadBins = array, F32, 19552, [8], "L", 1, 0, 0, 30000, 2 -fsioTable1RpmBins = array, F32, 19584, [8], "RPM", 1, 0, 0, 25500, 2 -fsioTable2 = array, U08, 19616, [8x8], "value", 1, 0, 0, 255, 0 -fsioTable2LoadBins = array, F32, 19680, [8], "L", 1, 0, 0, 255, 0 -fsioTable2RpmBins = array, F32, 19712, [8], "RPM", 1, 0, 0, 25500, 2 -fsioTable3 = array, U08, 19744, [8x8], "value", 1, 0, 0, 255, 0 -fsioTable3LoadBins = array, F32, 19808, [8], "L", 1, 0, 0, 255, 0 -fsioTable3RpmBins = array, F32, 19840, [8], "RPM", 1, 0, 0, 25500, 2 -fsioTable4 = array, U08, 19872, [8x8], "value", 1, 0, 0, 255, 0 -fsioTable4LoadBins = array, F32, 19936, [8], "L", 1, 0, 0, 255, 0 -fsioTable4RpmBins = array, F32, 19968, [8], "RPM", 1, 0, 0, 25500, 2 +scriptTable1 = array, F32, 19296, [8x8], "value", 1, 0, 0, 30000, 2 +scriptTable1LoadBins = array, F32, 19552, [8], "L", 1, 0, 0, 30000, 2 +scriptTable1RpmBins = array, F32, 19584, [8], "RPM", 1, 0, 0, 25500, 2 +scriptTable2 = array, U08, 19616, [8x8], "value", 1, 0, 0, 255, 0 +scriptTable2LoadBins = array, F32, 19680, [8], "L", 1, 0, 0, 255, 0 +scriptTable2RpmBins = array, F32, 19712, [8], "RPM", 1, 0, 0, 25500, 2 +scriptTable3 = array, U08, 19744, [8x8], "value", 1, 0, 0, 255, 0 +scriptTable3LoadBins = array, F32, 19808, [8], "L", 1, 0, 0, 255, 0 +scriptTable3RpmBins = array, F32, 19840, [8], "RPM", 1, 0, 0, 25500, 2 +scriptTable4 = array, U08, 19872, [8x8], "value", 1, 0, 0, 255, 0 +scriptTable4LoadBins = array, F32, 19936, [8], "L", 1, 0, 0, 255, 0 +scriptTable4RpmBins = array, F32, 19968, [8], "RPM", 1, 0, 0, 25500, 2 ; total TS size = 20000 [SettingContextHelp] engineType = "http://rusefi.com/wiki/index.php?title=Manual:Engine_Type\nset engine_type X" @@ -1808,10 +1808,10 @@ fsioTable4RpmBins = array, F32, 19968, [8], "RPM", 1, 0, 0, 25500, 2 vvtTable1RpmBins = "RPM is float and not integer in order to use unified methods for interpolation" vvtTable2RpmBins = "RPM is float and not integer in order to use unified methods for interpolation" tpsTpsAccelToRpmBins = "RPM is float and not integer in order to use unified methods for interpolation" - fsioTable1RpmBins = "RPM is float and not integer in order to use unified methods for interpolation" - fsioTable2RpmBins = "RPM is float and not integer in order to use unified methods for interpolation" - fsioTable3RpmBins = "RPM is float and not integer in order to use unified methods for interpolation" - fsioTable4RpmBins = "RPM is float and not integer in order to use unified methods for interpolation" + scriptTable1RpmBins = "RPM is float and not integer in order to use unified methods for interpolation" + scriptTable2RpmBins = "RPM is float and not integer in order to use unified methods for interpolation" + scriptTable3RpmBins = "RPM is float and not integer in order to use unified methods for interpolation" + scriptTable4RpmBins = "RPM is float and not integer in order to use unified methods for interpolation" ; SettingContextHelpEnd @@ -2613,25 +2613,25 @@ fsioTable4RpmBins = array, F32, 19968, [8], "RPM", 1, 0, 0, 25500, 2 zBins = vvtTable2 - table = fsioTable1Tbl, fsioTable1Map, "FSIO Table #1", 1 - xBins = fsioTable1RpmBins, RPMValue - yBins = fsioTable1LoadBins, fuelingLoad - zBins = fsioTable1 + table = scriptTable1Tbl, scriptTable1Map, "FSIO Table #1", 1 + xBins = scriptTable1RpmBins, RPMValue + yBins = scriptTable1LoadBins, fuelingLoad + zBins = scriptTable1 - table = fsioTable2Tbl, fsioTable2Map, "FSIO Table #2", 1 - xBins = fsioTable2RpmBins, RPMValue - yBins = fsioTable2LoadBins, fuelingLoad - zBins = fsioTable2 + table = scriptTable2Tbl, scriptTable2Map, "FSIO Table #2", 1 + xBins = scriptTable2RpmBins, RPMValue + yBins = scriptTable2LoadBins, fuelingLoad + zBins = scriptTable2 - table = fsioTable3Tbl, fsioTable3Map, "FSIO Table #3", 1 - xBins = fsioTable3RpmBins, RPMValue - yBins = fsioTable3LoadBins, fuelingLoad - zBins = fsioTable3 + table = scriptTable3Tbl, scriptTable3Map, "FSIO Table #3", 1 + xBins = scriptTable3RpmBins, RPMValue + yBins = scriptTable3LoadBins, fuelingLoad + zBins = scriptTable3 - table = fsioTable4Tbl, fsioTable4Map, "FSIO Table #4", 1 - xBins = fsioTable4RpmBins, RPMValue - yBins = fsioTable4LoadBins, fuelingLoad - zBins = fsioTable4 + table = scriptTable4Tbl, scriptTable4Map, "FSIO Table #4", 1 + xBins = scriptTable4RpmBins, RPMValue + yBins = scriptTable4LoadBins, fuelingLoad + zBins = scriptTable4 table = baroCorrTbl, baroCorrMap, "Baro Correction", 1 ; constant, variable @@ -3326,10 +3326,10 @@ menuDialog = main subMenu = scriptSetting, "Lua Script Settings" subMenu = std_separator - subMenu = fsioTable1TblSettings, "Script Table #1" - subMenu = fsioTable2TblSettings, "Script Table #2" - subMenu = fsioTable3TblSettings, "Script Table #3" - subMenu = fsioTable4TblSettings, "Script Table #4" + subMenu = scriptTable1TblSettings, "Script Table #1" + subMenu = scriptTable2TblSettings, "Script Table #2" + subMenu = scriptTable3TblSettings, "Script Table #3" + subMenu = scriptTable4TblSettings, "Script Table #4" subMenu = scriptCurve1Settings, "Script Curve #1" subMenu = scriptCurve2Settings, "Script Curve #2" subMenu = scriptCurve3Settings, "Script Curve #3" @@ -3616,21 +3616,21 @@ cmd_set_engine_type_8888_test = "Z\x00\x30\x00\x3B" cmd_set_engine_type_default = "Z\x00\x31\x00\x00" [UserDefined] - dialog = fsioTable1TblSettings, "", yAxis + dialog = scriptTable1TblSettings, "", yAxis field = "Name", scriptTableName1 - panel = fsioTable1Tbl + panel = scriptTable1Tbl - dialog = fsioTable2TblSettings, "", yAxis + dialog = scriptTable2TblSettings, "", yAxis field = "Name", scriptTableName2 - panel = fsioTable2Tbl + panel = scriptTable2Tbl - dialog = fsioTable3TblSettings, "", yAxis + dialog = scriptTable3TblSettings, "", yAxis field = "Name", scriptTableName3 - panel = fsioTable3Tbl + panel = scriptTable3Tbl - dialog = fsioTable4TblSettings, "", yAxis + dialog = scriptTable4TblSettings, "", yAxis field = "Name", scriptTableName4 - panel = fsioTable4Tbl + panel = scriptTable4Tbl dialog = scriptCurve1Settings, "", yAxis field = "Name", scriptCurveName1 @@ -5469,7 +5469,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" field = "Warning Message", warning_message field = "Ford redundant TPS mode", useFordRedundantTps field = "consumeObdSensors", consumeObdSensors, { canReadEnabled == 1 && canWriteEnabled == 1} - field = "use FSIO Table CAN Sniffing Filtering",useFSIOTableForCanSniffingFiltering + field = "use FSIO Table CAN Sniffing Filtering",usescriptTableForCanSniffingFiltering field = "turbo speed sensor", turboSpeedSensorInputPin field = "turbo speed multiplier", turboSpeedSensorMultiplier field = "Artificial Misfire", artificialTestMisfire diff --git a/firmware/tunerstudio/generated/rusefi_hellen_cypress.ini b/firmware/tunerstudio/generated/rusefi_hellen_cypress.ini index 6e78fddaa2..502e252e09 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.223845907" + signature = "rusEFI 2021.11.14.hellen_cypress.2319440833" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.11.14.hellen_cypress.223845907" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.11.14.hellen_cypress.2319440833" ; 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 15:06:26 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 15:51:42 UTC 2021 pageSize = 20000 page = 1 @@ -121,7 +121,7 @@ useRunningMathForCranking = bits, U32, 76, [23:23], "Fixed", "Fuel Map" displayLogicLevelsInEngineSniffer = bits, U32, 76, [24:24], "false", "true" useTLE8888_stepper = bits, U32, 76, [25:25], "false", "true" enableMapEstimationTableFallback = bits, U32, 76, [26:26], "false", "true" -useFSIOTableForCanSniffingFiltering = bits, U32, 76, [27:27], "false", "true" +usescriptTableForCanSniffingFiltering = bits, U32, 76, [27:27], "false", "true" issue_294_29 = bits, U32, 76, [28:28], "false", "true" artificialTestMisfire = bits, U32, 76, [29:29], "No thank you", "Danger Mode" issue_294_31 = bits, U32, 76, [30:30], "nada_example", "si_example" @@ -707,7 +707,7 @@ warningPeriod = scalar, S16, 1498, "seconds", 1, 0, 0, 60, 0 knockDetectionWindowStart = scalar, F32, 1500, "angle", 1, 0, -1000, 1000, 2 knockDetectionWindowEnd = scalar, F32, 1504, "angle", 1, 0, -1000, 1000, 2 idleStepperReactionTime = scalar, F32, 1508, "ms", 1, 0, 1, 300, 0 -unusedFsioInputs = array, U08, 1512, [20], "", 1, 0, 0, 255, 0 +unused20Inputs = array, U08, 1512, [20], "", 1, 0, 0, 255, 0 idleStepperTotalSteps = scalar, S32, 1532, "count", 1, 0, 5, 3000, 0 noAccelAfterHardLimitPeriodSecs = scalar, F32, 1536, "sec", 1, 0, 0, 60, 0 mapAveragingSchedulingAtIndex = scalar, S32, 1540, "index", 1, 0, 0, 7000, 0 @@ -1340,18 +1340,18 @@ lambdaRpmBins = array, F32, 18912, [16], "RPM", 1, 0, 0, 18000, 2 tpsTpsAccelTable = array, F32, 18976, [8x8], "value", 1, 0, 0, 30000, 2 tpsTpsAccelFromRpmBins = array, F32, 19232, [8], "from", 1, 0, 0, 30000, 2 tpsTpsAccelToRpmBins = array, F32, 19264, [8], "to", 1, 0, 0, 25500, 2 -fsioTable1 = array, F32, 19296, [8x8], "value", 1, 0, 0, 30000, 2 -fsioTable1LoadBins = array, F32, 19552, [8], "L", 1, 0, 0, 30000, 2 -fsioTable1RpmBins = array, F32, 19584, [8], "RPM", 1, 0, 0, 25500, 2 -fsioTable2 = array, U08, 19616, [8x8], "value", 1, 0, 0, 255, 0 -fsioTable2LoadBins = array, F32, 19680, [8], "L", 1, 0, 0, 255, 0 -fsioTable2RpmBins = array, F32, 19712, [8], "RPM", 1, 0, 0, 25500, 2 -fsioTable3 = array, U08, 19744, [8x8], "value", 1, 0, 0, 255, 0 -fsioTable3LoadBins = array, F32, 19808, [8], "L", 1, 0, 0, 255, 0 -fsioTable3RpmBins = array, F32, 19840, [8], "RPM", 1, 0, 0, 25500, 2 -fsioTable4 = array, U08, 19872, [8x8], "value", 1, 0, 0, 255, 0 -fsioTable4LoadBins = array, F32, 19936, [8], "L", 1, 0, 0, 255, 0 -fsioTable4RpmBins = array, F32, 19968, [8], "RPM", 1, 0, 0, 25500, 2 +scriptTable1 = array, F32, 19296, [8x8], "value", 1, 0, 0, 30000, 2 +scriptTable1LoadBins = array, F32, 19552, [8], "L", 1, 0, 0, 30000, 2 +scriptTable1RpmBins = array, F32, 19584, [8], "RPM", 1, 0, 0, 25500, 2 +scriptTable2 = array, U08, 19616, [8x8], "value", 1, 0, 0, 255, 0 +scriptTable2LoadBins = array, F32, 19680, [8], "L", 1, 0, 0, 255, 0 +scriptTable2RpmBins = array, F32, 19712, [8], "RPM", 1, 0, 0, 25500, 2 +scriptTable3 = array, U08, 19744, [8x8], "value", 1, 0, 0, 255, 0 +scriptTable3LoadBins = array, F32, 19808, [8], "L", 1, 0, 0, 255, 0 +scriptTable3RpmBins = array, F32, 19840, [8], "RPM", 1, 0, 0, 25500, 2 +scriptTable4 = array, U08, 19872, [8x8], "value", 1, 0, 0, 255, 0 +scriptTable4LoadBins = array, F32, 19936, [8], "L", 1, 0, 0, 255, 0 +scriptTable4RpmBins = array, F32, 19968, [8], "RPM", 1, 0, 0, 25500, 2 ; total TS size = 20000 [SettingContextHelp] engineType = "http://rusefi.com/wiki/index.php?title=Manual:Engine_Type\nset engine_type X" @@ -1808,10 +1808,10 @@ fsioTable4RpmBins = array, F32, 19968, [8], "RPM", 1, 0, 0, 25500, 2 vvtTable1RpmBins = "RPM is float and not integer in order to use unified methods for interpolation" vvtTable2RpmBins = "RPM is float and not integer in order to use unified methods for interpolation" tpsTpsAccelToRpmBins = "RPM is float and not integer in order to use unified methods for interpolation" - fsioTable1RpmBins = "RPM is float and not integer in order to use unified methods for interpolation" - fsioTable2RpmBins = "RPM is float and not integer in order to use unified methods for interpolation" - fsioTable3RpmBins = "RPM is float and not integer in order to use unified methods for interpolation" - fsioTable4RpmBins = "RPM is float and not integer in order to use unified methods for interpolation" + scriptTable1RpmBins = "RPM is float and not integer in order to use unified methods for interpolation" + scriptTable2RpmBins = "RPM is float and not integer in order to use unified methods for interpolation" + scriptTable3RpmBins = "RPM is float and not integer in order to use unified methods for interpolation" + scriptTable4RpmBins = "RPM is float and not integer in order to use unified methods for interpolation" ; SettingContextHelpEnd @@ -2613,25 +2613,25 @@ fsioTable4RpmBins = array, F32, 19968, [8], "RPM", 1, 0, 0, 25500, 2 zBins = vvtTable2 - table = fsioTable1Tbl, fsioTable1Map, "FSIO Table #1", 1 - xBins = fsioTable1RpmBins, RPMValue - yBins = fsioTable1LoadBins, fuelingLoad - zBins = fsioTable1 + table = scriptTable1Tbl, scriptTable1Map, "FSIO Table #1", 1 + xBins = scriptTable1RpmBins, RPMValue + yBins = scriptTable1LoadBins, fuelingLoad + zBins = scriptTable1 - table = fsioTable2Tbl, fsioTable2Map, "FSIO Table #2", 1 - xBins = fsioTable2RpmBins, RPMValue - yBins = fsioTable2LoadBins, fuelingLoad - zBins = fsioTable2 + table = scriptTable2Tbl, scriptTable2Map, "FSIO Table #2", 1 + xBins = scriptTable2RpmBins, RPMValue + yBins = scriptTable2LoadBins, fuelingLoad + zBins = scriptTable2 - table = fsioTable3Tbl, fsioTable3Map, "FSIO Table #3", 1 - xBins = fsioTable3RpmBins, RPMValue - yBins = fsioTable3LoadBins, fuelingLoad - zBins = fsioTable3 + table = scriptTable3Tbl, scriptTable3Map, "FSIO Table #3", 1 + xBins = scriptTable3RpmBins, RPMValue + yBins = scriptTable3LoadBins, fuelingLoad + zBins = scriptTable3 - table = fsioTable4Tbl, fsioTable4Map, "FSIO Table #4", 1 - xBins = fsioTable4RpmBins, RPMValue - yBins = fsioTable4LoadBins, fuelingLoad - zBins = fsioTable4 + table = scriptTable4Tbl, scriptTable4Map, "FSIO Table #4", 1 + xBins = scriptTable4RpmBins, RPMValue + yBins = scriptTable4LoadBins, fuelingLoad + zBins = scriptTable4 table = baroCorrTbl, baroCorrMap, "Baro Correction", 1 ; constant, variable @@ -3326,10 +3326,10 @@ menuDialog = main subMenu = scriptSetting, "Lua Script Settings" subMenu = std_separator - subMenu = fsioTable1TblSettings, "Script Table #1" - subMenu = fsioTable2TblSettings, "Script Table #2" - subMenu = fsioTable3TblSettings, "Script Table #3" - subMenu = fsioTable4TblSettings, "Script Table #4" + subMenu = scriptTable1TblSettings, "Script Table #1" + subMenu = scriptTable2TblSettings, "Script Table #2" + subMenu = scriptTable3TblSettings, "Script Table #3" + subMenu = scriptTable4TblSettings, "Script Table #4" subMenu = scriptCurve1Settings, "Script Curve #1" subMenu = scriptCurve2Settings, "Script Curve #2" subMenu = scriptCurve3Settings, "Script Curve #3" @@ -3620,21 +3620,21 @@ cmd_set_engine_type_8888_test = "Z\x00\x30\x00\x3B" cmd_set_engine_type_default = "Z\x00\x31\x00\x00" [UserDefined] - dialog = fsioTable1TblSettings, "", yAxis + dialog = scriptTable1TblSettings, "", yAxis field = "Name", scriptTableName1 - panel = fsioTable1Tbl + panel = scriptTable1Tbl - dialog = fsioTable2TblSettings, "", yAxis + dialog = scriptTable2TblSettings, "", yAxis field = "Name", scriptTableName2 - panel = fsioTable2Tbl + panel = scriptTable2Tbl - dialog = fsioTable3TblSettings, "", yAxis + dialog = scriptTable3TblSettings, "", yAxis field = "Name", scriptTableName3 - panel = fsioTable3Tbl + panel = scriptTable3Tbl - dialog = fsioTable4TblSettings, "", yAxis + dialog = scriptTable4TblSettings, "", yAxis field = "Name", scriptTableName4 - panel = fsioTable4Tbl + panel = scriptTable4Tbl dialog = scriptCurve1Settings, "", yAxis field = "Name", scriptCurveName1 @@ -5504,7 +5504,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" field = "Warning Message", warning_message field = "Ford redundant TPS mode", useFordRedundantTps field = "consumeObdSensors", consumeObdSensors, { canReadEnabled == 1 && canWriteEnabled == 1} - field = "use FSIO Table CAN Sniffing Filtering",useFSIOTableForCanSniffingFiltering + field = "use FSIO Table CAN Sniffing Filtering",usescriptTableForCanSniffingFiltering field = "turbo speed sensor", turboSpeedSensorInputPin field = "turbo speed multiplier", turboSpeedSensorMultiplier field = "Artificial Misfire", artificialTestMisfire diff --git a/firmware/tunerstudio/generated/rusefi_kinetis.ini b/firmware/tunerstudio/generated/rusefi_kinetis.ini index a204fdfb1d..f5e2abb61b 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.4075967215" + signature = "rusEFI 2021.11.14.kin.1973032765" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.11.14.kin.4075967215" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.11.14.kin.1973032765" ; 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 15:06:23 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 15:51:40 UTC 2021 pageSize = 19972 page = 1 @@ -121,7 +121,7 @@ useRunningMathForCranking = bits, U32, 76, [23:23], "Fixed", "Fuel Map" displayLogicLevelsInEngineSniffer = bits, U32, 76, [24:24], "false", "true" useTLE8888_stepper = bits, U32, 76, [25:25], "false", "true" enableMapEstimationTableFallback = bits, U32, 76, [26:26], "false", "true" -useFSIOTableForCanSniffingFiltering = bits, U32, 76, [27:27], "false", "true" +usescriptTableForCanSniffingFiltering = bits, U32, 76, [27:27], "false", "true" issue_294_29 = bits, U32, 76, [28:28], "false", "true" artificialTestMisfire = bits, U32, 76, [29:29], "No thank you", "Danger Mode" issue_294_31 = bits, U32, 76, [30:30], "nada_example", "si_example" @@ -698,7 +698,7 @@ warningPeriod = scalar, S16, 1498, "seconds", 1, 0, 0, 60, 0 knockDetectionWindowStart = scalar, F32, 1500, "angle", 1, 0, -1000, 1000, 2 knockDetectionWindowEnd = scalar, F32, 1504, "angle", 1, 0, -1000, 1000, 2 idleStepperReactionTime = scalar, F32, 1508, "ms", 1, 0, 1, 300, 0 -unusedFsioInputs = array, U08, 1512, [20], "", 1, 0, 0, 255, 0 +unused20Inputs = array, U08, 1512, [20], "", 1, 0, 0, 255, 0 idleStepperTotalSteps = scalar, S32, 1532, "count", 1, 0, 5, 3000, 0 noAccelAfterHardLimitPeriodSecs = scalar, F32, 1536, "sec", 1, 0, 0, 60, 0 mapAveragingSchedulingAtIndex = scalar, S32, 1540, "index", 1, 0, 0, 7000, 0 @@ -1318,18 +1318,18 @@ lambdaRpmBins = array, F32, 18884, [16], "RPM", 1, 0, 0, 18000, 2 tpsTpsAccelTable = array, F32, 18948, [8x8], "value", 1, 0, 0, 30000, 2 tpsTpsAccelFromRpmBins = array, F32, 19204, [8], "from", 1, 0, 0, 30000, 2 tpsTpsAccelToRpmBins = array, F32, 19236, [8], "to", 1, 0, 0, 25500, 2 -fsioTable1 = array, F32, 19268, [8x8], "value", 1, 0, 0, 30000, 2 -fsioTable1LoadBins = array, F32, 19524, [8], "L", 1, 0, 0, 30000, 2 -fsioTable1RpmBins = array, F32, 19556, [8], "RPM", 1, 0, 0, 25500, 2 -fsioTable2 = array, U08, 19588, [8x8], "value", 1, 0, 0, 255, 0 -fsioTable2LoadBins = array, F32, 19652, [8], "L", 1, 0, 0, 255, 0 -fsioTable2RpmBins = array, F32, 19684, [8], "RPM", 1, 0, 0, 25500, 2 -fsioTable3 = array, U08, 19716, [8x8], "value", 1, 0, 0, 255, 0 -fsioTable3LoadBins = array, F32, 19780, [8], "L", 1, 0, 0, 255, 0 -fsioTable3RpmBins = array, F32, 19812, [8], "RPM", 1, 0, 0, 25500, 2 -fsioTable4 = array, U08, 19844, [8x8], "value", 1, 0, 0, 255, 0 -fsioTable4LoadBins = array, F32, 19908, [8], "L", 1, 0, 0, 255, 0 -fsioTable4RpmBins = array, F32, 19940, [8], "RPM", 1, 0, 0, 25500, 2 +scriptTable1 = array, F32, 19268, [8x8], "value", 1, 0, 0, 30000, 2 +scriptTable1LoadBins = array, F32, 19524, [8], "L", 1, 0, 0, 30000, 2 +scriptTable1RpmBins = array, F32, 19556, [8], "RPM", 1, 0, 0, 25500, 2 +scriptTable2 = array, U08, 19588, [8x8], "value", 1, 0, 0, 255, 0 +scriptTable2LoadBins = array, F32, 19652, [8], "L", 1, 0, 0, 255, 0 +scriptTable2RpmBins = array, F32, 19684, [8], "RPM", 1, 0, 0, 25500, 2 +scriptTable3 = array, U08, 19716, [8x8], "value", 1, 0, 0, 255, 0 +scriptTable3LoadBins = array, F32, 19780, [8], "L", 1, 0, 0, 255, 0 +scriptTable3RpmBins = array, F32, 19812, [8], "RPM", 1, 0, 0, 25500, 2 +scriptTable4 = array, U08, 19844, [8x8], "value", 1, 0, 0, 255, 0 +scriptTable4LoadBins = array, F32, 19908, [8], "L", 1, 0, 0, 255, 0 +scriptTable4RpmBins = array, F32, 19940, [8], "RPM", 1, 0, 0, 25500, 2 ; total TS size = 19972 [SettingContextHelp] engineType = "http://rusefi.com/wiki/index.php?title=Manual:Engine_Type\nset engine_type X" @@ -1774,10 +1774,10 @@ fsioTable4RpmBins = array, F32, 19940, [8], "RPM", 1, 0, 0, 25500, 2 vvtTable1RpmBins = "RPM is float and not integer in order to use unified methods for interpolation" vvtTable2RpmBins = "RPM is float and not integer in order to use unified methods for interpolation" tpsTpsAccelToRpmBins = "RPM is float and not integer in order to use unified methods for interpolation" - fsioTable1RpmBins = "RPM is float and not integer in order to use unified methods for interpolation" - fsioTable2RpmBins = "RPM is float and not integer in order to use unified methods for interpolation" - fsioTable3RpmBins = "RPM is float and not integer in order to use unified methods for interpolation" - fsioTable4RpmBins = "RPM is float and not integer in order to use unified methods for interpolation" + scriptTable1RpmBins = "RPM is float and not integer in order to use unified methods for interpolation" + scriptTable2RpmBins = "RPM is float and not integer in order to use unified methods for interpolation" + scriptTable3RpmBins = "RPM is float and not integer in order to use unified methods for interpolation" + scriptTable4RpmBins = "RPM is float and not integer in order to use unified methods for interpolation" ; SettingContextHelpEnd @@ -2579,25 +2579,25 @@ fsioTable4RpmBins = array, F32, 19940, [8], "RPM", 1, 0, 0, 25500, 2 zBins = vvtTable2 - table = fsioTable1Tbl, fsioTable1Map, "FSIO Table #1", 1 - xBins = fsioTable1RpmBins, RPMValue - yBins = fsioTable1LoadBins, fuelingLoad - zBins = fsioTable1 + table = scriptTable1Tbl, scriptTable1Map, "FSIO Table #1", 1 + xBins = scriptTable1RpmBins, RPMValue + yBins = scriptTable1LoadBins, fuelingLoad + zBins = scriptTable1 - table = fsioTable2Tbl, fsioTable2Map, "FSIO Table #2", 1 - xBins = fsioTable2RpmBins, RPMValue - yBins = fsioTable2LoadBins, fuelingLoad - zBins = fsioTable2 + table = scriptTable2Tbl, scriptTable2Map, "FSIO Table #2", 1 + xBins = scriptTable2RpmBins, RPMValue + yBins = scriptTable2LoadBins, fuelingLoad + zBins = scriptTable2 - table = fsioTable3Tbl, fsioTable3Map, "FSIO Table #3", 1 - xBins = fsioTable3RpmBins, RPMValue - yBins = fsioTable3LoadBins, fuelingLoad - zBins = fsioTable3 + table = scriptTable3Tbl, scriptTable3Map, "FSIO Table #3", 1 + xBins = scriptTable3RpmBins, RPMValue + yBins = scriptTable3LoadBins, fuelingLoad + zBins = scriptTable3 - table = fsioTable4Tbl, fsioTable4Map, "FSIO Table #4", 1 - xBins = fsioTable4RpmBins, RPMValue - yBins = fsioTable4LoadBins, fuelingLoad - zBins = fsioTable4 + table = scriptTable4Tbl, scriptTable4Map, "FSIO Table #4", 1 + xBins = scriptTable4RpmBins, RPMValue + yBins = scriptTable4LoadBins, fuelingLoad + zBins = scriptTable4 table = baroCorrTbl, baroCorrMap, "Baro Correction", 1 ; constant, variable @@ -3292,10 +3292,10 @@ menuDialog = main subMenu = scriptSetting, "Lua Script Settings" subMenu = std_separator - subMenu = fsioTable1TblSettings, "Script Table #1" - subMenu = fsioTable2TblSettings, "Script Table #2" - subMenu = fsioTable3TblSettings, "Script Table #3" - subMenu = fsioTable4TblSettings, "Script Table #4" + subMenu = scriptTable1TblSettings, "Script Table #1" + subMenu = scriptTable2TblSettings, "Script Table #2" + subMenu = scriptTable3TblSettings, "Script Table #3" + subMenu = scriptTable4TblSettings, "Script Table #4" subMenu = scriptCurve1Settings, "Script Curve #1" subMenu = scriptCurve2Settings, "Script Curve #2" subMenu = scriptCurve3Settings, "Script Curve #3" @@ -3586,21 +3586,21 @@ cmd_set_engine_type_8888_test = "Z\x00\x30\x00\x3B" cmd_set_engine_type_default = "Z\x00\x31\x00\x00" [UserDefined] - dialog = fsioTable1TblSettings, "", yAxis + dialog = scriptTable1TblSettings, "", yAxis field = "Name", scriptTableName1 - panel = fsioTable1Tbl + panel = scriptTable1Tbl - dialog = fsioTable2TblSettings, "", yAxis + dialog = scriptTable2TblSettings, "", yAxis field = "Name", scriptTableName2 - panel = fsioTable2Tbl + panel = scriptTable2Tbl - dialog = fsioTable3TblSettings, "", yAxis + dialog = scriptTable3TblSettings, "", yAxis field = "Name", scriptTableName3 - panel = fsioTable3Tbl + panel = scriptTable3Tbl - dialog = fsioTable4TblSettings, "", yAxis + dialog = scriptTable4TblSettings, "", yAxis field = "Name", scriptTableName4 - panel = fsioTable4Tbl + panel = scriptTable4Tbl dialog = scriptCurve1Settings, "", yAxis field = "Name", scriptCurveName1 @@ -5471,7 +5471,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" field = "Warning Message", warning_message field = "Ford redundant TPS mode", useFordRedundantTps field = "consumeObdSensors", consumeObdSensors, { canReadEnabled == 1 && canWriteEnabled == 1} - field = "use FSIO Table CAN Sniffing Filtering",useFSIOTableForCanSniffingFiltering + field = "use FSIO Table CAN Sniffing Filtering",usescriptTableForCanSniffingFiltering field = "turbo speed sensor", turboSpeedSensorInputPin field = "turbo speed multiplier", turboSpeedSensorMultiplier field = "Artificial Misfire", artificialTestMisfire diff --git a/firmware/tunerstudio/generated/rusefi_mre_f4.ini b/firmware/tunerstudio/generated/rusefi_mre_f4.ini index c0abd5af6c..069e7c1bd4 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.3420671269" + signature = "rusEFI 2021.11.14.mre_f4.999380956" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.11.14.mre_f4.3420671269" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.11.14.mre_f4.999380956" ; 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 15:05: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 15:51:17 UTC 2021 pageSize = 20000 page = 1 @@ -121,7 +121,7 @@ useRunningMathForCranking = bits, U32, 76, [23:23], "Fixed", "Fuel Map" displayLogicLevelsInEngineSniffer = bits, U32, 76, [24:24], "false", "true" useTLE8888_stepper = bits, U32, 76, [25:25], "false", "true" enableMapEstimationTableFallback = bits, U32, 76, [26:26], "false", "true" -useFSIOTableForCanSniffingFiltering = bits, U32, 76, [27:27], "false", "true" +usescriptTableForCanSniffingFiltering = bits, U32, 76, [27:27], "false", "true" issue_294_29 = bits, U32, 76, [28:28], "false", "true" artificialTestMisfire = bits, U32, 76, [29:29], "No thank you", "Danger Mode" issue_294_31 = bits, U32, 76, [30:30], "nada_example", "si_example" @@ -707,7 +707,7 @@ warningPeriod = scalar, S16, 1498, "seconds", 1, 0, 0, 60, 0 knockDetectionWindowStart = scalar, F32, 1500, "angle", 1, 0, -1000, 1000, 2 knockDetectionWindowEnd = scalar, F32, 1504, "angle", 1, 0, -1000, 1000, 2 idleStepperReactionTime = scalar, F32, 1508, "ms", 1, 0, 1, 300, 0 -unusedFsioInputs = array, U08, 1512, [20], "", 1, 0, 0, 255, 0 +unused20Inputs = array, U08, 1512, [20], "", 1, 0, 0, 255, 0 idleStepperTotalSteps = scalar, S32, 1532, "count", 1, 0, 5, 3000, 0 noAccelAfterHardLimitPeriodSecs = scalar, F32, 1536, "sec", 1, 0, 0, 60, 0 mapAveragingSchedulingAtIndex = scalar, S32, 1540, "index", 1, 0, 0, 7000, 0 @@ -1340,18 +1340,18 @@ lambdaRpmBins = array, F32, 18912, [16], "RPM", 1, 0, 0, 18000, 2 tpsTpsAccelTable = array, F32, 18976, [8x8], "value", 1, 0, 0, 30000, 2 tpsTpsAccelFromRpmBins = array, F32, 19232, [8], "from", 1, 0, 0, 30000, 2 tpsTpsAccelToRpmBins = array, F32, 19264, [8], "to", 1, 0, 0, 25500, 2 -fsioTable1 = array, F32, 19296, [8x8], "value", 1, 0, 0, 30000, 2 -fsioTable1LoadBins = array, F32, 19552, [8], "L", 1, 0, 0, 30000, 2 -fsioTable1RpmBins = array, F32, 19584, [8], "RPM", 1, 0, 0, 25500, 2 -fsioTable2 = array, U08, 19616, [8x8], "value", 1, 0, 0, 255, 0 -fsioTable2LoadBins = array, F32, 19680, [8], "L", 1, 0, 0, 255, 0 -fsioTable2RpmBins = array, F32, 19712, [8], "RPM", 1, 0, 0, 25500, 2 -fsioTable3 = array, U08, 19744, [8x8], "value", 1, 0, 0, 255, 0 -fsioTable3LoadBins = array, F32, 19808, [8], "L", 1, 0, 0, 255, 0 -fsioTable3RpmBins = array, F32, 19840, [8], "RPM", 1, 0, 0, 25500, 2 -fsioTable4 = array, U08, 19872, [8x8], "value", 1, 0, 0, 255, 0 -fsioTable4LoadBins = array, F32, 19936, [8], "L", 1, 0, 0, 255, 0 -fsioTable4RpmBins = array, F32, 19968, [8], "RPM", 1, 0, 0, 25500, 2 +scriptTable1 = array, F32, 19296, [8x8], "value", 1, 0, 0, 30000, 2 +scriptTable1LoadBins = array, F32, 19552, [8], "L", 1, 0, 0, 30000, 2 +scriptTable1RpmBins = array, F32, 19584, [8], "RPM", 1, 0, 0, 25500, 2 +scriptTable2 = array, U08, 19616, [8x8], "value", 1, 0, 0, 255, 0 +scriptTable2LoadBins = array, F32, 19680, [8], "L", 1, 0, 0, 255, 0 +scriptTable2RpmBins = array, F32, 19712, [8], "RPM", 1, 0, 0, 25500, 2 +scriptTable3 = array, U08, 19744, [8x8], "value", 1, 0, 0, 255, 0 +scriptTable3LoadBins = array, F32, 19808, [8], "L", 1, 0, 0, 255, 0 +scriptTable3RpmBins = array, F32, 19840, [8], "RPM", 1, 0, 0, 25500, 2 +scriptTable4 = array, U08, 19872, [8x8], "value", 1, 0, 0, 255, 0 +scriptTable4LoadBins = array, F32, 19936, [8], "L", 1, 0, 0, 255, 0 +scriptTable4RpmBins = array, F32, 19968, [8], "RPM", 1, 0, 0, 25500, 2 ; total TS size = 20000 [SettingContextHelp] engineType = "http://rusefi.com/wiki/index.php?title=Manual:Engine_Type\nset engine_type X" @@ -1808,10 +1808,10 @@ fsioTable4RpmBins = array, F32, 19968, [8], "RPM", 1, 0, 0, 25500, 2 vvtTable1RpmBins = "RPM is float and not integer in order to use unified methods for interpolation" vvtTable2RpmBins = "RPM is float and not integer in order to use unified methods for interpolation" tpsTpsAccelToRpmBins = "RPM is float and not integer in order to use unified methods for interpolation" - fsioTable1RpmBins = "RPM is float and not integer in order to use unified methods for interpolation" - fsioTable2RpmBins = "RPM is float and not integer in order to use unified methods for interpolation" - fsioTable3RpmBins = "RPM is float and not integer in order to use unified methods for interpolation" - fsioTable4RpmBins = "RPM is float and not integer in order to use unified methods for interpolation" + scriptTable1RpmBins = "RPM is float and not integer in order to use unified methods for interpolation" + scriptTable2RpmBins = "RPM is float and not integer in order to use unified methods for interpolation" + scriptTable3RpmBins = "RPM is float and not integer in order to use unified methods for interpolation" + scriptTable4RpmBins = "RPM is float and not integer in order to use unified methods for interpolation" ; SettingContextHelpEnd @@ -2613,25 +2613,25 @@ fsioTable4RpmBins = array, F32, 19968, [8], "RPM", 1, 0, 0, 25500, 2 zBins = vvtTable2 - table = fsioTable1Tbl, fsioTable1Map, "FSIO Table #1", 1 - xBins = fsioTable1RpmBins, RPMValue - yBins = fsioTable1LoadBins, fuelingLoad - zBins = fsioTable1 + table = scriptTable1Tbl, scriptTable1Map, "FSIO Table #1", 1 + xBins = scriptTable1RpmBins, RPMValue + yBins = scriptTable1LoadBins, fuelingLoad + zBins = scriptTable1 - table = fsioTable2Tbl, fsioTable2Map, "FSIO Table #2", 1 - xBins = fsioTable2RpmBins, RPMValue - yBins = fsioTable2LoadBins, fuelingLoad - zBins = fsioTable2 + table = scriptTable2Tbl, scriptTable2Map, "FSIO Table #2", 1 + xBins = scriptTable2RpmBins, RPMValue + yBins = scriptTable2LoadBins, fuelingLoad + zBins = scriptTable2 - table = fsioTable3Tbl, fsioTable3Map, "FSIO Table #3", 1 - xBins = fsioTable3RpmBins, RPMValue - yBins = fsioTable3LoadBins, fuelingLoad - zBins = fsioTable3 + table = scriptTable3Tbl, scriptTable3Map, "FSIO Table #3", 1 + xBins = scriptTable3RpmBins, RPMValue + yBins = scriptTable3LoadBins, fuelingLoad + zBins = scriptTable3 - table = fsioTable4Tbl, fsioTable4Map, "FSIO Table #4", 1 - xBins = fsioTable4RpmBins, RPMValue - yBins = fsioTable4LoadBins, fuelingLoad - zBins = fsioTable4 + table = scriptTable4Tbl, scriptTable4Map, "FSIO Table #4", 1 + xBins = scriptTable4RpmBins, RPMValue + yBins = scriptTable4LoadBins, fuelingLoad + zBins = scriptTable4 table = baroCorrTbl, baroCorrMap, "Baro Correction", 1 ; constant, variable @@ -3326,10 +3326,10 @@ menuDialog = main subMenu = scriptSetting, "Lua Script Settings" subMenu = std_separator - subMenu = fsioTable1TblSettings, "Script Table #1" - subMenu = fsioTable2TblSettings, "Script Table #2" - subMenu = fsioTable3TblSettings, "Script Table #3" - subMenu = fsioTable4TblSettings, "Script Table #4" + subMenu = scriptTable1TblSettings, "Script Table #1" + subMenu = scriptTable2TblSettings, "Script Table #2" + subMenu = scriptTable3TblSettings, "Script Table #3" + subMenu = scriptTable4TblSettings, "Script Table #4" subMenu = scriptCurve1Settings, "Script Curve #1" subMenu = scriptCurve2Settings, "Script Curve #2" subMenu = scriptCurve3Settings, "Script Curve #3" @@ -3616,21 +3616,21 @@ cmd_set_engine_type_8888_test = "Z\x00\x30\x00\x3B" cmd_set_engine_type_default = "Z\x00\x31\x00\x00" [UserDefined] - dialog = fsioTable1TblSettings, "", yAxis + dialog = scriptTable1TblSettings, "", yAxis field = "Name", scriptTableName1 - panel = fsioTable1Tbl + panel = scriptTable1Tbl - dialog = fsioTable2TblSettings, "", yAxis + dialog = scriptTable2TblSettings, "", yAxis field = "Name", scriptTableName2 - panel = fsioTable2Tbl + panel = scriptTable2Tbl - dialog = fsioTable3TblSettings, "", yAxis + dialog = scriptTable3TblSettings, "", yAxis field = "Name", scriptTableName3 - panel = fsioTable3Tbl + panel = scriptTable3Tbl - dialog = fsioTable4TblSettings, "", yAxis + dialog = scriptTable4TblSettings, "", yAxis field = "Name", scriptTableName4 - panel = fsioTable4Tbl + panel = scriptTable4Tbl dialog = scriptCurve1Settings, "", yAxis field = "Name", scriptCurveName1 @@ -5473,7 +5473,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" field = "Warning Message", warning_message field = "Ford redundant TPS mode", useFordRedundantTps field = "consumeObdSensors", consumeObdSensors, { canReadEnabled == 1 && canWriteEnabled == 1} - field = "use FSIO Table CAN Sniffing Filtering",useFSIOTableForCanSniffingFiltering + field = "use FSIO Table CAN Sniffing Filtering",usescriptTableForCanSniffingFiltering field = "turbo speed sensor", turboSpeedSensorInputPin field = "turbo speed multiplier", turboSpeedSensorMultiplier field = "Artificial Misfire", artificialTestMisfire diff --git a/firmware/tunerstudio/generated/rusefi_mre_f7.ini b/firmware/tunerstudio/generated/rusefi_mre_f7.ini index ac6aebe92c..29212cb86a 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.3420671269" + signature = "rusEFI 2021.11.14.mre_f7.999380956" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.11.14.mre_f7.3420671269" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.11.14.mre_f7.999380956" ; 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 15:05:54 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Nov 14 15:51:14 UTC 2021 pageSize = 20000 page = 1 @@ -121,7 +121,7 @@ useRunningMathForCranking = bits, U32, 76, [23:23], "Fixed", "Fuel Map" displayLogicLevelsInEngineSniffer = bits, U32, 76, [24:24], "false", "true" useTLE8888_stepper = bits, U32, 76, [25:25], "false", "true" enableMapEstimationTableFallback = bits, U32, 76, [26:26], "false", "true" -useFSIOTableForCanSniffingFiltering = bits, U32, 76, [27:27], "false", "true" +usescriptTableForCanSniffingFiltering = bits, U32, 76, [27:27], "false", "true" issue_294_29 = bits, U32, 76, [28:28], "false", "true" artificialTestMisfire = bits, U32, 76, [29:29], "No thank you", "Danger Mode" issue_294_31 = bits, U32, 76, [30:30], "nada_example", "si_example" @@ -707,7 +707,7 @@ warningPeriod = scalar, S16, 1498, "seconds", 1, 0, 0, 60, 0 knockDetectionWindowStart = scalar, F32, 1500, "angle", 1, 0, -1000, 1000, 2 knockDetectionWindowEnd = scalar, F32, 1504, "angle", 1, 0, -1000, 1000, 2 idleStepperReactionTime = scalar, F32, 1508, "ms", 1, 0, 1, 300, 0 -unusedFsioInputs = array, U08, 1512, [20], "", 1, 0, 0, 255, 0 +unused20Inputs = array, U08, 1512, [20], "", 1, 0, 0, 255, 0 idleStepperTotalSteps = scalar, S32, 1532, "count", 1, 0, 5, 3000, 0 noAccelAfterHardLimitPeriodSecs = scalar, F32, 1536, "sec", 1, 0, 0, 60, 0 mapAveragingSchedulingAtIndex = scalar, S32, 1540, "index", 1, 0, 0, 7000, 0 @@ -1340,18 +1340,18 @@ lambdaRpmBins = array, F32, 18912, [16], "RPM", 1, 0, 0, 18000, 2 tpsTpsAccelTable = array, F32, 18976, [8x8], "value", 1, 0, 0, 30000, 2 tpsTpsAccelFromRpmBins = array, F32, 19232, [8], "from", 1, 0, 0, 30000, 2 tpsTpsAccelToRpmBins = array, F32, 19264, [8], "to", 1, 0, 0, 25500, 2 -fsioTable1 = array, F32, 19296, [8x8], "value", 1, 0, 0, 30000, 2 -fsioTable1LoadBins = array, F32, 19552, [8], "L", 1, 0, 0, 30000, 2 -fsioTable1RpmBins = array, F32, 19584, [8], "RPM", 1, 0, 0, 25500, 2 -fsioTable2 = array, U08, 19616, [8x8], "value", 1, 0, 0, 255, 0 -fsioTable2LoadBins = array, F32, 19680, [8], "L", 1, 0, 0, 255, 0 -fsioTable2RpmBins = array, F32, 19712, [8], "RPM", 1, 0, 0, 25500, 2 -fsioTable3 = array, U08, 19744, [8x8], "value", 1, 0, 0, 255, 0 -fsioTable3LoadBins = array, F32, 19808, [8], "L", 1, 0, 0, 255, 0 -fsioTable3RpmBins = array, F32, 19840, [8], "RPM", 1, 0, 0, 25500, 2 -fsioTable4 = array, U08, 19872, [8x8], "value", 1, 0, 0, 255, 0 -fsioTable4LoadBins = array, F32, 19936, [8], "L", 1, 0, 0, 255, 0 -fsioTable4RpmBins = array, F32, 19968, [8], "RPM", 1, 0, 0, 25500, 2 +scriptTable1 = array, F32, 19296, [8x8], "value", 1, 0, 0, 30000, 2 +scriptTable1LoadBins = array, F32, 19552, [8], "L", 1, 0, 0, 30000, 2 +scriptTable1RpmBins = array, F32, 19584, [8], "RPM", 1, 0, 0, 25500, 2 +scriptTable2 = array, U08, 19616, [8x8], "value", 1, 0, 0, 255, 0 +scriptTable2LoadBins = array, F32, 19680, [8], "L", 1, 0, 0, 255, 0 +scriptTable2RpmBins = array, F32, 19712, [8], "RPM", 1, 0, 0, 25500, 2 +scriptTable3 = array, U08, 19744, [8x8], "value", 1, 0, 0, 255, 0 +scriptTable3LoadBins = array, F32, 19808, [8], "L", 1, 0, 0, 255, 0 +scriptTable3RpmBins = array, F32, 19840, [8], "RPM", 1, 0, 0, 25500, 2 +scriptTable4 = array, U08, 19872, [8x8], "value", 1, 0, 0, 255, 0 +scriptTable4LoadBins = array, F32, 19936, [8], "L", 1, 0, 0, 255, 0 +scriptTable4RpmBins = array, F32, 19968, [8], "RPM", 1, 0, 0, 25500, 2 ; total TS size = 20000 [SettingContextHelp] engineType = "http://rusefi.com/wiki/index.php?title=Manual:Engine_Type\nset engine_type X" @@ -1808,10 +1808,10 @@ fsioTable4RpmBins = array, F32, 19968, [8], "RPM", 1, 0, 0, 25500, 2 vvtTable1RpmBins = "RPM is float and not integer in order to use unified methods for interpolation" vvtTable2RpmBins = "RPM is float and not integer in order to use unified methods for interpolation" tpsTpsAccelToRpmBins = "RPM is float and not integer in order to use unified methods for interpolation" - fsioTable1RpmBins = "RPM is float and not integer in order to use unified methods for interpolation" - fsioTable2RpmBins = "RPM is float and not integer in order to use unified methods for interpolation" - fsioTable3RpmBins = "RPM is float and not integer in order to use unified methods for interpolation" - fsioTable4RpmBins = "RPM is float and not integer in order to use unified methods for interpolation" + scriptTable1RpmBins = "RPM is float and not integer in order to use unified methods for interpolation" + scriptTable2RpmBins = "RPM is float and not integer in order to use unified methods for interpolation" + scriptTable3RpmBins = "RPM is float and not integer in order to use unified methods for interpolation" + scriptTable4RpmBins = "RPM is float and not integer in order to use unified methods for interpolation" ; SettingContextHelpEnd @@ -2613,25 +2613,25 @@ fsioTable4RpmBins = array, F32, 19968, [8], "RPM", 1, 0, 0, 25500, 2 zBins = vvtTable2 - table = fsioTable1Tbl, fsioTable1Map, "FSIO Table #1", 1 - xBins = fsioTable1RpmBins, RPMValue - yBins = fsioTable1LoadBins, fuelingLoad - zBins = fsioTable1 + table = scriptTable1Tbl, scriptTable1Map, "FSIO Table #1", 1 + xBins = scriptTable1RpmBins, RPMValue + yBins = scriptTable1LoadBins, fuelingLoad + zBins = scriptTable1 - table = fsioTable2Tbl, fsioTable2Map, "FSIO Table #2", 1 - xBins = fsioTable2RpmBins, RPMValue - yBins = fsioTable2LoadBins, fuelingLoad - zBins = fsioTable2 + table = scriptTable2Tbl, scriptTable2Map, "FSIO Table #2", 1 + xBins = scriptTable2RpmBins, RPMValue + yBins = scriptTable2LoadBins, fuelingLoad + zBins = scriptTable2 - table = fsioTable3Tbl, fsioTable3Map, "FSIO Table #3", 1 - xBins = fsioTable3RpmBins, RPMValue - yBins = fsioTable3LoadBins, fuelingLoad - zBins = fsioTable3 + table = scriptTable3Tbl, scriptTable3Map, "FSIO Table #3", 1 + xBins = scriptTable3RpmBins, RPMValue + yBins = scriptTable3LoadBins, fuelingLoad + zBins = scriptTable3 - table = fsioTable4Tbl, fsioTable4Map, "FSIO Table #4", 1 - xBins = fsioTable4RpmBins, RPMValue - yBins = fsioTable4LoadBins, fuelingLoad - zBins = fsioTable4 + table = scriptTable4Tbl, scriptTable4Map, "FSIO Table #4", 1 + xBins = scriptTable4RpmBins, RPMValue + yBins = scriptTable4LoadBins, fuelingLoad + zBins = scriptTable4 table = baroCorrTbl, baroCorrMap, "Baro Correction", 1 ; constant, variable @@ -3326,10 +3326,10 @@ menuDialog = main subMenu = scriptSetting, "Lua Script Settings" subMenu = std_separator - subMenu = fsioTable1TblSettings, "Script Table #1" - subMenu = fsioTable2TblSettings, "Script Table #2" - subMenu = fsioTable3TblSettings, "Script Table #3" - subMenu = fsioTable4TblSettings, "Script Table #4" + subMenu = scriptTable1TblSettings, "Script Table #1" + subMenu = scriptTable2TblSettings, "Script Table #2" + subMenu = scriptTable3TblSettings, "Script Table #3" + subMenu = scriptTable4TblSettings, "Script Table #4" subMenu = scriptCurve1Settings, "Script Curve #1" subMenu = scriptCurve2Settings, "Script Curve #2" subMenu = scriptCurve3Settings, "Script Curve #3" @@ -3616,21 +3616,21 @@ cmd_set_engine_type_8888_test = "Z\x00\x30\x00\x3B" cmd_set_engine_type_default = "Z\x00\x31\x00\x00" [UserDefined] - dialog = fsioTable1TblSettings, "", yAxis + dialog = scriptTable1TblSettings, "", yAxis field = "Name", scriptTableName1 - panel = fsioTable1Tbl + panel = scriptTable1Tbl - dialog = fsioTable2TblSettings, "", yAxis + dialog = scriptTable2TblSettings, "", yAxis field = "Name", scriptTableName2 - panel = fsioTable2Tbl + panel = scriptTable2Tbl - dialog = fsioTable3TblSettings, "", yAxis + dialog = scriptTable3TblSettings, "", yAxis field = "Name", scriptTableName3 - panel = fsioTable3Tbl + panel = scriptTable3Tbl - dialog = fsioTable4TblSettings, "", yAxis + dialog = scriptTable4TblSettings, "", yAxis field = "Name", scriptTableName4 - panel = fsioTable4Tbl + panel = scriptTable4Tbl dialog = scriptCurve1Settings, "", yAxis field = "Name", scriptCurveName1 @@ -5473,7 +5473,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" field = "Warning Message", warning_message field = "Ford redundant TPS mode", useFordRedundantTps field = "consumeObdSensors", consumeObdSensors, { canReadEnabled == 1 && canWriteEnabled == 1} - field = "use FSIO Table CAN Sniffing Filtering",useFSIOTableForCanSniffingFiltering + field = "use FSIO Table CAN Sniffing Filtering",usescriptTableForCanSniffingFiltering field = "turbo speed sensor", turboSpeedSensorInputPin field = "turbo speed multiplier", turboSpeedSensorMultiplier field = "Artificial Misfire", artificialTestMisfire diff --git a/firmware/tunerstudio/generated/rusefi_prometheus_405.ini b/firmware/tunerstudio/generated/rusefi_prometheus_405.ini index 581b12e62e..ef883ee3e6 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.273874786" + signature = "rusEFI 2021.11.14.prometheus_405.3760252315" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.11.14.prometheus_405.273874786" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.11.14.prometheus_405.3760252315" ; 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 15:06:07 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Nov 14 15:51:26 UTC 2021 pageSize = 20000 page = 1 @@ -121,7 +121,7 @@ useRunningMathForCranking = bits, U32, 76, [23:23], "Fixed", "Fuel Map" displayLogicLevelsInEngineSniffer = bits, U32, 76, [24:24], "false", "true" useTLE8888_stepper = bits, U32, 76, [25:25], "false", "true" enableMapEstimationTableFallback = bits, U32, 76, [26:26], "false", "true" -useFSIOTableForCanSniffingFiltering = bits, U32, 76, [27:27], "false", "true" +usescriptTableForCanSniffingFiltering = bits, U32, 76, [27:27], "false", "true" issue_294_29 = bits, U32, 76, [28:28], "false", "true" artificialTestMisfire = bits, U32, 76, [29:29], "No thank you", "Danger Mode" issue_294_31 = bits, U32, 76, [30:30], "nada_example", "si_example" @@ -707,7 +707,7 @@ warningPeriod = scalar, S16, 1498, "seconds", 1, 0, 0, 60, 0 knockDetectionWindowStart = scalar, F32, 1500, "angle", 1, 0, -1000, 1000, 2 knockDetectionWindowEnd = scalar, F32, 1504, "angle", 1, 0, -1000, 1000, 2 idleStepperReactionTime = scalar, F32, 1508, "ms", 1, 0, 1, 300, 0 -unusedFsioInputs = array, U08, 1512, [20], "", 1, 0, 0, 255, 0 +unused20Inputs = array, U08, 1512, [20], "", 1, 0, 0, 255, 0 idleStepperTotalSteps = scalar, S32, 1532, "count", 1, 0, 5, 3000, 0 noAccelAfterHardLimitPeriodSecs = scalar, F32, 1536, "sec", 1, 0, 0, 60, 0 mapAveragingSchedulingAtIndex = scalar, S32, 1540, "index", 1, 0, 0, 7000, 0 @@ -1340,18 +1340,18 @@ lambdaRpmBins = array, F32, 18912, [16], "RPM", 1, 0, 0, 18000, 2 tpsTpsAccelTable = array, F32, 18976, [8x8], "value", 1, 0, 0, 30000, 2 tpsTpsAccelFromRpmBins = array, F32, 19232, [8], "from", 1, 0, 0, 30000, 2 tpsTpsAccelToRpmBins = array, F32, 19264, [8], "to", 1, 0, 0, 25500, 2 -fsioTable1 = array, F32, 19296, [8x8], "value", 1, 0, 0, 30000, 2 -fsioTable1LoadBins = array, F32, 19552, [8], "L", 1, 0, 0, 30000, 2 -fsioTable1RpmBins = array, F32, 19584, [8], "RPM", 1, 0, 0, 25500, 2 -fsioTable2 = array, U08, 19616, [8x8], "value", 1, 0, 0, 255, 0 -fsioTable2LoadBins = array, F32, 19680, [8], "L", 1, 0, 0, 255, 0 -fsioTable2RpmBins = array, F32, 19712, [8], "RPM", 1, 0, 0, 25500, 2 -fsioTable3 = array, U08, 19744, [8x8], "value", 1, 0, 0, 255, 0 -fsioTable3LoadBins = array, F32, 19808, [8], "L", 1, 0, 0, 255, 0 -fsioTable3RpmBins = array, F32, 19840, [8], "RPM", 1, 0, 0, 25500, 2 -fsioTable4 = array, U08, 19872, [8x8], "value", 1, 0, 0, 255, 0 -fsioTable4LoadBins = array, F32, 19936, [8], "L", 1, 0, 0, 255, 0 -fsioTable4RpmBins = array, F32, 19968, [8], "RPM", 1, 0, 0, 25500, 2 +scriptTable1 = array, F32, 19296, [8x8], "value", 1, 0, 0, 30000, 2 +scriptTable1LoadBins = array, F32, 19552, [8], "L", 1, 0, 0, 30000, 2 +scriptTable1RpmBins = array, F32, 19584, [8], "RPM", 1, 0, 0, 25500, 2 +scriptTable2 = array, U08, 19616, [8x8], "value", 1, 0, 0, 255, 0 +scriptTable2LoadBins = array, F32, 19680, [8], "L", 1, 0, 0, 255, 0 +scriptTable2RpmBins = array, F32, 19712, [8], "RPM", 1, 0, 0, 25500, 2 +scriptTable3 = array, U08, 19744, [8x8], "value", 1, 0, 0, 255, 0 +scriptTable3LoadBins = array, F32, 19808, [8], "L", 1, 0, 0, 255, 0 +scriptTable3RpmBins = array, F32, 19840, [8], "RPM", 1, 0, 0, 25500, 2 +scriptTable4 = array, U08, 19872, [8x8], "value", 1, 0, 0, 255, 0 +scriptTable4LoadBins = array, F32, 19936, [8], "L", 1, 0, 0, 255, 0 +scriptTable4RpmBins = array, F32, 19968, [8], "RPM", 1, 0, 0, 25500, 2 ; total TS size = 20000 [SettingContextHelp] engineType = "http://rusefi.com/wiki/index.php?title=Manual:Engine_Type\nset engine_type X" @@ -1808,10 +1808,10 @@ fsioTable4RpmBins = array, F32, 19968, [8], "RPM", 1, 0, 0, 25500, 2 vvtTable1RpmBins = "RPM is float and not integer in order to use unified methods for interpolation" vvtTable2RpmBins = "RPM is float and not integer in order to use unified methods for interpolation" tpsTpsAccelToRpmBins = "RPM is float and not integer in order to use unified methods for interpolation" - fsioTable1RpmBins = "RPM is float and not integer in order to use unified methods for interpolation" - fsioTable2RpmBins = "RPM is float and not integer in order to use unified methods for interpolation" - fsioTable3RpmBins = "RPM is float and not integer in order to use unified methods for interpolation" - fsioTable4RpmBins = "RPM is float and not integer in order to use unified methods for interpolation" + scriptTable1RpmBins = "RPM is float and not integer in order to use unified methods for interpolation" + scriptTable2RpmBins = "RPM is float and not integer in order to use unified methods for interpolation" + scriptTable3RpmBins = "RPM is float and not integer in order to use unified methods for interpolation" + scriptTable4RpmBins = "RPM is float and not integer in order to use unified methods for interpolation" ; SettingContextHelpEnd @@ -2613,25 +2613,25 @@ fsioTable4RpmBins = array, F32, 19968, [8], "RPM", 1, 0, 0, 25500, 2 zBins = vvtTable2 - table = fsioTable1Tbl, fsioTable1Map, "FSIO Table #1", 1 - xBins = fsioTable1RpmBins, RPMValue - yBins = fsioTable1LoadBins, fuelingLoad - zBins = fsioTable1 + table = scriptTable1Tbl, scriptTable1Map, "FSIO Table #1", 1 + xBins = scriptTable1RpmBins, RPMValue + yBins = scriptTable1LoadBins, fuelingLoad + zBins = scriptTable1 - table = fsioTable2Tbl, fsioTable2Map, "FSIO Table #2", 1 - xBins = fsioTable2RpmBins, RPMValue - yBins = fsioTable2LoadBins, fuelingLoad - zBins = fsioTable2 + table = scriptTable2Tbl, scriptTable2Map, "FSIO Table #2", 1 + xBins = scriptTable2RpmBins, RPMValue + yBins = scriptTable2LoadBins, fuelingLoad + zBins = scriptTable2 - table = fsioTable3Tbl, fsioTable3Map, "FSIO Table #3", 1 - xBins = fsioTable3RpmBins, RPMValue - yBins = fsioTable3LoadBins, fuelingLoad - zBins = fsioTable3 + table = scriptTable3Tbl, scriptTable3Map, "FSIO Table #3", 1 + xBins = scriptTable3RpmBins, RPMValue + yBins = scriptTable3LoadBins, fuelingLoad + zBins = scriptTable3 - table = fsioTable4Tbl, fsioTable4Map, "FSIO Table #4", 1 - xBins = fsioTable4RpmBins, RPMValue - yBins = fsioTable4LoadBins, fuelingLoad - zBins = fsioTable4 + table = scriptTable4Tbl, scriptTable4Map, "FSIO Table #4", 1 + xBins = scriptTable4RpmBins, RPMValue + yBins = scriptTable4LoadBins, fuelingLoad + zBins = scriptTable4 table = baroCorrTbl, baroCorrMap, "Baro Correction", 1 ; constant, variable @@ -3322,10 +3322,10 @@ menuDialog = main subMenu = scriptSetting, "Lua Script Settings" subMenu = std_separator - subMenu = fsioTable1TblSettings, "Script Table #1" - subMenu = fsioTable2TblSettings, "Script Table #2" - subMenu = fsioTable3TblSettings, "Script Table #3" - subMenu = fsioTable4TblSettings, "Script Table #4" + subMenu = scriptTable1TblSettings, "Script Table #1" + subMenu = scriptTable2TblSettings, "Script Table #2" + subMenu = scriptTable3TblSettings, "Script Table #3" + subMenu = scriptTable4TblSettings, "Script Table #4" subMenu = scriptCurve1Settings, "Script Curve #1" subMenu = scriptCurve2Settings, "Script Curve #2" subMenu = scriptCurve3Settings, "Script Curve #3" @@ -3615,21 +3615,21 @@ cmd_set_engine_type_8888_test = "Z\x00\x30\x00\x3B" cmd_set_engine_type_default = "Z\x00\x31\x00\x00" [UserDefined] - dialog = fsioTable1TblSettings, "", yAxis + dialog = scriptTable1TblSettings, "", yAxis field = "Name", scriptTableName1 - panel = fsioTable1Tbl + panel = scriptTable1Tbl - dialog = fsioTable2TblSettings, "", yAxis + dialog = scriptTable2TblSettings, "", yAxis field = "Name", scriptTableName2 - panel = fsioTable2Tbl + panel = scriptTable2Tbl - dialog = fsioTable3TblSettings, "", yAxis + dialog = scriptTable3TblSettings, "", yAxis field = "Name", scriptTableName3 - panel = fsioTable3Tbl + panel = scriptTable3Tbl - dialog = fsioTable4TblSettings, "", yAxis + dialog = scriptTable4TblSettings, "", yAxis field = "Name", scriptTableName4 - panel = fsioTable4Tbl + panel = scriptTable4Tbl dialog = scriptCurve1Settings, "", yAxis field = "Name", scriptCurveName1 @@ -5499,7 +5499,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" field = "Warning Message", warning_message field = "Ford redundant TPS mode", useFordRedundantTps field = "consumeObdSensors", consumeObdSensors, { canReadEnabled == 1 && canWriteEnabled == 1} - field = "use FSIO Table CAN Sniffing Filtering",useFSIOTableForCanSniffingFiltering + field = "use FSIO Table CAN Sniffing Filtering",usescriptTableForCanSniffingFiltering field = "turbo speed sensor", turboSpeedSensorInputPin field = "turbo speed multiplier", turboSpeedSensorMultiplier field = "Artificial Misfire", artificialTestMisfire diff --git a/firmware/tunerstudio/generated/rusefi_prometheus_469.ini b/firmware/tunerstudio/generated/rusefi_prometheus_469.ini index f5342c662f..7cdc38ae62 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.273874786" + signature = "rusEFI 2021.11.14.prometheus_469.3760252315" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.11.14.prometheus_469.273874786" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.11.14.prometheus_469.3760252315" ; 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 15:06: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 15:51:23 UTC 2021 pageSize = 20000 page = 1 @@ -121,7 +121,7 @@ useRunningMathForCranking = bits, U32, 76, [23:23], "Fixed", "Fuel Map" displayLogicLevelsInEngineSniffer = bits, U32, 76, [24:24], "false", "true" useTLE8888_stepper = bits, U32, 76, [25:25], "false", "true" enableMapEstimationTableFallback = bits, U32, 76, [26:26], "false", "true" -useFSIOTableForCanSniffingFiltering = bits, U32, 76, [27:27], "false", "true" +usescriptTableForCanSniffingFiltering = bits, U32, 76, [27:27], "false", "true" issue_294_29 = bits, U32, 76, [28:28], "false", "true" artificialTestMisfire = bits, U32, 76, [29:29], "No thank you", "Danger Mode" issue_294_31 = bits, U32, 76, [30:30], "nada_example", "si_example" @@ -707,7 +707,7 @@ warningPeriod = scalar, S16, 1498, "seconds", 1, 0, 0, 60, 0 knockDetectionWindowStart = scalar, F32, 1500, "angle", 1, 0, -1000, 1000, 2 knockDetectionWindowEnd = scalar, F32, 1504, "angle", 1, 0, -1000, 1000, 2 idleStepperReactionTime = scalar, F32, 1508, "ms", 1, 0, 1, 300, 0 -unusedFsioInputs = array, U08, 1512, [20], "", 1, 0, 0, 255, 0 +unused20Inputs = array, U08, 1512, [20], "", 1, 0, 0, 255, 0 idleStepperTotalSteps = scalar, S32, 1532, "count", 1, 0, 5, 3000, 0 noAccelAfterHardLimitPeriodSecs = scalar, F32, 1536, "sec", 1, 0, 0, 60, 0 mapAveragingSchedulingAtIndex = scalar, S32, 1540, "index", 1, 0, 0, 7000, 0 @@ -1340,18 +1340,18 @@ lambdaRpmBins = array, F32, 18912, [16], "RPM", 1, 0, 0, 18000, 2 tpsTpsAccelTable = array, F32, 18976, [8x8], "value", 1, 0, 0, 30000, 2 tpsTpsAccelFromRpmBins = array, F32, 19232, [8], "from", 1, 0, 0, 30000, 2 tpsTpsAccelToRpmBins = array, F32, 19264, [8], "to", 1, 0, 0, 25500, 2 -fsioTable1 = array, F32, 19296, [8x8], "value", 1, 0, 0, 30000, 2 -fsioTable1LoadBins = array, F32, 19552, [8], "L", 1, 0, 0, 30000, 2 -fsioTable1RpmBins = array, F32, 19584, [8], "RPM", 1, 0, 0, 25500, 2 -fsioTable2 = array, U08, 19616, [8x8], "value", 1, 0, 0, 255, 0 -fsioTable2LoadBins = array, F32, 19680, [8], "L", 1, 0, 0, 255, 0 -fsioTable2RpmBins = array, F32, 19712, [8], "RPM", 1, 0, 0, 25500, 2 -fsioTable3 = array, U08, 19744, [8x8], "value", 1, 0, 0, 255, 0 -fsioTable3LoadBins = array, F32, 19808, [8], "L", 1, 0, 0, 255, 0 -fsioTable3RpmBins = array, F32, 19840, [8], "RPM", 1, 0, 0, 25500, 2 -fsioTable4 = array, U08, 19872, [8x8], "value", 1, 0, 0, 255, 0 -fsioTable4LoadBins = array, F32, 19936, [8], "L", 1, 0, 0, 255, 0 -fsioTable4RpmBins = array, F32, 19968, [8], "RPM", 1, 0, 0, 25500, 2 +scriptTable1 = array, F32, 19296, [8x8], "value", 1, 0, 0, 30000, 2 +scriptTable1LoadBins = array, F32, 19552, [8], "L", 1, 0, 0, 30000, 2 +scriptTable1RpmBins = array, F32, 19584, [8], "RPM", 1, 0, 0, 25500, 2 +scriptTable2 = array, U08, 19616, [8x8], "value", 1, 0, 0, 255, 0 +scriptTable2LoadBins = array, F32, 19680, [8], "L", 1, 0, 0, 255, 0 +scriptTable2RpmBins = array, F32, 19712, [8], "RPM", 1, 0, 0, 25500, 2 +scriptTable3 = array, U08, 19744, [8x8], "value", 1, 0, 0, 255, 0 +scriptTable3LoadBins = array, F32, 19808, [8], "L", 1, 0, 0, 255, 0 +scriptTable3RpmBins = array, F32, 19840, [8], "RPM", 1, 0, 0, 25500, 2 +scriptTable4 = array, U08, 19872, [8x8], "value", 1, 0, 0, 255, 0 +scriptTable4LoadBins = array, F32, 19936, [8], "L", 1, 0, 0, 255, 0 +scriptTable4RpmBins = array, F32, 19968, [8], "RPM", 1, 0, 0, 25500, 2 ; total TS size = 20000 [SettingContextHelp] engineType = "http://rusefi.com/wiki/index.php?title=Manual:Engine_Type\nset engine_type X" @@ -1808,10 +1808,10 @@ fsioTable4RpmBins = array, F32, 19968, [8], "RPM", 1, 0, 0, 25500, 2 vvtTable1RpmBins = "RPM is float and not integer in order to use unified methods for interpolation" vvtTable2RpmBins = "RPM is float and not integer in order to use unified methods for interpolation" tpsTpsAccelToRpmBins = "RPM is float and not integer in order to use unified methods for interpolation" - fsioTable1RpmBins = "RPM is float and not integer in order to use unified methods for interpolation" - fsioTable2RpmBins = "RPM is float and not integer in order to use unified methods for interpolation" - fsioTable3RpmBins = "RPM is float and not integer in order to use unified methods for interpolation" - fsioTable4RpmBins = "RPM is float and not integer in order to use unified methods for interpolation" + scriptTable1RpmBins = "RPM is float and not integer in order to use unified methods for interpolation" + scriptTable2RpmBins = "RPM is float and not integer in order to use unified methods for interpolation" + scriptTable3RpmBins = "RPM is float and not integer in order to use unified methods for interpolation" + scriptTable4RpmBins = "RPM is float and not integer in order to use unified methods for interpolation" ; SettingContextHelpEnd @@ -2613,25 +2613,25 @@ fsioTable4RpmBins = array, F32, 19968, [8], "RPM", 1, 0, 0, 25500, 2 zBins = vvtTable2 - table = fsioTable1Tbl, fsioTable1Map, "FSIO Table #1", 1 - xBins = fsioTable1RpmBins, RPMValue - yBins = fsioTable1LoadBins, fuelingLoad - zBins = fsioTable1 + table = scriptTable1Tbl, scriptTable1Map, "FSIO Table #1", 1 + xBins = scriptTable1RpmBins, RPMValue + yBins = scriptTable1LoadBins, fuelingLoad + zBins = scriptTable1 - table = fsioTable2Tbl, fsioTable2Map, "FSIO Table #2", 1 - xBins = fsioTable2RpmBins, RPMValue - yBins = fsioTable2LoadBins, fuelingLoad - zBins = fsioTable2 + table = scriptTable2Tbl, scriptTable2Map, "FSIO Table #2", 1 + xBins = scriptTable2RpmBins, RPMValue + yBins = scriptTable2LoadBins, fuelingLoad + zBins = scriptTable2 - table = fsioTable3Tbl, fsioTable3Map, "FSIO Table #3", 1 - xBins = fsioTable3RpmBins, RPMValue - yBins = fsioTable3LoadBins, fuelingLoad - zBins = fsioTable3 + table = scriptTable3Tbl, scriptTable3Map, "FSIO Table #3", 1 + xBins = scriptTable3RpmBins, RPMValue + yBins = scriptTable3LoadBins, fuelingLoad + zBins = scriptTable3 - table = fsioTable4Tbl, fsioTable4Map, "FSIO Table #4", 1 - xBins = fsioTable4RpmBins, RPMValue - yBins = fsioTable4LoadBins, fuelingLoad - zBins = fsioTable4 + table = scriptTable4Tbl, scriptTable4Map, "FSIO Table #4", 1 + xBins = scriptTable4RpmBins, RPMValue + yBins = scriptTable4LoadBins, fuelingLoad + zBins = scriptTable4 table = baroCorrTbl, baroCorrMap, "Baro Correction", 1 ; constant, variable @@ -3322,10 +3322,10 @@ menuDialog = main subMenu = scriptSetting, "Lua Script Settings" subMenu = std_separator - subMenu = fsioTable1TblSettings, "Script Table #1" - subMenu = fsioTable2TblSettings, "Script Table #2" - subMenu = fsioTable3TblSettings, "Script Table #3" - subMenu = fsioTable4TblSettings, "Script Table #4" + subMenu = scriptTable1TblSettings, "Script Table #1" + subMenu = scriptTable2TblSettings, "Script Table #2" + subMenu = scriptTable3TblSettings, "Script Table #3" + subMenu = scriptTable4TblSettings, "Script Table #4" subMenu = scriptCurve1Settings, "Script Curve #1" subMenu = scriptCurve2Settings, "Script Curve #2" subMenu = scriptCurve3Settings, "Script Curve #3" @@ -3615,21 +3615,21 @@ cmd_set_engine_type_8888_test = "Z\x00\x30\x00\x3B" cmd_set_engine_type_default = "Z\x00\x31\x00\x00" [UserDefined] - dialog = fsioTable1TblSettings, "", yAxis + dialog = scriptTable1TblSettings, "", yAxis field = "Name", scriptTableName1 - panel = fsioTable1Tbl + panel = scriptTable1Tbl - dialog = fsioTable2TblSettings, "", yAxis + dialog = scriptTable2TblSettings, "", yAxis field = "Name", scriptTableName2 - panel = fsioTable2Tbl + panel = scriptTable2Tbl - dialog = fsioTable3TblSettings, "", yAxis + dialog = scriptTable3TblSettings, "", yAxis field = "Name", scriptTableName3 - panel = fsioTable3Tbl + panel = scriptTable3Tbl - dialog = fsioTable4TblSettings, "", yAxis + dialog = scriptTable4TblSettings, "", yAxis field = "Name", scriptTableName4 - panel = fsioTable4Tbl + panel = scriptTable4Tbl dialog = scriptCurve1Settings, "", yAxis field = "Name", scriptCurveName1 @@ -5499,7 +5499,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" field = "Warning Message", warning_message field = "Ford redundant TPS mode", useFordRedundantTps field = "consumeObdSensors", consumeObdSensors, { canReadEnabled == 1 && canWriteEnabled == 1} - field = "use FSIO Table CAN Sniffing Filtering",useFSIOTableForCanSniffingFiltering + field = "use FSIO Table CAN Sniffing Filtering",usescriptTableForCanSniffingFiltering field = "turbo speed sensor", turboSpeedSensorInputPin field = "turbo speed multiplier", turboSpeedSensorMultiplier field = "Artificial Misfire", artificialTestMisfire diff --git a/firmware/tunerstudio/generated/rusefi_proteus_f4.ini b/firmware/tunerstudio/generated/rusefi_proteus_f4.ini index 07bbed8a77..63ff386468 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.3955707141" + signature = "rusEFI 2021.11.14.proteus_f4.464869372" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.11.14.proteus_f4.3955707141" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.11.14.proteus_f4.464869372" ; 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 15:06: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 15:51:31 UTC 2021 pageSize = 20000 page = 1 @@ -121,7 +121,7 @@ useRunningMathForCranking = bits, U32, 76, [23:23], "Fixed", "Fuel Map" displayLogicLevelsInEngineSniffer = bits, U32, 76, [24:24], "false", "true" useTLE8888_stepper = bits, U32, 76, [25:25], "false", "true" enableMapEstimationTableFallback = bits, U32, 76, [26:26], "false", "true" -useFSIOTableForCanSniffingFiltering = bits, U32, 76, [27:27], "false", "true" +usescriptTableForCanSniffingFiltering = bits, U32, 76, [27:27], "false", "true" issue_294_29 = bits, U32, 76, [28:28], "false", "true" artificialTestMisfire = bits, U32, 76, [29:29], "No thank you", "Danger Mode" issue_294_31 = bits, U32, 76, [30:30], "nada_example", "si_example" @@ -707,7 +707,7 @@ warningPeriod = scalar, S16, 1498, "seconds", 1, 0, 0, 60, 0 knockDetectionWindowStart = scalar, F32, 1500, "angle", 1, 0, -1000, 1000, 2 knockDetectionWindowEnd = scalar, F32, 1504, "angle", 1, 0, -1000, 1000, 2 idleStepperReactionTime = scalar, F32, 1508, "ms", 1, 0, 1, 300, 0 -unusedFsioInputs = array, U08, 1512, [20], "", 1, 0, 0, 255, 0 +unused20Inputs = array, U08, 1512, [20], "", 1, 0, 0, 255, 0 idleStepperTotalSteps = scalar, S32, 1532, "count", 1, 0, 5, 3000, 0 noAccelAfterHardLimitPeriodSecs = scalar, F32, 1536, "sec", 1, 0, 0, 60, 0 mapAveragingSchedulingAtIndex = scalar, S32, 1540, "index", 1, 0, 0, 7000, 0 @@ -1340,18 +1340,18 @@ lambdaRpmBins = array, F32, 18912, [16], "RPM", 1, 0, 0, 18000, 2 tpsTpsAccelTable = array, F32, 18976, [8x8], "value", 1, 0, 0, 30000, 2 tpsTpsAccelFromRpmBins = array, F32, 19232, [8], "from", 1, 0, 0, 30000, 2 tpsTpsAccelToRpmBins = array, F32, 19264, [8], "to", 1, 0, 0, 25500, 2 -fsioTable1 = array, F32, 19296, [8x8], "value", 1, 0, 0, 30000, 2 -fsioTable1LoadBins = array, F32, 19552, [8], "L", 1, 0, 0, 30000, 2 -fsioTable1RpmBins = array, F32, 19584, [8], "RPM", 1, 0, 0, 25500, 2 -fsioTable2 = array, U08, 19616, [8x8], "value", 1, 0, 0, 255, 0 -fsioTable2LoadBins = array, F32, 19680, [8], "L", 1, 0, 0, 255, 0 -fsioTable2RpmBins = array, F32, 19712, [8], "RPM", 1, 0, 0, 25500, 2 -fsioTable3 = array, U08, 19744, [8x8], "value", 1, 0, 0, 255, 0 -fsioTable3LoadBins = array, F32, 19808, [8], "L", 1, 0, 0, 255, 0 -fsioTable3RpmBins = array, F32, 19840, [8], "RPM", 1, 0, 0, 25500, 2 -fsioTable4 = array, U08, 19872, [8x8], "value", 1, 0, 0, 255, 0 -fsioTable4LoadBins = array, F32, 19936, [8], "L", 1, 0, 0, 255, 0 -fsioTable4RpmBins = array, F32, 19968, [8], "RPM", 1, 0, 0, 25500, 2 +scriptTable1 = array, F32, 19296, [8x8], "value", 1, 0, 0, 30000, 2 +scriptTable1LoadBins = array, F32, 19552, [8], "L", 1, 0, 0, 30000, 2 +scriptTable1RpmBins = array, F32, 19584, [8], "RPM", 1, 0, 0, 25500, 2 +scriptTable2 = array, U08, 19616, [8x8], "value", 1, 0, 0, 255, 0 +scriptTable2LoadBins = array, F32, 19680, [8], "L", 1, 0, 0, 255, 0 +scriptTable2RpmBins = array, F32, 19712, [8], "RPM", 1, 0, 0, 25500, 2 +scriptTable3 = array, U08, 19744, [8x8], "value", 1, 0, 0, 255, 0 +scriptTable3LoadBins = array, F32, 19808, [8], "L", 1, 0, 0, 255, 0 +scriptTable3RpmBins = array, F32, 19840, [8], "RPM", 1, 0, 0, 25500, 2 +scriptTable4 = array, U08, 19872, [8x8], "value", 1, 0, 0, 255, 0 +scriptTable4LoadBins = array, F32, 19936, [8], "L", 1, 0, 0, 255, 0 +scriptTable4RpmBins = array, F32, 19968, [8], "RPM", 1, 0, 0, 25500, 2 ; total TS size = 20000 [SettingContextHelp] engineType = "http://rusefi.com/wiki/index.php?title=Manual:Engine_Type\nset engine_type X" @@ -1808,10 +1808,10 @@ fsioTable4RpmBins = array, F32, 19968, [8], "RPM", 1, 0, 0, 25500, 2 vvtTable1RpmBins = "RPM is float and not integer in order to use unified methods for interpolation" vvtTable2RpmBins = "RPM is float and not integer in order to use unified methods for interpolation" tpsTpsAccelToRpmBins = "RPM is float and not integer in order to use unified methods for interpolation" - fsioTable1RpmBins = "RPM is float and not integer in order to use unified methods for interpolation" - fsioTable2RpmBins = "RPM is float and not integer in order to use unified methods for interpolation" - fsioTable3RpmBins = "RPM is float and not integer in order to use unified methods for interpolation" - fsioTable4RpmBins = "RPM is float and not integer in order to use unified methods for interpolation" + scriptTable1RpmBins = "RPM is float and not integer in order to use unified methods for interpolation" + scriptTable2RpmBins = "RPM is float and not integer in order to use unified methods for interpolation" + scriptTable3RpmBins = "RPM is float and not integer in order to use unified methods for interpolation" + scriptTable4RpmBins = "RPM is float and not integer in order to use unified methods for interpolation" ; SettingContextHelpEnd @@ -2613,25 +2613,25 @@ fsioTable4RpmBins = array, F32, 19968, [8], "RPM", 1, 0, 0, 25500, 2 zBins = vvtTable2 - table = fsioTable1Tbl, fsioTable1Map, "FSIO Table #1", 1 - xBins = fsioTable1RpmBins, RPMValue - yBins = fsioTable1LoadBins, fuelingLoad - zBins = fsioTable1 + table = scriptTable1Tbl, scriptTable1Map, "FSIO Table #1", 1 + xBins = scriptTable1RpmBins, RPMValue + yBins = scriptTable1LoadBins, fuelingLoad + zBins = scriptTable1 - table = fsioTable2Tbl, fsioTable2Map, "FSIO Table #2", 1 - xBins = fsioTable2RpmBins, RPMValue - yBins = fsioTable2LoadBins, fuelingLoad - zBins = fsioTable2 + table = scriptTable2Tbl, scriptTable2Map, "FSIO Table #2", 1 + xBins = scriptTable2RpmBins, RPMValue + yBins = scriptTable2LoadBins, fuelingLoad + zBins = scriptTable2 - table = fsioTable3Tbl, fsioTable3Map, "FSIO Table #3", 1 - xBins = fsioTable3RpmBins, RPMValue - yBins = fsioTable3LoadBins, fuelingLoad - zBins = fsioTable3 + table = scriptTable3Tbl, scriptTable3Map, "FSIO Table #3", 1 + xBins = scriptTable3RpmBins, RPMValue + yBins = scriptTable3LoadBins, fuelingLoad + zBins = scriptTable3 - table = fsioTable4Tbl, fsioTable4Map, "FSIO Table #4", 1 - xBins = fsioTable4RpmBins, RPMValue - yBins = fsioTable4LoadBins, fuelingLoad - zBins = fsioTable4 + table = scriptTable4Tbl, scriptTable4Map, "FSIO Table #4", 1 + xBins = scriptTable4RpmBins, RPMValue + yBins = scriptTable4LoadBins, fuelingLoad + zBins = scriptTable4 table = baroCorrTbl, baroCorrMap, "Baro Correction", 1 ; constant, variable @@ -3326,10 +3326,10 @@ menuDialog = main subMenu = scriptSetting, "Lua Script Settings" subMenu = std_separator - subMenu = fsioTable1TblSettings, "Script Table #1" - subMenu = fsioTable2TblSettings, "Script Table #2" - subMenu = fsioTable3TblSettings, "Script Table #3" - subMenu = fsioTable4TblSettings, "Script Table #4" + subMenu = scriptTable1TblSettings, "Script Table #1" + subMenu = scriptTable2TblSettings, "Script Table #2" + subMenu = scriptTable3TblSettings, "Script Table #3" + subMenu = scriptTable4TblSettings, "Script Table #4" subMenu = scriptCurve1Settings, "Script Curve #1" subMenu = scriptCurve2Settings, "Script Curve #2" subMenu = scriptCurve3Settings, "Script Curve #3" @@ -3613,21 +3613,21 @@ cmd_set_engine_type_8888_test = "Z\x00\x30\x00\x3B" cmd_set_engine_type_default = "Z\x00\x31\x00\x00" [UserDefined] - dialog = fsioTable1TblSettings, "", yAxis + dialog = scriptTable1TblSettings, "", yAxis field = "Name", scriptTableName1 - panel = fsioTable1Tbl + panel = scriptTable1Tbl - dialog = fsioTable2TblSettings, "", yAxis + dialog = scriptTable2TblSettings, "", yAxis field = "Name", scriptTableName2 - panel = fsioTable2Tbl + panel = scriptTable2Tbl - dialog = fsioTable3TblSettings, "", yAxis + dialog = scriptTable3TblSettings, "", yAxis field = "Name", scriptTableName3 - panel = fsioTable3Tbl + panel = scriptTable3Tbl - dialog = fsioTable4TblSettings, "", yAxis + dialog = scriptTable4TblSettings, "", yAxis field = "Name", scriptTableName4 - panel = fsioTable4Tbl + panel = scriptTable4Tbl dialog = scriptCurve1Settings, "", yAxis field = "Name", scriptCurveName1 @@ -5467,7 +5467,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" field = "Warning Message", warning_message field = "Ford redundant TPS mode", useFordRedundantTps field = "consumeObdSensors", consumeObdSensors, { canReadEnabled == 1 && canWriteEnabled == 1} - field = "use FSIO Table CAN Sniffing Filtering",useFSIOTableForCanSniffingFiltering + field = "use FSIO Table CAN Sniffing Filtering",usescriptTableForCanSniffingFiltering field = "turbo speed sensor", turboSpeedSensorInputPin field = "turbo speed multiplier", turboSpeedSensorMultiplier field = "Artificial Misfire", artificialTestMisfire diff --git a/firmware/tunerstudio/generated/rusefi_proteus_f7.ini b/firmware/tunerstudio/generated/rusefi_proteus_f7.ini index bbfe3ce36b..b0c7ab1383 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.3955707141" + signature = "rusEFI 2021.11.14.proteus_f7.464869372" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.11.14.proteus_f7.3955707141" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.11.14.proteus_f7.464869372" ; 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 15:06: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 15:51:29 UTC 2021 pageSize = 20000 page = 1 @@ -121,7 +121,7 @@ useRunningMathForCranking = bits, U32, 76, [23:23], "Fixed", "Fuel Map" displayLogicLevelsInEngineSniffer = bits, U32, 76, [24:24], "false", "true" useTLE8888_stepper = bits, U32, 76, [25:25], "false", "true" enableMapEstimationTableFallback = bits, U32, 76, [26:26], "false", "true" -useFSIOTableForCanSniffingFiltering = bits, U32, 76, [27:27], "false", "true" +usescriptTableForCanSniffingFiltering = bits, U32, 76, [27:27], "false", "true" issue_294_29 = bits, U32, 76, [28:28], "false", "true" artificialTestMisfire = bits, U32, 76, [29:29], "No thank you", "Danger Mode" issue_294_31 = bits, U32, 76, [30:30], "nada_example", "si_example" @@ -707,7 +707,7 @@ warningPeriod = scalar, S16, 1498, "seconds", 1, 0, 0, 60, 0 knockDetectionWindowStart = scalar, F32, 1500, "angle", 1, 0, -1000, 1000, 2 knockDetectionWindowEnd = scalar, F32, 1504, "angle", 1, 0, -1000, 1000, 2 idleStepperReactionTime = scalar, F32, 1508, "ms", 1, 0, 1, 300, 0 -unusedFsioInputs = array, U08, 1512, [20], "", 1, 0, 0, 255, 0 +unused20Inputs = array, U08, 1512, [20], "", 1, 0, 0, 255, 0 idleStepperTotalSteps = scalar, S32, 1532, "count", 1, 0, 5, 3000, 0 noAccelAfterHardLimitPeriodSecs = scalar, F32, 1536, "sec", 1, 0, 0, 60, 0 mapAveragingSchedulingAtIndex = scalar, S32, 1540, "index", 1, 0, 0, 7000, 0 @@ -1340,18 +1340,18 @@ lambdaRpmBins = array, F32, 18912, [16], "RPM", 1, 0, 0, 18000, 2 tpsTpsAccelTable = array, F32, 18976, [8x8], "value", 1, 0, 0, 30000, 2 tpsTpsAccelFromRpmBins = array, F32, 19232, [8], "from", 1, 0, 0, 30000, 2 tpsTpsAccelToRpmBins = array, F32, 19264, [8], "to", 1, 0, 0, 25500, 2 -fsioTable1 = array, F32, 19296, [8x8], "value", 1, 0, 0, 30000, 2 -fsioTable1LoadBins = array, F32, 19552, [8], "L", 1, 0, 0, 30000, 2 -fsioTable1RpmBins = array, F32, 19584, [8], "RPM", 1, 0, 0, 25500, 2 -fsioTable2 = array, U08, 19616, [8x8], "value", 1, 0, 0, 255, 0 -fsioTable2LoadBins = array, F32, 19680, [8], "L", 1, 0, 0, 255, 0 -fsioTable2RpmBins = array, F32, 19712, [8], "RPM", 1, 0, 0, 25500, 2 -fsioTable3 = array, U08, 19744, [8x8], "value", 1, 0, 0, 255, 0 -fsioTable3LoadBins = array, F32, 19808, [8], "L", 1, 0, 0, 255, 0 -fsioTable3RpmBins = array, F32, 19840, [8], "RPM", 1, 0, 0, 25500, 2 -fsioTable4 = array, U08, 19872, [8x8], "value", 1, 0, 0, 255, 0 -fsioTable4LoadBins = array, F32, 19936, [8], "L", 1, 0, 0, 255, 0 -fsioTable4RpmBins = array, F32, 19968, [8], "RPM", 1, 0, 0, 25500, 2 +scriptTable1 = array, F32, 19296, [8x8], "value", 1, 0, 0, 30000, 2 +scriptTable1LoadBins = array, F32, 19552, [8], "L", 1, 0, 0, 30000, 2 +scriptTable1RpmBins = array, F32, 19584, [8], "RPM", 1, 0, 0, 25500, 2 +scriptTable2 = array, U08, 19616, [8x8], "value", 1, 0, 0, 255, 0 +scriptTable2LoadBins = array, F32, 19680, [8], "L", 1, 0, 0, 255, 0 +scriptTable2RpmBins = array, F32, 19712, [8], "RPM", 1, 0, 0, 25500, 2 +scriptTable3 = array, U08, 19744, [8x8], "value", 1, 0, 0, 255, 0 +scriptTable3LoadBins = array, F32, 19808, [8], "L", 1, 0, 0, 255, 0 +scriptTable3RpmBins = array, F32, 19840, [8], "RPM", 1, 0, 0, 25500, 2 +scriptTable4 = array, U08, 19872, [8x8], "value", 1, 0, 0, 255, 0 +scriptTable4LoadBins = array, F32, 19936, [8], "L", 1, 0, 0, 255, 0 +scriptTable4RpmBins = array, F32, 19968, [8], "RPM", 1, 0, 0, 25500, 2 ; total TS size = 20000 [SettingContextHelp] engineType = "http://rusefi.com/wiki/index.php?title=Manual:Engine_Type\nset engine_type X" @@ -1808,10 +1808,10 @@ fsioTable4RpmBins = array, F32, 19968, [8], "RPM", 1, 0, 0, 25500, 2 vvtTable1RpmBins = "RPM is float and not integer in order to use unified methods for interpolation" vvtTable2RpmBins = "RPM is float and not integer in order to use unified methods for interpolation" tpsTpsAccelToRpmBins = "RPM is float and not integer in order to use unified methods for interpolation" - fsioTable1RpmBins = "RPM is float and not integer in order to use unified methods for interpolation" - fsioTable2RpmBins = "RPM is float and not integer in order to use unified methods for interpolation" - fsioTable3RpmBins = "RPM is float and not integer in order to use unified methods for interpolation" - fsioTable4RpmBins = "RPM is float and not integer in order to use unified methods for interpolation" + scriptTable1RpmBins = "RPM is float and not integer in order to use unified methods for interpolation" + scriptTable2RpmBins = "RPM is float and not integer in order to use unified methods for interpolation" + scriptTable3RpmBins = "RPM is float and not integer in order to use unified methods for interpolation" + scriptTable4RpmBins = "RPM is float and not integer in order to use unified methods for interpolation" ; SettingContextHelpEnd @@ -2613,25 +2613,25 @@ fsioTable4RpmBins = array, F32, 19968, [8], "RPM", 1, 0, 0, 25500, 2 zBins = vvtTable2 - table = fsioTable1Tbl, fsioTable1Map, "FSIO Table #1", 1 - xBins = fsioTable1RpmBins, RPMValue - yBins = fsioTable1LoadBins, fuelingLoad - zBins = fsioTable1 + table = scriptTable1Tbl, scriptTable1Map, "FSIO Table #1", 1 + xBins = scriptTable1RpmBins, RPMValue + yBins = scriptTable1LoadBins, fuelingLoad + zBins = scriptTable1 - table = fsioTable2Tbl, fsioTable2Map, "FSIO Table #2", 1 - xBins = fsioTable2RpmBins, RPMValue - yBins = fsioTable2LoadBins, fuelingLoad - zBins = fsioTable2 + table = scriptTable2Tbl, scriptTable2Map, "FSIO Table #2", 1 + xBins = scriptTable2RpmBins, RPMValue + yBins = scriptTable2LoadBins, fuelingLoad + zBins = scriptTable2 - table = fsioTable3Tbl, fsioTable3Map, "FSIO Table #3", 1 - xBins = fsioTable3RpmBins, RPMValue - yBins = fsioTable3LoadBins, fuelingLoad - zBins = fsioTable3 + table = scriptTable3Tbl, scriptTable3Map, "FSIO Table #3", 1 + xBins = scriptTable3RpmBins, RPMValue + yBins = scriptTable3LoadBins, fuelingLoad + zBins = scriptTable3 - table = fsioTable4Tbl, fsioTable4Map, "FSIO Table #4", 1 - xBins = fsioTable4RpmBins, RPMValue - yBins = fsioTable4LoadBins, fuelingLoad - zBins = fsioTable4 + table = scriptTable4Tbl, scriptTable4Map, "FSIO Table #4", 1 + xBins = scriptTable4RpmBins, RPMValue + yBins = scriptTable4LoadBins, fuelingLoad + zBins = scriptTable4 table = baroCorrTbl, baroCorrMap, "Baro Correction", 1 ; constant, variable @@ -3326,10 +3326,10 @@ menuDialog = main subMenu = scriptSetting, "Lua Script Settings" subMenu = std_separator - subMenu = fsioTable1TblSettings, "Script Table #1" - subMenu = fsioTable2TblSettings, "Script Table #2" - subMenu = fsioTable3TblSettings, "Script Table #3" - subMenu = fsioTable4TblSettings, "Script Table #4" + subMenu = scriptTable1TblSettings, "Script Table #1" + subMenu = scriptTable2TblSettings, "Script Table #2" + subMenu = scriptTable3TblSettings, "Script Table #3" + subMenu = scriptTable4TblSettings, "Script Table #4" subMenu = scriptCurve1Settings, "Script Curve #1" subMenu = scriptCurve2Settings, "Script Curve #2" subMenu = scriptCurve3Settings, "Script Curve #3" @@ -3613,21 +3613,21 @@ cmd_set_engine_type_8888_test = "Z\x00\x30\x00\x3B" cmd_set_engine_type_default = "Z\x00\x31\x00\x00" [UserDefined] - dialog = fsioTable1TblSettings, "", yAxis + dialog = scriptTable1TblSettings, "", yAxis field = "Name", scriptTableName1 - panel = fsioTable1Tbl + panel = scriptTable1Tbl - dialog = fsioTable2TblSettings, "", yAxis + dialog = scriptTable2TblSettings, "", yAxis field = "Name", scriptTableName2 - panel = fsioTable2Tbl + panel = scriptTable2Tbl - dialog = fsioTable3TblSettings, "", yAxis + dialog = scriptTable3TblSettings, "", yAxis field = "Name", scriptTableName3 - panel = fsioTable3Tbl + panel = scriptTable3Tbl - dialog = fsioTable4TblSettings, "", yAxis + dialog = scriptTable4TblSettings, "", yAxis field = "Name", scriptTableName4 - panel = fsioTable4Tbl + panel = scriptTable4Tbl dialog = scriptCurve1Settings, "", yAxis field = "Name", scriptCurveName1 @@ -5467,7 +5467,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" field = "Warning Message", warning_message field = "Ford redundant TPS mode", useFordRedundantTps field = "consumeObdSensors", consumeObdSensors, { canReadEnabled == 1 && canWriteEnabled == 1} - field = "use FSIO Table CAN Sniffing Filtering",useFSIOTableForCanSniffingFiltering + field = "use FSIO Table CAN Sniffing Filtering",usescriptTableForCanSniffingFiltering field = "turbo speed sensor", turboSpeedSensorInputPin field = "turbo speed multiplier", turboSpeedSensorMultiplier field = "Artificial Misfire", artificialTestMisfire diff --git a/firmware/tunerstudio/generated/rusefi_subaru_eg33_f7.ini b/firmware/tunerstudio/generated/rusefi_subaru_eg33_f7.ini index 7f2f98a15f..df49517d46 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.4095242239" + signature = "rusEFI 2021.11.14.subaru_eg33_f7.1936730669" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.11.14.subaru_eg33_f7.4095242239" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.11.14.subaru_eg33_f7.1936730669" ; 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 15:06:29 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 15:51:45 UTC 2021 pageSize = 20000 page = 1 @@ -121,7 +121,7 @@ useRunningMathForCranking = bits, U32, 76, [23:23], "Fixed", "Fuel Map" displayLogicLevelsInEngineSniffer = bits, U32, 76, [24:24], "false", "true" useTLE8888_stepper = bits, U32, 76, [25:25], "false", "true" enableMapEstimationTableFallback = bits, U32, 76, [26:26], "false", "true" -useFSIOTableForCanSniffingFiltering = bits, U32, 76, [27:27], "false", "true" +usescriptTableForCanSniffingFiltering = bits, U32, 76, [27:27], "false", "true" issue_294_29 = bits, U32, 76, [28:28], "false", "true" artificialTestMisfire = bits, U32, 76, [29:29], "No thank you", "Danger Mode" issue_294_31 = bits, U32, 76, [30:30], "nada_example", "si_example" @@ -707,7 +707,7 @@ warningPeriod = scalar, S16, 1498, "seconds", 1, 0, 0, 60, 0 knockDetectionWindowStart = scalar, F32, 1500, "angle", 1, 0, -1000, 1000, 2 knockDetectionWindowEnd = scalar, F32, 1504, "angle", 1, 0, -1000, 1000, 2 idleStepperReactionTime = scalar, F32, 1508, "ms", 1, 0, 1, 300, 0 -unusedFsioInputs = array, U08, 1512, [20], "", 1, 0, 0, 255, 0 +unused20Inputs = array, U08, 1512, [20], "", 1, 0, 0, 255, 0 idleStepperTotalSteps = scalar, S32, 1532, "count", 1, 0, 5, 3000, 0 noAccelAfterHardLimitPeriodSecs = scalar, F32, 1536, "sec", 1, 0, 0, 60, 0 mapAveragingSchedulingAtIndex = scalar, S32, 1540, "index", 1, 0, 0, 7000, 0 @@ -1340,18 +1340,18 @@ lambdaRpmBins = array, F32, 18912, [16], "RPM", 1, 0, 0, 18000, 2 tpsTpsAccelTable = array, F32, 18976, [8x8], "value", 1, 0, 0, 30000, 2 tpsTpsAccelFromRpmBins = array, F32, 19232, [8], "from", 1, 0, 0, 30000, 2 tpsTpsAccelToRpmBins = array, F32, 19264, [8], "to", 1, 0, 0, 25500, 2 -fsioTable1 = array, F32, 19296, [8x8], "value", 1, 0, 0, 30000, 2 -fsioTable1LoadBins = array, F32, 19552, [8], "L", 1, 0, 0, 30000, 2 -fsioTable1RpmBins = array, F32, 19584, [8], "RPM", 1, 0, 0, 25500, 2 -fsioTable2 = array, U08, 19616, [8x8], "value", 1, 0, 0, 255, 0 -fsioTable2LoadBins = array, F32, 19680, [8], "L", 1, 0, 0, 255, 0 -fsioTable2RpmBins = array, F32, 19712, [8], "RPM", 1, 0, 0, 25500, 2 -fsioTable3 = array, U08, 19744, [8x8], "value", 1, 0, 0, 255, 0 -fsioTable3LoadBins = array, F32, 19808, [8], "L", 1, 0, 0, 255, 0 -fsioTable3RpmBins = array, F32, 19840, [8], "RPM", 1, 0, 0, 25500, 2 -fsioTable4 = array, U08, 19872, [8x8], "value", 1, 0, 0, 255, 0 -fsioTable4LoadBins = array, F32, 19936, [8], "L", 1, 0, 0, 255, 0 -fsioTable4RpmBins = array, F32, 19968, [8], "RPM", 1, 0, 0, 25500, 2 +scriptTable1 = array, F32, 19296, [8x8], "value", 1, 0, 0, 30000, 2 +scriptTable1LoadBins = array, F32, 19552, [8], "L", 1, 0, 0, 30000, 2 +scriptTable1RpmBins = array, F32, 19584, [8], "RPM", 1, 0, 0, 25500, 2 +scriptTable2 = array, U08, 19616, [8x8], "value", 1, 0, 0, 255, 0 +scriptTable2LoadBins = array, F32, 19680, [8], "L", 1, 0, 0, 255, 0 +scriptTable2RpmBins = array, F32, 19712, [8], "RPM", 1, 0, 0, 25500, 2 +scriptTable3 = array, U08, 19744, [8x8], "value", 1, 0, 0, 255, 0 +scriptTable3LoadBins = array, F32, 19808, [8], "L", 1, 0, 0, 255, 0 +scriptTable3RpmBins = array, F32, 19840, [8], "RPM", 1, 0, 0, 25500, 2 +scriptTable4 = array, U08, 19872, [8x8], "value", 1, 0, 0, 255, 0 +scriptTable4LoadBins = array, F32, 19936, [8], "L", 1, 0, 0, 255, 0 +scriptTable4RpmBins = array, F32, 19968, [8], "RPM", 1, 0, 0, 25500, 2 ; total TS size = 20000 [SettingContextHelp] engineType = "http://rusefi.com/wiki/index.php?title=Manual:Engine_Type\nset engine_type X" @@ -1808,10 +1808,10 @@ fsioTable4RpmBins = array, F32, 19968, [8], "RPM", 1, 0, 0, 25500, 2 vvtTable1RpmBins = "RPM is float and not integer in order to use unified methods for interpolation" vvtTable2RpmBins = "RPM is float and not integer in order to use unified methods for interpolation" tpsTpsAccelToRpmBins = "RPM is float and not integer in order to use unified methods for interpolation" - fsioTable1RpmBins = "RPM is float and not integer in order to use unified methods for interpolation" - fsioTable2RpmBins = "RPM is float and not integer in order to use unified methods for interpolation" - fsioTable3RpmBins = "RPM is float and not integer in order to use unified methods for interpolation" - fsioTable4RpmBins = "RPM is float and not integer in order to use unified methods for interpolation" + scriptTable1RpmBins = "RPM is float and not integer in order to use unified methods for interpolation" + scriptTable2RpmBins = "RPM is float and not integer in order to use unified methods for interpolation" + scriptTable3RpmBins = "RPM is float and not integer in order to use unified methods for interpolation" + scriptTable4RpmBins = "RPM is float and not integer in order to use unified methods for interpolation" ; SettingContextHelpEnd @@ -2613,25 +2613,25 @@ fsioTable4RpmBins = array, F32, 19968, [8], "RPM", 1, 0, 0, 25500, 2 zBins = vvtTable2 - table = fsioTable1Tbl, fsioTable1Map, "FSIO Table #1", 1 - xBins = fsioTable1RpmBins, RPMValue - yBins = fsioTable1LoadBins, fuelingLoad - zBins = fsioTable1 + table = scriptTable1Tbl, scriptTable1Map, "FSIO Table #1", 1 + xBins = scriptTable1RpmBins, RPMValue + yBins = scriptTable1LoadBins, fuelingLoad + zBins = scriptTable1 - table = fsioTable2Tbl, fsioTable2Map, "FSIO Table #2", 1 - xBins = fsioTable2RpmBins, RPMValue - yBins = fsioTable2LoadBins, fuelingLoad - zBins = fsioTable2 + table = scriptTable2Tbl, scriptTable2Map, "FSIO Table #2", 1 + xBins = scriptTable2RpmBins, RPMValue + yBins = scriptTable2LoadBins, fuelingLoad + zBins = scriptTable2 - table = fsioTable3Tbl, fsioTable3Map, "FSIO Table #3", 1 - xBins = fsioTable3RpmBins, RPMValue - yBins = fsioTable3LoadBins, fuelingLoad - zBins = fsioTable3 + table = scriptTable3Tbl, scriptTable3Map, "FSIO Table #3", 1 + xBins = scriptTable3RpmBins, RPMValue + yBins = scriptTable3LoadBins, fuelingLoad + zBins = scriptTable3 - table = fsioTable4Tbl, fsioTable4Map, "FSIO Table #4", 1 - xBins = fsioTable4RpmBins, RPMValue - yBins = fsioTable4LoadBins, fuelingLoad - zBins = fsioTable4 + table = scriptTable4Tbl, scriptTable4Map, "FSIO Table #4", 1 + xBins = scriptTable4RpmBins, RPMValue + yBins = scriptTable4LoadBins, fuelingLoad + zBins = scriptTable4 table = baroCorrTbl, baroCorrMap, "Baro Correction", 1 ; constant, variable @@ -3326,10 +3326,10 @@ menuDialog = main subMenu = scriptSetting, "Lua Script Settings" subMenu = std_separator - subMenu = fsioTable1TblSettings, "Script Table #1" - subMenu = fsioTable2TblSettings, "Script Table #2" - subMenu = fsioTable3TblSettings, "Script Table #3" - subMenu = fsioTable4TblSettings, "Script Table #4" + subMenu = scriptTable1TblSettings, "Script Table #1" + subMenu = scriptTable2TblSettings, "Script Table #2" + subMenu = scriptTable3TblSettings, "Script Table #3" + subMenu = scriptTable4TblSettings, "Script Table #4" subMenu = scriptCurve1Settings, "Script Curve #1" subMenu = scriptCurve2Settings, "Script Curve #2" subMenu = scriptCurve3Settings, "Script Curve #3" @@ -3616,21 +3616,21 @@ cmd_set_engine_type_8888_test = "Z\x00\x30\x00\x3B" cmd_set_engine_type_default = "Z\x00\x31\x00\x00" [UserDefined] - dialog = fsioTable1TblSettings, "", yAxis + dialog = scriptTable1TblSettings, "", yAxis field = "Name", scriptTableName1 - panel = fsioTable1Tbl + panel = scriptTable1Tbl - dialog = fsioTable2TblSettings, "", yAxis + dialog = scriptTable2TblSettings, "", yAxis field = "Name", scriptTableName2 - panel = fsioTable2Tbl + panel = scriptTable2Tbl - dialog = fsioTable3TblSettings, "", yAxis + dialog = scriptTable3TblSettings, "", yAxis field = "Name", scriptTableName3 - panel = fsioTable3Tbl + panel = scriptTable3Tbl - dialog = fsioTable4TblSettings, "", yAxis + dialog = scriptTable4TblSettings, "", yAxis field = "Name", scriptTableName4 - panel = fsioTable4Tbl + panel = scriptTable4Tbl dialog = scriptCurve1Settings, "", yAxis field = "Name", scriptCurveName1 @@ -5490,7 +5490,7 @@ cmd_set_engine_type_default = "Z\x00\x31\x00\x00" field = "Warning Message", warning_message field = "Ford redundant TPS mode", useFordRedundantTps field = "consumeObdSensors", consumeObdSensors, { canReadEnabled == 1 && canWriteEnabled == 1} - field = "use FSIO Table CAN Sniffing Filtering",useFSIOTableForCanSniffingFiltering + field = "use FSIO Table CAN Sniffing Filtering",usescriptTableForCanSniffingFiltering field = "turbo speed sensor", turboSpeedSensorInputPin field = "turbo speed multiplier", turboSpeedSensorMultiplier field = "Artificial Misfire", artificialTestMisfire 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 c8fefb98e3..10f76d7ba4 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 14:38:54 UTC 2021 +// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Nov 14 15:51:37 UTC 2021 // by class com.rusefi.output.FileJavaFieldsConsumer import com.rusefi.config.*; @@ -920,33 +920,16 @@ public class Fields { public static final int fixedTiming_offset = 2204; public static final int FLASH_DATA_VERSION = 10003; public static final int flexSensorPin_offset = 3100; - public static final int FSIO_ANALOG_INPUT_COUNT = 4; - public static final int FSIO_COMMAND_COUNT = 6; - public static final int FSIO_CURVE_16 = 16; - public static final int FSIO_CURVE_8 = 8; public static final String FSIO_METHOD_FSIO_ANALOG_INPUT = "fsio_analog_input"; 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_TABLE_8 = 8; public static final int fsioFormulas1_offset = 6672; public static final int fsioFormulas2_offset = 6872; public static final int fsioFormulas3_offset = 7072; public static final int fsioFormulas4_offset = 7272; public static final int fsioFormulas5_offset = 7472; public static final int fsioFormulas6_offset = 7672; - public static final int fsioTable1_offset = 19296; - public static final int fsioTable1LoadBins_offset = 19552; - public static final int fsioTable1RpmBins_offset = 19584; - public static final int fsioTable2_offset = 19616; - public static final int fsioTable2LoadBins_offset = 19680; - public static final int fsioTable2RpmBins_offset = 19712; - public static final int fsioTable3_offset = 19744; - public static final int fsioTable3LoadBins_offset = 19808; - public static final int fsioTable3RpmBins_offset = 19840; - public static final int fsioTable4_offset = 19872; - public static final int fsioTable4LoadBins_offset = 19936; - public static final int fsioTable4RpmBins_offset = 19968; public static final int FUEL_LEVEL_TABLE_COUNT = 8; public static final int FUEL_LOAD_COUNT = 16; public static final int FUEL_RPM_COUNT = 16; @@ -1690,8 +1673,11 @@ public class Fields { public static final int RPM_1_BYTE_PACKING_MULT = 50; public static final int rpmHardLimit_offset = 416; public static final int runningLedPin_offset = 1813; + public static final int SCRIPT_CURVE_16 = 16; + public static final int SCRIPT_CURVE_8 = 8; public static final int SCRIPT_CURVE_COUNT = 6; public static final int SCRIPT_SETTING_COUNT = 8; + public static final int SCRIPT_TABLE_8 = 8; public static final int SCRIPT_TABLE_COUNT = 4; public static final int scriptCurve1_offset = 2780; public static final int scriptCurve1Bins_offset = 2716; @@ -1719,6 +1705,18 @@ public class Fields { 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 scriptTable1_offset = 19296; + public static final int scriptTable1LoadBins_offset = 19552; + public static final int scriptTable1RpmBins_offset = 19584; + public static final int scriptTable2_offset = 19616; + public static final int scriptTable2LoadBins_offset = 19680; + public static final int scriptTable2RpmBins_offset = 19712; + public static final int scriptTable3_offset = 19744; + public static final int scriptTable3LoadBins_offset = 19808; + public static final int scriptTable3RpmBins_offset = 19840; + public static final int scriptTable4_offset = 19872; + public static final int scriptTable4LoadBins_offset = 19936; + public static final int scriptTable4RpmBins_offset = 19968; public static final int scriptTableName1_offset = 3564; public static final int scriptTableName2_offset = 3580; public static final int scriptTableName3_offset = 3596; @@ -2210,7 +2208,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.2812226491"; + public static final String TS_SIGNATURE = "rusEFI 2021.11.14.all.2966043773"; public static final char TS_SINGLE_WRITE_COMMAND = 'W'; public static final char TS_TEST_COMMAND = 't'; public static final int tunerStudioSerialSpeed_offset = 728; @@ -2238,6 +2236,7 @@ public class Fields { public static final int unused1476b20_offset = 1476; public static final int unused1476b3_offset = 1476; public static final int unused1476b8_offset = 1476; + public static final int unused20Inputs_offset = 1512; public static final int unused2260_offset = 2260; public static final int unused2432_offset = 2432; public static final int unused244_2_offset = 2424; @@ -2312,7 +2311,6 @@ public class Fields { public static final int unusedEL4_offset = 2072; public static final int unusedExHpfp_offset = 724; public static final int unusedFiller_4703_offset = 4703; - public static final int unusedFsioInputs_offset = 1512; public static final int unusedLuaWasHere_offset = 16032; public static final int unusedOldBiquad_offset = 2331; public static final int unusedOutputFreqWhereHere_offset = 832; @@ -2329,7 +2327,6 @@ public class Fields { public static final int useFordRedundantTps_offset = 76; public static final int useFSIO4ForSeriousEngineWarning_offset = 1464; public static final int useFSIO5ForCriticalIssueEngineStop_offset = 1464; - public static final int useFSIOTableForCanSniffingFiltering_offset = 76; public static final int useHbridgesToDriveIdleStepper_offset = 976; public static final int useIacPidMultTable_offset = 1476; public static final int useIacTableForCoasting_offset = 744; @@ -2341,6 +2338,7 @@ public class Fields { public static final int useNoiselessTriggerDecoder_offset = 744; public static final int useOnlyRisingEdgeForTrigger_offset = 1476; public static final int useRunningMathForCranking_offset = 76; + public static final int usescriptTableForCanSniffingFiltering_offset = 76; public static final int useSeparateAdvanceForCranking_offset = 1476; public static final int useSeparateAdvanceForIdle_offset = 1476; public static final int useSeparateIdleTablesForCrankingTaper_offset = 76; @@ -2459,7 +2457,7 @@ public class Fields { public static final Field DISPLAYLOGICLEVELSINENGINESNIFFER = Field.create("DISPLAYLOGICLEVELSINENGINESNIFFER", 76, FieldType.BIT, 24); public static final Field USETLE8888_STEPPER = Field.create("USETLE8888_STEPPER", 76, FieldType.BIT, 25); public static final Field ENABLEMAPESTIMATIONTABLEFALLBACK = Field.create("ENABLEMAPESTIMATIONTABLEFALLBACK", 76, FieldType.BIT, 26); - public static final Field USEFSIOTABLEFORCANSNIFFINGFILTERING = Field.create("USEFSIOTABLEFORCANSNIFFINGFILTERING", 76, FieldType.BIT, 27); + public static final Field USESCRIPTTABLEFORCANSNIFFINGFILTERING = Field.create("USESCRIPTTABLEFORCANSNIFFINGFILTERING", 76, FieldType.BIT, 27); public static final Field ISSUE_294_29 = Field.create("ISSUE_294_29", 76, FieldType.BIT, 28); public static final Field ARTIFICIALTESTMISFIRE = Field.create("ARTIFICIALTESTMISFIRE", 76, FieldType.BIT, 29); public static final Field ISSUE_294_31 = Field.create("ISSUE_294_31", 76, FieldType.BIT, 30); @@ -3059,7 +3057,7 @@ public class Fields { public static final Field KNOCKDETECTIONWINDOWSTART = Field.create("KNOCKDETECTIONWINDOWSTART", 1500, FieldType.FLOAT); public static final Field KNOCKDETECTIONWINDOWEND = Field.create("KNOCKDETECTIONWINDOWEND", 1504, FieldType.FLOAT); public static final Field IDLESTEPPERREACTIONTIME = Field.create("IDLESTEPPERREACTIONTIME", 1508, FieldType.FLOAT); - public static final Field UNUSEDFSIOINPUTS = Field.create("UNUSEDFSIOINPUTS", 1512, FieldType.INT8); + public static final Field UNUSED20INPUTS = Field.create("UNUSED20INPUTS", 1512, FieldType.INT8); public static final Field IDLESTEPPERTOTALSTEPS = Field.create("IDLESTEPPERTOTALSTEPS", 1532, FieldType.INT); public static final Field NOACCELAFTERHARDLIMITPERIODSECS = Field.create("NOACCELAFTERHARDLIMITPERIODSECS", 1536, FieldType.FLOAT); public static final Field MAPAVERAGINGSCHEDULINGATINDEX = Field.create("MAPAVERAGINGSCHEDULINGATINDEX", 1540, FieldType.INT); @@ -3698,18 +3696,18 @@ public class Fields { public static final Field TPSTPSACCELTABLE = Field.create("TPSTPSACCELTABLE", 18976, FieldType.FLOAT); public static final Field TPSTPSACCELFROMRPMBINS = Field.create("TPSTPSACCELFROMRPMBINS", 19232, FieldType.FLOAT); public static final Field TPSTPSACCELTORPMBINS = Field.create("TPSTPSACCELTORPMBINS", 19264, FieldType.FLOAT); - public static final Field FSIOTABLE1 = Field.create("FSIOTABLE1", 19296, FieldType.FLOAT); - public static final Field FSIOTABLE1LOADBINS = Field.create("FSIOTABLE1LOADBINS", 19552, FieldType.FLOAT); - public static final Field FSIOTABLE1RPMBINS = Field.create("FSIOTABLE1RPMBINS", 19584, FieldType.FLOAT); - public static final Field FSIOTABLE2 = Field.create("FSIOTABLE2", 19616, FieldType.INT8); - public static final Field FSIOTABLE2LOADBINS = Field.create("FSIOTABLE2LOADBINS", 19680, FieldType.FLOAT); - public static final Field FSIOTABLE2RPMBINS = Field.create("FSIOTABLE2RPMBINS", 19712, FieldType.FLOAT); - public static final Field FSIOTABLE3 = Field.create("FSIOTABLE3", 19744, FieldType.INT8); - public static final Field FSIOTABLE3LOADBINS = Field.create("FSIOTABLE3LOADBINS", 19808, FieldType.FLOAT); - public static final Field FSIOTABLE3RPMBINS = Field.create("FSIOTABLE3RPMBINS", 19840, FieldType.FLOAT); - public static final Field FSIOTABLE4 = Field.create("FSIOTABLE4", 19872, FieldType.INT8); - public static final Field FSIOTABLE4LOADBINS = Field.create("FSIOTABLE4LOADBINS", 19936, FieldType.FLOAT); - public static final Field FSIOTABLE4RPMBINS = Field.create("FSIOTABLE4RPMBINS", 19968, FieldType.FLOAT); + public static final Field SCRIPTTABLE1 = Field.create("SCRIPTTABLE1", 19296, FieldType.FLOAT); + public static final Field SCRIPTTABLE1LOADBINS = Field.create("SCRIPTTABLE1LOADBINS", 19552, FieldType.FLOAT); + public static final Field SCRIPTTABLE1RPMBINS = Field.create("SCRIPTTABLE1RPMBINS", 19584, FieldType.FLOAT); + public static final Field SCRIPTTABLE2 = Field.create("SCRIPTTABLE2", 19616, FieldType.INT8); + public static final Field SCRIPTTABLE2LOADBINS = Field.create("SCRIPTTABLE2LOADBINS", 19680, FieldType.FLOAT); + public static final Field SCRIPTTABLE2RPMBINS = Field.create("SCRIPTTABLE2RPMBINS", 19712, FieldType.FLOAT); + public static final Field SCRIPTTABLE3 = Field.create("SCRIPTTABLE3", 19744, FieldType.INT8); + public static final Field SCRIPTTABLE3LOADBINS = Field.create("SCRIPTTABLE3LOADBINS", 19808, FieldType.FLOAT); + public static final Field SCRIPTTABLE3RPMBINS = Field.create("SCRIPTTABLE3RPMBINS", 19840, FieldType.FLOAT); + public static final Field SCRIPTTABLE4 = Field.create("SCRIPTTABLE4", 19872, FieldType.INT8); + public static final Field SCRIPTTABLE4LOADBINS = Field.create("SCRIPTTABLE4LOADBINS", 19936, FieldType.FLOAT); + public static final Field SCRIPTTABLE4RPMBINS = Field.create("SCRIPTTABLE4RPMBINS", 19968, FieldType.FLOAT); public static final Field[] VALUES = { ENGINETYPE, ENGINESNIFFERRPMTHRESHOLD, @@ -3743,7 +3741,7 @@ public class Fields { DISPLAYLOGICLEVELSINENGINESNIFFER, USETLE8888_STEPPER, ENABLEMAPESTIMATIONTABLEFALLBACK, - USEFSIOTABLEFORCANSNIFFINGFILTERING, + USESCRIPTTABLEFORCANSNIFFINGFILTERING, ISSUE_294_29, ARTIFICIALTESTMISFIRE, ISSUE_294_31, @@ -4329,7 +4327,7 @@ public class Fields { KNOCKDETECTIONWINDOWSTART, KNOCKDETECTIONWINDOWEND, IDLESTEPPERREACTIONTIME, - UNUSEDFSIOINPUTS, + UNUSED20INPUTS, IDLESTEPPERTOTALSTEPS, NOACCELAFTERHARDLIMITPERIODSECS, MAPAVERAGINGSCHEDULINGATINDEX, @@ -4958,17 +4956,17 @@ public class Fields { TPSTPSACCELTABLE, TPSTPSACCELFROMRPMBINS, TPSTPSACCELTORPMBINS, - FSIOTABLE1, - FSIOTABLE1LOADBINS, - FSIOTABLE1RPMBINS, - FSIOTABLE2, - FSIOTABLE2LOADBINS, - FSIOTABLE2RPMBINS, - FSIOTABLE3, - FSIOTABLE3LOADBINS, - FSIOTABLE3RPMBINS, - FSIOTABLE4, - FSIOTABLE4LOADBINS, - FSIOTABLE4RPMBINS, + SCRIPTTABLE1, + SCRIPTTABLE1LOADBINS, + SCRIPTTABLE1RPMBINS, + SCRIPTTABLE2, + SCRIPTTABLE2LOADBINS, + SCRIPTTABLE2RPMBINS, + SCRIPTTABLE3, + SCRIPTTABLE3LOADBINS, + SCRIPTTABLE3RPMBINS, + SCRIPTTABLE4, + SCRIPTTABLE4LOADBINS, + SCRIPTTABLE4RPMBINS, }; } diff --git a/java_console/rusefi.xml b/java_console/rusefi.xml index fdb5d630bf..8710f417c8 100644 --- a/java_console/rusefi.xml +++ b/java_console/rusefi.xml @@ -1,6 +1,6 @@ - + @@ -64,8 +64,8 @@ -
-
-
-
- @@ -181,8 +181,8 @@
-