diff --git a/firmware/config/boards/cypress/config/controllers/algo/engine_configuration_generated_structures.h b/firmware/config/boards/cypress/config/controllers/algo/engine_configuration_generated_structures.h index 6915218267..4f363dbca3 100644 --- a/firmware/config/boards/cypress/config/controllers/algo/engine_configuration_generated_structures.h +++ b/firmware/config/boards/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 Wed Sep 28 02:22:07 UTC 2022 +// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on hellen_cypress_gen_config.bat integration/rusefi_config.txt Mon Oct 03 15:05:32 UTC 2022 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -1617,10 +1617,18 @@ struct engine_configuration_s { * offset 748 */ Gpio triggerSimulatorPins[TRIGGER_SIMULATOR_PIN_COUNT]; + /** + * offset 752 + */ + uint16_t unusedTrig; /** * offset 754 */ pin_output_mode_e triggerSimulatorPinModes[TRIGGER_SIMULATOR_PIN_COUNT]; + /** + * offset 756 + */ + uint8_t unusedTrigMode; /** * need 4 byte alignment units @@ -3142,76 +3150,76 @@ struct engine_configuration_s { bool unused1130 : 1 {}; /** offset 1628 bit 8 */ - bool unusedBit_539_8 : 1 {}; + bool unusedBit_541_8 : 1 {}; /** offset 1628 bit 9 */ - bool unusedBit_539_9 : 1 {}; + bool unusedBit_541_9 : 1 {}; /** offset 1628 bit 10 */ - bool unusedBit_539_10 : 1 {}; + bool unusedBit_541_10 : 1 {}; /** offset 1628 bit 11 */ - bool unusedBit_539_11 : 1 {}; + bool unusedBit_541_11 : 1 {}; /** offset 1628 bit 12 */ - bool unusedBit_539_12 : 1 {}; + bool unusedBit_541_12 : 1 {}; /** offset 1628 bit 13 */ - bool unusedBit_539_13 : 1 {}; + bool unusedBit_541_13 : 1 {}; /** offset 1628 bit 14 */ - bool unusedBit_539_14 : 1 {}; + bool unusedBit_541_14 : 1 {}; /** offset 1628 bit 15 */ - bool unusedBit_539_15 : 1 {}; + bool unusedBit_541_15 : 1 {}; /** offset 1628 bit 16 */ - bool unusedBit_539_16 : 1 {}; + bool unusedBit_541_16 : 1 {}; /** offset 1628 bit 17 */ - bool unusedBit_539_17 : 1 {}; + bool unusedBit_541_17 : 1 {}; /** offset 1628 bit 18 */ - bool unusedBit_539_18 : 1 {}; + bool unusedBit_541_18 : 1 {}; /** offset 1628 bit 19 */ - bool unusedBit_539_19 : 1 {}; + bool unusedBit_541_19 : 1 {}; /** offset 1628 bit 20 */ - bool unusedBit_539_20 : 1 {}; + bool unusedBit_541_20 : 1 {}; /** offset 1628 bit 21 */ - bool unusedBit_539_21 : 1 {}; + bool unusedBit_541_21 : 1 {}; /** offset 1628 bit 22 */ - bool unusedBit_539_22 : 1 {}; + bool unusedBit_541_22 : 1 {}; /** offset 1628 bit 23 */ - bool unusedBit_539_23 : 1 {}; + bool unusedBit_541_23 : 1 {}; /** offset 1628 bit 24 */ - bool unusedBit_539_24 : 1 {}; + bool unusedBit_541_24 : 1 {}; /** offset 1628 bit 25 */ - bool unusedBit_539_25 : 1 {}; + bool unusedBit_541_25 : 1 {}; /** offset 1628 bit 26 */ - bool unusedBit_539_26 : 1 {}; + bool unusedBit_541_26 : 1 {}; /** offset 1628 bit 27 */ - bool unusedBit_539_27 : 1 {}; + bool unusedBit_541_27 : 1 {}; /** offset 1628 bit 28 */ - bool unusedBit_539_28 : 1 {}; + bool unusedBit_541_28 : 1 {}; /** offset 1628 bit 29 */ - bool unusedBit_539_29 : 1 {}; + bool unusedBit_541_29 : 1 {}; /** offset 1628 bit 30 */ - bool unusedBit_539_30 : 1 {}; + bool unusedBit_541_30 : 1 {}; /** offset 1628 bit 31 */ - bool unusedBit_539_31 : 1 {}; + bool unusedBit_541_31 : 1 {}; /** * Time between bench test pulses ms @@ -5049,4 +5057,4 @@ struct persistent_config_s { static_assert(sizeof(persistent_config_s) == 22048); // end -// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on hellen_cypress_gen_config.bat integration/rusefi_config.txt Wed Sep 28 02:22:07 UTC 2022 +// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on hellen_cypress_gen_config.bat integration/rusefi_config.txt Mon Oct 03 15:05:32 UTC 2022 diff --git a/firmware/config/boards/cypress/config/controllers/algo/rusefi_generated.h b/firmware/config/boards/cypress/config/controllers/algo/rusefi_generated.h index bcd65c379d..ea09692e3f 100644 --- a/firmware/config/boards/cypress/config/controllers/algo/rusefi_generated.h +++ b/firmware/config/boards/cypress/config/controllers/algo/rusefi_generated.h @@ -1969,7 +1969,7 @@ #define show_Frankenso_presets true #define show_test_presets true #define showHumanReadableWarning_offset 960 -#define SIGNATURE_HASH 2717408623 +#define SIGNATURE_HASH 3054430189 #define silentTriggerError_offset 1360 #define skippedWheelOnCam_offset 1360 #define slowAdcAlpha_offset 1600 @@ -2267,7 +2267,7 @@ #define TRIGGER_IS_CRANK_KEY "crankBased" #define TRIGGER_IS_SECOND_WHEEL_CAM "isSecondWheelCam" #define trigger_offset 468 -#define TRIGGER_SIMULATOR_PIN_COUNT 3 +#define TRIGGER_SIMULATOR_PIN_COUNT 2 #define trigger_type_e_auto_enum 0="TT_TOOTHED_WHEEL",38="TT_12_TOOTH_CRANK",50="TT_1_16",29="TT_2JZ_1_12",25="TT_2JZ_3_34",70="TT_36_2_1",71="TT_36_2_1_1",23="TT_36_2_2_2",31="TT_3_1_CAM",20="TT_60_2_VW",30="TT_CHRYSLER_NGC_36_2_2",6="TT_DAIHATSU",2="TT_DODGE_NEON_1995",39="TT_DODGE_NEON_1995_ONLY_CRANK",14="TT_DODGE_NEON_2003_CAM",32="TT_DODGE_NEON_2003_CRANK",19="TT_DODGE_RAM",22="TT_DODGE_STRATUS",41="TT_FIAT_IAW_P8",1="TT_FORD_ASPIRE",42="TT_FORD_ST170",65="TT_FORD_TFI_PIP",27="TT_GM_24x",74="TT_GM_24x_2",54="TT_GM_60_2_2_2",5="TT_GM_7X",28="TT_HONDA_CBR_600",67="TT_HONDA_K_CAM_4_1",46="TT_HONDA_K_CRANK_12_1",37="TT_JEEP_18_2_2_2",40="TT_JEEP_4_CYL",57="TT_KAWA_KX450F",15="TT_MAZDA_DOHC_1_4",3="TT_MAZDA_MIATA_NA",4="TT_MAZDA_MIATA_NB1",35="TT_MAZDA_MIATA_VVT_TEST",7="TT_MAZDA_SOHC_4",10="TT_MERCEDES_2_SEGMENT",33="TT_MIATA_VVT",11="TT_MITSUBISHI",52="TT_NISSAN_MR18_CAM_VVT",68="TT_NISSAN_MR18_CRANK",61="TT_NISSAN_QR25",24="TT_NISSAN_SR20VE",60="TT_NISSAN_VQ30",58="TT_NISSAN_VQ35",18="TT_ONE",16="TT_ONE_PLUS_ONE",44="TT_RENIX_44_2_2",45="TT_RENIX_66_2_2_2",26="TT_ROVER_K",55="TT_SKODA_FAVORIT",36="TT_SUBARU_7_6",51="TT_SUBARU_7_WITHOUT_6",12="TT_SUBARU_EZ30",49="TT_SUBARU_SVX",64="TT_SUBARU_SVX_CAM_VVT",63="TT_SUBARU_SVX_CRANK_1",66="TT_SUZUKI_G13B",69="TT_TOOTHED_WHEEL_32_2",9="TT_TOOTHED_WHEEL_36_1",48="TT_TOOTHED_WHEEL_36_2",8="TT_TOOTHED_WHEEL_60_2",53="TT_TRI_TACH",75="TT_UNUSED",56="TT_VVT_BARRA_3_PLUS_1",47="TT_VVT_BOSCH_QUICK_START",17="TT_VVT_JZ",13="TT_VVT_MAZDA_SKYACTIV",43="TT_VVT_MIATA_NB",62="TT_VVT_MITSUBISHI_3A92",72="TT_VVT_MITSUBISHI_6G75",59="TT_VVT_NISSAN_VQ35",73="TT_VVT_TOYOTA_4_1",21="UNUSED_21",34="UNUSED_34" #define trigger_type_e_enum "custom toothed wheel", "Ford Aspire", "Dodge Neon 1995", "Miata NA", "INVALID", "GM_7X", "Cooper R50", "Mazda SOHC 4", "60/2", "36/1", "Mercedes Two Segment", "Mitsubishi 4G93", "EZ30", "INVALID", "Dodge Neon 2003", "Mazda DOHC 1+4", "1+1", "INVALID", "Single Tooth", "Dodge Ram 1+16", "60/2 VW", "INVALID", "Dodge Stratus", "36_2_2_2", "Nissan Primera", "dev 2JZ 3/34 simulator", "Rover K", "GM 24x 5 degree", "Honda CBR 600", "2JZ_1_12", "Honda CBR 600 custom", "3/1 skipped", "Dodge Neon 2003 crank", "Miata NB", "INVALID", "INVALID", "Subaru 7+6", "Jeep 18-2-2-2", "12 tooth crank", "Dodge Neon 1995 crank only", "Jeep XJ 4 cyl", "FiatIAQ_P8", "Mazda Z5", "INVALID", "Renix 44-2-2", "Renix 66-2-2-2", "Honda K 12+1", "INVALID", "36/2", "Subaru SVX", "1+16", "Subaru 7 without 6", "INVALID", "TriTach", "GM 60/2/2/2", "Skoda Favorit", "Barra 3+1 Cam", "Kawa KX450F", "Nissan VQ35", "INVALID", "Nissan VQ30", "Nissan QR25", "Mitsubishi 3A92", "Subaru SVX Crank 1", "Subaru SVX Cam VVT", "Ford PIP", "Suzuki G13B", "Honda K 4+1", "Nissan MR18 Crank", "32/2", "36-2-1", "36-2-1-1", "INVALID", "INVALID", "GM 24x 3 degree", "trg75" #define trigger_type_e_Force_4_bytes_size_trigger_type 70000 @@ -2400,10 +2400,8 @@ #define triggerSimulatorFrequency_offset 576 #define triggerSimulatorPinModes1_offset 754 #define triggerSimulatorPinModes2_offset 755 -#define triggerSimulatorPinModes3_offset 756 #define triggerSimulatorPins1_offset 748 #define triggerSimulatorPins2_offset 750 -#define triggerSimulatorPins3_offset 752 #define TriggerWheel_T_PRIMARY 0 #define TriggerWheel_T_SECONDARY 1 #define TRIM_SIZE 4 @@ -2526,7 +2524,7 @@ #define ts_show_vbatt true #define ts_show_vr_threshold_2 true #define ts_show_vr_threshold_all true -#define TS_SIGNATURE "rusEFI 2022.10.03.cypress.2717408623" +#define TS_SIGNATURE "rusEFI 2022.10.03.cypress.3054430189" #define TS_SINGLE_WRITE_COMMAND 'W' #define TS_SINGLE_WRITE_COMMAND_char W #define TS_TEST_COMMAND 't' @@ -2574,30 +2572,32 @@ #define unused_1484_bit_38_offset 1372 #define unusedAlteOnOff_offset 764 #define unusedBit_45_31_offset 120 -#define unusedBit_539_10_offset 1628 -#define unusedBit_539_11_offset 1628 -#define unusedBit_539_12_offset 1628 -#define unusedBit_539_13_offset 1628 -#define unusedBit_539_14_offset 1628 -#define unusedBit_539_15_offset 1628 -#define unusedBit_539_16_offset 1628 -#define unusedBit_539_17_offset 1628 -#define unusedBit_539_18_offset 1628 -#define unusedBit_539_19_offset 1628 -#define unusedBit_539_20_offset 1628 -#define unusedBit_539_21_offset 1628 -#define unusedBit_539_22_offset 1628 -#define unusedBit_539_23_offset 1628 -#define unusedBit_539_24_offset 1628 -#define unusedBit_539_25_offset 1628 -#define unusedBit_539_26_offset 1628 -#define unusedBit_539_27_offset 1628 -#define unusedBit_539_28_offset 1628 -#define unusedBit_539_29_offset 1628 -#define unusedBit_539_30_offset 1628 -#define unusedBit_539_31_offset 1628 -#define unusedBit_539_8_offset 1628 -#define unusedBit_539_9_offset 1628 +#define unusedBit_541_10_offset 1628 +#define unusedBit_541_11_offset 1628 +#define unusedBit_541_12_offset 1628 +#define unusedBit_541_13_offset 1628 +#define unusedBit_541_14_offset 1628 +#define unusedBit_541_15_offset 1628 +#define unusedBit_541_16_offset 1628 +#define unusedBit_541_17_offset 1628 +#define unusedBit_541_18_offset 1628 +#define unusedBit_541_19_offset 1628 +#define unusedBit_541_20_offset 1628 +#define unusedBit_541_21_offset 1628 +#define unusedBit_541_22_offset 1628 +#define unusedBit_541_23_offset 1628 +#define unusedBit_541_24_offset 1628 +#define unusedBit_541_25_offset 1628 +#define unusedBit_541_26_offset 1628 +#define unusedBit_541_27_offset 1628 +#define unusedBit_541_28_offset 1628 +#define unusedBit_541_29_offset 1628 +#define unusedBit_541_30_offset 1628 +#define unusedBit_541_31_offset 1628 +#define unusedBit_541_8_offset 1628 +#define unusedBit_541_9_offset 1628 +#define unusedTrig_offset 752 +#define unusedTrigMode_offset 756 #define useAdvanceCorrectionsForCranking_offset 1372 #define useBiQuadOnAuxSpeedSensors_offset 1372 #define useCicPidForIdle_offset 120 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 fef62dfac8..5fa54f76e3 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 Wed Sep 28 02:22:05 UTC 2022 +// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Mon Oct 03 15:05:31 UTC 2022 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -1617,10 +1617,18 @@ struct engine_configuration_s { * offset 748 */ Gpio triggerSimulatorPins[TRIGGER_SIMULATOR_PIN_COUNT]; + /** + * offset 752 + */ + uint16_t unusedTrig; /** * offset 754 */ pin_output_mode_e triggerSimulatorPinModes[TRIGGER_SIMULATOR_PIN_COUNT]; + /** + * offset 756 + */ + uint8_t unusedTrigMode; /** * need 4 byte alignment units @@ -3142,76 +3150,76 @@ struct engine_configuration_s { bool unused1130 : 1 {}; /** offset 1628 bit 8 */ - bool unusedBit_539_8 : 1 {}; + bool unusedBit_541_8 : 1 {}; /** offset 1628 bit 9 */ - bool unusedBit_539_9 : 1 {}; + bool unusedBit_541_9 : 1 {}; /** offset 1628 bit 10 */ - bool unusedBit_539_10 : 1 {}; + bool unusedBit_541_10 : 1 {}; /** offset 1628 bit 11 */ - bool unusedBit_539_11 : 1 {}; + bool unusedBit_541_11 : 1 {}; /** offset 1628 bit 12 */ - bool unusedBit_539_12 : 1 {}; + bool unusedBit_541_12 : 1 {}; /** offset 1628 bit 13 */ - bool unusedBit_539_13 : 1 {}; + bool unusedBit_541_13 : 1 {}; /** offset 1628 bit 14 */ - bool unusedBit_539_14 : 1 {}; + bool unusedBit_541_14 : 1 {}; /** offset 1628 bit 15 */ - bool unusedBit_539_15 : 1 {}; + bool unusedBit_541_15 : 1 {}; /** offset 1628 bit 16 */ - bool unusedBit_539_16 : 1 {}; + bool unusedBit_541_16 : 1 {}; /** offset 1628 bit 17 */ - bool unusedBit_539_17 : 1 {}; + bool unusedBit_541_17 : 1 {}; /** offset 1628 bit 18 */ - bool unusedBit_539_18 : 1 {}; + bool unusedBit_541_18 : 1 {}; /** offset 1628 bit 19 */ - bool unusedBit_539_19 : 1 {}; + bool unusedBit_541_19 : 1 {}; /** offset 1628 bit 20 */ - bool unusedBit_539_20 : 1 {}; + bool unusedBit_541_20 : 1 {}; /** offset 1628 bit 21 */ - bool unusedBit_539_21 : 1 {}; + bool unusedBit_541_21 : 1 {}; /** offset 1628 bit 22 */ - bool unusedBit_539_22 : 1 {}; + bool unusedBit_541_22 : 1 {}; /** offset 1628 bit 23 */ - bool unusedBit_539_23 : 1 {}; + bool unusedBit_541_23 : 1 {}; /** offset 1628 bit 24 */ - bool unusedBit_539_24 : 1 {}; + bool unusedBit_541_24 : 1 {}; /** offset 1628 bit 25 */ - bool unusedBit_539_25 : 1 {}; + bool unusedBit_541_25 : 1 {}; /** offset 1628 bit 26 */ - bool unusedBit_539_26 : 1 {}; + bool unusedBit_541_26 : 1 {}; /** offset 1628 bit 27 */ - bool unusedBit_539_27 : 1 {}; + bool unusedBit_541_27 : 1 {}; /** offset 1628 bit 28 */ - bool unusedBit_539_28 : 1 {}; + bool unusedBit_541_28 : 1 {}; /** offset 1628 bit 29 */ - bool unusedBit_539_29 : 1 {}; + bool unusedBit_541_29 : 1 {}; /** offset 1628 bit 30 */ - bool unusedBit_539_30 : 1 {}; + bool unusedBit_541_30 : 1 {}; /** offset 1628 bit 31 */ - bool unusedBit_539_31 : 1 {}; + bool unusedBit_541_31 : 1 {}; /** * Time between bench test pulses ms @@ -5049,4 +5057,4 @@ struct persistent_config_s { static_assert(sizeof(persistent_config_s) == 22048); // end -// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Wed Sep 28 02:22:05 UTC 2022 +// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Mon Oct 03 15:05:31 UTC 2022 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 5d97cca9d6..c28b294445 100644 --- a/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h +++ b/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h @@ -1969,7 +1969,7 @@ #define show_Frankenso_presets true #define show_test_presets true #define showHumanReadableWarning_offset 960 -#define SIGNATURE_HASH 3375366051 +#define SIGNATURE_HASH 3738780961 #define silentTriggerError_offset 1360 #define skippedWheelOnCam_offset 1360 #define slowAdcAlpha_offset 1600 @@ -2267,7 +2267,7 @@ #define TRIGGER_IS_CRANK_KEY "crankBased" #define TRIGGER_IS_SECOND_WHEEL_CAM "isSecondWheelCam" #define trigger_offset 468 -#define TRIGGER_SIMULATOR_PIN_COUNT 3 +#define TRIGGER_SIMULATOR_PIN_COUNT 2 #define trigger_type_e_auto_enum 0="TT_TOOTHED_WHEEL",38="TT_12_TOOTH_CRANK",50="TT_1_16",29="TT_2JZ_1_12",25="TT_2JZ_3_34",70="TT_36_2_1",71="TT_36_2_1_1",23="TT_36_2_2_2",31="TT_3_1_CAM",20="TT_60_2_VW",30="TT_CHRYSLER_NGC_36_2_2",6="TT_DAIHATSU",2="TT_DODGE_NEON_1995",39="TT_DODGE_NEON_1995_ONLY_CRANK",14="TT_DODGE_NEON_2003_CAM",32="TT_DODGE_NEON_2003_CRANK",19="TT_DODGE_RAM",22="TT_DODGE_STRATUS",41="TT_FIAT_IAW_P8",1="TT_FORD_ASPIRE",42="TT_FORD_ST170",65="TT_FORD_TFI_PIP",27="TT_GM_24x",74="TT_GM_24x_2",54="TT_GM_60_2_2_2",5="TT_GM_7X",28="TT_HONDA_CBR_600",67="TT_HONDA_K_CAM_4_1",46="TT_HONDA_K_CRANK_12_1",37="TT_JEEP_18_2_2_2",40="TT_JEEP_4_CYL",57="TT_KAWA_KX450F",15="TT_MAZDA_DOHC_1_4",3="TT_MAZDA_MIATA_NA",4="TT_MAZDA_MIATA_NB1",35="TT_MAZDA_MIATA_VVT_TEST",7="TT_MAZDA_SOHC_4",10="TT_MERCEDES_2_SEGMENT",33="TT_MIATA_VVT",11="TT_MITSUBISHI",52="TT_NISSAN_MR18_CAM_VVT",68="TT_NISSAN_MR18_CRANK",61="TT_NISSAN_QR25",24="TT_NISSAN_SR20VE",60="TT_NISSAN_VQ30",58="TT_NISSAN_VQ35",18="TT_ONE",16="TT_ONE_PLUS_ONE",44="TT_RENIX_44_2_2",45="TT_RENIX_66_2_2_2",26="TT_ROVER_K",55="TT_SKODA_FAVORIT",36="TT_SUBARU_7_6",51="TT_SUBARU_7_WITHOUT_6",12="TT_SUBARU_EZ30",49="TT_SUBARU_SVX",64="TT_SUBARU_SVX_CAM_VVT",63="TT_SUBARU_SVX_CRANK_1",66="TT_SUZUKI_G13B",69="TT_TOOTHED_WHEEL_32_2",9="TT_TOOTHED_WHEEL_36_1",48="TT_TOOTHED_WHEEL_36_2",8="TT_TOOTHED_WHEEL_60_2",53="TT_TRI_TACH",75="TT_UNUSED",56="TT_VVT_BARRA_3_PLUS_1",47="TT_VVT_BOSCH_QUICK_START",17="TT_VVT_JZ",13="TT_VVT_MAZDA_SKYACTIV",43="TT_VVT_MIATA_NB",62="TT_VVT_MITSUBISHI_3A92",72="TT_VVT_MITSUBISHI_6G75",59="TT_VVT_NISSAN_VQ35",73="TT_VVT_TOYOTA_4_1",21="UNUSED_21",34="UNUSED_34" #define trigger_type_e_enum "custom toothed wheel", "Ford Aspire", "Dodge Neon 1995", "Miata NA", "INVALID", "GM_7X", "Cooper R50", "Mazda SOHC 4", "60/2", "36/1", "Mercedes Two Segment", "Mitsubishi 4G93", "EZ30", "INVALID", "Dodge Neon 2003", "Mazda DOHC 1+4", "1+1", "INVALID", "Single Tooth", "Dodge Ram 1+16", "60/2 VW", "INVALID", "Dodge Stratus", "36_2_2_2", "Nissan Primera", "dev 2JZ 3/34 simulator", "Rover K", "GM 24x 5 degree", "Honda CBR 600", "2JZ_1_12", "Honda CBR 600 custom", "3/1 skipped", "Dodge Neon 2003 crank", "Miata NB", "INVALID", "INVALID", "Subaru 7+6", "Jeep 18-2-2-2", "12 tooth crank", "Dodge Neon 1995 crank only", "Jeep XJ 4 cyl", "FiatIAQ_P8", "Mazda Z5", "INVALID", "Renix 44-2-2", "Renix 66-2-2-2", "Honda K 12+1", "INVALID", "36/2", "Subaru SVX", "1+16", "Subaru 7 without 6", "INVALID", "TriTach", "GM 60/2/2/2", "Skoda Favorit", "Barra 3+1 Cam", "Kawa KX450F", "Nissan VQ35", "INVALID", "Nissan VQ30", "Nissan QR25", "Mitsubishi 3A92", "Subaru SVX Crank 1", "Subaru SVX Cam VVT", "Ford PIP", "Suzuki G13B", "Honda K 4+1", "Nissan MR18 Crank", "32/2", "36-2-1", "36-2-1-1", "INVALID", "INVALID", "GM 24x 3 degree", "trg75" #define trigger_type_e_Force_4_bytes_size_trigger_type 70000 @@ -2400,10 +2400,8 @@ #define triggerSimulatorFrequency_offset 576 #define triggerSimulatorPinModes1_offset 754 #define triggerSimulatorPinModes2_offset 755 -#define triggerSimulatorPinModes3_offset 756 #define triggerSimulatorPins1_offset 748 #define triggerSimulatorPins2_offset 750 -#define triggerSimulatorPins3_offset 752 #define TriggerWheel_T_PRIMARY 0 #define TriggerWheel_T_SECONDARY 1 #define TRIM_SIZE 4 @@ -2526,7 +2524,7 @@ #define ts_show_vbatt true #define ts_show_vr_threshold_2 true #define ts_show_vr_threshold_all true -#define TS_SIGNATURE "rusEFI 2022.10.03.kin.3375366051" +#define TS_SIGNATURE "rusEFI 2022.10.03.kin.3738780961" #define TS_SINGLE_WRITE_COMMAND 'W' #define TS_SINGLE_WRITE_COMMAND_char W #define TS_TEST_COMMAND 't' @@ -2574,30 +2572,32 @@ #define unused_1484_bit_38_offset 1372 #define unusedAlteOnOff_offset 764 #define unusedBit_45_31_offset 120 -#define unusedBit_539_10_offset 1628 -#define unusedBit_539_11_offset 1628 -#define unusedBit_539_12_offset 1628 -#define unusedBit_539_13_offset 1628 -#define unusedBit_539_14_offset 1628 -#define unusedBit_539_15_offset 1628 -#define unusedBit_539_16_offset 1628 -#define unusedBit_539_17_offset 1628 -#define unusedBit_539_18_offset 1628 -#define unusedBit_539_19_offset 1628 -#define unusedBit_539_20_offset 1628 -#define unusedBit_539_21_offset 1628 -#define unusedBit_539_22_offset 1628 -#define unusedBit_539_23_offset 1628 -#define unusedBit_539_24_offset 1628 -#define unusedBit_539_25_offset 1628 -#define unusedBit_539_26_offset 1628 -#define unusedBit_539_27_offset 1628 -#define unusedBit_539_28_offset 1628 -#define unusedBit_539_29_offset 1628 -#define unusedBit_539_30_offset 1628 -#define unusedBit_539_31_offset 1628 -#define unusedBit_539_8_offset 1628 -#define unusedBit_539_9_offset 1628 +#define unusedBit_541_10_offset 1628 +#define unusedBit_541_11_offset 1628 +#define unusedBit_541_12_offset 1628 +#define unusedBit_541_13_offset 1628 +#define unusedBit_541_14_offset 1628 +#define unusedBit_541_15_offset 1628 +#define unusedBit_541_16_offset 1628 +#define unusedBit_541_17_offset 1628 +#define unusedBit_541_18_offset 1628 +#define unusedBit_541_19_offset 1628 +#define unusedBit_541_20_offset 1628 +#define unusedBit_541_21_offset 1628 +#define unusedBit_541_22_offset 1628 +#define unusedBit_541_23_offset 1628 +#define unusedBit_541_24_offset 1628 +#define unusedBit_541_25_offset 1628 +#define unusedBit_541_26_offset 1628 +#define unusedBit_541_27_offset 1628 +#define unusedBit_541_28_offset 1628 +#define unusedBit_541_29_offset 1628 +#define unusedBit_541_30_offset 1628 +#define unusedBit_541_31_offset 1628 +#define unusedBit_541_8_offset 1628 +#define unusedBit_541_9_offset 1628 +#define unusedTrig_offset 752 +#define unusedTrigMode_offset 756 #define useAdvanceCorrectionsForCranking_offset 1372 #define useBiQuadOnAuxSpeedSensors_offset 1372 #define useCicPidForIdle_offset 120 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 89ffdcaa2c..220d921a09 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_subaru_config.sh integration/rusefi_config.txt Wed Sep 28 02:22:08 UTC 2022 +// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on config/boards/subaru_eg33/config/gen_subaru_config.sh integration/rusefi_config.txt Mon Oct 03 15:05:34 UTC 2022 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -1617,10 +1617,18 @@ struct engine_configuration_s { * offset 748 */ Gpio triggerSimulatorPins[TRIGGER_SIMULATOR_PIN_COUNT]; + /** + * offset 752 + */ + uint16_t unusedTrig; /** * offset 754 */ pin_output_mode_e triggerSimulatorPinModes[TRIGGER_SIMULATOR_PIN_COUNT]; + /** + * offset 756 + */ + uint8_t unusedTrigMode; /** * need 4 byte alignment units @@ -3142,76 +3150,76 @@ struct engine_configuration_s { bool unused1130 : 1 {}; /** offset 1628 bit 8 */ - bool unusedBit_539_8 : 1 {}; + bool unusedBit_541_8 : 1 {}; /** offset 1628 bit 9 */ - bool unusedBit_539_9 : 1 {}; + bool unusedBit_541_9 : 1 {}; /** offset 1628 bit 10 */ - bool unusedBit_539_10 : 1 {}; + bool unusedBit_541_10 : 1 {}; /** offset 1628 bit 11 */ - bool unusedBit_539_11 : 1 {}; + bool unusedBit_541_11 : 1 {}; /** offset 1628 bit 12 */ - bool unusedBit_539_12 : 1 {}; + bool unusedBit_541_12 : 1 {}; /** offset 1628 bit 13 */ - bool unusedBit_539_13 : 1 {}; + bool unusedBit_541_13 : 1 {}; /** offset 1628 bit 14 */ - bool unusedBit_539_14 : 1 {}; + bool unusedBit_541_14 : 1 {}; /** offset 1628 bit 15 */ - bool unusedBit_539_15 : 1 {}; + bool unusedBit_541_15 : 1 {}; /** offset 1628 bit 16 */ - bool unusedBit_539_16 : 1 {}; + bool unusedBit_541_16 : 1 {}; /** offset 1628 bit 17 */ - bool unusedBit_539_17 : 1 {}; + bool unusedBit_541_17 : 1 {}; /** offset 1628 bit 18 */ - bool unusedBit_539_18 : 1 {}; + bool unusedBit_541_18 : 1 {}; /** offset 1628 bit 19 */ - bool unusedBit_539_19 : 1 {}; + bool unusedBit_541_19 : 1 {}; /** offset 1628 bit 20 */ - bool unusedBit_539_20 : 1 {}; + bool unusedBit_541_20 : 1 {}; /** offset 1628 bit 21 */ - bool unusedBit_539_21 : 1 {}; + bool unusedBit_541_21 : 1 {}; /** offset 1628 bit 22 */ - bool unusedBit_539_22 : 1 {}; + bool unusedBit_541_22 : 1 {}; /** offset 1628 bit 23 */ - bool unusedBit_539_23 : 1 {}; + bool unusedBit_541_23 : 1 {}; /** offset 1628 bit 24 */ - bool unusedBit_539_24 : 1 {}; + bool unusedBit_541_24 : 1 {}; /** offset 1628 bit 25 */ - bool unusedBit_539_25 : 1 {}; + bool unusedBit_541_25 : 1 {}; /** offset 1628 bit 26 */ - bool unusedBit_539_26 : 1 {}; + bool unusedBit_541_26 : 1 {}; /** offset 1628 bit 27 */ - bool unusedBit_539_27 : 1 {}; + bool unusedBit_541_27 : 1 {}; /** offset 1628 bit 28 */ - bool unusedBit_539_28 : 1 {}; + bool unusedBit_541_28 : 1 {}; /** offset 1628 bit 29 */ - bool unusedBit_539_29 : 1 {}; + bool unusedBit_541_29 : 1 {}; /** offset 1628 bit 30 */ - bool unusedBit_539_30 : 1 {}; + bool unusedBit_541_30 : 1 {}; /** offset 1628 bit 31 */ - bool unusedBit_539_31 : 1 {}; + bool unusedBit_541_31 : 1 {}; /** * Time between bench test pulses ms @@ -5049,4 +5057,4 @@ struct persistent_config_s { static_assert(sizeof(persistent_config_s) == 22048); // end -// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on config/boards/subaru_eg33/config/gen_subaru_config.sh integration/rusefi_config.txt Wed Sep 28 02:22:08 UTC 2022 +// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on config/boards/subaru_eg33/config/gen_subaru_config.sh integration/rusefi_config.txt Mon Oct 03 15:05:34 UTC 2022 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 34421d14b2..d89d1621e7 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 @@ -1935,7 +1935,7 @@ #define show_Proteus_presets false #define show_test_presets false #define showHumanReadableWarning_offset 960 -#define SIGNATURE_HASH 3638985909 +#define SIGNATURE_HASH 3473948215 #define silentTriggerError_offset 1360 #define skippedWheelOnCam_offset 1360 #define slowAdcAlpha_offset 1600 @@ -2234,7 +2234,7 @@ #define TRIGGER_IS_CRANK_KEY "crankBased" #define TRIGGER_IS_SECOND_WHEEL_CAM "isSecondWheelCam" #define trigger_offset 468 -#define TRIGGER_SIMULATOR_PIN_COUNT 3 +#define TRIGGER_SIMULATOR_PIN_COUNT 2 #define trigger_type_e_auto_enum 0="TT_TOOTHED_WHEEL",38="TT_12_TOOTH_CRANK",50="TT_1_16",29="TT_2JZ_1_12",25="TT_2JZ_3_34",70="TT_36_2_1",71="TT_36_2_1_1",23="TT_36_2_2_2",31="TT_3_1_CAM",20="TT_60_2_VW",30="TT_CHRYSLER_NGC_36_2_2",6="TT_DAIHATSU",2="TT_DODGE_NEON_1995",39="TT_DODGE_NEON_1995_ONLY_CRANK",14="TT_DODGE_NEON_2003_CAM",32="TT_DODGE_NEON_2003_CRANK",19="TT_DODGE_RAM",22="TT_DODGE_STRATUS",41="TT_FIAT_IAW_P8",1="TT_FORD_ASPIRE",42="TT_FORD_ST170",65="TT_FORD_TFI_PIP",27="TT_GM_24x",74="TT_GM_24x_2",54="TT_GM_60_2_2_2",5="TT_GM_7X",28="TT_HONDA_CBR_600",67="TT_HONDA_K_CAM_4_1",46="TT_HONDA_K_CRANK_12_1",37="TT_JEEP_18_2_2_2",40="TT_JEEP_4_CYL",57="TT_KAWA_KX450F",15="TT_MAZDA_DOHC_1_4",3="TT_MAZDA_MIATA_NA",4="TT_MAZDA_MIATA_NB1",35="TT_MAZDA_MIATA_VVT_TEST",7="TT_MAZDA_SOHC_4",10="TT_MERCEDES_2_SEGMENT",33="TT_MIATA_VVT",11="TT_MITSUBISHI",52="TT_NISSAN_MR18_CAM_VVT",68="TT_NISSAN_MR18_CRANK",61="TT_NISSAN_QR25",24="TT_NISSAN_SR20VE",60="TT_NISSAN_VQ30",58="TT_NISSAN_VQ35",18="TT_ONE",16="TT_ONE_PLUS_ONE",44="TT_RENIX_44_2_2",45="TT_RENIX_66_2_2_2",26="TT_ROVER_K",55="TT_SKODA_FAVORIT",36="TT_SUBARU_7_6",51="TT_SUBARU_7_WITHOUT_6",12="TT_SUBARU_EZ30",49="TT_SUBARU_SVX",64="TT_SUBARU_SVX_CAM_VVT",63="TT_SUBARU_SVX_CRANK_1",66="TT_SUZUKI_G13B",69="TT_TOOTHED_WHEEL_32_2",9="TT_TOOTHED_WHEEL_36_1",48="TT_TOOTHED_WHEEL_36_2",8="TT_TOOTHED_WHEEL_60_2",53="TT_TRI_TACH",75="TT_UNUSED",56="TT_VVT_BARRA_3_PLUS_1",47="TT_VVT_BOSCH_QUICK_START",17="TT_VVT_JZ",13="TT_VVT_MAZDA_SKYACTIV",43="TT_VVT_MIATA_NB",62="TT_VVT_MITSUBISHI_3A92",72="TT_VVT_MITSUBISHI_6G75",59="TT_VVT_NISSAN_VQ35",73="TT_VVT_TOYOTA_4_1",21="UNUSED_21",34="UNUSED_34" #define trigger_type_e_enum "custom toothed wheel", "Ford Aspire", "Dodge Neon 1995", "Miata NA", "INVALID", "GM_7X", "Cooper R50", "Mazda SOHC 4", "60/2", "36/1", "Mercedes Two Segment", "Mitsubishi 4G93", "EZ30", "INVALID", "Dodge Neon 2003", "Mazda DOHC 1+4", "1+1", "INVALID", "Single Tooth", "Dodge Ram 1+16", "60/2 VW", "INVALID", "Dodge Stratus", "36_2_2_2", "Nissan Primera", "dev 2JZ 3/34 simulator", "Rover K", "GM 24x 5 degree", "Honda CBR 600", "2JZ_1_12", "Honda CBR 600 custom", "3/1 skipped", "Dodge Neon 2003 crank", "Miata NB", "INVALID", "INVALID", "Subaru 7+6", "Jeep 18-2-2-2", "12 tooth crank", "Dodge Neon 1995 crank only", "Jeep XJ 4 cyl", "FiatIAQ_P8", "Mazda Z5", "INVALID", "Renix 44-2-2", "Renix 66-2-2-2", "Honda K 12+1", "INVALID", "36/2", "Subaru SVX", "1+16", "Subaru 7 without 6", "INVALID", "TriTach", "GM 60/2/2/2", "Skoda Favorit", "Barra 3+1 Cam", "Kawa KX450F", "Nissan VQ35", "INVALID", "Nissan VQ30", "Nissan QR25", "Mitsubishi 3A92", "Subaru SVX Crank 1", "Subaru SVX Cam VVT", "Ford PIP", "Suzuki G13B", "Honda K 4+1", "Nissan MR18 Crank", "32/2", "36-2-1", "36-2-1-1", "INVALID", "INVALID", "GM 24x 3 degree", "trg75" #define trigger_type_e_Force_4_bytes_size_trigger_type 70000 @@ -2367,10 +2367,8 @@ #define triggerSimulatorFrequency_offset 576 #define triggerSimulatorPinModes1_offset 754 #define triggerSimulatorPinModes2_offset 755 -#define triggerSimulatorPinModes3_offset 756 #define triggerSimulatorPins1_offset 748 #define triggerSimulatorPins2_offset 750 -#define triggerSimulatorPins3_offset 752 #define TriggerWheel_T_PRIMARY 0 #define TriggerWheel_T_SECONDARY 1 #define TRIM_SIZE 4 @@ -2493,7 +2491,7 @@ #define ts_show_vbatt true #define ts_show_vr_threshold_2 true #define ts_show_vr_threshold_all true -#define TS_SIGNATURE "rusEFI 2022.10.03.subaru_eg33_f7.3638985909" +#define TS_SIGNATURE "rusEFI 2022.10.03.subaru_eg33_f7.3473948215" #define TS_SINGLE_WRITE_COMMAND 'W' #define TS_SINGLE_WRITE_COMMAND_char W #define TS_TEST_COMMAND 't' @@ -2541,30 +2539,32 @@ #define unused_1484_bit_38_offset 1372 #define unusedAlteOnOff_offset 764 #define unusedBit_45_31_offset 120 -#define unusedBit_539_10_offset 1628 -#define unusedBit_539_11_offset 1628 -#define unusedBit_539_12_offset 1628 -#define unusedBit_539_13_offset 1628 -#define unusedBit_539_14_offset 1628 -#define unusedBit_539_15_offset 1628 -#define unusedBit_539_16_offset 1628 -#define unusedBit_539_17_offset 1628 -#define unusedBit_539_18_offset 1628 -#define unusedBit_539_19_offset 1628 -#define unusedBit_539_20_offset 1628 -#define unusedBit_539_21_offset 1628 -#define unusedBit_539_22_offset 1628 -#define unusedBit_539_23_offset 1628 -#define unusedBit_539_24_offset 1628 -#define unusedBit_539_25_offset 1628 -#define unusedBit_539_26_offset 1628 -#define unusedBit_539_27_offset 1628 -#define unusedBit_539_28_offset 1628 -#define unusedBit_539_29_offset 1628 -#define unusedBit_539_30_offset 1628 -#define unusedBit_539_31_offset 1628 -#define unusedBit_539_8_offset 1628 -#define unusedBit_539_9_offset 1628 +#define unusedBit_541_10_offset 1628 +#define unusedBit_541_11_offset 1628 +#define unusedBit_541_12_offset 1628 +#define unusedBit_541_13_offset 1628 +#define unusedBit_541_14_offset 1628 +#define unusedBit_541_15_offset 1628 +#define unusedBit_541_16_offset 1628 +#define unusedBit_541_17_offset 1628 +#define unusedBit_541_18_offset 1628 +#define unusedBit_541_19_offset 1628 +#define unusedBit_541_20_offset 1628 +#define unusedBit_541_21_offset 1628 +#define unusedBit_541_22_offset 1628 +#define unusedBit_541_23_offset 1628 +#define unusedBit_541_24_offset 1628 +#define unusedBit_541_25_offset 1628 +#define unusedBit_541_26_offset 1628 +#define unusedBit_541_27_offset 1628 +#define unusedBit_541_28_offset 1628 +#define unusedBit_541_29_offset 1628 +#define unusedBit_541_30_offset 1628 +#define unusedBit_541_31_offset 1628 +#define unusedBit_541_8_offset 1628 +#define unusedBit_541_9_offset 1628 +#define unusedTrig_offset 752 +#define unusedTrigMode_offset 756 #define useAdvanceCorrectionsForCranking_offset 1372 #define useBiQuadOnAuxSpeedSensors_offset 1372 #define useCicPidForIdle_offset 120 diff --git a/firmware/controllers/generated/engine_configuration_generated_structures.h b/firmware/controllers/generated/engine_configuration_generated_structures.h index 1e80d7b765..b2603f1c7e 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 Wed Sep 28 02:22:58 UTC 2022 +// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Oct 03 15:06:35 UTC 2022 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -1617,10 +1617,18 @@ struct engine_configuration_s { * offset 748 */ Gpio triggerSimulatorPins[TRIGGER_SIMULATOR_PIN_COUNT]; + /** + * offset 752 + */ + uint16_t unusedTrig; /** * offset 754 */ pin_output_mode_e triggerSimulatorPinModes[TRIGGER_SIMULATOR_PIN_COUNT]; + /** + * offset 756 + */ + uint8_t unusedTrigMode; /** * need 4 byte alignment units @@ -3142,76 +3150,76 @@ struct engine_configuration_s { bool unused1130 : 1 {}; /** offset 1628 bit 8 */ - bool unusedBit_539_8 : 1 {}; + bool unusedBit_541_8 : 1 {}; /** offset 1628 bit 9 */ - bool unusedBit_539_9 : 1 {}; + bool unusedBit_541_9 : 1 {}; /** offset 1628 bit 10 */ - bool unusedBit_539_10 : 1 {}; + bool unusedBit_541_10 : 1 {}; /** offset 1628 bit 11 */ - bool unusedBit_539_11 : 1 {}; + bool unusedBit_541_11 : 1 {}; /** offset 1628 bit 12 */ - bool unusedBit_539_12 : 1 {}; + bool unusedBit_541_12 : 1 {}; /** offset 1628 bit 13 */ - bool unusedBit_539_13 : 1 {}; + bool unusedBit_541_13 : 1 {}; /** offset 1628 bit 14 */ - bool unusedBit_539_14 : 1 {}; + bool unusedBit_541_14 : 1 {}; /** offset 1628 bit 15 */ - bool unusedBit_539_15 : 1 {}; + bool unusedBit_541_15 : 1 {}; /** offset 1628 bit 16 */ - bool unusedBit_539_16 : 1 {}; + bool unusedBit_541_16 : 1 {}; /** offset 1628 bit 17 */ - bool unusedBit_539_17 : 1 {}; + bool unusedBit_541_17 : 1 {}; /** offset 1628 bit 18 */ - bool unusedBit_539_18 : 1 {}; + bool unusedBit_541_18 : 1 {}; /** offset 1628 bit 19 */ - bool unusedBit_539_19 : 1 {}; + bool unusedBit_541_19 : 1 {}; /** offset 1628 bit 20 */ - bool unusedBit_539_20 : 1 {}; + bool unusedBit_541_20 : 1 {}; /** offset 1628 bit 21 */ - bool unusedBit_539_21 : 1 {}; + bool unusedBit_541_21 : 1 {}; /** offset 1628 bit 22 */ - bool unusedBit_539_22 : 1 {}; + bool unusedBit_541_22 : 1 {}; /** offset 1628 bit 23 */ - bool unusedBit_539_23 : 1 {}; + bool unusedBit_541_23 : 1 {}; /** offset 1628 bit 24 */ - bool unusedBit_539_24 : 1 {}; + bool unusedBit_541_24 : 1 {}; /** offset 1628 bit 25 */ - bool unusedBit_539_25 : 1 {}; + bool unusedBit_541_25 : 1 {}; /** offset 1628 bit 26 */ - bool unusedBit_539_26 : 1 {}; + bool unusedBit_541_26 : 1 {}; /** offset 1628 bit 27 */ - bool unusedBit_539_27 : 1 {}; + bool unusedBit_541_27 : 1 {}; /** offset 1628 bit 28 */ - bool unusedBit_539_28 : 1 {}; + bool unusedBit_541_28 : 1 {}; /** offset 1628 bit 29 */ - bool unusedBit_539_29 : 1 {}; + bool unusedBit_541_29 : 1 {}; /** offset 1628 bit 30 */ - bool unusedBit_539_30 : 1 {}; + bool unusedBit_541_30 : 1 {}; /** offset 1628 bit 31 */ - bool unusedBit_539_31 : 1 {}; + bool unusedBit_541_31 : 1 {}; /** * Time between bench test pulses ms @@ -5049,4 +5057,4 @@ struct persistent_config_s { static_assert(sizeof(persistent_config_s) == 22048); // end -// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Sep 28 02:22:58 UTC 2022 +// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Oct 03 15:06:35 UTC 2022 diff --git a/firmware/controllers/generated/rusefi_generated.h b/firmware/controllers/generated/rusefi_generated.h index 0d62ad7eda..41dd8f5b78 100644 --- a/firmware/controllers/generated/rusefi_generated.h +++ b/firmware/controllers/generated/rusefi_generated.h @@ -1969,7 +1969,7 @@ #define show_Frankenso_presets true #define show_test_presets true #define showHumanReadableWarning_offset 960 -#define SIGNATURE_HASH 2717408623 +#define SIGNATURE_HASH 3054430189 #define silentTriggerError_offset 1360 #define skippedWheelOnCam_offset 1360 #define slowAdcAlpha_offset 1600 @@ -2267,7 +2267,7 @@ #define TRIGGER_IS_CRANK_KEY "crankBased" #define TRIGGER_IS_SECOND_WHEEL_CAM "isSecondWheelCam" #define trigger_offset 468 -#define TRIGGER_SIMULATOR_PIN_COUNT 3 +#define TRIGGER_SIMULATOR_PIN_COUNT 2 #define trigger_type_e_auto_enum 0="TT_TOOTHED_WHEEL",38="TT_12_TOOTH_CRANK",50="TT_1_16",29="TT_2JZ_1_12",25="TT_2JZ_3_34",70="TT_36_2_1",71="TT_36_2_1_1",23="TT_36_2_2_2",31="TT_3_1_CAM",20="TT_60_2_VW",30="TT_CHRYSLER_NGC_36_2_2",6="TT_DAIHATSU",2="TT_DODGE_NEON_1995",39="TT_DODGE_NEON_1995_ONLY_CRANK",14="TT_DODGE_NEON_2003_CAM",32="TT_DODGE_NEON_2003_CRANK",19="TT_DODGE_RAM",22="TT_DODGE_STRATUS",41="TT_FIAT_IAW_P8",1="TT_FORD_ASPIRE",42="TT_FORD_ST170",65="TT_FORD_TFI_PIP",27="TT_GM_24x",74="TT_GM_24x_2",54="TT_GM_60_2_2_2",5="TT_GM_7X",28="TT_HONDA_CBR_600",67="TT_HONDA_K_CAM_4_1",46="TT_HONDA_K_CRANK_12_1",37="TT_JEEP_18_2_2_2",40="TT_JEEP_4_CYL",57="TT_KAWA_KX450F",15="TT_MAZDA_DOHC_1_4",3="TT_MAZDA_MIATA_NA",4="TT_MAZDA_MIATA_NB1",35="TT_MAZDA_MIATA_VVT_TEST",7="TT_MAZDA_SOHC_4",10="TT_MERCEDES_2_SEGMENT",33="TT_MIATA_VVT",11="TT_MITSUBISHI",52="TT_NISSAN_MR18_CAM_VVT",68="TT_NISSAN_MR18_CRANK",61="TT_NISSAN_QR25",24="TT_NISSAN_SR20VE",60="TT_NISSAN_VQ30",58="TT_NISSAN_VQ35",18="TT_ONE",16="TT_ONE_PLUS_ONE",44="TT_RENIX_44_2_2",45="TT_RENIX_66_2_2_2",26="TT_ROVER_K",55="TT_SKODA_FAVORIT",36="TT_SUBARU_7_6",51="TT_SUBARU_7_WITHOUT_6",12="TT_SUBARU_EZ30",49="TT_SUBARU_SVX",64="TT_SUBARU_SVX_CAM_VVT",63="TT_SUBARU_SVX_CRANK_1",66="TT_SUZUKI_G13B",69="TT_TOOTHED_WHEEL_32_2",9="TT_TOOTHED_WHEEL_36_1",48="TT_TOOTHED_WHEEL_36_2",8="TT_TOOTHED_WHEEL_60_2",53="TT_TRI_TACH",75="TT_UNUSED",56="TT_VVT_BARRA_3_PLUS_1",47="TT_VVT_BOSCH_QUICK_START",17="TT_VVT_JZ",13="TT_VVT_MAZDA_SKYACTIV",43="TT_VVT_MIATA_NB",62="TT_VVT_MITSUBISHI_3A92",72="TT_VVT_MITSUBISHI_6G75",59="TT_VVT_NISSAN_VQ35",73="TT_VVT_TOYOTA_4_1",21="UNUSED_21",34="UNUSED_34" #define trigger_type_e_enum "custom toothed wheel", "Ford Aspire", "Dodge Neon 1995", "Miata NA", "INVALID", "GM_7X", "Cooper R50", "Mazda SOHC 4", "60/2", "36/1", "Mercedes Two Segment", "Mitsubishi 4G93", "EZ30", "INVALID", "Dodge Neon 2003", "Mazda DOHC 1+4", "1+1", "INVALID", "Single Tooth", "Dodge Ram 1+16", "60/2 VW", "INVALID", "Dodge Stratus", "36_2_2_2", "Nissan Primera", "dev 2JZ 3/34 simulator", "Rover K", "GM 24x 5 degree", "Honda CBR 600", "2JZ_1_12", "Honda CBR 600 custom", "3/1 skipped", "Dodge Neon 2003 crank", "Miata NB", "INVALID", "INVALID", "Subaru 7+6", "Jeep 18-2-2-2", "12 tooth crank", "Dodge Neon 1995 crank only", "Jeep XJ 4 cyl", "FiatIAQ_P8", "Mazda Z5", "INVALID", "Renix 44-2-2", "Renix 66-2-2-2", "Honda K 12+1", "INVALID", "36/2", "Subaru SVX", "1+16", "Subaru 7 without 6", "INVALID", "TriTach", "GM 60/2/2/2", "Skoda Favorit", "Barra 3+1 Cam", "Kawa KX450F", "Nissan VQ35", "INVALID", "Nissan VQ30", "Nissan QR25", "Mitsubishi 3A92", "Subaru SVX Crank 1", "Subaru SVX Cam VVT", "Ford PIP", "Suzuki G13B", "Honda K 4+1", "Nissan MR18 Crank", "32/2", "36-2-1", "36-2-1-1", "INVALID", "INVALID", "GM 24x 3 degree", "trg75" #define trigger_type_e_Force_4_bytes_size_trigger_type 70000 @@ -2400,10 +2400,8 @@ #define triggerSimulatorFrequency_offset 576 #define triggerSimulatorPinModes1_offset 754 #define triggerSimulatorPinModes2_offset 755 -#define triggerSimulatorPinModes3_offset 756 #define triggerSimulatorPins1_offset 748 #define triggerSimulatorPins2_offset 750 -#define triggerSimulatorPins3_offset 752 #define TriggerWheel_T_PRIMARY 0 #define TriggerWheel_T_SECONDARY 1 #define TRIM_SIZE 4 @@ -2526,7 +2524,7 @@ #define ts_show_vbatt true #define ts_show_vr_threshold_2 true #define ts_show_vr_threshold_all true -#define TS_SIGNATURE "rusEFI 2022.10.03.all.2717408623" +#define TS_SIGNATURE "rusEFI 2022.10.03.all.3054430189" #define TS_SINGLE_WRITE_COMMAND 'W' #define TS_SINGLE_WRITE_COMMAND_char W #define TS_TEST_COMMAND 't' @@ -2574,30 +2572,32 @@ #define unused_1484_bit_38_offset 1372 #define unusedAlteOnOff_offset 764 #define unusedBit_45_31_offset 120 -#define unusedBit_539_10_offset 1628 -#define unusedBit_539_11_offset 1628 -#define unusedBit_539_12_offset 1628 -#define unusedBit_539_13_offset 1628 -#define unusedBit_539_14_offset 1628 -#define unusedBit_539_15_offset 1628 -#define unusedBit_539_16_offset 1628 -#define unusedBit_539_17_offset 1628 -#define unusedBit_539_18_offset 1628 -#define unusedBit_539_19_offset 1628 -#define unusedBit_539_20_offset 1628 -#define unusedBit_539_21_offset 1628 -#define unusedBit_539_22_offset 1628 -#define unusedBit_539_23_offset 1628 -#define unusedBit_539_24_offset 1628 -#define unusedBit_539_25_offset 1628 -#define unusedBit_539_26_offset 1628 -#define unusedBit_539_27_offset 1628 -#define unusedBit_539_28_offset 1628 -#define unusedBit_539_29_offset 1628 -#define unusedBit_539_30_offset 1628 -#define unusedBit_539_31_offset 1628 -#define unusedBit_539_8_offset 1628 -#define unusedBit_539_9_offset 1628 +#define unusedBit_541_10_offset 1628 +#define unusedBit_541_11_offset 1628 +#define unusedBit_541_12_offset 1628 +#define unusedBit_541_13_offset 1628 +#define unusedBit_541_14_offset 1628 +#define unusedBit_541_15_offset 1628 +#define unusedBit_541_16_offset 1628 +#define unusedBit_541_17_offset 1628 +#define unusedBit_541_18_offset 1628 +#define unusedBit_541_19_offset 1628 +#define unusedBit_541_20_offset 1628 +#define unusedBit_541_21_offset 1628 +#define unusedBit_541_22_offset 1628 +#define unusedBit_541_23_offset 1628 +#define unusedBit_541_24_offset 1628 +#define unusedBit_541_25_offset 1628 +#define unusedBit_541_26_offset 1628 +#define unusedBit_541_27_offset 1628 +#define unusedBit_541_28_offset 1628 +#define unusedBit_541_29_offset 1628 +#define unusedBit_541_30_offset 1628 +#define unusedBit_541_31_offset 1628 +#define unusedBit_541_8_offset 1628 +#define unusedBit_541_9_offset 1628 +#define unusedTrig_offset 752 +#define unusedTrigMode_offset 756 #define useAdvanceCorrectionsForCranking_offset 1372 #define useBiQuadOnAuxSpeedSensors_offset 1372 #define useCicPidForIdle_offset 120 diff --git a/firmware/controllers/generated/signature_48way.h b/firmware/controllers/generated/signature_48way.h index ae0dde3e32..66a5ad23f0 100644 --- a/firmware/controllers/generated/signature_48way.h +++ b/firmware/controllers/generated/signature_48way.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 3068089632 -#define TS_SIGNATURE "rusEFI 2022.10.03.48way.3068089632" +#define SIGNATURE_HASH 2703880098 +#define TS_SIGNATURE "rusEFI 2022.10.03.48way.2703880098" diff --git a/firmware/controllers/generated/signature_all.h b/firmware/controllers/generated/signature_all.h index 2857176939..dd51fc2488 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 null // -#define SIGNATURE_HASH 2717408623 -#define TS_SIGNATURE "rusEFI 2022.10.03.all.2717408623" +#define SIGNATURE_HASH 3054430189 +#define TS_SIGNATURE "rusEFI 2022.10.03.all.3054430189" diff --git a/firmware/controllers/generated/signature_alphax-2chan.h b/firmware/controllers/generated/signature_alphax-2chan.h index 740af524a2..8700c7d5bf 100644 --- a/firmware/controllers/generated/signature_alphax-2chan.h +++ b/firmware/controllers/generated/signature_alphax-2chan.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 2481635331 -#define TS_SIGNATURE "rusEFI 2022.10.03.alphax-2chan.2481635331" +#define SIGNATURE_HASH 2216458881 +#define TS_SIGNATURE "rusEFI 2022.10.03.alphax-2chan.2216458881" diff --git a/firmware/controllers/generated/signature_alphax-4chan.h b/firmware/controllers/generated/signature_alphax-4chan.h index 9521e050ba..ab2d1c5b71 100644 --- a/firmware/controllers/generated/signature_alphax-4chan.h +++ b/firmware/controllers/generated/signature_alphax-4chan.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 719625952 -#define TS_SIGNATURE "rusEFI 2022.10.03.alphax-4chan.719625952" +#define SIGNATURE_HASH 1024599138 +#define TS_SIGNATURE "rusEFI 2022.10.03.alphax-4chan.1024599138" diff --git a/firmware/controllers/generated/signature_atlas.h b/firmware/controllers/generated/signature_atlas.h index 419d5a872c..6b59be436d 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 null // -#define SIGNATURE_HASH 3174213704 -#define TS_SIGNATURE "rusEFI 2022.10.03.atlas.3174213704" +#define SIGNATURE_HASH 2864976586 +#define TS_SIGNATURE "rusEFI 2022.10.03.atlas.2864976586" diff --git a/firmware/controllers/generated/signature_core8.h b/firmware/controllers/generated/signature_core8.h index a1795bb476..083b77c6c5 100644 --- a/firmware/controllers/generated/signature_core8.h +++ b/firmware/controllers/generated/signature_core8.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 1460931734 -#define TS_SIGNATURE "rusEFI 2022.10.03.core8.1460931734" +#define SIGNATURE_HASH 1088599572 +#define TS_SIGNATURE "rusEFI 2022.10.03.core8.1088599572" diff --git a/firmware/controllers/generated/signature_cypress.h b/firmware/controllers/generated/signature_cypress.h index 9393107d67..d7ff3a86e5 100644 --- a/firmware/controllers/generated/signature_cypress.h +++ b/firmware/controllers/generated/signature_cypress.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on hellen_cypress_gen_config.bat null // -#define SIGNATURE_HASH 2717408623 -#define TS_SIGNATURE "rusEFI 2022.10.03.cypress.2717408623" +#define SIGNATURE_HASH 3054430189 +#define TS_SIGNATURE "rusEFI 2022.10.03.cypress.3054430189" diff --git a/firmware/controllers/generated/signature_f407-discovery.h b/firmware/controllers/generated/signature_f407-discovery.h index d1f93c657d..38ddc11fe3 100644 --- a/firmware/controllers/generated/signature_f407-discovery.h +++ b/firmware/controllers/generated/signature_f407-discovery.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 2717408623 -#define TS_SIGNATURE "rusEFI 2022.10.03.f407-discovery.2717408623" +#define SIGNATURE_HASH 3054430189 +#define TS_SIGNATURE "rusEFI 2022.10.03.f407-discovery.3054430189" diff --git a/firmware/controllers/generated/signature_f429-discovery.h b/firmware/controllers/generated/signature_f429-discovery.h index f0f948f3c9..b507452566 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 null // -#define SIGNATURE_HASH 2717408623 -#define TS_SIGNATURE "rusEFI 2022.10.03.f429-discovery.2717408623" +#define SIGNATURE_HASH 3054430189 +#define TS_SIGNATURE "rusEFI 2022.10.03.f429-discovery.3054430189" diff --git a/firmware/controllers/generated/signature_frankenso_na6.h b/firmware/controllers/generated/signature_frankenso_na6.h index 1cffcdb8e3..9e0caf96dd 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 null // -#define SIGNATURE_HASH 3818168747 -#define TS_SIGNATURE "rusEFI 2022.10.03.frankenso_na6.3818168747" +#define SIGNATURE_HASH 4100070185 +#define TS_SIGNATURE "rusEFI 2022.10.03.frankenso_na6.4100070185" diff --git a/firmware/controllers/generated/signature_harley81.h b/firmware/controllers/generated/signature_harley81.h index ea79d554c2..5387cb75a7 100644 --- a/firmware/controllers/generated/signature_harley81.h +++ b/firmware/controllers/generated/signature_harley81.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 1359304768 -#define TS_SIGNATURE "rusEFI 2022.10.03.harley81.1359304768" +#define SIGNATURE_HASH 1190388418 +#define TS_SIGNATURE "rusEFI 2022.10.03.harley81.1190388418" diff --git a/firmware/controllers/generated/signature_hellen-gm-e67.h b/firmware/controllers/generated/signature_hellen-gm-e67.h index c29e555e5d..b9e43c7ac6 100644 --- a/firmware/controllers/generated/signature_hellen-gm-e67.h +++ b/firmware/controllers/generated/signature_hellen-gm-e67.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 362797273 -#define TS_SIGNATURE "rusEFI 2022.10.03.hellen-gm-e67.362797273" +#define SIGNATURE_HASH 40460891 +#define TS_SIGNATURE "rusEFI 2022.10.03.hellen-gm-e67.40460891" diff --git a/firmware/controllers/generated/signature_hellen-nb1.h b/firmware/controllers/generated/signature_hellen-nb1.h index a440dda645..2ff4f8d88d 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 null // -#define SIGNATURE_HASH 2020830371 -#define TS_SIGNATURE "rusEFI 2022.10.03.hellen-nb1.2020830371" +#define SIGNATURE_HASH 1871042081 +#define TS_SIGNATURE "rusEFI 2022.10.03.hellen-nb1.1871042081" diff --git a/firmware/controllers/generated/signature_hellen121nissan.h b/firmware/controllers/generated/signature_hellen121nissan.h index 000b156628..2775e7f235 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 null // -#define SIGNATURE_HASH 690414981 -#define TS_SIGNATURE "rusEFI 2022.10.03.hellen121nissan.690414981" +#define SIGNATURE_HASH 1053843207 +#define TS_SIGNATURE "rusEFI 2022.10.03.hellen121nissan.1053843207" diff --git a/firmware/controllers/generated/signature_hellen121vag.h b/firmware/controllers/generated/signature_hellen121vag.h index e9d763e276..df85022898 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 null // -#define SIGNATURE_HASH 3520699925 -#define TS_SIGNATURE "rusEFI 2022.10.03.hellen121vag.3520699925" +#define SIGNATURE_HASH 3324978327 +#define TS_SIGNATURE "rusEFI 2022.10.03.hellen121vag.3324978327" diff --git a/firmware/controllers/generated/signature_hellen128.h b/firmware/controllers/generated/signature_hellen128.h index b8cae1e626..91daaa8eed 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 null // -#define SIGNATURE_HASH 1594253393 -#define TS_SIGNATURE "rusEFI 2022.10.03.hellen128.1594253393" +#define SIGNATURE_HASH 1223744211 +#define TS_SIGNATURE "rusEFI 2022.10.03.hellen128.1223744211" diff --git a/firmware/controllers/generated/signature_hellen154hyundai.h b/firmware/controllers/generated/signature_hellen154hyundai.h index f4752844f6..80ae984122 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 null // -#define SIGNATURE_HASH 245049757 -#define TS_SIGNATURE "rusEFI 2022.10.03.hellen154hyundai.245049757" +#define SIGNATURE_HASH 426611487 +#define TS_SIGNATURE "rusEFI 2022.10.03.hellen154hyundai.426611487" diff --git a/firmware/controllers/generated/signature_hellen72.h b/firmware/controllers/generated/signature_hellen72.h index 1c7c6d4773..02c72c66a7 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 null // -#define SIGNATURE_HASH 1405580395 -#define TS_SIGNATURE "rusEFI 2022.10.03.hellen72.1405580395" +#define SIGNATURE_HASH 1144114921 +#define TS_SIGNATURE "rusEFI 2022.10.03.hellen72.1144114921" diff --git a/firmware/controllers/generated/signature_hellen81.h b/firmware/controllers/generated/signature_hellen81.h index 673a4d84d5..56e1783cdc 100644 --- a/firmware/controllers/generated/signature_hellen81.h +++ b/firmware/controllers/generated/signature_hellen81.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 2202895717 -#define TS_SIGNATURE "rusEFI 2022.10.03.hellen81.2202895717" +#define SIGNATURE_HASH 2495299559 +#define TS_SIGNATURE "rusEFI 2022.10.03.hellen81.2495299559" diff --git a/firmware/controllers/generated/signature_hellen88bmw.h b/firmware/controllers/generated/signature_hellen88bmw.h index b52931eb26..7d82b4d047 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 null // -#define SIGNATURE_HASH 3020770979 -#define TS_SIGNATURE "rusEFI 2022.10.03.hellen88bmw.3020770979" +#define SIGNATURE_HASH 2751198241 +#define TS_SIGNATURE "rusEFI 2022.10.03.hellen88bmw.2751198241" diff --git a/firmware/controllers/generated/signature_hellenNA6.h b/firmware/controllers/generated/signature_hellenNA6.h index 72226c50aa..545d930205 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 null // -#define SIGNATURE_HASH 4290047064 -#define TS_SIGNATURE "rusEFI 2022.10.03.hellenNA6.4290047064" +#define SIGNATURE_HASH 3896661722 +#define TS_SIGNATURE "rusEFI 2022.10.03.hellenNA6.3896661722" diff --git a/firmware/controllers/generated/signature_hellenNA8_96.h b/firmware/controllers/generated/signature_hellenNA8_96.h index d51b7366b5..9539a57056 100644 --- a/firmware/controllers/generated/signature_hellenNA8_96.h +++ b/firmware/controllers/generated/signature_hellenNA8_96.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 32631943 -#define TS_SIGNATURE "rusEFI 2022.10.03.hellenNA8_96.32631943" +#define SIGNATURE_HASH 369579525 +#define TS_SIGNATURE "rusEFI 2022.10.03.hellenNA8_96.369579525" diff --git a/firmware/controllers/generated/signature_kin.h b/firmware/controllers/generated/signature_kin.h index 656bbaa63d..d2d708576a 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 null // -#define SIGNATURE_HASH 3375366051 -#define TS_SIGNATURE "rusEFI 2022.10.03.kin.3375366051" +#define SIGNATURE_HASH 3738780961 +#define TS_SIGNATURE "rusEFI 2022.10.03.kin.3738780961" diff --git a/firmware/controllers/generated/signature_mre_f4.h b/firmware/controllers/generated/signature_mre_f4.h index f65fd134f4..ad26786a26 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 null // -#define SIGNATURE_HASH 4272599904 -#define TS_SIGNATURE "rusEFI 2022.10.03.mre_f4.4272599904" +#define SIGNATURE_HASH 3915123170 +#define TS_SIGNATURE "rusEFI 2022.10.03.mre_f4.3915123170" diff --git a/firmware/controllers/generated/signature_mre_f7.h b/firmware/controllers/generated/signature_mre_f7.h index e9ce1e4f02..4f27c7784a 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 null // -#define SIGNATURE_HASH 4272599904 -#define TS_SIGNATURE "rusEFI 2022.10.03.mre_f7.4272599904" +#define SIGNATURE_HASH 3915123170 +#define TS_SIGNATURE "rusEFI 2022.10.03.mre_f7.3915123170" diff --git a/firmware/controllers/generated/signature_prometheus_405.h b/firmware/controllers/generated/signature_prometheus_405.h index 360fc0872b..2d2a8c7929 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 null // -#define SIGNATURE_HASH 4044522633 -#define TS_SIGNATURE "rusEFI 2022.10.03.prometheus_405.4044522633" +#define SIGNATURE_HASH 3873717771 +#define TS_SIGNATURE "rusEFI 2022.10.03.prometheus_405.3873717771" diff --git a/firmware/controllers/generated/signature_prometheus_469.h b/firmware/controllers/generated/signature_prometheus_469.h index 36d31fb8e9..7ed2d20dff 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 null // -#define SIGNATURE_HASH 4044522633 -#define TS_SIGNATURE "rusEFI 2022.10.03.prometheus_469.4044522633" +#define SIGNATURE_HASH 3873717771 +#define TS_SIGNATURE "rusEFI 2022.10.03.prometheus_469.3873717771" diff --git a/firmware/controllers/generated/signature_proteus_f4.h b/firmware/controllers/generated/signature_proteus_f4.h index 8140782745..5271f51929 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 null // -#define SIGNATURE_HASH 70621721 -#define TS_SIGNATURE "rusEFI 2022.10.03.proteus_f4.70621721" +#define SIGNATURE_HASH 331554971 +#define TS_SIGNATURE "rusEFI 2022.10.03.proteus_f4.331554971" diff --git a/firmware/controllers/generated/signature_proteus_f7.h b/firmware/controllers/generated/signature_proteus_f7.h index b3302d17d8..932e8a97db 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 null // -#define SIGNATURE_HASH 70621721 -#define TS_SIGNATURE "rusEFI 2022.10.03.proteus_f7.70621721" +#define SIGNATURE_HASH 331554971 +#define TS_SIGNATURE "rusEFI 2022.10.03.proteus_f7.331554971" diff --git a/firmware/controllers/generated/signature_proteus_h7.h b/firmware/controllers/generated/signature_proteus_h7.h index 6f6988f7e3..8ad6a87ec6 100644 --- a/firmware/controllers/generated/signature_proteus_h7.h +++ b/firmware/controllers/generated/signature_proteus_h7.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 70621721 -#define TS_SIGNATURE "rusEFI 2022.10.03.proteus_h7.70621721" +#define SIGNATURE_HASH 331554971 +#define TS_SIGNATURE "rusEFI 2022.10.03.proteus_h7.331554971" diff --git a/firmware/controllers/generated/signature_subaru_eg33_f7.h b/firmware/controllers/generated/signature_subaru_eg33_f7.h index bbd8e6a081..9c27776fc3 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_subaru_config.sh null // -#define SIGNATURE_HASH 3638985909 -#define TS_SIGNATURE "rusEFI 2022.10.03.subaru_eg33_f7.3638985909" +#define SIGNATURE_HASH 3473948215 +#define TS_SIGNATURE "rusEFI 2022.10.03.subaru_eg33_f7.3473948215" diff --git a/firmware/controllers/generated/signature_tdg-pdm8.h b/firmware/controllers/generated/signature_tdg-pdm8.h index 76c63f9894..4ad0c573aa 100644 --- a/firmware/controllers/generated/signature_tdg-pdm8.h +++ b/firmware/controllers/generated/signature_tdg-pdm8.h @@ -2,5 +2,5 @@ // was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh null // -#define SIGNATURE_HASH 200315707 -#define TS_SIGNATURE "rusEFI 2022.10.03.tdg-pdm8.200315707" +#define SIGNATURE_HASH 470165945 +#define TS_SIGNATURE "rusEFI 2022.10.03.tdg-pdm8.470165945" diff --git a/firmware/tunerstudio/generated/rusefi.ini b/firmware/tunerstudio/generated/rusefi.ini index e623cc50b1..bd14aeb1fb 100644 --- a/firmware/tunerstudio/generated/rusefi.ini +++ b/firmware/tunerstudio/generated/rusefi.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.10.03.all.2717408623" + signature = "rusEFI 2022.10.03.all.3054430189" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.10.03.all.2717408623" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.10.03.all.3054430189" ; 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 @@ -86,7 +86,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Oct 03 04:24:52 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Oct 03 15:06:33 UTC 2022 pageSize = 22048 page = 1 @@ -336,10 +336,10 @@ tunerStudioSerialSpeed = scalar, U32, 740, "BPs", 1, 0, 0, 1000000, 0 compressionRatio = scalar, F32, 744, "CR", 1, 0, 0, 300, 1 triggerSimulatorPins1 = bits, U16, 748, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15" triggerSimulatorPins2 = bits, U16, 750, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15" -triggerSimulatorPins3 = bits, U16, 752, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15" +unusedTrig = scalar, U16, 752, "", 1, 0, 0, 100, 0 triggerSimulatorPinModes1 = bits, U08, 754, [0:1], "default", "default inverted", "open collector", "open collector inverted" triggerSimulatorPinModes2 = bits, U08, 755, [0:1], "default", "default inverted", "open collector", "open collector inverted" -triggerSimulatorPinModes3 = bits, U08, 756, [0:1], "default", "default inverted", "open collector", "open collector inverted" +unusedTrigMode = scalar, U08, 756, "", 1, 0, 0, 100, 0 o2heaterPin = bits, U16, 758, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15", "MC33972_1", "MC33972_2", "MC33972_3", "MC33972_4", "MC33972_5", "MC33972_6", "MC33972_7", "MC33972_8", "MC33972_9", "MC33972_10", "MC33972_11", "MC33972_12", "MC33972_13", "MC33972_14", "MC33972_15", "MC33972_16", "MC33972_17", "MC33972_18", "MC33972_19", "MC33972_20", "MC33972_21", "MC33972_22", "TLE8888_1", "TLE8888_2", "TLE8888_3", "TLE8888_4", "TLE8888_5", "TLE8888_6", "TLE8888_7", "TLE8888_8", "TLE8888_9", "TLE8888_10", "TLE8888_11", "TLE8888_12", "TLE8888_13", "TLE8888_14", "TLE8888_15", "TLE8888_16", "TLE8888_17", "TLE8888_18", "TLE8888_19", "TLE8888_20", "TLE8888_21", "TLE8888_22", "TLE8888_23", "TLE8888_24", "TLE8888_25", "TLE8888_26", "TLE8888_27", "TLE8888_28", "INVALID", "INVALID", "INVALID", "TLE6240_1", "TLE6240_2", "TLE6240_3", "TLE6240_4", "TLE6240_5", "TLE6240_6", "TLE6240_7", "TLE6240_8", "TLE6240_9", "TLE6240_10", "TLE6240_11", "TLE6240_12", "TLE6240_13", "TLE6240_14", "TLE6240_15", "TLE6240_16" o2heaterPinModeTodO = bits, U08, 760, [0:1], "default", "default inverted", "open collector", "open collector inverted" is_enabled_spi_1 = bits, U32, 764, [0:0], "false", "true" @@ -763,30 +763,30 @@ unused1127 = bits, U32, 1628, [4:4], "false", "true" unused1128 = bits, U32, 1628, [5:5], "false", "true" unused1129 = bits, U32, 1628, [6:6], "false", "true" unused1130 = bits, U32, 1628, [7:7], "false", "true" -unusedBit_539_8 = bits, U32, 1628, [8:8], "false", "true" -unusedBit_539_9 = bits, U32, 1628, [9:9], "false", "true" -unusedBit_539_10 = bits, U32, 1628, [10:10], "false", "true" -unusedBit_539_11 = bits, U32, 1628, [11:11], "false", "true" -unusedBit_539_12 = bits, U32, 1628, [12:12], "false", "true" -unusedBit_539_13 = bits, U32, 1628, [13:13], "false", "true" -unusedBit_539_14 = bits, U32, 1628, [14:14], "false", "true" -unusedBit_539_15 = bits, U32, 1628, [15:15], "false", "true" -unusedBit_539_16 = bits, U32, 1628, [16:16], "false", "true" -unusedBit_539_17 = bits, U32, 1628, [17:17], "false", "true" -unusedBit_539_18 = bits, U32, 1628, [18:18], "false", "true" -unusedBit_539_19 = bits, U32, 1628, [19:19], "false", "true" -unusedBit_539_20 = bits, U32, 1628, [20:20], "false", "true" -unusedBit_539_21 = bits, U32, 1628, [21:21], "false", "true" -unusedBit_539_22 = bits, U32, 1628, [22:22], "false", "true" -unusedBit_539_23 = bits, U32, 1628, [23:23], "false", "true" -unusedBit_539_24 = bits, U32, 1628, [24:24], "false", "true" -unusedBit_539_25 = bits, U32, 1628, [25:25], "false", "true" -unusedBit_539_26 = bits, U32, 1628, [26:26], "false", "true" -unusedBit_539_27 = bits, U32, 1628, [27:27], "false", "true" -unusedBit_539_28 = bits, U32, 1628, [28:28], "false", "true" -unusedBit_539_29 = bits, U32, 1628, [29:29], "false", "true" -unusedBit_539_30 = bits, U32, 1628, [30:30], "false", "true" -unusedBit_539_31 = bits, U32, 1628, [31:31], "false", "true" +unusedBit_541_8 = bits, U32, 1628, [8:8], "false", "true" +unusedBit_541_9 = bits, U32, 1628, [9:9], "false", "true" +unusedBit_541_10 = bits, U32, 1628, [10:10], "false", "true" +unusedBit_541_11 = bits, U32, 1628, [11:11], "false", "true" +unusedBit_541_12 = bits, U32, 1628, [12:12], "false", "true" +unusedBit_541_13 = bits, U32, 1628, [13:13], "false", "true" +unusedBit_541_14 = bits, U32, 1628, [14:14], "false", "true" +unusedBit_541_15 = bits, U32, 1628, [15:15], "false", "true" +unusedBit_541_16 = bits, U32, 1628, [16:16], "false", "true" +unusedBit_541_17 = bits, U32, 1628, [17:17], "false", "true" +unusedBit_541_18 = bits, U32, 1628, [18:18], "false", "true" +unusedBit_541_19 = bits, U32, 1628, [19:19], "false", "true" +unusedBit_541_20 = bits, U32, 1628, [20:20], "false", "true" +unusedBit_541_21 = bits, U32, 1628, [21:21], "false", "true" +unusedBit_541_22 = bits, U32, 1628, [22:22], "false", "true" +unusedBit_541_23 = bits, U32, 1628, [23:23], "false", "true" +unusedBit_541_24 = bits, U32, 1628, [24:24], "false", "true" +unusedBit_541_25 = bits, U32, 1628, [25:25], "false", "true" +unusedBit_541_26 = bits, U32, 1628, [26:26], "false", "true" +unusedBit_541_27 = bits, U32, 1628, [27:27], "false", "true" +unusedBit_541_28 = bits, U32, 1628, [28:28], "false", "true" +unusedBit_541_29 = bits, U32, 1628, [29:29], "false", "true" +unusedBit_541_30 = bits, U32, 1628, [30:30], "false", "true" +unusedBit_541_31 = bits, U32, 1628, [31:31], "false", "true" benchTestOffTime = scalar, U08, 1632, "ms", 5.0, 0, 0, 2000, 1 benchTestCount = scalar, U08, 1633, "count", 1, 0, 0, 250, 1 benchTestOnTime = scalar, U08, 1634, "ms", 5.0, 0, 0, 2000, 1 @@ -1555,10 +1555,8 @@ ignBlends4_blendValues = array, U08, 22038, [8], "%", 0.5, 0, 0, 100, 1 compressionRatio = "Just for reference really, not taken into account by any logic at this point" triggerSimulatorPins1 = "Each rusEFI piece can provide synthetic trigger signal for external ECU. Sometimes these wires are routed back into trigger inputs of the same rusEFI board." triggerSimulatorPins2 = "Each rusEFI piece can provide synthetic trigger signal for external ECU. Sometimes these wires are routed back into trigger inputs of the same rusEFI board." - triggerSimulatorPins3 = "Each rusEFI piece can provide synthetic trigger signal for external ECU. Sometimes these wires are routed back into trigger inputs of the same rusEFI board." triggerSimulatorPinModes1 = "triggerSimulatorPinModes 1" triggerSimulatorPinModes2 = "triggerSimulatorPinModes 2" - triggerSimulatorPinModes3 = "triggerSimulatorPinModes 3" o2heaterPin = "Narrow band o2 heater, not used for CJ125. 'ON' if engine is running, 'OFF' if stopped or cranking. See wboHeaterPin" isSdCardEnabled = "enable sd/disable sd" rusefiVerbose29b = "Use 11 bit (standard) or 29 bit (extended) IDs for rusEFI verbose CAN format." @@ -6471,7 +6469,6 @@ dialog = wideband_stateDialog, "wideband_state" dialog = allPins1_1 field = "trigger stimulator pin #1", triggerSimulatorPins1 field = "trigger stimulator pin #2", triggerSimulatorPins2 - field = "trigger stimulator pin #2", triggerSimulatorPins3 field = "Warning Led", warningLedPin field = "tle6240_cs", tle6240_cs field = "tle6240 SPI", tle6240spiDevice @@ -7826,8 +7823,6 @@ dialog = tcuControls, "Transmission Settings" field = "trigger stimulator pin mode #1", triggerSimulatorPinModes1 field = "trigger stimulator pin #2", triggerSimulatorPins2 field = "trigger stimulator pin mode #2", triggerSimulatorPinModes2 - field = "trigger stimulator pin #3", triggerSimulatorPins3 - field = "trigger stimulator pin mode #3", triggerSimulatorPinModes3 field = "" field = "Logic input channel 1", logicAnalyzerPins1 field = "Logic input channel 2", logicAnalyzerPins2 diff --git a/firmware/tunerstudio/generated/rusefi_48way.ini b/firmware/tunerstudio/generated/rusefi_48way.ini index 54ab1f051e..58f1cea47d 100644 --- a/firmware/tunerstudio/generated/rusefi_48way.ini +++ b/firmware/tunerstudio/generated/rusefi_48way.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.10.03.48way.3068089632" + signature = "rusEFI 2022.10.03.48way.2703880098" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.10.03.48way.3068089632" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.10.03.48way.2703880098" ; 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 @@ -86,7 +86,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Oct 03 04:24:29 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Oct 03 15:06:10 UTC 2022 pageSize = 22048 page = 1 @@ -336,10 +336,10 @@ tunerStudioSerialSpeed = scalar, U32, 740, "BPs", 1, 0, 0, 1000000, 0 compressionRatio = scalar, F32, 744, "CR", 1, 0, 0, 300, 1 triggerSimulatorPins1 = bits, U16, 748, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15" triggerSimulatorPins2 = bits, U16, 750, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15" -triggerSimulatorPins3 = bits, U16, 752, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15" +unusedTrig = scalar, U16, 752, "", 1, 0, 0, 100, 0 triggerSimulatorPinModes1 = bits, U08, 754, [0:1], "default", "default inverted", "open collector", "open collector inverted" triggerSimulatorPinModes2 = bits, U08, 755, [0:1], "default", "default inverted", "open collector", "open collector inverted" -triggerSimulatorPinModes3 = bits, U08, 756, [0:1], "default", "default inverted", "open collector", "open collector inverted" +unusedTrigMode = scalar, U08, 756, "", 1, 0, 0, 100, 0 o2heaterPin = bits, U16, 758, [0:7], 0="NONE",41="Boost Controller Output (C7)",68="Fan Relay (E2)",69="Fuel Relay (E3)",65="HC1 Output (D15)",64="HC2 Output (D14)",40="Idle1 Output (C6)",62="Ignition 1 Output (D12)",63="Ignition 2 Output (D13)",33="Ignition 3 Output (B15)",32="Ignition 4 Output (B14)",58="Ignition 5 Output (D8)",59="Ignition 6 Output (D9)",61="Ignition 7 Output (D11)",60="Ignition 8 Output (D10)",81="Injector 1 Output (E15)",80="Injector 2 Output (E14)",79="Injector 3 Output (E13)",78="Injector 4 Output (E12)",77="Injector 5 Output (E11)",76="Injector 6 Output (E10)",75="Injector 7 Output (E9)",74="Injector 8 Output (E8)",71="Tachometer (E5)" o2heaterPinModeTodO = bits, U08, 760, [0:1], "default", "default inverted", "open collector", "open collector inverted" is_enabled_spi_1 = bits, U32, 764, [0:0], "false", "true" @@ -763,30 +763,30 @@ unused1127 = bits, U32, 1628, [4:4], "false", "true" unused1128 = bits, U32, 1628, [5:5], "false", "true" unused1129 = bits, U32, 1628, [6:6], "false", "true" unused1130 = bits, U32, 1628, [7:7], "false", "true" -unusedBit_539_8 = bits, U32, 1628, [8:8], "false", "true" -unusedBit_539_9 = bits, U32, 1628, [9:9], "false", "true" -unusedBit_539_10 = bits, U32, 1628, [10:10], "false", "true" -unusedBit_539_11 = bits, U32, 1628, [11:11], "false", "true" -unusedBit_539_12 = bits, U32, 1628, [12:12], "false", "true" -unusedBit_539_13 = bits, U32, 1628, [13:13], "false", "true" -unusedBit_539_14 = bits, U32, 1628, [14:14], "false", "true" -unusedBit_539_15 = bits, U32, 1628, [15:15], "false", "true" -unusedBit_539_16 = bits, U32, 1628, [16:16], "false", "true" -unusedBit_539_17 = bits, U32, 1628, [17:17], "false", "true" -unusedBit_539_18 = bits, U32, 1628, [18:18], "false", "true" -unusedBit_539_19 = bits, U32, 1628, [19:19], "false", "true" -unusedBit_539_20 = bits, U32, 1628, [20:20], "false", "true" -unusedBit_539_21 = bits, U32, 1628, [21:21], "false", "true" -unusedBit_539_22 = bits, U32, 1628, [22:22], "false", "true" -unusedBit_539_23 = bits, U32, 1628, [23:23], "false", "true" -unusedBit_539_24 = bits, U32, 1628, [24:24], "false", "true" -unusedBit_539_25 = bits, U32, 1628, [25:25], "false", "true" -unusedBit_539_26 = bits, U32, 1628, [26:26], "false", "true" -unusedBit_539_27 = bits, U32, 1628, [27:27], "false", "true" -unusedBit_539_28 = bits, U32, 1628, [28:28], "false", "true" -unusedBit_539_29 = bits, U32, 1628, [29:29], "false", "true" -unusedBit_539_30 = bits, U32, 1628, [30:30], "false", "true" -unusedBit_539_31 = bits, U32, 1628, [31:31], "false", "true" +unusedBit_541_8 = bits, U32, 1628, [8:8], "false", "true" +unusedBit_541_9 = bits, U32, 1628, [9:9], "false", "true" +unusedBit_541_10 = bits, U32, 1628, [10:10], "false", "true" +unusedBit_541_11 = bits, U32, 1628, [11:11], "false", "true" +unusedBit_541_12 = bits, U32, 1628, [12:12], "false", "true" +unusedBit_541_13 = bits, U32, 1628, [13:13], "false", "true" +unusedBit_541_14 = bits, U32, 1628, [14:14], "false", "true" +unusedBit_541_15 = bits, U32, 1628, [15:15], "false", "true" +unusedBit_541_16 = bits, U32, 1628, [16:16], "false", "true" +unusedBit_541_17 = bits, U32, 1628, [17:17], "false", "true" +unusedBit_541_18 = bits, U32, 1628, [18:18], "false", "true" +unusedBit_541_19 = bits, U32, 1628, [19:19], "false", "true" +unusedBit_541_20 = bits, U32, 1628, [20:20], "false", "true" +unusedBit_541_21 = bits, U32, 1628, [21:21], "false", "true" +unusedBit_541_22 = bits, U32, 1628, [22:22], "false", "true" +unusedBit_541_23 = bits, U32, 1628, [23:23], "false", "true" +unusedBit_541_24 = bits, U32, 1628, [24:24], "false", "true" +unusedBit_541_25 = bits, U32, 1628, [25:25], "false", "true" +unusedBit_541_26 = bits, U32, 1628, [26:26], "false", "true" +unusedBit_541_27 = bits, U32, 1628, [27:27], "false", "true" +unusedBit_541_28 = bits, U32, 1628, [28:28], "false", "true" +unusedBit_541_29 = bits, U32, 1628, [29:29], "false", "true" +unusedBit_541_30 = bits, U32, 1628, [30:30], "false", "true" +unusedBit_541_31 = bits, U32, 1628, [31:31], "false", "true" benchTestOffTime = scalar, U08, 1632, "ms", 5.0, 0, 0, 2000, 1 benchTestCount = scalar, U08, 1633, "count", 1, 0, 0, 250, 1 benchTestOnTime = scalar, U08, 1634, "ms", 5.0, 0, 0, 2000, 1 @@ -1555,10 +1555,8 @@ ignBlends4_blendValues = array, U08, 22038, [8], "%", 0.5, 0, 0, 100, 1 compressionRatio = "Just for reference really, not taken into account by any logic at this point" triggerSimulatorPins1 = "Each rusEFI piece can provide synthetic trigger signal for external ECU. Sometimes these wires are routed back into trigger inputs of the same rusEFI board." triggerSimulatorPins2 = "Each rusEFI piece can provide synthetic trigger signal for external ECU. Sometimes these wires are routed back into trigger inputs of the same rusEFI board." - triggerSimulatorPins3 = "Each rusEFI piece can provide synthetic trigger signal for external ECU. Sometimes these wires are routed back into trigger inputs of the same rusEFI board." triggerSimulatorPinModes1 = "triggerSimulatorPinModes 1" triggerSimulatorPinModes2 = "triggerSimulatorPinModes 2" - triggerSimulatorPinModes3 = "triggerSimulatorPinModes 3" o2heaterPin = "Narrow band o2 heater, not used for CJ125. 'ON' if engine is running, 'OFF' if stopped or cranking. See wboHeaterPin" isSdCardEnabled = "enable sd/disable sd" rusefiVerbose29b = "Use 11 bit (standard) or 29 bit (extended) IDs for rusEFI verbose CAN format." @@ -6469,7 +6467,6 @@ dialog = wideband_stateDialog, "wideband_state" dialog = allPins1_1 field = "trigger stimulator pin #1", triggerSimulatorPins1 field = "trigger stimulator pin #2", triggerSimulatorPins2 - field = "trigger stimulator pin #2", triggerSimulatorPins3 field = "Warning Led", warningLedPin field = "tle6240_cs", tle6240_cs field = "tle6240 SPI", tle6240spiDevice @@ -7818,8 +7815,6 @@ dialog = tcuControls, "Transmission Settings" field = "trigger stimulator pin mode #1", triggerSimulatorPinModes1 field = "trigger stimulator pin #2", triggerSimulatorPins2 field = "trigger stimulator pin mode #2", triggerSimulatorPinModes2 - field = "trigger stimulator pin #3", triggerSimulatorPins3 - field = "trigger stimulator pin mode #3", triggerSimulatorPinModes3 field = "" field = "Logic input channel 1", logicAnalyzerPins1 field = "Logic input channel 2", logicAnalyzerPins2 diff --git a/firmware/tunerstudio/generated/rusefi_alphax-2chan.ini b/firmware/tunerstudio/generated/rusefi_alphax-2chan.ini index 45bba29b0f..778a031cbb 100644 --- a/firmware/tunerstudio/generated/rusefi_alphax-2chan.ini +++ b/firmware/tunerstudio/generated/rusefi_alphax-2chan.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.10.03.alphax-2chan.2481635331" + signature = "rusEFI 2022.10.03.alphax-2chan.2216458881" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.10.03.alphax-2chan.2481635331" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.10.03.alphax-2chan.2216458881" ; 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 @@ -86,7 +86,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Oct 03 04:23:54 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Oct 03 15:05:36 UTC 2022 pageSize = 22048 page = 1 @@ -336,10 +336,10 @@ tunerStudioSerialSpeed = scalar, U32, 740, "BPs", 1, 0, 0, 1000000, 0 compressionRatio = scalar, F32, 744, "CR", 1, 0, 0, 300, 1 triggerSimulatorPins1 = bits, U16, 748, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15" triggerSimulatorPins2 = bits, U16, 750, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15" -triggerSimulatorPins3 = bits, U16, 752, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15" +unusedTrig = scalar, U16, 752, "", 1, 0, 0, 100, 0 triggerSimulatorPinModes1 = bits, U08, 754, [0:1], "default", "default inverted", "open collector", "open collector inverted" triggerSimulatorPinModes2 = bits, U08, 755, [0:1], "default", "default inverted", "open collector", "open collector inverted" -triggerSimulatorPinModes3 = bits, U08, 756, [0:1], "default", "default inverted", "open collector", "open collector inverted" +unusedTrigMode = scalar, U08, 756, "", 1, 0, 0, 100, 0 o2heaterPin = bits, U16, 758, [0:7], 0="NONE",40="A3 - Fuel Pump",41="A4 - Tachometer",47="A6 - Ignition A",71="A7 - Ignition B",105="A8 - Injector A",106="B8 - Injector B",42="C1 - Fan Relay",63="C8 - Idle" o2heaterPinModeTodO = bits, U08, 760, [0:1], "default", "default inverted", "open collector", "open collector inverted" is_enabled_spi_1 = bits, U32, 764, [0:0], "false", "true" @@ -763,30 +763,30 @@ unused1127 = bits, U32, 1628, [4:4], "false", "true" unused1128 = bits, U32, 1628, [5:5], "false", "true" unused1129 = bits, U32, 1628, [6:6], "false", "true" unused1130 = bits, U32, 1628, [7:7], "false", "true" -unusedBit_539_8 = bits, U32, 1628, [8:8], "false", "true" -unusedBit_539_9 = bits, U32, 1628, [9:9], "false", "true" -unusedBit_539_10 = bits, U32, 1628, [10:10], "false", "true" -unusedBit_539_11 = bits, U32, 1628, [11:11], "false", "true" -unusedBit_539_12 = bits, U32, 1628, [12:12], "false", "true" -unusedBit_539_13 = bits, U32, 1628, [13:13], "false", "true" -unusedBit_539_14 = bits, U32, 1628, [14:14], "false", "true" -unusedBit_539_15 = bits, U32, 1628, [15:15], "false", "true" -unusedBit_539_16 = bits, U32, 1628, [16:16], "false", "true" -unusedBit_539_17 = bits, U32, 1628, [17:17], "false", "true" -unusedBit_539_18 = bits, U32, 1628, [18:18], "false", "true" -unusedBit_539_19 = bits, U32, 1628, [19:19], "false", "true" -unusedBit_539_20 = bits, U32, 1628, [20:20], "false", "true" -unusedBit_539_21 = bits, U32, 1628, [21:21], "false", "true" -unusedBit_539_22 = bits, U32, 1628, [22:22], "false", "true" -unusedBit_539_23 = bits, U32, 1628, [23:23], "false", "true" -unusedBit_539_24 = bits, U32, 1628, [24:24], "false", "true" -unusedBit_539_25 = bits, U32, 1628, [25:25], "false", "true" -unusedBit_539_26 = bits, U32, 1628, [26:26], "false", "true" -unusedBit_539_27 = bits, U32, 1628, [27:27], "false", "true" -unusedBit_539_28 = bits, U32, 1628, [28:28], "false", "true" -unusedBit_539_29 = bits, U32, 1628, [29:29], "false", "true" -unusedBit_539_30 = bits, U32, 1628, [30:30], "false", "true" -unusedBit_539_31 = bits, U32, 1628, [31:31], "false", "true" +unusedBit_541_8 = bits, U32, 1628, [8:8], "false", "true" +unusedBit_541_9 = bits, U32, 1628, [9:9], "false", "true" +unusedBit_541_10 = bits, U32, 1628, [10:10], "false", "true" +unusedBit_541_11 = bits, U32, 1628, [11:11], "false", "true" +unusedBit_541_12 = bits, U32, 1628, [12:12], "false", "true" +unusedBit_541_13 = bits, U32, 1628, [13:13], "false", "true" +unusedBit_541_14 = bits, U32, 1628, [14:14], "false", "true" +unusedBit_541_15 = bits, U32, 1628, [15:15], "false", "true" +unusedBit_541_16 = bits, U32, 1628, [16:16], "false", "true" +unusedBit_541_17 = bits, U32, 1628, [17:17], "false", "true" +unusedBit_541_18 = bits, U32, 1628, [18:18], "false", "true" +unusedBit_541_19 = bits, U32, 1628, [19:19], "false", "true" +unusedBit_541_20 = bits, U32, 1628, [20:20], "false", "true" +unusedBit_541_21 = bits, U32, 1628, [21:21], "false", "true" +unusedBit_541_22 = bits, U32, 1628, [22:22], "false", "true" +unusedBit_541_23 = bits, U32, 1628, [23:23], "false", "true" +unusedBit_541_24 = bits, U32, 1628, [24:24], "false", "true" +unusedBit_541_25 = bits, U32, 1628, [25:25], "false", "true" +unusedBit_541_26 = bits, U32, 1628, [26:26], "false", "true" +unusedBit_541_27 = bits, U32, 1628, [27:27], "false", "true" +unusedBit_541_28 = bits, U32, 1628, [28:28], "false", "true" +unusedBit_541_29 = bits, U32, 1628, [29:29], "false", "true" +unusedBit_541_30 = bits, U32, 1628, [30:30], "false", "true" +unusedBit_541_31 = bits, U32, 1628, [31:31], "false", "true" benchTestOffTime = scalar, U08, 1632, "ms", 5.0, 0, 0, 2000, 1 benchTestCount = scalar, U08, 1633, "count", 1, 0, 0, 250, 1 benchTestOnTime = scalar, U08, 1634, "ms", 5.0, 0, 0, 2000, 1 @@ -1555,10 +1555,8 @@ ignBlends4_blendValues = array, U08, 22038, [8], "%", 0.5, 0, 0, 100, 1 compressionRatio = "Just for reference really, not taken into account by any logic at this point" triggerSimulatorPins1 = "Each rusEFI piece can provide synthetic trigger signal for external ECU. Sometimes these wires are routed back into trigger inputs of the same rusEFI board." triggerSimulatorPins2 = "Each rusEFI piece can provide synthetic trigger signal for external ECU. Sometimes these wires are routed back into trigger inputs of the same rusEFI board." - triggerSimulatorPins3 = "Each rusEFI piece can provide synthetic trigger signal for external ECU. Sometimes these wires are routed back into trigger inputs of the same rusEFI board." triggerSimulatorPinModes1 = "triggerSimulatorPinModes 1" triggerSimulatorPinModes2 = "triggerSimulatorPinModes 2" - triggerSimulatorPinModes3 = "triggerSimulatorPinModes 3" o2heaterPin = "Narrow band o2 heater, not used for CJ125. 'ON' if engine is running, 'OFF' if stopped or cranking. See wboHeaterPin" isSdCardEnabled = "enable sd/disable sd" rusefiVerbose29b = "Use 11 bit (standard) or 29 bit (extended) IDs for rusEFI verbose CAN format." @@ -6465,7 +6463,6 @@ dialog = wideband_stateDialog, "wideband_state" dialog = allPins1_1 field = "trigger stimulator pin #1", triggerSimulatorPins1 field = "trigger stimulator pin #2", triggerSimulatorPins2 - field = "trigger stimulator pin #2", triggerSimulatorPins3 field = "Warning Led", warningLedPin field = "tle6240_cs", tle6240_cs field = "tle6240 SPI", tle6240spiDevice diff --git a/firmware/tunerstudio/generated/rusefi_alphax-4chan.ini b/firmware/tunerstudio/generated/rusefi_alphax-4chan.ini index ab2d8feccd..8e81364842 100644 --- a/firmware/tunerstudio/generated/rusefi_alphax-4chan.ini +++ b/firmware/tunerstudio/generated/rusefi_alphax-4chan.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.10.03.alphax-4chan.719625952" + signature = "rusEFI 2022.10.03.alphax-4chan.1024599138" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.10.03.alphax-4chan.719625952" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.10.03.alphax-4chan.1024599138" ; 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 @@ -86,7 +86,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Oct 03 04:23:56 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Oct 03 15:05:38 UTC 2022 pageSize = 22048 page = 1 @@ -336,10 +336,10 @@ tunerStudioSerialSpeed = scalar, U32, 740, "BPs", 1, 0, 0, 1000000, 0 compressionRatio = scalar, F32, 744, "CR", 1, 0, 0, 300, 1 triggerSimulatorPins1 = bits, U16, 748, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15" triggerSimulatorPins2 = bits, U16, 750, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15" -triggerSimulatorPins3 = bits, U16, 752, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15" +unusedTrig = scalar, U16, 752, "", 1, 0, 0, 100, 0 triggerSimulatorPinModes1 = bits, U08, 754, [0:1], "default", "default inverted", "open collector", "open collector inverted" triggerSimulatorPinModes2 = bits, U08, 755, [0:1], "default", "default inverted", "open collector", "open collector inverted" -triggerSimulatorPinModes3 = bits, U08, 756, [0:1], "default", "default inverted", "open collector", "open collector inverted" +unusedTrigMode = scalar, U08, 756, "", 1, 0, 0, 100, 0 o2heaterPin = bits, U16, 758, [0:7], 0="NONE",10="A3 - Fuel Pump",104="A4 - Tachometer",47="A6 - Ignition 1",71="A7 - Ignition 2",105="A8 - Injector 1",106="B8 - Injector 2",100="C1 - Fan Relay",63="C8 - Idle",61="D1 - Injector 3",41="D2 - Out Boost",70="D6 - Ignition 3",69="D7 - Ignition 4",60="E1 - Injector 4",109="E2 - Out NOS",43="F1 - Idle2",65="F2 - VVT#1",62="F4 - VVT#2",110="F5 - MAIN" o2heaterPinModeTodO = bits, U08, 760, [0:1], "default", "default inverted", "open collector", "open collector inverted" is_enabled_spi_1 = bits, U32, 764, [0:0], "false", "true" @@ -763,30 +763,30 @@ unused1127 = bits, U32, 1628, [4:4], "false", "true" unused1128 = bits, U32, 1628, [5:5], "false", "true" unused1129 = bits, U32, 1628, [6:6], "false", "true" unused1130 = bits, U32, 1628, [7:7], "false", "true" -unusedBit_539_8 = bits, U32, 1628, [8:8], "false", "true" -unusedBit_539_9 = bits, U32, 1628, [9:9], "false", "true" -unusedBit_539_10 = bits, U32, 1628, [10:10], "false", "true" -unusedBit_539_11 = bits, U32, 1628, [11:11], "false", "true" -unusedBit_539_12 = bits, U32, 1628, [12:12], "false", "true" -unusedBit_539_13 = bits, U32, 1628, [13:13], "false", "true" -unusedBit_539_14 = bits, U32, 1628, [14:14], "false", "true" -unusedBit_539_15 = bits, U32, 1628, [15:15], "false", "true" -unusedBit_539_16 = bits, U32, 1628, [16:16], "false", "true" -unusedBit_539_17 = bits, U32, 1628, [17:17], "false", "true" -unusedBit_539_18 = bits, U32, 1628, [18:18], "false", "true" -unusedBit_539_19 = bits, U32, 1628, [19:19], "false", "true" -unusedBit_539_20 = bits, U32, 1628, [20:20], "false", "true" -unusedBit_539_21 = bits, U32, 1628, [21:21], "false", "true" -unusedBit_539_22 = bits, U32, 1628, [22:22], "false", "true" -unusedBit_539_23 = bits, U32, 1628, [23:23], "false", "true" -unusedBit_539_24 = bits, U32, 1628, [24:24], "false", "true" -unusedBit_539_25 = bits, U32, 1628, [25:25], "false", "true" -unusedBit_539_26 = bits, U32, 1628, [26:26], "false", "true" -unusedBit_539_27 = bits, U32, 1628, [27:27], "false", "true" -unusedBit_539_28 = bits, U32, 1628, [28:28], "false", "true" -unusedBit_539_29 = bits, U32, 1628, [29:29], "false", "true" -unusedBit_539_30 = bits, U32, 1628, [30:30], "false", "true" -unusedBit_539_31 = bits, U32, 1628, [31:31], "false", "true" +unusedBit_541_8 = bits, U32, 1628, [8:8], "false", "true" +unusedBit_541_9 = bits, U32, 1628, [9:9], "false", "true" +unusedBit_541_10 = bits, U32, 1628, [10:10], "false", "true" +unusedBit_541_11 = bits, U32, 1628, [11:11], "false", "true" +unusedBit_541_12 = bits, U32, 1628, [12:12], "false", "true" +unusedBit_541_13 = bits, U32, 1628, [13:13], "false", "true" +unusedBit_541_14 = bits, U32, 1628, [14:14], "false", "true" +unusedBit_541_15 = bits, U32, 1628, [15:15], "false", "true" +unusedBit_541_16 = bits, U32, 1628, [16:16], "false", "true" +unusedBit_541_17 = bits, U32, 1628, [17:17], "false", "true" +unusedBit_541_18 = bits, U32, 1628, [18:18], "false", "true" +unusedBit_541_19 = bits, U32, 1628, [19:19], "false", "true" +unusedBit_541_20 = bits, U32, 1628, [20:20], "false", "true" +unusedBit_541_21 = bits, U32, 1628, [21:21], "false", "true" +unusedBit_541_22 = bits, U32, 1628, [22:22], "false", "true" +unusedBit_541_23 = bits, U32, 1628, [23:23], "false", "true" +unusedBit_541_24 = bits, U32, 1628, [24:24], "false", "true" +unusedBit_541_25 = bits, U32, 1628, [25:25], "false", "true" +unusedBit_541_26 = bits, U32, 1628, [26:26], "false", "true" +unusedBit_541_27 = bits, U32, 1628, [27:27], "false", "true" +unusedBit_541_28 = bits, U32, 1628, [28:28], "false", "true" +unusedBit_541_29 = bits, U32, 1628, [29:29], "false", "true" +unusedBit_541_30 = bits, U32, 1628, [30:30], "false", "true" +unusedBit_541_31 = bits, U32, 1628, [31:31], "false", "true" benchTestOffTime = scalar, U08, 1632, "ms", 5.0, 0, 0, 2000, 1 benchTestCount = scalar, U08, 1633, "count", 1, 0, 0, 250, 1 benchTestOnTime = scalar, U08, 1634, "ms", 5.0, 0, 0, 2000, 1 @@ -1555,10 +1555,8 @@ ignBlends4_blendValues = array, U08, 22038, [8], "%", 0.5, 0, 0, 100, 1 compressionRatio = "Just for reference really, not taken into account by any logic at this point" triggerSimulatorPins1 = "Each rusEFI piece can provide synthetic trigger signal for external ECU. Sometimes these wires are routed back into trigger inputs of the same rusEFI board." triggerSimulatorPins2 = "Each rusEFI piece can provide synthetic trigger signal for external ECU. Sometimes these wires are routed back into trigger inputs of the same rusEFI board." - triggerSimulatorPins3 = "Each rusEFI piece can provide synthetic trigger signal for external ECU. Sometimes these wires are routed back into trigger inputs of the same rusEFI board." triggerSimulatorPinModes1 = "triggerSimulatorPinModes 1" triggerSimulatorPinModes2 = "triggerSimulatorPinModes 2" - triggerSimulatorPinModes3 = "triggerSimulatorPinModes 3" o2heaterPin = "Narrow band o2 heater, not used for CJ125. 'ON' if engine is running, 'OFF' if stopped or cranking. See wboHeaterPin" isSdCardEnabled = "enable sd/disable sd" rusefiVerbose29b = "Use 11 bit (standard) or 29 bit (extended) IDs for rusEFI verbose CAN format." @@ -6468,7 +6466,6 @@ dialog = wideband_stateDialog, "wideband_state" dialog = allPins1_1 field = "trigger stimulator pin #1", triggerSimulatorPins1 field = "trigger stimulator pin #2", triggerSimulatorPins2 - field = "trigger stimulator pin #2", triggerSimulatorPins3 field = "Warning Led", warningLedPin field = "tle6240_cs", tle6240_cs field = "tle6240 SPI", tle6240spiDevice diff --git a/firmware/tunerstudio/generated/rusefi_atlas.ini b/firmware/tunerstudio/generated/rusefi_atlas.ini index 7ab2084715..e47e6a311d 100644 --- a/firmware/tunerstudio/generated/rusefi_atlas.ini +++ b/firmware/tunerstudio/generated/rusefi_atlas.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.10.03.atlas.3174213704" + signature = "rusEFI 2022.10.03.atlas.2864976586" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.10.03.atlas.3174213704" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.10.03.atlas.2864976586" ; 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 @@ -86,7 +86,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Oct 03 04:24:48 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Oct 03 15:06:29 UTC 2022 pageSize = 22048 page = 1 @@ -336,10 +336,10 @@ tunerStudioSerialSpeed = scalar, U32, 740, "BPs", 1, 0, 0, 1000000, 0 compressionRatio = scalar, F32, 744, "CR", 1, 0, 0, 300, 1 triggerSimulatorPins1 = bits, U16, 748, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15" triggerSimulatorPins2 = bits, U16, 750, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15" -triggerSimulatorPins3 = bits, U16, 752, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15" +unusedTrig = scalar, U16, 752, "", 1, 0, 0, 100, 0 triggerSimulatorPinModes1 = bits, U08, 754, [0:1], "default", "default inverted", "open collector", "open collector inverted" triggerSimulatorPinModes2 = bits, U08, 755, [0:1], "default", "default inverted", "open collector", "open collector inverted" -triggerSimulatorPinModes3 = bits, U08, 756, [0:1], "default", "default inverted", "open collector", "open collector inverted" +unusedTrigMode = scalar, U08, 756, "", 1, 0, 0, 100, 0 o2heaterPin = bits, U16, 758, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15", "MC33972_1", "MC33972_2", "MC33972_3", "MC33972_4", "MC33972_5", "MC33972_6", "MC33972_7", "MC33972_8", "MC33972_9", "MC33972_10", "MC33972_11", "MC33972_12", "MC33972_13", "MC33972_14", "MC33972_15", "MC33972_16", "MC33972_17", "MC33972_18", "MC33972_19", "MC33972_20", "MC33972_21", "MC33972_22", "TLE8888_1", "TLE8888_2", "TLE8888_3", "TLE8888_4", "TLE8888_5", "TLE8888_6", "TLE8888_7", "TLE8888_8", "TLE8888_9", "TLE8888_10", "TLE8888_11", "TLE8888_12", "TLE8888_13", "TLE8888_14", "TLE8888_15", "TLE8888_16", "TLE8888_17", "TLE8888_18", "TLE8888_19", "TLE8888_20", "TLE8888_21", "TLE8888_22", "TLE8888_23", "TLE8888_24", "TLE8888_25", "TLE8888_26", "TLE8888_27", "TLE8888_28", "INVALID", "INVALID", "INVALID", "TLE6240_1", "TLE6240_2", "TLE6240_3", "TLE6240_4", "TLE6240_5", "TLE6240_6", "TLE6240_7", "TLE6240_8", "TLE6240_9", "TLE6240_10", "TLE6240_11", "TLE6240_12", "TLE6240_13", "TLE6240_14", "TLE6240_15", "TLE6240_16" o2heaterPinModeTodO = bits, U08, 760, [0:1], "default", "default inverted", "open collector", "open collector inverted" is_enabled_spi_1 = bits, U32, 764, [0:0], "false", "true" @@ -763,30 +763,30 @@ unused1127 = bits, U32, 1628, [4:4], "false", "true" unused1128 = bits, U32, 1628, [5:5], "false", "true" unused1129 = bits, U32, 1628, [6:6], "false", "true" unused1130 = bits, U32, 1628, [7:7], "false", "true" -unusedBit_539_8 = bits, U32, 1628, [8:8], "false", "true" -unusedBit_539_9 = bits, U32, 1628, [9:9], "false", "true" -unusedBit_539_10 = bits, U32, 1628, [10:10], "false", "true" -unusedBit_539_11 = bits, U32, 1628, [11:11], "false", "true" -unusedBit_539_12 = bits, U32, 1628, [12:12], "false", "true" -unusedBit_539_13 = bits, U32, 1628, [13:13], "false", "true" -unusedBit_539_14 = bits, U32, 1628, [14:14], "false", "true" -unusedBit_539_15 = bits, U32, 1628, [15:15], "false", "true" -unusedBit_539_16 = bits, U32, 1628, [16:16], "false", "true" -unusedBit_539_17 = bits, U32, 1628, [17:17], "false", "true" -unusedBit_539_18 = bits, U32, 1628, [18:18], "false", "true" -unusedBit_539_19 = bits, U32, 1628, [19:19], "false", "true" -unusedBit_539_20 = bits, U32, 1628, [20:20], "false", "true" -unusedBit_539_21 = bits, U32, 1628, [21:21], "false", "true" -unusedBit_539_22 = bits, U32, 1628, [22:22], "false", "true" -unusedBit_539_23 = bits, U32, 1628, [23:23], "false", "true" -unusedBit_539_24 = bits, U32, 1628, [24:24], "false", "true" -unusedBit_539_25 = bits, U32, 1628, [25:25], "false", "true" -unusedBit_539_26 = bits, U32, 1628, [26:26], "false", "true" -unusedBit_539_27 = bits, U32, 1628, [27:27], "false", "true" -unusedBit_539_28 = bits, U32, 1628, [28:28], "false", "true" -unusedBit_539_29 = bits, U32, 1628, [29:29], "false", "true" -unusedBit_539_30 = bits, U32, 1628, [30:30], "false", "true" -unusedBit_539_31 = bits, U32, 1628, [31:31], "false", "true" +unusedBit_541_8 = bits, U32, 1628, [8:8], "false", "true" +unusedBit_541_9 = bits, U32, 1628, [9:9], "false", "true" +unusedBit_541_10 = bits, U32, 1628, [10:10], "false", "true" +unusedBit_541_11 = bits, U32, 1628, [11:11], "false", "true" +unusedBit_541_12 = bits, U32, 1628, [12:12], "false", "true" +unusedBit_541_13 = bits, U32, 1628, [13:13], "false", "true" +unusedBit_541_14 = bits, U32, 1628, [14:14], "false", "true" +unusedBit_541_15 = bits, U32, 1628, [15:15], "false", "true" +unusedBit_541_16 = bits, U32, 1628, [16:16], "false", "true" +unusedBit_541_17 = bits, U32, 1628, [17:17], "false", "true" +unusedBit_541_18 = bits, U32, 1628, [18:18], "false", "true" +unusedBit_541_19 = bits, U32, 1628, [19:19], "false", "true" +unusedBit_541_20 = bits, U32, 1628, [20:20], "false", "true" +unusedBit_541_21 = bits, U32, 1628, [21:21], "false", "true" +unusedBit_541_22 = bits, U32, 1628, [22:22], "false", "true" +unusedBit_541_23 = bits, U32, 1628, [23:23], "false", "true" +unusedBit_541_24 = bits, U32, 1628, [24:24], "false", "true" +unusedBit_541_25 = bits, U32, 1628, [25:25], "false", "true" +unusedBit_541_26 = bits, U32, 1628, [26:26], "false", "true" +unusedBit_541_27 = bits, U32, 1628, [27:27], "false", "true" +unusedBit_541_28 = bits, U32, 1628, [28:28], "false", "true" +unusedBit_541_29 = bits, U32, 1628, [29:29], "false", "true" +unusedBit_541_30 = bits, U32, 1628, [30:30], "false", "true" +unusedBit_541_31 = bits, U32, 1628, [31:31], "false", "true" benchTestOffTime = scalar, U08, 1632, "ms", 5.0, 0, 0, 2000, 1 benchTestCount = scalar, U08, 1633, "count", 1, 0, 0, 250, 1 benchTestOnTime = scalar, U08, 1634, "ms", 5.0, 0, 0, 2000, 1 @@ -1555,10 +1555,8 @@ ignBlends4_blendValues = array, U08, 22038, [8], "%", 0.5, 0, 0, 100, 1 compressionRatio = "Just for reference really, not taken into account by any logic at this point" triggerSimulatorPins1 = "Each rusEFI piece can provide synthetic trigger signal for external ECU. Sometimes these wires are routed back into trigger inputs of the same rusEFI board." triggerSimulatorPins2 = "Each rusEFI piece can provide synthetic trigger signal for external ECU. Sometimes these wires are routed back into trigger inputs of the same rusEFI board." - triggerSimulatorPins3 = "Each rusEFI piece can provide synthetic trigger signal for external ECU. Sometimes these wires are routed back into trigger inputs of the same rusEFI board." triggerSimulatorPinModes1 = "triggerSimulatorPinModes 1" triggerSimulatorPinModes2 = "triggerSimulatorPinModes 2" - triggerSimulatorPinModes3 = "triggerSimulatorPinModes 3" o2heaterPin = "Narrow band o2 heater, not used for CJ125. 'ON' if engine is running, 'OFF' if stopped or cranking. See wboHeaterPin" isSdCardEnabled = "enable sd/disable sd" rusefiVerbose29b = "Use 11 bit (standard) or 29 bit (extended) IDs for rusEFI verbose CAN format." @@ -6471,7 +6469,6 @@ dialog = wideband_stateDialog, "wideband_state" dialog = allPins1_1 field = "trigger stimulator pin #1", triggerSimulatorPins1 field = "trigger stimulator pin #2", triggerSimulatorPins2 - field = "trigger stimulator pin #2", triggerSimulatorPins3 field = "Warning Led", warningLedPin field = "tle6240_cs", tle6240_cs field = "tle6240 SPI", tle6240spiDevice @@ -7817,8 +7814,6 @@ dialog = tcuControls, "Transmission Settings" field = "trigger stimulator pin mode #1", triggerSimulatorPinModes1 field = "trigger stimulator pin #2", triggerSimulatorPins2 field = "trigger stimulator pin mode #2", triggerSimulatorPinModes2 - field = "trigger stimulator pin #3", triggerSimulatorPins3 - field = "trigger stimulator pin mode #3", triggerSimulatorPinModes3 field = "" field = "Logic input channel 1", logicAnalyzerPins1 field = "Logic input channel 2", logicAnalyzerPins2 diff --git a/firmware/tunerstudio/generated/rusefi_core8.ini b/firmware/tunerstudio/generated/rusefi_core8.ini index 243a150531..da6af0090c 100644 --- a/firmware/tunerstudio/generated/rusefi_core8.ini +++ b/firmware/tunerstudio/generated/rusefi_core8.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.10.03.core8.1460931734" + signature = "rusEFI 2022.10.03.core8.1088599572" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.10.03.core8.1460931734" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.10.03.core8.1088599572" ; 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 @@ -86,7 +86,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Oct 03 04:24:27 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Oct 03 15:06:08 UTC 2022 pageSize = 22048 page = 1 @@ -336,10 +336,10 @@ tunerStudioSerialSpeed = scalar, U32, 740, "BPs", 1, 0, 0, 1000000, 0 compressionRatio = scalar, F32, 744, "CR", 1, 0, 0, 300, 1 triggerSimulatorPins1 = bits, U16, 748, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15" triggerSimulatorPins2 = bits, U16, 750, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15" -triggerSimulatorPins3 = bits, U16, 752, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15" +unusedTrig = scalar, U16, 752, "", 1, 0, 0, 100, 0 triggerSimulatorPinModes1 = bits, U08, 754, [0:1], "default", "default inverted", "open collector", "open collector inverted" triggerSimulatorPinModes2 = bits, U08, 755, [0:1], "default", "default inverted", "open collector", "open collector inverted" -triggerSimulatorPinModes3 = bits, U08, 756, [0:1], "default", "default inverted", "open collector", "open collector inverted" +unusedTrigMode = scalar, U08, 756, "", 1, 0, 0, 100, 0 o2heaterPin = bits, U16, 758, [0:7], 0="NONE",26="DBW Control (B8)",27="DBW Direction (B9)",25="DBW Disable (B7)",81="High Side 1 (E15)",76="High Side 10 (E10)",75="High Side 11 (E9)",74="High Side 12 (E8)",80="High Side 2 (E14)",79="High Side 3 (E13)",78="High Side 4 (E12)",77="High Side 5 (E11)",97="High Side 6 (F15)",98="High Side 7 (G0)",99="High Side 8 (G1)",73="High Side 9 (E7)",32="Low Side 1 (B14 v2.1 ONLY)",95="Low Side 1 (F13)",65="Low Side 10 (D15)",100="Low Side 11 (G2)",101="Low Side 12 (G3)",102="Low Side 13 (G4)",103="Low Side 14 (G5)",104="Low Side 15 (G6)",105="Low Side 16 (G7)",106="Low Side 17 (G8)",40="Low Side 18 (C6)",41="Low Side 19 (C7)",33="Low Side 2 (B15 v2.1 ONLY)",96="Low Side 2 (F14)",10="Low Side 20 (A8)",55="Low Side 21 (D5)",54="Low Side 22 (D4)",53="Low Side 23 (D3)",17="Low Side 24 (A15)",58="Low Side 3 (D8)",59="Low Side 4 (D9)",60="Low Side 5 (D10)",61="Low Side 6 (D11)",62="Low Side 7 (D12)",63="Low Side 8 (D13)",64="Low Side 9 (D14)",90="StepEr Control (F8)",89="StepEr Direction (F7)",91="StepEr Disable (F9)" o2heaterPinModeTodO = bits, U08, 760, [0:1], "default", "default inverted", "open collector", "open collector inverted" is_enabled_spi_1 = bits, U32, 764, [0:0], "false", "true" @@ -763,30 +763,30 @@ unused1127 = bits, U32, 1628, [4:4], "false", "true" unused1128 = bits, U32, 1628, [5:5], "false", "true" unused1129 = bits, U32, 1628, [6:6], "false", "true" unused1130 = bits, U32, 1628, [7:7], "false", "true" -unusedBit_539_8 = bits, U32, 1628, [8:8], "false", "true" -unusedBit_539_9 = bits, U32, 1628, [9:9], "false", "true" -unusedBit_539_10 = bits, U32, 1628, [10:10], "false", "true" -unusedBit_539_11 = bits, U32, 1628, [11:11], "false", "true" -unusedBit_539_12 = bits, U32, 1628, [12:12], "false", "true" -unusedBit_539_13 = bits, U32, 1628, [13:13], "false", "true" -unusedBit_539_14 = bits, U32, 1628, [14:14], "false", "true" -unusedBit_539_15 = bits, U32, 1628, [15:15], "false", "true" -unusedBit_539_16 = bits, U32, 1628, [16:16], "false", "true" -unusedBit_539_17 = bits, U32, 1628, [17:17], "false", "true" -unusedBit_539_18 = bits, U32, 1628, [18:18], "false", "true" -unusedBit_539_19 = bits, U32, 1628, [19:19], "false", "true" -unusedBit_539_20 = bits, U32, 1628, [20:20], "false", "true" -unusedBit_539_21 = bits, U32, 1628, [21:21], "false", "true" -unusedBit_539_22 = bits, U32, 1628, [22:22], "false", "true" -unusedBit_539_23 = bits, U32, 1628, [23:23], "false", "true" -unusedBit_539_24 = bits, U32, 1628, [24:24], "false", "true" -unusedBit_539_25 = bits, U32, 1628, [25:25], "false", "true" -unusedBit_539_26 = bits, U32, 1628, [26:26], "false", "true" -unusedBit_539_27 = bits, U32, 1628, [27:27], "false", "true" -unusedBit_539_28 = bits, U32, 1628, [28:28], "false", "true" -unusedBit_539_29 = bits, U32, 1628, [29:29], "false", "true" -unusedBit_539_30 = bits, U32, 1628, [30:30], "false", "true" -unusedBit_539_31 = bits, U32, 1628, [31:31], "false", "true" +unusedBit_541_8 = bits, U32, 1628, [8:8], "false", "true" +unusedBit_541_9 = bits, U32, 1628, [9:9], "false", "true" +unusedBit_541_10 = bits, U32, 1628, [10:10], "false", "true" +unusedBit_541_11 = bits, U32, 1628, [11:11], "false", "true" +unusedBit_541_12 = bits, U32, 1628, [12:12], "false", "true" +unusedBit_541_13 = bits, U32, 1628, [13:13], "false", "true" +unusedBit_541_14 = bits, U32, 1628, [14:14], "false", "true" +unusedBit_541_15 = bits, U32, 1628, [15:15], "false", "true" +unusedBit_541_16 = bits, U32, 1628, [16:16], "false", "true" +unusedBit_541_17 = bits, U32, 1628, [17:17], "false", "true" +unusedBit_541_18 = bits, U32, 1628, [18:18], "false", "true" +unusedBit_541_19 = bits, U32, 1628, [19:19], "false", "true" +unusedBit_541_20 = bits, U32, 1628, [20:20], "false", "true" +unusedBit_541_21 = bits, U32, 1628, [21:21], "false", "true" +unusedBit_541_22 = bits, U32, 1628, [22:22], "false", "true" +unusedBit_541_23 = bits, U32, 1628, [23:23], "false", "true" +unusedBit_541_24 = bits, U32, 1628, [24:24], "false", "true" +unusedBit_541_25 = bits, U32, 1628, [25:25], "false", "true" +unusedBit_541_26 = bits, U32, 1628, [26:26], "false", "true" +unusedBit_541_27 = bits, U32, 1628, [27:27], "false", "true" +unusedBit_541_28 = bits, U32, 1628, [28:28], "false", "true" +unusedBit_541_29 = bits, U32, 1628, [29:29], "false", "true" +unusedBit_541_30 = bits, U32, 1628, [30:30], "false", "true" +unusedBit_541_31 = bits, U32, 1628, [31:31], "false", "true" benchTestOffTime = scalar, U08, 1632, "ms", 5.0, 0, 0, 2000, 1 benchTestCount = scalar, U08, 1633, "count", 1, 0, 0, 250, 1 benchTestOnTime = scalar, U08, 1634, "ms", 5.0, 0, 0, 2000, 1 @@ -1555,10 +1555,8 @@ ignBlends4_blendValues = array, U08, 22038, [8], "%", 0.5, 0, 0, 100, 1 compressionRatio = "Just for reference really, not taken into account by any logic at this point" triggerSimulatorPins1 = "Each rusEFI piece can provide synthetic trigger signal for external ECU. Sometimes these wires are routed back into trigger inputs of the same rusEFI board." triggerSimulatorPins2 = "Each rusEFI piece can provide synthetic trigger signal for external ECU. Sometimes these wires are routed back into trigger inputs of the same rusEFI board." - triggerSimulatorPins3 = "Each rusEFI piece can provide synthetic trigger signal for external ECU. Sometimes these wires are routed back into trigger inputs of the same rusEFI board." triggerSimulatorPinModes1 = "triggerSimulatorPinModes 1" triggerSimulatorPinModes2 = "triggerSimulatorPinModes 2" - triggerSimulatorPinModes3 = "triggerSimulatorPinModes 3" o2heaterPin = "Narrow band o2 heater, not used for CJ125. 'ON' if engine is running, 'OFF' if stopped or cranking. See wboHeaterPin" isSdCardEnabled = "enable sd/disable sd" rusefiVerbose29b = "Use 11 bit (standard) or 29 bit (extended) IDs for rusEFI verbose CAN format." @@ -6469,7 +6467,6 @@ dialog = wideband_stateDialog, "wideband_state" dialog = allPins1_1 field = "trigger stimulator pin #1", triggerSimulatorPins1 field = "trigger stimulator pin #2", triggerSimulatorPins2 - field = "trigger stimulator pin #2", triggerSimulatorPins3 field = "Warning Led", warningLedPin field = "tle6240_cs", tle6240_cs field = "tle6240 SPI", tle6240spiDevice @@ -7818,8 +7815,6 @@ dialog = tcuControls, "Transmission Settings" field = "trigger stimulator pin mode #1", triggerSimulatorPinModes1 field = "trigger stimulator pin #2", triggerSimulatorPins2 field = "trigger stimulator pin mode #2", triggerSimulatorPinModes2 - field = "trigger stimulator pin #3", triggerSimulatorPins3 - field = "trigger stimulator pin mode #3", triggerSimulatorPinModes3 field = "" field = "Logic input channel 1", logicAnalyzerPins1 field = "Logic input channel 2", logicAnalyzerPins2 diff --git a/firmware/tunerstudio/generated/rusefi_cypress.ini b/firmware/tunerstudio/generated/rusefi_cypress.ini index 87662f6fcd..a6cfd973a2 100644 --- a/firmware/tunerstudio/generated/rusefi_cypress.ini +++ b/firmware/tunerstudio/generated/rusefi_cypress.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.10.03.cypress.2717408623" + signature = "rusEFI 2022.10.03.cypress.3054430189" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.10.03.cypress.2717408623" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.10.03.cypress.3054430189" ; 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 @@ -86,7 +86,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on hellen_cypress_gen_config.bat integration/rusefi_config.txt Mon Oct 03 04:23:50 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on hellen_cypress_gen_config.bat integration/rusefi_config.txt Mon Oct 03 15:05:32 UTC 2022 pageSize = 22048 page = 1 @@ -336,10 +336,10 @@ tunerStudioSerialSpeed = scalar, U32, 740, "BPs", 1, 0, 0, 1000000, 0 compressionRatio = scalar, F32, 744, "CR", 1, 0, 0, 300, 1 triggerSimulatorPins1 = bits, U16, 748, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15" triggerSimulatorPins2 = bits, U16, 750, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15" -triggerSimulatorPins3 = bits, U16, 752, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15" +unusedTrig = scalar, U16, 752, "", 1, 0, 0, 100, 0 triggerSimulatorPinModes1 = bits, U08, 754, [0:1], "default", "default inverted", "open collector", "open collector inverted" triggerSimulatorPinModes2 = bits, U08, 755, [0:1], "default", "default inverted", "open collector", "open collector inverted" -triggerSimulatorPinModes3 = bits, U08, 756, [0:1], "default", "default inverted", "open collector", "open collector inverted" +unusedTrigMode = scalar, U08, 756, "", 1, 0, 0, 100, 0 o2heaterPin = bits, U16, 758, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15", "MC33972_1", "MC33972_2", "MC33972_3", "MC33972_4", "MC33972_5", "MC33972_6", "MC33972_7", "MC33972_8", "MC33972_9", "MC33972_10", "MC33972_11", "MC33972_12", "MC33972_13", "MC33972_14", "MC33972_15", "MC33972_16", "MC33972_17", "MC33972_18", "MC33972_19", "MC33972_20", "MC33972_21", "MC33972_22", "TLE8888_1", "TLE8888_2", "TLE8888_3", "TLE8888_4", "TLE8888_5", "TLE8888_6", "TLE8888_7", "TLE8888_8", "TLE8888_9", "TLE8888_10", "TLE8888_11", "TLE8888_12", "TLE8888_13", "TLE8888_14", "TLE8888_15", "TLE8888_16", "TLE8888_17", "TLE8888_18", "TLE8888_19", "TLE8888_20", "TLE8888_21", "TLE8888_22", "TLE8888_23", "TLE8888_24", "TLE8888_25", "TLE8888_26", "TLE8888_27", "TLE8888_28", "INVALID", "INVALID", "INVALID", "TLE6240_1", "TLE6240_2", "TLE6240_3", "TLE6240_4", "TLE6240_5", "TLE6240_6", "TLE6240_7", "TLE6240_8", "TLE6240_9", "TLE6240_10", "TLE6240_11", "TLE6240_12", "TLE6240_13", "TLE6240_14", "TLE6240_15", "TLE6240_16" o2heaterPinModeTodO = bits, U08, 760, [0:1], "default", "default inverted", "open collector", "open collector inverted" is_enabled_spi_1 = bits, U32, 764, [0:0], "false", "true" @@ -763,30 +763,30 @@ unused1127 = bits, U32, 1628, [4:4], "false", "true" unused1128 = bits, U32, 1628, [5:5], "false", "true" unused1129 = bits, U32, 1628, [6:6], "false", "true" unused1130 = bits, U32, 1628, [7:7], "false", "true" -unusedBit_539_8 = bits, U32, 1628, [8:8], "false", "true" -unusedBit_539_9 = bits, U32, 1628, [9:9], "false", "true" -unusedBit_539_10 = bits, U32, 1628, [10:10], "false", "true" -unusedBit_539_11 = bits, U32, 1628, [11:11], "false", "true" -unusedBit_539_12 = bits, U32, 1628, [12:12], "false", "true" -unusedBit_539_13 = bits, U32, 1628, [13:13], "false", "true" -unusedBit_539_14 = bits, U32, 1628, [14:14], "false", "true" -unusedBit_539_15 = bits, U32, 1628, [15:15], "false", "true" -unusedBit_539_16 = bits, U32, 1628, [16:16], "false", "true" -unusedBit_539_17 = bits, U32, 1628, [17:17], "false", "true" -unusedBit_539_18 = bits, U32, 1628, [18:18], "false", "true" -unusedBit_539_19 = bits, U32, 1628, [19:19], "false", "true" -unusedBit_539_20 = bits, U32, 1628, [20:20], "false", "true" -unusedBit_539_21 = bits, U32, 1628, [21:21], "false", "true" -unusedBit_539_22 = bits, U32, 1628, [22:22], "false", "true" -unusedBit_539_23 = bits, U32, 1628, [23:23], "false", "true" -unusedBit_539_24 = bits, U32, 1628, [24:24], "false", "true" -unusedBit_539_25 = bits, U32, 1628, [25:25], "false", "true" -unusedBit_539_26 = bits, U32, 1628, [26:26], "false", "true" -unusedBit_539_27 = bits, U32, 1628, [27:27], "false", "true" -unusedBit_539_28 = bits, U32, 1628, [28:28], "false", "true" -unusedBit_539_29 = bits, U32, 1628, [29:29], "false", "true" -unusedBit_539_30 = bits, U32, 1628, [30:30], "false", "true" -unusedBit_539_31 = bits, U32, 1628, [31:31], "false", "true" +unusedBit_541_8 = bits, U32, 1628, [8:8], "false", "true" +unusedBit_541_9 = bits, U32, 1628, [9:9], "false", "true" +unusedBit_541_10 = bits, U32, 1628, [10:10], "false", "true" +unusedBit_541_11 = bits, U32, 1628, [11:11], "false", "true" +unusedBit_541_12 = bits, U32, 1628, [12:12], "false", "true" +unusedBit_541_13 = bits, U32, 1628, [13:13], "false", "true" +unusedBit_541_14 = bits, U32, 1628, [14:14], "false", "true" +unusedBit_541_15 = bits, U32, 1628, [15:15], "false", "true" +unusedBit_541_16 = bits, U32, 1628, [16:16], "false", "true" +unusedBit_541_17 = bits, U32, 1628, [17:17], "false", "true" +unusedBit_541_18 = bits, U32, 1628, [18:18], "false", "true" +unusedBit_541_19 = bits, U32, 1628, [19:19], "false", "true" +unusedBit_541_20 = bits, U32, 1628, [20:20], "false", "true" +unusedBit_541_21 = bits, U32, 1628, [21:21], "false", "true" +unusedBit_541_22 = bits, U32, 1628, [22:22], "false", "true" +unusedBit_541_23 = bits, U32, 1628, [23:23], "false", "true" +unusedBit_541_24 = bits, U32, 1628, [24:24], "false", "true" +unusedBit_541_25 = bits, U32, 1628, [25:25], "false", "true" +unusedBit_541_26 = bits, U32, 1628, [26:26], "false", "true" +unusedBit_541_27 = bits, U32, 1628, [27:27], "false", "true" +unusedBit_541_28 = bits, U32, 1628, [28:28], "false", "true" +unusedBit_541_29 = bits, U32, 1628, [29:29], "false", "true" +unusedBit_541_30 = bits, U32, 1628, [30:30], "false", "true" +unusedBit_541_31 = bits, U32, 1628, [31:31], "false", "true" benchTestOffTime = scalar, U08, 1632, "ms", 5.0, 0, 0, 2000, 1 benchTestCount = scalar, U08, 1633, "count", 1, 0, 0, 250, 1 benchTestOnTime = scalar, U08, 1634, "ms", 5.0, 0, 0, 2000, 1 @@ -1555,10 +1555,8 @@ ignBlends4_blendValues = array, U08, 22038, [8], "%", 0.5, 0, 0, 100, 1 compressionRatio = "Just for reference really, not taken into account by any logic at this point" triggerSimulatorPins1 = "Each rusEFI piece can provide synthetic trigger signal for external ECU. Sometimes these wires are routed back into trigger inputs of the same rusEFI board." triggerSimulatorPins2 = "Each rusEFI piece can provide synthetic trigger signal for external ECU. Sometimes these wires are routed back into trigger inputs of the same rusEFI board." - triggerSimulatorPins3 = "Each rusEFI piece can provide synthetic trigger signal for external ECU. Sometimes these wires are routed back into trigger inputs of the same rusEFI board." triggerSimulatorPinModes1 = "triggerSimulatorPinModes 1" triggerSimulatorPinModes2 = "triggerSimulatorPinModes 2" - triggerSimulatorPinModes3 = "triggerSimulatorPinModes 3" o2heaterPin = "Narrow band o2 heater, not used for CJ125. 'ON' if engine is running, 'OFF' if stopped or cranking. See wboHeaterPin" isSdCardEnabled = "enable sd/disable sd" rusefiVerbose29b = "Use 11 bit (standard) or 29 bit (extended) IDs for rusEFI verbose CAN format." @@ -6471,7 +6469,6 @@ dialog = wideband_stateDialog, "wideband_state" dialog = allPins1_1 field = "trigger stimulator pin #1", triggerSimulatorPins1 field = "trigger stimulator pin #2", triggerSimulatorPins2 - field = "trigger stimulator pin #2", triggerSimulatorPins3 field = "Warning Led", warningLedPin field = "tle6240_cs", tle6240_cs field = "tle6240 SPI", tle6240spiDevice @@ -7826,8 +7823,6 @@ dialog = tcuControls, "Transmission Settings" field = "trigger stimulator pin mode #1", triggerSimulatorPinModes1 field = "trigger stimulator pin #2", triggerSimulatorPins2 field = "trigger stimulator pin mode #2", triggerSimulatorPinModes2 - field = "trigger stimulator pin #3", triggerSimulatorPins3 - field = "trigger stimulator pin mode #3", triggerSimulatorPinModes3 field = "" field = "Logic input channel 1", logicAnalyzerPins1 field = "Logic input channel 2", logicAnalyzerPins2 diff --git a/firmware/tunerstudio/generated/rusefi_f407-discovery.ini b/firmware/tunerstudio/generated/rusefi_f407-discovery.ini index 4d2f833cd4..9fdb6af88f 100644 --- a/firmware/tunerstudio/generated/rusefi_f407-discovery.ini +++ b/firmware/tunerstudio/generated/rusefi_f407-discovery.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.10.03.f407-discovery.2717408623" + signature = "rusEFI 2022.10.03.f407-discovery.3054430189" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.10.03.f407-discovery.2717408623" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.10.03.f407-discovery.3054430189" ; 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 @@ -86,7 +86,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Oct 03 04:24:44 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Oct 03 15:06:25 UTC 2022 pageSize = 22048 page = 1 @@ -336,10 +336,10 @@ tunerStudioSerialSpeed = scalar, U32, 740, "BPs", 1, 0, 0, 1000000, 0 compressionRatio = scalar, F32, 744, "CR", 1, 0, 0, 300, 1 triggerSimulatorPins1 = bits, U16, 748, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15" triggerSimulatorPins2 = bits, U16, 750, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15" -triggerSimulatorPins3 = bits, U16, 752, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15" +unusedTrig = scalar, U16, 752, "", 1, 0, 0, 100, 0 triggerSimulatorPinModes1 = bits, U08, 754, [0:1], "default", "default inverted", "open collector", "open collector inverted" triggerSimulatorPinModes2 = bits, U08, 755, [0:1], "default", "default inverted", "open collector", "open collector inverted" -triggerSimulatorPinModes3 = bits, U08, 756, [0:1], "default", "default inverted", "open collector", "open collector inverted" +unusedTrigMode = scalar, U08, 756, "", 1, 0, 0, 100, 0 o2heaterPin = bits, U16, 758, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15", "MC33972_1", "MC33972_2", "MC33972_3", "MC33972_4", "MC33972_5", "MC33972_6", "MC33972_7", "MC33972_8", "MC33972_9", "MC33972_10", "MC33972_11", "MC33972_12", "MC33972_13", "MC33972_14", "MC33972_15", "MC33972_16", "MC33972_17", "MC33972_18", "MC33972_19", "MC33972_20", "MC33972_21", "MC33972_22", "TLE8888_1", "TLE8888_2", "TLE8888_3", "TLE8888_4", "TLE8888_5", "TLE8888_6", "TLE8888_7", "TLE8888_8", "TLE8888_9", "TLE8888_10", "TLE8888_11", "TLE8888_12", "TLE8888_13", "TLE8888_14", "TLE8888_15", "TLE8888_16", "TLE8888_17", "TLE8888_18", "TLE8888_19", "TLE8888_20", "TLE8888_21", "TLE8888_22", "TLE8888_23", "TLE8888_24", "TLE8888_25", "TLE8888_26", "TLE8888_27", "TLE8888_28", "INVALID", "INVALID", "INVALID", "TLE6240_1", "TLE6240_2", "TLE6240_3", "TLE6240_4", "TLE6240_5", "TLE6240_6", "TLE6240_7", "TLE6240_8", "TLE6240_9", "TLE6240_10", "TLE6240_11", "TLE6240_12", "TLE6240_13", "TLE6240_14", "TLE6240_15", "TLE6240_16" o2heaterPinModeTodO = bits, U08, 760, [0:1], "default", "default inverted", "open collector", "open collector inverted" is_enabled_spi_1 = bits, U32, 764, [0:0], "false", "true" @@ -763,30 +763,30 @@ unused1127 = bits, U32, 1628, [4:4], "false", "true" unused1128 = bits, U32, 1628, [5:5], "false", "true" unused1129 = bits, U32, 1628, [6:6], "false", "true" unused1130 = bits, U32, 1628, [7:7], "false", "true" -unusedBit_539_8 = bits, U32, 1628, [8:8], "false", "true" -unusedBit_539_9 = bits, U32, 1628, [9:9], "false", "true" -unusedBit_539_10 = bits, U32, 1628, [10:10], "false", "true" -unusedBit_539_11 = bits, U32, 1628, [11:11], "false", "true" -unusedBit_539_12 = bits, U32, 1628, [12:12], "false", "true" -unusedBit_539_13 = bits, U32, 1628, [13:13], "false", "true" -unusedBit_539_14 = bits, U32, 1628, [14:14], "false", "true" -unusedBit_539_15 = bits, U32, 1628, [15:15], "false", "true" -unusedBit_539_16 = bits, U32, 1628, [16:16], "false", "true" -unusedBit_539_17 = bits, U32, 1628, [17:17], "false", "true" -unusedBit_539_18 = bits, U32, 1628, [18:18], "false", "true" -unusedBit_539_19 = bits, U32, 1628, [19:19], "false", "true" -unusedBit_539_20 = bits, U32, 1628, [20:20], "false", "true" -unusedBit_539_21 = bits, U32, 1628, [21:21], "false", "true" -unusedBit_539_22 = bits, U32, 1628, [22:22], "false", "true" -unusedBit_539_23 = bits, U32, 1628, [23:23], "false", "true" -unusedBit_539_24 = bits, U32, 1628, [24:24], "false", "true" -unusedBit_539_25 = bits, U32, 1628, [25:25], "false", "true" -unusedBit_539_26 = bits, U32, 1628, [26:26], "false", "true" -unusedBit_539_27 = bits, U32, 1628, [27:27], "false", "true" -unusedBit_539_28 = bits, U32, 1628, [28:28], "false", "true" -unusedBit_539_29 = bits, U32, 1628, [29:29], "false", "true" -unusedBit_539_30 = bits, U32, 1628, [30:30], "false", "true" -unusedBit_539_31 = bits, U32, 1628, [31:31], "false", "true" +unusedBit_541_8 = bits, U32, 1628, [8:8], "false", "true" +unusedBit_541_9 = bits, U32, 1628, [9:9], "false", "true" +unusedBit_541_10 = bits, U32, 1628, [10:10], "false", "true" +unusedBit_541_11 = bits, U32, 1628, [11:11], "false", "true" +unusedBit_541_12 = bits, U32, 1628, [12:12], "false", "true" +unusedBit_541_13 = bits, U32, 1628, [13:13], "false", "true" +unusedBit_541_14 = bits, U32, 1628, [14:14], "false", "true" +unusedBit_541_15 = bits, U32, 1628, [15:15], "false", "true" +unusedBit_541_16 = bits, U32, 1628, [16:16], "false", "true" +unusedBit_541_17 = bits, U32, 1628, [17:17], "false", "true" +unusedBit_541_18 = bits, U32, 1628, [18:18], "false", "true" +unusedBit_541_19 = bits, U32, 1628, [19:19], "false", "true" +unusedBit_541_20 = bits, U32, 1628, [20:20], "false", "true" +unusedBit_541_21 = bits, U32, 1628, [21:21], "false", "true" +unusedBit_541_22 = bits, U32, 1628, [22:22], "false", "true" +unusedBit_541_23 = bits, U32, 1628, [23:23], "false", "true" +unusedBit_541_24 = bits, U32, 1628, [24:24], "false", "true" +unusedBit_541_25 = bits, U32, 1628, [25:25], "false", "true" +unusedBit_541_26 = bits, U32, 1628, [26:26], "false", "true" +unusedBit_541_27 = bits, U32, 1628, [27:27], "false", "true" +unusedBit_541_28 = bits, U32, 1628, [28:28], "false", "true" +unusedBit_541_29 = bits, U32, 1628, [29:29], "false", "true" +unusedBit_541_30 = bits, U32, 1628, [30:30], "false", "true" +unusedBit_541_31 = bits, U32, 1628, [31:31], "false", "true" benchTestOffTime = scalar, U08, 1632, "ms", 5.0, 0, 0, 2000, 1 benchTestCount = scalar, U08, 1633, "count", 1, 0, 0, 250, 1 benchTestOnTime = scalar, U08, 1634, "ms", 5.0, 0, 0, 2000, 1 @@ -1555,10 +1555,8 @@ ignBlends4_blendValues = array, U08, 22038, [8], "%", 0.5, 0, 0, 100, 1 compressionRatio = "Just for reference really, not taken into account by any logic at this point" triggerSimulatorPins1 = "Each rusEFI piece can provide synthetic trigger signal for external ECU. Sometimes these wires are routed back into trigger inputs of the same rusEFI board." triggerSimulatorPins2 = "Each rusEFI piece can provide synthetic trigger signal for external ECU. Sometimes these wires are routed back into trigger inputs of the same rusEFI board." - triggerSimulatorPins3 = "Each rusEFI piece can provide synthetic trigger signal for external ECU. Sometimes these wires are routed back into trigger inputs of the same rusEFI board." triggerSimulatorPinModes1 = "triggerSimulatorPinModes 1" triggerSimulatorPinModes2 = "triggerSimulatorPinModes 2" - triggerSimulatorPinModes3 = "triggerSimulatorPinModes 3" o2heaterPin = "Narrow band o2 heater, not used for CJ125. 'ON' if engine is running, 'OFF' if stopped or cranking. See wboHeaterPin" isSdCardEnabled = "enable sd/disable sd" rusefiVerbose29b = "Use 11 bit (standard) or 29 bit (extended) IDs for rusEFI verbose CAN format." @@ -6471,7 +6469,6 @@ dialog = wideband_stateDialog, "wideband_state" dialog = allPins1_1 field = "trigger stimulator pin #1", triggerSimulatorPins1 field = "trigger stimulator pin #2", triggerSimulatorPins2 - field = "trigger stimulator pin #2", triggerSimulatorPins3 field = "Warning Led", warningLedPin field = "tle6240_cs", tle6240_cs field = "tle6240 SPI", tle6240spiDevice @@ -7826,8 +7823,6 @@ dialog = tcuControls, "Transmission Settings" field = "trigger stimulator pin mode #1", triggerSimulatorPinModes1 field = "trigger stimulator pin #2", triggerSimulatorPins2 field = "trigger stimulator pin mode #2", triggerSimulatorPinModes2 - field = "trigger stimulator pin #3", triggerSimulatorPins3 - field = "trigger stimulator pin mode #3", triggerSimulatorPinModes3 field = "" field = "Logic input channel 1", logicAnalyzerPins1 field = "Logic input channel 2", logicAnalyzerPins2 diff --git a/firmware/tunerstudio/generated/rusefi_f429-discovery.ini b/firmware/tunerstudio/generated/rusefi_f429-discovery.ini index 167ae1d60e..6ebf8b9963 100644 --- a/firmware/tunerstudio/generated/rusefi_f429-discovery.ini +++ b/firmware/tunerstudio/generated/rusefi_f429-discovery.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.10.03.f429-discovery.2717408623" + signature = "rusEFI 2022.10.03.f429-discovery.3054430189" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.10.03.f429-discovery.2717408623" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.10.03.f429-discovery.3054430189" ; 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 @@ -86,7 +86,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Oct 03 04:24:46 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Oct 03 15:06:27 UTC 2022 pageSize = 22048 page = 1 @@ -336,10 +336,10 @@ tunerStudioSerialSpeed = scalar, U32, 740, "BPs", 1, 0, 0, 1000000, 0 compressionRatio = scalar, F32, 744, "CR", 1, 0, 0, 300, 1 triggerSimulatorPins1 = bits, U16, 748, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15" triggerSimulatorPins2 = bits, U16, 750, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15" -triggerSimulatorPins3 = bits, U16, 752, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15" +unusedTrig = scalar, U16, 752, "", 1, 0, 0, 100, 0 triggerSimulatorPinModes1 = bits, U08, 754, [0:1], "default", "default inverted", "open collector", "open collector inverted" triggerSimulatorPinModes2 = bits, U08, 755, [0:1], "default", "default inverted", "open collector", "open collector inverted" -triggerSimulatorPinModes3 = bits, U08, 756, [0:1], "default", "default inverted", "open collector", "open collector inverted" +unusedTrigMode = scalar, U08, 756, "", 1, 0, 0, 100, 0 o2heaterPin = bits, U16, 758, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15", "MC33972_1", "MC33972_2", "MC33972_3", "MC33972_4", "MC33972_5", "MC33972_6", "MC33972_7", "MC33972_8", "MC33972_9", "MC33972_10", "MC33972_11", "MC33972_12", "MC33972_13", "MC33972_14", "MC33972_15", "MC33972_16", "MC33972_17", "MC33972_18", "MC33972_19", "MC33972_20", "MC33972_21", "MC33972_22", "TLE8888_1", "TLE8888_2", "TLE8888_3", "TLE8888_4", "TLE8888_5", "TLE8888_6", "TLE8888_7", "TLE8888_8", "TLE8888_9", "TLE8888_10", "TLE8888_11", "TLE8888_12", "TLE8888_13", "TLE8888_14", "TLE8888_15", "TLE8888_16", "TLE8888_17", "TLE8888_18", "TLE8888_19", "TLE8888_20", "TLE8888_21", "TLE8888_22", "TLE8888_23", "TLE8888_24", "TLE8888_25", "TLE8888_26", "TLE8888_27", "TLE8888_28", "INVALID", "INVALID", "INVALID", "TLE6240_1", "TLE6240_2", "TLE6240_3", "TLE6240_4", "TLE6240_5", "TLE6240_6", "TLE6240_7", "TLE6240_8", "TLE6240_9", "TLE6240_10", "TLE6240_11", "TLE6240_12", "TLE6240_13", "TLE6240_14", "TLE6240_15", "TLE6240_16" o2heaterPinModeTodO = bits, U08, 760, [0:1], "default", "default inverted", "open collector", "open collector inverted" is_enabled_spi_1 = bits, U32, 764, [0:0], "false", "true" @@ -763,30 +763,30 @@ unused1127 = bits, U32, 1628, [4:4], "false", "true" unused1128 = bits, U32, 1628, [5:5], "false", "true" unused1129 = bits, U32, 1628, [6:6], "false", "true" unused1130 = bits, U32, 1628, [7:7], "false", "true" -unusedBit_539_8 = bits, U32, 1628, [8:8], "false", "true" -unusedBit_539_9 = bits, U32, 1628, [9:9], "false", "true" -unusedBit_539_10 = bits, U32, 1628, [10:10], "false", "true" -unusedBit_539_11 = bits, U32, 1628, [11:11], "false", "true" -unusedBit_539_12 = bits, U32, 1628, [12:12], "false", "true" -unusedBit_539_13 = bits, U32, 1628, [13:13], "false", "true" -unusedBit_539_14 = bits, U32, 1628, [14:14], "false", "true" -unusedBit_539_15 = bits, U32, 1628, [15:15], "false", "true" -unusedBit_539_16 = bits, U32, 1628, [16:16], "false", "true" -unusedBit_539_17 = bits, U32, 1628, [17:17], "false", "true" -unusedBit_539_18 = bits, U32, 1628, [18:18], "false", "true" -unusedBit_539_19 = bits, U32, 1628, [19:19], "false", "true" -unusedBit_539_20 = bits, U32, 1628, [20:20], "false", "true" -unusedBit_539_21 = bits, U32, 1628, [21:21], "false", "true" -unusedBit_539_22 = bits, U32, 1628, [22:22], "false", "true" -unusedBit_539_23 = bits, U32, 1628, [23:23], "false", "true" -unusedBit_539_24 = bits, U32, 1628, [24:24], "false", "true" -unusedBit_539_25 = bits, U32, 1628, [25:25], "false", "true" -unusedBit_539_26 = bits, U32, 1628, [26:26], "false", "true" -unusedBit_539_27 = bits, U32, 1628, [27:27], "false", "true" -unusedBit_539_28 = bits, U32, 1628, [28:28], "false", "true" -unusedBit_539_29 = bits, U32, 1628, [29:29], "false", "true" -unusedBit_539_30 = bits, U32, 1628, [30:30], "false", "true" -unusedBit_539_31 = bits, U32, 1628, [31:31], "false", "true" +unusedBit_541_8 = bits, U32, 1628, [8:8], "false", "true" +unusedBit_541_9 = bits, U32, 1628, [9:9], "false", "true" +unusedBit_541_10 = bits, U32, 1628, [10:10], "false", "true" +unusedBit_541_11 = bits, U32, 1628, [11:11], "false", "true" +unusedBit_541_12 = bits, U32, 1628, [12:12], "false", "true" +unusedBit_541_13 = bits, U32, 1628, [13:13], "false", "true" +unusedBit_541_14 = bits, U32, 1628, [14:14], "false", "true" +unusedBit_541_15 = bits, U32, 1628, [15:15], "false", "true" +unusedBit_541_16 = bits, U32, 1628, [16:16], "false", "true" +unusedBit_541_17 = bits, U32, 1628, [17:17], "false", "true" +unusedBit_541_18 = bits, U32, 1628, [18:18], "false", "true" +unusedBit_541_19 = bits, U32, 1628, [19:19], "false", "true" +unusedBit_541_20 = bits, U32, 1628, [20:20], "false", "true" +unusedBit_541_21 = bits, U32, 1628, [21:21], "false", "true" +unusedBit_541_22 = bits, U32, 1628, [22:22], "false", "true" +unusedBit_541_23 = bits, U32, 1628, [23:23], "false", "true" +unusedBit_541_24 = bits, U32, 1628, [24:24], "false", "true" +unusedBit_541_25 = bits, U32, 1628, [25:25], "false", "true" +unusedBit_541_26 = bits, U32, 1628, [26:26], "false", "true" +unusedBit_541_27 = bits, U32, 1628, [27:27], "false", "true" +unusedBit_541_28 = bits, U32, 1628, [28:28], "false", "true" +unusedBit_541_29 = bits, U32, 1628, [29:29], "false", "true" +unusedBit_541_30 = bits, U32, 1628, [30:30], "false", "true" +unusedBit_541_31 = bits, U32, 1628, [31:31], "false", "true" benchTestOffTime = scalar, U08, 1632, "ms", 5.0, 0, 0, 2000, 1 benchTestCount = scalar, U08, 1633, "count", 1, 0, 0, 250, 1 benchTestOnTime = scalar, U08, 1634, "ms", 5.0, 0, 0, 2000, 1 @@ -1555,10 +1555,8 @@ ignBlends4_blendValues = array, U08, 22038, [8], "%", 0.5, 0, 0, 100, 1 compressionRatio = "Just for reference really, not taken into account by any logic at this point" triggerSimulatorPins1 = "Each rusEFI piece can provide synthetic trigger signal for external ECU. Sometimes these wires are routed back into trigger inputs of the same rusEFI board." triggerSimulatorPins2 = "Each rusEFI piece can provide synthetic trigger signal for external ECU. Sometimes these wires are routed back into trigger inputs of the same rusEFI board." - triggerSimulatorPins3 = "Each rusEFI piece can provide synthetic trigger signal for external ECU. Sometimes these wires are routed back into trigger inputs of the same rusEFI board." triggerSimulatorPinModes1 = "triggerSimulatorPinModes 1" triggerSimulatorPinModes2 = "triggerSimulatorPinModes 2" - triggerSimulatorPinModes3 = "triggerSimulatorPinModes 3" o2heaterPin = "Narrow band o2 heater, not used for CJ125. 'ON' if engine is running, 'OFF' if stopped or cranking. See wboHeaterPin" isSdCardEnabled = "enable sd/disable sd" rusefiVerbose29b = "Use 11 bit (standard) or 29 bit (extended) IDs for rusEFI verbose CAN format." @@ -6471,7 +6469,6 @@ dialog = wideband_stateDialog, "wideband_state" dialog = allPins1_1 field = "trigger stimulator pin #1", triggerSimulatorPins1 field = "trigger stimulator pin #2", triggerSimulatorPins2 - field = "trigger stimulator pin #2", triggerSimulatorPins3 field = "Warning Led", warningLedPin field = "tle6240_cs", tle6240_cs field = "tle6240 SPI", tle6240spiDevice @@ -7826,8 +7823,6 @@ dialog = tcuControls, "Transmission Settings" field = "trigger stimulator pin mode #1", triggerSimulatorPinModes1 field = "trigger stimulator pin #2", triggerSimulatorPins2 field = "trigger stimulator pin mode #2", triggerSimulatorPinModes2 - field = "trigger stimulator pin #3", triggerSimulatorPins3 - field = "trigger stimulator pin mode #3", triggerSimulatorPinModes3 field = "" field = "Logic input channel 1", logicAnalyzerPins1 field = "Logic input channel 2", logicAnalyzerPins2 diff --git a/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini b/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini index 2f8965c9e3..16c7043996 100644 --- a/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini +++ b/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.10.03.frankenso_na6.3818168747" + signature = "rusEFI 2022.10.03.frankenso_na6.4100070185" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.10.03.frankenso_na6.3818168747" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.10.03.frankenso_na6.4100070185" ; 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 @@ -86,7 +86,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Oct 03 04:24:32 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Oct 03 15:06:13 UTC 2022 pageSize = 22048 page = 1 @@ -336,10 +336,10 @@ tunerStudioSerialSpeed = scalar, U32, 740, "BPs", 1, 0, 0, 1000000, 0 compressionRatio = scalar, F32, 744, "CR", 1, 0, 0, 300, 1 triggerSimulatorPins1 = bits, U16, 748, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15" triggerSimulatorPins2 = bits, U16, 750, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15" -triggerSimulatorPins3 = bits, U16, 752, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15" +unusedTrig = scalar, U16, 752, "", 1, 0, 0, 100, 0 triggerSimulatorPinModes1 = bits, U08, 754, [0:1], "default", "default inverted", "open collector", "open collector inverted" triggerSimulatorPinModes2 = bits, U08, 755, [0:1], "default", "default inverted", "open collector", "open collector inverted" -triggerSimulatorPinModes3 = bits, U08, 756, [0:1], "default", "default inverted", "open collector", "open collector inverted" +unusedTrigMode = scalar, U08, 756, "", 1, 0, 0, 100, 0 o2heaterPin = bits, U16, 758, [0:7], 0="NONE",43="Coil 1F",80="Coil 1G",41="Coil 1H",76="Coil 1I",74="Coil 1L",78="Coil 1M",58="Coil 1O",59="Coil 1P",47="Injector 2M",57="Injector 2N",71="Injector 2O",72="Injector 2P",69="Injector 3S",70="Injector 3T",53="Injector 3U",68="Injector 3V",27="Injector 3W",55="Injector 3X",26="Injector 3Y",25="Injector 3Z" o2heaterPinModeTodO = bits, U08, 760, [0:1], "default", "default inverted", "open collector", "open collector inverted" is_enabled_spi_1 = bits, U32, 764, [0:0], "false", "true" @@ -763,30 +763,30 @@ unused1127 = bits, U32, 1628, [4:4], "false", "true" unused1128 = bits, U32, 1628, [5:5], "false", "true" unused1129 = bits, U32, 1628, [6:6], "false", "true" unused1130 = bits, U32, 1628, [7:7], "false", "true" -unusedBit_539_8 = bits, U32, 1628, [8:8], "false", "true" -unusedBit_539_9 = bits, U32, 1628, [9:9], "false", "true" -unusedBit_539_10 = bits, U32, 1628, [10:10], "false", "true" -unusedBit_539_11 = bits, U32, 1628, [11:11], "false", "true" -unusedBit_539_12 = bits, U32, 1628, [12:12], "false", "true" -unusedBit_539_13 = bits, U32, 1628, [13:13], "false", "true" -unusedBit_539_14 = bits, U32, 1628, [14:14], "false", "true" -unusedBit_539_15 = bits, U32, 1628, [15:15], "false", "true" -unusedBit_539_16 = bits, U32, 1628, [16:16], "false", "true" -unusedBit_539_17 = bits, U32, 1628, [17:17], "false", "true" -unusedBit_539_18 = bits, U32, 1628, [18:18], "false", "true" -unusedBit_539_19 = bits, U32, 1628, [19:19], "false", "true" -unusedBit_539_20 = bits, U32, 1628, [20:20], "false", "true" -unusedBit_539_21 = bits, U32, 1628, [21:21], "false", "true" -unusedBit_539_22 = bits, U32, 1628, [22:22], "false", "true" -unusedBit_539_23 = bits, U32, 1628, [23:23], "false", "true" -unusedBit_539_24 = bits, U32, 1628, [24:24], "false", "true" -unusedBit_539_25 = bits, U32, 1628, [25:25], "false", "true" -unusedBit_539_26 = bits, U32, 1628, [26:26], "false", "true" -unusedBit_539_27 = bits, U32, 1628, [27:27], "false", "true" -unusedBit_539_28 = bits, U32, 1628, [28:28], "false", "true" -unusedBit_539_29 = bits, U32, 1628, [29:29], "false", "true" -unusedBit_539_30 = bits, U32, 1628, [30:30], "false", "true" -unusedBit_539_31 = bits, U32, 1628, [31:31], "false", "true" +unusedBit_541_8 = bits, U32, 1628, [8:8], "false", "true" +unusedBit_541_9 = bits, U32, 1628, [9:9], "false", "true" +unusedBit_541_10 = bits, U32, 1628, [10:10], "false", "true" +unusedBit_541_11 = bits, U32, 1628, [11:11], "false", "true" +unusedBit_541_12 = bits, U32, 1628, [12:12], "false", "true" +unusedBit_541_13 = bits, U32, 1628, [13:13], "false", "true" +unusedBit_541_14 = bits, U32, 1628, [14:14], "false", "true" +unusedBit_541_15 = bits, U32, 1628, [15:15], "false", "true" +unusedBit_541_16 = bits, U32, 1628, [16:16], "false", "true" +unusedBit_541_17 = bits, U32, 1628, [17:17], "false", "true" +unusedBit_541_18 = bits, U32, 1628, [18:18], "false", "true" +unusedBit_541_19 = bits, U32, 1628, [19:19], "false", "true" +unusedBit_541_20 = bits, U32, 1628, [20:20], "false", "true" +unusedBit_541_21 = bits, U32, 1628, [21:21], "false", "true" +unusedBit_541_22 = bits, U32, 1628, [22:22], "false", "true" +unusedBit_541_23 = bits, U32, 1628, [23:23], "false", "true" +unusedBit_541_24 = bits, U32, 1628, [24:24], "false", "true" +unusedBit_541_25 = bits, U32, 1628, [25:25], "false", "true" +unusedBit_541_26 = bits, U32, 1628, [26:26], "false", "true" +unusedBit_541_27 = bits, U32, 1628, [27:27], "false", "true" +unusedBit_541_28 = bits, U32, 1628, [28:28], "false", "true" +unusedBit_541_29 = bits, U32, 1628, [29:29], "false", "true" +unusedBit_541_30 = bits, U32, 1628, [30:30], "false", "true" +unusedBit_541_31 = bits, U32, 1628, [31:31], "false", "true" benchTestOffTime = scalar, U08, 1632, "ms", 5.0, 0, 0, 2000, 1 benchTestCount = scalar, U08, 1633, "count", 1, 0, 0, 250, 1 benchTestOnTime = scalar, U08, 1634, "ms", 5.0, 0, 0, 2000, 1 @@ -1555,10 +1555,8 @@ ignBlends4_blendValues = array, U08, 22038, [8], "%", 0.5, 0, 0, 100, 1 compressionRatio = "Just for reference really, not taken into account by any logic at this point" triggerSimulatorPins1 = "Each rusEFI piece can provide synthetic trigger signal for external ECU. Sometimes these wires are routed back into trigger inputs of the same rusEFI board." triggerSimulatorPins2 = "Each rusEFI piece can provide synthetic trigger signal for external ECU. Sometimes these wires are routed back into trigger inputs of the same rusEFI board." - triggerSimulatorPins3 = "Each rusEFI piece can provide synthetic trigger signal for external ECU. Sometimes these wires are routed back into trigger inputs of the same rusEFI board." triggerSimulatorPinModes1 = "triggerSimulatorPinModes 1" triggerSimulatorPinModes2 = "triggerSimulatorPinModes 2" - triggerSimulatorPinModes3 = "triggerSimulatorPinModes 3" o2heaterPin = "Narrow band o2 heater, not used for CJ125. 'ON' if engine is running, 'OFF' if stopped or cranking. See wboHeaterPin" isSdCardEnabled = "enable sd/disable sd" rusefiVerbose29b = "Use 11 bit (standard) or 29 bit (extended) IDs for rusEFI verbose CAN format." @@ -6471,7 +6469,6 @@ dialog = wideband_stateDialog, "wideband_state" dialog = allPins1_1 field = "trigger stimulator pin #1", triggerSimulatorPins1 field = "trigger stimulator pin #2", triggerSimulatorPins2 - field = "trigger stimulator pin #2", triggerSimulatorPins3 field = "Warning Led", warningLedPin field = "tle6240_cs", tle6240_cs field = "tle6240 SPI", tle6240spiDevice @@ -7826,8 +7823,6 @@ dialog = tcuControls, "Transmission Settings" field = "trigger stimulator pin mode #1", triggerSimulatorPinModes1 field = "trigger stimulator pin #2", triggerSimulatorPins2 field = "trigger stimulator pin mode #2", triggerSimulatorPinModes2 - field = "trigger stimulator pin #3", triggerSimulatorPins3 - field = "trigger stimulator pin mode #3", triggerSimulatorPinModes3 field = "" field = "Logic input channel 1", logicAnalyzerPins1 field = "Logic input channel 2", logicAnalyzerPins2 diff --git a/firmware/tunerstudio/generated/rusefi_harley81.ini b/firmware/tunerstudio/generated/rusefi_harley81.ini index 249b170007..02d42679ce 100644 --- a/firmware/tunerstudio/generated/rusefi_harley81.ini +++ b/firmware/tunerstudio/generated/rusefi_harley81.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.10.03.harley81.1359304768" + signature = "rusEFI 2022.10.03.harley81.1190388418" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.10.03.harley81.1359304768" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.10.03.harley81.1190388418" ; 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 @@ -86,7 +86,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Oct 03 04:23:58 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Oct 03 15:05:40 UTC 2022 pageSize = 22048 page = 1 @@ -336,10 +336,10 @@ tunerStudioSerialSpeed = scalar, U32, 740, "BPs", 1, 0, 0, 1000000, 0 compressionRatio = scalar, F32, 744, "CR", 1, 0, 0, 300, 1 triggerSimulatorPins1 = bits, U16, 748, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15" triggerSimulatorPins2 = bits, U16, 750, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15" -triggerSimulatorPins3 = bits, U16, 752, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15" +unusedTrig = scalar, U16, 752, "", 1, 0, 0, 100, 0 triggerSimulatorPinModes1 = bits, U08, 754, [0:1], "default", "default inverted", "open collector", "open collector inverted" triggerSimulatorPinModes2 = bits, U08, 755, [0:1], "default", "default inverted", "open collector", "open collector inverted" -triggerSimulatorPinModes3 = bits, U08, 756, [0:1], "default", "default inverted", "open collector", "open collector inverted" +unusedTrigMode = scalar, U08, 756, "", 1, 0, 0, 100, 0 o2heaterPin = bits, U16, 758, [0:7], 0="NONE",65="1 Right Oil Cooling",47="24 Front Coil",52="25 Front ACR",64="4 Left Oil Fan",71="43 Rear Coil",105="6 Front Injector",112="61 Reverse Gear",103="63 Cooling Pump",106="7 Rear Injector",109="8 Rear ACR",101="auxMain",41="auxWastegate" o2heaterPinModeTodO = bits, U08, 760, [0:1], "default", "default inverted", "open collector", "open collector inverted" is_enabled_spi_1 = bits, U32, 764, [0:0], "false", "true" @@ -763,30 +763,30 @@ unused1127 = bits, U32, 1628, [4:4], "false", "true" unused1128 = bits, U32, 1628, [5:5], "false", "true" unused1129 = bits, U32, 1628, [6:6], "false", "true" unused1130 = bits, U32, 1628, [7:7], "false", "true" -unusedBit_539_8 = bits, U32, 1628, [8:8], "false", "true" -unusedBit_539_9 = bits, U32, 1628, [9:9], "false", "true" -unusedBit_539_10 = bits, U32, 1628, [10:10], "false", "true" -unusedBit_539_11 = bits, U32, 1628, [11:11], "false", "true" -unusedBit_539_12 = bits, U32, 1628, [12:12], "false", "true" -unusedBit_539_13 = bits, U32, 1628, [13:13], "false", "true" -unusedBit_539_14 = bits, U32, 1628, [14:14], "false", "true" -unusedBit_539_15 = bits, U32, 1628, [15:15], "false", "true" -unusedBit_539_16 = bits, U32, 1628, [16:16], "false", "true" -unusedBit_539_17 = bits, U32, 1628, [17:17], "false", "true" -unusedBit_539_18 = bits, U32, 1628, [18:18], "false", "true" -unusedBit_539_19 = bits, U32, 1628, [19:19], "false", "true" -unusedBit_539_20 = bits, U32, 1628, [20:20], "false", "true" -unusedBit_539_21 = bits, U32, 1628, [21:21], "false", "true" -unusedBit_539_22 = bits, U32, 1628, [22:22], "false", "true" -unusedBit_539_23 = bits, U32, 1628, [23:23], "false", "true" -unusedBit_539_24 = bits, U32, 1628, [24:24], "false", "true" -unusedBit_539_25 = bits, U32, 1628, [25:25], "false", "true" -unusedBit_539_26 = bits, U32, 1628, [26:26], "false", "true" -unusedBit_539_27 = bits, U32, 1628, [27:27], "false", "true" -unusedBit_539_28 = bits, U32, 1628, [28:28], "false", "true" -unusedBit_539_29 = bits, U32, 1628, [29:29], "false", "true" -unusedBit_539_30 = bits, U32, 1628, [30:30], "false", "true" -unusedBit_539_31 = bits, U32, 1628, [31:31], "false", "true" +unusedBit_541_8 = bits, U32, 1628, [8:8], "false", "true" +unusedBit_541_9 = bits, U32, 1628, [9:9], "false", "true" +unusedBit_541_10 = bits, U32, 1628, [10:10], "false", "true" +unusedBit_541_11 = bits, U32, 1628, [11:11], "false", "true" +unusedBit_541_12 = bits, U32, 1628, [12:12], "false", "true" +unusedBit_541_13 = bits, U32, 1628, [13:13], "false", "true" +unusedBit_541_14 = bits, U32, 1628, [14:14], "false", "true" +unusedBit_541_15 = bits, U32, 1628, [15:15], "false", "true" +unusedBit_541_16 = bits, U32, 1628, [16:16], "false", "true" +unusedBit_541_17 = bits, U32, 1628, [17:17], "false", "true" +unusedBit_541_18 = bits, U32, 1628, [18:18], "false", "true" +unusedBit_541_19 = bits, U32, 1628, [19:19], "false", "true" +unusedBit_541_20 = bits, U32, 1628, [20:20], "false", "true" +unusedBit_541_21 = bits, U32, 1628, [21:21], "false", "true" +unusedBit_541_22 = bits, U32, 1628, [22:22], "false", "true" +unusedBit_541_23 = bits, U32, 1628, [23:23], "false", "true" +unusedBit_541_24 = bits, U32, 1628, [24:24], "false", "true" +unusedBit_541_25 = bits, U32, 1628, [25:25], "false", "true" +unusedBit_541_26 = bits, U32, 1628, [26:26], "false", "true" +unusedBit_541_27 = bits, U32, 1628, [27:27], "false", "true" +unusedBit_541_28 = bits, U32, 1628, [28:28], "false", "true" +unusedBit_541_29 = bits, U32, 1628, [29:29], "false", "true" +unusedBit_541_30 = bits, U32, 1628, [30:30], "false", "true" +unusedBit_541_31 = bits, U32, 1628, [31:31], "false", "true" benchTestOffTime = scalar, U08, 1632, "ms", 5.0, 0, 0, 2000, 1 benchTestCount = scalar, U08, 1633, "count", 1, 0, 0, 250, 1 benchTestOnTime = scalar, U08, 1634, "ms", 5.0, 0, 0, 2000, 1 @@ -1555,10 +1555,8 @@ ignBlends4_blendValues = array, U08, 22038, [8], "%", 0.5, 0, 0, 100, 1 compressionRatio = "Just for reference really, not taken into account by any logic at this point" triggerSimulatorPins1 = "Each rusEFI piece can provide synthetic trigger signal for external ECU. Sometimes these wires are routed back into trigger inputs of the same rusEFI board." triggerSimulatorPins2 = "Each rusEFI piece can provide synthetic trigger signal for external ECU. Sometimes these wires are routed back into trigger inputs of the same rusEFI board." - triggerSimulatorPins3 = "Each rusEFI piece can provide synthetic trigger signal for external ECU. Sometimes these wires are routed back into trigger inputs of the same rusEFI board." triggerSimulatorPinModes1 = "triggerSimulatorPinModes 1" triggerSimulatorPinModes2 = "triggerSimulatorPinModes 2" - triggerSimulatorPinModes3 = "triggerSimulatorPinModes 3" o2heaterPin = "Narrow band o2 heater, not used for CJ125. 'ON' if engine is running, 'OFF' if stopped or cranking. See wboHeaterPin" isSdCardEnabled = "enable sd/disable sd" rusefiVerbose29b = "Use 11 bit (standard) or 29 bit (extended) IDs for rusEFI verbose CAN format." @@ -6465,7 +6463,6 @@ dialog = wideband_stateDialog, "wideband_state" dialog = allPins1_1 field = "trigger stimulator pin #1", triggerSimulatorPins1 field = "trigger stimulator pin #2", triggerSimulatorPins2 - field = "trigger stimulator pin #2", triggerSimulatorPins3 field = "Warning Led", warningLedPin field = "tle6240_cs", tle6240_cs field = "tle6240 SPI", tle6240spiDevice diff --git a/firmware/tunerstudio/generated/rusefi_hellen-gm-e67.ini b/firmware/tunerstudio/generated/rusefi_hellen-gm-e67.ini index 1f83bf4430..10e91c0c38 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen-gm-e67.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen-gm-e67.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.10.03.hellen-gm-e67.362797273" + signature = "rusEFI 2022.10.03.hellen-gm-e67.40460891" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.10.03.hellen-gm-e67.362797273" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.10.03.hellen-gm-e67.40460891" ; 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 @@ -86,7 +86,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Oct 03 04:24:17 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Oct 03 15:05:58 UTC 2022 pageSize = 22048 page = 1 @@ -336,10 +336,10 @@ tunerStudioSerialSpeed = scalar, U32, 740, "BPs", 1, 0, 0, 1000000, 0 compressionRatio = scalar, F32, 744, "CR", 1, 0, 0, 300, 1 triggerSimulatorPins1 = bits, U16, 748, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15" triggerSimulatorPins2 = bits, U16, 750, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15" -triggerSimulatorPins3 = bits, U16, 752, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15" +unusedTrig = scalar, U16, 752, "", 1, 0, 0, 100, 0 triggerSimulatorPinModes1 = bits, U08, 754, [0:1], "default", "default inverted", "open collector", "open collector inverted" triggerSimulatorPinModes2 = bits, U08, 755, [0:1], "default", "default inverted", "open collector", "open collector inverted" -triggerSimulatorPinModes3 = bits, U08, 756, [0:1], "default", "default inverted", "open collector", "open collector inverted" +unusedTrigMode = scalar, U08, 756, "", 1, 0, 0, 100, 0 o2heaterPin = bits, U16, 758, [0:7], 0="NONE",100="C1-12 Check Engine",52="C1-13 - Fuel Pump",65="C1-25 Tach",109="C1-26 - Starter Relay",64="C1-39 - VSS Output",112="C1-40 - MAIN",102="C1-56 - Starter Enable",47="C2-1 - IGN 1",61="C2-16 INJ 3",72="C2-17 - IGN 8",69="C2-18 - IGN 4",106="C2-32 INJ 2",27="C2-33 - IGN 7",68="C2-34 - IGN 5",96="C2-48 INJ 8",59="C2-49 INJ 5",94="C2-52 INJ 6",71="C2-53 - IGN 2",26="C2-54 - IGN 6",70="C2-55 - IGN 3",60="C2-70 INJ 4",95="C2-71 INJ 7",105="C2-72 INJ 1",111="C3-16 - Coolant Pump",10="C3-49 - Fan Relay",63="C3-7 - Alternator Enable",43="J4_4 Wastegate Solenoid",53="J4_5 Error Light",46="J7_1 AUX",45="J7_2 AUX",44="J7_3 AUX",17="J7_4 AUX",55="J7_5 AUX",56="J7_6 AUX",66="J7_7 AUX",67="J7_8 AUX" o2heaterPinModeTodO = bits, U08, 760, [0:1], "default", "default inverted", "open collector", "open collector inverted" is_enabled_spi_1 = bits, U32, 764, [0:0], "false", "true" @@ -763,30 +763,30 @@ unused1127 = bits, U32, 1628, [4:4], "false", "true" unused1128 = bits, U32, 1628, [5:5], "false", "true" unused1129 = bits, U32, 1628, [6:6], "false", "true" unused1130 = bits, U32, 1628, [7:7], "false", "true" -unusedBit_539_8 = bits, U32, 1628, [8:8], "false", "true" -unusedBit_539_9 = bits, U32, 1628, [9:9], "false", "true" -unusedBit_539_10 = bits, U32, 1628, [10:10], "false", "true" -unusedBit_539_11 = bits, U32, 1628, [11:11], "false", "true" -unusedBit_539_12 = bits, U32, 1628, [12:12], "false", "true" -unusedBit_539_13 = bits, U32, 1628, [13:13], "false", "true" -unusedBit_539_14 = bits, U32, 1628, [14:14], "false", "true" -unusedBit_539_15 = bits, U32, 1628, [15:15], "false", "true" -unusedBit_539_16 = bits, U32, 1628, [16:16], "false", "true" -unusedBit_539_17 = bits, U32, 1628, [17:17], "false", "true" -unusedBit_539_18 = bits, U32, 1628, [18:18], "false", "true" -unusedBit_539_19 = bits, U32, 1628, [19:19], "false", "true" -unusedBit_539_20 = bits, U32, 1628, [20:20], "false", "true" -unusedBit_539_21 = bits, U32, 1628, [21:21], "false", "true" -unusedBit_539_22 = bits, U32, 1628, [22:22], "false", "true" -unusedBit_539_23 = bits, U32, 1628, [23:23], "false", "true" -unusedBit_539_24 = bits, U32, 1628, [24:24], "false", "true" -unusedBit_539_25 = bits, U32, 1628, [25:25], "false", "true" -unusedBit_539_26 = bits, U32, 1628, [26:26], "false", "true" -unusedBit_539_27 = bits, U32, 1628, [27:27], "false", "true" -unusedBit_539_28 = bits, U32, 1628, [28:28], "false", "true" -unusedBit_539_29 = bits, U32, 1628, [29:29], "false", "true" -unusedBit_539_30 = bits, U32, 1628, [30:30], "false", "true" -unusedBit_539_31 = bits, U32, 1628, [31:31], "false", "true" +unusedBit_541_8 = bits, U32, 1628, [8:8], "false", "true" +unusedBit_541_9 = bits, U32, 1628, [9:9], "false", "true" +unusedBit_541_10 = bits, U32, 1628, [10:10], "false", "true" +unusedBit_541_11 = bits, U32, 1628, [11:11], "false", "true" +unusedBit_541_12 = bits, U32, 1628, [12:12], "false", "true" +unusedBit_541_13 = bits, U32, 1628, [13:13], "false", "true" +unusedBit_541_14 = bits, U32, 1628, [14:14], "false", "true" +unusedBit_541_15 = bits, U32, 1628, [15:15], "false", "true" +unusedBit_541_16 = bits, U32, 1628, [16:16], "false", "true" +unusedBit_541_17 = bits, U32, 1628, [17:17], "false", "true" +unusedBit_541_18 = bits, U32, 1628, [18:18], "false", "true" +unusedBit_541_19 = bits, U32, 1628, [19:19], "false", "true" +unusedBit_541_20 = bits, U32, 1628, [20:20], "false", "true" +unusedBit_541_21 = bits, U32, 1628, [21:21], "false", "true" +unusedBit_541_22 = bits, U32, 1628, [22:22], "false", "true" +unusedBit_541_23 = bits, U32, 1628, [23:23], "false", "true" +unusedBit_541_24 = bits, U32, 1628, [24:24], "false", "true" +unusedBit_541_25 = bits, U32, 1628, [25:25], "false", "true" +unusedBit_541_26 = bits, U32, 1628, [26:26], "false", "true" +unusedBit_541_27 = bits, U32, 1628, [27:27], "false", "true" +unusedBit_541_28 = bits, U32, 1628, [28:28], "false", "true" +unusedBit_541_29 = bits, U32, 1628, [29:29], "false", "true" +unusedBit_541_30 = bits, U32, 1628, [30:30], "false", "true" +unusedBit_541_31 = bits, U32, 1628, [31:31], "false", "true" benchTestOffTime = scalar, U08, 1632, "ms", 5.0, 0, 0, 2000, 1 benchTestCount = scalar, U08, 1633, "count", 1, 0, 0, 250, 1 benchTestOnTime = scalar, U08, 1634, "ms", 5.0, 0, 0, 2000, 1 @@ -1555,10 +1555,8 @@ ignBlends4_blendValues = array, U08, 22038, [8], "%", 0.5, 0, 0, 100, 1 compressionRatio = "Just for reference really, not taken into account by any logic at this point" triggerSimulatorPins1 = "Each rusEFI piece can provide synthetic trigger signal for external ECU. Sometimes these wires are routed back into trigger inputs of the same rusEFI board." triggerSimulatorPins2 = "Each rusEFI piece can provide synthetic trigger signal for external ECU. Sometimes these wires are routed back into trigger inputs of the same rusEFI board." - triggerSimulatorPins3 = "Each rusEFI piece can provide synthetic trigger signal for external ECU. Sometimes these wires are routed back into trigger inputs of the same rusEFI board." triggerSimulatorPinModes1 = "triggerSimulatorPinModes 1" triggerSimulatorPinModes2 = "triggerSimulatorPinModes 2" - triggerSimulatorPinModes3 = "triggerSimulatorPinModes 3" o2heaterPin = "Narrow band o2 heater, not used for CJ125. 'ON' if engine is running, 'OFF' if stopped or cranking. See wboHeaterPin" isSdCardEnabled = "enable sd/disable sd" rusefiVerbose29b = "Use 11 bit (standard) or 29 bit (extended) IDs for rusEFI verbose CAN format." @@ -6468,7 +6466,6 @@ dialog = wideband_stateDialog, "wideband_state" dialog = allPins1_1 field = "trigger stimulator pin #1", triggerSimulatorPins1 field = "trigger stimulator pin #2", triggerSimulatorPins2 - field = "trigger stimulator pin #2", triggerSimulatorPins3 field = "Warning Led", warningLedPin field = "tle6240_cs", tle6240_cs field = "tle6240 SPI", tle6240spiDevice diff --git a/firmware/tunerstudio/generated/rusefi_hellen-nb1.ini b/firmware/tunerstudio/generated/rusefi_hellen-nb1.ini index e7b8c0f69e..ede8fed60d 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen-nb1.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen-nb1.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.10.03.hellen-nb1.2020830371" + signature = "rusEFI 2022.10.03.hellen-nb1.1871042081" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.10.03.hellen-nb1.2020830371" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.10.03.hellen-nb1.1871042081" ; 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 @@ -86,7 +86,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Oct 03 04:24:15 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Oct 03 15:05:56 UTC 2022 pageSize = 22048 page = 1 @@ -336,10 +336,10 @@ tunerStudioSerialSpeed = scalar, U32, 740, "BPs", 1, 0, 0, 1000000, 0 compressionRatio = scalar, F32, 744, "CR", 1, 0, 0, 300, 1 triggerSimulatorPins1 = bits, U16, 748, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15" triggerSimulatorPins2 = bits, U16, 750, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15" -triggerSimulatorPins3 = bits, U16, 752, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15" +unusedTrig = scalar, U16, 752, "", 1, 0, 0, 100, 0 triggerSimulatorPinModes1 = bits, U08, 754, [0:1], "default", "default inverted", "open collector", "open collector inverted" triggerSimulatorPinModes2 = bits, U08, 755, [0:1], "default", "default inverted", "open collector", "open collector inverted" -triggerSimulatorPinModes3 = bits, U08, 756, [0:1], "default", "default inverted", "open collector", "open collector inverted" +unusedTrigMode = scalar, U08, 756, "", 1, 0, 0, 100, 0 o2heaterPin = bits, U16, 758, [0:7], 0="NONE",102="1E - Check Engine Light",11="1I AC Fan Relay",65="1O - ALTERN",110="1Q - Aternator Warning Lamp",62="1R - ECF",109="1S - AC Relay",53="1U - O2H",63="2K - TACH",100="2M US / 2P EUROPE - FPUMP",64="2Q - IDLE",35="3D - MAP",47="3G - IGN_1 (1&4)",71="3H - IGN_2 (2&3)",96="3Q - VICS",94="3T/4D - BOOST OUT",111="3V - O2H2",105="3W - INJ_1",106="3X - INJ_2",61="3Y - INJ_3",60="3Z - INJ_4",59="4E - VVT",41="ETB +",42="ETB -",40="ETB EN" o2heaterPinModeTodO = bits, U08, 760, [0:1], "default", "default inverted", "open collector", "open collector inverted" is_enabled_spi_1 = bits, U32, 764, [0:0], "false", "true" @@ -763,30 +763,30 @@ unused1127 = bits, U32, 1628, [4:4], "false", "true" unused1128 = bits, U32, 1628, [5:5], "false", "true" unused1129 = bits, U32, 1628, [6:6], "false", "true" unused1130 = bits, U32, 1628, [7:7], "false", "true" -unusedBit_539_8 = bits, U32, 1628, [8:8], "false", "true" -unusedBit_539_9 = bits, U32, 1628, [9:9], "false", "true" -unusedBit_539_10 = bits, U32, 1628, [10:10], "false", "true" -unusedBit_539_11 = bits, U32, 1628, [11:11], "false", "true" -unusedBit_539_12 = bits, U32, 1628, [12:12], "false", "true" -unusedBit_539_13 = bits, U32, 1628, [13:13], "false", "true" -unusedBit_539_14 = bits, U32, 1628, [14:14], "false", "true" -unusedBit_539_15 = bits, U32, 1628, [15:15], "false", "true" -unusedBit_539_16 = bits, U32, 1628, [16:16], "false", "true" -unusedBit_539_17 = bits, U32, 1628, [17:17], "false", "true" -unusedBit_539_18 = bits, U32, 1628, [18:18], "false", "true" -unusedBit_539_19 = bits, U32, 1628, [19:19], "false", "true" -unusedBit_539_20 = bits, U32, 1628, [20:20], "false", "true" -unusedBit_539_21 = bits, U32, 1628, [21:21], "false", "true" -unusedBit_539_22 = bits, U32, 1628, [22:22], "false", "true" -unusedBit_539_23 = bits, U32, 1628, [23:23], "false", "true" -unusedBit_539_24 = bits, U32, 1628, [24:24], "false", "true" -unusedBit_539_25 = bits, U32, 1628, [25:25], "false", "true" -unusedBit_539_26 = bits, U32, 1628, [26:26], "false", "true" -unusedBit_539_27 = bits, U32, 1628, [27:27], "false", "true" -unusedBit_539_28 = bits, U32, 1628, [28:28], "false", "true" -unusedBit_539_29 = bits, U32, 1628, [29:29], "false", "true" -unusedBit_539_30 = bits, U32, 1628, [30:30], "false", "true" -unusedBit_539_31 = bits, U32, 1628, [31:31], "false", "true" +unusedBit_541_8 = bits, U32, 1628, [8:8], "false", "true" +unusedBit_541_9 = bits, U32, 1628, [9:9], "false", "true" +unusedBit_541_10 = bits, U32, 1628, [10:10], "false", "true" +unusedBit_541_11 = bits, U32, 1628, [11:11], "false", "true" +unusedBit_541_12 = bits, U32, 1628, [12:12], "false", "true" +unusedBit_541_13 = bits, U32, 1628, [13:13], "false", "true" +unusedBit_541_14 = bits, U32, 1628, [14:14], "false", "true" +unusedBit_541_15 = bits, U32, 1628, [15:15], "false", "true" +unusedBit_541_16 = bits, U32, 1628, [16:16], "false", "true" +unusedBit_541_17 = bits, U32, 1628, [17:17], "false", "true" +unusedBit_541_18 = bits, U32, 1628, [18:18], "false", "true" +unusedBit_541_19 = bits, U32, 1628, [19:19], "false", "true" +unusedBit_541_20 = bits, U32, 1628, [20:20], "false", "true" +unusedBit_541_21 = bits, U32, 1628, [21:21], "false", "true" +unusedBit_541_22 = bits, U32, 1628, [22:22], "false", "true" +unusedBit_541_23 = bits, U32, 1628, [23:23], "false", "true" +unusedBit_541_24 = bits, U32, 1628, [24:24], "false", "true" +unusedBit_541_25 = bits, U32, 1628, [25:25], "false", "true" +unusedBit_541_26 = bits, U32, 1628, [26:26], "false", "true" +unusedBit_541_27 = bits, U32, 1628, [27:27], "false", "true" +unusedBit_541_28 = bits, U32, 1628, [28:28], "false", "true" +unusedBit_541_29 = bits, U32, 1628, [29:29], "false", "true" +unusedBit_541_30 = bits, U32, 1628, [30:30], "false", "true" +unusedBit_541_31 = bits, U32, 1628, [31:31], "false", "true" benchTestOffTime = scalar, U08, 1632, "ms", 5.0, 0, 0, 2000, 1 benchTestCount = scalar, U08, 1633, "count", 1, 0, 0, 250, 1 benchTestOnTime = scalar, U08, 1634, "ms", 5.0, 0, 0, 2000, 1 @@ -1555,10 +1555,8 @@ ignBlends4_blendValues = array, U08, 22038, [8], "%", 0.5, 0, 0, 100, 1 compressionRatio = "Just for reference really, not taken into account by any logic at this point" triggerSimulatorPins1 = "Each rusEFI piece can provide synthetic trigger signal for external ECU. Sometimes these wires are routed back into trigger inputs of the same rusEFI board." triggerSimulatorPins2 = "Each rusEFI piece can provide synthetic trigger signal for external ECU. Sometimes these wires are routed back into trigger inputs of the same rusEFI board." - triggerSimulatorPins3 = "Each rusEFI piece can provide synthetic trigger signal for external ECU. Sometimes these wires are routed back into trigger inputs of the same rusEFI board." triggerSimulatorPinModes1 = "triggerSimulatorPinModes 1" triggerSimulatorPinModes2 = "triggerSimulatorPinModes 2" - triggerSimulatorPinModes3 = "triggerSimulatorPinModes 3" o2heaterPin = "Narrow band o2 heater, not used for CJ125. 'ON' if engine is running, 'OFF' if stopped or cranking. See wboHeaterPin" isSdCardEnabled = "enable sd/disable sd" rusefiVerbose29b = "Use 11 bit (standard) or 29 bit (extended) IDs for rusEFI verbose CAN format." @@ -6468,7 +6466,6 @@ dialog = wideband_stateDialog, "wideband_state" dialog = allPins1_1 field = "trigger stimulator pin #1", triggerSimulatorPins1 field = "trigger stimulator pin #2", triggerSimulatorPins2 - field = "trigger stimulator pin #2", triggerSimulatorPins3 field = "Warning Led", warningLedPin field = "tle6240_cs", tle6240_cs field = "tle6240 SPI", tle6240spiDevice diff --git a/firmware/tunerstudio/generated/rusefi_hellen121nissan.ini b/firmware/tunerstudio/generated/rusefi_hellen121nissan.ini index ea737639d2..0726ec342a 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen121nissan.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen121nissan.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.10.03.hellen121nissan.690414981" + signature = "rusEFI 2022.10.03.hellen121nissan.1053843207" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.10.03.hellen121nissan.690414981" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.10.03.hellen121nissan.1053843207" ; 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 @@ -86,7 +86,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Oct 03 04:24:04 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Oct 03 15:05:46 UTC 2022 pageSize = 22048 page = 1 @@ -336,10 +336,10 @@ tunerStudioSerialSpeed = scalar, U32, 740, "BPs", 1, 0, 0, 1000000, 0 compressionRatio = scalar, F32, 744, "CR", 1, 0, 0, 300, 1 triggerSimulatorPins1 = bits, U16, 748, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15" triggerSimulatorPins2 = bits, U16, 750, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15" -triggerSimulatorPins3 = bits, U16, 752, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15" +unusedTrig = scalar, U16, 752, "", 1, 0, 0, 100, 0 triggerSimulatorPinModes1 = bits, U08, 754, [0:1], "default", "default inverted", "open collector", "open collector inverted" triggerSimulatorPinModes2 = bits, U08, 755, [0:1], "default", "default inverted", "open collector", "open collector inverted" -triggerSimulatorPinModes3 = bits, U08, 756, [0:1], "default", "default inverted", "open collector", "open collector inverted" +unusedTrigMode = scalar, U08, 756, "", 1, 0, 0, 100, 0 o2heaterPin = bits, U16, 758, [0:7], 0="NONE",95="10 - VTC Left",103="104 ETB Relay",96="11 - VTC Right",112="111 Main Relay",62="113 Fuel Pump Relay",59="21 - INJ_5",61="22 - INJ_3",105="23 - INJ_1",53="29 - VIAS",94="40 - INJ_6",60="41 - INJ_4",106="42 - INJ_2",68="60 - Coil 5",70="61 - Coil 3",47="62 - Coil 1",26="79 - Coil 6",69="80 - Coil 4",71="81 - Coil 2" o2heaterPinModeTodO = bits, U08, 760, [0:1], "default", "default inverted", "open collector", "open collector inverted" is_enabled_spi_1 = bits, U32, 764, [0:0], "false", "true" @@ -763,30 +763,30 @@ unused1127 = bits, U32, 1628, [4:4], "false", "true" unused1128 = bits, U32, 1628, [5:5], "false", "true" unused1129 = bits, U32, 1628, [6:6], "false", "true" unused1130 = bits, U32, 1628, [7:7], "false", "true" -unusedBit_539_8 = bits, U32, 1628, [8:8], "false", "true" -unusedBit_539_9 = bits, U32, 1628, [9:9], "false", "true" -unusedBit_539_10 = bits, U32, 1628, [10:10], "false", "true" -unusedBit_539_11 = bits, U32, 1628, [11:11], "false", "true" -unusedBit_539_12 = bits, U32, 1628, [12:12], "false", "true" -unusedBit_539_13 = bits, U32, 1628, [13:13], "false", "true" -unusedBit_539_14 = bits, U32, 1628, [14:14], "false", "true" -unusedBit_539_15 = bits, U32, 1628, [15:15], "false", "true" -unusedBit_539_16 = bits, U32, 1628, [16:16], "false", "true" -unusedBit_539_17 = bits, U32, 1628, [17:17], "false", "true" -unusedBit_539_18 = bits, U32, 1628, [18:18], "false", "true" -unusedBit_539_19 = bits, U32, 1628, [19:19], "false", "true" -unusedBit_539_20 = bits, U32, 1628, [20:20], "false", "true" -unusedBit_539_21 = bits, U32, 1628, [21:21], "false", "true" -unusedBit_539_22 = bits, U32, 1628, [22:22], "false", "true" -unusedBit_539_23 = bits, U32, 1628, [23:23], "false", "true" -unusedBit_539_24 = bits, U32, 1628, [24:24], "false", "true" -unusedBit_539_25 = bits, U32, 1628, [25:25], "false", "true" -unusedBit_539_26 = bits, U32, 1628, [26:26], "false", "true" -unusedBit_539_27 = bits, U32, 1628, [27:27], "false", "true" -unusedBit_539_28 = bits, U32, 1628, [28:28], "false", "true" -unusedBit_539_29 = bits, U32, 1628, [29:29], "false", "true" -unusedBit_539_30 = bits, U32, 1628, [30:30], "false", "true" -unusedBit_539_31 = bits, U32, 1628, [31:31], "false", "true" +unusedBit_541_8 = bits, U32, 1628, [8:8], "false", "true" +unusedBit_541_9 = bits, U32, 1628, [9:9], "false", "true" +unusedBit_541_10 = bits, U32, 1628, [10:10], "false", "true" +unusedBit_541_11 = bits, U32, 1628, [11:11], "false", "true" +unusedBit_541_12 = bits, U32, 1628, [12:12], "false", "true" +unusedBit_541_13 = bits, U32, 1628, [13:13], "false", "true" +unusedBit_541_14 = bits, U32, 1628, [14:14], "false", "true" +unusedBit_541_15 = bits, U32, 1628, [15:15], "false", "true" +unusedBit_541_16 = bits, U32, 1628, [16:16], "false", "true" +unusedBit_541_17 = bits, U32, 1628, [17:17], "false", "true" +unusedBit_541_18 = bits, U32, 1628, [18:18], "false", "true" +unusedBit_541_19 = bits, U32, 1628, [19:19], "false", "true" +unusedBit_541_20 = bits, U32, 1628, [20:20], "false", "true" +unusedBit_541_21 = bits, U32, 1628, [21:21], "false", "true" +unusedBit_541_22 = bits, U32, 1628, [22:22], "false", "true" +unusedBit_541_23 = bits, U32, 1628, [23:23], "false", "true" +unusedBit_541_24 = bits, U32, 1628, [24:24], "false", "true" +unusedBit_541_25 = bits, U32, 1628, [25:25], "false", "true" +unusedBit_541_26 = bits, U32, 1628, [26:26], "false", "true" +unusedBit_541_27 = bits, U32, 1628, [27:27], "false", "true" +unusedBit_541_28 = bits, U32, 1628, [28:28], "false", "true" +unusedBit_541_29 = bits, U32, 1628, [29:29], "false", "true" +unusedBit_541_30 = bits, U32, 1628, [30:30], "false", "true" +unusedBit_541_31 = bits, U32, 1628, [31:31], "false", "true" benchTestOffTime = scalar, U08, 1632, "ms", 5.0, 0, 0, 2000, 1 benchTestCount = scalar, U08, 1633, "count", 1, 0, 0, 250, 1 benchTestOnTime = scalar, U08, 1634, "ms", 5.0, 0, 0, 2000, 1 @@ -1555,10 +1555,8 @@ ignBlends4_blendValues = array, U08, 22038, [8], "%", 0.5, 0, 0, 100, 1 compressionRatio = "Just for reference really, not taken into account by any logic at this point" triggerSimulatorPins1 = "Each rusEFI piece can provide synthetic trigger signal for external ECU. Sometimes these wires are routed back into trigger inputs of the same rusEFI board." triggerSimulatorPins2 = "Each rusEFI piece can provide synthetic trigger signal for external ECU. Sometimes these wires are routed back into trigger inputs of the same rusEFI board." - triggerSimulatorPins3 = "Each rusEFI piece can provide synthetic trigger signal for external ECU. Sometimes these wires are routed back into trigger inputs of the same rusEFI board." triggerSimulatorPinModes1 = "triggerSimulatorPinModes 1" triggerSimulatorPinModes2 = "triggerSimulatorPinModes 2" - triggerSimulatorPinModes3 = "triggerSimulatorPinModes 3" o2heaterPin = "Narrow band o2 heater, not used for CJ125. 'ON' if engine is running, 'OFF' if stopped or cranking. See wboHeaterPin" isSdCardEnabled = "enable sd/disable sd" rusefiVerbose29b = "Use 11 bit (standard) or 29 bit (extended) IDs for rusEFI verbose CAN format." @@ -6465,7 +6463,6 @@ dialog = wideband_stateDialog, "wideband_state" dialog = allPins1_1 field = "trigger stimulator pin #1", triggerSimulatorPins1 field = "trigger stimulator pin #2", triggerSimulatorPins2 - field = "trigger stimulator pin #2", triggerSimulatorPins3 field = "Warning Led", warningLedPin field = "tle6240_cs", tle6240_cs field = "tle6240 SPI", tle6240spiDevice diff --git a/firmware/tunerstudio/generated/rusefi_hellen121vag.ini b/firmware/tunerstudio/generated/rusefi_hellen121vag.ini index 7dbd3a2204..72303180d3 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen121vag.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen121vag.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.10.03.hellen121vag.3520699925" + signature = "rusEFI 2022.10.03.hellen121vag.3324978327" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.10.03.hellen121vag.3520699925" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.10.03.hellen121vag.3324978327" ; 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 @@ -86,7 +86,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Oct 03 04:24:02 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Oct 03 15:05:44 UTC 2022 pageSize = 22048 page = 1 @@ -336,10 +336,10 @@ tunerStudioSerialSpeed = scalar, U32, 740, "BPs", 1, 0, 0, 1000000, 0 compressionRatio = scalar, F32, 744, "CR", 1, 0, 0, 300, 1 triggerSimulatorPins1 = bits, U16, 748, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15" triggerSimulatorPins2 = bits, U16, 750, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15" -triggerSimulatorPins3 = bits, U16, 752, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15" +unusedTrig = scalar, U16, 752, "", 1, 0, 0, 100, 0 triggerSimulatorPinModes1 = bits, U08, 754, [0:1], "default", "default inverted", "open collector", "open collector inverted" triggerSimulatorPinModes2 = bits, U08, 755, [0:1], "default", "default inverted", "open collector", "open collector inverted" -triggerSimulatorPinModes3 = bits, U08, 756, [0:1], "default", "default inverted", "open collector", "open collector inverted" +unusedTrigMode = scalar, U08, 756, "", 1, 0, 0, 100, 0 o2heaterPin = bits, U16, 758, [0:7], 0="NONE",35="101 - MAP2",138="102 - IGN_1",68="103 - IGN_5",11="104 Wastegate",64="105 - IDLE rev A,B",103="105 - IDLE rev C+",135="110 - IGN_6",70="111 - IGN_3",94="112 INJ 6",59="113 INJ 5",101="115 - VVT1_2",40="117 ETB_OUT+",41="118 ETB_OUT-",42="120 - VVT2 B2",43="18 - VVT2 B1",95="19 - INJ 7",130="22 - VVT1 1",96="24 - INJ 8",63="37 - TACH",102="47 - CEL",128="65 - Fuel Pump",71="7 - IGN_2",136="8 - IGN_7",60="88 - INJ_4",106="89 - INJ_2",69="94 - IGN_4",137="95 - IGN_8",105="96 - INJ_1",61="97 - INJ_3",132="Main Relay" o2heaterPinModeTodO = bits, U08, 760, [0:1], "default", "default inverted", "open collector", "open collector inverted" is_enabled_spi_1 = bits, U32, 764, [0:0], "false", "true" @@ -763,30 +763,30 @@ unused1127 = bits, U32, 1628, [4:4], "false", "true" unused1128 = bits, U32, 1628, [5:5], "false", "true" unused1129 = bits, U32, 1628, [6:6], "false", "true" unused1130 = bits, U32, 1628, [7:7], "false", "true" -unusedBit_539_8 = bits, U32, 1628, [8:8], "false", "true" -unusedBit_539_9 = bits, U32, 1628, [9:9], "false", "true" -unusedBit_539_10 = bits, U32, 1628, [10:10], "false", "true" -unusedBit_539_11 = bits, U32, 1628, [11:11], "false", "true" -unusedBit_539_12 = bits, U32, 1628, [12:12], "false", "true" -unusedBit_539_13 = bits, U32, 1628, [13:13], "false", "true" -unusedBit_539_14 = bits, U32, 1628, [14:14], "false", "true" -unusedBit_539_15 = bits, U32, 1628, [15:15], "false", "true" -unusedBit_539_16 = bits, U32, 1628, [16:16], "false", "true" -unusedBit_539_17 = bits, U32, 1628, [17:17], "false", "true" -unusedBit_539_18 = bits, U32, 1628, [18:18], "false", "true" -unusedBit_539_19 = bits, U32, 1628, [19:19], "false", "true" -unusedBit_539_20 = bits, U32, 1628, [20:20], "false", "true" -unusedBit_539_21 = bits, U32, 1628, [21:21], "false", "true" -unusedBit_539_22 = bits, U32, 1628, [22:22], "false", "true" -unusedBit_539_23 = bits, U32, 1628, [23:23], "false", "true" -unusedBit_539_24 = bits, U32, 1628, [24:24], "false", "true" -unusedBit_539_25 = bits, U32, 1628, [25:25], "false", "true" -unusedBit_539_26 = bits, U32, 1628, [26:26], "false", "true" -unusedBit_539_27 = bits, U32, 1628, [27:27], "false", "true" -unusedBit_539_28 = bits, U32, 1628, [28:28], "false", "true" -unusedBit_539_29 = bits, U32, 1628, [29:29], "false", "true" -unusedBit_539_30 = bits, U32, 1628, [30:30], "false", "true" -unusedBit_539_31 = bits, U32, 1628, [31:31], "false", "true" +unusedBit_541_8 = bits, U32, 1628, [8:8], "false", "true" +unusedBit_541_9 = bits, U32, 1628, [9:9], "false", "true" +unusedBit_541_10 = bits, U32, 1628, [10:10], "false", "true" +unusedBit_541_11 = bits, U32, 1628, [11:11], "false", "true" +unusedBit_541_12 = bits, U32, 1628, [12:12], "false", "true" +unusedBit_541_13 = bits, U32, 1628, [13:13], "false", "true" +unusedBit_541_14 = bits, U32, 1628, [14:14], "false", "true" +unusedBit_541_15 = bits, U32, 1628, [15:15], "false", "true" +unusedBit_541_16 = bits, U32, 1628, [16:16], "false", "true" +unusedBit_541_17 = bits, U32, 1628, [17:17], "false", "true" +unusedBit_541_18 = bits, U32, 1628, [18:18], "false", "true" +unusedBit_541_19 = bits, U32, 1628, [19:19], "false", "true" +unusedBit_541_20 = bits, U32, 1628, [20:20], "false", "true" +unusedBit_541_21 = bits, U32, 1628, [21:21], "false", "true" +unusedBit_541_22 = bits, U32, 1628, [22:22], "false", "true" +unusedBit_541_23 = bits, U32, 1628, [23:23], "false", "true" +unusedBit_541_24 = bits, U32, 1628, [24:24], "false", "true" +unusedBit_541_25 = bits, U32, 1628, [25:25], "false", "true" +unusedBit_541_26 = bits, U32, 1628, [26:26], "false", "true" +unusedBit_541_27 = bits, U32, 1628, [27:27], "false", "true" +unusedBit_541_28 = bits, U32, 1628, [28:28], "false", "true" +unusedBit_541_29 = bits, U32, 1628, [29:29], "false", "true" +unusedBit_541_30 = bits, U32, 1628, [30:30], "false", "true" +unusedBit_541_31 = bits, U32, 1628, [31:31], "false", "true" benchTestOffTime = scalar, U08, 1632, "ms", 5.0, 0, 0, 2000, 1 benchTestCount = scalar, U08, 1633, "count", 1, 0, 0, 250, 1 benchTestOnTime = scalar, U08, 1634, "ms", 5.0, 0, 0, 2000, 1 @@ -1555,10 +1555,8 @@ ignBlends4_blendValues = array, U08, 22038, [8], "%", 0.5, 0, 0, 100, 1 compressionRatio = "Just for reference really, not taken into account by any logic at this point" triggerSimulatorPins1 = "Each rusEFI piece can provide synthetic trigger signal for external ECU. Sometimes these wires are routed back into trigger inputs of the same rusEFI board." triggerSimulatorPins2 = "Each rusEFI piece can provide synthetic trigger signal for external ECU. Sometimes these wires are routed back into trigger inputs of the same rusEFI board." - triggerSimulatorPins3 = "Each rusEFI piece can provide synthetic trigger signal for external ECU. Sometimes these wires are routed back into trigger inputs of the same rusEFI board." triggerSimulatorPinModes1 = "triggerSimulatorPinModes 1" triggerSimulatorPinModes2 = "triggerSimulatorPinModes 2" - triggerSimulatorPinModes3 = "triggerSimulatorPinModes 3" o2heaterPin = "Narrow band o2 heater, not used for CJ125. 'ON' if engine is running, 'OFF' if stopped or cranking. See wboHeaterPin" isSdCardEnabled = "enable sd/disable sd" rusefiVerbose29b = "Use 11 bit (standard) or 29 bit (extended) IDs for rusEFI verbose CAN format." @@ -6468,7 +6466,6 @@ dialog = wideband_stateDialog, "wideband_state" dialog = allPins1_1 field = "trigger stimulator pin #1", triggerSimulatorPins1 field = "trigger stimulator pin #2", triggerSimulatorPins2 - field = "trigger stimulator pin #2", triggerSimulatorPins3 field = "Warning Led", warningLedPin field = "tle6240_cs", tle6240_cs field = "tle6240 SPI", tle6240spiDevice diff --git a/firmware/tunerstudio/generated/rusefi_hellen128mercedes.ini b/firmware/tunerstudio/generated/rusefi_hellen128mercedes.ini index 8c6aa4b9b6..5d74246603 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen128mercedes.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen128mercedes.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.10.03.hellen128.1594253393" + signature = "rusEFI 2022.10.03.hellen128.1223744211" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.10.03.hellen128.1594253393" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.10.03.hellen128.1223744211" ; 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 @@ -86,7 +86,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Oct 03 04:24:00 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Oct 03 15:05:42 UTC 2022 pageSize = 22048 page = 1 @@ -336,10 +336,10 @@ tunerStudioSerialSpeed = scalar, U32, 740, "BPs", 1, 0, 0, 1000000, 0 compressionRatio = scalar, F32, 744, "CR", 1, 0, 0, 300, 1 triggerSimulatorPins1 = bits, U16, 748, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15" triggerSimulatorPins2 = bits, U16, 750, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15" -triggerSimulatorPins3 = bits, U16, 752, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15" +unusedTrig = scalar, U16, 752, "", 1, 0, 0, 100, 0 triggerSimulatorPinModes1 = bits, U08, 754, [0:1], "default", "default inverted", "open collector", "open collector inverted" triggerSimulatorPinModes2 = bits, U08, 755, [0:1], "default", "default inverted", "open collector", "open collector inverted" -triggerSimulatorPinModes3 = bits, U08, 756, [0:1], "default", "default inverted", "open collector", "open collector inverted" +unusedTrigMode = scalar, U08, 756, "", 1, 0, 0, 100, 0 o2heaterPin = bits, U16, 758, [0:7], 0="NONE",62="A6 - Fan Control",128="C21 - Evap Purge Control",65="C29 - Fuel Pump",105="E1 - LS1",59="E13 - INJ 4",94="E14 - INJ 2",106="E2- LS2",95="E25 - INJ 1",96="E26 - INJ 3",61="E3 - LS3",60="E4 - LS4/VVT",137="F11 - IGN 8",69="F13 - IGN 4",71="F16 - IGN 2",135="F17 - IGN 6",138="F20 - IGN 1",68="F4 - IGN 5",70="F6 - IGN 3",136="F9 - IGN 7",10="P18_OUT_PP2",131="P19_OUT_LOW11",43="P33_PWM5",129="P34_OUT_LOW8",130="P35_OUT_LOW9" o2heaterPinModeTodO = bits, U08, 760, [0:1], "default", "default inverted", "open collector", "open collector inverted" is_enabled_spi_1 = bits, U32, 764, [0:0], "false", "true" @@ -763,30 +763,30 @@ unused1127 = bits, U32, 1628, [4:4], "false", "true" unused1128 = bits, U32, 1628, [5:5], "false", "true" unused1129 = bits, U32, 1628, [6:6], "false", "true" unused1130 = bits, U32, 1628, [7:7], "false", "true" -unusedBit_539_8 = bits, U32, 1628, [8:8], "false", "true" -unusedBit_539_9 = bits, U32, 1628, [9:9], "false", "true" -unusedBit_539_10 = bits, U32, 1628, [10:10], "false", "true" -unusedBit_539_11 = bits, U32, 1628, [11:11], "false", "true" -unusedBit_539_12 = bits, U32, 1628, [12:12], "false", "true" -unusedBit_539_13 = bits, U32, 1628, [13:13], "false", "true" -unusedBit_539_14 = bits, U32, 1628, [14:14], "false", "true" -unusedBit_539_15 = bits, U32, 1628, [15:15], "false", "true" -unusedBit_539_16 = bits, U32, 1628, [16:16], "false", "true" -unusedBit_539_17 = bits, U32, 1628, [17:17], "false", "true" -unusedBit_539_18 = bits, U32, 1628, [18:18], "false", "true" -unusedBit_539_19 = bits, U32, 1628, [19:19], "false", "true" -unusedBit_539_20 = bits, U32, 1628, [20:20], "false", "true" -unusedBit_539_21 = bits, U32, 1628, [21:21], "false", "true" -unusedBit_539_22 = bits, U32, 1628, [22:22], "false", "true" -unusedBit_539_23 = bits, U32, 1628, [23:23], "false", "true" -unusedBit_539_24 = bits, U32, 1628, [24:24], "false", "true" -unusedBit_539_25 = bits, U32, 1628, [25:25], "false", "true" -unusedBit_539_26 = bits, U32, 1628, [26:26], "false", "true" -unusedBit_539_27 = bits, U32, 1628, [27:27], "false", "true" -unusedBit_539_28 = bits, U32, 1628, [28:28], "false", "true" -unusedBit_539_29 = bits, U32, 1628, [29:29], "false", "true" -unusedBit_539_30 = bits, U32, 1628, [30:30], "false", "true" -unusedBit_539_31 = bits, U32, 1628, [31:31], "false", "true" +unusedBit_541_8 = bits, U32, 1628, [8:8], "false", "true" +unusedBit_541_9 = bits, U32, 1628, [9:9], "false", "true" +unusedBit_541_10 = bits, U32, 1628, [10:10], "false", "true" +unusedBit_541_11 = bits, U32, 1628, [11:11], "false", "true" +unusedBit_541_12 = bits, U32, 1628, [12:12], "false", "true" +unusedBit_541_13 = bits, U32, 1628, [13:13], "false", "true" +unusedBit_541_14 = bits, U32, 1628, [14:14], "false", "true" +unusedBit_541_15 = bits, U32, 1628, [15:15], "false", "true" +unusedBit_541_16 = bits, U32, 1628, [16:16], "false", "true" +unusedBit_541_17 = bits, U32, 1628, [17:17], "false", "true" +unusedBit_541_18 = bits, U32, 1628, [18:18], "false", "true" +unusedBit_541_19 = bits, U32, 1628, [19:19], "false", "true" +unusedBit_541_20 = bits, U32, 1628, [20:20], "false", "true" +unusedBit_541_21 = bits, U32, 1628, [21:21], "false", "true" +unusedBit_541_22 = bits, U32, 1628, [22:22], "false", "true" +unusedBit_541_23 = bits, U32, 1628, [23:23], "false", "true" +unusedBit_541_24 = bits, U32, 1628, [24:24], "false", "true" +unusedBit_541_25 = bits, U32, 1628, [25:25], "false", "true" +unusedBit_541_26 = bits, U32, 1628, [26:26], "false", "true" +unusedBit_541_27 = bits, U32, 1628, [27:27], "false", "true" +unusedBit_541_28 = bits, U32, 1628, [28:28], "false", "true" +unusedBit_541_29 = bits, U32, 1628, [29:29], "false", "true" +unusedBit_541_30 = bits, U32, 1628, [30:30], "false", "true" +unusedBit_541_31 = bits, U32, 1628, [31:31], "false", "true" benchTestOffTime = scalar, U08, 1632, "ms", 5.0, 0, 0, 2000, 1 benchTestCount = scalar, U08, 1633, "count", 1, 0, 0, 250, 1 benchTestOnTime = scalar, U08, 1634, "ms", 5.0, 0, 0, 2000, 1 @@ -1555,10 +1555,8 @@ ignBlends4_blendValues = array, U08, 22038, [8], "%", 0.5, 0, 0, 100, 1 compressionRatio = "Just for reference really, not taken into account by any logic at this point" triggerSimulatorPins1 = "Each rusEFI piece can provide synthetic trigger signal for external ECU. Sometimes these wires are routed back into trigger inputs of the same rusEFI board." triggerSimulatorPins2 = "Each rusEFI piece can provide synthetic trigger signal for external ECU. Sometimes these wires are routed back into trigger inputs of the same rusEFI board." - triggerSimulatorPins3 = "Each rusEFI piece can provide synthetic trigger signal for external ECU. Sometimes these wires are routed back into trigger inputs of the same rusEFI board." triggerSimulatorPinModes1 = "triggerSimulatorPinModes 1" triggerSimulatorPinModes2 = "triggerSimulatorPinModes 2" - triggerSimulatorPinModes3 = "triggerSimulatorPinModes 3" o2heaterPin = "Narrow band o2 heater, not used for CJ125. 'ON' if engine is running, 'OFF' if stopped or cranking. See wboHeaterPin" isSdCardEnabled = "enable sd/disable sd" rusefiVerbose29b = "Use 11 bit (standard) or 29 bit (extended) IDs for rusEFI verbose CAN format." @@ -6465,7 +6463,6 @@ dialog = wideband_stateDialog, "wideband_state" dialog = allPins1_1 field = "trigger stimulator pin #1", triggerSimulatorPins1 field = "trigger stimulator pin #2", triggerSimulatorPins2 - field = "trigger stimulator pin #2", triggerSimulatorPins3 field = "Warning Led", warningLedPin field = "tle6240_cs", tle6240_cs field = "tle6240 SPI", tle6240spiDevice diff --git a/firmware/tunerstudio/generated/rusefi_hellen154hyundai.ini b/firmware/tunerstudio/generated/rusefi_hellen154hyundai.ini index 25826c5637..ef98829cfd 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen154hyundai.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen154hyundai.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.10.03.hellen154hyundai.245049757" + signature = "rusEFI 2022.10.03.hellen154hyundai.426611487" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.10.03.hellen154hyundai.245049757" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.10.03.hellen154hyundai.426611487" ; 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 @@ -86,7 +86,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Oct 03 04:24:06 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Oct 03 15:05:48 UTC 2022 pageSize = 22048 page = 1 @@ -336,10 +336,10 @@ tunerStudioSerialSpeed = scalar, U32, 740, "BPs", 1, 0, 0, 1000000, 0 compressionRatio = scalar, F32, 744, "CR", 1, 0, 0, 300, 1 triggerSimulatorPins1 = bits, U16, 748, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15" triggerSimulatorPins2 = bits, U16, 750, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15" -triggerSimulatorPins3 = bits, U16, 752, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15" +unusedTrig = scalar, U16, 752, "", 1, 0, 0, 100, 0 triggerSimulatorPinModes1 = bits, U08, 754, [0:1], "default", "default inverted", "open collector", "open collector inverted" triggerSimulatorPinModes2 = bits, U08, 755, [0:1], "default", "default inverted", "open collector", "open collector inverted" -triggerSimulatorPinModes3 = bits, U08, 756, [0:1], "default", "default inverted", "open collector", "open collector inverted" +unusedTrigMode = scalar, U08, 756, "", 1, 0, 0, 100, 0 o2heaterPin = bits, U16, 758, [0:7], 0="NONE",53="Aux P66",11="Aux P67",103="Aux P68",47="Coil 1",71="Coil 2",70="Coil 3",69="Coil 4",102="Fan Relay HI",101="Fan Relay Low",111="Fuel Pump K70",105="INJ_1 k25",106="INJ_2 k26",61="INJ_3 k27",60="INJ_4 k28",95="K47 BK1 Wastegate Solenoid",96="K48 LS1",110="K87 AC Relay",62="MIL",112="Main Relay K64",65="Tacho",59="VVT1",94="VVT2" o2heaterPinModeTodO = bits, U08, 760, [0:1], "default", "default inverted", "open collector", "open collector inverted" is_enabled_spi_1 = bits, U32, 764, [0:0], "false", "true" @@ -763,30 +763,30 @@ unused1127 = bits, U32, 1628, [4:4], "false", "true" unused1128 = bits, U32, 1628, [5:5], "false", "true" unused1129 = bits, U32, 1628, [6:6], "false", "true" unused1130 = bits, U32, 1628, [7:7], "false", "true" -unusedBit_539_8 = bits, U32, 1628, [8:8], "false", "true" -unusedBit_539_9 = bits, U32, 1628, [9:9], "false", "true" -unusedBit_539_10 = bits, U32, 1628, [10:10], "false", "true" -unusedBit_539_11 = bits, U32, 1628, [11:11], "false", "true" -unusedBit_539_12 = bits, U32, 1628, [12:12], "false", "true" -unusedBit_539_13 = bits, U32, 1628, [13:13], "false", "true" -unusedBit_539_14 = bits, U32, 1628, [14:14], "false", "true" -unusedBit_539_15 = bits, U32, 1628, [15:15], "false", "true" -unusedBit_539_16 = bits, U32, 1628, [16:16], "false", "true" -unusedBit_539_17 = bits, U32, 1628, [17:17], "false", "true" -unusedBit_539_18 = bits, U32, 1628, [18:18], "false", "true" -unusedBit_539_19 = bits, U32, 1628, [19:19], "false", "true" -unusedBit_539_20 = bits, U32, 1628, [20:20], "false", "true" -unusedBit_539_21 = bits, U32, 1628, [21:21], "false", "true" -unusedBit_539_22 = bits, U32, 1628, [22:22], "false", "true" -unusedBit_539_23 = bits, U32, 1628, [23:23], "false", "true" -unusedBit_539_24 = bits, U32, 1628, [24:24], "false", "true" -unusedBit_539_25 = bits, U32, 1628, [25:25], "false", "true" -unusedBit_539_26 = bits, U32, 1628, [26:26], "false", "true" -unusedBit_539_27 = bits, U32, 1628, [27:27], "false", "true" -unusedBit_539_28 = bits, U32, 1628, [28:28], "false", "true" -unusedBit_539_29 = bits, U32, 1628, [29:29], "false", "true" -unusedBit_539_30 = bits, U32, 1628, [30:30], "false", "true" -unusedBit_539_31 = bits, U32, 1628, [31:31], "false", "true" +unusedBit_541_8 = bits, U32, 1628, [8:8], "false", "true" +unusedBit_541_9 = bits, U32, 1628, [9:9], "false", "true" +unusedBit_541_10 = bits, U32, 1628, [10:10], "false", "true" +unusedBit_541_11 = bits, U32, 1628, [11:11], "false", "true" +unusedBit_541_12 = bits, U32, 1628, [12:12], "false", "true" +unusedBit_541_13 = bits, U32, 1628, [13:13], "false", "true" +unusedBit_541_14 = bits, U32, 1628, [14:14], "false", "true" +unusedBit_541_15 = bits, U32, 1628, [15:15], "false", "true" +unusedBit_541_16 = bits, U32, 1628, [16:16], "false", "true" +unusedBit_541_17 = bits, U32, 1628, [17:17], "false", "true" +unusedBit_541_18 = bits, U32, 1628, [18:18], "false", "true" +unusedBit_541_19 = bits, U32, 1628, [19:19], "false", "true" +unusedBit_541_20 = bits, U32, 1628, [20:20], "false", "true" +unusedBit_541_21 = bits, U32, 1628, [21:21], "false", "true" +unusedBit_541_22 = bits, U32, 1628, [22:22], "false", "true" +unusedBit_541_23 = bits, U32, 1628, [23:23], "false", "true" +unusedBit_541_24 = bits, U32, 1628, [24:24], "false", "true" +unusedBit_541_25 = bits, U32, 1628, [25:25], "false", "true" +unusedBit_541_26 = bits, U32, 1628, [26:26], "false", "true" +unusedBit_541_27 = bits, U32, 1628, [27:27], "false", "true" +unusedBit_541_28 = bits, U32, 1628, [28:28], "false", "true" +unusedBit_541_29 = bits, U32, 1628, [29:29], "false", "true" +unusedBit_541_30 = bits, U32, 1628, [30:30], "false", "true" +unusedBit_541_31 = bits, U32, 1628, [31:31], "false", "true" benchTestOffTime = scalar, U08, 1632, "ms", 5.0, 0, 0, 2000, 1 benchTestCount = scalar, U08, 1633, "count", 1, 0, 0, 250, 1 benchTestOnTime = scalar, U08, 1634, "ms", 5.0, 0, 0, 2000, 1 @@ -1555,10 +1555,8 @@ ignBlends4_blendValues = array, U08, 22038, [8], "%", 0.5, 0, 0, 100, 1 compressionRatio = "Just for reference really, not taken into account by any logic at this point" triggerSimulatorPins1 = "Each rusEFI piece can provide synthetic trigger signal for external ECU. Sometimes these wires are routed back into trigger inputs of the same rusEFI board." triggerSimulatorPins2 = "Each rusEFI piece can provide synthetic trigger signal for external ECU. Sometimes these wires are routed back into trigger inputs of the same rusEFI board." - triggerSimulatorPins3 = "Each rusEFI piece can provide synthetic trigger signal for external ECU. Sometimes these wires are routed back into trigger inputs of the same rusEFI board." triggerSimulatorPinModes1 = "triggerSimulatorPinModes 1" triggerSimulatorPinModes2 = "triggerSimulatorPinModes 2" - triggerSimulatorPinModes3 = "triggerSimulatorPinModes 3" o2heaterPin = "Narrow band o2 heater, not used for CJ125. 'ON' if engine is running, 'OFF' if stopped or cranking. See wboHeaterPin" isSdCardEnabled = "enable sd/disable sd" rusefiVerbose29b = "Use 11 bit (standard) or 29 bit (extended) IDs for rusEFI verbose CAN format." @@ -6465,7 +6463,6 @@ dialog = wideband_stateDialog, "wideband_state" dialog = allPins1_1 field = "trigger stimulator pin #1", triggerSimulatorPins1 field = "trigger stimulator pin #2", triggerSimulatorPins2 - field = "trigger stimulator pin #2", triggerSimulatorPins3 field = "Warning Led", warningLedPin field = "tle6240_cs", tle6240_cs field = "tle6240 SPI", tle6240spiDevice diff --git a/firmware/tunerstudio/generated/rusefi_hellen72.ini b/firmware/tunerstudio/generated/rusefi_hellen72.ini index de4d83af01..9773b8bd30 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen72.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen72.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.10.03.hellen72.1405580395" + signature = "rusEFI 2022.10.03.hellen72.1144114921" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.10.03.hellen72.1405580395" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.10.03.hellen72.1144114921" ; 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 @@ -86,7 +86,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Oct 03 04:24:11 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Oct 03 15:05:52 UTC 2022 pageSize = 22048 page = 1 @@ -336,10 +336,10 @@ tunerStudioSerialSpeed = scalar, U32, 740, "BPs", 1, 0, 0, 1000000, 0 compressionRatio = scalar, F32, 744, "CR", 1, 0, 0, 300, 1 triggerSimulatorPins1 = bits, U16, 748, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15" triggerSimulatorPins2 = bits, U16, 750, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15" -triggerSimulatorPins3 = bits, U16, 752, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15" +unusedTrig = scalar, U16, 752, "", 1, 0, 0, 100, 0 triggerSimulatorPinModes1 = bits, U08, 754, [0:1], "default", "default inverted", "open collector", "open collector inverted" triggerSimulatorPinModes2 = bits, U08, 755, [0:1], "default", "default inverted", "open collector", "open collector inverted" -triggerSimulatorPinModes3 = bits, U08, 756, [0:1], "default", "default inverted", "open collector", "open collector inverted" +unusedTrigMode = scalar, U08, 756, "", 1, 0, 0, 100, 0 o2heaterPin = bits, U16, 758, [0:7], 0="NONE",105="2A - INJ_1",62="2B - ECF (PWM8)",59="2C - AC Fan / INJ_5",106="2D - INJ_2",61="2G - INJ_3",60="2J - INJ_4",129="2K - AC (O4)",100="2M - FPUMP (O9)",94="2N - VTSC / INJ_6",70="2O - IGN_3",64="2Q - IDLE (PWM5)",102="2R - CE (O11)",95="3C - Purge Solenoid / INJ_7",96="3D - EGR Solenoid / INJ_8",101="3E - CANIST (O10)",138="3F - IGN_1 (1&4)",132="3H - MAIN (O1)",71="3I - IGN_2 (2&3)",128="3J - O2H (O3)",136="3L - IGN_7 / AFR",65="3M - ALTERN (PWM6)",69="3N - IGN_4",63="3O - TACH (PWM7)",11="3P - O2H2 (O7)",127="3U - AWARN (O2)",68="3Z - IGN_5 / GNDA",135="4K - IGN_6 / +5V_MAP",130="4R - VVT (O5)",137="4U - MAP2/Ign8 (A10)",43="5E - SOLENOID OUTPUT",41="ETB +",42="ETB -",40="ETB EN" o2heaterPinModeTodO = bits, U08, 760, [0:1], "default", "default inverted", "open collector", "open collector inverted" is_enabled_spi_1 = bits, U32, 764, [0:0], "false", "true" @@ -763,30 +763,30 @@ unused1127 = bits, U32, 1628, [4:4], "false", "true" unused1128 = bits, U32, 1628, [5:5], "false", "true" unused1129 = bits, U32, 1628, [6:6], "false", "true" unused1130 = bits, U32, 1628, [7:7], "false", "true" -unusedBit_539_8 = bits, U32, 1628, [8:8], "false", "true" -unusedBit_539_9 = bits, U32, 1628, [9:9], "false", "true" -unusedBit_539_10 = bits, U32, 1628, [10:10], "false", "true" -unusedBit_539_11 = bits, U32, 1628, [11:11], "false", "true" -unusedBit_539_12 = bits, U32, 1628, [12:12], "false", "true" -unusedBit_539_13 = bits, U32, 1628, [13:13], "false", "true" -unusedBit_539_14 = bits, U32, 1628, [14:14], "false", "true" -unusedBit_539_15 = bits, U32, 1628, [15:15], "false", "true" -unusedBit_539_16 = bits, U32, 1628, [16:16], "false", "true" -unusedBit_539_17 = bits, U32, 1628, [17:17], "false", "true" -unusedBit_539_18 = bits, U32, 1628, [18:18], "false", "true" -unusedBit_539_19 = bits, U32, 1628, [19:19], "false", "true" -unusedBit_539_20 = bits, U32, 1628, [20:20], "false", "true" -unusedBit_539_21 = bits, U32, 1628, [21:21], "false", "true" -unusedBit_539_22 = bits, U32, 1628, [22:22], "false", "true" -unusedBit_539_23 = bits, U32, 1628, [23:23], "false", "true" -unusedBit_539_24 = bits, U32, 1628, [24:24], "false", "true" -unusedBit_539_25 = bits, U32, 1628, [25:25], "false", "true" -unusedBit_539_26 = bits, U32, 1628, [26:26], "false", "true" -unusedBit_539_27 = bits, U32, 1628, [27:27], "false", "true" -unusedBit_539_28 = bits, U32, 1628, [28:28], "false", "true" -unusedBit_539_29 = bits, U32, 1628, [29:29], "false", "true" -unusedBit_539_30 = bits, U32, 1628, [30:30], "false", "true" -unusedBit_539_31 = bits, U32, 1628, [31:31], "false", "true" +unusedBit_541_8 = bits, U32, 1628, [8:8], "false", "true" +unusedBit_541_9 = bits, U32, 1628, [9:9], "false", "true" +unusedBit_541_10 = bits, U32, 1628, [10:10], "false", "true" +unusedBit_541_11 = bits, U32, 1628, [11:11], "false", "true" +unusedBit_541_12 = bits, U32, 1628, [12:12], "false", "true" +unusedBit_541_13 = bits, U32, 1628, [13:13], "false", "true" +unusedBit_541_14 = bits, U32, 1628, [14:14], "false", "true" +unusedBit_541_15 = bits, U32, 1628, [15:15], "false", "true" +unusedBit_541_16 = bits, U32, 1628, [16:16], "false", "true" +unusedBit_541_17 = bits, U32, 1628, [17:17], "false", "true" +unusedBit_541_18 = bits, U32, 1628, [18:18], "false", "true" +unusedBit_541_19 = bits, U32, 1628, [19:19], "false", "true" +unusedBit_541_20 = bits, U32, 1628, [20:20], "false", "true" +unusedBit_541_21 = bits, U32, 1628, [21:21], "false", "true" +unusedBit_541_22 = bits, U32, 1628, [22:22], "false", "true" +unusedBit_541_23 = bits, U32, 1628, [23:23], "false", "true" +unusedBit_541_24 = bits, U32, 1628, [24:24], "false", "true" +unusedBit_541_25 = bits, U32, 1628, [25:25], "false", "true" +unusedBit_541_26 = bits, U32, 1628, [26:26], "false", "true" +unusedBit_541_27 = bits, U32, 1628, [27:27], "false", "true" +unusedBit_541_28 = bits, U32, 1628, [28:28], "false", "true" +unusedBit_541_29 = bits, U32, 1628, [29:29], "false", "true" +unusedBit_541_30 = bits, U32, 1628, [30:30], "false", "true" +unusedBit_541_31 = bits, U32, 1628, [31:31], "false", "true" benchTestOffTime = scalar, U08, 1632, "ms", 5.0, 0, 0, 2000, 1 benchTestCount = scalar, U08, 1633, "count", 1, 0, 0, 250, 1 benchTestOnTime = scalar, U08, 1634, "ms", 5.0, 0, 0, 2000, 1 @@ -1555,10 +1555,8 @@ ignBlends4_blendValues = array, U08, 22038, [8], "%", 0.5, 0, 0, 100, 1 compressionRatio = "Just for reference really, not taken into account by any logic at this point" triggerSimulatorPins1 = "Each rusEFI piece can provide synthetic trigger signal for external ECU. Sometimes these wires are routed back into trigger inputs of the same rusEFI board." triggerSimulatorPins2 = "Each rusEFI piece can provide synthetic trigger signal for external ECU. Sometimes these wires are routed back into trigger inputs of the same rusEFI board." - triggerSimulatorPins3 = "Each rusEFI piece can provide synthetic trigger signal for external ECU. Sometimes these wires are routed back into trigger inputs of the same rusEFI board." triggerSimulatorPinModes1 = "triggerSimulatorPinModes 1" triggerSimulatorPinModes2 = "triggerSimulatorPinModes 2" - triggerSimulatorPinModes3 = "triggerSimulatorPinModes 3" o2heaterPin = "Narrow band o2 heater, not used for CJ125. 'ON' if engine is running, 'OFF' if stopped or cranking. See wboHeaterPin" isSdCardEnabled = "enable sd/disable sd" rusefiVerbose29b = "Use 11 bit (standard) or 29 bit (extended) IDs for rusEFI verbose CAN format." @@ -6468,7 +6466,6 @@ dialog = wideband_stateDialog, "wideband_state" dialog = allPins1_1 field = "trigger stimulator pin #1", triggerSimulatorPins1 field = "trigger stimulator pin #2", triggerSimulatorPins2 - field = "trigger stimulator pin #2", triggerSimulatorPins3 field = "Warning Led", warningLedPin field = "tle6240_cs", tle6240_cs field = "tle6240 SPI", tle6240spiDevice diff --git a/firmware/tunerstudio/generated/rusefi_hellen81.ini b/firmware/tunerstudio/generated/rusefi_hellen81.ini index 6cd60c5700..3533bbdfc7 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen81.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen81.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.10.03.hellen81.2202895717" + signature = "rusEFI 2022.10.03.hellen81.2495299559" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.10.03.hellen81.2202895717" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.10.03.hellen81.2495299559" ; 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 @@ -86,7 +86,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Oct 03 04:24:13 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Oct 03 15:05:54 UTC 2022 pageSize = 22048 page = 1 @@ -336,10 +336,10 @@ tunerStudioSerialSpeed = scalar, U32, 740, "BPs", 1, 0, 0, 1000000, 0 compressionRatio = scalar, F32, 744, "CR", 1, 0, 0, 300, 1 triggerSimulatorPins1 = bits, U16, 748, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15" triggerSimulatorPins2 = bits, U16, 750, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15" -triggerSimulatorPins3 = bits, U16, 752, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15" +unusedTrig = scalar, U16, 752, "", 1, 0, 0, 100, 0 triggerSimulatorPinModes1 = bits, U08, 754, [0:1], "default", "default inverted", "open collector", "open collector inverted" triggerSimulatorPinModes2 = bits, U08, 755, [0:1], "default", "default inverted", "open collector", "open collector inverted" -triggerSimulatorPinModes3 = bits, U08, 756, [0:1], "default", "default inverted", "open collector", "open collector inverted" +unusedTrigMode = scalar, U08, 756, "", 1, 0, 0, 100, 0 o2heaterPin = bits, U16, 758, [0:7], 0="NONE",71="1 - IGN_2",65="10 - OUT_FUEL",127="11 - OUT_HIGH",132="14 - OUT_MAIN",70="2 - IGN_3",72="21 - IGN_8",27="22 - IGN_7",26="23 - IGN_6",68="24 - IGN_5",94="25 - INJ_6",105="27 - INJ_1",11="28 - OUT_O2H2",59="30 - INJ_5",102="31 - OUT_CE",69="4 - IGN_4",101="46 - OUT_CANIST",60="47 - INJ_4",128="48 - OUT_O2H",131="49 - OUT_HEATER",138="5 - IGN_1",130="50 - OUT_STARTER",106="6 - INJ_2",63="60 - OUT_IO",43="64 - OUT_COIL_B2",42="65 - OUT_COIL_B1",41="66 - OUT_COIL_A2",40="67 - OUT_COIL_A1",62="68 - OUT_ECF",129="69 - OUT_AC",61="7 - INJ_3",100="70 - OUT_PUMP",95="72 - INJ_7",96="73 - INJ_8",64="8 - OUT_TACH" o2heaterPinModeTodO = bits, U08, 760, [0:1], "default", "default inverted", "open collector", "open collector inverted" is_enabled_spi_1 = bits, U32, 764, [0:0], "false", "true" @@ -763,30 +763,30 @@ unused1127 = bits, U32, 1628, [4:4], "false", "true" unused1128 = bits, U32, 1628, [5:5], "false", "true" unused1129 = bits, U32, 1628, [6:6], "false", "true" unused1130 = bits, U32, 1628, [7:7], "false", "true" -unusedBit_539_8 = bits, U32, 1628, [8:8], "false", "true" -unusedBit_539_9 = bits, U32, 1628, [9:9], "false", "true" -unusedBit_539_10 = bits, U32, 1628, [10:10], "false", "true" -unusedBit_539_11 = bits, U32, 1628, [11:11], "false", "true" -unusedBit_539_12 = bits, U32, 1628, [12:12], "false", "true" -unusedBit_539_13 = bits, U32, 1628, [13:13], "false", "true" -unusedBit_539_14 = bits, U32, 1628, [14:14], "false", "true" -unusedBit_539_15 = bits, U32, 1628, [15:15], "false", "true" -unusedBit_539_16 = bits, U32, 1628, [16:16], "false", "true" -unusedBit_539_17 = bits, U32, 1628, [17:17], "false", "true" -unusedBit_539_18 = bits, U32, 1628, [18:18], "false", "true" -unusedBit_539_19 = bits, U32, 1628, [19:19], "false", "true" -unusedBit_539_20 = bits, U32, 1628, [20:20], "false", "true" -unusedBit_539_21 = bits, U32, 1628, [21:21], "false", "true" -unusedBit_539_22 = bits, U32, 1628, [22:22], "false", "true" -unusedBit_539_23 = bits, U32, 1628, [23:23], "false", "true" -unusedBit_539_24 = bits, U32, 1628, [24:24], "false", "true" -unusedBit_539_25 = bits, U32, 1628, [25:25], "false", "true" -unusedBit_539_26 = bits, U32, 1628, [26:26], "false", "true" -unusedBit_539_27 = bits, U32, 1628, [27:27], "false", "true" -unusedBit_539_28 = bits, U32, 1628, [28:28], "false", "true" -unusedBit_539_29 = bits, U32, 1628, [29:29], "false", "true" -unusedBit_539_30 = bits, U32, 1628, [30:30], "false", "true" -unusedBit_539_31 = bits, U32, 1628, [31:31], "false", "true" +unusedBit_541_8 = bits, U32, 1628, [8:8], "false", "true" +unusedBit_541_9 = bits, U32, 1628, [9:9], "false", "true" +unusedBit_541_10 = bits, U32, 1628, [10:10], "false", "true" +unusedBit_541_11 = bits, U32, 1628, [11:11], "false", "true" +unusedBit_541_12 = bits, U32, 1628, [12:12], "false", "true" +unusedBit_541_13 = bits, U32, 1628, [13:13], "false", "true" +unusedBit_541_14 = bits, U32, 1628, [14:14], "false", "true" +unusedBit_541_15 = bits, U32, 1628, [15:15], "false", "true" +unusedBit_541_16 = bits, U32, 1628, [16:16], "false", "true" +unusedBit_541_17 = bits, U32, 1628, [17:17], "false", "true" +unusedBit_541_18 = bits, U32, 1628, [18:18], "false", "true" +unusedBit_541_19 = bits, U32, 1628, [19:19], "false", "true" +unusedBit_541_20 = bits, U32, 1628, [20:20], "false", "true" +unusedBit_541_21 = bits, U32, 1628, [21:21], "false", "true" +unusedBit_541_22 = bits, U32, 1628, [22:22], "false", "true" +unusedBit_541_23 = bits, U32, 1628, [23:23], "false", "true" +unusedBit_541_24 = bits, U32, 1628, [24:24], "false", "true" +unusedBit_541_25 = bits, U32, 1628, [25:25], "false", "true" +unusedBit_541_26 = bits, U32, 1628, [26:26], "false", "true" +unusedBit_541_27 = bits, U32, 1628, [27:27], "false", "true" +unusedBit_541_28 = bits, U32, 1628, [28:28], "false", "true" +unusedBit_541_29 = bits, U32, 1628, [29:29], "false", "true" +unusedBit_541_30 = bits, U32, 1628, [30:30], "false", "true" +unusedBit_541_31 = bits, U32, 1628, [31:31], "false", "true" benchTestOffTime = scalar, U08, 1632, "ms", 5.0, 0, 0, 2000, 1 benchTestCount = scalar, U08, 1633, "count", 1, 0, 0, 250, 1 benchTestOnTime = scalar, U08, 1634, "ms", 5.0, 0, 0, 2000, 1 @@ -1555,10 +1555,8 @@ ignBlends4_blendValues = array, U08, 22038, [8], "%", 0.5, 0, 0, 100, 1 compressionRatio = "Just for reference really, not taken into account by any logic at this point" triggerSimulatorPins1 = "Each rusEFI piece can provide synthetic trigger signal for external ECU. Sometimes these wires are routed back into trigger inputs of the same rusEFI board." triggerSimulatorPins2 = "Each rusEFI piece can provide synthetic trigger signal for external ECU. Sometimes these wires are routed back into trigger inputs of the same rusEFI board." - triggerSimulatorPins3 = "Each rusEFI piece can provide synthetic trigger signal for external ECU. Sometimes these wires are routed back into trigger inputs of the same rusEFI board." triggerSimulatorPinModes1 = "triggerSimulatorPinModes 1" triggerSimulatorPinModes2 = "triggerSimulatorPinModes 2" - triggerSimulatorPinModes3 = "triggerSimulatorPinModes 3" o2heaterPin = "Narrow band o2 heater, not used for CJ125. 'ON' if engine is running, 'OFF' if stopped or cranking. See wboHeaterPin" isSdCardEnabled = "enable sd/disable sd" rusefiVerbose29b = "Use 11 bit (standard) or 29 bit (extended) IDs for rusEFI verbose CAN format." @@ -6466,7 +6464,6 @@ dialog = wideband_stateDialog, "wideband_state" dialog = allPins1_1 field = "trigger stimulator pin #1", triggerSimulatorPins1 field = "trigger stimulator pin #2", triggerSimulatorPins2 - field = "trigger stimulator pin #2", triggerSimulatorPins3 field = "Warning Led", warningLedPin field = "tle6240_cs", tle6240_cs field = "tle6240 SPI", tle6240spiDevice diff --git a/firmware/tunerstudio/generated/rusefi_hellen88bmw.ini b/firmware/tunerstudio/generated/rusefi_hellen88bmw.ini index f2dfd8fd60..c66c6d2f9e 100644 --- a/firmware/tunerstudio/generated/rusefi_hellen88bmw.ini +++ b/firmware/tunerstudio/generated/rusefi_hellen88bmw.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.10.03.hellen88bmw.3020770979" + signature = "rusEFI 2022.10.03.hellen88bmw.2751198241" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.10.03.hellen88bmw.3020770979" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.10.03.hellen88bmw.2751198241" ; 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 @@ -86,7 +86,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Oct 03 04:24:09 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Oct 03 15:05:50 UTC 2022 pageSize = 22048 page = 1 @@ -336,10 +336,10 @@ tunerStudioSerialSpeed = scalar, U32, 740, "BPs", 1, 0, 0, 1000000, 0 compressionRatio = scalar, F32, 744, "CR", 1, 0, 0, 300, 1 triggerSimulatorPins1 = bits, U16, 748, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15" triggerSimulatorPins2 = bits, U16, 750, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15" -triggerSimulatorPins3 = bits, U16, 752, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15" +unusedTrig = scalar, U16, 752, "", 1, 0, 0, 100, 0 triggerSimulatorPinModes1 = bits, U08, 754, [0:1], "default", "default inverted", "open collector", "open collector inverted" triggerSimulatorPinModes2 = bits, U08, 755, [0:1], "default", "default inverted", "open collector", "open collector inverted" -triggerSimulatorPinModes3 = bits, U08, 756, [0:1], "default", "default inverted", "open collector", "open collector inverted" +unusedTrigMode = scalar, U08, 756, "", 1, 0, 0, 100, 0 o2heaterPin = bits, U16, 758, [0:7], 0="NONE",112="1 - OUT_PUMP",62="2 - IdleC",69="23 - Coil 4",26="24 - Coil 6",68="25 - Coil 5",53="27 - MAIN",43="29 - Idle",59="3 - INJ_5",61="31 - INJ_3",106="32 - INJ_2",105="33 - INJ_1",96="35 - INJ_8",94="4 - INJ_6",65="47 - Tach",60="5 - INJ_4",47="50 - Coil 1",71="51 - Coil 2",70="52 - Coil 3",95="7 - INJ_7/VVT" o2heaterPinModeTodO = bits, U08, 760, [0:1], "default", "default inverted", "open collector", "open collector inverted" is_enabled_spi_1 = bits, U32, 764, [0:0], "false", "true" @@ -763,30 +763,30 @@ unused1127 = bits, U32, 1628, [4:4], "false", "true" unused1128 = bits, U32, 1628, [5:5], "false", "true" unused1129 = bits, U32, 1628, [6:6], "false", "true" unused1130 = bits, U32, 1628, [7:7], "false", "true" -unusedBit_539_8 = bits, U32, 1628, [8:8], "false", "true" -unusedBit_539_9 = bits, U32, 1628, [9:9], "false", "true" -unusedBit_539_10 = bits, U32, 1628, [10:10], "false", "true" -unusedBit_539_11 = bits, U32, 1628, [11:11], "false", "true" -unusedBit_539_12 = bits, U32, 1628, [12:12], "false", "true" -unusedBit_539_13 = bits, U32, 1628, [13:13], "false", "true" -unusedBit_539_14 = bits, U32, 1628, [14:14], "false", "true" -unusedBit_539_15 = bits, U32, 1628, [15:15], "false", "true" -unusedBit_539_16 = bits, U32, 1628, [16:16], "false", "true" -unusedBit_539_17 = bits, U32, 1628, [17:17], "false", "true" -unusedBit_539_18 = bits, U32, 1628, [18:18], "false", "true" -unusedBit_539_19 = bits, U32, 1628, [19:19], "false", "true" -unusedBit_539_20 = bits, U32, 1628, [20:20], "false", "true" -unusedBit_539_21 = bits, U32, 1628, [21:21], "false", "true" -unusedBit_539_22 = bits, U32, 1628, [22:22], "false", "true" -unusedBit_539_23 = bits, U32, 1628, [23:23], "false", "true" -unusedBit_539_24 = bits, U32, 1628, [24:24], "false", "true" -unusedBit_539_25 = bits, U32, 1628, [25:25], "false", "true" -unusedBit_539_26 = bits, U32, 1628, [26:26], "false", "true" -unusedBit_539_27 = bits, U32, 1628, [27:27], "false", "true" -unusedBit_539_28 = bits, U32, 1628, [28:28], "false", "true" -unusedBit_539_29 = bits, U32, 1628, [29:29], "false", "true" -unusedBit_539_30 = bits, U32, 1628, [30:30], "false", "true" -unusedBit_539_31 = bits, U32, 1628, [31:31], "false", "true" +unusedBit_541_8 = bits, U32, 1628, [8:8], "false", "true" +unusedBit_541_9 = bits, U32, 1628, [9:9], "false", "true" +unusedBit_541_10 = bits, U32, 1628, [10:10], "false", "true" +unusedBit_541_11 = bits, U32, 1628, [11:11], "false", "true" +unusedBit_541_12 = bits, U32, 1628, [12:12], "false", "true" +unusedBit_541_13 = bits, U32, 1628, [13:13], "false", "true" +unusedBit_541_14 = bits, U32, 1628, [14:14], "false", "true" +unusedBit_541_15 = bits, U32, 1628, [15:15], "false", "true" +unusedBit_541_16 = bits, U32, 1628, [16:16], "false", "true" +unusedBit_541_17 = bits, U32, 1628, [17:17], "false", "true" +unusedBit_541_18 = bits, U32, 1628, [18:18], "false", "true" +unusedBit_541_19 = bits, U32, 1628, [19:19], "false", "true" +unusedBit_541_20 = bits, U32, 1628, [20:20], "false", "true" +unusedBit_541_21 = bits, U32, 1628, [21:21], "false", "true" +unusedBit_541_22 = bits, U32, 1628, [22:22], "false", "true" +unusedBit_541_23 = bits, U32, 1628, [23:23], "false", "true" +unusedBit_541_24 = bits, U32, 1628, [24:24], "false", "true" +unusedBit_541_25 = bits, U32, 1628, [25:25], "false", "true" +unusedBit_541_26 = bits, U32, 1628, [26:26], "false", "true" +unusedBit_541_27 = bits, U32, 1628, [27:27], "false", "true" +unusedBit_541_28 = bits, U32, 1628, [28:28], "false", "true" +unusedBit_541_29 = bits, U32, 1628, [29:29], "false", "true" +unusedBit_541_30 = bits, U32, 1628, [30:30], "false", "true" +unusedBit_541_31 = bits, U32, 1628, [31:31], "false", "true" benchTestOffTime = scalar, U08, 1632, "ms", 5.0, 0, 0, 2000, 1 benchTestCount = scalar, U08, 1633, "count", 1, 0, 0, 250, 1 benchTestOnTime = scalar, U08, 1634, "ms", 5.0, 0, 0, 2000, 1 @@ -1555,10 +1555,8 @@ ignBlends4_blendValues = array, U08, 22038, [8], "%", 0.5, 0, 0, 100, 1 compressionRatio = "Just for reference really, not taken into account by any logic at this point" triggerSimulatorPins1 = "Each rusEFI piece can provide synthetic trigger signal for external ECU. Sometimes these wires are routed back into trigger inputs of the same rusEFI board." triggerSimulatorPins2 = "Each rusEFI piece can provide synthetic trigger signal for external ECU. Sometimes these wires are routed back into trigger inputs of the same rusEFI board." - triggerSimulatorPins3 = "Each rusEFI piece can provide synthetic trigger signal for external ECU. Sometimes these wires are routed back into trigger inputs of the same rusEFI board." triggerSimulatorPinModes1 = "triggerSimulatorPinModes 1" triggerSimulatorPinModes2 = "triggerSimulatorPinModes 2" - triggerSimulatorPinModes3 = "triggerSimulatorPinModes 3" o2heaterPin = "Narrow band o2 heater, not used for CJ125. 'ON' if engine is running, 'OFF' if stopped or cranking. See wboHeaterPin" isSdCardEnabled = "enable sd/disable sd" rusefiVerbose29b = "Use 11 bit (standard) or 29 bit (extended) IDs for rusEFI verbose CAN format." @@ -6465,7 +6463,6 @@ dialog = wideband_stateDialog, "wideband_state" dialog = allPins1_1 field = "trigger stimulator pin #1", triggerSimulatorPins1 field = "trigger stimulator pin #2", triggerSimulatorPins2 - field = "trigger stimulator pin #2", triggerSimulatorPins3 field = "Warning Led", warningLedPin field = "tle6240_cs", tle6240_cs field = "tle6240 SPI", tle6240spiDevice diff --git a/firmware/tunerstudio/generated/rusefi_hellenNA6.ini b/firmware/tunerstudio/generated/rusefi_hellenNA6.ini index 9306952664..ef41b771f1 100644 --- a/firmware/tunerstudio/generated/rusefi_hellenNA6.ini +++ b/firmware/tunerstudio/generated/rusefi_hellenNA6.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.10.03.hellenNA6.4290047064" + signature = "rusEFI 2022.10.03.hellenNA6.3896661722" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.10.03.hellenNA6.4290047064" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.10.03.hellenNA6.3896661722" ; 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 @@ -86,7 +86,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Oct 03 04:24:19 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Oct 03 15:06:00 UTC 2022 pageSize = 22048 page = 1 @@ -336,10 +336,10 @@ tunerStudioSerialSpeed = scalar, U32, 740, "BPs", 1, 0, 0, 1000000, 0 compressionRatio = scalar, F32, 744, "CR", 1, 0, 0, 300, 1 triggerSimulatorPins1 = bits, U16, 748, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15" triggerSimulatorPins2 = bits, U16, 750, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15" -triggerSimulatorPins3 = bits, U16, 752, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15" +unusedTrig = scalar, U16, 752, "", 1, 0, 0, 100, 0 triggerSimulatorPinModes1 = bits, U08, 754, [0:1], "default", "default inverted", "open collector", "open collector inverted" triggerSimulatorPinModes2 = bits, U08, 755, [0:1], "default", "default inverted", "open collector", "open collector inverted" -triggerSimulatorPinModes3 = bits, U08, 756, [0:1], "default", "default inverted", "open collector", "open collector inverted" +unusedTrigMode = scalar, U08, 756, "", 1, 0, 0, 100, 0 o2heaterPin = bits, U16, 758, [0:7], 0="NONE",107="1E - Check Engine Light",138="1G - Ignition 1 & 4 (rev C)",47="1G - Ignition 1 & 4 (rev D)",71="1H - Ignition 2 & 3",129="1J - AC Relay",96="2I - VVT",94="2J - Boost Control",59="3S - A/C Fan 94-95",105="3U - Injector 1",106="3V - Injector 2",64="3W - IDLE",61="3Y - Injector 3",60="3Z - Injector 4",41="ETB +",42="ETB -",40="ETB EN",100="Fuel Pump Relay",62="Radiator Fan",130="Tachometer (rev C)",110="Tachometer (rev D)" o2heaterPinModeTodO = bits, U08, 760, [0:1], "default", "default inverted", "open collector", "open collector inverted" is_enabled_spi_1 = bits, U32, 764, [0:0], "false", "true" @@ -763,30 +763,30 @@ unused1127 = bits, U32, 1628, [4:4], "false", "true" unused1128 = bits, U32, 1628, [5:5], "false", "true" unused1129 = bits, U32, 1628, [6:6], "false", "true" unused1130 = bits, U32, 1628, [7:7], "false", "true" -unusedBit_539_8 = bits, U32, 1628, [8:8], "false", "true" -unusedBit_539_9 = bits, U32, 1628, [9:9], "false", "true" -unusedBit_539_10 = bits, U32, 1628, [10:10], "false", "true" -unusedBit_539_11 = bits, U32, 1628, [11:11], "false", "true" -unusedBit_539_12 = bits, U32, 1628, [12:12], "false", "true" -unusedBit_539_13 = bits, U32, 1628, [13:13], "false", "true" -unusedBit_539_14 = bits, U32, 1628, [14:14], "false", "true" -unusedBit_539_15 = bits, U32, 1628, [15:15], "false", "true" -unusedBit_539_16 = bits, U32, 1628, [16:16], "false", "true" -unusedBit_539_17 = bits, U32, 1628, [17:17], "false", "true" -unusedBit_539_18 = bits, U32, 1628, [18:18], "false", "true" -unusedBit_539_19 = bits, U32, 1628, [19:19], "false", "true" -unusedBit_539_20 = bits, U32, 1628, [20:20], "false", "true" -unusedBit_539_21 = bits, U32, 1628, [21:21], "false", "true" -unusedBit_539_22 = bits, U32, 1628, [22:22], "false", "true" -unusedBit_539_23 = bits, U32, 1628, [23:23], "false", "true" -unusedBit_539_24 = bits, U32, 1628, [24:24], "false", "true" -unusedBit_539_25 = bits, U32, 1628, [25:25], "false", "true" -unusedBit_539_26 = bits, U32, 1628, [26:26], "false", "true" -unusedBit_539_27 = bits, U32, 1628, [27:27], "false", "true" -unusedBit_539_28 = bits, U32, 1628, [28:28], "false", "true" -unusedBit_539_29 = bits, U32, 1628, [29:29], "false", "true" -unusedBit_539_30 = bits, U32, 1628, [30:30], "false", "true" -unusedBit_539_31 = bits, U32, 1628, [31:31], "false", "true" +unusedBit_541_8 = bits, U32, 1628, [8:8], "false", "true" +unusedBit_541_9 = bits, U32, 1628, [9:9], "false", "true" +unusedBit_541_10 = bits, U32, 1628, [10:10], "false", "true" +unusedBit_541_11 = bits, U32, 1628, [11:11], "false", "true" +unusedBit_541_12 = bits, U32, 1628, [12:12], "false", "true" +unusedBit_541_13 = bits, U32, 1628, [13:13], "false", "true" +unusedBit_541_14 = bits, U32, 1628, [14:14], "false", "true" +unusedBit_541_15 = bits, U32, 1628, [15:15], "false", "true" +unusedBit_541_16 = bits, U32, 1628, [16:16], "false", "true" +unusedBit_541_17 = bits, U32, 1628, [17:17], "false", "true" +unusedBit_541_18 = bits, U32, 1628, [18:18], "false", "true" +unusedBit_541_19 = bits, U32, 1628, [19:19], "false", "true" +unusedBit_541_20 = bits, U32, 1628, [20:20], "false", "true" +unusedBit_541_21 = bits, U32, 1628, [21:21], "false", "true" +unusedBit_541_22 = bits, U32, 1628, [22:22], "false", "true" +unusedBit_541_23 = bits, U32, 1628, [23:23], "false", "true" +unusedBit_541_24 = bits, U32, 1628, [24:24], "false", "true" +unusedBit_541_25 = bits, U32, 1628, [25:25], "false", "true" +unusedBit_541_26 = bits, U32, 1628, [26:26], "false", "true" +unusedBit_541_27 = bits, U32, 1628, [27:27], "false", "true" +unusedBit_541_28 = bits, U32, 1628, [28:28], "false", "true" +unusedBit_541_29 = bits, U32, 1628, [29:29], "false", "true" +unusedBit_541_30 = bits, U32, 1628, [30:30], "false", "true" +unusedBit_541_31 = bits, U32, 1628, [31:31], "false", "true" benchTestOffTime = scalar, U08, 1632, "ms", 5.0, 0, 0, 2000, 1 benchTestCount = scalar, U08, 1633, "count", 1, 0, 0, 250, 1 benchTestOnTime = scalar, U08, 1634, "ms", 5.0, 0, 0, 2000, 1 @@ -1555,10 +1555,8 @@ ignBlends4_blendValues = array, U08, 22038, [8], "%", 0.5, 0, 0, 100, 1 compressionRatio = "Just for reference really, not taken into account by any logic at this point" triggerSimulatorPins1 = "Each rusEFI piece can provide synthetic trigger signal for external ECU. Sometimes these wires are routed back into trigger inputs of the same rusEFI board." triggerSimulatorPins2 = "Each rusEFI piece can provide synthetic trigger signal for external ECU. Sometimes these wires are routed back into trigger inputs of the same rusEFI board." - triggerSimulatorPins3 = "Each rusEFI piece can provide synthetic trigger signal for external ECU. Sometimes these wires are routed back into trigger inputs of the same rusEFI board." triggerSimulatorPinModes1 = "triggerSimulatorPinModes 1" triggerSimulatorPinModes2 = "triggerSimulatorPinModes 2" - triggerSimulatorPinModes3 = "triggerSimulatorPinModes 3" o2heaterPin = "Narrow band o2 heater, not used for CJ125. 'ON' if engine is running, 'OFF' if stopped or cranking. See wboHeaterPin" isSdCardEnabled = "enable sd/disable sd" rusefiVerbose29b = "Use 11 bit (standard) or 29 bit (extended) IDs for rusEFI verbose CAN format." @@ -6468,7 +6466,6 @@ dialog = wideband_stateDialog, "wideband_state" dialog = allPins1_1 field = "trigger stimulator pin #1", triggerSimulatorPins1 field = "trigger stimulator pin #2", triggerSimulatorPins2 - field = "trigger stimulator pin #2", triggerSimulatorPins3 field = "Warning Led", warningLedPin field = "tle6240_cs", tle6240_cs field = "tle6240 SPI", tle6240spiDevice diff --git a/firmware/tunerstudio/generated/rusefi_hellenNA8_96.ini b/firmware/tunerstudio/generated/rusefi_hellenNA8_96.ini index 288693ea8b..6f352fd7ef 100644 --- a/firmware/tunerstudio/generated/rusefi_hellenNA8_96.ini +++ b/firmware/tunerstudio/generated/rusefi_hellenNA8_96.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.10.03.hellenNA8_96.32631943" + signature = "rusEFI 2022.10.03.hellenNA8_96.369579525" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.10.03.hellenNA8_96.32631943" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.10.03.hellenNA8_96.369579525" ; 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 @@ -86,7 +86,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Oct 03 04:24:21 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Oct 03 15:06:02 UTC 2022 pageSize = 22048 page = 1 @@ -336,10 +336,10 @@ tunerStudioSerialSpeed = scalar, U32, 740, "BPs", 1, 0, 0, 1000000, 0 compressionRatio = scalar, F32, 744, "CR", 1, 0, 0, 300, 1 triggerSimulatorPins1 = bits, U16, 748, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15" triggerSimulatorPins2 = bits, U16, 750, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15" -triggerSimulatorPins3 = bits, U16, 752, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15" +unusedTrig = scalar, U16, 752, "", 1, 0, 0, 100, 0 triggerSimulatorPinModes1 = bits, U08, 754, [0:1], "default", "default inverted", "open collector", "open collector inverted" triggerSimulatorPinModes2 = bits, U08, 755, [0:1], "default", "default inverted", "open collector", "open collector inverted" -triggerSimulatorPinModes3 = bits, U08, 756, [0:1], "default", "default inverted", "open collector", "open collector inverted" +unusedTrigMode = scalar, U08, 756, "", 1, 0, 0, 100, 0 o2heaterPin = bits, U16, 758, [0:7], 0="NONE",62="1A - ECF",11="1B - AC Fan Relay",102="1E - Check Engine Light",109="1G - AC Relay",100="1U - Fuel Pump",63="3L - TACH",47="3N - IGN_1 (1&4)",64="3Q - IDLE",71="3R - IGN_2 (2&3)",105="3U - INJ_1",106="3V - INJ_2",61="3W - INJ_3",60="3X - INJ_4",111="3Z - O2H2",94="4D - BOOST OUT",59="4E - VVT",41="ETB +",42="ETB -",40="ETB EN",52="P18/P22" o2heaterPinModeTodO = bits, U08, 760, [0:1], "default", "default inverted", "open collector", "open collector inverted" is_enabled_spi_1 = bits, U32, 764, [0:0], "false", "true" @@ -763,30 +763,30 @@ unused1127 = bits, U32, 1628, [4:4], "false", "true" unused1128 = bits, U32, 1628, [5:5], "false", "true" unused1129 = bits, U32, 1628, [6:6], "false", "true" unused1130 = bits, U32, 1628, [7:7], "false", "true" -unusedBit_539_8 = bits, U32, 1628, [8:8], "false", "true" -unusedBit_539_9 = bits, U32, 1628, [9:9], "false", "true" -unusedBit_539_10 = bits, U32, 1628, [10:10], "false", "true" -unusedBit_539_11 = bits, U32, 1628, [11:11], "false", "true" -unusedBit_539_12 = bits, U32, 1628, [12:12], "false", "true" -unusedBit_539_13 = bits, U32, 1628, [13:13], "false", "true" -unusedBit_539_14 = bits, U32, 1628, [14:14], "false", "true" -unusedBit_539_15 = bits, U32, 1628, [15:15], "false", "true" -unusedBit_539_16 = bits, U32, 1628, [16:16], "false", "true" -unusedBit_539_17 = bits, U32, 1628, [17:17], "false", "true" -unusedBit_539_18 = bits, U32, 1628, [18:18], "false", "true" -unusedBit_539_19 = bits, U32, 1628, [19:19], "false", "true" -unusedBit_539_20 = bits, U32, 1628, [20:20], "false", "true" -unusedBit_539_21 = bits, U32, 1628, [21:21], "false", "true" -unusedBit_539_22 = bits, U32, 1628, [22:22], "false", "true" -unusedBit_539_23 = bits, U32, 1628, [23:23], "false", "true" -unusedBit_539_24 = bits, U32, 1628, [24:24], "false", "true" -unusedBit_539_25 = bits, U32, 1628, [25:25], "false", "true" -unusedBit_539_26 = bits, U32, 1628, [26:26], "false", "true" -unusedBit_539_27 = bits, U32, 1628, [27:27], "false", "true" -unusedBit_539_28 = bits, U32, 1628, [28:28], "false", "true" -unusedBit_539_29 = bits, U32, 1628, [29:29], "false", "true" -unusedBit_539_30 = bits, U32, 1628, [30:30], "false", "true" -unusedBit_539_31 = bits, U32, 1628, [31:31], "false", "true" +unusedBit_541_8 = bits, U32, 1628, [8:8], "false", "true" +unusedBit_541_9 = bits, U32, 1628, [9:9], "false", "true" +unusedBit_541_10 = bits, U32, 1628, [10:10], "false", "true" +unusedBit_541_11 = bits, U32, 1628, [11:11], "false", "true" +unusedBit_541_12 = bits, U32, 1628, [12:12], "false", "true" +unusedBit_541_13 = bits, U32, 1628, [13:13], "false", "true" +unusedBit_541_14 = bits, U32, 1628, [14:14], "false", "true" +unusedBit_541_15 = bits, U32, 1628, [15:15], "false", "true" +unusedBit_541_16 = bits, U32, 1628, [16:16], "false", "true" +unusedBit_541_17 = bits, U32, 1628, [17:17], "false", "true" +unusedBit_541_18 = bits, U32, 1628, [18:18], "false", "true" +unusedBit_541_19 = bits, U32, 1628, [19:19], "false", "true" +unusedBit_541_20 = bits, U32, 1628, [20:20], "false", "true" +unusedBit_541_21 = bits, U32, 1628, [21:21], "false", "true" +unusedBit_541_22 = bits, U32, 1628, [22:22], "false", "true" +unusedBit_541_23 = bits, U32, 1628, [23:23], "false", "true" +unusedBit_541_24 = bits, U32, 1628, [24:24], "false", "true" +unusedBit_541_25 = bits, U32, 1628, [25:25], "false", "true" +unusedBit_541_26 = bits, U32, 1628, [26:26], "false", "true" +unusedBit_541_27 = bits, U32, 1628, [27:27], "false", "true" +unusedBit_541_28 = bits, U32, 1628, [28:28], "false", "true" +unusedBit_541_29 = bits, U32, 1628, [29:29], "false", "true" +unusedBit_541_30 = bits, U32, 1628, [30:30], "false", "true" +unusedBit_541_31 = bits, U32, 1628, [31:31], "false", "true" benchTestOffTime = scalar, U08, 1632, "ms", 5.0, 0, 0, 2000, 1 benchTestCount = scalar, U08, 1633, "count", 1, 0, 0, 250, 1 benchTestOnTime = scalar, U08, 1634, "ms", 5.0, 0, 0, 2000, 1 @@ -1555,10 +1555,8 @@ ignBlends4_blendValues = array, U08, 22038, [8], "%", 0.5, 0, 0, 100, 1 compressionRatio = "Just for reference really, not taken into account by any logic at this point" triggerSimulatorPins1 = "Each rusEFI piece can provide synthetic trigger signal for external ECU. Sometimes these wires are routed back into trigger inputs of the same rusEFI board." triggerSimulatorPins2 = "Each rusEFI piece can provide synthetic trigger signal for external ECU. Sometimes these wires are routed back into trigger inputs of the same rusEFI board." - triggerSimulatorPins3 = "Each rusEFI piece can provide synthetic trigger signal for external ECU. Sometimes these wires are routed back into trigger inputs of the same rusEFI board." triggerSimulatorPinModes1 = "triggerSimulatorPinModes 1" triggerSimulatorPinModes2 = "triggerSimulatorPinModes 2" - triggerSimulatorPinModes3 = "triggerSimulatorPinModes 3" o2heaterPin = "Narrow band o2 heater, not used for CJ125. 'ON' if engine is running, 'OFF' if stopped or cranking. See wboHeaterPin" isSdCardEnabled = "enable sd/disable sd" rusefiVerbose29b = "Use 11 bit (standard) or 29 bit (extended) IDs for rusEFI verbose CAN format." @@ -6468,7 +6466,6 @@ dialog = wideband_stateDialog, "wideband_state" dialog = allPins1_1 field = "trigger stimulator pin #1", triggerSimulatorPins1 field = "trigger stimulator pin #2", triggerSimulatorPins2 - field = "trigger stimulator pin #2", triggerSimulatorPins3 field = "Warning Led", warningLedPin field = "tle6240_cs", tle6240_cs field = "tle6240 SPI", tle6240spiDevice diff --git a/firmware/tunerstudio/generated/rusefi_kin.ini b/firmware/tunerstudio/generated/rusefi_kin.ini index 447cb5fd0b..1a12c81135 100644 --- a/firmware/tunerstudio/generated/rusefi_kin.ini +++ b/firmware/tunerstudio/generated/rusefi_kin.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.10.03.kin.3375366051" + signature = "rusEFI 2022.10.03.kin.3738780961" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.10.03.kin.3375366051" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.10.03.kin.3738780961" ; 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 @@ -86,7 +86,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Mon Oct 03 04:23:48 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Mon Oct 03 15:05:31 UTC 2022 pageSize = 22048 page = 1 @@ -336,10 +336,10 @@ tunerStudioSerialSpeed = scalar, U32, 740, "BPs", 1, 0, 0, 1000000, 0 compressionRatio = scalar, F32, 744, "CR", 1, 0, 0, 300, 1 triggerSimulatorPins1 = bits, U16, 748, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PA16", "PA17", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PB16", "PB17", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PC16", "PC17", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PD16", "PD17", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PE16", "PE17", "TLE6240_1", "TLE6240_2", "TLE6240_3", "TLE6240_4", "TLE6240_5", "TLE6240_6", "TLE6240_7", "TLE6240_8", "TLE6240_9", "TLE6240_10", "TLE6240_11", "TLE6240_12", "TLE6240_13", "TLE6240_14", "TLE6240_15", "TLE6240_16" triggerSimulatorPins2 = bits, U16, 750, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PA16", "PA17", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PB16", "PB17", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PC16", "PC17", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PD16", "PD17", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PE16", "PE17", "TLE6240_1", "TLE6240_2", "TLE6240_3", "TLE6240_4", "TLE6240_5", "TLE6240_6", "TLE6240_7", "TLE6240_8", "TLE6240_9", "TLE6240_10", "TLE6240_11", "TLE6240_12", "TLE6240_13", "TLE6240_14", "TLE6240_15", "TLE6240_16" -triggerSimulatorPins3 = bits, U16, 752, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PA16", "PA17", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PB16", "PB17", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PC16", "PC17", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PD16", "PD17", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PE16", "PE17", "TLE6240_1", "TLE6240_2", "TLE6240_3", "TLE6240_4", "TLE6240_5", "TLE6240_6", "TLE6240_7", "TLE6240_8", "TLE6240_9", "TLE6240_10", "TLE6240_11", "TLE6240_12", "TLE6240_13", "TLE6240_14", "TLE6240_15", "TLE6240_16" +unusedTrig = scalar, U16, 752, "", 1, 0, 0, 100, 0 triggerSimulatorPinModes1 = bits, U08, 754, [0:1], "default", "default inverted", "open collector", "open collector inverted" triggerSimulatorPinModes2 = bits, U08, 755, [0:1], "default", "default inverted", "open collector", "open collector inverted" -triggerSimulatorPinModes3 = bits, U08, 756, [0:1], "default", "default inverted", "open collector", "open collector inverted" +unusedTrigMode = scalar, U08, 756, "", 1, 0, 0, 100, 0 o2heaterPin = bits, U16, 758, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "N/A", "N/A", "PA10", "PA11", "PA12", "PA13", "N/A", "N/A", "N/A", "N/A", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "N/A", "N/A", "N/A", "N/A", "PB12", "PB13", "N/A", "N/A", "N/A", "N/A", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "N/A", "N/A", "N/A", "N/A", "PC14", "PC15", "PC16", "PC17", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "PD15", "PD16", "N/A", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "TLE6240_1", "TLE6240_2", "TLE6240_3", "TLE6240_4", "TLE6240_5", "TLE6240_6", "TLE6240_7", "TLE6240_8", "TLE6240_9", "TLE6240_10", "TLE6240_11", "TLE6240_12", "TLE6240_13", "TLE6240_14", "TLE6240_15", "TLE6240_16" o2heaterPinModeTodO = bits, U08, 760, [0:1], "default", "default inverted", "open collector", "open collector inverted" is_enabled_spi_1 = bits, U32, 764, [0:0], "false", "true" @@ -763,30 +763,30 @@ unused1127 = bits, U32, 1628, [4:4], "false", "true" unused1128 = bits, U32, 1628, [5:5], "false", "true" unused1129 = bits, U32, 1628, [6:6], "false", "true" unused1130 = bits, U32, 1628, [7:7], "false", "true" -unusedBit_539_8 = bits, U32, 1628, [8:8], "false", "true" -unusedBit_539_9 = bits, U32, 1628, [9:9], "false", "true" -unusedBit_539_10 = bits, U32, 1628, [10:10], "false", "true" -unusedBit_539_11 = bits, U32, 1628, [11:11], "false", "true" -unusedBit_539_12 = bits, U32, 1628, [12:12], "false", "true" -unusedBit_539_13 = bits, U32, 1628, [13:13], "false", "true" -unusedBit_539_14 = bits, U32, 1628, [14:14], "false", "true" -unusedBit_539_15 = bits, U32, 1628, [15:15], "false", "true" -unusedBit_539_16 = bits, U32, 1628, [16:16], "false", "true" -unusedBit_539_17 = bits, U32, 1628, [17:17], "false", "true" -unusedBit_539_18 = bits, U32, 1628, [18:18], "false", "true" -unusedBit_539_19 = bits, U32, 1628, [19:19], "false", "true" -unusedBit_539_20 = bits, U32, 1628, [20:20], "false", "true" -unusedBit_539_21 = bits, U32, 1628, [21:21], "false", "true" -unusedBit_539_22 = bits, U32, 1628, [22:22], "false", "true" -unusedBit_539_23 = bits, U32, 1628, [23:23], "false", "true" -unusedBit_539_24 = bits, U32, 1628, [24:24], "false", "true" -unusedBit_539_25 = bits, U32, 1628, [25:25], "false", "true" -unusedBit_539_26 = bits, U32, 1628, [26:26], "false", "true" -unusedBit_539_27 = bits, U32, 1628, [27:27], "false", "true" -unusedBit_539_28 = bits, U32, 1628, [28:28], "false", "true" -unusedBit_539_29 = bits, U32, 1628, [29:29], "false", "true" -unusedBit_539_30 = bits, U32, 1628, [30:30], "false", "true" -unusedBit_539_31 = bits, U32, 1628, [31:31], "false", "true" +unusedBit_541_8 = bits, U32, 1628, [8:8], "false", "true" +unusedBit_541_9 = bits, U32, 1628, [9:9], "false", "true" +unusedBit_541_10 = bits, U32, 1628, [10:10], "false", "true" +unusedBit_541_11 = bits, U32, 1628, [11:11], "false", "true" +unusedBit_541_12 = bits, U32, 1628, [12:12], "false", "true" +unusedBit_541_13 = bits, U32, 1628, [13:13], "false", "true" +unusedBit_541_14 = bits, U32, 1628, [14:14], "false", "true" +unusedBit_541_15 = bits, U32, 1628, [15:15], "false", "true" +unusedBit_541_16 = bits, U32, 1628, [16:16], "false", "true" +unusedBit_541_17 = bits, U32, 1628, [17:17], "false", "true" +unusedBit_541_18 = bits, U32, 1628, [18:18], "false", "true" +unusedBit_541_19 = bits, U32, 1628, [19:19], "false", "true" +unusedBit_541_20 = bits, U32, 1628, [20:20], "false", "true" +unusedBit_541_21 = bits, U32, 1628, [21:21], "false", "true" +unusedBit_541_22 = bits, U32, 1628, [22:22], "false", "true" +unusedBit_541_23 = bits, U32, 1628, [23:23], "false", "true" +unusedBit_541_24 = bits, U32, 1628, [24:24], "false", "true" +unusedBit_541_25 = bits, U32, 1628, [25:25], "false", "true" +unusedBit_541_26 = bits, U32, 1628, [26:26], "false", "true" +unusedBit_541_27 = bits, U32, 1628, [27:27], "false", "true" +unusedBit_541_28 = bits, U32, 1628, [28:28], "false", "true" +unusedBit_541_29 = bits, U32, 1628, [29:29], "false", "true" +unusedBit_541_30 = bits, U32, 1628, [30:30], "false", "true" +unusedBit_541_31 = bits, U32, 1628, [31:31], "false", "true" benchTestOffTime = scalar, U08, 1632, "ms", 5.0, 0, 0, 2000, 1 benchTestCount = scalar, U08, 1633, "count", 1, 0, 0, 250, 1 benchTestOnTime = scalar, U08, 1634, "ms", 5.0, 0, 0, 2000, 1 @@ -1555,10 +1555,8 @@ ignBlends4_blendValues = array, U08, 22038, [8], "%", 0.5, 0, 0, 100, 1 compressionRatio = "Just for reference really, not taken into account by any logic at this point" triggerSimulatorPins1 = "Each rusEFI piece can provide synthetic trigger signal for external ECU. Sometimes these wires are routed back into trigger inputs of the same rusEFI board." triggerSimulatorPins2 = "Each rusEFI piece can provide synthetic trigger signal for external ECU. Sometimes these wires are routed back into trigger inputs of the same rusEFI board." - triggerSimulatorPins3 = "Each rusEFI piece can provide synthetic trigger signal for external ECU. Sometimes these wires are routed back into trigger inputs of the same rusEFI board." triggerSimulatorPinModes1 = "triggerSimulatorPinModes 1" triggerSimulatorPinModes2 = "triggerSimulatorPinModes 2" - triggerSimulatorPinModes3 = "triggerSimulatorPinModes 3" o2heaterPin = "Narrow band o2 heater, not used for CJ125. 'ON' if engine is running, 'OFF' if stopped or cranking. See wboHeaterPin" isSdCardEnabled = "enable sd/disable sd" rusefiVerbose29b = "Use 11 bit (standard) or 29 bit (extended) IDs for rusEFI verbose CAN format." @@ -6472,7 +6470,6 @@ dialog = wideband_stateDialog, "wideband_state" dialog = allPins1_1 field = "trigger stimulator pin #1", triggerSimulatorPins1 field = "trigger stimulator pin #2", triggerSimulatorPins2 - field = "trigger stimulator pin #2", triggerSimulatorPins3 field = "Warning Led", warningLedPin field = "tle6240_cs", tle6240_cs field = "tle6240 SPI", tle6240spiDevice @@ -7827,8 +7824,6 @@ dialog = tcuControls, "Transmission Settings" field = "trigger stimulator pin mode #1", triggerSimulatorPinModes1 field = "trigger stimulator pin #2", triggerSimulatorPins2 field = "trigger stimulator pin mode #2", triggerSimulatorPinModes2 - field = "trigger stimulator pin #3", triggerSimulatorPins3 - field = "trigger stimulator pin mode #3", triggerSimulatorPinModes3 field = "" field = "Logic input channel 1", logicAnalyzerPins1 field = "Logic input channel 2", logicAnalyzerPins2 diff --git a/firmware/tunerstudio/generated/rusefi_mre_f4.ini b/firmware/tunerstudio/generated/rusefi_mre_f4.ini index 43aadd5e79..b5be114c61 100644 --- a/firmware/tunerstudio/generated/rusefi_mre_f4.ini +++ b/firmware/tunerstudio/generated/rusefi_mre_f4.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.10.03.mre_f4.4272599904" + signature = "rusEFI 2022.10.03.mre_f4.3915123170" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.10.03.mre_f4.4272599904" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.10.03.mre_f4.3915123170" ; 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 @@ -86,7 +86,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Oct 03 04:24:25 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Oct 03 15:06:06 UTC 2022 pageSize = 22048 page = 1 @@ -336,10 +336,10 @@ tunerStudioSerialSpeed = scalar, U32, 740, "BPs", 1, 0, 0, 1000000, 0 compressionRatio = scalar, F32, 744, "CR", 1, 0, 0, 300, 1 triggerSimulatorPins1 = bits, U16, 748, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15" triggerSimulatorPins2 = bits, U16, 750, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15" -triggerSimulatorPins3 = bits, U16, 752, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15" +unusedTrig = scalar, U16, 752, "", 1, 0, 0, 100, 0 triggerSimulatorPinModes1 = bits, U08, 754, [0:1], "default", "default inverted", "open collector", "open collector inverted" triggerSimulatorPinModes2 = bits, U08, 755, [0:1], "default", "default inverted", "open collector", "open collector inverted" -triggerSimulatorPinModes3 = bits, U08, 756, [0:1], "default", "default inverted", "open collector", "open collector inverted" +unusedTrigMode = scalar, U08, 756, "", 1, 0, 0, 100, 0 o2heaterPin = bits, U16, 758, [0:7], 0="NONE",53="10 - Ignition 2",52="11 - Ignition 3",51="12 - Ignition 4",56="13 - GP Out 6",57="14 - GP Out 5",6="28 - AN volt 10, Aux Reuse",172="3 - Lowside 2",38="32 - AN volt 6, Aux Reuse",190="33 - GP Out 3",189="34 - GP Out 2",188="35 - GP Out 1",18="36 - AN volt 8, Aux Reuse",168="37 - Injector 1",169="38 - Injector 2",19="40 - AN volt 9, Aux Reuse",170="41 - Injector 3",171="42 - Injector 4",191="43 - GP Out 4",173="7 - Lowside 1",54="9 - Ignition 1",72="AUX J10 PE6",71="AUX J11 PE5",29="AUX J12",28="AUX J13",25="AUX J18 PB7",17="AUX J2 PA15",26="AUX J2 PB8",27="AUX J2 PB9",46="AUX J2 PC12",66="AUX J6" o2heaterPinModeTodO = bits, U08, 760, [0:1], "default", "default inverted", "open collector", "open collector inverted" is_enabled_spi_1 = bits, U32, 764, [0:0], "false", "true" @@ -763,30 +763,30 @@ unused1127 = bits, U32, 1628, [4:4], "false", "true" unused1128 = bits, U32, 1628, [5:5], "false", "true" unused1129 = bits, U32, 1628, [6:6], "false", "true" unused1130 = bits, U32, 1628, [7:7], "false", "true" -unusedBit_539_8 = bits, U32, 1628, [8:8], "false", "true" -unusedBit_539_9 = bits, U32, 1628, [9:9], "false", "true" -unusedBit_539_10 = bits, U32, 1628, [10:10], "false", "true" -unusedBit_539_11 = bits, U32, 1628, [11:11], "false", "true" -unusedBit_539_12 = bits, U32, 1628, [12:12], "false", "true" -unusedBit_539_13 = bits, U32, 1628, [13:13], "false", "true" -unusedBit_539_14 = bits, U32, 1628, [14:14], "false", "true" -unusedBit_539_15 = bits, U32, 1628, [15:15], "false", "true" -unusedBit_539_16 = bits, U32, 1628, [16:16], "false", "true" -unusedBit_539_17 = bits, U32, 1628, [17:17], "false", "true" -unusedBit_539_18 = bits, U32, 1628, [18:18], "false", "true" -unusedBit_539_19 = bits, U32, 1628, [19:19], "false", "true" -unusedBit_539_20 = bits, U32, 1628, [20:20], "false", "true" -unusedBit_539_21 = bits, U32, 1628, [21:21], "false", "true" -unusedBit_539_22 = bits, U32, 1628, [22:22], "false", "true" -unusedBit_539_23 = bits, U32, 1628, [23:23], "false", "true" -unusedBit_539_24 = bits, U32, 1628, [24:24], "false", "true" -unusedBit_539_25 = bits, U32, 1628, [25:25], "false", "true" -unusedBit_539_26 = bits, U32, 1628, [26:26], "false", "true" -unusedBit_539_27 = bits, U32, 1628, [27:27], "false", "true" -unusedBit_539_28 = bits, U32, 1628, [28:28], "false", "true" -unusedBit_539_29 = bits, U32, 1628, [29:29], "false", "true" -unusedBit_539_30 = bits, U32, 1628, [30:30], "false", "true" -unusedBit_539_31 = bits, U32, 1628, [31:31], "false", "true" +unusedBit_541_8 = bits, U32, 1628, [8:8], "false", "true" +unusedBit_541_9 = bits, U32, 1628, [9:9], "false", "true" +unusedBit_541_10 = bits, U32, 1628, [10:10], "false", "true" +unusedBit_541_11 = bits, U32, 1628, [11:11], "false", "true" +unusedBit_541_12 = bits, U32, 1628, [12:12], "false", "true" +unusedBit_541_13 = bits, U32, 1628, [13:13], "false", "true" +unusedBit_541_14 = bits, U32, 1628, [14:14], "false", "true" +unusedBit_541_15 = bits, U32, 1628, [15:15], "false", "true" +unusedBit_541_16 = bits, U32, 1628, [16:16], "false", "true" +unusedBit_541_17 = bits, U32, 1628, [17:17], "false", "true" +unusedBit_541_18 = bits, U32, 1628, [18:18], "false", "true" +unusedBit_541_19 = bits, U32, 1628, [19:19], "false", "true" +unusedBit_541_20 = bits, U32, 1628, [20:20], "false", "true" +unusedBit_541_21 = bits, U32, 1628, [21:21], "false", "true" +unusedBit_541_22 = bits, U32, 1628, [22:22], "false", "true" +unusedBit_541_23 = bits, U32, 1628, [23:23], "false", "true" +unusedBit_541_24 = bits, U32, 1628, [24:24], "false", "true" +unusedBit_541_25 = bits, U32, 1628, [25:25], "false", "true" +unusedBit_541_26 = bits, U32, 1628, [26:26], "false", "true" +unusedBit_541_27 = bits, U32, 1628, [27:27], "false", "true" +unusedBit_541_28 = bits, U32, 1628, [28:28], "false", "true" +unusedBit_541_29 = bits, U32, 1628, [29:29], "false", "true" +unusedBit_541_30 = bits, U32, 1628, [30:30], "false", "true" +unusedBit_541_31 = bits, U32, 1628, [31:31], "false", "true" benchTestOffTime = scalar, U08, 1632, "ms", 5.0, 0, 0, 2000, 1 benchTestCount = scalar, U08, 1633, "count", 1, 0, 0, 250, 1 benchTestOnTime = scalar, U08, 1634, "ms", 5.0, 0, 0, 2000, 1 @@ -1555,10 +1555,8 @@ ignBlends4_blendValues = array, U08, 22038, [8], "%", 0.5, 0, 0, 100, 1 compressionRatio = "Just for reference really, not taken into account by any logic at this point" triggerSimulatorPins1 = "Each rusEFI piece can provide synthetic trigger signal for external ECU. Sometimes these wires are routed back into trigger inputs of the same rusEFI board." triggerSimulatorPins2 = "Each rusEFI piece can provide synthetic trigger signal for external ECU. Sometimes these wires are routed back into trigger inputs of the same rusEFI board." - triggerSimulatorPins3 = "Each rusEFI piece can provide synthetic trigger signal for external ECU. Sometimes these wires are routed back into trigger inputs of the same rusEFI board." triggerSimulatorPinModes1 = "triggerSimulatorPinModes 1" triggerSimulatorPinModes2 = "triggerSimulatorPinModes 2" - triggerSimulatorPinModes3 = "triggerSimulatorPinModes 3" o2heaterPin = "Narrow band o2 heater, not used for CJ125. 'ON' if engine is running, 'OFF' if stopped or cranking. See wboHeaterPin" isSdCardEnabled = "enable sd/disable sd" rusefiVerbose29b = "Use 11 bit (standard) or 29 bit (extended) IDs for rusEFI verbose CAN format." @@ -6469,7 +6467,6 @@ dialog = wideband_stateDialog, "wideband_state" dialog = allPins1_1 field = "trigger stimulator pin #1", triggerSimulatorPins1 field = "trigger stimulator pin #2", triggerSimulatorPins2 - field = "trigger stimulator pin #2", triggerSimulatorPins3 field = "Warning Led", warningLedPin field = "tle6240_cs", tle6240_cs field = "tle6240 SPI", tle6240spiDevice diff --git a/firmware/tunerstudio/generated/rusefi_mre_f7.ini b/firmware/tunerstudio/generated/rusefi_mre_f7.ini index 887a5ef1cc..7676fa5ab1 100644 --- a/firmware/tunerstudio/generated/rusefi_mre_f7.ini +++ b/firmware/tunerstudio/generated/rusefi_mre_f7.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.10.03.mre_f7.4272599904" + signature = "rusEFI 2022.10.03.mre_f7.3915123170" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.10.03.mre_f7.4272599904" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.10.03.mre_f7.3915123170" ; 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 @@ -86,7 +86,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Oct 03 04:24:23 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Oct 03 15:06:04 UTC 2022 pageSize = 22048 page = 1 @@ -336,10 +336,10 @@ tunerStudioSerialSpeed = scalar, U32, 740, "BPs", 1, 0, 0, 1000000, 0 compressionRatio = scalar, F32, 744, "CR", 1, 0, 0, 300, 1 triggerSimulatorPins1 = bits, U16, 748, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15" triggerSimulatorPins2 = bits, U16, 750, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15" -triggerSimulatorPins3 = bits, U16, 752, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15" +unusedTrig = scalar, U16, 752, "", 1, 0, 0, 100, 0 triggerSimulatorPinModes1 = bits, U08, 754, [0:1], "default", "default inverted", "open collector", "open collector inverted" triggerSimulatorPinModes2 = bits, U08, 755, [0:1], "default", "default inverted", "open collector", "open collector inverted" -triggerSimulatorPinModes3 = bits, U08, 756, [0:1], "default", "default inverted", "open collector", "open collector inverted" +unusedTrigMode = scalar, U08, 756, "", 1, 0, 0, 100, 0 o2heaterPin = bits, U16, 758, [0:7], 0="NONE",53="10 - Ignition 2",52="11 - Ignition 3",51="12 - Ignition 4",56="13 - GP Out 6",57="14 - GP Out 5",6="28 - AN volt 10, Aux Reuse",172="3 - Lowside 2",38="32 - AN volt 6, Aux Reuse",190="33 - GP Out 3",189="34 - GP Out 2",188="35 - GP Out 1",18="36 - AN volt 8, Aux Reuse",168="37 - Injector 1",169="38 - Injector 2",19="40 - AN volt 9, Aux Reuse",170="41 - Injector 3",171="42 - Injector 4",191="43 - GP Out 4",173="7 - Lowside 1",54="9 - Ignition 1",72="AUX J10 PE6",71="AUX J11 PE5",29="AUX J12",28="AUX J13",25="AUX J18 PB7",17="AUX J2 PA15",26="AUX J2 PB8",27="AUX J2 PB9",46="AUX J2 PC12",66="AUX J6" o2heaterPinModeTodO = bits, U08, 760, [0:1], "default", "default inverted", "open collector", "open collector inverted" is_enabled_spi_1 = bits, U32, 764, [0:0], "false", "true" @@ -763,30 +763,30 @@ unused1127 = bits, U32, 1628, [4:4], "false", "true" unused1128 = bits, U32, 1628, [5:5], "false", "true" unused1129 = bits, U32, 1628, [6:6], "false", "true" unused1130 = bits, U32, 1628, [7:7], "false", "true" -unusedBit_539_8 = bits, U32, 1628, [8:8], "false", "true" -unusedBit_539_9 = bits, U32, 1628, [9:9], "false", "true" -unusedBit_539_10 = bits, U32, 1628, [10:10], "false", "true" -unusedBit_539_11 = bits, U32, 1628, [11:11], "false", "true" -unusedBit_539_12 = bits, U32, 1628, [12:12], "false", "true" -unusedBit_539_13 = bits, U32, 1628, [13:13], "false", "true" -unusedBit_539_14 = bits, U32, 1628, [14:14], "false", "true" -unusedBit_539_15 = bits, U32, 1628, [15:15], "false", "true" -unusedBit_539_16 = bits, U32, 1628, [16:16], "false", "true" -unusedBit_539_17 = bits, U32, 1628, [17:17], "false", "true" -unusedBit_539_18 = bits, U32, 1628, [18:18], "false", "true" -unusedBit_539_19 = bits, U32, 1628, [19:19], "false", "true" -unusedBit_539_20 = bits, U32, 1628, [20:20], "false", "true" -unusedBit_539_21 = bits, U32, 1628, [21:21], "false", "true" -unusedBit_539_22 = bits, U32, 1628, [22:22], "false", "true" -unusedBit_539_23 = bits, U32, 1628, [23:23], "false", "true" -unusedBit_539_24 = bits, U32, 1628, [24:24], "false", "true" -unusedBit_539_25 = bits, U32, 1628, [25:25], "false", "true" -unusedBit_539_26 = bits, U32, 1628, [26:26], "false", "true" -unusedBit_539_27 = bits, U32, 1628, [27:27], "false", "true" -unusedBit_539_28 = bits, U32, 1628, [28:28], "false", "true" -unusedBit_539_29 = bits, U32, 1628, [29:29], "false", "true" -unusedBit_539_30 = bits, U32, 1628, [30:30], "false", "true" -unusedBit_539_31 = bits, U32, 1628, [31:31], "false", "true" +unusedBit_541_8 = bits, U32, 1628, [8:8], "false", "true" +unusedBit_541_9 = bits, U32, 1628, [9:9], "false", "true" +unusedBit_541_10 = bits, U32, 1628, [10:10], "false", "true" +unusedBit_541_11 = bits, U32, 1628, [11:11], "false", "true" +unusedBit_541_12 = bits, U32, 1628, [12:12], "false", "true" +unusedBit_541_13 = bits, U32, 1628, [13:13], "false", "true" +unusedBit_541_14 = bits, U32, 1628, [14:14], "false", "true" +unusedBit_541_15 = bits, U32, 1628, [15:15], "false", "true" +unusedBit_541_16 = bits, U32, 1628, [16:16], "false", "true" +unusedBit_541_17 = bits, U32, 1628, [17:17], "false", "true" +unusedBit_541_18 = bits, U32, 1628, [18:18], "false", "true" +unusedBit_541_19 = bits, U32, 1628, [19:19], "false", "true" +unusedBit_541_20 = bits, U32, 1628, [20:20], "false", "true" +unusedBit_541_21 = bits, U32, 1628, [21:21], "false", "true" +unusedBit_541_22 = bits, U32, 1628, [22:22], "false", "true" +unusedBit_541_23 = bits, U32, 1628, [23:23], "false", "true" +unusedBit_541_24 = bits, U32, 1628, [24:24], "false", "true" +unusedBit_541_25 = bits, U32, 1628, [25:25], "false", "true" +unusedBit_541_26 = bits, U32, 1628, [26:26], "false", "true" +unusedBit_541_27 = bits, U32, 1628, [27:27], "false", "true" +unusedBit_541_28 = bits, U32, 1628, [28:28], "false", "true" +unusedBit_541_29 = bits, U32, 1628, [29:29], "false", "true" +unusedBit_541_30 = bits, U32, 1628, [30:30], "false", "true" +unusedBit_541_31 = bits, U32, 1628, [31:31], "false", "true" benchTestOffTime = scalar, U08, 1632, "ms", 5.0, 0, 0, 2000, 1 benchTestCount = scalar, U08, 1633, "count", 1, 0, 0, 250, 1 benchTestOnTime = scalar, U08, 1634, "ms", 5.0, 0, 0, 2000, 1 @@ -1555,10 +1555,8 @@ ignBlends4_blendValues = array, U08, 22038, [8], "%", 0.5, 0, 0, 100, 1 compressionRatio = "Just for reference really, not taken into account by any logic at this point" triggerSimulatorPins1 = "Each rusEFI piece can provide synthetic trigger signal for external ECU. Sometimes these wires are routed back into trigger inputs of the same rusEFI board." triggerSimulatorPins2 = "Each rusEFI piece can provide synthetic trigger signal for external ECU. Sometimes these wires are routed back into trigger inputs of the same rusEFI board." - triggerSimulatorPins3 = "Each rusEFI piece can provide synthetic trigger signal for external ECU. Sometimes these wires are routed back into trigger inputs of the same rusEFI board." triggerSimulatorPinModes1 = "triggerSimulatorPinModes 1" triggerSimulatorPinModes2 = "triggerSimulatorPinModes 2" - triggerSimulatorPinModes3 = "triggerSimulatorPinModes 3" o2heaterPin = "Narrow band o2 heater, not used for CJ125. 'ON' if engine is running, 'OFF' if stopped or cranking. See wboHeaterPin" isSdCardEnabled = "enable sd/disable sd" rusefiVerbose29b = "Use 11 bit (standard) or 29 bit (extended) IDs for rusEFI verbose CAN format." @@ -6469,7 +6467,6 @@ dialog = wideband_stateDialog, "wideband_state" dialog = allPins1_1 field = "trigger stimulator pin #1", triggerSimulatorPins1 field = "trigger stimulator pin #2", triggerSimulatorPins2 - field = "trigger stimulator pin #2", triggerSimulatorPins3 field = "Warning Led", warningLedPin field = "tle6240_cs", tle6240_cs field = "tle6240 SPI", tle6240spiDevice diff --git a/firmware/tunerstudio/generated/rusefi_prometheus_405.ini b/firmware/tunerstudio/generated/rusefi_prometheus_405.ini index 2eaa67ab2e..7f05fd4920 100644 --- a/firmware/tunerstudio/generated/rusefi_prometheus_405.ini +++ b/firmware/tunerstudio/generated/rusefi_prometheus_405.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.10.03.prometheus_405.4044522633" + signature = "rusEFI 2022.10.03.prometheus_405.3873717771" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.10.03.prometheus_405.4044522633" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.10.03.prometheus_405.3873717771" ; 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 @@ -86,7 +86,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Oct 03 04:24:36 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Oct 03 15:06:17 UTC 2022 pageSize = 22048 page = 1 @@ -336,10 +336,10 @@ tunerStudioSerialSpeed = scalar, U32, 740, "BPs", 1, 0, 0, 1000000, 0 compressionRatio = scalar, F32, 744, "CR", 1, 0, 0, 300, 1 triggerSimulatorPins1 = bits, U16, 748, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15" triggerSimulatorPins2 = bits, U16, 750, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15" -triggerSimulatorPins3 = bits, U16, 752, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15" +unusedTrig = scalar, U16, 752, "", 1, 0, 0, 100, 0 triggerSimulatorPinModes1 = bits, U08, 754, [0:1], "default", "default inverted", "open collector", "open collector inverted" triggerSimulatorPinModes2 = bits, U08, 755, [0:1], "default", "default inverted", "open collector", "open collector inverted" -triggerSimulatorPinModes3 = bits, U08, 756, [0:1], "default", "default inverted", "open collector", "open collector inverted" +unusedTrigMode = scalar, U08, 756, "", 1, 0, 0, 100, 0 o2heaterPin = bits, U16, 758, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15", "MC33972_1", "MC33972_2", "MC33972_3", "MC33972_4", "MC33972_5", "MC33972_6", "MC33972_7", "MC33972_8", "MC33972_9", "MC33972_10", "MC33972_11", "MC33972_12", "MC33972_13", "MC33972_14", "MC33972_15", "MC33972_16", "MC33972_17", "MC33972_18", "MC33972_19", "MC33972_20", "MC33972_21", "MC33972_22", "TLE8888_1", "TLE8888_2", "TLE8888_3", "TLE8888_4", "TLE8888_5", "TLE8888_6", "TLE8888_7", "TLE8888_8", "TLE8888_9", "TLE8888_10", "TLE8888_11", "TLE8888_12", "TLE8888_13", "TLE8888_14", "TLE8888_15", "TLE8888_16", "TLE8888_17", "TLE8888_18", "TLE8888_19", "TLE8888_20", "TLE8888_21", "TLE8888_22", "TLE8888_23", "TLE8888_24", "TLE8888_25", "TLE8888_26", "TLE8888_27", "TLE8888_28", "INVALID", "INVALID", "INVALID", "TLE6240_1", "TLE6240_2", "TLE6240_3", "TLE6240_4", "TLE6240_5", "TLE6240_6", "TLE6240_7", "TLE6240_8", "TLE6240_9", "TLE6240_10", "TLE6240_11", "TLE6240_12", "TLE6240_13", "TLE6240_14", "TLE6240_15", "TLE6240_16" o2heaterPinModeTodO = bits, U08, 760, [0:1], "default", "default inverted", "open collector", "open collector inverted" is_enabled_spi_1 = bits, U32, 764, [0:0], "false", "true" @@ -763,30 +763,30 @@ unused1127 = bits, U32, 1628, [4:4], "false", "true" unused1128 = bits, U32, 1628, [5:5], "false", "true" unused1129 = bits, U32, 1628, [6:6], "false", "true" unused1130 = bits, U32, 1628, [7:7], "false", "true" -unusedBit_539_8 = bits, U32, 1628, [8:8], "false", "true" -unusedBit_539_9 = bits, U32, 1628, [9:9], "false", "true" -unusedBit_539_10 = bits, U32, 1628, [10:10], "false", "true" -unusedBit_539_11 = bits, U32, 1628, [11:11], "false", "true" -unusedBit_539_12 = bits, U32, 1628, [12:12], "false", "true" -unusedBit_539_13 = bits, U32, 1628, [13:13], "false", "true" -unusedBit_539_14 = bits, U32, 1628, [14:14], "false", "true" -unusedBit_539_15 = bits, U32, 1628, [15:15], "false", "true" -unusedBit_539_16 = bits, U32, 1628, [16:16], "false", "true" -unusedBit_539_17 = bits, U32, 1628, [17:17], "false", "true" -unusedBit_539_18 = bits, U32, 1628, [18:18], "false", "true" -unusedBit_539_19 = bits, U32, 1628, [19:19], "false", "true" -unusedBit_539_20 = bits, U32, 1628, [20:20], "false", "true" -unusedBit_539_21 = bits, U32, 1628, [21:21], "false", "true" -unusedBit_539_22 = bits, U32, 1628, [22:22], "false", "true" -unusedBit_539_23 = bits, U32, 1628, [23:23], "false", "true" -unusedBit_539_24 = bits, U32, 1628, [24:24], "false", "true" -unusedBit_539_25 = bits, U32, 1628, [25:25], "false", "true" -unusedBit_539_26 = bits, U32, 1628, [26:26], "false", "true" -unusedBit_539_27 = bits, U32, 1628, [27:27], "false", "true" -unusedBit_539_28 = bits, U32, 1628, [28:28], "false", "true" -unusedBit_539_29 = bits, U32, 1628, [29:29], "false", "true" -unusedBit_539_30 = bits, U32, 1628, [30:30], "false", "true" -unusedBit_539_31 = bits, U32, 1628, [31:31], "false", "true" +unusedBit_541_8 = bits, U32, 1628, [8:8], "false", "true" +unusedBit_541_9 = bits, U32, 1628, [9:9], "false", "true" +unusedBit_541_10 = bits, U32, 1628, [10:10], "false", "true" +unusedBit_541_11 = bits, U32, 1628, [11:11], "false", "true" +unusedBit_541_12 = bits, U32, 1628, [12:12], "false", "true" +unusedBit_541_13 = bits, U32, 1628, [13:13], "false", "true" +unusedBit_541_14 = bits, U32, 1628, [14:14], "false", "true" +unusedBit_541_15 = bits, U32, 1628, [15:15], "false", "true" +unusedBit_541_16 = bits, U32, 1628, [16:16], "false", "true" +unusedBit_541_17 = bits, U32, 1628, [17:17], "false", "true" +unusedBit_541_18 = bits, U32, 1628, [18:18], "false", "true" +unusedBit_541_19 = bits, U32, 1628, [19:19], "false", "true" +unusedBit_541_20 = bits, U32, 1628, [20:20], "false", "true" +unusedBit_541_21 = bits, U32, 1628, [21:21], "false", "true" +unusedBit_541_22 = bits, U32, 1628, [22:22], "false", "true" +unusedBit_541_23 = bits, U32, 1628, [23:23], "false", "true" +unusedBit_541_24 = bits, U32, 1628, [24:24], "false", "true" +unusedBit_541_25 = bits, U32, 1628, [25:25], "false", "true" +unusedBit_541_26 = bits, U32, 1628, [26:26], "false", "true" +unusedBit_541_27 = bits, U32, 1628, [27:27], "false", "true" +unusedBit_541_28 = bits, U32, 1628, [28:28], "false", "true" +unusedBit_541_29 = bits, U32, 1628, [29:29], "false", "true" +unusedBit_541_30 = bits, U32, 1628, [30:30], "false", "true" +unusedBit_541_31 = bits, U32, 1628, [31:31], "false", "true" benchTestOffTime = scalar, U08, 1632, "ms", 5.0, 0, 0, 2000, 1 benchTestCount = scalar, U08, 1633, "count", 1, 0, 0, 250, 1 benchTestOnTime = scalar, U08, 1634, "ms", 5.0, 0, 0, 2000, 1 @@ -1555,10 +1555,8 @@ ignBlends4_blendValues = array, U08, 22038, [8], "%", 0.5, 0, 0, 100, 1 compressionRatio = "Just for reference really, not taken into account by any logic at this point" triggerSimulatorPins1 = "Each rusEFI piece can provide synthetic trigger signal for external ECU. Sometimes these wires are routed back into trigger inputs of the same rusEFI board." triggerSimulatorPins2 = "Each rusEFI piece can provide synthetic trigger signal for external ECU. Sometimes these wires are routed back into trigger inputs of the same rusEFI board." - triggerSimulatorPins3 = "Each rusEFI piece can provide synthetic trigger signal for external ECU. Sometimes these wires are routed back into trigger inputs of the same rusEFI board." triggerSimulatorPinModes1 = "triggerSimulatorPinModes 1" triggerSimulatorPinModes2 = "triggerSimulatorPinModes 2" - triggerSimulatorPinModes3 = "triggerSimulatorPinModes 3" o2heaterPin = "Narrow band o2 heater, not used for CJ125. 'ON' if engine is running, 'OFF' if stopped or cranking. See wboHeaterPin" isSdCardEnabled = "enable sd/disable sd" rusefiVerbose29b = "Use 11 bit (standard) or 29 bit (extended) IDs for rusEFI verbose CAN format." @@ -6465,7 +6463,6 @@ dialog = wideband_stateDialog, "wideband_state" dialog = allPins1_1 field = "trigger stimulator pin #1", triggerSimulatorPins1 field = "trigger stimulator pin #2", triggerSimulatorPins2 - field = "trigger stimulator pin #2", triggerSimulatorPins3 field = "Warning Led", warningLedPin field = "tle6240_cs", tle6240_cs field = "tle6240 SPI", tle6240spiDevice @@ -7820,8 +7817,6 @@ dialog = tcuControls, "Transmission Settings" field = "trigger stimulator pin mode #1", triggerSimulatorPinModes1 field = "trigger stimulator pin #2", triggerSimulatorPins2 field = "trigger stimulator pin mode #2", triggerSimulatorPinModes2 - field = "trigger stimulator pin #3", triggerSimulatorPins3 - field = "trigger stimulator pin mode #3", triggerSimulatorPinModes3 field = "" field = "Logic input channel 1", logicAnalyzerPins1 field = "Logic input channel 2", logicAnalyzerPins2 diff --git a/firmware/tunerstudio/generated/rusefi_prometheus_469.ini b/firmware/tunerstudio/generated/rusefi_prometheus_469.ini index d060797b7a..2bd6e8fdb9 100644 --- a/firmware/tunerstudio/generated/rusefi_prometheus_469.ini +++ b/firmware/tunerstudio/generated/rusefi_prometheus_469.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.10.03.prometheus_469.4044522633" + signature = "rusEFI 2022.10.03.prometheus_469.3873717771" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.10.03.prometheus_469.4044522633" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.10.03.prometheus_469.3873717771" ; 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 @@ -86,7 +86,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Oct 03 04:24:33 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Oct 03 15:06:15 UTC 2022 pageSize = 22048 page = 1 @@ -336,10 +336,10 @@ tunerStudioSerialSpeed = scalar, U32, 740, "BPs", 1, 0, 0, 1000000, 0 compressionRatio = scalar, F32, 744, "CR", 1, 0, 0, 300, 1 triggerSimulatorPins1 = bits, U16, 748, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15" triggerSimulatorPins2 = bits, U16, 750, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15" -triggerSimulatorPins3 = bits, U16, 752, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15" +unusedTrig = scalar, U16, 752, "", 1, 0, 0, 100, 0 triggerSimulatorPinModes1 = bits, U08, 754, [0:1], "default", "default inverted", "open collector", "open collector inverted" triggerSimulatorPinModes2 = bits, U08, 755, [0:1], "default", "default inverted", "open collector", "open collector inverted" -triggerSimulatorPinModes3 = bits, U08, 756, [0:1], "default", "default inverted", "open collector", "open collector inverted" +unusedTrigMode = scalar, U08, 756, "", 1, 0, 0, 100, 0 o2heaterPin = bits, U16, 758, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15", "MC33972_1", "MC33972_2", "MC33972_3", "MC33972_4", "MC33972_5", "MC33972_6", "MC33972_7", "MC33972_8", "MC33972_9", "MC33972_10", "MC33972_11", "MC33972_12", "MC33972_13", "MC33972_14", "MC33972_15", "MC33972_16", "MC33972_17", "MC33972_18", "MC33972_19", "MC33972_20", "MC33972_21", "MC33972_22", "TLE8888_1", "TLE8888_2", "TLE8888_3", "TLE8888_4", "TLE8888_5", "TLE8888_6", "TLE8888_7", "TLE8888_8", "TLE8888_9", "TLE8888_10", "TLE8888_11", "TLE8888_12", "TLE8888_13", "TLE8888_14", "TLE8888_15", "TLE8888_16", "TLE8888_17", "TLE8888_18", "TLE8888_19", "TLE8888_20", "TLE8888_21", "TLE8888_22", "TLE8888_23", "TLE8888_24", "TLE8888_25", "TLE8888_26", "TLE8888_27", "TLE8888_28", "INVALID", "INVALID", "INVALID", "TLE6240_1", "TLE6240_2", "TLE6240_3", "TLE6240_4", "TLE6240_5", "TLE6240_6", "TLE6240_7", "TLE6240_8", "TLE6240_9", "TLE6240_10", "TLE6240_11", "TLE6240_12", "TLE6240_13", "TLE6240_14", "TLE6240_15", "TLE6240_16" o2heaterPinModeTodO = bits, U08, 760, [0:1], "default", "default inverted", "open collector", "open collector inverted" is_enabled_spi_1 = bits, U32, 764, [0:0], "false", "true" @@ -763,30 +763,30 @@ unused1127 = bits, U32, 1628, [4:4], "false", "true" unused1128 = bits, U32, 1628, [5:5], "false", "true" unused1129 = bits, U32, 1628, [6:6], "false", "true" unused1130 = bits, U32, 1628, [7:7], "false", "true" -unusedBit_539_8 = bits, U32, 1628, [8:8], "false", "true" -unusedBit_539_9 = bits, U32, 1628, [9:9], "false", "true" -unusedBit_539_10 = bits, U32, 1628, [10:10], "false", "true" -unusedBit_539_11 = bits, U32, 1628, [11:11], "false", "true" -unusedBit_539_12 = bits, U32, 1628, [12:12], "false", "true" -unusedBit_539_13 = bits, U32, 1628, [13:13], "false", "true" -unusedBit_539_14 = bits, U32, 1628, [14:14], "false", "true" -unusedBit_539_15 = bits, U32, 1628, [15:15], "false", "true" -unusedBit_539_16 = bits, U32, 1628, [16:16], "false", "true" -unusedBit_539_17 = bits, U32, 1628, [17:17], "false", "true" -unusedBit_539_18 = bits, U32, 1628, [18:18], "false", "true" -unusedBit_539_19 = bits, U32, 1628, [19:19], "false", "true" -unusedBit_539_20 = bits, U32, 1628, [20:20], "false", "true" -unusedBit_539_21 = bits, U32, 1628, [21:21], "false", "true" -unusedBit_539_22 = bits, U32, 1628, [22:22], "false", "true" -unusedBit_539_23 = bits, U32, 1628, [23:23], "false", "true" -unusedBit_539_24 = bits, U32, 1628, [24:24], "false", "true" -unusedBit_539_25 = bits, U32, 1628, [25:25], "false", "true" -unusedBit_539_26 = bits, U32, 1628, [26:26], "false", "true" -unusedBit_539_27 = bits, U32, 1628, [27:27], "false", "true" -unusedBit_539_28 = bits, U32, 1628, [28:28], "false", "true" -unusedBit_539_29 = bits, U32, 1628, [29:29], "false", "true" -unusedBit_539_30 = bits, U32, 1628, [30:30], "false", "true" -unusedBit_539_31 = bits, U32, 1628, [31:31], "false", "true" +unusedBit_541_8 = bits, U32, 1628, [8:8], "false", "true" +unusedBit_541_9 = bits, U32, 1628, [9:9], "false", "true" +unusedBit_541_10 = bits, U32, 1628, [10:10], "false", "true" +unusedBit_541_11 = bits, U32, 1628, [11:11], "false", "true" +unusedBit_541_12 = bits, U32, 1628, [12:12], "false", "true" +unusedBit_541_13 = bits, U32, 1628, [13:13], "false", "true" +unusedBit_541_14 = bits, U32, 1628, [14:14], "false", "true" +unusedBit_541_15 = bits, U32, 1628, [15:15], "false", "true" +unusedBit_541_16 = bits, U32, 1628, [16:16], "false", "true" +unusedBit_541_17 = bits, U32, 1628, [17:17], "false", "true" +unusedBit_541_18 = bits, U32, 1628, [18:18], "false", "true" +unusedBit_541_19 = bits, U32, 1628, [19:19], "false", "true" +unusedBit_541_20 = bits, U32, 1628, [20:20], "false", "true" +unusedBit_541_21 = bits, U32, 1628, [21:21], "false", "true" +unusedBit_541_22 = bits, U32, 1628, [22:22], "false", "true" +unusedBit_541_23 = bits, U32, 1628, [23:23], "false", "true" +unusedBit_541_24 = bits, U32, 1628, [24:24], "false", "true" +unusedBit_541_25 = bits, U32, 1628, [25:25], "false", "true" +unusedBit_541_26 = bits, U32, 1628, [26:26], "false", "true" +unusedBit_541_27 = bits, U32, 1628, [27:27], "false", "true" +unusedBit_541_28 = bits, U32, 1628, [28:28], "false", "true" +unusedBit_541_29 = bits, U32, 1628, [29:29], "false", "true" +unusedBit_541_30 = bits, U32, 1628, [30:30], "false", "true" +unusedBit_541_31 = bits, U32, 1628, [31:31], "false", "true" benchTestOffTime = scalar, U08, 1632, "ms", 5.0, 0, 0, 2000, 1 benchTestCount = scalar, U08, 1633, "count", 1, 0, 0, 250, 1 benchTestOnTime = scalar, U08, 1634, "ms", 5.0, 0, 0, 2000, 1 @@ -1555,10 +1555,8 @@ ignBlends4_blendValues = array, U08, 22038, [8], "%", 0.5, 0, 0, 100, 1 compressionRatio = "Just for reference really, not taken into account by any logic at this point" triggerSimulatorPins1 = "Each rusEFI piece can provide synthetic trigger signal for external ECU. Sometimes these wires are routed back into trigger inputs of the same rusEFI board." triggerSimulatorPins2 = "Each rusEFI piece can provide synthetic trigger signal for external ECU. Sometimes these wires are routed back into trigger inputs of the same rusEFI board." - triggerSimulatorPins3 = "Each rusEFI piece can provide synthetic trigger signal for external ECU. Sometimes these wires are routed back into trigger inputs of the same rusEFI board." triggerSimulatorPinModes1 = "triggerSimulatorPinModes 1" triggerSimulatorPinModes2 = "triggerSimulatorPinModes 2" - triggerSimulatorPinModes3 = "triggerSimulatorPinModes 3" o2heaterPin = "Narrow band o2 heater, not used for CJ125. 'ON' if engine is running, 'OFF' if stopped or cranking. See wboHeaterPin" isSdCardEnabled = "enable sd/disable sd" rusefiVerbose29b = "Use 11 bit (standard) or 29 bit (extended) IDs for rusEFI verbose CAN format." @@ -6465,7 +6463,6 @@ dialog = wideband_stateDialog, "wideband_state" dialog = allPins1_1 field = "trigger stimulator pin #1", triggerSimulatorPins1 field = "trigger stimulator pin #2", triggerSimulatorPins2 - field = "trigger stimulator pin #2", triggerSimulatorPins3 field = "Warning Led", warningLedPin field = "tle6240_cs", tle6240_cs field = "tle6240 SPI", tle6240spiDevice @@ -7820,8 +7817,6 @@ dialog = tcuControls, "Transmission Settings" field = "trigger stimulator pin mode #1", triggerSimulatorPinModes1 field = "trigger stimulator pin #2", triggerSimulatorPins2 field = "trigger stimulator pin mode #2", triggerSimulatorPinModes2 - field = "trigger stimulator pin #3", triggerSimulatorPins3 - field = "trigger stimulator pin mode #3", triggerSimulatorPinModes3 field = "" field = "Logic input channel 1", logicAnalyzerPins1 field = "Logic input channel 2", logicAnalyzerPins2 diff --git a/firmware/tunerstudio/generated/rusefi_proteus_f4.ini b/firmware/tunerstudio/generated/rusefi_proteus_f4.ini index c6edefc5c6..8a20e82af4 100644 --- a/firmware/tunerstudio/generated/rusefi_proteus_f4.ini +++ b/firmware/tunerstudio/generated/rusefi_proteus_f4.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.10.03.proteus_f4.70621721" + signature = "rusEFI 2022.10.03.proteus_f4.331554971" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.10.03.proteus_f4.70621721" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.10.03.proteus_f4.331554971" ; 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 @@ -86,7 +86,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Oct 03 04:24:40 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Oct 03 15:06:21 UTC 2022 pageSize = 22048 page = 1 @@ -336,10 +336,10 @@ tunerStudioSerialSpeed = scalar, U32, 740, "BPs", 1, 0, 0, 1000000, 0 compressionRatio = scalar, F32, 744, "CR", 1, 0, 0, 300, 1 triggerSimulatorPins1 = bits, U16, 748, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15" triggerSimulatorPins2 = bits, U16, 750, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15" -triggerSimulatorPins3 = bits, U16, 752, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15" +unusedTrig = scalar, U16, 752, "", 1, 0, 0, 100, 0 triggerSimulatorPinModes1 = bits, U08, 754, [0:1], "default", "default inverted", "open collector", "open collector inverted" triggerSimulatorPinModes2 = bits, U08, 755, [0:1], "default", "default inverted", "open collector", "open collector inverted" -triggerSimulatorPinModes3 = bits, U08, 756, [0:1], "default", "default inverted", "open collector", "open collector inverted" +unusedTrigMode = scalar, U08, 756, "", 1, 0, 0, 100, 0 o2heaterPin = bits, U16, 758, [0:7], 0="NONE",11="Highside 1",10="Highside 2",65="Highside 3",64="Highside 4",54="Ign 1",102="Ign 10",101="Ign 11",100="Ign 12",53="Ign 2",43="Ign 3",42="Ign 4",41="Ign 5",106="Ign 6",105="Ign 7",104="Ign 8",103="Ign 9",57="Lowside 1",24="Lowside 10",25="Lowside 11",26="Lowside 12",27="Lowside 13",66="Lowside 14",67="Lowside 15",68="Lowside 16",107="Lowside 2",108="Lowside 3",109="Lowside 4",110="Lowside 5",111="Lowside 6",112="Lowside 7",22="Lowside 8",23="Lowside 9",60="STM32 PD10",61="STM32 PD11",62="STM32 PD12",63="STM32 PD13",58="STM32 PD8",59="STM32 PD9" o2heaterPinModeTodO = bits, U08, 760, [0:1], "default", "default inverted", "open collector", "open collector inverted" is_enabled_spi_1 = bits, U32, 764, [0:0], "false", "true" @@ -763,30 +763,30 @@ unused1127 = bits, U32, 1628, [4:4], "false", "true" unused1128 = bits, U32, 1628, [5:5], "false", "true" unused1129 = bits, U32, 1628, [6:6], "false", "true" unused1130 = bits, U32, 1628, [7:7], "false", "true" -unusedBit_539_8 = bits, U32, 1628, [8:8], "false", "true" -unusedBit_539_9 = bits, U32, 1628, [9:9], "false", "true" -unusedBit_539_10 = bits, U32, 1628, [10:10], "false", "true" -unusedBit_539_11 = bits, U32, 1628, [11:11], "false", "true" -unusedBit_539_12 = bits, U32, 1628, [12:12], "false", "true" -unusedBit_539_13 = bits, U32, 1628, [13:13], "false", "true" -unusedBit_539_14 = bits, U32, 1628, [14:14], "false", "true" -unusedBit_539_15 = bits, U32, 1628, [15:15], "false", "true" -unusedBit_539_16 = bits, U32, 1628, [16:16], "false", "true" -unusedBit_539_17 = bits, U32, 1628, [17:17], "false", "true" -unusedBit_539_18 = bits, U32, 1628, [18:18], "false", "true" -unusedBit_539_19 = bits, U32, 1628, [19:19], "false", "true" -unusedBit_539_20 = bits, U32, 1628, [20:20], "false", "true" -unusedBit_539_21 = bits, U32, 1628, [21:21], "false", "true" -unusedBit_539_22 = bits, U32, 1628, [22:22], "false", "true" -unusedBit_539_23 = bits, U32, 1628, [23:23], "false", "true" -unusedBit_539_24 = bits, U32, 1628, [24:24], "false", "true" -unusedBit_539_25 = bits, U32, 1628, [25:25], "false", "true" -unusedBit_539_26 = bits, U32, 1628, [26:26], "false", "true" -unusedBit_539_27 = bits, U32, 1628, [27:27], "false", "true" -unusedBit_539_28 = bits, U32, 1628, [28:28], "false", "true" -unusedBit_539_29 = bits, U32, 1628, [29:29], "false", "true" -unusedBit_539_30 = bits, U32, 1628, [30:30], "false", "true" -unusedBit_539_31 = bits, U32, 1628, [31:31], "false", "true" +unusedBit_541_8 = bits, U32, 1628, [8:8], "false", "true" +unusedBit_541_9 = bits, U32, 1628, [9:9], "false", "true" +unusedBit_541_10 = bits, U32, 1628, [10:10], "false", "true" +unusedBit_541_11 = bits, U32, 1628, [11:11], "false", "true" +unusedBit_541_12 = bits, U32, 1628, [12:12], "false", "true" +unusedBit_541_13 = bits, U32, 1628, [13:13], "false", "true" +unusedBit_541_14 = bits, U32, 1628, [14:14], "false", "true" +unusedBit_541_15 = bits, U32, 1628, [15:15], "false", "true" +unusedBit_541_16 = bits, U32, 1628, [16:16], "false", "true" +unusedBit_541_17 = bits, U32, 1628, [17:17], "false", "true" +unusedBit_541_18 = bits, U32, 1628, [18:18], "false", "true" +unusedBit_541_19 = bits, U32, 1628, [19:19], "false", "true" +unusedBit_541_20 = bits, U32, 1628, [20:20], "false", "true" +unusedBit_541_21 = bits, U32, 1628, [21:21], "false", "true" +unusedBit_541_22 = bits, U32, 1628, [22:22], "false", "true" +unusedBit_541_23 = bits, U32, 1628, [23:23], "false", "true" +unusedBit_541_24 = bits, U32, 1628, [24:24], "false", "true" +unusedBit_541_25 = bits, U32, 1628, [25:25], "false", "true" +unusedBit_541_26 = bits, U32, 1628, [26:26], "false", "true" +unusedBit_541_27 = bits, U32, 1628, [27:27], "false", "true" +unusedBit_541_28 = bits, U32, 1628, [28:28], "false", "true" +unusedBit_541_29 = bits, U32, 1628, [29:29], "false", "true" +unusedBit_541_30 = bits, U32, 1628, [30:30], "false", "true" +unusedBit_541_31 = bits, U32, 1628, [31:31], "false", "true" benchTestOffTime = scalar, U08, 1632, "ms", 5.0, 0, 0, 2000, 1 benchTestCount = scalar, U08, 1633, "count", 1, 0, 0, 250, 1 benchTestOnTime = scalar, U08, 1634, "ms", 5.0, 0, 0, 2000, 1 @@ -1555,10 +1555,8 @@ ignBlends4_blendValues = array, U08, 22038, [8], "%", 0.5, 0, 0, 100, 1 compressionRatio = "Just for reference really, not taken into account by any logic at this point" triggerSimulatorPins1 = "Each rusEFI piece can provide synthetic trigger signal for external ECU. Sometimes these wires are routed back into trigger inputs of the same rusEFI board." triggerSimulatorPins2 = "Each rusEFI piece can provide synthetic trigger signal for external ECU. Sometimes these wires are routed back into trigger inputs of the same rusEFI board." - triggerSimulatorPins3 = "Each rusEFI piece can provide synthetic trigger signal for external ECU. Sometimes these wires are routed back into trigger inputs of the same rusEFI board." triggerSimulatorPinModes1 = "triggerSimulatorPinModes 1" triggerSimulatorPinModes2 = "triggerSimulatorPinModes 2" - triggerSimulatorPinModes3 = "triggerSimulatorPinModes 3" o2heaterPin = "Narrow band o2 heater, not used for CJ125. 'ON' if engine is running, 'OFF' if stopped or cranking. See wboHeaterPin" isSdCardEnabled = "enable sd/disable sd" rusefiVerbose29b = "Use 11 bit (standard) or 29 bit (extended) IDs for rusEFI verbose CAN format." @@ -6465,7 +6463,6 @@ dialog = wideband_stateDialog, "wideband_state" dialog = allPins1_1 field = "trigger stimulator pin #1", triggerSimulatorPins1 field = "trigger stimulator pin #2", triggerSimulatorPins2 - field = "trigger stimulator pin #2", triggerSimulatorPins3 field = "Warning Led", warningLedPin field = "tle6240_cs", tle6240_cs field = "tle6240 SPI", tle6240spiDevice diff --git a/firmware/tunerstudio/generated/rusefi_proteus_f7.ini b/firmware/tunerstudio/generated/rusefi_proteus_f7.ini index 12548a7277..71fde1fae9 100644 --- a/firmware/tunerstudio/generated/rusefi_proteus_f7.ini +++ b/firmware/tunerstudio/generated/rusefi_proteus_f7.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.10.03.proteus_f7.70621721" + signature = "rusEFI 2022.10.03.proteus_f7.331554971" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.10.03.proteus_f7.70621721" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.10.03.proteus_f7.331554971" ; 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 @@ -86,7 +86,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Oct 03 04:24:38 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Oct 03 15:06:19 UTC 2022 pageSize = 22048 page = 1 @@ -336,10 +336,10 @@ tunerStudioSerialSpeed = scalar, U32, 740, "BPs", 1, 0, 0, 1000000, 0 compressionRatio = scalar, F32, 744, "CR", 1, 0, 0, 300, 1 triggerSimulatorPins1 = bits, U16, 748, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15" triggerSimulatorPins2 = bits, U16, 750, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15" -triggerSimulatorPins3 = bits, U16, 752, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15" +unusedTrig = scalar, U16, 752, "", 1, 0, 0, 100, 0 triggerSimulatorPinModes1 = bits, U08, 754, [0:1], "default", "default inverted", "open collector", "open collector inverted" triggerSimulatorPinModes2 = bits, U08, 755, [0:1], "default", "default inverted", "open collector", "open collector inverted" -triggerSimulatorPinModes3 = bits, U08, 756, [0:1], "default", "default inverted", "open collector", "open collector inverted" +unusedTrigMode = scalar, U08, 756, "", 1, 0, 0, 100, 0 o2heaterPin = bits, U16, 758, [0:7], 0="NONE",11="Highside 1",10="Highside 2",65="Highside 3",64="Highside 4",54="Ign 1",102="Ign 10",101="Ign 11",100="Ign 12",53="Ign 2",43="Ign 3",42="Ign 4",41="Ign 5",106="Ign 6",105="Ign 7",104="Ign 8",103="Ign 9",57="Lowside 1",24="Lowside 10",25="Lowside 11",26="Lowside 12",27="Lowside 13",66="Lowside 14",67="Lowside 15",68="Lowside 16",107="Lowside 2",108="Lowside 3",109="Lowside 4",110="Lowside 5",111="Lowside 6",112="Lowside 7",22="Lowside 8",23="Lowside 9",60="STM32 PD10",61="STM32 PD11",62="STM32 PD12",63="STM32 PD13",58="STM32 PD8",59="STM32 PD9" o2heaterPinModeTodO = bits, U08, 760, [0:1], "default", "default inverted", "open collector", "open collector inverted" is_enabled_spi_1 = bits, U32, 764, [0:0], "false", "true" @@ -763,30 +763,30 @@ unused1127 = bits, U32, 1628, [4:4], "false", "true" unused1128 = bits, U32, 1628, [5:5], "false", "true" unused1129 = bits, U32, 1628, [6:6], "false", "true" unused1130 = bits, U32, 1628, [7:7], "false", "true" -unusedBit_539_8 = bits, U32, 1628, [8:8], "false", "true" -unusedBit_539_9 = bits, U32, 1628, [9:9], "false", "true" -unusedBit_539_10 = bits, U32, 1628, [10:10], "false", "true" -unusedBit_539_11 = bits, U32, 1628, [11:11], "false", "true" -unusedBit_539_12 = bits, U32, 1628, [12:12], "false", "true" -unusedBit_539_13 = bits, U32, 1628, [13:13], "false", "true" -unusedBit_539_14 = bits, U32, 1628, [14:14], "false", "true" -unusedBit_539_15 = bits, U32, 1628, [15:15], "false", "true" -unusedBit_539_16 = bits, U32, 1628, [16:16], "false", "true" -unusedBit_539_17 = bits, U32, 1628, [17:17], "false", "true" -unusedBit_539_18 = bits, U32, 1628, [18:18], "false", "true" -unusedBit_539_19 = bits, U32, 1628, [19:19], "false", "true" -unusedBit_539_20 = bits, U32, 1628, [20:20], "false", "true" -unusedBit_539_21 = bits, U32, 1628, [21:21], "false", "true" -unusedBit_539_22 = bits, U32, 1628, [22:22], "false", "true" -unusedBit_539_23 = bits, U32, 1628, [23:23], "false", "true" -unusedBit_539_24 = bits, U32, 1628, [24:24], "false", "true" -unusedBit_539_25 = bits, U32, 1628, [25:25], "false", "true" -unusedBit_539_26 = bits, U32, 1628, [26:26], "false", "true" -unusedBit_539_27 = bits, U32, 1628, [27:27], "false", "true" -unusedBit_539_28 = bits, U32, 1628, [28:28], "false", "true" -unusedBit_539_29 = bits, U32, 1628, [29:29], "false", "true" -unusedBit_539_30 = bits, U32, 1628, [30:30], "false", "true" -unusedBit_539_31 = bits, U32, 1628, [31:31], "false", "true" +unusedBit_541_8 = bits, U32, 1628, [8:8], "false", "true" +unusedBit_541_9 = bits, U32, 1628, [9:9], "false", "true" +unusedBit_541_10 = bits, U32, 1628, [10:10], "false", "true" +unusedBit_541_11 = bits, U32, 1628, [11:11], "false", "true" +unusedBit_541_12 = bits, U32, 1628, [12:12], "false", "true" +unusedBit_541_13 = bits, U32, 1628, [13:13], "false", "true" +unusedBit_541_14 = bits, U32, 1628, [14:14], "false", "true" +unusedBit_541_15 = bits, U32, 1628, [15:15], "false", "true" +unusedBit_541_16 = bits, U32, 1628, [16:16], "false", "true" +unusedBit_541_17 = bits, U32, 1628, [17:17], "false", "true" +unusedBit_541_18 = bits, U32, 1628, [18:18], "false", "true" +unusedBit_541_19 = bits, U32, 1628, [19:19], "false", "true" +unusedBit_541_20 = bits, U32, 1628, [20:20], "false", "true" +unusedBit_541_21 = bits, U32, 1628, [21:21], "false", "true" +unusedBit_541_22 = bits, U32, 1628, [22:22], "false", "true" +unusedBit_541_23 = bits, U32, 1628, [23:23], "false", "true" +unusedBit_541_24 = bits, U32, 1628, [24:24], "false", "true" +unusedBit_541_25 = bits, U32, 1628, [25:25], "false", "true" +unusedBit_541_26 = bits, U32, 1628, [26:26], "false", "true" +unusedBit_541_27 = bits, U32, 1628, [27:27], "false", "true" +unusedBit_541_28 = bits, U32, 1628, [28:28], "false", "true" +unusedBit_541_29 = bits, U32, 1628, [29:29], "false", "true" +unusedBit_541_30 = bits, U32, 1628, [30:30], "false", "true" +unusedBit_541_31 = bits, U32, 1628, [31:31], "false", "true" benchTestOffTime = scalar, U08, 1632, "ms", 5.0, 0, 0, 2000, 1 benchTestCount = scalar, U08, 1633, "count", 1, 0, 0, 250, 1 benchTestOnTime = scalar, U08, 1634, "ms", 5.0, 0, 0, 2000, 1 @@ -1555,10 +1555,8 @@ ignBlends4_blendValues = array, U08, 22038, [8], "%", 0.5, 0, 0, 100, 1 compressionRatio = "Just for reference really, not taken into account by any logic at this point" triggerSimulatorPins1 = "Each rusEFI piece can provide synthetic trigger signal for external ECU. Sometimes these wires are routed back into trigger inputs of the same rusEFI board." triggerSimulatorPins2 = "Each rusEFI piece can provide synthetic trigger signal for external ECU. Sometimes these wires are routed back into trigger inputs of the same rusEFI board." - triggerSimulatorPins3 = "Each rusEFI piece can provide synthetic trigger signal for external ECU. Sometimes these wires are routed back into trigger inputs of the same rusEFI board." triggerSimulatorPinModes1 = "triggerSimulatorPinModes 1" triggerSimulatorPinModes2 = "triggerSimulatorPinModes 2" - triggerSimulatorPinModes3 = "triggerSimulatorPinModes 3" o2heaterPin = "Narrow band o2 heater, not used for CJ125. 'ON' if engine is running, 'OFF' if stopped or cranking. See wboHeaterPin" isSdCardEnabled = "enable sd/disable sd" rusefiVerbose29b = "Use 11 bit (standard) or 29 bit (extended) IDs for rusEFI verbose CAN format." @@ -6465,7 +6463,6 @@ dialog = wideband_stateDialog, "wideband_state" dialog = allPins1_1 field = "trigger stimulator pin #1", triggerSimulatorPins1 field = "trigger stimulator pin #2", triggerSimulatorPins2 - field = "trigger stimulator pin #2", triggerSimulatorPins3 field = "Warning Led", warningLedPin field = "tle6240_cs", tle6240_cs field = "tle6240 SPI", tle6240spiDevice diff --git a/firmware/tunerstudio/generated/rusefi_proteus_h7.ini b/firmware/tunerstudio/generated/rusefi_proteus_h7.ini index cbadbee128..d17e5616f0 100644 --- a/firmware/tunerstudio/generated/rusefi_proteus_h7.ini +++ b/firmware/tunerstudio/generated/rusefi_proteus_h7.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.10.03.proteus_h7.70621721" + signature = "rusEFI 2022.10.03.proteus_h7.331554971" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.10.03.proteus_h7.70621721" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.10.03.proteus_h7.331554971" ; 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 @@ -86,7 +86,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Oct 03 04:24:42 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Oct 03 15:06:23 UTC 2022 pageSize = 22048 page = 1 @@ -336,10 +336,10 @@ tunerStudioSerialSpeed = scalar, U32, 740, "BPs", 1, 0, 0, 1000000, 0 compressionRatio = scalar, F32, 744, "CR", 1, 0, 0, 300, 1 triggerSimulatorPins1 = bits, U16, 748, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15" triggerSimulatorPins2 = bits, U16, 750, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15" -triggerSimulatorPins3 = bits, U16, 752, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15" +unusedTrig = scalar, U16, 752, "", 1, 0, 0, 100, 0 triggerSimulatorPinModes1 = bits, U08, 754, [0:1], "default", "default inverted", "open collector", "open collector inverted" triggerSimulatorPinModes2 = bits, U08, 755, [0:1], "default", "default inverted", "open collector", "open collector inverted" -triggerSimulatorPinModes3 = bits, U08, 756, [0:1], "default", "default inverted", "open collector", "open collector inverted" +unusedTrigMode = scalar, U08, 756, "", 1, 0, 0, 100, 0 o2heaterPin = bits, U16, 758, [0:7], 0="NONE",11="Highside 1",10="Highside 2",65="Highside 3",64="Highside 4",54="Ign 1",102="Ign 10",101="Ign 11",100="Ign 12",53="Ign 2",43="Ign 3",42="Ign 4",41="Ign 5",106="Ign 6",105="Ign 7",104="Ign 8",103="Ign 9",57="Lowside 1",24="Lowside 10",25="Lowside 11",26="Lowside 12",27="Lowside 13",66="Lowside 14",67="Lowside 15",68="Lowside 16",107="Lowside 2",108="Lowside 3",109="Lowside 4",110="Lowside 5",111="Lowside 6",112="Lowside 7",22="Lowside 8",23="Lowside 9",60="STM32 PD10",61="STM32 PD11",62="STM32 PD12",63="STM32 PD13",58="STM32 PD8",59="STM32 PD9" o2heaterPinModeTodO = bits, U08, 760, [0:1], "default", "default inverted", "open collector", "open collector inverted" is_enabled_spi_1 = bits, U32, 764, [0:0], "false", "true" @@ -763,30 +763,30 @@ unused1127 = bits, U32, 1628, [4:4], "false", "true" unused1128 = bits, U32, 1628, [5:5], "false", "true" unused1129 = bits, U32, 1628, [6:6], "false", "true" unused1130 = bits, U32, 1628, [7:7], "false", "true" -unusedBit_539_8 = bits, U32, 1628, [8:8], "false", "true" -unusedBit_539_9 = bits, U32, 1628, [9:9], "false", "true" -unusedBit_539_10 = bits, U32, 1628, [10:10], "false", "true" -unusedBit_539_11 = bits, U32, 1628, [11:11], "false", "true" -unusedBit_539_12 = bits, U32, 1628, [12:12], "false", "true" -unusedBit_539_13 = bits, U32, 1628, [13:13], "false", "true" -unusedBit_539_14 = bits, U32, 1628, [14:14], "false", "true" -unusedBit_539_15 = bits, U32, 1628, [15:15], "false", "true" -unusedBit_539_16 = bits, U32, 1628, [16:16], "false", "true" -unusedBit_539_17 = bits, U32, 1628, [17:17], "false", "true" -unusedBit_539_18 = bits, U32, 1628, [18:18], "false", "true" -unusedBit_539_19 = bits, U32, 1628, [19:19], "false", "true" -unusedBit_539_20 = bits, U32, 1628, [20:20], "false", "true" -unusedBit_539_21 = bits, U32, 1628, [21:21], "false", "true" -unusedBit_539_22 = bits, U32, 1628, [22:22], "false", "true" -unusedBit_539_23 = bits, U32, 1628, [23:23], "false", "true" -unusedBit_539_24 = bits, U32, 1628, [24:24], "false", "true" -unusedBit_539_25 = bits, U32, 1628, [25:25], "false", "true" -unusedBit_539_26 = bits, U32, 1628, [26:26], "false", "true" -unusedBit_539_27 = bits, U32, 1628, [27:27], "false", "true" -unusedBit_539_28 = bits, U32, 1628, [28:28], "false", "true" -unusedBit_539_29 = bits, U32, 1628, [29:29], "false", "true" -unusedBit_539_30 = bits, U32, 1628, [30:30], "false", "true" -unusedBit_539_31 = bits, U32, 1628, [31:31], "false", "true" +unusedBit_541_8 = bits, U32, 1628, [8:8], "false", "true" +unusedBit_541_9 = bits, U32, 1628, [9:9], "false", "true" +unusedBit_541_10 = bits, U32, 1628, [10:10], "false", "true" +unusedBit_541_11 = bits, U32, 1628, [11:11], "false", "true" +unusedBit_541_12 = bits, U32, 1628, [12:12], "false", "true" +unusedBit_541_13 = bits, U32, 1628, [13:13], "false", "true" +unusedBit_541_14 = bits, U32, 1628, [14:14], "false", "true" +unusedBit_541_15 = bits, U32, 1628, [15:15], "false", "true" +unusedBit_541_16 = bits, U32, 1628, [16:16], "false", "true" +unusedBit_541_17 = bits, U32, 1628, [17:17], "false", "true" +unusedBit_541_18 = bits, U32, 1628, [18:18], "false", "true" +unusedBit_541_19 = bits, U32, 1628, [19:19], "false", "true" +unusedBit_541_20 = bits, U32, 1628, [20:20], "false", "true" +unusedBit_541_21 = bits, U32, 1628, [21:21], "false", "true" +unusedBit_541_22 = bits, U32, 1628, [22:22], "false", "true" +unusedBit_541_23 = bits, U32, 1628, [23:23], "false", "true" +unusedBit_541_24 = bits, U32, 1628, [24:24], "false", "true" +unusedBit_541_25 = bits, U32, 1628, [25:25], "false", "true" +unusedBit_541_26 = bits, U32, 1628, [26:26], "false", "true" +unusedBit_541_27 = bits, U32, 1628, [27:27], "false", "true" +unusedBit_541_28 = bits, U32, 1628, [28:28], "false", "true" +unusedBit_541_29 = bits, U32, 1628, [29:29], "false", "true" +unusedBit_541_30 = bits, U32, 1628, [30:30], "false", "true" +unusedBit_541_31 = bits, U32, 1628, [31:31], "false", "true" benchTestOffTime = scalar, U08, 1632, "ms", 5.0, 0, 0, 2000, 1 benchTestCount = scalar, U08, 1633, "count", 1, 0, 0, 250, 1 benchTestOnTime = scalar, U08, 1634, "ms", 5.0, 0, 0, 2000, 1 @@ -1555,10 +1555,8 @@ ignBlends4_blendValues = array, U08, 22038, [8], "%", 0.5, 0, 0, 100, 1 compressionRatio = "Just for reference really, not taken into account by any logic at this point" triggerSimulatorPins1 = "Each rusEFI piece can provide synthetic trigger signal for external ECU. Sometimes these wires are routed back into trigger inputs of the same rusEFI board." triggerSimulatorPins2 = "Each rusEFI piece can provide synthetic trigger signal for external ECU. Sometimes these wires are routed back into trigger inputs of the same rusEFI board." - triggerSimulatorPins3 = "Each rusEFI piece can provide synthetic trigger signal for external ECU. Sometimes these wires are routed back into trigger inputs of the same rusEFI board." triggerSimulatorPinModes1 = "triggerSimulatorPinModes 1" triggerSimulatorPinModes2 = "triggerSimulatorPinModes 2" - triggerSimulatorPinModes3 = "triggerSimulatorPinModes 3" o2heaterPin = "Narrow band o2 heater, not used for CJ125. 'ON' if engine is running, 'OFF' if stopped or cranking. See wboHeaterPin" isSdCardEnabled = "enable sd/disable sd" rusefiVerbose29b = "Use 11 bit (standard) or 29 bit (extended) IDs for rusEFI verbose CAN format." @@ -6465,7 +6463,6 @@ dialog = wideband_stateDialog, "wideband_state" dialog = allPins1_1 field = "trigger stimulator pin #1", triggerSimulatorPins1 field = "trigger stimulator pin #2", triggerSimulatorPins2 - field = "trigger stimulator pin #2", triggerSimulatorPins3 field = "Warning Led", warningLedPin field = "tle6240_cs", tle6240_cs field = "tle6240 SPI", tle6240spiDevice diff --git a/firmware/tunerstudio/generated/rusefi_subaru_eg33_f7.ini b/firmware/tunerstudio/generated/rusefi_subaru_eg33_f7.ini index 1d74f78a30..45bd25324e 100644 --- a/firmware/tunerstudio/generated/rusefi_subaru_eg33_f7.ini +++ b/firmware/tunerstudio/generated/rusefi_subaru_eg33_f7.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.10.03.subaru_eg33_f7.3638985909" + signature = "rusEFI 2022.10.03.subaru_eg33_f7.3473948215" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.10.03.subaru_eg33_f7.3638985909" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.10.03.subaru_eg33_f7.3473948215" ; 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 @@ -86,7 +86,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on config/boards/subaru_eg33/config/gen_subaru_config.sh integration/rusefi_config.txt Mon Oct 03 04:23:51 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on config/boards/subaru_eg33/config/gen_subaru_config.sh integration/rusefi_config.txt Mon Oct 03 15:05:34 UTC 2022 pageSize = 22048 page = 1 @@ -336,10 +336,10 @@ tunerStudioSerialSpeed = scalar, U32, 740, "BPs", 1, 0, 0, 1000000, 0 compressionRatio = scalar, F32, 744, "CR", 1, 0, 0, 300, 1 triggerSimulatorPins1 = bits, U16, 748, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15" triggerSimulatorPins2 = bits, U16, 750, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15" -triggerSimulatorPins3 = bits, U16, 752, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15" +unusedTrig = scalar, U16, 752, "", 1, 0, 0, 100, 0 triggerSimulatorPinModes1 = bits, U08, 754, [0:1], "default", "default inverted", "open collector", "open collector inverted" triggerSimulatorPinModes2 = bits, U08, 755, [0:1], "default", "default inverted", "open collector", "open collector inverted" -triggerSimulatorPinModes3 = bits, U08, 756, [0:1], "default", "default inverted", "open collector", "open collector inverted" +unusedTrigMode = scalar, U08, 756, "", 1, 0, 0, 100, 0 o2heaterPin = bits, U16, 758, [0:7], 0="NONE",186="A01 - Injector 5",194="A12 - Injector 6",159="AUX0_14 - AUX0 OD output 1",158="AUX0_17 - AUX0 OD output 0",160="B08 - AC clutch",149="C14 - FPump modulator",153="C15 - AUX1 OD out",148="C16 - Tacho out",157="D01 - IDLE close",156="D02 - IDLE open",147="D03 - FAN 2 relay",121="D05 - Self Shutdown",155="D06 - Absorber purge valve",188="D07 - Ignition Cyl 4",198="D08 - Ignition Cyl 2",189="D09 - Ignition Cyl 3",199="D10 - Ignition Cyl 1",185="D11 - Injector 3",192="D12 - Injector 2",184="D13 - Injector 1",197="D16 - Ignition Cyl 6",146="D17 - FAN 1 relay",154="D18 - Auxillary air valve",152="D19 - Check Engine indicator",161="D20 - Inertia-Resonance Super-Charger control",191="D21 - Ignition Cyl 5",151="D22 - EGR control",150="D23 - Fuel Pump relay",193="D26 - Injector 4" o2heaterPinModeTodO = bits, U08, 760, [0:1], "default", "default inverted", "open collector", "open collector inverted" is_enabled_spi_1 = bits, U32, 764, [0:0], "false", "true" @@ -763,30 +763,30 @@ unused1127 = bits, U32, 1628, [4:4], "false", "true" unused1128 = bits, U32, 1628, [5:5], "false", "true" unused1129 = bits, U32, 1628, [6:6], "false", "true" unused1130 = bits, U32, 1628, [7:7], "false", "true" -unusedBit_539_8 = bits, U32, 1628, [8:8], "false", "true" -unusedBit_539_9 = bits, U32, 1628, [9:9], "false", "true" -unusedBit_539_10 = bits, U32, 1628, [10:10], "false", "true" -unusedBit_539_11 = bits, U32, 1628, [11:11], "false", "true" -unusedBit_539_12 = bits, U32, 1628, [12:12], "false", "true" -unusedBit_539_13 = bits, U32, 1628, [13:13], "false", "true" -unusedBit_539_14 = bits, U32, 1628, [14:14], "false", "true" -unusedBit_539_15 = bits, U32, 1628, [15:15], "false", "true" -unusedBit_539_16 = bits, U32, 1628, [16:16], "false", "true" -unusedBit_539_17 = bits, U32, 1628, [17:17], "false", "true" -unusedBit_539_18 = bits, U32, 1628, [18:18], "false", "true" -unusedBit_539_19 = bits, U32, 1628, [19:19], "false", "true" -unusedBit_539_20 = bits, U32, 1628, [20:20], "false", "true" -unusedBit_539_21 = bits, U32, 1628, [21:21], "false", "true" -unusedBit_539_22 = bits, U32, 1628, [22:22], "false", "true" -unusedBit_539_23 = bits, U32, 1628, [23:23], "false", "true" -unusedBit_539_24 = bits, U32, 1628, [24:24], "false", "true" -unusedBit_539_25 = bits, U32, 1628, [25:25], "false", "true" -unusedBit_539_26 = bits, U32, 1628, [26:26], "false", "true" -unusedBit_539_27 = bits, U32, 1628, [27:27], "false", "true" -unusedBit_539_28 = bits, U32, 1628, [28:28], "false", "true" -unusedBit_539_29 = bits, U32, 1628, [29:29], "false", "true" -unusedBit_539_30 = bits, U32, 1628, [30:30], "false", "true" -unusedBit_539_31 = bits, U32, 1628, [31:31], "false", "true" +unusedBit_541_8 = bits, U32, 1628, [8:8], "false", "true" +unusedBit_541_9 = bits, U32, 1628, [9:9], "false", "true" +unusedBit_541_10 = bits, U32, 1628, [10:10], "false", "true" +unusedBit_541_11 = bits, U32, 1628, [11:11], "false", "true" +unusedBit_541_12 = bits, U32, 1628, [12:12], "false", "true" +unusedBit_541_13 = bits, U32, 1628, [13:13], "false", "true" +unusedBit_541_14 = bits, U32, 1628, [14:14], "false", "true" +unusedBit_541_15 = bits, U32, 1628, [15:15], "false", "true" +unusedBit_541_16 = bits, U32, 1628, [16:16], "false", "true" +unusedBit_541_17 = bits, U32, 1628, [17:17], "false", "true" +unusedBit_541_18 = bits, U32, 1628, [18:18], "false", "true" +unusedBit_541_19 = bits, U32, 1628, [19:19], "false", "true" +unusedBit_541_20 = bits, U32, 1628, [20:20], "false", "true" +unusedBit_541_21 = bits, U32, 1628, [21:21], "false", "true" +unusedBit_541_22 = bits, U32, 1628, [22:22], "false", "true" +unusedBit_541_23 = bits, U32, 1628, [23:23], "false", "true" +unusedBit_541_24 = bits, U32, 1628, [24:24], "false", "true" +unusedBit_541_25 = bits, U32, 1628, [25:25], "false", "true" +unusedBit_541_26 = bits, U32, 1628, [26:26], "false", "true" +unusedBit_541_27 = bits, U32, 1628, [27:27], "false", "true" +unusedBit_541_28 = bits, U32, 1628, [28:28], "false", "true" +unusedBit_541_29 = bits, U32, 1628, [29:29], "false", "true" +unusedBit_541_30 = bits, U32, 1628, [30:30], "false", "true" +unusedBit_541_31 = bits, U32, 1628, [31:31], "false", "true" benchTestOffTime = scalar, U08, 1632, "ms", 5.0, 0, 0, 2000, 1 benchTestCount = scalar, U08, 1633, "count", 1, 0, 0, 250, 1 benchTestOnTime = scalar, U08, 1634, "ms", 5.0, 0, 0, 2000, 1 @@ -1555,10 +1555,8 @@ ignBlends4_blendValues = array, U08, 22038, [8], "%", 0.5, 0, 0, 100, 1 compressionRatio = "Just for reference really, not taken into account by any logic at this point" triggerSimulatorPins1 = "Each rusEFI piece can provide synthetic trigger signal for external ECU. Sometimes these wires are routed back into trigger inputs of the same rusEFI board." triggerSimulatorPins2 = "Each rusEFI piece can provide synthetic trigger signal for external ECU. Sometimes these wires are routed back into trigger inputs of the same rusEFI board." - triggerSimulatorPins3 = "Each rusEFI piece can provide synthetic trigger signal for external ECU. Sometimes these wires are routed back into trigger inputs of the same rusEFI board." triggerSimulatorPinModes1 = "triggerSimulatorPinModes 1" triggerSimulatorPinModes2 = "triggerSimulatorPinModes 2" - triggerSimulatorPinModes3 = "triggerSimulatorPinModes 3" o2heaterPin = "Narrow band o2 heater, not used for CJ125. 'ON' if engine is running, 'OFF' if stopped or cranking. See wboHeaterPin" isSdCardEnabled = "enable sd/disable sd" rusefiVerbose29b = "Use 11 bit (standard) or 29 bit (extended) IDs for rusEFI verbose CAN format." @@ -6467,7 +6465,6 @@ dialog = wideband_stateDialog, "wideband_state" dialog = allPins1_1 field = "trigger stimulator pin #1", triggerSimulatorPins1 field = "trigger stimulator pin #2", triggerSimulatorPins2 - field = "trigger stimulator pin #2", triggerSimulatorPins3 field = "Warning Led", warningLedPin field = "tle6240_cs", tle6240_cs field = "tle6240 SPI", tle6240spiDevice @@ -7810,8 +7807,6 @@ dialog = tcuControls, "Transmission Settings" field = "trigger stimulator pin mode #1", triggerSimulatorPinModes1 field = "trigger stimulator pin #2", triggerSimulatorPins2 field = "trigger stimulator pin mode #2", triggerSimulatorPinModes2 - field = "trigger stimulator pin #3", triggerSimulatorPins3 - field = "trigger stimulator pin mode #3", triggerSimulatorPinModes3 field = "" field = "Logic input channel 1", logicAnalyzerPins1 field = "Logic input channel 2", logicAnalyzerPins2 diff --git a/firmware/tunerstudio/generated/rusefi_tdg-pdm8.ini b/firmware/tunerstudio/generated/rusefi_tdg-pdm8.ini index 7f4b331817..8bf6a3d379 100644 --- a/firmware/tunerstudio/generated/rusefi_tdg-pdm8.ini +++ b/firmware/tunerstudio/generated/rusefi_tdg-pdm8.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2022.10.03.tdg-pdm8.200315707" + signature = "rusEFI 2022.10.03.tdg-pdm8.470165945" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmware version for title bar. - signature = "rusEFI 2022.10.03.tdg-pdm8.200315707" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2022.10.03.tdg-pdm8.470165945" ; 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 @@ -86,7 +86,7 @@ enable2ndByteCanID = false ; name = scalar, type, offset, units, scale, translate, lo, hi, digits ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Oct 03 04:24:50 UTC 2022 +; this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Oct 03 15:06:31 UTC 2022 pageSize = 22048 page = 1 @@ -336,10 +336,10 @@ tunerStudioSerialSpeed = scalar, U32, 740, "BPs", 1, 0, 0, 1000000, 0 compressionRatio = scalar, F32, 744, "CR", 1, 0, 0, 300, 1 triggerSimulatorPins1 = bits, U16, 748, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15" triggerSimulatorPins2 = bits, U16, 750, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15" -triggerSimulatorPins3 = bits, U16, 752, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15" +unusedTrig = scalar, U16, 752, "", 1, 0, 0, 100, 0 triggerSimulatorPinModes1 = bits, U08, 754, [0:1], "default", "default inverted", "open collector", "open collector inverted" triggerSimulatorPinModes2 = bits, U08, 755, [0:1], "default", "default inverted", "open collector", "open collector inverted" -triggerSimulatorPinModes3 = bits, U08, 756, [0:1], "default", "default inverted", "open collector", "open collector inverted" +unusedTrigMode = scalar, U08, 756, "", 1, 0, 0, 100, 0 o2heaterPin = bits, U16, 758, [0:7], 0="NONE",257="Out 1",258="Out 2",259="Out 3",260="Out 4",261="Out 5",262="Out 6",263="Out 7",264="Out 8" o2heaterPinModeTodO = bits, U08, 760, [0:1], "default", "default inverted", "open collector", "open collector inverted" is_enabled_spi_1 = bits, U32, 764, [0:0], "false", "true" @@ -763,30 +763,30 @@ unused1127 = bits, U32, 1628, [4:4], "false", "true" unused1128 = bits, U32, 1628, [5:5], "false", "true" unused1129 = bits, U32, 1628, [6:6], "false", "true" unused1130 = bits, U32, 1628, [7:7], "false", "true" -unusedBit_539_8 = bits, U32, 1628, [8:8], "false", "true" -unusedBit_539_9 = bits, U32, 1628, [9:9], "false", "true" -unusedBit_539_10 = bits, U32, 1628, [10:10], "false", "true" -unusedBit_539_11 = bits, U32, 1628, [11:11], "false", "true" -unusedBit_539_12 = bits, U32, 1628, [12:12], "false", "true" -unusedBit_539_13 = bits, U32, 1628, [13:13], "false", "true" -unusedBit_539_14 = bits, U32, 1628, [14:14], "false", "true" -unusedBit_539_15 = bits, U32, 1628, [15:15], "false", "true" -unusedBit_539_16 = bits, U32, 1628, [16:16], "false", "true" -unusedBit_539_17 = bits, U32, 1628, [17:17], "false", "true" -unusedBit_539_18 = bits, U32, 1628, [18:18], "false", "true" -unusedBit_539_19 = bits, U32, 1628, [19:19], "false", "true" -unusedBit_539_20 = bits, U32, 1628, [20:20], "false", "true" -unusedBit_539_21 = bits, U32, 1628, [21:21], "false", "true" -unusedBit_539_22 = bits, U32, 1628, [22:22], "false", "true" -unusedBit_539_23 = bits, U32, 1628, [23:23], "false", "true" -unusedBit_539_24 = bits, U32, 1628, [24:24], "false", "true" -unusedBit_539_25 = bits, U32, 1628, [25:25], "false", "true" -unusedBit_539_26 = bits, U32, 1628, [26:26], "false", "true" -unusedBit_539_27 = bits, U32, 1628, [27:27], "false", "true" -unusedBit_539_28 = bits, U32, 1628, [28:28], "false", "true" -unusedBit_539_29 = bits, U32, 1628, [29:29], "false", "true" -unusedBit_539_30 = bits, U32, 1628, [30:30], "false", "true" -unusedBit_539_31 = bits, U32, 1628, [31:31], "false", "true" +unusedBit_541_8 = bits, U32, 1628, [8:8], "false", "true" +unusedBit_541_9 = bits, U32, 1628, [9:9], "false", "true" +unusedBit_541_10 = bits, U32, 1628, [10:10], "false", "true" +unusedBit_541_11 = bits, U32, 1628, [11:11], "false", "true" +unusedBit_541_12 = bits, U32, 1628, [12:12], "false", "true" +unusedBit_541_13 = bits, U32, 1628, [13:13], "false", "true" +unusedBit_541_14 = bits, U32, 1628, [14:14], "false", "true" +unusedBit_541_15 = bits, U32, 1628, [15:15], "false", "true" +unusedBit_541_16 = bits, U32, 1628, [16:16], "false", "true" +unusedBit_541_17 = bits, U32, 1628, [17:17], "false", "true" +unusedBit_541_18 = bits, U32, 1628, [18:18], "false", "true" +unusedBit_541_19 = bits, U32, 1628, [19:19], "false", "true" +unusedBit_541_20 = bits, U32, 1628, [20:20], "false", "true" +unusedBit_541_21 = bits, U32, 1628, [21:21], "false", "true" +unusedBit_541_22 = bits, U32, 1628, [22:22], "false", "true" +unusedBit_541_23 = bits, U32, 1628, [23:23], "false", "true" +unusedBit_541_24 = bits, U32, 1628, [24:24], "false", "true" +unusedBit_541_25 = bits, U32, 1628, [25:25], "false", "true" +unusedBit_541_26 = bits, U32, 1628, [26:26], "false", "true" +unusedBit_541_27 = bits, U32, 1628, [27:27], "false", "true" +unusedBit_541_28 = bits, U32, 1628, [28:28], "false", "true" +unusedBit_541_29 = bits, U32, 1628, [29:29], "false", "true" +unusedBit_541_30 = bits, U32, 1628, [30:30], "false", "true" +unusedBit_541_31 = bits, U32, 1628, [31:31], "false", "true" benchTestOffTime = scalar, U08, 1632, "ms", 5.0, 0, 0, 2000, 1 benchTestCount = scalar, U08, 1633, "count", 1, 0, 0, 250, 1 benchTestOnTime = scalar, U08, 1634, "ms", 5.0, 0, 0, 2000, 1 @@ -1555,10 +1555,8 @@ ignBlends4_blendValues = array, U08, 22038, [8], "%", 0.5, 0, 0, 100, 1 compressionRatio = "Just for reference really, not taken into account by any logic at this point" triggerSimulatorPins1 = "Each rusEFI piece can provide synthetic trigger signal for external ECU. Sometimes these wires are routed back into trigger inputs of the same rusEFI board." triggerSimulatorPins2 = "Each rusEFI piece can provide synthetic trigger signal for external ECU. Sometimes these wires are routed back into trigger inputs of the same rusEFI board." - triggerSimulatorPins3 = "Each rusEFI piece can provide synthetic trigger signal for external ECU. Sometimes these wires are routed back into trigger inputs of the same rusEFI board." triggerSimulatorPinModes1 = "triggerSimulatorPinModes 1" triggerSimulatorPinModes2 = "triggerSimulatorPinModes 2" - triggerSimulatorPinModes3 = "triggerSimulatorPinModes 3" o2heaterPin = "Narrow band o2 heater, not used for CJ125. 'ON' if engine is running, 'OFF' if stopped or cranking. See wboHeaterPin" isSdCardEnabled = "enable sd/disable sd" rusefiVerbose29b = "Use 11 bit (standard) or 29 bit (extended) IDs for rusEFI verbose CAN format." @@ -6471,7 +6469,6 @@ dialog = wideband_stateDialog, "wideband_state" dialog = allPins1_1 field = "trigger stimulator pin #1", triggerSimulatorPins1 field = "trigger stimulator pin #2", triggerSimulatorPins2 - field = "trigger stimulator pin #2", triggerSimulatorPins3 field = "Warning Led", warningLedPin field = "tle6240_cs", tle6240_cs field = "tle6240 SPI", tle6240spiDevice @@ -7826,8 +7823,6 @@ dialog = tcuControls, "Transmission Settings" field = "trigger stimulator pin mode #1", triggerSimulatorPinModes1 field = "trigger stimulator pin #2", triggerSimulatorPins2 field = "trigger stimulator pin mode #2", triggerSimulatorPinModes2 - field = "trigger stimulator pin #3", triggerSimulatorPins3 - field = "trigger stimulator pin mode #3", triggerSimulatorPinModes3 field = "" field = "Logic input channel 1", logicAnalyzerPins1 field = "Logic input channel 2", logicAnalyzerPins2 diff --git a/java_console/models/src/main/java/com/rusefi/config/generated/AcControl.java b/java_console/models/src/main/java/com/rusefi/config/generated/AcControl.java index a1e57536fc..bf163dc78e 100644 --- a/java_console/models/src/main/java/com/rusefi/config/generated/AcControl.java +++ b/java_console/models/src/main/java/com/rusefi/config/generated/AcControl.java @@ -1,6 +1,6 @@ package com.rusefi.config.generated; -// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) controllers/actuators/ac_control.txt Fri Sep 30 00:59:59 UTC 2022 +// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) controllers/actuators/ac_control.txt Mon Oct 03 15:05:29 UTC 2022 // by class com.rusefi.output.FileJavaFieldsConsumer import com.rusefi.config.*; @@ -341,7 +341,7 @@ public class AcControl { public static final int TRIGGER_INPUT_PIN_COUNT = 2; public static final String TRIGGER_IS_CRANK_KEY = "crankBased"; public static final String TRIGGER_IS_SECOND_WHEEL_CAM = "isSecondWheelCam"; - public static final int TRIGGER_SIMULATOR_PIN_COUNT = 3; + public static final int TRIGGER_SIMULATOR_PIN_COUNT = 2; public static final String TRIGGERS_FILE_NAME = "triggers.txt"; public static final int TRIM_SIZE = 4; public static final int TS_BLOCK_READ_TIMEOUT = 3000; diff --git a/java_console/models/src/main/java/com/rusefi/config/generated/BoostControl.java b/java_console/models/src/main/java/com/rusefi/config/generated/BoostControl.java index 1d4e760ce2..77143bbe23 100644 --- a/java_console/models/src/main/java/com/rusefi/config/generated/BoostControl.java +++ b/java_console/models/src/main/java/com/rusefi/config/generated/BoostControl.java @@ -1,6 +1,6 @@ package com.rusefi.config.generated; -// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) controllers/actuators/boost_control.txt Fri Sep 30 00:59:59 UTC 2022 +// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) controllers/actuators/boost_control.txt Mon Oct 03 15:05:29 UTC 2022 // by class com.rusefi.output.FileJavaFieldsConsumer import com.rusefi.config.*; @@ -341,7 +341,7 @@ public class BoostControl { public static final int TRIGGER_INPUT_PIN_COUNT = 2; public static final String TRIGGER_IS_CRANK_KEY = "crankBased"; public static final String TRIGGER_IS_SECOND_WHEEL_CAM = "isSecondWheelCam"; - public static final int TRIGGER_SIMULATOR_PIN_COUNT = 3; + public static final int TRIGGER_SIMULATOR_PIN_COUNT = 2; public static final String TRIGGERS_FILE_NAME = "triggers.txt"; public static final int TRIM_SIZE = 4; public static final int TS_BLOCK_READ_TIMEOUT = 3000; diff --git a/java_console/models/src/main/java/com/rusefi/config/generated/EngineState.java b/java_console/models/src/main/java/com/rusefi/config/generated/EngineState.java index 8250067b7f..96bfa4404e 100644 --- a/java_console/models/src/main/java/com/rusefi/config/generated/EngineState.java +++ b/java_console/models/src/main/java/com/rusefi/config/generated/EngineState.java @@ -1,6 +1,6 @@ package com.rusefi.config.generated; -// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) controllers/algo/engine_state.txt Fri Sep 30 00:59:59 UTC 2022 +// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) controllers/algo/engine_state.txt Mon Oct 03 15:05:29 UTC 2022 // by class com.rusefi.output.FileJavaFieldsConsumer import com.rusefi.config.*; @@ -341,7 +341,7 @@ public class EngineState { public static final int TRIGGER_INPUT_PIN_COUNT = 2; public static final String TRIGGER_IS_CRANK_KEY = "crankBased"; public static final String TRIGGER_IS_SECOND_WHEEL_CAM = "isSecondWheelCam"; - public static final int TRIGGER_SIMULATOR_PIN_COUNT = 3; + public static final int TRIGGER_SIMULATOR_PIN_COUNT = 2; public static final String TRIGGERS_FILE_NAME = "triggers.txt"; public static final int TRIM_SIZE = 4; public static final int TS_BLOCK_READ_TIMEOUT = 3000; 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 521fa7a29c..851099acac 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 Mon Oct 03 04:24:56 UTC 2022 +// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Oct 03 15:06:35 UTC 2022 // by class com.rusefi.output.FileJavaFieldsConsumer import com.rusefi.config.*; @@ -2203,7 +2203,7 @@ public class Fields { public static final String TRIGGER_IS_CRANK_KEY = "crankBased"; public static final String TRIGGER_IS_SECOND_WHEEL_CAM = "isSecondWheelCam"; public static final int trigger_offset = 468; - public static final int TRIGGER_SIMULATOR_PIN_COUNT = 3; + public static final int TRIGGER_SIMULATOR_PIN_COUNT = 2; public static final int trigger_type_e_Force_4_bytes_size_trigger_type = 70000; public static final int trigger_type_e_TT_12_TOOTH_CRANK = 38; public static final int trigger_type_e_TT_1_16 = 50; @@ -2332,10 +2332,8 @@ public class Fields { public static final int triggerSimulatorFrequency_offset = 576; public static final int triggerSimulatorPinModes1_offset = 754; public static final int triggerSimulatorPinModes2_offset = 755; - public static final int triggerSimulatorPinModes3_offset = 756; public static final int triggerSimulatorPins1_offset = 748; public static final int triggerSimulatorPins2_offset = 750; - public static final int triggerSimulatorPins3_offset = 752; public static final int TriggerWheel_T_PRIMARY = 0; public static final int TriggerWheel_T_SECONDARY = 1; public static final int TRIM_SIZE = 4; @@ -2408,7 +2406,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 2022.10.03.all.2717408623"; + public static final String TS_SIGNATURE = "rusEFI 2022.10.03.all.3054430189"; public static final char TS_SINGLE_WRITE_COMMAND = 'W'; public static final char TS_TEST_COMMAND = 't'; public static final int TS_TOTAL_OUTPUT_SIZE = 1264; @@ -2453,30 +2451,32 @@ public class Fields { public static final int unused_1484_bit_38_offset = 1372; public static final int unusedAlteOnOff_offset = 764; public static final int unusedBit_45_31_offset = 120; - public static final int unusedBit_539_10_offset = 1628; - public static final int unusedBit_539_11_offset = 1628; - public static final int unusedBit_539_12_offset = 1628; - public static final int unusedBit_539_13_offset = 1628; - public static final int unusedBit_539_14_offset = 1628; - public static final int unusedBit_539_15_offset = 1628; - public static final int unusedBit_539_16_offset = 1628; - public static final int unusedBit_539_17_offset = 1628; - public static final int unusedBit_539_18_offset = 1628; - public static final int unusedBit_539_19_offset = 1628; - public static final int unusedBit_539_20_offset = 1628; - public static final int unusedBit_539_21_offset = 1628; - public static final int unusedBit_539_22_offset = 1628; - public static final int unusedBit_539_23_offset = 1628; - public static final int unusedBit_539_24_offset = 1628; - public static final int unusedBit_539_25_offset = 1628; - public static final int unusedBit_539_26_offset = 1628; - public static final int unusedBit_539_27_offset = 1628; - public static final int unusedBit_539_28_offset = 1628; - public static final int unusedBit_539_29_offset = 1628; - public static final int unusedBit_539_30_offset = 1628; - public static final int unusedBit_539_31_offset = 1628; - public static final int unusedBit_539_8_offset = 1628; - public static final int unusedBit_539_9_offset = 1628; + public static final int unusedBit_541_10_offset = 1628; + public static final int unusedBit_541_11_offset = 1628; + public static final int unusedBit_541_12_offset = 1628; + public static final int unusedBit_541_13_offset = 1628; + public static final int unusedBit_541_14_offset = 1628; + public static final int unusedBit_541_15_offset = 1628; + public static final int unusedBit_541_16_offset = 1628; + public static final int unusedBit_541_17_offset = 1628; + public static final int unusedBit_541_18_offset = 1628; + public static final int unusedBit_541_19_offset = 1628; + public static final int unusedBit_541_20_offset = 1628; + public static final int unusedBit_541_21_offset = 1628; + public static final int unusedBit_541_22_offset = 1628; + public static final int unusedBit_541_23_offset = 1628; + public static final int unusedBit_541_24_offset = 1628; + public static final int unusedBit_541_25_offset = 1628; + public static final int unusedBit_541_26_offset = 1628; + public static final int unusedBit_541_27_offset = 1628; + public static final int unusedBit_541_28_offset = 1628; + public static final int unusedBit_541_29_offset = 1628; + public static final int unusedBit_541_30_offset = 1628; + public static final int unusedBit_541_31_offset = 1628; + public static final int unusedBit_541_8_offset = 1628; + public static final int unusedBit_541_9_offset = 1628; + public static final int unusedTrig_offset = 752; + public static final int unusedTrigMode_offset = 756; public static final int useAdvanceCorrectionsForCranking_offset = 1372; public static final int useBiQuadOnAuxSpeedSensors_offset = 1372; public static final int useCicPidForIdle_offset = 120; @@ -2883,10 +2883,10 @@ public class Fields { public static final Field COMPRESSIONRATIO = Field.create("COMPRESSIONRATIO", 744, FieldType.FLOAT); public static final Field TRIGGERSIMULATORPINS1 = Field.create("TRIGGERSIMULATORPINS1", 748, FieldType.INT16, Gpio).setScale(1.0); public static final Field TRIGGERSIMULATORPINS2 = Field.create("TRIGGERSIMULATORPINS2", 750, FieldType.INT16, Gpio).setScale(1.0); - public static final Field TRIGGERSIMULATORPINS3 = Field.create("TRIGGERSIMULATORPINS3", 752, FieldType.INT16, Gpio).setScale(1.0); + public static final Field UNUSEDTRIG = Field.create("UNUSEDTRIG", 752, FieldType.INT16).setScale(1.0); public static final Field TRIGGERSIMULATORPINMODES1 = Field.create("TRIGGERSIMULATORPINMODES1", 754, FieldType.INT8, pin_output_mode_e).setScale(1.0); public static final Field TRIGGERSIMULATORPINMODES2 = Field.create("TRIGGERSIMULATORPINMODES2", 755, FieldType.INT8, pin_output_mode_e).setScale(1.0); - public static final Field TRIGGERSIMULATORPINMODES3 = Field.create("TRIGGERSIMULATORPINMODES3", 756, FieldType.INT8, pin_output_mode_e).setScale(1.0); + public static final Field UNUSEDTRIGMODE = Field.create("UNUSEDTRIGMODE", 756, FieldType.INT8).setScale(1.0); public static final Field ALIGNMENTFILL_AT_757 = Field.create("ALIGNMENTFILL_AT_757", 757, FieldType.INT8).setScale(1.0); public static final Field O2HEATERPIN = Field.create("O2HEATERPIN", 758, FieldType.INT16, output_pin_e).setScale(1.0); public static final Field O2HEATERPINMODETODO = Field.create("O2HEATERPINMODETODO", 760, FieldType.INT8, pin_output_mode_e).setScale(1.0); @@ -3343,30 +3343,30 @@ public class Fields { public static final Field UNUSED1128 = Field.create("UNUSED1128", 1628, FieldType.BIT, 5); public static final Field UNUSED1129 = Field.create("UNUSED1129", 1628, FieldType.BIT, 6); public static final Field UNUSED1130 = Field.create("UNUSED1130", 1628, FieldType.BIT, 7); - public static final Field UNUSEDBIT_539_8 = Field.create("UNUSEDBIT_539_8", 1628, FieldType.BIT, 8); - public static final Field UNUSEDBIT_539_9 = Field.create("UNUSEDBIT_539_9", 1628, FieldType.BIT, 9); - public static final Field UNUSEDBIT_539_10 = Field.create("UNUSEDBIT_539_10", 1628, FieldType.BIT, 10); - public static final Field UNUSEDBIT_539_11 = Field.create("UNUSEDBIT_539_11", 1628, FieldType.BIT, 11); - public static final Field UNUSEDBIT_539_12 = Field.create("UNUSEDBIT_539_12", 1628, FieldType.BIT, 12); - public static final Field UNUSEDBIT_539_13 = Field.create("UNUSEDBIT_539_13", 1628, FieldType.BIT, 13); - public static final Field UNUSEDBIT_539_14 = Field.create("UNUSEDBIT_539_14", 1628, FieldType.BIT, 14); - public static final Field UNUSEDBIT_539_15 = Field.create("UNUSEDBIT_539_15", 1628, FieldType.BIT, 15); - public static final Field UNUSEDBIT_539_16 = Field.create("UNUSEDBIT_539_16", 1628, FieldType.BIT, 16); - public static final Field UNUSEDBIT_539_17 = Field.create("UNUSEDBIT_539_17", 1628, FieldType.BIT, 17); - public static final Field UNUSEDBIT_539_18 = Field.create("UNUSEDBIT_539_18", 1628, FieldType.BIT, 18); - public static final Field UNUSEDBIT_539_19 = Field.create("UNUSEDBIT_539_19", 1628, FieldType.BIT, 19); - public static final Field UNUSEDBIT_539_20 = Field.create("UNUSEDBIT_539_20", 1628, FieldType.BIT, 20); - public static final Field UNUSEDBIT_539_21 = Field.create("UNUSEDBIT_539_21", 1628, FieldType.BIT, 21); - public static final Field UNUSEDBIT_539_22 = Field.create("UNUSEDBIT_539_22", 1628, FieldType.BIT, 22); - public static final Field UNUSEDBIT_539_23 = Field.create("UNUSEDBIT_539_23", 1628, FieldType.BIT, 23); - public static final Field UNUSEDBIT_539_24 = Field.create("UNUSEDBIT_539_24", 1628, FieldType.BIT, 24); - public static final Field UNUSEDBIT_539_25 = Field.create("UNUSEDBIT_539_25", 1628, FieldType.BIT, 25); - public static final Field UNUSEDBIT_539_26 = Field.create("UNUSEDBIT_539_26", 1628, FieldType.BIT, 26); - public static final Field UNUSEDBIT_539_27 = Field.create("UNUSEDBIT_539_27", 1628, FieldType.BIT, 27); - public static final Field UNUSEDBIT_539_28 = Field.create("UNUSEDBIT_539_28", 1628, FieldType.BIT, 28); - public static final Field UNUSEDBIT_539_29 = Field.create("UNUSEDBIT_539_29", 1628, FieldType.BIT, 29); - public static final Field UNUSEDBIT_539_30 = Field.create("UNUSEDBIT_539_30", 1628, FieldType.BIT, 30); - public static final Field UNUSEDBIT_539_31 = Field.create("UNUSEDBIT_539_31", 1628, FieldType.BIT, 31); + public static final Field UNUSEDBIT_541_8 = Field.create("UNUSEDBIT_541_8", 1628, FieldType.BIT, 8); + public static final Field UNUSEDBIT_541_9 = Field.create("UNUSEDBIT_541_9", 1628, FieldType.BIT, 9); + public static final Field UNUSEDBIT_541_10 = Field.create("UNUSEDBIT_541_10", 1628, FieldType.BIT, 10); + public static final Field UNUSEDBIT_541_11 = Field.create("UNUSEDBIT_541_11", 1628, FieldType.BIT, 11); + public static final Field UNUSEDBIT_541_12 = Field.create("UNUSEDBIT_541_12", 1628, FieldType.BIT, 12); + public static final Field UNUSEDBIT_541_13 = Field.create("UNUSEDBIT_541_13", 1628, FieldType.BIT, 13); + public static final Field UNUSEDBIT_541_14 = Field.create("UNUSEDBIT_541_14", 1628, FieldType.BIT, 14); + public static final Field UNUSEDBIT_541_15 = Field.create("UNUSEDBIT_541_15", 1628, FieldType.BIT, 15); + public static final Field UNUSEDBIT_541_16 = Field.create("UNUSEDBIT_541_16", 1628, FieldType.BIT, 16); + public static final Field UNUSEDBIT_541_17 = Field.create("UNUSEDBIT_541_17", 1628, FieldType.BIT, 17); + public static final Field UNUSEDBIT_541_18 = Field.create("UNUSEDBIT_541_18", 1628, FieldType.BIT, 18); + public static final Field UNUSEDBIT_541_19 = Field.create("UNUSEDBIT_541_19", 1628, FieldType.BIT, 19); + public static final Field UNUSEDBIT_541_20 = Field.create("UNUSEDBIT_541_20", 1628, FieldType.BIT, 20); + public static final Field UNUSEDBIT_541_21 = Field.create("UNUSEDBIT_541_21", 1628, FieldType.BIT, 21); + public static final Field UNUSEDBIT_541_22 = Field.create("UNUSEDBIT_541_22", 1628, FieldType.BIT, 22); + public static final Field UNUSEDBIT_541_23 = Field.create("UNUSEDBIT_541_23", 1628, FieldType.BIT, 23); + public static final Field UNUSEDBIT_541_24 = Field.create("UNUSEDBIT_541_24", 1628, FieldType.BIT, 24); + public static final Field UNUSEDBIT_541_25 = Field.create("UNUSEDBIT_541_25", 1628, FieldType.BIT, 25); + public static final Field UNUSEDBIT_541_26 = Field.create("UNUSEDBIT_541_26", 1628, FieldType.BIT, 26); + public static final Field UNUSEDBIT_541_27 = Field.create("UNUSEDBIT_541_27", 1628, FieldType.BIT, 27); + public static final Field UNUSEDBIT_541_28 = Field.create("UNUSEDBIT_541_28", 1628, FieldType.BIT, 28); + public static final Field UNUSEDBIT_541_29 = Field.create("UNUSEDBIT_541_29", 1628, FieldType.BIT, 29); + public static final Field UNUSEDBIT_541_30 = Field.create("UNUSEDBIT_541_30", 1628, FieldType.BIT, 30); + public static final Field UNUSEDBIT_541_31 = Field.create("UNUSEDBIT_541_31", 1628, FieldType.BIT, 31); public static final Field BENCHTESTOFFTIME = Field.create("BENCHTESTOFFTIME", 1632, FieldType.INT8).setScale(5.0); public static final Field BENCHTESTCOUNT = Field.create("BENCHTESTCOUNT", 1633, FieldType.INT8).setScale(1.0); public static final Field BENCHTESTONTIME = Field.create("BENCHTESTONTIME", 1634, FieldType.INT8).setScale(5.0); @@ -4292,10 +4292,10 @@ public class Fields { COMPRESSIONRATIO, TRIGGERSIMULATORPINS1, TRIGGERSIMULATORPINS2, - TRIGGERSIMULATORPINS3, + UNUSEDTRIG, TRIGGERSIMULATORPINMODES1, TRIGGERSIMULATORPINMODES2, - TRIGGERSIMULATORPINMODES3, + UNUSEDTRIGMODE, ALIGNMENTFILL_AT_757, O2HEATERPIN, O2HEATERPINMODETODO, @@ -4744,30 +4744,30 @@ public class Fields { UNUSED1128, UNUSED1129, UNUSED1130, - UNUSEDBIT_539_8, - UNUSEDBIT_539_9, - UNUSEDBIT_539_10, - UNUSEDBIT_539_11, - UNUSEDBIT_539_12, - UNUSEDBIT_539_13, - UNUSEDBIT_539_14, - UNUSEDBIT_539_15, - UNUSEDBIT_539_16, - UNUSEDBIT_539_17, - UNUSEDBIT_539_18, - UNUSEDBIT_539_19, - UNUSEDBIT_539_20, - UNUSEDBIT_539_21, - UNUSEDBIT_539_22, - UNUSEDBIT_539_23, - UNUSEDBIT_539_24, - UNUSEDBIT_539_25, - UNUSEDBIT_539_26, - UNUSEDBIT_539_27, - UNUSEDBIT_539_28, - UNUSEDBIT_539_29, - UNUSEDBIT_539_30, - UNUSEDBIT_539_31, + UNUSEDBIT_541_8, + UNUSEDBIT_541_9, + UNUSEDBIT_541_10, + UNUSEDBIT_541_11, + UNUSEDBIT_541_12, + UNUSEDBIT_541_13, + UNUSEDBIT_541_14, + UNUSEDBIT_541_15, + UNUSEDBIT_541_16, + UNUSEDBIT_541_17, + UNUSEDBIT_541_18, + UNUSEDBIT_541_19, + UNUSEDBIT_541_20, + UNUSEDBIT_541_21, + UNUSEDBIT_541_22, + UNUSEDBIT_541_23, + UNUSEDBIT_541_24, + UNUSEDBIT_541_25, + UNUSEDBIT_541_26, + UNUSEDBIT_541_27, + UNUSEDBIT_541_28, + UNUSEDBIT_541_29, + UNUSEDBIT_541_30, + UNUSEDBIT_541_31, BENCHTESTOFFTIME, BENCHTESTCOUNT, BENCHTESTONTIME, diff --git a/java_console/models/src/main/java/com/rusefi/config/generated/FuelComputer.java b/java_console/models/src/main/java/com/rusefi/config/generated/FuelComputer.java index 2d118bf858..a62719a00d 100644 --- a/java_console/models/src/main/java/com/rusefi/config/generated/FuelComputer.java +++ b/java_console/models/src/main/java/com/rusefi/config/generated/FuelComputer.java @@ -1,6 +1,6 @@ package com.rusefi.config.generated; -// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) controllers/algo/fuel/fuel_computer.txt Fri Sep 30 00:59:59 UTC 2022 +// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) controllers/algo/fuel/fuel_computer.txt Mon Oct 03 15:05:29 UTC 2022 // by class com.rusefi.output.FileJavaFieldsConsumer import com.rusefi.config.*; @@ -341,7 +341,7 @@ public class FuelComputer { public static final int TRIGGER_INPUT_PIN_COUNT = 2; public static final String TRIGGER_IS_CRANK_KEY = "crankBased"; public static final String TRIGGER_IS_SECOND_WHEEL_CAM = "isSecondWheelCam"; - public static final int TRIGGER_SIMULATOR_PIN_COUNT = 3; + public static final int TRIGGER_SIMULATOR_PIN_COUNT = 2; public static final String TRIGGERS_FILE_NAME = "triggers.txt"; public static final int TRIM_SIZE = 4; public static final int TS_BLOCK_READ_TIMEOUT = 3000; diff --git a/java_console/models/src/main/java/com/rusefi/config/generated/TriggerState.java b/java_console/models/src/main/java/com/rusefi/config/generated/TriggerState.java index 47ec0443bf..4c2abf377e 100644 --- a/java_console/models/src/main/java/com/rusefi/config/generated/TriggerState.java +++ b/java_console/models/src/main/java/com/rusefi/config/generated/TriggerState.java @@ -1,6 +1,6 @@ package com.rusefi.config.generated; -// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) controllers/trigger/trigger_state.txt Fri Sep 30 00:59:59 UTC 2022 +// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) controllers/trigger/trigger_state.txt Mon Oct 03 15:05:29 UTC 2022 // by class com.rusefi.output.FileJavaFieldsConsumer import com.rusefi.config.*; @@ -341,7 +341,7 @@ public class TriggerState { public static final int TRIGGER_INPUT_PIN_COUNT = 2; public static final String TRIGGER_IS_CRANK_KEY = "crankBased"; public static final String TRIGGER_IS_SECOND_WHEEL_CAM = "isSecondWheelCam"; - public static final int TRIGGER_SIMULATOR_PIN_COUNT = 3; + public static final int TRIGGER_SIMULATOR_PIN_COUNT = 2; public static final String TRIGGERS_FILE_NAME = "triggers.txt"; public static final int TRIM_SIZE = 4; public static final int TS_BLOCK_READ_TIMEOUT = 3000; diff --git a/java_console/models/src/main/java/com/rusefi/config/generated/TriggerStatePrimary.java b/java_console/models/src/main/java/com/rusefi/config/generated/TriggerStatePrimary.java index 29d81cf275..0ed7cc1147 100644 --- a/java_console/models/src/main/java/com/rusefi/config/generated/TriggerStatePrimary.java +++ b/java_console/models/src/main/java/com/rusefi/config/generated/TriggerStatePrimary.java @@ -1,6 +1,6 @@ package com.rusefi.config.generated; -// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) controllers/trigger/trigger_state_primary.txt Fri Sep 30 00:59:59 UTC 2022 +// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) controllers/trigger/trigger_state_primary.txt Mon Oct 03 15:05:29 UTC 2022 // by class com.rusefi.output.FileJavaFieldsConsumer import com.rusefi.config.*; @@ -341,7 +341,7 @@ public class TriggerStatePrimary { public static final int TRIGGER_INPUT_PIN_COUNT = 2; public static final String TRIGGER_IS_CRANK_KEY = "crankBased"; public static final String TRIGGER_IS_SECOND_WHEEL_CAM = "isSecondWheelCam"; - public static final int TRIGGER_SIMULATOR_PIN_COUNT = 3; + public static final int TRIGGER_SIMULATOR_PIN_COUNT = 2; public static final String TRIGGERS_FILE_NAME = "triggers.txt"; public static final int TRIM_SIZE = 4; public static final int TS_BLOCK_READ_TIMEOUT = 3000; diff --git a/java_console/models/src/main/java/com/rusefi/config/generated/TsOutputs.java b/java_console/models/src/main/java/com/rusefi/config/generated/TsOutputs.java index e5c73e0a7d..8c31cf5099 100644 --- a/java_console/models/src/main/java/com/rusefi/config/generated/TsOutputs.java +++ b/java_console/models/src/main/java/com/rusefi/config/generated/TsOutputs.java @@ -1,6 +1,6 @@ package com.rusefi.config.generated; -// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) console/binary/output_channels.txt Fri Sep 30 00:59:58 UTC 2022 +// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on (unknown script) console/binary/output_channels.txt Mon Oct 03 15:05:28 UTC 2022 // by class com.rusefi.output.FileJavaFieldsConsumer import com.rusefi.config.*; @@ -341,7 +341,7 @@ public class TsOutputs { public static final int TRIGGER_INPUT_PIN_COUNT = 2; public static final String TRIGGER_IS_CRANK_KEY = "crankBased"; public static final String TRIGGER_IS_SECOND_WHEEL_CAM = "isSecondWheelCam"; - public static final int TRIGGER_SIMULATOR_PIN_COUNT = 3; + public static final int TRIGGER_SIMULATOR_PIN_COUNT = 2; public static final String TRIGGERS_FILE_NAME = "triggers.txt"; public static final int TRIM_SIZE = 4; public static final int TS_BLOCK_READ_TIMEOUT = 3000;