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 74cf1ae9ea..8e7ac5d347 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 07 03:32:03 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 07 15:29:31 UTC 2021 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -3728,10 +3728,14 @@ struct engine_configuration_s { */ float scriptCurve6[FSIO_CURVE_8]; /** - units * offset 3564 */ - uint8_t unused3328[300]; + gppwm_note_t scriptTableName[SCRIPT_TABLE_COUNT]; + /** + units + * offset 3628 + */ + uint8_t unused3328[236]; /** Min tCharge Coeff. * offset 3864 @@ -4557,4 +4561,4 @@ struct persistent_config_s { }; // end -// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on hellen_cypress_gen_config.bat integration/rusefi_config.txt Sun Nov 07 03:32:03 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 07 15:29:31 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 d577d6d167..b792f2cff5 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 @@ -767,7 +767,7 @@ #define ENGINE_MAKE_VAG "VAG" #define ENGINE_NOISE_CURVE_SIZE 8 #define ENGINE_SNIFFER_UNIT_US 10 -#define engine_type_e_auto_enum "DEFAULT_FRANKENSO", "MIATA_PROTEUS_TCU", "DODGE_NEON_1995", "FORD_ASPIRE_1996", "MRE_SECONDARY_CAN", "NISSAN_PRIMERA", "ET_UNUSED_6", "FORD_INLINE_6_1995", "GY6_139QMB", "UNUSED9", "UNUSED10", "MRE_MIATA_NB2_MAP", "MRE_MIATA_NA6_VAF", "MRE_MIATA_NB2_ETB", "FORD_ESCORT_GT", "MRE_MIATA_NB2_MAF", "MITSU_4G93", "HONDA_ACCORD_CD_TWO_WIRES", "UNUSED18", "UNUSED_19", "MRE_MIATA_94_MAP", "MIATA_1996", "SUBARU_2003_WRX", "MRE_BODY_CONTROL", "BMW_M73_M", "PROTEUS_LUA_DEMO", "TEST_ENGINE", "TEST_ISSUE_898", "MAZDA_626", "SACHS", "UNUSED30", "MRE_BOARD_NEW_TEST", "VW_ABA", "HELLEN72_ETB", "HELLEN_NA6", "CAMARO_4", "HELLEN_128_MERCEDES_4_CYL", "MRE_SUBARU_EJ18", "TOYOTA_JZS147", "UNUSED39", "FRANKENSO_BMW_M73_F", "FRANKENSO_MIATA_NA6_MAP", "PROTEUS_QC_TEST_BOARD", "HONDA_600", "TOYOTA_2JZ_GTE_VVTi", "TEST_ENGINE_VVT", "DODGE_NEON_2003_CRANK", "FRANKENSO_MAZDA_MIATA_2003", "UNUSED_48", "FRANKENSO_QA_ENGINE", "UNUSED_50", "UNUSED_51", "TEST_ISSUE_366_BOTH", "TEST_ISSUE_366_RISE", "MAZDA_MIATA_2003_NA_RAIL", "MAZDA_MIATA_2003_BOARD_TEST", "FRANKENSO_MAZDA_MIATA_NA8", "FRANKENSO_MIATA_NA6_VAF", "ETB_BENCH_ENGINE", "TLE8888_BENCH_ENGINE", "MICRO_RUS_EFI", "PROTEUS_DEFAULTS", "VW_B6", "PROTEUS_BMW_M73", "DODGE_RAM", "CITROEN_TU3JP", "MRE_MIATA_NA6_MAP", "PROTEUS_MIATA_NB2", "MRE_M111", "HELLEN_NB2", "SUBARUEG33_DEFAULTS", "HELLEN_121_VAG_4_CYL", "HELLEN_121_NISSAN_6_CYL", "HELLEN_55_BMW", "HELLEN_88_BMW", "HELLEN_134_BMW", "HELLEN_154_VAG", "HELLEN_121_VAG_5_CYL", "HELLEN_121_VAG_V6_CYL", "HELLEN_121_VAG_VR6_CYL", "HELLEN_NA94", "HELLEN_121_VAG_8_CYL", "HELLEN_154_HYUNDAI_COUPE_BK1", "HELLEN_NB1", "HELLEN_121_NISSAN_4_CYL", "HELLEN_121_NISSAN_8_CYL", "HELLEN_NB2_36", "HELLEN_121_NISSAN_ALMERA_N16", "HELLEN_128_MERCEDES_6_CYL", "HELLEN_128_MERCEDES_8_CYL", "PROTEUS_HONDA_ELEMENT_2003", "PROTEUS_HONDA_OBD2A", "PROTEUS_VAG_80_18T", "PROTEUS_N73", "HELLEN_NB1_36", "HELLEN_154_HYUNDAI_COUPE_BK2", "ET_UNUSED96", "ET_UNUSED97", "ET_UNUSED98", "MINIMAL_PINS", "PROMETHEUS_DEFAULTS", "UNUSED101", "VAG_18_TURBO", "TEST_33816", "BMW_M73_MRE", "BMW_M73_MRE_SLAVE", "PROTEUS_ANALOG_PWM_TEST", "TEST_ROTARY", "TEST_108", "TEST_109", "TEST_110" +#define engine_type_e_auto_enum "DEFAULT_FRANKENSO", "MIATA_PROTEUS_TCU", "DODGE_NEON_1995", "FORD_ASPIRE_1996", "MRE_SECONDARY_CAN", "NISSAN_PRIMERA", "ET_UNUSED_6", "FORD_INLINE_6_1995", "GY6_139QMB", "UNUSED9", "UNUSED10", "MRE_MIATA_NB2_MAP", "MRE_MIATA_NA6_VAF", "MRE_MIATA_NB2_ETB", "FORD_ESCORT_GT", "MRE_MIATA_NB2_MAF", "MITSU_4G93", "HONDA_ACCORD_CD_TWO_WIRES", "UNUSED18", "UNUSED_19", "MRE_MIATA_94_MAP", "MIATA_1996", "SUBARU_2003_WRX", "MRE_BODY_CONTROL", "BMW_M73_M", "PROTEUS_LUA_DEMO", "TEST_ENGINE", "TEST_ISSUE_898", "UNUSED28", "SACHS", "UNUSED30", "MRE_BOARD_NEW_TEST", "VW_ABA", "HELLEN72_ETB", "HELLEN_NA6", "CAMARO_4", "HELLEN_128_MERCEDES_4_CYL", "MRE_SUBARU_EJ18", "TOYOTA_JZS147", "UNUSED39", "FRANKENSO_BMW_M73_F", "FRANKENSO_MIATA_NA6_MAP", "PROTEUS_QC_TEST_BOARD", "HONDA_600", "TOYOTA_2JZ_GTE_VVTi", "TEST_ENGINE_VVT", "DODGE_NEON_2003_CRANK", "FRANKENSO_MAZDA_MIATA_2003", "UNUSED_48", "FRANKENSO_QA_ENGINE", "UNUSED_50", "UNUSED_51", "TEST_ISSUE_366_BOTH", "TEST_ISSUE_366_RISE", "MAZDA_MIATA_2003_NA_RAIL", "MAZDA_MIATA_2003_BOARD_TEST", "FRANKENSO_MAZDA_MIATA_NA8", "FRANKENSO_MIATA_NA6_VAF", "ETB_BENCH_ENGINE", "TLE8888_BENCH_ENGINE", "UNUSED60", "UNUSED61", "VW_B6", "PROTEUS_BMW_M73", "DODGE_RAM", "CITROEN_TU3JP", "MRE_MIATA_NA6_MAP", "PROTEUS_MIATA_NB2", "MRE_M111", "HELLEN_NB2", "SUBARUEG33_DEFAULTS", "HELLEN_121_VAG_4_CYL", "HELLEN_121_NISSAN_6_CYL", "HELLEN_55_BMW", "HELLEN_88_BMW", "HELLEN_134_BMW", "HELLEN_154_VAG", "HELLEN_121_VAG_5_CYL", "HELLEN_121_VAG_V6_CYL", "HELLEN_121_VAG_VR6_CYL", "HELLEN_NA94", "HELLEN_121_VAG_8_CYL", "HELLEN_154_HYUNDAI_COUPE_BK1", "HELLEN_NB1", "HELLEN_121_NISSAN_4_CYL", "HELLEN_121_NISSAN_8_CYL", "HELLEN_NB2_36", "HELLEN_121_NISSAN_ALMERA_N16", "HELLEN_128_MERCEDES_6_CYL", "HELLEN_128_MERCEDES_8_CYL", "PROTEUS_HONDA_ELEMENT_2003", "PROTEUS_HONDA_OBD2A", "PROTEUS_VAG_80_18T", "PROTEUS_N73", "HELLEN_NB1_36", "HELLEN_154_HYUNDAI_COUPE_BK2", "ET_UNUSED96", "ET_UNUSED97", "ET_UNUSED98", "MINIMAL_PINS", "UNUSED100", "UNUSED101", "VAG_18_TURBO", "TEST_33816", "BMW_M73_MRE", "BMW_M73_MRE_SLAVE", "PROTEUS_ANALOG_PWM_TEST", "TEST_ROTARY", "TEST_108", "TEST_109", "TEST_110" #define engine_type_e_BMW_M73_M 24 #define engine_type_e_BMW_M73_MRE 104 #define engine_type_e_BMW_M73_MRE_SLAVE 105 @@ -820,12 +820,10 @@ #define engine_type_e_HELLEN_NB2_36 86 #define engine_type_e_HONDA_600 43 #define engine_type_e_HONDA_ACCORD_CD_TWO_WIRES 17 -#define engine_type_e_MAZDA_626 28 #define engine_type_e_MAZDA_MIATA_2003_BOARD_TEST 55 #define engine_type_e_MAZDA_MIATA_2003_NA_RAIL 54 #define engine_type_e_MIATA_1996 21 #define engine_type_e_MIATA_PROTEUS_TCU 1 -#define engine_type_e_MICRO_RUS_EFI 60 #define engine_type_e_MINIMAL_PINS 99 #define engine_type_e_MITSU_4G93 16 #define engine_type_e_MRE_BOARD_NEW_TEST 31 @@ -840,10 +838,8 @@ #define engine_type_e_MRE_SECONDARY_CAN 4 #define engine_type_e_MRE_SUBARU_EJ18 37 #define engine_type_e_NISSAN_PRIMERA 5 -#define engine_type_e_PROMETHEUS_DEFAULTS 100 #define engine_type_e_PROTEUS_ANALOG_PWM_TEST 106 #define engine_type_e_PROTEUS_BMW_M73 63 -#define engine_type_e_PROTEUS_DEFAULTS 61 #define engine_type_e_PROTEUS_HONDA_ELEMENT_2003 90 #define engine_type_e_PROTEUS_HONDA_OBD2A 91 #define engine_type_e_PROTEUS_LUA_DEMO 25 @@ -868,10 +864,14 @@ #define engine_type_e_TOYOTA_2JZ_GTE_VVTi 44 #define engine_type_e_TOYOTA_JZS147 38 #define engine_type_e_UNUSED10 10 +#define engine_type_e_UNUSED100 100 #define engine_type_e_UNUSED101 101 #define engine_type_e_UNUSED18 18 +#define engine_type_e_UNUSED28 28 #define engine_type_e_UNUSED30 30 #define engine_type_e_UNUSED39 39 +#define engine_type_e_UNUSED60 60 +#define engine_type_e_UNUSED61 61 #define engine_type_e_UNUSED9 9 #define engine_type_e_UNUSED_19 19 #define engine_type_e_UNUSED_48 48 @@ -1796,6 +1796,7 @@ #define rpmHardLimit_offset 416 #define runningLedPin_offset 1813 #define SCRIPT_CURVE_COUNT 6 +#define SCRIPT_TABLE_COUNT 4 #define scriptCurve1_offset 2780 #define scriptCurve1Bins_offset 2716 #define scriptCurve2_offset 2908 @@ -1814,6 +1815,10 @@ #define scriptCurveName4_offset 3388 #define scriptCurveName5_offset 3404 #define scriptCurveName6_offset 3420 +#define scriptTableName1_offset 3564 +#define scriptTableName2_offset 3580 +#define scriptTableName3_offset 3596 +#define scriptTableName4_offset 3612 #define sdCardCsPin_offset 707 #define sdCardCsPinMode_offset 2226 #define sdCardPeriodMs_offset 804 @@ -1843,7 +1848,7 @@ #define show_test_presets true #define showHumanReadableWarning_offset 976 #define showSdCardWarning_offset 76 -#define SIGNATURE_HASH 1362832977 +#define SIGNATURE_HASH 3934782067 #define silentTriggerError_offset 1464 #define slowAdcAlpha_offset 2088 #define sparkDwellRpmBins_offset 332 @@ -2350,7 +2355,7 @@ #define ts_show_spi true #define ts_show_trigger_comparator false #define ts_show_tunerstudio_port true -#define TS_SIGNATURE "rusEFI 2021.11.07.hellen_cypress.1362832977" +#define TS_SIGNATURE "rusEFI 2021.11.07.hellen_cypress.3934782067" #define TS_SINGLE_WRITE_COMMAND 'W' #define TS_SINGLE_WRITE_COMMAND_char W #define TS_TEST_COMMAND 't' @@ -2388,7 +2393,7 @@ #define unused2508_offset 2511 #define unused2536_offset 2539 #define unused3103_offset 3103 -#define unused3328_offset 3564 +#define unused3328_offset 3628 #define unused3942_offset 3992 #define unused3988_offset 3988 #define unused4028_offset 4028 diff --git a/firmware/config/boards/kinetis/config/controllers/algo/engine_configuration_generated_structures.h b/firmware/config/boards/kinetis/config/controllers/algo/engine_configuration_generated_structures.h index f4d8302548..d56309c6c5 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 07 03:32:00 UTC 2021 +// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Sun Nov 07 15:29:29 UTC 2021 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -3722,10 +3722,14 @@ struct engine_configuration_s { */ float scriptCurve6[FSIO_CURVE_8]; /** - units * offset 3536 */ - uint8_t unused3328[300]; + gppwm_note_t scriptTableName[SCRIPT_TABLE_COUNT]; + /** + units + * offset 3600 + */ + uint8_t unused3328[236]; /** Min tCharge Coeff. * offset 3836 @@ -4551,4 +4555,4 @@ struct persistent_config_s { }; // end -// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Sun Nov 07 03:32:00 UTC 2021 +// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Sun Nov 07 15:29:29 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 7bb9a632dc..a38b60d562 100644 --- a/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h +++ b/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h @@ -752,7 +752,7 @@ #define ENGINE_MAKE_VAG "VAG" #define ENGINE_NOISE_CURVE_SIZE 8 #define ENGINE_SNIFFER_UNIT_US 10 -#define engine_type_e_auto_enum "DEFAULT_FRANKENSO", "MIATA_PROTEUS_TCU", "DODGE_NEON_1995", "FORD_ASPIRE_1996", "MRE_SECONDARY_CAN", "NISSAN_PRIMERA", "ET_UNUSED_6", "FORD_INLINE_6_1995", "GY6_139QMB", "UNUSED9", "UNUSED10", "MRE_MIATA_NB2_MAP", "MRE_MIATA_NA6_VAF", "MRE_MIATA_NB2_ETB", "FORD_ESCORT_GT", "MRE_MIATA_NB2_MAF", "MITSU_4G93", "HONDA_ACCORD_CD_TWO_WIRES", "UNUSED18", "UNUSED_19", "MRE_MIATA_94_MAP", "MIATA_1996", "SUBARU_2003_WRX", "MRE_BODY_CONTROL", "BMW_M73_M", "PROTEUS_LUA_DEMO", "TEST_ENGINE", "TEST_ISSUE_898", "MAZDA_626", "SACHS", "UNUSED30", "MRE_BOARD_NEW_TEST", "VW_ABA", "HELLEN72_ETB", "HELLEN_NA6", "CAMARO_4", "HELLEN_128_MERCEDES_4_CYL", "MRE_SUBARU_EJ18", "TOYOTA_JZS147", "UNUSED39", "FRANKENSO_BMW_M73_F", "FRANKENSO_MIATA_NA6_MAP", "PROTEUS_QC_TEST_BOARD", "HONDA_600", "TOYOTA_2JZ_GTE_VVTi", "TEST_ENGINE_VVT", "DODGE_NEON_2003_CRANK", "FRANKENSO_MAZDA_MIATA_2003", "UNUSED_48", "FRANKENSO_QA_ENGINE", "UNUSED_50", "UNUSED_51", "TEST_ISSUE_366_BOTH", "TEST_ISSUE_366_RISE", "MAZDA_MIATA_2003_NA_RAIL", "MAZDA_MIATA_2003_BOARD_TEST", "FRANKENSO_MAZDA_MIATA_NA8", "FRANKENSO_MIATA_NA6_VAF", "ETB_BENCH_ENGINE", "TLE8888_BENCH_ENGINE", "MICRO_RUS_EFI", "PROTEUS_DEFAULTS", "VW_B6", "PROTEUS_BMW_M73", "DODGE_RAM", "CITROEN_TU3JP", "MRE_MIATA_NA6_MAP", "PROTEUS_MIATA_NB2", "MRE_M111", "HELLEN_NB2", "SUBARUEG33_DEFAULTS", "HELLEN_121_VAG_4_CYL", "HELLEN_121_NISSAN_6_CYL", "HELLEN_55_BMW", "HELLEN_88_BMW", "HELLEN_134_BMW", "HELLEN_154_VAG", "HELLEN_121_VAG_5_CYL", "HELLEN_121_VAG_V6_CYL", "HELLEN_121_VAG_VR6_CYL", "HELLEN_NA94", "HELLEN_121_VAG_8_CYL", "HELLEN_154_HYUNDAI_COUPE_BK1", "HELLEN_NB1", "HELLEN_121_NISSAN_4_CYL", "HELLEN_121_NISSAN_8_CYL", "HELLEN_NB2_36", "HELLEN_121_NISSAN_ALMERA_N16", "HELLEN_128_MERCEDES_6_CYL", "HELLEN_128_MERCEDES_8_CYL", "PROTEUS_HONDA_ELEMENT_2003", "PROTEUS_HONDA_OBD2A", "PROTEUS_VAG_80_18T", "PROTEUS_N73", "HELLEN_NB1_36", "HELLEN_154_HYUNDAI_COUPE_BK2", "ET_UNUSED96", "ET_UNUSED97", "ET_UNUSED98", "MINIMAL_PINS", "PROMETHEUS_DEFAULTS", "UNUSED101", "VAG_18_TURBO", "TEST_33816", "BMW_M73_MRE", "BMW_M73_MRE_SLAVE", "PROTEUS_ANALOG_PWM_TEST", "TEST_ROTARY", "TEST_108", "TEST_109", "TEST_110" +#define engine_type_e_auto_enum "DEFAULT_FRANKENSO", "MIATA_PROTEUS_TCU", "DODGE_NEON_1995", "FORD_ASPIRE_1996", "MRE_SECONDARY_CAN", "NISSAN_PRIMERA", "ET_UNUSED_6", "FORD_INLINE_6_1995", "GY6_139QMB", "UNUSED9", "UNUSED10", "MRE_MIATA_NB2_MAP", "MRE_MIATA_NA6_VAF", "MRE_MIATA_NB2_ETB", "FORD_ESCORT_GT", "MRE_MIATA_NB2_MAF", "MITSU_4G93", "HONDA_ACCORD_CD_TWO_WIRES", "UNUSED18", "UNUSED_19", "MRE_MIATA_94_MAP", "MIATA_1996", "SUBARU_2003_WRX", "MRE_BODY_CONTROL", "BMW_M73_M", "PROTEUS_LUA_DEMO", "TEST_ENGINE", "TEST_ISSUE_898", "UNUSED28", "SACHS", "UNUSED30", "MRE_BOARD_NEW_TEST", "VW_ABA", "HELLEN72_ETB", "HELLEN_NA6", "CAMARO_4", "HELLEN_128_MERCEDES_4_CYL", "MRE_SUBARU_EJ18", "TOYOTA_JZS147", "UNUSED39", "FRANKENSO_BMW_M73_F", "FRANKENSO_MIATA_NA6_MAP", "PROTEUS_QC_TEST_BOARD", "HONDA_600", "TOYOTA_2JZ_GTE_VVTi", "TEST_ENGINE_VVT", "DODGE_NEON_2003_CRANK", "FRANKENSO_MAZDA_MIATA_2003", "UNUSED_48", "FRANKENSO_QA_ENGINE", "UNUSED_50", "UNUSED_51", "TEST_ISSUE_366_BOTH", "TEST_ISSUE_366_RISE", "MAZDA_MIATA_2003_NA_RAIL", "MAZDA_MIATA_2003_BOARD_TEST", "FRANKENSO_MAZDA_MIATA_NA8", "FRANKENSO_MIATA_NA6_VAF", "ETB_BENCH_ENGINE", "TLE8888_BENCH_ENGINE", "UNUSED60", "UNUSED61", "VW_B6", "PROTEUS_BMW_M73", "DODGE_RAM", "CITROEN_TU3JP", "MRE_MIATA_NA6_MAP", "PROTEUS_MIATA_NB2", "MRE_M111", "HELLEN_NB2", "SUBARUEG33_DEFAULTS", "HELLEN_121_VAG_4_CYL", "HELLEN_121_NISSAN_6_CYL", "HELLEN_55_BMW", "HELLEN_88_BMW", "HELLEN_134_BMW", "HELLEN_154_VAG", "HELLEN_121_VAG_5_CYL", "HELLEN_121_VAG_V6_CYL", "HELLEN_121_VAG_VR6_CYL", "HELLEN_NA94", "HELLEN_121_VAG_8_CYL", "HELLEN_154_HYUNDAI_COUPE_BK1", "HELLEN_NB1", "HELLEN_121_NISSAN_4_CYL", "HELLEN_121_NISSAN_8_CYL", "HELLEN_NB2_36", "HELLEN_121_NISSAN_ALMERA_N16", "HELLEN_128_MERCEDES_6_CYL", "HELLEN_128_MERCEDES_8_CYL", "PROTEUS_HONDA_ELEMENT_2003", "PROTEUS_HONDA_OBD2A", "PROTEUS_VAG_80_18T", "PROTEUS_N73", "HELLEN_NB1_36", "HELLEN_154_HYUNDAI_COUPE_BK2", "ET_UNUSED96", "ET_UNUSED97", "ET_UNUSED98", "MINIMAL_PINS", "UNUSED100", "UNUSED101", "VAG_18_TURBO", "TEST_33816", "BMW_M73_MRE", "BMW_M73_MRE_SLAVE", "PROTEUS_ANALOG_PWM_TEST", "TEST_ROTARY", "TEST_108", "TEST_109", "TEST_110" #define engine_type_e_BMW_M73_M 24 #define engine_type_e_BMW_M73_MRE 104 #define engine_type_e_BMW_M73_MRE_SLAVE 105 @@ -805,12 +805,10 @@ #define engine_type_e_HELLEN_NB2_36 86 #define engine_type_e_HONDA_600 43 #define engine_type_e_HONDA_ACCORD_CD_TWO_WIRES 17 -#define engine_type_e_MAZDA_626 28 #define engine_type_e_MAZDA_MIATA_2003_BOARD_TEST 55 #define engine_type_e_MAZDA_MIATA_2003_NA_RAIL 54 #define engine_type_e_MIATA_1996 21 #define engine_type_e_MIATA_PROTEUS_TCU 1 -#define engine_type_e_MICRO_RUS_EFI 60 #define engine_type_e_MINIMAL_PINS 99 #define engine_type_e_MITSU_4G93 16 #define engine_type_e_MRE_BOARD_NEW_TEST 31 @@ -825,10 +823,8 @@ #define engine_type_e_MRE_SECONDARY_CAN 4 #define engine_type_e_MRE_SUBARU_EJ18 37 #define engine_type_e_NISSAN_PRIMERA 5 -#define engine_type_e_PROMETHEUS_DEFAULTS 100 #define engine_type_e_PROTEUS_ANALOG_PWM_TEST 106 #define engine_type_e_PROTEUS_BMW_M73 63 -#define engine_type_e_PROTEUS_DEFAULTS 61 #define engine_type_e_PROTEUS_HONDA_ELEMENT_2003 90 #define engine_type_e_PROTEUS_HONDA_OBD2A 91 #define engine_type_e_PROTEUS_LUA_DEMO 25 @@ -853,10 +849,14 @@ #define engine_type_e_TOYOTA_2JZ_GTE_VVTi 44 #define engine_type_e_TOYOTA_JZS147 38 #define engine_type_e_UNUSED10 10 +#define engine_type_e_UNUSED100 100 #define engine_type_e_UNUSED101 101 #define engine_type_e_UNUSED18 18 +#define engine_type_e_UNUSED28 28 #define engine_type_e_UNUSED30 30 #define engine_type_e_UNUSED39 39 +#define engine_type_e_UNUSED60 60 +#define engine_type_e_UNUSED61 61 #define engine_type_e_UNUSED9 9 #define engine_type_e_UNUSED_19 19 #define engine_type_e_UNUSED_48 48 @@ -1781,6 +1781,7 @@ #define rpmHardLimit_offset 416 #define runningLedPin_offset 1813 #define SCRIPT_CURVE_COUNT 6 +#define SCRIPT_TABLE_COUNT 4 #define scriptCurve1_offset 2752 #define scriptCurve1Bins_offset 2688 #define scriptCurve2_offset 2880 @@ -1799,6 +1800,10 @@ #define scriptCurveName4_offset 3360 #define scriptCurveName5_offset 3376 #define scriptCurveName6_offset 3392 +#define scriptTableName1_offset 3536 +#define scriptTableName2_offset 3552 +#define scriptTableName3_offset 3568 +#define scriptTableName4_offset 3584 #define sdCardCsPin_offset 707 #define sdCardCsPinMode_offset 2223 #define sdCardPeriodMs_offset 804 @@ -1828,7 +1833,7 @@ #define show_test_presets true #define showHumanReadableWarning_offset 976 #define showSdCardWarning_offset 76 -#define SIGNATURE_HASH 2929648301 +#define SIGNATURE_HASH 355323535 #define silentTriggerError_offset 1464 #define slowAdcAlpha_offset 2088 #define sparkDwellRpmBins_offset 332 @@ -2335,7 +2340,7 @@ #define ts_show_spi true #define ts_show_trigger_comparator true #define ts_show_tunerstudio_port true -#define TS_SIGNATURE "rusEFI 2021.11.07.kin.2929648301" +#define TS_SIGNATURE "rusEFI 2021.11.07.kin.355323535" #define TS_SINGLE_WRITE_COMMAND 'W' #define TS_SINGLE_WRITE_COMMAND_char W #define TS_TEST_COMMAND 't' @@ -2373,7 +2378,7 @@ #define unused2508_offset 2503 #define unused2536_offset 2531 #define unused3103_offset 3075 -#define unused3328_offset 3536 +#define unused3328_offset 3600 #define unused3942_offset 3964 #define unused3988_offset 3960 #define unused4028_offset 4000 diff --git a/firmware/config/boards/subaru_eg33/config/controllers/algo/engine_configuration_generated_structures.h b/firmware/config/boards/subaru_eg33/config/controllers/algo/engine_configuration_generated_structures.h index 504417430c..ece8ff5ee3 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 07 03:32:06 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 07 15:29:33 UTC 2021 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -3728,10 +3728,14 @@ struct engine_configuration_s { */ float scriptCurve6[FSIO_CURVE_8]; /** - units * offset 3564 */ - uint8_t unused3328[300]; + gppwm_note_t scriptTableName[SCRIPT_TABLE_COUNT]; + /** + units + * offset 3628 + */ + uint8_t unused3328[236]; /** Min tCharge Coeff. * offset 3864 @@ -4557,4 +4561,4 @@ struct persistent_config_s { }; // end -// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on config/boards/subaru_eg33/config/gen_config.sh integration/rusefi_config.txt Sun Nov 07 03:32:06 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 07 15:29:33 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 b83ce0cb5a..dba88114c8 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 @@ -779,7 +779,7 @@ #define ENGINE_MAKE_VAG "VAG" #define ENGINE_NOISE_CURVE_SIZE 8 #define ENGINE_SNIFFER_UNIT_US 10 -#define engine_type_e_auto_enum "DEFAULT_FRANKENSO", "MIATA_PROTEUS_TCU", "DODGE_NEON_1995", "FORD_ASPIRE_1996", "MRE_SECONDARY_CAN", "NISSAN_PRIMERA", "ET_UNUSED_6", "FORD_INLINE_6_1995", "GY6_139QMB", "UNUSED9", "UNUSED10", "MRE_MIATA_NB2_MAP", "MRE_MIATA_NA6_VAF", "MRE_MIATA_NB2_ETB", "FORD_ESCORT_GT", "MRE_MIATA_NB2_MAF", "MITSU_4G93", "HONDA_ACCORD_CD_TWO_WIRES", "UNUSED18", "UNUSED_19", "MRE_MIATA_94_MAP", "MIATA_1996", "SUBARU_2003_WRX", "MRE_BODY_CONTROL", "BMW_M73_M", "PROTEUS_LUA_DEMO", "TEST_ENGINE", "TEST_ISSUE_898", "MAZDA_626", "SACHS", "UNUSED30", "MRE_BOARD_NEW_TEST", "VW_ABA", "HELLEN72_ETB", "HELLEN_NA6", "CAMARO_4", "HELLEN_128_MERCEDES_4_CYL", "MRE_SUBARU_EJ18", "TOYOTA_JZS147", "UNUSED39", "FRANKENSO_BMW_M73_F", "FRANKENSO_MIATA_NA6_MAP", "PROTEUS_QC_TEST_BOARD", "HONDA_600", "TOYOTA_2JZ_GTE_VVTi", "TEST_ENGINE_VVT", "DODGE_NEON_2003_CRANK", "FRANKENSO_MAZDA_MIATA_2003", "UNUSED_48", "FRANKENSO_QA_ENGINE", "UNUSED_50", "UNUSED_51", "TEST_ISSUE_366_BOTH", "TEST_ISSUE_366_RISE", "MAZDA_MIATA_2003_NA_RAIL", "MAZDA_MIATA_2003_BOARD_TEST", "FRANKENSO_MAZDA_MIATA_NA8", "FRANKENSO_MIATA_NA6_VAF", "ETB_BENCH_ENGINE", "TLE8888_BENCH_ENGINE", "MICRO_RUS_EFI", "PROTEUS_DEFAULTS", "VW_B6", "PROTEUS_BMW_M73", "DODGE_RAM", "CITROEN_TU3JP", "MRE_MIATA_NA6_MAP", "PROTEUS_MIATA_NB2", "MRE_M111", "HELLEN_NB2", "SUBARUEG33_DEFAULTS", "HELLEN_121_VAG_4_CYL", "HELLEN_121_NISSAN_6_CYL", "HELLEN_55_BMW", "HELLEN_88_BMW", "HELLEN_134_BMW", "HELLEN_154_VAG", "HELLEN_121_VAG_5_CYL", "HELLEN_121_VAG_V6_CYL", "HELLEN_121_VAG_VR6_CYL", "HELLEN_NA94", "HELLEN_121_VAG_8_CYL", "HELLEN_154_HYUNDAI_COUPE_BK1", "HELLEN_NB1", "HELLEN_121_NISSAN_4_CYL", "HELLEN_121_NISSAN_8_CYL", "HELLEN_NB2_36", "HELLEN_121_NISSAN_ALMERA_N16", "HELLEN_128_MERCEDES_6_CYL", "HELLEN_128_MERCEDES_8_CYL", "PROTEUS_HONDA_ELEMENT_2003", "PROTEUS_HONDA_OBD2A", "PROTEUS_VAG_80_18T", "PROTEUS_N73", "HELLEN_NB1_36", "HELLEN_154_HYUNDAI_COUPE_BK2", "ET_UNUSED96", "ET_UNUSED97", "ET_UNUSED98", "MINIMAL_PINS", "PROMETHEUS_DEFAULTS", "UNUSED101", "VAG_18_TURBO", "TEST_33816", "BMW_M73_MRE", "BMW_M73_MRE_SLAVE", "PROTEUS_ANALOG_PWM_TEST", "TEST_ROTARY", "TEST_108", "TEST_109", "TEST_110" +#define engine_type_e_auto_enum "DEFAULT_FRANKENSO", "MIATA_PROTEUS_TCU", "DODGE_NEON_1995", "FORD_ASPIRE_1996", "MRE_SECONDARY_CAN", "NISSAN_PRIMERA", "ET_UNUSED_6", "FORD_INLINE_6_1995", "GY6_139QMB", "UNUSED9", "UNUSED10", "MRE_MIATA_NB2_MAP", "MRE_MIATA_NA6_VAF", "MRE_MIATA_NB2_ETB", "FORD_ESCORT_GT", "MRE_MIATA_NB2_MAF", "MITSU_4G93", "HONDA_ACCORD_CD_TWO_WIRES", "UNUSED18", "UNUSED_19", "MRE_MIATA_94_MAP", "MIATA_1996", "SUBARU_2003_WRX", "MRE_BODY_CONTROL", "BMW_M73_M", "PROTEUS_LUA_DEMO", "TEST_ENGINE", "TEST_ISSUE_898", "UNUSED28", "SACHS", "UNUSED30", "MRE_BOARD_NEW_TEST", "VW_ABA", "HELLEN72_ETB", "HELLEN_NA6", "CAMARO_4", "HELLEN_128_MERCEDES_4_CYL", "MRE_SUBARU_EJ18", "TOYOTA_JZS147", "UNUSED39", "FRANKENSO_BMW_M73_F", "FRANKENSO_MIATA_NA6_MAP", "PROTEUS_QC_TEST_BOARD", "HONDA_600", "TOYOTA_2JZ_GTE_VVTi", "TEST_ENGINE_VVT", "DODGE_NEON_2003_CRANK", "FRANKENSO_MAZDA_MIATA_2003", "UNUSED_48", "FRANKENSO_QA_ENGINE", "UNUSED_50", "UNUSED_51", "TEST_ISSUE_366_BOTH", "TEST_ISSUE_366_RISE", "MAZDA_MIATA_2003_NA_RAIL", "MAZDA_MIATA_2003_BOARD_TEST", "FRANKENSO_MAZDA_MIATA_NA8", "FRANKENSO_MIATA_NA6_VAF", "ETB_BENCH_ENGINE", "TLE8888_BENCH_ENGINE", "UNUSED60", "UNUSED61", "VW_B6", "PROTEUS_BMW_M73", "DODGE_RAM", "CITROEN_TU3JP", "MRE_MIATA_NA6_MAP", "PROTEUS_MIATA_NB2", "MRE_M111", "HELLEN_NB2", "SUBARUEG33_DEFAULTS", "HELLEN_121_VAG_4_CYL", "HELLEN_121_NISSAN_6_CYL", "HELLEN_55_BMW", "HELLEN_88_BMW", "HELLEN_134_BMW", "HELLEN_154_VAG", "HELLEN_121_VAG_5_CYL", "HELLEN_121_VAG_V6_CYL", "HELLEN_121_VAG_VR6_CYL", "HELLEN_NA94", "HELLEN_121_VAG_8_CYL", "HELLEN_154_HYUNDAI_COUPE_BK1", "HELLEN_NB1", "HELLEN_121_NISSAN_4_CYL", "HELLEN_121_NISSAN_8_CYL", "HELLEN_NB2_36", "HELLEN_121_NISSAN_ALMERA_N16", "HELLEN_128_MERCEDES_6_CYL", "HELLEN_128_MERCEDES_8_CYL", "PROTEUS_HONDA_ELEMENT_2003", "PROTEUS_HONDA_OBD2A", "PROTEUS_VAG_80_18T", "PROTEUS_N73", "HELLEN_NB1_36", "HELLEN_154_HYUNDAI_COUPE_BK2", "ET_UNUSED96", "ET_UNUSED97", "ET_UNUSED98", "MINIMAL_PINS", "UNUSED100", "UNUSED101", "VAG_18_TURBO", "TEST_33816", "BMW_M73_MRE", "BMW_M73_MRE_SLAVE", "PROTEUS_ANALOG_PWM_TEST", "TEST_ROTARY", "TEST_108", "TEST_109", "TEST_110" #define engine_type_e_BMW_M73_M 24 #define engine_type_e_BMW_M73_MRE 104 #define engine_type_e_BMW_M73_MRE_SLAVE 105 @@ -832,12 +832,10 @@ #define engine_type_e_HELLEN_NB2_36 86 #define engine_type_e_HONDA_600 43 #define engine_type_e_HONDA_ACCORD_CD_TWO_WIRES 17 -#define engine_type_e_MAZDA_626 28 #define engine_type_e_MAZDA_MIATA_2003_BOARD_TEST 55 #define engine_type_e_MAZDA_MIATA_2003_NA_RAIL 54 #define engine_type_e_MIATA_1996 21 #define engine_type_e_MIATA_PROTEUS_TCU 1 -#define engine_type_e_MICRO_RUS_EFI 60 #define engine_type_e_MINIMAL_PINS 99 #define engine_type_e_MITSU_4G93 16 #define engine_type_e_MRE_BOARD_NEW_TEST 31 @@ -852,10 +850,8 @@ #define engine_type_e_MRE_SECONDARY_CAN 4 #define engine_type_e_MRE_SUBARU_EJ18 37 #define engine_type_e_NISSAN_PRIMERA 5 -#define engine_type_e_PROMETHEUS_DEFAULTS 100 #define engine_type_e_PROTEUS_ANALOG_PWM_TEST 106 #define engine_type_e_PROTEUS_BMW_M73 63 -#define engine_type_e_PROTEUS_DEFAULTS 61 #define engine_type_e_PROTEUS_HONDA_ELEMENT_2003 90 #define engine_type_e_PROTEUS_HONDA_OBD2A 91 #define engine_type_e_PROTEUS_LUA_DEMO 25 @@ -880,10 +876,14 @@ #define engine_type_e_TOYOTA_2JZ_GTE_VVTi 44 #define engine_type_e_TOYOTA_JZS147 38 #define engine_type_e_UNUSED10 10 +#define engine_type_e_UNUSED100 100 #define engine_type_e_UNUSED101 101 #define engine_type_e_UNUSED18 18 +#define engine_type_e_UNUSED28 28 #define engine_type_e_UNUSED30 30 #define engine_type_e_UNUSED39 39 +#define engine_type_e_UNUSED60 60 +#define engine_type_e_UNUSED61 61 #define engine_type_e_UNUSED9 9 #define engine_type_e_UNUSED_19 19 #define engine_type_e_UNUSED_48 48 @@ -1808,6 +1808,7 @@ #define rpmHardLimit_offset 416 #define runningLedPin_offset 1813 #define SCRIPT_CURVE_COUNT 6 +#define SCRIPT_TABLE_COUNT 4 #define scriptCurve1_offset 2780 #define scriptCurve1Bins_offset 2716 #define scriptCurve2_offset 2908 @@ -1826,6 +1827,10 @@ #define scriptCurveName4_offset 3388 #define scriptCurveName5_offset 3404 #define scriptCurveName6_offset 3420 +#define scriptTableName1_offset 3564 +#define scriptTableName2_offset 3580 +#define scriptTableName3_offset 3596 +#define scriptTableName4_offset 3612 #define sdCardCsPin_offset 707 #define sdCardCsPinMode_offset 2226 #define sdCardPeriodMs_offset 804 @@ -1856,7 +1861,7 @@ #define show_test_presets false #define showHumanReadableWarning_offset 976 #define showSdCardWarning_offset 76 -#define SIGNATURE_HASH 2261589730 +#define SIGNATURE_HASH 1031680704 #define silentTriggerError_offset 1464 #define slowAdcAlpha_offset 2088 #define sparkDwellRpmBins_offset 332 @@ -2363,7 +2368,7 @@ #define ts_show_spi true #define ts_show_trigger_comparator false #define ts_show_tunerstudio_port false -#define TS_SIGNATURE "rusEFI 2021.11.07.subaru_eg33_f7.2261589730" +#define TS_SIGNATURE "rusEFI 2021.11.07.subaru_eg33_f7.1031680704" #define TS_SINGLE_WRITE_COMMAND 'W' #define TS_SINGLE_WRITE_COMMAND_char W #define TS_TEST_COMMAND 't' @@ -2401,7 +2406,7 @@ #define unused2508_offset 2511 #define unused2536_offset 2539 #define unused3103_offset 3103 -#define unused3328_offset 3564 +#define unused3328_offset 3628 #define unused3942_offset 3992 #define unused3988_offset 3988 #define unused4028_offset 4028 diff --git a/firmware/controllers/generated/engine_configuration_generated_structures.h b/firmware/controllers/generated/engine_configuration_generated_structures.h index 5daad4b936..570bb57648 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 07 03:31:57 UTC 2021 +// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Nov 07 15:29:27 UTC 2021 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -3728,10 +3728,14 @@ struct engine_configuration_s { */ float scriptCurve6[FSIO_CURVE_8]; /** - units * offset 3564 */ - uint8_t unused3328[300]; + gppwm_note_t scriptTableName[SCRIPT_TABLE_COUNT]; + /** + units + * offset 3628 + */ + uint8_t unused3328[236]; /** Min tCharge Coeff. * offset 3864 @@ -4557,4 +4561,4 @@ struct persistent_config_s { }; // end -// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Nov 07 03:31:57 UTC 2021 +// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Nov 07 15:29:27 UTC 2021 diff --git a/firmware/controllers/generated/fsio_enums_generated.def b/firmware/controllers/generated/fsio_enums_generated.def index 1b1b493771..feb598765b 100644 --- a/firmware/controllers/generated/fsio_enums_generated.def +++ b/firmware/controllers/generated/fsio_enums_generated.def @@ -1,4 +1,4 @@ -// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Nov 07 03:31:57 UTC 2021 +// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Nov 07 15:29:27 UTC 2021 // by class com.rusefi.output.FileFsioSettingsConsumer FSIO_SETTING_ACIDLEEXTRAOFFSET = 1000, diff --git a/firmware/controllers/generated/fsio_getters.def b/firmware/controllers/generated/fsio_getters.def index 496f97ebc1..145e3a84b6 100644 --- a/firmware/controllers/generated/fsio_getters.def +++ b/firmware/controllers/generated/fsio_getters.def @@ -1,4 +1,4 @@ -// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Nov 07 03:31:57 UTC 2021 +// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Nov 07 15:29:27 UTC 2021 // by class com.rusefi.output.FileFsioSettingsConsumer case FSIO_SETTING_ACIDLEEXTRAOFFSET: diff --git a/firmware/controllers/generated/fsio_names.def b/firmware/controllers/generated/fsio_names.def index a21bdbc84a..bb67eff9e7 100644 --- a/firmware/controllers/generated/fsio_names.def +++ b/firmware/controllers/generated/fsio_names.def @@ -1,4 +1,4 @@ -// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Nov 07 03:31:57 UTC 2021 +// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Nov 07 15:29:27 UTC 2021 // by class com.rusefi.output.FileFsioSettingsConsumer static LENameOrdinalPair leacIdleExtraOffset(FSIO_SETTING_ACIDLEEXTRAOFFSET, "cfg_acIdleExtraOffset"); diff --git a/firmware/controllers/generated/fsio_strings.def b/firmware/controllers/generated/fsio_strings.def index 6d28f64f0e..a047c82cce 100644 --- a/firmware/controllers/generated/fsio_strings.def +++ b/firmware/controllers/generated/fsio_strings.def @@ -1,4 +1,4 @@ -// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Nov 07 03:31:57 UTC 2021 +// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Nov 07 15:29:27 UTC 2021 // by class com.rusefi.output.FileFsioSettingsConsumer case FSIO_SETTING_ACIDLEEXTRAOFFSET: diff --git a/firmware/controllers/generated/rusefi_generated.h b/firmware/controllers/generated/rusefi_generated.h index e149548f38..c28a1fa610 100644 --- a/firmware/controllers/generated/rusefi_generated.h +++ b/firmware/controllers/generated/rusefi_generated.h @@ -767,7 +767,7 @@ #define ENGINE_MAKE_VAG "VAG" #define ENGINE_NOISE_CURVE_SIZE 8 #define ENGINE_SNIFFER_UNIT_US 10 -#define engine_type_e_auto_enum "DEFAULT_FRANKENSO", "MIATA_PROTEUS_TCU", "DODGE_NEON_1995", "FORD_ASPIRE_1996", "MRE_SECONDARY_CAN", "NISSAN_PRIMERA", "ET_UNUSED_6", "FORD_INLINE_6_1995", "GY6_139QMB", "UNUSED9", "UNUSED10", "MRE_MIATA_NB2_MAP", "MRE_MIATA_NA6_VAF", "MRE_MIATA_NB2_ETB", "FORD_ESCORT_GT", "MRE_MIATA_NB2_MAF", "MITSU_4G93", "HONDA_ACCORD_CD_TWO_WIRES", "UNUSED18", "UNUSED_19", "MRE_MIATA_94_MAP", "MIATA_1996", "SUBARU_2003_WRX", "MRE_BODY_CONTROL", "BMW_M73_M", "PROTEUS_LUA_DEMO", "TEST_ENGINE", "TEST_ISSUE_898", "MAZDA_626", "SACHS", "UNUSED30", "MRE_BOARD_NEW_TEST", "VW_ABA", "HELLEN72_ETB", "HELLEN_NA6", "CAMARO_4", "HELLEN_128_MERCEDES_4_CYL", "MRE_SUBARU_EJ18", "TOYOTA_JZS147", "UNUSED39", "FRANKENSO_BMW_M73_F", "FRANKENSO_MIATA_NA6_MAP", "PROTEUS_QC_TEST_BOARD", "HONDA_600", "TOYOTA_2JZ_GTE_VVTi", "TEST_ENGINE_VVT", "DODGE_NEON_2003_CRANK", "FRANKENSO_MAZDA_MIATA_2003", "UNUSED_48", "FRANKENSO_QA_ENGINE", "UNUSED_50", "UNUSED_51", "TEST_ISSUE_366_BOTH", "TEST_ISSUE_366_RISE", "MAZDA_MIATA_2003_NA_RAIL", "MAZDA_MIATA_2003_BOARD_TEST", "FRANKENSO_MAZDA_MIATA_NA8", "FRANKENSO_MIATA_NA6_VAF", "ETB_BENCH_ENGINE", "TLE8888_BENCH_ENGINE", "MICRO_RUS_EFI", "PROTEUS_DEFAULTS", "VW_B6", "PROTEUS_BMW_M73", "DODGE_RAM", "CITROEN_TU3JP", "MRE_MIATA_NA6_MAP", "PROTEUS_MIATA_NB2", "MRE_M111", "HELLEN_NB2", "SUBARUEG33_DEFAULTS", "HELLEN_121_VAG_4_CYL", "HELLEN_121_NISSAN_6_CYL", "HELLEN_55_BMW", "HELLEN_88_BMW", "HELLEN_134_BMW", "HELLEN_154_VAG", "HELLEN_121_VAG_5_CYL", "HELLEN_121_VAG_V6_CYL", "HELLEN_121_VAG_VR6_CYL", "HELLEN_NA94", "HELLEN_121_VAG_8_CYL", "HELLEN_154_HYUNDAI_COUPE_BK1", "HELLEN_NB1", "HELLEN_121_NISSAN_4_CYL", "HELLEN_121_NISSAN_8_CYL", "HELLEN_NB2_36", "HELLEN_121_NISSAN_ALMERA_N16", "HELLEN_128_MERCEDES_6_CYL", "HELLEN_128_MERCEDES_8_CYL", "PROTEUS_HONDA_ELEMENT_2003", "PROTEUS_HONDA_OBD2A", "PROTEUS_VAG_80_18T", "PROTEUS_N73", "HELLEN_NB1_36", "HELLEN_154_HYUNDAI_COUPE_BK2", "ET_UNUSED96", "ET_UNUSED97", "ET_UNUSED98", "MINIMAL_PINS", "PROMETHEUS_DEFAULTS", "UNUSED101", "VAG_18_TURBO", "TEST_33816", "BMW_M73_MRE", "BMW_M73_MRE_SLAVE", "PROTEUS_ANALOG_PWM_TEST", "TEST_ROTARY", "TEST_108", "TEST_109", "TEST_110" +#define engine_type_e_auto_enum "DEFAULT_FRANKENSO", "MIATA_PROTEUS_TCU", "DODGE_NEON_1995", "FORD_ASPIRE_1996", "MRE_SECONDARY_CAN", "NISSAN_PRIMERA", "ET_UNUSED_6", "FORD_INLINE_6_1995", "GY6_139QMB", "UNUSED9", "UNUSED10", "MRE_MIATA_NB2_MAP", "MRE_MIATA_NA6_VAF", "MRE_MIATA_NB2_ETB", "FORD_ESCORT_GT", "MRE_MIATA_NB2_MAF", "MITSU_4G93", "HONDA_ACCORD_CD_TWO_WIRES", "UNUSED18", "UNUSED_19", "MRE_MIATA_94_MAP", "MIATA_1996", "SUBARU_2003_WRX", "MRE_BODY_CONTROL", "BMW_M73_M", "PROTEUS_LUA_DEMO", "TEST_ENGINE", "TEST_ISSUE_898", "UNUSED28", "SACHS", "UNUSED30", "MRE_BOARD_NEW_TEST", "VW_ABA", "HELLEN72_ETB", "HELLEN_NA6", "CAMARO_4", "HELLEN_128_MERCEDES_4_CYL", "MRE_SUBARU_EJ18", "TOYOTA_JZS147", "UNUSED39", "FRANKENSO_BMW_M73_F", "FRANKENSO_MIATA_NA6_MAP", "PROTEUS_QC_TEST_BOARD", "HONDA_600", "TOYOTA_2JZ_GTE_VVTi", "TEST_ENGINE_VVT", "DODGE_NEON_2003_CRANK", "FRANKENSO_MAZDA_MIATA_2003", "UNUSED_48", "FRANKENSO_QA_ENGINE", "UNUSED_50", "UNUSED_51", "TEST_ISSUE_366_BOTH", "TEST_ISSUE_366_RISE", "MAZDA_MIATA_2003_NA_RAIL", "MAZDA_MIATA_2003_BOARD_TEST", "FRANKENSO_MAZDA_MIATA_NA8", "FRANKENSO_MIATA_NA6_VAF", "ETB_BENCH_ENGINE", "TLE8888_BENCH_ENGINE", "UNUSED60", "UNUSED61", "VW_B6", "PROTEUS_BMW_M73", "DODGE_RAM", "CITROEN_TU3JP", "MRE_MIATA_NA6_MAP", "PROTEUS_MIATA_NB2", "MRE_M111", "HELLEN_NB2", "SUBARUEG33_DEFAULTS", "HELLEN_121_VAG_4_CYL", "HELLEN_121_NISSAN_6_CYL", "HELLEN_55_BMW", "HELLEN_88_BMW", "HELLEN_134_BMW", "HELLEN_154_VAG", "HELLEN_121_VAG_5_CYL", "HELLEN_121_VAG_V6_CYL", "HELLEN_121_VAG_VR6_CYL", "HELLEN_NA94", "HELLEN_121_VAG_8_CYL", "HELLEN_154_HYUNDAI_COUPE_BK1", "HELLEN_NB1", "HELLEN_121_NISSAN_4_CYL", "HELLEN_121_NISSAN_8_CYL", "HELLEN_NB2_36", "HELLEN_121_NISSAN_ALMERA_N16", "HELLEN_128_MERCEDES_6_CYL", "HELLEN_128_MERCEDES_8_CYL", "PROTEUS_HONDA_ELEMENT_2003", "PROTEUS_HONDA_OBD2A", "PROTEUS_VAG_80_18T", "PROTEUS_N73", "HELLEN_NB1_36", "HELLEN_154_HYUNDAI_COUPE_BK2", "ET_UNUSED96", "ET_UNUSED97", "ET_UNUSED98", "MINIMAL_PINS", "UNUSED100", "UNUSED101", "VAG_18_TURBO", "TEST_33816", "BMW_M73_MRE", "BMW_M73_MRE_SLAVE", "PROTEUS_ANALOG_PWM_TEST", "TEST_ROTARY", "TEST_108", "TEST_109", "TEST_110" #define engine_type_e_BMW_M73_M 24 #define engine_type_e_BMW_M73_MRE 104 #define engine_type_e_BMW_M73_MRE_SLAVE 105 @@ -820,12 +820,10 @@ #define engine_type_e_HELLEN_NB2_36 86 #define engine_type_e_HONDA_600 43 #define engine_type_e_HONDA_ACCORD_CD_TWO_WIRES 17 -#define engine_type_e_MAZDA_626 28 #define engine_type_e_MAZDA_MIATA_2003_BOARD_TEST 55 #define engine_type_e_MAZDA_MIATA_2003_NA_RAIL 54 #define engine_type_e_MIATA_1996 21 #define engine_type_e_MIATA_PROTEUS_TCU 1 -#define engine_type_e_MICRO_RUS_EFI 60 #define engine_type_e_MINIMAL_PINS 99 #define engine_type_e_MITSU_4G93 16 #define engine_type_e_MRE_BOARD_NEW_TEST 31 @@ -840,10 +838,8 @@ #define engine_type_e_MRE_SECONDARY_CAN 4 #define engine_type_e_MRE_SUBARU_EJ18 37 #define engine_type_e_NISSAN_PRIMERA 5 -#define engine_type_e_PROMETHEUS_DEFAULTS 100 #define engine_type_e_PROTEUS_ANALOG_PWM_TEST 106 #define engine_type_e_PROTEUS_BMW_M73 63 -#define engine_type_e_PROTEUS_DEFAULTS 61 #define engine_type_e_PROTEUS_HONDA_ELEMENT_2003 90 #define engine_type_e_PROTEUS_HONDA_OBD2A 91 #define engine_type_e_PROTEUS_LUA_DEMO 25 @@ -868,10 +864,14 @@ #define engine_type_e_TOYOTA_2JZ_GTE_VVTi 44 #define engine_type_e_TOYOTA_JZS147 38 #define engine_type_e_UNUSED10 10 +#define engine_type_e_UNUSED100 100 #define engine_type_e_UNUSED101 101 #define engine_type_e_UNUSED18 18 +#define engine_type_e_UNUSED28 28 #define engine_type_e_UNUSED30 30 #define engine_type_e_UNUSED39 39 +#define engine_type_e_UNUSED60 60 +#define engine_type_e_UNUSED61 61 #define engine_type_e_UNUSED9 9 #define engine_type_e_UNUSED_19 19 #define engine_type_e_UNUSED_48 48 @@ -1796,6 +1796,7 @@ #define rpmHardLimit_offset 416 #define runningLedPin_offset 1813 #define SCRIPT_CURVE_COUNT 6 +#define SCRIPT_TABLE_COUNT 4 #define scriptCurve1_offset 2780 #define scriptCurve1Bins_offset 2716 #define scriptCurve2_offset 2908 @@ -1814,6 +1815,10 @@ #define scriptCurveName4_offset 3388 #define scriptCurveName5_offset 3404 #define scriptCurveName6_offset 3420 +#define scriptTableName1_offset 3564 +#define scriptTableName2_offset 3580 +#define scriptTableName3_offset 3596 +#define scriptTableName4_offset 3612 #define sdCardCsPin_offset 707 #define sdCardCsPinMode_offset 2226 #define sdCardPeriodMs_offset 804 @@ -1843,7 +1848,7 @@ #define show_test_presets true #define showHumanReadableWarning_offset 976 #define showSdCardWarning_offset 76 -#define SIGNATURE_HASH 483694278 +#define SIGNATURE_HASH 2808593124 #define silentTriggerError_offset 1464 #define slowAdcAlpha_offset 2088 #define sparkDwellRpmBins_offset 332 @@ -2350,7 +2355,7 @@ #define ts_show_spi true #define ts_show_trigger_comparator false #define ts_show_tunerstudio_port true -#define TS_SIGNATURE "rusEFI 2021.11.07.all.483694278" +#define TS_SIGNATURE "rusEFI 2021.11.07.all.2808593124" #define TS_SINGLE_WRITE_COMMAND 'W' #define TS_SINGLE_WRITE_COMMAND_char W #define TS_TEST_COMMAND 't' @@ -2388,7 +2393,7 @@ #define unused2508_offset 2511 #define unused2536_offset 2539 #define unused3103_offset 3103 -#define unused3328_offset 3564 +#define unused3328_offset 3628 #define unused3942_offset 3992 #define unused3988_offset 3988 #define unused4028_offset 4028 diff --git a/firmware/controllers/generated/signature_all.h b/firmware/controllers/generated/signature_all.h index 6945a93453..30dc2d142f 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 2634413741 -#define TS_SIGNATURE "rusEFI 2021.11.07.all.2634413741" +#define SIGNATURE_HASH 2808593124 +#define TS_SIGNATURE "rusEFI 2021.11.07.all.2808593124" diff --git a/firmware/controllers/generated/signature_atlas.h b/firmware/controllers/generated/signature_atlas.h index 14eac28afe..7fd4366486 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 2177827722 -#define TS_SIGNATURE "rusEFI 2021.11.07.atlas.2177827722" +#define SIGNATURE_HASH 3148697539 +#define TS_SIGNATURE "rusEFI 2021.11.07.atlas.3148697539" diff --git a/firmware/controllers/generated/signature_f429-discovery.h b/firmware/controllers/generated/signature_f429-discovery.h index cf019de224..915000d757 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 2634413741 -#define TS_SIGNATURE "rusEFI 2021.11.07.f429-discovery.2634413741" +#define SIGNATURE_HASH 2808593124 +#define TS_SIGNATURE "rusEFI 2021.11.07.f429-discovery.2808593124" diff --git a/firmware/controllers/generated/signature_frankenso_na6.h b/firmware/controllers/generated/signature_frankenso_na6.h index 9d5d89ae20..d2c16ef850 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 3879183172 -#define TS_SIGNATURE "rusEFI 2021.11.07.frankenso_na6.3879183172" +#define SIGNATURE_HASH 3713396493 +#define TS_SIGNATURE "rusEFI 2021.11.07.frankenso_na6.3713396493" diff --git a/firmware/controllers/generated/signature_hellen-nb1.h b/firmware/controllers/generated/signature_hellen-nb1.h index 5052b93ada..4aaee5a3be 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 4204949636 -#define TS_SIGNATURE "rusEFI 2021.11.07.hellen-nb1.4204949636" +#define SIGNATURE_HASH 3233823949 +#define TS_SIGNATURE "rusEFI 2021.11.07.hellen-nb1.3233823949" diff --git a/firmware/controllers/generated/signature_hellen121nissan.h b/firmware/controllers/generated/signature_hellen121nissan.h index f90e926771..a2a97369dc 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 385134319 -#define TS_SIGNATURE "rusEFI 2021.11.07.hellen121nissan.385134319" +#define SIGNATURE_HASH 748085926 +#define TS_SIGNATURE "rusEFI 2021.11.07.hellen121nissan.748085926" diff --git a/firmware/controllers/generated/signature_hellen121vag.h b/firmware/controllers/generated/signature_hellen121vag.h index 193a45d33a..c3c8461f93 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 3471382251 -#define TS_SIGNATURE "rusEFI 2021.11.07.hellen121vag.3471382251" +#define SIGNATURE_HASH 4102773410 +#define TS_SIGNATURE "rusEFI 2021.11.07.hellen121vag.4102773410" diff --git a/firmware/controllers/generated/signature_hellen128.h b/firmware/controllers/generated/signature_hellen128.h index 62d9d3de33..e84a0b209f 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 2024136565 -#define TS_SIGNATURE "rusEFI 2021.11.07.hellen128.2024136565" +#define SIGNATURE_HASH 1120375612 +#define TS_SIGNATURE "rusEFI 2021.11.07.hellen128.1120375612" diff --git a/firmware/controllers/generated/signature_hellen154hyundai.h b/firmware/controllers/generated/signature_hellen154hyundai.h index 0cd2e1d58e..65d4692d11 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 3648671895 -#define TS_SIGNATURE "rusEFI 2021.11.07.hellen154hyundai.3648671895" +#define SIGNATURE_HASH 3810008286 +#define TS_SIGNATURE "rusEFI 2021.11.07.hellen154hyundai.3810008286" diff --git a/firmware/controllers/generated/signature_hellen72.h b/firmware/controllers/generated/signature_hellen72.h index ec642e5f5c..e295b30f25 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 4220556938 -#define TS_SIGNATURE "rusEFI 2021.11.07.hellen72.4220556938" +#define SIGNATURE_HASH 3253918403 +#define TS_SIGNATURE "rusEFI 2021.11.07.hellen72.3253918403" diff --git a/firmware/controllers/generated/signature_hellen88bmw.h b/firmware/controllers/generated/signature_hellen88bmw.h index 41473e96f4..dbe77b8858 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 1803881024 -#define TS_SIGNATURE "rusEFI 2021.11.07.hellen88bmw.1803881024" +#define SIGNATURE_HASH 1374111241 +#define TS_SIGNATURE "rusEFI 2021.11.07.hellen88bmw.1374111241" diff --git a/firmware/controllers/generated/signature_hellenNA6.h b/firmware/controllers/generated/signature_hellenNA6.h index 6c75260355..3264bc6fec 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 744357795 -#define TS_SIGNATURE "rusEFI 2021.11.07.hellenNA6.744357795" +#define SIGNATURE_HASH 373273578 +#define TS_SIGNATURE "rusEFI 2021.11.07.hellenNA6.373273578" diff --git a/firmware/controllers/generated/signature_hellen_cypress.h b/firmware/controllers/generated/signature_hellen_cypress.h index 63902b781e..a9253a1158 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 3505016378 -#define TS_SIGNATURE "rusEFI 2021.11.07.hellen_cypress.3505016378" +#define SIGNATURE_HASH 3934782067 +#define TS_SIGNATURE "rusEFI 2021.11.07.hellen_cypress.3934782067" diff --git a/firmware/controllers/generated/signature_kin.h b/firmware/controllers/generated/signature_kin.h index abc7107884..32a7f65001 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 793739974 -#define TS_SIGNATURE "rusEFI 2021.11.07.kin.793739974" +#define SIGNATURE_HASH 355323535 +#define TS_SIGNATURE "rusEFI 2021.11.07.kin.355323535" diff --git a/firmware/controllers/generated/signature_mre_f4.h b/firmware/controllers/generated/signature_mre_f4.h index 8c32117673..364f7a29fc 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 362144057 -#define TS_SIGNATURE "rusEFI 2021.11.07.mre_f4.362144057" +#define SIGNATURE_HASH 804760944 +#define TS_SIGNATURE "rusEFI 2021.11.07.mre_f4.804760944" diff --git a/firmware/controllers/generated/signature_mre_f7.h b/firmware/controllers/generated/signature_mre_f7.h index bcf8062790..9c60926fc8 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 362144057 -#define TS_SIGNATURE "rusEFI 2021.11.07.mre_f7.362144057" +#define SIGNATURE_HASH 804760944 +#define TS_SIGNATURE "rusEFI 2021.11.07.mre_f7.804760944" diff --git a/firmware/controllers/generated/signature_prometheus_405.h b/firmware/controllers/generated/signature_prometheus_405.h index 27a3de8947..da3a748dd2 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 3455004491 -#define TS_SIGNATURE "rusEFI 2021.11.07.prometheus_405.3455004491" +#define SIGNATURE_HASH 4153238274 +#define TS_SIGNATURE "rusEFI 2021.11.07.prometheus_405.4153238274" diff --git a/firmware/controllers/generated/signature_prometheus_469.h b/firmware/controllers/generated/signature_prometheus_469.h index f0b2306dcb..61a0880106 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 3455004491 -#define TS_SIGNATURE "rusEFI 2021.11.07.prometheus_469.3455004491" +#define SIGNATURE_HASH 4153238274 +#define TS_SIGNATURE "rusEFI 2021.11.07.prometheus_469.4153238274" diff --git a/firmware/controllers/generated/signature_proteus_f4.h b/firmware/controllers/generated/signature_proteus_f4.h index 4d3bc72cad..34ef04062a 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 65126001 -#define TS_SIGNATURE "rusEFI 2021.11.07.proteus_f4.65126001" +#define SIGNATURE_HASH 964948536 +#define TS_SIGNATURE "rusEFI 2021.11.07.proteus_f4.964948536" diff --git a/firmware/controllers/generated/signature_proteus_f7.h b/firmware/controllers/generated/signature_proteus_f7.h index 0f42068b00..e807ba653c 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 65126001 -#define TS_SIGNATURE "rusEFI 2021.11.07.proteus_f7.65126001" +#define SIGNATURE_HASH 964948536 +#define TS_SIGNATURE "rusEFI 2021.11.07.proteus_f7.964948536" diff --git a/firmware/controllers/generated/signature_subaru_eg33_f7.h b/firmware/controllers/generated/signature_subaru_eg33_f7.h index d814fa56b5..fb10bbaf32 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 119307913 -#define TS_SIGNATURE "rusEFI 2021.11.07.subaru_eg33_f7.119307913" +#define SIGNATURE_HASH 1031680704 +#define TS_SIGNATURE "rusEFI 2021.11.07.subaru_eg33_f7.1031680704" diff --git a/firmware/tunerstudio/generated/cache.zip b/firmware/tunerstudio/generated/cache.zip index 8153e845ef..39bbc95e1d 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 8c0c0ac595..956abf5f73 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.07.all.2634413741" + signature = "rusEFI 2021.11.07.all.2808593124" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.11.07.all.2634413741" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.11.07.all.2808593124" ; 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 07 04:42:46 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Nov 07 15:29:27 UTC 2021 pageSize = 20000 page = 1 @@ -1096,7 +1096,11 @@ scriptCurve5Bins = array, F32, 3436, [8], "x", 1, 0, -999, 1000, 3 scriptCurve5 = array, F32, 3468, [8], "y", 1, 0, -999, 1000, 3 scriptCurve6Bins = array, F32, 3500, [8], "x", 1, 0, -999, 1000, 3 scriptCurve6 = array, F32, 3532, [8], "y", 1, 0, -999, 1000, 3 -unused3328 = array, U08, 3564, [300], "units", 1, 0, -20, 100, 0 +scriptTableName1 = string, ASCII, 3564, 16 +scriptTableName2 = string, ASCII, 3580, 16 +scriptTableName3 = string, ASCII, 3596, 16 +scriptTableName4 = string, ASCII, 3612, 16 +unused3328 = array, U08, 3628, [236], "units", 1, 0, -20, 100, 0 tChargeAirCoefMin = scalar, F32, 3864, "Min tCharge Coeff.", 1, 0, 0, 1, 4 tChargeAirCoefMax = scalar, F32, 3868, "Max tCharge Coeff.", 1, 0, 0, 1, 4 tChargeAirFlowMax = scalar, F32, 3872, "Max Air Flow (kg/h)", 1, 0, 0, 1000, 1 @@ -3372,10 +3376,10 @@ menuDialog = main subMenu = fsioFormulas, "FSIO Formulas" subMenu = std_separator - subMenu = fsioTable1Tbl, "Script Table #1" - subMenu = fsioTable2Tbl, "Script Table #2" - subMenu = fsioTable3Tbl, "Script Table #3" - subMenu = fsioTable4Tbl, "Script Table #4" + subMenu = fsioTable1TblSettings, "Script Table #1" + subMenu = fsioTable2TblSettings, "Script Table #2" + subMenu = fsioTable3TblSettings, "Script Table #3" + subMenu = fsioTable4TblSettings, "Script Table #4" subMenu = scriptCurve1Settings, "Script Curve #1" subMenu = scriptCurve2Settings, "Script Curve #2" subMenu = scriptCurve3Settings, "Script Curve #3" @@ -3666,6 +3670,22 @@ 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 + field = "Name", tableCurveName1 + panel = fsioTable1Tbl + + dialog = fsioTable2TblSettings, "", yAxis + field = "Name", tableCurveName2 + panel = fsioTable1Tb2 + + dialog = fsioTable3TblSettings, "", yAxis + field = "Name", tableCurveName3 + panel = fsioTable3Tbl + + dialog = fsioTable4TblSettings, "", yAxis + field = "Name", tableCurveName4 + panel = fsioTable4Tbl + dialog = scriptCurve1Settings, "", yAxis field = "Name", scriptCurveName4 panel = scriptCurve1 diff --git a/firmware/tunerstudio/generated/rusefi_atlas.ini b/firmware/tunerstudio/generated/rusefi_atlas.ini index ef46250701..46f482a1f8 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.07.atlas.2177827722" + signature = "rusEFI 2021.11.07.atlas.3148697539" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.11.07.atlas.2177827722" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.11.07.atlas.3148697539" ; 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 07 04:42:44 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Nov 07 15:29:25 UTC 2021 pageSize = 20000 page = 1 @@ -1096,7 +1096,11 @@ scriptCurve5Bins = array, F32, 3436, [8], "x", 1, 0, -999, 1000, 3 scriptCurve5 = array, F32, 3468, [8], "y", 1, 0, -999, 1000, 3 scriptCurve6Bins = array, F32, 3500, [8], "x", 1, 0, -999, 1000, 3 scriptCurve6 = array, F32, 3532, [8], "y", 1, 0, -999, 1000, 3 -unused3328 = array, U08, 3564, [300], "units", 1, 0, -20, 100, 0 +scriptTableName1 = string, ASCII, 3564, 16 +scriptTableName2 = string, ASCII, 3580, 16 +scriptTableName3 = string, ASCII, 3596, 16 +scriptTableName4 = string, ASCII, 3612, 16 +unused3328 = array, U08, 3628, [236], "units", 1, 0, -20, 100, 0 tChargeAirCoefMin = scalar, F32, 3864, "Min tCharge Coeff.", 1, 0, 0, 1, 4 tChargeAirCoefMax = scalar, F32, 3868, "Max tCharge Coeff.", 1, 0, 0, 1, 4 tChargeAirFlowMax = scalar, F32, 3872, "Max Air Flow (kg/h)", 1, 0, 0, 1000, 1 @@ -3372,10 +3376,10 @@ menuDialog = main subMenu = fsioFormulas, "FSIO Formulas" subMenu = std_separator - subMenu = fsioTable1Tbl, "Script Table #1" - subMenu = fsioTable2Tbl, "Script Table #2" - subMenu = fsioTable3Tbl, "Script Table #3" - subMenu = fsioTable4Tbl, "Script Table #4" + subMenu = fsioTable1TblSettings, "Script Table #1" + subMenu = fsioTable2TblSettings, "Script Table #2" + subMenu = fsioTable3TblSettings, "Script Table #3" + subMenu = fsioTable4TblSettings, "Script Table #4" subMenu = scriptCurve1Settings, "Script Curve #1" subMenu = scriptCurve2Settings, "Script Curve #2" subMenu = scriptCurve3Settings, "Script Curve #3" @@ -3666,6 +3670,22 @@ 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 + field = "Name", tableCurveName1 + panel = fsioTable1Tbl + + dialog = fsioTable2TblSettings, "", yAxis + field = "Name", tableCurveName2 + panel = fsioTable1Tb2 + + dialog = fsioTable3TblSettings, "", yAxis + field = "Name", tableCurveName3 + panel = fsioTable3Tbl + + dialog = fsioTable4TblSettings, "", yAxis + field = "Name", tableCurveName4 + panel = fsioTable4Tbl + dialog = scriptCurve1Settings, "", yAxis field = "Name", scriptCurveName4 panel = scriptCurve1 diff --git a/firmware/tunerstudio/generated/rusefi_f429-discovery.ini b/firmware/tunerstudio/generated/rusefi_f429-discovery.ini index 100ad03836..e4437813b3 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.07.f429-discovery.2634413741" + signature = "rusEFI 2021.11.07.f429-discovery.2808593124" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.11.07.f429-discovery.2634413741" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.11.07.f429-discovery.2808593124" ; 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 07 04:42:03 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Nov 07 15:28:46 UTC 2021 pageSize = 20000 page = 1 @@ -1096,7 +1096,11 @@ scriptCurve5Bins = array, F32, 3436, [8], "x", 1, 0, -999, 1000, 3 scriptCurve5 = array, F32, 3468, [8], "y", 1, 0, -999, 1000, 3 scriptCurve6Bins = array, F32, 3500, [8], "x", 1, 0, -999, 1000, 3 scriptCurve6 = array, F32, 3532, [8], "y", 1, 0, -999, 1000, 3 -unused3328 = array, U08, 3564, [300], "units", 1, 0, -20, 100, 0 +scriptTableName1 = string, ASCII, 3564, 16 +scriptTableName2 = string, ASCII, 3580, 16 +scriptTableName3 = string, ASCII, 3596, 16 +scriptTableName4 = string, ASCII, 3612, 16 +unused3328 = array, U08, 3628, [236], "units", 1, 0, -20, 100, 0 tChargeAirCoefMin = scalar, F32, 3864, "Min tCharge Coeff.", 1, 0, 0, 1, 4 tChargeAirCoefMax = scalar, F32, 3868, "Max tCharge Coeff.", 1, 0, 0, 1, 4 tChargeAirFlowMax = scalar, F32, 3872, "Max Air Flow (kg/h)", 1, 0, 0, 1000, 1 @@ -3372,10 +3376,10 @@ menuDialog = main subMenu = fsioFormulas, "FSIO Formulas" subMenu = std_separator - subMenu = fsioTable1Tbl, "Script Table #1" - subMenu = fsioTable2Tbl, "Script Table #2" - subMenu = fsioTable3Tbl, "Script Table #3" - subMenu = fsioTable4Tbl, "Script Table #4" + subMenu = fsioTable1TblSettings, "Script Table #1" + subMenu = fsioTable2TblSettings, "Script Table #2" + subMenu = fsioTable3TblSettings, "Script Table #3" + subMenu = fsioTable4TblSettings, "Script Table #4" subMenu = scriptCurve1Settings, "Script Curve #1" subMenu = scriptCurve2Settings, "Script Curve #2" subMenu = scriptCurve3Settings, "Script Curve #3" @@ -3666,6 +3670,22 @@ 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 + field = "Name", tableCurveName1 + panel = fsioTable1Tbl + + dialog = fsioTable2TblSettings, "", yAxis + field = "Name", tableCurveName2 + panel = fsioTable1Tb2 + + dialog = fsioTable3TblSettings, "", yAxis + field = "Name", tableCurveName3 + panel = fsioTable3Tbl + + dialog = fsioTable4TblSettings, "", yAxis + field = "Name", tableCurveName4 + panel = fsioTable4Tbl + dialog = scriptCurve1Settings, "", yAxis field = "Name", scriptCurveName4 panel = scriptCurve1 diff --git a/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini b/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini index e4112f37d1..eb331dc203 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.07.frankenso_na6.3879183172" + signature = "rusEFI 2021.11.07.frankenso_na6.3713396493" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.11.07.frankenso_na6.3879183172" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.11.07.frankenso_na6.3713396493" ; 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 07 04:42:31 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Nov 07 15:29:13 UTC 2021 pageSize = 20000 page = 1 @@ -1096,7 +1096,11 @@ scriptCurve5Bins = array, F32, 3436, [8], "x", 1, 0, -999, 1000, 3 scriptCurve5 = array, F32, 3468, [8], "y", 1, 0, -999, 1000, 3 scriptCurve6Bins = array, F32, 3500, [8], "x", 1, 0, -999, 1000, 3 scriptCurve6 = array, F32, 3532, [8], "y", 1, 0, -999, 1000, 3 -unused3328 = array, U08, 3564, [300], "units", 1, 0, -20, 100, 0 +scriptTableName1 = string, ASCII, 3564, 16 +scriptTableName2 = string, ASCII, 3580, 16 +scriptTableName3 = string, ASCII, 3596, 16 +scriptTableName4 = string, ASCII, 3612, 16 +unused3328 = array, U08, 3628, [236], "units", 1, 0, -20, 100, 0 tChargeAirCoefMin = scalar, F32, 3864, "Min tCharge Coeff.", 1, 0, 0, 1, 4 tChargeAirCoefMax = scalar, F32, 3868, "Max tCharge Coeff.", 1, 0, 0, 1, 4 tChargeAirFlowMax = scalar, F32, 3872, "Max Air Flow (kg/h)", 1, 0, 0, 1000, 1 @@ -3372,10 +3376,10 @@ menuDialog = main subMenu = fsioFormulas, "FSIO Formulas" subMenu = std_separator - subMenu = fsioTable1Tbl, "Script Table #1" - subMenu = fsioTable2Tbl, "Script Table #2" - subMenu = fsioTable3Tbl, "Script Table #3" - subMenu = fsioTable4Tbl, "Script Table #4" + subMenu = fsioTable1TblSettings, "Script Table #1" + subMenu = fsioTable2TblSettings, "Script Table #2" + subMenu = fsioTable3TblSettings, "Script Table #3" + subMenu = fsioTable4TblSettings, "Script Table #4" subMenu = scriptCurve1Settings, "Script Curve #1" subMenu = scriptCurve2Settings, "Script Curve #2" subMenu = scriptCurve3Settings, "Script Curve #3" @@ -3666,6 +3670,22 @@ 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 + field = "Name", tableCurveName1 + panel = fsioTable1Tbl + + dialog = fsioTable2TblSettings, "", yAxis + field = "Name", tableCurveName2 + panel = fsioTable1Tb2 + + dialog = fsioTable3TblSettings, "", yAxis + field = "Name", tableCurveName3 + panel = fsioTable3Tbl + + dialog = fsioTable4TblSettings, "", yAxis + field = "Name", tableCurveName4 + panel = fsioTable4Tbl + dialog = scriptCurve1Settings, "", yAxis field = "Name", scriptCurveName4 panel = scriptCurve1 diff --git a/firmware/tunerstudio/generated/rusefi_hellen-nb1.ini b/firmware/tunerstudio/generated/rusefi_hellen-nb1.ini index 29a452f3fd..655a4422c1 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.07.hellen-nb1.4204949636" + signature = "rusEFI 2021.11.07.hellen-nb1.3233823949" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.11.07.hellen-nb1.4204949636" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.11.07.hellen-nb1.3233823949" ; 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 07 04:42:21 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Nov 07 15:29:04 UTC 2021 pageSize = 20000 page = 1 @@ -1096,7 +1096,11 @@ scriptCurve5Bins = array, F32, 3436, [8], "x", 1, 0, -999, 1000, 3 scriptCurve5 = array, F32, 3468, [8], "y", 1, 0, -999, 1000, 3 scriptCurve6Bins = array, F32, 3500, [8], "x", 1, 0, -999, 1000, 3 scriptCurve6 = array, F32, 3532, [8], "y", 1, 0, -999, 1000, 3 -unused3328 = array, U08, 3564, [300], "units", 1, 0, -20, 100, 0 +scriptTableName1 = string, ASCII, 3564, 16 +scriptTableName2 = string, ASCII, 3580, 16 +scriptTableName3 = string, ASCII, 3596, 16 +scriptTableName4 = string, ASCII, 3612, 16 +unused3328 = array, U08, 3628, [236], "units", 1, 0, -20, 100, 0 tChargeAirCoefMin = scalar, F32, 3864, "Min tCharge Coeff.", 1, 0, 0, 1, 4 tChargeAirCoefMax = scalar, F32, 3868, "Max tCharge Coeff.", 1, 0, 0, 1, 4 tChargeAirFlowMax = scalar, F32, 3872, "Max Air Flow (kg/h)", 1, 0, 0, 1000, 1 @@ -3372,10 +3376,10 @@ menuDialog = main subMenu = fsioFormulas, "FSIO Formulas" subMenu = std_separator - subMenu = fsioTable1Tbl, "Script Table #1" - subMenu = fsioTable2Tbl, "Script Table #2" - subMenu = fsioTable3Tbl, "Script Table #3" - subMenu = fsioTable4Tbl, "Script Table #4" + subMenu = fsioTable1TblSettings, "Script Table #1" + subMenu = fsioTable2TblSettings, "Script Table #2" + subMenu = fsioTable3TblSettings, "Script Table #3" + subMenu = fsioTable4TblSettings, "Script Table #4" subMenu = scriptCurve1Settings, "Script Curve #1" subMenu = scriptCurve2Settings, "Script Curve #2" subMenu = scriptCurve3Settings, "Script Curve #3" @@ -3662,6 +3666,22 @@ 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 + field = "Name", tableCurveName1 + panel = fsioTable1Tbl + + dialog = fsioTable2TblSettings, "", yAxis + field = "Name", tableCurveName2 + panel = fsioTable1Tb2 + + dialog = fsioTable3TblSettings, "", yAxis + field = "Name", tableCurveName3 + panel = fsioTable3Tbl + + dialog = fsioTable4TblSettings, "", yAxis + field = "Name", tableCurveName4 + panel = fsioTable4Tbl + dialog = scriptCurve1Settings, "", yAxis field = "Name", scriptCurveName4 panel = scriptCurve1 diff --git a/firmware/tunerstudio/generated/rusefi_hellen121nissan.ini b/firmware/tunerstudio/generated/rusefi_hellen121nissan.ini index ce23cd3ec3..f3844ca88b 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.07.hellen121nissan.385134319" + signature = "rusEFI 2021.11.07.hellen121nissan.748085926" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.11.07.hellen121nissan.385134319" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.11.07.hellen121nissan.748085926" ; 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 07 04:42:10 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Nov 07 15:28:54 UTC 2021 pageSize = 20000 page = 1 @@ -1096,7 +1096,11 @@ scriptCurve5Bins = array, F32, 3436, [8], "x", 1, 0, -999, 1000, 3 scriptCurve5 = array, F32, 3468, [8], "y", 1, 0, -999, 1000, 3 scriptCurve6Bins = array, F32, 3500, [8], "x", 1, 0, -999, 1000, 3 scriptCurve6 = array, F32, 3532, [8], "y", 1, 0, -999, 1000, 3 -unused3328 = array, U08, 3564, [300], "units", 1, 0, -20, 100, 0 +scriptTableName1 = string, ASCII, 3564, 16 +scriptTableName2 = string, ASCII, 3580, 16 +scriptTableName3 = string, ASCII, 3596, 16 +scriptTableName4 = string, ASCII, 3612, 16 +unused3328 = array, U08, 3628, [236], "units", 1, 0, -20, 100, 0 tChargeAirCoefMin = scalar, F32, 3864, "Min tCharge Coeff.", 1, 0, 0, 1, 4 tChargeAirCoefMax = scalar, F32, 3868, "Max tCharge Coeff.", 1, 0, 0, 1, 4 tChargeAirFlowMax = scalar, F32, 3872, "Max Air Flow (kg/h)", 1, 0, 0, 1000, 1 @@ -3372,10 +3376,10 @@ menuDialog = main subMenu = fsioFormulas, "FSIO Formulas" subMenu = std_separator - subMenu = fsioTable1Tbl, "Script Table #1" - subMenu = fsioTable2Tbl, "Script Table #2" - subMenu = fsioTable3Tbl, "Script Table #3" - subMenu = fsioTable4Tbl, "Script Table #4" + subMenu = fsioTable1TblSettings, "Script Table #1" + subMenu = fsioTable2TblSettings, "Script Table #2" + subMenu = fsioTable3TblSettings, "Script Table #3" + subMenu = fsioTable4TblSettings, "Script Table #4" subMenu = scriptCurve1Settings, "Script Curve #1" subMenu = scriptCurve2Settings, "Script Curve #2" subMenu = scriptCurve3Settings, "Script Curve #3" @@ -3662,6 +3666,22 @@ 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 + field = "Name", tableCurveName1 + panel = fsioTable1Tbl + + dialog = fsioTable2TblSettings, "", yAxis + field = "Name", tableCurveName2 + panel = fsioTable1Tb2 + + dialog = fsioTable3TblSettings, "", yAxis + field = "Name", tableCurveName3 + panel = fsioTable3Tbl + + dialog = fsioTable4TblSettings, "", yAxis + field = "Name", tableCurveName4 + panel = fsioTable4Tbl + dialog = scriptCurve1Settings, "", yAxis field = "Name", scriptCurveName4 panel = scriptCurve1 diff --git a/firmware/tunerstudio/generated/rusefi_hellen121vag.ini b/firmware/tunerstudio/generated/rusefi_hellen121vag.ini index e38bde8fb5..17d0d9ae10 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.07.hellen121vag.3471382251" + signature = "rusEFI 2021.11.07.hellen121vag.4102773410" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.11.07.hellen121vag.3471382251" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.11.07.hellen121vag.4102773410" ; 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 07 04:42:08 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Nov 07 15:28:51 UTC 2021 pageSize = 20000 page = 1 @@ -1096,7 +1096,11 @@ scriptCurve5Bins = array, F32, 3436, [8], "x", 1, 0, -999, 1000, 3 scriptCurve5 = array, F32, 3468, [8], "y", 1, 0, -999, 1000, 3 scriptCurve6Bins = array, F32, 3500, [8], "x", 1, 0, -999, 1000, 3 scriptCurve6 = array, F32, 3532, [8], "y", 1, 0, -999, 1000, 3 -unused3328 = array, U08, 3564, [300], "units", 1, 0, -20, 100, 0 +scriptTableName1 = string, ASCII, 3564, 16 +scriptTableName2 = string, ASCII, 3580, 16 +scriptTableName3 = string, ASCII, 3596, 16 +scriptTableName4 = string, ASCII, 3612, 16 +unused3328 = array, U08, 3628, [236], "units", 1, 0, -20, 100, 0 tChargeAirCoefMin = scalar, F32, 3864, "Min tCharge Coeff.", 1, 0, 0, 1, 4 tChargeAirCoefMax = scalar, F32, 3868, "Max tCharge Coeff.", 1, 0, 0, 1, 4 tChargeAirFlowMax = scalar, F32, 3872, "Max Air Flow (kg/h)", 1, 0, 0, 1000, 1 @@ -3372,10 +3376,10 @@ menuDialog = main subMenu = fsioFormulas, "FSIO Formulas" subMenu = std_separator - subMenu = fsioTable1Tbl, "Script Table #1" - subMenu = fsioTable2Tbl, "Script Table #2" - subMenu = fsioTable3Tbl, "Script Table #3" - subMenu = fsioTable4Tbl, "Script Table #4" + subMenu = fsioTable1TblSettings, "Script Table #1" + subMenu = fsioTable2TblSettings, "Script Table #2" + subMenu = fsioTable3TblSettings, "Script Table #3" + subMenu = fsioTable4TblSettings, "Script Table #4" subMenu = scriptCurve1Settings, "Script Curve #1" subMenu = scriptCurve2Settings, "Script Curve #2" subMenu = scriptCurve3Settings, "Script Curve #3" @@ -3662,6 +3666,22 @@ 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 + field = "Name", tableCurveName1 + panel = fsioTable1Tbl + + dialog = fsioTable2TblSettings, "", yAxis + field = "Name", tableCurveName2 + panel = fsioTable1Tb2 + + dialog = fsioTable3TblSettings, "", yAxis + field = "Name", tableCurveName3 + panel = fsioTable3Tbl + + dialog = fsioTable4TblSettings, "", yAxis + field = "Name", tableCurveName4 + panel = fsioTable4Tbl + dialog = scriptCurve1Settings, "", yAxis field = "Name", scriptCurveName4 panel = scriptCurve1 diff --git a/firmware/tunerstudio/generated/rusefi_hellen128mercedes.ini b/firmware/tunerstudio/generated/rusefi_hellen128mercedes.ini index b1a786fa7e..1ac1a1d671 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.07.hellen128.2024136565" + signature = "rusEFI 2021.11.07.hellen128.1120375612" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.11.07.hellen128.2024136565" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.11.07.hellen128.1120375612" ; 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 07 04:42:06 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Nov 07 15:28:49 UTC 2021 pageSize = 20000 page = 1 @@ -1096,7 +1096,11 @@ scriptCurve5Bins = array, F32, 3436, [8], "x", 1, 0, -999, 1000, 3 scriptCurve5 = array, F32, 3468, [8], "y", 1, 0, -999, 1000, 3 scriptCurve6Bins = array, F32, 3500, [8], "x", 1, 0, -999, 1000, 3 scriptCurve6 = array, F32, 3532, [8], "y", 1, 0, -999, 1000, 3 -unused3328 = array, U08, 3564, [300], "units", 1, 0, -20, 100, 0 +scriptTableName1 = string, ASCII, 3564, 16 +scriptTableName2 = string, ASCII, 3580, 16 +scriptTableName3 = string, ASCII, 3596, 16 +scriptTableName4 = string, ASCII, 3612, 16 +unused3328 = array, U08, 3628, [236], "units", 1, 0, -20, 100, 0 tChargeAirCoefMin = scalar, F32, 3864, "Min tCharge Coeff.", 1, 0, 0, 1, 4 tChargeAirCoefMax = scalar, F32, 3868, "Max tCharge Coeff.", 1, 0, 0, 1, 4 tChargeAirFlowMax = scalar, F32, 3872, "Max Air Flow (kg/h)", 1, 0, 0, 1000, 1 @@ -3372,10 +3376,10 @@ menuDialog = main subMenu = fsioFormulas, "FSIO Formulas" subMenu = std_separator - subMenu = fsioTable1Tbl, "Script Table #1" - subMenu = fsioTable2Tbl, "Script Table #2" - subMenu = fsioTable3Tbl, "Script Table #3" - subMenu = fsioTable4Tbl, "Script Table #4" + subMenu = fsioTable1TblSettings, "Script Table #1" + subMenu = fsioTable2TblSettings, "Script Table #2" + subMenu = fsioTable3TblSettings, "Script Table #3" + subMenu = fsioTable4TblSettings, "Script Table #4" subMenu = scriptCurve1Settings, "Script Curve #1" subMenu = scriptCurve2Settings, "Script Curve #2" subMenu = scriptCurve3Settings, "Script Curve #3" @@ -3662,6 +3666,22 @@ 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 + field = "Name", tableCurveName1 + panel = fsioTable1Tbl + + dialog = fsioTable2TblSettings, "", yAxis + field = "Name", tableCurveName2 + panel = fsioTable1Tb2 + + dialog = fsioTable3TblSettings, "", yAxis + field = "Name", tableCurveName3 + panel = fsioTable3Tbl + + dialog = fsioTable4TblSettings, "", yAxis + field = "Name", tableCurveName4 + panel = fsioTable4Tbl + dialog = scriptCurve1Settings, "", yAxis field = "Name", scriptCurveName4 panel = scriptCurve1 diff --git a/firmware/tunerstudio/generated/rusefi_hellen154hyundai.ini b/firmware/tunerstudio/generated/rusefi_hellen154hyundai.ini index 506fa04717..170073b79c 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.07.hellen154hyundai.3648671895" + signature = "rusEFI 2021.11.07.hellen154hyundai.3810008286" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.11.07.hellen154hyundai.3648671895" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.11.07.hellen154hyundai.3810008286" ; 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 07 04:42:13 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Nov 07 15:28:56 UTC 2021 pageSize = 20000 page = 1 @@ -1096,7 +1096,11 @@ scriptCurve5Bins = array, F32, 3436, [8], "x", 1, 0, -999, 1000, 3 scriptCurve5 = array, F32, 3468, [8], "y", 1, 0, -999, 1000, 3 scriptCurve6Bins = array, F32, 3500, [8], "x", 1, 0, -999, 1000, 3 scriptCurve6 = array, F32, 3532, [8], "y", 1, 0, -999, 1000, 3 -unused3328 = array, U08, 3564, [300], "units", 1, 0, -20, 100, 0 +scriptTableName1 = string, ASCII, 3564, 16 +scriptTableName2 = string, ASCII, 3580, 16 +scriptTableName3 = string, ASCII, 3596, 16 +scriptTableName4 = string, ASCII, 3612, 16 +unused3328 = array, U08, 3628, [236], "units", 1, 0, -20, 100, 0 tChargeAirCoefMin = scalar, F32, 3864, "Min tCharge Coeff.", 1, 0, 0, 1, 4 tChargeAirCoefMax = scalar, F32, 3868, "Max tCharge Coeff.", 1, 0, 0, 1, 4 tChargeAirFlowMax = scalar, F32, 3872, "Max Air Flow (kg/h)", 1, 0, 0, 1000, 1 @@ -3372,10 +3376,10 @@ menuDialog = main subMenu = fsioFormulas, "FSIO Formulas" subMenu = std_separator - subMenu = fsioTable1Tbl, "Script Table #1" - subMenu = fsioTable2Tbl, "Script Table #2" - subMenu = fsioTable3Tbl, "Script Table #3" - subMenu = fsioTable4Tbl, "Script Table #4" + subMenu = fsioTable1TblSettings, "Script Table #1" + subMenu = fsioTable2TblSettings, "Script Table #2" + subMenu = fsioTable3TblSettings, "Script Table #3" + subMenu = fsioTable4TblSettings, "Script Table #4" subMenu = scriptCurve1Settings, "Script Curve #1" subMenu = scriptCurve2Settings, "Script Curve #2" subMenu = scriptCurve3Settings, "Script Curve #3" @@ -3662,6 +3666,22 @@ 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 + field = "Name", tableCurveName1 + panel = fsioTable1Tbl + + dialog = fsioTable2TblSettings, "", yAxis + field = "Name", tableCurveName2 + panel = fsioTable1Tb2 + + dialog = fsioTable3TblSettings, "", yAxis + field = "Name", tableCurveName3 + panel = fsioTable3Tbl + + dialog = fsioTable4TblSettings, "", yAxis + field = "Name", tableCurveName4 + panel = fsioTable4Tbl + dialog = scriptCurve1Settings, "", yAxis field = "Name", scriptCurveName4 panel = scriptCurve1 diff --git a/firmware/tunerstudio/generated/rusefi_hellen72.ini b/firmware/tunerstudio/generated/rusefi_hellen72.ini index 6fdccba53c..077e208287 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.07.hellen72.4220556938" + signature = "rusEFI 2021.11.07.hellen72.3253918403" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.11.07.hellen72.4220556938" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.11.07.hellen72.3253918403" ; 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 07 04:42:18 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Nov 07 15:29:01 UTC 2021 pageSize = 20000 page = 1 @@ -1096,7 +1096,11 @@ scriptCurve5Bins = array, F32, 3436, [8], "x", 1, 0, -999, 1000, 3 scriptCurve5 = array, F32, 3468, [8], "y", 1, 0, -999, 1000, 3 scriptCurve6Bins = array, F32, 3500, [8], "x", 1, 0, -999, 1000, 3 scriptCurve6 = array, F32, 3532, [8], "y", 1, 0, -999, 1000, 3 -unused3328 = array, U08, 3564, [300], "units", 1, 0, -20, 100, 0 +scriptTableName1 = string, ASCII, 3564, 16 +scriptTableName2 = string, ASCII, 3580, 16 +scriptTableName3 = string, ASCII, 3596, 16 +scriptTableName4 = string, ASCII, 3612, 16 +unused3328 = array, U08, 3628, [236], "units", 1, 0, -20, 100, 0 tChargeAirCoefMin = scalar, F32, 3864, "Min tCharge Coeff.", 1, 0, 0, 1, 4 tChargeAirCoefMax = scalar, F32, 3868, "Max tCharge Coeff.", 1, 0, 0, 1, 4 tChargeAirFlowMax = scalar, F32, 3872, "Max Air Flow (kg/h)", 1, 0, 0, 1000, 1 @@ -3372,10 +3376,10 @@ menuDialog = main subMenu = fsioFormulas, "FSIO Formulas" subMenu = std_separator - subMenu = fsioTable1Tbl, "Script Table #1" - subMenu = fsioTable2Tbl, "Script Table #2" - subMenu = fsioTable3Tbl, "Script Table #3" - subMenu = fsioTable4Tbl, "Script Table #4" + subMenu = fsioTable1TblSettings, "Script Table #1" + subMenu = fsioTable2TblSettings, "Script Table #2" + subMenu = fsioTable3TblSettings, "Script Table #3" + subMenu = fsioTable4TblSettings, "Script Table #4" subMenu = scriptCurve1Settings, "Script Curve #1" subMenu = scriptCurve2Settings, "Script Curve #2" subMenu = scriptCurve3Settings, "Script Curve #3" @@ -3662,6 +3666,22 @@ 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 + field = "Name", tableCurveName1 + panel = fsioTable1Tbl + + dialog = fsioTable2TblSettings, "", yAxis + field = "Name", tableCurveName2 + panel = fsioTable1Tb2 + + dialog = fsioTable3TblSettings, "", yAxis + field = "Name", tableCurveName3 + panel = fsioTable3Tbl + + dialog = fsioTable4TblSettings, "", yAxis + field = "Name", tableCurveName4 + panel = fsioTable4Tbl + dialog = scriptCurve1Settings, "", yAxis field = "Name", scriptCurveName4 panel = scriptCurve1 diff --git a/firmware/tunerstudio/generated/rusefi_hellen88bmw.ini b/firmware/tunerstudio/generated/rusefi_hellen88bmw.ini index cfef2dc611..8a1b3694d3 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.07.hellen88bmw.1803881024" + signature = "rusEFI 2021.11.07.hellen88bmw.1374111241" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.11.07.hellen88bmw.1803881024" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.11.07.hellen88bmw.1374111241" ; 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 07 04:42:16 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Nov 07 15:28:59 UTC 2021 pageSize = 20000 page = 1 @@ -1096,7 +1096,11 @@ scriptCurve5Bins = array, F32, 3436, [8], "x", 1, 0, -999, 1000, 3 scriptCurve5 = array, F32, 3468, [8], "y", 1, 0, -999, 1000, 3 scriptCurve6Bins = array, F32, 3500, [8], "x", 1, 0, -999, 1000, 3 scriptCurve6 = array, F32, 3532, [8], "y", 1, 0, -999, 1000, 3 -unused3328 = array, U08, 3564, [300], "units", 1, 0, -20, 100, 0 +scriptTableName1 = string, ASCII, 3564, 16 +scriptTableName2 = string, ASCII, 3580, 16 +scriptTableName3 = string, ASCII, 3596, 16 +scriptTableName4 = string, ASCII, 3612, 16 +unused3328 = array, U08, 3628, [236], "units", 1, 0, -20, 100, 0 tChargeAirCoefMin = scalar, F32, 3864, "Min tCharge Coeff.", 1, 0, 0, 1, 4 tChargeAirCoefMax = scalar, F32, 3868, "Max tCharge Coeff.", 1, 0, 0, 1, 4 tChargeAirFlowMax = scalar, F32, 3872, "Max Air Flow (kg/h)", 1, 0, 0, 1000, 1 @@ -3372,10 +3376,10 @@ menuDialog = main subMenu = fsioFormulas, "FSIO Formulas" subMenu = std_separator - subMenu = fsioTable1Tbl, "Script Table #1" - subMenu = fsioTable2Tbl, "Script Table #2" - subMenu = fsioTable3Tbl, "Script Table #3" - subMenu = fsioTable4Tbl, "Script Table #4" + subMenu = fsioTable1TblSettings, "Script Table #1" + subMenu = fsioTable2TblSettings, "Script Table #2" + subMenu = fsioTable3TblSettings, "Script Table #3" + subMenu = fsioTable4TblSettings, "Script Table #4" subMenu = scriptCurve1Settings, "Script Curve #1" subMenu = scriptCurve2Settings, "Script Curve #2" subMenu = scriptCurve3Settings, "Script Curve #3" @@ -3662,6 +3666,22 @@ 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 + field = "Name", tableCurveName1 + panel = fsioTable1Tbl + + dialog = fsioTable2TblSettings, "", yAxis + field = "Name", tableCurveName2 + panel = fsioTable1Tb2 + + dialog = fsioTable3TblSettings, "", yAxis + field = "Name", tableCurveName3 + panel = fsioTable3Tbl + + dialog = fsioTable4TblSettings, "", yAxis + field = "Name", tableCurveName4 + panel = fsioTable4Tbl + dialog = scriptCurve1Settings, "", yAxis field = "Name", scriptCurveName4 panel = scriptCurve1 diff --git a/firmware/tunerstudio/generated/rusefi_hellenNA6.ini b/firmware/tunerstudio/generated/rusefi_hellenNA6.ini index 900d82ecb5..1fe099278f 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.07.hellenNA6.744357795" + signature = "rusEFI 2021.11.07.hellenNA6.373273578" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.11.07.hellenNA6.744357795" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.11.07.hellenNA6.373273578" ; 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 07 04:42:23 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Nov 07 15:29:06 UTC 2021 pageSize = 20000 page = 1 @@ -1096,7 +1096,11 @@ scriptCurve5Bins = array, F32, 3436, [8], "x", 1, 0, -999, 1000, 3 scriptCurve5 = array, F32, 3468, [8], "y", 1, 0, -999, 1000, 3 scriptCurve6Bins = array, F32, 3500, [8], "x", 1, 0, -999, 1000, 3 scriptCurve6 = array, F32, 3532, [8], "y", 1, 0, -999, 1000, 3 -unused3328 = array, U08, 3564, [300], "units", 1, 0, -20, 100, 0 +scriptTableName1 = string, ASCII, 3564, 16 +scriptTableName2 = string, ASCII, 3580, 16 +scriptTableName3 = string, ASCII, 3596, 16 +scriptTableName4 = string, ASCII, 3612, 16 +unused3328 = array, U08, 3628, [236], "units", 1, 0, -20, 100, 0 tChargeAirCoefMin = scalar, F32, 3864, "Min tCharge Coeff.", 1, 0, 0, 1, 4 tChargeAirCoefMax = scalar, F32, 3868, "Max tCharge Coeff.", 1, 0, 0, 1, 4 tChargeAirFlowMax = scalar, F32, 3872, "Max Air Flow (kg/h)", 1, 0, 0, 1000, 1 @@ -3372,10 +3376,10 @@ menuDialog = main subMenu = fsioFormulas, "FSIO Formulas" subMenu = std_separator - subMenu = fsioTable1Tbl, "Script Table #1" - subMenu = fsioTable2Tbl, "Script Table #2" - subMenu = fsioTable3Tbl, "Script Table #3" - subMenu = fsioTable4Tbl, "Script Table #4" + subMenu = fsioTable1TblSettings, "Script Table #1" + subMenu = fsioTable2TblSettings, "Script Table #2" + subMenu = fsioTable3TblSettings, "Script Table #3" + subMenu = fsioTable4TblSettings, "Script Table #4" subMenu = scriptCurve1Settings, "Script Curve #1" subMenu = scriptCurve2Settings, "Script Curve #2" subMenu = scriptCurve3Settings, "Script Curve #3" @@ -3662,6 +3666,22 @@ 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 + field = "Name", tableCurveName1 + panel = fsioTable1Tbl + + dialog = fsioTable2TblSettings, "", yAxis + field = "Name", tableCurveName2 + panel = fsioTable1Tb2 + + dialog = fsioTable3TblSettings, "", yAxis + field = "Name", tableCurveName3 + panel = fsioTable3Tbl + + dialog = fsioTable4TblSettings, "", yAxis + field = "Name", tableCurveName4 + panel = fsioTable4Tbl + dialog = scriptCurve1Settings, "", yAxis field = "Name", scriptCurveName4 panel = scriptCurve1 diff --git a/firmware/tunerstudio/generated/rusefi_hellen_cypress.ini b/firmware/tunerstudio/generated/rusefi_hellen_cypress.ini index c7345bd342..89448a866b 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.07.hellen_cypress.3505016378" + signature = "rusEFI 2021.11.07.hellen_cypress.3934782067" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.11.07.hellen_cypress.3505016378" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.11.07.hellen_cypress.3934782067" ; 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 07 04:42:51 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 07 15:29:31 UTC 2021 pageSize = 20000 page = 1 @@ -1096,7 +1096,11 @@ scriptCurve5Bins = array, F32, 3436, [8], "x", 1, 0, -999, 1000, 3 scriptCurve5 = array, F32, 3468, [8], "y", 1, 0, -999, 1000, 3 scriptCurve6Bins = array, F32, 3500, [8], "x", 1, 0, -999, 1000, 3 scriptCurve6 = array, F32, 3532, [8], "y", 1, 0, -999, 1000, 3 -unused3328 = array, U08, 3564, [300], "units", 1, 0, -20, 100, 0 +scriptTableName1 = string, ASCII, 3564, 16 +scriptTableName2 = string, ASCII, 3580, 16 +scriptTableName3 = string, ASCII, 3596, 16 +scriptTableName4 = string, ASCII, 3612, 16 +unused3328 = array, U08, 3628, [236], "units", 1, 0, -20, 100, 0 tChargeAirCoefMin = scalar, F32, 3864, "Min tCharge Coeff.", 1, 0, 0, 1, 4 tChargeAirCoefMax = scalar, F32, 3868, "Max tCharge Coeff.", 1, 0, 0, 1, 4 tChargeAirFlowMax = scalar, F32, 3872, "Max Air Flow (kg/h)", 1, 0, 0, 1000, 1 @@ -3372,10 +3376,10 @@ menuDialog = main subMenu = fsioFormulas, "FSIO Formulas" subMenu = std_separator - subMenu = fsioTable1Tbl, "Script Table #1" - subMenu = fsioTable2Tbl, "Script Table #2" - subMenu = fsioTable3Tbl, "Script Table #3" - subMenu = fsioTable4Tbl, "Script Table #4" + subMenu = fsioTable1TblSettings, "Script Table #1" + subMenu = fsioTable2TblSettings, "Script Table #2" + subMenu = fsioTable3TblSettings, "Script Table #3" + subMenu = fsioTable4TblSettings, "Script Table #4" subMenu = scriptCurve1Settings, "Script Curve #1" subMenu = scriptCurve2Settings, "Script Curve #2" subMenu = scriptCurve3Settings, "Script Curve #3" @@ -3666,6 +3670,22 @@ 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 + field = "Name", tableCurveName1 + panel = fsioTable1Tbl + + dialog = fsioTable2TblSettings, "", yAxis + field = "Name", tableCurveName2 + panel = fsioTable1Tb2 + + dialog = fsioTable3TblSettings, "", yAxis + field = "Name", tableCurveName3 + panel = fsioTable3Tbl + + dialog = fsioTable4TblSettings, "", yAxis + field = "Name", tableCurveName4 + panel = fsioTable4Tbl + dialog = scriptCurve1Settings, "", yAxis field = "Name", scriptCurveName4 panel = scriptCurve1 diff --git a/firmware/tunerstudio/generated/rusefi_kinetis.ini b/firmware/tunerstudio/generated/rusefi_kinetis.ini index 5388bcdc72..60360162a5 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.07.kin.793739974" + signature = "rusEFI 2021.11.07.kin.355323535" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.11.07.kin.793739974" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.11.07.kin.355323535" ; 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 07 04:42:49 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Sun Nov 07 15:29:29 UTC 2021 pageSize = 19972 page = 1 @@ -1074,7 +1074,11 @@ scriptCurve5Bins = array, F32, 3408, [8], "x", 1, 0, -999, 1000, 3 scriptCurve5 = array, F32, 3440, [8], "y", 1, 0, -999, 1000, 3 scriptCurve6Bins = array, F32, 3472, [8], "x", 1, 0, -999, 1000, 3 scriptCurve6 = array, F32, 3504, [8], "y", 1, 0, -999, 1000, 3 -unused3328 = array, U08, 3536, [300], "units", 1, 0, -20, 100, 0 +scriptTableName1 = string, ASCII, 3536, 16 +scriptTableName2 = string, ASCII, 3552, 16 +scriptTableName3 = string, ASCII, 3568, 16 +scriptTableName4 = string, ASCII, 3584, 16 +unused3328 = array, U08, 3600, [236], "units", 1, 0, -20, 100, 0 tChargeAirCoefMin = scalar, F32, 3836, "Min tCharge Coeff.", 1, 0, 0, 1, 4 tChargeAirCoefMax = scalar, F32, 3840, "Max tCharge Coeff.", 1, 0, 0, 1, 4 tChargeAirFlowMax = scalar, F32, 3844, "Max Air Flow (kg/h)", 1, 0, 0, 1000, 1 @@ -3338,10 +3342,10 @@ menuDialog = main subMenu = fsioFormulas, "FSIO Formulas" subMenu = std_separator - subMenu = fsioTable1Tbl, "Script Table #1" - subMenu = fsioTable2Tbl, "Script Table #2" - subMenu = fsioTable3Tbl, "Script Table #3" - subMenu = fsioTable4Tbl, "Script Table #4" + subMenu = fsioTable1TblSettings, "Script Table #1" + subMenu = fsioTable2TblSettings, "Script Table #2" + subMenu = fsioTable3TblSettings, "Script Table #3" + subMenu = fsioTable4TblSettings, "Script Table #4" subMenu = scriptCurve1Settings, "Script Curve #1" subMenu = scriptCurve2Settings, "Script Curve #2" subMenu = scriptCurve3Settings, "Script Curve #3" @@ -3632,6 +3636,22 @@ 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 + field = "Name", tableCurveName1 + panel = fsioTable1Tbl + + dialog = fsioTable2TblSettings, "", yAxis + field = "Name", tableCurveName2 + panel = fsioTable1Tb2 + + dialog = fsioTable3TblSettings, "", yAxis + field = "Name", tableCurveName3 + panel = fsioTable3Tbl + + dialog = fsioTable4TblSettings, "", yAxis + field = "Name", tableCurveName4 + panel = fsioTable4Tbl + dialog = scriptCurve1Settings, "", yAxis field = "Name", scriptCurveName4 panel = scriptCurve1 diff --git a/firmware/tunerstudio/generated/rusefi_mre_f4.ini b/firmware/tunerstudio/generated/rusefi_mre_f4.ini index 3ba4354a82..d7931daabb 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.07.mre_f4.362144057" + signature = "rusEFI 2021.11.07.mre_f4.804760944" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.11.07.mre_f4.362144057" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.11.07.mre_f4.804760944" ; 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 07 04:42:29 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Nov 07 15:29:11 UTC 2021 pageSize = 20000 page = 1 @@ -1096,7 +1096,11 @@ scriptCurve5Bins = array, F32, 3436, [8], "x", 1, 0, -999, 1000, 3 scriptCurve5 = array, F32, 3468, [8], "y", 1, 0, -999, 1000, 3 scriptCurve6Bins = array, F32, 3500, [8], "x", 1, 0, -999, 1000, 3 scriptCurve6 = array, F32, 3532, [8], "y", 1, 0, -999, 1000, 3 -unused3328 = array, U08, 3564, [300], "units", 1, 0, -20, 100, 0 +scriptTableName1 = string, ASCII, 3564, 16 +scriptTableName2 = string, ASCII, 3580, 16 +scriptTableName3 = string, ASCII, 3596, 16 +scriptTableName4 = string, ASCII, 3612, 16 +unused3328 = array, U08, 3628, [236], "units", 1, 0, -20, 100, 0 tChargeAirCoefMin = scalar, F32, 3864, "Min tCharge Coeff.", 1, 0, 0, 1, 4 tChargeAirCoefMax = scalar, F32, 3868, "Max tCharge Coeff.", 1, 0, 0, 1, 4 tChargeAirFlowMax = scalar, F32, 3872, "Max Air Flow (kg/h)", 1, 0, 0, 1000, 1 @@ -3372,10 +3376,10 @@ menuDialog = main subMenu = fsioFormulas, "FSIO Formulas" subMenu = std_separator - subMenu = fsioTable1Tbl, "Script Table #1" - subMenu = fsioTable2Tbl, "Script Table #2" - subMenu = fsioTable3Tbl, "Script Table #3" - subMenu = fsioTable4Tbl, "Script Table #4" + subMenu = fsioTable1TblSettings, "Script Table #1" + subMenu = fsioTable2TblSettings, "Script Table #2" + subMenu = fsioTable3TblSettings, "Script Table #3" + subMenu = fsioTable4TblSettings, "Script Table #4" subMenu = scriptCurve1Settings, "Script Curve #1" subMenu = scriptCurve2Settings, "Script Curve #2" subMenu = scriptCurve3Settings, "Script Curve #3" @@ -3662,6 +3666,22 @@ 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 + field = "Name", tableCurveName1 + panel = fsioTable1Tbl + + dialog = fsioTable2TblSettings, "", yAxis + field = "Name", tableCurveName2 + panel = fsioTable1Tb2 + + dialog = fsioTable3TblSettings, "", yAxis + field = "Name", tableCurveName3 + panel = fsioTable3Tbl + + dialog = fsioTable4TblSettings, "", yAxis + field = "Name", tableCurveName4 + panel = fsioTable4Tbl + dialog = scriptCurve1Settings, "", yAxis field = "Name", scriptCurveName4 panel = scriptCurve1 diff --git a/firmware/tunerstudio/generated/rusefi_mre_f7.ini b/firmware/tunerstudio/generated/rusefi_mre_f7.ini index 72ed2235ca..c800653b55 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.07.mre_f7.362144057" + signature = "rusEFI 2021.11.07.mre_f7.804760944" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.11.07.mre_f7.362144057" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.11.07.mre_f7.804760944" ; 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 07 04:42:26 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Nov 07 15:29:08 UTC 2021 pageSize = 20000 page = 1 @@ -1096,7 +1096,11 @@ scriptCurve5Bins = array, F32, 3436, [8], "x", 1, 0, -999, 1000, 3 scriptCurve5 = array, F32, 3468, [8], "y", 1, 0, -999, 1000, 3 scriptCurve6Bins = array, F32, 3500, [8], "x", 1, 0, -999, 1000, 3 scriptCurve6 = array, F32, 3532, [8], "y", 1, 0, -999, 1000, 3 -unused3328 = array, U08, 3564, [300], "units", 1, 0, -20, 100, 0 +scriptTableName1 = string, ASCII, 3564, 16 +scriptTableName2 = string, ASCII, 3580, 16 +scriptTableName3 = string, ASCII, 3596, 16 +scriptTableName4 = string, ASCII, 3612, 16 +unused3328 = array, U08, 3628, [236], "units", 1, 0, -20, 100, 0 tChargeAirCoefMin = scalar, F32, 3864, "Min tCharge Coeff.", 1, 0, 0, 1, 4 tChargeAirCoefMax = scalar, F32, 3868, "Max tCharge Coeff.", 1, 0, 0, 1, 4 tChargeAirFlowMax = scalar, F32, 3872, "Max Air Flow (kg/h)", 1, 0, 0, 1000, 1 @@ -3372,10 +3376,10 @@ menuDialog = main subMenu = fsioFormulas, "FSIO Formulas" subMenu = std_separator - subMenu = fsioTable1Tbl, "Script Table #1" - subMenu = fsioTable2Tbl, "Script Table #2" - subMenu = fsioTable3Tbl, "Script Table #3" - subMenu = fsioTable4Tbl, "Script Table #4" + subMenu = fsioTable1TblSettings, "Script Table #1" + subMenu = fsioTable2TblSettings, "Script Table #2" + subMenu = fsioTable3TblSettings, "Script Table #3" + subMenu = fsioTable4TblSettings, "Script Table #4" subMenu = scriptCurve1Settings, "Script Curve #1" subMenu = scriptCurve2Settings, "Script Curve #2" subMenu = scriptCurve3Settings, "Script Curve #3" @@ -3662,6 +3666,22 @@ 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 + field = "Name", tableCurveName1 + panel = fsioTable1Tbl + + dialog = fsioTable2TblSettings, "", yAxis + field = "Name", tableCurveName2 + panel = fsioTable1Tb2 + + dialog = fsioTable3TblSettings, "", yAxis + field = "Name", tableCurveName3 + panel = fsioTable3Tbl + + dialog = fsioTable4TblSettings, "", yAxis + field = "Name", tableCurveName4 + panel = fsioTable4Tbl + dialog = scriptCurve1Settings, "", yAxis field = "Name", scriptCurveName4 panel = scriptCurve1 diff --git a/firmware/tunerstudio/generated/rusefi_prometheus_405.ini b/firmware/tunerstudio/generated/rusefi_prometheus_405.ini index c1bee1587f..fc4eac5c50 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.07.prometheus_405.3455004491" + signature = "rusEFI 2021.11.07.prometheus_405.4153238274" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.11.07.prometheus_405.3455004491" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.11.07.prometheus_405.4153238274" ; 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 07 04:42:36 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Nov 07 15:29:18 UTC 2021 pageSize = 20000 page = 1 @@ -1096,7 +1096,11 @@ scriptCurve5Bins = array, F32, 3436, [8], "x", 1, 0, -999, 1000, 3 scriptCurve5 = array, F32, 3468, [8], "y", 1, 0, -999, 1000, 3 scriptCurve6Bins = array, F32, 3500, [8], "x", 1, 0, -999, 1000, 3 scriptCurve6 = array, F32, 3532, [8], "y", 1, 0, -999, 1000, 3 -unused3328 = array, U08, 3564, [300], "units", 1, 0, -20, 100, 0 +scriptTableName1 = string, ASCII, 3564, 16 +scriptTableName2 = string, ASCII, 3580, 16 +scriptTableName3 = string, ASCII, 3596, 16 +scriptTableName4 = string, ASCII, 3612, 16 +unused3328 = array, U08, 3628, [236], "units", 1, 0, -20, 100, 0 tChargeAirCoefMin = scalar, F32, 3864, "Min tCharge Coeff.", 1, 0, 0, 1, 4 tChargeAirCoefMax = scalar, F32, 3868, "Max tCharge Coeff.", 1, 0, 0, 1, 4 tChargeAirFlowMax = scalar, F32, 3872, "Max Air Flow (kg/h)", 1, 0, 0, 1000, 1 @@ -3368,10 +3372,10 @@ menuDialog = main subMenu = fsioFormulas, "FSIO Formulas" subMenu = std_separator - subMenu = fsioTable1Tbl, "Script Table #1" - subMenu = fsioTable2Tbl, "Script Table #2" - subMenu = fsioTable3Tbl, "Script Table #3" - subMenu = fsioTable4Tbl, "Script Table #4" + subMenu = fsioTable1TblSettings, "Script Table #1" + subMenu = fsioTable2TblSettings, "Script Table #2" + subMenu = fsioTable3TblSettings, "Script Table #3" + subMenu = fsioTable4TblSettings, "Script Table #4" subMenu = scriptCurve1Settings, "Script Curve #1" subMenu = scriptCurve2Settings, "Script Curve #2" subMenu = scriptCurve3Settings, "Script Curve #3" @@ -3661,6 +3665,22 @@ 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 + field = "Name", tableCurveName1 + panel = fsioTable1Tbl + + dialog = fsioTable2TblSettings, "", yAxis + field = "Name", tableCurveName2 + panel = fsioTable1Tb2 + + dialog = fsioTable3TblSettings, "", yAxis + field = "Name", tableCurveName3 + panel = fsioTable3Tbl + + dialog = fsioTable4TblSettings, "", yAxis + field = "Name", tableCurveName4 + panel = fsioTable4Tbl + dialog = scriptCurve1Settings, "", yAxis field = "Name", scriptCurveName4 panel = scriptCurve1 diff --git a/firmware/tunerstudio/generated/rusefi_prometheus_469.ini b/firmware/tunerstudio/generated/rusefi_prometheus_469.ini index c94a7170c4..3eacb18b8b 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.07.prometheus_469.3455004491" + signature = "rusEFI 2021.11.07.prometheus_469.4153238274" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.11.07.prometheus_469.3455004491" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.11.07.prometheus_469.4153238274" ; 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 07 04:42:34 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Nov 07 15:29:16 UTC 2021 pageSize = 20000 page = 1 @@ -1096,7 +1096,11 @@ scriptCurve5Bins = array, F32, 3436, [8], "x", 1, 0, -999, 1000, 3 scriptCurve5 = array, F32, 3468, [8], "y", 1, 0, -999, 1000, 3 scriptCurve6Bins = array, F32, 3500, [8], "x", 1, 0, -999, 1000, 3 scriptCurve6 = array, F32, 3532, [8], "y", 1, 0, -999, 1000, 3 -unused3328 = array, U08, 3564, [300], "units", 1, 0, -20, 100, 0 +scriptTableName1 = string, ASCII, 3564, 16 +scriptTableName2 = string, ASCII, 3580, 16 +scriptTableName3 = string, ASCII, 3596, 16 +scriptTableName4 = string, ASCII, 3612, 16 +unused3328 = array, U08, 3628, [236], "units", 1, 0, -20, 100, 0 tChargeAirCoefMin = scalar, F32, 3864, "Min tCharge Coeff.", 1, 0, 0, 1, 4 tChargeAirCoefMax = scalar, F32, 3868, "Max tCharge Coeff.", 1, 0, 0, 1, 4 tChargeAirFlowMax = scalar, F32, 3872, "Max Air Flow (kg/h)", 1, 0, 0, 1000, 1 @@ -3368,10 +3372,10 @@ menuDialog = main subMenu = fsioFormulas, "FSIO Formulas" subMenu = std_separator - subMenu = fsioTable1Tbl, "Script Table #1" - subMenu = fsioTable2Tbl, "Script Table #2" - subMenu = fsioTable3Tbl, "Script Table #3" - subMenu = fsioTable4Tbl, "Script Table #4" + subMenu = fsioTable1TblSettings, "Script Table #1" + subMenu = fsioTable2TblSettings, "Script Table #2" + subMenu = fsioTable3TblSettings, "Script Table #3" + subMenu = fsioTable4TblSettings, "Script Table #4" subMenu = scriptCurve1Settings, "Script Curve #1" subMenu = scriptCurve2Settings, "Script Curve #2" subMenu = scriptCurve3Settings, "Script Curve #3" @@ -3661,6 +3665,22 @@ 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 + field = "Name", tableCurveName1 + panel = fsioTable1Tbl + + dialog = fsioTable2TblSettings, "", yAxis + field = "Name", tableCurveName2 + panel = fsioTable1Tb2 + + dialog = fsioTable3TblSettings, "", yAxis + field = "Name", tableCurveName3 + panel = fsioTable3Tbl + + dialog = fsioTable4TblSettings, "", yAxis + field = "Name", tableCurveName4 + panel = fsioTable4Tbl + dialog = scriptCurve1Settings, "", yAxis field = "Name", scriptCurveName4 panel = scriptCurve1 diff --git a/firmware/tunerstudio/generated/rusefi_proteus_f4.ini b/firmware/tunerstudio/generated/rusefi_proteus_f4.ini index d0951a746a..50bf01edc5 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.07.proteus_f4.65126001" + signature = "rusEFI 2021.11.07.proteus_f4.964948536" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.11.07.proteus_f4.65126001" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.11.07.proteus_f4.964948536" ; 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 07 04:42:41 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Nov 07 15:29:22 UTC 2021 pageSize = 20000 page = 1 @@ -1096,7 +1096,11 @@ scriptCurve5Bins = array, F32, 3436, [8], "x", 1, 0, -999, 1000, 3 scriptCurve5 = array, F32, 3468, [8], "y", 1, 0, -999, 1000, 3 scriptCurve6Bins = array, F32, 3500, [8], "x", 1, 0, -999, 1000, 3 scriptCurve6 = array, F32, 3532, [8], "y", 1, 0, -999, 1000, 3 -unused3328 = array, U08, 3564, [300], "units", 1, 0, -20, 100, 0 +scriptTableName1 = string, ASCII, 3564, 16 +scriptTableName2 = string, ASCII, 3580, 16 +scriptTableName3 = string, ASCII, 3596, 16 +scriptTableName4 = string, ASCII, 3612, 16 +unused3328 = array, U08, 3628, [236], "units", 1, 0, -20, 100, 0 tChargeAirCoefMin = scalar, F32, 3864, "Min tCharge Coeff.", 1, 0, 0, 1, 4 tChargeAirCoefMax = scalar, F32, 3868, "Max tCharge Coeff.", 1, 0, 0, 1, 4 tChargeAirFlowMax = scalar, F32, 3872, "Max Air Flow (kg/h)", 1, 0, 0, 1000, 1 @@ -3372,10 +3376,10 @@ menuDialog = main subMenu = fsioFormulas, "FSIO Formulas" subMenu = std_separator - subMenu = fsioTable1Tbl, "Script Table #1" - subMenu = fsioTable2Tbl, "Script Table #2" - subMenu = fsioTable3Tbl, "Script Table #3" - subMenu = fsioTable4Tbl, "Script Table #4" + subMenu = fsioTable1TblSettings, "Script Table #1" + subMenu = fsioTable2TblSettings, "Script Table #2" + subMenu = fsioTable3TblSettings, "Script Table #3" + subMenu = fsioTable4TblSettings, "Script Table #4" subMenu = scriptCurve1Settings, "Script Curve #1" subMenu = scriptCurve2Settings, "Script Curve #2" subMenu = scriptCurve3Settings, "Script Curve #3" @@ -3659,6 +3663,22 @@ 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 + field = "Name", tableCurveName1 + panel = fsioTable1Tbl + + dialog = fsioTable2TblSettings, "", yAxis + field = "Name", tableCurveName2 + panel = fsioTable1Tb2 + + dialog = fsioTable3TblSettings, "", yAxis + field = "Name", tableCurveName3 + panel = fsioTable3Tbl + + dialog = fsioTable4TblSettings, "", yAxis + field = "Name", tableCurveName4 + panel = fsioTable4Tbl + dialog = scriptCurve1Settings, "", yAxis field = "Name", scriptCurveName4 panel = scriptCurve1 diff --git a/firmware/tunerstudio/generated/rusefi_proteus_f7.ini b/firmware/tunerstudio/generated/rusefi_proteus_f7.ini index dbb35f5a04..49f792bf55 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.07.proteus_f7.65126001" + signature = "rusEFI 2021.11.07.proteus_f7.964948536" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.11.07.proteus_f7.65126001" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.11.07.proteus_f7.964948536" ; 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 07 04:42:39 UTC 2021 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Nov 07 15:29:20 UTC 2021 pageSize = 20000 page = 1 @@ -1096,7 +1096,11 @@ scriptCurve5Bins = array, F32, 3436, [8], "x", 1, 0, -999, 1000, 3 scriptCurve5 = array, F32, 3468, [8], "y", 1, 0, -999, 1000, 3 scriptCurve6Bins = array, F32, 3500, [8], "x", 1, 0, -999, 1000, 3 scriptCurve6 = array, F32, 3532, [8], "y", 1, 0, -999, 1000, 3 -unused3328 = array, U08, 3564, [300], "units", 1, 0, -20, 100, 0 +scriptTableName1 = string, ASCII, 3564, 16 +scriptTableName2 = string, ASCII, 3580, 16 +scriptTableName3 = string, ASCII, 3596, 16 +scriptTableName4 = string, ASCII, 3612, 16 +unused3328 = array, U08, 3628, [236], "units", 1, 0, -20, 100, 0 tChargeAirCoefMin = scalar, F32, 3864, "Min tCharge Coeff.", 1, 0, 0, 1, 4 tChargeAirCoefMax = scalar, F32, 3868, "Max tCharge Coeff.", 1, 0, 0, 1, 4 tChargeAirFlowMax = scalar, F32, 3872, "Max Air Flow (kg/h)", 1, 0, 0, 1000, 1 @@ -3372,10 +3376,10 @@ menuDialog = main subMenu = fsioFormulas, "FSIO Formulas" subMenu = std_separator - subMenu = fsioTable1Tbl, "Script Table #1" - subMenu = fsioTable2Tbl, "Script Table #2" - subMenu = fsioTable3Tbl, "Script Table #3" - subMenu = fsioTable4Tbl, "Script Table #4" + subMenu = fsioTable1TblSettings, "Script Table #1" + subMenu = fsioTable2TblSettings, "Script Table #2" + subMenu = fsioTable3TblSettings, "Script Table #3" + subMenu = fsioTable4TblSettings, "Script Table #4" subMenu = scriptCurve1Settings, "Script Curve #1" subMenu = scriptCurve2Settings, "Script Curve #2" subMenu = scriptCurve3Settings, "Script Curve #3" @@ -3659,6 +3663,22 @@ 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 + field = "Name", tableCurveName1 + panel = fsioTable1Tbl + + dialog = fsioTable2TblSettings, "", yAxis + field = "Name", tableCurveName2 + panel = fsioTable1Tb2 + + dialog = fsioTable3TblSettings, "", yAxis + field = "Name", tableCurveName3 + panel = fsioTable3Tbl + + dialog = fsioTable4TblSettings, "", yAxis + field = "Name", tableCurveName4 + panel = fsioTable4Tbl + dialog = scriptCurve1Settings, "", yAxis field = "Name", scriptCurveName4 panel = scriptCurve1 diff --git a/firmware/tunerstudio/generated/rusefi_subaru_eg33_f7.ini b/firmware/tunerstudio/generated/rusefi_subaru_eg33_f7.ini index bb0c52f988..2fbc8bd2de 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.07.subaru_eg33_f7.119307913" + signature = "rusEFI 2021.11.07.subaru_eg33_f7.1031680704" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2021.11.07.subaru_eg33_f7.119307913" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2021.11.07.subaru_eg33_f7.1031680704" ; 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 07 04:42:53 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 07 15:29:33 UTC 2021 pageSize = 20000 page = 1 @@ -1096,7 +1096,11 @@ scriptCurve5Bins = array, F32, 3436, [8], "x", 1, 0, -999, 1000, 3 scriptCurve5 = array, F32, 3468, [8], "y", 1, 0, -999, 1000, 3 scriptCurve6Bins = array, F32, 3500, [8], "x", 1, 0, -999, 1000, 3 scriptCurve6 = array, F32, 3532, [8], "y", 1, 0, -999, 1000, 3 -unused3328 = array, U08, 3564, [300], "units", 1, 0, -20, 100, 0 +scriptTableName1 = string, ASCII, 3564, 16 +scriptTableName2 = string, ASCII, 3580, 16 +scriptTableName3 = string, ASCII, 3596, 16 +scriptTableName4 = string, ASCII, 3612, 16 +unused3328 = array, U08, 3628, [236], "units", 1, 0, -20, 100, 0 tChargeAirCoefMin = scalar, F32, 3864, "Min tCharge Coeff.", 1, 0, 0, 1, 4 tChargeAirCoefMax = scalar, F32, 3868, "Max tCharge Coeff.", 1, 0, 0, 1, 4 tChargeAirFlowMax = scalar, F32, 3872, "Max Air Flow (kg/h)", 1, 0, 0, 1000, 1 @@ -3372,10 +3376,10 @@ menuDialog = main subMenu = fsioFormulas, "FSIO Formulas" subMenu = std_separator - subMenu = fsioTable1Tbl, "Script Table #1" - subMenu = fsioTable2Tbl, "Script Table #2" - subMenu = fsioTable3Tbl, "Script Table #3" - subMenu = fsioTable4Tbl, "Script Table #4" + subMenu = fsioTable1TblSettings, "Script Table #1" + subMenu = fsioTable2TblSettings, "Script Table #2" + subMenu = fsioTable3TblSettings, "Script Table #3" + subMenu = fsioTable4TblSettings, "Script Table #4" subMenu = scriptCurve1Settings, "Script Curve #1" subMenu = scriptCurve2Settings, "Script Curve #2" subMenu = scriptCurve3Settings, "Script Curve #3" @@ -3662,6 +3666,22 @@ 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 + field = "Name", tableCurveName1 + panel = fsioTable1Tbl + + dialog = fsioTable2TblSettings, "", yAxis + field = "Name", tableCurveName2 + panel = fsioTable1Tb2 + + dialog = fsioTable3TblSettings, "", yAxis + field = "Name", tableCurveName3 + panel = fsioTable3Tbl + + dialog = fsioTable4TblSettings, "", yAxis + field = "Name", tableCurveName4 + panel = fsioTable4Tbl + dialog = scriptCurve1Settings, "", yAxis field = "Name", scriptCurveName4 panel = scriptCurve1 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 349d717128..454fea9005 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 07 03:31:57 UTC 2021 +// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Sun Nov 07 15:29:27 UTC 2021 // by class com.rusefi.output.FileJavaFieldsConsumer import com.rusefi.config.*; @@ -787,12 +787,10 @@ public class Fields { public static final int engine_type_e_HELLEN_NB2_36 = 86; public static final int engine_type_e_HONDA_600 = 43; public static final int engine_type_e_HONDA_ACCORD_CD_TWO_WIRES = 17; - public static final int engine_type_e_MAZDA_626 = 28; public static final int engine_type_e_MAZDA_MIATA_2003_BOARD_TEST = 55; public static final int engine_type_e_MAZDA_MIATA_2003_NA_RAIL = 54; public static final int engine_type_e_MIATA_1996 = 21; public static final int engine_type_e_MIATA_PROTEUS_TCU = 1; - public static final int engine_type_e_MICRO_RUS_EFI = 60; public static final int engine_type_e_MINIMAL_PINS = 99; public static final int engine_type_e_MITSU_4G93 = 16; public static final int engine_type_e_MRE_BOARD_NEW_TEST = 31; @@ -807,10 +805,8 @@ public class Fields { public static final int engine_type_e_MRE_SECONDARY_CAN = 4; public static final int engine_type_e_MRE_SUBARU_EJ18 = 37; public static final int engine_type_e_NISSAN_PRIMERA = 5; - public static final int engine_type_e_PROMETHEUS_DEFAULTS = 100; public static final int engine_type_e_PROTEUS_ANALOG_PWM_TEST = 106; public static final int engine_type_e_PROTEUS_BMW_M73 = 63; - public static final int engine_type_e_PROTEUS_DEFAULTS = 61; public static final int engine_type_e_PROTEUS_HONDA_ELEMENT_2003 = 90; public static final int engine_type_e_PROTEUS_HONDA_OBD2A = 91; public static final int engine_type_e_PROTEUS_LUA_DEMO = 25; @@ -835,10 +831,14 @@ public class Fields { public static final int engine_type_e_TOYOTA_2JZ_GTE_VVTi = 44; public static final int engine_type_e_TOYOTA_JZS147 = 38; public static final int engine_type_e_UNUSED10 = 10; + public static final int engine_type_e_UNUSED100 = 100; public static final int engine_type_e_UNUSED101 = 101; public static final int engine_type_e_UNUSED18 = 18; + public static final int engine_type_e_UNUSED28 = 28; public static final int engine_type_e_UNUSED30 = 30; public static final int engine_type_e_UNUSED39 = 39; + public static final int engine_type_e_UNUSED60 = 60; + public static final int engine_type_e_UNUSED61 = 61; public static final int engine_type_e_UNUSED9 = 9; public static final int engine_type_e_UNUSED_19 = 19; public static final int engine_type_e_UNUSED_48 = 48; @@ -1728,6 +1728,7 @@ public class Fields { public static final int rpmHardLimit_offset = 416; public static final int runningLedPin_offset = 1813; public static final int SCRIPT_CURVE_COUNT = 6; + public static final int SCRIPT_TABLE_COUNT = 4; public static final int scriptCurve1_offset = 2780; public static final int scriptCurve1Bins_offset = 2716; public static final int scriptCurve2_offset = 2908; @@ -1746,6 +1747,10 @@ public class Fields { public static final int scriptCurveName4_offset = 3388; public static final int scriptCurveName5_offset = 3404; public static final int scriptCurveName6_offset = 3420; + public static final int scriptTableName1_offset = 3564; + public static final int scriptTableName2_offset = 3580; + public static final int scriptTableName3_offset = 3596; + public static final int scriptTableName4_offset = 3612; public static final int sdCardCsPin_offset = 707; public static final int sdCardCsPinMode_offset = 2226; public static final int sdCardPeriodMs_offset = 804; @@ -1770,7 +1775,6 @@ public class Fields { public static final int servoOutputPins8_offset = 3147; public static final int showHumanReadableWarning_offset = 976; public static final int showSdCardWarning_offset = 76; - public static final int SIGNATURE_HASH = 483694278; public static final int silentTriggerError_offset = 1464; public static final int slowAdcAlpha_offset = 2088; public static final int sparkDwellRpmBins_offset = 332; @@ -2222,7 +2226,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.07.all.483694278"; + public static final String TS_SIGNATURE = "rusEFI 2021.11.07.all.2808593124"; public static final char TS_SINGLE_WRITE_COMMAND = 'W'; public static final char TS_TEST_COMMAND = 't'; public static final int tunerStudioSerialSpeed_offset = 728; @@ -2257,7 +2261,7 @@ public class Fields { public static final int unused2508_offset = 2511; public static final int unused2536_offset = 2539; public static final int unused3103_offset = 3103; - public static final int unused3328_offset = 3564; + public static final int unused3328_offset = 3628; public static final int unused3942_offset = 3992; public static final int unused3988_offset = 3988; public static final int unused4028_offset = 4028; @@ -3467,7 +3471,11 @@ public class Fields { public static final Field SCRIPTCURVE5 = Field.create("SCRIPTCURVE5", 3468, FieldType.FLOAT); public static final Field SCRIPTCURVE6BINS = Field.create("SCRIPTCURVE6BINS", 3500, FieldType.FLOAT); public static final Field SCRIPTCURVE6 = Field.create("SCRIPTCURVE6", 3532, FieldType.FLOAT); - public static final Field UNUSED3328 = Field.create("UNUSED3328", 3564, FieldType.INT8); + public static final Field SCRIPTTABLENAME1 = Field.create("SCRIPTTABLENAME1", 3564, 16, FieldType.STRING); + public static final Field SCRIPTTABLENAME2 = Field.create("SCRIPTTABLENAME2", 3580, 16, FieldType.STRING); + public static final Field SCRIPTTABLENAME3 = Field.create("SCRIPTTABLENAME3", 3596, 16, FieldType.STRING); + public static final Field SCRIPTTABLENAME4 = Field.create("SCRIPTTABLENAME4", 3612, 16, FieldType.STRING); + public static final Field UNUSED3328 = Field.create("UNUSED3328", 3628, FieldType.INT8); public static final Field TCHARGEAIRCOEFMIN = Field.create("TCHARGEAIRCOEFMIN", 3864, FieldType.FLOAT); public static final Field TCHARGEAIRCOEFMAX = Field.create("TCHARGEAIRCOEFMAX", 3868, FieldType.FLOAT); public static final Field TCHARGEAIRFLOWMAX = Field.create("TCHARGEAIRFLOWMAX", 3872, FieldType.FLOAT); @@ -4754,6 +4762,10 @@ public class Fields { SCRIPTCURVE5, SCRIPTCURVE6BINS, SCRIPTCURVE6, + SCRIPTTABLENAME1, + SCRIPTTABLENAME2, + SCRIPTTABLENAME3, + SCRIPTTABLENAME4, UNUSED3328, TCHARGEAIRCOEFMIN, TCHARGEAIRCOEFMAX, diff --git a/java_console/rusefi.xml b/java_console/rusefi.xml index 72c8cc97c6..76c8f6c6f8 100644 --- a/java_console/rusefi.xml +++ b/java_console/rusefi.xml @@ -1,6 +1,6 @@ - +