diff --git a/STM32/Environment_Node/Drivers/LoRa.c b/STM32/Environment_Node/Drivers/LoRa.c index c49d6d2..81be305 100644 --- a/STM32/Environment_Node/Drivers/LoRa.c +++ b/STM32/Environment_Node/Drivers/LoRa.c @@ -84,7 +84,112 @@ void vLoRaToGateExeIdPkt(uint8_t ucExeId) } } -void vLoRaReceivedMesg(void) +eLoRaMsgRecStatus xLoRaMessageReceived(uint8_t *pucData) { + switch (*pucData) + { + case 0xD1: + /* code */ + return statusNode1; + case 0xD2: + return statusNode2; + + case 0xFA: + return statusExeLed; + + case 0xFB: + return statusExeFan; + + case 0xFC: + return statusExeHumidifier; + + case 0xFD: + return statusExeBuzzer; + + case 0xFE: + return statusExeServo; + + case 0x01: + return statusExeOn; + + case 0x00: + return statusExeOff; + + default: + return statusNode1; + } +} + +eLoRaMsgRecStatus xLoRaMsgProcess(uint8_t ucDataRecNodeId, uint8_t ucDataRecExeId, uint8_t ucDataRecExeSta) +{ + switch (xLoRaMessageReceived(&ucDataRecNodeId)) + { + case statusNode1: + /* code */ + while (xLoRaMessageReceived(&ucDataRecExeSta) == statusExeOn) + { + /* code */ + if (xLoRaMessageReceived(&ucDataRecExeId) == statusExeLed) + { + /* code */ + return statusLedOn; + } else if (xLoRaMessageReceived(&ucDataRecExeId) == statusExeFan) + { + /* code */ + return statusFanOn; + } else if (xLoRaMessageReceived(&ucDataRecExeId) == statusExeHumidifier) + { + /* code */ + return statusHumidifierOn; + } + } + while (xLoRaMessageReceived(&ucDataRecExeSta) == statusExeOff) + { + /* code */ + if (xLoRaMessageReceived(&ucDataRecExeId) == statusExeLed) + { + /* code */ + return statusLedOff; + } else if (xLoRaMessageReceived(&ucDataRecExeId) == statusExeFan) + { + /* code */ + return statusFanOff; + } else if (xLoRaMessageReceived(&ucDataRecExeId) == statusExeHumidifier) + { + /* code */ + return statusHumidifierOff; + } + } + + case statusNode2: + while (xLoRaMessageReceived(&ucDataRecExeSta) == statusExeOn) + { + /* code */ + if (xLoRaMessageReceived(&ucDataRecExeId) == statusExeBuzzer) + { + /* code */ + return statusBuzzerOn; + } else if (xLoRaMessageReceived(&ucDataRecExeId) == statusExeServo) + { + /* code */ + return statusServoOn; + } + } + while (xLoRaMessageReceived(&ucDataRecExeSta) == statusExeOff) + { + /* code */ + if (xLoRaMessageReceived(&ucDataRecExeId) == statusExeBuzzer) + { + /* code */ + return statusBuzzerOff; + } else if (xLoRaMessageReceived(&ucDataRecExeId) == statusExeServo) + { + /* code */ + return statusServoOff; + } + } + default: + return statusNode1; + } } diff --git a/STM32/Environment_Node/Drivers/LoRa.h b/STM32/Environment_Node/Drivers/LoRa.h index 555f70f..6ecd577 100644 --- a/STM32/Environment_Node/Drivers/LoRa.h +++ b/STM32/Environment_Node/Drivers/LoRa.h @@ -3,7 +3,7 @@ #include "USART3.h" -#define LORA_MODE +// #define LORA_MODE /* LoRa的静态设置 */ #define LORA_MODE_INIT 1 @@ -36,6 +36,29 @@ /* LoRa移植层 */ +typedef enum { + statusGatawayNode = 1, + statusNode1, + statusNode2, + statusExeLed, + statusExeFan, + statusExeHumidifier, + statusExeBuzzer, + statusExeServo, + statusExeOn, + statusExeOff, + statusLedOn, + statusLedOff, + statusFanOn, + statusFanOff, + statusHumidifierOn, + statusHumidifierOff, + statusBuzzerOn, + statusBuzzerOff, + statusServoOn, + statusServoOff +}eLoRaMsgRecStatus; + typedef struct { uint8_t ucLoRaGateAddrHigh; uint8_t ucLoRaGateAddrLow; @@ -129,6 +152,8 @@ void vLoRaConnectionPkt(uint8_t ucNodeId); void vLoRaToGateIdPkt(uint8_t ucNodeId); void vLoRaToGateSenIdPkt(uint8_t ucSensorId); void vLoRaToGateExeIdPkt(uint8_t ucExecutorId); -void vLoRaReceivedMesg(void); +eLoRaMsgRecStatus xLoRaMessageReceived(uint8_t *pucData); +eLoRaMsgRecStatus xLoRaMsgProcess(uint8_t ucDataRecNodeId, uint8_t ucDataRecExeId, uint8_t ucDataRecExeSta); + #endif diff --git a/STM32/Environment_Node/README.md b/STM32/Environment_Node/README.md index 40edf1e..6d9571a 100644 --- a/STM32/Environment_Node/README.md +++ b/STM32/Environment_Node/README.md @@ -1,7 +1,8 @@ 项目实现逻辑： -一、环境监测节点：= +一、环境监测节点： 1、创建任务：创建了led状态任务、温湿度检测任务和向网关节点传输数据三个任务。 2、创建消息队列：温湿度检测任务将采集到的温湿度数据通过队列发送到传输数据任务，实现数据的保护。在中断服务函数中创建串口接收队列，同时新建一个所有执行器检测状态的任务，用于分析串口队列数据是否符合触发条件，若符合则触发二值信号量，反之则不触发。 +3、创建中断触发消息队列：在串口3创建消息队列，当串口3接收到消息触发中断后，将消息传送到消息队列，同时创建一个任务用于接收消息队列。 本系统在FreeRTOS中引用的api： 一、多任务创建与运行： 1、概念：通过定义任务句柄、名称、优先级，从而实现多任务同时在单核的单片机中以并发或抢占的形式运行。在FreeRTOS中，时钟源频率通常被设定为1kHz(#define configTICK_RATE_HZ ( ( TickType_t ) 1000 ))，时间片1tick也就是1ms。在任务优先级相同的情况下，多个任务按照一个时间片切换运行，也就是轮询式调度；当其中一个任务的优先级较高时（数值较高），该任务会打断其他任务的运行，也就是抢占式调度。在创建任务后，会产生任务控制块，简称TCB，TCB在切换任务的时候，会将创建任务的指针保存到创建的栈里，也就是保存任务现场，直到任务切换过来后再复原现场。FreeRTOS的任务分为4个状态，分别为就绪态、运行态、挂起态和阻塞态，当其中一个任务遇到延时等情况，会进入到阻塞态，会执行其他任务知道延时结束，低优先级任务被高优先级任务打断也同理。 diff --git a/STM32/Environment_Node/STM32Template.uvguix.Exploration b/STM32/Environment_Node/STM32Template.uvguix.Exploration index 5459288..f0980a7 100644 --- a/STM32/Environment_Node/STM32Template.uvguix.Exploration +++ b/STM32/Environment_Node/STM32Template.uvguix.Exploration @@ -15,17 +15,17 @@ 38003 Registers - 140 100 + 140 90 346 Code Coverage - 1010 412 + 1010 160 204 Performance Analyzer - 1170 175 175 252 + 1170 @@ -40,7 +40,7 @@ 1506 Symbols - 321 80 80 + 80 80 80 1936 @@ -101,17 +101,17 @@ -1 - 59 - 78 - 1660 - 761 + 244 + -8 + 1303 + 1048 0 - 2405 - 01000000040000000100000001000000010000000100000000000000020000000000000001000000010000000000000028000000280000000100000011000000000000000100000063433A5C55736572735C4578706C6F726174696F6E5C4465736B746F705C4672656552544F535F4C6F52615F456E7669726F6E6D656E745F417373697374616E745C53544D33325C456E7669726F6E6D656E745F4E6F64655C557365725C6D61696E2E6300000000066D61696E2E6300000000C5D4F200FFFFFFFF67433A5C55736572735C4578706C6F726174696F6E5C4465736B746F705C4672656552544F535F4C6F52615F456E7669726F6E6D656E745F417373697374616E745C53544D33325C456E7669726F6E6D656E745F4E6F64655C53797374656D5C5553415254332E6800000000085553415254332E6800000000FFDC7800FFFFFFFF67433A5C55736572735C4578706C6F726174696F6E5C4465736B746F705C4672656552544F535F4C6F52615F456E7669726F6E6D656E745F417373697374616E745C53544D33325C456E7669726F6E6D656E745F4E6F64655C53797374656D5C5553415254332E6300000000085553415254332E6300000000BECEA100FFFFFFFF65433A5C55736572735C4578706C6F726174696F6E5C4465736B746F705C4672656552544F535F4C6F52615F456E7669726F6E6D656E745F417373697374616E745C53544D33325C456E7669726F6E6D656E745F4E6F64655C447269766572735C4C45442E6800000000054C45442E6800000000F0A0A100FFFFFFFF65433A5C55736572735C4578706C6F726174696F6E5C4465736B746F705C4672656552544F535F4C6F52615F456E7669726F6E6D656E745F417373697374616E745C53544D33325C456E7669726F6E6D656E745F4E6F64655C447269766572735C4C45442E6300000000054C45442E6300000000BCA8E100FFFFFFFF66433A5C55736572735C4578706C6F726174696F6E5C4465736B746F705C4672656552544F535F4C6F52615F456E7669726F6E6D656E745F417373697374616E745C53544D33325C456E7669726F6E6D656E745F4E6F64655C53797374656D5C44656C61792E68000000000744656C61792E68000000009CC1B600FFFFFFFF66433A5C55736572735C4578706C6F726174696F6E5C4465736B746F705C4672656552544F535F4C6F52615F456E7669726F6E6D656E745F417373697374616E745C53544D33325C456E7669726F6E6D656E745F4E6F64655C53797374656D5C44656C61792E63000000000744656C61792E6300000000F7B88600FFFFFFFF67453A5C446174615C50726F6A6563745C496F5450726F6A656374735C4672656552544F535F4C6F52615F456E7669726F6E6D656E745F417373697374616E745C53544D33325C456E7669726F6E6D656E745F4E6F64655C53797374656D5C5379735469636B2E6800000000095379735469636B2E6800000000D9ADC200FFFFFFFF78433A5C55736572735C4578706C6F726174696F6E5C4465736B746F705C4672656552544F535F4C6F52615F456E7669726F6E6D656E745F417373697374616E745C53544D33325C456E7669726F6E6D656E745F4E6F64655C4672656552544F535C636F6E6669675C4672656552544F53436F6E6669672E6800000000104672656552544F53436F6E6669672E6800000000A5C2D700FFFFFFFF6B433A5C55736572735C4578706C6F726174696F6E5C4465736B746F705C4672656552544F535F4C6F52615F456E7669726F6E6D656E745F417373697374616E745C53544D33325C456E7669726F6E6D656E745F4E6F64655C4672656552544F535C7372635C6C6973742E6300000000066C6973742E6300000000B3A6BE00FFFFFFFF6C433A5C55736572735C4578706C6F726174696F6E5C4465736B746F705C4672656552544F535F4C6F52615F456E7669726F6E6D656E745F417373697374616E745C53544D33325C456E7669726F6E6D656E745F4E6F64655C4672656552544F535C7372635C7461736B732E6300000000077461736B732E6300000000EAD6A300FFFFFFFF66433A5C55736572735C4578706C6F726174696F6E5C4465736B746F705C4672656552544F535F4C6F52615F456E7669726F6E6D656E745F417373697374616E745C53544D33325C456E7669726F6E6D656E745F4E6F64655C447269766572735C4C6F52612E6800000000064C6F52612E6800000000F6FA7D00FFFFFFFF66433A5C55736572735C4578706C6F726174696F6E5C4465736B746F705C4672656552544F535F4C6F52615F456E7669726F6E6D656E745F417373697374616E745C53544D33325C456E7669726F6E6D656E745F4E6F64655C447269766572735C4C6F52612E6300000000064C6F52612E6300000000B5E99D00FFFFFFFF7A433A5C55736572735C4578706C6F726174696F6E5C4465736B746F705C4672656552544F535F4C6F52615F456E7669726F6E6D656E745F417373697374616E745C53544D33325C456E7669726F6E6D656E745F4E6F64655C53797374656D46696C65735C737461727475705F73746D3332663130785F6D642E730000000016737461727475705F73746D3332663130785F6D642E73000000005FC3CF00FFFFFFFF6C433A5C55736572735C4578706C6F726174696F6E5C4465736B746F705C4672656552544F535F4C6F52615F456E7669726F6E6D656E745F417373697374616E745C53544D33325C456E7669726F6E6D656E745F4E6F64655C4672656552544F535C7372635C71756575652E63000000000771756575652E6300000000C1838300FFFFFFFF67433A5C55736572735C4578706C6F726174696F6E5C4465736B746F705C4672656552544F535F4C6F52615F456E7669726F6E6D656E745F417373697374616E745C53544D33325C456E7669726F6E6D656E745F4E6F64655C447269766572735C44485431312E63000000000744485431312E6300000000CACAD500FFFFFFFF66433A5C55736572735C4578706C6F726174696F6E5C4465736B746F705C4672656552544F535F4C6F52615F456E7669726F6E6D656E745F417373697374616E745C53544D33325C456E7669726F6E6D656E745F4E6F64655C53797374656D5C43524333322E63000000000743524333322E6300000000C5D4F200FFFFFFFF0100000010000000C5D4F200FFDC7800BECEA100F0A0A100BCA8E1009CC1B600F7B88600D9ADC200A5C2D700B3A6BE00EAD6A300F6FA7D00B5E99D005FC3CF00C1838300CACAD500010000000000000002000000F4000000660000008007000030030000 + 967 + 01000000040000000100000001000000010000000100000000000000020000000000000001000000010000000000000028000000280000000100000006000000000000000100000063433A5C55736572735C4578706C6F726174696F6E5C4465736B746F705C4672656552544F535F4C6F52615F456E7669726F6E6D656E745F417373697374616E745C53544D33325C456E7669726F6E6D656E745F4E6F64655C557365725C6D61696E2E6300000000066D61696E2E6300000000C5D4F200FFFFFFFF67433A5C55736572735C4578706C6F726174696F6E5C4465736B746F705C4672656552544F535F4C6F52615F456E7669726F6E6D656E745F417373697374616E745C53544D33325C456E7669726F6E6D656E745F4E6F64655C53797374656D5C5553415254332E6800000000085553415254332E6800000000FFDC7800FFFFFFFF67433A5C55736572735C4578706C6F726174696F6E5C4465736B746F705C4672656552544F535F4C6F52615F456E7669726F6E6D656E745F417373697374616E745C53544D33325C456E7669726F6E6D656E745F4E6F64655C53797374656D5C5553415254332E6300000000085553415254332E6300000000BECEA100FFFFFFFF66433A5C55736572735C4578706C6F726174696F6E5C4465736B746F705C4672656552544F535F4C6F52615F456E7669726F6E6D656E745F417373697374616E745C53544D33325C456E7669726F6E6D656E745F4E6F64655C447269766572735C4C6F52612E6800000000064C6F52612E6800000000F0A0A100FFFFFFFF66433A5C55736572735C4578706C6F726174696F6E5C4465736B746F705C4672656552544F535F4C6F52615F456E7669726F6E6D656E745F417373697374616E745C53544D33325C456E7669726F6E6D656E745F4E6F64655C447269766572735C4C6F52612E6300000000064C6F52612E6300000000BCA8E100FFFFFFFF7A433A5C55736572735C4578706C6F726174696F6E5C4465736B746F705C4672656552544F535F4C6F52615F456E7669726F6E6D656E745F417373697374616E745C53544D33325C456E7669726F6E6D656E745F4E6F64655C53797374656D46696C65735C737461727475705F73746D3332663130785F6D642E730000000016737461727475705F73746D3332663130785F6D642E73000000009CC1B600FFFFFFFF0100000010000000C5D4F200FFDC7800BECEA100F0A0A100BCA8E1009CC1B600F7B88600D9ADC200A5C2D700B3A6BE00EAD6A300F6FA7D00B5E99D005FC3CF00C1838300CACAD500010000000000000002000000F4000000660000008007000030030000 @@ -1822,7 +1822,7 @@ Build 976 - 00200000010000001000FFFF01001100434D4643546F6F6C426172427574746F6ECF7F0000000000001C0000000000000000000000000000000001000000010000000180D07F0000000000001D000000000000000000000000000000000100000001000000018030800000000000001E000000000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6EC7040000000000006A0000000C4261746368204275696C2664000000000000000000000000010000000100000000000000000000000100000004000580C7040000000000006A0000000C4261746368204275696C266400000000000000000000000001000000010000000000000000000000010000000000058046070000000000006B0000000D42617463682052656275696C640000000000000000000000000100000001000000000000000000000001000000000005804707000000000000FFFFFFFF0B426174636820436C65616E0000000000000000010000000000000001000000000000000000000001000000000005809E8A0000000000001F0000000F4261746326682053657475702E2E2E000000000000000000000000010000000100000000000000000000000100000000000180D17F0000000004002000000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001804C8A0000000000002100000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000FFFF01001900434D4643546F6F6C426172436F6D626F426F78427574746F6EBA000000000000000000000000000000000000000000000000010000000100000096000000030020500000000008546172676574203196000000000000000100085461726765742031000000000180EB880000000000002200000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180C07F000000000000230000000000000000000000000000000001000000010000000180B08A000000000400240000000000000000000000000000000001000000010000000180A8010000000000004E00000000000000000000000000000000010000000100000001807202000000000000530000000000000000000000000000000001000000010000000180BE010000000000005000000000000000000000000000000000010000000100000000000000054275696C64DC010000 + 00200000010000001000FFFF01001100434D4643546F6F6C426172427574746F6ECF7F0000000000001C0000000000000000000000000000000001000000010000000180D07F0000000000001D000000000000000000000000000000000100000001000000018030800000000002001E000000000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6EC7040000000000006A0000000C4261746368204275696C2664000000000000000000000000010000000100000000000000000000000100000004000580C7040000000000006A0000000C4261746368204275696C266400000000000000000000000001000000010000000000000000000000010000000000058046070000000000006B0000000D42617463682052656275696C640000000000000000000000000100000001000000000000000000000001000000000005804707000000000000FFFFFFFF0B426174636820436C65616E0100000000000000000000000100000001000000000000000000000001000000000005809E8A0000000000001F0000000F4261746326682053657475702E2E2E000000000000000000000000010000000100000000000000000000000100000000000180D17F0000000004002000000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001804C8A0000000000002100000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000FFFF01001900434D4643546F6F6C426172436F6D626F426F78427574746F6EBA000000000000000000000000000000000000000000000000010000000100000096000000030020500000000008546172676574203196000000000000000100085461726765742031000000000180EB880000000000002200000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180C07F000000000000230000000000000000000000000000000001000000010000000180B08A000000000400240000000000000000000000000000000001000000010000000180A8010000000000004E00000000000000000000000000000000010000000100000001807202000000000000530000000000000000000000000000000001000000010000000180BE010000000000005000000000000000000000000000000000010000000100000000000000054275696C64DC010000 583 @@ -1838,7 +1838,7 @@ Debug 2373 - 00200000000000001900FFFF01001100434D4643546F6F6C426172427574746F6ECC880000000000002500000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018017800000000000002600000000000000000000000000000000010000000100000001801D800000000000002700000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001801A800000000000002800000000000000000000000000000000010000000100000001801B80000000000000290000000000000000000000000000000001000000010000000180E57F0000000000002A00000000000000000000000000000000010000000100000001801C800000000000002B00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018000890000000000002C00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180E48B0000000000002D0000000000000000000000000000000001000000010000000180F07F0000000000002E0000000000000000000000000000000001000000010000000180E8880000000000003700000000000000000000000000000000010000000100000001803B010000000000002F0000000000000000000000000000000001000000010000000180BB8A00000000000030000000000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6E0E01000000000000310000000D57617463682057696E646F7773000000000000000000000000010000000100000000000000000000000100000003001380D88B00000000000031000000085761746368202631000000000000000000000000010000000100000000000000000000000100000000001380D98B00000000000031000000085761746368202632000000000000000000000000010000000100000000000000000000000100000000001380CE01000000000000FFFFFFFF0C576174636820416E63686F720100000000000000010000000000000001000000000000000000000001000000000013800F01000000000000320000000E4D656D6F72792057696E646F7773000000000000000000000000010000000100000000000000000000000100000004001380D28B00000000000032000000094D656D6F7279202631000000000000000000000000010000000100000000000000000000000100000000001380D38B00000000000032000000094D656D6F7279202632000000000000000000000000010000000100000000000000000000000100000000001380D48B00000000000032000000094D656D6F7279202633000000000000000000000000010000000100000000000000000000000100000000001380D58B00000000000032000000094D656D6F72792026340000000000000000000000000100000001000000000000000000000001000000000013801001000000000000330000000E53657269616C2057696E646F77730000000000000000000000000100000001000000000000000000000001000000040013809307000000000000330000000855415254202326310000000000000000000000000100000001000000000000000000000001000000000013809407000000000000330000000855415254202326320000000000000000000000000100000001000000000000000000000001000000000013809507000000000000330000000855415254202326330000000000000000000000000100000001000000000000000000000001000000000013809607000000000000330000001626446562756720287072696E746629205669657765720000000000000000000000000100000001000000000000000000000001000000000013803C010000000000007200000010416E616C797369732057696E646F7773000000000000000000000000010000000100000000000000000000000100000004001380658A000000000000340000000F264C6F67696320416E616C797A6572000000000000000000000000010000000100000000000000000000000100000000001380DC7F0000000000003E0000001526506572666F726D616E636520416E616C797A6572000000000000000000000000010000000100000000000000000000000100000000001380E788000000000000380000000E26436F646520436F766572616765000000000000000000000000010000000100000000000000000000000100000000001380CD01000000000000FFFFFFFF0F416E616C7973697320416E63686F7201000000000000000100000000000000010000000000000000000000010000000000138053010000000000003F0000000D54726163652057696E646F77730000000000000000000000000100000001000000000000000000000001000000010013805401000000000000FFFFFFFF115472616365204D656E7520416E63686F720100000000000000010000000000000001000000000000000000000001000000000013802901000000000000350000001553797374656D205669657765722057696E646F77730000000000000000000000000100000001000000000000000000000001000000010013804B01000000000000FFFFFFFF1453797374656D2056696577657220416E63686F720100000000000000010000000000000001000000000000000000000001000000000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000013800189000000000000360000000F26546F6F6C626F782057696E646F7700000000000000000000000001000000010000000000000000000000010000000300138044C5000000000000FFFFFFFF0E5570646174652057696E646F77730100000000000000010000000000000001000000000000000000000001000000000013800000000000000400FFFFFFFF000000000000000000010000000000000001000000000000000000000001000000000013805B01000000000000FFFFFFFF12546F6F6C626F78204D656E75416E63686F72010000000000000001000000000000000100000000000000000000000100000000000000000005446562756764020000 + 00200000000000001900FFFF01001100434D4643546F6F6C426172427574746F6ECC880000000000002500000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018017800000000000002600000000000000000000000000000000010000000100000001801D800000000000002700000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001801A800000000000002800000000000000000000000000000000010000000100000001801B80000000000000290000000000000000000000000000000001000000010000000180E57F0000000000002A00000000000000000000000000000000010000000100000001801C800000000000002B00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018000890000000000002C00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180E48B0000000000002D0000000000000000000000000000000001000000010000000180F07F0000000000002E0000000000000000000000000000000001000000010000000180E8880000000000003700000000000000000000000000000000010000000100000001803B010000000000002F0000000000000000000000000000000001000000010000000180BB8A00000000000030000000000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6E0E01000000000000310000000D57617463682057696E646F7773000000000000000000000000010000000100000000000000000000000100000003001380D88B00000000000031000000085761746368202631000000000000000000000000010000000100000000000000000000000100000000001380D98B00000000000031000000085761746368202632000000000000000000000000010000000100000000000000000000000100000000001380CE01000000000000FFFFFFFF0C576174636820416E63686F720000000000000000010000000000000001000000000000000000000001000000000013800F01000000000000320000000E4D656D6F72792057696E646F7773000000000000000000000000010000000100000000000000000000000100000004001380D28B00000000000032000000094D656D6F7279202631000000000000000000000000010000000100000000000000000000000100000000001380D38B00000000000032000000094D656D6F7279202632000000000000000000000000010000000100000000000000000000000100000000001380D48B00000000000032000000094D656D6F7279202633000000000000000000000000010000000100000000000000000000000100000000001380D58B00000000000032000000094D656D6F72792026340000000000000000000000000100000001000000000000000000000001000000000013801001000000000000330000000E53657269616C2057696E646F77730000000000000000000000000100000001000000000000000000000001000000040013809307000000000000330000000855415254202326310000000000000000000000000100000001000000000000000000000001000000000013809407000000000000330000000855415254202326320000000000000000000000000100000001000000000000000000000001000000000013809507000000000000330000000855415254202326330000000000000000000000000100000001000000000000000000000001000000000013809607000000000000330000001626446562756720287072696E746629205669657765720000000000000000000000000100000001000000000000000000000001000000000013803C010000000000007200000010416E616C797369732057696E646F7773000000000000000000000000010000000100000000000000000000000100000004001380658A000000000000340000000F264C6F67696320416E616C797A6572000000000000000000000000010000000100000000000000000000000100000000001380DC7F0000000000003E0000001526506572666F726D616E636520416E616C797A6572000000000000000000000000010000000100000000000000000000000100000000001380E788000000000000380000000E26436F646520436F766572616765000000000000000000000000010000000100000000000000000000000100000000001380CD01000000000000FFFFFFFF0F416E616C7973697320416E63686F7200000000000000000100000000000000010000000000000000000000010000000000138053010000000000003F0000000D54726163652057696E646F77730000000000000000000000000100000001000000000000000000000001000000010013805401000000000000FFFFFFFF115472616365204D656E7520416E63686F720000000000000000010000000000000001000000000000000000000001000000000013802901000000000000350000001553797374656D205669657765722057696E646F77730000000000000000000000000100000001000000000000000000000001000000010013804B01000000000000FFFFFFFF1453797374656D2056696577657220416E63686F720000000000000000010000000000000001000000000000000000000001000000000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000013800189000000000000360000000F26546F6F6C626F782057696E646F7700000000000000000000000001000000010000000000000000000000010000000300138044C5000000000000FFFFFFFF0E5570646174652057696E646F77730000000000000000010000000000000001000000000000000000000001000000000013800000000000000400FFFFFFFF000000000000000000010000000000000001000000000000000000000001000000000013805B01000000000000FFFFFFFF12546F6F6C626F78204D656E75416E63686F72000000000000000001000000000000000100000000000000000000000100000000000000000005446562756764020000 898 @@ -1875,7 +1875,7 @@ 16 - F4000000660000008C060000F4000000 + F40000006600000080070000F4000000 @@ -2011,7 +2011,7 @@ 0 16 - 7705000063000000800700007C020000 + 7A050000660000007D07000063020000 16 @@ -2031,7 +2031,7 @@ 0 16 - F70000006600000089060000C4000000 + F7000000660000007D070000C4000000 16 @@ -2311,7 +2311,7 @@ 0 16 - F70000006600000089060000C4000000 + F7000000660000007D070000C4000000 16 @@ -2351,7 +2351,7 @@ 0 16 - 7A050000660000006406000063020000 + 7A050000660000007D07000063020000 16 @@ -2391,7 +2391,7 @@ 0 16 - F70000006600000089060000C4000000 + F7000000660000007D070000C4000000 16 @@ -2411,7 +2411,7 @@ 0 16 - F70000006600000089060000C4000000 + F7000000660000007D070000C4000000 16 @@ -2431,7 +2431,7 @@ 0 16 - F70000006600000089060000C4000000 + F7000000660000007D070000C4000000 16 @@ -2451,7 +2451,7 @@ 0 16 - F70000006600000089060000C4000000 + F7000000660000007D070000C4000000 16 @@ -2471,7 +2471,7 @@ 0 16 - 7A050000660000006406000063020000 + 7A050000660000007D07000063020000 16 @@ -2491,7 +2491,7 @@ 0 16 - 7A050000660000006406000063020000 + 7A050000660000007D07000063020000 16 @@ -2511,7 +2511,7 @@ 0 16 - 7A050000660000006406000063020000 + 7A050000660000007D07000063020000 16 @@ -2531,7 +2531,7 @@ 0 16 - 7A050000660000006406000063020000 + 7A050000660000007D07000063020000 16 @@ -2551,7 +2551,7 @@ 0 16 - 7A050000660000006406000063020000 + 7A050000660000007D07000063020000 16 @@ -2571,7 +2571,7 @@ 0 16 - 7A050000660000006406000063020000 + 7A050000660000007D07000063020000 16 @@ -2591,7 +2591,7 @@ 0 16 - 7A050000660000006406000063020000 + 7A050000660000007D07000063020000 16 @@ -2611,7 +2611,7 @@ 0 16 - 7A050000660000006406000063020000 + 7A050000660000007D07000063020000 16 @@ -2631,7 +2631,7 @@ 0 16 - 7A050000660000006406000063020000 + 7A050000660000007D07000063020000 16 @@ -2651,7 +2651,7 @@ 0 16 - 7A050000660000006406000063020000 + 7A050000660000007D07000063020000 16 @@ -2671,7 +2671,7 @@ 0 16 - 7A050000660000006406000063020000 + 7A050000660000007D07000063020000 16 @@ -2691,7 +2691,7 @@ 0 16 - 7A050000660000006406000063020000 + 7A050000660000007D07000063020000 16 @@ -2711,7 +2711,7 @@ 0 16 - 7A050000660000006406000063020000 + 7A050000660000007D07000063020000 16 @@ -2731,7 +2731,7 @@ 0 16 - 7A050000660000006406000063020000 + 7A050000660000007D07000063020000 16 @@ -2751,7 +2751,7 @@ 0 16 - 7A050000660000006406000063020000 + 7A050000660000007D07000063020000 16 @@ -2771,7 +2771,7 @@ 0 16 - 7A050000660000006406000063020000 + 7A050000660000007D07000063020000 16 @@ -2791,7 +2791,7 @@ 0 16 - 7A050000660000006406000063020000 + 7A050000660000007D07000063020000 16 @@ -2811,7 +2811,7 @@ 0 16 - 7A050000660000006406000063020000 + 7A050000660000007D07000063020000 16 @@ -2831,7 +2831,7 @@ 0 16 - 7A050000660000006406000063020000 + 7A050000660000007D07000063020000 16 @@ -2851,7 +2851,7 @@ 0 16 - 7A050000660000006406000063020000 + 7A050000660000007D07000063020000 16 @@ -2871,7 +2871,7 @@ 0 16 - 7705000063000000670600007C020000 + 7A050000660000007D07000063020000 16 @@ -3031,7 +3031,7 @@ 0 16 - F70000006600000089060000C4000000 + F7000000660000007D070000C4000000 16 @@ -3051,7 +3051,7 @@ 0 16 - 7A050000660000006406000063020000 + 7A050000660000007D07000063020000 16 @@ -3071,7 +3071,7 @@ 0 16 - 7A050000660000006406000063020000 + 7A050000660000007D07000063020000 16 @@ -3091,7 +3091,7 @@ 0 16 - 7A050000660000006406000063020000 + 7A050000660000007D07000063020000 16 @@ -3111,7 +3111,7 @@ 0 16 - 7A050000660000006406000063020000 + 7A050000660000007D07000063020000 16 @@ -3131,7 +3131,7 @@ 0 16 - 7A050000660000006406000063020000 + 7A050000660000007D07000063020000 16 @@ -3151,7 +3151,7 @@ 0 16 - 7A050000660000006406000063020000 + 7A050000660000007D07000063020000 16 @@ -3171,7 +3171,7 @@ 0 16 - 7A050000660000006406000063020000 + 7A050000660000007D07000063020000 16 @@ -3191,7 +3191,7 @@ 0 16 - 7A050000660000006406000063020000 + 7A050000660000007D07000063020000 16 @@ -3211,7 +3211,7 @@ 0 16 - 7A050000660000006406000063020000 + 7A050000660000007D07000063020000 16 @@ -3231,7 +3231,7 @@ 0 16 - 7A050000660000006406000063020000 + 7A050000660000007D07000063020000 16 @@ -3251,7 +3251,7 @@ 0 16 - 7A050000660000006406000063020000 + 7A050000660000007D07000063020000 16 @@ -3271,7 +3271,7 @@ 0 16 - 7A050000660000006406000063020000 + 7A050000660000007D07000063020000 16 @@ -3291,7 +3291,7 @@ 0 16 - 7A050000660000006406000063020000 + 7A050000660000007D07000063020000 16 @@ -3311,7 +3311,7 @@ 0 16 - 7A050000660000006406000063020000 + 7A050000660000007D07000063020000 16 @@ -3331,7 +3331,7 @@ 0 16 - 7A050000660000006406000063020000 + 7A050000660000007D07000063020000 16 @@ -3351,7 +3351,7 @@ 0 16 - 7A050000660000006406000063020000 + 7A050000660000007D07000063020000 16 @@ -3371,7 +3371,7 @@ 0 16 - 7A050000660000006406000063020000 + 7A050000660000007D07000063020000 16 @@ -3391,7 +3391,7 @@ 0 16 - 7A050000660000006406000063020000 + 7A050000660000007D07000063020000 16 @@ -3411,7 +3411,7 @@ 0 16 - 7A050000660000006406000063020000 + 7A050000660000007D07000063020000 16 @@ -3431,7 +3431,7 @@ 0 16 - 7A050000660000006406000063020000 + 7A050000660000007D07000063020000 16 @@ -3540,14 +3540,14 @@ 3317 - 000000000B000000000000000020000001000000FFFFFFFFFFFFFFFFF4000000DD00000080070000E1000000010000000100001004000000010000000000000000000000FFFFFFFF08000000CB00000057010000CC000000F08B00005A01000079070000D601000045890000FFFF02000B004354616262656450616E650020000001000000F4000000660000008C060000F4000000F40000004F00000080070000DD0000000000000040280056080000000B446973617373656D626C7901000000CB00000001000000FFFFFFFFFFFFFFFF14506572666F726D616E636520416E616C797A6572000000005701000001000000FFFFFFFFFFFFFFFF14506572666F726D616E636520416E616C797A657200000000CC00000001000000FFFFFFFFFFFFFFFF0E4C6F67696320416E616C797A657200000000F08B000001000000FFFFFFFFFFFFFFFF0D436F646520436F766572616765000000005A01000001000000FFFFFFFFFFFFFFFF11496E737472756374696F6E205472616365000000007907000001000000FFFFFFFFFFFFFFFF0F53797374656D20416E616C797A657200000000D601000001000000FFFFFFFFFFFFFFFF104576656E742053746174697374696373000000004589000001000000FFFFFFFFFFFFFFFF00000000000000000000000000000000000000000000000001000000FFFFFFFFCB00000001000000FFFFFFFFCB000000000000000040000000000000FFFFFFFFFFFFFFFF730500004F000000770500007C020000000000000200001004000000010000006DFAFFFFEE000000FFFFFFFF2B000000E2050000CA0900002D8C00002E8C00002F8C0000308C0000318C0000328C0000338C0000348C0000358C0000368C0000378C0000388C0000398C00003A8C00003B8C00003C8C00003D8C00003E8C00003F8C0000408C0000418C000050C3000051C3000052C3000053C3000054C3000055C3000056C3000057C3000058C3000059C300005AC300005BC300005CC300005DC300005EC300005FC3000060C3000061C3000062C3000063C300000180004000000000000090060000660000008007000093020000770500004F000000800700007C02000000000000404100462B0000000753796D626F6C7300000000E205000001000000FFFFFFFFFFFFFFFF0A5472616365204461746100000000CA09000001000000FFFFFFFFFFFFFFFF00000000002D8C000001000000FFFFFFFFFFFFFFFF00000000002E8C000001000000FFFFFFFFFFFFFFFF00000000002F8C000001000000FFFFFFFFFFFFFFFF0000000000308C000001000000FFFFFFFFFFFFFFFF0000000000318C000001000000FFFFFFFFFFFFFFFF0000000000328C000001000000FFFFFFFFFFFFFFFF0000000000338C000001000000FFFFFFFFFFFFFFFF0000000000348C000001000000FFFFFFFFFFFFFFFF0000000000358C000001000000FFFFFFFFFFFFFFFF0000000000368C000001000000FFFFFFFFFFFFFFFF0000000000378C000001000000FFFFFFFFFFFFFFFF0000000000388C000001000000FFFFFFFFFFFFFFFF0000000000398C000001000000FFFFFFFFFFFFFFFF00000000003A8C000001000000FFFFFFFFFFFFFFFF00000000003B8C000001000000FFFFFFFFFFFFFFFF00000000003C8C000001000000FFFFFFFFFFFFFFFF00000000003D8C000001000000FFFFFFFFFFFFFFFF00000000003E8C000001000000FFFFFFFFFFFFFFFF00000000003F8C000001000000FFFFFFFFFFFFFFFF0000000000408C000001000000FFFFFFFFFFFFFFFF0655534152543300000000418C000001000000FFFFFFFFFFFFFFFF000000000050C3000001000000FFFFFFFFFFFFFFFF000000000051C3000001000000FFFFFFFFFFFFFFFF000000000052C3000001000000FFFFFFFFFFFFFFFF000000000053C3000001000000FFFFFFFFFFFFFFFF000000000054C3000001000000FFFFFFFFFFFFFFFF000000000055C3000001000000FFFFFFFFFFFFFFFF000000000056C3000001000000FFFFFFFFFFFFFFFF000000000057C3000001000000FFFFFFFFFFFFFFFF000000000058C3000001000000FFFFFFFFFFFFFFFF000000000059C3000001000000FFFFFFFFFFFFFFFF00000000005AC3000001000000FFFFFFFFFFFFFFFF00000000005BC3000001000000FFFFFFFFFFFFFFFF00000000005CC3000001000000FFFFFFFFFFFFFFFF00000000005DC3000001000000FFFFFFFFFFFFFFFF00000000005EC3000001000000FFFFFFFFFFFFFFFF00000000005FC3000001000000FFFFFFFFFFFFFFFF000000000060C3000001000000FFFFFFFFFFFFFFFF000000000061C3000001000000FFFFFFFFFFFFFFFF000000000062C3000001000000FFFFFFFFFFFFFFFF000000000063C3000001000000FFFFFFFFFFFFFFFFFFFFFFFF000000000000000000000000000000000000000001000000FFFFFFFFE205000001000000FFFFFFFFE2050000000000000010000001000000FFFFFFFFFFFFFFFFF00000004F000000F40000007C020000010000000200001004000000010000000000000000000000FFFFFFFF05000000ED0300006D000000C3000000C400000073940000018000100000010000000000000066000000F000000093020000000000004F000000F00000007C0200000000000040410056050000000750726F6A65637401000000ED03000001000000FFFFFFFFFFFFFFFF05426F6F6B73000000006D00000001000000FFFFFFFFFFFFFFFF0946756E6374696F6E7300000000C300000001000000FFFFFFFFFFFFFFFF0954656D706C6174657300000000C400000001000000FFFFFFFFFFFFFFFF09526567697374657273010000007394000001000000FFFFFFFFFFFFFFFF04000000000000000000000000000000000000000000000001000000FFFFFFFFED03000001000000FFFFFFFFED030000000000000080000001000000FFFFFFFFFFFFFFFF000000007C020000800700008002000001000000010000100400000001000000D2FEFFFFD700000000000000000000000000000001000000C6000000FFFFFFFF0F0000008F070000930700009407000095070000960700009007000091070000B5010000B801000038030000B9050000BA050000BB050000BC050000CB09000001800080000001000000C403000097020000800700006B030000C403000080020000800700005403000000000000404100560F0000001343616C6C20537461636B202B204C6F63616C73010000008F07000001000000FFFFFFFFFFFFFFFF0755415254202331000000009307000001000000FFFFFFFFFFFFFFFF0755415254202332000000009407000001000000FFFFFFFFFFFFFFFF0755415254202333000000009507000001000000FFFFFFFFFFFFFFFF15446562756720287072696E74662920566965776572000000009607000001000000FFFFFFFFFFFFFFFF0757617463682031010000009007000001000000FFFFFFFFFFFFFFFF0757617463682032010000009107000001000000FFFFFFFFFFFFFFFF10547261636520457863657074696F6E7300000000B501000001000000FFFFFFFFFFFFFFFF0E4576656E7420436F756E7465727300000000B801000001000000FFFFFFFFFFFFFFFF09554C494E4B706C7573000000003803000001000000FFFFFFFFFFFFFFFF084D656D6F7279203101000000B905000001000000FFFFFFFFFFFFFFFF084D656D6F7279203200000000BA05000001000000FFFFFFFFFFFFFFFF084D656D6F7279203300000000BB05000001000000FFFFFFFFFFFFFFFF084D656D6F7279203400000000BC05000001000000FFFFFFFFFFFFFFFF105472616365204E617669676174696F6E00000000CB09000001000000FFFFFFFFFFFFFFFF050000000000000001000000000000000100000001000000FFFFFFFFC003000080020000C40300005403000001000000020000100400000000000000000000000000000000000000000000000000000002000000C6000000FFFFFFFF8F07000001000000FFFFFFFF8F07000001000000C6000000000000000080000001000000FFFFFFFFFFFFFFFF00000000540300008007000058030000010000000100001004000000010000000000000000000000FFFFFFFF06000000C5000000C7000000B4010000D2010000CF0100007794000001800080000001000000000000006F03000080070000FD030000000000005803000080070000E60300000000000040820056060000000C4275696C64204F757470757400000000C500000001000000FFFFFFFFFFFFFFFF0D46696E6420496E2046696C657300000000C700000001000000FFFFFFFFFFFFFFFF0A4572726F72204C69737400000000B401000001000000FFFFFFFFFFFFFFFF0E536F757263652042726F7773657200000000D201000001000000FFFFFFFFFFFFFFFF0E416C6C205265666572656E63657300000000CF01000001000000FFFFFFFFFFFFFFFF0642726F777365010000007794000001000000FFFFFFFFFFFFFFFF05000000000000000000000000000000000000000000000001000000FFFFFFFFC500000001000000FFFFFFFFC5000000000000000000000000000000 + 000000000B000000000000000020000001000000FFFFFFFFFFFFFFFFF4000000DD00000080070000E1000000010000000100001004000000010000000000000000000000FFFFFFFF08000000CB00000057010000CC000000F08B00005A01000079070000D601000045890000FFFF02000B004354616262656450616E650020000001000000F40000006600000080070000F4000000F40000004F00000080070000DD0000000000000040280056080000000B446973617373656D626C7901000000CB00000001000000FFFFFFFFFFFFFFFF14506572666F726D616E636520416E616C797A6572000000005701000001000000FFFFFFFFFFFFFFFF14506572666F726D616E636520416E616C797A657200000000CC00000001000000FFFFFFFFFFFFFFFF0E4C6F67696320416E616C797A657200000000F08B000001000000FFFFFFFFFFFFFFFF0D436F646520436F766572616765000000005A01000001000000FFFFFFFFFFFFFFFF11496E737472756374696F6E205472616365000000007907000001000000FFFFFFFFFFFFFFFF0F53797374656D20416E616C797A657200000000D601000001000000FFFFFFFFFFFFFFFF104576656E742053746174697374696373000000004589000001000000FFFFFFFFFFFFFFFF00000000000000000000000000000000000000000000000001000000FFFFFFFFCB00000001000000FFFFFFFFCB000000000000000040000000000000FFFFFFFFFFFFFFFF730500004F000000770500007C020000000000000200000004000000010000006DFAFFFFEE000000FFFFFFFF2B000000E2050000CA0900002D8C00002E8C00002F8C0000308C0000318C0000328C0000338C0000348C0000358C0000368C0000378C0000388C0000398C00003A8C00003B8C00003C8C00003D8C00003E8C00003F8C0000408C0000418C000050C3000051C3000052C3000053C3000054C3000055C3000056C3000057C3000058C3000059C300005AC300005BC300005CC300005DC300005EC300005FC3000060C3000061C3000062C3000063C300000180004000000000000077050000660000008007000093020000770500004F000000800700007C02000000000000404100462B0000000753796D626F6C7300000000E205000001000000FFFFFFFFFFFFFFFF0A5472616365204461746100000000CA09000001000000FFFFFFFFFFFFFFFF00000000002D8C000001000000FFFFFFFFFFFFFFFF00000000002E8C000001000000FFFFFFFFFFFFFFFF00000000002F8C000001000000FFFFFFFFFFFFFFFF0000000000308C000001000000FFFFFFFFFFFFFFFF0000000000318C000001000000FFFFFFFFFFFFFFFF0000000000328C000001000000FFFFFFFFFFFFFFFF0000000000338C000001000000FFFFFFFFFFFFFFFF0000000000348C000001000000FFFFFFFFFFFFFFFF0000000000358C000001000000FFFFFFFFFFFFFFFF0000000000368C000001000000FFFFFFFFFFFFFFFF0000000000378C000001000000FFFFFFFFFFFFFFFF0000000000388C000001000000FFFFFFFFFFFFFFFF0000000000398C000001000000FFFFFFFFFFFFFFFF00000000003A8C000001000000FFFFFFFFFFFFFFFF00000000003B8C000001000000FFFFFFFFFFFFFFFF00000000003C8C000001000000FFFFFFFFFFFFFFFF00000000003D8C000001000000FFFFFFFFFFFFFFFF00000000003E8C000001000000FFFFFFFFFFFFFFFF00000000003F8C000001000000FFFFFFFFFFFFFFFF0000000000408C000001000000FFFFFFFFFFFFFFFF0655534152543300000000418C000001000000FFFFFFFFFFFFFFFF000000000050C3000001000000FFFFFFFFFFFFFFFF000000000051C3000001000000FFFFFFFFFFFFFFFF000000000052C3000001000000FFFFFFFFFFFFFFFF000000000053C3000001000000FFFFFFFFFFFFFFFF000000000054C3000001000000FFFFFFFFFFFFFFFF000000000055C3000001000000FFFFFFFFFFFFFFFF000000000056C3000001000000FFFFFFFFFFFFFFFF000000000057C3000001000000FFFFFFFFFFFFFFFF000000000058C3000001000000FFFFFFFFFFFFFFFF000000000059C3000001000000FFFFFFFFFFFFFFFF00000000005AC3000001000000FFFFFFFFFFFFFFFF00000000005BC3000001000000FFFFFFFFFFFFFFFF00000000005CC3000001000000FFFFFFFFFFFFFFFF00000000005DC3000001000000FFFFFFFFFFFFFFFF00000000005EC3000001000000FFFFFFFFFFFFFFFF00000000005FC3000001000000FFFFFFFFFFFFFFFF000000000060C3000001000000FFFFFFFFFFFFFFFF000000000061C3000001000000FFFFFFFFFFFFFFFF000000000062C3000001000000FFFFFFFFFFFFFFFF000000000063C3000001000000FFFFFFFFFFFFFFFFFFFFFFFF000000000000000000000000000000000000000001000000FFFFFFFFE205000001000000FFFFFFFFE2050000000000000010000001000000FFFFFFFFFFFFFFFFF00000004F000000F40000007C020000010000000200001004000000010000000000000000000000FFFFFFFF05000000ED0300006D000000C3000000C400000073940000018000100000010000000000000066000000F000000093020000000000004F000000F00000007C0200000000000040410056050000000750726F6A65637401000000ED03000001000000FFFFFFFFFFFFFFFF05426F6F6B73000000006D00000001000000FFFFFFFFFFFFFFFF0946756E6374696F6E7300000000C300000001000000FFFFFFFFFFFFFFFF0954656D706C6174657300000000C400000001000000FFFFFFFFFFFFFFFF09526567697374657273010000007394000001000000FFFFFFFFFFFFFFFF04000000000000000000000000000000000000000000000001000000FFFFFFFFED03000001000000FFFFFFFFED030000000000000080000001000000FFFFFFFFFFFFFFFF000000007C020000800700008002000001000000010000100400000001000000D2FEFFFFD700000000000000000000000000000001000000C6000000FFFFFFFF0F0000008F070000930700009407000095070000960700009007000091070000B5010000B801000038030000B9050000BA050000BB050000BC050000CB09000001800080000001000000C403000097020000800700006B030000C403000080020000800700005403000000000000404100560F0000001343616C6C20537461636B202B204C6F63616C73010000008F07000001000000FFFFFFFFFFFFFFFF0755415254202331000000009307000001000000FFFFFFFFFFFFFFFF0755415254202332000000009407000001000000FFFFFFFFFFFFFFFF0755415254202333000000009507000001000000FFFFFFFFFFFFFFFF15446562756720287072696E74662920566965776572000000009607000001000000FFFFFFFFFFFFFFFF0757617463682031010000009007000001000000FFFFFFFFFFFFFFFF0757617463682032010000009107000001000000FFFFFFFFFFFFFFFF10547261636520457863657074696F6E7300000000B501000001000000FFFFFFFFFFFFFFFF0E4576656E7420436F756E7465727300000000B801000001000000FFFFFFFFFFFFFFFF09554C494E4B706C7573000000003803000001000000FFFFFFFFFFFFFFFF084D656D6F7279203101000000B905000001000000FFFFFFFFFFFFFFFF084D656D6F7279203200000000BA05000001000000FFFFFFFFFFFFFFFF084D656D6F7279203300000000BB05000001000000FFFFFFFFFFFFFFFF084D656D6F7279203400000000BC05000001000000FFFFFFFFFFFFFFFF105472616365204E617669676174696F6E00000000CB09000001000000FFFFFFFFFFFFFFFF050000000000000001000000000000000100000001000000FFFFFFFFC003000080020000C40300005403000001000000020000100400000000000000000000000000000000000000000000000000000002000000C6000000FFFFFFFF8F07000001000000FFFFFFFF8F07000001000000C6000000000000000080000001000000FFFFFFFFFFFFFFFF00000000540300008007000058030000010000000100001004000000010000000000000000000000FFFFFFFF06000000C5000000C7000000B4010000D2010000CF0100007794000001800080000001000000000000006F03000080070000FD030000000000005803000080070000E60300000000000040820056060000000C4275696C64204F757470757400000000C500000001000000FFFFFFFFFFFFFFFF0D46696E6420496E2046696C657300000000C700000001000000FFFFFFFFFFFFFFFF0A4572726F72204C69737400000000B401000001000000FFFFFFFFFFFFFFFF0E536F757263652042726F7773657200000000D201000001000000FFFFFFFFFFFFFFFF0E416C6C205265666572656E63657300000000CF01000001000000FFFFFFFFFFFFFFFF0642726F777365010000007794000001000000FFFFFFFFFFFFFFFF05000000000000000000000000000000000000000000000001000000FFFFFFFFC500000001000000FFFFFFFFC5000000000000000000000000000000 59392 File 2842 - 00200000010000002800FFFF01001100434D4643546F6F6C426172427574746F6E00E100000000000000000000000000000000000000000000000100000001000000018001E100000000000001000000000000000000000000000000000100000001000000018003E1000000000000020000000000000000000000000000000001000000010000000180CD7F0000000000000300000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018023E100000000040004000000000000000000000000000000000100000001000000018022E100000000040005000000000000000000000000000000000100000001000000018025E10000000000000600000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001802BE10000000004000700000000000000000000000000000000010000000100000001802CE10000000004000800000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001807A8A0000000000000900000000000000000000000000000000010000000100000001807B8A0000000004000A00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180D3B00000000000000B000000000000000000000000000000000100000001000000018015B10000000004000C0000000000000000000000000000000001000000010000000180F4B00000000004000D000000000000000000000000000000000100000001000000018036B10000000004000E00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180FF88000000000400460000000000000000000000000000000001000000010000000180FE880000000004004500000000000000000000000000000000010000000100000001800B810000000004001300000000000000000000000000000000010000000100000001800C810000000004001400000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180F0880000020000000F000000000000000000000000000000000100000001000000FFFF0100120043555646696E64436F6D626F427574746F6EE8030000000000000000000000000000000000000000000000010000000100000096000000020020500000000010756353656E6448756D694275666665729600000000000000130010756353656E6448756D6942756666657210756353656E6454656D704275666665720D784C6F52615573617274335278087644656C61794D730653616D706C65077563537461746504756349640B75635052785061636B65740A6C6F52614E6F646549440873656E736F7249440D4C45445F504331335F504F52540D55534152545F54797065446566027538067072696E7466056670757463075379735469636B11707852656164795461736B734C6973747314636F6E6669674D41585F5052494F5249544945530C5461736B48616E646C655F7400000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000018024E10000000000001100000000000000000000000000000000010000000100000001800A810000000000001200000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6E2280000002000100150000002153746172742F53746F70202644656275672053657373696F6E094374726C2B46350000000000000000000000000100000001000000000000000000000001000000020021802280000000000000150000002153746172742F53746F70202644656275672053657373696F6E094374726C2B4635000000000000000000000000010000000100000000000000000000000100000000002180E0010000000000007500000021456E65726779204D6561737572656D656E742026776974686F75742044656275670000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180C488000000000400160000000000000000000000000000000001000000010000000180C988000000000400180000000000000000000000000000000001000000010000000180C788000000000000190000000000000000000000000000000001000000010000002180C8880000000000001700000027264B696C6C20416C6C20427265616B706F696E747320696E2043757272656E7420546172676574000000000000000000000000010000000100000000000000000000000100000003002180C8880000000000001700000027264B696C6C20416C6C20427265616B706F696E747320696E2043757272656E7420546172676574000000000000000000000000010000000100000000000000000000000100000000002180E50100000000000078000000264B696C6C20416C6C20427265616B706F696E747320696E204163746976652050726F6A656374000000000000000000000000010000000100000000000000000000000100000000002180E601000000000000790000002F4B696C6C20416C6C20427265616B706F696E747320696E204D756C74692D50726F6A65637420576F726B73706163650000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000021804C010000020001001A0000000F2650726F6A6563742057696E646F77000000000000000000000000010000000100000000000000000000000100000008002180DD880000000000001A0000000750726F6A656374000000000000000000000000010000000100000000000000000000000100000000002180DC8B0000000000003A00000005426F6F6B73000000000000000000000000010000000100000000000000000000000100000000002180E18B0000000000003B0000000946756E6374696F6E73000000000000000000000000010000000100000000000000000000000100000000002180E28B000000000000400000000954656D706C6174657300000000000000000000000001000000010000000000000000000000010000000000218018890000000000003D0000000E536F757263652042726F777365720000000000000000000000000100000001000000000000000000000001000000000021800000000000000400FFFFFFFF00000000000000000001000000000000000100000000000000000000000100000000002180D988000000000000390000000C4275696C64204F7574707574000000000000000000000000010000000100000000000000000000000100000000002180E38B000000000000410000000B46696E64204F75747075740000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180FB7F0000000000001B000000000000000000000000000000000100000001000000000000000446696C65C6030000 + 00200000010000002800FFFF01001100434D4643546F6F6C426172427574746F6E00E100000000000000000000000000000000000000000000000100000001000000018001E100000000000001000000000000000000000000000000000100000001000000018003E1000000000000020000000000000000000000000000000001000000010000000180CD7F0000000000000300000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018023E100000000040004000000000000000000000000000000000100000001000000018022E100000000040005000000000000000000000000000000000100000001000000018025E10000000000000600000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001802BE10000000004000700000000000000000000000000000000010000000100000001802CE10000000004000800000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001807A8A0000000000000900000000000000000000000000000000010000000100000001807B8A0000000004000A00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180D3B00000000000000B000000000000000000000000000000000100000001000000018015B10000000004000C0000000000000000000000000000000001000000010000000180F4B00000000004000D000000000000000000000000000000000100000001000000018036B10000000004000E00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180FF88000000000400460000000000000000000000000000000001000000010000000180FE880000000004004500000000000000000000000000000000010000000100000001800B810000000004001300000000000000000000000000000000010000000100000001800C810000000004001400000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180F0880000020000000F000000000000000000000000000000000100000001000000FFFF0100120043555646696E64436F6D626F427574746F6EE8030000000000000000000000000000000000000000000000010000000100000096000000020020500000000010756353656E6448756D694275666665729600000000000000130010756353656E6448756D6942756666657210756353656E6454656D704275666665720D784C6F52615573617274335278087644656C61794D730653616D706C65077563537461746504756349640B75635052785061636B65740A6C6F52614E6F646549440873656E736F7249440D4C45445F504331335F504F52540D55534152545F54797065446566027538067072696E7466056670757463075379735469636B11707852656164795461736B734C6973747314636F6E6669674D41585F5052494F5249544945530C5461736B48616E646C655F7400000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000018024E10000000000001100000000000000000000000000000000010000000100000001800A810000000000001200000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6E2280000002000100150000002153746172742F53746F70202644656275672053657373696F6E094374726C2B46350000000000000000000000000100000001000000000000000000000001000000020021802280000000000000150000002153746172742F53746F70202644656275672053657373696F6E094374726C2B4635000000000000000000000000010000000100000000000000000000000100000000002180E0010000000000007500000021456E65726779204D6561737572656D656E742026776974686F75742044656275670000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180C488000000000000160000000000000000000000000000000001000000010000000180C988000000000000180000000000000000000000000000000001000000010000000180C788000000000000190000000000000000000000000000000001000000010000002180C8880000000000001700000027264B696C6C20416C6C20427265616B706F696E747320696E2043757272656E7420546172676574000000000000000000000000010000000100000000000000000000000100000003002180C8880000000000001700000027264B696C6C20416C6C20427265616B706F696E747320696E2043757272656E7420546172676574000000000000000000000000010000000100000000000000000000000100000000002180E50100000000000078000000264B696C6C20416C6C20427265616B706F696E747320696E204163746976652050726F6A656374000000000000000000000000010000000100000000000000000000000100000000002180E601000000000000790000002F4B696C6C20416C6C20427265616B706F696E747320696E204D756C74692D50726F6A65637420576F726B73706163650000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000021804C010000020001001A0000000F2650726F6A6563742057696E646F77000000000000000000000000010000000100000000000000000000000100000008002180DD880000000000001A0000000750726F6A656374000000000000000000000000010000000100000000000000000000000100000000002180DC8B0000000000003A00000005426F6F6B73000000000000000000000000010000000100000000000000000000000100000000002180E18B0000000000003B0000000946756E6374696F6E73000000000000000000000000010000000100000000000000000000000100000000002180E28B000000000000400000000954656D706C6174657300000000000000000000000001000000010000000000000000000000010000000000218018890000000000003D0000000E536F757263652042726F777365720000000000000000000000000100000001000000000000000000000001000000000021800000000000000400FFFFFFFF00000000000000000001000000000000000100000000000000000000000100000000002180D988000000000000390000000C4275696C64204F7574707574000000000000000000000000010000000100000000000000000000000100000000002180E38B000000000000410000000B46696E64204F75747075740000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180FB7F0000000000001B000000000000000000000000000000000100000001000000000000000446696C65C6030000 1423 @@ -3563,7 +3563,7 @@ Build 955 - 00200000000000001000FFFF01001100434D4643546F6F6C426172427574746F6ECF7F0000000000001C0000000000000000000000000000000001000000010000000180D07F0000000000001D000000000000000000000000000000000100000001000000018030800000000000001E000000000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6EC7040000000000006A0000000C4261746368204275696C2664000000000000000000000000010000000100000000000000000000000100000004000580C7040000000000006A0000000C4261746368204275696C266400000000000000000000000001000000010000000000000000000000010000000000058046070000000000006B0000000D42617463682052656275696C640000000000000000000000000100000001000000000000000000000001000000000005804707000000000000FFFFFFFF0B426174636820436C65616E0100000000000000010000000000000001000000000000000000000001000000000005809E8A0000000000001F0000000F4261746326682053657475702E2E2E000000000000000000000000010000000100000000000000000000000100000000000180D17F0000000000002000000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001804C8A0000000000002100000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000FFFF01001900434D4643546F6F6C426172436F6D626F426F78427574746F6EBA00000000000000000000000000000000000000000000000001000000010000009600000003002050FFFFFFFF00960000000000000000000180EB880000000000002200000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180C07F000000000000230000000000000000000000000000000001000000010000000180B08A000000000000240000000000000000000000000000000001000000010000000180A8010000000000004E00000000000000000000000000000000010000000100000001807202000000000000530000000000000000000000000000000001000000010000000180BE010000000000005000000000000000000000000000000000010000000100000000000000054275696C64DC010000 + 00200000000000001000FFFF01001100434D4643546F6F6C426172427574746F6ECF7F0000000000001C0000000000000000000000000000000001000000010000000180D07F0000000000001D000000000000000000000000000000000100000001000000018030800000000000001E000000000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6EC7040000000000006A0000000C4261746368204275696C2664000000000000000000000000010000000100000000000000000000000100000004000580C7040000000000006A0000000C4261746368204275696C266400000000000000000000000001000000010000000000000000000000010000000000058046070000000000006B0000000D42617463682052656275696C640000000000000000000000000100000001000000000000000000000001000000000005804707000000000000FFFFFFFF0B426174636820436C65616E0000000000000000010000000000000001000000000000000000000001000000000005809E8A0000000000001F0000000F4261746326682053657475702E2E2E000000000000000000000000010000000100000000000000000000000100000000000180D17F0000000000002000000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001804C8A0000000000002100000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000FFFF01001900434D4643546F6F6C426172436F6D626F426F78427574746F6EBA00000000000000000000000000000000000000000000000001000000010000009600000003002050FFFFFFFF00960000000000000000000180EB880000000000002200000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180C07F000000000000230000000000000000000000000000000001000000010000000180B08A000000000000240000000000000000000000000000000001000000010000000180A8010000000000004E00000000000000000000000000000000010000000100000001807202000000000000530000000000000000000000000000000001000000010000000180BE010000000000005000000000000000000000000000000000010000000100000000000000054275696C64DC010000 583 @@ -3579,7 +3579,7 @@ Debug 2362 - 00200000010000001900FFFF01001100434D4643546F6F6C426172427574746F6ECC880000000000002500000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018017800000000000002600000000000000000000000000000000010000000100000001801D800000000004002700000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001801A800000000000002800000000000000000000000000000000010000000100000001801B80000000000000290000000000000000000000000000000001000000010000000180E57F0000000000002A00000000000000000000000000000000010000000100000001801C800000000000002B00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018000890000000000002C00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180E48B0000020001002D0000000000000000000000000000000001000000010000000180F07F0000020001002E0000000000000000000000000000000001000000010000000180E8880000020000003700000000000000000000000000000000010000000100000001803B010000020001002F0000000000000000000000000000000001000000010000000180BB8A00000200010030000000000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6E0E01000002000100310000000D57617463682057696E646F7773000000000000000000000000010000000100000000000000000000000100000003001380D88B00000000000031000000085761746368202631000000000000000000000000010000000100000000000000000000000100000000001380D98B00000000000031000000085761746368202632000000000000000000000000010000000100000000000000000000000100000000001380CE01000000000000FFFFFFFF0C576174636820416E63686F720100000000000000010000000000000001000000000000000000000001000000000013800F0100000200010032000000094D656D6F7279202631000000000000000000000000010000000100000000000000000000000100000004001380D28B00000000000032000000094D656D6F7279202631000000000000000000000000010000000100000000000000000000000100000000001380D38B00000000000032000000094D656D6F7279202632000000000000000000000000010000000100000000000000000000000100000000001380D48B00000000000032000000094D656D6F7279202633000000000000000000000000010000000100000000000000000000000100000000001380D58B00000000000032000000094D656D6F72792026340000000000000000000000000100000001000000000000000000000001000000000013801001000002000000330000000855415254202326310000000000000000000000000100000001000000000000000000000001000000040013809307000000000000330000000855415254202326310000000000000000000000000100000001000000000000000000000001000000000013809407000000000000330000000855415254202326320000000000000000000000000100000001000000000000000000000001000000000013809507000000000000330000000855415254202326330000000000000000000000000100000001000000000000000000000001000000000013809607000000000000330000001626446562756720287072696E746629205669657765720000000000000000000000000100000001000000000000000000000001000000000013803C010000000000007200000010416E616C797369732057696E646F7773000000000000000000000000010000000100000000000000000000000100000004001380658A000000000000340000000F264C6F67696320416E616C797A6572000000000000000000000000010000000100000000000000000000000100000000001380DC7F0000000000003E0000001526506572666F726D616E636520416E616C797A6572000000000000000000000000010000000100000000000000000000000100000000001380E788000000000000380000000E26436F646520436F766572616765000000000000000000000000010000000100000000000000000000000100000000001380CD01000000000000FFFFFFFF0F416E616C7973697320416E63686F7201000000000000000100000000000000010000000000000000000000010000000000138053010000000000003F0000000D54726163652057696E646F77730000000000000000000000000100000001000000000000000000000001000000010013805401000000000000FFFFFFFF115472616365204D656E7520416E63686F720100000000000000010000000000000001000000000000000000000001000000000013802901000000000000350000001553797374656D205669657765722057696E646F77730000000000000000000000000100000001000000000000000000000001000000010013804B01000000000000FFFFFFFF1453797374656D2056696577657220416E63686F720100000000000000010000000000000001000000000000000000000001000000000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000013800189000002000000360000000F26546F6F6C626F782057696E646F7700000000000000000000000001000000010000000000000000000000010000000300138044C5000000000000FFFFFFFF0E5570646174652057696E646F77730100000000000000010000000000000001000000000000000000000001000000000013800000000000000400FFFFFFFF000000000000000000010000000000000001000000000000000000000001000000000013805B01000000000000FFFFFFFF12546F6F6C626F78204D656E75416E63686F72010000000000000001000000000000000100000000000000000000000100000000000000000005446562756764020000 + 00200000010000001900FFFF01001100434D4643546F6F6C426172427574746F6ECC880000000000002500000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018017800000000000002600000000000000000000000000000000010000000100000001801D800000000004002700000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001801A800000000000002800000000000000000000000000000000010000000100000001801B80000000000000290000000000000000000000000000000001000000010000000180E57F0000000000002A00000000000000000000000000000000010000000100000001801C800000000000002B00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018000890000000000002C00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180E48B0000020001002D0000000000000000000000000000000001000000010000000180F07F0000020001002E0000000000000000000000000000000001000000010000000180E8880000020000003700000000000000000000000000000000010000000100000001803B010000020001002F0000000000000000000000000000000001000000010000000180BB8A00000200010030000000000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6E0E01000002000100310000000D57617463682057696E646F7773000000000000000000000000010000000100000000000000000000000100000003001380D88B00000000000031000000085761746368202631000000000000000000000000010000000100000000000000000000000100000000001380D98B00000000000031000000085761746368202632000000000000000000000000010000000100000000000000000000000100000000001380CE01000000000000FFFFFFFF0C576174636820416E63686F720000000000000000010000000000000001000000000000000000000001000000000013800F0100000200010032000000094D656D6F7279202631000000000000000000000000010000000100000000000000000000000100000004001380D28B00000000000032000000094D656D6F7279202631000000000000000000000000010000000100000000000000000000000100000000001380D38B00000000000032000000094D656D6F7279202632000000000000000000000000010000000100000000000000000000000100000000001380D48B00000000000032000000094D656D6F7279202633000000000000000000000000010000000100000000000000000000000100000000001380D58B00000000000032000000094D656D6F72792026340000000000000000000000000100000001000000000000000000000001000000000013801001000002000000330000000855415254202326310000000000000000000000000100000001000000000000000000000001000000040013809307000000000000330000000855415254202326310000000000000000000000000100000001000000000000000000000001000000000013809407000000000000330000000855415254202326320000000000000000000000000100000001000000000000000000000001000000000013809507000000000000330000000855415254202326330000000000000000000000000100000001000000000000000000000001000000000013809607000000000000330000001626446562756720287072696E746629205669657765720000000000000000000000000100000001000000000000000000000001000000000013803C010000000000007200000010416E616C797369732057696E646F7773000000000000000000000000010000000100000000000000000000000100000004001380658A000000000000340000000F264C6F67696320416E616C797A6572000000000000000000000000010000000100000000000000000000000100000000001380DC7F0000000000003E0000001526506572666F726D616E636520416E616C797A6572000000000000000000000000010000000100000000000000000000000100000000001380E788000000000000380000000E26436F646520436F766572616765000000000000000000000000010000000100000000000000000000000100000000001380CD01000000000000FFFFFFFF0F416E616C7973697320416E63686F7200000000000000000100000000000000010000000000000000000000010000000000138053010000000000003F0000000D54726163652057696E646F77730000000000000000000000000100000001000000000000000000000001000000010013805401000000000000FFFFFFFF115472616365204D656E7520416E63686F720000000000000000010000000000000001000000000000000000000001000000000013802901000000000000350000001553797374656D205669657765722057696E646F77730000000000000000000000000100000001000000000000000000000001000000010013804B01000000000000FFFFFFFF1453797374656D2056696577657220416E63686F720000000000000000010000000000000001000000000000000000000001000000000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000013800189000002000000360000000F26546F6F6C626F782057696E646F7700000000000000000000000001000000010000000000000000000000010000000300138044C5000000000000FFFFFFFF0E5570646174652057696E646F77730000000000000000010000000000000001000000000000000000000001000000000013800000000000000400FFFFFFFF000000000000000000010000000000000001000000000000000000000001000000000013805B01000000000000FFFFFFFF12546F6F6C626F78204D656E75416E63686F72000000000000000001000000000000000100000000000000000000000100000000000000000005446562756764020000 898 @@ -3606,108 +3606,36 @@ 0 .\User\main.c - 5 - 64 - 79 + 12 + 73 + 97 1 0 .\System\USART3.h - 0 + 39 1 - 26 + 22 1 0 .\System\USART3.c - 27 + 12 87 135 1 0 - - .\Drivers\LED.h - 0 - 1 - 19 - 1 - - 0 - - - .\Drivers\LED.c - 0 - 1 - 36 - 1 - - 0 - - - .\System\Delay.h - 0 - 1 - 16 - 1 - - 0 - - - .\System\Delay.c - 0 - 77 - 98 - 1 - - 0 - - - E:\Data\Project\IoTProjects\FreeRTOS_LoRa_Environment_Assistant\STM32\Environment_Node\System\SysTick.h - 18 - 1 - 16 - 1 - - 0 - - - .\FreeRTOS\config\FreeRTOSConfig.h - 2 - 102 - 123 - 1 - - 0 - - - .\FreeRTOS\src\list.c - 0 - 195 - 220 - 1 - - 0 - - - .\FreeRTOS\src\tasks.c - 54 - 6031 - 6052 - 1 - - 0 - .\Drivers\LoRa.h - 27 - 83 - 132 + 108 + 108 + 156 1 0 @@ -3715,8 +3643,8 @@ .\Drivers\LoRa.c 0 - 27 - 75 + 1 + 146 1 0 @@ -3730,33 +3658,6 @@ 0 - - .\FreeRTOS\src\queue.c - 0 - 1576 - 1577 - 1 - - 0 - - - .\Drivers\DHT11.c - 15 - 59 - 110 - 1 - - 0 - - - .\System\CRC32.c - 20 - 1 - 22 - 1 - - 0 - diff --git a/STM32/Environment_Node/STM32Template.uvoptx b/STM32/Environment_Node/STM32Template.uvoptx index 1eb9518..ad5da46 100644 --- a/STM32/Environment_Node/STM32Template.uvoptx +++ b/STM32/Environment_Node/STM32Template.uvoptx @@ -153,13 +153,38 @@ 0 1 - xReturn + ucBufferRecFromIsr 1 1 ucBufferRecFromIsr + + 2 + 1 + ucBufferRecFromIsr + + + 3 + 1 + statusExeLedOn + + + 4 + 1 + ucStatus + + + 5 + 1 + pucData + + + 6 + 1 + ucBufferRecFromIsr + 0 @@ -1095,7 +1120,7 @@ FreeRTOS/inc - 0 + 1 0 0 0 diff --git a/STM32/Environment_Node/System/USART3.h b/STM32/Environment_Node/System/USART3.h index cace087..c42092a 100644 --- a/STM32/Environment_Node/System/USART3.h +++ b/STM32/Environment_Node/System/USART3.h @@ -4,7 +4,6 @@ #include "stm32f10x.h" // Device header #include "FreeRTOS.h" #include "queue.h" -// #include "semphr.h" #include #include #include @@ -15,13 +14,6 @@ #define USART3_GPIO_PIN_ATK_MD0 GPIO_Pin_3 // PB3 #define USART3_QUEUE_LENGTH 256 -typedef struct -{ - /* data */ - uint8_t *ucRxBuffer; - uint8_t ucIndex; -}Usart3RecBuffer_t; - extern QueueHandle_t xQueueUsart3ReHdlr; void vUsart3Init(uint32_t ulUsart3Baudrate); diff --git a/STM32/Environment_Node/User/main.c b/STM32/Environment_Node/User/main.c index 49f4030..64ad2d5 100644 --- a/STM32/Environment_Node/User/main.c +++ b/STM32/Environment_Node/User/main.c @@ -14,12 +14,16 @@ TaskHandle_t xStateLedTaskHdlr; TaskHandle_t xDht11TaskHdlr; TaskHandle_t xRelayCtrlTaskHdlr; TaskHandle_t xLoRaToGateTskHdlr; -TaskHandle_t xLoRaRecMsgTskHdlr; -QueueHandle_t xQueueUsart3ReHdlr; +TaskHandle_t xLoRaMsgRecTskHdlr; /* 创建队列句柄 */ QueueHandle_t xQueueTempHdlr; QueueHandle_t xQueueHumiHdlr; +QueueHandle_t xQueueUsart3ReHdlr; + +/* 创建二值信号量句柄 */ +SemaphoreHandle_t xSemLedOnHandler; +SemaphoreHandle_t xSemLedOffHandler; /* 闪烁LED任务函数，参数为空指针，返回NULL。 */ void vStateLedTask(void *pvParameters) @@ -42,11 +46,9 @@ void vDht11Task(void *pvParameters) if (vDht11Init() != 0) { /* 初始化失败，进行错误处理 */ - // vUsart3Printf("DHT11 Init Failed\r\n."); ucSendTempData = ucSendHumiData = 0xAA; xQueueSend(xQueueTempHdlr, &ucSendTempData, pdMS_TO_TICKS(10)); xQueueSend(xQueueHumiHdlr, &ucSendHumiData, pdMS_TO_TICKS(10)); -// vTaskDelay(50); } while (1) { @@ -55,53 +57,29 @@ void vDht11Task(void *pvParameters) { /* code */ ucSendTempData = xDHT11Data.ucTemp; -// vTaskDelay(50); ucSendHumiData = xDHT11Data.ucHumi; -// vTaskDelay(50); /* 写队列。第一个参数是队列句柄，第二个是写入队列的地址（如数组），第三个是因队列满造成阻塞时的等待时长，也就是无法写入数据时的等待时长，以操作系统默认时钟节拍为准。 */ xQueueSend(xQueueTempHdlr, &ucSendTempData, pdMS_TO_TICKS(10)); xQueueSend(xQueueHumiHdlr, &ucSendHumiData, pdMS_TO_TICKS(10)); } else { - // vUsart3Printf("DHT11 Read Data Failed\r\n."); ucSendTempData = ucSendHumiData = 0xAB; -// vTaskDelay(50); } } } -void vLoRaRecMsgTask(void *pvParameters) -{ - uint8_t ucBufferRecFromIsr[128] = {0}; - static uint32_t ulLastSendTime = 0; - - while (1) - { - if (xQueueReceive(xQueueUsart3ReHdlr, ucBufferRecFromIsr, pdMS_TO_TICKS(10)) == pdTRUE) - { - // 只有超过一定时间没有发送数据时才发送连接包 - if ((xTaskGetTickCount() - ulLastSendTime) > pdMS_TO_TICKS(1000)) - { - vLoRaConnectionPkt(xLoRaGateConfig.ucLoRaGateChannel); - vTaskDelay(10); - } - - vUsart3SendArray(ucBufferRecFromIsr, 1); - ulLastSendTime = xTaskGetTickCount(); - } - } -} - void vLoRaToGatePktTask(void *pvParameters) { uint8_t ucRecTempData = 0; uint8_t ucRecHumiData = 0; + uint8_t testData = 0xAC; + uint8_t ledOff = 0xAD; /* 定义一个返回值判断是否接收成功 */ BaseType_t xQueueTempRetval, xQueueHumiRetval; while (1) { /* code */ - /* 接收队列：队列句柄、给哪个接收数据缓冲区和未接收到数据的等待时长，分3种情况，分别为0、0~portMAX_DELAY和portMAX_DELAY三种，分别对应 + /* 接收队列：队列句柄、传输转存的目标变量或数组和未接收到数据的等待时长，分3种情况，分别为0、0~portMAX_DELAY和portMAX_DELAY三种，分别对应 * 一点不等、等一点时间和等最大时间。在等待队列数据的情况下，该接收队列所在的任务会一直处于阻塞态。 */ xQueueTempRetval = xQueueReceive(xQueueTempHdlr, &ucRecTempData, pdMS_TO_TICKS(10)); @@ -116,23 +94,63 @@ void vLoRaToGatePktTask(void *pvParameters) /* code */ vUsart3SendArray(&ucRecTempData, 1); vUsart3SendArray(&ucRecHumiData, 1); + } + if (xSemaphoreTake(xSemLedOnHandler, pdMS_TO_TICKS(10)) == pdTRUE) + { + /* code */ + vUsart3SendArray(&testData, 1); + vPc13LedOn(); + } + else if (xSemaphoreTake(xSemLedOffHandler, pdMS_TO_TICKS(10)) == pdTRUE) + { + /* code */ + vUsart3SendArray(&ledOff, 1); + vPc13LedOff(); + } + vTaskDelay(1000); } } -void vTasksList(void) +void vLoRaMsgRecTask(void *pvParameters) +{ + uint8_t ucDataRecNodeId = 0, ucDataRecExeId = 0, ucDataRecExeSta = 0; + uint8_t ucRetvalQueueNodeId = 0, ucRetvalQueueExeId = 0, ucRetvalQueueExeSta = 0; + while (1) + { + ucRetvalQueueNodeId = xQueueReceive(xQueueUsart3ReHdlr, &ucDataRecNodeId, portMAX_DELAY); + ucRetvalQueueExeId = xQueueReceive(xQueueUsart3ReHdlr, &ucDataRecExeId, portMAX_DELAY); + ucRetvalQueueExeSta = xQueueReceive(xQueueUsart3ReHdlr, &ucDataRecExeSta, portMAX_DELAY); + while (ucRetvalQueueNodeId == pdTRUE && ucRetvalQueueExeId == pdTRUE && ucRetvalQueueExeSta == pdTRUE) + { + /* code */ + if (xLoRaMsgProcess(ucDataRecNodeId, ucDataRecExeId, ucDataRecExeSta) == statusLedOn) + { + /* code */ + xSemaphoreGive(xSemLedOnHandler); + } else if (xLoRaMsgProcess(ucDataRecNodeId, ucDataRecExeId, ucDataRecExeSta) == statusLedOff) + { + /* code */ + xSemaphoreGive(xSemLedOffHandler); + } + break; + } + } +} + +void vCreateTasksList(void) { /* 进入临界区 */ // taskENTER_CRITICAL(); /* 创建任务，参数分别为任务函数名称、任务名字、栈大小、返回参数值、优先级、任务句柄。 */ - xTaskCreate( - (TaskFunction_t ) vStateLedTask, - (char * ) "TaskName_StateLed", - (configSTACK_DEPTH_TYPE) 512, - (void * ) NULL, - (UBaseType_t ) 2, - (TaskHandle_t * ) &xStateLedTaskHdlr); +// xTaskCreate( +// (TaskFunction_t ) vStateLedTask, +// (char * ) "TaskName_StateLed", +// (configSTACK_DEPTH_TYPE) 512, +// (void * ) NULL, +// (UBaseType_t ) 2, +// (TaskHandle_t * ) &xStateLedTaskHdlr); xTaskCreate( (TaskFunction_t ) vDht11Task, (char * ) "TaskName_DHT11", @@ -148,17 +166,17 @@ void vTasksList(void) (UBaseType_t ) 2, (TaskHandle_t * ) &xLoRaToGateTskHdlr); xTaskCreate( - (TaskFunction_t ) vLoRaRecMsgTask, + (TaskFunction_t ) vLoRaMsgRecTask, (char * ) "TaskName_LoRaReceivedMessage", (configSTACK_DEPTH_TYPE) 512, (void * ) NULL, (UBaseType_t ) 2, - (TaskHandle_t * ) &xLoRaRecMsgTskHdlr); + (TaskHandle_t * ) &xLoRaMsgRecTskHdlr); /* 退出临界区 */ // taskEXIT_CRITICAL(); } -void vMainQueuesList(void) +void vCreateQueuesList(void) { /* 创建队列有两个参数，第一个是队列的长度,也就是这个队列能存放多少个数据； * 第二个参数就是每个数据的大小，单位为字节，在stm32中uint8_t指针的长度一般是4字节。 @@ -170,7 +188,7 @@ void vMainQueuesList(void) (UBaseType_t) 5, (UBaseType_t) sizeof(uint8_t)); xQueueUsart3ReHdlr = xQueueCreate( - (UBaseType_t) 128, + (UBaseType_t) 64, (UBaseType_t) sizeof(uint8_t *)); if (xQueueTempHdlr == NULL || xQueueHumiHdlr == NULL || xQueueUsart3ReHdlr == NULL) { @@ -179,14 +197,21 @@ void vMainQueuesList(void) } } +void vCreateSemaphoreList(void) +{ + xSemLedOnHandler = xSemaphoreCreateBinary(); + xSemLedOffHandler = xSemaphoreCreateBinary(); +} + int main(void) { vFanRelayInit(); vDelayInit(); vPc13LedInit(); vUsart3Init(115200); - vMainQueuesList(); - vTasksList(); + vCreateQueuesList(); + vCreateSemaphoreList(); + vCreateTasksList(); vTaskStartScheduler(); while(1) {