From cf5c99185e5f2abde160746e960949d6a4ec26a9 Mon Sep 17 00:00:00 2001 From: GitHub build-firmware Action Date: Thu, 6 Aug 2020 00:48:46 +0000 Subject: [PATCH] Auto-generated configs and docs --- ...ngine_configuration_generated_structures.h | 4 +-- .../controllers/algo/rusefi_generated.h | 30 ++++++++++++++++-- ...ngine_configuration_generated_structures.h | 4 +-- .../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 | 30 ++++++++++++++++-- .../controllers/generated/signature_all.h | 6 ++-- .../generated/signature_frankenso_na6.h | 6 ++-- .../controllers/generated/signature_kin.h | 6 ++-- .../controllers/generated/signature_mre_f4.h | 6 ++-- .../controllers/generated/signature_mre_f7.h | 6 ++-- .../generated/signature_prometheus_405.h | 6 ++-- .../generated/signature_prometheus_469.h | 6 ++-- .../generated/signature_proteus_f4.h | 6 ++-- .../generated/signature_proteus_f7.h | 6 ++-- firmware/tunerstudio/generated/cache.zip | Bin 849100 -> 849361 bytes firmware/tunerstudio/generated/rusefi.ini | 6 ++-- .../generated/rusefi_frankenso_na6.ini | 6 ++-- .../tunerstudio/generated/rusefi_kinetis.ini | 6 ++-- .../tunerstudio/generated/rusefi_mre_f4.ini | 6 ++-- .../tunerstudio/generated/rusefi_mre_f7.ini | 6 ++-- .../generated/rusefi_prometheus_405.ini | 6 ++-- .../generated/rusefi_prometheus_469.ini | 6 ++-- .../generated/rusefi_proteus_f4.ini | 6 ++-- .../generated/rusefi_proteus_f7.ini | 6 ++-- .../com/rusefi/config/generated/Fields.java | 5 ++- java_console/rusefi.xml | 2 +- 29 files changed, 119 insertions(+), 72 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 b8128baeff..b4790e4d0d 100644 --- a/firmware/config/boards/kinetis/config/controllers/algo/engine_configuration_generated_structures.h +++ b/firmware/config/boards/kinetis/config/controllers/algo/engine_configuration_generated_structures.h @@ -1,4 +1,4 @@ -// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Wed Aug 05 11:59:25 UTC 2020 +// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Thu Aug 06 00:48:27 UTC 2020 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -3651,4 +3651,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 Wed Aug 05 11:59:25 UTC 2020 +// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on kinetis_gen_config.bat integration/rusefi_config.txt Thu Aug 06 00:48:27 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 53573bd821..976a47fb26 100644 --- a/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h +++ b/firmware/config/boards/kinetis/config/controllers/algo/rusefi_generated.h @@ -1081,8 +1081,8 @@ #define showHumanReadableWarning_offset 976 #define showSdCardWarning_offset 76 #define SIGNATURE_BOARD kin -#define SIGNATURE_DATE 2020.08.05 -#define SIGNATURE_HASH 2006635304 +#define SIGNATURE_DATE 2020.08.06 +#define SIGNATURE_HASH 3131935648 #define silentTriggerError_offset 1464 #define slowAdcAlpha_offset 2088 #define sparkDwellRpmBins_offset 332 @@ -1305,29 +1305,48 @@ #define triggerSimulatorPins2_offset 737 #define triggerSimulatorPins3_offset 738 #define TS_BURN_COMMAND 'B' +#define TS_BURN_COMMAND_char B #define TS_CHUNK_WRITE_COMMAND 'C' +#define TS_CHUNK_WRITE_COMMAND_char C #define TS_COMMAND_F 'F' +#define TS_COMMAND_F_char F #define TS_COMPOSITE_DISABLE 2 #define TS_COMPOSITE_ENABLE 1 #define TS_CRC_CHECK_COMMAND 'k' +#define TS_CRC_CHECK_COMMAND_char k #define TS_EXECUTE 'E' +#define TS_EXECUTE_char E #define TS_FILE_VERSION 20200310 #define TS_GET_COMPOSITE_BUFFER_DONE_DIFFERENTLY '8' +#define TS_GET_COMPOSITE_BUFFER_DONE_DIFFERENTLY_char 8 #define TS_GET_CONFIG_ERROR 'e' +#define TS_GET_CONFIG_ERROR_char e #define TS_GET_FIRMWARE_VERSION 'V' +#define TS_GET_FIRMWARE_VERSION_char V #define TS_GET_LOGGER_GET_BUFFER 'L' +#define TS_GET_LOGGER_GET_BUFFER_char L #define TS_GET_STRUCT '9' +#define TS_GET_STRUCT_char 9 #define TS_GET_TEXT 'G' +#define TS_GET_TEXT_char G #define TS_HELLO_COMMAND 'S' +#define TS_HELLO_COMMAND_char S #define TS_IO_TEST_COMMAND 'Z' +#define TS_IO_TEST_COMMAND_char Z #define TS_ONLINE_PROTOCOL 'z' +#define TS_ONLINE_PROTOCOL_char z #define TS_OUTPUT_COMMAND 'O' +#define TS_OUTPUT_COMMAND_char O #define TS_OUTPUT_SIZE 288 #define TS_PAGE_COMMAND 'P' +#define TS_PAGE_COMMAND_char P #define TS_PERF_TRACE_BEGIN '_' +#define TS_PERF_TRACE_BEGIN_char _ #define TS_PERF_TRACE_GET_BUFFER 'b' +#define TS_PERF_TRACE_GET_BUFFER_char b #define TS_PROTOCOL "001" #define TS_READ_COMMAND 'R' +#define TS_READ_COMMAND_char R #define TS_RESPONSE_BURN_OK 4 #define TS_RESPONSE_COMMAND_OK 7 #define TS_RESPONSE_OK 0 @@ -1339,8 +1358,11 @@ #define TS_SD_PROTOCOL_REMOVE_FILE 6 #define TS_SD_PROTOCOL_RTC 7 #define TS_SD_R_COMMAND 'r' +#define TS_SD_R_COMMAND_char r #define TS_SD_W_COMMAND 'w' +#define TS_SD_W_COMMAND_char w #define TS_SET_LOGGER_SWITCH 'l' +#define TS_SET_LOGGER_SWITCH_char l #define ts_show_analog_divider true #define ts_show_auxserial_pins true #define ts_show_can2 true @@ -1360,8 +1382,10 @@ #define ts_show_spi true #define ts_show_trigger_comparator true #define ts_show_tunerstudio_port true -#define TS_SIGNATURE "rusEFI 2020.08.05.kin.2006635304" +#define TS_SIGNATURE "rusEFI 2020.08.06.kin.3131935648" #define TS_SINGLE_WRITE_COMMAND 'W' +#define TS_SINGLE_WRITE_COMMAND_char W +#define TS_TEST_COMMAND 't' // 0x74 #define tunerStudioSerialSpeed_offset 728 #define twoWireBatchIgnition_offset 1476 #define twoWireBatchInjection_offset 1476 diff --git a/firmware/controllers/generated/engine_configuration_generated_structures.h b/firmware/controllers/generated/engine_configuration_generated_structures.h index ea99304033..660a05160f 100644 --- a/firmware/controllers/generated/engine_configuration_generated_structures.h +++ b/firmware/controllers/generated/engine_configuration_generated_structures.h @@ -1,4 +1,4 @@ -// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Wed Aug 05 11:59:13 UTC 2020 +// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Aug 06 00:48:17 UTC 2020 // by class com.rusefi.output.CHeaderConsumer // begin #pragma once @@ -3651,4 +3651,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 Wed Aug 05 11:59:13 UTC 2020 +// this section was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Aug 06 00:48:17 UTC 2020 diff --git a/firmware/controllers/generated/fsio_enums_generated.def b/firmware/controllers/generated/fsio_enums_generated.def index b8c48d3cc4..85607112e4 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 Wed Aug 05 11:59:13 UTC 2020 +// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Aug 06 00:48:17 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 1b577bed0a..ad7d06d469 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 Wed Aug 05 11:59:13 UTC 2020 +// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Aug 06 00:48:17 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 10fc0e9974..a76f1c99ef 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 Wed Aug 05 11:59:13 UTC 2020 +// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Aug 06 00:48:17 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 05930ed6e3..34da43613b 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 Wed Aug 05 11:59:13 UTC 2020 +// this file was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt Thu Aug 06 00:48:17 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 0130768863..e1ece273cd 100644 --- a/firmware/controllers/generated/rusefi_generated.h +++ b/firmware/controllers/generated/rusefi_generated.h @@ -1081,8 +1081,8 @@ #define showHumanReadableWarning_offset 976 #define showSdCardWarning_offset 76 #define SIGNATURE_BOARD all -#define SIGNATURE_DATE 2020.08.05 -#define SIGNATURE_HASH 1481545352 +#define SIGNATURE_DATE 2020.08.06 +#define SIGNATURE_HASH 2507787776 #define silentTriggerError_offset 1464 #define slowAdcAlpha_offset 2088 #define sparkDwellRpmBins_offset 332 @@ -1305,29 +1305,48 @@ #define triggerSimulatorPins2_offset 737 #define triggerSimulatorPins3_offset 738 #define TS_BURN_COMMAND 'B' +#define TS_BURN_COMMAND_char B #define TS_CHUNK_WRITE_COMMAND 'C' +#define TS_CHUNK_WRITE_COMMAND_char C #define TS_COMMAND_F 'F' +#define TS_COMMAND_F_char F #define TS_COMPOSITE_DISABLE 2 #define TS_COMPOSITE_ENABLE 1 #define TS_CRC_CHECK_COMMAND 'k' +#define TS_CRC_CHECK_COMMAND_char k #define TS_EXECUTE 'E' +#define TS_EXECUTE_char E #define TS_FILE_VERSION 20200310 #define TS_GET_COMPOSITE_BUFFER_DONE_DIFFERENTLY '8' +#define TS_GET_COMPOSITE_BUFFER_DONE_DIFFERENTLY_char 8 #define TS_GET_CONFIG_ERROR 'e' +#define TS_GET_CONFIG_ERROR_char e #define TS_GET_FIRMWARE_VERSION 'V' +#define TS_GET_FIRMWARE_VERSION_char V #define TS_GET_LOGGER_GET_BUFFER 'L' +#define TS_GET_LOGGER_GET_BUFFER_char L #define TS_GET_STRUCT '9' +#define TS_GET_STRUCT_char 9 #define TS_GET_TEXT 'G' +#define TS_GET_TEXT_char G #define TS_HELLO_COMMAND 'S' +#define TS_HELLO_COMMAND_char S #define TS_IO_TEST_COMMAND 'Z' +#define TS_IO_TEST_COMMAND_char Z #define TS_ONLINE_PROTOCOL 'z' +#define TS_ONLINE_PROTOCOL_char z #define TS_OUTPUT_COMMAND 'O' +#define TS_OUTPUT_COMMAND_char O #define TS_OUTPUT_SIZE 288 #define TS_PAGE_COMMAND 'P' +#define TS_PAGE_COMMAND_char P #define TS_PERF_TRACE_BEGIN '_' +#define TS_PERF_TRACE_BEGIN_char _ #define TS_PERF_TRACE_GET_BUFFER 'b' +#define TS_PERF_TRACE_GET_BUFFER_char b #define TS_PROTOCOL "001" #define TS_READ_COMMAND 'R' +#define TS_READ_COMMAND_char R #define TS_RESPONSE_BURN_OK 4 #define TS_RESPONSE_COMMAND_OK 7 #define TS_RESPONSE_OK 0 @@ -1339,8 +1358,11 @@ #define TS_SD_PROTOCOL_REMOVE_FILE 6 #define TS_SD_PROTOCOL_RTC 7 #define TS_SD_R_COMMAND 'r' +#define TS_SD_R_COMMAND_char r #define TS_SD_W_COMMAND 'w' +#define TS_SD_W_COMMAND_char w #define TS_SET_LOGGER_SWITCH 'l' +#define TS_SET_LOGGER_SWITCH_char l #define ts_show_analog_divider true #define ts_show_auxserial_pins true #define ts_show_can2 true @@ -1360,8 +1382,10 @@ #define ts_show_spi true #define ts_show_trigger_comparator false #define ts_show_tunerstudio_port true -#define TS_SIGNATURE "rusEFI 2020.08.05.all.1481545352" +#define TS_SIGNATURE "rusEFI 2020.08.06.all.2507787776" #define TS_SINGLE_WRITE_COMMAND 'W' +#define TS_SINGLE_WRITE_COMMAND_char W +#define TS_TEST_COMMAND 't' // 0x74 #define tunerStudioSerialSpeed_offset 728 #define twoWireBatchIgnition_offset 1476 #define twoWireBatchInjection_offset 1476 diff --git a/firmware/controllers/generated/signature_all.h b/firmware/controllers/generated/signature_all.h index a471070230..c5cfa72b59 100644 --- a/firmware/controllers/generated/signature_all.h +++ b/firmware/controllers/generated/signature_all.h @@ -3,6 +3,6 @@ // #define SIGNATURE_BOARD all -#define SIGNATURE_DATE 2020.08.05 -#define SIGNATURE_HASH 1233200858 -#define TS_SIGNATURE "rusEFI 2020.08.05.all.1233200858" +#define SIGNATURE_DATE 2020.08.06 +#define SIGNATURE_HASH 2507787776 +#define TS_SIGNATURE "rusEFI 2020.08.06.all.2507787776" diff --git a/firmware/controllers/generated/signature_frankenso_na6.h b/firmware/controllers/generated/signature_frankenso_na6.h index 396f9da21b..1ada176a96 100644 --- a/firmware/controllers/generated/signature_frankenso_na6.h +++ b/firmware/controllers/generated/signature_frankenso_na6.h @@ -3,6 +3,6 @@ // #define SIGNATURE_BOARD frankenso_na6 -#define SIGNATURE_DATE 2020.08.05 -#define SIGNATURE_HASH 1978454787 -#define TS_SIGNATURE "rusEFI 2020.08.05.frankenso_na6.1978454787" +#define SIGNATURE_DATE 2020.08.06 +#define SIGNATURE_HASH 2836675545 +#define TS_SIGNATURE "rusEFI 2020.08.06.frankenso_na6.2836675545" diff --git a/firmware/controllers/generated/signature_kin.h b/firmware/controllers/generated/signature_kin.h index a78e1d8e5d..e40fe2679e 100644 --- a/firmware/controllers/generated/signature_kin.h +++ b/firmware/controllers/generated/signature_kin.h @@ -3,6 +3,6 @@ // #define SIGNATURE_BOARD kin -#define SIGNATURE_DATE 2020.08.05 -#define SIGNATURE_HASH 1716872058 -#define TS_SIGNATURE "rusEFI 2020.08.05.kin.1716872058" +#define SIGNATURE_DATE 2020.08.06 +#define SIGNATURE_HASH 3131935648 +#define TS_SIGNATURE "rusEFI 2020.08.06.kin.3131935648" diff --git a/firmware/controllers/generated/signature_mre_f4.h b/firmware/controllers/generated/signature_mre_f4.h index 489f0bc296..2af34332c5 100644 --- a/firmware/controllers/generated/signature_mre_f4.h +++ b/firmware/controllers/generated/signature_mre_f4.h @@ -3,6 +3,6 @@ // #define SIGNATURE_BOARD mre_f4 -#define SIGNATURE_DATE 2020.08.05 -#define SIGNATURE_HASH 2989470593 -#define TS_SIGNATURE "rusEFI 2020.08.05.mre_f4.2989470593" +#define SIGNATURE_DATE 2020.08.06 +#define SIGNATURE_HASH 1859607387 +#define TS_SIGNATURE "rusEFI 2020.08.06.mre_f4.1859607387" diff --git a/firmware/controllers/generated/signature_mre_f7.h b/firmware/controllers/generated/signature_mre_f7.h index aa0eaeca01..40c68d5552 100644 --- a/firmware/controllers/generated/signature_mre_f7.h +++ b/firmware/controllers/generated/signature_mre_f7.h @@ -3,6 +3,6 @@ // #define SIGNATURE_BOARD mre_f7 -#define SIGNATURE_DATE 2020.08.05 -#define SIGNATURE_HASH 2989470593 -#define TS_SIGNATURE "rusEFI 2020.08.05.mre_f7.2989470593" +#define SIGNATURE_DATE 2020.08.06 +#define SIGNATURE_HASH 1859607387 +#define TS_SIGNATURE "rusEFI 2020.08.06.mre_f7.1859607387" diff --git a/firmware/controllers/generated/signature_prometheus_405.h b/firmware/controllers/generated/signature_prometheus_405.h index 3d45c5c0a7..3194b20772 100644 --- a/firmware/controllers/generated/signature_prometheus_405.h +++ b/firmware/controllers/generated/signature_prometheus_405.h @@ -3,6 +3,6 @@ // #define SIGNATURE_BOARD prometheus_405 -#define SIGNATURE_DATE 2020.08.05 -#define SIGNATURE_HASH 1584883556 -#define TS_SIGNATURE "rusEFI 2020.08.05.prometheus_405.1584883556" +#define SIGNATURE_DATE 2020.08.06 +#define SIGNATURE_HASH 2190446526 +#define TS_SIGNATURE "rusEFI 2020.08.06.prometheus_405.2190446526" diff --git a/firmware/controllers/generated/signature_prometheus_469.h b/firmware/controllers/generated/signature_prometheus_469.h index fac0dafd80..5fd4a1183a 100644 --- a/firmware/controllers/generated/signature_prometheus_469.h +++ b/firmware/controllers/generated/signature_prometheus_469.h @@ -3,6 +3,6 @@ // #define SIGNATURE_BOARD prometheus_469 -#define SIGNATURE_DATE 2020.08.05 -#define SIGNATURE_HASH 1584883556 -#define TS_SIGNATURE "rusEFI 2020.08.05.prometheus_469.1584883556" +#define SIGNATURE_DATE 2020.08.06 +#define SIGNATURE_HASH 2190446526 +#define TS_SIGNATURE "rusEFI 2020.08.06.prometheus_469.2190446526" diff --git a/firmware/controllers/generated/signature_proteus_f4.h b/firmware/controllers/generated/signature_proteus_f4.h index b14395daab..ffcc32d6bd 100644 --- a/firmware/controllers/generated/signature_proteus_f4.h +++ b/firmware/controllers/generated/signature_proteus_f4.h @@ -3,6 +3,6 @@ // #define SIGNATURE_BOARD proteus_f4 -#define SIGNATURE_DATE 2020.08.05 -#define SIGNATURE_HASH 1984802561 -#define TS_SIGNATURE "rusEFI 2020.08.05.proteus_f4.1984802561" +#define SIGNATURE_DATE 2020.08.06 +#define SIGNATURE_HASH 2864007131 +#define TS_SIGNATURE "rusEFI 2020.08.06.proteus_f4.2864007131" diff --git a/firmware/controllers/generated/signature_proteus_f7.h b/firmware/controllers/generated/signature_proteus_f7.h index b093260e69..fb4d9c8996 100644 --- a/firmware/controllers/generated/signature_proteus_f7.h +++ b/firmware/controllers/generated/signature_proteus_f7.h @@ -3,6 +3,6 @@ // #define SIGNATURE_BOARD proteus_f7 -#define SIGNATURE_DATE 2020.08.05 -#define SIGNATURE_HASH 1984802561 -#define TS_SIGNATURE "rusEFI 2020.08.05.proteus_f7.1984802561" +#define SIGNATURE_DATE 2020.08.06 +#define SIGNATURE_HASH 2864007131 +#define TS_SIGNATURE "rusEFI 2020.08.06.proteus_f7.2864007131" diff --git a/firmware/tunerstudio/generated/cache.zip b/firmware/tunerstudio/generated/cache.zip index d76638bb6b817f1acd33e9db6fe4956a4898f496..e4a0dd8d4b8e13842d70e97685292a7c409036fb 100644 GIT binary patch delta 9154 zcmeI1X;>6T8pnHXrl%O39Y6wt3XG0B95c)eN4SZKC@!FY2PhZ<9#H|sM8$|PC>jq| z+fWI{O@hXaKC2-fXjByNSoK*^bY1l^MiE6h1!O^ef^Jo}$#j!;zmg9FPkn&*|5o+e z_5XEMSO2TYSl41)RVXMF7K#pu1EuzIsWjnwd0Sc5T!IK(EFfG76#>6-5W16-ChO9e zb|kJr_A0Aj^~15VoL=Zo=GuA=&$mtAJ$Jia^v#Z@v)43tO77%Q)$f(Q>>FPr0RH(a z<0>*-Vk$gF{c`k|KI2x~CtY_=$D8Jl3GGp@{JP#l-gPK{XYT6lRpW2pc-FCY_qPu# z9|!L-2VD?te@oCTy|PAC={Sb4ABX3;w+6qmnU8CjA&tw11D^ zKKG)X@Vs%w$@!jwCgXTQ}b3SsPS7d&A_{s=R(a60XNwq|Nd%5py z?ajUQc|#9;X1g)y=ZdWx0*@bSH`#t!Wxnd@KYg42ef6$qWfL!k1ZQjy$$fS-BIemO zkH~$i;mweD!{N z@o7)$U;lA!-KE*@)NBrazc9g0Rea-lLs-VkaTP8h%G%z;X@hrua^}NnSL+IH*6ess z?A9`E^kNrN+=NYQRAslXf9bC%dUE}%-nyKFacZScPS~lUNT0fxU1h?F&mX2~vJ$K8 z?UI&Vxp-{PiNg*_w>2|wdmTO7)zGa;EVJL+8!9wRjZ55itUmncum#(;K3%b4=jrCp z7I}@HJN;5yb@ji=^pcRdV}IE7_xSa0n+ggua`mE9ad!`#JMcl{%)8!gm0x*#B*=!w znj>Ew*5^L>@em=CIbW_8AizH_HyV{=~QU#P8VxOsa_^TvYs2_msQLD<+3*r5wnj5omR z*w2Ka` z&z6{3fg>~#&Sbx3z!NP43l?RjWtm`o7Z`@INJLmL&5DH;i-E%eTb0J*LYg#yWVw>T z0)-*M!V#{^kQx=1@M|`3czvccij~N)fddz_q-IutVMDFx$A*qjLAxg4gP}-9P%zC3 zg%yf{g93Y$hC($(7DlpM$v}a^uzI@eFA7UUNBO!2P{*CVmNVNdEP0V4iyp#~q%{Z$ z%SH?ZH5#Z*Sw%5gtsl;$g*O;PAjMrSZu1Q8-Y^9%{I1g-}hh z?8$I~bkNOD;S7%ilfLY5uAgG2K!n2yp=1;*0^LlC^>kpbN#RUA@=(I^4xq$q1FLuD zh@pg>u>2g&6BBS%6Y%8iycKmWPFsp3^*4d5fv;=J(Sd;QUlu-}d~-!fJ+H5oK3Mlq;{!@|QTP}V7bR4t z!_AL?H?IH}BRY{Gr3Ci&C67_Xe7(>WUCWeG#g4BF;#1KD+0UlCqS{N9erWpp>$t}| z0z$``ql3`42^jVG*oa*SPQteT)id6lq{UNUP7^R0__9V8cZ6R>_BvyOK1p-3v?(%J zH(eHNLKn%GNl9<`A&U|M)C`==S*bGk{dwR@4Ra=8{APizBYzigb2GZNXOJ3=e|f!^Bv{;z$}XH_10x-TLvYzfo(sos zh;J@icMHnffKiR#58377H$z;ms5MGXbqpN>+kXO1dLGsPDYtAatZM_22EME}*ZX0# zobq)a1?{5c^nCMV(}fGijKkf#;`dW}zWWP*x9jHI*4A1%Rpsu)Jf!fBon1ZN@5eqt z)$a);saOwJn0^DO)qJXbSd|h&!hOM{KlTlu=w&Ao*@cmCRw(KFCef@eBzhD^Qg=L@ z=x3Ckrz_4(YB>dcdKPwe0ADrUxbf8@jP`}`oxs2=z-0)Y!}3n#G`4)E1pP z4C_MASw0mmLAb^Yf9M2n{Yqhf9bQ=3cGPf+(4J7h8OIgc!RSun1(aO~&V=9J1UAUFWi4>Qv%!-Mo1dcDDDVQX sULp>Gqr1UiHJ@x@H>$YL3vTEJBb^z61TD1$aT@))MG?e~g8=>YKisk$6951J delta 8815 zcmeI1X;>6T9>#m_nV#YbFak3p=p%>@3*v=LzjJU^+{3A* z@v*C0Ce6()(t%tiIdCz5*l=M%fFq!8hdt$v#v$h=&*PFHs088u0GeqzrGS(f&u zHo4{Pg~8%$AKcgeT|eDTb?3l5RkBa(rLOPhD2{fQOqm_Eg)UB*;L>ocH}&|RGvZDx z4hd?0@3Zoat=StC=PQdVHiVw(QeVE5@N+=P=lf~-f0i|$^q*EJon;En_#!9b=($T$ z@O^f+Wb^KQvgl#2%I=(5CTa{mMS--6_-%*JmK^oG`>p5vc|Il$RH<_GUycRlx$+QxTlhD`iX(fDEWvQ*1`z^TGznIXqLYOm;DoRT$-k7##4aHnl` zVHQ8p@4~YQPqS;KldJRwPp|I}7Pys;j;QPXQ`p+*Z8u$7_IH1r&x>87-7)9B&&j>( z&%G2FrU-;i6eX2Xadjftu}r9^_ao+*R^^i^EEEc`(vZbgQd7iff<9%*N}-mlNm(SG zmv4(|2&AFiE1@5K0CmhXE6i4y2OZ{<>7o#lISaDyE)m6$O6?L+J+BYun`vSN+@2xw zA!OK`A$roM4qJrOAC`&S3AKvh-N5F3>2r}EU4nRLnw57e?}N%a!VfA_#33Ye4DVPu zyFeU6Dh%&fLA*y23WGWp5bAnD_>FQSoAUD=;vl*dQO-0gV1%$lXbkoDmWZvmO z7=A;4MnCku5&HIBK!edgjL>JA6@4rEgNi=F5S|!EhtmXe4Ek6}520g7r8fb5O22FK>LCqvJ}xCpI`O)F%ai(%l-fb zd+&fCKm6IrFonl=qJIBAU|gC#+5ZzEMVSI9%AJx?mVc*V>Rm9>5q~%6R|I$61xn$r zEFlH!+rbDqIcbjbC`#^1QGu)xMl2CgOIM`9+z{Fg+C2bD&S654zzc@!?tw9! zdJ)#MVcR`0a=`fL$n7-=mCu>+Uv&d7M|`48Cd8+8yKus)WHHpFh(`s8C<%w@HTlwD z=Y0^&*)t9$$W9Z()<&Q(*$V(%`vBN;T5&$X$%SI*zeqfM496t;pQ313KXOus7+&lU zYjGt$q9HTl$~Ettygx@kQ5(e+<;$vkHA?~u5+phWcO|TOh$dD!R|4CTBubc)DDn6s zr{)oIb|gyRx+KXM{5x_@29w`g0YLpLcy&MbB?ZO!Z1t zAHF*Lj{dsfT2|@KsW9^~&^vNe!LQ9Iioqa-5zc%sd&=cG1~bhd z$dRL{FE#(^L|D-Y)KD8Jw<+udLpYs%!Ou>D%greG#fv}zGdqC2j-%7pq=wOWB<+Ct z57;=feycEO+XZxvc<)Yz#v62F7rGob#=?v);LmB;@dOzPf?-P+c#G4Z>PFW+DwHyJ&*5TSJ8xEsx_{E92yYi?_XOQ`@%D-yVQx0x9?yi!h%*Ts0_3Loqg-IoFdhxVvjk3m - +