From be29b11d0555b8c5c98fee1e55e039e3858ed6c3 Mon Sep 17 00:00:00 2001 From: GitHub build-firmware Action Date: Thu, 19 Aug 2021 10:55:01 +0000 Subject: [PATCH] Auto-generated configs and docs --- ...ngine_configuration_generated_structures.h | 23 +++++++++--------- .../generated/fsio_enums_generated.def | 2 +- .../controllers/generated/fsio_getters.def | 2 +- firmware/controllers/generated/fsio_names.def | 2 +- .../controllers/generated/fsio_strings.def | 2 +- .../controllers/generated/rusefi_generated.h | 19 ++++++++------- .../generated/signature_hellen121vag.h | 6 ++--- firmware/tunerstudio/generated/cache.zip | Bin 1956904 -> 1956923 bytes .../generated/rusefi_hellen121vag.ini | 6 ++--- .../com/rusefi/config/generated/Fields.java | 16 ++++++------ java_console/rusefi.xml | 2 +- 11 files changed, 41 insertions(+), 39 deletions(-) diff --git a/firmware/controllers/generated/engine_configuration_generated_structures.h b/firmware/controllers/generated/engine_configuration_generated_structures.h index 2c5eb00db5..b0435e73e9 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 Tue Aug 17 21:33:54 UTC 2021 +// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Aug 19 10:53:48 UTC 2021 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -13,7 +13,7 @@ #define acSwitch_offset 1469 #define acSwitchMode_offset 4516 #define adc_channel_e_auto_enum "EFI_ADC_NONE", "EFI_ADC_0", "EFI_ADC_1", "EFI_ADC_2", "EFI_ADC_3", "EFI_ADC_4", "EFI_ADC_5", "EFI_ADC_6", "EFI_ADC_7", "EFI_ADC_8", "EFI_ADC_9", "EFI_ADC_10", "EFI_ADC_11", "EFI_ADC_12", "EFI_ADC_13", "EFI_ADC_14", "EFI_ADC_15", "EFI_ADC_LAST_CHANNEL", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "EFI_ADC_ERROR" -#define adc_channel_e_enum "NONE","C31 - O2S","P31_IN_O2S2","INVALID","C24 - PPS1","E31 - TPS1","Battery Sense","E40 - IN_CAM","P30_IN_AUX4","E34 - TPS2","E37 - Crank Input","E47 - MAF","E23 - MAP","E29 - Coolant Temp","E45 - IAT","C25 - PPS2" +#define adc_channel_e_enum "NONE","14 - O2","INVALID","INVALID","34 In PPS1","92 - TPS 1","106 - KNOCK","86 - CAM1","87 - CAM2","84 - TPS2","INVALID","29 In Maf","101 - MAP2","93 - CLT","85 - IAT","35 In PPS2" #define adc_channel_mode_e_auto_enum "ADC_OFF", "ADC_SLOW", "ADC_FAST" #define ADC_CHANNEL_NONE 0 #define adcVcc_offset 548 @@ -152,7 +152,7 @@ #define boostTpsBins_offset 6392 #define boostType_e_auto_enum "OPEN_LOOP", "CLOSED_LOOP" #define boostType_offset 1012 -#define brain_input_pin_e_enum "NONE","INVALID","INVALID","INVALID","INVALID","C24 - PPS1","E31 - TPS1","INVALID","E40 - IN_CAM","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","E34 - TPS2","E37 - Crank Input","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","E47 - MAF","E23 - MAP","E29 - Coolant Temp","E45 - IAT","C25 - PPS2" +#define brain_input_pin_e_enum "NONE","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","86 - CAM1","87 - CAM2","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","82 - VR","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","54 - VSS" #define brain_pin_e_auto_enum "GPIO_UNASSIGNED", "GPIO_INVALID", "GPIOA_0", "GPIOA_1", "GPIOA_2", "GPIOA_3", "GPIOA_4", "GPIOA_5", "GPIOA_6", "GPIOA_7", "GPIOA_8", "GPIOA_9", "GPIOA_10", "GPIOA_11", "GPIOA_12", "GPIOA_13", "GPIOA_14", "GPIOA_15", "GPIOB_0", "GPIOB_1", "GPIOB_2", "GPIOB_3", "GPIOB_4", "GPIOB_5", "GPIOB_6", "GPIOB_7", "GPIOB_8", "GPIOB_9", "GPIOB_10", "GPIOB_11", "GPIOB_12", "GPIOB_13", "GPIOB_14", "GPIOB_15", "GPIOC_0", "GPIOC_1", "GPIOC_2", "GPIOC_3", "GPIOC_4", "GPIOC_5", "GPIOC_6", "GPIOC_7", "GPIOC_8", "GPIOC_9", "GPIOC_10", "GPIOC_11", "GPIOC_12", "GPIOC_13", "GPIOC_14", "GPIOC_15", "GPIOD_0", "GPIOD_1", "GPIOD_2", "GPIOD_3", "GPIOD_4", "GPIOD_5", "GPIOD_6", "GPIOD_7", "GPIOD_8", "GPIOD_9", "GPIOD_10", "GPIOD_11", "GPIOD_12", "GPIOD_13", "GPIOD_14", "GPIOD_15", "GPIOE_0", "GPIOE_1", "GPIOE_2", "GPIOE_3", "GPIOE_4", "GPIOE_5", "GPIOE_6", "GPIOE_7", "GPIOE_8", "GPIOE_9", "GPIOE_10", "GPIOE_11", "GPIOE_12", "GPIOE_13", "GPIOE_14", "GPIOE_15", "GPIOF_0", "GPIOF_1", "GPIOF_2", "GPIOF_3", "GPIOF_4", "GPIOF_5", "GPIOF_6", "GPIOF_7", "GPIOF_8", "GPIOF_9", "GPIOF_10", "GPIOF_11", "GPIOF_12", "GPIOF_13", "GPIOF_14", "GPIOF_15", "GPIOG_0", "GPIOG_1", "GPIOG_2", "GPIOG_3", "GPIOG_4", "GPIOG_5", "GPIOG_6", "GPIOG_7", "GPIOG_8", "GPIOG_9", "GPIOG_10", "GPIOG_11", "GPIOG_12", "GPIOG_13", "GPIOG_14", "GPIOG_15", "GPIOH_0", "GPIOH_1", "GPIOH_2", "GPIOH_3", "GPIOH_4", "GPIOH_5", "GPIOH_6", "GPIOH_7", "GPIOH_8", "GPIOH_9", "GPIOH_10", "GPIOH_11", "GPIOH_12", "GPIOH_13", "GPIOH_14", "GPIOH_15", "GPIOI_0", "GPIOI_1", "GPIOI_2", "GPIOI_3", "GPIOI_4", "GPIOI_5", "GPIOI_6", "GPIOI_7", "GPIOI_8", "GPIOI_9", "GPIOI_10", "GPIOI_11", "GPIOI_12", "GPIOI_13", "GPIOI_14", "GPIOI_15", "MC33972_PIN_1", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "MC33972_PIN_21", "MC33972_PIN_22", "TLE8888_PIN_1", "TLE8888_PIN_2", "TLE8888_PIN_3", "TLE8888_PIN_4", "TLE8888_PIN_5", "TLE8888_PIN_6", "TLE8888_PIN_7", "TLE8888_PIN_8", "TLE8888_PIN_9", "TLE8888_PIN_10", "TLE8888_PIN_11", "TLE8888_PIN_12", "TLE8888_PIN_13", "TLE8888_PIN_14", "TLE8888_PIN_15", "TLE8888_PIN_16", "TLE8888_PIN_17", "TLE8888_PIN_18", "TLE8888_PIN_19", "TLE8888_PIN_20", "TLE8888_PIN_21", "TLE8888_PIN_22", "TLE8888_PIN_23", "TLE8888_PIN_24", "TLE8888_PIN_25", "TLE8888_PIN_26", "TLE8888_PIN_27", "TLE8888_PIN_28", "TLE8888_PIN_MR", "TLE8888_PIN_KEY", "TLE8888_PIN_WAKE", "TLE6240_PIN_1", "TLE6240_PIN_2", "TLE6240_PIN_3", "TLE6240_PIN_4", "TLE6240_PIN_5", "TLE6240_PIN_6", "TLE6240_PIN_7", "TLE6240_PIN_8", "TLE6240_PIN_9", "TLE6240_PIN_10", "TLE6240_PIN_11", "TLE6240_PIN_12", "TLE6240_PIN_13", "TLE6240_PIN_14", "TLE6240_PIN_15", "TLE6240_PIN_16" #define brain_pin_e_enum "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" #define brakePedalPin_offset 2608 @@ -1068,7 +1068,7 @@ #define mafDecoding_offset 10784 #define mafDecodingBins_offset 11808 #define mafSensorType_offset 948 -#define MAIN_HELP_URL "https://rusefi.com/s/hellen128merc" +#define MAIN_HELP_URL "https://rusefi.com/s/hellen121vag" #define mainRelayPin_offset 706 #define mainRelayPinMode_offset 752 #define mainUnusedEnd_offset 4612 @@ -1168,7 +1168,7 @@ #define oilPressure_value2_offset 2708 #define onOffAlternatorLogic_offset 744 #define operation_mode_e_auto_enum "OM_NONE", "FOUR_STROKE_CRANK_SENSOR", "FOUR_STROKE_CAM_SENSOR", "TWO_STROKE", "FOUR_STROKE_SYMMETRICAL_CRANK_SENSOR", "FOUR_STROKE_THREE_TIMES_CRANK_SENSOR" -#define output_pin_e_enum "NONE","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","E13 - INJ 5","E4 - INJ_4/VVT","E3 - INJ 3","A6 - Fan Control","INVALID","INVALID","C29 - Fuel Pump","INVALID","INVALID","F4 - IGN 5","F13 - IGN 4","F6 - IGN 3","F16 - IGN 2","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","E14 - INJ 6","E25 - INJ 7","E26 - INJ 8","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","E1 - INJ 1","E2- INJ 2","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","C21 - Evap Purge Control","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","F17 - IGN 6","F9 - IGN 7","F11 - IGN 8","F20 - IGN 1" +#define output_pin_e_enum "NONE","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","104 Wastegate","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","101 - MAP2","INVALID","INVALID","INVALID","INVALID","117 ETB_OUT+","118 ETB_OUT-","120 - VVT2 B2","18 - VVT2 B1","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","113 INJ 5","88 - INJ_4","97 - INJ_3","INVALID","37 - TACH","105 - IDLE","INVALID","INVALID","INVALID","103 - IGN_5","94 - IGN_4","111 - IGN_3","7 - IGN_2","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","112 INJ 6","19 - INJ 7","24 - INJ 8","INVALID","INVALID","INVALID","INVALID","115 - VVT1_2","47 - CEL","INVALID","INVALID","96 - INJ_1","89 - INJ_2","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","65 - Fuel Pump","INVALID","22 - VVT1 1","INVALID","Main Relay","INVALID","INVALID","110 - IGN_6","8 - IGN_7","95 - IGN_8","102 - IGN_1" #define overrideCrankingIacSetting_offset 1476 #define overrideTriggerGaps_offset 76 #define PACK_ADD_TEMPERATURE 40 @@ -1254,14 +1254,15 @@ #define servoOutputPins7_offset 3146 #define servoOutputPins8_offset 3147 #define show_Frankenso_presets false +#define show_Hellen121vag_presets true #define show_microRusEFI_presets false #define show_Proteus_presets false #define show_test_presets false #define showHumanReadableWarning_offset 976 #define showSdCardWarning_offset 76 -#define SIGNATURE_BOARD hellen128 -#define SIGNATURE_DATE 2021.08.17 -#define SIGNATURE_HASH 261208335 +#define SIGNATURE_BOARD hellen121vag +#define SIGNATURE_DATE 2021.08.19 +#define SIGNATURE_HASH 738079672 #define silentTriggerError_offset 1464 #define slowAdcAlpha_offset 2088 #define sparkDwellRpmBins_offset 332 @@ -1344,7 +1345,7 @@ #define stftIgnoreErrorMagnitude_offset 976 #define stoichRatioPrimary_offset 4005 #define stoichRatioSecondary_offset 4009 -#define switch_input_pin_e_enum "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" +#define switch_input_pin_e_enum "NONE","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","In D1","In D2","In D3","In D4","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","48 - IN RES1","39 - IN RES2" #define tachOutputPin_offset 704 #define tachOutputPinMode_offset 705 #define tachPulseDuractionMs_offset 1704 @@ -1617,7 +1618,7 @@ #define ts_show_spi true #define ts_show_trigger_comparator false #define ts_show_tunerstudio_port false -#define TS_SIGNATURE "rusEFI 2021.08.17.hellen128.261208335" +#define TS_SIGNATURE "rusEFI 2021.08.19.hellen121vag.738079672" #define TS_SINGLE_WRITE_COMMAND 'W' #define TS_SINGLE_WRITE_COMMAND_char W #define TS_TEST_COMMAND 't' @@ -6180,4 +6181,4 @@ struct persistent_config_s { }; // end -// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Tue Aug 17 21:33:54 UTC 2021 +// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Aug 19 10:53:48 UTC 2021 diff --git a/firmware/controllers/generated/fsio_enums_generated.def b/firmware/controllers/generated/fsio_enums_generated.def index 9cc1809dce..af3e6fb2aa 100644 --- a/firmware/controllers/generated/fsio_enums_generated.def +++ b/firmware/controllers/generated/fsio_enums_generated.def @@ -1,4 +1,4 @@ -// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Tue Aug 17 21:33:54 UTC 2021 +// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Aug 19 10:53:48 UTC 2021 // by class com.rusefi.output.FileFsioSettingsConsumer FSIO_SETTING_ACIDLEEXTRAOFFSET = 1000, diff --git a/firmware/controllers/generated/fsio_getters.def b/firmware/controllers/generated/fsio_getters.def index 6d56db9c6c..fba0cd2d6d 100644 --- a/firmware/controllers/generated/fsio_getters.def +++ b/firmware/controllers/generated/fsio_getters.def @@ -1,4 +1,4 @@ -// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Tue Aug 17 21:33:54 UTC 2021 +// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Aug 19 10:53:48 UTC 2021 // by class com.rusefi.output.FileFsioSettingsConsumer case FSIO_SETTING_ACIDLEEXTRAOFFSET: diff --git a/firmware/controllers/generated/fsio_names.def b/firmware/controllers/generated/fsio_names.def index 6457c47c1e..78bde419f2 100644 --- a/firmware/controllers/generated/fsio_names.def +++ b/firmware/controllers/generated/fsio_names.def @@ -1,4 +1,4 @@ -// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Tue Aug 17 21:33:54 UTC 2021 +// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Aug 19 10:53:48 UTC 2021 // by class com.rusefi.output.FileFsioSettingsConsumer static LENameOrdinalPair leacIdleExtraOffset(FSIO_SETTING_ACIDLEEXTRAOFFSET, "cfg_acIdleExtraOffset"); diff --git a/firmware/controllers/generated/fsio_strings.def b/firmware/controllers/generated/fsio_strings.def index 5419b9f24a..af86d6d887 100644 --- a/firmware/controllers/generated/fsio_strings.def +++ b/firmware/controllers/generated/fsio_strings.def @@ -1,4 +1,4 @@ -// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Tue Aug 17 21:33:54 UTC 2021 +// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Aug 19 10:53:48 UTC 2021 // by class com.rusefi.output.FileFsioSettingsConsumer case FSIO_SETTING_ACIDLEEXTRAOFFSET: diff --git a/firmware/controllers/generated/rusefi_generated.h b/firmware/controllers/generated/rusefi_generated.h index 6663571ced..c97ad13a62 100644 --- a/firmware/controllers/generated/rusefi_generated.h +++ b/firmware/controllers/generated/rusefi_generated.h @@ -12,7 +12,7 @@ #define acSwitch_offset 1469 #define acSwitchMode_offset 4516 #define adc_channel_e_auto_enum "EFI_ADC_NONE", "EFI_ADC_0", "EFI_ADC_1", "EFI_ADC_2", "EFI_ADC_3", "EFI_ADC_4", "EFI_ADC_5", "EFI_ADC_6", "EFI_ADC_7", "EFI_ADC_8", "EFI_ADC_9", "EFI_ADC_10", "EFI_ADC_11", "EFI_ADC_12", "EFI_ADC_13", "EFI_ADC_14", "EFI_ADC_15", "EFI_ADC_LAST_CHANNEL", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "EFI_ADC_ERROR" -#define adc_channel_e_enum "NONE","C31 - O2S","P31_IN_O2S2","INVALID","C24 - PPS1","E31 - TPS1","Battery Sense","E40 - IN_CAM","P30_IN_AUX4","E34 - TPS2","E37 - Crank Input","E47 - MAF","E23 - MAP","E29 - Coolant Temp","E45 - IAT","C25 - PPS2" +#define adc_channel_e_enum "NONE","14 - O2","INVALID","INVALID","34 In PPS1","92 - TPS 1","106 - KNOCK","86 - CAM1","87 - CAM2","84 - TPS2","INVALID","29 In Maf","101 - MAP2","93 - CLT","85 - IAT","35 In PPS2" #define adc_channel_mode_e_auto_enum "ADC_OFF", "ADC_SLOW", "ADC_FAST" #define ADC_CHANNEL_NONE 0 #define adcVcc_offset 548 @@ -151,7 +151,7 @@ #define boostTpsBins_offset 6392 #define boostType_e_auto_enum "OPEN_LOOP", "CLOSED_LOOP" #define boostType_offset 1012 -#define brain_input_pin_e_enum "NONE","INVALID","INVALID","INVALID","INVALID","C24 - PPS1","E31 - TPS1","INVALID","E40 - IN_CAM","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","E34 - TPS2","E37 - Crank Input","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","E47 - MAF","E23 - MAP","E29 - Coolant Temp","E45 - IAT","C25 - PPS2" +#define brain_input_pin_e_enum "NONE","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","86 - CAM1","87 - CAM2","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","82 - VR","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","54 - VSS" #define brain_pin_e_auto_enum "GPIO_UNASSIGNED", "GPIO_INVALID", "GPIOA_0", "GPIOA_1", "GPIOA_2", "GPIOA_3", "GPIOA_4", "GPIOA_5", "GPIOA_6", "GPIOA_7", "GPIOA_8", "GPIOA_9", "GPIOA_10", "GPIOA_11", "GPIOA_12", "GPIOA_13", "GPIOA_14", "GPIOA_15", "GPIOB_0", "GPIOB_1", "GPIOB_2", "GPIOB_3", "GPIOB_4", "GPIOB_5", "GPIOB_6", "GPIOB_7", "GPIOB_8", "GPIOB_9", "GPIOB_10", "GPIOB_11", "GPIOB_12", "GPIOB_13", "GPIOB_14", "GPIOB_15", "GPIOC_0", "GPIOC_1", "GPIOC_2", "GPIOC_3", "GPIOC_4", "GPIOC_5", "GPIOC_6", "GPIOC_7", "GPIOC_8", "GPIOC_9", "GPIOC_10", "GPIOC_11", "GPIOC_12", "GPIOC_13", "GPIOC_14", "GPIOC_15", "GPIOD_0", "GPIOD_1", "GPIOD_2", "GPIOD_3", "GPIOD_4", "GPIOD_5", "GPIOD_6", "GPIOD_7", "GPIOD_8", "GPIOD_9", "GPIOD_10", "GPIOD_11", "GPIOD_12", "GPIOD_13", "GPIOD_14", "GPIOD_15", "GPIOE_0", "GPIOE_1", "GPIOE_2", "GPIOE_3", "GPIOE_4", "GPIOE_5", "GPIOE_6", "GPIOE_7", "GPIOE_8", "GPIOE_9", "GPIOE_10", "GPIOE_11", "GPIOE_12", "GPIOE_13", "GPIOE_14", "GPIOE_15", "GPIOF_0", "GPIOF_1", "GPIOF_2", "GPIOF_3", "GPIOF_4", "GPIOF_5", "GPIOF_6", "GPIOF_7", "GPIOF_8", "GPIOF_9", "GPIOF_10", "GPIOF_11", "GPIOF_12", "GPIOF_13", "GPIOF_14", "GPIOF_15", "GPIOG_0", "GPIOG_1", "GPIOG_2", "GPIOG_3", "GPIOG_4", "GPIOG_5", "GPIOG_6", "GPIOG_7", "GPIOG_8", "GPIOG_9", "GPIOG_10", "GPIOG_11", "GPIOG_12", "GPIOG_13", "GPIOG_14", "GPIOG_15", "GPIOH_0", "GPIOH_1", "GPIOH_2", "GPIOH_3", "GPIOH_4", "GPIOH_5", "GPIOH_6", "GPIOH_7", "GPIOH_8", "GPIOH_9", "GPIOH_10", "GPIOH_11", "GPIOH_12", "GPIOH_13", "GPIOH_14", "GPIOH_15", "GPIOI_0", "GPIOI_1", "GPIOI_2", "GPIOI_3", "GPIOI_4", "GPIOI_5", "GPIOI_6", "GPIOI_7", "GPIOI_8", "GPIOI_9", "GPIOI_10", "GPIOI_11", "GPIOI_12", "GPIOI_13", "GPIOI_14", "GPIOI_15", "MC33972_PIN_1", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "MC33972_PIN_21", "MC33972_PIN_22", "TLE8888_PIN_1", "TLE8888_PIN_2", "TLE8888_PIN_3", "TLE8888_PIN_4", "TLE8888_PIN_5", "TLE8888_PIN_6", "TLE8888_PIN_7", "TLE8888_PIN_8", "TLE8888_PIN_9", "TLE8888_PIN_10", "TLE8888_PIN_11", "TLE8888_PIN_12", "TLE8888_PIN_13", "TLE8888_PIN_14", "TLE8888_PIN_15", "TLE8888_PIN_16", "TLE8888_PIN_17", "TLE8888_PIN_18", "TLE8888_PIN_19", "TLE8888_PIN_20", "TLE8888_PIN_21", "TLE8888_PIN_22", "TLE8888_PIN_23", "TLE8888_PIN_24", "TLE8888_PIN_25", "TLE8888_PIN_26", "TLE8888_PIN_27", "TLE8888_PIN_28", "TLE8888_PIN_MR", "TLE8888_PIN_KEY", "TLE8888_PIN_WAKE", "TLE6240_PIN_1", "TLE6240_PIN_2", "TLE6240_PIN_3", "TLE6240_PIN_4", "TLE6240_PIN_5", "TLE6240_PIN_6", "TLE6240_PIN_7", "TLE6240_PIN_8", "TLE6240_PIN_9", "TLE6240_PIN_10", "TLE6240_PIN_11", "TLE6240_PIN_12", "TLE6240_PIN_13", "TLE6240_PIN_14", "TLE6240_PIN_15", "TLE6240_PIN_16" #define brain_pin_e_enum "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" #define brakePedalPin_offset 2608 @@ -1067,7 +1067,7 @@ #define mafDecoding_offset 10784 #define mafDecodingBins_offset 11808 #define mafSensorType_offset 948 -#define MAIN_HELP_URL "https://rusefi.com/s/hellen128merc" +#define MAIN_HELP_URL "https://rusefi.com/s/hellen121vag" #define mainRelayPin_offset 706 #define mainRelayPinMode_offset 752 #define mainUnusedEnd_offset 4612 @@ -1167,7 +1167,7 @@ #define oilPressure_value2_offset 2708 #define onOffAlternatorLogic_offset 744 #define operation_mode_e_auto_enum "OM_NONE", "FOUR_STROKE_CRANK_SENSOR", "FOUR_STROKE_CAM_SENSOR", "TWO_STROKE", "FOUR_STROKE_SYMMETRICAL_CRANK_SENSOR", "FOUR_STROKE_THREE_TIMES_CRANK_SENSOR" -#define output_pin_e_enum "NONE","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","E13 - INJ 5","E4 - INJ_4/VVT","E3 - INJ 3","A6 - Fan Control","INVALID","INVALID","C29 - Fuel Pump","INVALID","INVALID","F4 - IGN 5","F13 - IGN 4","F6 - IGN 3","F16 - IGN 2","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","E14 - INJ 6","E25 - INJ 7","E26 - INJ 8","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","E1 - INJ 1","E2- INJ 2","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","C21 - Evap Purge Control","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","F17 - IGN 6","F9 - IGN 7","F11 - IGN 8","F20 - IGN 1" +#define output_pin_e_enum "NONE","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","104 Wastegate","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","101 - MAP2","INVALID","INVALID","INVALID","INVALID","117 ETB_OUT+","118 ETB_OUT-","120 - VVT2 B2","18 - VVT2 B1","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","113 INJ 5","88 - INJ_4","97 - INJ_3","INVALID","37 - TACH","105 - IDLE","INVALID","INVALID","INVALID","103 - IGN_5","94 - IGN_4","111 - IGN_3","7 - IGN_2","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","112 INJ 6","19 - INJ 7","24 - INJ 8","INVALID","INVALID","INVALID","INVALID","115 - VVT1_2","47 - CEL","INVALID","INVALID","96 - INJ_1","89 - INJ_2","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","65 - Fuel Pump","INVALID","22 - VVT1 1","INVALID","Main Relay","INVALID","INVALID","110 - IGN_6","8 - IGN_7","95 - IGN_8","102 - IGN_1" #define overrideCrankingIacSetting_offset 1476 #define overrideTriggerGaps_offset 76 #define PACK_ADD_TEMPERATURE 40 @@ -1253,14 +1253,15 @@ #define servoOutputPins7_offset 3146 #define servoOutputPins8_offset 3147 #define show_Frankenso_presets false +#define show_Hellen121vag_presets true #define show_microRusEFI_presets false #define show_Proteus_presets false #define show_test_presets false #define showHumanReadableWarning_offset 976 #define showSdCardWarning_offset 76 -#define SIGNATURE_BOARD hellen128 -#define SIGNATURE_DATE 2021.08.17 -#define SIGNATURE_HASH 261208335 +#define SIGNATURE_BOARD hellen121vag +#define SIGNATURE_DATE 2021.08.19 +#define SIGNATURE_HASH 738079672 #define silentTriggerError_offset 1464 #define slowAdcAlpha_offset 2088 #define sparkDwellRpmBins_offset 332 @@ -1343,7 +1344,7 @@ #define stftIgnoreErrorMagnitude_offset 976 #define stoichRatioPrimary_offset 4005 #define stoichRatioSecondary_offset 4009 -#define switch_input_pin_e_enum "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PF0", "PF1", "PF2", "PF3", "PF4", "PF5", "PF6", "PF7", "PF8", "PF9", "PF10", "PF11", "PF12", "PF13", "PF14", "PF15", "PG0", "PG1", "PG2", "PG3", "PG4", "PG5", "PG6", "PG7", "PG8", "PG9", "PG10", "PG11", "PG12", "PG13", "PG14", "PG15", "PH0", "PH1", "PH2", "PH3", "PH4", "PH5", "PH6", "PH7", "PH8", "PH9", "PH10", "PH11", "PH12", "PH13", "PH14", "PH15", "PI0", "PI1", "PI2", "PI3", "PI4", "PI5", "PI6", "PI7", "PI8", "PI9", "PI10", "PI11", "PI12", "PI13", "PI14", "PI15", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" +#define switch_input_pin_e_enum "NONE","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","In D1","In D2","In D3","In D4","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","48 - IN RES1","39 - IN RES2" #define tachOutputPin_offset 704 #define tachOutputPinMode_offset 705 #define tachPulseDuractionMs_offset 1704 @@ -1616,7 +1617,7 @@ #define ts_show_spi true #define ts_show_trigger_comparator false #define ts_show_tunerstudio_port false -#define TS_SIGNATURE "rusEFI 2021.08.17.hellen128.261208335" +#define TS_SIGNATURE "rusEFI 2021.08.19.hellen121vag.738079672" #define TS_SINGLE_WRITE_COMMAND 'W' #define TS_SINGLE_WRITE_COMMAND_char W #define TS_TEST_COMMAND 't' diff --git a/firmware/controllers/generated/signature_hellen121vag.h b/firmware/controllers/generated/signature_hellen121vag.h index 9926af53e6..0a88965f77 100644 --- a/firmware/controllers/generated/signature_hellen121vag.h +++ b/firmware/controllers/generated/signature_hellen121vag.h @@ -3,6 +3,6 @@ // #define SIGNATURE_BOARD hellen121vag -#define SIGNATURE_DATE 2021.08.17 -#define SIGNATURE_HASH 499510234 -#define TS_SIGNATURE "rusEFI 2021.08.17.hellen121vag.499510234" +#define SIGNATURE_DATE 2021.08.19 +#define SIGNATURE_HASH 738079672 +#define TS_SIGNATURE "rusEFI 2021.08.19.hellen121vag.738079672" diff --git a/firmware/tunerstudio/generated/cache.zip b/firmware/tunerstudio/generated/cache.zip index 713537b3513e402f61069838b7e2e95ee4d235ab..b7254e821ec2e221d7b803e5e75f16038ab9293b 100644 GIT binary patch delta 4238 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 delta 4290 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 - +