From 895fc1c9ffc39d60d6f62e6b51200fd4352d9699 Mon Sep 17 00:00:00 2001 From: GitHub build-firmware Action Date: Mon, 7 Sep 2020 14:49:54 +0000 Subject: [PATCH] Auto-generated configs and docs --- ...ngine_configuration_generated_structures.h | 70 +++++--- .../controllers/algo/rusefi_generated.h | 58 ++++--- ...ngine_configuration_generated_structures.h | 70 +++++--- .../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 | 58 ++++--- .../controllers/generated/signature_all.h | 4 +- .../generated/signature_frankenso_na6.h | 4 +- .../controllers/generated/signature_kin.h | 4 +- .../controllers/generated/signature_mre_f4.h | 4 +- .../controllers/generated/signature_mre_f7.h | 4 +- .../generated/signature_prometheus_405.h | 4 +- .../generated/signature_prometheus_469.h | 4 +- .../generated/signature_proteus_f4.h | 4 +- .../generated/signature_proteus_f7.h | 4 +- firmware/tunerstudio/generated/cache.zip | Bin 868813 -> 869083 bytes firmware/tunerstudio/generated/rusefi.ini | 60 ++++--- .../generated/rusefi_frankenso_na6.ini | 60 ++++--- .../tunerstudio/generated/rusefi_kinetis.ini | 60 ++++--- .../tunerstudio/generated/rusefi_mre_f4.ini | 60 ++++--- .../tunerstudio/generated/rusefi_mre_f7.ini | 60 ++++--- .../generated/rusefi_prometheus_405.ini | 60 ++++--- .../generated/rusefi_prometheus_469.ini | 60 ++++--- .../generated/rusefi_proteus_f4.ini | 60 ++++--- .../generated/rusefi_proteus_f7.ini | 60 ++++--- .../com/rusefi/config/generated/Fields.java | 163 ++++++++++-------- java_console/rusefi.xml | 2 +- 29 files changed, 546 insertions(+), 459 deletions(-) diff --git a/firmware/config/boards/kinetis/config/controllers/algo/engine_configuration_generated_structures.h b/firmware/config/boards/kinetis/config/controllers/algo/engine_configuration_generated_structures.h index b202e60f6c..fd281f4937 100644 --- a/firmware/config/boards/kinetis/config/controllers/algo/engine_configuration_generated_structures.h +++ b/firmware/config/boards/kinetis/config/controllers/algo/engine_configuration_generated_structures.h @@ -1,4 +1,4 @@ -// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Mon Sep 07 14:17:26 UTC 2020 +// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Mon Sep 07 14:49:39 UTC 2020 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -1952,7 +1952,23 @@ struct engine_configuration_s { /** * offset 1200 */ - int unusedAtOldBoardConfigurationEnd[65]; + spi_device_e drv8860spiDevice; + /** + * offset 1201 + */ + brain_pin_e drv8860_cs; + /** + * offset 1202 + */ + pin_output_mode_e drv8860_csPinMode; + /** + * offset 1203 + */ + brain_pin_e drv8860_miso; + /** + * offset 1204 + */ + int unusedAtOldBoardConfigurationEnd[64]; /** * offset 1460 */ @@ -2643,76 +2659,76 @@ struct engine_configuration_s { bool unused1130 : 1; /** offset 2116 bit 8 */ - bool unusedBit_478_8 : 1; + bool unusedBit_482_8 : 1; /** offset 2116 bit 9 */ - bool unusedBit_478_9 : 1; + bool unusedBit_482_9 : 1; /** offset 2116 bit 10 */ - bool unusedBit_478_10 : 1; + bool unusedBit_482_10 : 1; /** offset 2116 bit 11 */ - bool unusedBit_478_11 : 1; + bool unusedBit_482_11 : 1; /** offset 2116 bit 12 */ - bool unusedBit_478_12 : 1; + bool unusedBit_482_12 : 1; /** offset 2116 bit 13 */ - bool unusedBit_478_13 : 1; + bool unusedBit_482_13 : 1; /** offset 2116 bit 14 */ - bool unusedBit_478_14 : 1; + bool unusedBit_482_14 : 1; /** offset 2116 bit 15 */ - bool unusedBit_478_15 : 1; + bool unusedBit_482_15 : 1; /** offset 2116 bit 16 */ - bool unusedBit_478_16 : 1; + bool unusedBit_482_16 : 1; /** offset 2116 bit 17 */ - bool unusedBit_478_17 : 1; + bool unusedBit_482_17 : 1; /** offset 2116 bit 18 */ - bool unusedBit_478_18 : 1; + bool unusedBit_482_18 : 1; /** offset 2116 bit 19 */ - bool unusedBit_478_19 : 1; + bool unusedBit_482_19 : 1; /** offset 2116 bit 20 */ - bool unusedBit_478_20 : 1; + bool unusedBit_482_20 : 1; /** offset 2116 bit 21 */ - bool unusedBit_478_21 : 1; + bool unusedBit_482_21 : 1; /** offset 2116 bit 22 */ - bool unusedBit_478_22 : 1; + bool unusedBit_482_22 : 1; /** offset 2116 bit 23 */ - bool unusedBit_478_23 : 1; + bool unusedBit_482_23 : 1; /** offset 2116 bit 24 */ - bool unusedBit_478_24 : 1; + bool unusedBit_482_24 : 1; /** offset 2116 bit 25 */ - bool unusedBit_478_25 : 1; + bool unusedBit_482_25 : 1; /** offset 2116 bit 26 */ - bool unusedBit_478_26 : 1; + bool unusedBit_482_26 : 1; /** offset 2116 bit 27 */ - bool unusedBit_478_27 : 1; + bool unusedBit_482_27 : 1; /** offset 2116 bit 28 */ - bool unusedBit_478_28 : 1; + bool unusedBit_482_28 : 1; /** offset 2116 bit 29 */ - bool unusedBit_478_29 : 1; + bool unusedBit_482_29 : 1; /** offset 2116 bit 30 */ - bool unusedBit_478_30 : 1; + bool unusedBit_482_30 : 1; /** offset 2116 bit 31 */ - bool unusedBit_478_31 : 1; + bool unusedBit_482_31 : 1; /** * set can_mode X * offset 2120 @@ -3670,4 +3686,4 @@ struct persistent_config_s { typedef struct persistent_config_s persistent_config_s; // end -// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Mon Sep 07 14:17:26 UTC 2020 +// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Mon Sep 07 14:49:39 UTC 2020 diff --git a/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h b/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h index f20ba73fc2..a1a0f08af2 100644 --- a/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h +++ b/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h @@ -333,6 +333,10 @@ #define displayMode_offset 492 #define dizzySparkOutputPin_offset 2226 #define dizzySparkOutputPinMode_offset 2227 +#define drv8860_cs_offset 1201 +#define drv8860_csPinMode_offset 1202 +#define drv8860_miso_offset 1203 +#define drv8860spiDevice_offset 1200 #define DWELL_CURVE_SIZE 8 #define ego_sensor_e_auto_enum "ES_BPSX_D1", "ES_Innovate_MTX_L", "ES_14Point7_Free", "ES_NarrowBand", "ES_PLX", "ES_Custom", "ES_AEM" #define ego_sensor_e_enum "BPSX", "Innovate", "14Point7", "Narrow", "PLX", "Custom", "INVALID", "INVALID" @@ -1164,7 +1168,7 @@ #define showSdCardWarning_offset 76 #define SIGNATURE_BOARD kin #define SIGNATURE_DATE 2020.09.07 -#define SIGNATURE_HASH 2414148739 +#define SIGNATURE_HASH 1437275241 #define silentTriggerError_offset 1464 #define slowAdcAlpha_offset 2088 #define sparkDwellRpmBins_offset 332 @@ -1474,7 +1478,7 @@ #define ts_show_spi true #define ts_show_trigger_comparator true #define ts_show_tunerstudio_port true -#define TS_SIGNATURE "rusEFI 2020.09.07.kin.2414148739" +#define TS_SIGNATURE "rusEFI 2020.09.07.kin.1437275241" #define TS_SINGLE_WRITE_COMMAND 'W' #define TS_SINGLE_WRITE_COMMAND_char W #define TS_TEST_COMMAND 't' // 0x74 @@ -1514,7 +1518,7 @@ #define unusedAt716_offset 716 #define unusedAt720_offset 720 #define unusedAt724_offset 724 -#define unusedAtOldBoardConfigurationEnd_offset 1200 +#define unusedAtOldBoardConfigurationEnd_offset 1204 #define unusedAuxVoltage1_TODO_332_offset 2713 #define unusedAuxVoltage2_TODO_332_offset 2714 #define unusedBit4_1476_offset 1476 @@ -1522,30 +1526,30 @@ #define unusedBit_285_30_offset 976 #define unusedBit_285_31_offset 976 #define unusedBit_34_31_offset 76 -#define unusedBit_478_10_offset 2116 -#define unusedBit_478_11_offset 2116 -#define unusedBit_478_12_offset 2116 -#define unusedBit_478_13_offset 2116 -#define unusedBit_478_14_offset 2116 -#define unusedBit_478_15_offset 2116 -#define unusedBit_478_16_offset 2116 -#define unusedBit_478_17_offset 2116 -#define unusedBit_478_18_offset 2116 -#define unusedBit_478_19_offset 2116 -#define unusedBit_478_20_offset 2116 -#define unusedBit_478_21_offset 2116 -#define unusedBit_478_22_offset 2116 -#define unusedBit_478_23_offset 2116 -#define unusedBit_478_24_offset 2116 -#define unusedBit_478_25_offset 2116 -#define unusedBit_478_26_offset 2116 -#define unusedBit_478_27_offset 2116 -#define unusedBit_478_28_offset 2116 -#define unusedBit_478_29_offset 2116 -#define unusedBit_478_30_offset 2116 -#define unusedBit_478_31_offset 2116 -#define unusedBit_478_8_offset 2116 -#define unusedBit_478_9_offset 2116 +#define unusedBit_482_10_offset 2116 +#define unusedBit_482_11_offset 2116 +#define unusedBit_482_12_offset 2116 +#define unusedBit_482_13_offset 2116 +#define unusedBit_482_14_offset 2116 +#define unusedBit_482_15_offset 2116 +#define unusedBit_482_16_offset 2116 +#define unusedBit_482_17_offset 2116 +#define unusedBit_482_18_offset 2116 +#define unusedBit_482_19_offset 2116 +#define unusedBit_482_20_offset 2116 +#define unusedBit_482_21_offset 2116 +#define unusedBit_482_22_offset 2116 +#define unusedBit_482_23_offset 2116 +#define unusedBit_482_24_offset 2116 +#define unusedBit_482_25_offset 2116 +#define unusedBit_482_26_offset 2116 +#define unusedBit_482_27_offset 2116 +#define unusedBit_482_28_offset 2116 +#define unusedBit_482_29_offset 2116 +#define unusedBit_482_30_offset 2116 +#define unusedBit_482_31_offset 2116 +#define unusedBit_482_8_offset 2116 +#define unusedBit_482_9_offset 2116 #define unusedFlexFuelSensor_offset 3100 #define unusedHereWeHave_offset 1464 #define unusedOldBiquad_offset 2332 diff --git a/firmware/controllers/generated/engine_configuration_generated_structures.h b/firmware/controllers/generated/engine_configuration_generated_structures.h index 94bcde5692..f15228f810 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 Mon Sep 07 14:17:13 UTC 2020 +// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Sep 07 14:49:25 UTC 2020 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -1952,7 +1952,23 @@ struct engine_configuration_s { /** * offset 1200 */ - int unusedAtOldBoardConfigurationEnd[65]; + spi_device_e drv8860spiDevice; + /** + * offset 1201 + */ + brain_pin_e drv8860_cs; + /** + * offset 1202 + */ + pin_output_mode_e drv8860_csPinMode; + /** + * offset 1203 + */ + brain_pin_e drv8860_miso; + /** + * offset 1204 + */ + int unusedAtOldBoardConfigurationEnd[64]; /** * offset 1460 */ @@ -2643,76 +2659,76 @@ struct engine_configuration_s { bool unused1130 : 1; /** offset 2116 bit 8 */ - bool unusedBit_478_8 : 1; + bool unusedBit_482_8 : 1; /** offset 2116 bit 9 */ - bool unusedBit_478_9 : 1; + bool unusedBit_482_9 : 1; /** offset 2116 bit 10 */ - bool unusedBit_478_10 : 1; + bool unusedBit_482_10 : 1; /** offset 2116 bit 11 */ - bool unusedBit_478_11 : 1; + bool unusedBit_482_11 : 1; /** offset 2116 bit 12 */ - bool unusedBit_478_12 : 1; + bool unusedBit_482_12 : 1; /** offset 2116 bit 13 */ - bool unusedBit_478_13 : 1; + bool unusedBit_482_13 : 1; /** offset 2116 bit 14 */ - bool unusedBit_478_14 : 1; + bool unusedBit_482_14 : 1; /** offset 2116 bit 15 */ - bool unusedBit_478_15 : 1; + bool unusedBit_482_15 : 1; /** offset 2116 bit 16 */ - bool unusedBit_478_16 : 1; + bool unusedBit_482_16 : 1; /** offset 2116 bit 17 */ - bool unusedBit_478_17 : 1; + bool unusedBit_482_17 : 1; /** offset 2116 bit 18 */ - bool unusedBit_478_18 : 1; + bool unusedBit_482_18 : 1; /** offset 2116 bit 19 */ - bool unusedBit_478_19 : 1; + bool unusedBit_482_19 : 1; /** offset 2116 bit 20 */ - bool unusedBit_478_20 : 1; + bool unusedBit_482_20 : 1; /** offset 2116 bit 21 */ - bool unusedBit_478_21 : 1; + bool unusedBit_482_21 : 1; /** offset 2116 bit 22 */ - bool unusedBit_478_22 : 1; + bool unusedBit_482_22 : 1; /** offset 2116 bit 23 */ - bool unusedBit_478_23 : 1; + bool unusedBit_482_23 : 1; /** offset 2116 bit 24 */ - bool unusedBit_478_24 : 1; + bool unusedBit_482_24 : 1; /** offset 2116 bit 25 */ - bool unusedBit_478_25 : 1; + bool unusedBit_482_25 : 1; /** offset 2116 bit 26 */ - bool unusedBit_478_26 : 1; + bool unusedBit_482_26 : 1; /** offset 2116 bit 27 */ - bool unusedBit_478_27 : 1; + bool unusedBit_482_27 : 1; /** offset 2116 bit 28 */ - bool unusedBit_478_28 : 1; + bool unusedBit_482_28 : 1; /** offset 2116 bit 29 */ - bool unusedBit_478_29 : 1; + bool unusedBit_482_29 : 1; /** offset 2116 bit 30 */ - bool unusedBit_478_30 : 1; + bool unusedBit_482_30 : 1; /** offset 2116 bit 31 */ - bool unusedBit_478_31 : 1; + bool unusedBit_482_31 : 1; /** * set can_mode X * offset 2120 @@ -3670,4 +3686,4 @@ struct persistent_config_s { typedef struct persistent_config_s persistent_config_s; // end -// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Sep 07 14:17:13 UTC 2020 +// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Sep 07 14:49:25 UTC 2020 diff --git a/firmware/controllers/generated/fsio_enums_generated.def b/firmware/controllers/generated/fsio_enums_generated.def index 9477b9d25d..05f182ced3 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 Mon Sep 07 14:17:13 UTC 2020 +// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Sep 07 14:49:25 UTC 2020 // by class com.rusefi.output.FileFsioSettingsConsumer FSIO_SETTING_FANONTEMPERATURE = 1000, diff --git a/firmware/controllers/generated/fsio_getters.def b/firmware/controllers/generated/fsio_getters.def index e14cdd209c..f6e315da8d 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 Mon Sep 07 14:17:13 UTC 2020 +// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Sep 07 14:49:25 UTC 2020 // by class com.rusefi.output.FileFsioSettingsConsumer case FSIO_SETTING_FANONTEMPERATURE: diff --git a/firmware/controllers/generated/fsio_names.def b/firmware/controllers/generated/fsio_names.def index 08f7462d13..605f723c5d 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 Mon Sep 07 14:17:13 UTC 2020 +// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Sep 07 14:49:25 UTC 2020 // by class com.rusefi.output.FileFsioSettingsConsumer static LENameOrdinalPair lefanOnTemperature(FSIO_SETTING_FANONTEMPERATURE, "cfg_fanOnTemperature"); diff --git a/firmware/controllers/generated/fsio_strings.def b/firmware/controllers/generated/fsio_strings.def index c0af57525d..12227e6001 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 Mon Sep 07 14:17:13 UTC 2020 +// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Sep 07 14:49:25 UTC 2020 // by class com.rusefi.output.FileFsioSettingsConsumer case FSIO_SETTING_FANONTEMPERATURE: diff --git a/firmware/controllers/generated/rusefi_generated.h b/firmware/controllers/generated/rusefi_generated.h index d04575c083..4addf5004e 100644 --- a/firmware/controllers/generated/rusefi_generated.h +++ b/firmware/controllers/generated/rusefi_generated.h @@ -333,6 +333,10 @@ #define displayMode_offset 492 #define dizzySparkOutputPin_offset 2226 #define dizzySparkOutputPinMode_offset 2227 +#define drv8860_cs_offset 1201 +#define drv8860_csPinMode_offset 1202 +#define drv8860_miso_offset 1203 +#define drv8860spiDevice_offset 1200 #define DWELL_CURVE_SIZE 8 #define ego_sensor_e_auto_enum "ES_BPSX_D1", "ES_Innovate_MTX_L", "ES_14Point7_Free", "ES_NarrowBand", "ES_PLX", "ES_Custom", "ES_AEM" #define ego_sensor_e_enum "BPSX", "Innovate", "14Point7", "Narrow", "PLX", "Custom", "INVALID", "INVALID" @@ -1164,7 +1168,7 @@ #define showSdCardWarning_offset 76 #define SIGNATURE_BOARD all #define SIGNATURE_DATE 2020.09.07 -#define SIGNATURE_HASH 1681901319 +#define SIGNATURE_HASH 3195023341 #define silentTriggerError_offset 1464 #define slowAdcAlpha_offset 2088 #define sparkDwellRpmBins_offset 332 @@ -1474,7 +1478,7 @@ #define ts_show_spi true #define ts_show_trigger_comparator false #define ts_show_tunerstudio_port true -#define TS_SIGNATURE "rusEFI 2020.09.07.all.1681901319" +#define TS_SIGNATURE "rusEFI 2020.09.07.all.3195023341" #define TS_SINGLE_WRITE_COMMAND 'W' #define TS_SINGLE_WRITE_COMMAND_char W #define TS_TEST_COMMAND 't' // 0x74 @@ -1514,7 +1518,7 @@ #define unusedAt716_offset 716 #define unusedAt720_offset 720 #define unusedAt724_offset 724 -#define unusedAtOldBoardConfigurationEnd_offset 1200 +#define unusedAtOldBoardConfigurationEnd_offset 1204 #define unusedAuxVoltage1_TODO_332_offset 2713 #define unusedAuxVoltage2_TODO_332_offset 2714 #define unusedBit4_1476_offset 1476 @@ -1522,30 +1526,30 @@ #define unusedBit_285_30_offset 976 #define unusedBit_285_31_offset 976 #define unusedBit_34_31_offset 76 -#define unusedBit_478_10_offset 2116 -#define unusedBit_478_11_offset 2116 -#define unusedBit_478_12_offset 2116 -#define unusedBit_478_13_offset 2116 -#define unusedBit_478_14_offset 2116 -#define unusedBit_478_15_offset 2116 -#define unusedBit_478_16_offset 2116 -#define unusedBit_478_17_offset 2116 -#define unusedBit_478_18_offset 2116 -#define unusedBit_478_19_offset 2116 -#define unusedBit_478_20_offset 2116 -#define unusedBit_478_21_offset 2116 -#define unusedBit_478_22_offset 2116 -#define unusedBit_478_23_offset 2116 -#define unusedBit_478_24_offset 2116 -#define unusedBit_478_25_offset 2116 -#define unusedBit_478_26_offset 2116 -#define unusedBit_478_27_offset 2116 -#define unusedBit_478_28_offset 2116 -#define unusedBit_478_29_offset 2116 -#define unusedBit_478_30_offset 2116 -#define unusedBit_478_31_offset 2116 -#define unusedBit_478_8_offset 2116 -#define unusedBit_478_9_offset 2116 +#define unusedBit_482_10_offset 2116 +#define unusedBit_482_11_offset 2116 +#define unusedBit_482_12_offset 2116 +#define unusedBit_482_13_offset 2116 +#define unusedBit_482_14_offset 2116 +#define unusedBit_482_15_offset 2116 +#define unusedBit_482_16_offset 2116 +#define unusedBit_482_17_offset 2116 +#define unusedBit_482_18_offset 2116 +#define unusedBit_482_19_offset 2116 +#define unusedBit_482_20_offset 2116 +#define unusedBit_482_21_offset 2116 +#define unusedBit_482_22_offset 2116 +#define unusedBit_482_23_offset 2116 +#define unusedBit_482_24_offset 2116 +#define unusedBit_482_25_offset 2116 +#define unusedBit_482_26_offset 2116 +#define unusedBit_482_27_offset 2116 +#define unusedBit_482_28_offset 2116 +#define unusedBit_482_29_offset 2116 +#define unusedBit_482_30_offset 2116 +#define unusedBit_482_31_offset 2116 +#define unusedBit_482_8_offset 2116 +#define unusedBit_482_9_offset 2116 #define unusedFlexFuelSensor_offset 3100 #define unusedHereWeHave_offset 1464 #define unusedOldBiquad_offset 2332 diff --git a/firmware/controllers/generated/signature_all.h b/firmware/controllers/generated/signature_all.h index 8890d4c3fa..1fcd41b487 100644 --- a/firmware/controllers/generated/signature_all.h +++ b/firmware/controllers/generated/signature_all.h @@ -4,5 +4,5 @@ #define SIGNATURE_BOARD all #define SIGNATURE_DATE 2020.09.07 -#define SIGNATURE_HASH 1681901319 -#define TS_SIGNATURE "rusEFI 2020.09.07.all.1681901319" +#define SIGNATURE_HASH 3195023341 +#define TS_SIGNATURE "rusEFI 2020.09.07.all.3195023341" diff --git a/firmware/controllers/generated/signature_frankenso_na6.h b/firmware/controllers/generated/signature_frankenso_na6.h index 5fb717dabf..bea4c8595e 100644 --- a/firmware/controllers/generated/signature_frankenso_na6.h +++ b/firmware/controllers/generated/signature_frankenso_na6.h @@ -4,5 +4,5 @@ #define SIGNATURE_BOARD frankenso_na6 #define SIGNATURE_DATE 2020.09.07 -#define SIGNATURE_HASH 3282346300 -#define TS_SIGNATURE "rusEFI 2020.09.07.frankenso_na6.3282346300" +#define SIGNATURE_HASH 434850262 +#define TS_SIGNATURE "rusEFI 2020.09.07.frankenso_na6.434850262" diff --git a/firmware/controllers/generated/signature_kin.h b/firmware/controllers/generated/signature_kin.h index 8309d434bc..39c31f9900 100644 --- a/firmware/controllers/generated/signature_kin.h +++ b/firmware/controllers/generated/signature_kin.h @@ -4,5 +4,5 @@ #define SIGNATURE_BOARD kin #define SIGNATURE_DATE 2020.09.07 -#define SIGNATURE_HASH 2414148739 -#define TS_SIGNATURE "rusEFI 2020.09.07.kin.2414148739" +#define SIGNATURE_HASH 1437275241 +#define TS_SIGNATURE "rusEFI 2020.09.07.kin.1437275241" diff --git a/firmware/controllers/generated/signature_mre_f4.h b/firmware/controllers/generated/signature_mre_f4.h index f8d11b30ad..5beab913ae 100644 --- a/firmware/controllers/generated/signature_mre_f4.h +++ b/firmware/controllers/generated/signature_mre_f4.h @@ -4,5 +4,5 @@ #define SIGNATURE_BOARD mre_f4 #define SIGNATURE_DATE 2020.09.07 -#define SIGNATURE_HASH 1977246637 -#define TS_SIGNATURE "rusEFI 2020.09.07.mre_f4.1977246637" +#define SIGNATURE_HASH 2945813319 +#define TS_SIGNATURE "rusEFI 2020.09.07.mre_f4.2945813319" diff --git a/firmware/controllers/generated/signature_mre_f7.h b/firmware/controllers/generated/signature_mre_f7.h index 211a446a36..af1d21a422 100644 --- a/firmware/controllers/generated/signature_mre_f7.h +++ b/firmware/controllers/generated/signature_mre_f7.h @@ -4,5 +4,5 @@ #define SIGNATURE_BOARD mre_f7 #define SIGNATURE_DATE 2020.09.07 -#define SIGNATURE_HASH 1977246637 -#define TS_SIGNATURE "rusEFI 2020.09.07.mre_f7.1977246637" +#define SIGNATURE_HASH 2945813319 +#define TS_SIGNATURE "rusEFI 2020.09.07.mre_f7.2945813319" diff --git a/firmware/controllers/generated/signature_prometheus_405.h b/firmware/controllers/generated/signature_prometheus_405.h index 3e33281745..114dde53ae 100644 --- a/firmware/controllers/generated/signature_prometheus_405.h +++ b/firmware/controllers/generated/signature_prometheus_405.h @@ -4,5 +4,5 @@ #define SIGNATURE_BOARD prometheus_405 #define SIGNATURE_DATE 2020.09.07 -#define SIGNATURE_HASH 3507498612 -#define TS_SIGNATURE "rusEFI 2020.09.07.prometheus_405.3507498612" +#define SIGNATURE_HASH 190826142 +#define TS_SIGNATURE "rusEFI 2020.09.07.prometheus_405.190826142" diff --git a/firmware/controllers/generated/signature_prometheus_469.h b/firmware/controllers/generated/signature_prometheus_469.h index 52d66dda46..a42cce2d69 100644 --- a/firmware/controllers/generated/signature_prometheus_469.h +++ b/firmware/controllers/generated/signature_prometheus_469.h @@ -4,5 +4,5 @@ #define SIGNATURE_BOARD prometheus_469 #define SIGNATURE_DATE 2020.09.07 -#define SIGNATURE_HASH 3507498612 -#define TS_SIGNATURE "rusEFI 2020.09.07.prometheus_469.3507498612" +#define SIGNATURE_HASH 190826142 +#define TS_SIGNATURE "rusEFI 2020.09.07.prometheus_469.190826142" diff --git a/firmware/controllers/generated/signature_proteus_f4.h b/firmware/controllers/generated/signature_proteus_f4.h index d5cac04f42..4b8b6cae96 100644 --- a/firmware/controllers/generated/signature_proteus_f4.h +++ b/firmware/controllers/generated/signature_proteus_f4.h @@ -4,5 +4,5 @@ #define SIGNATURE_BOARD proteus_f4 #define SIGNATURE_DATE 2020.09.07 -#define SIGNATURE_HASH 2280528919 -#define TS_SIGNATURE "rusEFI 2020.09.07.proteus_f4.2280528919" +#define SIGNATURE_HASH 1570895101 +#define TS_SIGNATURE "rusEFI 2020.09.07.proteus_f4.1570895101" diff --git a/firmware/controllers/generated/signature_proteus_f7.h b/firmware/controllers/generated/signature_proteus_f7.h index 74528c93a5..0bc45f4f3d 100644 --- a/firmware/controllers/generated/signature_proteus_f7.h +++ b/firmware/controllers/generated/signature_proteus_f7.h @@ -4,5 +4,5 @@ #define SIGNATURE_BOARD proteus_f7 #define SIGNATURE_DATE 2020.09.07 -#define SIGNATURE_HASH 2280528919 -#define TS_SIGNATURE "rusEFI 2020.09.07.proteus_f7.2280528919" +#define SIGNATURE_HASH 1570895101 +#define TS_SIGNATURE "rusEFI 2020.09.07.proteus_f7.1570895101" diff --git a/firmware/tunerstudio/generated/cache.zip b/firmware/tunerstudio/generated/cache.zip index f560afe64caf9d951d49f6d8de9bce96ad3739f4..30901f7d273d8d84d4a99bbe33012e385e8a3e9a 100644 GIT binary patch delta 253939 zcmV)GK)%1tgEiZQHGqTxgaU*Ev;;T?5iNEnQ7t8F?aFKb0DFA_03DY>a|9NbP&5q; ze+>W!c1TuVc1TuVc1TuV?0tE6B1w|x->FX#MZccRoYcV~bR^r`3JythAz%PWSzT2d zFMvQqClE|TpriKfcV9c)J=}u;q0Fk?o_Sp}ogyOqFu%;r&CPzc_k$Hr{m7d5GtU}( z6Mx}F@W!(yK{$6~E0|c}Dr!u8Yw3lNe;>u(BDO}sV&XrnLO1qms(Q3I2fS@V-o(E8pKjKzAO|j>UTA^jD*%)dbdLk_lh&>XlVr#exDd}kHE*_Xd zNZI#1%bi65b~%&~)^TkgVozgnzd2;W;nA7(>n@uTI#H2AQJR_+Ws1Lw%m)yu0I@N#n80nQqV{94tsbswVtp~F|`LHR6YJeL{)-G|e3 z?2TqH9bs%ET(2)n&%zO@h(#yn5H;SVHIuvOTweAYgNvMKg!@ zG?(yL8wH#>*|MTwMr2s-2)9PdkN1%?LB^k(H{DKeV7CXqTHd1<0@w0^ z#|`>U=XTJ&9XS2w-y2vmGyAbMcY)(YuzUn-3O!uEn4#aiYTJX`UPJY{9OhJM#j`V$ zYGS`o95K;wf6mn7uP0y`)TIO5Q2Ml?;I5_(I&RdKO~%UF;cP%}e-#YftnX6g_vxH1b%cDGLe7Emg-p6uVlE zalfNp1@22DCrVg_ALG{8P!&&_G7bs0CjtvL8sPf zIRpF3%2^k=Bwb@rb*fDp3cl^#HDnXDf(E_j)m5X%T=*pK6yam$x6+AIu+FuNozCFe zf9cw_9~-hsI6<<%Gvi8qBiaQ;7Z+>kFE0K)^_FUZom1-tV88w5pkdNc*2q{(LZp;4 zzMJG^<|C4_E7i%mvAZzhS1>$O*_rX-zS*vK?&TNtscF}oZnN&(+_na5AKP}X2YISE zOYfWY2LFONAeQD@h8h&YBTiomC&`zdf8D0Jib9=GqV7dG%E$=wd;3wySAwe znLi_yHp8LEn{AK)I?etTVg}8d?WEkLGAEO*cI)6;fePyD3keqpzbqy%?b|O-y?NCf z*e&PIZeh{sBuzWr!|Kyr6}~mwe`_E!*g#bMzR_xJ_?F%8NzGSnr`54#TePvoe=mb> zKl?+kdy{-fz7Ux>g}TkQ{9e>EHaCB5TtOdP+wFFvr8-tM5W271Ntm5{e|_)V*k52u z)S!#%jW1T=bdBHio3ILO?7XDf(poBJrdcU~)i!IybAS3fBs57(NFmNFng3d!;T-6y z8KceDyT*011{1E?zU=Vel(czqe|ZZv8GUVhF$XT$K{}oOK+ATP`l4k^K6M*)n4g0V zjd^;O^aq#F`83Jax0|+8Z(Q2QX{vU=VdbA`&x1`*+uWa@pNYZYM1<9r4NFeP4 zb{2H&5_%Rz#)UV-gD^_Tf22=BnF^DzEMvJ5v|u(%rUTT++ef$8==V|1E9JAkHhQ%N z@75V#2aOv@z+&QB3cFr65*%lhaMOo+vp(3DJyS%`KH+Yu_hs@)^y;RZH+COH`c~&2 z5+p1F7DU!y6*U$C3u=23gK(#Id8OAtyklTjfe)PN%Z_;p@$EBhf2nG(3n#|Pr!O~+ z!F8wZ&~G?E4}cmgH-Q6)1Ls{_Ub)Tbi3pLJ7U7n(x)>_5xC?g{JUFD-+LBZ5hI-bq z|KP{&Oy)IuAOC09fd2^kOc_Xifr+Gj!979p>UO7XZmLzghs?UyTazDd>`P#0wN9P3 zOx~x<8XvzLfRHq>e|rPxy3?v>OAuNjD9Zln)l`jkuUWfJ?a)HqFj;vs9ttOZcMKAv zxhGs)Jd0NeSHHMm&Fj8pS(l|E{?U{vyOr?ker}HXD*CU$fAiuI_z(U9!I*y(C9RL1 zq}2LoZP=a}$bWQaD{uSw7t4a!{02fN zrJ|U!yV9CD2YwG)VGmiGt?@E)=zrSc%HTFsXXg9ubib*nZ)k;@9z!<_oKX;l#^N(s z9MznDwVnPQe+mGqNe7}YzalR_MVviTrZa?cU#HpYZro*0GSk2x+O0;*jW)hvo8Vu60SO z2x?Bc#-vNq*EqZ8|8?KWjaTuD&Q@r0<(0lRiYKu%f&+^)nmjns-a9zIodM^YyU+G` zT&ZBMe~?&UDSnEbg{-NJNkSCFA_0y$78UlXTSswWqDBgmLP z6tv=BCbzifEyfO0Y*HR^fr5hOc;@xI2Vj!D<-GE#>do*{9u?`(Q~Pv+^dX5AQX16D z!-?1jnse}-Xx?%@&D=-|MYWOS4N^LfUKp+xf33hB8-%dp+nT|9CMe*9>oh@!U@9c5 zu%A(NvAkBTzvu=}UdWZ&c$=`H(j_L#s`BlXjy-ogbQe(JJziUkW!6UkO{hmrQ4WQJcla$l(n=+Bnet zNYWIt1MulK7i!7XlBut=$^)?hF>5!+%$|fsMbu+v1=N4zN)AMDF5hfLL9~J@DH!vR z3fHE>?^ie(6s?wZZ|1&KKG7dIBH%qQe|<^ruW9ZLy-5(_A9!Lr8=NR(v6n}E->Xhnhh%F036(G6K)ixR58 zocT}{X+>+T!9L!~?4$n4g3|WsF4=!%yEW)occzN9ma7@i^5l=>>7hQkf2=gmF3O2j z*pnk4;+9Xl3M>FN7eJNv%%A(vT4Jwk_Jv;>wOgo$Z5op5snKYeAUtQe|}s9qp$b_yP$AFG|ylTg~7rffdml-aXh0%*Le0ue=Fz|{9W}HFv~P<)Krobtf@Pj zke%Sw--#d}t%BNB>P9wMmMN-11T*75R{rR#Mg1h_)`|Raf2tai)cjgAm=C8Y)f+K) zBjCF*JKYCuA;VbE;Lo1i7n&z+G*!#m56t|EoZGb>fsOkzszYjiuxz#;o(F8)*1Q3R z1pgN4-x8aoHE+)8B1~H5ka4TktlcU*GM8@hYEyscclsbU(;b<*7%N!+W)=A^QdofF zS-@SQ*vvCre;OBAt}MhFhcKccvubI!HI3tC^!e!M!H=h_;UO&IBavMGJ*ZQ*=x8_# zhDXq9U{pu`Vsr#2OQ_M|QV*xZt`|TLb57iPM1^pYP=uF&@MCH8JA|1fEXJZ}<*Bw) zTZ4rsv!P5x2U$9Z$QILWplEXB!7yj98@T_c{Y)g}#o!v&E z@Wz^~)YADQAO47^|NjsFYSk`JN<*LKe%2L1QKcA9hk#<8Gg6Ee=dTjg|JzM!&a=U=~2?f4OH0VfKdGs ztU~FzGO~sNoFWo>G;*nqFJHdk$LPtAN7J>hKmGI*Iv|)Ep0?HTf0-K|Y&ChgmNWOe zu6>+*e|5iuBJ|=4Tpj!>ia~{+rR3*v@{{+wZZ*kXEhImS$ ze^sIg{}#mGqWCLHDu|*ATvm;f*En^J6W2Ixjg!{O>$_IB#IWaivl*(FzY$(3Ddl~H|Hl;w(YTv3KAN`FPkuc*E&s_%;GyQ2E8 z&N-LJ%(=O~E3WT~>$@_S5ETndf6Y_Eo6iTv$v_mf&dhf!alEmCxs?XSwi`7lrhTV){iX z{USwRAw^+9ka$xomCjF#vhnht>RB~jf4wNAUlh|X zO6eCV0t+b$*BYOqv2d1pK2P;dKJ}dLJzDOXlOT`B*j|Pt3fTd>0?hvd+&7NcOFE3*I!gpZ~Z7(e;bXy(o5Z*e@8Wz&A`Rwv1;p} zOZG3qa-_zsZrbz*O|-~Dhu%rEB=utbGRd?!S5<9+1Y-MzEYh@&F+T6TGo~^8Tlv)Y zaOxmJh)-I3G_1ml@b3K$It~YmgJ3cd)Bmud*$=Pcm*%8_#=MnJ%?T>@*|PToLzY== z+_rCd@#rIiZpBcMe>WC3Xk^@{@OEJ6V$Y>J283uMqb|gvA=EOw9zXnL!8T%3>AMRx zxD!v5gA_ka-557E=dl>=z_NL)fJL-i!e+Uak4y=7t9uevr^ zkl}9~dKkKPp=XB9TZN4Nl3b$*+!@hRNzb~8`7n;ww)RrBlL=Wf?^rK<*;Mf`F^b+& z@!q@iTt^dj``M3VXY*CmjO^T=xm)G*OeTglC*7IzaF>`& zO!{~EA%gfsXd@yGPZ7y$t6@^bOw}d?rRdQdKZsxi?IL1|ZCYNSWlsEMs zrWpm|>o=FUWi8;J%AVO()2AB$uI$NG4GY6yHg8}w8IBF;#GmR#>tY!C-UL5cE^KNp zdDNH~Y1A=4oA5}#A_m=Z28nHS=oFl08_O!3ED3Yw;w}YNGU<{@1X?ZmlJ28vIdHZL z`*^Msa3H-q#b3RC4b~|k;ND-1gO`yW2pxX}X*Cx4l36iOAB4FD^DMDc(BrA*6e=;n zqiFmNxK+)Yjrg(tkPP*PK~+D@xD@Sx7;911m|Ef;}fo%E3OM zm$6n#L5WGJQi{JDEyZu9C1V(qMO}k2%vkE9Rru&7xU6v4U1tzH{FU^e!jl@+ERU7O zz^QlYR}F{6x5D{(S%dC@kC&ZZ-LZfB-6p~yt$ny`Hu?iw!vd2Zn(Y>X(VbYQ`lnv! zuF-Su&U6GInWNFKb$SEmYG4(N;;J|IPNQ@T0=E9PZ`ZE-R`FbacX#jDRU1*nw3jve z#_n~jQaN4b&1uQG)RC9WoePh6xE`2eELcm)br)jtYJkQ&&DmZ z&FHvV6MD1Jb_Tblzd^godkKG1hX6NCor+Qpd=`qxC+xzfr+3^{97s9YEQy~6C|RO+ z#OI?UfqIJ05l{YC{|KZI@A+^!UH&!p8%fX!Nq^6Z?ec3}7I`OK% zAT0jgaz2;>vqv2Aif|K)_>(|QA9~8`S=SH1p;WISqqyxpaizTO6DNN;8v7vvb5dTr z@b8oG_JjYY4NxYcZxSn?e9hFhB~(NLN_gsz;Mi}CMn`iW#In(9=#Q)s>`XqeMM#al z9q?rpL#I{QyYUIp7#@xy>o4deT`ZrUpPro+tbeyY%!WtP@Z&Fw%#U2f$0OJQ%1M%Z z0r=zj={cq0B$eD~Uc!GL*ga|Jntg)WV6Y8XGAxm9Lbd$W8oF`Zavy3z7?P+9qvA|p zt9Ddx&fEv9Wna;NnQtY!8+@(kJKNfbX&MWKr}GBFDs$B5q38I}i=RAik&GfKq|wKP z5d{!tfIMv?%`bEVDdhy($I!wi(@0eVZxO@Zk1m67MYLSH!g2fTaacSmBu8ZRj? zz3`)3x9&gsV{csf)D(;A*0!ivsjYjGAl5gvTkFwx6KQlzS;N0tw=TgtJOl)7VU-R` zkA%oTzEgN~cjte@v1|R$(!S*%5~TNwHS-_`0ueGRIX*rt{IVcC3GaCs2q5(dh9Q8n z5Y39h>9h6V;<|aT`wxPn9N3qt-A%B8%Oc|>Pa3)<*QIEE;gdz?mas<}TNBcozp#z>S*3k2cVp>{;g zq;MyUok0E1%SL{VL1{ zt7pM<2nm09JyF3!gH{jIeVJZF6QSrE3a_4tg>J9;BbfEDUPa%Mg^=POxPlRm-DO8^ zNKC*7K0=-1se_Lyq9}Q@sC>4k?&xbper+-~4QyVrGG3EI7y{T7@Mfkfb{4w1pw6KU zC-fdxGxE_^acU?U$)h`3t>(}T3to3K^3D~`yA6L@v16_To>8s9?z_eppvVXAX}kks zdn-q@ZPV1A8O;kYhL!a{E3MevSzL zg1~>atfjy;DZ<-`a4-th9`98|G#@Cj;1q0im|>X(vA__20wff6bI+1c;IL6FDG5a< z(S5F5t_Y@A5lC;Pk}-m;6fp(eFzMZ))rP5Y#~8Xl>_#7y_XhfO0_l#ePPb>U1_nXU zA{h!{8R)`oEI)mwD=^g#>(6w(wm{!lgcW~gAOsMyU|ri3%ODa?uL_0$k%AFnEnPBt z+(HHf=z2%|B; zQy+ng;=0fp-b8OueMw{*aa&AK0vc0*vTjKbo)9|~5L}e1PB0%bA@Z-$(!PrlA&LPKO&ZqiI1H8_5eu63GIusYh6>vz z!6HyN4_K(t)Sbk?z?tU(L<2ZtA)`gWYQdpJ*pG+u%7mdm%%3o z7Jqet1uXmY`IiN~^6`x=)x(03LpdqE&1e=^geSKLUo5ej%(iaXVEVU90?2dP29e4U%`C_ zc{%Sjm7IV*7uVC+Jo*RE{7QNG72!;(AeQh=C@cz3o7(i%LMS!D<{=w~(aQ{v^hIGc z!0pSrjXY%+K)7*;xqe`Mg|=w9<(EnhKBNg^B_zU%@-ZzP@!(fzq#J%EZqO4q%$AN=6KclI2s(`>m`E%cjYv?GY7hP0 zJ_k*TVQwJ{5u3Ffq=>+BD!JAc=CP)~l{zC;2=EXn1+iz>P)E{t>c%xSR0oM*=Re-J z%KO&IzID29o$Xua`-I?DfbWH3_QkegJ+wwgs(CU9&&0>A!U@7LVr*b^$c|G$y@vSd zl$?K}a||y^^2M100-tl@l$}$j2p`Jw1EhnOC3tm`Ks9T{XF{-~@0y_z9gLzNsKrJV z4oU~d2Sxr_gr6n(79RL#86HlO$1_X>FUkj}dcLyE38irs@s0if{UvIFd@EC*VJTFa zs=7=?oInw$2WR~1gy<H_tQ4inPv*px1Xq$F3DaE)}^A?+-qOKcH6PxJ9^}_J*ZO6Q6=RK6rT5i84t5gLr84Go{fx2{Q*6 z{|0XYBx^z8%!hI0X(aGv@rXgnD~{pI8ZlMKp%_4KoYRRh>H)^|5C$MeLC;HFQu39J zF4k&5k&6nX`MD5L8HMUMH;{ko$sty5dGi%t)aN8rp*b4X7hM7I6x>5rB3q6Bp1^iz zm5X}aVaU->3L24sqsHFIC;MAv+^JOiG{aDJ`5vYW9doss6;a(O;!?sviiPjbsCj+z zxRq#rE80tI+{f6_GUhJ_3R+^c<0tp!uUV&vgfS{>8-)?i+)_4Gt|)&#n25uyvcq}(jb_NDFMuc-8gTFlPV7y8UDEhdV(#LjEdJ*B(Kn-^l3FFO4MnU=-u4JgVKp; zmil4HohqupMy$I`W~EL8#OT$`q*uhh^b-QvXToHJeKHRHA>uSfz`Rm5%V*{UMjbe- zuv=CX5E?~tF2~c5I-`FVsBnImL5;-+rlA-hnvd$RLSSxqsxj91hgzpg@wB0@XKwiM zFx4QzXH;h7NN_qP%;Tqkk0{o1wtAq2jjxmxz0U`E%qrt=V`|nCj{`Osd%@V84`N=^ zI^js5_%h(tyJd?L=kT~V?1Y`fQaOVtpIYCu+ZqLlkPds<(oL1cFOyx&n z3aDB_&LsG+*|vQ|g^VGm$bdB&C5Q;G+;!MZY@z;v?zW^!IWT$-k{0QOeLPIYgIa*J zGFK7%o-%vSpiF<8x-g;MQvu@Bdtq4bAL3=U7!mPJI6KgMV2Nh3nsG4Sd@Qj`IqB#@-O~($B?yx4*s6JGL}q;$)N3E<%7$Tq@v18p zAhhIc0c`NcMexM1;)Ljk#S!EpHcZEc5?w~R5Z>-FEvtV4J&?>jTvZs2xLy;?m8o__ zg$}QQT@-?Pd=b5nrE$wZNN9{E?5Eg-<=~aje7#clCgx z0E%9M6!r;vy@?$9D%mZC)rpQ=K5-YF#UKd^0O!phAme5DLT)YxxO|fYco)G(#(iNy z8yOa~yC{tEn<$w~ULj>N`Tc2;{UY?gbUeffAjV&x;2{&mL`GaB*15@cjpu%N?$11L*_B}XHM>1T_BJIg zHDmC@8qv&Pc2qPf57eaq3g1=aE1HVN+%cXUgRguee}SU@$ejz_$J*!Ax1#vAo-TTs z&k5{W!ogb~)Y(emi+|j#novEx);xDU^dDAmI_$_VEG4|}BgC&@`B5SW%?a`xIpc)( zig@;NXx*SdjymT90ZS;ep<%&Gf;}izK&TQwv|eeVfIM7=Ao+_j@RKX#2pOOixQN2E z=7SQSe++7g4_p>Tsm z1utmE-g8R-mJU{7s^G5c)M$!E@I3`gJ^x`Ef4{YawB>c$B%s3PKr-`h2X@q z@X%6+YP!bm3bUW2jFf*8?c-Vv#xA}LgOL}p)jx7e0JJy8G_ehn zj?fXGjMY_e0K0t1Mx1)sSch5%RghXz+60V2N(V6wtqNgjUHS-$-U_0q@+p5<;HEtU z!C1FXTZzC>&zqGf6qzP3_nkzUE#uS(f7($^94D^OZ(9*o1zP@_he6eZS+Eq>)2=Eq zcm@?sGn+ zv95*UW`J!^is^wI0BKJok=EV4UZ-ATANA6t1;=(cMTe1Ya&13~K%DJ{h_{b!GH@+x33oy*wE&kXCq_Jd}>*4;orw1$z34I^l01hGJ~j5#5MAyhD^ zTwneMGj{aCGYaZ#+W+Bn&yw-^ds)=W5juL_!hg1ok7Y&td~%Xh%`N}Ye<~DtG%@R` zm_|j7^#0u!@wseBx`{@|SPZ+x|HxQC7Z-c)Qbom5VAkIwXM2ZM7^ooT@PjvAXW`Y| zmwaW@mxA~LytxCtO53Qp;{{9Nx29@L9-D=Ut<+6OE{tdeDC#XZhMbr_gCKTiv=aF8 zyprQX>PAkAKgy|7mR4S$f2ZO1mZ;yQt}#*ZB9Yq=69rb9KhgkJHpM~7!9kQJOt)DO ze~aR8N&Gbg$Lyc5QyP^D+noN=uhXkFw=^^`aVWrd+E2FdhP1`Cv~zc2Y|p};Yrn64j@L-TRVxjD5w|Pj2Es~r>vb8Ots`#mUkY5(0S|nQ})NAJIYc9^l?q1L( z<~6kTpKJCFN4D>;h4*vkq+A2BrRL7b3{VJR=A!j{(*Kc;h>lczE3>4lCBvSR*0x;K zP#`cDWxMS!Mzht}f78ygcy03@4K>~H<-Ozq`*>sEr%AwS@7&NQtvQ9BlKM#uwwBxi zj6^%|zGu*>cdS31oItNAq=ZQ*r)jjs({_`itpoZ0DV%NX%ih~2{U7LT`(|1azKJVe z9}*m&z0@H@it*j-!&gNMWu_#4wl`KHKOg5t(g++GP-dxoe{e|3rdcPQLG;|4t;^TX z4$EZ(8>|6t1@#gz;V1%Dxef`IeD3-Sarnf9%c-G;LyN$Zd%Y7#C@UIZObqiuSR^qOxYm~q}TLC>C$1SA_2%oesdo+Zo+e* z@69It*q1gY)`tZfpG1gvvUH<}{0V4_mg5VB$QYT@k}a#3QZB*9#Q&KcOfgbnx7kih z35h8Qe_Ao8b6&NZ8#4;IhVx}DCcS80O<9SOVniB!6$tI16Gj_8(9F;JFdiOn$TA+5 zH-0(U_~kTR(Ze!w!e@M_tbd5*2ZIBlfZJWom&}~j`$GFJHU=~Q+?`EU3+hrd;24Qn z2l5^10%Zhq)THk7ywh@!Z4_nU6o(c^RkVgPe}C~cB3m!qIEHX;I?SSOL+u+!cH(M- zYW9Q6{5fmi11S<-)q^KWLc7?=4I?&0apgW22eLVyPh2{xLFyyl8Oz9m-Fc|8|+>< zN7}j5*vBw(sZcidUlt>DtT776YJGBut@BsQ_^g=r@C9~t^y$D*#gWEYN6-@~Akq;d z8gG!wlF!N5Wk9*@7VNa3AM$4$+xpUte`53az6Kk!dd5U7R}~x$Mdp@GQlS5PUIg;n zX!>t;RKW*J3Q|fZwalxK;%iqSLi`nXA(^`O;w!rMR}0xi7T-nAr?vKr$hw2Xu0$er z(b1SMbSe_VAy zj92)ocoRf&JB5fvn_c7x+C>FgXFmZmT#;n;$6ZlmDIW&C=G9fB#|nrnAwkGUq=yg! z#`@Y5nyXs0VY`Uk(Uc?Ai&KyvrF_+ewC1t3AqPmu3jk?g`a&Qknl$#?Z!ct|sEW

