From 96633a92a5bc06345227f5bcccbde26ea2347c39 Mon Sep 17 00:00:00 2001 From: GitHub build-firmware Action Date: Tue, 24 Aug 2021 15:44:43 +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_hellenNA6.h | 4 +- firmware/tunerstudio/generated/cache.zip | Bin 1959195 -> 1959196 bytes .../generated/rusefi_hellenNA6.ini | 36 +++++++++--------- .../com/rusefi/config/generated/Fields.java | 15 ++++---- java_console/rusefi.xml | 2 +- 11 files changed, 55 insertions(+), 52 deletions(-) diff --git a/firmware/controllers/generated/engine_configuration_generated_structures.h b/firmware/controllers/generated/engine_configuration_generated_structures.h index 989d9db229..f123b3705d 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 24 14:13:46 UTC 2021 +// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Tue Aug 24 15:43:34 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","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_e_enum "NONE","3N - O2S","2N - Temperature Sensor","intMAP (A15)","INVALID","TPS Input","1B - Battery Sense","INVALID","INVALID","INVALID","INVALID","3O - MAF","2M - Pressure Sensor","3Q - CLT","3P - IAT","1V - Clutch Switch","1Q AC Switch" #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","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_input_pin_e_enum "NONE","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","3G - CAM","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","3E - CRANK","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","2L - Flex Fuel","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","1M - 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 @@ -1077,7 +1077,7 @@ #define mafDecoding_offset 10784 #define mafDecodingBins_offset 11808 #define mafSensorType_offset 948 -#define MAIN_HELP_URL "https://rusefi.com/s/hellen121vag" +#define MAIN_HELP_URL "https://rusefi.com/s/hellenNA6" #define mainRelayPin_offset 706 #define mainRelayPinMode_offset 752 #define mainUnusedEnd_offset 4612 @@ -1177,7 +1177,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","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 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","3S - A/C Fan 94-95","3Z - Injector 4","3Y - Injector 3","Radiator Fan","INVALID","3W - IDLE","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","1H - Ignition 2 & 3","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","2A - Boost Control","INVALID","INVALID","INVALID","INVALID","INVALID","Fuel Pump Relay","INVALID","INVALID","INVALID","INVALID","3U - Injector 1","3V - Injector 2","1E - Check Engine Light","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","1J - AC Relay","Tachometer","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","1G - Ignition 1 & 4" #define overrideCrankingIacSetting_offset 1476 #define overrideTriggerGaps_offset 76 #define PACK_ADD_TEMPERATURE 40 @@ -1263,15 +1263,16 @@ #define servoOutputPins7_offset 3146 #define servoOutputPins8_offset 3147 #define show_Frankenso_presets false -#define show_Hellen121vag_presets true +#define show_Hellen_presets true +#define show_HellenNA6_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 hellen121vag +#define SIGNATURE_BOARD hellenNA6 #define SIGNATURE_DATE 2021.08.24 -#define SIGNATURE_HASH 2900514968 +#define SIGNATURE_HASH 43551344 #define silentTriggerError_offset 1464 #define slowAdcAlpha_offset 2088 #define sparkDwellRpmBins_offset 332 @@ -1354,7 +1355,7 @@ #define stftIgnoreErrorMagnitude_offset 976 #define stoichRatioPrimary_offset 4005 #define stoichRatioSecondary_offset 4009 -#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 switch_input_pin_e_enum "NONE","INVALID","INVALID","2N - Temperature Sensor","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","2M - Pressure Sensor","INVALID","INVALID","1V - Clutch Switch","1Q AC Switch" #define tachOutputPin_offset 704 #define tachOutputPinMode_offset 705 #define tachPulseDuractionMs_offset 1704 @@ -1627,7 +1628,7 @@ #define ts_show_spi true #define ts_show_trigger_comparator false #define ts_show_tunerstudio_port false -#define TS_SIGNATURE "rusEFI 2021.08.24.hellen121vag.2900514968" +#define TS_SIGNATURE "rusEFI 2021.08.24.hellenNA6.43551344" #define TS_SINGLE_WRITE_COMMAND 'W' #define TS_SINGLE_WRITE_COMMAND_char W #define TS_TEST_COMMAND 't' @@ -6194,4 +6195,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 24 14:13:46 UTC 2021 +// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Tue Aug 24 15:43:34 UTC 2021 diff --git a/firmware/controllers/generated/fsio_enums_generated.def b/firmware/controllers/generated/fsio_enums_generated.def index 1d446def95..1f4afeeb72 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 24 14:13:46 UTC 2021 +// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Tue Aug 24 15:43:34 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 8c7b01758e..813f30d35a 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 24 14:13:46 UTC 2021 +// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Tue Aug 24 15:43:34 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 06d78d0f84..faa764d917 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 24 14:13:46 UTC 2021 +// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Tue Aug 24 15:43:34 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 6f9624346e..7fdbb2faff 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 24 14:13:46 UTC 2021 +// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Tue Aug 24 15:43:34 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 ed57be487e..e668333df5 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","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_e_enum "NONE","3N - O2S","2N - Temperature Sensor","intMAP (A15)","INVALID","TPS Input","1B - Battery Sense","INVALID","INVALID","INVALID","INVALID","3O - MAF","2M - Pressure Sensor","3Q - CLT","3P - IAT","1V - Clutch Switch","1Q AC Switch" #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","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_input_pin_e_enum "NONE","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","3G - CAM","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","3E - CRANK","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","2L - Flex Fuel","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","1M - 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 @@ -1076,7 +1076,7 @@ #define mafDecoding_offset 10784 #define mafDecodingBins_offset 11808 #define mafSensorType_offset 948 -#define MAIN_HELP_URL "https://rusefi.com/s/hellen121vag" +#define MAIN_HELP_URL "https://rusefi.com/s/hellenNA6" #define mainRelayPin_offset 706 #define mainRelayPinMode_offset 752 #define mainUnusedEnd_offset 4612 @@ -1176,7 +1176,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","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 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","3S - A/C Fan 94-95","3Z - Injector 4","3Y - Injector 3","Radiator Fan","INVALID","3W - IDLE","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","1H - Ignition 2 & 3","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","2A - Boost Control","INVALID","INVALID","INVALID","INVALID","INVALID","Fuel Pump Relay","INVALID","INVALID","INVALID","INVALID","3U - Injector 1","3V - Injector 2","1E - Check Engine Light","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","1J - AC Relay","Tachometer","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","1G - Ignition 1 & 4" #define overrideCrankingIacSetting_offset 1476 #define overrideTriggerGaps_offset 76 #define PACK_ADD_TEMPERATURE 40 @@ -1262,15 +1262,16 @@ #define servoOutputPins7_offset 3146 #define servoOutputPins8_offset 3147 #define show_Frankenso_presets false -#define show_Hellen121vag_presets true +#define show_Hellen_presets true +#define show_HellenNA6_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 hellen121vag +#define SIGNATURE_BOARD hellenNA6 #define SIGNATURE_DATE 2021.08.24 -#define SIGNATURE_HASH 2900514968 +#define SIGNATURE_HASH 43551344 #define silentTriggerError_offset 1464 #define slowAdcAlpha_offset 2088 #define sparkDwellRpmBins_offset 332 @@ -1353,7 +1354,7 @@ #define stftIgnoreErrorMagnitude_offset 976 #define stoichRatioPrimary_offset 4005 #define stoichRatioSecondary_offset 4009 -#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 switch_input_pin_e_enum "NONE","INVALID","INVALID","2N - Temperature Sensor","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","2M - Pressure Sensor","INVALID","INVALID","1V - Clutch Switch","1Q AC Switch" #define tachOutputPin_offset 704 #define tachOutputPinMode_offset 705 #define tachPulseDuractionMs_offset 1704 @@ -1626,7 +1627,7 @@ #define ts_show_spi true #define ts_show_trigger_comparator false #define ts_show_tunerstudio_port false -#define TS_SIGNATURE "rusEFI 2021.08.24.hellen121vag.2900514968" +#define TS_SIGNATURE "rusEFI 2021.08.24.hellenNA6.43551344" #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_hellenNA6.h b/firmware/controllers/generated/signature_hellenNA6.h index 4d967fbfdd..24827f0fba 100644 --- a/firmware/controllers/generated/signature_hellenNA6.h +++ b/firmware/controllers/generated/signature_hellenNA6.h @@ -4,5 +4,5 @@ #define SIGNATURE_BOARD hellenNA6 #define SIGNATURE_DATE 2021.08.24 -#define SIGNATURE_HASH 3901185516 -#define TS_SIGNATURE "rusEFI 2021.08.24.hellenNA6.3901185516" +#define SIGNATURE_HASH 43551344 +#define TS_SIGNATURE "rusEFI 2021.08.24.hellenNA6.43551344" diff --git a/firmware/tunerstudio/generated/cache.zip b/firmware/tunerstudio/generated/cache.zip index 383e935e733bae8230919073e4e737f6c2f84ba3..f441f4410bab07b52e0a0dceb84623e0cb329c4a 100644 GIT binary patch delta 2992 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 - +