From 3a537f633c99d30fa3fe5d01105f6525a48d3d72 Mon Sep 17 00:00:00 2001 From: "2584532475@qq.com" Date: Mon, 8 Apr 2024 20:38:35 +0800 Subject: [PATCH] =?UTF-8?q?=E5=85=BC=E5=AE=B9=E9=87=91=E5=B7=9D=E4=B8=AD?= =?UTF-8?q?=E5=BF=83=E7=81=8C=E5=8C=BA=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Application/os-app.c | 1 + Application/os-app.h | 17 ++++++--- Board/data.c | 55 ++++++++++++++++++++++++----- Board/data.h | 43 +++++++++++++++++++--- Board/di-board.c | 17 ++++----- Board/di-board.h | 8 ++++- Board/network/cat1drv.c | 30 +++++++++++++++- Board/network/jsonpacket.c | 24 ++++++++++--- Board/network/jsonunpack.c | 20 +++++++++++ Comm/networkthread.c | 2 ++ MDK-ARM/GB01VETx.uvguix.Memory | 50 +++++++++++++------------- Project/g0b1vetx-sluice | 2 +- middleware/easyflash/inc/ef_cfg.h | 4 +-- middleware/easyflash/port/ef_port.c | 6 +++- 14 files changed, 217 insertions(+), 62 deletions(-) diff --git a/Application/os-app.c b/Application/os-app.c index 2092072..bb8f405 100644 --- a/Application/os-app.c +++ b/Application/os-app.c @@ -68,6 +68,7 @@ static void thread_entry (void *parameter) //gCommEvents = rt_event_create ("gCommEvents", RT_IPC_FLAG_FIFO) ; locktimer = rt_timer_create ("locktimer", locktimerouter, RT_NULL, 1000, RT_TIMER_FLAG_ONE_SHOT); // 异常检测定时器 + RtcThreadStart (); SluiceThreadStart(); // 闸门控制线程 U4851ThreadStart(); // 4851采集线程 U4852ThreadStart(); // 4852采集线程 diff --git a/Application/os-app.h b/Application/os-app.h index 0880b52..4c59c62 100644 --- a/Application/os-app.h +++ b/Application/os-app.h @@ -64,10 +64,14 @@ #define CFG_THREAD_PRIORITY 13 // 优先级 #define CFG_THREAD_TIMESLICE 5 -// UI线程 +// 升级 #define UPGRADE_THREAD_PRIORITY 12 // 优先级 #define UPGRADE_THREAD_TIMESLICE 5 +// RTC +#define RTC_THREAD_PRIORITY 11 // 优先级 +#define RTC_THREAD_TIMESLICE 5 + int ThreadNewOsApp (void); void SluiceThreadStart (void); @@ -84,6 +88,7 @@ void CAT1ThreadStart (void); void ZS001ThreadStart (void); void MJEth1ThreadStart (void); void UpgradeThreadStart (void); +void RtcThreadStart (void); #define EVENT_CTRL_SET_OPT_SLU (1U<< 0) // 发送开度控制到提闸线程 #define EVENT_CTRL_SET_STP_SLU (1U<< 1) // 发送停止控制到提闸线程 @@ -118,6 +123,7 @@ void UpgradeThreadStart (void); #define EVENT_TRIG_COMM_RX (1U << 6) // MQTT 接受到数据 #define EVENT_TRIG_COMM_RST (1U << 7) // MQTT 发送数据 #define EVENT_TRIG_UPGRADE_RX (1U << 8) // MQTT 接受到数据 +#define EVENT_TRIG_NETMODE_TX2 (1U << 9) // 通过网络模块向通道2发送数据 #define MAIL_COMM_HEART 0 @@ -127,6 +133,7 @@ void UpgradeThreadStart (void); #define MAIL_COMM_UPACK 4 // 提闸的ACK #define MAIL_COMM_SLACK 5 // 其他的ACK #define MAIL_COMM_READPARA 6 // 读取参数 +#define MAIL_COMM_ACK 7 // 读取参数 #define MAIL_SLUICE_OPT 0 #define MAIL_SLUICE_STP 1 @@ -134,10 +141,10 @@ void UpgradeThreadStart (void); #define MAIL_SLUICE_SDW 3 -#define MAIL_CT_OPT 0 -#define MAIL_CT_SUP 1 -#define MAIL_CT_SDW 2 -#define MAIL_CT_STP 3 +#define MAIL_CT_OPT 0 // 执行 +#define MAIL_CT_SUP 1 // 上升 +#define MAIL_CT_SDW 2 // 下降 +#define MAIL_CT_STP 3 // 停止 #define MAIL_VIEW_LOGIN 1 // 登录成功 需要跳转页面 #define MAIL_VIEW_FLUSH 2 // 刷新界面显示 diff --git a/Board/data.c b/Board/data.c index 90de6de..1524e7c 100644 --- a/Board/data.c +++ b/Board/data.c @@ -3,6 +3,17 @@ + +/****************************************** +* 版本信息 +******************************************/ +volatile const char _makeData[] = __DATE__; //12字节，编译日期 +volatile const char _makeTime[] = __TIME__; //9字节 +volatile const char cBootv[] = "Ver3.0.0"; //获取时添加上面两个时间信息，最大长度64字节 +char _versionTemp[64]; + + + const StrIndex_t cDownDataType[] = { {"run",DownRun} , @@ -14,7 +25,8 @@ const StrIndex_t cDownDataType[] = {"update",DownUpdate}, {"reboot",DownReboot}, {"config",DownConfig}, - {"read",DownRead} + {"read",DownRead} , + {"fact",DownFact} }; @@ -24,20 +36,25 @@ const StrIndex_t cSiteType[] = {"sluice",SiteSluice} , {"flow",SiteFlow} , {"press",SiteSee} , - {"auto",SiteColl} , + {"auto",SiteColl} , // 自动化采集站 {"trans",SiteServer} , - {"level",SiteLevel} + {"level",SiteLevel}, + {"skew",SiteSkew} //测斜仪 }; const StrIndex_t cMotorType[] = { {"mg1000",MT_MG_1000} , - {"qh100",MT_QH_V100} , - {"qh200",MT_QH_V200} , - {"zs100",MT_ZS_V100} , - {"dy100",MT_DY_V100} , - {"kg100",MT_KG_V100} + {"qh100", MT_QH_V100} , + {"qh200", MT_QH_V200} , + {"zs100", MT_ZS_V100} , + {"jz200", MT_JZ_V200} , // 金志 4-20 ma + {"dy100", MT_DY_V100}, // 大禹锥型阀 + {"kg100", MT_KG_V100}, // 开关量模块 + {"kr100", MT_KR_V100}, // 闸位计 + {"asca3", MT_ASC_A3}, // A3 驱动器 + {"ascws", MT_ASC_WS}, // A3 驱动器 }; const StrIndex_t c4851Type[] = @@ -47,6 +64,7 @@ const StrIndex_t c4851Type[] = {"qh200",ST_QH_V200} , {"dy100",ST_DY_V100} , {"kg100",ST_KG_V100} , + {"at100",ST_AT_V100} , }; const StrIndex_t cU485Type[] = @@ -54,6 +72,7 @@ const StrIndex_t cU485Type[] = {"modbus",0} }; +// 485 2 通道 const StrIndex_t c4852Type[] = { {"rds600",ST_RDS_600} , @@ -61,7 +80,8 @@ const StrIndex_t c4852Type[] = {"ht100",ST_HT_V100} , {"zkjszk",ST_ZK_JSZK}, {"djx100",ST_DJX_100}, - {"rds300",ST_RDS_300} + {"rds300",ST_RDS_300}, + {"mi600",ST_MI_600} // 测斜仪 }; @@ -98,7 +118,13 @@ const ParShallInfo_t ParShallTale[] = SluiceData_t SluiceData[SLUICE_COUTN]; WaterData_t WaterData[WATER_COUTN]; + +InclinometerData_t IncData[6]; // 测斜仪数据 + SysData_t SysData; +SOFTRTC_t g_SoftRtc = { + 23,10,1,0,0,0 +}; uint32_t g_ifconfig = 0; uint32_t g_ifupdate = 0; @@ -186,6 +212,17 @@ int cSiteType2Index(char * str) +/********************************************** +获取boot版本信息 +**********************************************/ +void *GetVersion(void) +{ + int i = rt_sprintf(_versionTemp,"%s-%s %s",cBootv, _makeData, _makeTime); + _versionTemp[i] = 0; + return (void*)_versionTemp; +} + + diff --git a/Board/data.h b/Board/data.h index 927de34..f44fda5 100644 --- a/Board/data.h +++ b/Board/data.h @@ -3,8 +3,10 @@ #include + #define SLUICE_COUTN 1// 当前处理几口闸 #define WATER_COUTN 6// 当前接入n个流量计 + #define SUBTOPIC_COUNT 1 // 订阅topic 数量 #define SLUCIE_EXEC_COUNT 20// 闸门异常时间 @@ -13,6 +15,9 @@ + + + extern uint32_t g_ifconfig; extern uint32_t g_ifupdate; @@ -78,18 +83,37 @@ typedef struct SysData_t int fileSize; // 文件大小 } SysData_t; +typedef struct SOFTRTC_t +{ + uint8_t year; + uint8_t month; + uint8_t day; + uint8_t hour; + uint8_t minutes; + uint8_t second; +}SOFTRTC_t; + // 水量参数 +typedef struct InclinometerData_t +{ + uint8_t dir; // 方向 + uint32_t data;// 数据 +} InclinometerData_t; + + +// 测斜数据 typedef struct WaterData_t { - int64_t ttWater; // 累计流量 单位 m3 - int32_t thisFlow; // 瞬时流量 单位 m3 - int32_t thisLevel; // 水位 - int32_t thisSpeed; // 流速 + int64_t ttWater; // 累计流量 单位 m3 + int32_t thisFlow; // 瞬时流量 单位 m3 + int32_t thisLevel; // 水位 + int32_t thisSpeed; // 流速 int32_t thisPress; // 压力 int32_t thisTemp; // 温度 + int retry ; // 重试次数 } WaterData_t; @@ -111,6 +135,8 @@ typedef enum MotorType_t MT_DY_V100, // 大禹锥型阀 MT_KG_V100, // 开关量模块 MT_KR_V100, // 徐州正天闸位计 + MT_ASC_A3, // A3驱动器 + MT_ASC_WS, // 金昌无刷电机 } MotorType_t; typedef enum S4851Type_t @@ -132,6 +158,7 @@ typedef enum S4852Type_t ST_ZK_JSZK, // 精水中科多普勒 ST_DJX_100, // 丁家峡闸门 读取开度 ST_RDS_300, // 雷达流量计 + ST_MI_600, // 鹦鸽嘴测斜仪 } S4852Type_t; @@ -151,7 +178,8 @@ typedef enum SiteType_t SiteSee, // 渗流渗压站 SiteColl, // 采集站 SiteServer, // 串口服务器 - SiteLevel // 水位站 + SiteLevel, // 水位站 + SiteSkew // 测斜仪 }SiteType_t; @@ -167,6 +195,7 @@ typedef enum DownDataType_t DownReboot = 7, // 重启 DownConfig = 8, // 修改参数 DownRead = 9, // 读取参数 + DownFact = 10, // 读取参数 }DownDataType_t; @@ -185,9 +214,11 @@ typedef struct TypeIndexMail_t extern SluiceData_t SluiceData[SLUICE_COUTN]; extern WaterData_t WaterData[WATER_COUTN]; +extern InclinometerData_t IncData[6]; extern SysData_t SysData; extern const WaterLeveInfo_t LeveInfo; extern const ParShallInfo_t ParShallTale[]; +extern SOFTRTC_t g_SoftRtc; int cMotorGetType (char * str); @@ -208,6 +239,8 @@ int cDownType2Index(char * str); int cSiteType2Index(char * str); +void *GetVersion(void); + #endif diff --git a/Board/di-board.c b/Board/di-board.c index db57117..2274763 100644 --- a/Board/di-board.c +++ b/Board/di-board.c @@ -1,39 +1,40 @@ #include "main.h" +#include "di-board.h" -int DiReadChann (int chann) +DIState_t MX_Din_Pull (int chann) { - int ret = -1; + DIState_t ret; switch (chann) { case 1: { - ret = HAL_GPIO_ReadPin (DI1_GPIO_Port, DI1_Pin); + ret = (DIState_t) HAL_GPIO_ReadPin (DI1_GPIO_Port, DI1_Pin); break; } case 2: { - ret = HAL_GPIO_ReadPin (DI2_GPIO_Port, DI2_Pin); + ret = (DIState_t)HAL_GPIO_ReadPin (DI2_GPIO_Port, DI2_Pin); break; } case 3: { - ret = HAL_GPIO_ReadPin (DI3_GPIO_Port, DI4_Pin); + ret = (DIState_t)HAL_GPIO_ReadPin (DI3_GPIO_Port, DI3_Pin); break; } case 4: { - ret = HAL_GPIO_ReadPin (DI4_GPIO_Port, DI4_Pin); + ret = (DIState_t)HAL_GPIO_ReadPin (DI4_GPIO_Port, DI4_Pin); break; } case 5: { - ret = HAL_GPIO_ReadPin (DI5_GPIO_Port, DI5_Pin); + ret = (DIState_t)HAL_GPIO_ReadPin (DI5_GPIO_Port, DI5_Pin); break; } case 6: { - ret = HAL_GPIO_ReadPin (DI6_GPIO_Port, DI6_Pin); + ret = (DIState_t) HAL_GPIO_ReadPin (DI6_GPIO_Port, DI6_Pin); break; } } diff --git a/Board/di-board.h b/Board/di-board.h index 355b92f..e88ee59 100644 --- a/Board/di-board.h +++ b/Board/di-board.h @@ -1,8 +1,14 @@ #ifndef _DI_BOARD_H #define _DI_BOARD_H +typedef enum DIState_t +{ + DI_HIGH = 1, + DI_LOW = 0 +}DIState_t; + void DiInit (void); -int DiReadChann (int chann); +DIState_t MX_Din_Pull (int chann); #endif diff --git a/Board/network/cat1drv.c b/Board/network/cat1drv.c index db3677a..1acca24 100644 --- a/Board/network/cat1drv.c +++ b/Board/network/cat1drv.c @@ -165,7 +165,7 @@ static CommRet_T cat1_sendcmd_and_responce (int time, char * tx, int size, char { if (RT_EOK == rt_event_recv (gUartEvents, EVENT_UART_GSM_RX, RT_EVENT_FLAG_AND | RT_EVENT_FLAG_CLEAR, 0, RT_NULL)) { - // rt_kprintf ("[%.*s]", g_GSMDrv.rx_size, g_GSMDrv.rx_buffer) ; + //rt_kprintf ("[%.*s]", g_GSMDrv.rx_size, g_GSMDrv.rx_buffer) ; if (NULL != rt_strstr ( (char *) g_GSMDrv.rx_buffer, ack)) { if (call != NULL) @@ -278,6 +278,26 @@ CAT1RST: rt_kprintf ("NET:+CME:ERROR QIRD\r\n"); goto CAT1RST; } +// // 通过通道2上报数据 +// if (RT_EOK == rt_event_recv (gTrigEvents, EVENT_TRIG_NETMODE_TX2, RT_EVENT_FLAG_AND | RT_EVENT_FLAG_CLEAR, RT_WAITING_NO, RT_NULL)) // 需要发送数据 +// { +// if (g_cat1Drv.txbuff != NULL) +// { +// rt_sprintf (at_cmd, "AT+QISEND=0,%d\r\n", g_cat1Drv.tx_size); +// rt_thread_mdelay (10); +// if (cat1_sendcmd_and_responce (1000, at_cmd, strlen (at_cmd), ">", NULL) != RetSucc) +// { +// rt_kprintf ("NET:+CME:ERROR QISEND\r\n"); +// goto CAT1RST; +// } +// if (cat1_sendcmd_and_responce (3000, g_cat1Drv.txbuff, g_cat1Drv.tx_size, "SEND OK", NULL) != RetSucc) +// { +// rt_kprintf ("NET:+CME:ERROR QPUSH\r\n"); +// goto CAT1RST; +// } +// } +// } + } rt_thread_mdelay (3000); } @@ -292,6 +312,14 @@ void cat1_service_tx (char * buff, int size) rt_event_send (gTrigEvents, EVENT_TRIG_NETMODE_TX1) ; } +// 通过网络通道2发送数据 +void cat1_service2_tx (char * buff, int size) +{ + rt_memcpy (g_cat1Drv.txbuff, buff, size); + g_cat1Drv.tx_size = size; + rt_event_send (gTrigEvents, EVENT_TRIG_NETMODE_TX2) ; +} + void CAT1ThreadStart (void) { diff --git a/Board/network/jsonpacket.c b/Board/network/jsonpacket.c index f9d4011..a589779 100644 --- a/Board/network/jsonpacket.c +++ b/Board/network/jsonpacket.c @@ -26,15 +26,15 @@ int Json5MinFlowDataPacket (uint8_t * buffer) cJSON_AddItemToObject (root, "site_type", cJSON_CreateString (p)); // 表示流量计 cJSON_AddItemToObject (root, "pver", cJSON_CreateString (PROTO_VER)); // 表示流量计 cJSON_AddItemToObject (root, "iccid", cJSON_CreateString (SysData.iccid)); // 表示流量计 - cJSON_AddItemToObject (root, "ver", cJSON_CreateString (VERSION)); // 表示流量计 + cJSON_AddItemToObject (root, "ver", cJSON_CreateString (GetVersion())); // 表示流量计 cJSON_AddItemToObject (root, "vol", cJSON_CreateNumber (12.3)); // 表示电池电压 cJSON_AddItemToObject (root, "temp", cJSON_CreateNumber (32.5)); // 表示流量计 p = ef_get_env ("net_drv"); cJSON_AddItemToObject (root, "netdrv", cJSON_CreateString (p)); // 表示流量计 p = ef_get_env ("iap_app_filename"); - //uint32_t max_open = atoi (p); cJSON_AddItemToObject (root, "filename", cJSON_CreateString (p)); // 表示电池电压 - cJSON_AddItemToObject (root, "chancnt", cJSON_CreateNumber (1)); // 表示电池电压 + p = ef_get_env ("chancnt"); + cJSON_AddItemToObject (root, "chancnt", cJSON_CreateString (p)); // 表示电池电压 //cJSON_AddItemToObject (root, "chancnt", cJSON_CreateNumber (1)); // 表示电池电压 // 瞬时流速 for (int i = 0; i < 6; i++) @@ -63,7 +63,7 @@ int Json5MinFlowDataPacket (uint8_t * buffer) // 当前水位 for (int i = 0; i < 6; i++) { - dbl[i] = WaterData[i].thisLevel; + dbl[i] = (double)WaterData[i].thisLevel/100; } cJSON * ArrNumLeve = cJSON_CreateDoubleArray (dbl, 6); cJSON_AddItemToObject (root, "thisLeve", ArrNumLeve); @@ -82,6 +82,22 @@ int Json5MinFlowDataPacket (uint8_t * buffer) } cJSON * ArrNumTemp = cJSON_CreateDoubleArray (dbl, 6); cJSON_AddItemToObject (root, "thistemp", ArrNumTemp); + + // 当前测斜方向 + for (int i = 0; i < 6; i++) + { + dbl[i] = IncData[i].dir; + } + cJSON * ArrNumIncDir = cJSON_CreateDoubleArray (dbl, 6); + cJSON_AddItemToObject (root, "thisincdir", ArrNumIncDir); + + // 当前测斜数据 + for (int i = 0; i < 6; i++) + { + dbl[i] = IncData[i].data; + } + cJSON * ArrNumIncData = cJSON_CreateDoubleArray (dbl, 6); + cJSON_AddItemToObject (root, "thisincdata", ArrNumIncData); //---------------------------------------------以下不准修改 result = cJSON_PrintUnformatted (root); diff --git a/Board/network/jsonunpack.c b/Board/network/jsonunpack.c index 6f3d941..a052437 100644 --- a/Board/network/jsonunpack.c +++ b/Board/network/jsonunpack.c @@ -7,9 +7,13 @@ #include #include "data.h" #include "os-app.h" +#include "main.h" char config_list[16][32] = {NULL}; int config_list_size = 0; +// 用于远程出厂设置时保留配置 +char backdevice_id[12] = {0}; +char backnetdrv[12] = {0}; @@ -66,6 +70,7 @@ void JsonUnPacket (int index, char *buff) UpgradeThreadStart(); break; case DownReboot : + HAL_NVIC_SystemReset(); break; case DownConfig: // 设置参数 // 读取参数列表 @@ -80,6 +85,9 @@ void JsonUnPacket (int index, char *buff) ef_set_env (key, value); } } + mail.Type = MAIL_COMM_ACK; + mail.index = index + 1; // 0通道用来升级的通道 + rt_mb_send (gTCommMail, * ( (uint32_t*) &mail)); break; case DownRead: // 读取参数 list = cJSON_GetObjectItem (root, "list"); @@ -94,6 +102,18 @@ void JsonUnPacket (int index, char *buff) rt_mb_send (gTCommMail, * ( (uint32_t*) &mail)); // 读取参数列表 break; + case DownFact: + p = ef_get_env("device_id"); + rt_sprintf(backdevice_id,"%s",p); + p = ef_get_env("net_drv") ; + rt_sprintf(backnetdrv,"%s",p); + ef_env_set_default(); + ef_set_env("device_id",backdevice_id) ; + ef_set_env("net_drv",backnetdrv) ; + mail.Type = MAIL_COMM_ACK; + mail.index = index + 1; // 0通道用来升级的通道 + rt_mb_send (gTCommMail, * ( (uint32_t*) &mail)); + break; default: break; } diff --git a/Comm/networkthread.c b/Comm/networkthread.c index 4d00b2b..94f2484 100644 --- a/Comm/networkthread.c +++ b/Comm/networkthread.c @@ -179,6 +179,8 @@ INIT: break; case SiteFlow: case SiteSee: + case SiteLevel: + case SiteSkew: gMqttDrv.tx_size = Json5MinFlowDataPacket ( (uint8_t *) gMqttDrv.txbuff); break; case SiteColl: diff --git a/MDK-ARM/GB01VETx.uvguix.Memory b/MDK-ARM/GB01VETx.uvguix.Memory index 650e83c..82f8240 100644 --- a/MDK-ARM/GB01VETx.uvguix.Memory +++ b/MDK-ARM/GB01VETx.uvguix.Memory @@ -97,17 +97,17 @@ -1 - 337 - 2503 - 3943 - 1096 + 133 + 1960 + 3400 + 892 0 1394 - 010000000400000001000000010000000100000001000000000000000200000000000000010000000100000000000000280000002800000001000000090000000400000001000000834A3A5C6164645F62795F7A68616E6770656E675C50726F6A6563745C534C554943455C536C756963655C474230564554785C67306231766574782D626F6172645C4D6964646C6577617265735C54686972645F50617274795C5265616C5468726561645F52544F535C636F6D706F6E656E74735C6465766963655C6465766963652E6300000000086465766963652E6300000000C5D4F200FFFFFFFF554A3A5C6164645F62795F7A68616E6770656E675C50726F6A6563745C534C554943455C536C756963655C474230564554785C67306231766574782D626F6172645C52542D5468726561645C7274636F6E6669672E68000000000A7274636F6E6669672E6800000000FFDC7800FFFFFFFF8C4A3A5C6164645F62795F7A68616E6770656E675C50726F6A6563745C534C554943455C536C756963655C474230564554785C67306231766574782D626F6172645C4D6964646C6577617265735C54686972645F50617274795C5265616C5468726561645F52544F535C6273705C5F74656D706C6174655C637562656D785F636F6E6669675C626F6172642E630000000007626F6172642E6300000000BECEA100FFFFFFFF754A3A5C6164645F62795F7A68616E6770656E675C50726F6A6563745C534C554943455C536C756963655C474230564554785C67306231766574782D626F6172645C447269766572735C53544D3332473078785F48414C5F4472697665725C496E635C73746D3332673078785F68616C5F6465662E68000000001373746D3332673078785F68616C5F6465662E6800000000F0A0A100FFFFFFFF504A3A5C6164645F62795F7A68616E6770656E675C50726F6A6563745C534C554943455C536C756963655C474230564554785C67306231766574782D626F6172645C436F72655C5372635C6D61696E2E6300000000066D61696E2E6300000000BCA8E100FFFFFFFF5E4A3A5C6164645F62795F7A68616E6770656E675C50726F6A6563745C534C554943455C536C756963655C474230564554785C67306231766574782D626F6172645C4D444B2D41524D5C737461727475705F73746D33326730623178782E730000000015737461727475705F73746D33326730623178782E73000000009CC1B600FFFFFFFF794A3A5C6164645F62795F7A68616E6770656E675C50726F6A6563745C534C554943455C536C756963655C474230564554785C67306231766574782D626F6172645C4D6964646C6577617265735C54686972645F50617274795C5265616C5468726561645F52544F535C7372635C636F6D706F6E656E74732E63000000000C636F6D706F6E656E74732E6300000000F7B88600FFFFFFFF734A3A5C6164645F62795F7A68616E6770656E675C50726F6A6563745C534C554943455C536C756963655C474230564554785C67306231766574782D626F6172645C4D6964646C6577617265735C54686972645F50617274795C5265616C5468726561645F52544F535C7372635C69646C652E63000000000669646C652E6300000000D9ADC200FFFFFFFF514A3A5C6164645F62795F7A68616E6770656E675C50726F6A6563745C534C554943455C536C756963655C474230564554785C67306231766574782D626F6172645C436F72655C5372635C75736172742E63000000000775736172742E6300000000A5C2D700FFFFFFFF0100000010000000C5D4F200FFDC7800BECEA100F0A0A100BCA8E1009CC1B600F7B88600D9ADC200A5C2D700B3A6BE00EAD6A300F6FA7D00B5E99D005FC3CF00C1838300CACAD500010000000000000002000000C808000066000000000F0000D8020000 + 010000000400000001000000010000000100000001000000000000000200000000000000010000000100000000000000280000002800000001000000090000000400000001000000834A3A5C6164645F62795F7A68616E6770656E675C50726F6A6563745C534C554943455C536C756963655C474230564554785C67306231766574782D626F6172645C4D6964646C6577617265735C54686972645F50617274795C5265616C5468726561645F52544F535C636F6D706F6E656E74735C6465766963655C6465766963652E6300000000086465766963652E6300000000C5D4F200FFFFFFFF554A3A5C6164645F62795F7A68616E6770656E675C50726F6A6563745C534C554943455C536C756963655C474230564554785C67306231766574782D626F6172645C52542D5468726561645C7274636F6E6669672E68000000000A7274636F6E6669672E6800000000FFDC7800FFFFFFFF8C4A3A5C6164645F62795F7A68616E6770656E675C50726F6A6563745C534C554943455C536C756963655C474230564554785C67306231766574782D626F6172645C4D6964646C6577617265735C54686972645F50617274795C5265616C5468726561645F52544F535C6273705C5F74656D706C6174655C637562656D785F636F6E6669675C626F6172642E630000000007626F6172642E6300000000BECEA100FFFFFFFF754A3A5C6164645F62795F7A68616E6770656E675C50726F6A6563745C534C554943455C536C756963655C474230564554785C67306231766574782D626F6172645C447269766572735C53544D3332473078785F48414C5F4472697665725C496E635C73746D3332673078785F68616C5F6465662E68000000001373746D3332673078785F68616C5F6465662E6800000000F0A0A100FFFFFFFF504A3A5C6164645F62795F7A68616E6770656E675C50726F6A6563745C534C554943455C536C756963655C474230564554785C67306231766574782D626F6172645C436F72655C5372635C6D61696E2E6300000000066D61696E2E6300000000BCA8E100FFFFFFFF5E4A3A5C6164645F62795F7A68616E6770656E675C50726F6A6563745C534C554943455C536C756963655C474230564554785C67306231766574782D626F6172645C4D444B2D41524D5C737461727475705F73746D33326730623178782E730000000015737461727475705F73746D33326730623178782E73000000009CC1B600FFFFFFFF794A3A5C6164645F62795F7A68616E6770656E675C50726F6A6563745C534C554943455C536C756963655C474230564554785C67306231766574782D626F6172645C4D6964646C6577617265735C54686972645F50617274795C5265616C5468726561645F52544F535C7372635C636F6D706F6E656E74732E63000000000C636F6D706F6E656E74732E6300000000F7B88600FFFFFFFF734A3A5C6164645F62795F7A68616E6770656E675C50726F6A6563745C534C554943455C536C756963655C474230564554785C67306231766574782D626F6172645C4D6964646C6577617265735C54686972645F50617274795C5265616C5468726561645F52544F535C7372635C69646C652E63000000000669646C652E6300000000D9ADC200FFFFFFFF514A3A5C6164645F62795F7A68616E6770656E675C50726F6A6563745C534C554943455C536C756963655C474230564554785C67306231766574782D626F6172645C436F72655C5372635C75736172742E63000000000775736172742E6300000000A5C2D700FFFFFFFF0100000010000000C5D4F200FFDC7800BECEA100F0A0A100BCA8E1009CC1B600F7B88600D9ADC200A5C2D700B3A6BE00EAD6A300F6FA7D00B5E99D005FC3CF00C1838300CACAD500010000000000000002000000C808000066000000000F0000D0020000 @@ -146,7 +146,7 @@ 0 16 - 030000006600000041010000A8020000 + 030000006600000041010000A0020000 16 @@ -166,7 +166,7 @@ 0 16 - 030000006600000041010000A8020000 + 030000006600000041010000A0020000 16 @@ -446,7 +446,7 @@ 0 16 - 030000006600000041010000A8020000 + 030000006600000041010000A0020000 16 @@ -466,7 +466,7 @@ 0 16 - 030000006600000041010000A8020000 + 030000006600000041010000A0020000 16 @@ -486,7 +486,7 @@ 0 16 - 03000000DC0200007D070000CD030000 + 03000000D40200007D070000C5030000 16 @@ -526,7 +526,7 @@ 0 16 - 03000000DC0200007D070000CD030000 + 03000000D40200007D070000C5030000 16 @@ -1146,7 +1146,7 @@ 0 16 - 030000006600000041010000A8020000 + 030000006600000041010000A0020000 16 @@ -1166,7 +1166,7 @@ 0 16 - 03000000DC0200007D070000CD030000 + 03000000D40200007D070000C5030000 16 @@ -1186,7 +1186,7 @@ 0 16 - 03000000DC0200007D070000CD030000 + 03000000D40200007D070000C5030000 16 @@ -1246,7 +1246,7 @@ 0 16 - 03000000DC0200007D070000CD030000 + 03000000D40200007D070000C5030000 16 @@ -1266,7 +1266,7 @@ 0 16 - 03000000DC0200007D070000CD030000 + 03000000D40200007D070000C5030000 16 @@ -1726,7 +1726,7 @@ 0 16 - 00000000E603000080070000F9030000 + 00000000DE03000080070000F1030000 16 @@ -1795,14 +1795,14 @@ 3312 - 000000000B000000000000000020000000000000FFFFFFFFFFFFFFFFF4000000DF00000090050000E3000000000000000100000004000000010000000000000000000000FFFFFFFF08000000CB00000057010000CC000000F08B00005A01000079070000D601000045890000FFFF02000B004354616262656450616E6500200000000000007408000066000000100D0000F6000000F40000004F00000090050000DF0000000000000040280046080000000B446973617373656D626C7900000000CB00000001000000FFFFFFFFFFFFFFFF14506572666F726D616E636520416E616C797A6572000000005701000001000000FFFFFFFFFFFFFFFF14506572666F726D616E636520416E616C797A657200000000CC00000001000000FFFFFFFFFFFFFFFF0E4C6F67696320416E616C797A657200000000F08B000001000000FFFFFFFFFFFFFFFF0D436F646520436F766572616765000000005A01000001000000FFFFFFFFFFFFFFFF11496E737472756374696F6E205472616365000000007907000001000000FFFFFFFFFFFFFFFF0F53797374656D20416E616C797A657200000000D601000001000000FFFFFFFFFFFFFFFF104576656E742053746174697374696373000000004589000001000000FFFFFFFFFFFFFFFFFFFFFFFF000000000000000000000000000000000000000001000000FFFFFFFFCB00000001000000FFFFFFFFCB000000000000000040000000000000FFFFFFFFFFFFFFFF9C0400004F000000A004000029020000000000000200000004000000010000000000000000000000FFFFFFFF2B000000E2050000CA0900002D8C00002E8C00002F8C0000308C0000318C0000328C0000338C0000348C0000358C0000368C0000378C0000388C0000398C00003A8C00003B8C00003C8C00003D8C00003E8C00003F8C0000408C0000418C000050C3000051C3000052C3000053C3000054C3000055C3000056C3000057C3000058C3000059C300005AC300005BC300005CC300005DC300005EC300005FC3000060C3000061C3000062C3000063C3000001800040000000000000200C000066000000100D000040020000A00400004F000000900500002902000000000000404100462B0000000753796D626F6C7300000000E205000001000000FFFFFFFFFFFFFFFF0A5472616365204461746100000000CA09000001000000FFFFFFFFFFFFFFFF00000000002D8C000001000000FFFFFFFFFFFFFFFF00000000002E8C000001000000FFFFFFFFFFFFFFFF00000000002F8C000001000000FFFFFFFFFFFFFFFF0000000000308C000001000000FFFFFFFFFFFFFFFF0000000000318C000001000000FFFFFFFFFFFFFFFF0000000000328C000001000000FFFFFFFFFFFFFFFF0000000000338C000001000000FFFFFFFFFFFFFFFF0000000000348C000001000000FFFFFFFFFFFFFFFF0000000000358C000001000000FFFFFFFFFFFFFFFF0000000000368C000001000000FFFFFFFFFFFFFFFF0000000000378C000001000000FFFFFFFFFFFFFFFF0000000000388C000001000000FFFFFFFFFFFFFFFF0000000000398C000001000000FFFFFFFFFFFFFFFF00000000003A8C000001000000FFFFFFFFFFFFFFFF00000000003B8C000001000000FFFFFFFFFFFFFFFF00000000003C8C000001000000FFFFFFFFFFFFFFFF00000000003D8C000001000000FFFFFFFFFFFFFFFF00000000003E8C000001000000FFFFFFFFFFFFFFFF00000000003F8C000001000000FFFFFFFFFFFFFFFF0000000000408C000001000000FFFFFFFFFFFFFFFF0000000000418C000001000000FFFFFFFFFFFFFFFF000000000050C3000001000000FFFFFFFFFFFFFFFF000000000051C3000001000000FFFFFFFFFFFFFFFF000000000052C3000001000000FFFFFFFFFFFFFFFF000000000053C3000001000000FFFFFFFFFFFFFFFF000000000054C3000001000000FFFFFFFFFFFFFFFF000000000055C3000001000000FFFFFFFFFFFFFFFF000000000056C3000001000000FFFFFFFFFFFFFFFF000000000057C3000001000000FFFFFFFFFFFFFFFF000000000058C3000001000000FFFFFFFFFFFFFFFF000000000059C3000001000000FFFFFFFFFFFFFFFF00000000005AC3000001000000FFFFFFFFFFFFFFFF00000000005BC3000001000000FFFFFFFFFFFFFFFF00000000005CC3000001000000FFFFFFFFFFFFFFFF00000000005DC3000001000000FFFFFFFFFFFFFFFF00000000005EC3000001000000FFFFFFFFFFFFFFFF00000000005FC3000001000000FFFFFFFFFFFFFFFF000000000060C3000001000000FFFFFFFFFFFFFFFF000000000061C3000001000000FFFFFFFFFFFFFFFF000000000062C3000001000000FFFFFFFFFFFFFFFF000000000063C3000001000000FFFFFFFFFFFFFFFFFFFFFFFF000000000000000000000000000000000000000001000000FFFFFFFFE205000001000000FFFFFFFFE2050000000000000010000001000000FFFFFFFFFFFFFFFF440100004F00000048010000C102000001000000020000100400000001000000C7FEFFFF3C060000FFFFFFFF05000000ED0300006D000000C3000000C400000073940000018000100000010000008007000066000000C4080000D8020000000000004F00000044010000C10200000000000040410056050000000750726F6A65637401000000ED03000001000000FFFFFFFFFFFFFFFF05426F6F6B73010000006D00000001000000FFFFFFFFFFFFFFFF0946756E6374696F6E7301000000C300000001000000FFFFFFFFFFFFFFFF0954656D706C6174657301000000C400000001000000FFFFFFFFFFFFFFFF09526567697374657273000000007394000001000000FFFFFFFFFFFFFFFF00000000000000000000000000000000000000000000000001000000FFFFFFFFED03000001000000FFFFFFFFED030000000000000080000000000000FFFFFFFFFFFFFFFF0000000015020000900500001902000000000000010000000400000001000000000000000000000000000000000000000000000001000000C6000000FFFFFFFF0F0000008F070000930700009407000095070000960700009007000091070000B5010000B801000038030000B9050000BA050000BB050000BC050000CB090000018000800000000000008007000030020000100D0000D4020000000000001902000090050000BD02000000000000404100460F0000001343616C6C20537461636B202B204C6F63616C73000000008F07000001000000FFFFFFFFFFFFFFFF0755415254202331000000009307000001000000FFFFFFFFFFFFFFFF0755415254202332000000009407000001000000FFFFFFFFFFFFFFFF0755415254202333000000009507000001000000FFFFFFFFFFFFFFFF15446562756720287072696E74662920566965776572000000009607000001000000FFFFFFFFFFFFFFFF0757617463682031000000009007000001000000FFFFFFFFFFFFFFFF0757617463682032000000009107000001000000FFFFFFFFFFFFFFFF10547261636520457863657074696F6E7300000000B501000001000000FFFFFFFFFFFFFFFF0E4576656E7420436F756E7465727300000000B801000001000000FFFFFFFFFFFFFFFF09554C494E4B706C7573000000003803000001000000FFFFFFFFFFFFFFFF084D656D6F7279203100000000B905000001000000FFFFFFFFFFFFFFFF084D656D6F7279203200000000BA05000001000000FFFFFFFFFFFFFFFF084D656D6F7279203300000000BB05000001000000FFFFFFFFFFFFFFFF084D656D6F7279203400000000BC05000001000000FFFFFFFFFFFFFFFF105472616365204E617669676174696F6E00000000CB09000001000000FFFFFFFFFFFFFFFFFFFFFFFF0000000001000000000000000000000001000000FFFFFFFFC802000019020000CC020000BD02000000000000020000000400000000000000000000000000000000000000000000000000000002000000C6000000FFFFFFFF8F07000001000000FFFFFFFF8F07000001000000C6000000000000000080000001000000FFFFFFFFFFFFFFFF00000000C102000080070000C5020000010000000100001004000000010000004CFDFFFF8E000000FFFFFFFF06000000C5000000C7000000B4010000D2010000CF010000779400000180008000000100000080070000DC020000000F0000FD03000000000000C502000080070000E60300000000000040820056060000000C4275696C64204F757470757401000000C500000001000000FFFFFFFFFFFFFFFF0D46696E6420496E2046696C657301000000C700000001000000FFFFFFFFFFFFFFFF0A4572726F72204C69737400000000B401000001000000FFFFFFFFFFFFFFFF0E536F757263652042726F7773657200000000D201000001000000FFFFFFFFFFFFFFFF0E416C6C205265666572656E63657300000000CF01000001000000FFFFFFFFFFFFFFFF0742726F77736572010000007794000001000000FFFFFFFFFFFFFFFF00000000000000000000000000000000000000000000000001000000FFFFFFFFC500000001000000FFFFFFFFC5000000000000000000000000000000 + 000000000B000000000000000020000000000000FFFFFFFFFFFFFFFFF4000000DF00000090050000E3000000000000000100000004000000010000000000000000000000FFFFFFFF08000000CB00000057010000CC000000F08B00005A01000079070000D601000045890000FFFF02000B004354616262656450616E6500200000000000007408000066000000100D0000F6000000F40000004F00000090050000DF0000000000000040280046080000000B446973617373656D626C7900000000CB00000001000000FFFFFFFFFFFFFFFF14506572666F726D616E636520416E616C797A6572000000005701000001000000FFFFFFFFFFFFFFFF14506572666F726D616E636520416E616C797A657200000000CC00000001000000FFFFFFFFFFFFFFFF0E4C6F67696320416E616C797A657200000000F08B000001000000FFFFFFFFFFFFFFFF0D436F646520436F766572616765000000005A01000001000000FFFFFFFFFFFFFFFF11496E737472756374696F6E205472616365000000007907000001000000FFFFFFFFFFFFFFFF0F53797374656D20416E616C797A657200000000D601000001000000FFFFFFFFFFFFFFFF104576656E742053746174697374696373000000004589000001000000FFFFFFFFFFFFFFFFFFFFFFFF000000000000000000000000000000000000000001000000FFFFFFFFCB00000001000000FFFFFFFFCB000000000000000040000000000000FFFFFFFFFFFFFFFF9C0400004F000000A004000029020000000000000200000004000000010000000000000000000000FFFFFFFF2B000000E2050000CA0900002D8C00002E8C00002F8C0000308C0000318C0000328C0000338C0000348C0000358C0000368C0000378C0000388C0000398C00003A8C00003B8C00003C8C00003D8C00003E8C00003F8C0000408C0000418C000050C3000051C3000052C3000053C3000054C3000055C3000056C3000057C3000058C3000059C300005AC300005BC300005CC300005DC300005EC300005FC3000060C3000061C3000062C3000063C3000001800040000000000000200C000066000000100D000040020000A00400004F000000900500002902000000000000404100462B0000000753796D626F6C7300000000E205000001000000FFFFFFFFFFFFFFFF0A5472616365204461746100000000CA09000001000000FFFFFFFFFFFFFFFF00000000002D8C000001000000FFFFFFFFFFFFFFFF00000000002E8C000001000000FFFFFFFFFFFFFFFF00000000002F8C000001000000FFFFFFFFFFFFFFFF0000000000308C000001000000FFFFFFFFFFFFFFFF0000000000318C000001000000FFFFFFFFFFFFFFFF0000000000328C000001000000FFFFFFFFFFFFFFFF0000000000338C000001000000FFFFFFFFFFFFFFFF0000000000348C000001000000FFFFFFFFFFFFFFFF0000000000358C000001000000FFFFFFFFFFFFFFFF0000000000368C000001000000FFFFFFFFFFFFFFFF0000000000378C000001000000FFFFFFFFFFFFFFFF0000000000388C000001000000FFFFFFFFFFFFFFFF0000000000398C000001000000FFFFFFFFFFFFFFFF00000000003A8C000001000000FFFFFFFFFFFFFFFF00000000003B8C000001000000FFFFFFFFFFFFFFFF00000000003C8C000001000000FFFFFFFFFFFFFFFF00000000003D8C000001000000FFFFFFFFFFFFFFFF00000000003E8C000001000000FFFFFFFFFFFFFFFF00000000003F8C000001000000FFFFFFFFFFFFFFFF0000000000408C000001000000FFFFFFFFFFFFFFFF0000000000418C000001000000FFFFFFFFFFFFFFFF000000000050C3000001000000FFFFFFFFFFFFFFFF000000000051C3000001000000FFFFFFFFFFFFFFFF000000000052C3000001000000FFFFFFFFFFFFFFFF000000000053C3000001000000FFFFFFFFFFFFFFFF000000000054C3000001000000FFFFFFFFFFFFFFFF000000000055C3000001000000FFFFFFFFFFFFFFFF000000000056C3000001000000FFFFFFFFFFFFFFFF000000000057C3000001000000FFFFFFFFFFFFFFFF000000000058C3000001000000FFFFFFFFFFFFFFFF000000000059C3000001000000FFFFFFFFFFFFFFFF00000000005AC3000001000000FFFFFFFFFFFFFFFF00000000005BC3000001000000FFFFFFFFFFFFFFFF00000000005CC3000001000000FFFFFFFFFFFFFFFF00000000005DC3000001000000FFFFFFFFFFFFFFFF00000000005EC3000001000000FFFFFFFFFFFFFFFF00000000005FC3000001000000FFFFFFFFFFFFFFFF000000000060C3000001000000FFFFFFFFFFFFFFFF000000000061C3000001000000FFFFFFFFFFFFFFFF000000000062C3000001000000FFFFFFFFFFFFFFFF000000000063C3000001000000FFFFFFFFFFFFFFFFFFFFFFFF000000000000000000000000000000000000000001000000FFFFFFFFE205000001000000FFFFFFFFE2050000000000000010000001000000FFFFFFFFFFFFFFFF440100004F00000048010000B902000001000000020000100400000001000000C7FEFFFF3C060000FFFFFFFF05000000ED0300006D000000C3000000C400000073940000018000100000010000008007000066000000C4080000D0020000000000004F00000044010000B90200000000000040410056050000000750726F6A65637401000000ED03000001000000FFFFFFFFFFFFFFFF05426F6F6B73010000006D00000001000000FFFFFFFFFFFFFFFF0946756E6374696F6E7301000000C300000001000000FFFFFFFFFFFFFFFF0954656D706C6174657301000000C400000001000000FFFFFFFFFFFFFFFF09526567697374657273000000007394000001000000FFFFFFFFFFFFFFFF00000000000000000000000000000000000000000000000001000000FFFFFFFFED03000001000000FFFFFFFFED030000000000000080000000000000FFFFFFFFFFFFFFFF0000000015020000900500001902000000000000010000000400000001000000000000000000000000000000000000000000000001000000C6000000FFFFFFFF0F0000008F070000930700009407000095070000960700009007000091070000B5010000B801000038030000B9050000BA050000BB050000BC050000CB090000018000800000000000008007000030020000100D0000D4020000000000001902000090050000BD02000000000000404100460F0000001343616C6C20537461636B202B204C6F63616C73000000008F07000001000000FFFFFFFFFFFFFFFF0755415254202331000000009307000001000000FFFFFFFFFFFFFFFF0755415254202332000000009407000001000000FFFFFFFFFFFFFFFF0755415254202333000000009507000001000000FFFFFFFFFFFFFFFF15446562756720287072696E74662920566965776572000000009607000001000000FFFFFFFFFFFFFFFF0757617463682031000000009007000001000000FFFFFFFFFFFFFFFF0757617463682032000000009107000001000000FFFFFFFFFFFFFFFF10547261636520457863657074696F6E7300000000B501000001000000FFFFFFFFFFFFFFFF0E4576656E7420436F756E7465727300000000B801000001000000FFFFFFFFFFFFFFFF09554C494E4B706C7573000000003803000001000000FFFFFFFFFFFFFFFF084D656D6F7279203100000000B905000001000000FFFFFFFFFFFFFFFF084D656D6F7279203200000000BA05000001000000FFFFFFFFFFFFFFFF084D656D6F7279203300000000BB05000001000000FFFFFFFFFFFFFFFF084D656D6F7279203400000000BC05000001000000FFFFFFFFFFFFFFFF105472616365204E617669676174696F6E00000000CB09000001000000FFFFFFFFFFFFFFFFFFFFFFFF0000000001000000000000000000000001000000FFFFFFFFC802000019020000CC020000BD02000000000000020000000400000000000000000000000000000000000000000000000000000002000000C6000000FFFFFFFF8F07000001000000FFFFFFFF8F07000001000000C6000000000000000080000001000000FFFFFFFFFFFFFFFF00000000B902000080070000BD020000010000000100001004000000010000004CFDFFFF8E000000FFFFFFFF06000000C5000000C7000000B4010000D2010000CF010000779400000180008000000100000080070000D4020000000F0000F503000000000000BD02000080070000DE0300000000000040820056060000000C4275696C64204F757470757401000000C500000001000000FFFFFFFFFFFFFFFF0D46696E6420496E2046696C657301000000C700000001000000FFFFFFFFFFFFFFFF0A4572726F72204C69737400000000B401000001000000FFFFFFFFFFFFFFFF0E536F757263652042726F7773657200000000D201000001000000FFFFFFFFFFFFFFFF0E416C6C205265666572656E63657300000000CF01000001000000FFFFFFFFFFFFFFFF0742726F77736572010000007794000001000000FFFFFFFFFFFFFFFF00000000000000000000000000000000000000000000000001000000FFFFFFFFC500000001000000FFFFFFFFC5000000000000000000000000000000 59392 File - 2878 - 00200000010000002800FFFF01001100434D4643546F6F6C426172427574746F6E00E100000000000000000000000000000000000000000000000100000001000000018001E100000000000001000000000000000000000000000000000100000001000000018003E1000000000000020000000000000000000000000000000001000000010000000180CD7F0000000000000300000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018023E100000000040004000000000000000000000000000000000100000001000000018022E100000000040005000000000000000000000000000000000100000001000000018025E10000000000000600000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001802BE10000000004000700000000000000000000000000000000010000000100000001802CE10000000004000800000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001807A8A0000000000000900000000000000000000000000000000010000000100000001807B8A0000000004000A00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180D3B00000000000000B000000000000000000000000000000000100000001000000018015B10000000004000C0000000000000000000000000000000001000000010000000180F4B00000000004000D000000000000000000000000000000000100000001000000018036B10000000004000E00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180FF88000000000400460000000000000000000000000000000001000000010000000180FE880000000004004500000000000000000000000000000000010000000100000001800B810000000004001300000000000000000000000000000000010000000100000001800C810000000004001400000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180F0880000020000000F000000000000000000000000000000000100000001000000FFFF0100120043555646696E64436F6D626F427574746F6EE803000000000000000000000000000000000000000000000001000000010000009600000002002050000000000A4465766963654C696E6B960000000000000013000A4465766963654C696E6B096C696E6B54696D657204D0C4CCF80A6754436F6D6D4D61696C0D50616B63657454696D657255700F4D41494C5F534C554943455F4F50540C75343835325F7468726561641445465F454E565F5553494E475F574C5F4D4F44450F534655445F44454255475F4D4F44450557617465720F6F6E6C696E655F6961705F7461736B0D6961705F66696C655F73697A650B6961705F66696C656E616D074949435F53434C1065665F65726173655F62616B5F6170701172745F656E7465725F637269746963616C0C4D585F554152545F496E6974164F535F4941505F5448524541445F5052494F524954590A675F6966636F6E66696700000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000018024E10000000000001100000000000000000000000000000000010000000100000001800A810000000000001200000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6E2280000002000000150000002153746172742F53746F70202644656275672053657373696F6E094374726C2B46350000000000000000000000000100000001000000000000000000000001000000020021802280000000000000150000002153746172742F53746F70202644656275672053657373696F6E094374726C2B4635000000000000000000000000010000000100000000000000000000000100000000002180E0010000000000007500000021456E65726779204D6561737572656D656E742026776974686F75742044656275670000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180C488000000000000160000000000000000000000000000000001000000010000000180C988000000000400180000000000000000000000000000000001000000010000000180C788000000000000190000000000000000000000000000000001000000010000002180C8880000000000001700000027264B696C6C20416C6C20427265616B706F696E747320696E2043757272656E7420546172676574000000000000000000000000010000000100000000000000000000000100000003002180C8880000000000001700000027264B696C6C20416C6C20427265616B706F696E747320696E2043757272656E7420546172676574000000000000000000000000010000000100000000000000000000000100000000002180E50100000000000078000000264B696C6C20416C6C20427265616B706F696E747320696E204163746976652050726F6A656374000000000000000000000000010000000100000000000000000000000100000000002180E601000000000000790000002F4B696C6C20416C6C20427265616B706F696E747320696E204D756C74692D50726F6A65637420576F726B73706163650000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000021804C010000020001001A0000000F2650726F6A6563742057696E646F77000000000000000000000000010000000100000000000000000000000100000008002180DD880000000000001A0000000750726F6A656374000000000000000000000000010000000100000000000000000000000100000000002180DC8B0000000000003A00000005426F6F6B73000000000000000000000000010000000100000000000000000000000100000000002180E18B0000000000003B0000000946756E6374696F6E73000000000000000000000000010000000100000000000000000000000100000000002180E28B000000000000400000000954656D706C6174657300000000000000000000000001000000010000000000000000000000010000000000218018890000000000003D0000000E536F757263652042726F777365720000000000000000000000000100000001000000000000000000000001000000000021800000000000000400FFFFFFFF00000000000000000001000000000000000100000000000000000000000100000000002180D988000000000000390000000C4275696C64204F7574707574000000000000000000000000010000000100000000000000000000000100000000002180E38B000000000000410000000B46696E64204F75747075740000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180FB7F0000000000001B000000000000000000000000000000000100000001000000000000000446696C65EE010000 + 2605 + 00200000010000002800FFFF01001100434D4643546F6F6C426172427574746F6E00E100000000000000000000000000000000000000000000000100000001000000018001E100000000000001000000000000000000000000000000000100000001000000018003E1000000000000020000000000000000000000000000000001000000010000000180CD7F0000000000000300000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018023E100000000040004000000000000000000000000000000000100000001000000018022E100000000040005000000000000000000000000000000000100000001000000018025E10000000000000600000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001802BE10000000004000700000000000000000000000000000000010000000100000001802CE10000000004000800000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001807A8A0000000004000900000000000000000000000000000000010000000100000001807B8A0000000004000A00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180D3B00000000000000B000000000000000000000000000000000100000001000000018015B10000000004000C0000000000000000000000000000000001000000010000000180F4B00000000004000D000000000000000000000000000000000100000001000000018036B10000000004000E00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180FF88000000000400460000000000000000000000000000000001000000010000000180FE880000000004004500000000000000000000000000000000010000000100000001800B810000000004001300000000000000000000000000000000010000000100000001800C810000000004001400000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180F0880000020000000F000000000000000000000000000000000100000001000000FFFF0100120043555646696E64436F6D626F427574746F6EE80300000000000000000000000000000000000000000000000100000001000000960000000200205000000000114A736F6E363531556E7061636B496E666F96000000000000000300114A736F6E363531556E7061636B496E666F04656C73650F4E455453656E6444617461556E6966000000000000000000000000018024E10000000000001100000000000000000000000000000000010000000100000001800A810000000000001200000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6E2280000002000000150000002153746172742F53746F70202644656275672053657373696F6E094374726C2B46350000000000000000000000000100000001000000000000000000000001000000020021802280000000000000150000002153746172742F53746F70202644656275672053657373696F6E094374726C2B4635000000000000000000000000010000000100000000000000000000000100000000002180E0010000000000007500000021456E65726779204D6561737572656D656E742026776974686F75742044656275670000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180C488000000000000160000000000000000000000000000000001000000010000000180C988000000000400180000000000000000000000000000000001000000010000000180C788000000000000190000000000000000000000000000000001000000010000002180C8880000000000001700000027264B696C6C20416C6C20427265616B706F696E747320696E2043757272656E7420546172676574000000000000000000000000010000000100000000000000000000000100000003002180C8880000000000001700000027264B696C6C20416C6C20427265616B706F696E747320696E2043757272656E7420546172676574000000000000000000000000010000000100000000000000000000000100000000002180E50100000000000078000000264B696C6C20416C6C20427265616B706F696E747320696E204163746976652050726F6A656374000000000000000000000000010000000100000000000000000000000100000000002180E601000000000000790000002F4B696C6C20416C6C20427265616B706F696E747320696E204D756C74692D50726F6A65637420576F726B73706163650000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000021804C010000020001001A0000000F2650726F6A6563742057696E646F77000000000000000000000000010000000100000000000000000000000100000008002180DD880000000000001A0000000750726F6A656374000000000000000000000000010000000100000000000000000000000100000000002180DC8B0000000000003A00000005426F6F6B73000000000000000000000000010000000100000000000000000000000100000000002180E18B0000000000003B0000000946756E6374696F6E73000000000000000000000000010000000100000000000000000000000100000000002180E28B000000000000400000000954656D706C6174657300000000000000000000000001000000010000000000000000000000010000000000218018890000000000003D0000000E536F757263652042726F777365720000000000000000000000000100000001000000000000000000000001000000000021800000000000000400FFFFFFFF00000000000000000001000000000000000100000000000000000000000100000000002180D988000000000000390000000C4275696C64204F7574707574000000000000000000000000010000000100000000000000000000000100000000002180E38B000000000000410000000B46696E64204F75747075740000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180FB7F0000000000001B000000000000000000000000000000000100000001000000000000000446696C65EE010000 1423 @@ -1834,7 +1834,7 @@ Debug 2373 - 00200000000000001900FFFF01001100434D4643546F6F6C426172427574746F6ECC880000000000002500000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018017800000000000002600000000000000000000000000000000010000000100000001801D800000000000002700000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001801A800000000000002800000000000000000000000000000000010000000100000001801B80000000000000290000000000000000000000000000000001000000010000000180E57F0000000000002A00000000000000000000000000000000010000000100000001801C800000000000002B00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018000890000000000002C00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180E48B0000000000002D0000000000000000000000000000000001000000010000000180F07F0000000000002E0000000000000000000000000000000001000000010000000180E8880000000000003700000000000000000000000000000000010000000100000001803B010000000000002F0000000000000000000000000000000001000000010000000180BB8A00000000000030000000000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6E0E01000000000000310000000D57617463682057696E646F7773000000000000000000000000010000000100000000000000000000000100000003001380D88B00000000000031000000085761746368202631000000000000000000000000010000000100000000000000000000000100000000001380D98B00000000000031000000085761746368202632000000000000000000000000010000000100000000000000000000000100000000001380CE01000000000000FFFFFFFF0C576174636820416E63686F720100000000000000010000000000000001000000000000000000000001000000000013800F01000000000000320000000E4D656D6F72792057696E646F7773000000000000000000000000010000000100000000000000000000000100000004001380D28B00000000000032000000094D656D6F7279202631000000000000000000000000010000000100000000000000000000000100000000001380D38B00000000000032000000094D656D6F7279202632000000000000000000000000010000000100000000000000000000000100000000001380D48B00000000000032000000094D656D6F7279202633000000000000000000000000010000000100000000000000000000000100000000001380D58B00000000000032000000094D656D6F72792026340000000000000000000000000100000001000000000000000000000001000000000013801001000000000000330000000E53657269616C2057696E646F77730000000000000000000000000100000001000000000000000000000001000000040013809307000000000000330000000855415254202326310000000000000000000000000100000001000000000000000000000001000000000013809407000000000000330000000855415254202326320000000000000000000000000100000001000000000000000000000001000000000013809507000000000000330000000855415254202326330000000000000000000000000100000001000000000000000000000001000000000013809607000000000000330000001626446562756720287072696E746629205669657765720000000000000000000000000100000001000000000000000000000001000000000013803C010000000000007200000010416E616C797369732057696E646F7773000000000000000000000000010000000100000000000000000000000100000004001380658A000000000000340000000F264C6F67696320416E616C797A6572000000000000000000000000010000000100000000000000000000000100000000001380DC7F0000000000003E0000001526506572666F726D616E636520416E616C797A6572000000000000000000000000010000000100000000000000000000000100000000001380E788000000000000380000000E26436F646520436F766572616765000000000000000000000000010000000100000000000000000000000100000000001380CD01000000000000FFFFFFFF0F416E616C7973697320416E63686F7201000000000000000100000000000000010000000000000000000000010000000000138053010000000000003F0000000D54726163652057696E646F77730000000000000000000000000100000001000000000000000000000001000000010013805401000000000000FFFFFFFF115472616365204D656E7520416E63686F720100000000000000010000000000000001000000000000000000000001000000000013802901000000000000350000001553797374656D205669657765722057696E646F77730000000000000000000000000100000001000000000000000000000001000000010013804B01000000000000FFFFFFFF1453797374656D2056696577657220416E63686F720100000000000000010000000000000001000000000000000000000001000000000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000013800189000000000000360000000F26546F6F6C626F782057696E646F7700000000000000000000000001000000010000000000000000000000010000000300138044C5000000000000FFFFFFFF0E5570646174652057696E646F77730100000000000000010000000000000001000000000000000000000001000000000013800000000000000400FFFFFFFF000000000000000000010000000000000001000000000000000000000001000000000013805B01000000000000FFFFFFFF12546F6F6C626F78204D656E75416E63686F72010000000000000001000000000000000100000000000000000000000100000000000000000005446562756764020000 + 00200000000000001900FFFF01001100434D4643546F6F6C426172427574746F6ECC880000000000002500000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018017800000000000002600000000000000000000000000000000010000000100000001801D800000000000002700000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001801A800000000000002800000000000000000000000000000000010000000100000001801B80000000000000290000000000000000000000000000000001000000010000000180E57F0000000000002A00000000000000000000000000000000010000000100000001801C800000000000002B00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018000890000000000002C00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180E48B0000000000002D0000000000000000000000000000000001000000010000000180F07F0000000000002E0000000000000000000000000000000001000000010000000180E8880000000000003700000000000000000000000000000000010000000100000001803B010000000000002F0000000000000000000000000000000001000000010000000180BB8A00000000000030000000000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6E0E01000000000000310000000D57617463682057696E646F7773000000000000000000000000010000000100000000000000000000000100000003001380D88B00000000000031000000085761746368202631000000000000000000000000010000000100000000000000000000000100000000001380D98B00000000000031000000085761746368202632000000000000000000000000010000000100000000000000000000000100000000001380CE01000000000000FFFFFFFF0C576174636820416E63686F720000000000000000010000000000000001000000000000000000000001000000000013800F01000000000000320000000E4D656D6F72792057696E646F7773000000000000000000000000010000000100000000000000000000000100000004001380D28B00000000000032000000094D656D6F7279202631000000000000000000000000010000000100000000000000000000000100000000001380D38B00000000000032000000094D656D6F7279202632000000000000000000000000010000000100000000000000000000000100000000001380D48B00000000000032000000094D656D6F7279202633000000000000000000000000010000000100000000000000000000000100000000001380D58B00000000000032000000094D656D6F72792026340000000000000000000000000100000001000000000000000000000001000000000013801001000000000000330000000E53657269616C2057696E646F77730000000000000000000000000100000001000000000000000000000001000000040013809307000000000000330000000855415254202326310000000000000000000000000100000001000000000000000000000001000000000013809407000000000000330000000855415254202326320000000000000000000000000100000001000000000000000000000001000000000013809507000000000000330000000855415254202326330000000000000000000000000100000001000000000000000000000001000000000013809607000000000000330000001626446562756720287072696E746629205669657765720000000000000000000000000100000001000000000000000000000001000000000013803C010000000000007200000010416E616C797369732057696E646F7773000000000000000000000000010000000100000000000000000000000100000004001380658A000000000000340000000F264C6F67696320416E616C797A6572000000000000000000000000010000000100000000000000000000000100000000001380DC7F0000000000003E0000001526506572666F726D616E636520416E616C797A6572000000000000000000000000010000000100000000000000000000000100000000001380E788000000000000380000000E26436F646520436F766572616765000000000000000000000000010000000100000000000000000000000100000000001380CD01000000000000FFFFFFFF0F416E616C7973697320416E63686F7200000000000000000100000000000000010000000000000000000000010000000000138053010000000000003F0000000D54726163652057696E646F77730000000000000000000000000100000001000000000000000000000001000000010013805401000000000000FFFFFFFF115472616365204D656E7520416E63686F720000000000000000010000000000000001000000000000000000000001000000000013802901000000000000350000001553797374656D205669657765722057696E646F77730000000000000000000000000100000001000000000000000000000001000000010013804B01000000000000FFFFFFFF1453797374656D2056696577657220416E63686F720000000000000000010000000000000001000000000000000000000001000000000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000013800189000000000000360000000F26546F6F6C626F782057696E646F7700000000000000000000000001000000010000000000000000000000010000000300138044C5000000000000FFFFFFFF0E5570646174652057696E646F77730000000000000000010000000000000001000000000000000000000001000000000013800000000000000400FFFFFFFF000000000000000000010000000000000001000000000000000000000001000000000013805B01000000000000FFFFFFFF12546F6F6C626F78204D656E75416E63686F72000000000000000001000000000000000100000000000000000000000100000000000000000005446562756764020000 898 @@ -3638,9 +3638,9 @@ ../Core/Src/main.c - 25 - 199 - 207 + 4 + 178 + 188 1 0 @@ -3674,7 +3674,7 @@ ../Core/Src/usart.c - 4 + 19 97 98 1 diff --git a/Project/g0b1vetx-sluice b/Project/g0b1vetx-sluice index 38d2e6b..78a5f69 160000 --- a/Project/g0b1vetx-sluice +++ b/Project/g0b1vetx-sluice @@ -1 +1 @@ -Subproject commit 38d2e6b239cf12f35cc10a3b03de211c06d34aad +Subproject commit 78a5f69493722a6684d30182e7a383e004652721 diff --git a/middleware/easyflash/inc/ef_cfg.h b/middleware/easyflash/inc/ef_cfg.h index 919b2c3..e9db4eb 100644 --- a/middleware/easyflash/inc/ef_cfg.h +++ b/middleware/easyflash/inc/ef_cfg.h @@ -34,12 +34,12 @@ #ifdef EF_USING_ENV /* Auto update ENV to latest default when current ENV version number is changed. */ -/* #define EF_ENV_AUTO_UPDATE */ +#define EF_ENV_AUTO_UPDATE /** * ENV version number defined by user. * Please change it when your firmware add a new ENV to default_env_set. */ -#define EF_ENV_VER_NUM 0 /* @note you must define it for a value, such as 0 */ +#define EF_ENV_VER_NUM 3 /* @note you must define it for a value, such as 0 */ /* MCU Endian Configuration, default is Little Endian Order. */ /* #define EF_BIG_ENDIAN */ diff --git a/middleware/easyflash/port/ef_port.c b/middleware/easyflash/port/ef_port.c index bf4450f..6a18fff 100644 --- a/middleware/easyflash/port/ef_port.c +++ b/middleware/easyflash/port/ef_port.c @@ -98,7 +98,11 @@ static const ef_env default_env_set[] = { {"site_type", "sluice"}, // 0,闸门站，1，流量站，2，渗流渗压站，3，自动化采集站，4，串口服务器 {"level","[0.1,0.2,0.3,0.4,0.5,0.6,0.7,0.8,0.9,1.0]"}, {"flow", "[0.1,0.2,0.3,0.4,0.5,0.6,0.7,0.8,0.9,1.0]"}, - {"wsid","[128,2,3,4,5,6]"}, + {"wsid","[1,2,3,4,5,6]"}, + {"sl427ip","116.176.77.72"}, + {"sl427port","6200"}, + {"sl427code","0000000002"}, + // 水位流量关系表 配置10 个点