From bd85b7395e0b1f316c286108976a3f18cad6c79c Mon Sep 17 00:00:00 2001 From: WYR2019_ProjectAdmin <2434005456@qq.com> Date: Tue, 2 Dec 2025 20:19:38 +0800 Subject: [PATCH] =?UTF-8?q?=E2=80=9C12.2=EF=BC=9A=E5=88=9D=E6=AD=A5?= =?UTF-8?q?=E5=AE=9E=E7=8E=B0esp8266=E5=A4=84=E7=90=86=E5=93=8D=E5=BA=94?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=EF=BC=8C=E6=9A=82=E4=B8=8D=E5=AE=8C=E5=96=84?= =?UTF-8?q?=E3=80=82=E2=80=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 39 +- STM32/Environment_Node/Drivers/LED.h | 12 +- .../STM32Template.uvguix.Exploration | 189 +++--- STM32/Environment_Node/STM32Template.uvoptx | 2 +- STM32/Environment_Node/System/USART.c | 36 +- STM32/Environment_Node/System/USART.h | 25 +- STM32/Environment_Node/User/main.c | 3 +- .../Application/NetFIFO/NetFIFO.c | 80 +++ .../Application/NetFIFO/NetFIFO.h | 23 + STM32/Gateway_Node/Drivers/ESP8266.c | 57 ++ STM32/Gateway_Node/Drivers/ESP8266.h | 13 + .../FreeRTOS/config/FreeRTOSConfig.h | 24 +- .../STM32Template.uvguix.Exploration | 610 ++++++++---------- STM32/Gateway_Node/STM32Template.uvoptx | 47 +- STM32/Gateway_Node/STM32Template.uvprojx | 17 +- STM32/Gateway_Node/System/Delay.c | 31 +- STM32/Gateway_Node/System/USART.c | 67 +- STM32/Gateway_Node/System/USART.h | 23 +- STM32/Gateway_Node/User/main.c | 93 ++- 19 files changed, 811 insertions(+), 580 deletions(-) create mode 100644 STM32/Gateway_Node/Application/NetFIFO/NetFIFO.c create mode 100644 STM32/Gateway_Node/Application/NetFIFO/NetFIFO.h diff --git a/README.md b/README.md index f3bef1e..e6b2b9e 100644 --- a/README.md +++ b/README.md @@ -21,21 +21,21 @@ 创建了LED状态灯、Wi-Fi初始化、向子节点传输数据、从子节点接收数据、MQTT上发、MQTT下发6个任务。
### 二、自定义传输协议： -自定义传输协议仿照了ModBus传输协议，其完善性相比有欠缺，但是可满足非大型项目的基本使用。在自定义传输协议中，使用十六进制数字进行传输，分别由网关节点和子节点。 +自定义传输协议仿照了ModBus传输协议，其完善性相比有欠缺，但是可满足非大型项目的基本使用。在自定义传输协议中，使用十六进制数字进行传输，分别由网关节点和子节点。
**1、节点：**
-*规则：* +**规则：** 子节点的传输协议主要分为帧头、传感器ID、传感器数据、执行器ID、执行器指令和帧尾。其中，帧头（也是节点ID），用于声明自己是哪个节点上发的数据；传感器ID，用于声明自己是什么传感器；传感器数据，如DHT11温湿度数据；执行器ID也是同理，用于声明自己是什么执行器；执行器指令，一般是0或1，0为关、1为开，用于在执行网关节点下发的控制指令后的返回结果，告诉网关节点是开了还是关了，是否成功，若失败了是什么原因；最后一个是帧尾，为帧头倒写，添加帧头和帧尾的目的是在网关接收多个节点的数据是验证其数据是否完整，不会被其他上传的数据打断。
-*节点ID：* +**节点ID：** D1为子节点1，D2为子节点2，以此类推。
-*传感器ID：* +**传感器ID：** EA为DHT11温湿度传感器，EB为MQ2烟雾浓度传感器、EC为火焰传感器、ED为光敏传感器。
-*传感器数据：* +**传感器数据：** 如17、35：17为温度数据、35为湿度数据，将其转化为10进制，分别为23℃、湿度53%。
-*执行器ID：* +**执行器ID：** FA为LED灯、FB为小风扇、FC为加湿器、FD为蜂鸣器、FE为舵机、FF为加热片。
-*执行器指令* +**执行器指令** 0为关、1为开。
-*帧尾：* +**帧尾：** D1倒过来就是1D，以此类推。
| 目标地址 | 目标信道 | 帧头（也是节点ID） | 传感器ID | 传感器数据 | 执行器ID | 执行器指令 | 帧尾（为帧头倒写） | @@ -43,10 +43,9 @@ D1倒过来就是1D，以此类推。
| 03 E9 | 17 | D1 | EA | 17 35 | FA | 01 | 1D | **2、网关：** -*规则：* -网关的传输协议主要分为帧头、执行器ID、执行器指令和帧尾。其中，帧头也是节点ID，用于声明控制的是哪个节点的设备；执行器ID，同理一般是0或1，用于声明控制的是哪个设备；执行器指令用于声明执行器是开还是关；最后一个是帧尾，为帧头倒写。 -*节点ID、执行器ID与上面相同。* -*执行器指令：* +**规则：** +网关的传输协议主要分为帧头、执行器ID、执行器指令和帧尾。其中，帧头也是节点ID，用于声明控制的是哪个节点的设备；执行器ID，同理一般是0或1，用于声明控制的是哪个设备；执行器指令用于声明执行器是开还是关；最后一个是帧尾，为帧头倒写。*节点ID、执行器ID与上面相同。*
+**执行器指令：** 一共有两种，一种是常规的0和1，另外一种是温控模式，用于控制温度范围，若超过这个范围就会触发执行器的指令。温控模式默认常开，控制字为02，后面跟的是温控的数据，也就是限定的温湿度数值，如17 20 35 50，就是温度在23~26度之间，湿度在53%~80%之间。 *常规模式* @@ -73,12 +72,12 @@ void vTask(void *<参数>); ```c TaskHandle_t xTaskHandler; xTaskCreate( - (TaskFunction_t ) vTask, - (char * ) "<定义一个任务名称>", - (configSTACK_DEPTH_TYPE) 1024, - (void * ) NULL, （若有参数则写参数名称） - (UBaseType_t ) <优先级，数字越大优先级越高> - (TaskHandle_t * ) &xTaskHandler); + (TaskFunction_t ) vTask, + (char * ) "<定义一个任务名称>", + (configSTACK_DEPTH_TYPE) 1024, + (void * ) NULL, （若有参数则写参数名称） + (UBaseType_t ) <优先级，数字越大优先级越高> + (TaskHandle_t * ) &xTaskHandler); ``` - 启动任务调度函数： ```c @@ -95,8 +94,8 @@ QueueHandle_t xQueueHandler; - 创建队列： ```c xQueueHandler = xQueueCreate( - (UBaseType_t) <队列的长度，单位字节>, - (UBaseType_t) <每个数据的大小>); + (UBaseType_t) <队列的长度，单位字节>, + (UBaseType_t) <每个数据的大小>); ``` - 发送队列，也就是将数据存入队列，等待接收，接收时长从0到portMAX_DELAY，如下所示。 ```c diff --git a/STM32/Environment_Node/Drivers/LED.h b/STM32/Environment_Node/Drivers/LED.h index 89cc265..9a96f19 100644 --- a/STM32/Environment_Node/Drivers/LED.h +++ b/STM32/Environment_Node/Drivers/LED.h @@ -4,15 +4,15 @@ #include "stm32f10x.h" // Device header -#define LED_PC13_WORK_MODE LED_PC13_LIGHT_MODE +#define LED_PC13_WORK_MODE LIGHT_MODE -#define LED_PC13_STM32_STATE_MODE 0 -#define LED_PC13_LIGHT_MODE 1 +#define STM32_STATE_MODE 0 +#define LIGHT_MODE 1 /* PC13LED */ -#define LED_PC13_GPIO_CLOCK RCC_APB2Periph_GPIOC -#define LED_PC13_GPIO_PORT GPIOC -#define LED_PC13_GPIO_PIN GPIO_Pin_13 +#define LED_PC13_GPIO_CLOCK RCC_APB2Periph_GPIOC +#define LED_PC13_GPIO_PORT GPIOC +#define LED_PC13_GPIO_PIN GPIO_Pin_13 /* */ void vPc13LedInit(void); diff --git a/STM32/Environment_Node/STM32Template.uvguix.Exploration b/STM32/Environment_Node/STM32Template.uvguix.Exploration index c8e3ca2..fe92281 100644 --- a/STM32/Environment_Node/STM32Template.uvguix.Exploration +++ b/STM32/Environment_Node/STM32Template.uvguix.Exploration @@ -93,8 +93,8 @@ 2 3 - -32000 - -32000 + -1 + -1 -1 @@ -110,8 +110,8 @@ 0 - 1211 - 01000000040000000100000001000000010000000100000000000000020000000000000001000000010000000000000028000000280000000100000008000000070000000100000065453A5C446174615C50726F6A6563745C496F5450726F6A656374735C4672656552544F535F4C6F52615F456E7669726F6E6D656E745F417373697374616E745C53544D33325C456E7669726F6E6D656E745F4E6F64655C447269766572735C4C6F52612E6800000000064C6F52612E6800000000F0A0A100FFFFFFFF65453A5C446174615C50726F6A6563745C496F5450726F6A656374735C4672656552544F535F4C6F52615F456E7669726F6E6D656E745F417373697374616E745C53544D33325C456E7669726F6E6D656E745F4E6F64655C447269766572735C4C6F52612E6300000000064C6F52612E6300000000BCA8E100FFFFFFFF79453A5C446174615C50726F6A6563745C496F5450726F6A656374735C4672656552544F535F4C6F52615F456E7669726F6E6D656E745F417373697374616E745C53544D33325C456E7669726F6E6D656E745F4E6F64655C53797374656D46696C65735C737461727475705F73746D3332663130785F6D642E730000000016737461727475705F73746D3332663130785F6D642E73000000009CC1B600FFFFFFFF66453A5C446174615C50726F6A6563745C496F5450726F6A656374735C4672656552544F535F4C6F52615F456E7669726F6E6D656E745F417373697374616E745C53544D33325C456E7669726F6E6D656E745F4E6F64655C447269766572735C52656C61792E63000000000752656C61792E6300000000F7B88600FFFFFFFF66453A5C446174615C50726F6A6563745C496F5450726F6A656374735C4672656552544F535F4C6F52615F456E7669726F6E6D656E745F417373697374616E745C53544D33325C456E7669726F6E6D656E745F4E6F64655C447269766572735C52656C61792E68000000000752656C61792E6800000000D9ADC200FFFFFFFF65453A5C446174615C50726F6A6563745C496F5450726F6A656374735C4672656552544F535F4C6F52615F456E7669726F6E6D656E745F417373697374616E745C53544D33325C456E7669726F6E6D656E745F4E6F64655C53797374656D5C55534152542E63000000000755534152542E6300000000F7B88600FFFFFFFF65453A5C446174615C50726F6A6563745C496F5450726F6A656374735C4672656552544F535F4C6F52615F456E7669726F6E6D656E745F417373697374616E745C53544D33325C456E7669726F6E6D656E745F4E6F64655C53797374656D5C55534152542E68000000000755534152542E6800000000D9ADC200FFFFFFFF62453A5C446174615C50726F6A6563745C496F5450726F6A656374735C4672656552544F535F4C6F52615F456E7669726F6E6D656E745F417373697374616E745C53544D33325C456E7669726F6E6D656E745F4E6F64655C557365725C6D61696E2E6300000000066D61696E2E6300000000D9ADC200FFFFFFFF0100000010000000C5D4F200FFDC7800BECEA100F0A0A100BCA8E1009CC1B600F7B88600D9ADC200A5C2D700B3A6BE00EAD6A300F6FA7D00B5E99D005FC3CF00C1838300CACAD500010000000000000002000000F4000000660000008007000030030000 + 1334 + 01000000040000000100000001000000010000000100000000000000020000000000000001000000010000000000000028000000280000000100000009000000080000000100000065453A5C446174615C50726F6A6563745C496F5450726F6A656374735C4672656552544F535F4C6F52615F456E7669726F6E6D656E745F417373697374616E745C53544D33325C456E7669726F6E6D656E745F4E6F64655C447269766572735C4C6F52612E6800000000064C6F52612E6800000000C5D4F200FFFFFFFF65453A5C446174615C50726F6A6563745C496F5450726F6A656374735C4672656552544F535F4C6F52615F456E7669726F6E6D656E745F417373697374616E745C53544D33325C456E7669726F6E6D656E745F4E6F64655C447269766572735C4C6F52612E6300000000064C6F52612E6300000000FFDC7800FFFFFFFF79453A5C446174615C50726F6A6563745C496F5450726F6A656374735C4672656552544F535F4C6F52615F456E7669726F6E6D656E745F417373697374616E745C53544D33325C456E7669726F6E6D656E745F4E6F64655C53797374656D46696C65735C737461727475705F73746D3332663130785F6D642E730000000016737461727475705F73746D3332663130785F6D642E7300000000BECEA100FFFFFFFF66453A5C446174615C50726F6A6563745C496F5450726F6A656374735C4672656552544F535F4C6F52615F456E7669726F6E6D656E745F417373697374616E745C53544D33325C456E7669726F6E6D656E745F4E6F64655C447269766572735C52656C61792E63000000000752656C61792E6300000000F0A0A100FFFFFFFF66453A5C446174615C50726F6A6563745C496F5450726F6A656374735C4672656552544F535F4C6F52615F456E7669726F6E6D656E745F417373697374616E745C53544D33325C456E7669726F6E6D656E745F4E6F64655C447269766572735C52656C61792E68000000000752656C61792E6800000000BCA8E100FFFFFFFF65453A5C446174615C50726F6A6563745C496F5450726F6A656374735C4672656552544F535F4C6F52615F456E7669726F6E6D656E745F417373697374616E745C53544D33325C456E7669726F6E6D656E745F4E6F64655C53797374656D5C55534152542E63000000000755534152542E63000000009CC1B600FFFFFFFF65453A5C446174615C50726F6A6563745C496F5450726F6A656374735C4672656552544F535F4C6F52615F456E7669726F6E6D656E745F417373697374616E745C53544D33325C456E7669726F6E6D656E745F4E6F64655C53797374656D5C55534152542E68000000000755534152542E6800000000F7B88600FFFFFFFF62453A5C446174615C50726F6A6563745C496F5450726F6A656374735C4672656552544F535F4C6F52615F456E7669726F6E6D656E745F417373697374616E745C53544D33325C456E7669726F6E6D656E745F4E6F64655C557365725C6D61696E2E6300000000066D61696E2E6300000000D9ADC200FFFFFFFF64453A5C446174615C50726F6A6563745C496F5450726F6A656374735C4672656552544F535F4C6F52615F456E7669726F6E6D656E745F417373697374616E745C53544D33325C456E7669726F6E6D656E745F4E6F64655C447269766572735C4C45442E6800000000054C45442E6800000000A5C2D700FFFFFFFF0100000010000000C5D4F200FFDC7800BECEA100F0A0A100BCA8E1009CC1B600F7B88600D9ADC200A5C2D700B3A6BE00EAD6A300F6FA7D00B5E99D005FC3CF00C1838300CACAD500010000000000000002000000F4000000660000008007000030030000 @@ -1805,8 +1805,8 @@ 59392 File - 2578 - 00200000010000002800FFFF01001100434D4643546F6F6C426172427574746F6E00E100000000000000000000000000000000000000000000000100000001000000018001E100000000000001000000000000000000000000000000000100000001000000018003E1000000000000020000000000000000000000000000000001000000010000000180CD7F0000000000000300000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018023E100000000040004000000000000000000000000000000000100000001000000018022E100000000040005000000000000000000000000000000000100000001000000018025E10000000000000600000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001802BE10000000004000700000000000000000000000000000000010000000100000001802CE10000000004000800000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001807A8A0000000000000900000000000000000000000000000000010000000100000001807B8A0000000004000A00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180D3B00000000000000B000000000000000000000000000000000100000001000000018015B10000000004000C0000000000000000000000000000000001000000010000000180F4B00000000004000D000000000000000000000000000000000100000001000000018036B10000000004000E00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180FF88000000000400460000000000000000000000000000000001000000010000000180FE880000000004004500000000000000000000000000000000010000000100000001800B810000000004001300000000000000000000000000000000010000000100000001800C810000000004001400000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180F0880000020000000F000000000000000000000000000000000100000001000000FFFF0100120043555646696E64436F6D626F427574746F6EE8030000000000000000000000000000000000000000000000010000000100000096000000020020500000000012785175657565557361727433526548646C729600000000000000010012785175657565557361727433526548646C7200000000018024E10000000000001100000000000000000000000000000000010000000100000001800A810000000000001200000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6E2280000002000000150000002153746172742F53746F70202644656275672053657373696F6E094374726C2B46350000000000000000000000000100000001000000000000000000000001000000020021802280000000000000150000002153746172742F53746F70202644656275672053657373696F6E094374726C2B4635000000000000000000000000010000000100000000000000000000000100000000002180E0010000000000007500000021456E65726779204D6561737572656D656E742026776974686F75742044656275670000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180C488000000000000160000000000000000000000000000000001000000010000000180C988000000000400180000000000000000000000000000000001000000010000000180C788000000000000190000000000000000000000000000000001000000010000002180C8880000000000001700000027264B696C6C20416C6C20427265616B706F696E747320696E2043757272656E7420546172676574000000000000000000000000010000000100000000000000000000000100000003002180C8880000000000001700000027264B696C6C20416C6C20427265616B706F696E747320696E2043757272656E7420546172676574000000000000000000000000010000000100000000000000000000000100000000002180E50100000000000078000000264B696C6C20416C6C20427265616B706F696E747320696E204163746976652050726F6A656374000000000000000000000000010000000100000000000000000000000100000000002180E601000000000000790000002F4B696C6C20416C6C20427265616B706F696E747320696E204D756C74692D50726F6A65637420576F726B73706163650000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000021804C010000020001001A0000000F2650726F6A6563742057696E646F77000000000000000000000000010000000100000000000000000000000100000008002180DD880000000000001A0000000750726F6A656374000000000000000000000000010000000100000000000000000000000100000000002180DC8B0000000000003A00000005426F6F6B73000000000000000000000000010000000100000000000000000000000100000000002180E18B0000000000003B0000000946756E6374696F6E73000000000000000000000000010000000100000000000000000000000100000000002180E28B000000000000400000000954656D706C6174657300000000000000000000000001000000010000000000000000000000010000000000218018890000000000003D0000000E536F757263652042726F777365720000000000000000000000000100000001000000000000000000000001000000000021800000000000000400FFFFFFFF00000000000000000001000000000000000100000000000000000000000100000000002180D988000000000000390000000C4275696C64204F7574707574000000000000000000000000010000000100000000000000000000000100000000002180E38B000000000000410000000B46696E64204F75747075740000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180FB7F0000000000001B000000000000000000000000000000000100000001000000000000000446696C65C6030000 + 2836 + 00200000010000002800FFFF01001100434D4643546F6F6C426172427574746F6E00E100000000000000000000000000000000000000000000000100000001000000018001E100000000000001000000000000000000000000000000000100000001000000018003E1000000000000020000000000000000000000000000000001000000010000000180CD7F0000000000000300000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018023E100000000040004000000000000000000000000000000000100000001000000018022E100000000040005000000000000000000000000000000000100000001000000018025E10000000000000600000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001802BE10000000004000700000000000000000000000000000000010000000100000001802CE10000000004000800000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001807A8A0000000000000900000000000000000000000000000000010000000100000001807B8A0000000004000A00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180D3B00000000000000B000000000000000000000000000000000100000001000000018015B10000000004000C0000000000000000000000000000000001000000010000000180F4B00000000004000D000000000000000000000000000000000100000001000000018036B10000000004000E00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180FF88000000000400460000000000000000000000000000000001000000010000000180FE880000000004004500000000000000000000000000000000010000000100000001800B810000000004001300000000000000000000000000000000010000000100000001800C810000000004001400000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180F0880000020000000F000000000000000000000000000000000100000001000000FFFF0100120043555646696E64436F6D626F427574746F6EE803000000000000000000000000000000000000000000000001000000010000009600000002002050000000001451756575652046756C6C206F72204572726F7221960000000000000013001451756575652046756C6C206F72204572726F722113756352657476616C51756575655769666953740A517565756520496E697404696E697402753812785175657565557361727433526548646C72087644656C61794D730653616D706C65077563537461746504756349640D784C6F526155534152543352780B75635052785061636B65740A6C6F52614E6F646549440873656E736F7249440D4C45445F504331335F504F52540D55534152545F54797065446566067072696E7466056670757463075379735469636B00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000018024E10000000000001100000000000000000000000000000000010000000100000001800A810000000000001200000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6E2280000002000000150000002153746172742F53746F70202644656275672053657373696F6E094374726C2B46350000000000000000000000000100000001000000000000000000000001000000020021802280000000000000150000002153746172742F53746F70202644656275672053657373696F6E094374726C2B4635000000000000000000000000010000000100000000000000000000000100000000002180E0010000000000007500000021456E65726779204D6561737572656D656E742026776974686F75742044656275670000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180C488000000000000160000000000000000000000000000000001000000010000000180C988000000000400180000000000000000000000000000000001000000010000000180C788000000000000190000000000000000000000000000000001000000010000002180C8880000000000001700000027264B696C6C20416C6C20427265616B706F696E747320696E2043757272656E7420546172676574000000000000000000000000010000000100000000000000000000000100000003002180C8880000000000001700000027264B696C6C20416C6C20427265616B706F696E747320696E2043757272656E7420546172676574000000000000000000000000010000000100000000000000000000000100000000002180E50100000000000078000000264B696C6C20416C6C20427265616B706F696E747320696E204163746976652050726F6A656374000000000000000000000000010000000100000000000000000000000100000000002180E601000000000000790000002F4B696C6C20416C6C20427265616B706F696E747320696E204D756C74692D50726F6A65637420576F726B73706163650000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000021804C010000020001001A0000000F2650726F6A6563742057696E646F77000000000000000000000000010000000100000000000000000000000100000008002180DD880000000000001A0000000750726F6A656374000000000000000000000000010000000100000000000000000000000100000000002180DC8B0000000000003A00000005426F6F6B73000000000000000000000000010000000100000000000000000000000100000000002180E18B0000000000003B0000000946756E6374696F6E73000000000000000000000000010000000100000000000000000000000100000000002180E28B000000000000400000000954656D706C6174657300000000000000000000000001000000010000000000000000000000010000000000218018890000000000003D0000000E536F757263652042726F777365720000000000000000000000000100000001000000000000000000000001000000000021800000000000000400FFFFFFFF00000000000000000001000000000000000100000000000000000000000100000000002180D988000000000000390000000C4275696C64204F7574707574000000000000000000000000010000000100000000000000000000000100000000002180E38B000000000000410000000B46696E64204F75747075740000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180FB7F0000000000001B000000000000000000000000000000000100000001000000000000000446696C65C6030000 1423 @@ -1822,7 +1822,7 @@ Build 976 - 00200000010000001000FFFF01001100434D4643546F6F6C426172427574746F6ECF7F0000000000001C0000000000000000000000000000000001000000010000000180D07F0000000000001D000000000000000000000000000000000100000001000000018030800000000000001E000000000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6EC7040000000000006A0000000C4261746368204275696C2664000000000000000000000000010000000100000000000000000000000100000004000580C7040000000000006A0000000C4261746368204275696C266400000000000000000000000001000000010000000000000000000000010000000000058046070000000000006B0000000D42617463682052656275696C640000000000000000000000000100000001000000000000000000000001000000000005804707000000000000FFFFFFFF0B426174636820436C65616E0100000000000000000000000100000001000000000000000000000001000000000005809E8A0000000000001F0000000F4261746326682053657475702E2E2E000000000000000000000000010000000100000000000000000000000100000000000180D17F0000000004002000000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001804C8A0000000000002100000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000FFFF01001900434D4643546F6F6C426172436F6D626F426F78427574746F6EBA000000000000000000000000000000000000000000000000010000000100000096000000030020500000000008546172676574203196000000000000000100085461726765742031000000000180EB880000000000002200000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180C07F000000000000230000000000000000000000000000000001000000010000000180B08A000000000400240000000000000000000000000000000001000000010000000180A8010000000000004E00000000000000000000000000000000010000000100000001807202000000000000530000000000000000000000000000000001000000010000000180BE010000000000005000000000000000000000000000000000010000000100000000000000054275696C64DC010000 + 00200000010000001000FFFF01001100434D4643546F6F6C426172427574746F6ECF7F0000000004001C0000000000000000000000000000000001000000010000000180D07F0000000000001D000000000000000000000000000000000100000001000000018030800000000000001E000000000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6EC7040000000000006A0000000C4261746368204275696C2664000000000000000000000000010000000100000000000000000000000100000004000580C7040000000000006A0000000C4261746368204275696C266400000000000000000000000001000000010000000000000000000000010000000000058046070000000000006B0000000D42617463682052656275696C640000000000000000000000000100000001000000000000000000000001000000000005804707000000000000FFFFFFFF0B426174636820436C65616E0100000000000000000000000100000001000000000000000000000001000000000005809E8A0000000000001F0000000F4261746326682053657475702E2E2E000000000000000000000000010000000100000000000000000000000100000000000180D17F0000000004002000000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001804C8A0000000000002100000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000FFFF01001900434D4643546F6F6C426172436F6D626F426F78427574746F6EBA000000000000000000000000000000000000000000000000010000000100000096000000030020500000000008546172676574203196000000000000000100085461726765742031000000000180EB880000000000002200000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180C07F000000000000230000000000000000000000000000000001000000010000000180B08A000000000400240000000000000000000000000000000001000000010000000180A8010000000000004E00000000000000000000000000000000010000000100000001807202000000000000530000000000000000000000000000000001000000010000000180BE010000000000005000000000000000000000000000000000010000000100000000000000054275696C64DC010000 583 @@ -1838,7 +1838,7 @@ Debug 2373 - 00200000000000001900FFFF01001100434D4643546F6F6C426172427574746F6ECC880000000000002500000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018017800000000000002600000000000000000000000000000000010000000100000001801D800000000000002700000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001801A800000000000002800000000000000000000000000000000010000000100000001801B80000000000000290000000000000000000000000000000001000000010000000180E57F0000000000002A00000000000000000000000000000000010000000100000001801C800000000000002B00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018000890000000000002C00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180E48B0000000000002D0000000000000000000000000000000001000000010000000180F07F0000000000002E0000000000000000000000000000000001000000010000000180E8880000000000003700000000000000000000000000000000010000000100000001803B010000000000002F0000000000000000000000000000000001000000010000000180BB8A00000000000030000000000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6E0E01000000000000310000000D57617463682057696E646F7773000000000000000000000000010000000100000000000000000000000100000003001380D88B00000000000031000000085761746368202631000000000000000000000000010000000100000000000000000000000100000000001380D98B00000000000031000000085761746368202632000000000000000000000000010000000100000000000000000000000100000000001380CE01000000000000FFFFFFFF0C576174636820416E63686F720100000000000000010000000000000001000000000000000000000001000000000013800F01000000000000320000000E4D656D6F72792057696E646F7773000000000000000000000000010000000100000000000000000000000100000004001380D28B00000000000032000000094D656D6F7279202631000000000000000000000000010000000100000000000000000000000100000000001380D38B00000000000032000000094D656D6F7279202632000000000000000000000000010000000100000000000000000000000100000000001380D48B00000000000032000000094D656D6F7279202633000000000000000000000000010000000100000000000000000000000100000000001380D58B00000000000032000000094D656D6F72792026340000000000000000000000000100000001000000000000000000000001000000000013801001000000000000330000000E53657269616C2057696E646F77730000000000000000000000000100000001000000000000000000000001000000040013809307000000000000330000000855415254202326310000000000000000000000000100000001000000000000000000000001000000000013809407000000000000330000000855415254202326320000000000000000000000000100000001000000000000000000000001000000000013809507000000000000330000000855415254202326330000000000000000000000000100000001000000000000000000000001000000000013809607000000000000330000001626446562756720287072696E746629205669657765720000000000000000000000000100000001000000000000000000000001000000000013803C010000000000007200000010416E616C797369732057696E646F7773000000000000000000000000010000000100000000000000000000000100000004001380658A000000000000340000000F264C6F67696320416E616C797A6572000000000000000000000000010000000100000000000000000000000100000000001380DC7F0000000000003E0000001526506572666F726D616E636520416E616C797A6572000000000000000000000000010000000100000000000000000000000100000000001380E788000000000000380000000E26436F646520436F766572616765000000000000000000000000010000000100000000000000000000000100000000001380CD01000000000000FFFFFFFF0F416E616C7973697320416E63686F7201000000000000000100000000000000010000000000000000000000010000000000138053010000000000003F0000000D54726163652057696E646F77730000000000000000000000000100000001000000000000000000000001000000010013805401000000000000FFFFFFFF115472616365204D656E7520416E63686F720100000000000000010000000000000001000000000000000000000001000000000013802901000000000000350000001553797374656D205669657765722057696E646F77730000000000000000000000000100000001000000000000000000000001000000010013804B01000000000000FFFFFFFF1453797374656D2056696577657220416E63686F720100000000000000010000000000000001000000000000000000000001000000000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000013800189000000000000360000000F26546F6F6C626F782057696E646F7700000000000000000000000001000000010000000000000000000000010000000300138044C5000000000000FFFFFFFF0E5570646174652057696E646F77730100000000000000010000000000000001000000000000000000000001000000000013800000000000000400FFFFFFFF000000000000000000010000000000000001000000000000000000000001000000000013805B01000000000000FFFFFFFF12546F6F6C626F78204D656E75416E63686F72010000000000000001000000000000000100000000000000000000000100000000000000000005446562756764020000 + 00200000000000001900FFFF01001100434D4643546F6F6C426172427574746F6ECC880000000000002500000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018017800000000000002600000000000000000000000000000000010000000100000001801D800000000000002700000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001801A800000000000002800000000000000000000000000000000010000000100000001801B80000000000000290000000000000000000000000000000001000000010000000180E57F0000000000002A00000000000000000000000000000000010000000100000001801C800000000000002B00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018000890000000000002C00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180E48B0000000000002D0000000000000000000000000000000001000000010000000180F07F0000000000002E0000000000000000000000000000000001000000010000000180E8880000000000003700000000000000000000000000000000010000000100000001803B010000000000002F0000000000000000000000000000000001000000010000000180BB8A00000000000030000000000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6E0E01000000000000310000000D57617463682057696E646F7773000000000000000000000000010000000100000000000000000000000100000003001380D88B00000000000031000000085761746368202631000000000000000000000000010000000100000000000000000000000100000000001380D98B00000000000031000000085761746368202632000000000000000000000000010000000100000000000000000000000100000000001380CE01000000000000FFFFFFFF0C576174636820416E63686F720000000000000000010000000000000001000000000000000000000001000000000013800F01000000000000320000000E4D656D6F72792057696E646F7773000000000000000000000000010000000100000000000000000000000100000004001380D28B00000000000032000000094D656D6F7279202631000000000000000000000000010000000100000000000000000000000100000000001380D38B00000000000032000000094D656D6F7279202632000000000000000000000000010000000100000000000000000000000100000000001380D48B00000000000032000000094D656D6F7279202633000000000000000000000000010000000100000000000000000000000100000000001380D58B00000000000032000000094D656D6F72792026340000000000000000000000000100000001000000000000000000000001000000000013801001000000000000330000000E53657269616C2057696E646F77730000000000000000000000000100000001000000000000000000000001000000040013809307000000000000330000000855415254202326310000000000000000000000000100000001000000000000000000000001000000000013809407000000000000330000000855415254202326320000000000000000000000000100000001000000000000000000000001000000000013809507000000000000330000000855415254202326330000000000000000000000000100000001000000000000000000000001000000000013809607000000000000330000001626446562756720287072696E746629205669657765720000000000000000000000000100000001000000000000000000000001000000000013803C010000000000007200000010416E616C797369732057696E646F7773000000000000000000000000010000000100000000000000000000000100000004001380658A000000000000340000000F264C6F67696320416E616C797A6572000000000000000000000000010000000100000000000000000000000100000000001380DC7F0000000000003E0000001526506572666F726D616E636520416E616C797A6572000000000000000000000000010000000100000000000000000000000100000000001380E788000000000000380000000E26436F646520436F766572616765000000000000000000000000010000000100000000000000000000000100000000001380CD01000000000000FFFFFFFF0F416E616C7973697320416E63686F7200000000000000000100000000000000010000000000000000000000010000000000138053010000000000003F0000000D54726163652057696E646F77730000000000000000000000000100000001000000000000000000000001000000010013805401000000000000FFFFFFFF115472616365204D656E7520416E63686F720000000000000000010000000000000001000000000000000000000001000000000013802901000000000000350000001553797374656D205669657765722057696E646F77730000000000000000000000000100000001000000000000000000000001000000010013804B01000000000000FFFFFFFF1453797374656D2056696577657220416E63686F720000000000000000010000000000000001000000000000000000000001000000000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000013800189000000000000360000000F26546F6F6C626F782057696E646F7700000000000000000000000001000000010000000000000000000000010000000300138044C5000000000000FFFFFFFF0E5570646174652057696E646F77730000000000000000010000000000000001000000000000000000000001000000000013800000000000000400FFFFFFFF000000000000000000010000000000000001000000000000000000000001000000000013805B01000000000000FFFFFFFF12546F6F6C626F78204D656E75416E63686F72000000000000000001000000000000000100000000000000000000000100000000000000000005446562756764020000 898 @@ -1871,7 +1871,7 @@ 0 16 - F40000004F00000080070000DD000000 + F40000004F0000008C060000DD000000 16 @@ -1891,7 +1891,7 @@ 0 16 - 0300000066000000ED00000085020000 + 0300000066000000ED0000008D020000 16 @@ -1931,7 +1931,7 @@ 0 16 - C7030000B90200007D070000C5030000 + C7030000C10200007D070000CD030000 16 @@ -1951,7 +1951,7 @@ 0 16 - C7030000B90200007D070000C5030000 + C7030000C10200007D070000CD030000 16 @@ -1971,7 +1971,7 @@ 0 16 - C7030000B90200007D070000C5030000 + C7030000C10200007D070000CD030000 16 @@ -1991,7 +1991,7 @@ 0 16 - C7030000B90200007D070000C5030000 + C7030000C10200007D070000CD030000 16 @@ -2011,7 +2011,7 @@ 0 16 - A3040000660000008D0500000C020000 + 93060000660000007D0700000C020000 16 @@ -2051,7 +2051,7 @@ 0 16 - C7030000B90200007D070000C5030000 + C7030000C10200007D070000CD030000 16 @@ -2071,7 +2071,7 @@ 0 16 - C7030000B90200007D070000C5030000 + C7030000C10200007D070000CD030000 16 @@ -2081,7 +2081,7 @@ 1937 1937 - 0 + 1 0 0 0 @@ -2091,7 +2091,7 @@ 0 16 - C7030000B90200007D070000C5030000 + C7030000C10200007D070000CD030000 16 @@ -2111,7 +2111,7 @@ 0 16 - C7030000B90200007D070000C5030000 + C7030000C10200007D070000CD030000 16 @@ -2131,7 +2131,7 @@ 0 16 - C7030000B90200007D070000C5030000 + C7030000C10200007D070000CD030000 16 @@ -2151,7 +2151,7 @@ 0 16 - C7030000B90200007D070000C5030000 + C7030000C10200007D070000CD030000 16 @@ -2171,7 +2171,7 @@ 0 16 - C7030000B90200007D070000C5030000 + C7030000C10200007D070000CD030000 16 @@ -2251,7 +2251,7 @@ 0 16 - 00000000A2020000C0030000DE030000 + 00000000AA020000C0030000E6030000 16 @@ -2291,7 +2291,7 @@ 0 16 - F40000006300000080070000DD000000 + F4000000630000008C060000DD000000 16 @@ -2351,7 +2351,7 @@ 0 16 - A3040000660000008D0500000C020000 + 93060000660000007D0700000C020000 16 @@ -2371,7 +2371,7 @@ 0 16 - C7030000B90200007D070000C5030000 + C7030000C10200007D070000CD030000 16 @@ -2471,7 +2471,7 @@ 0 16 - A3040000660000008D0500000C020000 + 93060000660000007D0700000C020000 16 @@ -2491,7 +2491,7 @@ 0 16 - A3040000660000008D0500000C020000 + 93060000660000007D0700000C020000 16 @@ -2511,7 +2511,7 @@ 0 16 - A3040000660000008D0500000C020000 + 93060000660000007D0700000C020000 16 @@ -2531,7 +2531,7 @@ 0 16 - A3040000660000008D0500000C020000 + 93060000660000007D0700000C020000 16 @@ -2551,7 +2551,7 @@ 0 16 - A3040000660000008D0500000C020000 + 93060000660000007D0700000C020000 16 @@ -2571,7 +2571,7 @@ 0 16 - A3040000660000008D0500000C020000 + 93060000660000007D0700000C020000 16 @@ -2591,7 +2591,7 @@ 0 16 - A3040000660000008D0500000C020000 + 93060000660000007D0700000C020000 16 @@ -2611,7 +2611,7 @@ 0 16 - A3040000660000008D0500000C020000 + 93060000660000007D0700000C020000 16 @@ -2631,7 +2631,7 @@ 0 16 - A3040000660000008D0500000C020000 + 93060000660000007D0700000C020000 16 @@ -2651,7 +2651,7 @@ 0 16 - A3040000660000008D0500000C020000 + 93060000660000007D0700000C020000 16 @@ -2671,7 +2671,7 @@ 0 16 - A3040000660000008D0500000C020000 + 93060000660000007D0700000C020000 16 @@ -2691,7 +2691,7 @@ 0 16 - A3040000660000008D0500000C020000 + 93060000660000007D0700000C020000 16 @@ -2711,7 +2711,7 @@ 0 16 - A3040000660000008D0500000C020000 + 93060000660000007D0700000C020000 16 @@ -2731,7 +2731,7 @@ 0 16 - A3040000660000008D0500000C020000 + 93060000660000007D0700000C020000 16 @@ -2751,7 +2751,7 @@ 0 16 - A3040000660000008D0500000C020000 + 93060000660000007D0700000C020000 16 @@ -2771,7 +2771,7 @@ 0 16 - A3040000660000008D0500000C020000 + 93060000660000007D0700000C020000 16 @@ -2791,7 +2791,7 @@ 0 16 - A3040000660000008D0500000C020000 + 93060000660000007D0700000C020000 16 @@ -2811,7 +2811,7 @@ 0 16 - A3040000660000008D0500000C020000 + 93060000660000007D0700000C020000 16 @@ -2831,7 +2831,7 @@ 0 16 - A3040000660000008D0500000C020000 + 93060000660000007D0700000C020000 16 @@ -2841,7 +2841,7 @@ 35904 35904 - 0 + 1 0 0 0 @@ -2851,7 +2851,7 @@ 0 16 - A3040000660000008D0500000C020000 + 93060000660000007D0700008D020000 16 @@ -2861,7 +2861,7 @@ 35905 35905 - 0 + 1 0 0 0 @@ -2871,7 +2871,7 @@ 0 16 - A3040000660000008D0500000C020000 + 93060000660000007D0700008D020000 16 @@ -2891,7 +2891,7 @@ 0 16 - 0300000066000000ED00000085020000 + 0300000066000000ED0000008D020000 16 @@ -2951,7 +2951,7 @@ 0 16 - C7030000B90200007D070000C5030000 + C7030000C10200007D070000CD030000 16 @@ -2971,7 +2971,7 @@ 0 16 - C7030000B90200007D070000C5030000 + C7030000C10200007D070000CD030000 16 @@ -3051,7 +3051,7 @@ 0 16 - A3040000660000008D0500000C020000 + 93060000660000007D0700000C020000 16 @@ -3071,7 +3071,7 @@ 0 16 - A3040000660000008D0500000C020000 + 93060000660000007D0700000C020000 16 @@ -3091,7 +3091,7 @@ 0 16 - A3040000660000008D0500000C020000 + 93060000660000007D0700000C020000 16 @@ -3111,7 +3111,7 @@ 0 16 - A3040000660000008D0500000C020000 + 93060000660000007D0700000C020000 16 @@ -3131,7 +3131,7 @@ 0 16 - A3040000660000008D0500000C020000 + 93060000660000007D0700000C020000 16 @@ -3151,7 +3151,7 @@ 0 16 - A3040000660000008D0500000C020000 + 93060000660000007D0700000C020000 16 @@ -3171,7 +3171,7 @@ 0 16 - A3040000660000008D0500000C020000 + 93060000660000007D0700000C020000 16 @@ -3191,7 +3191,7 @@ 0 16 - A3040000660000008D0500000C020000 + 93060000660000007D0700000C020000 16 @@ -3211,7 +3211,7 @@ 0 16 - A3040000660000008D0500000C020000 + 93060000660000007D0700000C020000 16 @@ -3231,7 +3231,7 @@ 0 16 - A3040000660000008D0500000C020000 + 93060000660000007D0700000C020000 16 @@ -3251,7 +3251,7 @@ 0 16 - A3040000660000008D0500000C020000 + 93060000660000007D0700000C020000 16 @@ -3271,7 +3271,7 @@ 0 16 - A3040000660000008D0500000C020000 + 93060000660000007D0700000C020000 16 @@ -3291,7 +3291,7 @@ 0 16 - A3040000660000008D0500000C020000 + 93060000660000007D0700000C020000 16 @@ -3311,7 +3311,7 @@ 0 16 - A3040000660000008D0500000C020000 + 93060000660000007D0700000C020000 16 @@ -3331,7 +3331,7 @@ 0 16 - A3040000660000008D0500000C020000 + 93060000660000007D0700000C020000 16 @@ -3351,7 +3351,7 @@ 0 16 - A3040000660000008D0500000C020000 + 93060000660000007D0700000C020000 16 @@ -3371,7 +3371,7 @@ 0 16 - A3040000660000008D0500000C020000 + 93060000660000007D0700000C020000 16 @@ -3391,7 +3391,7 @@ 0 16 - A3040000660000008D0500000C020000 + 93060000660000007D0700000C020000 16 @@ -3411,7 +3411,7 @@ 0 16 - A3040000660000008D0500000C020000 + 93060000660000007D0700000C020000 16 @@ -3431,7 +3431,7 @@ 0 16 - A3040000660000008D0500000C020000 + 93060000660000007D0700000C020000 16 @@ -3471,7 +3471,7 @@ 0 16 - 00000000DE03000080070000F1030000 + 00000000E603000080070000F9030000 16 @@ -3531,7 +3531,7 @@ 0 16 - C7030000B90200007D070000C5030000 + C7030000C10200007D070000CD030000 16 @@ -3540,14 +3540,14 @@ 3311 - 000000000B000000000000000020000001000000FFFFFFFFFFFFFFFFF4000000DD00000080070000E1000000010000000100001004000000010000000000000000000000FFFFFFFF08000000CB00000057010000CC000000F08B00005A01000079070000D601000045890000FFFF02000B004354616262656450616E650020000001000000F40000006600000080070000F4000000F40000004F00000080070000DD0000000000000040280056080000000B446973617373656D626C7901000000CB00000001000000FFFFFFFFFFFFFFFF14506572666F726D616E636520416E616C797A6572000000005701000001000000FFFFFFFFFFFFFFFF14506572666F726D616E636520416E616C797A657200000000CC00000001000000FFFFFFFFFFFFFFFF0E4C6F67696320416E616C797A657200000000F08B000001000000FFFFFFFFFFFFFFFF0D436F646520436F766572616765000000005A01000001000000FFFFFFFFFFFFFFFF11496E737472756374696F6E205472616365000000007907000001000000FFFFFFFFFFFFFFFF0F53797374656D20416E616C797A657200000000D601000001000000FFFFFFFFFFFFFFFF104576656E742053746174697374696373000000004589000001000000FFFFFFFFFFFFFFFF00000000000000000000000000000000000000000000000001000000FFFFFFFFCB00000001000000FFFFFFFFCB000000000000000040000000000000FFFFFFFFFFFFFFFF9C0400004F000000A004000025020000000000000200000004000000010000000000000000000000FFFFFFFF2B000000E2050000CA0900002D8C00002E8C00002F8C0000308C0000318C0000328C0000338C0000348C0000358C0000368C0000378C0000388C0000398C00003A8C00003B8C00003C8C00003D8C00003E8C00003F8C0000408C0000418C000050C3000051C3000052C3000053C3000054C3000055C3000056C3000057C3000058C3000059C300005AC300005BC300005CC300005DC300005EC300005FC3000060C3000061C3000062C3000063C3000001800040000000000000A004000066000000900500003C020000A00400004F000000900500002502000000000000404100462B0000000753796D626F6C7300000000E205000001000000FFFFFFFFFFFFFFFF0A5472616365204461746100000000CA09000001000000FFFFFFFFFFFFFFFF00000000002D8C000001000000FFFFFFFFFFFFFFFF00000000002E8C000001000000FFFFFFFFFFFFFFFF00000000002F8C000001000000FFFFFFFFFFFFFFFF0000000000308C000001000000FFFFFFFFFFFFFFFF0000000000318C000001000000FFFFFFFFFFFFFFFF0000000000328C000001000000FFFFFFFFFFFFFFFF0000000000338C000001000000FFFFFFFFFFFFFFFF0000000000348C000001000000FFFFFFFFFFFFFFFF0000000000358C000001000000FFFFFFFFFFFFFFFF0000000000368C000001000000FFFFFFFFFFFFFFFF0000000000378C000001000000FFFFFFFFFFFFFFFF0000000000388C000001000000FFFFFFFFFFFFFFFF0000000000398C000001000000FFFFFFFFFFFFFFFF00000000003A8C000001000000FFFFFFFFFFFFFFFF00000000003B8C000001000000FFFFFFFFFFFFFFFF00000000003C8C000001000000FFFFFFFFFFFFFFFF00000000003D8C000001000000FFFFFFFFFFFFFFFF00000000003E8C000001000000FFFFFFFFFFFFFFFF00000000003F8C000001000000FFFFFFFFFFFFFFFF0000000000408C000001000000FFFFFFFFFFFFFFFF0000000000418C000001000000FFFFFFFFFFFFFFFF000000000050C3000001000000FFFFFFFFFFFFFFFF000000000051C3000001000000FFFFFFFFFFFFFFFF000000000052C3000001000000FFFFFFFFFFFFFFFF000000000053C3000001000000FFFFFFFFFFFFFFFF000000000054C3000001000000FFFFFFFFFFFFFFFF000000000055C3000001000000FFFFFFFFFFFFFFFF000000000056C3000001000000FFFFFFFFFFFFFFFF000000000057C3000001000000FFFFFFFFFFFFFFFF000000000058C3000001000000FFFFFFFFFFFFFFFF000000000059C3000001000000FFFFFFFFFFFFFFFF00000000005AC3000001000000FFFFFFFFFFFFFFFF00000000005BC3000001000000FFFFFFFFFFFFFFFF00000000005CC3000001000000FFFFFFFFFFFFFFFF00000000005DC3000001000000FFFFFFFFFFFFFFFF00000000005EC3000001000000FFFFFFFFFFFFFFFF00000000005FC3000001000000FFFFFFFFFFFFFFFF000000000060C3000001000000FFFFFFFFFFFFFFFF000000000061C3000001000000FFFFFFFFFFFFFFFF000000000062C3000001000000FFFFFFFFFFFFFFFF000000000063C3000001000000FFFFFFFFFFFFFFFFFFFFFFFF000000000000000000000000000000000000000001000000FFFFFFFFE205000001000000FFFFFFFFE2050000000000000010000001000000FFFFFFFFFFFFFFFFF00000004F000000F40000009E020000010000000200001004000000010000000000000000000000FFFFFFFF05000000ED0300006D000000C3000000C400000073940000018000100000010000000000000066000000F0000000B5020000000000004F000000F00000009E0200000000000040410056050000000750726F6A65637401000000ED03000001000000FFFFFFFFFFFFFFFF05426F6F6B73000000006D00000001000000FFFFFFFFFFFFFFFF0946756E6374696F6E7300000000C300000001000000FFFFFFFFFFFFFFFF0954656D706C6174657300000000C400000001000000FFFFFFFFFFFFFFFF09526567697374657273010000007394000001000000FFFFFFFFFFFFFFFF04000000000000000000000000000000000000000000000001000000FFFFFFFFED03000001000000FFFFFFFFED030000000000000080000001000000FFFFFFFFFFFFFFFF000000009E02000080070000A202000001000000010000100400000001000000D9FEFFFF6801000000000000000000000000000001000000C6000000FFFFFFFF0F0000008F070000930700009407000095070000960700009007000091070000B5010000B801000038030000B9050000BA050000BB050000BC050000CB09000001800080000001000000C4030000B902000080070000F5030000C4030000A202000080070000DE03000000000000404100560F0000001343616C6C20537461636B202B204C6F63616C73010000008F07000001000000FFFFFFFFFFFFFFFF0755415254202331000000009307000001000000FFFFFFFFFFFFFFFF0755415254202332000000009407000001000000FFFFFFFFFFFFFFFF0755415254202333000000009507000001000000FFFFFFFFFFFFFFFF15446562756720287072696E74662920566965776572000000009607000001000000FFFFFFFFFFFFFFFF0757617463682031010000009007000001000000FFFFFFFFFFFFFFFF0757617463682032000000009107000001000000FFFFFFFFFFFFFFFF10547261636520457863657074696F6E7300000000B501000001000000FFFFFFFFFFFFFFFF0E4576656E7420436F756E7465727300000000B801000001000000FFFFFFFFFFFFFFFF09554C494E4B706C7573000000003803000001000000FFFFFFFFFFFFFFFF084D656D6F7279203101000000B905000001000000FFFFFFFFFFFFFFFF084D656D6F7279203200000000BA05000001000000FFFFFFFFFFFFFFFF084D656D6F7279203300000000BB05000001000000FFFFFFFFFFFFFFFF084D656D6F7279203400000000BC05000001000000FFFFFFFFFFFFFFFF105472616365204E617669676174696F6E00000000CB09000001000000FFFFFFFFFFFFFFFF050000000000000001000000000000000100000001000000FFFFFFFFC0030000A2020000C4030000DE03000001000000020000100400000000000000000000000000000000000000000000000000000002000000C6000000FFFFFFFF8F07000001000000FFFFFFFF8F07000001000000C6000000000000000080000000000000FFFFFFFFFFFFFFFF00000000250200009005000029020000000000000100000004000000010000000000000000000000FFFFFFFF06000000C5000000C7000000B4010000D2010000CF0100007794000001800080000000000000000000004002000090050000CE020000000000002902000090050000B70200000000000040820046060000000C4275696C64204F757470757400000000C500000001000000FFFFFFFFFFFFFFFF0D46696E6420496E2046696C657300000000C700000001000000FFFFFFFFFFFFFFFF0A4572726F72204C69737400000000B401000001000000FFFFFFFFFFFFFFFF0E536F757263652042726F7773657200000000D201000001000000FFFFFFFFFFFFFFFF0E416C6C205265666572656E63657300000000CF01000001000000FFFFFFFFFFFFFFFF0642726F777365000000007794000001000000FFFFFFFFFFFFFFFFFFFFFFFF000000000000000000000000000000000000000001000000FFFFFFFFC500000001000000FFFFFFFFC5000000000000000000000000000000 + 000000000B000000000000000020000001000000FFFFFFFFFFFFFFFFF4000000DD0000008C060000E1000000010000000100001004000000010000000000000000000000FFFFFFFF08000000CB00000057010000CC000000F08B00005A01000079070000D601000045890000FFFF02000B004354616262656450616E650020000001000000F40000006600000080070000F4000000F40000004F0000008C060000DD0000000000000040280056080000000B446973617373656D626C7901000000CB00000001000000FFFFFFFFFFFFFFFF14506572666F726D616E636520416E616C797A6572000000005701000001000000FFFFFFFFFFFFFFFF14506572666F726D616E636520416E616C797A657200000000CC00000001000000FFFFFFFFFFFFFFFF0E4C6F67696320416E616C797A657200000000F08B000001000000FFFFFFFFFFFFFFFF0D436F646520436F766572616765000000005A01000001000000FFFFFFFFFFFFFFFF11496E737472756374696F6E205472616365000000007907000001000000FFFFFFFFFFFFFFFF0F53797374656D20416E616C797A657200000000D601000001000000FFFFFFFFFFFFFFFF104576656E742053746174697374696373000000004589000001000000FFFFFFFFFFFFFFFF00000000000000000000000000000000000000000000000001000000FFFFFFFFCB00000001000000FFFFFFFFCB000000000000000040000001000000FFFFFFFFFFFFFFFF8C0600004F00000090060000A6020000010000000200000004000000010000000000000000000000FFFFFFFF2B000000E2050000CA0900002D8C00002E8C00002F8C0000308C0000318C0000328C0000338C0000348C0000358C0000368C0000378C0000388C0000398C00003A8C00003B8C00003C8C00003D8C00003E8C00003F8C0000408C0000418C000050C3000051C3000052C3000053C3000054C3000055C3000056C3000057C3000058C3000059C300005AC300005BC300005CC300005DC300005EC300005FC3000060C3000061C3000062C3000063C3000001800040000001000000A004000066000000900500003C020000900600004F00000080070000A602000000000000404100562B0000000753796D626F6C7300000000E205000001000000FFFFFFFFFFFFFFFF0A5472616365204461746100000000CA09000001000000FFFFFFFFFFFFFFFF00000000002D8C000001000000FFFFFFFFFFFFFFFF00000000002E8C000001000000FFFFFFFFFFFFFFFF00000000002F8C000001000000FFFFFFFFFFFFFFFF0000000000308C000001000000FFFFFFFFFFFFFFFF0000000000318C000001000000FFFFFFFFFFFFFFFF0000000000328C000001000000FFFFFFFFFFFFFFFF0000000000338C000001000000FFFFFFFFFFFFFFFF0000000000348C000001000000FFFFFFFFFFFFFFFF0000000000358C000001000000FFFFFFFFFFFFFFFF0000000000368C000001000000FFFFFFFFFFFFFFFF0000000000378C000001000000FFFFFFFFFFFFFFFF0000000000388C000001000000FFFFFFFFFFFFFFFF0000000000398C000001000000FFFFFFFFFFFFFFFF00000000003A8C000001000000FFFFFFFFFFFFFFFF00000000003B8C000001000000FFFFFFFFFFFFFFFF00000000003C8C000001000000FFFFFFFFFFFFFFFF00000000003D8C000001000000FFFFFFFFFFFFFFFF00000000003E8C000001000000FFFFFFFFFFFFFFFF00000000003F8C000001000000FFFFFFFFFFFFFFFF0001000000408C000001000000FFFFFFFFFFFFFFFF0001000000418C000001000000FFFFFFFFFFFFFFFF000000000050C3000001000000FFFFFFFFFFFFFFFF000000000051C3000001000000FFFFFFFFFFFFFFFF000000000052C3000001000000FFFFFFFFFFFFFFFF000000000053C3000001000000FFFFFFFFFFFFFFFF000000000054C3000001000000FFFFFFFFFFFFFFFF000000000055C3000001000000FFFFFFFFFFFFFFFF000000000056C3000001000000FFFFFFFFFFFFFFFF000000000057C3000001000000FFFFFFFFFFFFFFFF000000000058C3000001000000FFFFFFFFFFFFFFFF000000000059C3000001000000FFFFFFFFFFFFFFFF00000000005AC3000001000000FFFFFFFFFFFFFFFF00000000005BC3000001000000FFFFFFFFFFFFFFFF00000000005CC3000001000000FFFFFFFFFFFFFFFF00000000005DC3000001000000FFFFFFFFFFFFFFFF00000000005EC3000001000000FFFFFFFFFFFFFFFF00000000005FC3000001000000FFFFFFFFFFFFFFFF000000000060C3000001000000FFFFFFFFFFFFFFFF000000000061C3000001000000FFFFFFFFFFFFFFFF000000000062C3000001000000FFFFFFFFFFFFFFFF000000000063C3000001000000FFFFFFFFFFFFFFFF16000000000000000000000000000000000000000000000001000000FFFFFFFFE205000001000000FFFFFFFFE2050000000000000010000001000000FFFFFFFFFFFFFFFFF00000004F000000F4000000A6020000010000000200001004000000010000000000000000000000FFFFFFFF05000000ED0300006D000000C3000000C400000073940000018000100000010000000000000066000000F0000000B5020000000000004F000000F0000000A60200000000000040410056050000000750726F6A65637401000000ED03000001000000FFFFFFFFFFFFFFFF05426F6F6B73000000006D00000001000000FFFFFFFFFFFFFFFF0946756E6374696F6E7300000000C300000001000000FFFFFFFFFFFFFFFF0954656D706C6174657300000000C400000001000000FFFFFFFFFFFFFFFF09526567697374657273010000007394000001000000FFFFFFFFFFFFFFFF04000000000000000000000000000000000000000000000001000000FFFFFFFFED03000001000000FFFFFFFFED030000000000000080000001000000FFFFFFFFFFFFFFFF00000000A602000080070000AA02000001000000010000100400000001000000D9FEFFFF6801000000000000000000000000000001000000C6000000FFFFFFFF0F0000008F070000930700009407000095070000960700009007000091070000B5010000B801000038030000B9050000BA050000BB050000BC050000CB09000001800080000001000000C4030000B902000080070000F5030000C4030000AA02000080070000E603000000000000404100560F0000001343616C6C20537461636B202B204C6F63616C73010000008F07000001000000FFFFFFFFFFFFFFFF0755415254202331000000009307000001000000FFFFFFFFFFFFFFFF0755415254202332000000009407000001000000FFFFFFFFFFFFFFFF0755415254202333000000009507000001000000FFFFFFFFFFFFFFFF15446562756720287072696E74662920566965776572000000009607000001000000FFFFFFFFFFFFFFFF0757617463682031010000009007000001000000FFFFFFFFFFFFFFFF0757617463682032010000009107000001000000FFFFFFFFFFFFFFFF10547261636520457863657074696F6E7300000000B501000001000000FFFFFFFFFFFFFFFF0E4576656E7420436F756E7465727300000000B801000001000000FFFFFFFFFFFFFFFF09554C494E4B706C7573000000003803000001000000FFFFFFFFFFFFFFFF084D656D6F7279203101000000B905000001000000FFFFFFFFFFFFFFFF084D656D6F7279203200000000BA05000001000000FFFFFFFFFFFFFFFF084D656D6F7279203300000000BB05000001000000FFFFFFFFFFFFFFFF084D656D6F7279203400000000BC05000001000000FFFFFFFFFFFFFFFF105472616365204E617669676174696F6E00000000CB09000001000000FFFFFFFFFFFFFFFF050000000000000001000000000000000100000001000000FFFFFFFFC0030000AA020000C4030000E603000001000000020000100400000000000000000000000000000000000000000000000000000002000000C6000000FFFFFFFF8F07000001000000FFFFFFFF8F07000001000000C6000000000000000080000000000000FFFFFFFFFFFFFFFF00000000250200009005000029020000000000000100000004000000010000000000000000000000FFFFFFFF06000000C5000000C7000000B4010000D2010000CF0100007794000001800080000000000000000000004002000090050000CE020000000000002902000090050000B70200000000000040820046060000000C4275696C64204F757470757400000000C500000001000000FFFFFFFFFFFFFFFF0D46696E6420496E2046696C657300000000C700000001000000FFFFFFFFFFFFFFFF0A4572726F72204C69737400000000B401000001000000FFFFFFFFFFFFFFFF0E536F757263652042726F7773657200000000D201000001000000FFFFFFFFFFFFFFFF0E416C6C205265666572656E63657300000000CF01000001000000FFFFFFFFFFFFFFFF0642726F777365000000007794000001000000FFFFFFFFFFFFFFFFFFFFFFFF000000000000000000000000000000000000000001000000FFFFFFFFC500000001000000FFFFFFFFC5000000000000000000000000000000 59392 File - 2864 - 00200000010000002800FFFF01001100434D4643546F6F6C426172427574746F6E00E100000000000000000000000000000000000000000000000100000001000000018001E100000000000001000000000000000000000000000000000100000001000000018003E1000000000000020000000000000000000000000000000001000000010000000180CD7F0000000000000300000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018023E100000000040004000000000000000000000000000000000100000001000000018022E100000000040005000000000000000000000000000000000100000001000000018025E10000000000000600000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001802BE10000000004000700000000000000000000000000000000010000000100000001802CE10000000004000800000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001807A8A0000000000000900000000000000000000000000000000010000000100000001807B8A0000000004000A00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180D3B00000000000000B000000000000000000000000000000000100000001000000018015B10000000004000C0000000000000000000000000000000001000000010000000180F4B00000000004000D000000000000000000000000000000000100000001000000018036B10000000004000E00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180FF88000000000400460000000000000000000000000000000001000000010000000180FE880000000004004500000000000000000000000000000000010000000100000001800B810000000004001300000000000000000000000000000000010000000100000001800C810000000004001400000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180F0880000020000000F000000000000000000000000000000000100000001000000FFFF0100120043555646696E64436F6D626F427574746F6EE803000000000000000000000000000000000000000000000001000000010000009600000002002050000000000E455350383236365F54585F425546960000000000000014000E455350383236365F54585F4255460D5553415254785F52585F4255460E455350383236365F52585F4255460B446174615F52585F4255460875696E7433325F74037531360775696E74385F741B455350383236365F5553415254315F5363616E5F416374696F6E730655534152543206555341525431044750494F067374726C656E06737472737472056670757463115553415254315F49525148616E646C6572094952516E5F547970650E55534152545F53656E64446174610B52533438355F54585F454E16455854495F436C656172495450656E64696E674269740A455854495F4C696E65780000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000018024E10000000000001100000000000000000000000000000000010000000100000001800A810000000000001200000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6E2280000002000100150000002153746172742F53746F70202644656275672053657373696F6E094374726C2B46350000000000000000000000000100000001000000000000000000000001000000020021802280000000000000150000002153746172742F53746F70202644656275672053657373696F6E094374726C2B4635000000000000000000000000010000000100000000000000000000000100000000002180E0010000000000007500000021456E65726779204D6561737572656D656E742026776974686F75742044656275670000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180C488000000000000160000000000000000000000000000000001000000010000000180C988000000000400180000000000000000000000000000000001000000010000000180C788000000000000190000000000000000000000000000000001000000010000002180C8880000000000001700000027264B696C6C20416C6C20427265616B706F696E747320696E2043757272656E7420546172676574000000000000000000000000010000000100000000000000000000000100000003002180C8880000000000001700000027264B696C6C20416C6C20427265616B706F696E747320696E2043757272656E7420546172676574000000000000000000000000010000000100000000000000000000000100000000002180E50100000000000078000000264B696C6C20416C6C20427265616B706F696E747320696E204163746976652050726F6A656374000000000000000000000000010000000100000000000000000000000100000000002180E601000000000000790000002F4B696C6C20416C6C20427265616B706F696E747320696E204D756C74692D50726F6A65637420576F726B73706163650000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000021804C010000020001001A0000000F2650726F6A6563742057696E646F77000000000000000000000000010000000100000000000000000000000100000008002180DD880000000000001A0000000750726F6A656374000000000000000000000000010000000100000000000000000000000100000000002180DC8B0000000000003A00000005426F6F6B73000000000000000000000000010000000100000000000000000000000100000000002180E18B0000000000003B0000000946756E6374696F6E73000000000000000000000000010000000100000000000000000000000100000000002180E28B000000000000400000000954656D706C6174657300000000000000000000000001000000010000000000000000000000010000000000218018890000000000003D0000000E536F757263652042726F777365720000000000000000000000000100000001000000000000000000000001000000000021800000000000000400FFFFFFFF00000000000000000001000000000000000100000000000000000000000100000000002180D988000000000000390000000C4275696C64204F7574707574000000000000000000000000010000000100000000000000000000000100000000002180E38B000000000000410000000B46696E64204F75747075740000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180FB7F0000000000001B000000000000000000000000000000000100000001000000000000000446696C65C6030000 + 2578 + 00200000010000002800FFFF01001100434D4643546F6F6C426172427574746F6E00E100000000000000000000000000000000000000000000000100000001000000018001E100000000000001000000000000000000000000000000000100000001000000018003E1000000000000020000000000000000000000000000000001000000010000000180CD7F0000000000000300000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018023E100000000040004000000000000000000000000000000000100000001000000018022E100000000040005000000000000000000000000000000000100000001000000018025E10000000000000600000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001802BE10000000004000700000000000000000000000000000000010000000100000001802CE10000000004000800000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001807A8A0000000000000900000000000000000000000000000000010000000100000001807B8A0000000004000A00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180D3B00000000000000B000000000000000000000000000000000100000001000000018015B10000000004000C0000000000000000000000000000000001000000010000000180F4B00000000004000D000000000000000000000000000000000100000001000000018036B10000000004000E00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180FF88000000000400460000000000000000000000000000000001000000010000000180FE880000000004004500000000000000000000000000000000010000000100000001800B810000000004001300000000000000000000000000000000010000000100000001800C810000000004001400000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180F0880000020000000F000000000000000000000000000000000100000001000000FFFF0100120043555646696E64436F6D626F427574746F6EE8030000000000000000000000000000000000000000000000010000000100000096000000020020500000000012785175657565557361727433526548646C729600000000000000010012785175657565557361727433526548646C7200000000018024E10000000000001100000000000000000000000000000000010000000100000001800A810000000000001200000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6E2280000002000300150000002153746172742F53746F70202644656275672053657373696F6E094374726C2B46350000000000000000000000000100000001000000000000000000000001000000020021802280000000000000150000002153746172742F53746F70202644656275672053657373696F6E094374726C2B4635000000000000000000000000010000000100000000000000000000000100000000002180E0010000000000007500000021456E65726779204D6561737572656D656E742026776974686F75742044656275670000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180C488000000000000160000000000000000000000000000000001000000010000000180C988000000000400180000000000000000000000000000000001000000010000000180C788000000000000190000000000000000000000000000000001000000010000002180C8880000000000001700000027264B696C6C20416C6C20427265616B706F696E747320696E2043757272656E7420546172676574000000000000000000000000010000000100000000000000000000000100000003002180C8880000000000001700000027264B696C6C20416C6C20427265616B706F696E747320696E2043757272656E7420546172676574000000000000000000000000010000000100000000000000000000000100000000002180E50100000000000078000000264B696C6C20416C6C20427265616B706F696E747320696E204163746976652050726F6A656374000000000000000000000000010000000100000000000000000000000100000000002180E601000000000000790000002F4B696C6C20416C6C20427265616B706F696E747320696E204D756C74692D50726F6A65637420576F726B73706163650000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000021804C010000020001001A0000000F2650726F6A6563742057696E646F77000000000000000000000000010000000100000000000000000000000100000008002180DD880000000000001A0000000750726F6A656374000000000000000000000000010000000100000000000000000000000100000000002180DC8B0000000000003A00000005426F6F6B73000000000000000000000000010000000100000000000000000000000100000000002180E18B0000000000003B0000000946756E6374696F6E73000000000000000000000000010000000100000000000000000000000100000000002180E28B000000000000400000000954656D706C6174657300000000000000000000000001000000010000000000000000000000010000000000218018890000000000003D0000000E536F757263652042726F777365720000000000000000000000000100000001000000000000000000000001000000000021800000000000000400FFFFFFFF00000000000000000001000000000000000100000000000000000000000100000000002180D988000000000000390000000C4275696C64204F7574707574000000000000000000000000010000000100000000000000000000000100000000002180E38B000000000000410000000B46696E64204F75747075740000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180FB7F0000000000001B000000000000000000000000000000000100000001000000000000000446696C65C6030000 1423 @@ -3603,11 +3603,11 @@ 0 100 - 7 + 8 .\Drivers\LoRa.h 15 - 1 + 104 34 1 @@ -3615,9 +3615,9 @@ .\Drivers\LoRa.c - 18 + 41 1 - 14 + 9 1 0 @@ -3651,27 +3651,36 @@ .\System\USART.c - 0 - 211 - 1 + 19 + 201 + 47 1 0 .\System\USART.h - 45 + 25 1 - 32 + 11 1 0 .\User\main.c - 60 - 163 - 197 + 46 + 210 + 211 + 1 + + 0 + + + .\Drivers\LED.h + 0 + 1 + 16 1 0 diff --git a/STM32/Environment_Node/STM32Template.uvoptx b/STM32/Environment_Node/STM32Template.uvoptx index 3bf89b9..b9f37b9 100644 --- a/STM32/Environment_Node/STM32Template.uvoptx +++ b/STM32/Environment_Node/STM32Template.uvoptx @@ -1016,7 +1016,7 @@ Drivers - 0 + 1 0 0 0 diff --git a/STM32/Environment_Node/System/USART.c b/STM32/Environment_Node/System/USART.c index dd676a7..918da74 100644 --- a/STM32/Environment_Node/System/USART.c +++ b/STM32/Environment_Node/System/USART.c @@ -12,17 +12,17 @@ void vUsartInit(USART_TypeDef *xUsartId, uint32_t ulBaudrate) if (xUsartId == USART1) { /* code */ - RCC_APB2PeriphClockCmd(RCC_APB2Periph_GPIOB,ENABLE); + RCC_APB2PeriphClockCmd(USART1_GPIO_CLOCK,ENABLE); GPIO_InitTypeDef GPIO_InitStructure; GPIO_InitStructure.GPIO_Mode = GPIO_Mode_AF_PP; GPIO_InitStructure.GPIO_Speed = GPIO_Speed_50MHz; GPIO_InitStructure.GPIO_Pin = USART1_GPIO_PIN_TX; - GPIO_Init(GPIOA, &GPIO_InitStructure); + GPIO_Init(USART1_GPIO_PORT, &GPIO_InitStructure); GPIO_InitStructure.GPIO_Mode = GPIO_Mode_IPU; GPIO_InitStructure.GPIO_Speed = GPIO_Speed_50MHz; GPIO_InitStructure.GPIO_Pin = USART1_GPIO_PIN_RX; - GPIO_Init(GPIOA, &GPIO_InitStructure); + GPIO_Init(USART1_GPIO_PORT, &GPIO_InitStructure); USART_InitTypeDef USART_InitStructure; USART_InitStructure.USART_BaudRate = ulBaudrate; // 趨USART_InitڲԶ9600ӦķƵϵдBRRĴ @@ -48,15 +48,15 @@ void vUsartInit(USART_TypeDef *xUsartId, uint32_t ulBaudrate) } else if (xUsartId == USART2) { /* code */ - RCC_APB2PeriphClockCmd(RCC_APB2Periph_GPIOA,ENABLE); + RCC_APB2PeriphClockCmd(USART2_GPIO_CLOCK,ENABLE); GPIO_InitTypeDef GPIO_InitStructure; GPIO_InitStructure.GPIO_Mode = GPIO_Mode_AF_PP; GPIO_InitStructure.GPIO_Speed = GPIO_Speed_50MHz; GPIO_InitStructure.GPIO_Pin = USART2_GPIO_PIN_TX; - GPIO_Init(GPIOB, &GPIO_InitStructure); + GPIO_Init(USART2_GPIO_PORT, &GPIO_InitStructure); GPIO_InitStructure.GPIO_Mode = GPIO_Mode_IPU; GPIO_InitStructure.GPIO_Pin = USART2_GPIO_PIN_RX; - GPIO_Init(GPIOB, &GPIO_InitStructure); + GPIO_Init(USART2_GPIO_PORT, &GPIO_InitStructure); USART_InitTypeDef USART_InitStructure; USART_InitStructure.USART_BaudRate = ulBaudrate; // 趨USART_InitڲԶ9600ӦķƵϵдBRRĴ @@ -82,16 +82,16 @@ void vUsartInit(USART_TypeDef *xUsartId, uint32_t ulBaudrate) } else if (xUsartId == USART3) { /* code */ - RCC_APB2PeriphClockCmd(RCC_APB2Periph_GPIOB,ENABLE); + RCC_APB2PeriphClockCmd(USART3_GPIO_CLOCK,ENABLE); GPIO_InitTypeDef GPIO_InitStructure; GPIO_InitStructure.GPIO_Mode = GPIO_Mode_AF_PP; GPIO_InitStructure.GPIO_Speed = GPIO_Speed_50MHz; GPIO_InitStructure.GPIO_Pin = USART3_GPIO_PIN_TX; - GPIO_Init(GPIOB, &GPIO_InitStructure); + GPIO_Init(USART3_GPIO_PORT, &GPIO_InitStructure); GPIO_InitStructure.GPIO_Mode = GPIO_Mode_IPU; GPIO_InitStructure.GPIO_Pin = USART3_GPIO_PIN_RX; - GPIO_Init(GPIOB, &GPIO_InitStructure); + GPIO_Init(USART3_GPIO_PORT, &GPIO_InitStructure); USART_InitTypeDef USART_InitStructure; USART_InitStructure.USART_BaudRate = ulBaudrate; // 趨USART_InitڲԶ9600ӦķƵϵдBRRĴ @@ -220,13 +220,13 @@ void USART1_IRQHandler(void) { /* code */ uint8_t ulRxData = (uint8_t)USART_ReceiveData(USART1); - #if (USE_NONE_SYSTEM == 1) - #elif (USE_FREERTOS == 1) + #if (USE_SYSTEM == NONE) + #elif (USE_SYSTEM == FREERTOS) BaseType_t xHigherPriorityTaskWoken = pdFALSE; xQueueSendFromISR(xQueueUsart1IrqHdlr, &ulRxData, &xHigherPriorityTaskWoken); /* Դл */ portYIELD_FROM_ISR(xHigherPriorityTaskWoken); - #elif (USE_OSAL == 1) + #elif (USE_SYSTEM == OSAL) #endif USART_ClearITPendingBit(USART1, USART_IT_RXNE); } @@ -244,13 +244,13 @@ void USART2_IRQHandler(void) { /* code */ uint8_t ulRxData = (uint8_t)USART_ReceiveData(USART2); - #if (USE_NONE_SYSTEM == 1) - #elif (USE_FREERTOS == 1) + #if (USE_SYSTEM == NONE) + #elif (USE_SYSTEM == FREERTOS) BaseType_t xHigherPriorityTaskWoken = pdFALSE; xQueueSendFromISR(xQueueUsart2IrqHdlr, &ulRxData, &xHigherPriorityTaskWoken); /* Դл */ portYIELD_FROM_ISR(xHigherPriorityTaskWoken); - #elif (USE_OSAL == 1) + #elif (USE_SYSTEM == OSAL) #endif USART_ClearITPendingBit(USART2, USART_IT_RXNE); } @@ -268,13 +268,13 @@ void USART3_IRQHandler(void) { /* code */ uint8_t ulRxData = (uint8_t)USART_ReceiveData(USART3); - #if (USE_NONE_SYSTEM == 1) - #elif (USE_FREERTOS == 1) + #if (USE_SYSTEM == NONE) + #elif (USE_SYSTEM == FREERTOS) BaseType_t xHigherPriorityTaskWoken = pdFALSE; xQueueSendFromISR(xQueueUsart3IrqHdlr, &ulRxData, &xHigherPriorityTaskWoken); /* Դл */ portYIELD_FROM_ISR(xHigherPriorityTaskWoken); - #elif (USE_OSAL == 1) + #elif (USE_SYSTEM == OSAL) #endif USART_ClearITPendingBit(USART3, USART_IT_RXNE); } diff --git a/STM32/Environment_Node/System/USART.h b/STM32/Environment_Node/System/USART.h index b1cdbbb..f176f56 100644 --- a/STM32/Environment_Node/System/USART.h +++ b/STM32/Environment_Node/System/USART.h @@ -1,12 +1,19 @@ #ifndef __USART_H__ #define __USART_H__ -#define USE_NONE_SYSTEM 0 -#define USE_FREERTOS 1 -#define USE_OSAL 0 +#define USE_SYSTEM FREERTOS +#define NONE 0 +#define FREERTOS 1 +#define OSAL 2 #define vUsart1IrqHandler USART1_IRQHandler #define vEsp8266IrqHandler USART2_IRQHandler #define vLoRaIrqHandler USART3_IRQHandler +#define USART1_GPIO_CLOCK RCC_APB2Periph_GPIOA +#define USART2_GPIO_CLOCK RCC_APB2Periph_GPIOA +#define USART3_GPIO_CLOCK RCC_APB2Periph_GPIOB +#define USART1_GPIO_PORT GPIOA +#define USART2_GPIO_PORT GPIOA +#define USART3_GPIO_PORT GPIOB #define USART1_GPIO_PIN_TX GPIO_Pin_9 #define USART1_GPIO_PIN_RX GPIO_Pin_10 #define USART2_GPIO_PIN_TX GPIO_Pin_2 @@ -14,11 +21,11 @@ #define USART3_GPIO_PIN_TX GPIO_Pin_10 #define USART3_GPIO_PIN_RX GPIO_Pin_11 -#if (USE_NONE_SYSTEM == 1) -#elif (USE_FREERTOS == 1) +#if (USE_SYSTEM == NONE) +#elif (USE_SYSTEM == FREERTOS) #include "FreeRTOS.h" #include "queue.h" -#elif (USE_OSAL == 1) +#elif (USE_SYSTEM == OSAL) #endif #include "stm32f10x.h" // Device header @@ -26,12 +33,12 @@ #include #include -#if (USE_NONE_SYSTEM == 1) -#elif (USE_FREERTOS == 1) +#if (USE_SYSTEM == NONE) +#elif (USE_SYSTEM == FREERTOS) extern QueueHandle_t xQueueUsart1IrqHdlr; extern QueueHandle_t xQueueUsart2IrqHdlr; extern QueueHandle_t xQueueUsart3IrqHdlr; -#elif (USE_OSAL == 1) +#elif (USE_SYSTEM == OSAL) #endif void vUsartInit(USART_TypeDef *xUsartId, uint32_t ulBaudrate); diff --git a/STM32/Environment_Node/User/main.c b/STM32/Environment_Node/User/main.c index 4e98c9b..e9a82d4 100644 --- a/STM32/Environment_Node/User/main.c +++ b/STM32/Environment_Node/User/main.c @@ -5,7 +5,6 @@ #include "semphr.h" #include "LED.h" #include "DHT11.h" -// #include "USART3.h" #include "USART.h" #include "LoRa.h" #include "Relay.h" @@ -183,7 +182,7 @@ void vTaskLoRaMsgRec(void *pvParameters) void vCreateTasksList(void) { // #if defined __LED_H__ - #if LED_PC13_WORK_MODE == LED_PC13_STM32_STATE_MODE + #if LED_PC13_WORK_MODE == STM32_STATE_MODE /* 񣬲ֱΪơ֡ջСزֵȼ */ xTaskCreate( (TaskFunction_t ) vTaskStateLed, diff --git a/STM32/Gateway_Node/Application/NetFIFO/NetFIFO.c b/STM32/Gateway_Node/Application/NetFIFO/NetFIFO.c new file mode 100644 index 0000000..64949f0 --- /dev/null +++ b/STM32/Gateway_Node/Application/NetFIFO/NetFIFO.c @@ -0,0 +1,80 @@ +#include "NetFIFO.h" + +/** + * @brief ʼλ + * @param pBuffer: ṹָ + * @retval None + */ +void vNetBufferInit(NetFifoBuffer_t *pxBuffer) +{ + if (pxBuffer == NULL) return; + memset(pxBuffer->cResponseBuffer, 0, sizeof(pxBuffer->cResponseBuffer)); + pxBuffer->ucBufferIndex = 0; +} + +/** + * @brief 򻺳д + * @param pxBuffer: ṹָ + * @param cData: Ҫд + * @retval None + */ +void vNetBufferWrite(NetFifoBuffer_t *pxBuffer, char cData) +{ + if (pxBuffer == NULL) return; + if (pxBuffer->ucBufferIndex < sizeof(pxBuffer->cResponseBuffer) - 1) + { + pxBuffer->cResponseBuffer[pxBuffer->ucBufferIndex++] = cData; + pxBuffer->cResponseBuffer[pxBuffer->ucBufferIndex] = '\0'; // ȷַֹ + } +} + +/** + * @brief ӻȡָֽ + * @param pxBuffer: ṹָ + * @param index: Ҫȡֽ + * @retval ȡֽڣЧʱ'\0' + */ +char cNetBufferReadByte(NetFifoBuffer_t *pxBuffer, int index) +{ + if (pxBuffer == NULL) return '\0'; + if (index < 0 || index >= pxBuffer->ucBufferIndex) + { + return '\0'; // Ч + } + return pxBuffer->cResponseBuffer[index]; +} + +/** + * @brief Ƚϻַָ + * @param pxBuffer: ṹָ + * @param pcStr: ҪȽϵַ + * @retval true: ƥɹ, false: ƥʧ + */ +bool bNetBufferCompareStr(NetFifoBuffer_t *pxBuffer, const char *pcStr) +{ + if (pxBuffer == NULL || pcStr == NULL) return false; + return (strstr(pxBuffer->cResponseBuffer, pcStr) != NULL); +} + +/** + * @brief ȡǰ + * @param pxBuffer: ṹָ + * @retval + */ +int iNetBufferGetLength(NetFifoBuffer_t *pxBuffer) +{ + if (pxBuffer == NULL) return 0; + return pxBuffer->ucBufferIndex; +} + +/** + * @brief ջ + * @param pxBuffer: ṹָ + * @retval None + */ +void vNetBufferClear(NetFifoBuffer_t *pxBuffer) +{ + if (pxBuffer == NULL) return; + memset(pxBuffer->cResponseBuffer, 0, sizeof(pxBuffer->cResponseBuffer)); + pxBuffer->ucBufferIndex = 0; +} diff --git a/STM32/Gateway_Node/Application/NetFIFO/NetFIFO.h b/STM32/Gateway_Node/Application/NetFIFO/NetFIFO.h new file mode 100644 index 0000000..d492c9a --- /dev/null +++ b/STM32/Gateway_Node/Application/NetFIFO/NetFIFO.h @@ -0,0 +1,23 @@ +#ifndef __NETFIFO_H__ +#define __NETFIFO_H__ 1 + +#include "stm32f10x.h" +#include "stdio.h" +#include "string.h" +#include "stdbool.h" +#include "stdlib.h" + +typedef struct +{ + char cResponseBuffer[1024]; + uint8_t ucBufferIndex; +}NetFifoBuffer_t; + +void vNetBufferInit(NetFifoBuffer_t *pxBuffer); +void vNetBufferWrite(NetFifoBuffer_t *pxBuffer, char cData); +char cNetBufferReadByte(NetFifoBuffer_t *pxBuffer, int index); +bool bNetBufferCompareStr(NetFifoBuffer_t *pxBuffer, const char *pcStr); +int iNetBufferGetLength(NetFifoBuffer_t *pxBuffer); +void vNetBufferClear(NetFifoBuffer_t *pxBuffer); + +#endif diff --git a/STM32/Gateway_Node/Drivers/ESP8266.c b/STM32/Gateway_Node/Drivers/ESP8266.c index ec97834..eae13d6 100644 --- a/STM32/Gateway_Node/Drivers/ESP8266.c +++ b/STM32/Gateway_Node/Drivers/ESP8266.c @@ -1 +1,58 @@ #include "ESP8266.h" + +void vEsp8266Restore(void) +{ + vUsartPrintf(USART2, "AT+RESTORE\r\n"); +} + +void vEsp8266Reset(void) +{ + vUsartPrintf(USART2, "AT+RST\r\n"); +} + +uint8_t ucEsp8266SetMode(uint8_t ucMode) +{ + vUsartPrintf(USART2, "AT+CWMODE=%d\r\n", ucMode); + if (ucMode == 1) + { + /* code */ + return ESP8266_MODE_STATION; + } else if (ucMode == 0) + { + /* code */ + return ESP8266_MODE_SOFTAP; + } else + { + return 0xFF; // Чģʽ + } +} + +void vEsp8266JoinAp(const char *pcSsid, const char *pcPassword) +{ + vUsartPrintf(USART2, "AT+CWJAP=\"%s\",\"%s\"\r\n", pcSsid, pcPassword); +} + +/** + * @brief ESP8266Ӧ + * @param *pxEspBuffer ESP8266ָ + * @retval 0: ȴ, 1: ɹ, 2: ʧ + */ +uint8_t ucEsp8266ResponseHandler(NetFifoBuffer_t *pxEspBuffer) +{ + // ǷյӦ + if (strstr(pxEspBuffer->cResponseBuffer, "ready") != NULL) + { + return 1; // ɹ + } + else if (strstr(pxEspBuffer->cResponseBuffer, "OK") != NULL) + { + return 1; // ɹ + } + else if (strstr(pxEspBuffer->cResponseBuffer, "ERROR") != NULL || + strstr(pxEspBuffer->cResponseBuffer, "FAIL") != NULL) + { + return 2; // ʧ + } + + return 0; // ȴ +} diff --git a/STM32/Gateway_Node/Drivers/ESP8266.h b/STM32/Gateway_Node/Drivers/ESP8266.h index 89ff7c3..ed4f28f 100644 --- a/STM32/Gateway_Node/Drivers/ESP8266.h +++ b/STM32/Gateway_Node/Drivers/ESP8266.h @@ -1,5 +1,18 @@ #ifndef __ESP8266_H__ #define __ESP8266_H__ +#include "string.h" +#include "stdbool.h" +#include "USART.h" +#include "NetFIFO.h" + +#define ESP8266_MODE_STATION 0 +#define ESP8266_MODE_SOFTAP 1 + +void vEsp8266Restore(void); +void vEsp8266Reset(void); +uint8_t ucEsp8266SetMode(uint8_t ucMode); +void vEsp8266JoinAp(const char *pcSsid, const char *pcPassword); +uint8_t ucEsp8266ResponseHandler(NetFifoBuffer_t *pxEspBuffer); #endif diff --git a/STM32/Gateway_Node/FreeRTOS/config/FreeRTOSConfig.h b/STM32/Gateway_Node/FreeRTOS/config/FreeRTOSConfig.h index 6fcf2a6..3ba6b69 100644 --- a/STM32/Gateway_Node/FreeRTOS/config/FreeRTOSConfig.h +++ b/STM32/Gateway_Node/FreeRTOS/config/FreeRTOSConfig.h @@ -39,20 +39,20 @@ * See http://www.freertos.org/a00110.html *----------------------------------------------------------*/ -#define configUSE_PREEMPTION 1 -#define configUSE_IDLE_HOOK 0 -#define configUSE_TICK_HOOK 0 -#define configCPU_CLOCK_HZ ( ( unsigned long ) 72000000 ) -#define configTICK_RATE_HZ ( ( TickType_t ) 1000 ) -#define configMAX_PRIORITIES ( 5 ) -#define configMINIMAL_STACK_SIZE ( ( unsigned short ) 128 ) -#define configTOTAL_HEAP_SIZE ( ( size_t ) ( 17 * 1024 ) ) -#define configMAX_TASK_NAME_LEN ( 16 ) -#define configUSE_TRACE_FACILITY 0 +#define configUSE_PREEMPTION 1 +#define configUSE_IDLE_HOOK 0 +#define configUSE_TICK_HOOK 0 +#define configCPU_CLOCK_HZ ( ( unsigned long ) 72000000 ) +#define configTICK_RATE_HZ ( ( TickType_t ) 1000 ) +#define configMAX_PRIORITIES ( 5 ) +#define configMINIMAL_STACK_SIZE ( ( unsigned short ) 128 ) +#define configTOTAL_HEAP_SIZE ( ( size_t ) ( 17 * 1024 ) ) +#define configMAX_TASK_NAME_LEN ( 16 ) +#define configUSE_TRACE_FACILITY 0 /* ϵͳļͣ1ʾΪ16λ޷Σ0ʾΪ32λ޷ */ -#define configUSE_16_BIT_TICKS 0 +#define configUSE_16_BIT_TICKS 0 /* 1CPUʹȨ,ͬȼû 2ȼȼͬ2ʹ1 */ -#define configIDLE_SHOULD_YIELD 1 +#define configIDLE_SHOULD_YIELD 1 /* ӵIJ */ /* ʱƬȣȼͬʱִ */ #define configUSE_TIME_SLICING 1 diff --git a/STM32/Gateway_Node/STM32Template.uvguix.Exploration b/STM32/Gateway_Node/STM32Template.uvguix.Exploration index bd6a2de..8904320 100644 --- a/STM32/Gateway_Node/STM32Template.uvguix.Exploration +++ b/STM32/Gateway_Node/STM32Template.uvguix.Exploration @@ -6,7 +6,7 @@
### uVision Project, (C) Keil Software
- E:\Data\Project\IoTProjects\FreeRTOS_LoRa_Environment_Assistant\STM32\Gateway_Node\System + E:\Data\Project\IoTProjects\FreeRTOS_LoRa_Environment_Assistant\STM32\Gateway_Node\Application\NetFIFO @@ -28,7 +28,7 @@ 38003 Registers - 140 82 + 140 106 346 @@ -104,7 +104,7 @@ 44 2 - 2 + 3 -32000 -32000 @@ -123,8 +123,8 @@ 0 - 1596 - 0100000004000000010000000100000001000000010000000000000002000000000000000100000001000000000000002800000028000000010000000B00000000000000010000005E453A5C446174615C50726F6A6563745C496F5450726F6A656374735C4672656552544F535F4C6F52615F456E7669726F6E6D656E745F417373697374616E745C53544D33325C476174657761795F4E6F64655C557365725C6D61696E2E6300000000066D61696E2E6300000000C5D4F200FFFFFFFF73453A5C446174615C50726F6A6563745C496F5450726F6A656374735C4672656552544F535F4C6F52615F456E7669726F6E6D656E745F417373697374616E745C53544D33325C476174657761795F4E6F64655C4672656552544F535C636F6E6669675C4672656552544F53436F6E6669672E6800000000104672656552544F53436F6E6669672E6800000000FFDC7800FFFFFFFF78453A5C446174615C50726F6A6563745C496F5450726F6A656374735C4672656552544F535F4C6F52615F456E7669726F6E6D656E745F417373697374616E745C53544D33325C476174657761795F4E6F64655C4672656552544F535C706F727461626C655C525644535C41524D5F434D335C706F72742E630000000006706F72742E6300000000BECEA100FFFFFFFF66453A5C446174615C50726F6A6563745C496F5450726F6A656374735C4672656552544F535F4C6F52615F456E7669726F6E6D656E745F417373697374616E745C53544D33325C476174657761795F4E6F64655C4672656552544F535C696E635C7461736B2E6800000000067461736B2E6800000000F0A0A100FFFFFFFF61453A5C446174615C50726F6A6563745C496F5450726F6A656374735C4672656552544F535F4C6F52615F456E7669726F6E6D656E745F417373697374616E745C53544D33325C476174657761795F4E6F64655C447269766572735C4C6F52612E6300000000064C6F52612E6300000000BCA8E100FFFFFFFF61453A5C446174615C50726F6A6563745C496F5450726F6A656374735C4672656552544F535F4C6F52615F456E7669726F6E6D656E745F417373697374616E745C53544D33325C476174657761795F4E6F64655C53797374656D5C44656C61792E63000000000744656C61792E63000000009CC1B600FFFFFFFF61453A5C446174615C50726F6A6563745C496F5450726F6A656374735C4672656552544F535F4C6F52615F456E7669726F6E6D656E745F417373697374616E745C53544D33325C476174657761795F4E6F64655C53797374656D5C44656C61792E68000000000744656C61792E6800000000F7B88600FFFFFFFF61453A5C446174615C50726F6A6563745C496F5450726F6A656374735C4672656552544F535F4C6F52615F456E7669726F6E6D656E745F417373697374616E745C53544D33325C476174657761795F4E6F64655C53797374656D5C55534152542E63000000000755534152542E6300000000D9ADC200FFFFFFFF61453A5C446174615C50726F6A6563745C496F5450726F6A656374735C4672656552544F535F4C6F52615F456E7669726F6E6D656E745F417373697374616E745C53544D33325C476174657761795F4E6F64655C447269766572735C4C6F52612E6800000000064C6F52612E6800000000A5C2D700FFFFFFFF61453A5C446174615C50726F6A6563745C496F5450726F6A656374735C4672656552544F535F4C6F52615F456E7669726F6E6D656E745F417373697374616E745C53544D33325C476174657761795F4E6F64655C53797374656D5C55534152542E68000000000755534152542E6800000000B3A6BE00FFFFFFFF75453A5C446174615C50726F6A6563745C496F5450726F6A656374735C4672656552544F535F4C6F52615F456E7669726F6E6D656E745F417373697374616E745C53544D33325C476174657761795F4E6F64655C53797374656D46696C65735C737461727475705F73746D3332663130785F6D642E730000000016737461727475705F73746D3332663130785F6D642E7300000000EAD6A300FFFFFFFF0100000010000000C5D4F200FFDC7800BECEA100F0A0A100BCA8E1009CC1B600F7B88600D9ADC200A5C2D700B3A6BE00EAD6A300F6FA7D00B5E99D005FC3CF00C1838300CACAD500010000000000000002000000EC83FFFF4F83FFFF808AFFFF1986FFFF + 822 + 0100000004000000010000000100000001000000010000000000000002000000000000000100000001000000000000002800000028000000010000000500000002000000010000005E453A5C446174615C50726F6A6563745C496F5450726F6A656374735C4672656552544F535F4C6F52615F456E7669726F6E6D656E745F417373697374616E745C53544D33325C476174657761795F4E6F64655C557365725C6D61696E2E6300000000066D61696E2E6300000000C5D4F200FFFFFFFF64453A5C446174615C50726F6A6563745C496F5450726F6A656374735C4672656552544F535F4C6F52615F456E7669726F6E6D656E745F417373697374616E745C53544D33325C476174657761795F4E6F64655C447269766572735C455350383236362E630000000009455350383236362E6300000000FFDC7800FFFFFFFF64453A5C446174615C50726F6A6563745C496F5450726F6A656374735C4672656552544F535F4C6F52615F456E7669726F6E6D656E745F417373697374616E745C53544D33325C476174657761795F4E6F64655C447269766572735C455350383236362E680000000009455350383236362E6800000000BECEA100FFFFFFFF70453A5C446174615C50726F6A6563745C496F5450726F6A656374735C4672656552544F535F4C6F52615F456E7669726F6E6D656E745F417373697374616E745C53544D33325C476174657761795F4E6F64655C4170706C69636174696F6E5C4E65744649464F5C4E65744649464F2E6300000000094E65744649464F2E6300000000F0A0A100FFFFFFFF70453A5C446174615C50726F6A6563745C496F5450726F6A656374735C4672656552544F535F4C6F52615F456E7669726F6E6D656E745F417373697374616E745C53544D33325C476174657761795F4E6F64655C4170706C69636174696F6E5C4E65744649464F5C4E65744649464F2E6800000000094E65744649464F2E6800000000BCA8E100FFFFFFFF0100000010000000C5D4F200FFDC7800BECEA100F0A0A100BCA8E1009CC1B600F7B88600D9ADC200A5C2D700B3A6BE00EAD6A300F6FA7D00B5E99D005FC3CF00C1838300CACAD5000100000000000000020000000401000066000000800700007C030000 @@ -143,11 +143,11 @@ 0 16 - F40000004F00000090050000DD000000 + F40000004F00000090050000DF000000 16 - F40000006600000090050000F4000000 + F40000006600000090050000F6000000 @@ -163,17 +163,17 @@ 0 16 - 0300000066000000B100000037030000 + 00000000630000000001000065030000 16 - 22000000390000001201000002010000 + A4000000BB0000009401000086010000 109 109 - 1 + 0 0 0 0 @@ -183,11 +183,11 @@ 0 16 - 0300000066000000B100000037030000 + 0300000066000000FD0000004C030000 16 - 22000000390000003E01000075020000 + A4000000BB000000C0010000FB020000 @@ -203,11 +203,11 @@ 0 16 - 030000002C0200008D0500009E020000 + 03000000300200008D050000A4020000 16 - 2200000039000000EA020000C7000000 + A4000000BB0000006C0300004B010000 @@ -223,11 +223,11 @@ 0 16 - 030000002C0200008D0500009E020000 + 03000000300200008D050000A4020000 16 - 2200000039000000EA020000C7000000 + A4000000BB0000006C0300004B010000 @@ -243,11 +243,11 @@ 0 16 - 030000002C0200008D0500009E020000 + 03000000300200008D050000A4020000 16 - 2200000039000000EA020000C7000000 + A4000000BB0000006C0300004B010000 @@ -263,11 +263,11 @@ 0 16 - 030000002C0200008D0500009E020000 + 03000000300200008D050000A4020000 16 - 2200000039000000EA020000C7000000 + A4000000BB0000006C0300004B010000 @@ -283,11 +283,11 @@ 0 16 - A3040000660000008D0500000C020000 + A3040000660000008D05000010020000 16 - 22000000390000001201000002010000 + A4000000BB0000009401000086010000 @@ -303,11 +303,11 @@ 0 16 - F7000000660000008D050000C4000000 + F7000000660000008D050000C6000000 16 - 2200000039000000EA020000C7000000 + A4000000BB0000006C0300004B010000 @@ -323,11 +323,11 @@ 0 16 - 030000002C0200008D0500009E020000 + 03000000300200008D050000A4020000 16 - 22000000390000001201000002010000 + A4000000BB0000009401000086010000 @@ -343,11 +343,11 @@ 0 16 - 030000002C0200008D0500009E020000 + 03000000300200008D050000A4020000 16 - 22000000390000001201000002010000 + A4000000BB0000009401000086010000 @@ -363,11 +363,11 @@ 0 16 - 030000002C0200008D0500009E020000 + 03000000300200008D050000A4020000 16 - 22000000390000001201000002010000 + A4000000BB0000009401000086010000 @@ -383,11 +383,11 @@ 0 16 - 030000002C0200008D0500009E020000 + 03000000300200008D050000A4020000 16 - 2200000039000000EA020000C7000000 + A4000000BB0000006C0300004B010000 @@ -403,11 +403,11 @@ 0 16 - 030000002C0200008D0500009E020000 + 03000000300200008D050000A4020000 16 - 2200000039000000EA020000C7000000 + A4000000BB0000006C0300004B010000 @@ -423,11 +423,11 @@ 0 16 - 030000002C0200008D0500009E020000 + 03000000300200008D050000A4020000 16 - 2200000039000000EA020000C7000000 + A4000000BB0000006C0300004B010000 @@ -443,17 +443,17 @@ 0 16 - 030000002C0200008D0500009E020000 + 03000000300200008D050000A4020000 16 - 2200000039000000EA020000C7000000 + A4000000BB0000006C0300004B010000 195 195 - 1 + 0 0 0 0 @@ -463,17 +463,17 @@ 0 16 - 0300000066000000B100000037030000 + 0300000066000000FD0000004C030000 16 - 22000000390000003E01000075020000 + A4000000BB000000C0010000FB020000 196 196 - 1 + 0 0 0 0 @@ -483,11 +483,11 @@ 0 16 - 0300000066000000B100000037030000 + 0300000066000000FD0000004C030000 16 - 22000000390000003E01000075020000 + A4000000BB000000C0010000FB020000 @@ -503,11 +503,11 @@ 0 16 - 000000006803000080070000E6030000 + 000000007D03000080070000E6030000 16 - 2200000039000000EA020000C7000000 + A4000000BB0000006C0300004B010000 @@ -523,11 +523,11 @@ 0 16 - 000000001502000090050000B7020000 + 000000001902000090050000BD020000 16 - 2200000039000000EA020000C7000000 + A4000000BB0000006C0300004B010000 @@ -539,15 +539,15 @@ 0 32767 0 - 32768 + 4096 0 16 - 030000006B0300007D070000CD030000 + 03000000800300007D070000CD030000 16 - 2200000039000000EA020000C7000000 + A4000000BB0000006C0300004B010000 @@ -563,11 +563,11 @@ 0 16 - F7000000660000008D050000C4000000 + F7000000660000008D050000C6000000 16 - 2200000039000000EA020000C7000000 + A4000000BB0000006C0300004B010000 @@ -583,11 +583,11 @@ 0 16 - F7000000660000008D050000C4000000 + F7000000660000008D050000C6000000 16 - 2200000039000000EA020000C7000000 + A4000000BB0000006C0300004B010000 @@ -623,11 +623,11 @@ 0 16 - A3040000660000008D0500000C020000 + A3040000660000008D05000010020000 16 - 22000000390000001201000002010000 + A4000000BB0000009401000086010000 @@ -643,11 +643,11 @@ 0 16 - 030000002C0200008D0500009E020000 + 03000000300200008D050000A4020000 16 - 2200000039000000EA020000C7000000 + A4000000BB0000006C0300004B010000 @@ -663,11 +663,11 @@ 0 16 - F7000000660000008D050000C4000000 + F7000000660000008D050000C6000000 16 - 2200000039000000EA020000C7000000 + A4000000BB0000006C0300004B010000 @@ -683,11 +683,11 @@ 0 16 - F7000000660000008D050000C4000000 + F7000000660000008D050000C6000000 16 - 2200000039000000EA020000C7000000 + A4000000BB0000006C0300004B010000 @@ -703,11 +703,11 @@ 0 16 - F7000000660000008D050000C4000000 + F7000000660000008D050000C6000000 16 - 22000000390000001201000002010000 + A4000000BB0000009401000086010000 @@ -723,11 +723,11 @@ 0 16 - F7000000660000008D050000C4000000 + F7000000660000008D050000C6000000 16 - 2200000039000000EA020000C7000000 + A4000000BB0000006C0300004B010000 @@ -743,11 +743,11 @@ 0 16 - A3040000660000008D0500000C020000 + A3040000660000008D05000010020000 16 - 22000000390000001201000002010000 + A4000000BB0000009401000086010000 @@ -763,11 +763,11 @@ 0 16 - A3040000660000008D0500000C020000 + A3040000660000008D05000010020000 16 - 22000000390000001201000002010000 + A4000000BB0000009401000086010000 @@ -783,11 +783,11 @@ 0 16 - A3040000660000008D0500000C020000 + A3040000660000008D05000010020000 16 - 22000000390000001201000002010000 + A4000000BB0000009401000086010000 @@ -803,11 +803,11 @@ 0 16 - A3040000660000008D0500000C020000 + A3040000660000008D05000010020000 16 - 22000000390000001201000002010000 + A4000000BB0000009401000086010000 @@ -823,11 +823,11 @@ 0 16 - A3040000660000008D0500000C020000 + A3040000660000008D05000010020000 16 - 22000000390000001201000002010000 + A4000000BB0000009401000086010000 @@ -843,11 +843,11 @@ 0 16 - A3040000660000008D0500000C020000 + A3040000660000008D05000010020000 16 - 22000000390000001201000002010000 + A4000000BB0000009401000086010000 @@ -863,11 +863,11 @@ 0 16 - A3040000660000008D0500000C020000 + A3040000660000008D05000010020000 16 - 22000000390000001201000002010000 + A4000000BB0000009401000086010000 @@ -883,11 +883,11 @@ 0 16 - A3040000660000008D0500000C020000 + A3040000660000008D05000010020000 16 - 22000000390000001201000002010000 + A4000000BB0000009401000086010000 @@ -903,11 +903,11 @@ 0 16 - A3040000660000008D0500000C020000 + A3040000660000008D05000010020000 16 - 22000000390000001201000002010000 + A4000000BB0000009401000086010000 @@ -923,11 +923,11 @@ 0 16 - A3040000660000008D0500000C020000 + A3040000660000008D05000010020000 16 - 22000000390000001201000002010000 + A4000000BB0000009401000086010000 @@ -943,11 +943,11 @@ 0 16 - A3040000660000008D0500000C020000 + A3040000660000008D05000010020000 16 - 22000000390000001201000002010000 + A4000000BB0000009401000086010000 @@ -963,11 +963,11 @@ 0 16 - A3040000660000008D0500000C020000 + A3040000660000008D05000010020000 16 - 22000000390000001201000002010000 + A4000000BB0000009401000086010000 @@ -983,11 +983,11 @@ 0 16 - A3040000660000008D0500000C020000 + A3040000660000008D05000010020000 16 - 22000000390000001201000002010000 + A4000000BB0000009401000086010000 @@ -1003,11 +1003,11 @@ 0 16 - A3040000660000008D0500000C020000 + A3040000660000008D05000010020000 16 - 22000000390000001201000002010000 + A4000000BB0000009401000086010000 @@ -1023,11 +1023,11 @@ 0 16 - A3040000660000008D0500000C020000 + A3040000660000008D05000010020000 16 - 22000000390000001201000002010000 + A4000000BB0000009401000086010000 @@ -1043,11 +1043,11 @@ 0 16 - A3040000660000008D0500000C020000 + A3040000660000008D05000010020000 16 - 22000000390000001201000002010000 + A4000000BB0000009401000086010000 @@ -1063,11 +1063,11 @@ 0 16 - A3040000660000008D0500000C020000 + A3040000660000008D05000010020000 16 - 22000000390000001201000002010000 + A4000000BB0000009401000086010000 @@ -1083,11 +1083,11 @@ 0 16 - A3040000660000008D0500000C020000 + A3040000660000008D05000010020000 16 - 22000000390000001201000002010000 + A4000000BB0000009401000086010000 @@ -1103,11 +1103,11 @@ 0 16 - A3040000660000008D0500000C020000 + A3040000660000008D05000010020000 16 - 22000000390000001201000002010000 + A4000000BB0000009401000086010000 @@ -1123,11 +1123,11 @@ 0 16 - A3040000660000008D0500000C020000 + A3040000660000008D05000010020000 16 - 22000000390000001201000002010000 + A4000000BB0000009401000086010000 @@ -1143,11 +1143,11 @@ 0 16 - A3040000660000008D0500000C020000 + A3040000660000008D05000010020000 16 - 22000000390000001201000002010000 + A4000000BB0000009401000086010000 @@ -1163,11 +1163,11 @@ 0 16 - 0300000066000000B10000002F030000 + 0300000066000000FD0000004C030000 16 - 22000000390000003E01000075020000 + A4000000BB000000C0010000FB020000 @@ -1179,15 +1179,15 @@ 0 32767 0 - 32768 + 4096 0 16 - 030000006B0300007D070000CD030000 + 03000000800300007D070000CD030000 16 - 2200000039000000EA020000C7000000 + A4000000BB0000006C0300004B010000 @@ -1199,15 +1199,15 @@ 0 32767 0 - 32768 + 4096 0 16 - 030000006B0300007D070000CD030000 + 03000000800300007D070000CD030000 16 - 22000000390000003E01000075020000 + A4000000BB000000C0010000FB020000 @@ -1223,11 +1223,11 @@ 0 16 - 030000002C0200008D0500009E020000 + 03000000300200008D050000A4020000 16 - 22000000390000001201000002010000 + A4000000BB0000009401000086010000 @@ -1243,11 +1243,11 @@ 0 16 - 030000002C0200008D0500009E020000 + 03000000300200008D050000A4020000 16 - 22000000390000001201000002010000 + A4000000BB0000009401000086010000 @@ -1259,15 +1259,15 @@ 0 32767 0 - 32768 + 4096 0 16 - 030000006B0300007D070000CD030000 + 03000000800300007D070000CD030000 16 - 22000000390000003E01000075020000 + A4000000BB000000C0010000FB020000 @@ -1279,15 +1279,15 @@ 0 32767 0 - 32768 + 4096 0 16 - 030000006B0300007D070000CD030000 + 03000000800300007D070000CD030000 16 - 22000000390000003E01000075020000 + A4000000BB000000C0010000FB020000 @@ -1303,11 +1303,11 @@ 0 16 - F7000000660000008D050000C4000000 + F7000000660000008D050000C6000000 16 - 2200000039000000EA020000C7000000 + A4000000BB0000006C0300004B010000 @@ -1323,11 +1323,11 @@ 0 16 - A3040000660000008D0500000C020000 + A3040000660000008D05000010020000 16 - 22000000390000001201000002010000 + A4000000BB0000009401000086010000 @@ -1343,11 +1343,11 @@ 0 16 - A3040000660000008D0500000C020000 + A3040000660000008D05000010020000 16 - 22000000390000001201000002010000 + A4000000BB0000009401000086010000 @@ -1363,11 +1363,11 @@ 0 16 - A3040000660000008D0500000C020000 + A3040000660000008D05000010020000 16 - 22000000390000001201000002010000 + A4000000BB0000009401000086010000 @@ -1383,11 +1383,11 @@ 0 16 - A3040000660000008D0500000C020000 + A3040000660000008D05000010020000 16 - 22000000390000001201000002010000 + A4000000BB0000009401000086010000 @@ -1403,11 +1403,11 @@ 0 16 - A3040000660000008D0500000C020000 + A3040000660000008D05000010020000 16 - 22000000390000001201000002010000 + A4000000BB0000009401000086010000 @@ -1423,11 +1423,11 @@ 0 16 - A3040000660000008D0500000C020000 + A3040000660000008D05000010020000 16 - 22000000390000001201000002010000 + A4000000BB0000009401000086010000 @@ -1443,11 +1443,11 @@ 0 16 - A3040000660000008D0500000C020000 + A3040000660000008D05000010020000 16 - 22000000390000001201000002010000 + A4000000BB0000009401000086010000 @@ -1463,11 +1463,11 @@ 0 16 - A3040000660000008D0500000C020000 + A3040000660000008D05000010020000 16 - 22000000390000001201000002010000 + A4000000BB0000009401000086010000 @@ -1483,11 +1483,11 @@ 0 16 - A3040000660000008D0500000C020000 + A3040000660000008D05000010020000 16 - 22000000390000001201000002010000 + A4000000BB0000009401000086010000 @@ -1503,11 +1503,11 @@ 0 16 - A3040000660000008D0500000C020000 + A3040000660000008D05000010020000 16 - 22000000390000001201000002010000 + A4000000BB0000009401000086010000 @@ -1523,11 +1523,11 @@ 0 16 - A3040000660000008D0500000C020000 + A3040000660000008D05000010020000 16 - 22000000390000001201000002010000 + A4000000BB0000009401000086010000 @@ -1543,11 +1543,11 @@ 0 16 - A3040000660000008D0500000C020000 + A3040000660000008D05000010020000 16 - 22000000390000001201000002010000 + A4000000BB0000009401000086010000 @@ -1563,11 +1563,11 @@ 0 16 - A3040000660000008D0500000C020000 + A3040000660000008D05000010020000 16 - 22000000390000001201000002010000 + A4000000BB0000009401000086010000 @@ -1583,11 +1583,11 @@ 0 16 - A3040000660000008D0500000C020000 + A3040000660000008D05000010020000 16 - 22000000390000001201000002010000 + A4000000BB0000009401000086010000 @@ -1603,11 +1603,11 @@ 0 16 - A3040000660000008D0500000C020000 + A3040000660000008D05000010020000 16 - 22000000390000001201000002010000 + A4000000BB0000009401000086010000 @@ -1623,11 +1623,11 @@ 0 16 - A3040000660000008D0500000C020000 + A3040000660000008D05000010020000 16 - 22000000390000001201000002010000 + A4000000BB0000009401000086010000 @@ -1643,11 +1643,11 @@ 0 16 - A3040000660000008D0500000C020000 + A3040000660000008D05000010020000 16 - 22000000390000001201000002010000 + A4000000BB0000009401000086010000 @@ -1663,11 +1663,11 @@ 0 16 - A3040000660000008D0500000C020000 + A3040000660000008D05000010020000 16 - 22000000390000001201000002010000 + A4000000BB0000009401000086010000 @@ -1683,11 +1683,11 @@ 0 16 - A3040000660000008D0500000C020000 + A3040000660000008D05000010020000 16 - 22000000390000001201000002010000 + A4000000BB0000009401000086010000 @@ -1703,11 +1703,11 @@ 0 16 - A3040000660000008D0500000C020000 + A3040000660000008D05000010020000 16 - 22000000390000001201000002010000 + A4000000BB0000009401000086010000 @@ -1723,7 +1723,7 @@ 0 16 - 0100000000000000D20300001C000000 + 0000000000000000D10300001C000000 16 @@ -1803,23 +1803,23 @@ 0 16 - 030000002C0200008D0500009E020000 + 03000000300200008D050000A4020000 16 - 22000000390000001201000002010000 + A4000000BB0000009401000086010000 3312 - 000000000B000000000000000020000000000000FFFFFFFFFFFFFFFFF4000000DD00000090050000E1000000000000000100000004000000010000000000000000000000FFFFFFFF08000000CB00000057010000CC000000F08B00005A01000079070000D601000045890000FFFF02000B004354616262656450616E650020000000000000F40000006600000090050000F4000000F40000004F00000090050000DD0000000000000040280046080000000B446973617373656D626C7900000000CB00000001000000FFFFFFFFFFFFFFFF14506572666F726D616E636520416E616C797A6572000000005701000001000000FFFFFFFFFFFFFFFF14506572666F726D616E636520416E616C797A657200000000CC00000001000000FFFFFFFFFFFFFFFF0E4C6F67696320416E616C797A657200000000F08B000001000000FFFFFFFFFFFFFFFF0D436F646520436F766572616765000000005A01000001000000FFFFFFFFFFFFFFFF11496E737472756374696F6E205472616365000000007907000001000000FFFFFFFFFFFFFFFF0F53797374656D20416E616C797A657200000000D601000001000000FFFFFFFFFFFFFFFF104576656E742053746174697374696373000000004589000001000000FFFFFFFFFFFFFFFFFFFFFFFF000000000000000000000000000000000000000001000000FFFFFFFFCB00000001000000FFFFFFFFCB000000000000000040000000000000FFFFFFFFFFFFFFFF9C0400004F000000A004000025020000000000000200000004000000010000000000000000000000FFFFFFFF2B000000E2050000CA0900002D8C00002E8C00002F8C0000308C0000318C0000328C0000338C0000348C0000358C0000368C0000378C0000388C0000398C00003A8C00003B8C00003C8C00003D8C00003E8C00003F8C0000408C0000418C000050C3000051C3000052C3000053C3000054C3000055C3000056C3000057C3000058C3000059C300005AC300005BC300005CC300005DC300005EC300005FC3000060C3000061C3000062C3000063C3000001800040000000000000A004000066000000900500003C020000A00400004F000000900500002502000000000000404100462B0000000753796D626F6C7300000000E205000001000000FFFFFFFFFFFFFFFF0A5472616365204461746100000000CA09000001000000FFFFFFFFFFFFFFFF00000000002D8C000001000000FFFFFFFFFFFFFFFF00000000002E8C000001000000FFFFFFFFFFFFFFFF00000000002F8C000001000000FFFFFFFFFFFFFFFF0000000000308C000001000000FFFFFFFFFFFFFFFF0000000000318C000001000000FFFFFFFFFFFFFFFF0000000000328C000001000000FFFFFFFFFFFFFFFF0000000000338C000001000000FFFFFFFFFFFFFFFF0000000000348C000001000000FFFFFFFFFFFFFFFF0000000000358C000001000000FFFFFFFFFFFFFFFF0000000000368C000001000000FFFFFFFFFFFFFFFF0000000000378C000001000000FFFFFFFFFFFFFFFF0000000000388C000001000000FFFFFFFFFFFFFFFF0000000000398C000001000000FFFFFFFFFFFFFFFF00000000003A8C000001000000FFFFFFFFFFFFFFFF00000000003B8C000001000000FFFFFFFFFFFFFFFF00000000003C8C000001000000FFFFFFFFFFFFFFFF00000000003D8C000001000000FFFFFFFFFFFFFFFF00000000003E8C000001000000FFFFFFFFFFFFFFFF00000000003F8C000001000000FFFFFFFFFFFFFFFF0000000000408C000001000000FFFFFFFFFFFFFFFF0000000000418C000001000000FFFFFFFFFFFFFFFF000000000050C3000001000000FFFFFFFFFFFFFFFF000000000051C3000001000000FFFFFFFFFFFFFFFF000000000052C3000001000000FFFFFFFFFFFFFFFF000000000053C3000001000000FFFFFFFFFFFFFFFF000000000054C3000001000000FFFFFFFFFFFFFFFF000000000055C3000001000000FFFFFFFFFFFFFFFF000000000056C3000001000000FFFFFFFFFFFFFFFF000000000057C3000001000000FFFFFFFFFFFFFFFF000000000058C3000001000000FFFFFFFFFFFFFFFF000000000059C3000001000000FFFFFFFFFFFFFFFF00000000005AC3000001000000FFFFFFFFFFFFFFFF00000000005BC3000001000000FFFFFFFFFFFFFFFF00000000005CC3000001000000FFFFFFFFFFFFFFFF00000000005DC3000001000000FFFFFFFFFFFFFFFF00000000005EC3000001000000FFFFFFFFFFFFFFFF00000000005FC3000001000000FFFFFFFFFFFFFFFF000000000060C3000001000000FFFFFFFFFFFFFFFF000000000061C3000001000000FFFFFFFFFFFFFFFF000000000062C3000001000000FFFFFFFFFFFFFFFF000000000063C3000001000000FFFFFFFFFFFFFFFFFFFFFFFF000000000000000000000000000000000000000001000000FFFFFFFFE205000001000000FFFFFFFFE2050000000000000010000001000000FFFFFFFFFFFFFFFFB40000004F000000B8000000500300000100000002000010040000000100000010FFFFFF85060000FFFFFFFF05000000ED0300006D000000C3000000C400000073940000018000100000010000000000000066000000B40000005F030000000000004F000000B4000000500300000000000040410056050000000750726F6A65637401000000ED03000001000000FFFFFFFFFFFFFFFF05426F6F6B73010000006D00000001000000FFFFFFFFFFFFFFFF0946756E6374696F6E7301000000C300000001000000FFFFFFFFFFFFFFFF0954656D706C6174657301000000C400000001000000FFFFFFFFFFFFFFFF09526567697374657273000000007394000001000000FFFFFFFFFFFFFFFF00000000000000000000000000000000000000000000000001000000FFFFFFFFED03000001000000FFFFFFFFED030000000000000080000000000000FFFFFFFFFFFFFFFF0000000011020000900500001502000000000000010000000400000001000000000000000000000000000000000000000000000001000000C6000000FFFFFFFF0F0000008F070000930700009407000095070000960700009007000091070000B5010000B801000038030000B9050000BA050000BB050000BC050000CB09000001800080000000000000000000002C02000090050000CE020000000000001502000090050000B702000000000000404100460F0000001343616C6C20537461636B202B204C6F63616C73000000008F07000001000000FFFFFFFFFFFFFFFF0755415254202331000000009307000001000000FFFFFFFFFFFFFFFF0755415254202332000000009407000001000000FFFFFFFFFFFFFFFF0755415254202333000000009507000001000000FFFFFFFFFFFFFFFF15446562756720287072696E74662920566965776572000000009607000001000000FFFFFFFFFFFFFFFF0757617463682031000000009007000001000000FFFFFFFFFFFFFFFF0757617463682032000000009107000001000000FFFFFFFFFFFFFFFF10547261636520457863657074696F6E7300000000B501000001000000FFFFFFFFFFFFFFFF0E4576656E7420436F756E7465727300000000B801000001000000FFFFFFFFFFFFFFFF09554C494E4B706C7573000000003803000001000000FFFFFFFFFFFFFFFF084D656D6F7279203100000000B905000001000000FFFFFFFFFFFFFFFF084D656D6F7279203200000000BA05000001000000FFFFFFFFFFFFFFFF084D656D6F7279203300000000BB05000001000000FFFFFFFFFFFFFFFF084D656D6F7279203400000000BC05000001000000FFFFFFFFFFFFFFFF105472616365204E617669676174696F6E00000000CB09000001000000FFFFFFFFFFFFFFFFFFFFFFFF0000000001000000000000000000000001000000FFFFFFFFC802000015020000CC020000B702000000000000020000000400000000000000000000000000000000000000000000000000000002000000C6000000FFFFFFFF8F07000001000000FFFFFFFF8F07000001000000C6000000000000000080000001000000FFFFFFFFFFFFFFFF000000005003000080070000540300000100000001000010040000000100000018FDFFFF9C000000FFFFFFFF06000000C5000000C7000000B4010000D2010000CF0100007794000001800080000001000000000000006303000080070000F5030000000000005403000080070000E60300000000000040820056060000000C4275696C64204F757470757401000000C500000001000000FFFFFFFFFFFFFFFF0D46696E6420496E2046696C657300000000C700000001000000FFFFFFFFFFFFFFFF0A4572726F72204C69737400000000B401000001000000FFFFFFFFFFFFFFFF0E536F757263652042726F7773657200000000D201000001000000FFFFFFFFFFFFFFFF0E416C6C205265666572656E63657300000000CF01000001000000FFFFFFFFFFFFFFFF0742726F77736572000000007794000001000000FFFFFFFFFFFFFFFF00000000000000000000000000000000000000000000000001000000FFFFFFFFC500000001000000FFFFFFFFC5000000000000000000000000000000 + 000000000B000000000000000020000000000000FFFFFFFFFFFFFFFFF4000000DF00000090050000E3000000000000000100000004000000010000000000000000000000FFFFFFFF08000000CB00000057010000CC000000F08B00005A01000079070000D601000045890000FFFF02000B004354616262656450616E650020000000000000F40000006600000090050000F6000000F40000004F00000090050000DF0000000000000040280046080000000B446973617373656D626C7900000000CB00000001000000FFFFFFFFFFFFFFFF14506572666F726D616E636520416E616C797A6572000000005701000001000000FFFFFFFFFFFFFFFF14506572666F726D616E636520416E616C797A657200000000CC00000001000000FFFFFFFFFFFFFFFF0E4C6F67696320416E616C797A657200000000F08B000001000000FFFFFFFFFFFFFFFF0D436F646520436F766572616765000000005A01000001000000FFFFFFFFFFFFFFFF11496E737472756374696F6E205472616365000000007907000001000000FFFFFFFFFFFFFFFF0F53797374656D20416E616C797A657200000000D601000001000000FFFFFFFFFFFFFFFF104576656E742053746174697374696373000000004589000001000000FFFFFFFFFFFFFFFFFFFFFFFF000000000000000000000000000000000000000001000000FFFFFFFFCB00000001000000FFFFFFFFCB000000000000000040000000000000FFFFFFFFFFFFFFFF9C0400004F000000A004000029020000000000000200000004000000010000000000000000000000FFFFFFFF2B000000E2050000CA0900002D8C00002E8C00002F8C0000308C0000318C0000328C0000338C0000348C0000358C0000368C0000378C0000388C0000398C00003A8C00003B8C00003C8C00003D8C00003E8C00003F8C0000408C0000418C000050C3000051C3000052C3000053C3000054C3000055C3000056C3000057C3000058C3000059C300005AC300005BC300005CC300005DC300005EC300005FC3000060C3000061C3000062C3000063C3000001800040000000000000A0040000660000009005000040020000A00400004F000000900500002902000000000000404100462B0000000753796D626F6C7300000000E205000001000000FFFFFFFFFFFFFFFF0A5472616365204461746100000000CA09000001000000FFFFFFFFFFFFFFFF00000000002D8C000001000000FFFFFFFFFFFFFFFF00000000002E8C000001000000FFFFFFFFFFFFFFFF00000000002F8C000001000000FFFFFFFFFFFFFFFF0000000000308C000001000000FFFFFFFFFFFFFFFF0000000000318C000001000000FFFFFFFFFFFFFFFF0000000000328C000001000000FFFFFFFFFFFFFFFF0000000000338C000001000000FFFFFFFFFFFFFFFF0000000000348C000001000000FFFFFFFFFFFFFFFF0000000000358C000001000000FFFFFFFFFFFFFFFF0000000000368C000001000000FFFFFFFFFFFFFFFF0000000000378C000001000000FFFFFFFFFFFFFFFF0000000000388C000001000000FFFFFFFFFFFFFFFF0000000000398C000001000000FFFFFFFFFFFFFFFF00000000003A8C000001000000FFFFFFFFFFFFFFFF00000000003B8C000001000000FFFFFFFFFFFFFFFF00000000003C8C000001000000FFFFFFFFFFFFFFFF00000000003D8C000001000000FFFFFFFFFFFFFFFF00000000003E8C000001000000FFFFFFFFFFFFFFFF00000000003F8C000001000000FFFFFFFFFFFFFFFF0000000000408C000001000000FFFFFFFFFFFFFFFF0000000000418C000001000000FFFFFFFFFFFFFFFF000000000050C3000001000000FFFFFFFFFFFFFFFF000000000051C3000001000000FFFFFFFFFFFFFFFF000000000052C3000001000000FFFFFFFFFFFFFFFF000000000053C3000001000000FFFFFFFFFFFFFFFF000000000054C3000001000000FFFFFFFFFFFFFFFF000000000055C3000001000000FFFFFFFFFFFFFFFF000000000056C3000001000000FFFFFFFFFFFFFFFF000000000057C3000001000000FFFFFFFFFFFFFFFF000000000058C3000001000000FFFFFFFFFFFFFFFF000000000059C3000001000000FFFFFFFFFFFFFFFF00000000005AC3000001000000FFFFFFFFFFFFFFFF00000000005BC3000001000000FFFFFFFFFFFFFFFF00000000005CC3000001000000FFFFFFFFFFFFFFFF00000000005DC3000001000000FFFFFFFFFFFFFFFF00000000005EC3000001000000FFFFFFFFFFFFFFFF00000000005FC3000001000000FFFFFFFFFFFFFFFF000000000060C3000001000000FFFFFFFFFFFFFFFF000000000061C3000001000000FFFFFFFFFFFFFFFF000000000062C3000001000000FFFFFFFFFFFFFFFF000000000063C3000001000000FFFFFFFFFFFFFFFFFFFFFFFF000000000000000000000000000000000000000001000000FFFFFFFFE205000001000000FFFFFFFFE2050000000000000010000001000000FFFFFFFFFFFFFFFF000100004F0000000401000065030000010000000200001004000000010000001AFFFFFF8F060000FFFFFFFF05000000ED0300006D000000C3000000C400000073940000018000100000010000000000000066000000000100007C030000000000004F00000000010000650300000000000040410056050000000750726F6A65637401000000ED03000001000000FFFFFFFFFFFFFFFF05426F6F6B73000000006D00000001000000FFFFFFFFFFFFFFFF0946756E6374696F6E7300000000C300000001000000FFFFFFFFFFFFFFFF0954656D706C6174657300000000C400000001000000FFFFFFFFFFFFFFFF09526567697374657273000000007394000001000000FFFFFFFFFFFFFFFF00000000000000000000000000000000000000000000000001000000FFFFFFFFED03000001000000FFFFFFFFED030000000000000080000000000000FFFFFFFFFFFFFFFF0000000015020000900500001902000000000000010000000400000001000000000000000000000000000000000000000000000001000000C6000000FFFFFFFF0F0000008F070000930700009407000095070000960700009007000091070000B5010000B801000038030000B9050000BA050000BB050000BC050000CB09000001800080000000000000000000003002000090050000D4020000000000001902000090050000BD02000000000000404100460F0000001343616C6C20537461636B202B204C6F63616C73000000008F07000001000000FFFFFFFFFFFFFFFF0755415254202331000000009307000001000000FFFFFFFFFFFFFFFF0755415254202332000000009407000001000000FFFFFFFFFFFFFFFF0755415254202333000000009507000001000000FFFFFFFFFFFFFFFF15446562756720287072696E74662920566965776572000000009607000001000000FFFFFFFFFFFFFFFF0757617463682031000000009007000001000000FFFFFFFFFFFFFFFF0757617463682032000000009107000001000000FFFFFFFFFFFFFFFF10547261636520457863657074696F6E7300000000B501000001000000FFFFFFFFFFFFFFFF0E4576656E7420436F756E7465727300000000B801000001000000FFFFFFFFFFFFFFFF09554C494E4B706C7573000000003803000001000000FFFFFFFFFFFFFFFF084D656D6F7279203100000000B905000001000000FFFFFFFFFFFFFFFF084D656D6F7279203200000000BA05000001000000FFFFFFFFFFFFFFFF084D656D6F7279203300000000BB05000001000000FFFFFFFFFFFFFFFF084D656D6F7279203400000000BC05000001000000FFFFFFFFFFFFFFFF105472616365204E617669676174696F6E00000000CB09000001000000FFFFFFFFFFFFFFFFFFFFFFFF0000000001000000000000000000000001000000FFFFFFFFC802000019020000CC020000BD02000000000000020000000400000000000000000000000000000000000000000000000000000002000000C6000000FFFFFFFF8F07000001000000FFFFFFFF8F07000001000000C6000000000000000080000001000000FFFFFFFFFFFFFFFF000000006503000080070000690300000100000001000010040000000100000091FDFFFF1D010000FFFFFFFF06000000C5000000C7000000B4010000D2010000CF0100007794000001800080000001000000000000008003000080070000FD030000000000006903000080070000E60300000000000040820056060000000C4275696C64204F757470757401000000C500000001000000FFFFFFFFFFFFFFFF0D46696E6420496E2046696C657300000000C700000001000000FFFFFFFFFFFFFFFF0A4572726F72204C69737400000000B401000001000000FFFFFFFFFFFFFFFF0E536F757263652042726F7773657200000000D201000001000000FFFFFFFFFFFFFFFF0E416C6C205265666572656E63657300000000CF01000001000000FFFFFFFFFFFFFFFF0742726F77736572000000007794000001000000FFFFFFFFFFFFFFFF00000000000000000000000000000000000000000000000001000000FFFFFFFFC500000001000000FFFFFFFFC5000000000000000000000000000000 59392 File - 2578 - 00200000010000002800FFFF01001100434D4643546F6F6C426172427574746F6E00E100000000000000000000000000000000000000000000000100000001000000018001E100000000000001000000000000000000000000000000000100000001000000018003E1000000000000020000000000000000000000000000000001000000010000000180CD7F0000000000000300000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018023E100000000040004000000000000000000000000000000000100000001000000018022E100000000040005000000000000000000000000000000000100000001000000018025E10000000000000600000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001802BE10000000004000700000000000000000000000000000000010000000100000001802CE10000000004000800000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001807A8A0000000000000900000000000000000000000000000000010000000100000001807B8A0000000004000A00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180D3B00000000000000B000000000000000000000000000000000100000001000000018015B10000000004000C0000000000000000000000000000000001000000010000000180F4B00000000004000D000000000000000000000000000000000100000001000000018036B10000000004000E00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180FF88000000000400460000000000000000000000000000000001000000010000000180FE880000000004004500000000000000000000000000000000010000000100000001800B810000000004001300000000000000000000000000000000010000000100000001800C810000000004001400000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180F0880000020000000F000000000000000000000000000000000100000001000000FFFF0100120043555646696E64436F6D626F427574746F6EE8030000000000000000000000000000000000000000000000010000000100000096000000020020500000000012785175657565557361727433526548646C729600000000000000010012785175657565557361727433526548646C7200000000018024E10000000000001100000000000000000000000000000000010000000100000001800A810000000000001200000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6E2280000002000000150000002153746172742F53746F70202644656275672053657373696F6E094374726C2B46350000000000000000000000000100000001000000000000000000000001000000020021802280000000000000150000002153746172742F53746F70202644656275672053657373696F6E094374726C2B4635000000000000000000000000010000000100000000000000000000000100000000002180E0010000000000007500000021456E65726779204D6561737572656D656E742026776974686F75742044656275670000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180C488000000000000160000000000000000000000000000000001000000010000000180C988000000000400180000000000000000000000000000000001000000010000000180C788000000000000190000000000000000000000000000000001000000010000002180C8880000000000001700000027264B696C6C20416C6C20427265616B706F696E747320696E2043757272656E7420546172676574000000000000000000000000010000000100000000000000000000000100000003002180C8880000000000001700000027264B696C6C20416C6C20427265616B706F696E747320696E2043757272656E7420546172676574000000000000000000000000010000000100000000000000000000000100000000002180E50100000000000078000000264B696C6C20416C6C20427265616B706F696E747320696E204163746976652050726F6A656374000000000000000000000000010000000100000000000000000000000100000000002180E601000000000000790000002F4B696C6C20416C6C20427265616B706F696E747320696E204D756C74692D50726F6A65637420576F726B73706163650000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000021804C010000020001001A0000000F2650726F6A6563742057696E646F77000000000000000000000000010000000100000000000000000000000100000008002180DD880000000000001A0000000750726F6A656374000000000000000000000000010000000100000000000000000000000100000000002180DC8B0000000000003A00000005426F6F6B73000000000000000000000000010000000100000000000000000000000100000000002180E18B0000000000003B0000000946756E6374696F6E73000000000000000000000000010000000100000000000000000000000100000000002180E28B000000000000400000000954656D706C6174657300000000000000000000000001000000010000000000000000000000010000000000218018890000000000003D0000000E536F757263652042726F777365720000000000000000000000000100000001000000000000000000000001000000000021800000000000000400FFFFFFFF00000000000000000001000000000000000100000000000000000000000100000000002180D988000000000000390000000C4275696C64204F7574707574000000000000000000000000010000000100000000000000000000000100000000002180E38B000000000000410000000B46696E64204F75747075740000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180FB7F0000000000001B000000000000000000000000000000000100000001000000000000000446696C65C6030000 + 2836 + 00200000010000002800FFFF01001100434D4643546F6F6C426172427574746F6E00E100000000000000000000000000000000000000000000000100000001000000018001E100000000000001000000000000000000000000000000000100000001000000018003E1000000000000020000000000000000000000000000000001000000010000000180CD7F0000000000000300000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018023E100000000040004000000000000000000000000000000000100000001000000018022E100000000040005000000000000000000000000000000000100000001000000018025E10000000000000600000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001802BE10000000000000700000000000000000000000000000000010000000100000001802CE10000000004000800000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001807A8A0000000000000900000000000000000000000000000000010000000100000001807B8A0000000004000A00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180D3B00000000000000B000000000000000000000000000000000100000001000000018015B10000000004000C0000000000000000000000000000000001000000010000000180F4B00000000004000D000000000000000000000000000000000100000001000000018036B10000000004000E00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180FF88000000000400460000000000000000000000000000000001000000010000000180FE880000000004004500000000000000000000000000000000010000000100000001800B810000000004001300000000000000000000000000000000010000000100000001800C810000000004001400000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180F0880000020000000F000000000000000000000000000000000100000001000000FFFF0100120043555646696E64436F6D626F427574746F6EE803000000000000000000000000000000000000000000000001000000010000009600000002002050000000001451756575652046756C6C206F72204572726F7221960000000000000013001451756575652046756C6C206F72204572726F722113756352657476616C51756575655769666953740A517565756520496E697404696E697402753812785175657565557361727433526548646C72087644656C61794D730653616D706C65077563537461746504756349640D784C6F526155534152543352780B75635052785061636B65740A6C6F52614E6F646549440873656E736F7249440D4C45445F504331335F504F52540D55534152545F54797065446566067072696E7466056670757463075379735469636B00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000018024E10000000000001100000000000000000000000000000000010000000100000001800A810000000000001200000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6E2280000002000000150000002153746172742F53746F70202644656275672053657373696F6E094374726C2B46350000000000000000000000000100000001000000000000000000000001000000020021802280000000000000150000002153746172742F53746F70202644656275672053657373696F6E094374726C2B4635000000000000000000000000010000000100000000000000000000000100000000002180E0010000000000007500000021456E65726779204D6561737572656D656E742026776974686F75742044656275670000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180C488000000000000160000000000000000000000000000000001000000010000000180C988000000000400180000000000000000000000000000000001000000010000000180C788000000000000190000000000000000000000000000000001000000010000002180C8880000000000001700000027264B696C6C20416C6C20427265616B706F696E747320696E2043757272656E7420546172676574000000000000000000000000010000000100000000000000000000000100000003002180C8880000000000001700000027264B696C6C20416C6C20427265616B706F696E747320696E2043757272656E7420546172676574000000000000000000000000010000000100000000000000000000000100000000002180E50100000000000078000000264B696C6C20416C6C20427265616B706F696E747320696E204163746976652050726F6A656374000000000000000000000000010000000100000000000000000000000100000000002180E601000000000000790000002F4B696C6C20416C6C20427265616B706F696E747320696E204D756C74692D50726F6A65637420576F726B73706163650000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000021804C010000020001001A0000000F2650726F6A6563742057696E646F77000000000000000000000000010000000100000000000000000000000100000008002180DD880000000000001A0000000750726F6A656374000000000000000000000000010000000100000000000000000000000100000000002180DC8B0000000000003A00000005426F6F6B73000000000000000000000000010000000100000000000000000000000100000000002180E18B0000000000003B0000000946756E6374696F6E73000000000000000000000000010000000100000000000000000000000100000000002180E28B000000000000400000000954656D706C6174657300000000000000000000000001000000010000000000000000000000010000000000218018890000000000003D0000000E536F757263652042726F777365720000000000000000000000000100000001000000000000000000000001000000000021800000000000000400FFFFFFFF00000000000000000001000000000000000100000000000000000000000100000000002180D988000000000000390000000C4275696C64204F7574707574000000000000000000000000010000000100000000000000000000000100000000002180E38B000000000000410000000B46696E64204F75747075740000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180FB7F0000000000001B000000000000000000000000000000000100000001000000000000000446696C65C6030000 1423 @@ -1835,7 +1835,7 @@ Build 976 - 00200000010000001000FFFF01001100434D4643546F6F6C426172427574746F6ECF7F0000000000001C0000000000000000000000000000000001000000010000000180D07F0000000000001D000000000000000000000000000000000100000001000000018030800000000000001E000000000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6EC7040000000000006A0000000C4261746368204275696C2664000000000000000000000000010000000100000000000000000000000100000004000580C7040000000000006A0000000C4261746368204275696C266400000000000000000000000001000000010000000000000000000000010000000000058046070000000000006B0000000D42617463682052656275696C640000000000000000000000000100000001000000000000000000000001000000000005804707000000000000FFFFFFFF0B426174636820436C65616E0100000000000000000000000100000001000000000000000000000001000000000005809E8A0000000000001F0000000F4261746326682053657475702E2E2E000000000000000000000000010000000100000000000000000000000100000000000180D17F0000000004002000000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001804C8A0000000000002100000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000FFFF01001900434D4643546F6F6C426172436F6D626F426F78427574746F6EBA000000000000000000000000000000000000000000000000010000000100000096000000030020500000000008546172676574203196000000000000000100085461726765742031000000000180EB880000000000002200000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180C07F000000000000230000000000000000000000000000000001000000010000000180B08A000000000400240000000000000000000000000000000001000000010000000180A8010000000000004E00000000000000000000000000000000010000000100000001807202000000000000530000000000000000000000000000000001000000010000000180BE010000000000005000000000000000000000000000000000010000000100000000000000054275696C64DC010000 + 00200000010000001000FFFF01001100434D4643546F6F6C426172427574746F6ECF7F0000000004001C0000000000000000000000000000000001000000010000000180D07F0000000000001D000000000000000000000000000000000100000001000000018030800000000000001E000000000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6EC7040000000000006A0000000C4261746368204275696C2664000000000000000000000000010000000100000000000000000000000100000004000580C7040000000000006A0000000C4261746368204275696C266400000000000000000000000001000000010000000000000000000000010000000000058046070000000000006B0000000D42617463682052656275696C640000000000000000000000000100000001000000000000000000000001000000000005804707000000000000FFFFFFFF0B426174636820436C65616E0100000000000000000000000100000001000000000000000000000001000000000005809E8A0000000000001F0000000F4261746326682053657475702E2E2E000000000000000000000000010000000100000000000000000000000100000000000180D17F0000000004002000000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001804C8A0000000000002100000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000FFFF01001900434D4643546F6F6C426172436F6D626F426F78427574746F6EBA000000000000000000000000000000000000000000000000010000000100000096000000030020500000000008546172676574203196000000000000000100085461726765742031000000000180EB880000000000002200000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180C07F000000000000230000000000000000000000000000000001000000010000000180B08A000000000400240000000000000000000000000000000001000000010000000180A8010000000000004E00000000000000000000000000000000010000000100000001807202000000000000530000000000000000000000000000000001000000010000000180BE010000000000005000000000000000000000000000000000010000000100000000000000054275696C64DC010000 583 @@ -1851,7 +1851,7 @@ Debug 2373 - 00200000000000001900FFFF01001100434D4643546F6F6C426172427574746F6ECC880000000000002500000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018017800000000000002600000000000000000000000000000000010000000100000001801D800000000000002700000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001801A800000000000002800000000000000000000000000000000010000000100000001801B80000000000000290000000000000000000000000000000001000000010000000180E57F0000000000002A00000000000000000000000000000000010000000100000001801C800000000000002B00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018000890000000000002C00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180E48B0000000000002D0000000000000000000000000000000001000000010000000180F07F0000000000002E0000000000000000000000000000000001000000010000000180E8880000000000003700000000000000000000000000000000010000000100000001803B010000000000002F0000000000000000000000000000000001000000010000000180BB8A00000000000030000000000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6E0E01000000000000310000000D57617463682057696E646F7773000000000000000000000000010000000100000000000000000000000100000003001380D88B00000000000031000000085761746368202631000000000000000000000000010000000100000000000000000000000100000000001380D98B00000000000031000000085761746368202632000000000000000000000000010000000100000000000000000000000100000000001380CE01000000000000FFFFFFFF0C576174636820416E63686F720100000000000000010000000000000001000000000000000000000001000000000013800F01000000000000320000000E4D656D6F72792057696E646F7773000000000000000000000000010000000100000000000000000000000100000004001380D28B00000000000032000000094D656D6F7279202631000000000000000000000000010000000100000000000000000000000100000000001380D38B00000000000032000000094D656D6F7279202632000000000000000000000000010000000100000000000000000000000100000000001380D48B00000000000032000000094D656D6F7279202633000000000000000000000000010000000100000000000000000000000100000000001380D58B00000000000032000000094D656D6F72792026340000000000000000000000000100000001000000000000000000000001000000000013801001000000000000330000000E53657269616C2057696E646F77730000000000000000000000000100000001000000000000000000000001000000040013809307000000000000330000000855415254202326310000000000000000000000000100000001000000000000000000000001000000000013809407000000000000330000000855415254202326320000000000000000000000000100000001000000000000000000000001000000000013809507000000000000330000000855415254202326330000000000000000000000000100000001000000000000000000000001000000000013809607000000000000330000001626446562756720287072696E746629205669657765720000000000000000000000000100000001000000000000000000000001000000000013803C010000000000007200000010416E616C797369732057696E646F7773000000000000000000000000010000000100000000000000000000000100000004001380658A000000000000340000000F264C6F67696320416E616C797A6572000000000000000000000000010000000100000000000000000000000100000000001380DC7F0000000000003E0000001526506572666F726D616E636520416E616C797A6572000000000000000000000000010000000100000000000000000000000100000000001380E788000000000000380000000E26436F646520436F766572616765000000000000000000000000010000000100000000000000000000000100000000001380CD01000000000000FFFFFFFF0F416E616C7973697320416E63686F7201000000000000000100000000000000010000000000000000000000010000000000138053010000000000003F0000000D54726163652057696E646F77730000000000000000000000000100000001000000000000000000000001000000010013805401000000000000FFFFFFFF115472616365204D656E7520416E63686F720100000000000000010000000000000001000000000000000000000001000000000013802901000000000000350000001553797374656D205669657765722057696E646F77730000000000000000000000000100000001000000000000000000000001000000010013804B01000000000000FFFFFFFF1453797374656D2056696577657220416E63686F720100000000000000010000000000000001000000000000000000000001000000000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000013800189000000000000360000000F26546F6F6C626F782057696E646F7700000000000000000000000001000000010000000000000000000000010000000300138044C5000000000000FFFFFFFF0E5570646174652057696E646F77730100000000000000010000000000000001000000000000000000000001000000000013800000000000000400FFFFFFFF000000000000000000010000000000000001000000000000000000000001000000000013805B01000000000000FFFFFFFF12546F6F6C626F78204D656E75416E63686F72010000000000000001000000000000000100000000000000000000000100000000000000000005446562756764020000 + 00200000000000001900FFFF01001100434D4643546F6F6C426172427574746F6ECC880000000000002500000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018017800000000000002600000000000000000000000000000000010000000100000001801D800000000000002700000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001801A800000000000002800000000000000000000000000000000010000000100000001801B80000000000000290000000000000000000000000000000001000000010000000180E57F0000000000002A00000000000000000000000000000000010000000100000001801C800000000000002B00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018000890000000000002C00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180E48B0000000000002D0000000000000000000000000000000001000000010000000180F07F0000000000002E0000000000000000000000000000000001000000010000000180E8880000000000003700000000000000000000000000000000010000000100000001803B010000000000002F0000000000000000000000000000000001000000010000000180BB8A00000000000030000000000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6E0E01000000000000310000000D57617463682057696E646F7773000000000000000000000000010000000100000000000000000000000100000003001380D88B00000000000031000000085761746368202631000000000000000000000000010000000100000000000000000000000100000000001380D98B00000000000031000000085761746368202632000000000000000000000000010000000100000000000000000000000100000000001380CE01000000000000FFFFFFFF0C576174636820416E63686F720000000000000000010000000000000001000000000000000000000001000000000013800F01000000000000320000000E4D656D6F72792057696E646F7773000000000000000000000000010000000100000000000000000000000100000004001380D28B00000000000032000000094D656D6F7279202631000000000000000000000000010000000100000000000000000000000100000000001380D38B00000000000032000000094D656D6F7279202632000000000000000000000000010000000100000000000000000000000100000000001380D48B00000000000032000000094D656D6F7279202633000000000000000000000000010000000100000000000000000000000100000000001380D58B00000000000032000000094D656D6F72792026340000000000000000000000000100000001000000000000000000000001000000000013801001000000000000330000000E53657269616C2057696E646F77730000000000000000000000000100000001000000000000000000000001000000040013809307000000000000330000000855415254202326310000000000000000000000000100000001000000000000000000000001000000000013809407000000000000330000000855415254202326320000000000000000000000000100000001000000000000000000000001000000000013809507000000000000330000000855415254202326330000000000000000000000000100000001000000000000000000000001000000000013809607000000000000330000001626446562756720287072696E746629205669657765720000000000000000000000000100000001000000000000000000000001000000000013803C010000000000007200000010416E616C797369732057696E646F7773000000000000000000000000010000000100000000000000000000000100000004001380658A000000000000340000000F264C6F67696320416E616C797A6572000000000000000000000000010000000100000000000000000000000100000000001380DC7F0000000000003E0000001526506572666F726D616E636520416E616C797A6572000000000000000000000000010000000100000000000000000000000100000000001380E788000000000000380000000E26436F646520436F766572616765000000000000000000000000010000000100000000000000000000000100000000001380CD01000000000000FFFFFFFF0F416E616C7973697320416E63686F7200000000000000000100000000000000010000000000000000000000010000000000138053010000000000003F0000000D54726163652057696E646F77730000000000000000000000000100000001000000000000000000000001000000010013805401000000000000FFFFFFFF115472616365204D656E7520416E63686F720000000000000000010000000000000001000000000000000000000001000000000013802901000000000000350000001553797374656D205669657765722057696E646F77730000000000000000000000000100000001000000000000000000000001000000010013804B01000000000000FFFFFFFF1453797374656D2056696577657220416E63686F720000000000000000010000000000000001000000000000000000000001000000000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000013800189000000000000360000000F26546F6F6C626F782057696E646F7700000000000000000000000001000000010000000000000000000000010000000300138044C5000000000000FFFFFFFF0E5570646174652057696E646F77730000000000000000010000000000000001000000000000000000000001000000000013800000000000000400FFFFFFFF000000000000000000010000000000000001000000000000000000000001000000000013805B01000000000000FFFFFFFF12546F6F6C626F78204D656E75416E63686F72000000000000000001000000000000000100000000000000000000000100000000000000000005446562756764020000 898 @@ -1880,15 +1880,15 @@ 0 32767 0 - 4096 + 8192 0 16 - F40000004F00000080070000DD000000 + F40000004F0000008C060000DD000000 16 - F40000006600000080070000F4000000 + F4000000660000008C060000F4000000 @@ -1904,7 +1904,7 @@ 0 16 - 0300000066000000ED00000085020000 + 0300000066000000ED0000008D020000 16 @@ -1924,7 +1924,7 @@ 0 16 - 0300000066000000ED00000085020000 + 0300000066000000ED0000008D020000 16 @@ -1944,7 +1944,7 @@ 0 16 - C7030000B90200007D070000C5030000 + C7030000C10200007D070000CD030000 16 @@ -1964,7 +1964,7 @@ 0 16 - C7030000B90200007D070000C5030000 + C7030000C10200007D070000CD030000 16 @@ -1984,7 +1984,7 @@ 0 16 - C7030000B90200007D070000C5030000 + C7030000C10200007D070000CD030000 16 @@ -2004,7 +2004,7 @@ 0 16 - C7030000B90200007D070000C5030000 + C7030000C10200007D070000CD030000 16 @@ -2024,7 +2024,7 @@ 0 16 - A3040000660000008D0500000C020000 + 93060000660000007D0700008D020000 16 @@ -2044,7 +2044,7 @@ 0 16 - F7000000660000007D070000C4000000 + F70000006600000089060000C4000000 16 @@ -2064,7 +2064,7 @@ 0 16 - C7030000B90200007D070000C5030000 + C7030000C10200007D070000CD030000 16 @@ -2084,7 +2084,7 @@ 0 16 - C7030000B90200007D070000C5030000 + C7030000C10200007D070000CD030000 16 @@ -2104,7 +2104,7 @@ 0 16 - C7030000B90200007D070000C5030000 + C7030000C10200007D070000CD030000 16 @@ -2124,7 +2124,7 @@ 0 16 - C7030000B90200007D070000C5030000 + C7030000C10200007D070000CD030000 16 @@ -2144,7 +2144,7 @@ 0 16 - C7030000B90200007D070000C5030000 + C7030000C10200007D070000CD030000 16 @@ -2164,7 +2164,7 @@ 0 16 - C7030000B90200007D070000C5030000 + C7030000C10200007D070000CD030000 16 @@ -2184,7 +2184,7 @@ 0 16 - C7030000B90200007D070000C5030000 + C7030000C10200007D070000CD030000 16 @@ -2204,7 +2204,7 @@ 0 16 - 0300000066000000ED00000085020000 + 0300000066000000ED0000008D020000 16 @@ -2224,7 +2224,7 @@ 0 16 - 0300000066000000ED00000085020000 + 0300000066000000ED0000008D020000 16 @@ -2264,7 +2264,7 @@ 0 16 - 00000000A2020000C0030000DE030000 + 00000000AA020000C0030000E6030000 16 @@ -2304,7 +2304,7 @@ 0 16 - F40000006300000080070000DD000000 + F4000000630000008C060000DD000000 16 @@ -2324,7 +2324,7 @@ 0 16 - F7000000660000007D070000C4000000 + F70000006600000089060000C4000000 16 @@ -2364,7 +2364,7 @@ 0 16 - A3040000660000008D0500000C020000 + 93060000660000007D0700008D020000 16 @@ -2384,7 +2384,7 @@ 0 16 - C7030000B90200007D070000C5030000 + C7030000C10200007D070000CD030000 16 @@ -2404,7 +2404,7 @@ 0 16 - F7000000660000007D070000C4000000 + F70000006600000089060000C4000000 16 @@ -2424,7 +2424,7 @@ 0 16 - F7000000660000007D070000C4000000 + F70000006600000089060000C4000000 16 @@ -2444,7 +2444,7 @@ 0 16 - F7000000660000007D070000C4000000 + F70000006600000089060000C4000000 16 @@ -2464,7 +2464,7 @@ 0 16 - F7000000660000007D070000C4000000 + F70000006600000089060000C4000000 16 @@ -2484,7 +2484,7 @@ 0 16 - A3040000660000008D0500000C020000 + 93060000660000007D0700008D020000 16 @@ -2504,7 +2504,7 @@ 0 16 - A3040000660000008D0500000C020000 + 93060000660000007D0700008D020000 16 @@ -2524,7 +2524,7 @@ 0 16 - A3040000660000008D0500000C020000 + 93060000660000007D0700008D020000 16 @@ -2544,7 +2544,7 @@ 0 16 - A3040000660000008D0500000C020000 + 93060000660000007D0700008D020000 16 @@ -2564,7 +2564,7 @@ 0 16 - A3040000660000008D0500000C020000 + 93060000660000007D0700008D020000 16 @@ -2584,7 +2584,7 @@ 0 16 - A3040000660000008D0500000C020000 + 93060000660000007D0700008D020000 16 @@ -2604,7 +2604,7 @@ 0 16 - A3040000660000008D0500000C020000 + 93060000660000007D0700008D020000 16 @@ -2624,7 +2624,7 @@ 0 16 - A3040000660000008D0500000C020000 + 93060000660000007D0700008D020000 16 @@ -2644,7 +2644,7 @@ 0 16 - A3040000660000008D0500000C020000 + 93060000660000007D0700008D020000 16 @@ -2664,7 +2664,7 @@ 0 16 - A3040000660000008D0500000C020000 + 93060000660000007D0700008D020000 16 @@ -2684,7 +2684,7 @@ 0 16 - A3040000660000008D0500000C020000 + 93060000660000007D0700008D020000 16 @@ -2704,7 +2704,7 @@ 0 16 - A3040000660000008D0500000C020000 + 93060000660000007D0700008D020000 16 @@ -2724,7 +2724,7 @@ 0 16 - A3040000660000008D0500000C020000 + 93060000660000007D0700008D020000 16 @@ -2744,7 +2744,7 @@ 0 16 - A3040000660000008D0500000C020000 + 93060000660000007D0700008D020000 16 @@ -2764,7 +2764,7 @@ 0 16 - A3040000660000008D0500000C020000 + 93060000660000007D0700008D020000 16 @@ -2784,7 +2784,7 @@ 0 16 - A3040000660000008D0500000C020000 + 93060000660000007D0700008D020000 16 @@ -2804,7 +2804,7 @@ 0 16 - A3040000660000008D0500000C020000 + 93060000660000007D0700008D020000 16 @@ -2824,7 +2824,7 @@ 0 16 - A3040000660000008D0500000C020000 + 93060000660000007D0700008D020000 16 @@ -2844,7 +2844,7 @@ 0 16 - A3040000660000008D0500000C020000 + 93060000660000007D0700008D020000 16 @@ -2854,7 +2854,7 @@ 35904 35904 - 0 + 1 0 0 0 @@ -2864,7 +2864,7 @@ 0 16 - A3040000660000008D0500000C020000 + 93060000660000007D0700008D020000 16 @@ -2874,7 +2874,7 @@ 35905 35905 - 0 + 1 0 0 0 @@ -2884,7 +2884,7 @@ 0 16 - A3040000660000008D0500000C020000 + 93060000660000007D0700008D020000 16 @@ -2904,7 +2904,7 @@ 0 16 - 0300000066000000ED00000085020000 + 0300000066000000ED0000008D020000 16 @@ -2964,7 +2964,7 @@ 0 16 - C7030000B90200007D070000C5030000 + C7030000C10200007D070000CD030000 16 @@ -2984,7 +2984,7 @@ 0 16 - C7030000B90200007D070000C5030000 + C7030000C10200007D070000CD030000 16 @@ -3044,7 +3044,7 @@ 0 16 - F7000000660000007D070000C4000000 + F70000006600000089060000C4000000 16 @@ -3064,7 +3064,7 @@ 0 16 - A3040000660000008D0500000C020000 + 93060000660000007D0700008D020000 16 @@ -3084,7 +3084,7 @@ 0 16 - A3040000660000008D0500000C020000 + 93060000660000007D0700008D020000 16 @@ -3104,7 +3104,7 @@ 0 16 - A3040000660000008D0500000C020000 + 93060000660000007D0700008D020000 16 @@ -3124,7 +3124,7 @@ 0 16 - A3040000660000008D0500000C020000 + 93060000660000007D0700008D020000 16 @@ -3144,7 +3144,7 @@ 0 16 - A3040000660000008D0500000C020000 + 93060000660000007D0700008D020000 16 @@ -3164,7 +3164,7 @@ 0 16 - A3040000660000008D0500000C020000 + 93060000660000007D0700008D020000 16 @@ -3184,7 +3184,7 @@ 0 16 - A3040000660000008D0500000C020000 + 93060000660000007D0700008D020000 16 @@ -3204,7 +3204,7 @@ 0 16 - A3040000660000008D0500000C020000 + 93060000660000007D0700008D020000 16 @@ -3224,7 +3224,7 @@ 0 16 - A3040000660000008D0500000C020000 + 93060000660000007D0700008D020000 16 @@ -3244,7 +3244,7 @@ 0 16 - A3040000660000008D0500000C020000 + 93060000660000007D0700008D020000 16 @@ -3264,7 +3264,7 @@ 0 16 - A3040000660000008D0500000C020000 + 93060000660000007D0700008D020000 16 @@ -3284,7 +3284,7 @@ 0 16 - A3040000660000008D0500000C020000 + 93060000660000007D0700008D020000 16 @@ -3304,7 +3304,7 @@ 0 16 - A3040000660000008D0500000C020000 + 93060000660000007D0700008D020000 16 @@ -3324,7 +3324,7 @@ 0 16 - A3040000660000008D0500000C020000 + 93060000660000007D0700008D020000 16 @@ -3344,7 +3344,7 @@ 0 16 - A3040000660000008D0500000C020000 + 93060000660000007D0700008D020000 16 @@ -3364,7 +3364,7 @@ 0 16 - A3040000660000008D0500000C020000 + 93060000660000007D0700008D020000 16 @@ -3384,7 +3384,7 @@ 0 16 - A3040000660000008D0500000C020000 + 93060000660000007D0700008D020000 16 @@ -3404,7 +3404,7 @@ 0 16 - A3040000660000008D0500000C020000 + 93060000660000007D0700008D020000 16 @@ -3424,7 +3424,7 @@ 0 16 - A3040000660000008D0500000C020000 + 93060000660000007D0700008D020000 16 @@ -3444,7 +3444,7 @@ 0 16 - A3040000660000008D0500000C020000 + 93060000660000007D0700008D020000 16 @@ -3484,7 +3484,7 @@ 0 16 - 00000000DE03000080070000F1030000 + 00000000E603000080070000F9030000 16 @@ -3544,7 +3544,7 @@ 0 16 - C7030000B90200007D070000C5030000 + C7030000C10200007D070000CD030000 16 @@ -3553,14 +3553,14 @@ 3311 - 000000000B000000000000000020000001000000FFFFFFFFFFFFFFFFF4000000DD00000080070000E1000000010000000100001004000000010000000000000000000000FFFFFFFF08000000CB00000057010000CC000000F08B00005A01000079070000D601000045890000FFFF02000B004354616262656450616E650020000001000000F40000006600000080070000F4000000F40000004F00000080070000DD0000000000000040280056080000000B446973617373656D626C7901000000CB00000001000000FFFFFFFFFFFFFFFF14506572666F726D616E636520416E616C797A6572000000005701000001000000FFFFFFFFFFFFFFFF14506572666F726D616E636520416E616C797A657200000000CC00000001000000FFFFFFFFFFFFFFFF0E4C6F67696320416E616C797A657200000000F08B000001000000FFFFFFFFFFFFFFFF0D436F646520436F766572616765000000005A01000001000000FFFFFFFFFFFFFFFF11496E737472756374696F6E205472616365000000007907000001000000FFFFFFFFFFFFFFFF0F53797374656D20416E616C797A657200000000D601000001000000FFFFFFFFFFFFFFFF104576656E742053746174697374696373000000004589000001000000FFFFFFFFFFFFFFFF00000000000000000000000000000000000000000000000001000000FFFFFFFFCB00000001000000FFFFFFFFCB000000000000000040000000000000FFFFFFFFFFFFFFFF9C0400004F000000A004000025020000000000000200000004000000010000000000000000000000FFFFFFFF2B000000E2050000CA0900002D8C00002E8C00002F8C0000308C0000318C0000328C0000338C0000348C0000358C0000368C0000378C0000388C0000398C00003A8C00003B8C00003C8C00003D8C00003E8C00003F8C0000408C0000418C000050C3000051C3000052C3000053C3000054C3000055C3000056C3000057C3000058C3000059C300005AC300005BC300005CC300005DC300005EC300005FC3000060C3000061C3000062C3000063C3000001800040000000000000A004000066000000900500003C020000A00400004F000000900500002502000000000000404100462B0000000753796D626F6C7300000000E205000001000000FFFFFFFFFFFFFFFF0A5472616365204461746100000000CA09000001000000FFFFFFFFFFFFFFFF00000000002D8C000001000000FFFFFFFFFFFFFFFF00000000002E8C000001000000FFFFFFFFFFFFFFFF00000000002F8C000001000000FFFFFFFFFFFFFFFF0000000000308C000001000000FFFFFFFFFFFFFFFF0000000000318C000001000000FFFFFFFFFFFFFFFF0000000000328C000001000000FFFFFFFFFFFFFFFF0000000000338C000001000000FFFFFFFFFFFFFFFF0000000000348C000001000000FFFFFFFFFFFFFFFF0000000000358C000001000000FFFFFFFFFFFFFFFF0000000000368C000001000000FFFFFFFFFFFFFFFF0000000000378C000001000000FFFFFFFFFFFFFFFF0000000000388C000001000000FFFFFFFFFFFFFFFF0000000000398C000001000000FFFFFFFFFFFFFFFF00000000003A8C000001000000FFFFFFFFFFFFFFFF00000000003B8C000001000000FFFFFFFFFFFFFFFF00000000003C8C000001000000FFFFFFFFFFFFFFFF00000000003D8C000001000000FFFFFFFFFFFFFFFF00000000003E8C000001000000FFFFFFFFFFFFFFFF00000000003F8C000001000000FFFFFFFFFFFFFFFF0000000000408C000001000000FFFFFFFFFFFFFFFF0000000000418C000001000000FFFFFFFFFFFFFFFF000000000050C3000001000000FFFFFFFFFFFFFFFF000000000051C3000001000000FFFFFFFFFFFFFFFF000000000052C3000001000000FFFFFFFFFFFFFFFF000000000053C3000001000000FFFFFFFFFFFFFFFF000000000054C3000001000000FFFFFFFFFFFFFFFF000000000055C3000001000000FFFFFFFFFFFFFFFF000000000056C3000001000000FFFFFFFFFFFFFFFF000000000057C3000001000000FFFFFFFFFFFFFFFF000000000058C3000001000000FFFFFFFFFFFFFFFF000000000059C3000001000000FFFFFFFFFFFFFFFF00000000005AC3000001000000FFFFFFFFFFFFFFFF00000000005BC3000001000000FFFFFFFFFFFFFFFF00000000005CC3000001000000FFFFFFFFFFFFFFFF00000000005DC3000001000000FFFFFFFFFFFFFFFF00000000005EC3000001000000FFFFFFFFFFFFFFFF00000000005FC3000001000000FFFFFFFFFFFFFFFF000000000060C3000001000000FFFFFFFFFFFFFFFF000000000061C3000001000000FFFFFFFFFFFFFFFF000000000062C3000001000000FFFFFFFFFFFFFFFF000000000063C3000001000000FFFFFFFFFFFFFFFFFFFFFFFF000000000000000000000000000000000000000001000000FFFFFFFFE205000001000000FFFFFFFFE2050000000000000010000001000000FFFFFFFFFFFFFFFFF00000004F000000F40000009E020000010000000200001004000000010000000000000000000000FFFFFFFF05000000ED0300006D000000C3000000C400000073940000018000100000010000000000000066000000F0000000B5020000000000004F000000F00000009E0200000000000040410056050000000750726F6A65637401000000ED03000001000000FFFFFFFFFFFFFFFF05426F6F6B73000000006D00000001000000FFFFFFFFFFFFFFFF0946756E6374696F6E7300000000C300000001000000FFFFFFFFFFFFFFFF0954656D706C6174657300000000C400000001000000FFFFFFFFFFFFFFFF09526567697374657273010000007394000001000000FFFFFFFFFFFFFFFF04000000000000000000000000000000000000000000000001000000FFFFFFFFED03000001000000FFFFFFFFED030000000000000080000001000000FFFFFFFFFFFFFFFF000000009E02000080070000A202000001000000010000100400000001000000D9FEFFFF6801000000000000000000000000000001000000C6000000FFFFFFFF0F0000008F070000930700009407000095070000960700009007000091070000B5010000B801000038030000B9050000BA050000BB050000BC050000CB09000001800080000001000000C4030000B902000080070000F5030000C4030000A202000080070000DE03000000000000404100560F0000001343616C6C20537461636B202B204C6F63616C73010000008F07000001000000FFFFFFFFFFFFFFFF0755415254202331000000009307000001000000FFFFFFFFFFFFFFFF0755415254202332000000009407000001000000FFFFFFFFFFFFFFFF0755415254202333000000009507000001000000FFFFFFFFFFFFFFFF15446562756720287072696E74662920566965776572000000009607000001000000FFFFFFFFFFFFFFFF0757617463682031010000009007000001000000FFFFFFFFFFFFFFFF0757617463682032010000009107000001000000FFFFFFFFFFFFFFFF10547261636520457863657074696F6E7300000000B501000001000000FFFFFFFFFFFFFFFF0E4576656E7420436F756E7465727300000000B801000001000000FFFFFFFFFFFFFFFF09554C494E4B706C7573000000003803000001000000FFFFFFFFFFFFFFFF084D656D6F7279203101000000B905000001000000FFFFFFFFFFFFFFFF084D656D6F7279203200000000BA05000001000000FFFFFFFFFFFFFFFF084D656D6F7279203300000000BB05000001000000FFFFFFFFFFFFFFFF084D656D6F7279203400000000BC05000001000000FFFFFFFFFFFFFFFF105472616365204E617669676174696F6E00000000CB09000001000000FFFFFFFFFFFFFFFF050000000000000001000000000000000100000001000000FFFFFFFFC0030000A2020000C4030000DE03000001000000020000100400000000000000000000000000000000000000000000000000000002000000C6000000FFFFFFFF8F07000001000000FFFFFFFF8F07000001000000C6000000000000000080000000000000FFFFFFFFFFFFFFFF00000000250200009005000029020000000000000100000004000000010000000000000000000000FFFFFFFF06000000C5000000C7000000B4010000D2010000CF0100007794000001800080000000000000000000004002000090050000CE020000000000002902000090050000B70200000000000040820046060000000C4275696C64204F757470757400000000C500000001000000FFFFFFFFFFFFFFFF0D46696E6420496E2046696C657300000000C700000001000000FFFFFFFFFFFFFFFF0A4572726F72204C69737400000000B401000001000000FFFFFFFFFFFFFFFF0E536F757263652042726F7773657200000000D201000001000000FFFFFFFFFFFFFFFF0E416C6C205265666572656E63657300000000CF01000001000000FFFFFFFFFFFFFFFF0642726F777365000000007794000001000000FFFFFFFFFFFFFFFFFFFFFFFF000000000000000000000000000000000000000001000000FFFFFFFFC500000001000000FFFFFFFFC5000000000000000000000000000000 + 000000000B000000000000000020000001000000FFFFFFFFFFFFFFFFF4000000DD0000008C060000E1000000010000000100001004000000010000000000000000000000FFFFFFFF08000000CB00000057010000CC000000F08B00005A01000079070000D601000045890000FFFF02000B004354616262656450616E650020000001000000F4000000660000008C060000F4000000F40000004F0000008C060000DD0000000000000040280056080000000B446973617373656D626C7901000000CB00000001000000FFFFFFFFFFFFFFFF14506572666F726D616E636520416E616C797A6572000000005701000001000000FFFFFFFFFFFFFFFF14506572666F726D616E636520416E616C797A657200000000CC00000001000000FFFFFFFFFFFFFFFF0E4C6F67696320416E616C797A657200000000F08B000001000000FFFFFFFFFFFFFFFF0D436F646520436F766572616765000000005A01000001000000FFFFFFFFFFFFFFFF11496E737472756374696F6E205472616365000000007907000001000000FFFFFFFFFFFFFFFF0F53797374656D20416E616C797A657200000000D601000001000000FFFFFFFFFFFFFFFF104576656E742053746174697374696373000000004589000001000000FFFFFFFFFFFFFFFF00000000000000000000000000000000000000000000000001000000FFFFFFFFCB00000001000000FFFFFFFFCB000000000000000040000001000000FFFFFFFFFFFFFFFF8C0600004F00000090060000A6020000010000000200001004000000010000000000000000000000FFFFFFFF2B000000E2050000CA0900002D8C00002E8C00002F8C0000308C0000318C0000328C0000338C0000348C0000358C0000368C0000378C0000388C0000398C00003A8C00003B8C00003C8C00003D8C00003E8C00003F8C0000408C0000418C000050C3000051C3000052C3000053C3000054C3000055C3000056C3000057C3000058C3000059C300005AC300005BC300005CC300005DC300005EC300005FC3000060C3000061C3000062C3000063C3000001800040000001000000900600006600000080070000BD020000900600004F00000080070000A602000000000000404100562B0000000753796D626F6C7300000000E205000001000000FFFFFFFFFFFFFFFF0A5472616365204461746100000000CA09000001000000FFFFFFFFFFFFFFFF00000000002D8C000001000000FFFFFFFFFFFFFFFF00000000002E8C000001000000FFFFFFFFFFFFFFFF00000000002F8C000001000000FFFFFFFFFFFFFFFF0000000000308C000001000000FFFFFFFFFFFFFFFF0000000000318C000001000000FFFFFFFFFFFFFFFF0000000000328C000001000000FFFFFFFFFFFFFFFF0000000000338C000001000000FFFFFFFFFFFFFFFF0000000000348C000001000000FFFFFFFFFFFFFFFF0000000000358C000001000000FFFFFFFFFFFFFFFF0000000000368C000001000000FFFFFFFFFFFFFFFF0000000000378C000001000000FFFFFFFFFFFFFFFF0000000000388C000001000000FFFFFFFFFFFFFFFF0000000000398C000001000000FFFFFFFFFFFFFFFF00000000003A8C000001000000FFFFFFFFFFFFFFFF00000000003B8C000001000000FFFFFFFFFFFFFFFF00000000003C8C000001000000FFFFFFFFFFFFFFFF00000000003D8C000001000000FFFFFFFFFFFFFFFF00000000003E8C000001000000FFFFFFFFFFFFFFFF00000000003F8C000001000000FFFFFFFFFFFFFFFF0001000000408C000001000000FFFFFFFFFFFFFFFF0001000000418C000001000000FFFFFFFFFFFFFFFF000000000050C3000001000000FFFFFFFFFFFFFFFF000000000051C3000001000000FFFFFFFFFFFFFFFF000000000052C3000001000000FFFFFFFFFFFFFFFF000000000053C3000001000000FFFFFFFFFFFFFFFF000000000054C3000001000000FFFFFFFFFFFFFFFF000000000055C3000001000000FFFFFFFFFFFFFFFF000000000056C3000001000000FFFFFFFFFFFFFFFF000000000057C3000001000000FFFFFFFFFFFFFFFF000000000058C3000001000000FFFFFFFFFFFFFFFF000000000059C3000001000000FFFFFFFFFFFFFFFF00000000005AC3000001000000FFFFFFFFFFFFFFFF00000000005BC3000001000000FFFFFFFFFFFFFFFF00000000005CC3000001000000FFFFFFFFFFFFFFFF00000000005DC3000001000000FFFFFFFFFFFFFFFF00000000005EC3000001000000FFFFFFFFFFFFFFFF00000000005FC3000001000000FFFFFFFFFFFFFFFF000000000060C3000001000000FFFFFFFFFFFFFFFF000000000061C3000001000000FFFFFFFFFFFFFFFF000000000062C3000001000000FFFFFFFFFFFFFFFF000000000063C3000001000000FFFFFFFFFFFFFFFF16000000000000000000000000000000000000000000000001000000FFFFFFFFE205000001000000FFFFFFFFE2050000000000000010000001000000FFFFFFFFFFFFFFFFF00000004F000000F4000000A6020000010000000200001004000000010000000000000000000000FFFFFFFF05000000ED0300006D000000C3000000C400000073940000018000100000010000000000000066000000F0000000BD020000000000004F000000F0000000A60200000000000040410056050000000750726F6A65637401000000ED03000001000000FFFFFFFFFFFFFFFF05426F6F6B73000000006D00000001000000FFFFFFFFFFFFFFFF0946756E6374696F6E7300000000C300000001000000FFFFFFFFFFFFFFFF0954656D706C6174657300000000C400000001000000FFFFFFFFFFFFFFFF09526567697374657273010000007394000001000000FFFFFFFFFFFFFFFF04000000000000000000000000000000000000000000000001000000FFFFFFFFED03000001000000FFFFFFFFED030000000000000080000001000000FFFFFFFFFFFFFFFF00000000A602000080070000AA02000001000000010000100400000001000000D9FEFFFF6801000000000000000000000000000001000000C6000000FFFFFFFF0F0000008F070000930700009407000095070000960700009007000091070000B5010000B801000038030000B9050000BA050000BB050000BC050000CB09000001800080000001000000C4030000C102000080070000FD030000C4030000AA02000080070000E603000000000000404100560F0000001343616C6C20537461636B202B204C6F63616C73010000008F07000001000000FFFFFFFFFFFFFFFF0755415254202331000000009307000001000000FFFFFFFFFFFFFFFF0755415254202332000000009407000001000000FFFFFFFFFFFFFFFF0755415254202333000000009507000001000000FFFFFFFFFFFFFFFF15446562756720287072696E74662920566965776572000000009607000001000000FFFFFFFFFFFFFFFF0757617463682031010000009007000001000000FFFFFFFFFFFFFFFF0757617463682032010000009107000001000000FFFFFFFFFFFFFFFF10547261636520457863657074696F6E7300000000B501000001000000FFFFFFFFFFFFFFFF0E4576656E7420436F756E7465727300000000B801000001000000FFFFFFFFFFFFFFFF09554C494E4B706C7573000000003803000001000000FFFFFFFFFFFFFFFF084D656D6F7279203101000000B905000001000000FFFFFFFFFFFFFFFF084D656D6F7279203200000000BA05000001000000FFFFFFFFFFFFFFFF084D656D6F7279203300000000BB05000001000000FFFFFFFFFFFFFFFF084D656D6F7279203400000000BC05000001000000FFFFFFFFFFFFFFFF105472616365204E617669676174696F6E00000000CB09000001000000FFFFFFFFFFFFFFFF050000000000000001000000000000000100000001000000FFFFFFFFC0030000AA020000C4030000E603000001000000020000100400000000000000000000000000000000000000000000000000000002000000C6000000FFFFFFFF8F07000001000000FFFFFFFF8F07000001000000C6000000000000000080000000000000FFFFFFFFFFFFFFFF00000000250200009005000029020000000000000100000004000000010000000000000000000000FFFFFFFF06000000C5000000C7000000B4010000D2010000CF0100007794000001800080000000000000000000004002000090050000CE020000000000002902000090050000B70200000000000040820046060000000C4275696C64204F757470757400000000C500000001000000FFFFFFFFFFFFFFFF0D46696E6420496E2046696C657300000000C700000001000000FFFFFFFFFFFFFFFF0A4572726F72204C69737400000000B401000001000000FFFFFFFFFFFFFFFF0E536F757263652042726F7773657200000000D201000001000000FFFFFFFFFFFFFFFF0E416C6C205265666572656E63657300000000CF01000001000000FFFFFFFFFFFFFFFF0642726F777365000000007794000001000000FFFFFFFFFFFFFFFFFFFFFFFF000000000000000000000000000000000000000001000000FFFFFFFFC500000001000000FFFFFFFFC5000000000000000000000000000000 59392 File - 2864 - 00200000010000002800FFFF01001100434D4643546F6F6C426172427574746F6E00E100000000000000000000000000000000000000000000000100000001000000018001E100000000000001000000000000000000000000000000000100000001000000018003E1000000000000020000000000000000000000000000000001000000010000000180CD7F0000000000000300000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018023E100000000000004000000000000000000000000000000000100000001000000018022E100000000000005000000000000000000000000000000000100000001000000018025E10000000000000600000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001802BE10000000000000700000000000000000000000000000000010000000100000001802CE10000000004000800000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001807A8A0000000000000900000000000000000000000000000000010000000100000001807B8A0000000004000A00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180D3B00000000000000B000000000000000000000000000000000100000001000000018015B10000000004000C0000000000000000000000000000000001000000010000000180F4B00000000004000D000000000000000000000000000000000100000001000000018036B10000000004000E00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180FF88000000000000460000000000000000000000000000000001000000010000000180FE880000000000004500000000000000000000000000000000010000000100000001800B810000000000001300000000000000000000000000000000010000000100000001800C810000000000001400000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180F0880000020000000F000000000000000000000000000000000100000001000000FFFF0100120043555646696E64436F6D626F427574746F6EE803000000000000000000000000000000000000000000000001000000010000009600000002002050000000000E455350383236365F54585F425546960000000000000014000E455350383236365F54585F4255460D5553415254785F52585F4255460E455350383236365F52585F4255460B446174615F52585F4255460875696E7433325F74037531360775696E74385F741B455350383236365F5553415254315F5363616E5F416374696F6E730655534152543206555341525431044750494F067374726C656E06737472737472056670757463115553415254315F49525148616E646C6572094952516E5F547970650E55534152545F53656E64446174610B52533438355F54585F454E16455854495F436C656172495450656E64696E674269740A455854495F4C696E65780000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000018024E10000000000001100000000000000000000000000000000010000000100000001800A810000000000001200000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6E2280000002000100150000002153746172742F53746F70202644656275672053657373696F6E094374726C2B46350000000000000000000000000100000001000000000000000000000001000000020021802280000000000000150000002153746172742F53746F70202644656275672053657373696F6E094374726C2B4635000000000000000000000000010000000100000000000000000000000100000000002180E0010000000000007500000021456E65726779204D6561737572656D656E742026776974686F75742044656275670000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180C488000000000400160000000000000000000000000000000001000000010000000180C988000000000400180000000000000000000000000000000001000000010000000180C788000000000000190000000000000000000000000000000001000000010000002180C8880000000000001700000027264B696C6C20416C6C20427265616B706F696E747320696E2043757272656E7420546172676574000000000000000000000000010000000100000000000000000000000100000003002180C8880000000000001700000027264B696C6C20416C6C20427265616B706F696E747320696E2043757272656E7420546172676574000000000000000000000000010000000100000000000000000000000100000000002180E50100000000000078000000264B696C6C20416C6C20427265616B706F696E747320696E204163746976652050726F6A656374000000000000000000000000010000000100000000000000000000000100000000002180E601000000000000790000002F4B696C6C20416C6C20427265616B706F696E747320696E204D756C74692D50726F6A65637420576F726B73706163650000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000021804C010000020001001A0000000F2650726F6A6563742057696E646F77000000000000000000000000010000000100000000000000000000000100000008002180DD880000000000001A0000000750726F6A656374000000000000000000000000010000000100000000000000000000000100000000002180DC8B0000000000003A00000005426F6F6B73000000000000000000000000010000000100000000000000000000000100000000002180E18B0000000000003B0000000946756E6374696F6E73000000000000000000000000010000000100000000000000000000000100000000002180E28B000000000000400000000954656D706C6174657300000000000000000000000001000000010000000000000000000000010000000000218018890000000000003D0000000E536F757263652042726F777365720000000000000000000000000100000001000000000000000000000001000000000021800000000000000400FFFFFFFF00000000000000000001000000000000000100000000000000000000000100000000002180D988000000000000390000000C4275696C64204F7574707574000000000000000000000000010000000100000000000000000000000100000000002180E38B000000000000410000000B46696E64204F75747075740000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180FB7F0000000000001B000000000000000000000000000000000100000001000000000000000446696C65C6030000 + 2595 + 00200000010000002800FFFF01001100434D4643546F6F6C426172427574746F6E00E100000000000000000000000000000000000000000000000100000001000000018001E100000000000001000000000000000000000000000000000100000001000000018003E1000000000000020000000000000000000000000000000001000000010000000180CD7F0000000000000300000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018023E100000000040004000000000000000000000000000000000100000001000000018022E100000000040005000000000000000000000000000000000100000001000000018025E10000000000000600000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001802BE10000000004000700000000000000000000000000000000010000000100000001802CE10000000004000800000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001807A8A0000000000000900000000000000000000000000000000010000000100000001807B8A0000000004000A00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180D3B00000000000000B000000000000000000000000000000000100000001000000018015B10000000004000C0000000000000000000000000000000001000000010000000180F4B00000000004000D000000000000000000000000000000000100000001000000018036B10000000004000E00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180FF88000000000400460000000000000000000000000000000001000000010000000180FE880000000004004500000000000000000000000000000000010000000100000001800B810000000004001300000000000000000000000000000000010000000100000001800C810000000004001400000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180F0880000020000000F000000000000000000000000000000000100000001000000FFFF0100120043555646696E64436F6D626F427574746F6EE803000000000000000000000000000000000000000000000001000000010000009600000002002050000000000A517565756520496E69749600000000000000030013756352657476616C51756575655769666953740A517565756520496E697404696E6974000000000000000000000000018024E10000000000001100000000000000000000000000000000010000000100000001800A810000000000001200000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6E2280000002000300150000002153746172742F53746F70202644656275672053657373696F6E094374726C2B46350000000000000000000000000100000001000000000000000000000001000000020021802280000000000000150000002153746172742F53746F70202644656275672053657373696F6E094374726C2B4635000000000000000000000000010000000100000000000000000000000100000000002180E0010000000000007500000021456E65726779204D6561737572656D656E742026776974686F75742044656275670000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180C488000000000000160000000000000000000000000000000001000000010000000180C988000000000400180000000000000000000000000000000001000000010000000180C788000000000000190000000000000000000000000000000001000000010000002180C8880000000000001700000027264B696C6C20416C6C20427265616B706F696E747320696E2043757272656E7420546172676574000000000000000000000000010000000100000000000000000000000100000003002180C8880000000000001700000027264B696C6C20416C6C20427265616B706F696E747320696E2043757272656E7420546172676574000000000000000000000000010000000100000000000000000000000100000000002180E50100000000000078000000264B696C6C20416C6C20427265616B706F696E747320696E204163746976652050726F6A656374000000000000000000000000010000000100000000000000000000000100000000002180E601000000000000790000002F4B696C6C20416C6C20427265616B706F696E747320696E204D756C74692D50726F6A65637420576F726B73706163650000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000021804C010000020001001A0000000F2650726F6A6563742057696E646F77000000000000000000000000010000000100000000000000000000000100000008002180DD880000000000001A0000000750726F6A656374000000000000000000000000010000000100000000000000000000000100000000002180DC8B0000000000003A00000005426F6F6B73000000000000000000000000010000000100000000000000000000000100000000002180E18B0000000000003B0000000946756E6374696F6E73000000000000000000000000010000000100000000000000000000000100000000002180E28B000000000000400000000954656D706C6174657300000000000000000000000001000000010000000000000000000000010000000000218018890000000000003D0000000E536F757263652042726F777365720000000000000000000000000100000001000000000000000000000001000000000021800000000000000400FFFFFFFF00000000000000000001000000000000000100000000000000000000000100000000002180D988000000000000390000000C4275696C64204F7574707574000000000000000000000000010000000100000000000000000000000100000000002180E38B000000000000410000000B46696E64204F75747075740000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180FB7F0000000000001B000000000000000000000000000000000100000001000000000000000446696C65C6030000 1423 @@ -3592,7 +3592,7 @@ Debug 2362 - 00200000010000001900FFFF01001100434D4643546F6F6C426172427574746F6ECC880000000000002500000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018017800000000000002600000000000000000000000000000000010000000100000001801D800000000004002700000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001801A800000000000002800000000000000000000000000000000010000000100000001801B80000000000000290000000000000000000000000000000001000000010000000180E57F0000000000002A00000000000000000000000000000000010000000100000001801C800000000004002B00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018000890000000000002C00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180E48B0000020001002D0000000000000000000000000000000001000000010000000180F07F0000020001002E0000000000000000000000000000000001000000010000000180E8880000020000003700000000000000000000000000000000010000000100000001803B010000020001002F0000000000000000000000000000000001000000010000000180BB8A00000200010030000000000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6E0E01000002000100310000000D57617463682057696E646F7773000000000000000000000000010000000100000000000000000000000100000003001380D88B00000000000031000000085761746368202631000000000000000000000000010000000100000000000000000000000100000000001380D98B00000000000031000000085761746368202632000000000000000000000000010000000100000000000000000000000100000000001380CE01000000000000FFFFFFFF0C576174636820416E63686F720100000000000000010000000000000001000000000000000000000001000000000013800F0100000200010032000000094D656D6F7279202631000000000000000000000000010000000100000000000000000000000100000004001380D28B00000000000032000000094D656D6F7279202631000000000000000000000000010000000100000000000000000000000100000000001380D38B00000000000032000000094D656D6F7279202632000000000000000000000000010000000100000000000000000000000100000000001380D48B00000000000032000000094D656D6F7279202633000000000000000000000000010000000100000000000000000000000100000000001380D58B00000000000032000000094D656D6F72792026340000000000000000000000000100000001000000000000000000000001000000000013801001000002000000330000000855415254202326310000000000000000000000000100000001000000000000000000000001000000040013809307000000000000330000000855415254202326310000000000000000000000000100000001000000000000000000000001000000000013809407000000000000330000000855415254202326320000000000000000000000000100000001000000000000000000000001000000000013809507000000000000330000000855415254202326330000000000000000000000000100000001000000000000000000000001000000000013809607000000000000330000001626446562756720287072696E746629205669657765720000000000000000000000000100000001000000000000000000000001000000000013803C010000000000007200000010416E616C797369732057696E646F7773000000000000000000000000010000000100000000000000000000000100000004001380658A000000000000340000000F264C6F67696320416E616C797A6572000000000000000000000000010000000100000000000000000000000100000000001380DC7F0000000000003E0000001526506572666F726D616E636520416E616C797A6572000000000000000000000000010000000100000000000000000000000100000000001380E788000000000000380000000E26436F646520436F766572616765000000000000000000000000010000000100000000000000000000000100000000001380CD01000000000000FFFFFFFF0F416E616C7973697320416E63686F7201000000000000000100000000000000010000000000000000000000010000000000138053010000000000003F0000000D54726163652057696E646F77730000000000000000000000000100000001000000000000000000000001000000010013805401000000000000FFFFFFFF115472616365204D656E7520416E63686F720100000000000000010000000000000001000000000000000000000001000000000013802901000000000000350000001553797374656D205669657765722057696E646F77730000000000000000000000000100000001000000000000000000000001000000010013804B01000000000000FFFFFFFF1453797374656D2056696577657220416E63686F720100000000000000010000000000000001000000000000000000000001000000000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000013800189000002000000360000000F26546F6F6C626F782057696E646F7700000000000000000000000001000000010000000000000000000000010000000300138044C5000000000000FFFFFFFF0E5570646174652057696E646F77730100000000000000010000000000000001000000000000000000000001000000000013800000000000000400FFFFFFFF000000000000000000010000000000000001000000000000000000000001000000000013805B01000000000000FFFFFFFF12546F6F6C626F78204D656E75416E63686F72010000000000000001000000000000000100000000000000000000000100000000000000000005446562756764020000 + 00200000010000001900FFFF01001100434D4643546F6F6C426172427574746F6ECC880000000000002500000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018017800000000000002600000000000000000000000000000000010000000100000001801D800000000004002700000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001801A800000000000002800000000000000000000000000000000010000000100000001801B80000000000000290000000000000000000000000000000001000000010000000180E57F0000000000002A00000000000000000000000000000000010000000100000001801C800000000000002B00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018000890000000000002C00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180E48B0000020001002D0000000000000000000000000000000001000000010000000180F07F0000020001002E0000000000000000000000000000000001000000010000000180E8880000020000003700000000000000000000000000000000010000000100000001803B010000020001002F0000000000000000000000000000000001000000010000000180BB8A00000200010030000000000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6E0E01000002000100310000000D57617463682057696E646F7773000000000000000000000000010000000100000000000000000000000100000003001380D88B00000000000031000000085761746368202631000000000000000000000000010000000100000000000000000000000100000000001380D98B00000000000031000000085761746368202632000000000000000000000000010000000100000000000000000000000100000000001380CE01000000000000FFFFFFFF0C576174636820416E63686F720100000000000000010000000000000001000000000000000000000001000000000013800F0100000200010032000000094D656D6F7279202631000000000000000000000000010000000100000000000000000000000100000004001380D28B00000000000032000000094D656D6F7279202631000000000000000000000000010000000100000000000000000000000100000000001380D38B00000000000032000000094D656D6F7279202632000000000000000000000000010000000100000000000000000000000100000000001380D48B00000000000032000000094D656D6F7279202633000000000000000000000000010000000100000000000000000000000100000000001380D58B00000000000032000000094D656D6F72792026340000000000000000000000000100000001000000000000000000000001000000000013801001000002000000330000000855415254202326310000000000000000000000000100000001000000000000000000000001000000040013809307000000000000330000000855415254202326310000000000000000000000000100000001000000000000000000000001000000000013809407000000000000330000000855415254202326320000000000000000000000000100000001000000000000000000000001000000000013809507000000000000330000000855415254202326330000000000000000000000000100000001000000000000000000000001000000000013809607000000000000330000001626446562756720287072696E746629205669657765720000000000000000000000000100000001000000000000000000000001000000000013803C010000000000007200000010416E616C797369732057696E646F7773000000000000000000000000010000000100000000000000000000000100000004001380658A000000000000340000000F264C6F67696320416E616C797A6572000000000000000000000000010000000100000000000000000000000100000000001380DC7F0000000000003E0000001526506572666F726D616E636520416E616C797A6572000000000000000000000000010000000100000000000000000000000100000000001380E788000000000000380000000E26436F646520436F766572616765000000000000000000000000010000000100000000000000000000000100000000001380CD01000000000000FFFFFFFF0F416E616C7973697320416E63686F7201000000000000000100000000000000010000000000000000000000010000000000138053010000000000003F0000000D54726163652057696E646F77730000000000000000000000000100000001000000000000000000000001000000010013805401000000000000FFFFFFFF115472616365204D656E7520416E63686F720100000000000000010000000000000001000000000000000000000001000000000013802901000000000000350000001553797374656D205669657765722057696E646F77730000000000000000000000000100000001000000000000000000000001000000010013804B01000000000000FFFFFFFF1453797374656D2056696577657220416E63686F720100000000000000010000000000000001000000000000000000000001000000000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000013800189000002000000360000000F26546F6F6C626F782057696E646F7700000000000000000000000001000000010000000000000000000000010000000300138044C5000000000000FFFFFFFF0E5570646174652057696E646F77730100000000000000010000000000000001000000000000000000000001000000000013800000000000000400FFFFFFFF000000000000000000010000000000000001000000000000000000000001000000000013805B01000000000000FFFFFFFF12546F6F6C626F78204D656E75416E63686F72010000000000000001000000000000000100000000000000000000000100000000000000000005446562756764020000 898 @@ -3616,19 +3616,19 @@ 0 100 - 0 + 2 .\User\main.c - 22 - 28 - 54 + 8 + 44 + 63 1 0 - .\FreeRTOS\config\FreeRTOSConfig.h - 61 + .\Drivers\ESP8266.c + 0 1 30 1 @@ -3636,82 +3636,28 @@ 0 - .\FreeRTOS\portable\RVDS\ARM_CM3\port.c - 28 - 176 - 177 - 1 - - 0 - - - .\FreeRTOS\inc\task.h - 80 - 49 - 53 - 1 - - 0 - - - .\Drivers\LoRa.c - 1 - 1 - 20 - 1 - - 0 - - - .\System\Delay.c - 0 - 1 - 1 - 1 - - 0 - - - .\System\Delay.h - 0 - 1 - 1 - 1 - - 0 - - - .\System\USART.c - 0 - 148 - 160 - 1 - - 0 - - - .\Drivers\LoRa.h + .\Drivers\ESP8266.h 18 1 - 5 + 6 1 0 - .\System\USART.h + .\Application\NetFIFO\NetFIFO.c + 1 + 1 + 13 + 1 + + 0 + + + .\Application\NetFIFO\NetFIFO.h 0 1 - 41 - 1 - - 0 - - - .\SystemFiles\startup_stm32f10x_md.s - 0 - 117 - 133 + 24 1 0 diff --git a/STM32/Gateway_Node/STM32Template.uvoptx b/STM32/Gateway_Node/STM32Template.uvoptx index 01eff4f..8211212 100644 --- a/STM32/Gateway_Node/STM32Template.uvoptx +++ b/STM32/Gateway_Node/STM32Template.uvoptx @@ -149,6 +149,13 @@ + + + 0 + 1 + responseBuffer + + 0 @@ -293,7 +300,7 @@ User - 1 + 0 0 0 0 @@ -909,7 +916,7 @@ System - 1 + 0 0 0 0 @@ -965,7 +972,7 @@ Drivers - 1 + 0 0 0 0 @@ -1361,7 +1368,7 @@ FreeRTOS/portable - 1 + 0 0 0 0 @@ -1423,4 +1430,36 @@ + + Application/NetFIFO + 1 + 0 + 0 + 0 + + 10 + 96 + 1 + 0 + 0 + 0 + .\Application\NetFIFO\NetFIFO.c + NetFIFO.c + 0 + 0 + + + 10 + 97 + 5 + 0 + 0 + 0 + .\Application\NetFIFO\NetFIFO.h + NetFIFO.h + 0 + 0 + + + diff --git a/STM32/Gateway_Node/STM32Template.uvprojx b/STM32/Gateway_Node/STM32Template.uvprojx index 4bcc50e..e2572a3 100644 --- a/STM32/Gateway_Node/STM32Template.uvprojx +++ b/STM32/Gateway_Node/STM32Template.uvprojx @@ -341,7 +341,7 @@ --no-multibyte-chars USE_STDPERIPH_DRIVER - .\SystemFiles;.\Libraries\inc;.\User;.\System;.\Drivers;.\FreeRTOS\inc;.\FreeRTOS\portable\RVDS\ARM_CM3;.\FreeRTOS\config + .\SystemFiles;.\Libraries\inc;.\User;.\System;.\Drivers;.\FreeRTOS\inc;.\FreeRTOS\portable\RVDS\ARM_CM3;.\FreeRTOS\config;.\Application\NetFIFO @@ -902,6 +902,21 @@ + + Application/NetFIFO + + + NetFIFO.c + 1 + .\Application\NetFIFO\NetFIFO.c + + + NetFIFO.h + 5 + .\Application\NetFIFO\NetFIFO.h + + + diff --git a/STM32/Gateway_Node/System/Delay.c b/STM32/Gateway_Node/System/Delay.c index d9687df..1aa0693 100644 --- a/STM32/Gateway_Node/System/Delay.c +++ b/STM32/Gateway_Node/System/Delay.c @@ -29,17 +29,10 @@ void vDelayUs(uint32_t ulNus) SysTick->VAL =0x00; //ռ } -//ʱnms -//עnmsķΧ -//SysTick->LOADΪ24λĴ,,ʱΪ: -//nms<=0xffffff*8*1000/SYSCLK -//SYSCLKλΪHz,nmsλΪms -//72M,nms<=1864 - /** * @brief 뼶ʱ - * @note SystickʱΪ24λʱװصֵΪ0xFFFFFFҲ16777215صֵ0xFFFFFFʵʼصֵȡģֵʱʱ̡ - * Գ1.864sʱᵼ¼Ӷ¶ʱΪxms-16777215Ľ + * @note SystickʱΪ24λʱװصֵΪ0xFFFFFFҲ16777215صֵ0xFFFFFFʵʼصֵȡģֵʱʱ̣ + * usNms<=0xFFFFFF*8*1000/SYSCLK72M£1.864sʱᵼ¼Ӷ¶ʱΪxms-16777215Ľ * @note ºжʱǷ񳬹ʱֳɶ1000ms * @param None * @retval None @@ -68,14 +61,9 @@ void vDelayMs(uint16_t usNms) void vDelayInit(void) { - //ʹDWT - DEMCR |= (uint32_t)TRCENA; - - //DWT CYCCNTĴ0 - DWT_CYCCNT = (uint32_t)0u; - - //ʹCortex-M3 DWT CYCCNTĴ - DWT_CTRL |= (uint32_t)DWT_CTRL_CYCCNTENA; + DEMCR |= (uint32_t)TRCENA; // ʹDWT + DWT_CYCCNT = (uint32_t)0u; // DWT CYCCNTĴ0 + DWT_CTRL |= (uint32_t)DWT_CTRL_CYCCNTENA; // ʹCortex-M3 DWT CYCCNTĴ } // ΢ʱ @@ -89,19 +77,16 @@ void vDelayUs(uint32_t ulNus) ulTicksDelay = ( ulNus * ( SystemCoreClock / (1000000) ) ); // ΢ɵδ ulTicksEnd = ulTicksStart + ulTicksDelay; - // ulTicksEndû - if ( ulTicksEnd >= ulTicksStart ) + if ( ulTicksEnd >= ulTicksStart ) // ulTicksEndû { - // DWT_CYCCNTʱû - if(DWT_CYCCNT > ulTicksStart) + if(DWT_CYCCNT > ulTicksStart) // DWT_CYCCNTʱû { while( DWT_CYCCNT < ulTicksEnd ); } // DWT_CYCCNT else { - // Ѿʱֱ˳ - return; + return; // Ѿʱֱ˳ } } else // ulTicksEnd diff --git a/STM32/Gateway_Node/System/USART.c b/STM32/Gateway_Node/System/USART.c index dd676a7..2264c80 100644 --- a/STM32/Gateway_Node/System/USART.c +++ b/STM32/Gateway_Node/System/USART.c @@ -12,21 +12,21 @@ void vUsartInit(USART_TypeDef *xUsartId, uint32_t ulBaudrate) if (xUsartId == USART1) { /* code */ - RCC_APB2PeriphClockCmd(RCC_APB2Periph_GPIOB,ENABLE); + RCC_APB2PeriphClockCmd(USART1_GPIO_CLOCK, ENABLE); GPIO_InitTypeDef GPIO_InitStructure; GPIO_InitStructure.GPIO_Mode = GPIO_Mode_AF_PP; GPIO_InitStructure.GPIO_Speed = GPIO_Speed_50MHz; GPIO_InitStructure.GPIO_Pin = USART1_GPIO_PIN_TX; - GPIO_Init(GPIOA, &GPIO_InitStructure); + GPIO_Init(USART1_GPIO_PORT, &GPIO_InitStructure); GPIO_InitStructure.GPIO_Mode = GPIO_Mode_IPU; GPIO_InitStructure.GPIO_Speed = GPIO_Speed_50MHz; GPIO_InitStructure.GPIO_Pin = USART1_GPIO_PIN_RX; - GPIO_Init(GPIOA, &GPIO_InitStructure); + GPIO_Init(USART1_GPIO_PORT, &GPIO_InitStructure); USART_InitTypeDef USART_InitStructure; USART_InitStructure.USART_BaudRate = ulBaudrate; // 趨USART_InitڲԶ9600ӦķƵϵдBRRĴ - RCC_APB1PeriphClockCmd(RCC_APB2Periph_USART1,ENABLE); + RCC_APB1PeriphClockCmd(RCC_APB2Periph_USART1, ENABLE); USART_InitStructure.USART_HardwareFlowControl = USART_HardwareFlowControl_None; // Ӳ,ʹ USART_InitStructure.USART_Mode = USART_Mode_Tx|USART_Mode_Rx; // ģʽʹģʽûţģʽͽģʽ USART_InitStructure.USART_Parity = USART_Parity_No; // Уλ @@ -34,13 +34,13 @@ void vUsartInit(USART_TypeDef *xUsartId, uint32_t ulBaudrate) USART_InitStructure.USART_WordLength = USART_WordLength_8b; // ֳҪУ飬ֳѡ8λ USART_Init(USART1,&USART_InitStructure); // ǴڵIJѯģʽʹжϣҪжϣNVIC - USART_ITConfig(USART1,USART_IT_RXNE,ENABLE); // ѡRXNEж,RXNE־λNVICRXNE־λ1ͻNVICжϣ֮жϺн + USART_ITConfig(USART1, USART_IT_RXNE, ENABLE); // ѡRXNEж,RXNE־λNVICRXNE־λ1ͻNVICжϣ֮жϺн NVIC_PriorityGroupConfig(NVIC_PriorityGroup_4); // 飬4Ϊ4bitռȼ0bitӦȼռȼΪ0-15FreeRTOSûӦȼȼ4൱4λռȼ0λӦȼ NVIC_InitTypeDef NVIC_InitStructure; // ʼNVICUSART1ͨ NVIC_InitStructure.NVIC_IRQChannel = USART1_IRQn; // жͨ NVIC_InitStructure.NVIC_IRQChannelCmd = ENABLE; - NVIC_InitStructure.NVIC_IRQChannelPreemptionPriority = 5; // ռȼãFreeRTOSãڷΧڿԵFreeRTOSԡFromISR()βapi + NVIC_InitStructure.NVIC_IRQChannelPreemptionPriority = 7; // ռȼãFreeRTOSãڷΧڿԵFreeRTOSԡFromISR()βapi // NVIC_InitStructure.NVIC_IRQChannelSubPriority = 1; // Ӧȼãò NVIC_Init(&NVIC_InitStructure); // ָNVIC_InitStructureĵַ @@ -48,27 +48,27 @@ void vUsartInit(USART_TypeDef *xUsartId, uint32_t ulBaudrate) } else if (xUsartId == USART2) { /* code */ - RCC_APB2PeriphClockCmd(RCC_APB2Periph_GPIOA,ENABLE); + RCC_APB2PeriphClockCmd(USART2_GPIO_CLOCK,ENABLE); GPIO_InitTypeDef GPIO_InitStructure; GPIO_InitStructure.GPIO_Mode = GPIO_Mode_AF_PP; GPIO_InitStructure.GPIO_Speed = GPIO_Speed_50MHz; GPIO_InitStructure.GPIO_Pin = USART2_GPIO_PIN_TX; - GPIO_Init(GPIOB, &GPIO_InitStructure); + GPIO_Init(USART2_GPIO_PORT, &GPIO_InitStructure); GPIO_InitStructure.GPIO_Mode = GPIO_Mode_IPU; GPIO_InitStructure.GPIO_Pin = USART2_GPIO_PIN_RX; - GPIO_Init(GPIOB, &GPIO_InitStructure); + GPIO_Init(USART2_GPIO_PORT, &GPIO_InitStructure); USART_InitTypeDef USART_InitStructure; USART_InitStructure.USART_BaudRate = ulBaudrate; // 趨USART_InitڲԶ9600ӦķƵϵдBRRĴ - RCC_APB1PeriphClockCmd(RCC_APB1Periph_USART2,ENABLE); + RCC_APB1PeriphClockCmd(RCC_APB1Periph_USART2, ENABLE); USART_InitStructure.USART_HardwareFlowControl = USART_HardwareFlowControl_None; // Ӳ,ʹ USART_InitStructure.USART_Mode = USART_Mode_Tx|USART_Mode_Rx; // ģʽʹģʽûţģʽͽģʽ USART_InitStructure.USART_Parity = USART_Parity_No; // Уλ USART_InitStructure.USART_StopBits = USART_StopBits_1; // һλֹͣλ USART_InitStructure.USART_WordLength = USART_WordLength_8b; // ֳҪУ飬ֳѡ8λ - USART_Init(USART2,&USART_InitStructure); + USART_Init(USART2, &USART_InitStructure); // ǴڵIJѯģʽʹжϣҪжϣNVIC - USART_ITConfig(USART2,USART_IT_RXNE,ENABLE); // ѡRXNEж,RXNE־λNVICRXNE־λ1ͻNVICжϣ֮жϺн + USART_ITConfig(USART2, USART_IT_RXNE, ENABLE); // ѡRXNEж,RXNE־λNVICRXNE־λ1ͻNVICжϣ֮жϺн NVIC_PriorityGroupConfig(NVIC_PriorityGroup_4); // 飬4Ϊ4bitռȼ0bitӦȼռȼΪ0-15FreeRTOSûӦȼȼ4൱4λռȼ0λӦȼ NVIC_InitTypeDef NVIC_InitStructure; // ʼNVICUSART1ͨ @@ -82,16 +82,16 @@ void vUsartInit(USART_TypeDef *xUsartId, uint32_t ulBaudrate) } else if (xUsartId == USART3) { /* code */ - RCC_APB2PeriphClockCmd(RCC_APB2Periph_GPIOB,ENABLE); + RCC_APB2PeriphClockCmd(USART3_GPIO_CLOCK,ENABLE); GPIO_InitTypeDef GPIO_InitStructure; GPIO_InitStructure.GPIO_Mode = GPIO_Mode_AF_PP; GPIO_InitStructure.GPIO_Speed = GPIO_Speed_50MHz; GPIO_InitStructure.GPIO_Pin = USART3_GPIO_PIN_TX; - GPIO_Init(GPIOB, &GPIO_InitStructure); + GPIO_Init(USART3_GPIO_PORT, &GPIO_InitStructure); GPIO_InitStructure.GPIO_Mode = GPIO_Mode_IPU; GPIO_InitStructure.GPIO_Pin = USART3_GPIO_PIN_RX; - GPIO_Init(GPIOB, &GPIO_InitStructure); + GPIO_Init(USART3_GPIO_PORT, &GPIO_InitStructure); USART_InitTypeDef USART_InitStructure; USART_InitStructure.USART_BaudRate = ulBaudrate; // 趨USART_InitڲԶ9600ӦķƵϵдBRRĴ @@ -109,7 +109,7 @@ void vUsartInit(USART_TypeDef *xUsartId, uint32_t ulBaudrate) NVIC_InitTypeDef NVIC_InitStructure; // ʼNVICUSART1ͨ NVIC_InitStructure.NVIC_IRQChannel = USART3_IRQn; // жͨ NVIC_InitStructure.NVIC_IRQChannelCmd = ENABLE; - NVIC_InitStructure.NVIC_IRQChannelPreemptionPriority = 5; // ռȼãFreeRTOSãڷΧڿԵFreeRTOSԡFromISR()βapi + NVIC_InitStructure.NVIC_IRQChannelPreemptionPriority = 6; // ռȼãFreeRTOSãڷΧڿԵFreeRTOSԡFromISR()βapi // NVIC_InitStructure.NVIC_IRQChannelSubPriority = 1; // Ӧȼãò NVIC_Init(&NVIC_InitStructure); // ָNVIC_InitStructureĵַ @@ -220,13 +220,13 @@ void USART1_IRQHandler(void) { /* code */ uint8_t ulRxData = (uint8_t)USART_ReceiveData(USART1); - #if (USE_NONE_SYSTEM == 1) - #elif (USE_FREERTOS == 1) + #if (USE_RTOS == NONE) + #elif (USE_RTOS == FREERTOS) BaseType_t xHigherPriorityTaskWoken = pdFALSE; xQueueSendFromISR(xQueueUsart1IrqHdlr, &ulRxData, &xHigherPriorityTaskWoken); /* Դл */ portYIELD_FROM_ISR(xHigherPriorityTaskWoken); - #elif (USE_OSAL == 1) + #elif (USE_RTOS == OSAL) #endif USART_ClearITPendingBit(USART1, USART_IT_RXNE); } @@ -244,13 +244,28 @@ void USART2_IRQHandler(void) { /* code */ uint8_t ulRxData = (uint8_t)USART_ReceiveData(USART2); - #if (USE_NONE_SYSTEM == 1) - #elif (USE_FREERTOS == 1) + #if (USE_RTOS == NONE) + #elif (USE_RTOS == FREERTOS) BaseType_t xHigherPriorityTaskWoken = pdFALSE; - xQueueSendFromISR(xQueueUsart2IrqHdlr, &ulRxData, &xHigherPriorityTaskWoken); +// xQueueSendFromISR(xQueueUsart2IrqHdlr, &ulRxData, &xHigherPriorityTaskWoken); + // if (xQueueSendFromISR(xQueueUsart2IrqHdlr, &ulRxData, &xHigherPriorityTaskWoken) != pdTRUE) + // { + // /* code */ + // vUsartSendString(USART3, "Queue Init Failed!"); + // } + // Ӷ״̬ + if(xQueueUsart2IrqHdlr != NULL) { + if (xQueueSendFromISR(xQueueUsart2IrqHdlr, &ulRxData, &xHigherPriorityTaskWoken) != pdTRUE) { + // зʧܴ + vUsartSendString(USART3, "Queue Full or Error!"); + } + } else { + vUsartSendString(USART3, "Queue Not Initialized!"); + } + /* Դл */ portYIELD_FROM_ISR(xHigherPriorityTaskWoken); - #elif (USE_OSAL == 1) + #elif (USE_RTOS == OSAL) #endif USART_ClearITPendingBit(USART2, USART_IT_RXNE); } @@ -268,13 +283,13 @@ void USART3_IRQHandler(void) { /* code */ uint8_t ulRxData = (uint8_t)USART_ReceiveData(USART3); - #if (USE_NONE_SYSTEM == 1) - #elif (USE_FREERTOS == 1) + #if (USE_RTOS == NONE) + #elif (USE_RTOS == FREERTOS) BaseType_t xHigherPriorityTaskWoken = pdFALSE; xQueueSendFromISR(xQueueUsart3IrqHdlr, &ulRxData, &xHigherPriorityTaskWoken); /* Դл */ portYIELD_FROM_ISR(xHigherPriorityTaskWoken); - #elif (USE_OSAL == 1) + #elif (USE_RTOS == OSAL) #endif USART_ClearITPendingBit(USART3, USART_IT_RXNE); } diff --git a/STM32/Gateway_Node/System/USART.h b/STM32/Gateway_Node/System/USART.h index b1cdbbb..155c61e 100644 --- a/STM32/Gateway_Node/System/USART.h +++ b/STM32/Gateway_Node/System/USART.h @@ -1,12 +1,18 @@ #ifndef __USART_H__ #define __USART_H__ -#define USE_NONE_SYSTEM 0 -#define USE_FREERTOS 1 -#define USE_OSAL 0 +#define USE_RTOS FREERTOS +#define NONE 0 +#define FREERTOS 1 #define vUsart1IrqHandler USART1_IRQHandler #define vEsp8266IrqHandler USART2_IRQHandler #define vLoRaIrqHandler USART3_IRQHandler +#define USART1_GPIO_CLOCK RCC_APB2Periph_GPIOA +#define USART2_GPIO_CLOCK RCC_APB2Periph_GPIOA +#define USART3_GPIO_CLOCK RCC_APB2Periph_GPIOB +#define USART1_GPIO_PORT GPIOA +#define USART2_GPIO_PORT GPIOA +#define USART3_GPIO_PORT GPIOB #define USART1_GPIO_PIN_TX GPIO_Pin_9 #define USART1_GPIO_PIN_RX GPIO_Pin_10 #define USART2_GPIO_PIN_TX GPIO_Pin_2 @@ -14,24 +20,23 @@ #define USART3_GPIO_PIN_TX GPIO_Pin_10 #define USART3_GPIO_PIN_RX GPIO_Pin_11 -#if (USE_NONE_SYSTEM == 1) -#elif (USE_FREERTOS == 1) +#if (USE_RTOS == NONE) +#elif (USE_RTOS == FREERTOS) #include "FreeRTOS.h" #include "queue.h" -#elif (USE_OSAL == 1) #endif + #include "stm32f10x.h" // Device header #include #include #include -#if (USE_NONE_SYSTEM == 1) -#elif (USE_FREERTOS == 1) +#if (USE_RTOS == NONE) +#elif (USE_RTOS == FREERTOS) extern QueueHandle_t xQueueUsart1IrqHdlr; extern QueueHandle_t xQueueUsart2IrqHdlr; extern QueueHandle_t xQueueUsart3IrqHdlr; -#elif (USE_OSAL == 1) #endif void vUsartInit(USART_TypeDef *xUsartId, uint32_t ulBaudrate); diff --git a/STM32/Gateway_Node/User/main.c b/STM32/Gateway_Node/User/main.c index 16cbff2..f5ec70c 100644 --- a/STM32/Gateway_Node/User/main.c +++ b/STM32/Gateway_Node/User/main.c @@ -6,6 +6,8 @@ #include "Delay.h" #include "USART.h" #include "LED.h" +#include "ESP8266.h" +#include "NetFIFO.h" /* ֤ĸĶϲڡ */ /* һҪ,һһӦ */ @@ -21,6 +23,12 @@ QueueHandle_t xQueueUsart3IrqHdlr; SemaphoreHandle_t xSemWifiRetOkHdlr; SemaphoreHandle_t xSemWifiRetErrHdlr; +/** + * @brief ״ָ̬ʾLED + * @note ͨPC13ŵLEDƣʵϵͳ״ָ̬ʾܡ + * @param *pvParameters ûضIJΪָ + * @retval None + */ /* */ void vTaskStateLed(void *pvParameters) { @@ -28,37 +36,62 @@ void vTaskStateLed(void *pvParameters) { vPc13LedOn(); vTaskDelay(1000); - vUsartPrintf(USART3, "USART3 Printf Test %d\r\n", 123); vPc13LedOff(); vTaskDelay(1000); } } +/** + * @brief WiFi + * @note FreeRTOSжϢлƣESP8266ӦݣӦݴ浽õFIFOڡжǷҪ + * @note ⣺ϢкʹӦݺ쵽һˣ˴ࡣ + * @param *pvParameters ûضIJΪָ + * @retval None + */ void vTaskWifiConnection(void *pvParameters) { - uint8_t ucRetvalQueueWifiSt = 0; - uint8_t ucBufferQueueRec = 0; - vUsartPrintf(USART2, "AT+RST\r\n"); - vTaskDelay(1000); - vUsartPrintf(USART2, "AT+CWMODE=1\r\n"); - vTaskDelay(1000); - /* תַ */ - vUsartPrintf(USART2, "AT+CWJAP=\"Exploration\",\"IPSK25em.\"\r\n"); - while (1) - { - - ucRetvalQueueWifiSt = xQueueReceive(xQueueUsart2IrqHdlr, &ucBufferQueueRec, pdMS_TO_TICKS(30)); - /* code */ - if (ucRetvalQueueWifiSt == pdTRUE) - { - /* code */ - vUsartPrintf(USART3, (char *)&ucBufferQueueRec); - } - else - { - vUsartSendString(USART3, "Queue Receive failed!\r\n"); - vTaskDelay(300); + NetFifoBuffer_t espBuffer; + vNetBufferInit(&espBuffer); + uint8_t ucRetvalQueueWifiSta = 0; + uint8_t ucRetvalQueueByte = 0; + while (1) + { + /* code */ + ucEsp8266SetMode(1); + TickType_t startTime = xTaskGetTickCount(); + while ((xTaskGetTickCount() - startTime) < pdMS_TO_TICKS(3000)) + { + ucRetvalQueueWifiSta = xQueueReceive(xQueueUsart2IrqHdlr, + &ucRetvalQueueByte, + pdMS_TO_TICKS(100)); + if (ucRetvalQueueWifiSta == pdTRUE) + { + // յֽڴ + vNetBufferWrite(&espBuffer, (char)ucRetvalQueueByte); + // Ӧ + uint8_t ucResponseStatus = ucEsp8266ResponseHandler(&espBuffer); + if (strstr(espBuffer.cResponseBuffer, "ready") != NULL) + { + vUsartSendString(USART3, "WiFi Reset Successfully!\r\n"); + vUsartSendString(USART3, espBuffer.cResponseBuffer); + vTaskDelay(1000); + break; + } else if (strstr(espBuffer.cResponseBuffer, "OK") != NULL) + { + /* code */ + vUsartSendString(USART3, "Set WiFi Mode Successfully!\r\n"); + vUsartSendString(USART3, espBuffer.cResponseBuffer); + } else if (strstr(espBuffer.cResponseBuffer, "ERROR") != NULL || + strstr(espBuffer.cResponseBuffer, "FAIL") != NULL) + { + vUsartSendString(USART3, "Error!\r\n"); + vUsartSendString(USART3, espBuffer.cResponseBuffer); + vUsartSendString(USART3, "\r\n"); + break; + } + } } + vTaskDelete(NULL); } } @@ -86,17 +119,23 @@ void vCreateQueuesList(void) (UBaseType_t) 64, (UBaseType_t) sizeof(uint8_t *)); xQueueUsart2IrqHdlr = xQueueCreate( - (UBaseType_t) 64, - (UBaseType_t) sizeof(uint8_t *)); + (UBaseType_t) 1024, + (UBaseType_t) sizeof(char *)); xQueueUsart3IrqHdlr = xQueueCreate( (UBaseType_t) 64, (UBaseType_t) sizeof(uint8_t *)); + if (xQueueUsart2IrqHdlr == NULL) + { + /* code */ + vUsartSendString(USART1, "Queue Init Failed.\r\n"); + vTaskDelay(1000); + } } void vCreateSemaphoresList(void) { - xSemWifiRetOkHdlr = xSemaphoreCreateBinary(); - xSemWifiRetErrHdlr = xSemaphoreCreateBinary(); + xSemWifiRetOkHdlr = xSemaphoreCreateBinary(); + xSemWifiRetErrHdlr = xSemaphoreCreateBinary(); } int main(void)