$`zK&^9pM?FffmZj@@zb&Wro`)hCoL^0Ac3HunG22jph|amagQwUO3|D>FU5xESDK- zR@i71{}>|;Dt@)V4Zx013nxNl6Dd*-iplB4OkB*rCGqjr#0=O*S7R71e;m%0tFaHK zVuV#7BOk#n(Oq;fXelN5&|Qtu+za}!+KskyjeJU~7ydiJoX+YnSY#tt`Sdrbx=Sqg zI7Tyj`^N59GKoY_{}Fktk!9)v{nH$Y>5sNm0YctQ@yR}znGAc7>q(nw2_>k z-@LhP*@$MdnHv}Tk0L*#Nf_^@dpWK zGu-}Rd82TE;5P#0fKFBnD9e#ChwkXBa7-0tiD>fD#u(3pf)XgrTWI3&#dbZIb)f8l9GljUtN?o<@| zkHbC_V+X~zLe|S7UmB&}mgHLoP?4Y9R) z4@te17(hyhSGQWcPP;)EC$CsP#E2<|Ta*A{Ap>Ufs!JV9IIlGiC@{d70lM)M3{3j7 z46Ke;$g>$6Junrbf7_6f0(rIJ6_ccIu=Gd5v1%+Oeg4uKjr*g}^A_TjfGrZpEfu|N z(IYk7g5ca}xA8^}1U8I(z9RjDka}?)TsCnXf`A=>oF&1MU?Wml60{`!E!Rhu^hwVX zl8We8vH&4i16p^<8B17%u%#C3r^xXGmOowugq8-8t{JODeLO8)f3nV83u@&Uf2QM=p7bwhiZ`>tb zr#2TIv`k}X2PzoF`w1D-D8CF~RKT|*&Mzhq0dRFeZb3{01cie00Qw2(>&6QOP7N&Y z+of#rr~Vw$f8kxMM3*4muX8vmsWXwl7F~we=%O&i<&OfFjN$19ZxySejkO|rGfF$9 zu@FH{87!3fWNS`-_^U-Sp2GZ|Tz;sC$R(E%Y4A)|%}I0t;_2)Id#Kh!(;boPA>w%m znp0E?lXxTtkB;clu@oLyO}i%jlLT=%msmK86tF|+f1$i7+cJdhmOYrL8MuMLG{%H- zU}xz2DZQ20L;hik){^uGH5_DrPE+1q#lZo}U&x9CZkB9XJAgR_-5ZG`b=||GZo=0v z3p-47{jp$`;v>m5r^m-bIm=Ug`k3D?aa}gzp~#$g?$X$09MhPo;keXm%=-8ZX;eMx z{lk=xe}(qRY7DAJGGoe&E24lF%7hj~Pj>86ZbZ{W@)cb~7kUOzlN}H0HPt^*+k}Ct zRQongj6u~RktxR6Nd6{BBZ8|*CyIo}&jSW^5U5syvH79IS;VZ87s1cw0{Ar@UuHN? z{z&K1wm1KR`;&(-_wUp1RMhZN5m7K87y5zjf3u$>?Nel1=PuZ-gMhNU2XTW-{-~(C zAh`&H3v`jpJleH7SIwGZx9!$Xe+S8>c5S!YjaFJ_Atqu27kv563pXC{^ixuXj!HlO zWq)ce;_G0>_dXlXk4YkVRQtgymrl-3^XCNwT`2yq;`u>gU${Q~r%y?=-h1_!hS*-2 zXEa#q1o83aQ<|v{9bK|c_ETpmYUsIRpLSCCB0Q_`Y6B|B)RT$=MAv5t!I%AJ2jriVTk~OesS|o6p@49bf5RyW*OwWj=;y}OVAE8VicHcFCiagj*c5lN z?9r8ew{~w(kUxs@M+t3qBu*Er2h`#CQ@@V8z!+B)0piQ^F@iCGxa6~vE!qe(rH*I$ z)Qn=jf0lpcoV=#9)$y0suTn{vpfz3BE-JHbRM(Tz9O;NFYIQj+V64<(fb;RSe?%fO zxHHrqyhy03l*)zrsIT1;lly`&%tJO!Rr1|8N}prGp*&DPusCxqN6tUfw zQ3A1{L#(ZrRuBhwtw14EN_i65e+-^HqE|{%UX6PACRDyEeFrit3BRXbC+GLKf?B+X`wkA%VH)46C|q+Bb};wm@NlFR37WHurdV_3;CW!n@q&=Z<+#xMb4 z;f#Rz5}hR~@AT_tT4uD^53Fc`&iGOxBQ{h#^bnfmn9zh^|0XwQj=Kede`BW3(yTg5 zpX!b@m1PzyH}~o!j@;N8qa8S6hPk2e4AYpP#+qKW?2rgXxZPn)CG>5Bkt(Xft=qzh z$z$bzZ!sWwm#W~^%_K1qNVWhfLkNhD-T~HSdLMZAE_a7$Bn-6mE=3w6cfI2a1*6bc z>5@q+i2=mie+Ws^3{*ruf9v0H-y0&YWN)gaPqPk3HWjW9J{7V<_R*K@uzm1FhVDy$ zD5}CTK5Z(kxT&<#M$$^Eu=P)wrH#gOdHsN9AMVhqK^LK0H>@s&l4-$QU(F=IoH*Gl zC!Svx#NXMi4GsfTOcQe9Q6CpD=Qb<;NAQ9enqS#@dz~=(-Ogx@fBaV6oUOL`Q=LDV zq6>Px!#;NlFXcsT;-DdIzR>qXIcP{9H^EZKcAmp8qT!5Pt2J6=jNcg8%~qpsu`@i~ zbix_-Iqmb14!&sCxhVvI0y)Yc@#11HRfy(7!w!r>ohuq|v1-N=M?+c{S})Aqi5a0v zbi^YW@;_389!Z>ge=MnHtYzBL5{|E#T@6P3+IzQN+FV*vlRIoeY^~QEG;4Ot>Gm3z z%`a9?zQ`f?9ICQsBxxl3%_#H<(^W`9lUQK3&f#3+J^+JIksErwPS2^{US5*U`tJ=4 zg9pTk77LLL#G*+6{P5!9u5sP0wHi*dec7S(7Z>Q%NeU6We_v}h^=`;ao)k_bIf5iA zeT|y!rDr5pg#*#(4+$r9Dj8^yEVtEYUk$FemzJ5vli_%P7w;r|MueWBnVINN8QK@`d-sLfj}X&;5DA+BN`&jf0@buo2;Ldc?V_gq6fXPe zE2ITo<$SY$ zSVXJ2*BJ_q8Of7dh)s=Ovul z_N7xoQT>uWczU|xj_FD}raRs-U3tfUbSFEeJKZte*^cSXcT88v@0xJe5h-jNl6bT- zZlqZkSM_73SS~olbJP#9JHgMe8qy*Id}#)IjO1z@;D^YAHN(|UguC{D%U#|~NF`X- z0Y8Saw_ZAg6x!BZJvDQu98%uN*l#a;K7JPpNL%Nh{o+#E3 zTkEJAwyUb;;4PzFblW2Ex50DksJGpc3C?{WQ6nBW{Mmndb?ZTE<Dwv@uF<^$S=k;X1vc zJn`6e=jj5kvCGJA1m1Qy%oaI9{<63eP-^5^Hgy#w>cam|&54fOprx>VxRt8ZRpy{} z>-0OVM!SF0TvHH$tl-FtC_K@dP7>kc?A=9BA5r%w{NU~`!QCB#y9amI1or^J8g~os z?hxEv0>NE_I|L`V4*z%Rse0yJ&1%^E7I$;L)tm0FTU}k}p3l;fj8A+#)GIZ*t&^j) z;8(-G^q`!yhTg_@p=`p}vQZPhI!7#9a%)~ac~jQ49t{nH2h6U`yprZ+i62Z~^gVOk z&h**Mewc39CgnS?Vd50bvj@RToYOjp7-L?2-;ds$Uj~nd>lH z!0EeFWWKWecrdub#f)6ozx+0p;r9K$)2x$u@b>rKW1g4c+KgecguE|uTq*gSZp=1AT zyOgBNjk5IPh; zY>}-!ly{CE+y#(PV|LX81t{}Moba6E*GBt4NF}$fw)4x-`!%)(b_@=hgcinPpdwB8 zcr!3$#T_8=Q?@bevr4J?k*Q2e|A~AM?xB~R5abB^ooTlzkeh{$A!#G{u>}JKSso*1 zGV*qpYh=Sq2Q^X+Yfz86JhnnA-T{-=6@Ta)+0p}RWeOk`vGgx2m?_C4D6mYRy5U63 zY?rm!{A5wvEPg>HJ>|BM%mpeeK z?DE%NE1%)NaAq6R(Fv8`6fFSMzgG zG80Sx@||!Sf!K^(PHi;A!S$b!sc41D4LXkUkD&x1R5Vg)cO=Pt^%UHhTY*Sce9x_n z%3ey<1+2V@1Aiy@D^Dgc9?~;MGOGq2lmK94llGOn6mCzbry=HP+wZ` z6nar1p3OWehDHfT8eBr1iZ4IzO(W?`ym8jJrVah|qAAY1P}9u3u+ajPCdv=EpFbvH zw#JUaY8meyVh&mINw1Kp`e@&>bQH`rw|s~bX<0Vsx9Fh^@EwwvKoIi@Cf0XUij@(y z{Cf^i2^67c_*-Tw8YL?F-%2A2|MQ_W$%+~0Lcr7A<}%@i+F)?fHH7?<16?!9BPwgM z3a^VQit|#7T1+z-?fOtXKdHc(1}(zyn+cusuM_Mj-HNf_b@&j@cQe&yUk_IB{ zC!@3jcXd>UN>jPg(Yh&u-R!`v0peH)@MQdw$8@jE{U`?SJ^kee}nDyyKo9I3BOHZ;t+rE);s*9QmKNpHcD_0-dkv z$y}oVmcP%KFtPZfE=T)jbwc)J3O;jh!HHO8mTyK1uL_HGw3dw4dHJrq$Fdn8`?S^h z>JJYE(Za71lN=U83uF2HpAnQ}{vx3?`pRW=luFa8Bw;#c)uYlfFx8>kq7615gZqo& zww;-F+oH9=adiZ2^QZUZh_fn)0#ktrVDO~*_}X!qF_9GjRW=ll8%bF9b4{cVhMKS@N)c7Z zWYT$<13MH5M3`KYg_qpeeOMN3kr02=P~3!lg*Y9^qN4+Yc<$L?MdDe}fVi;BfIT(V zvL0GjHcKc)8{sBfc;nC=Ctmb&tARH?5S6#TLgCn8ru^4Q_T zWPq+7q))WX!Vgl5MUHCc16G$T*f*5@j)^E4t>-hU(uU$PeO;h15x6YjdV=JH3QsCp zGlDU88yUboIWE84K+>susAOS!+heMuYTwmW51S|bE8Z3j`!Z6=F2Unns_ID$kzRS; zeF3fEZ0hzJ)`A$4RrN=JaKu0nGK&}q$4<)nr_(j9H`ab(Gq;B{EIpo=H z4Xgi3pgH*Nzc#V*kH3;WY&>mp?)Zq1W8OjIvx}f`v{}zwtbc$SbTE;n9IoybU5sTv zz)~aIZIDy!=WeAL6awGREgpS)?a0(y7{-zl`>NY0-X;Kj8z!mFA@OxyHxy9{Zs?_U z)vzA-rw*L$ZPS&$Vd_a%#Oj4oW4X^L(xAN3y>J?8ipK$o!1Uk;nAB;{pFGBkpi7aXPWY zY6z8t7_b@4j2JrDTpwNqM(TiUoj+7I^SGtv=^AeWX2ax*X1!iGaR2r3CL-WqAEIs7 z*T!Q3kj{Qwon!yrD3RJ(dSUUcEwbo^VjkDVmDeRlzAzy?J)7X9{7c(rJ>Qs5A1b;` zo5-Y9A~D_vUt6KnR|F+r3e3201V%fFUmkJMfet)#O4)1^#YG#f5c=ybSBcZ*aL5@( z8WGY3sh*o)x%L?ab83>>x0!wn#~2|6XgH9u02l1KmQP+YJ4>~N_9_#zgau^3uaHOx z`(Hk|-{lTHh<0#c3~a0o!SnzZwtb;qipITpGh7A@Y~itI4FRvnI!y#)7`LB13)$oY@inWb%A|4bXdzzZco* zfb)Cb7>%tzU||EEl$w7SY5SlY6V-<1YPDM$m9a=*9DT-OheCuVecA15D)n#L6Ts_x__(_Dc>szw_2yCBFIRkpwns0SGQidFJF|b82Zt$v_Vy&@OWx|$%nukH|Gyn# zjs;^XOIQn7W4cCyL*U*_V6%q7sg2rN}@Sv;Q1Q^V=SV}Qea;7&n&DjK9rP( zVSGfShPE_iUoj~iuT@KR$9!lFE1Dpg3Y&QYohep{U~#!kJ1M3}uDc=r6!e@bA)i^C zJap%{nI%g~dOQvrQKx!yjO}rZg+fSQq%+In{Y5*m>GwnEaazSm;lfzdU;spg-Hmfl z;WApYqmjX`k}qMXzl*R8U+aFs6euYytPC}q;K1}7`Zh%k*GPpgaO10LDy1BAJ}Nx^ z87-_P@eHqh@0qmq2N@w76=o{NZ-y~~ctyWZ8p7y)Hh%`Gl+O!d#sgJ?o85i2Z~;@u zqhdke-d>UF&5+^i44S?~SLnce&+4i#P7tB>o^hxGi74HNbuxc$!=p^>G2IUTcKGem zIq-q1iM}SJ6dNTKjn(`gVq)6PJ8LU41S9f@hIE9B-!5(Y?J~^PMXbt3?J3l`=|#?e z;`8AhvXYkZ2#H#*=ErhE|7?;Bkj7p;<90a;@?KBLbu1AeT6$}6rep`aJ5l-th}RAt zUb(Rpn!|?6e^kp3*(Qjh{JyySH>Dg(^YMi=V=X3+T-JXGKto`q_4PL`XH|WKh?#4G zK42M_9ws=r<##U?1tu`GoRDNKUQVqd|EcK*iCT9dCod9zihVt#hW22lu0r6x6WioV zDJ)s0YPA~frXMUxh;0K#RU|_P+VO8EB{FShuFrHZhyab~Ul&JWRs6PfLAx9 zvG`48_S7$;6ZzFi-S&{6;3BO%`N{QWVm2b4&@eF?D6tJ=w(D!afw|l?qU>u!^enWm#NAYExPAy0#XayI*IY=U}PH>(@EW73a($g9CcOE*^nZ+(Yhf-u|I zL!+j3MxKf9YS}pJE7*fiZDm9U#L786X7GbyATH)9_cD{H!x|-7UiB|Os8iI*V)p8` zsI@Ay*}z)#OuQh;xX5Z)Vwaz4-%8VQcr*3GC2}F`7naWVfCjb*OJa#e=DtCwOnS6b zroKVMXN(!Yz(aw1N;dKQR(;83uN&9O*v!t!^%FT37GB#~Yqp{waWp;h%tDVl#iu#u zW}P047SrKp!Ut*EdK!P}a|&{olRVwV`n-#>V-(tDPuP+bLAn)s+?Lq=;>wv(-hJsH zlh#E{J?J%jz-8eFo3Q*5db?+RaJ&es*8{%n0575>`WgoU0UtSsk?XIXPpQJqqME_6 zE6g_RerT{k#b|tyInnOnazHzCDn~m`HJl544q4WdBmZ2V+))n<`vw2JOrjq%%?HE0 zEtQw*;6`vxEm^!DmtBir5ybJTf)kG&{uFMMV;uDWz!kRW^G1mEI6+#t?1OMGz6nsy zDKQECu`W`Mq+lKYdLydqfN}r)%(p`58}g5!j`}KX-4x2^iFE_;o=6`YB)wi;3*Ro! zBcnatg^*w~g@2^Vk^nj4pSBhP3FJ^5_ds$_=m*MuLg$;t)uV5xnRID4YurajFX~72 zXZRh0fF$}p0yuOVA>=Jd!M7|!qIRegO0tZPALGu-KaNPkOne2#TbF+AxU-Yz5*MBo zK~Ie9+Dsxxn@3&3I5?@Dg%-jImFgDEOTm9s5vAEH4E1&3eE}+0PVPSa;T*~NUiW2- zE8@Getl|ARW&C)gTh}t}u?}r%6dn)vRjp#$EMP1XQ;I-DTG3mIy**nvhF*sfzT+4J z6WPgqyKBGcj?z`Ry2Q|wOsC90-Y=h+uM`&`%z~(DG15UmYBh;$O6r6i^Y+JMISyz2 ztq(eBr!W)VFi(%x{kkyX^f^&+=OXFOOqUp)^PiN_p0hned&NDMsAzobLZ3BZq$758 z9Z;5h%jAt>3Nd{XhHr#zH)RaJD-z)kD0j4@QP!V0Wsl7Dfq#_ma5$B+k>wHL3R6%Z zTWdsx4w?h3>Rwe#uVi1gknb19VXEiH4UnYeG&v3U%|^PfH*jP7Je>FRRwIJ%CqWq(4zxxYJ)dz9R<}OmkvOP1|A8ahSHF5zdx2 z@9w7rgtnZF`N?yoq6p?DsG5`tR0W!y2tW<8D z?laAQ`BLki;Q@t0ym|`BK;~27ll_GueBsu`xblmVwmMTbQ(XgsfAPF`O(B)d+>Rj| zG~d!^6Ab>@il3?D>4?1j8HLTAV9gx&?U_xg8v_aSvHD$g%MFr6aU!;%AxVT|f$+;SXNxR%EK9Bm*KzdCI0sP@Q0Xdq19Ps_U z(zR@gWgDn`hn_>!5d%?;M)n0np4?>S?4~+-6_lto$c90uYupugDrWOvYIyphVFO6i zyO1lQ^CNn663}ipsTv0TAYmCQmdE{eB*J6lB5f3_;j(Fp>Iiz2a(XOj2v03ZdmUa; zEX(1gEYQ^;ACiuB0bG_rS7F$iwyXX<(l*Cr2L)jyp>-_F5z3$|sre$9ExQ9H17ynP zP4hL58+3`-@dSmJSeO9Ki|6=Uf1$+`|F7qBghRT{sm$ADJ>%x7{ z$CMul%ESCD*I#!M;$;V$;g>1WG*NM-3B?}Q{PU8sEvHwQ6IkN5WN{g5B+kQNg0NlB zafIz^IzQQA@l3-L}5Wzf4N4J-hwk|Bx`a|+NrBw4tSO}iaM5VS3!yh0|{VyHb$jfjcRGT->q~1tj z+~fs}L1?ln)`Op4W5M&c8|-8nq(e(g^B5u z_otutoCCbVb+JfaPncg>y2roMEwX>HN`efbQGx+kN69puqvTYg&n);)$ZF2ifA`4f0%?vlg<>=z7>kc&^(CZG3QObdozB9 zsd1T-RG{;(fA`63<%w(C)L-gwNm)wZGcT?)#9iJtpBZ07qk5yGyXHp*GvB;l(W6y3 zHCHQDl5hm!gZ50K?wekoXsl%OB?A>?yL;)5(Mwv8T##oI>Tv5?;)K7}m4BU^AI9ZA z%7#nXGl94L<0BB2XfGwjbF0C#zzoF7Om+Gg<3D}++)ZkZ+6*vN;7-b237|d!S+nJ5 zmWn=#?%UO~2B<}N`jP!q?mBmgn17n;u{!a6Phetke}{c7Ylgxeoe8_yDDU%C^z>Yk zQ4172VPp_c(c*QEm7StfGOifr{wq1qNyy>x?6*q5vyiE=s`TfFElTRmtkx&`l$0Xm zdKWyILx@5yCCe$-@?HEdek>46K(x#k*YRpsr}vC}$bCcrOO?U_eg70(d!G@rl* zQDJp;3VBb=o7vilqVHG5k(JKX96^7!H0q8(Q0ucRut?uav=Q;`;Blzv1Ngwb2qAZj z6}S8f3YJTj8NW`F1~JEcjZ2E;pU;J74_3Vn)q@b~9={VL3yBHs`z(X_;F~7~TcxT7 zm(zAP+6RkC^0kBIj5Ju>@owW6!I|U#MEh=1~?K6kELvocHGFhsxy3?NV4_kSw8H7P9W zm(3KM?S0`r#a~~NN>!T-THsbO&e)%rn5c10;qKO$3bEyM&b(7!Ih9iglO*&IWR*;# z|Gwwu8TrumTij&u16Ce^Ldy;ib0qq6R8#(Cu1vOymd_jP{zQ$+w7q4LJH7>hhY3ev zIPD~8CL-{U{>a)IfHB{bns!p`)b2``?jL?C?p~(p%EZ6if1&>HPnU|dvN_Uwq&@ou zsQqd_({R1^Wb1OmMiq3$^v%>TuY0+4rn|a;%Z-|3AG&0uV)5YP?KiM}x^`sWS(^to zkvI(mysz+Q(X5i1g^V6=nx+$(F4=Op z{*~4sb^mJUj-}}j1$k_7{Hd|y;0m7tw_O?cD_*3@w55cTYNl8LfrW_`GQ(z{8vnMciRh+e=pJp zV3kQIO3%|Ry>IO>8e+xC-7tPujnmQW>4rY{u<d{sDFuPMM+VC)Td%a04`jwVfe4$^?v^!nlL@FdY$m^xi>7UWnoL@jL zIcw)=J;errrO2=KSnN%$(YJF+Eu@U8g1DBB1Z!%iyE-lL6elQ=*ycmhr`U%7(#&1_ z&fNICZ%{Z9bbHqd!@?ZK*%;bh8qPo|eGiO}*-%uZx zg+~_I1ltcMH!&v4+?1+;C`VJ zEg2_#sT2Hhm52K(Y(bSPKCNX-Q;h=Up-TK&7*2|XPkU}49BtY|HA)G^;KZ%zUwJz9&^6#2n+ z>YlpJaaH&0WV2uEMsi`cJ9|X%yEltK{x$_< z^N4w4b?vb2Gmcal!qO^|PWv==nqd!z0kYIDmU3HN#Tc&w>B!+#3n!cp&&x!kY>@yj zqx@z;vV&`BbJ0_@$hatz#IR1rgp<~?0R~L1S z7rYIvF|>EWhd$Y^@pZmr6SnD?UIv^#d(v)xY;U0*uTNq5Xx6L<(%Qp0=?}nJi`5g( zqe~u+Rt8&jvq(wh6U0~AN?>TTK5xxUQof`d>D9D1wda5SdhJy3gG2Jes?u80-jBN! zM9NdzD#VYwrf8f)A`j@8?$@csY(8>0pAs!0z^UN~U418^AwKm9T|nBd;;Y|>@?-I>eBqx_-Y z!f789)y-3|LZe=BBBHPUoBsv$*rzY`LiSnECtYD5SsM^BUQ>>DCq`ty$?8AgnHLvj zevF}D3pls;SN-GTE?${OXwIf94Q?RpR&<~%;TKj*pxb3H9O5Jgz)hajeYjm- z9MvgaLSNDvn5mQLtdTiZ75>DJ`O;^yEImsww@klZ>uYQiQVwISGRUAtL0@Jjfy>OH zzMj-tppq;YA0Ta-??T~3SWfs`$p;7GhrOJE#?VN0VprOeIHi!^PL(oHrjl)U)LQhH zx9h`Cuc*+XzoNvgv1k#E0Hvn)L2@Id>c@Rzd$}UsQD$pf^xA7ASt;(D^&>9-!e=g5 z=Tur9E-H(b^iIQ`((S)gkGj`;S&=?h|(d zDET5$^OW^v-<_9hQ@5qoY_@U=YU6zJJUn={$iDbq+*Gdr#@7ABu^ud$Znz7Vr9wj6 z>m<~pARC35!H*A7NDWwWGczksA_`aqvj{>d+yMw}jeBZ8NS-u{F4@{jfASibURt0g z@X`@=r|bl=h5v|>((g_=u3A6M0)r-8;Vyefrx)-}m2=a1_EuHVamO2jWE60OJ_rv9 zYqrz1?7M}xgmdls@2#%1dF{R77BZe)q8jXTJ{Qw-xL}AW_&&86S<%egzL5>ihT;BvB_9m1%DZNVwbCHOR%5+ zBJ9J1!LScal}nu3EkIjjtxq&snmFFOxzV5%!g~ex0DJ*Y&zthFatTW9#!o~EA66@i z9KW8%>-EG6mu(Dzu}yO0N3>Ax%g#}Mize%jyN52_gI(T>$3zDAOqT^Cn0&PZ^l zf{B;*zh-eR%AyS~Afbnd-OA2|J_DnkW|9^3Wc%`pWG6eK&tgw(du}iyKX9>tI2ixe z*n0P(aufw-^l*;2a$4Q_n=Ek+cT0^kQ7?)U}r6Q}HmF35DQIRc~zeqyk z-%z8M0^5&W0s{ADOOpc?(TB&W1%1hHaVtU1$FZ!&Vrl92{#h{o2zONC$wb1y&d_EFaO8;Plz9zrMCB$XC9p6h`H`-7 zrUHLLYLc_&e@IUSyX8RAt8U%(F=4h=n%4AL@gb^;&E|21$~hQhP&tM~u&r`E?qd$D zr;&*=?NIV-Z=EVb;Z>40h#@}>mf4jGC-ZRiHKWfQmg2fVdjDJc>XkCpMz`w474>P* z)b4T`SS&KdguTzW1k4X_#2Q>D-1eboU%SgO)q>o`p(M`@f3S&7c^d2e*C5-+%! zPBQKC12rbb?-WtvuRzw$wpc&(JoqHm z1q=0+S1ahXK}UAVu4zm4>Yb625*cjx!a~%gKip{0J3N@BS(gX&Y?qGmLoIO00QUzj z?OK5h2)wT_zYY%LLeJ;|QpkWO6oH(=jkw(;f$zV}nug3t;jhZ8Q1otfz*{H6vcmCv zA@Jzb5Eg&Vd-Se{oKf^Mq&#S>TmSVGn!gg)S;Z|4JncVV8DcFXtq8z+QDj704_ufK z4xj%lI{(=>SIJ6g`nPf(?g21$DRz~p^wLHD*<`vn&5@9c)~ZUlAOh#}4$TzCN(Ilf zq*S2?nXY?=pPNyoky>!MRBj(?Rvg=wkdhn(B<6& zCP9L~1@P|wXK-$d@C5?QHMzzUlKHPde>Q zP6OVPPJ5HnfcK=+-sCjkJ?XSJISqJEI_*tP1KyKPdy~_E_oUO_9jXF4R}vF z?M+St-jhyylhc6rq|@HyG~hkyv^O~ocuzX*O-=*elTLe+(}4G+)86DX;63TIH#rS> zPde>QP6OVPPJ5HnfcK=+-sCjkJ?XSJISqJEI_*tP1KyKPdy~_E_oUO_9jXF z4R}vF?M+St-jhyylhc6rq|@HyG~hkyv^O~ocuzX*O-=*elTLe+(}4G+)0q5=f%l}- z-sCjkJ?XSJIZYQtr-A4+5S<31(?E0@h)x61X&^ccM5lr1G!UHzqSHWh8i-B<(P|CPGfRSws3(Gfd7wd<}Tgj z-~w$90sa&$u%!u!nGpuAY()g6+o{rv2KQ^J+%1CM3f>b zy>!bzk|_b^`Y8db54&o>#{rT9gsFirH4vs|gg09Vv7+=)pSw|6gv488WaZlP-pVUueSV8hQ!rMcmLxDDj zoxs)g!j4)0FSSWI84Kb@yp@QC(jZI?gsFirwJ}r7D&JYKznrpe^bmtPL4ae8OhUWw zWkq{KHV1gBpBYNnlhfSE+PYcx`JL)~O>7seWogV->_J?}?xkhrH<>b6D}~m90=el0 zp0>T$Z|lQRnimn{8Wv8wiJe^G)HUq>5E1NY{5(@@d^}y5VEgH96F2U9rAAdCObvvo zfiSf&^~HE{;;kgbHh6{)TsXpsH>25)lR73+U>}$I(02HB|753i{_RkEBdKS&RXu1S~AA(IAK{u97IW^1U`80KcFf|aS zCZGet)IgXT2vY-LY9LGvgsFirH4vr-!qh;R8VFMZVQL^u4TPzIFf|aS2Ex=pm>LLE z17T_)ObvvofiN`?rUt^)K$sc`Qv+dYAWRK}sev#x5T*vg)IgXT2vY-LY9LGvgsFir zH4vr-!qh;R8VFMZVQL^u4TPzIFf|aS2Ex=pm>LLE17T_)ObvvofiN`?rUt^)K$sc` zQv+dYAWRK}sev#x5T*vg)IgXT2vY-LY9LGvgsFirH4vr-!qh;R8VFMZVQL^u4TPzI zFf|aS2Ex=pm>LLE17T_)ObvvofiSiIJ4}t)HJR20S^)k(vYE$!FtxW}!3|pWzk~mc zsl5e9-=W3+EBN1-+FPB$6PoM4>i-*4!(jP8Fg36b^dHcYQMr(q0HhBvUT>({f7btN zR1F~RUn6Uj>@nFAsu1PA2?)aK-?YN4617)kMtEWBGun~(!QB|lJioa)CA1>75EfvB z{m~H)S^dD2HssYo453SeG~Y-t#EOh&3CZ+mD5iM+k$COw+4q%th}F`Unu1BxW4pLp zM|9wTy`b}|kETefU{IG|7~&&&6^6FmK@0FWxwXXLZepcxy(OT1VYSKp{}xpP-c&W? zCqmWQ*E<`1n8|@|r{AX5U}HhGU$+mc&c|L5KQ`g&p7wfl=~NiOuIq{se-X2|$lvYb zxT_A=I7Q@z*dKAZ-Uy3{>c87J%pJ=`_=q>7Y42z2`cz%*yb4{a!L)T0|(DMV<}KUu%4GAZ>B+0&h)A*))E zwE>2FM>|AoWRW+pRN9$4?%7$f^biYsk6E&AZc*$3yu2-KtRm|+n;xYo^Pui@)R~-B z#B7U3D~Ls=ITmH{v9@-X?q$%tMWd<7UO0yoSklU^~ms&f9T2m6^PsRsZ4ViH{j{3s#(b$GuuZmf2q8F_+RDyaBm2<6- zGrsLW&)|k2AR@zJ_k&=2$S2$WHLp+3xsF$794S%8lfL$$!~R1Qm+tou2r_4M14U7* zi=XcXHgyt(_JweOxub0?fB~AA8kt*+C8v;kE2t)1FC{2};fluC?4wpZONwd{e>B+( zO?agrZ*euWg?T6O&pe)#t`H{VuJE$2M2#-kkcP%&rZ}%*+6A0WIOCK0QI0P>=Rm~V z$}raDeN~@%!g7;SKig~lhTEs_`prGW92$DMWhCXo9A~;s_jTTKfa_D|d!lMUMHp@o z`xs>k;BThGTx#N6|7D|#cn2ExRk4ErD&x~qZJv>&nbs+6ljKOu?GJX5f$VhdRRw#a zCYUarwR{}#g-gHRNDm78u9F=fd7k&y3AEVQA8R<>{I(^ky&$dO1@yX7a@X6fmIIaz z#I9Qi_tY%=>)7M1OuCc^S*IL;@!9Pv>i0v{fHzew;@(8ikZ$KzT7Ki@mk-)ANoul@ zx5(gF>gbAv6+HW(2e!$b{xP1>nB1Mewc-^arhwaTj!Uf~S_HTuM)lu44ipCSy*i*TGOGc7byIlX? z0NoniP#J87zoPw5!l@^$+;eUq;*u*ugePI*P#Dg&1_ey$wS!+)f+X_TPG-!!W75-7 z7-F&Z(<7W{V5RPv-- z^lGDSCVlbJfV$q%N+Zm?V_dnflmrfr^&vCUi@B>qYv^DXvYZc7*G9J0J z^lRu>|4$@Idpg1Rn7!l*hVaxw$yvZ^QOkRxY5;S9ozSCLm1n${bSG*mPf+VvYmoxCdN5LT@FHJhmkou~Vy-9dbhL=CK&^GX`4jQ9!sq^@JBccAg zBk&!86VLnoP&MF9Rbyi%#BHA>){g067% ze=kclEgak`kJIngb#i$$K%dRy8Nx&nNOzlT>A<%caHA7`O>~$E@u(AAOcqcTpA_7* zE4?+pl)3s_l)>#vEdHRePlQgv0FEs_Z-m8(4TfOli5}ok?E1ZMLAc%2NYf7`<8UPU zJN(57yDd;^RfRx3FkH;c9o6%#_;k{qM;OHypPt(fA{1g@U(cXr>@W=WM;i8KQhh5f zU2QXh8#X^r!Q!7d)ze^)`I^^_->33>oF2rlUl)8|VISo2q<#Ft3cPy+L@xij7TemD zskeoUwl3(#6Wblj8GUU~$ZV8fD;~io?jrP!<){WcA@*Bm%D&2>>X6Y4zZ}k~MY&dK zw<(-VimtL~e`hCxr}l9}M9*)b*3;vU(1g?MYBm}>>NM9*E+l)IN}z2^JU{ZWi+-Sc zsOkp(ZK2(vyny$l0GO0NW3mcn9{}0IY(J$OR>fDq$0yp1Hg83yq{M^%b3y0>SK7du zm>ux?(d<1@H30rYnG8%Ga~B!2phV_tcax_iH-Qu^-5>stcFEtsjk;zUJwdQx3GBqz zxJivq6Z8F>W1w+z(b*$6!15D77&qbRS=R{mDguJN<$09w&t zF!7IjdUftJCDlmT%4i>BHEa~pE+s$m`N#4v`V!xgwt(Lmj4PUr}qyGZXyZ%;hB7vp2n<&I6vgVu^O6- zE3K*Cq-Y8Kd*MHY8pTDOr9srRR&#r+oxzfjbBrpbec`7`O8 z{a&Y<;1n?r*@gf!;4O1nWqFF!A%nU_>~6wGkU?Ww52N)LBi~<-L@Sb943mz1!XtT0 zL#TMp(nnr{rb{QKi0gYOopuIB8ef0S=o#?! z<$`-ZIWhqmA;w2MIn9Pf#Zn}@jZ}yH$7m=5x~t2<2@G%r=zP|DPgD)S#J&ozFf|^Y zk{ViM*`I4qOMqD$=Yf`6 zQFudAIo{;uPR#aUu3!sL!7;%!{C=n!@TRI^G!0+zi!H&3SMnf!xmz)skK6)JV!`-S zIynglGx{Lugv~&&*HqR<^XVxV^kJTFo+9%wTM{@1N8G5=PToG1ORl{5HVa&{)p{-Y zxA_piULBF31k!l!5a z{xvqsFhu=6UoQe={ebg#siCFvuLyU2`M(tl%+3FhA1OkeRte%Gf8w`WIT*m1Ufqt; z?a2*VjS)f3VY340F~b(qRtJQ*U6WtjS+6JyEfC89I+ZCF9&fEO@r#@}o`6@j!JPVU z?c&wV39~Gs-&ww(JavYDW%O189-HrpuD6ZC6dBzbHqiR@xLnY5YRZBsllOj(t7|w< zWc1c}ten(y)V@5PMQF{qKU zS+zLKic-Gx*vyT&^)M3RpZa|EnzQ zzhK=nsc89bYj^ACEsnD50r)uD?}@4b)VM1N;a}2Q&<{LFkRfeWYJJyDP$YXOsMFv^-ZSAHe*SXF z;_?i&&hSa@j*^;v4PlC@_<}az>$el|SK7;LmGI(kCv2~uHie3x_9I_2>`_x(fqOX4 z^;!t_IA4zR-$5-hYy+ZV`g{?LiEQ1W)gTtvbn%S^(k+zIY0#MI`eZ~H@o_9wtOBb34ucr|ezrgb? z3S)uCHY$F8_^3^zX`o?#T*6g5l16G)2cuzL{3oZfb!Pm+r*D}U3!iK=Cq3n0dRahXsH&uszU(agZ(H6&<@l%M!O@nMPWsBT@S`@iWK=8!dEkGw zccgoDXe!uH^^*?XET`lHxo+eh4-h6XBQU*s&2S7 z`N+DZpJ(1KVC^P8i1t@c>@)r-8gBpUL{MVjZ83I?Wk;5qsZ2tQdq?~2P1E#cOKv;G zl{BTTxzfg#+|e1avfEO*SI*L9qNS_(zMw^_amBU~=i5JJd6>o*-Cfm@`ZK^Np z{_0If@LNayzldu}C!EEfXj->ODsu}dGb+cW9Lw^J4>7g;e0aXL4 z22>5G8c;Q$YCzS1ssU94ss>aIs2Wf;plU$XfT{si1F8m84X7GWHK1xh)qtu2RRgL9 zR1K&aP&J@xK-GY%0aXL422>5G8c;Q$YCzS1ssU94ss>aIs2Wf;plU$XfT{si1F8m8 z4X7GWHK1xh)qtu2RRgL9R1K&aP&J@xK-GY%0aXL422>5G8c;Q$YCzS1ssU94ss>aI zs2Wf;plU$XfT{si1F8m84X7GWwSR}IX|c$5Ke`3umu$A_7pg`DQUmF>g92oKAiav4 zny(I`&lxQpbcT-J`T_7bxM$`F56Pqbg?brDKCe7y zMu}n2_Nvctz8o^0YjS|%ePLgVrs77#-RHH;Sf|H~gC8`meB-JQUjo>7yMu}r)**^)xFv<+H7RyeW6u8 zk*(Vl4tw(J>ZQ6I7wni9>oB(Hlxj#+P<}*ls%9Pc=+;Pn0b7UaNS|eAYchJ4wASV@ z(>sg!+a4KPmKcX8XIJY*qi;58#$rpQ^Wud*y-E&*R8;v!H{dA>Vh^F{OK#uJ5Sy{kLv^Df?-v8&$d!lch2)oRCrR0F97QVpaUNHvgZAk{#s zfm8#j22u^A8b~#eY9Q4>s)1AksRmLFq#8&ykZK^+K&pXM1E~g54Wt@KHIQl`)j+C& zR0F97QVpaUNHvgZAk{#sfm8#j22u^A8b~#eY9Q4>s)1AksRmLFq#8&ykZK^+K&pXM z1E~g54Wt@KHIQl`)j+C&R0F97QVpaUNHvgZAk{#sfm8#j22u^A8b~#eY9Q4>s)1Ak zsRmLFq#8)Ie@&`6_zKF9Ax6weOeT%~OE}v+h*lfnPbJKk;2ukMO=U_B%^GmljL6L_ z0h0k#?Kzdn7LplB+J$jTG5%AF6b%#z8c4_p_*qJX{qgX~K?y(kwGrAZ#RcjL>pnd2 zqR~P(lPh=x4GDsB*M1GSYcgk^jW5pIts*Y}?%#Llc-cbTEw z;_+5P=HQGuRbQt)OtR!+O*z1KYjkGe7GGXHxNC6N;I6rhEkDUqYuA18=<|$J=F}`V z59M-;#Lkg#cDQhzoN4&{5Z@9N@E5 zyILn+_h|OLb8S=A;%mYQ3||kWQK4O>o}slDuk>HHnUIuxnO8id%1b{ncUES@`-|G) z3rdv`qsn}0Qs4B4toZI@?lz_YQUM23!bd~}hs1Z%$-#Gm8*6gz* z1We^)rN6egw3y`jzTRHfaPnIDw$psaM$)MdB&EPeHm|?%TS{kNKTLYQk3$&)M;g=*Owj6ArJ|i)E$B4!f^MKR?`7fc%lMs* zoTHoGO$QlAUGMkIr6MEzH>{L&FL4o<)bJHvUTPG2&bf?xb>p6qop9ISuEAX^_nPCV z-k!3mZ&6>gQ-4A4`-;o-b*K8(#Cs+Cs@Aui@k;cvVJ9cm%{tmvc=$~D<1TsGzTKz# z`$hUapK91z&rE52^#+;}rS!6mm*E>85J; zEbA)&>ic%WjNP_Qp?YU-MznqGWlkMIj|g|s8Tq9D+_5T=%$H>2iLk=FINL{pDqpJ3 zf907O@90%~$tSqISw7tRj@^F3aI}GkTkWYfmP_->l9R^#+dbruYur9Iv0Nul#;nKv zhQZ23ExAJamq*zi2p2b-S2t#!_L(%P=$2$@^*A1nZ*!K_>eJISx49GEMB%FvM+Y|aRIn%52wIggS!TI4elD;HMnbV z*Wj+fU4y#@cMa|u+%>psaM$3j!Ciy926qka8r(IwYjD@#uEAY{y9Rd+?i$=RxNC6N z;I6@4gS!TI4elD;HMnbV*Wj+fU4y#@cMa|u+%>psaM$3j!Ciy926qka8r(IwYjD@# zuEAY{y9Rd+?i$=RxNC6N;I6@4gS!TI4elD;HMnbV*Wj+fU4y#@cMa|u+%>psaM$3j z!Ciy926qka+P`zxv{@wOu30jE$!5eaZ;c92-r9mefkDI?6{LtY>%qYvvKlo{$!ey9 z=KlfJbcTXzVO$JdB8&pnehq+X0M!4M1PR`v! z`uFYUh)l@3A5$#n8$VI+b#S;>&Z%lazoQjbu4L5&oOwvH0aOF1R&)49=wzkm z+u!M#?{ZO@^!K@x1p!%k_Gb&4`ECEY7grsWaPH`1g~<=oKYfUcHVK^OFKPF}eb!-pIU> zes}w~#@$vCtl*oT!{?^<5}+DDHGpbb4|py%8Q&D*y;$fMJo|pt-)n@v-8z2P_Jq58 zwfs9!G=3U!dDEYYVRn)Q@M|af4n2R3K@g!8m_dGjXS7>I)BKv~0I~7iP z2&WS&3(K^OHanzSv>$nD6yC3M@5se~Jd1Oe50q=o2-aFH(v!b;jrwN0@0S6p0aOF1 zcI=y~waV^ejOF%G>`J46s8N+h>!a8e58mb4=M-jF6kDCJB`Y&usEx~U|kZs za!NqbsLCnplh_rO)*0Ew*%enRy06^Rh#2{1x6`|06<1GZYk01I&DYvwmU#KbTB*A& zb-aBhCyA2g2ET5}b>g}7KIKm-V*LQs0IIF*1*lfG$g1S(o-VEEic4P>X0rtybz2=Y zH&rce*V5iwzp%YNw{!XIQLOJ(F>Y%*mXt@nuT8$P>`mv~$vX`c>kjpwn=XIIhA{AJ z{CIxh{j)ADR%M3k?WcfC4&1$)>Cvjh z7&UokLsPCx&}m=t;M}?0fn5`~eY5b8mt)$Fyua>m*M%)hZE`lBHLUKP|043k-K);g zN3*|mTz!&Jb27c|)-KlZCoEAuhV0%un~r+abop5?J)iEa)G?!hy-zfcH)~x|k}M(F zK@XmjT*=63Ha2 z4WJr8HGpaW)c~piR0F66Pz|6OKsA7B0M!7h0aOF122c&48bCFGY5>&$ssU63s0L6C zpc+6mfNB8M0IC601E>a24WJr8HGpaW)c~piR0F66Pz|6OKsA7B0M!7h0aOF122c&4 z8bCFGY5>&$ssU63s0L6Cpc+6mfNB8M0IC601E>a24WJr8HGpaW)c~piR0F66Pz|6O zKsA7B0M!7h{X0-iheZZ?Gt3#kWV5hepc)lW*~qXS9N4mvv5bqG3e@;9W)2FFO8$)O zf%yi1#?(Rc|6ppmLol_t3?W@&8)d2e8nD!0slifHa&;T;z}7mrD0N!2T%Xe3jIgPv z&hdM==gXcwW^}M%m&S;Kz3FRYF8PnP!#Q5*V<+K7m!wGSjd zb!FaiKTwmi@s3Xa#pi)jf>&I=A**MgQW&b?RRh{Y8FNM&QRclAqJoRwjC1_*h$eiGQ7J4J(r#oNi>(n(&#wf7_G^ z@r_P9$BEyRpYP02yiX?ArCuRmslif%rRF53^q{Zh>Eb9>rep5>52Z8ev>bzVWf+QE z0)@qnUr}7Xd|Jd(!KDS4T^_y5cXuRD%Jr2UP|l5Od$+|qx?80?^E%P-a^yFWKJFU_ z32}w9G07*&y9w)-lrXy^+P3|~mMzh4%ExN0PM;1@op)k)x544U`kCJSs~PjHBopDC`QTM|OPv^P8TbnTY8_DTg#2U87#cdIxi z@&qn)ksfuhrR_R7C(c?!L1!|3FVEtQTJIJc-^nU!CD!z{8#a-V2Sy0RY_T8@dnqkk zYo3xj(Mf)P(QY9zmVfgHI??GgZ#e-=4VD@#wNpw@rL+U(pXX{B*U{HcyyZ~(yd=3+ z^04B1y(JH;MT&a%Ce~z+4~zP)lRndP%Q>%0vdMI>+KN1`oxJ^{TN=a?PU!m-x5&+P zYTUQs@26+#RE%{5phhr`5kdXwNiKBq|e*d{A*@Tiu)`XzbqXW6<1J9l*EddCqo| zkxMo@lirP2rx_J437$-@UU0zhvux^EzL)O|$;GS1oyRYFvND`}<3nLbqHD zd|dR#Ml+jlr@Xa%w{lE(J+GOghL@*CaQVS8Ys0QiG)iOAVG9EHzka zu+(6w!BT^z21^Z=8Z0$fYOvH`slif%r3On4mKrQISZc7;V5z}UgQW&b4VD@#HCSq} z)L^N>QiG)iOAVG9EHzkau+(6w!BT^z21^Z=8Z0$fYOvH`slif%r3On4mKrQISZc7; zV5z}UgQW&b4VD@#wSQ-+>9WX^>xIl2zhtv*zbrK>Kv`;1W4=EPo1B_8kIu{Yd^|J4~_pLt?3Ps*2tQEAuVD%MXmiBpw>XG zfm#E#CeUwtO^PpZO4a#eF0@w_dVy2@aY^pVPhoeN z-SeARrPszA^)@z0Iq2wq&(aSJdu4fU6Yn~P$?}4OM;r1yYr<>(n)&&PbmQW+cP{9% zJy#akNo$w+7MH&wG8I9sfm#E#mM?n9Xvft@mwNsx*EKLC)-N}gU0(Bnb^PR1dwtQX znKf1ilQt2XTWg;=yI7YWiFg~OY5&4Ms-ZLC9K-8<-ihkRPAaQY9hJ8}HCT7skLWg@ zq-QmE&ctH1L;X%EFQl8(#~y!FnOhiefqzs+RsQ?7=LaqZZwMCBC&q3DwFYVp)S6{d z|Mi^ES%y-x1yri1?aG@~^RDZ&ga@n9eB>csGjWMSA78pQ_I8v8?X_^~$uw{$>&INW zXY@Q+Xt~Qg&r^GK>b;xj#*(*+SV=BDJUS94ui06Fvx^_g8h1QZo4m2IQ><3=olg!s z*H63V-j2;T-`Bc|T4WvOCbVimt$|ttwf0QwjZ&=g-Em8T-Y87&R`QoToe^+=Ig58x zN>g2FRNlilL!OFomi?;WSL%9aPpfD3+%e-#*jjSY!!qpqg9qkSWlTrc2(k2n#4bCD zwU+D7-Y~6y@cww;{cVrGv}jZjZn^r+4uPqAv*Z6BTl(pB%&V58rdQ7Bl@J;aK&^pV z1GP3`1g}@^`K=8rMP}WYG&$G&;Pv_-zP#j}5${L478R>~E&IGCNMOO8qB`>EDMrHd zuU@K=KI;9Rk4j@>)h2dnjBS~>`jeJ_FJFV&6q|1fin{eeWg4g2mBZHreBka^{*cf{t4=FN>K3eS31chcuwyfN--nsZ&cjxHQ^2LpRCC$?5V~@B1ryGHOre zypB&cpV<&4t-J_o}33_FeAW6OV~0FDnxrgH)|c>5g;ELwQuK;ndW6if zw>IBnm9}tift30kpHziaW7w7}!nKPW-X34_ty$sn8Q*6s)`(8)iR(OalRfUKT1;Hw z^|ZjZOPRZF=iKZHb_@r#R$vZl4b&Q_HBf7y)XGfm#E# z25Jq|8mKi;YoOLZt$|ttwFYVp)EcNYP-~#pK&^pV1GNTf4b&Q_HBf7y)XGfm#E#25Jq|8mKi;YoOLZt$|ttwFYVp)EcNYP-~#pK&^pV1GNTf z4b&Q_HBf7y)XGfm#E#25Rl!QEPfEvcyZ+l<`Y8+y0AM zqXJueg_jHt)cFeU=H{jXYy5=W#{Fl7y)zHZ&W49qoJJE6pi%KRe!_->7uxv?1w`Z| z^b6Z+k5C^&k zW-2ZS^}N>X$U~z=@Y86rG(p;bex!q_^!I{Yws#Z(^GEK*dL zX*^t+6}n7m9;Xn#cu}StnXJnc9WLoQmBgJ8N{-ZJN|5_P`9|msvzO-oY{!YtPa4zt z6$efk@>@5WKfB=yB%}418e+qQ2b$nf2;ygRiHnm*CUP-IEnTM6aG5{)nG(X!jv4(= zKf{z8=!YjH^k=z`3e1sOzb9$^){N?qXETLPiWo3;v^M?L$iS+>?~3}6RV)0-4F*g- z?cr8Qysxx-M7>tG1!y#*A*;lK=w!b*Q;JNP%w&+Yf%MV3)D;d_W9AqBLUpQ!Ej6@< z)R+}Ku=6OgH;67b@Bsc?O-371SMntIpS=d|WY}}6E3EtQz>7u;-ONQ(8?whCJ^}U( zDe0f@>*hZ$hP0hZy@&baIwPim)}LX;1>fezl&_^uPEa>6bx37@7FlM*G}j((Rb$m# zJL)(zk{Y^0R?P|&VE2ueA??Dr#|-rR=V~&>n0l?ng9fUPCkI;A{5?tgx7T23%Qd9n zRHmL7@msUntRKzt&^8E??f!zJ*z+cgAnm3zM``|<`M>(UM3zlu&d?ri(SL7ycfgNL z4F+2NbLEegdF)w&WR?_D`bW=y)Yti~XQd(6I-Z-szAiWB=VK20t#cg~Id>ZM9+~!x0O<~9b zx_*`0QGzU03DZKa|9NbKsOBx ze+>W!>p)gt>p)gt>p)gt?0tK8;z*M3-{nuCX3lI?t+CC+_)*-sWAU&}HwG54UEN)M zbp!~bDUeu6_|f;=?|$QvnMw(PaaH%dvwNm@r;Mb0M7|;;BO`vX_k$75+|Zc1bH|uC zQ`d7sc;gsTKUmn2;ZKcV6*i}?v2=pae+?tYi;S`FP2Go8U`MX+8DSKx#?dNp_Vlvg z?=tYmP8d29WAtJi9v=O}ezdK~_vhgemtawaE|zlm4?8gM8x%737YnE+gp%zbGM?OM zX1xF5{oW7wf0CRe4e*4-g-CDost-W3&n=>3C*)4@@DX z95{|)&qE)(9Lj=Wi&hiYKLQ#ie+%a@dX6aBe|$2oeQ2X^*prFjL35$(`6T>1d^0~m z$9WUO_Kf!{Zv{j6-Wa(s8v=tL4Hu@thgG<;=g=8AUuLTZM|^C0lV5*>HU~CzWJF&b z58D9$L6_MJhu(<-!__E^+-Ma!TG`G6bSe$J?Y(Hk(fC5%5DN+2-yJU1fAt>yua5EH zc%thMM_4g5ZMhWm(Y(VR9?y&?>{Cqbzz8|UA=WZ64q+hcm8wbz_b&6)|)$aC?<$Z9QvyOCJ7hv0efFowp>LYxh&i0_4CFPbfWzT zW4Ew>$5Fjnwb;Cb62C{c)JUn;o%wOOQHN>&05zu`&O()KH z4$~3FHpKP%vUCg_k*Zj9Vh&N`ZCW$Ai|*y+pgFwAiB=Bb!+V(1M&vA(a~m2*|IYmR z1O^TGhN#S+PD6*6uj@&AR}nUCVn=q&HxAdT{I&3@^qXEEuV69we>ict8G->VoiQ(r zRcOO3q-23Z2}9$+m}zpm%{K8BaFOwu=kOBS^qeTZP27XtisZxkQ+6Bma?W&WW~nn)lZ5 z=U&t5m^aODYkE!*oG1(`!9|vPOQ+e1i-ai;Bmu& z)x90|Zim*O^-B{=W@bMz7B+Ca5SEW%O@V{!7c&f6R~>VB+i$8qm&2SYt#o#lq?*_- z6h}-nSTObYf9nZY26gEWHgH9|NS_(B0Cw)YD!S|qa=my;OfHOQe#Fe=T z#1rp06;81@FH+=B{7+05=JgzBLOX*ocOPcN2@(w*t+CeGbsxR$t_h!9*SKpC%E5H zuLAd_krO4Xf&ga^e*eK}5f=_%b8`dkHIgSp_N*BOyOZN_!86!%9WOjo9d+3@2iI1^ z9Ga@He}GdKO4w1bUGd~ujSkd)K=P9D;0yXd@__{&3AsmXCCk8F*sw@craVp7_qeHv z$pTq%zS$^;g7BJ{x;XXr_BgX9*$U|aBsTfc@_cIb-J2V;)3Dmj z&eiZ5rUcD~5VoTCqq#r+3N5;{$1pJOQxjg6e^G09>p!(RSJtIjA9njjsd5rma0z{9 znH{s;y|P*zT*dY7ZD(j4$4Tnu4SyP}e;YLWcU|%NOv}>k47xx&4N$M&9d_&8wly@b zjGS?ii_(gcBtDJ2S4-H=`HaAZpkA1N2)``FFU{M}R-<**8k%kE z&TM1R=_D;P-NWkBT@AjqIzKj%8Ehb`ao=pWH+;+P_qgV(j@9m(vMt)!;+J7>e~|s5 z-@A!F#9xR^oI<@;M}9Bq8C#pbHm{%$uFX!T*;XB^8VKFj>&DDZzQ4Y=Zp_axCF;;c zjpk>gc)G@K1}#_xCU#z2ZFwyfGt;aTz-n7{;<-Qn0tu5O#-tEumdt;x&u|X()Qr*Q z>s|A@Rfh@J>RfhtaLU@exV(j$e-eG2_>vsBcn9fr2SY8}S?Y_HE&kMNHeh}ZyENwM zSuz-2Lg&*YTirJ#wxbX*y|kdOzNe`I1fFgSrb zHXi+XgvUhJ3*Ctju~^|C@}L5RPLiZyChyi6 zUx&>bNWfy^S_-q#NF+GUD&b}T^=5rAFZ)RmLHmTerQVnEC()~$a^9E&5b4|9dq@zo z2v`tVgH_U41T3iSNfLxx^~)>02I3t+HlfLL(e#pRXToSujfsc8{zNvn&YB8%X4 z>59h3FNYu`4bA@0f4c6r8`%f>zi=)@Ez83@!Sfwzx954b_?XemmW7D(V|rp{B>k4t#6u2SH--C0QKR zoPM>P{v8Scf2v6bqA$M^FFr+``@pw*iEd6DA*kr&Ipj6kUeB+uz+`70l#ogALrIZo zdk=HxpNGa%B+}r2wJE!FCa^_DKF?d=0&7w`Rh02|J3rXD7-qKX1mho&spz2)kG(y% zmhQw_tmYAsyQY`mep!FJo!p&^*+wqx6UojU`F4IJaU+l!NcIrRFITk3VG{3;BzXmIf#ei7t6qE}s@!m!yiI z=A>(kyCi*$vupm}@+LQ5+k5AsF#Nm zu?sZk;5*U0<$RjCkrYd6BPk?E={`C^u=3ize?3VM!isNW4)2*DpA)Xr1Ra8@kgQ@p zqv}#+ty;sPG=IEyi;{bokl}4$&}7Ag1Nv z3=aou`3fym48GRE+dFr$43JWo2qSmyMlWbHg7;K(KO=9%?8!f1C9z6^bpg=4y$q+^R!YelkF>Gi}&K`?0WTilo&a@p+_4Bx*v&~ zLUsTy-R43qxq3YHbyj&GHXvs0$uTphL82n+v1A3*f0JqsL~t%Y*@~iQ1yxc^%tI<% zn+kti;bc&>S~i@y{ZiehKX63AdtUkyf8Srz+#5MlKfpim#CA3~Q6^{)u+%3;6}f=# zO~QmIRAHX=F2${WO{>$~h^$b4GcZkk`VdyLI0x>ez&NHb)8TMC5f>!v=+N5_?)bHuf4CyG zBdU5}_PhS%CahvflOeG0>iW?(E(?B?Gs{WP3-kXD<@IWpHEi%~kN_W3nOsO^)d{f> zuN4kcK3Sgq{4M3_vqo<2&I2lbywDGnl}fEQ_>8tFEzk2G(e455QjU8*P;-jEJFtQK zPx!0Xri6782PjMD&TO|D`cEk=f9Mq%$HJ6jfRb^-l%qtZ9BWkJm6w?4D zj1VS1&%2QwI+rVF4y*_5tS0itTWDHQTVlB0KLneA&$MVofq7-+pzP>ItguB1)m_eA zsEV|r_4Y82w=#LuKN(P3p6-&}N48sojUfY0uq-3#}#g%4T2qrCGm)YS^YBuAUl=mKpM_#S12nrYi1OnCEf3 z;i$NRgyl-%;J8wNx(|&n9+|<&K8JV4=UB4HXhdRpWX-sVGg>`Z(8aM`lsSh{^lac5 zxS(R{Ht#4obMirKXakV9f0Kl4uS8& z?6e=Wg$!dsgFk<=Uud3m&{QpJKS<_R1;P z|CZS#t#xxw7h%#ehm2c|R{d7lk=b;USD(2fw>to_neNEc#aPk!H>1RNk-`ET&jR)m z#b%!2(zwX5e`O)YB!CeOm{m)&tyvT;!%s&?4{kJDjSgWEABp7h??HpIg-4^gKRSX| z1EV@}z3~y8ETKk=OFf(syY_${=A5|ohzj8(p$IPn;m6YGcLXy_Sd4|?%292nw)&nU zv!P5x2U$9Z$QILWplEXF;*My0j=u`$FLB#}6AW+4f2Cxbxf1AlAPxj<+_He*Vh@J? zG$Ok}n840t1-zbyi|iI*%+3t^(RSx}2vNl>?3a5XUdD6n0RZ!7yj96@~mv0Y)g}#oxNtU_{N%y z)YADgAO4J||NjsFYSk`JN<*LKe$Wp%-KAn#tm z+K8Gbjudj69qe{7cFuoWq5dX#i=0~IzoAXLBjt3Z0L zjE#{Gr-+yyja;hZ^XJd_F?@2P@oequ&p-c+4hYE&PuuGFzswB}wwi)m%bELK&peL5 zzq;Q+5qfb&t`2^c#Gt~@a{Ti+{>l4YuNG&o72}_!_-Dp`*Q+r_HKwS>6xEob8c~FQ ze~aR8N&FQh6-7}+F00PT>zumIiR+xU&PnT)^YU8HHzH>|CIPong1N~TAxZzszh?VOG)ptepT~U2k=bTGq z=GGp&A5Cf0L(#H=hp@Cj(K`Iy2v`#0{H(u3gm+5&zmD{cdW^0AV9JV`#DCLhnlT9wb|sb{(H;}^yBi&FYUIsGC< zU@=8uQIL33FPG0xOS19uv6Or)Cm)ZKkCo(Os^rt;qino^Md4cGQ#2OOQqSk9-YKM>)4fN_UtGg#^NJoz$;Wc?@i_TdNj{z=A5W8y+PtFY z^VG9GulPkV{i2k9QBJ=|5m-!7SWJ;vOwlO2Rz07mdZ&i{{3V)d z`g1gevDm`_*q8u5G=olRf51uWhr8X!DjX*0fUw{Ls$SEGC1Nl>L{P5|G$ zQ}nz`(6d&XW-%2mUF_*_@0~9EF8t8#xn4E()(!pjx8e9Jf4$W0c~oQB3|w3utF{h% zWd9;8N9x?_mPvomM2jqR=$$l6QZLpoladzas;VuJKy1H|MVi(ziO+lQ64My|t?myT zoH~dQ;*!=L4Xf}XymxEop;7_Mw`X5#``{7me(wa8Wn76v$nxbN#EqgyOWSPOn zZF$3q#vd7Ue=CBDoQbeOBjY}Ww*x~LIX2xfAVeD(bs-iFp_bwG_~93iZNz5McNc1~ zr;aEGDSn#S5t?EcGdq~jJvmw``_S;QxP({+@SPA|7WRX4SWWuP2@Ct!(j9v45)F|Z zZ~UTl)KtF1BGCjKyULD$!U012kj=4g6lTBUAIBrSe<;z7IC-Jk+3$M26=B)0y4Lr| z@V5ay3|;H#nW6Jm0i(af*C+yaM)XwNvvzDgjH9)!y;SXVO4iIf)(c-YRXmD~qPJAM z_bxrx(S+T6c0<|Od=)h(JGW=$nc*gc)z0b$cTKsw4?KI4C&Ftetr`hdT zhysNVrBb0-GR?v{r7IgXJCJ#y?@37TU;M~6f6mU2ONE01Brj-%oA{fJzeBmGL-ro?&?yycve>qPN{XK5It1`vAZqFfRPWqFl=Ru5#rlz}t11rzxR zHiQT!BSPdM%)&D8AFy9_cmsPfUfV4i!r36Fv>Dqp85^`1HK`=X?XCk*Ge9S5%f52_ ze;dxp^(JV$O4ekOuu;NJ8Ty+Iy1({p!5R21VNZnB+}EX@xh@ZmaaEqlrCAc?&D@7s zMuGVH%_VMG3;3tHm+Y$9Q=NZT_vEUEg^^%3Z(uYTjt%I9VidT}6h9d@Y-%=n z)Fd&|sAGOj!Xy2L7<9`yBsS5ZQ*fGXFD$EgCd`>jyA)W>q)R3dXtm@^nn%-e;A~a) z@mwe1KzetIzk2-|tW!+Dz3WZ9e)66H4^#aSus=}gt-OtEU{G3P!1mj0aC$h(c)?%nsZJJBbPMRrN0|8m5yIkWIql%Nl?kfQbmR+20Qdrp>=gMC0R zW37~;5|dJ;l>RVUO5aRN#xTZdp|&LDXBtLZ_7CpD^B9xKhE z)#x^^nih#~#q;xu2HgW6FT4GQWq%HOErdZ@`*7K64u+M_x+y1PZc@+-Dr0B)aRS-?VO82y)mlPpmuhG6Ch5_CApZho=$=2oG3GuttE;)(ni3wY+iL zkoJ?4R2SDyjFVDw{s;`TOYAK?C>Y7nm9OKHjpO3h6t$9ZeELcm)bo|otYJkQ&*m+( zEzxoH7W8JbV-0W1KSH}Idw(%fhX6NCor+Qpd1?vFPb|x3tBBVy& z4*0T)pwnvX-S~uP3=c=4@i%mmE>+IYPtVSZ#=jdM=A)xo@bQb6`H`#mcmz8@B~DT( z0)IR|J*PCBq?#Kq%76F+yC)4@lP9PR2HSuo!xHHxRLkFtksU>C`=Ra!0g1XWD%KRX zYD@Lz+i8HD0x5T2lH4Q3OYU`dPi1khV)_8R7SQ?#B*5L2Ptxd2F4?aO#80EwA zBOx-7?-U;0?SI8+VjKUnoHyJl zXjT+YpN$6_*DcgXp1i=3AloS&;`LUw!`1OQ_mLBgEZ_lF^yFLEk`P!(y9wv4bH+A@ z_Xqf%^{WPaJ1-TARNr0ax-{sO3m7h<(;brj5QC${$$!NtH2f9x@xY%up6^c3<+i#% zSdHvp1&7)fg#0IzOL;5vh|Z`6w9%Dt457bpIE~;`3wJU>M#a92p(vRa2*R;L?TDI5 z;Z7Jkf%>19jr<&e(5C8?wK2)Sm7fNaI-DNvZ3=->P0Wd4eNOb>Iw!t(ZQuVI8guun zW59F>2!D7zR>4DqRu8khOfRB|Q1lIjSI@*kx7Xb<%z9X_qHoDUNbwI`!3f80vm-Yo zCg1}Xp-%DC!ABKQl)PC~KHD>U{Ix2-wiufRHZNHjugMV%0c;9*Gt(103*B5$=g@`| zI1j5i`Dm*+H585H(H^f>3+M)q*WH}FbA|J6lYdt1ge!q(R4cIiZsH42D)9eNf&T=+gF83%7~<^og#(R6C5n()F5$zOe`^%zr=#AY{S1HYt`tD4bpu3;`kqBf?s`Wc0X& z3<%1zB)FWvZcyeF`G#k$lh@jC?LN%Dy%DJO{qtHu>WgAgwPP<6k3%6w2(=MLV}Pdt z0vAOMp*6e--=O-E$TZ@%n4knSrT}H#k{~=Kb}AsaC{=@CK4e1dv0?wVnLy&$24uy- z^~(0Z+zlQa*7ok-)BdE8Ha;*E$JnNQ7bQXz10tlLT8FFzs{H0@>fe2fegwoQUX zpl}|rP{Wx$jlRH{=K(|mIAS5AMZjvop+(q_kmExz>=13$DWr}u5o)oX_Oq9fAq*CO zvw;OH2lV-iN3UFbV@ma~VB}CvN^disM^)j;?Era<%`N@T1pqO$nJzL>H5fuKIl7t$ zWr!crrMh-h-FruPIb!=ks5DbZ4j2Wb?>q|76gb1#4>7chaGHm~nK|>N$gQ8H$jKbG zj~tu=H+NvEu%=IoiDAT$z7wG`bK6LN92C!RahOnU7-1gfqt>q;y>KwmT2McsLRU?3=iK;l6_V4Dxc` zYpOW`doHf0v3c|lp81vX@+-ob)IcoZn^0I3jyARFtAS8zgv~=X4C9wM9_fQbnvdI; zaT_|yE`V_35Oe*&_zG>&a?3B(9DGO<#7ann73E`EI^w}^&`3M@O5C6?ZkW5CF>q;d z)O~l3)*SaX#gG|bm$4}Y6$E_pFY1@@CkPdPs}pL*%?LV;#+XPf8I4I$lxh$CU7mv` zMKHIJg^0~s4pK;9In`Wy3-egh-%6d4Dg<~4l!Dl^Yp5gXJN3jhHB<+QVCO&18!CF|Qq7Y=c&09H6_y`N5Mu+QLw2nq>NUhqt8A5j ztYdglmM_jM5csSUt74s6CHPR0A0QpPEW@jl7^+z-J`;i^eb)?)=wcKFK`l0_cu+n# zJ}B|e68tR7xA4F}EAVg(kPAHADh;Q@<=r25J|X&w`2AdxeoDnwkSf_(aU;%D14SB4orXVH`;Ju=v1Zl#nYCzOcxUw_;L%QJPeX z?ymKuZ47c;!yeeijTlvT_`*ViG>iA<&u`vkV;nnH{-Oy|3R`I_Yk;4FB?f+LKr>we zmCfOGgXsnai+cFRoG)kgK__W9lTwUpHE*#QD(SlMG_kR6TrUg{-{$HoRH({%I_qYB7>%+jFnP&<^N!k{-WCy#igJH!!ZIWo@lSwriV(0Q*n z6fIM80}UsLx|(bQBiANSubLe(ikH}j31Kj|w^oT1XW zk>Gv;sgq1E4h@Rjg6e~#R-8jfog^BOUWw(SLlNaJTs=H+bU9&Rmu%L5;X1)?HleKl z%D^F{8w*zj!u*t~0YqinBOoTF;SE_kICUwwi~ zP~@TlX?}VlDx*;S=7v&#JvqY44QH|9i~5{|Dol=s@mW_uJo)#KmB?1(zbCNWS>>W$ zcNubYUqK@haMZ*ZyJUZ>j60QTpJo`UF5knHp<}LAvm&ZDLtIKYNU`w!2{o@z4!07` zZ$*1)jk_2-TE_h4KtW54cKl?&{5|Uw5i>?*ZKE*anOn-H$`!?b2NQ9aRd(1mGXr7b zLmGtSVu}GXVK*)q;-t!hMuvYjfu3MXC8OfC70N5LFnwB$h!S;LC3-hE@t}Mnnx%du z@#69!af-V?g()jLttL1n&mTdfI?K7<<9koDX7N(>mcu zp!m|~)#NeL`r!$iui7B9J z2|1JCzsa`c5fw6moFW6(lqf+&c;&9cZek1d4|KOBP0E4MbC9%9FYM!CJRZ~nq?Ngf z*!Ps#dj@5H+SG*!^_~h4pWX|@diM}7v&D#rZ^GGu<^xMK)76}dVL){XARaGEIJl2( zfy4c_A(c&gnENApF5qK{UCK#E59*#~=r2K#v?oU0K_fEb!?02RNLMxt3yfD?kpQ73 zXA5A1KY9KW!-^B4BNj)Hi`Xz78%lH;=|XtB$F!_}26R9&cW_lhVQT7bp}79KNfCjz)Za7Sw%bI(5e`Y8LkU*vCiX_!Y7Oa!XPwP;nI&D*L`( zy>@6^#&P>t^Y^~=9`(4f1)#_n8kI*@RFw`ZkB6i=dS5&|Ie9I4`4NU5Da&dw+AQQ_ zLpEs`QvHbfTfLo0iIX(glG(|-!BBZ$q?EsTmk}-q6@OZcV6ayp&2g;62YdB^q5z6s zf)w@%dcBDp`YPTnh1H3UTt2nEt~ZQ>0>F9G_sMt}zL1;C0WRM-0p3OMkufhUXv2gB z?Jf$V!X`?l(^p8DPXBmXWWNagFC7nY0*LX~CpZXXee4VM0m!-j z{UguDM1Rt}@pW-Ddv)ka8&zz!XL+OXD~>AYdg2R+WZ{E%XI|wDI_>__Fpd6aQiIfP z?n%xm6-wgKXtH}srdmza4Zk|0F&S}@SZBxEHJpFOVnJZn z5)R(@pw3nbU;N`{)r9KlwdUE2k^8WM(_vSBVJYGL03m(_%MW8gXhD$Y$Qh@!S48ud zL*oVoa@08=2v|ay4GjxkV(dYw0z#Geq47!+1?1r}0LfpJfuC$4N5}xJz(o|MH6N7t zWPebPCBI~&aV|+XZocb(lXUNi=|7tsAD^BTw4ZFzvm8&)DyPSZUQg8{9;u@hEf~-e z+6DZ02TDljW3*;cG&v78f}R_9uJhysxxGYT@Nh}LtE@a5yzZ97x@7kNn9?UIVxk)V?gY>#-Y*S7hmtaGcEx;e(y# zJlf^`DPPpbZo_$&p!sYBKNl=TV!Yec3keDS)eC8`av>3_}~ zbH)A*3GxpOS&R**HB_M4cx5X0u+Zmoz0||-p(>ENDj;%wNK1(!6@d1MF^z4*q$705 zCu4OL?87b}uo0&oHrArnK^3Hylr{kqkkUa+L#skqT9+<@qPP7ptnL>Mi`=va-=FCA zX)6&J>Upygg(A}wb#ORpQo7(Rh{=T}gPC0^%kIdfav&$^`u^NN!b${I;hI~>u zB5|aAazuAO*LbOK9PgKo_lsO)6s|^YICGO<hPZdYyWW1Jp~C7987Ql`KZO$#vW?1aY<(Al^Q@$-uen(J1}+ zi%~u*A2ZUvE#NHrv{U`WJ%4Ak2Zr9ndaZAqu-h=?wu+3XlKg0lmA7*FsAz;=-Q^PX zx9k1FdwD!wAg%B;c_<&tA2hVW3iNcJI^jnU@{Hoy0p8?M_4ln_#+(qs5Goi{uFpTh zj2*x5jDk8_=6_hdvv_=dsfcnDzI_+1{ZQ1}ca-{NRn#^_+(NQmAhF zQWRf+H+P{|X&X)Mc>a?3ZBjKRkIllwR_Z1s7e=%K6!kogAt$EK(2wjntpvV2ujcrW zx{;IOk4oy4rIk0}X@B^=CF*ynYfMzUh~+lKM1hs&jx~UlO>t0ia1f;l(`yyQ-;(%S z7Jn0hWA;zjDHD|n+nmADZP2SVw=^^`u_(ZI+E2FlhP0)%vG%VryGMRdG}IAYVLEEs`w~>NRtXH5cc^?q1X-<~6kT zU+d-#N46iVh4-@;q+A2BrEV|C3{VJR$wlk9r2iuw5gn=cR%S_8O9^{UTHA6_LxI3t zlJ+ zV?eRwr^ta#KWMmO^VpnZ0DthSku^A44Lmd%uH)z+<@(7npJ??KtDC=-Qs2aFOlB^! zmrBE=p;dCSqp9Pod+~PVp&O2z^i{qvlQ&8Q_6q~iUAlR)_bc6gZ9tBau?J-4!^Vy`U>9u_F!S*`~i-@a#)}&;iCUFNVI9plEc{g2o{B z3&n0*2L5C<<_l)Z4rw60rY}mD4nq|RKsNH5`>1gfo&y7CJ{?4^v@tP0cx-$UBHqc; z4ny)MpeBe%6P{=y*ex$*8jN%gM$sr|F6wmZ23q<3n}* zLnJ>WI1mcBz13pL%xS$ZwC`eLNakPI^XbZ?E=2>5v6yur-;pj*MleTBYM$qvmV<1g zC<~`JG&riFF`B!7-q(<9y>R0g!MW)$i@FW9ZyedFtqp3jA8h8&S^FMHk?^YFKT#6e z#m06JvLT8s_qoWI&2fa%ld=iXfWr(*XLOKJpS%ya0|&;Ku;t8+JRbV zo}dInF00mz-jM`@p`Ma^5~iq!$qeH#PMkP)!g;7%JgZbf?cABz$1rlKP&N);yfHe~ zBnrrCeSC;*@K+=8SuyR=3+(FX(}AIiLyfbJp(j#6q+>=j-XN95pX0I1fO6X{*lAHe z1*N*4h`5bq9%EiA3t6qq$f{FGJh=D!fTS_PE<3 zdK6=+BV7{uuzpiPd+!o~%kg+bT01yq<&FDVH*Yk5ueu<{D|}VF2_m_jLd2rYE^-9z zq5`e6pMV*zNV59#t|+pU55s=z>Z;ji1w@vRAY>%cLkIz5eeDU&RXyCWT}1YH#*ym9 zDaZ{|zUo3+bJ*ID1Ek{xfHW|DArKQy8vFhC7cx>*#b)k!iHbMu$gbB%Y>o_!V}c7{ zKAK{Gu(mgRR_xXGgtU-8N5YqWB3U4l?X7J+>!(H0kqWLgVGLuB@r=+!3uR?_Hkr^e z!|fA8pd%oFFmq(s1oNm)^NJ!%S93il7<2S=bzmq}DhxF%Y&1%Lj*$ixzw&ScFr(Ar ziBQ>uij;#=e0oVHE*0LA_;_n#25h6NF$@=f4(H0%#D!Ba!YYuFkKmT*E;<~xl@fep zuO?{j1$|iSg=vE?4eXl8HU$o@(uk?83^CXY3; zO!d$|{Q(%REo{S<=rB>u)%!Ws+nWB12`P)gD5gXk$q5Fno7=XDXf~Unwj-ujbnRiXb_>@zX3P<$(9y)5yiQR;13 zzGVOv3CbZnFv5v~+zBT#CCWjtkxRF4@s^!UlSm-)+cobYskagXND1-kR*TnZ&kv&b z73+r>F(u&^B|uonfH`^9rH&<>*I4)z7+}Hx-S`OxCjD6kR!1x3`J9a&m=DoD*eI@%-=pF{^fMs<6^k~j$8 zeK&+Df#$)1i{2FhoM52^k`sa03UcX#lbMeT6y~}&_7bmCTV59})7aU83P$mMO2#zG zF9R4A@a>TEiwQ&kTs@Fm5EB7Gq2N4#enR@XaRPx;1Izn%DOr)p}^zV{$!2JP$#0ib`P;kL2Ld5nVc#!UL;i z)}?=vAP(me3rC>>b_g7Qls9EtMzGzo2NN{|H!zsSm{1Pv9DP5fw-S5EKg`ftlK!BE zgY3^~%A2dmKS22lS&_ial1=OQFsGntB)R7F_;@5| zd5TXT^V=n^%VsnZnPbmg8oP{R8Z$KVeLp}Oqp?o z6wpGM(1Pg6j(y6FXckMpqKoK4F9FnKM#Dy3^$*lGWuPk6zKs)OSTjguif}fPzX{Ta z;A+x|BIfZ6pFtf2s+C}DZXj_MF{|W7@U!Iszoz5M9LLEW>pa?Y7N2o{auDYJefph> z8eT3T3I^mtKhQjX`#I7+MYeUe$8H@2l;u2#8(i{7McoC-MIcD8z zkHd+`@{>VDP@81U@B$XnKW2*4$1G2ul4!m6>M;$my)w^eu+$0SSNh$W{b5o5D9ImXwAqn3 zU928ZhvWT019yQ5t|$V;m*-;yV*qiGk=Qy@X47WNVr zaBYSAQ5zaVw(@im-!hh^PrptsJZ)>0rAB;OH|(J*UhxdXt5s{ zp@+`+QXwNYR6O($n&pJhgkb+BH)oE!1%hLLrp_{1b(TKW9&0MgELNV}tK&Fw6KjHY z;D{M!2f{NnY0=kKrGycfFw;{MdUMo z{tfrN5%Nm*rdql*>u_XK;rifHF*{@*eaQ~n2VZ39zVwHZDlFsErqW8AN-J+9t*i=L z|CCwUc(Rb!4`}vbkBmBW5xRB5>QX3~2F&%<=S@A#o7sSx~%Ff&Cgvsw_Mr-7Mx7y}x_069e{3$8Apw~O>bGPtPUev}88q($q zeNU8whV*e0EQM_6Is76T&Y1OjvrWeM&7s+9HyZ{!!_!SCoME5SJ`d^Oi^)1Sg#b_> zM;RnuTb` znYOfq<7;MDgAu>>-mRCmke1Zs4jU6&@3)4ny4kjR{pMxsvyqc8atJ<$s_Z#Q8u5NJ z4qU=?6_U_25}2(EIM>(@z#vrQhJL@>w`#YSm!z})rHNtifH=`&A+mv3H1&ZWUR>NY zuUqwY(`t1tyOjRo0-ZWZAz}`H>aCXE4VlT~!igkHkVK`gQM0}DjO40tAR7H4;e<{l z0}Ybpwws-+;q~^CGmIi|{uq51M zI3D1|I|-j5p=W4jCc2=i`Txq#B6e{4qp%)Ieufo%Jqp~(1A_6lrkCMD1SWrLzArWWj7BRCb+s3o zX?ljb?cIf;{-))5K89*&*Tq#4;_6?o7Pi-iQyr!d@cL5gJ&jrq9vtUMoV~HpR&X_O z^iIf2cnkFTh@o9bGSULw+Wcl2_%!24!y$lb#;X7??qtjbVnBz65i2Yg6nevO?9gRs zU%cG*2UG_$SPHeR_Pq|L+noQ zE3AgJ$N*nj{vIQ_CJyi;OSGFJ>YVeHxp6`mUX~SW#=6gE6I=wgu=xXF?MKw z-jI~HgG5S7ih6^PEA6?HsuITN%`oi*yV1A2ix(txZQoy#&$EbgLC;i+UYh#Nv=Z6{ zRjM3Ijtsu8z z1sh7vdM$=hgde7)>+fdH7#ucb>+XxV?+f;Vud(plaW1og(m_{#7 zgmELhrE2b{Q zRdKtwsKCj^roM`_ZtC3_qN|{EM3y$-`zsjI*+bx;k+y@dh;(^1Tf4x_?9<)|Yo%Q)5=EnXC-Ic)EtKHn^jVqFW>NDpNb`~f4 z;`N*Vaog%Q8*H4&f>PI`&`#MU*GXxUD7if-VyT4d^oH`pW5-^k3%tfIBfAlJ+vPA@ z5zs+w@7zNmvl?Fgdimi(jC$v$NfI%PZa^VgkleUX2b&hzqcjPY5WLixS~yOMoPU}EW4J7%9A z0wt?PRuY5GW>>iF<>rP>E4)K@_n!U-Vb?!8Pi5|D6XduY!$^Kph=+>y(XU7v;Bl9!>A#(DnUD$ z7;m93V71FYHBJPZ%Kq{-H=|7r6VYHUPO_w*a5~!BPwL|4&f3CISIOJhxQ~8wI557U z$n`th+%Y-xJtpe(WX+!yc}3M5l8bef=6$#^Uot6MQwN9S%C@=TQmd`dGJJuF>|Rb- zT{Wd-cRhr{RBA4k*(n4Dq6OhYIM~80iVWo+1E zwMbo2*d+SZI{7xq3GK_%LSlmOUCv*1#-A+AzA#oof}_}Oit}8Xf@xMz!-nNIHS`HR zuAYpz!`FSTc&JhD7B}njabX@+#RIN%L#fESu9>p<+S10B3hK5KLJ}i`;H1Wwx_dQ` zWF6@vG<@`*RhQDV(qP^+MW}w>^<+5<@*c&cFS)8#&1Yk%zbY3^po~MdIU%V`G~(?J ze{OLAZJ@jh$=v0670mMW9FKPwo#96(3dMuTuZw1H1BJ2H0B=L(cFu2C14CEzH|;e= z9bdvMW2kN|f9t5I=NegiQ%`ggutr_dK(Cd`9n_D8Qsmcc2zF)jcjkvW+e}3y+D7g- zk=l|>8NOfW1OyJ9WbP{>C>X-*k1J|VR9X@kL6%x^QM8C3jQ0<(25W!PPb|E0LvDC; zJx$l1*w;vET$^|u!PW^Z2ba<$W{{@GX#8sp6E zGpQx9g3iQJVarOu{RVI-&vt2(Ttw5Ut|N26nkZ5 zyvUhI`#gI~HqImB%Ov2`lSj%8Y|u>XEUdSpD}J5shTF(#V@qAyVV|z&ug(TcGqUl; zEqqiQRLt}cGVEa6=2#!Bbv7StwCatNbss@~;oiocG|;VVaEU4(9s9O*{s%FSSZF_V zSmVSv7%upPCZq<{szmB%&S1z)?-^CE4*Q^NQZX*p>eNPOe-KmdK{op@oOqlzP805! zlf6#^WmNp8l!8P{yiUC+ub;3Keu>;f6Ge6C#=v=6c(zQ#KQU`_GNhg@7Wh@nX`86e z@|@=Uvb57Lk&4W(zsc!;$$yYrOxLAHaK zaGkF=8jfy;uu)7>9c|)%e!*{`LcqBH6|RAACWq#sYi&tQGUhEFXG$1B@<9l}oZzUc z)3a{_jl5>-ch1|WHsQwIqp&;|G^^*Vo~mqcPU^ueAvl`+A%fj$LL+K|@dJX<7WtP+ z(jQ3a*IV=xy49Jd_$06j+9R#=g&>d45~}{f7HBp(npg(qrl;$iqLs{vAxH5CCCfAS zl%Jnfh(`%uoi6BoaKFvFD;WsAhN$og zdtG{%Z0n;Z=^x4J1mUF5Jw3lZim(%GC}|33E>xpoe1bhX=`DD-^moHWi(bS7nQNBJ zSJ9cL>w3$PZtoUjN_nuo;<{~5fkOtolaJ)fvYv-eeSn;kn!Q|4gFKKJ?R zkL)tqI@Cn^^AoxO{1^u8ghz$K43kK0miHB25=KHI4YKYf?imj)aSyk2cNbQd`?UwN z+o_eq!3VQ1mTZ^9KPbRoxiQ+}KC)cjrCEuFT{c>tb;D9$O+*n_=HyRHLP28g87ac* zT-MP9@=OP1n{RHL&02AOymvUP_KXfpu;}}uIPUv}lp#_C^E1UXDW(l&8!j9wkrF0x#iw!KraX=$)UHFo%=AdL9_bBZ;DP18|HmRnm= z@pQN`=`;HPqjpV|GamIl!!lKx!F7vUU$}My1=*W9o0XoOYZdr|_f$z!tE9sst6mYG zG3lEMRNJ*Zykc?LaXg|r@pj@nqK`3*V|B_Fyy+rJPKZc6+*;DVn-}NOye3o7n>k=I ze5P7J>bV=l_|#?*7j7>JqL5m6{ed21W61W@+ga3gYYU%6%TqlIAKrpY8)xz=zAE%x z((mMTlT`EJFT5|B^h-4EV5B3yoOGTdYXAMn@K1O%I+9Oist?()uVIikB??Ldqr)3! z7N2KV^%fTX#AWWsJPG%gQtuM(KEkHG^U!m+eLkY-zWh{PUpqg-v>C!EN~vS&DoG2g zWz*EDT+iuInc`C%|K?sa^>{lZ?$vmBX?vUd;WQ zB1TPGG!-Xd0e>(4w)mob?xtkAxn{5Np|w!Af(7%KCm-2aAy@7j3C3$fEa6bc58-NE z@)$`1JSF8%zEqrQFwaAYt_89u(KhR3A3eeXUX^AJi6~(PkZTJFOIkdA@v^ffB^Mz- zFH-`si`q}H8tZ2)c4>A{E$6$ZP8Ud->+4GVA+KU)TmB-8W z#9E)k7e?Ky$#1@#Wp<~L%tp<1ykoJsU*d8}&bRGcO5o%Qe^ciQ4H#%+yIPjt)Y#Fe zToUQqe38u7-Xvrs(faVRxBYNzvw_xeeY*X(Ec#v3%mKFI3Zc1GMKr$WFSo=mq@y`L zAFI?7`%fWe@`y=TD`+5AkT~bAf9k^)o^eHhgId@HMrNu^BU{DV#P5aRSJgZ}xfuTr z1In@|Cf>(TP5OR$3&k16DsS)vU7h_TlCqP+@jts+%AGi+m6kC4b3$U?o`Zwx4gWFK z0Y0tI`NyW%T6FfBSb{xoQlAFea^%idMq(qEz7p2_~zK zftP$g>t2E+*YkF)?e>nq9CYhom4ot`j5`%%^I*5em;-~T11O6n2(8%UNDc+I+tMZW zc=8q24aV`sj34-?X`)YizrA^Px^~w$KJsuh`og z438mMYki6>%lSSo<%(0$I7Z{2%`R^ZoM~EH47vUwT1%{I2vyn16yx&sQJG^zBF3e3 zz(9+|_LNm+QKErd zYWOGRn)_!~&NPTxBEQOymQRN7L%DH4OIBiB8T0DPK$r};FxKb=tAZ09(}2R(ucN5J zwN0p-$ipoBj8hY7B#nW3aT2bA3Ly&R@+MXup^k|fQh&!E_|(~-#!%N(=pd&w)>kj> z;@eZraD<=X@;pCPixBZZr&&{uqkORxDjy;H#R7>F{l#EdRYWB$wFBmUPIdA0qs{cK zd8F#K0AZ(Y^|AW;eVNDIoYdlJ?p%Wef17pT_lL{9RPS%yik0J*Ut0`9c-=^>(D_Bk zTQ~~U75YY@%F!{cvdKE(rJ0;mY+U(P$sF_P?4K7|w&JOeXm0m{$gvTFY<4etJ>xjM z9R#OOl6bxs$#;D~YH8oyVJ(=YW3!KX%5LIkeiV!p>F$e zJ#lx_o9bU2{$ekN_gp=g18|uTzhaS(x$o1FRl0v#52l z&12JwyMul|WeH2Rywf{M)W|&B8UMtncxNyg{W<@`XG=}tLR-|ac&}7;?Li{Ac+Mm< zlb{?2ocqeO)<}3QTVy+$jtaDsFzyIKYKK7tIAe|wvxEEzDnS&(nCJet;YGEWJBjotBnk~HWeysqPM5*6Rz))1ld-nvSMi2rw;xS!GCA?UJKN9ecN z`YhO;?0j3ZYUL6<QCCZV#1T|dZ)h~HXspkT?6n$9Elg)-B}SeMyTeI{sf-$6l(648!sMy?>XiY` z5R_%b0=K^Z*$2g$f#kWPpN6TN+NYBdi7};Wzv{$eV*afMYGDT&Y;FepRMTXpQLH!> z|FBI`#a^BOHn|j~S!v_`N)GC(o*I<ajRdWZaXv^TB|IImnoH#f#+7>qX8Cfa#cTJ-`5!)Y*AX?Wkc3jdb%7Sg zD+n)rOhfu}x6EwDl6lid&TquRi`d`SW1nPeKfAVpE1&h#|bPu@{w)qc~&a z!jB2`#$+{-OP5l7_xr4Ne$G3{)xx6FBiXh0_ZWJ*+HLK+`Krq`gZR{sMxoC&;kMN- zah_sI&$A1%zQ=#xgj2Dx=X>hh!b^gO7`Z_ZuwP{QCK0!~N+CVaIPrEU=t4}3u^rUNN4<2P@m6%v3Qq?T!hL9s;gk}}Al3SkS zPRl!rbHzki8X!n1)8+#ad*<{Kq{ZiNI!lDcgEJ?EK?KND?V zRUEl;EB>X+d(oy((Tr1Ac2!$nb4!ZzvFOUFFB|nV5NyY}hr?i`ZYwk(tmUS+P_rKt zYW7g#9L6@4_to4smaWV8&m}JM>hD&|RorDM`1>XOP@I((F+Oz1G^}c#TTw_7lA%3ym_gkMjM+nDc++Y8;4GLnQt_+_mBuGg`&&6=oM|tTT;bz`E<3-2#QuntbgTb z#*pw_?2|htncZ|Wd=ajou30a4&-Y#$@N|9^fv1)76iJ~$*VF~_s*ccKTpEyw?1ncd z6oD}bWJZanW!RFKv1qK>eFtg7qs<|e0wtG3e1m;M{v_>X zO+61&tIei5x48)@bC5SI5wmS%$L>cR4|1Lw!TPLR{Q&|(c_1EB&sXFh5CP7{nyzXO zBdp-}@JS|qmnq#jEm)@HaF-sd0G80NiB>aFa(G(SYoiR>O$O-sMr%ilaZkBsQvB}9 z$4{O)@1C;}>X?h&pqeXPewIRb^E^`H-GtNtbJ_hoLtQ}_^rP`94rlW>jsSeGoLD{$ zQDYwo9|BR~7r7Je%Tx@R+1bPF^z>GCY&Z&Db9DF>1XrFO1>zaqKdv;~3kh`o&>}11 zUl06nyO*1EyVt(`A$iKNJ;obh2q%D{CS`n+H-Z;|R>9?w_vGHUUeMDevuMz;WxZ$9 z=H_a5h2`<-15}~QL4HhTh?S_7_-&U*zm>}UeGh^D`w{K<`&Y8!jIHuE0fA}t&n9o^ z0+qQfn7@3gg?H=EZv5?vnwsMDgy$dI0hdQyP;gs()36rbDSMT74^37g)J|STXr)UWgw<@9XONz8e5heXQ-KK@(=zF z3<(F1YyhTE&cVFeosz04F6t9$C*)KWy%~9Z@$gCdfM0R7Fi$!2SU&kcn6J2cfAW(Y zIhC3=iJP>Rj*d!Rg?+3rt~w;w!*fJNhNV2m3jNhbwL?JtQL36Nu6!h(MX*=-_U+lw zXU9DDpQKR9z%qvX+(=3ilQoJ=d5?}{?Qay;cKp-}54y1`({8Gl)0NU`>pLbX`0sjs zn&jD?s9@nD_Zyt4JYs*XuQz^9Sbh52CoesLV5Msb!`olM2;zFD9LK zZSJVEN#QJvtbdYnu|6nuMfKX1c@J?EzsyP7i07ko87(Bu!Q+6pUCD7o?hrURJm>OC zqxW`=hHBC1@aK(Og8~jOgwxe_ZEwC8bji9l;47^kYir z73iC=ema&BYV}Kd`=(sS$FVw@P0p*dMmoU793q}6*Bd4adpE?rhdkV|H7}a_gjKV@ z>xRgDFLGdqlr=(vFq1p(3ISt_3Gp{x57wwqRg#^1G|L+ZZXKJDL+1{2zp#q-!DWe9 z+v`eT{F7_3+S^eaJFf%dkd<2Nr=*b$mWeG2GO-;sR$X>0Pxxk?O6ckqbMaO;H4}Y} z!XQ>FD6_4vPeJ-N5p#@;5M@{cpE=WMMK`~RJ6d)}IuN$s)h^qtR3Y{?o939|bh&(} zLVH1sSR!(9K?nZwS9wFqi;HEf_PACo>Ha;(d6#2KKH8e+OPE6b7m0-22$)PEFo)6# zrbBO;xh3}2j+7-*@mY}y9%eM<)8bwl3PU6LgQI2c+tz8Cs5eYi(hm*?W80StZxYqT zG~o=&{V!MOo?#@0h?kiLJr_h}>3wskdKEw|UdDyd*1~Jc?fApRK)4olq}XQ?J16zq zqjW?klRWv!^WI$QfScgf8{?f}Y6Hg}9~U(gm}e?|tft+^V#N6VK@O6S=2Ro>pYtKd zQTHgx%aj59H78}=bA<0zId{m2y&Gpz4fRWF-E;+b_yZ@ZlZXuMk)}<53@E(?!&X1v zn-Wb4TQL@_OErBd?$v)!L<@(Hv-3Fp0NduQ)`|je8PlFYClzp$AUh}6TSX>r+`07l zkFAC~sTbMh>H0B(qr>f59ba3TuEn7nIDdo0!MXOPg1(huabDrO`?`dQU*%q5hj2St z{Tbmxs2Zl2gfeR{iEcceh}gh{)|X03RSPrWGk5MRlVtm%XY9_T%{m3CR4#}19o8P) zyc=GiK0!BTLY}gPsy9@B7CX&U>8w64l|9jw$eyE6(37XP!Q$XJYB|jHn685&v=6t9 zC%eP_OVefdkABhoj!_k2i})xOn6;nG)j}BF@0;6*;OuYZB4GHj*J>C8?)WqiSldi(`PF^RBxwj?20oqv<{MVg07JZQ2Y z`1rItoqPuuyXut0CiO#09JO68q+CeDEu0Z1P5x(*EmNBh*0Cs#x2?CMl5zR)khtZ= zqbU*UzMe;1(`Zz5@;{bJjGdxTs2;rvR*%MTUOzC67*6N^9(=qJe_ACY!kBCR=b{t| zu2HLlUnJAq3!9aMIgxMIXar+5GRZpjkZoQ&HN2;F&xjg6fzH*;xGk&zGKG{9s&d1+ zw`hV0#~KN7s7*e;A7Rn7YbV}L`S`*}`sB}>#FLLNWPH!bUqro4;wNsY%y&QEqNx(; zsHN8IO(%(SBuw|0mDHU`Wu84{Vme&LB2!27za#99fNhgmf$ut&Z@bO9+_(x7zfiLRVVhGea1X`dR%^oS*7J!xXg_#LKR-}S3CdVd|2x*LM*@wu-24tvAQ}7V zJ7hO{*>Hek7_P?6{Dxi3C`unaR!8e>E)~C7`CH$i&Tk&MiUo3X_C?nqsrU%PmF#v4 zYaV_9>geA(O0iQ%X&(`ktc*G%(KLJP@-5T15^W^?+H@Vtdqm*8$!<4{Ret&B=g-=t z*joRj59a)2k&zT7I+F{b@`h+!guQ_m?;N`pqYM2M)1xGh?wS2r8o5$K6D6nhda(-` zpUR?*>zF!3#_@W!m-JBfFq_KpV7K%^@#R2s4W$gx?9^spjg(G{?`SzrI%S+AMF4vR zokCAzclOthsv~zuxVQ6dGW0%-C)Q;XcIL~RrgOKp*ZVrdE|N9LW9En$kQ%~~`*wwz zTch$%gVM?T<1KUHqqLPdxm3;Z;8_9nSi$ev+1aLtT=sqypRpF++v!h~H7zA);C>W5 z_cn>*(>WVC-a@!=`&8W<1Ir>Kkl{4+h%+0kms*)}U#6A#R>S-j?rfnXYQWt&*Pg+d z(BTb7M#8fNv?4<8`qrejHi$7QkoVbw%BK6FCjS$HrSKEY%7ZuV4Uy|*=Y$Q4CT|>x z@3hZ+Zy$%U5|w6WynZ)M)DNfNPqt2d^azKuZcTxu)6u)tw@9BF^xS_K?Ci16a5!)8qeZRu}hoYbk;uoeQiJzWM zXAC|aZZIKy{`5@VN`S^=o+uwL{z+^|6OF=LUNNSEQ{wCcyU352UDIJ0gZD}W({=KC zBT1PF3XV5vIaw@X^s8+Pnl`737pg6`KbG?a0#WGoKX@$IFs5%l1mb!}x+=1&+lMoq z>Zj$fMMV<48&WIBAFdRHR0qfONq=U_o-d@g8>4p=Y<@Z&d@hVqGaGWCM#;uQ;hFsU z{?wZG;#$cxhzUDR^Ln(d-K#NN@8##%*6zE0_c=0M~;^5aUH&mV?+c_VNZRlA- z?OqX(%Na@7cm|g}kv{%9CBtN}QOYkcT$;Pw6wcUeI5q~pcbA`jnyiJ;j-g&tKBIbE zB>8Ud;ASK(=@t4r1s^TVNaSG4_W^Y@+sC)_km;2T%h~t6gbj30{mSyOI%VdzAIt>? zB2P;5hwc>|AJ56veW3#BZ;(xB!sD*U#&sg5&>z#k*T0W|i@{eu#IL(EP|c3+;I=(& z*_yC9Js?mBB~62iTV9`>m~{tLk*v-#k*#h4^TN?a>P(q+w~O}*wx!9%R5r|$+| z9w8e3W*FXqT{-@MbU>NLW`p7t&vUB(oxU<>mX{gTLEnzn6Eg3itTb_3@{jV)MYR<` zoXMHB;g{GshT#_156l&^(W_9-yCLpZRAC(ddV#Ph12>-)`Y@wJGwMk5aq%oI)4a^r zXYv3YFPwF#_hDvQ3$Oo4+{LIX&8B=@gYieZPZ#(_;rRJ)6&QtH(Qz;In0J_Bwm#Gc zZHEV4P(~Jf(}U7XsN>z0<6i0p!KzzTj_4DOM0*6zb4uBBIcW&!iq84-AJ=L2{7IZX zxZ;ku4_rf#G^YvL8(9Jw$5o*FI2{6qq?*I)Jb{qlfKVGhtyoS(T_G@y ze6d=uyk)VW(yLh`*8M}k=|p8~;OPw7quJ~{De{}I2cIDNTfJ}hQ4~lB$jJ|Hg4XUMJfKGqu01 z{JUD(?v4u@=Gv>{3XXrD}a+V@GFr*5}Ylw$q83k>D$XDYgU&{+IA%FwP3F#>1y^pg*d zo{t&^h)4}oAE^1|3v9v6U^7TJWgO5PkNP6r$S;sVonP?GdzH&?Aa)OM2Y`^X2fKWR|K?<(H3Oy5+$9>B3n*NH>W7Ry~K&m67v;0?)aSg9CR z7nF|H{Wv=u zEBk{8)I^qO_kn+*mF+I$r+S>Qoik!$v_v>Nv2h0r&%h8Tpeen*NEjS+Bo?*tkg zSAsC#Y$oC6tT4hJHCCry*p;!@R7VwA#Cw~@|19!za%WmZvR`<~msY>Px?dA!Y$I2O zWU4p9rb)+IVn$EI$)~lF)KadVEFK&9(mBtC&WWsyY(Ui)3qJPmpC)QUtjXN(QShLo zJ>f>=3h$3$NqbU+EipKe4fHxbJ4uc78sys)_OA+sM=C6BaceFx6yyZ9I5F_Le)wkp zY#zb4#lx#RR9dNAopSsT|4`xTtRmYnXBfJa-73xGwbOAu5%R-6?ZLBl0^xKQG4nH{ za!TeAW~1A+oVEEwq482@cj+?`rXTFk;?3Zx>gP#3uFx&~K@Og{m}YV^*%vH0XWX>L zmD8}o$zKQ=R%S$i`>j2h-76bZd+&ycGH5?PtYOxmx1`j6}GlnUhL z$$gd_y`--z{ouU7pSm78=KVf5zb4N2v!|!9E{(awufruHKX!g6%XW;9%D#z=kh_9^ zKJxGbkqGlMb%!%c%*3qx$(FA&lDrPZ#NF5Ug2o9H?U=TDmQgc72DgO^oq0`oHO;oA z(QA+F2lHtfF9J>sQ@;%#6gKR+e;mq_RNX6fhcS&K{Kh29Pw@fPw5G$i)eDix!C|F% zuX0;f#qE2=0&5-p^~2VPmmY7V9L-7$~HOk^d}IV4$F;yD#i&l_g(qu*-r!r!^LnyHK^mdx%XDetdI#GTzKoK0fefFywtm&P5I=(vf-OMTXyO?d zksCNwTV25n)s#a+oDt1K+8-_9IhLn$AaeNLqF#gzTde(cXX^XZgcL&mSSyjucasK| zT1!M$?g5AXu3l1;E%gF7Au9yP7u}X#_ma1@xvfp>nsMDw;uy=p{=4rp$A)6MVg7+Y z+?<7J&7%>YAFM>UFSSI4BoJ?92XJm{^G}wvE@A`Agtx!me;t1&B#4H)pV!tEcALJ# z92FlovSFky&qZlIHpTno6>19)4ErDA_a_uDX%0VcQy zK}w;bRva@e%bsQs{^@BZ@im(JH=AF36pCNAFD6!^KTLny7C>LmV@&Rwe2@MnzpkVt zJ!}=bphB3YN!&`G(OyMG%!9vyFAvhG=!|HJJq4K=>3{%q6> zaW6-FKDF%5gYgfV{`GW;#xq_ zg85@c_qBcx&AHUrntXJt9D!L=NFAoo2`y_&0h~eHPxN&K#iAk;2Wn_1{kzzDPt>y3 z?pCeUh$N+ReDWs{)SM5@)wqO4-DVPNB8I-?2(uIMy-nF?^+gdPR{Ie43hM(MK@AK zW)G{^&z|QaQzYceygNVG#r}%LbMT^)Fk{HBF?{xC)+Ht3*M3Ve=;8IdXHGLuy#g`c zGYqXSvPbjXnD&pe4n51#$g>)9tb8Z`O)2_!{IfcQQp93%_Gfp&Fgp_xS~f77e10Fs zk7=`L@>1T!dEb0LYdrg*u}yD7a0HY{6WhQ({Xll@SjrlOEH3?J*n z&|juOf{m3?42S<4)fQ44AN%?(rObF%K({j5GSyvBl7of~H*MB<72y(RrX&!9Oj{p; zx!wP;M*F$RFVR%4W(oO41AFLB$d8MxJRCTy>=R3pg!~3|6{m6NujMu)L28m9k=%X}E-xf?$O(Uz8S!-bO@u zlW92Fb#D^*sU+E8ZA*`JD;{_nfWMkc_|Y#b(!! zwj{sdZ5fq5^iF?tg3>1k+Sbq4j(gnVOr9$GR2)CsY@@W+qiM5?(v-R~aY@-An#P{# zLVYYs`nzalUyka9_AvwXF+-;+(=(>#ezng;JJ7`0d7|o{4puFbA4O@tWc+m~pJaYjf&fcqOTx&Pn6svX)p_L<1li0MP)520%0bq5%*MfM@_j10Wgz(Ex}BKr{fN z0T2yL<1li0MP)5 z20%0bq5%*MfM@_j10Wgz(Ex}BKr{fN0T2yL<1li0MP)520%0bq5%*MfM@_j10Wgz(Ex}BKr{fN0T2y< zXaGb5Alm;35RJ(xIp5{UbJYKBl}R-ImwWa%;C4qOOtx}=!uzjjq5G3|Sh&Bbx#tt< ze+iOnJ)fNYqhI9pg#TaqjsKsPM#B96YH2VyFt$$b49)qHV_7h${z0Z4{Uy`>SqFej z17sQ?(*T(U$TUEv0WuAcX@E=vWEvpT0GS5JG(e^SG7XSvfJ_5q8X(gEnFh!-K&AmQ z4UlPoOao*ZAkzSu2FNr(rU5bykZFKS17sQ?(*T(U$TUEv0WuAcX@E=vWEvpT0GS5J zG(e^SG7XSvfJ_5q8X(gEnFh!-K&AmQ4UlPoOao*ZAkzSu2FNr(rU5bykZFKS17sQ? z(*T(U$TUEv0WuAcX@E=vWEvpT0GS5JG(e^SG7XSvfJ_5q8X(gEnFh!-K&AmQ4UlPo zOao*ZAkzSu2FNr(rU5bykZFKS17sQ?(*T(U$TUEv0WuAcX@E=vWEvpT{zs5$%udOH zE{M-j|7n#S{gX`l8~i2H6#g~%FD>nF@WK;O`d@Y3t zh|YR({YQB;v~4cPGn#1*^5*&CW0`0FGd_Gx(mD6whVEX(n^#@An!oA9}od*0`XP z#g^*2m|&`{+v@Q)M;>i%<_LWq4A;h7>+wpNl-*!Uawa8_dmOvJK|sW~4k;eVR+bJ; zuH2XR)WPAmHIZ{25x|@+y{|thIZuB}S!u+5E$G+;5eLAsXL55!X<7EL<(v6Sqe!p+ z$9S|H@d&7+D>5?5lar(AtC{49ZeWp^s1^np;)6&%`Ol=h`QJCcE$o68;dZ(V&!z&` zYK>2F-2CZ@RrtpmBGJClzU)-f5AJQSthY{WmPxUveT=mp3vX~syP7%Keml9BA~0%i z?Wv5D!GzAz^&-jZRnbNiH(T~#S1Lv=#*7TYWa<`#J0dR0Q<1D$Eu_bLvV!FVAM{wX z{2$`c_EB^p#1FgJ0tv9TOig80fy!*edZ^EE7=2_sx~_6ub`TdY{dh$MdlQ>cdhw10 z36!e^In_5*?o|{Cw=T#mq(lO_-6+j_QE)NHE1Hry^-GhDHDEC@-kESxl8}d{H#ktb zqvTKGCHqNn>K_(pPqiw8(~Z|3F{gYb&f-p2(QYNq{GU*uG|So04|f{;ta_5;O4mEt5+__8 z2NWNRRPx%Tw*LT+R>GVP1>w=%iST}z68LPO>f%_P^yk;F6%G56r$2@2-@;sqSYo8h z3$u_ATg!(fDD+>^38mhIG(i@crU+1IX|uClXR z=&AoiUb_-1`Yfa1szNp%>LSB_<;*Tkj=F|Z#Mu{r{c7c4{7oNS1%#;lD7f^x1}2e@ z^~vTlQaAIW_7e0|aoR-wo_{-!7W0q`t+a-V_Zo&NW=OSZ%lUHd66>dT@K@$weHm3Q zn$spPBSBu8-R~b!ZtrMsv>W-(MZY)x;^US@o_kBbJtDjA69(6}Z)`o-33w;V@jKt^ zfB4lb{s@N>PuHK1ZILtrReX2AJfDi1*xEPv-J%tWGQ0Q2)x+W2{MV+h!D+ZYnb36{ zS(7``t}Bu>`@-wJ$RzeZQ`Y=OzL>3iTf49S%{-c!i6F!!=r6)g@!%0OATx`$6pmf3 zyGC`E0~f3umv83|Ir_J~u6r+zCj0SFV$0L~3RYlph@?U!&tWib(qSto8oNvKCk`B0jKnTYCKfMX8M!5&PeQ25&YD^f?VYa8M^8iD`8DL|J?<{@yx%KM>7zWhswQgohHfN zx{*G82!TJxF6MU95cJb^Snk_QT*$}@!!EJHv6C;0%%zDuoO6EcqUoDS%5V~xs#RV@ z5~$hcvHyH^3Yn8%f6C!xh9BbOiml^pVtn~_Y1cI_{r%_xZSB$3>_#Z*Z`_}++ZJ-z zFZGp*W5`{_yzkvdfYMV+yX(C&z3^1$AI zBagQAXaI?}H0kR9AtZccoGZC6(-gwzjF1(5GWEW0EbDvu^y_oXy(xD@yjb^B1=0o! z#52mnn{RVse+nX~8mj!qt(xfy55ClykNJxSX#bR+F}JQmXTQyEXyR$Ym`=U%6;ai{iha45AR2~WX%-MmyfJTE?>sATVV7I(Rx zN5h=pQlu)}Ttmk~vc5rO*F!h2H=?gr z2>1XyZYxF{Dfk_S1!7&zr{Fla5mk|McATX@Hoz=%BKcjX&K`frY8rX(tD?Z-HYnaQ70 zEX8mFqE6f$5U4w@7+%D zbD;Sq@D9t5qy2uw+`M?7{LJRWCg$J3qwNq7Lj&Cjrhajb-3fUzg=E&6Yl+DzJL{d7 zss`4~q*2%mV&7Y1$%T_yEilWG4$B$N`t>dK)bvf7mc(zVP>Wx0!RWBU@he z0%h7@%%C`;?(@YZ*QZ7vk126tRlTgExFxv;{lMt@?NVLS<}`SAl_R<|^1b-sm%k6< zG9cZ)=R#+&b~klpop46Zu$orimx9qM=r6yS8(tT@?g)PWvyl2r7RkpX;K9xR7okwec&Cp9yDzz3_$1;=^_LodkvGb3d+<-!jxYr| ztwI_Q0o@&sc_{6lulN&i6q4kWdozLE_vL?;T zoZ!>+on+-}`&8Ta6zGGFuOEc9zrM<@iE!(J8m*D;x{FY`tLo*ytjvjv$qwDDoat&8 z6vpKnjU3!093WKsQU|=LL*1JyCY>{TU08fWJreb(+q_9ug! z;L}Ol980I2U(uFc(H*GUoQ@0rcX51Z5Dog~M#TvgA6ReOwd^D|+DV<|x zPrhb_L>@df9vMTwn{eHBM^@`&J4lYrL;Y{$(SA(XKrdgj{?0c2qj3|h_t^1pFx`x_ zU-Za^|3LU>&ibs}Cd=kkd{$PPa;rS)%V=PutSPI3*H>K;px4&O=dpqTw+8pkG z7k`YxL>~HY_9di{-Aa$lH}Oa+FTwe-|Hc0E5@ zz}0U`<;9J<(e-mXxW}v?9Tw-uLJyJ8B9`DE6RuTKAIW}aD=6!f$~d*XQh?-#IGHc# z>D%+`k_m2;Sz7bIag@{yJCD)xINN;L!k&26!~UqX8Zb@MwTX13Vhw z(EyJIcr?JH0UizTXn;opJR0E90FMTEG{B<)9u4qlfJXy78sO0Yj|O-&z@q^k4e)4y zM*}<>;L!k&26!~UqX8Zb@MwTX13Vhw(EyJIcr?JH0UizTXn;opJR0E90FMTEG{B<) z9u4qlfJXy78sO0Yj|O-&z@q^k4e)4yM*}<>;L!k&26!~UqX8c6e+rLg<$@%G`cJFu z_+NN53U?$GwEq)m$8(YkBv-m4<-+}?(9}JUUjECeeH{0FefWG(e;Q zA`K8}fJg&G8X(dDkp_q~K%@a8jR_EGfJg&G8X(dDkp_q~K%@a84G?L7NCQL~AkqMl z28c93qyZug5NUu&14J4i(g2YLh%`W?0U`|$X@E!rL>eH{0FefWG(e;QA`K8}fJg&G z8X(dDkp_q~K%@a84G?L7NCQL~AkqMl28c93qyZug5NUu&14J4i(g2YLh%`W?0U`|$ zX@E!rL>eH{0FefWG(e;QA`K8}fJg&G8X(dDkp_q~K%@a84G?L7NCQL~AkqMl28c93 zqyZug5NUu&14J4i(g2YLh_wF^L>h}zGP)xQMY4k%GGg+P6EZdGKh?6+e`0BWZ}D?Q zRzv$g!9TDxo#YQ6P{`r_hU#v}3jcB{dFKO)`#<_r?#N>Q(*G|k4UhHz!qQ-2*kEvy ziA69tAq*I#v%hHCKkGk@ra>6A1CdeH$4X0~T1IkTj){%&%lju-94^mmR*!j329$|} z@l4N6$S5ctdVK3D2Cuf)aFUJGf;p0$uCYY8PDt^2E(y_!8G_;tsd%y$EzQ3^u01Sc zT|;phbQmW=y}>W-&o@Y44HEeVOeNc4%bthf3oXO*jVo-_OZ8xqi9lHFS>GQR3upKX z$Kr7+L}$JJvuGNGw$0@k%`^vj^L+8K%(MR)AHF8(oO^IXcQ4}2D=s= z4u|WRW{O(0BoNY@8-sUY!T5UEX4yM&Ewzk|hO)Fm&M^&LP&`ydpRT%p-p7*D<>s?( z#y|g0qG?cEzKZvI4VVu-;(~}ZZdRhAZU-ZVs~FFEt4nakeFT*l$J{X|ar*gtFK%mG z(8*#;bzMv_)z)qGc$*`SHaByGz7B?KW3KghrA*3huq8Q@lE^)d-QOS}VqAw5k7O%L zhbC9<%X{kJ@Y|ZmxsC{6&X(TSpOl=Zzoo1+;=YCi9h-;)VA(UdIis{Jd)V^L{H0N( z|8r;>lp`L|(G?jP<;ls>^wmuAL^rTVOjHYl4Dmsvp8RK0-u&;I-xhX3i*P$#hG$cO zYqiEFId1;+#47w_4UuTyXkT`!=?C{VSk_yoHp`^g(>}&pkA*k5rCrUOY`>k{OA#2g zxAs)V$zVcf>3Wgm^{QwiikmHauqzd#7Gp*R0h&zR!W|KpH-s zw-o;~Xd2|F@l@fbT9v`+#_NxmQ@#>sai^Q$P_MYy+=PFg!z zH9tBweL_-*FdBm0@cAmQS^N(wdrRE_7uT@{-rFQd&Dw2Wyk1ymrrz!`kEw+30GEF=4tNs3US)mlO& zM3yWm7usxWo8#A)?lK4<^$A#ADOb%(TQKXC`Ik zW%pd4)hkH$H*7rDeekAlakU$ZocWTK-g~SM`^oVsHKy}cI9VP2P(-FNvQs3gleiAX zJVP?-j}XS2B3^V4*o+nLJj?#7-`d;nNbQ^Zh4)X#Av`CpPDcqA`m*+Uv+BvcwdfCz zk(+OFR<#Wvlqh%i{b@7}aj;WYP!G~l6`u1uRkPt0M|&vOUGq+n(L~16CQ(VQzKDBJ zsYRX>nM42F;JWT(?jypVgdLd#+wHeJJQAs%Ax~xXi4YRgI;?l7;f$}H*V}9cwZC;e>)xE|;m;{k{W`I7=+B~Qh>f;k`tdIwje>i8h|A{AFpYEFUgNP{ zJ<$BfyQ)u@-o__{aHSsNb~Q{3zb+O&*y>5E6su~9iT6-z$~9?YRm-#q@-va50ZmD79%%d!KjI6{qJ^@!Zc-ue#0>$9P^_l)g=rqfGUMRo9Ttib&v} z&o>~&p9_esJf~vV!W5AJm7TebZp~TSwen2WHt(*BKl>o;ozTfYiKZdlG#l;WLUXHm zetw!%YwB#;4h>#Xn7;OsCa1i*g!=Smi*Z7KlP}BCi@qa9#Daq?qbmkyYFl;YZ-t2z zWCt}IDw0U1X67BJ3nB;adac)Tz&Q^m_vKnap<*GvId&#MtKDsNKhg4fa?NAHac3&4 zuHA^FgpQvAuI;DW5{}gRL(=v*?9G9#XbK}R}(?e+r3>HT`F(()MsT?I2;s? zj{I|I8nOzLyVft_17D=(x>Ef<*Zr8-`@! zTw!WwR3410TKYIhbEa6mblciLg{C2E4Y?kKx!DtjVnwbk&1_^A3Qmnox6`@Vzioep z<*R|2ttJ(h;(V`UUwPS8J zYMJ**!t&G^?X3o$?yn?=YzS!{%g6Gz$x#Mn?8B!%^ihvZ_(lKqXV5gHV{c;{QDZx~ zf;{}lTUFg`r6Xr{laxMRQQ**)2dAWW>`R!CugVD6lGfN3l5QHHq_E}07p`5o>a3rW zD%6t|8asnX7wZfOKWN)^qv$-9XcVl8w z;le#dzb3MPsb#|FsCI(_tCQ#Rd+wOq7sWBjZT&0}C)7`Qx@iodM#Y;~t<@N1aGl9Z zt6;SCWY}@2zWp>uhU8@JfxXkWEXq$iy-pU*Ojv#{M&S3OX~@!hwd2})t*jd|rH6Z_ z+ZXRg!xn=_ncY3K1ji?$<8;->}VzH=s%h17&YH@D>*93_8E01n#!CN zAR26)hwX2=O>A|rNWMKI`YeKGUi2}GWr7lKB{f=;>a@uk8FPMas}p}?hufnEgrK1Z z)VvjWr*ZbWC&@_8UdIHlh8=RwB8aL3DD*AF*d8_!)b87SNx zUpNth?UcCAMq=u$dD-j3tYmB+ak{hC>~KoKmjvzg;QT4;tmUewDmn-TVmfTM`6HZ;W?^zx0 z>kIE5UpBKUSt@$*=I=z)ke5v^n=E9;uG!CTpE++yE1#n_7qJec&}4b%_~%=lN7G#r zT#P9RS4$7vovx0HXnHxLv|>IYg+}9~IW@~~HPXA*{jt`*;_}&H&Zk*rkb&9c%;iWB0!JQW#uQv+>sFfX?r$`|#F`e0btDKKT zd$}|5scMMqD4$MScPumF+(pimkjuj7tnYjr>#3h!bKK+Rh|AzWJ((6kVEcV&8WR4& z&2W}al5eBgM)|b5Cj;@tb)f_C1$Bl4mnLk|cK28g^oW(n>PL$^WrSM}+-NDjonQHc z7++i&N{lb4G$e{izIyZCl4$Mx(b@s63h~&Gfj4v3YkI?#ugVcTHMYW}tt;>O$8lFi zTEffngX2RQbKxps?M$@j>8-Ie!7~I(S+6br3-A@IGs)VegT^XY#Oj> zz@`D425cIzX~3odn+9weuxY@i0hz@`D425cIzX={N^12zrV zG+@(!O#?O!*fe0%fK3B74cIhb(|}C_HVxP`VAFt212zrVG+@(!O#?O!*fe0%fK3B7 z4cIhb(|}C_HVxP`VAFt212zrVG+@(!O#?O!*fe0%fK3B74cIhb(|}C_HVxP`VAFt2 z12zrVG+@(!O#?O!*fe0%fK3B74cIhb(|}C_HVxP`VAFt212zrVG+@(!O#?O!*fe0% zfK3B74cIhb(|}C_HVxP`VAFt212zrVG+@*IC)hMu57fvFtBd_^m5qOA)98U&53JFT z0aH(`6$2wZkl}^Z`yqgS@xtaWe17*RR`Z9?|Ax{Caz8<7XdnZJ5;95W(Y{~*HjjoE zuR+2i?hb8fKfBY`Aah7yA8&f~i`7Ra$8+8fDGt||{H3|ne%ww_Sa|MXKwie?;;vM z{wpB333cVt9}nTxc*msNVAPer{vkn7i&HKEsh^WdZc$CHqi|pV&)0Qn{KZup`E&(*QqlSvs%ZM$htLtOCL@~Ov$({(VKqvSCImd@#G3Te{$v7 zorO6)4Fc+W52Udg9CtZJ*^8W1WmWZZ*sxcK^DTy^i?(u{eHY63uvt2y&5=*TvbB!M zYc>AcL>QhPYBN;S?5RI``#GfG%#PIe7J~r{NLo!qLQ{E$DOug zjy@!-v*h?3($@B&KHK{qukz?_DtE&P^(|6$zJx~ZYSl**Uvj)~f*0?Yd)X1pJ|4DI zDhmJn=~JS{{l}rZ2%Qi8FE{FU$;NmRmmARPW@ngL@Y82*Kf7k4cNWbWFg&)KTlKJ= zf%h{t!mB&8`NOH>SN5#PvRyN+?p}xp1T)B8T|G)7K$stIOUGLxH(GtmFNO@&= zc*HT1eBpfu-C^^SDLUFa@q#RKTKPh+V{X0~n;ARkda8}Fw{q`j)5*@RhU_wepKL??;KmS;j)`J?V@vCXn{}MRLgMBp2q&mYR}!AkC|}COXF5o zZjA9aPU(tRBYW*}Wh_1y-?D+ZF}54wc}CV%%s_YC)v#0=?%?!bIz>zQw|KMxc5{T~ zXdjnaG{a%(!n8vtO=JZuu`1kBCpP$1P9=Kvvb0SGDru`fx>UseXz7qTpUGWy(zdRx zvs*XwcTWf&T(5O^ zldJ}lkG`UETDB7oY-$?oJNXU`O}e!{6)~0O=kS+Uc?7X54+)5TW}K}ucGF6xw`h?NK zy{uLGZ18a0TGc2hZ*!>?aP! z3gx!{8$4R-sw>E;r4nDYlro#tZrGT5x!;YM|L~z>yIbnA*BbeIFq2x2_$!8*tCtHn z8-_$1RZmH1#Lk2yQH_q~xIPn(nC8QA?(~kCKGM;zTs$=z{-sHAU{_XiwyW#ghxr$T zay!mytHj@$%Fw4Em4aNxo^pCZ*iP;gQWa&|xP#hYT_ur$u$a))+bwc1my~6ed{QC$ z97rik#l@1vFRA`{9xZb2I?_=RN`ACAWOMxb(p?4tq&@+wE9I(LiJY0wO;TES38gJ( zYkxIR{mi7SyzHLqvw8)|{)Ua`x)0v;Ev|NBkuzVi(tD5fVLv%OrN(sL3MZ?hABxB{ zMs|usbrRRXm}f{v{Sm@=Q^bqz0h_VnooCr!^;>)U9jSeDzwrL)IGz(%k?APGLSNQC zZ&p3Iw-){3F>>=w&Z@Qngc9ZMzCX>QIoPQq3hF^xs={-Ar)oC5;%E=$x@+DkGMdPE z+9WE;)faIODz(USB6H}U8(i0Y%zZ@oldvO`V7vX6hesmSGvukPJ`qA`zJX@U$DNIc@Zw<0K1aYQyGWQ&cS;uz0si_*7=a+ImQ zu<9DpSrG~R^ZAD2&jkpvmFH9pTbLpept3W!(XBaayH=j5+UDJL@n;`|y%Re5Cwa7P znhl~|Txf1J&(BYjYE7L@+o8cr3e(qK(&Us^mr$SHY%xygZ}MeXdeL{ph*)rtWpu^h zOl_;q{H-vNg6yD%Lq!tF)XcmCbwT9dU9a_84mjuGS`h=db_tvqf6z@ zp8Bk;3WtNj(UE_SM_Yx-Mb`R7eBg`JTvw{!=ei#gdw-ZDuNoS~Z<=7HFzPNIDX?jh z>nUk>>ASftlk6AB`-M1W!Xsl?qzR$&e&+JmmRX`nVTs*I&JiUNC(h+M&v%UKyXJ)L z@hVtPNlP5h-=};oeT|@b`p9@CcIsW_%pgv^<3WI`6vc_p|MVk9y%A(PRn}n(pR9p# zhtIP4n@kohjVny;jLL&?RZAZSY0ea@mu_48r+BorhFr*lFgJU`P^`$crJ0S)Lcyt# z>2^9d`?u}SuzWQzv(=>HQk?IV?CUQjS3bQnI(W%M&|fiU?d@UVEV*h=ve)z*4#EqC z%_7O4I&qw=&NEoK9k{ZV%C}lRcX5&1F0+aIeAXv9Dg{sN@FI)5J)%A#+e+Rw3O>rv za9BqmT)m!qH6rsqNm!mbqrKI@)BTm?kPRWtWBFL#HaW_mjD7gjhd%1D3BTyS{tS=S zv9}RvBWi3XSCEGvd8?|Mt#stfZj#dHD+(Oi^5B&8j(rIe@>LlDThbcaLefnGloYm{ z_`EfMcYa@pUPF~jAUA8T$-eLB!9dmWF6t_B(z$&3-!tIgr zDy^nTZ_eo4W6IMPi{<8*p!PPr<@`LIA6F=rkBHwnW;Bq8sXD~6RP4e?D8jgv|c^|q~<}iePERPgXo(Zk_DZ2bY4O)_kOIHG_`SF zMU3EDsZ(EaQAiV&IY>xn9ZX+2T5aWMX=Y_t_>RncC9povabu9*{!fY2Uj6j!jqJ@f zbvC!d@@`B_DqOgy=+{IRFttqh9Mx`6V0H3*e$O3q`=U4|xvifi;)MDsPdANGqv8?s zsX zua$K}ru1;nbels<#0SP01%8dxhKdvGdB{7``I(?jIz)6o z6F#|pRm0S5nn~MyVBy*c#hl}_5DI7j~n;~1-AIA4oPcxPPkwYU$5!Vy!6ff zjmaKj@Ul?yLq%1BBKa8-Bhq!_=0q|;`Q)`u$?NhWy)?oSvhh32ly^D zf7Q*haEm?cB#e9PZZW61>%Q@|oG_nCGrL{piw0z`wY^RWF*w~4I|7Rk3~M4v^_%!@u|u}o0nt)xb4Qk^zgk2ya_Y<1#q z>~MSZfDknFfSR`=?=;R{_aqs~+3T3#)v!a(nY^iccUN2HAe&1YY9{o1d9?ka)rdqO zH~#WY-yow zYvZ{~CIf}L;|nK3u$>au*+@*CH7|R8n3aspBTjeLnjKCl_>v%=dwuf;RtwFL$IBWI zCpvocemL*wf4&^sLvnu`v=rx7d&}VpQpD4HOoYJf(v}n0VaIu9URkU}_i{y@!;mRg;WWjeTu?$&K^7y-qRqF}$>8DY)~(yBkcoV&=G5^`Diob{cLV?FiLYmR%|9B~;Os3+4R z2yDNPM+^Vph8WKBN%Czp+bEw__hcZxxGr=czM#%<;L?Om+U_39fgZ6ES^a2nr;KpR zfg3HwxAQBX5aWw0Ly7SPm4-wy$yaaQTN16EKUzDWRUsZ5GVo^3dQES*@>My4r^Z&8 zv~}e@|2Xc-NK1HGesFw9V=i1JteuG#J-s!SCOCG@$Yl4O4IZV&Mu_1P(y9qb$+Dz8 zlc9~4A$3_j{(SSz-9u0W3J;0*@j|My% z@MyrJ0gnbe8t`bqqXCZwJR0z5z@q_=20R+@XuzWZj|My%@MyrJ0gnbe8t`bqqXCZw zJR0z5z@q_=20R+@XuzWZj|My%@MyrJ0gnbe8t`bqqXCZwJR0z5z@q_=20R+@XuzWZ zj|My%@MyrJ0gnbe8t`bqqXCZwJR0z5z@q_=20R+@XuzWZj|My%@MyrJ0gnbe8t`bq zqXCZwJR0z5z@q_=20R+@XuzWZj|M#2{{)XF_l-v*qS>w-E3x0fvdQm88a+xk(un9& zGF}#s$FTm8@VAvlPoP_AM9LMJztHzySgs#R{Eep36Xk5*F3dEzW`pAozEGGR=OnV5Mo7&bNxJwE1zQ~Pn?x}zLN z!}C+|Th|bzJfzHOo=d2uyI?RA$59qVyeiKC-AXexW?k>*Oju%Z>jbFw?{blOX9w?%M7i6$TE0yr_i-j4K>0vA?tc=%M zEbL4VGYKDCf)cp#VraTDo@=qJI(io4UVn6jGM*1D*THj>ex1mw|Js8vs;h#R<@x-} z>{tEY?1j*H75eNK2`|i^>8TG3g@KnBO%$a!V(ZKD7ax5Q7fJrsONSo|<-)T6Yh{t7 zg;tnE{J&MC>v{yGMQi!6GhbU%4_}^monp{ zzA}AIKR1uqFc|fps>b=SqQicyM3kn67hiO&-Xu%49DVFo`nBe#v30(zC^tV|3XNPv z-@kv}7mZh^H*Mwj?GCFJj^M93tAE)(*`Ml*E@7io5(WQ0f+N4Qz1jn{(W19aKZ>TB zcwY3p240kBk)%ou`W)UJWkWA|v#niN^?&9_nRU1Jo6`SNF(~~~`e_c?-V5b57pr_# zn_fAFx_3b&L@M|%-|JqOtCWeeB@hq5{KR&?euYhl@#2)5A z*ND-V>sv32WG(cwLvmP9ji!%S|W0AatJ{U1x3v~n*9wG}{^Ut)O zA0m=JZOua($E60GG(Uad!i(+aZlui6GCBNmriU&#R0KzV*6gsU-Z^6oQAudHB;Bctx91|AZz8=rNSoZPt^z2qo gG;Td!>f4*x)OZQ~Er`K9r2h)9$6#Vdawu>b%7 diff --git a/firmware/tunerstudio/generated/rusefi.ini b/firmware/tunerstudio/generated/rusefi.ini index dc52826a1b..a845562cb4 100644 --- a/firmware/tunerstudio/generated/rusefi.ini +++ b/firmware/tunerstudio/generated/rusefi.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2020.09.07.all.1681901319" + signature = "rusEFI 2020.09.07.all.3195023341" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2020.09.07.all.1681901319" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2020.09.07.all.3195023341" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -74,7 +74,7 @@ enable2ndByteCanID = false ; see PAGE_0_SIZE in C source code ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Sep 07 14:17:13 UTC 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Sep 07 14:49:25 UTC 2020 pageSize = 20000 page = 1 @@ -632,7 +632,11 @@ page = 1 tcu_solenoid6 = bits, U08, 1197, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6","PE7","PE8","PE9","PE10","PE11","PE12","PE13","PE14","PE15", "PF0","PF1","PF2","PF3","PF4","PF5","PF6","PF7","PF8","PF9","PF10","PF11","PF12","PF13","PF14","PF15", "PG0","PG1","PG2","PG3","PG4","PG5","PG6","PG7","PG8","PG9","PG10","PG11","PG12","PG13","PG14","PG15", "PH0","PH1","PH2","PH3","PH4","PH5","PH6","PH7","PH8","PH9","PH10","PH11","PH12","PH13","PH14","PH15","TLE6240_1", "TLE6240_2", "TLE6240_3", "TLE6240_4", "TLE6240_5", "TLE6240_6", "TLE6240_7", "TLE6240_8", "TLE6240_9", "TLE6240_10", "TLE6240_11", "TLE6240_12", "TLE6240_13", "TLE6240_14", "TLE6240_15", "TLE6240_16", "MC33972_1", "MC33972_2", "MC33972_3", "MC33972_4", "MC33972_5", "MC33972_6", "MC33972_7", "MC33972_8", "MC33972_9", "MC33972_10", "MC33972_11", "MC33972_12", "MC33972_13", "MC33972_14", "MC33972_15", "MC33972_16", "MC33972_17", "MC33972_18", "MC33972_19", "MC33972_20", "MC33972_21", "MC33972_22", "TLE8888_1", "TLE8888_2", "TLE8888_3", "TLE8888_4", "TLE8888_5", "TLE8888_6", "TLE8888_7", "TLE8888_8", "TLE8888_9", "TLE8888_10", "TLE8888_11", "TLE8888_12", "TLE8888_13", "TLE8888_14", "TLE8888_15", "TLE8888_16", "TLE8888_17", "TLE8888_18", "TLE8888_19", "TLE8888_20", "TLE8888_21", "TLE8888_22", "TLE8888_23", "TLE8888_24", "TLE8888_25", "TLE8888_26", "TLE8888_27", "TLE8888_28", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" tcu_solenoid7 = bits, U08, 1198, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6","PE7","PE8","PE9","PE10","PE11","PE12","PE13","PE14","PE15", "PF0","PF1","PF2","PF3","PF4","PF5","PF6","PF7","PF8","PF9","PF10","PF11","PF12","PF13","PF14","PF15", "PG0","PG1","PG2","PG3","PG4","PG5","PG6","PG7","PG8","PG9","PG10","PG11","PG12","PG13","PG14","PG15", "PH0","PH1","PH2","PH3","PH4","PH5","PH6","PH7","PH8","PH9","PH10","PH11","PH12","PH13","PH14","PH15","TLE6240_1", "TLE6240_2", "TLE6240_3", "TLE6240_4", "TLE6240_5", "TLE6240_6", "TLE6240_7", "TLE6240_8", "TLE6240_9", "TLE6240_10", "TLE6240_11", "TLE6240_12", "TLE6240_13", "TLE6240_14", "TLE6240_15", "TLE6240_16", "MC33972_1", "MC33972_2", "MC33972_3", "MC33972_4", "MC33972_5", "MC33972_6", "MC33972_7", "MC33972_8", "MC33972_9", "MC33972_10", "MC33972_11", "MC33972_12", "MC33972_13", "MC33972_14", "MC33972_15", "MC33972_16", "MC33972_17", "MC33972_18", "MC33972_19", "MC33972_20", "MC33972_21", "MC33972_22", "TLE8888_1", "TLE8888_2", "TLE8888_3", "TLE8888_4", "TLE8888_5", "TLE8888_6", "TLE8888_7", "TLE8888_8", "TLE8888_9", "TLE8888_10", "TLE8888_11", "TLE8888_12", "TLE8888_13", "TLE8888_14", "TLE8888_15", "TLE8888_16", "TLE8888_17", "TLE8888_18", "TLE8888_19", "TLE8888_20", "TLE8888_21", "TLE8888_22", "TLE8888_23", "TLE8888_24", "TLE8888_25", "TLE8888_26", "TLE8888_27", "TLE8888_28", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" tcu_solenoid8 = bits, U08, 1199, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6","PE7","PE8","PE9","PE10","PE11","PE12","PE13","PE14","PE15", "PF0","PF1","PF2","PF3","PF4","PF5","PF6","PF7","PF8","PF9","PF10","PF11","PF12","PF13","PF14","PF15", "PG0","PG1","PG2","PG3","PG4","PG5","PG6","PG7","PG8","PG9","PG10","PG11","PG12","PG13","PG14","PG15", "PH0","PH1","PH2","PH3","PH4","PH5","PH6","PH7","PH8","PH9","PH10","PH11","PH12","PH13","PH14","PH15","TLE6240_1", "TLE6240_2", "TLE6240_3", "TLE6240_4", "TLE6240_5", "TLE6240_6", "TLE6240_7", "TLE6240_8", "TLE6240_9", "TLE6240_10", "TLE6240_11", "TLE6240_12", "TLE6240_13", "TLE6240_14", "TLE6240_15", "TLE6240_16", "MC33972_1", "MC33972_2", "MC33972_3", "MC33972_4", "MC33972_5", "MC33972_6", "MC33972_7", "MC33972_8", "MC33972_9", "MC33972_10", "MC33972_11", "MC33972_12", "MC33972_13", "MC33972_14", "MC33972_15", "MC33972_16", "MC33972_17", "MC33972_18", "MC33972_19", "MC33972_20", "MC33972_21", "MC33972_22", "TLE8888_1", "TLE8888_2", "TLE8888_3", "TLE8888_4", "TLE8888_5", "TLE8888_6", "TLE8888_7", "TLE8888_8", "TLE8888_9", "TLE8888_10", "TLE8888_11", "TLE8888_12", "TLE8888_13", "TLE8888_14", "TLE8888_15", "TLE8888_16", "TLE8888_17", "TLE8888_18", "TLE8888_19", "TLE8888_20", "TLE8888_21", "TLE8888_22", "TLE8888_23", "TLE8888_24", "TLE8888_25", "TLE8888_26", "TLE8888_27", "TLE8888_28", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" - unusedAtOldBoardConfigurationEnd = array, S32, 1200, [65], "units", 1.0, 0, -20, 100, 0 + drv8860spiDevice = bits,U32, 1200, [0:2], "Off", "SPI1", "SPI2", "SPI3", "SPI4", "INVALID", "INVALID", "INVALID" + drv8860_cs = bits, U08, 1201, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6","PE7","PE8","PE9","PE10","PE11","PE12","PE13","PE14","PE15", "PF0","PF1","PF2","PF3","PF4","PF5","PF6","PF7","PF8","PF9","PF10","PF11","PF12","PF13","PF14","PF15", "PG0","PG1","PG2","PG3","PG4","PG5","PG6","PG7","PG8","PG9","PG10","PG11","PG12","PG13","PG14","PG15", "PH0","PH1","PH2","PH3","PH4","PH5","PH6","PH7","PH8","PH9","PH10","PH11","PH12","PH13","PH14","PH15","INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" + drv8860_csPinMode = bits, U08, 1202, [0:1], "default", "default inverted", "open collector", "open collector inverted" + drv8860_miso = bits, U08, 1203, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6","PE7","PE8","PE9","PE10","PE11","PE12","PE13","PE14","PE15", "PF0","PF1","PF2","PF3","PF4","PF5","PF6","PF7","PF8","PF9","PF10","PF11","PF12","PF13","PF14","PF15", "PG0","PG1","PG2","PG3","PG4","PG5","PG6","PG7","PG8","PG9","PG10","PG11","PG12","PG13","PG14","PG15", "PH0","PH1","PH2","PH3","PH4","PH5","PH6","PH7","PH8","PH9","PH10","PH11","PH12","PH13","PH14","PH15","INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" + unusedAtOldBoardConfigurationEnd = array, S32, 1204, [64], "units", 1.0, 0, -20, 100, 0 tps2SecondaryMin = scalar, U16, 1460, "ADC", 1.0, 0, 0, 1000, 0 tps2SecondaryMax = scalar, U16, 1462, "ADC", 1.0, 0, 0, 1000, 0 unusedHereWeHave = bits, U32, 1464, [0:0], "false", "true" @@ -832,30 +836,30 @@ page = 1 unused1128 = bits, U32, 2116, [5:5], "false", "true" unused1129 = bits, U32, 2116, [6:6], "false", "true" unused1130 = bits, U32, 2116, [7:7], "false", "true" - unusedBit_478_8 = bits, U32, 2116, [8:8], "false", "true" - unusedBit_478_9 = bits, U32, 2116, [9:9], "false", "true" - unusedBit_478_10 = bits, U32, 2116, [10:10], "false", "true" - unusedBit_478_11 = bits, U32, 2116, [11:11], "false", "true" - unusedBit_478_12 = bits, U32, 2116, [12:12], "false", "true" - unusedBit_478_13 = bits, U32, 2116, [13:13], "false", "true" - unusedBit_478_14 = bits, U32, 2116, [14:14], "false", "true" - unusedBit_478_15 = bits, U32, 2116, [15:15], "false", "true" - unusedBit_478_16 = bits, U32, 2116, [16:16], "false", "true" - unusedBit_478_17 = bits, U32, 2116, [17:17], "false", "true" - unusedBit_478_18 = bits, U32, 2116, [18:18], "false", "true" - unusedBit_478_19 = bits, U32, 2116, [19:19], "false", "true" - unusedBit_478_20 = bits, U32, 2116, [20:20], "false", "true" - unusedBit_478_21 = bits, U32, 2116, [21:21], "false", "true" - unusedBit_478_22 = bits, U32, 2116, [22:22], "false", "true" - unusedBit_478_23 = bits, U32, 2116, [23:23], "false", "true" - unusedBit_478_24 = bits, U32, 2116, [24:24], "false", "true" - unusedBit_478_25 = bits, U32, 2116, [25:25], "false", "true" - unusedBit_478_26 = bits, U32, 2116, [26:26], "false", "true" - unusedBit_478_27 = bits, U32, 2116, [27:27], "false", "true" - unusedBit_478_28 = bits, U32, 2116, [28:28], "false", "true" - unusedBit_478_29 = bits, U32, 2116, [29:29], "false", "true" - unusedBit_478_30 = bits, U32, 2116, [30:30], "false", "true" - unusedBit_478_31 = bits, U32, 2116, [31:31], "false", "true" + unusedBit_482_8 = bits, U32, 2116, [8:8], "false", "true" + unusedBit_482_9 = bits, U32, 2116, [9:9], "false", "true" + unusedBit_482_10 = bits, U32, 2116, [10:10], "false", "true" + unusedBit_482_11 = bits, U32, 2116, [11:11], "false", "true" + unusedBit_482_12 = bits, U32, 2116, [12:12], "false", "true" + unusedBit_482_13 = bits, U32, 2116, [13:13], "false", "true" + unusedBit_482_14 = bits, U32, 2116, [14:14], "false", "true" + unusedBit_482_15 = bits, U32, 2116, [15:15], "false", "true" + unusedBit_482_16 = bits, U32, 2116, [16:16], "false", "true" + unusedBit_482_17 = bits, U32, 2116, [17:17], "false", "true" + unusedBit_482_18 = bits, U32, 2116, [18:18], "false", "true" + unusedBit_482_19 = bits, U32, 2116, [19:19], "false", "true" + unusedBit_482_20 = bits, U32, 2116, [20:20], "false", "true" + unusedBit_482_21 = bits, U32, 2116, [21:21], "false", "true" + unusedBit_482_22 = bits, U32, 2116, [22:22], "false", "true" + unusedBit_482_23 = bits, U32, 2116, [23:23], "false", "true" + unusedBit_482_24 = bits, U32, 2116, [24:24], "false", "true" + unusedBit_482_25 = bits, U32, 2116, [25:25], "false", "true" + unusedBit_482_26 = bits, U32, 2116, [26:26], "false", "true" + unusedBit_482_27 = bits, U32, 2116, [27:27], "false", "true" + unusedBit_482_28 = bits, U32, 2116, [28:28], "false", "true" + unusedBit_482_29 = bits, U32, 2116, [29:29], "false", "true" + unusedBit_482_30 = bits, U32, 2116, [30:30], "false", "true" + unusedBit_482_31 = bits, U32, 2116, [31:31], "false", "true" can2NbcType = bits, U32, 2120, [0:3], "None", "FIAT", "VAG" , "MAZDA RX8", "BMW", "W202", "BMW E90", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" can2TxPin = bits, U08, 2124, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6","PE7","PE8","PE9","PE10","PE11","PE12","PE13","PE14","PE15", "PF0","PF1","PF2","PF3","PF4","PF5","PF6","PF7","PF8","PF9","PF10","PF11","PF12","PF13","PF14","PF15", "PG0","PG1","PG2","PG3","PG4","PG5","PG6","PG7","PG8","PG9","PG10","PG11","PG12","PG13","PG14","PG15", "PH0","PH1","PH2","PH3","PH4","PH5","PH6","PH7","PH8","PH9","PH10","PH11","PH12","PH13","PH14","PH15","INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" can2RxPin = bits, U08, 2125, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6","PE7","PE8","PE9","PE10","PE11","PE12","PE13","PE14","PE15", "PF0","PF1","PF2","PF3","PF4","PF5","PF6","PF7","PF8","PF9","PF10","PF11","PF12","PF13","PF14","PF15", "PG0","PG1","PG2","PG3","PG4","PG5","PG6","PG7","PG8","PG9","PG10","PG11","PG12","PG13","PG14","PG15", "PH0","PH1","PH2","PH3","PH4","PH5","PH6","PH7","PH8","PH9","PH10","PH11","PH12","PH13","PH14","PH15","INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" diff --git a/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini b/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini index c9c0efb817..0e7f802310 100644 --- a/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini +++ b/firmware/tunerstudio/generated/rusefi_frankenso_na6.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2020.09.07.frankenso_na6.3282346300" + signature = "rusEFI 2020.09.07.frankenso_na6.434850262" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2020.09.07.frankenso_na6.3282346300" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2020.09.07.frankenso_na6.434850262" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -74,7 +74,7 @@ enable2ndByteCanID = false ; see PAGE_0_SIZE in C source code ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Sep 07 14:17:19 UTC 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Sep 07 14:49:31 UTC 2020 pageSize = 20000 page = 1 @@ -632,7 +632,11 @@ page = 1 tcu_solenoid6 = bits, U08, 1197, [0:7], "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","Injector 3Z","Injector 3Y","Injector 3W","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","Coil 1H","INVALID","Coil 1F","INVALID","INVALID","INVALID","Injector 2M","INVALID","INVALID","INVALID","INVALID","INVALID","Injector 3U","INVALID","Injector 3X","INVALID","Injector 2N","Coil 1O","Coil 1P","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","Injector 3V","Injector 3S","Injector 3T","Injector 2O","Injector 2P","INVALID","Coil 1L","INVALID","Coil 1I","INVALID","Coil 1M","INVALID","Coil 1G","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" tcu_solenoid7 = bits, U08, 1198, [0:7], "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","Injector 3Z","Injector 3Y","Injector 3W","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","Coil 1H","INVALID","Coil 1F","INVALID","INVALID","INVALID","Injector 2M","INVALID","INVALID","INVALID","INVALID","INVALID","Injector 3U","INVALID","Injector 3X","INVALID","Injector 2N","Coil 1O","Coil 1P","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","Injector 3V","Injector 3S","Injector 3T","Injector 2O","Injector 2P","INVALID","Coil 1L","INVALID","Coil 1I","INVALID","Coil 1M","INVALID","Coil 1G","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" tcu_solenoid8 = bits, U08, 1199, [0:7], "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","Injector 3Z","Injector 3Y","Injector 3W","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","Coil 1H","INVALID","Coil 1F","INVALID","INVALID","INVALID","Injector 2M","INVALID","INVALID","INVALID","INVALID","INVALID","Injector 3U","INVALID","Injector 3X","INVALID","Injector 2N","Coil 1O","Coil 1P","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","Injector 3V","Injector 3S","Injector 3T","Injector 2O","Injector 2P","INVALID","Coil 1L","INVALID","Coil 1I","INVALID","Coil 1M","INVALID","Coil 1G","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" - unusedAtOldBoardConfigurationEnd = array, S32, 1200, [65], "units", 1.0, 0, -20, 100, 0 + drv8860spiDevice = bits,U32, 1200, [0:2], "Off", "SPI1", "SPI2", "SPI3", "SPI4", "INVALID", "INVALID", "INVALID" + drv8860_cs = bits, U08, 1201, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6","PE7","PE8","PE9","PE10","PE11","PE12","PE13","PE14","PE15", "PF0","PF1","PF2","PF3","PF4","PF5","PF6","PF7","PF8","PF9","PF10","PF11","PF12","PF13","PF14","PF15", "PG0","PG1","PG2","PG3","PG4","PG5","PG6","PG7","PG8","PG9","PG10","PG11","PG12","PG13","PG14","PG15", "PH0","PH1","PH2","PH3","PH4","PH5","PH6","PH7","PH8","PH9","PH10","PH11","PH12","PH13","PH14","PH15","INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" + drv8860_csPinMode = bits, U08, 1202, [0:1], "default", "default inverted", "open collector", "open collector inverted" + drv8860_miso = bits, U08, 1203, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6","PE7","PE8","PE9","PE10","PE11","PE12","PE13","PE14","PE15", "PF0","PF1","PF2","PF3","PF4","PF5","PF6","PF7","PF8","PF9","PF10","PF11","PF12","PF13","PF14","PF15", "PG0","PG1","PG2","PG3","PG4","PG5","PG6","PG7","PG8","PG9","PG10","PG11","PG12","PG13","PG14","PG15", "PH0","PH1","PH2","PH3","PH4","PH5","PH6","PH7","PH8","PH9","PH10","PH11","PH12","PH13","PH14","PH15","INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" + unusedAtOldBoardConfigurationEnd = array, S32, 1204, [64], "units", 1.0, 0, -20, 100, 0 tps2SecondaryMin = scalar, U16, 1460, "ADC", 1.0, 0, 0, 1000, 0 tps2SecondaryMax = scalar, U16, 1462, "ADC", 1.0, 0, 0, 1000, 0 unusedHereWeHave = bits, U32, 1464, [0:0], "false", "true" @@ -832,30 +836,30 @@ page = 1 unused1128 = bits, U32, 2116, [5:5], "false", "true" unused1129 = bits, U32, 2116, [6:6], "false", "true" unused1130 = bits, U32, 2116, [7:7], "false", "true" - unusedBit_478_8 = bits, U32, 2116, [8:8], "false", "true" - unusedBit_478_9 = bits, U32, 2116, [9:9], "false", "true" - unusedBit_478_10 = bits, U32, 2116, [10:10], "false", "true" - unusedBit_478_11 = bits, U32, 2116, [11:11], "false", "true" - unusedBit_478_12 = bits, U32, 2116, [12:12], "false", "true" - unusedBit_478_13 = bits, U32, 2116, [13:13], "false", "true" - unusedBit_478_14 = bits, U32, 2116, [14:14], "false", "true" - unusedBit_478_15 = bits, U32, 2116, [15:15], "false", "true" - unusedBit_478_16 = bits, U32, 2116, [16:16], "false", "true" - unusedBit_478_17 = bits, U32, 2116, [17:17], "false", "true" - unusedBit_478_18 = bits, U32, 2116, [18:18], "false", "true" - unusedBit_478_19 = bits, U32, 2116, [19:19], "false", "true" - unusedBit_478_20 = bits, U32, 2116, [20:20], "false", "true" - unusedBit_478_21 = bits, U32, 2116, [21:21], "false", "true" - unusedBit_478_22 = bits, U32, 2116, [22:22], "false", "true" - unusedBit_478_23 = bits, U32, 2116, [23:23], "false", "true" - unusedBit_478_24 = bits, U32, 2116, [24:24], "false", "true" - unusedBit_478_25 = bits, U32, 2116, [25:25], "false", "true" - unusedBit_478_26 = bits, U32, 2116, [26:26], "false", "true" - unusedBit_478_27 = bits, U32, 2116, [27:27], "false", "true" - unusedBit_478_28 = bits, U32, 2116, [28:28], "false", "true" - unusedBit_478_29 = bits, U32, 2116, [29:29], "false", "true" - unusedBit_478_30 = bits, U32, 2116, [30:30], "false", "true" - unusedBit_478_31 = bits, U32, 2116, [31:31], "false", "true" + unusedBit_482_8 = bits, U32, 2116, [8:8], "false", "true" + unusedBit_482_9 = bits, U32, 2116, [9:9], "false", "true" + unusedBit_482_10 = bits, U32, 2116, [10:10], "false", "true" + unusedBit_482_11 = bits, U32, 2116, [11:11], "false", "true" + unusedBit_482_12 = bits, U32, 2116, [12:12], "false", "true" + unusedBit_482_13 = bits, U32, 2116, [13:13], "false", "true" + unusedBit_482_14 = bits, U32, 2116, [14:14], "false", "true" + unusedBit_482_15 = bits, U32, 2116, [15:15], "false", "true" + unusedBit_482_16 = bits, U32, 2116, [16:16], "false", "true" + unusedBit_482_17 = bits, U32, 2116, [17:17], "false", "true" + unusedBit_482_18 = bits, U32, 2116, [18:18], "false", "true" + unusedBit_482_19 = bits, U32, 2116, [19:19], "false", "true" + unusedBit_482_20 = bits, U32, 2116, [20:20], "false", "true" + unusedBit_482_21 = bits, U32, 2116, [21:21], "false", "true" + unusedBit_482_22 = bits, U32, 2116, [22:22], "false", "true" + unusedBit_482_23 = bits, U32, 2116, [23:23], "false", "true" + unusedBit_482_24 = bits, U32, 2116, [24:24], "false", "true" + unusedBit_482_25 = bits, U32, 2116, [25:25], "false", "true" + unusedBit_482_26 = bits, U32, 2116, [26:26], "false", "true" + unusedBit_482_27 = bits, U32, 2116, [27:27], "false", "true" + unusedBit_482_28 = bits, U32, 2116, [28:28], "false", "true" + unusedBit_482_29 = bits, U32, 2116, [29:29], "false", "true" + unusedBit_482_30 = bits, U32, 2116, [30:30], "false", "true" + unusedBit_482_31 = bits, U32, 2116, [31:31], "false", "true" can2NbcType = bits, U32, 2120, [0:3], "None", "FIAT", "VAG" , "MAZDA RX8", "BMW", "W202", "BMW E90", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" can2TxPin = bits, U08, 2124, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6","PE7","PE8","PE9","PE10","PE11","PE12","PE13","PE14","PE15", "PF0","PF1","PF2","PF3","PF4","PF5","PF6","PF7","PF8","PF9","PF10","PF11","PF12","PF13","PF14","PF15", "PG0","PG1","PG2","PG3","PG4","PG5","PG6","PG7","PG8","PG9","PG10","PG11","PG12","PG13","PG14","PG15", "PH0","PH1","PH2","PH3","PH4","PH5","PH6","PH7","PH8","PH9","PH10","PH11","PH12","PH13","PH14","PH15","INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" can2RxPin = bits, U08, 2125, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6","PE7","PE8","PE9","PE10","PE11","PE12","PE13","PE14","PE15", "PF0","PF1","PF2","PF3","PF4","PF5","PF6","PF7","PF8","PF9","PF10","PF11","PF12","PF13","PF14","PF15", "PG0","PG1","PG2","PG3","PG4","PG5","PG6","PG7","PG8","PG9","PG10","PG11","PG12","PG13","PG14","PG15", "PH0","PH1","PH2","PH3","PH4","PH5","PH6","PH7","PH8","PH9","PH10","PH11","PH12","PH13","PH14","PH15","INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" diff --git a/firmware/tunerstudio/generated/rusefi_kinetis.ini b/firmware/tunerstudio/generated/rusefi_kinetis.ini index ccdbae934c..3b2d990a16 100644 --- a/firmware/tunerstudio/generated/rusefi_kinetis.ini +++ b/firmware/tunerstudio/generated/rusefi_kinetis.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2020.09.07.kin.2414148739" + signature = "rusEFI 2020.09.07.kin.1437275241" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2020.09.07.kin.2414148739" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2020.09.07.kin.1437275241" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -74,7 +74,7 @@ enable2ndByteCanID = false ; see PAGE_0_SIZE in C source code ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Mon Sep 07 14:17:26 UTC 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Mon Sep 07 14:49:39 UTC 2020 pageSize = 20000 page = 1 @@ -632,7 +632,11 @@ page = 1 tcu_solenoid6 = bits, U08, 1197, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "N/A", "N/A", "PA10", "PA11", "PA12", "PA13", "N/A", "N/A", "N/A", "N/A", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "N/A", "N/A", "N/A", "N/A", "PB12", "PB13", "N/A", "N/A", "N/A", "N/A", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "N/A", "N/A", "N/A", "N/A", "PC14", "PC15", "PC16", "PC17", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "PD15", "PD16", "N/A", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "TLE6240_1", "TLE6240_2", "TLE6240_3", "TLE6240_4", "TLE6240_5", "TLE6240_6", "TLE6240_7", "TLE6240_8", "TLE6240_9", "TLE6240_10", "TLE6240_11", "TLE6240_12", "TLE6240_13", "TLE6240_14", "TLE6240_15", "TLE6240_16", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" tcu_solenoid7 = bits, U08, 1198, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "N/A", "N/A", "PA10", "PA11", "PA12", "PA13", "N/A", "N/A", "N/A", "N/A", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "N/A", "N/A", "N/A", "N/A", "PB12", "PB13", "N/A", "N/A", "N/A", "N/A", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "N/A", "N/A", "N/A", "N/A", "PC14", "PC15", "PC16", "PC17", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "PD15", "PD16", "N/A", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "TLE6240_1", "TLE6240_2", "TLE6240_3", "TLE6240_4", "TLE6240_5", "TLE6240_6", "TLE6240_7", "TLE6240_8", "TLE6240_9", "TLE6240_10", "TLE6240_11", "TLE6240_12", "TLE6240_13", "TLE6240_14", "TLE6240_15", "TLE6240_16", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" tcu_solenoid8 = bits, U08, 1199, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "N/A", "N/A", "PA10", "PA11", "PA12", "PA13", "N/A", "N/A", "N/A", "N/A", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "N/A", "N/A", "N/A", "N/A", "PB12", "PB13", "N/A", "N/A", "N/A", "N/A", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "N/A", "N/A", "N/A", "N/A", "PC14", "PC15", "PC16", "PC17", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "PD15", "PD16", "N/A", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "N/A", "N/A", "N/A", "N/A", "N/A", "N/A", "TLE6240_1", "TLE6240_2", "TLE6240_3", "TLE6240_4", "TLE6240_5", "TLE6240_6", "TLE6240_7", "TLE6240_8", "TLE6240_9", "TLE6240_10", "TLE6240_11", "TLE6240_12", "TLE6240_13", "TLE6240_14", "TLE6240_15", "TLE6240_16", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" - unusedAtOldBoardConfigurationEnd = array, S32, 1200, [65], "units", 1.0, 0, -20, 100, 0 + drv8860spiDevice = bits,U32, 1200, [0:2], "Off", "SPI1", "SPI2", "SPI3", "SPI4", "INVALID", "INVALID", "INVALID" + drv8860_cs = bits, U08, 1201, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PA16", "PA17", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PB16", "PB17", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PC16", "PC17", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PD16", "PD17", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PE16", "PE17", "TLE6240_1", "TLE6240_2", "TLE6240_3", "TLE6240_4", "TLE6240_5", "TLE6240_6", "TLE6240_7", "TLE6240_8", "TLE6240_9", "TLE6240_10", "TLE6240_11", "TLE6240_12", "TLE6240_13", "TLE6240_14", "TLE6240_15", "TLE6240_16", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" + drv8860_csPinMode = bits, U08, 1202, [0:1], "default", "default inverted", "open collector", "open collector inverted" + drv8860_miso = bits, U08, 1203, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PA16", "PA17", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PB16", "PB17", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PC16", "PC17", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PD16", "PD17", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PE16", "PE17", "TLE6240_1", "TLE6240_2", "TLE6240_3", "TLE6240_4", "TLE6240_5", "TLE6240_6", "TLE6240_7", "TLE6240_8", "TLE6240_9", "TLE6240_10", "TLE6240_11", "TLE6240_12", "TLE6240_13", "TLE6240_14", "TLE6240_15", "TLE6240_16", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" + unusedAtOldBoardConfigurationEnd = array, S32, 1204, [64], "units", 1.0, 0, -20, 100, 0 tps2SecondaryMin = scalar, U16, 1460, "ADC", 1.0, 0, 0, 1000, 0 tps2SecondaryMax = scalar, U16, 1462, "ADC", 1.0, 0, 0, 1000, 0 unusedHereWeHave = bits, U32, 1464, [0:0], "false", "true" @@ -832,30 +836,30 @@ page = 1 unused1128 = bits, U32, 2116, [5:5], "false", "true" unused1129 = bits, U32, 2116, [6:6], "false", "true" unused1130 = bits, U32, 2116, [7:7], "false", "true" - unusedBit_478_8 = bits, U32, 2116, [8:8], "false", "true" - unusedBit_478_9 = bits, U32, 2116, [9:9], "false", "true" - unusedBit_478_10 = bits, U32, 2116, [10:10], "false", "true" - unusedBit_478_11 = bits, U32, 2116, [11:11], "false", "true" - unusedBit_478_12 = bits, U32, 2116, [12:12], "false", "true" - unusedBit_478_13 = bits, U32, 2116, [13:13], "false", "true" - unusedBit_478_14 = bits, U32, 2116, [14:14], "false", "true" - unusedBit_478_15 = bits, U32, 2116, [15:15], "false", "true" - unusedBit_478_16 = bits, U32, 2116, [16:16], "false", "true" - unusedBit_478_17 = bits, U32, 2116, [17:17], "false", "true" - unusedBit_478_18 = bits, U32, 2116, [18:18], "false", "true" - unusedBit_478_19 = bits, U32, 2116, [19:19], "false", "true" - unusedBit_478_20 = bits, U32, 2116, [20:20], "false", "true" - unusedBit_478_21 = bits, U32, 2116, [21:21], "false", "true" - unusedBit_478_22 = bits, U32, 2116, [22:22], "false", "true" - unusedBit_478_23 = bits, U32, 2116, [23:23], "false", "true" - unusedBit_478_24 = bits, U32, 2116, [24:24], "false", "true" - unusedBit_478_25 = bits, U32, 2116, [25:25], "false", "true" - unusedBit_478_26 = bits, U32, 2116, [26:26], "false", "true" - unusedBit_478_27 = bits, U32, 2116, [27:27], "false", "true" - unusedBit_478_28 = bits, U32, 2116, [28:28], "false", "true" - unusedBit_478_29 = bits, U32, 2116, [29:29], "false", "true" - unusedBit_478_30 = bits, U32, 2116, [30:30], "false", "true" - unusedBit_478_31 = bits, U32, 2116, [31:31], "false", "true" + unusedBit_482_8 = bits, U32, 2116, [8:8], "false", "true" + unusedBit_482_9 = bits, U32, 2116, [9:9], "false", "true" + unusedBit_482_10 = bits, U32, 2116, [10:10], "false", "true" + unusedBit_482_11 = bits, U32, 2116, [11:11], "false", "true" + unusedBit_482_12 = bits, U32, 2116, [12:12], "false", "true" + unusedBit_482_13 = bits, U32, 2116, [13:13], "false", "true" + unusedBit_482_14 = bits, U32, 2116, [14:14], "false", "true" + unusedBit_482_15 = bits, U32, 2116, [15:15], "false", "true" + unusedBit_482_16 = bits, U32, 2116, [16:16], "false", "true" + unusedBit_482_17 = bits, U32, 2116, [17:17], "false", "true" + unusedBit_482_18 = bits, U32, 2116, [18:18], "false", "true" + unusedBit_482_19 = bits, U32, 2116, [19:19], "false", "true" + unusedBit_482_20 = bits, U32, 2116, [20:20], "false", "true" + unusedBit_482_21 = bits, U32, 2116, [21:21], "false", "true" + unusedBit_482_22 = bits, U32, 2116, [22:22], "false", "true" + unusedBit_482_23 = bits, U32, 2116, [23:23], "false", "true" + unusedBit_482_24 = bits, U32, 2116, [24:24], "false", "true" + unusedBit_482_25 = bits, U32, 2116, [25:25], "false", "true" + unusedBit_482_26 = bits, U32, 2116, [26:26], "false", "true" + unusedBit_482_27 = bits, U32, 2116, [27:27], "false", "true" + unusedBit_482_28 = bits, U32, 2116, [28:28], "false", "true" + unusedBit_482_29 = bits, U32, 2116, [29:29], "false", "true" + unusedBit_482_30 = bits, U32, 2116, [30:30], "false", "true" + unusedBit_482_31 = bits, U32, 2116, [31:31], "false", "true" can2NbcType = bits, U32, 2120, [0:3], "None", "FIAT", "VAG" , "MAZDA RX8", "BMW", "W202", "BMW E90", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" can2TxPin = bits, U08, 2124, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PA16", "PA17", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PB16", "PB17", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PC16", "PC17", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PD16", "PD17", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PE16", "PE17", "TLE6240_1", "TLE6240_2", "TLE6240_3", "TLE6240_4", "TLE6240_5", "TLE6240_6", "TLE6240_7", "TLE6240_8", "TLE6240_9", "TLE6240_10", "TLE6240_11", "TLE6240_12", "TLE6240_13", "TLE6240_14", "TLE6240_15", "TLE6240_16", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" can2RxPin = bits, U08, 2125, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PA16", "PA17", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PB16", "PB17", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PC16", "PC17", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PD16", "PD17", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6", "PE7", "PE8", "PE9", "PE10", "PE11", "PE12", "PE13", "PE14", "PE15", "PE16", "PE17", "TLE6240_1", "TLE6240_2", "TLE6240_3", "TLE6240_4", "TLE6240_5", "TLE6240_6", "TLE6240_7", "TLE6240_8", "TLE6240_9", "TLE6240_10", "TLE6240_11", "TLE6240_12", "TLE6240_13", "TLE6240_14", "TLE6240_15", "TLE6240_16", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" diff --git a/firmware/tunerstudio/generated/rusefi_mre_f4.ini b/firmware/tunerstudio/generated/rusefi_mre_f4.ini index 616f5a16c9..77fa6a914c 100644 --- a/firmware/tunerstudio/generated/rusefi_mre_f4.ini +++ b/firmware/tunerstudio/generated/rusefi_mre_f4.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2020.09.07.mre_f4.1977246637" + signature = "rusEFI 2020.09.07.mre_f4.2945813319" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2020.09.07.mre_f4.1977246637" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2020.09.07.mre_f4.2945813319" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -74,7 +74,7 @@ enable2ndByteCanID = false ; see PAGE_0_SIZE in C source code ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Sep 07 14:17:17 UTC 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Sep 07 14:49:29 UTC 2020 pageSize = 20000 page = 1 @@ -632,7 +632,11 @@ page = 1 tcu_solenoid6 = bits, U08, 1197, [0:7], "NONE","INVALID","INVALID","INVALID","INVALID","INVALID","AUX AV10 reuse","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","AUX J2 PA15","AUX AV8 reuse","AUX AV9 reuse","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","AUX J2 PB8","AUX J2 PB9","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","AUX AV6 reuse","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","AUX J2 PC12","INVALID","INVALID","INVALID","INVALID","12 - Ignition 4","11 - Ignition 3","10 - Ignition 2","9 - Ignition 1","INVALID","13 - GP Out 6","14 - GP Out 5","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","35 - GP Out 1","7 - Lowside 1","3 - Lowside 2","42 - Injector 4","41 - Injector 3","38 - Injector 2","37 - Injector 1","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","34 - GP Out 2","33 - GP Out 3","43 - GP Out 4","INVALID","INVALID","INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" tcu_solenoid7 = bits, U08, 1198, [0:7], "NONE","INVALID","INVALID","INVALID","INVALID","INVALID","AUX AV10 reuse","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","AUX J2 PA15","AUX AV8 reuse","AUX AV9 reuse","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","AUX J2 PB8","AUX J2 PB9","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","AUX AV6 reuse","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","AUX J2 PC12","INVALID","INVALID","INVALID","INVALID","12 - Ignition 4","11 - Ignition 3","10 - Ignition 2","9 - Ignition 1","INVALID","13 - GP Out 6","14 - GP Out 5","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","35 - GP Out 1","7 - Lowside 1","3 - Lowside 2","42 - Injector 4","41 - Injector 3","38 - Injector 2","37 - Injector 1","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","34 - GP Out 2","33 - GP Out 3","43 - GP Out 4","INVALID","INVALID","INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" tcu_solenoid8 = bits, U08, 1199, [0:7], "NONE","INVALID","INVALID","INVALID","INVALID","INVALID","AUX AV10 reuse","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","AUX J2 PA15","AUX AV8 reuse","AUX AV9 reuse","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","AUX J2 PB8","AUX J2 PB9","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","AUX AV6 reuse","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","AUX J2 PC12","INVALID","INVALID","INVALID","INVALID","12 - Ignition 4","11 - Ignition 3","10 - Ignition 2","9 - Ignition 1","INVALID","13 - GP Out 6","14 - GP Out 5","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","35 - GP Out 1","7 - Lowside 1","3 - Lowside 2","42 - Injector 4","41 - Injector 3","38 - Injector 2","37 - Injector 1","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","34 - GP Out 2","33 - GP Out 3","43 - GP Out 4","INVALID","INVALID","INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" - unusedAtOldBoardConfigurationEnd = array, S32, 1200, [65], "units", 1.0, 0, -20, 100, 0 + drv8860spiDevice = bits,U32, 1200, [0:2], "Off", "SPI1", "SPI2", "SPI3", "SPI4", "INVALID", "INVALID", "INVALID" + drv8860_cs = bits, U08, 1201, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6","PE7","PE8","PE9","PE10","PE11","PE12","PE13","PE14","PE15", "PF0","PF1","PF2","PF3","PF4","PF5","PF6","PF7","PF8","PF9","PF10","PF11","PF12","PF13","PF14","PF15", "PG0","PG1","PG2","PG3","PG4","PG5","PG6","PG7","PG8","PG9","PG10","PG11","PG12","PG13","PG14","PG15", "PH0","PH1","PH2","PH3","PH4","PH5","PH6","PH7","PH8","PH9","PH10","PH11","PH12","PH13","PH14","PH15","INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" + drv8860_csPinMode = bits, U08, 1202, [0:1], "default", "default inverted", "open collector", "open collector inverted" + drv8860_miso = bits, U08, 1203, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6","PE7","PE8","PE9","PE10","PE11","PE12","PE13","PE14","PE15", "PF0","PF1","PF2","PF3","PF4","PF5","PF6","PF7","PF8","PF9","PF10","PF11","PF12","PF13","PF14","PF15", "PG0","PG1","PG2","PG3","PG4","PG5","PG6","PG7","PG8","PG9","PG10","PG11","PG12","PG13","PG14","PG15", "PH0","PH1","PH2","PH3","PH4","PH5","PH6","PH7","PH8","PH9","PH10","PH11","PH12","PH13","PH14","PH15","INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" + unusedAtOldBoardConfigurationEnd = array, S32, 1204, [64], "units", 1.0, 0, -20, 100, 0 tps2SecondaryMin = scalar, U16, 1460, "ADC", 1.0, 0, 0, 1000, 0 tps2SecondaryMax = scalar, U16, 1462, "ADC", 1.0, 0, 0, 1000, 0 unusedHereWeHave = bits, U32, 1464, [0:0], "false", "true" @@ -832,30 +836,30 @@ page = 1 unused1128 = bits, U32, 2116, [5:5], "false", "true" unused1129 = bits, U32, 2116, [6:6], "false", "true" unused1130 = bits, U32, 2116, [7:7], "false", "true" - unusedBit_478_8 = bits, U32, 2116, [8:8], "false", "true" - unusedBit_478_9 = bits, U32, 2116, [9:9], "false", "true" - unusedBit_478_10 = bits, U32, 2116, [10:10], "false", "true" - unusedBit_478_11 = bits, U32, 2116, [11:11], "false", "true" - unusedBit_478_12 = bits, U32, 2116, [12:12], "false", "true" - unusedBit_478_13 = bits, U32, 2116, [13:13], "false", "true" - unusedBit_478_14 = bits, U32, 2116, [14:14], "false", "true" - unusedBit_478_15 = bits, U32, 2116, [15:15], "false", "true" - unusedBit_478_16 = bits, U32, 2116, [16:16], "false", "true" - unusedBit_478_17 = bits, U32, 2116, [17:17], "false", "true" - unusedBit_478_18 = bits, U32, 2116, [18:18], "false", "true" - unusedBit_478_19 = bits, U32, 2116, [19:19], "false", "true" - unusedBit_478_20 = bits, U32, 2116, [20:20], "false", "true" - unusedBit_478_21 = bits, U32, 2116, [21:21], "false", "true" - unusedBit_478_22 = bits, U32, 2116, [22:22], "false", "true" - unusedBit_478_23 = bits, U32, 2116, [23:23], "false", "true" - unusedBit_478_24 = bits, U32, 2116, [24:24], "false", "true" - unusedBit_478_25 = bits, U32, 2116, [25:25], "false", "true" - unusedBit_478_26 = bits, U32, 2116, [26:26], "false", "true" - unusedBit_478_27 = bits, U32, 2116, [27:27], "false", "true" - unusedBit_478_28 = bits, U32, 2116, [28:28], "false", "true" - unusedBit_478_29 = bits, U32, 2116, [29:29], "false", "true" - unusedBit_478_30 = bits, U32, 2116, [30:30], "false", "true" - unusedBit_478_31 = bits, U32, 2116, [31:31], "false", "true" + unusedBit_482_8 = bits, U32, 2116, [8:8], "false", "true" + unusedBit_482_9 = bits, U32, 2116, [9:9], "false", "true" + unusedBit_482_10 = bits, U32, 2116, [10:10], "false", "true" + unusedBit_482_11 = bits, U32, 2116, [11:11], "false", "true" + unusedBit_482_12 = bits, U32, 2116, [12:12], "false", "true" + unusedBit_482_13 = bits, U32, 2116, [13:13], "false", "true" + unusedBit_482_14 = bits, U32, 2116, [14:14], "false", "true" + unusedBit_482_15 = bits, U32, 2116, [15:15], "false", "true" + unusedBit_482_16 = bits, U32, 2116, [16:16], "false", "true" + unusedBit_482_17 = bits, U32, 2116, [17:17], "false", "true" + unusedBit_482_18 = bits, U32, 2116, [18:18], "false", "true" + unusedBit_482_19 = bits, U32, 2116, [19:19], "false", "true" + unusedBit_482_20 = bits, U32, 2116, [20:20], "false", "true" + unusedBit_482_21 = bits, U32, 2116, [21:21], "false", "true" + unusedBit_482_22 = bits, U32, 2116, [22:22], "false", "true" + unusedBit_482_23 = bits, U32, 2116, [23:23], "false", "true" + unusedBit_482_24 = bits, U32, 2116, [24:24], "false", "true" + unusedBit_482_25 = bits, U32, 2116, [25:25], "false", "true" + unusedBit_482_26 = bits, U32, 2116, [26:26], "false", "true" + unusedBit_482_27 = bits, U32, 2116, [27:27], "false", "true" + unusedBit_482_28 = bits, U32, 2116, [28:28], "false", "true" + unusedBit_482_29 = bits, U32, 2116, [29:29], "false", "true" + unusedBit_482_30 = bits, U32, 2116, [30:30], "false", "true" + unusedBit_482_31 = bits, U32, 2116, [31:31], "false", "true" can2NbcType = bits, U32, 2120, [0:3], "None", "FIAT", "VAG" , "MAZDA RX8", "BMW", "W202", "BMW E90", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" can2TxPin = bits, U08, 2124, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6","PE7","PE8","PE9","PE10","PE11","PE12","PE13","PE14","PE15", "PF0","PF1","PF2","PF3","PF4","PF5","PF6","PF7","PF8","PF9","PF10","PF11","PF12","PF13","PF14","PF15", "PG0","PG1","PG2","PG3","PG4","PG5","PG6","PG7","PG8","PG9","PG10","PG11","PG12","PG13","PG14","PG15", "PH0","PH1","PH2","PH3","PH4","PH5","PH6","PH7","PH8","PH9","PH10","PH11","PH12","PH13","PH14","PH15","INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" can2RxPin = bits, U08, 2125, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6","PE7","PE8","PE9","PE10","PE11","PE12","PE13","PE14","PE15", "PF0","PF1","PF2","PF3","PF4","PF5","PF6","PF7","PF8","PF9","PF10","PF11","PF12","PF13","PF14","PF15", "PG0","PG1","PG2","PG3","PG4","PG5","PG6","PG7","PG8","PG9","PG10","PG11","PG12","PG13","PG14","PG15", "PH0","PH1","PH2","PH3","PH4","PH5","PH6","PH7","PH8","PH9","PH10","PH11","PH12","PH13","PH14","PH15","INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" diff --git a/firmware/tunerstudio/generated/rusefi_mre_f7.ini b/firmware/tunerstudio/generated/rusefi_mre_f7.ini index 8aba8abfcb..2264cb88eb 100644 --- a/firmware/tunerstudio/generated/rusefi_mre_f7.ini +++ b/firmware/tunerstudio/generated/rusefi_mre_f7.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2020.09.07.mre_f7.1977246637" + signature = "rusEFI 2020.09.07.mre_f7.2945813319" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2020.09.07.mre_f7.1977246637" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2020.09.07.mre_f7.2945813319" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -74,7 +74,7 @@ enable2ndByteCanID = false ; see PAGE_0_SIZE in C source code ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Sep 07 14:17:15 UTC 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Sep 07 14:49:27 UTC 2020 pageSize = 20000 page = 1 @@ -632,7 +632,11 @@ page = 1 tcu_solenoid6 = bits, U08, 1197, [0:7], "NONE","INVALID","INVALID","INVALID","INVALID","INVALID","AUX AV10 reuse","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","AUX J2 PA15","AUX AV8 reuse","AUX AV9 reuse","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","AUX J2 PB8","AUX J2 PB9","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","AUX AV6 reuse","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","AUX J2 PC12","INVALID","INVALID","INVALID","INVALID","12 - Ignition 4","11 - Ignition 3","10 - Ignition 2","9 - Ignition 1","INVALID","13 - GP Out 6","14 - GP Out 5","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","35 - GP Out 1","7 - Lowside 1","3 - Lowside 2","42 - Injector 4","41 - Injector 3","38 - Injector 2","37 - Injector 1","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","34 - GP Out 2","33 - GP Out 3","43 - GP Out 4","INVALID","INVALID","INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" tcu_solenoid7 = bits, U08, 1198, [0:7], "NONE","INVALID","INVALID","INVALID","INVALID","INVALID","AUX AV10 reuse","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","AUX J2 PA15","AUX AV8 reuse","AUX AV9 reuse","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","AUX J2 PB8","AUX J2 PB9","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","AUX AV6 reuse","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","AUX J2 PC12","INVALID","INVALID","INVALID","INVALID","12 - Ignition 4","11 - Ignition 3","10 - Ignition 2","9 - Ignition 1","INVALID","13 - GP Out 6","14 - GP Out 5","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","35 - GP Out 1","7 - Lowside 1","3 - Lowside 2","42 - Injector 4","41 - Injector 3","38 - Injector 2","37 - Injector 1","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","34 - GP Out 2","33 - GP Out 3","43 - GP Out 4","INVALID","INVALID","INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" tcu_solenoid8 = bits, U08, 1199, [0:7], "NONE","INVALID","INVALID","INVALID","INVALID","INVALID","AUX AV10 reuse","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","AUX J2 PA15","AUX AV8 reuse","AUX AV9 reuse","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","AUX J2 PB8","AUX J2 PB9","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","AUX AV6 reuse","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","AUX J2 PC12","INVALID","INVALID","INVALID","INVALID","12 - Ignition 4","11 - Ignition 3","10 - Ignition 2","9 - Ignition 1","INVALID","13 - GP Out 6","14 - GP Out 5","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","35 - GP Out 1","7 - Lowside 1","3 - Lowside 2","42 - Injector 4","41 - Injector 3","38 - Injector 2","37 - Injector 1","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","34 - GP Out 2","33 - GP Out 3","43 - GP Out 4","INVALID","INVALID","INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" - unusedAtOldBoardConfigurationEnd = array, S32, 1200, [65], "units", 1.0, 0, -20, 100, 0 + drv8860spiDevice = bits,U32, 1200, [0:2], "Off", "SPI1", "SPI2", "SPI3", "SPI4", "INVALID", "INVALID", "INVALID" + drv8860_cs = bits, U08, 1201, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6","PE7","PE8","PE9","PE10","PE11","PE12","PE13","PE14","PE15", "PF0","PF1","PF2","PF3","PF4","PF5","PF6","PF7","PF8","PF9","PF10","PF11","PF12","PF13","PF14","PF15", "PG0","PG1","PG2","PG3","PG4","PG5","PG6","PG7","PG8","PG9","PG10","PG11","PG12","PG13","PG14","PG15", "PH0","PH1","PH2","PH3","PH4","PH5","PH6","PH7","PH8","PH9","PH10","PH11","PH12","PH13","PH14","PH15","INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" + drv8860_csPinMode = bits, U08, 1202, [0:1], "default", "default inverted", "open collector", "open collector inverted" + drv8860_miso = bits, U08, 1203, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6","PE7","PE8","PE9","PE10","PE11","PE12","PE13","PE14","PE15", "PF0","PF1","PF2","PF3","PF4","PF5","PF6","PF7","PF8","PF9","PF10","PF11","PF12","PF13","PF14","PF15", "PG0","PG1","PG2","PG3","PG4","PG5","PG6","PG7","PG8","PG9","PG10","PG11","PG12","PG13","PG14","PG15", "PH0","PH1","PH2","PH3","PH4","PH5","PH6","PH7","PH8","PH9","PH10","PH11","PH12","PH13","PH14","PH15","INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" + unusedAtOldBoardConfigurationEnd = array, S32, 1204, [64], "units", 1.0, 0, -20, 100, 0 tps2SecondaryMin = scalar, U16, 1460, "ADC", 1.0, 0, 0, 1000, 0 tps2SecondaryMax = scalar, U16, 1462, "ADC", 1.0, 0, 0, 1000, 0 unusedHereWeHave = bits, U32, 1464, [0:0], "false", "true" @@ -832,30 +836,30 @@ page = 1 unused1128 = bits, U32, 2116, [5:5], "false", "true" unused1129 = bits, U32, 2116, [6:6], "false", "true" unused1130 = bits, U32, 2116, [7:7], "false", "true" - unusedBit_478_8 = bits, U32, 2116, [8:8], "false", "true" - unusedBit_478_9 = bits, U32, 2116, [9:9], "false", "true" - unusedBit_478_10 = bits, U32, 2116, [10:10], "false", "true" - unusedBit_478_11 = bits, U32, 2116, [11:11], "false", "true" - unusedBit_478_12 = bits, U32, 2116, [12:12], "false", "true" - unusedBit_478_13 = bits, U32, 2116, [13:13], "false", "true" - unusedBit_478_14 = bits, U32, 2116, [14:14], "false", "true" - unusedBit_478_15 = bits, U32, 2116, [15:15], "false", "true" - unusedBit_478_16 = bits, U32, 2116, [16:16], "false", "true" - unusedBit_478_17 = bits, U32, 2116, [17:17], "false", "true" - unusedBit_478_18 = bits, U32, 2116, [18:18], "false", "true" - unusedBit_478_19 = bits, U32, 2116, [19:19], "false", "true" - unusedBit_478_20 = bits, U32, 2116, [20:20], "false", "true" - unusedBit_478_21 = bits, U32, 2116, [21:21], "false", "true" - unusedBit_478_22 = bits, U32, 2116, [22:22], "false", "true" - unusedBit_478_23 = bits, U32, 2116, [23:23], "false", "true" - unusedBit_478_24 = bits, U32, 2116, [24:24], "false", "true" - unusedBit_478_25 = bits, U32, 2116, [25:25], "false", "true" - unusedBit_478_26 = bits, U32, 2116, [26:26], "false", "true" - unusedBit_478_27 = bits, U32, 2116, [27:27], "false", "true" - unusedBit_478_28 = bits, U32, 2116, [28:28], "false", "true" - unusedBit_478_29 = bits, U32, 2116, [29:29], "false", "true" - unusedBit_478_30 = bits, U32, 2116, [30:30], "false", "true" - unusedBit_478_31 = bits, U32, 2116, [31:31], "false", "true" + unusedBit_482_8 = bits, U32, 2116, [8:8], "false", "true" + unusedBit_482_9 = bits, U32, 2116, [9:9], "false", "true" + unusedBit_482_10 = bits, U32, 2116, [10:10], "false", "true" + unusedBit_482_11 = bits, U32, 2116, [11:11], "false", "true" + unusedBit_482_12 = bits, U32, 2116, [12:12], "false", "true" + unusedBit_482_13 = bits, U32, 2116, [13:13], "false", "true" + unusedBit_482_14 = bits, U32, 2116, [14:14], "false", "true" + unusedBit_482_15 = bits, U32, 2116, [15:15], "false", "true" + unusedBit_482_16 = bits, U32, 2116, [16:16], "false", "true" + unusedBit_482_17 = bits, U32, 2116, [17:17], "false", "true" + unusedBit_482_18 = bits, U32, 2116, [18:18], "false", "true" + unusedBit_482_19 = bits, U32, 2116, [19:19], "false", "true" + unusedBit_482_20 = bits, U32, 2116, [20:20], "false", "true" + unusedBit_482_21 = bits, U32, 2116, [21:21], "false", "true" + unusedBit_482_22 = bits, U32, 2116, [22:22], "false", "true" + unusedBit_482_23 = bits, U32, 2116, [23:23], "false", "true" + unusedBit_482_24 = bits, U32, 2116, [24:24], "false", "true" + unusedBit_482_25 = bits, U32, 2116, [25:25], "false", "true" + unusedBit_482_26 = bits, U32, 2116, [26:26], "false", "true" + unusedBit_482_27 = bits, U32, 2116, [27:27], "false", "true" + unusedBit_482_28 = bits, U32, 2116, [28:28], "false", "true" + unusedBit_482_29 = bits, U32, 2116, [29:29], "false", "true" + unusedBit_482_30 = bits, U32, 2116, [30:30], "false", "true" + unusedBit_482_31 = bits, U32, 2116, [31:31], "false", "true" can2NbcType = bits, U32, 2120, [0:3], "None", "FIAT", "VAG" , "MAZDA RX8", "BMW", "W202", "BMW E90", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" can2TxPin = bits, U08, 2124, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6","PE7","PE8","PE9","PE10","PE11","PE12","PE13","PE14","PE15", "PF0","PF1","PF2","PF3","PF4","PF5","PF6","PF7","PF8","PF9","PF10","PF11","PF12","PF13","PF14","PF15", "PG0","PG1","PG2","PG3","PG4","PG5","PG6","PG7","PG8","PG9","PG10","PG11","PG12","PG13","PG14","PG15", "PH0","PH1","PH2","PH3","PH4","PH5","PH6","PH7","PH8","PH9","PH10","PH11","PH12","PH13","PH14","PH15","INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" can2RxPin = bits, U08, 2125, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6","PE7","PE8","PE9","PE10","PE11","PE12","PE13","PE14","PE15", "PF0","PF1","PF2","PF3","PF4","PF5","PF6","PF7","PF8","PF9","PF10","PF11","PF12","PF13","PF14","PF15", "PG0","PG1","PG2","PG3","PG4","PG5","PG6","PG7","PG8","PG9","PG10","PG11","PG12","PG13","PG14","PG15", "PH0","PH1","PH2","PH3","PH4","PH5","PH6","PH7","PH8","PH9","PH10","PH11","PH12","PH13","PH14","PH15","INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" diff --git a/firmware/tunerstudio/generated/rusefi_prometheus_405.ini b/firmware/tunerstudio/generated/rusefi_prometheus_405.ini index a1b8b1b5dd..ac7c8316bd 100644 --- a/firmware/tunerstudio/generated/rusefi_prometheus_405.ini +++ b/firmware/tunerstudio/generated/rusefi_prometheus_405.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2020.09.07.prometheus_405.3507498612" + signature = "rusEFI 2020.09.07.prometheus_405.190826142" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2020.09.07.prometheus_405.3507498612" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2020.09.07.prometheus_405.190826142" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -74,7 +74,7 @@ enable2ndByteCanID = false ; see PAGE_0_SIZE in C source code ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Sep 07 14:17:22 UTC 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Sep 07 14:49:34 UTC 2020 pageSize = 20000 page = 1 @@ -632,7 +632,11 @@ page = 1 tcu_solenoid6 = bits, U08, 1197, [0:7], "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","Injector 3Z","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" tcu_solenoid7 = bits, U08, 1198, [0:7], "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","Injector 3Z","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" tcu_solenoid8 = bits, U08, 1199, [0:7], "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","Injector 3Z","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" - unusedAtOldBoardConfigurationEnd = array, S32, 1200, [65], "units", 1.0, 0, -20, 100, 0 + drv8860spiDevice = bits,U32, 1200, [0:2], "Off", "SPI1", "SPI2", "SPI3", "SPI4", "INVALID", "INVALID", "INVALID" + drv8860_cs = bits, U08, 1201, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6","PE7","PE8","PE9","PE10","PE11","PE12","PE13","PE14","PE15", "PF0","PF1","PF2","PF3","PF4","PF5","PF6","PF7","PF8","PF9","PF10","PF11","PF12","PF13","PF14","PF15", "PG0","PG1","PG2","PG3","PG4","PG5","PG6","PG7","PG8","PG9","PG10","PG11","PG12","PG13","PG14","PG15", "PH0","PH1","PH2","PH3","PH4","PH5","PH6","PH7","PH8","PH9","PH10","PH11","PH12","PH13","PH14","PH15","INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" + drv8860_csPinMode = bits, U08, 1202, [0:1], "default", "default inverted", "open collector", "open collector inverted" + drv8860_miso = bits, U08, 1203, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6","PE7","PE8","PE9","PE10","PE11","PE12","PE13","PE14","PE15", "PF0","PF1","PF2","PF3","PF4","PF5","PF6","PF7","PF8","PF9","PF10","PF11","PF12","PF13","PF14","PF15", "PG0","PG1","PG2","PG3","PG4","PG5","PG6","PG7","PG8","PG9","PG10","PG11","PG12","PG13","PG14","PG15", "PH0","PH1","PH2","PH3","PH4","PH5","PH6","PH7","PH8","PH9","PH10","PH11","PH12","PH13","PH14","PH15","INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" + unusedAtOldBoardConfigurationEnd = array, S32, 1204, [64], "units", 1.0, 0, -20, 100, 0 tps2SecondaryMin = scalar, U16, 1460, "ADC", 1.0, 0, 0, 1000, 0 tps2SecondaryMax = scalar, U16, 1462, "ADC", 1.0, 0, 0, 1000, 0 unusedHereWeHave = bits, U32, 1464, [0:0], "false", "true" @@ -832,30 +836,30 @@ page = 1 unused1128 = bits, U32, 2116, [5:5], "false", "true" unused1129 = bits, U32, 2116, [6:6], "false", "true" unused1130 = bits, U32, 2116, [7:7], "false", "true" - unusedBit_478_8 = bits, U32, 2116, [8:8], "false", "true" - unusedBit_478_9 = bits, U32, 2116, [9:9], "false", "true" - unusedBit_478_10 = bits, U32, 2116, [10:10], "false", "true" - unusedBit_478_11 = bits, U32, 2116, [11:11], "false", "true" - unusedBit_478_12 = bits, U32, 2116, [12:12], "false", "true" - unusedBit_478_13 = bits, U32, 2116, [13:13], "false", "true" - unusedBit_478_14 = bits, U32, 2116, [14:14], "false", "true" - unusedBit_478_15 = bits, U32, 2116, [15:15], "false", "true" - unusedBit_478_16 = bits, U32, 2116, [16:16], "false", "true" - unusedBit_478_17 = bits, U32, 2116, [17:17], "false", "true" - unusedBit_478_18 = bits, U32, 2116, [18:18], "false", "true" - unusedBit_478_19 = bits, U32, 2116, [19:19], "false", "true" - unusedBit_478_20 = bits, U32, 2116, [20:20], "false", "true" - unusedBit_478_21 = bits, U32, 2116, [21:21], "false", "true" - unusedBit_478_22 = bits, U32, 2116, [22:22], "false", "true" - unusedBit_478_23 = bits, U32, 2116, [23:23], "false", "true" - unusedBit_478_24 = bits, U32, 2116, [24:24], "false", "true" - unusedBit_478_25 = bits, U32, 2116, [25:25], "false", "true" - unusedBit_478_26 = bits, U32, 2116, [26:26], "false", "true" - unusedBit_478_27 = bits, U32, 2116, [27:27], "false", "true" - unusedBit_478_28 = bits, U32, 2116, [28:28], "false", "true" - unusedBit_478_29 = bits, U32, 2116, [29:29], "false", "true" - unusedBit_478_30 = bits, U32, 2116, [30:30], "false", "true" - unusedBit_478_31 = bits, U32, 2116, [31:31], "false", "true" + unusedBit_482_8 = bits, U32, 2116, [8:8], "false", "true" + unusedBit_482_9 = bits, U32, 2116, [9:9], "false", "true" + unusedBit_482_10 = bits, U32, 2116, [10:10], "false", "true" + unusedBit_482_11 = bits, U32, 2116, [11:11], "false", "true" + unusedBit_482_12 = bits, U32, 2116, [12:12], "false", "true" + unusedBit_482_13 = bits, U32, 2116, [13:13], "false", "true" + unusedBit_482_14 = bits, U32, 2116, [14:14], "false", "true" + unusedBit_482_15 = bits, U32, 2116, [15:15], "false", "true" + unusedBit_482_16 = bits, U32, 2116, [16:16], "false", "true" + unusedBit_482_17 = bits, U32, 2116, [17:17], "false", "true" + unusedBit_482_18 = bits, U32, 2116, [18:18], "false", "true" + unusedBit_482_19 = bits, U32, 2116, [19:19], "false", "true" + unusedBit_482_20 = bits, U32, 2116, [20:20], "false", "true" + unusedBit_482_21 = bits, U32, 2116, [21:21], "false", "true" + unusedBit_482_22 = bits, U32, 2116, [22:22], "false", "true" + unusedBit_482_23 = bits, U32, 2116, [23:23], "false", "true" + unusedBit_482_24 = bits, U32, 2116, [24:24], "false", "true" + unusedBit_482_25 = bits, U32, 2116, [25:25], "false", "true" + unusedBit_482_26 = bits, U32, 2116, [26:26], "false", "true" + unusedBit_482_27 = bits, U32, 2116, [27:27], "false", "true" + unusedBit_482_28 = bits, U32, 2116, [28:28], "false", "true" + unusedBit_482_29 = bits, U32, 2116, [29:29], "false", "true" + unusedBit_482_30 = bits, U32, 2116, [30:30], "false", "true" + unusedBit_482_31 = bits, U32, 2116, [31:31], "false", "true" can2NbcType = bits, U32, 2120, [0:3], "None", "FIAT", "VAG" , "MAZDA RX8", "BMW", "W202", "BMW E90", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" can2TxPin = bits, U08, 2124, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6","PE7","PE8","PE9","PE10","PE11","PE12","PE13","PE14","PE15", "PF0","PF1","PF2","PF3","PF4","PF5","PF6","PF7","PF8","PF9","PF10","PF11","PF12","PF13","PF14","PF15", "PG0","PG1","PG2","PG3","PG4","PG5","PG6","PG7","PG8","PG9","PG10","PG11","PG12","PG13","PG14","PG15", "PH0","PH1","PH2","PH3","PH4","PH5","PH6","PH7","PH8","PH9","PH10","PH11","PH12","PH13","PH14","PH15","INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" can2RxPin = bits, U08, 2125, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6","PE7","PE8","PE9","PE10","PE11","PE12","PE13","PE14","PE15", "PF0","PF1","PF2","PF3","PF4","PF5","PF6","PF7","PF8","PF9","PF10","PF11","PF12","PF13","PF14","PF15", "PG0","PG1","PG2","PG3","PG4","PG5","PG6","PG7","PG8","PG9","PG10","PG11","PG12","PG13","PG14","PG15", "PH0","PH1","PH2","PH3","PH4","PH5","PH6","PH7","PH8","PH9","PH10","PH11","PH12","PH13","PH14","PH15","INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" diff --git a/firmware/tunerstudio/generated/rusefi_prometheus_469.ini b/firmware/tunerstudio/generated/rusefi_prometheus_469.ini index ea35a2a3ad..3b70d3d5a8 100644 --- a/firmware/tunerstudio/generated/rusefi_prometheus_469.ini +++ b/firmware/tunerstudio/generated/rusefi_prometheus_469.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2020.09.07.prometheus_469.3507498612" + signature = "rusEFI 2020.09.07.prometheus_469.190826142" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2020.09.07.prometheus_469.3507498612" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2020.09.07.prometheus_469.190826142" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -74,7 +74,7 @@ enable2ndByteCanID = false ; see PAGE_0_SIZE in C source code ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Sep 07 14:17:20 UTC 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Sep 07 14:49:32 UTC 2020 pageSize = 20000 page = 1 @@ -632,7 +632,11 @@ page = 1 tcu_solenoid6 = bits, U08, 1197, [0:7], "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","Injector 3Z","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" tcu_solenoid7 = bits, U08, 1198, [0:7], "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","Injector 3Z","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" tcu_solenoid8 = bits, U08, 1199, [0:7], "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","Injector 3Z","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" - unusedAtOldBoardConfigurationEnd = array, S32, 1200, [65], "units", 1.0, 0, -20, 100, 0 + drv8860spiDevice = bits,U32, 1200, [0:2], "Off", "SPI1", "SPI2", "SPI3", "SPI4", "INVALID", "INVALID", "INVALID" + drv8860_cs = bits, U08, 1201, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6","PE7","PE8","PE9","PE10","PE11","PE12","PE13","PE14","PE15", "PF0","PF1","PF2","PF3","PF4","PF5","PF6","PF7","PF8","PF9","PF10","PF11","PF12","PF13","PF14","PF15", "PG0","PG1","PG2","PG3","PG4","PG5","PG6","PG7","PG8","PG9","PG10","PG11","PG12","PG13","PG14","PG15", "PH0","PH1","PH2","PH3","PH4","PH5","PH6","PH7","PH8","PH9","PH10","PH11","PH12","PH13","PH14","PH15","INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" + drv8860_csPinMode = bits, U08, 1202, [0:1], "default", "default inverted", "open collector", "open collector inverted" + drv8860_miso = bits, U08, 1203, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6","PE7","PE8","PE9","PE10","PE11","PE12","PE13","PE14","PE15", "PF0","PF1","PF2","PF3","PF4","PF5","PF6","PF7","PF8","PF9","PF10","PF11","PF12","PF13","PF14","PF15", "PG0","PG1","PG2","PG3","PG4","PG5","PG6","PG7","PG8","PG9","PG10","PG11","PG12","PG13","PG14","PG15", "PH0","PH1","PH2","PH3","PH4","PH5","PH6","PH7","PH8","PH9","PH10","PH11","PH12","PH13","PH14","PH15","INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" + unusedAtOldBoardConfigurationEnd = array, S32, 1204, [64], "units", 1.0, 0, -20, 100, 0 tps2SecondaryMin = scalar, U16, 1460, "ADC", 1.0, 0, 0, 1000, 0 tps2SecondaryMax = scalar, U16, 1462, "ADC", 1.0, 0, 0, 1000, 0 unusedHereWeHave = bits, U32, 1464, [0:0], "false", "true" @@ -832,30 +836,30 @@ page = 1 unused1128 = bits, U32, 2116, [5:5], "false", "true" unused1129 = bits, U32, 2116, [6:6], "false", "true" unused1130 = bits, U32, 2116, [7:7], "false", "true" - unusedBit_478_8 = bits, U32, 2116, [8:8], "false", "true" - unusedBit_478_9 = bits, U32, 2116, [9:9], "false", "true" - unusedBit_478_10 = bits, U32, 2116, [10:10], "false", "true" - unusedBit_478_11 = bits, U32, 2116, [11:11], "false", "true" - unusedBit_478_12 = bits, U32, 2116, [12:12], "false", "true" - unusedBit_478_13 = bits, U32, 2116, [13:13], "false", "true" - unusedBit_478_14 = bits, U32, 2116, [14:14], "false", "true" - unusedBit_478_15 = bits, U32, 2116, [15:15], "false", "true" - unusedBit_478_16 = bits, U32, 2116, [16:16], "false", "true" - unusedBit_478_17 = bits, U32, 2116, [17:17], "false", "true" - unusedBit_478_18 = bits, U32, 2116, [18:18], "false", "true" - unusedBit_478_19 = bits, U32, 2116, [19:19], "false", "true" - unusedBit_478_20 = bits, U32, 2116, [20:20], "false", "true" - unusedBit_478_21 = bits, U32, 2116, [21:21], "false", "true" - unusedBit_478_22 = bits, U32, 2116, [22:22], "false", "true" - unusedBit_478_23 = bits, U32, 2116, [23:23], "false", "true" - unusedBit_478_24 = bits, U32, 2116, [24:24], "false", "true" - unusedBit_478_25 = bits, U32, 2116, [25:25], "false", "true" - unusedBit_478_26 = bits, U32, 2116, [26:26], "false", "true" - unusedBit_478_27 = bits, U32, 2116, [27:27], "false", "true" - unusedBit_478_28 = bits, U32, 2116, [28:28], "false", "true" - unusedBit_478_29 = bits, U32, 2116, [29:29], "false", "true" - unusedBit_478_30 = bits, U32, 2116, [30:30], "false", "true" - unusedBit_478_31 = bits, U32, 2116, [31:31], "false", "true" + unusedBit_482_8 = bits, U32, 2116, [8:8], "false", "true" + unusedBit_482_9 = bits, U32, 2116, [9:9], "false", "true" + unusedBit_482_10 = bits, U32, 2116, [10:10], "false", "true" + unusedBit_482_11 = bits, U32, 2116, [11:11], "false", "true" + unusedBit_482_12 = bits, U32, 2116, [12:12], "false", "true" + unusedBit_482_13 = bits, U32, 2116, [13:13], "false", "true" + unusedBit_482_14 = bits, U32, 2116, [14:14], "false", "true" + unusedBit_482_15 = bits, U32, 2116, [15:15], "false", "true" + unusedBit_482_16 = bits, U32, 2116, [16:16], "false", "true" + unusedBit_482_17 = bits, U32, 2116, [17:17], "false", "true" + unusedBit_482_18 = bits, U32, 2116, [18:18], "false", "true" + unusedBit_482_19 = bits, U32, 2116, [19:19], "false", "true" + unusedBit_482_20 = bits, U32, 2116, [20:20], "false", "true" + unusedBit_482_21 = bits, U32, 2116, [21:21], "false", "true" + unusedBit_482_22 = bits, U32, 2116, [22:22], "false", "true" + unusedBit_482_23 = bits, U32, 2116, [23:23], "false", "true" + unusedBit_482_24 = bits, U32, 2116, [24:24], "false", "true" + unusedBit_482_25 = bits, U32, 2116, [25:25], "false", "true" + unusedBit_482_26 = bits, U32, 2116, [26:26], "false", "true" + unusedBit_482_27 = bits, U32, 2116, [27:27], "false", "true" + unusedBit_482_28 = bits, U32, 2116, [28:28], "false", "true" + unusedBit_482_29 = bits, U32, 2116, [29:29], "false", "true" + unusedBit_482_30 = bits, U32, 2116, [30:30], "false", "true" + unusedBit_482_31 = bits, U32, 2116, [31:31], "false", "true" can2NbcType = bits, U32, 2120, [0:3], "None", "FIAT", "VAG" , "MAZDA RX8", "BMW", "W202", "BMW E90", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" can2TxPin = bits, U08, 2124, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6","PE7","PE8","PE9","PE10","PE11","PE12","PE13","PE14","PE15", "PF0","PF1","PF2","PF3","PF4","PF5","PF6","PF7","PF8","PF9","PF10","PF11","PF12","PF13","PF14","PF15", "PG0","PG1","PG2","PG3","PG4","PG5","PG6","PG7","PG8","PG9","PG10","PG11","PG12","PG13","PG14","PG15", "PH0","PH1","PH2","PH3","PH4","PH5","PH6","PH7","PH8","PH9","PH10","PH11","PH12","PH13","PH14","PH15","INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" can2RxPin = bits, U08, 2125, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6","PE7","PE8","PE9","PE10","PE11","PE12","PE13","PE14","PE15", "PF0","PF1","PF2","PF3","PF4","PF5","PF6","PF7","PF8","PF9","PF10","PF11","PF12","PF13","PF14","PF15", "PG0","PG1","PG2","PG3","PG4","PG5","PG6","PG7","PG8","PG9","PG10","PG11","PG12","PG13","PG14","PG15", "PH0","PH1","PH2","PH3","PH4","PH5","PH6","PH7","PH8","PH9","PH10","PH11","PH12","PH13","PH14","PH15","INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" diff --git a/firmware/tunerstudio/generated/rusefi_proteus_f4.ini b/firmware/tunerstudio/generated/rusefi_proteus_f4.ini index 1b60f92ac4..76749571ce 100644 --- a/firmware/tunerstudio/generated/rusefi_proteus_f4.ini +++ b/firmware/tunerstudio/generated/rusefi_proteus_f4.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2020.09.07.proteus_f4.2280528919" + signature = "rusEFI 2020.09.07.proteus_f4.1570895101" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2020.09.07.proteus_f4.2280528919" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2020.09.07.proteus_f4.1570895101" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -74,7 +74,7 @@ enable2ndByteCanID = false ; see PAGE_0_SIZE in C source code ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Sep 07 14:17:25 UTC 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Sep 07 14:49:38 UTC 2020 pageSize = 20000 page = 1 @@ -632,7 +632,11 @@ page = 1 tcu_solenoid6 = bits, U08, 1197, [0:7], "NONE","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","Highside 2","Highside 1","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","Lowside 8","Lowside 9","Lowside 10","Lowside 11","Lowside 12","Lowside 13","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","Ign 5","Ign 4","Ign 3","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","Ign 2","Ign 1","INVALID","INVALID","Lowside 1","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","Highside 4","Highside 3","Lowside 14","Lowside 15","Lowside 16","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","Ign 12","Ign 11","Ign 10","Ign 9","Ign 8","Ign 7","Ign 6","Lowside 2","Lowside 3","Lowside 4","Lowside 5","Lowside 6","Lowside 7","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" tcu_solenoid7 = bits, U08, 1198, [0:7], "NONE","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","Highside 2","Highside 1","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","Lowside 8","Lowside 9","Lowside 10","Lowside 11","Lowside 12","Lowside 13","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","Ign 5","Ign 4","Ign 3","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","Ign 2","Ign 1","INVALID","INVALID","Lowside 1","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","Highside 4","Highside 3","Lowside 14","Lowside 15","Lowside 16","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","Ign 12","Ign 11","Ign 10","Ign 9","Ign 8","Ign 7","Ign 6","Lowside 2","Lowside 3","Lowside 4","Lowside 5","Lowside 6","Lowside 7","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" tcu_solenoid8 = bits, U08, 1199, [0:7], "NONE","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","Highside 2","Highside 1","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","Lowside 8","Lowside 9","Lowside 10","Lowside 11","Lowside 12","Lowside 13","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","Ign 5","Ign 4","Ign 3","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","Ign 2","Ign 1","INVALID","INVALID","Lowside 1","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","Highside 4","Highside 3","Lowside 14","Lowside 15","Lowside 16","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","Ign 12","Ign 11","Ign 10","Ign 9","Ign 8","Ign 7","Ign 6","Lowside 2","Lowside 3","Lowside 4","Lowside 5","Lowside 6","Lowside 7","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" - unusedAtOldBoardConfigurationEnd = array, S32, 1200, [65], "units", 1.0, 0, -20, 100, 0 + drv8860spiDevice = bits,U32, 1200, [0:2], "Off", "SPI1", "SPI2", "SPI3", "SPI4", "INVALID", "INVALID", "INVALID" + drv8860_cs = bits, U08, 1201, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6","PE7","PE8","PE9","PE10","PE11","PE12","PE13","PE14","PE15", "PF0","PF1","PF2","PF3","PF4","PF5","PF6","PF7","PF8","PF9","PF10","PF11","PF12","PF13","PF14","PF15", "PG0","PG1","PG2","PG3","PG4","PG5","PG6","PG7","PG8","PG9","PG10","PG11","PG12","PG13","PG14","PG15", "PH0","PH1","PH2","PH3","PH4","PH5","PH6","PH7","PH8","PH9","PH10","PH11","PH12","PH13","PH14","PH15","INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" + drv8860_csPinMode = bits, U08, 1202, [0:1], "default", "default inverted", "open collector", "open collector inverted" + drv8860_miso = bits, U08, 1203, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6","PE7","PE8","PE9","PE10","PE11","PE12","PE13","PE14","PE15", "PF0","PF1","PF2","PF3","PF4","PF5","PF6","PF7","PF8","PF9","PF10","PF11","PF12","PF13","PF14","PF15", "PG0","PG1","PG2","PG3","PG4","PG5","PG6","PG7","PG8","PG9","PG10","PG11","PG12","PG13","PG14","PG15", "PH0","PH1","PH2","PH3","PH4","PH5","PH6","PH7","PH8","PH9","PH10","PH11","PH12","PH13","PH14","PH15","INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" + unusedAtOldBoardConfigurationEnd = array, S32, 1204, [64], "units", 1.0, 0, -20, 100, 0 tps2SecondaryMin = scalar, U16, 1460, "ADC", 1.0, 0, 0, 1000, 0 tps2SecondaryMax = scalar, U16, 1462, "ADC", 1.0, 0, 0, 1000, 0 unusedHereWeHave = bits, U32, 1464, [0:0], "false", "true" @@ -832,30 +836,30 @@ page = 1 unused1128 = bits, U32, 2116, [5:5], "false", "true" unused1129 = bits, U32, 2116, [6:6], "false", "true" unused1130 = bits, U32, 2116, [7:7], "false", "true" - unusedBit_478_8 = bits, U32, 2116, [8:8], "false", "true" - unusedBit_478_9 = bits, U32, 2116, [9:9], "false", "true" - unusedBit_478_10 = bits, U32, 2116, [10:10], "false", "true" - unusedBit_478_11 = bits, U32, 2116, [11:11], "false", "true" - unusedBit_478_12 = bits, U32, 2116, [12:12], "false", "true" - unusedBit_478_13 = bits, U32, 2116, [13:13], "false", "true" - unusedBit_478_14 = bits, U32, 2116, [14:14], "false", "true" - unusedBit_478_15 = bits, U32, 2116, [15:15], "false", "true" - unusedBit_478_16 = bits, U32, 2116, [16:16], "false", "true" - unusedBit_478_17 = bits, U32, 2116, [17:17], "false", "true" - unusedBit_478_18 = bits, U32, 2116, [18:18], "false", "true" - unusedBit_478_19 = bits, U32, 2116, [19:19], "false", "true" - unusedBit_478_20 = bits, U32, 2116, [20:20], "false", "true" - unusedBit_478_21 = bits, U32, 2116, [21:21], "false", "true" - unusedBit_478_22 = bits, U32, 2116, [22:22], "false", "true" - unusedBit_478_23 = bits, U32, 2116, [23:23], "false", "true" - unusedBit_478_24 = bits, U32, 2116, [24:24], "false", "true" - unusedBit_478_25 = bits, U32, 2116, [25:25], "false", "true" - unusedBit_478_26 = bits, U32, 2116, [26:26], "false", "true" - unusedBit_478_27 = bits, U32, 2116, [27:27], "false", "true" - unusedBit_478_28 = bits, U32, 2116, [28:28], "false", "true" - unusedBit_478_29 = bits, U32, 2116, [29:29], "false", "true" - unusedBit_478_30 = bits, U32, 2116, [30:30], "false", "true" - unusedBit_478_31 = bits, U32, 2116, [31:31], "false", "true" + unusedBit_482_8 = bits, U32, 2116, [8:8], "false", "true" + unusedBit_482_9 = bits, U32, 2116, [9:9], "false", "true" + unusedBit_482_10 = bits, U32, 2116, [10:10], "false", "true" + unusedBit_482_11 = bits, U32, 2116, [11:11], "false", "true" + unusedBit_482_12 = bits, U32, 2116, [12:12], "false", "true" + unusedBit_482_13 = bits, U32, 2116, [13:13], "false", "true" + unusedBit_482_14 = bits, U32, 2116, [14:14], "false", "true" + unusedBit_482_15 = bits, U32, 2116, [15:15], "false", "true" + unusedBit_482_16 = bits, U32, 2116, [16:16], "false", "true" + unusedBit_482_17 = bits, U32, 2116, [17:17], "false", "true" + unusedBit_482_18 = bits, U32, 2116, [18:18], "false", "true" + unusedBit_482_19 = bits, U32, 2116, [19:19], "false", "true" + unusedBit_482_20 = bits, U32, 2116, [20:20], "false", "true" + unusedBit_482_21 = bits, U32, 2116, [21:21], "false", "true" + unusedBit_482_22 = bits, U32, 2116, [22:22], "false", "true" + unusedBit_482_23 = bits, U32, 2116, [23:23], "false", "true" + unusedBit_482_24 = bits, U32, 2116, [24:24], "false", "true" + unusedBit_482_25 = bits, U32, 2116, [25:25], "false", "true" + unusedBit_482_26 = bits, U32, 2116, [26:26], "false", "true" + unusedBit_482_27 = bits, U32, 2116, [27:27], "false", "true" + unusedBit_482_28 = bits, U32, 2116, [28:28], "false", "true" + unusedBit_482_29 = bits, U32, 2116, [29:29], "false", "true" + unusedBit_482_30 = bits, U32, 2116, [30:30], "false", "true" + unusedBit_482_31 = bits, U32, 2116, [31:31], "false", "true" can2NbcType = bits, U32, 2120, [0:3], "None", "FIAT", "VAG" , "MAZDA RX8", "BMW", "W202", "BMW E90", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" can2TxPin = bits, U08, 2124, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6","PE7","PE8","PE9","PE10","PE11","PE12","PE13","PE14","PE15", "PF0","PF1","PF2","PF3","PF4","PF5","PF6","PF7","PF8","PF9","PF10","PF11","PF12","PF13","PF14","PF15", "PG0","PG1","PG2","PG3","PG4","PG5","PG6","PG7","PG8","PG9","PG10","PG11","PG12","PG13","PG14","PG15", "PH0","PH1","PH2","PH3","PH4","PH5","PH6","PH7","PH8","PH9","PH10","PH11","PH12","PH13","PH14","PH15","INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" can2RxPin = bits, U08, 2125, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6","PE7","PE8","PE9","PE10","PE11","PE12","PE13","PE14","PE15", "PF0","PF1","PF2","PF3","PF4","PF5","PF6","PF7","PF8","PF9","PF10","PF11","PF12","PF13","PF14","PF15", "PG0","PG1","PG2","PG3","PG4","PG5","PG6","PG7","PG8","PG9","PG10","PG11","PG12","PG13","PG14","PG15", "PH0","PH1","PH2","PH3","PH4","PH5","PH6","PH7","PH8","PH9","PH10","PH11","PH12","PH13","PH14","PH15","INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" diff --git a/firmware/tunerstudio/generated/rusefi_proteus_f7.ini b/firmware/tunerstudio/generated/rusefi_proteus_f7.ini index 0780866ec3..06e9d14b73 100644 --- a/firmware/tunerstudio/generated/rusefi_proteus_f7.ini +++ b/firmware/tunerstudio/generated/rusefi_proteus_f7.ini @@ -33,12 +33,12 @@ enable2ndByteCanID = false [MegaTune] ; https://rusefi.com/forum/viewtopic.php?p=36201#p36201 - signature = "rusEFI 2020.09.07.proteus_f7.2280528919" + signature = "rusEFI 2020.09.07.proteus_f7.1570895101" [TunerStudio] queryCommand = "S" versionInfo = "V" ; firmwave version for title bar. - signature = "rusEFI 2020.09.07.proteus_f7.2280528919" ; signature is expected to be 7 or more characters. + signature = "rusEFI 2020.09.07.proteus_f7.1570895101" ; signature is expected to be 7 or more characters. [Constants] ; new packet serial format with CRC @@ -74,7 +74,7 @@ enable2ndByteCanID = false ; see PAGE_0_SIZE in C source code ; CONFIG_DEFINITION_START -; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Sep 07 14:17:23 UTC 2020 +; this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Sep 07 14:49:36 UTC 2020 pageSize = 20000 page = 1 @@ -632,7 +632,11 @@ page = 1 tcu_solenoid6 = bits, U08, 1197, [0:7], "NONE","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","Highside 2","Highside 1","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","Lowside 8","Lowside 9","Lowside 10","Lowside 11","Lowside 12","Lowside 13","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","Ign 5","Ign 4","Ign 3","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","Ign 2","Ign 1","INVALID","INVALID","Lowside 1","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","Highside 4","Highside 3","Lowside 14","Lowside 15","Lowside 16","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","Ign 12","Ign 11","Ign 10","Ign 9","Ign 8","Ign 7","Ign 6","Lowside 2","Lowside 3","Lowside 4","Lowside 5","Lowside 6","Lowside 7","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" tcu_solenoid7 = bits, U08, 1198, [0:7], "NONE","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","Highside 2","Highside 1","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","Lowside 8","Lowside 9","Lowside 10","Lowside 11","Lowside 12","Lowside 13","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","Ign 5","Ign 4","Ign 3","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","Ign 2","Ign 1","INVALID","INVALID","Lowside 1","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","Highside 4","Highside 3","Lowside 14","Lowside 15","Lowside 16","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","Ign 12","Ign 11","Ign 10","Ign 9","Ign 8","Ign 7","Ign 6","Lowside 2","Lowside 3","Lowside 4","Lowside 5","Lowside 6","Lowside 7","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" tcu_solenoid8 = bits, U08, 1199, [0:7], "NONE","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","Highside 2","Highside 1","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","Lowside 8","Lowside 9","Lowside 10","Lowside 11","Lowside 12","Lowside 13","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","Ign 5","Ign 4","Ign 3","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","Ign 2","Ign 1","INVALID","INVALID","Lowside 1","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","Highside 4","Highside 3","Lowside 14","Lowside 15","Lowside 16","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","Ign 12","Ign 11","Ign 10","Ign 9","Ign 8","Ign 7","Ign 6","Lowside 2","Lowside 3","Lowside 4","Lowside 5","Lowside 6","Lowside 7","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID","INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" - unusedAtOldBoardConfigurationEnd = array, S32, 1200, [65], "units", 1.0, 0, -20, 100, 0 + drv8860spiDevice = bits,U32, 1200, [0:2], "Off", "SPI1", "SPI2", "SPI3", "SPI4", "INVALID", "INVALID", "INVALID" + drv8860_cs = bits, U08, 1201, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6","PE7","PE8","PE9","PE10","PE11","PE12","PE13","PE14","PE15", "PF0","PF1","PF2","PF3","PF4","PF5","PF6","PF7","PF8","PF9","PF10","PF11","PF12","PF13","PF14","PF15", "PG0","PG1","PG2","PG3","PG4","PG5","PG6","PG7","PG8","PG9","PG10","PG11","PG12","PG13","PG14","PG15", "PH0","PH1","PH2","PH3","PH4","PH5","PH6","PH7","PH8","PH9","PH10","PH11","PH12","PH13","PH14","PH15","INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" + drv8860_csPinMode = bits, U08, 1202, [0:1], "default", "default inverted", "open collector", "open collector inverted" + drv8860_miso = bits, U08, 1203, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6","PE7","PE8","PE9","PE10","PE11","PE12","PE13","PE14","PE15", "PF0","PF1","PF2","PF3","PF4","PF5","PF6","PF7","PF8","PF9","PF10","PF11","PF12","PF13","PF14","PF15", "PG0","PG1","PG2","PG3","PG4","PG5","PG6","PG7","PG8","PG9","PG10","PG11","PG12","PG13","PG14","PG15", "PH0","PH1","PH2","PH3","PH4","PH5","PH6","PH7","PH8","PH9","PH10","PH11","PH12","PH13","PH14","PH15","INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" + unusedAtOldBoardConfigurationEnd = array, S32, 1204, [64], "units", 1.0, 0, -20, 100, 0 tps2SecondaryMin = scalar, U16, 1460, "ADC", 1.0, 0, 0, 1000, 0 tps2SecondaryMax = scalar, U16, 1462, "ADC", 1.0, 0, 0, 1000, 0 unusedHereWeHave = bits, U32, 1464, [0:0], "false", "true" @@ -832,30 +836,30 @@ page = 1 unused1128 = bits, U32, 2116, [5:5], "false", "true" unused1129 = bits, U32, 2116, [6:6], "false", "true" unused1130 = bits, U32, 2116, [7:7], "false", "true" - unusedBit_478_8 = bits, U32, 2116, [8:8], "false", "true" - unusedBit_478_9 = bits, U32, 2116, [9:9], "false", "true" - unusedBit_478_10 = bits, U32, 2116, [10:10], "false", "true" - unusedBit_478_11 = bits, U32, 2116, [11:11], "false", "true" - unusedBit_478_12 = bits, U32, 2116, [12:12], "false", "true" - unusedBit_478_13 = bits, U32, 2116, [13:13], "false", "true" - unusedBit_478_14 = bits, U32, 2116, [14:14], "false", "true" - unusedBit_478_15 = bits, U32, 2116, [15:15], "false", "true" - unusedBit_478_16 = bits, U32, 2116, [16:16], "false", "true" - unusedBit_478_17 = bits, U32, 2116, [17:17], "false", "true" - unusedBit_478_18 = bits, U32, 2116, [18:18], "false", "true" - unusedBit_478_19 = bits, U32, 2116, [19:19], "false", "true" - unusedBit_478_20 = bits, U32, 2116, [20:20], "false", "true" - unusedBit_478_21 = bits, U32, 2116, [21:21], "false", "true" - unusedBit_478_22 = bits, U32, 2116, [22:22], "false", "true" - unusedBit_478_23 = bits, U32, 2116, [23:23], "false", "true" - unusedBit_478_24 = bits, U32, 2116, [24:24], "false", "true" - unusedBit_478_25 = bits, U32, 2116, [25:25], "false", "true" - unusedBit_478_26 = bits, U32, 2116, [26:26], "false", "true" - unusedBit_478_27 = bits, U32, 2116, [27:27], "false", "true" - unusedBit_478_28 = bits, U32, 2116, [28:28], "false", "true" - unusedBit_478_29 = bits, U32, 2116, [29:29], "false", "true" - unusedBit_478_30 = bits, U32, 2116, [30:30], "false", "true" - unusedBit_478_31 = bits, U32, 2116, [31:31], "false", "true" + unusedBit_482_8 = bits, U32, 2116, [8:8], "false", "true" + unusedBit_482_9 = bits, U32, 2116, [9:9], "false", "true" + unusedBit_482_10 = bits, U32, 2116, [10:10], "false", "true" + unusedBit_482_11 = bits, U32, 2116, [11:11], "false", "true" + unusedBit_482_12 = bits, U32, 2116, [12:12], "false", "true" + unusedBit_482_13 = bits, U32, 2116, [13:13], "false", "true" + unusedBit_482_14 = bits, U32, 2116, [14:14], "false", "true" + unusedBit_482_15 = bits, U32, 2116, [15:15], "false", "true" + unusedBit_482_16 = bits, U32, 2116, [16:16], "false", "true" + unusedBit_482_17 = bits, U32, 2116, [17:17], "false", "true" + unusedBit_482_18 = bits, U32, 2116, [18:18], "false", "true" + unusedBit_482_19 = bits, U32, 2116, [19:19], "false", "true" + unusedBit_482_20 = bits, U32, 2116, [20:20], "false", "true" + unusedBit_482_21 = bits, U32, 2116, [21:21], "false", "true" + unusedBit_482_22 = bits, U32, 2116, [22:22], "false", "true" + unusedBit_482_23 = bits, U32, 2116, [23:23], "false", "true" + unusedBit_482_24 = bits, U32, 2116, [24:24], "false", "true" + unusedBit_482_25 = bits, U32, 2116, [25:25], "false", "true" + unusedBit_482_26 = bits, U32, 2116, [26:26], "false", "true" + unusedBit_482_27 = bits, U32, 2116, [27:27], "false", "true" + unusedBit_482_28 = bits, U32, 2116, [28:28], "false", "true" + unusedBit_482_29 = bits, U32, 2116, [29:29], "false", "true" + unusedBit_482_30 = bits, U32, 2116, [30:30], "false", "true" + unusedBit_482_31 = bits, U32, 2116, [31:31], "false", "true" can2NbcType = bits, U32, 2120, [0:3], "None", "FIAT", "VAG" , "MAZDA RX8", "BMW", "W202", "BMW E90", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" can2TxPin = bits, U08, 2124, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6","PE7","PE8","PE9","PE10","PE11","PE12","PE13","PE14","PE15", "PF0","PF1","PF2","PF3","PF4","PF5","PF6","PF7","PF8","PF9","PF10","PF11","PF12","PF13","PF14","PF15", "PG0","PG1","PG2","PG3","PG4","PG5","PG6","PG7","PG8","PG9","PG10","PG11","PG12","PG13","PG14","PG15", "PH0","PH1","PH2","PH3","PH4","PH5","PH6","PH7","PH8","PH9","PH10","PH11","PH12","PH13","PH14","PH15","INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" can2RxPin = bits, U08, 2125, [0:7], "NONE", "INVALID", "PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7", "PA8", "PA9", "PA10", "PA11", "PA12", "PA13", "PA14", "PA15", "PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7", "PB8", "PB9", "PB10", "PB11", "PB12", "PB13", "PB14", "PB15", "PC0", "PC1", "PC2", "PC3", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", "PC11", "PC12", "PC13", "PC14", "PC15", "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD6", "PD7", "PD8", "PD9", "PD10", "PD11", "PD12", "PD13", "PD14", "PD15", "PE0", "PE1", "PE2", "PE3", "PE4", "PE5", "PE6","PE7","PE8","PE9","PE10","PE11","PE12","PE13","PE14","PE15", "PF0","PF1","PF2","PF3","PF4","PF5","PF6","PF7","PF8","PF9","PF10","PF11","PF12","PF13","PF14","PF15", "PG0","PG1","PG2","PG3","PG4","PG5","PG6","PG7","PG8","PG9","PG10","PG11","PG12","PG13","PG14","PG15", "PH0","PH1","PH2","PH3","PH4","PH5","PH6","PH7","PH8","PH9","PH10","PH11","PH12","PH13","PH14","PH15","INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID", "INVALID" diff --git a/java_console/models/src/main/java/com/rusefi/config/generated/Fields.java b/java_console/models/src/main/java/com/rusefi/config/generated/Fields.java index ece7354bcd..3e9130a967 100644 --- a/java_console/models/src/main/java/com/rusefi/config/generated/Fields.java +++ b/java_console/models/src/main/java/com/rusefi/config/generated/Fields.java @@ -1,6 +1,6 @@ package com.rusefi.config.generated; -// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Sep 07 14:17:13 UTC 2020 +// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Mon Sep 07 14:49:25 UTC 2020 // by class com.rusefi.output.FileJavaFieldsConsumer import com.rusefi.config.*; @@ -320,6 +320,10 @@ public class Fields { public static final int displayMode_offset = 492; public static final int dizzySparkOutputPin_offset = 2226; public static final int dizzySparkOutputPinMode_offset = 2227; + public static final int drv8860_cs_offset = 1201; + public static final int drv8860_csPinMode_offset = 1202; + public static final int drv8860_miso_offset = 1203; + public static final int drv8860spiDevice_offset = 1200; public static final int DWELL_CURVE_SIZE = 8; public static final int egoValueShift_offset = 2216; public static final int EGT_CHANNEL_COUNT = 8; @@ -1119,7 +1123,6 @@ public class Fields { public static final int servoOutputPins8_offset = 3147; public static final int showHumanReadableWarning_offset = 976; public static final int showSdCardWarning_offset = 76; - public static final int SIGNATURE_HASH = 1681901319; public static final int silentTriggerError_offset = 1464; public static final int slowAdcAlpha_offset = 2088; public static final int sparkDwellRpmBins_offset = 332; @@ -1379,7 +1382,7 @@ public class Fields { public static final char TS_SD_R_COMMAND = 'r'; public static final char TS_SD_W_COMMAND = 'w'; public static final char TS_SET_LOGGER_SWITCH = 'l'; - public static final String TS_SIGNATURE = "rusEFI 2020.09.07.all.1681901319"; + public static final String TS_SIGNATURE = "rusEFI 2020.09.07.all.3195023341"; public static final char TS_SINGLE_WRITE_COMMAND = 'W'; public static final int tunerStudioSerialSpeed_offset = 728; public static final int twoWireBatchIgnition_offset = 1476; @@ -1416,7 +1419,7 @@ public class Fields { public static final int unusedAt716_offset = 716; public static final int unusedAt720_offset = 720; public static final int unusedAt724_offset = 724; - public static final int unusedAtOldBoardConfigurationEnd_offset = 1200; + public static final int unusedAtOldBoardConfigurationEnd_offset = 1204; public static final int unusedAuxVoltage1_TODO_332_offset = 2713; public static final int unusedAuxVoltage2_TODO_332_offset = 2714; public static final int unusedBit4_1476_offset = 1476; @@ -1424,30 +1427,30 @@ public class Fields { public static final int unusedBit_285_30_offset = 976; public static final int unusedBit_285_31_offset = 976; public static final int unusedBit_34_31_offset = 76; - public static final int unusedBit_478_10_offset = 2116; - public static final int unusedBit_478_11_offset = 2116; - public static final int unusedBit_478_12_offset = 2116; - public static final int unusedBit_478_13_offset = 2116; - public static final int unusedBit_478_14_offset = 2116; - public static final int unusedBit_478_15_offset = 2116; - public static final int unusedBit_478_16_offset = 2116; - public static final int unusedBit_478_17_offset = 2116; - public static final int unusedBit_478_18_offset = 2116; - public static final int unusedBit_478_19_offset = 2116; - public static final int unusedBit_478_20_offset = 2116; - public static final int unusedBit_478_21_offset = 2116; - public static final int unusedBit_478_22_offset = 2116; - public static final int unusedBit_478_23_offset = 2116; - public static final int unusedBit_478_24_offset = 2116; - public static final int unusedBit_478_25_offset = 2116; - public static final int unusedBit_478_26_offset = 2116; - public static final int unusedBit_478_27_offset = 2116; - public static final int unusedBit_478_28_offset = 2116; - public static final int unusedBit_478_29_offset = 2116; - public static final int unusedBit_478_30_offset = 2116; - public static final int unusedBit_478_31_offset = 2116; - public static final int unusedBit_478_8_offset = 2116; - public static final int unusedBit_478_9_offset = 2116; + public static final int unusedBit_482_10_offset = 2116; + public static final int unusedBit_482_11_offset = 2116; + public static final int unusedBit_482_12_offset = 2116; + public static final int unusedBit_482_13_offset = 2116; + public static final int unusedBit_482_14_offset = 2116; + public static final int unusedBit_482_15_offset = 2116; + public static final int unusedBit_482_16_offset = 2116; + public static final int unusedBit_482_17_offset = 2116; + public static final int unusedBit_482_18_offset = 2116; + public static final int unusedBit_482_19_offset = 2116; + public static final int unusedBit_482_20_offset = 2116; + public static final int unusedBit_482_21_offset = 2116; + public static final int unusedBit_482_22_offset = 2116; + public static final int unusedBit_482_23_offset = 2116; + public static final int unusedBit_482_24_offset = 2116; + public static final int unusedBit_482_25_offset = 2116; + public static final int unusedBit_482_26_offset = 2116; + public static final int unusedBit_482_27_offset = 2116; + public static final int unusedBit_482_28_offset = 2116; + public static final int unusedBit_482_29_offset = 2116; + public static final int unusedBit_482_30_offset = 2116; + public static final int unusedBit_482_31_offset = 2116; + public static final int unusedBit_482_8_offset = 2116; + public static final int unusedBit_482_9_offset = 2116; public static final int unusedFlexFuelSensor_offset = 3100; public static final int unusedHereWeHave_offset = 1464; public static final int unusedOldBiquad_offset = 2332; @@ -2073,6 +2076,10 @@ public class Fields { public static final Field TCU_SOLENOID6 = Field.create("TCU_SOLENOID6", 1197, FieldType.INT8, output_pin_e); public static final Field TCU_SOLENOID7 = Field.create("TCU_SOLENOID7", 1198, FieldType.INT8, output_pin_e); public static final Field TCU_SOLENOID8 = Field.create("TCU_SOLENOID8", 1199, FieldType.INT8, output_pin_e); + public static final Field DRV8860SPIDEVICE = Field.create("DRV8860SPIDEVICE", 1200, FieldType.INT8); + public static final Field DRV8860_CS = Field.create("DRV8860_CS", 1201, FieldType.INT8, brain_pin_e); + public static final Field DRV8860_CSPINMODE = Field.create("DRV8860_CSPINMODE", 1202, FieldType.INT8, pin_output_mode_e); + public static final Field DRV8860_MISO = Field.create("DRV8860_MISO", 1203, FieldType.INT8, brain_pin_e); public static final Field TPS2SECONDARYMIN = Field.create("TPS2SECONDARYMIN", 1460, FieldType.INT16); public static final Field TPS2SECONDARYMAX = Field.create("TPS2SECONDARYMAX", 1462, FieldType.INT16); public static final Field UNUSEDHEREWEHAVE = Field.create("UNUSEDHEREWEHAVE", 1464, FieldType.BIT, 0); @@ -2268,30 +2275,30 @@ public class Fields { public static final Field UNUSED1128 = Field.create("UNUSED1128", 2116, FieldType.BIT, 5); public static final Field UNUSED1129 = Field.create("UNUSED1129", 2116, FieldType.BIT, 6); public static final Field UNUSED1130 = Field.create("UNUSED1130", 2116, FieldType.BIT, 7); - public static final Field UNUSEDBIT_478_8 = Field.create("UNUSEDBIT_478_8", 2116, FieldType.BIT, 8); - public static final Field UNUSEDBIT_478_9 = Field.create("UNUSEDBIT_478_9", 2116, FieldType.BIT, 9); - public static final Field UNUSEDBIT_478_10 = Field.create("UNUSEDBIT_478_10", 2116, FieldType.BIT, 10); - public static final Field UNUSEDBIT_478_11 = Field.create("UNUSEDBIT_478_11", 2116, FieldType.BIT, 11); - public static final Field UNUSEDBIT_478_12 = Field.create("UNUSEDBIT_478_12", 2116, FieldType.BIT, 12); - public static final Field UNUSEDBIT_478_13 = Field.create("UNUSEDBIT_478_13", 2116, FieldType.BIT, 13); - public static final Field UNUSEDBIT_478_14 = Field.create("UNUSEDBIT_478_14", 2116, FieldType.BIT, 14); - public static final Field UNUSEDBIT_478_15 = Field.create("UNUSEDBIT_478_15", 2116, FieldType.BIT, 15); - public static final Field UNUSEDBIT_478_16 = Field.create("UNUSEDBIT_478_16", 2116, FieldType.BIT, 16); - public static final Field UNUSEDBIT_478_17 = Field.create("UNUSEDBIT_478_17", 2116, FieldType.BIT, 17); - public static final Field UNUSEDBIT_478_18 = Field.create("UNUSEDBIT_478_18", 2116, FieldType.BIT, 18); - public static final Field UNUSEDBIT_478_19 = Field.create("UNUSEDBIT_478_19", 2116, FieldType.BIT, 19); - public static final Field UNUSEDBIT_478_20 = Field.create("UNUSEDBIT_478_20", 2116, FieldType.BIT, 20); - public static final Field UNUSEDBIT_478_21 = Field.create("UNUSEDBIT_478_21", 2116, FieldType.BIT, 21); - public static final Field UNUSEDBIT_478_22 = Field.create("UNUSEDBIT_478_22", 2116, FieldType.BIT, 22); - public static final Field UNUSEDBIT_478_23 = Field.create("UNUSEDBIT_478_23", 2116, FieldType.BIT, 23); - public static final Field UNUSEDBIT_478_24 = Field.create("UNUSEDBIT_478_24", 2116, FieldType.BIT, 24); - public static final Field UNUSEDBIT_478_25 = Field.create("UNUSEDBIT_478_25", 2116, FieldType.BIT, 25); - public static final Field UNUSEDBIT_478_26 = Field.create("UNUSEDBIT_478_26", 2116, FieldType.BIT, 26); - public static final Field UNUSEDBIT_478_27 = Field.create("UNUSEDBIT_478_27", 2116, FieldType.BIT, 27); - public static final Field UNUSEDBIT_478_28 = Field.create("UNUSEDBIT_478_28", 2116, FieldType.BIT, 28); - public static final Field UNUSEDBIT_478_29 = Field.create("UNUSEDBIT_478_29", 2116, FieldType.BIT, 29); - public static final Field UNUSEDBIT_478_30 = Field.create("UNUSEDBIT_478_30", 2116, FieldType.BIT, 30); - public static final Field UNUSEDBIT_478_31 = Field.create("UNUSEDBIT_478_31", 2116, FieldType.BIT, 31); + public static final Field UNUSEDBIT_482_8 = Field.create("UNUSEDBIT_482_8", 2116, FieldType.BIT, 8); + public static final Field UNUSEDBIT_482_9 = Field.create("UNUSEDBIT_482_9", 2116, FieldType.BIT, 9); + public static final Field UNUSEDBIT_482_10 = Field.create("UNUSEDBIT_482_10", 2116, FieldType.BIT, 10); + public static final Field UNUSEDBIT_482_11 = Field.create("UNUSEDBIT_482_11", 2116, FieldType.BIT, 11); + public static final Field UNUSEDBIT_482_12 = Field.create("UNUSEDBIT_482_12", 2116, FieldType.BIT, 12); + public static final Field UNUSEDBIT_482_13 = Field.create("UNUSEDBIT_482_13", 2116, FieldType.BIT, 13); + public static final Field UNUSEDBIT_482_14 = Field.create("UNUSEDBIT_482_14", 2116, FieldType.BIT, 14); + public static final Field UNUSEDBIT_482_15 = Field.create("UNUSEDBIT_482_15", 2116, FieldType.BIT, 15); + public static final Field UNUSEDBIT_482_16 = Field.create("UNUSEDBIT_482_16", 2116, FieldType.BIT, 16); + public static final Field UNUSEDBIT_482_17 = Field.create("UNUSEDBIT_482_17", 2116, FieldType.BIT, 17); + public static final Field UNUSEDBIT_482_18 = Field.create("UNUSEDBIT_482_18", 2116, FieldType.BIT, 18); + public static final Field UNUSEDBIT_482_19 = Field.create("UNUSEDBIT_482_19", 2116, FieldType.BIT, 19); + public static final Field UNUSEDBIT_482_20 = Field.create("UNUSEDBIT_482_20", 2116, FieldType.BIT, 20); + public static final Field UNUSEDBIT_482_21 = Field.create("UNUSEDBIT_482_21", 2116, FieldType.BIT, 21); + public static final Field UNUSEDBIT_482_22 = Field.create("UNUSEDBIT_482_22", 2116, FieldType.BIT, 22); + public static final Field UNUSEDBIT_482_23 = Field.create("UNUSEDBIT_482_23", 2116, FieldType.BIT, 23); + public static final Field UNUSEDBIT_482_24 = Field.create("UNUSEDBIT_482_24", 2116, FieldType.BIT, 24); + public static final Field UNUSEDBIT_482_25 = Field.create("UNUSEDBIT_482_25", 2116, FieldType.BIT, 25); + public static final Field UNUSEDBIT_482_26 = Field.create("UNUSEDBIT_482_26", 2116, FieldType.BIT, 26); + public static final Field UNUSEDBIT_482_27 = Field.create("UNUSEDBIT_482_27", 2116, FieldType.BIT, 27); + public static final Field UNUSEDBIT_482_28 = Field.create("UNUSEDBIT_482_28", 2116, FieldType.BIT, 28); + public static final Field UNUSEDBIT_482_29 = Field.create("UNUSEDBIT_482_29", 2116, FieldType.BIT, 29); + public static final Field UNUSEDBIT_482_30 = Field.create("UNUSEDBIT_482_30", 2116, FieldType.BIT, 30); + public static final Field UNUSEDBIT_482_31 = Field.create("UNUSEDBIT_482_31", 2116, FieldType.BIT, 31); public static final Field CAN2NBCTYPE = Field.create("CAN2NBCTYPE", 2120, FieldType.INT); public static final Field CAN2TXPIN = Field.create("CAN2TXPIN", 2124, FieldType.INT8, brain_pin_e); public static final Field CAN2RXPIN = Field.create("CAN2RXPIN", 2125, FieldType.INT8, brain_pin_e); @@ -3101,6 +3108,10 @@ public class Fields { TCU_SOLENOID6, TCU_SOLENOID7, TCU_SOLENOID8, + DRV8860SPIDEVICE, + DRV8860_CS, + DRV8860_CSPINMODE, + DRV8860_MISO, TPS2SECONDARYMIN, TPS2SECONDARYMAX, UNUSEDHEREWEHAVE, @@ -3292,30 +3303,30 @@ public class Fields { UNUSED1128, UNUSED1129, UNUSED1130, - UNUSEDBIT_478_8, - UNUSEDBIT_478_9, - UNUSEDBIT_478_10, - UNUSEDBIT_478_11, - UNUSEDBIT_478_12, - UNUSEDBIT_478_13, - UNUSEDBIT_478_14, - UNUSEDBIT_478_15, - UNUSEDBIT_478_16, - UNUSEDBIT_478_17, - UNUSEDBIT_478_18, - UNUSEDBIT_478_19, - UNUSEDBIT_478_20, - UNUSEDBIT_478_21, - UNUSEDBIT_478_22, - UNUSEDBIT_478_23, - UNUSEDBIT_478_24, - UNUSEDBIT_478_25, - UNUSEDBIT_478_26, - UNUSEDBIT_478_27, - UNUSEDBIT_478_28, - UNUSEDBIT_478_29, - UNUSEDBIT_478_30, - UNUSEDBIT_478_31, + UNUSEDBIT_482_8, + UNUSEDBIT_482_9, + UNUSEDBIT_482_10, + UNUSEDBIT_482_11, + UNUSEDBIT_482_12, + UNUSEDBIT_482_13, + UNUSEDBIT_482_14, + UNUSEDBIT_482_15, + UNUSEDBIT_482_16, + UNUSEDBIT_482_17, + UNUSEDBIT_482_18, + UNUSEDBIT_482_19, + UNUSEDBIT_482_20, + UNUSEDBIT_482_21, + UNUSEDBIT_482_22, + UNUSEDBIT_482_23, + UNUSEDBIT_482_24, + UNUSEDBIT_482_25, + UNUSEDBIT_482_26, + UNUSEDBIT_482_27, + UNUSEDBIT_482_28, + UNUSEDBIT_482_29, + UNUSEDBIT_482_30, + UNUSEDBIT_482_31, CAN2NBCTYPE, CAN2TXPIN, CAN2RXPIN, diff --git a/java_console/rusefi.xml b/java_console/rusefi.xml index a928c519ad..9d99ffc8e4 100644 --- a/java_console/rusefi.xml +++ b/java_console/rusefi.xml @@ -1,6 +1,6 @@ - +