From 0e6d0a78621b43e4dc9c17631e121631a9964d99 Mon Sep 17 00:00:00 2001 From: GitHub build-firmware Action Date: Tue, 28 Sep 2021 18:29:16 +0000 Subject: [PATCH] Auto-generated configs and docs --- ...ngine_configuration_generated_structures.h | 22 +++++----- .../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 | 18 ++++----- .../generated/signature_hellenNA6.h | 6 +-- firmware/tunerstudio/generated/cache.zip | Bin 1975729 -> 1975727 bytes .../generated/rusefi_hellenNA6.ini | 38 +++++++++--------- .../com/rusefi/config/generated/Fields.java | 14 +++---- java_console/rusefi.xml | 2 +- 11 files changed, 54 insertions(+), 54 deletions(-) diff --git a/firmware/controllers/generated/engine_configuration_generated_structures.h b/firmware/controllers/generated/engine_configuration_generated_structures.h index 44de7dc6bb..c7efa7469a 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 Sep 28 17:13:46 UTC 2021 +// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Tue Sep 28 18:28:10 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","2C - O2S","INVALID","intMAP","1G - Steering/RES2","3E - TPS","1B - Battery Sense","2H - CAM","3S - EGR BOOST IN","2A - Pressure Input","2J - CRANK","2L - MAF","3D - MAP","2E - Coolant","2B - IAT","4C - IN TEMP/PPS2","1P - AC Switch" +#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 @@ -154,7 +154,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","2H - CAM","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","2J - 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","4B - KNOCK","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","2D - 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","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","2L - Flex Fuel","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 @@ -1088,7 +1088,7 @@ #define mafDecoding_offset 10784 #define mafDecodingBins_offset 11808 #define mafSensorType_offset 948 -#define MAIN_HELP_URL "https://rusefi.com/s/hellenNB1" +#define MAIN_HELP_URL "https://rusefi.com/s/hellenNA6" #define mainRelayPin_offset 706 #define mainRelayPinMode_offset 752 #define mainUnusedEnd_offset 4612 @@ -1188,7 +1188,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","3V - O2H2","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","3D - MAP","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","3G - IGN_1 (1&4)","INVALID","INVALID","INVALID","INVALID","INVALID","1U - O2H","INVALID","INVALID","INVALID","INVALID","INVALID","4E - VVT","3Z - INJ_4","3Y - INJ_3","2B - ECF","2K - TACH","INVALID","1O - ALTERN","INVALID","INVALID","INVALID","INVALID","INVALID","3H - IGN_2 (2&3)","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","3T/4D - BOOST OUT","INVALID","3Q - VICS","INVALID","INVALID","INVALID","2M US / 2P EUROPE - FPUMP","INVALID","INVALID","INVALID","INVALID","3W - INJ_1","3X - INJ_2","1E - Check Engine Light","INVALID","1S - AC Relay","1Q - Aternator Warning Lamp" +#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","2J - 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 @@ -1276,15 +1276,15 @@ #define servoOutputPins8_offset 3147 #define show_Frankenso_presets false #define show_Hellen_presets true -#define show_HellenNB1_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 hellen-nb1 +#define SIGNATURE_BOARD hellenNA6 #define SIGNATURE_DATE 2021.09.28 -#define SIGNATURE_HASH 3131954881 +#define SIGNATURE_HASH 2870319853 #define silentTriggerError_offset 1464 #define slowAdcAlpha_offset 2088 #define sparkDwellRpmBins_offset 332 @@ -1367,7 +1367,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","3S - EGR BOOST IN","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","2A - Pressure Input","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","4C - IN TEMP/PPS2","1P - AC Switch","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","3I - Clutch","1V - Neutral","INVALID","INVALID","INVALID","INVALID","3J - O2S2","INVALID","INVALID","INVALID","INVALID","INVALID","1F - Brake/RES1","1G - Steering/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 @@ -1640,7 +1640,7 @@ #define ts_show_spi true #define ts_show_trigger_comparator false #define ts_show_tunerstudio_port false -#define TS_SIGNATURE "rusEFI 2021.09.28.hellen-nb1.3131954881" +#define TS_SIGNATURE "rusEFI 2021.09.28.hellenNA6.2870319853" #define TS_SINGLE_WRITE_COMMAND 'W' #define TS_SINGLE_WRITE_COMMAND_char W #define TS_TEST_COMMAND 't' @@ -6222,4 +6222,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 Sep 28 17:13:46 UTC 2021 +// this section was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Tue Sep 28 18:28:10 UTC 2021 diff --git a/firmware/controllers/generated/fsio_enums_generated.def b/firmware/controllers/generated/fsio_enums_generated.def index 86cfd54f4c..126d5964a2 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 Sep 28 17:13:46 UTC 2021 +// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Tue Sep 28 18:28:10 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 2f1a04ca7e..856ecb5763 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 Sep 28 17:13:46 UTC 2021 +// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Tue Sep 28 18:28:10 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 368dbdda5e..f599fbc731 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 Sep 28 17:13:46 UTC 2021 +// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Tue Sep 28 18:28:10 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 39056edd4e..2ff988bf2a 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 Sep 28 17:13:46 UTC 2021 +// this file was generated automatically by rusEFI tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Tue Sep 28 18:28:10 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 30908b769f..32d87437c6 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","2C - O2S","INVALID","intMAP","1G - Steering/RES2","3E - TPS","1B - Battery Sense","2H - CAM","3S - EGR BOOST IN","2A - Pressure Input","2J - CRANK","2L - MAF","3D - MAP","2E - Coolant","2B - IAT","4C - IN TEMP/PPS2","1P - AC Switch" +#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 @@ -153,7 +153,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","2H - CAM","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","2J - 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","4B - KNOCK","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","2D - 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","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","2L - Flex Fuel","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 @@ -1087,7 +1087,7 @@ #define mafDecoding_offset 10784 #define mafDecodingBins_offset 11808 #define mafSensorType_offset 948 -#define MAIN_HELP_URL "https://rusefi.com/s/hellenNB1" +#define MAIN_HELP_URL "https://rusefi.com/s/hellenNA6" #define mainRelayPin_offset 706 #define mainRelayPinMode_offset 752 #define mainUnusedEnd_offset 4612 @@ -1187,7 +1187,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","3V - O2H2","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","3D - MAP","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","3G - IGN_1 (1&4)","INVALID","INVALID","INVALID","INVALID","INVALID","1U - O2H","INVALID","INVALID","INVALID","INVALID","INVALID","4E - VVT","3Z - INJ_4","3Y - INJ_3","2B - ECF","2K - TACH","INVALID","1O - ALTERN","INVALID","INVALID","INVALID","INVALID","INVALID","3H - IGN_2 (2&3)","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","3T/4D - BOOST OUT","INVALID","3Q - VICS","INVALID","INVALID","INVALID","2M US / 2P EUROPE - FPUMP","INVALID","INVALID","INVALID","INVALID","3W - INJ_1","3X - INJ_2","1E - Check Engine Light","INVALID","1S - AC Relay","1Q - Aternator Warning Lamp" +#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","2J - 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 @@ -1275,15 +1275,15 @@ #define servoOutputPins8_offset 3147 #define show_Frankenso_presets false #define show_Hellen_presets true -#define show_HellenNB1_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 hellen-nb1 +#define SIGNATURE_BOARD hellenNA6 #define SIGNATURE_DATE 2021.09.28 -#define SIGNATURE_HASH 3131954881 +#define SIGNATURE_HASH 2870319853 #define silentTriggerError_offset 1464 #define slowAdcAlpha_offset 2088 #define sparkDwellRpmBins_offset 332 @@ -1366,7 +1366,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","3S - EGR BOOST IN","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","2A - Pressure Input","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","4C - IN TEMP/PPS2","1P - AC Switch","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","3I - Clutch","1V - Neutral","INVALID","INVALID","INVALID","INVALID","3J - O2S2","INVALID","INVALID","INVALID","INVALID","INVALID","1F - Brake/RES1","1G - Steering/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 @@ -1639,7 +1639,7 @@ #define ts_show_spi true #define ts_show_trigger_comparator false #define ts_show_tunerstudio_port false -#define TS_SIGNATURE "rusEFI 2021.09.28.hellen-nb1.3131954881" +#define TS_SIGNATURE "rusEFI 2021.09.28.hellenNA6.2870319853" #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 6df9a0180c..95247d95ce 100644 --- a/firmware/controllers/generated/signature_hellenNA6.h +++ b/firmware/controllers/generated/signature_hellenNA6.h @@ -3,6 +3,6 @@ // #define SIGNATURE_BOARD hellenNA6 -#define SIGNATURE_DATE 2021.09.27 -#define SIGNATURE_HASH 2673443413 -#define TS_SIGNATURE "rusEFI 2021.09.27.hellenNA6.2673443413" +#define SIGNATURE_DATE 2021.09.28 +#define SIGNATURE_HASH 2870319853 +#define TS_SIGNATURE "rusEFI 2021.09.28.hellenNA6.2870319853" diff --git a/firmware/tunerstudio/generated/cache.zip b/firmware/tunerstudio/generated/cache.zip index eda592dce9f06735d3300c69810e68c70689d2b6..a3e6e03c1f2ea02b53a7b61e0d572486fc3d5a6c 100644 GIT binary patch delta 3672 zcmZu!2{@E%8y>!42D34XF*DzX7}=NRFQsYGB1KUmk+tLyS`Zb6&K!wKBCiwWl%;c& zP_kvoR$BgS{T0g6qLnC#B>y|Z`A=Pcb6xj!eb4>g&-2{hyL|68MR&pr?u18+WyG># zM2r{9iRHxvF;T1_Run50lL9LaWek%cC=gT#8iX>03IrX30l|b|L8wBoA=Dr^5Zuy? zVIDUN^hPNWk=SG**i}JVq*Uqd;5CC%nFoZ25z--#&yO#cGVJ;tUe_Y@dwr8aIY}TC>A+%kYxx&yJa>EJ;E7NtGJW4LybPPusYc7^12*Ep;vyuT2Wh zcD%Xw#42(yTPxvuLSwaXP_EB^@Z*4S$H#`?!9Z=twa4#QYJ0UR*|J56YQrrTd+O&! zY)^V*+;CWxKSWruaNRo%0lCgTj4%|aTHooB-N zzPEVHUoa6E-}q@R{qy7J2AP6a3a$#wWRHK4FM%a ztguaw!F|uTUrUpyBEGSVXgG}VEtexZ{uRBuQ!y%GNb8Gn$E(R~`2kDB$a$FWzAJ0& z_1&Wa(v!IV1fe$!huq`N*j{)R-t9QTsJ-#nR7vh;ciZO^rUz4R9>&h-(*_Od^2@zE zy+#|tPh>_!TAHQX#$9H|3`WN`M_)wa)Ltsg8YLp7wz}JNl-|DQ@kN67-4RhqRx3}2 zPdS;AUK-4srIEk zmkr_y(rG4ivvx1{x<4j#!k^pto||NN|K67O5UbZFv8j>#T;CCVV93GI_nE!6PC1^l zoAo~PJ_q}vIj{RqXWNP##ecn6+P%O|`_DYjXa@`CCsns$X-p?QE58_Y!9_cg{<%GtHm1(ak6{KUhCe&&JJ&^lSxw zf!#S%4gcGZ&De)O ziLP;MTO;ol#b323@}yRE$)S!EO}Z{(pI;t-wdbCvL+UfVu7J(Y`7S#T3!o%oM%w`-nok+uj;xKC-HK~8DEOKZ{G~9=rSd0wYFbcX^^nme~Per(Nt|pAa9O# z_*>S1Uh{cNZU0i|^vv-TQAu0s?st?RzxBt2-?ZEhB;Fb>N#YHVCW79ok}sfH3r#Zp zoJ)>|mf8*M=XyI8bvZUveB9urpp|c|804wFo?b91P({NMe>BM&r!bA5X#==UD?_42I2K5a&F_il+dx~BiiDT7# za}gN&`>$ME^$JmNs5f?sJf3&dU64!_A)_Pp(`x?2s@8eDTC`FsE+MXX4iHvBI#v_f~ zvQkmiC-d%jx0+L*_}ib2f6aW~b&_onVV#xPhKq_Ha55PE_Ap`Ws-51a_RW+Q<)w0) zS2e9E&psdUDq8Kf&NBDSlye~)Z>LgTJt|q#Vbyfm@2%cK3(wfg3CGv{b?$s+tBfEe zQv5H2*;^qL)vbMeL2dV}fWNlfebU}1 zxU_yR+wpwbzCY@H(+&|g7bX0@%0lQ;zV_?%Utxh(<&v=ZF>WCOG!Js z!Yshq$F{tn{mmU$O3Q8{U(vmOqp^*>zBS`WtQQ!0YHs0a#e3qL6O!Z0^V_9XcTKBs z3!mlqd{WsjGo0fhAR7mpQ~!*172C^1)g2C5Hhx7O=uZ*sZ3sj(?{Kz_JPtR>#o_F2 z5Ih4%BocA4$udF!uc;+J+)ySWii(`{hN`wEJN__)ttPLO!NYsc0oe2LED*VdtoeiB zx-sExZfR)>x+Vw&%3&C?wStsfOJaa06DSLm$zjIGL36T{nUuqUxC>!IAfJXsU z2}H?bW=Ped8LCGf6C(4hW}<>fiUQb3z|062SCMgndwhVX4P^pa4N3=0d5i&?2p9(; zu9eDXfx-%uCh5lj21LlGuOoxLER+GFCQxM%NQ6FGKas&1BIb+??V(5>xS-`59P?F# zISUkEPJb8$43$x5yd6`3-VFB5Q12C>x9k{cG!JZ3gkzjvDZnciwy4QP<)(e{6=1DL zim=w+IH`2TR}&HP3zZ#Va(WyRD!mam{CE|3)(EuqJ%9%d@e~NQ?Qf-TXsiqJ3UFC$QTWHQ{Wn=ZKEaEa(Ss4%5>0Ag{^K;V5^$Gzgfcc%yFo& zY*jxE*ibQVMDraD6jCu?WC}i5GG%$wRaen4W7$P1pun204VEGp734t%*`}-l3a#m8 zfTS#WPnHUZDMIPVYc(j-mP3@G=mu9xW57N}mJPZj%50tr7;>QNg9R!udRngn)`v6H zrwga6z#KVCx`Z+U;}XHtN;+tXhLH;$TY`vJOQVJ07dm{YK{|XXueCFRi5ezlns;MB z{+m5L*;WgkHj~GIh25R#$uyl=V3L6?Ms97QgT+j26M{_9lPz`Gppc2JKy)G)(!f5C z$^_ah*k2=t0fw(JrTvw`Y!=)Gc`R5yM=a$RN>r*qO%+lH<7T8%CsIC6!mA&F{8g0w z-8Q?ygmqp^21QAX5AI2#%N%xcpMeh0MKN2Y4wQ}C z;TPl+;uj2dPoNk$jl%x4MmD&IVxEZkGBsd^!QGj@N)0IE@k>Ds9e#SSRgBa12o$pmDu+8*^bqO?&oVj_k=whaCR1^50<`w2Qpp* z9$Wd4@2M#bcmfZGeouvILX~Cs_tZNHwc)_`l-Dds9g37vzaY6$9H6X+pE*biw4kr& zd@e9`;~9XHT5u)^S<*;-dI85J0+~O#K!%SQg2EkgO5n~{lmd2YLw;=m7u5R6&1~ov z36)8){O_ED@gh*IUGUq*TvrEN0IO|6#dx= zMF?hM_7jD}_cxI>P67AN?`#hb)ILBpQt_BE{U@ow5|43_;C>$Pz+)yqRh*S5+TQ-J z4ik*vG1^b1U1KPhynld)`^6_9z$a*(G{gLfqkmm!lO(|;U?yOM&!=)X29 BvOE9) delta 3608 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 - +