feat(uart): 分离ETH与Cat1通讯，支持UART1/Cat1/Debug互斥切换

Breaking Changes:
- USART1(PA11/PA12)改为Cat1(115200)/Debug(500000)共享，SGM3157控制
- USART4(PB09/PC13)独家给ETH(115200)，不再共享
- 新增EthTask独立状态机，与CatOneTask解耦运行
- 上电默认Comm=CATONE_COMM，dch=RS485_CH1

Details:
- feat: 新增EthTask.c/h，ETH状态机(8态)独立运行
- refactor: CatOneTask移除ETH代码，AT发送/接收走USART1
- feat: comm cat1/eth命令增加USART1占用互斥检查
- feat: dch dbg命令增加USART1占用互斥检查
- feat: rt_kprintf根据dch通道自动路由(USART1/RS485)
- feat: 新增eth on/off调试打印开关命令
- fix: 两个状态机按Comm模式判断休眠，避免误发AT
- fix: bsp.c修复IRQ回调函数名不匹配(BusFault隐患)
- fix: PB08(PortB Pin08)PORT_Init触发复位，改用外部上拉+POUTE单bit使能
- fix: DebugCmd命令表DEBUG_CMD_CNT与实际条目数不符(crash风险)
- chore: 删除InfTest死函数、重复include、无用宏声明、EthRev_Sem等冗余代码
- chore: 更正中文标点(！→! ，→,)

.qwen/skills/auto-skill-add-debug-command/SKILL.md

@@ -0,0 +1,88 @@
+---
+name: add-debug-command
+description: 在 GateWay_Debug 模块中添加新的 Debug 调试命令（函数指针表 + 字符串匹配模式）
+source: auto-skill
+extracted_at: '2026-06-15T08:10:31.194Z'
+---
+
+# 添加 Debug 调试命令
+
+本项目的 Debug 命令系统位于 `Project/GateWay/source/Module/GateWay_Debug/DebugCmd.c`，采用**函数指针表 + 字符串匹配**模式。
+
+## 修改步骤
+
+### 1. 编写 handler 函数
+
+在 `DebugCmd.c` 中添加函数，签名固定为 `void FuncName(int argc, char *argv[])`：
+
+```c
+static void DebugCmdXxx(int argc, char *argv[])
+{
+    DBG_LOG("\r\n");
+    if(strcmp(argv[1], "?") == 0) {
+        DBG_LOG("Debug Cmd: xxx\r\n");
+        DBG_LOG("  brief --> 功能描述.\r\n\r\n");
+        return;
+    }
+    // 实际逻辑...
+}
+```
+
+**必须遵循的模式：**
+- 函数体第一行：`DBG_LOG("\r\n");`
+- `"?"` 帮助分支：打印命令名和 brief 说明
+- 若修改了 `ConfigPara`，调用 `WritePara()` 保存
+- 需要被外部引用时声明为 `void`，仅内部使用时声明为 `static void`
+
+### 2. 注册到命令表
+
+在文件末尾的 `DebugFun[]` 常量数组中添加一行：
+
+```c
+const DBGFunType DebugFun[DEBUG_CMD_CNT] = {
+    // ... 已有命令 ...
+    "xxx",              DebugCmdXxx,
+};
+```
+
+**容量限制：** `DEBUG_CMD_CNT = 30`，添加前检查剩余空位（当前使用 28/30）。若超出需增大该宏。
+
+### 3. 添加到 help 输出
+
+在 `DebugCmdHelp` 函数末尾添加：
+
+```c
+len = strlen("xxx ?\r\n");
+memcpy(Data, "xxx ?\r\n", len);
+DebugAnalyze(GateWay, Data, len);
+```
+
+## 可用的关键 API
+
+| 函数 | 头文件 | 用途 |
+|---|---|---|
+| `CatOneEthSendQueue(data, len)` | CatOneTask.h | 将载荷放入网络发送队列（需 `SvrRegFlag == true`） |
+| `CommUintOrgData(GateWay, CUPara, CUData, buf)` | Public.h | 组装通讯单元传感器数据包 |
+| `GateWayRegister(TxBuff)` | CatOneTask.h | 组装网关注册包，返回长度 |
+| `NetCommOrgData(GateWay, payload, outBuf)` | Public.h | 为载荷添加网络帧头(0x7A)+MAC+CRC |
+| `WritePara(data, len)` | (bsp) | 保存配置参数到 Flash |
+| `CatOneTriggerRegister()` | CatOneTask.h | 将 Cat1 状态机立即切换到注册状态 |
+| `ETHTriggerRegister()` | CatOneTask.h | 将以太网状态机立即切换到注册状态 |
+
+## 可用的全局/extern 变量
+
+| 变量 | 类型 | 来源 |
+|---|---|---|
+| `GateWay` | `static GateWayPara` | DebugCmd.c 内静态指针，指向网关参数 |
+| `SComm1Para` / `SComm2Para` | `SensorCommPara_t` | RS485Task.c 中定义，DebugCmd.c 已 extern |
+| `GateWay->SvrRegFlag` | `bool` | 服务器注册状态 |
+| `GateWay->ConfigPara` | `GWConfigPara_t` | 网关配置参数 |
+
+## 注意事项
+
+- `CatOne_t CatOne` 和 `CatOneEthTxBuff[]` 均为 CatOneTask.c 中的 **static** 变量，不能直接在 DebugCmd.c 中访问；应使用封装好的接口函数（如 `CatOneTriggerRegister()`、`ETHTriggerRegister()`）来操作状态机
+- 重新注册应：清 `GateWay->SvrRegFlag = false`，然后根据通信模式调用 `CatOneTriggerRegister()` 或 `ETHTriggerRegister()` 立即切换状态机到注册状态，而不是仅清标志位等待状态机自动检测
+- `CatOneEthSendQueue` 内部检查 `SvrRegFlag`，未注册时返回 `false`
+- 命令解析函数 `DebugAnalyze` 按 `" "` 分割参数，去除 `\r`，最多 10 个参数
+- `DEBUG_CMD_CNT = 30` 为命令容量上限，添加新命令前需检查当前使用量，若超出需将此宏增大（如改为31）
+- 若模块需要保存独立的配置参数（如YOXO1007网络参数），可在DebugCmd.c中定义static变量，并通过Flash读写函数持久化（参考`EthNetPara_t`和`WriteEthNetPara`的实现）

.qwen/skills/auto-skill-fix-yoxo1007-receive-data/SKILL.md

@@ -0,0 +1,57 @@
+---
+name: fix-yoxo1007-receive-data
+description: 修复YOXO1007以太网模块接收数据解析错误问题
+source: auto-skill
+extracted_at: '2026-06-17T04:30:00.000Z'
+---
+
+# 修复 YOXO1007 以太网模块接收数据解析错误
+
+## 问题现象
+
+服务器已收到网关注册请求并响应，但网关端无法接收/解析服务器返回的数据。
+
+## 根本原因
+
+YOXO1007 模块在**透传模式**下发送的是**原始二进制数据**，不是 ASCII 格式的 hex 字符串。
+
+原代码错误地使用了 `AsciiToHex` 函数进行格式转换：
+
+```c
+// 错误代码 - CATONE 模式使用的 ASCII 转换不适用于 ETH 透传模式
+memset(HexData, 0x00, CatOneEthRxLen / 2);
+uint8_t ret = AsciiToHex(RxBuffTemp, HexData, CatOneEthRxLen);
+if(ret > 0)
+    GateWay->SvrRevCallBack(GateWay, HexData, ret);
+```
+
+这导致服务器返回的二进制数据被错误解析，回调函数无法正确处理。
+
+## 修复方案
+
+修改 `CatOneTask.c` 中 ETH 接收线程的数据处理逻辑，直接传递原始二进制数据：
+
+```c
+// 修改后的正确代码
+CAT1_DBG_LOG("Eth Rev: len=%d\r\n", CatOneEthRxLen);
+/* YOXO1007模块在透传模式下发送原始二进制数据,直接传递 */
+if(CatOneEthRxLen > 0)
+    GateWay->SvrRevCallBack(GateWay, (uint8_t *)CatOneEthRxBuff, CatOneEthRxLen);
+```
+
+## 修改位置
+
+`Project/GateWay/source/User/Src/CatOneTask.c` 中的 `CatOneRev_Thread_Entry` 函数内的 ETH 分支。
+
+## 关键区别
+
+| 模式 | 数据格式 | 解析方式 |
+|------|----------|----------|
+| CAT1 (4G) | ASCII 字符串 (AT 命令/响应) | 需要 AsciiToHex 转换 |
+| ETH (YOXO1007) | 原始二进制 (透传模式) | 直接传递，不转换 |
+
+## 注意事项
+
+- 此修改仅影响 ETH 通信模式，CAT1 模式的 ASCII 解析逻辑保持不变
+- YOXO1007 模块配置参数使用二进制命令协议（识别流 ED F2 A3 56...），与数据透传是不同层面
+- 模块配置保存后重启会自动进入之前保存的工作模式，无需额外进入透传模式的命令

.qwen/skills/auto-skill-git-branch-cleanup/SKILL.md

@@ -0,0 +1,79 @@
+---
+name: git-branch-cleanup
+description: 批量删除/重命名本地和远端 Git 分支，并同步远端仓库结构（含中文分支名、upstream 修复）
+source: auto-skill
+extracted_at: '2026-06-17T10:06:37.947Z'
+---
+
+# Git 分支批量清理与重命名
+
+## 适用场景
+需要删除多余的本地/远端分支、将分支重命名、并让远端结构与本地保持一致。
+
+## 操作流程
+
+### 1. 切换到安全分支
+```bash
+# 先 stash 未提交的更改
+git stash --include-untracked
+
+# 如果有 untracked 文件冲突，使用 -f 强制切换
+git checkout -f master
+```
+
+> **坑点**：中文分支名之间的文件差异可能产生大量 untracked 冲突（如 FatFS 文档等），
+> `git checkout` 会拒绝切换，需要 `-f` 强制切换，之后 `git stash pop` 恢复。
+
+### 2. 删除本地分支
+```bash
+git branch -D "LAN口通讯"
+git branch -D "新版4G模块1"
+```
+
+### 3. 重命名本地分支
+```bash
+git branch -m "旧版4G模块" develop
+```
+
+### 4. 删除远端分支（每个远端都要操作）
+```bash
+# 一次性删除多个远端分支
+git push home --delete "LAN口通讯" "新版4G模块" "旧版4G模块"
+git push origin --delete "LAN口通讯" "新版4G模块" "旧版4G模块"
+```
+
+> **注意**：远端可能认证失败（如内网地址不可达），先确认网络可达再操作。
+> 远端分支名可能与本地不完全一致（本地有 `新版4G模块1`，远端只有 `新版4G模块`）。
+
+### 5. 强制推送重命名后的分支到远端
+```bash
+git push home develop --force
+git push origin develop --force
+```
+
+### 6. 修复上游跟踪分支
+重命名后，分支仍跟踪旧的远端名（如 `origin/旧版4G模块`，已不存在）：
+```bash
+git branch --set-upstream-to=origin/develop develop
+```
+
+### 7. 恢复工作内容并切回开发分支
+```bash
+git checkout develop
+git stash pop
+```
+
+### 8. 验证最终结构
+```bash
+git fetch --all --prune
+git branch -a
+```
+
+## 常见问题
+
+| 问题 | 解决方案 |
+|------|----------|
+| checkout 报 untracked files 冲突 | `git checkout -f <branch>` |
+| 远端认证失败 | 检查网络/VPN，确认远端地址可达 |
+| 重命名后 upstream 指向已删除的远端分支 | `git branch --set-upstream-to=origin/<new-name> <branch>` |
+| 中文分支名在命令行中需加引号 | `git branch -D "旧版4G模块"` |

Netlist_GETWAY_V1.3_V1.4_2026-06-16.tel

@@ -0,0 +1,314 @@
+$PACKAGES
+bq25306rter ! bq25306rter ! '{Value}' ; U2 
+c0402m ! c0402m ! 100nF ; C9 C28 C41 
+c0402m ! c0402m ! 100pF ; C11 C42 C43 
+c0402m ! c0402m ! 10nF ; C10 
+c0402m ! c0402m ! 33pF ; C29 C30 C31 C32 
+C0603 ! C0603 ! '2.2uF' ; C59 C60 C68 
+C0603 ! C0603 ! '4.7uF' ; C65 
+C0603 ! C0603 ! 100nF ; C1 C3 C5 C15 C16 C19 C21 C23 C25 C26 C34 C36 C38 C40 ,
+        C44 C46 C48 C50 C52 C53 C54 C56 C61 C63 C64 C66 C70 C71 C76 C78 C79 ,
+        C80 C83 C84 C85 C86 
+C0603 ! C0603 ! 10uF ; C27 C55 C57 C62 
+C0603 ! C0603 ! 15pF ; C73 C77 
+C0603 ! C0603 ! 1uF ; C69 C72 C75 
+C0603 ! C0603 ! 22pF ; C67 C74 C81 C82 
+C0603 ! C0603 ! 22uF ; C58 
+C0603 ! C0603 ! 470pF ; C17 
+C0603 ! C0603 ! 47nF ; C4 
+C0805 ! C0805 ! '2.2uF' ; C13 
+C0805 ! C0805 ! 10nF ; C24 
+C0805 ! C0805 ! 22uF ; C2 C8 C12 C18 C20 C33 C35 C39 C45 C47 C49 C51 
+C1206 ! C1206 ! 22uF ; C14 C37 
+CAP-SMD_BD6.3-L6.6-W6.6-FD ! CAP-SMD_BD6.3-L6.6-W6.6-FD ! 470uF ; C6 C7 
+CAP-SMD_BD6.3-L6.6-W6.6-LS7.3-FD ! CAP-SMD_BD6.3-L6.6-W6.6-LS7.3-FD ! 220uF ; ,
+        C22 
+CONN-TH_2P-P2.50_HX25003-2A ! CONN-TH_2P-P2.50_HX25003-2A ! '{Value}' ; CN1 
+CONN-TH_2P-P3.81_L7.4-W7.6 ! CONN-TH_2P-P3.81_L7.4-W7.6 ! '{Value}' ; U1 U9 ,
+        U11 U13 U15 
+,
+        CONN-TH_3P-P2.00_HCTL_PH-3A_C2908624 ! CONN-TH_3P-P2.00_HCTL_PH-3A_C2908624 ! '{Value}' ,
+        ; CN3 
+CONN-TH_4P-P2.00_PH-4A_C2908625 ! CONN-TH_4P-P2.00_PH-4A_C2908625 ! '{Value}' ,
+        ; H4 
+,
+        CONN-TH_7P-P1.25_HCTL_HC-1.25-7A ! CONN-TH_7P-P1.25_HCTL_HC-1.25-7A ! '{Value}' ,
+        ; CN2 
+CONN-TH_PH-2A_C2908623 ! CONN-TH_PH-2A_C2908623 ! '{Value}' ; H1 
+CRYSTAL-SMD_4P-L3.2-W2.5-BL-2 ! CRYSTAL-SMD_4P-L3.2-W2.5-BL-2 ! '{Value}' ; ,
+        U21 
+DO-214AC_L4.3-W2.4-LS4.7-RD ! DO-214AC_L4.3-W2.4-LS4.7-RD ! '{Value}' ; D1 
+E32-400M30S ! E32-400M30S ! '{Value}' ; U12 
+,
+        ESOP-8_L4.9-W3.9-P1.27-LS6.0-TL-EP ! ESOP-8_L4.9-W3.9-P1.27-LS6.0-TL-EP ! '{Value}' ,
+        ; U4 
+FC-135R_L3.2-W1.5 ! FC-135R_L3.2-W1.5 ! '32.768kHz' ; X1 
+HDR-TH_2P-P2.54-V-M ! HDR-TH_2P-P2.54-V-M ! '{Value}' ; H5 
+HDR-TH_3P-P2.54-V-M ! HDR-TH_3P-P2.54-V-M ! '{Value}' ; H2 H3 
+IND-SMD_L2.5-W2.0_AHP252010TF ! IND-SMD_L2.5-W2.0_AHP252010TF ! 10uH ; L2 L4 
+IND-SMD_L4.8-W4.5 ! IND-SMD_L4.8-W4.5 ! '2.2uH' ; L1 
+IND-SMD_L7.0-W6.6_FXL0630 ! IND-SMD_L7.0-W6.6_FXL0630 ! 15uH ; L3 L5 
+IPEX-SMD_BWIPX-1-001E ! IPEX-SMD_BWIPX-1-001E ! '{Value}' ; RF1 
+L0603 ! L0603 ! '{Value}' ; L6 
+LED0603-FD_BLUE ! LED0603-FD_BLUE ! '{Value}' ; LORA 
+LED0603-RD ! LED0603-RD ! '{Value}' ; LAN LED1 
+,
+        LQFP-64_L10.0-W10.0-P0.50-LS12.0-BL ! LQFP-64_L10.0-W10.0-P0.50-LS12.0-BL ! '{Value}' ,
+        ; U20 
+NANO-SIM-SMD_SMN-305-ARP7 ! NANO-SIM-SMD_SMN-305-ARP7 ! '{Value}' ; CARD1 
+NT26E ! NT26E ! '{Value}' ; U19 
+OSC-SMD_4P-L3.2-W2.5-BL ! OSC-SMD_4P-L3.2-W2.5-BL ! 16MHz ; X2 
+,
+        QFN-48_L5.0-W5.0-P0.35-EP3.7_UC8288 ! QFN-48_L5.0-W5.0-P0.35-EP3.7_UC8288 ! '{Value}' ,
+        ; U17 
+R0402 ! R0402 ! '100kΩ' ; R5 R34 R41 R42 R44 
+R0402 ! R0402 ! '10kΩ' ; R2 R15 R23 R35 R37 R38 R39 R40 R43 R45 R55 R75 
+R0402 ! R0402 ! '1kΩ' ; R18 
+R0402 ! R0402 ! '22Ω' ; R25 R26 R30 
+R0603 ! R0603 ! '100kΩ' ; R13 R19 R57 R72 
+R0603 ! R0603 ! '100Ω' ; R56 
+R0603 ! R0603 ! '10kΩ' ; R10 R11 R14 R47 R50 R51 R54 R59 R63 R64 R65 R66 R67 ,
+        R68 
+R0603 ! R0603 ! '120kΩ' ; R73 
+R0603 ! R0603 ! '120Ω' ; R49 R52 
+R0603 ! R0603 ! '12kΩ' ; R22 R36 
+R0603 ! R0603 ! '169kΩ' ; R7 R28 
+R0603 ! R0603 ! '1kΩ' ; R1 R4 R8 R12 R29 R58 R69 R70 R74 
+R0603 ! R0603 ! '1MΩ' ; R17 
+R0603 ! R0603 ! '2.7kΩ' ; R61 
+R0603 ! R0603 ! '200kΩ' ; R16 R71 
+R0603 ! R0603 ! '24kΩ' ; R46 
+R0603 ! R0603 ! '3.24kΩ' ; R31 
+R0603 ! R0603 ! '3.3kΩ' ; R6 R21 
+R0603 ! R0603 ! '30kΩ' ; R3 
+R0603 ! R0603 ! '330kΩ' ; R20 
+R0603 ! R0603 ! '4.7kΩ' ; R60 R62 
+R0603 ! R0603 ! '64kΩ' ; R9 R27 
+R0805 ! R0805 ! '100kΩ' ; R53 
+R0805 ! R0805 ! '10kΩ' ; R24 R33 
+R0805 ! R0805 ! '1kΩ' ; R48 
+R0805 ! R0805 ! '20kΩ' ; R32 
+RJ45-TH_HR915310A ! RJ45-TH_HR915310A ! '{Value}' ; D7 
+,
+        SC-70-6_L2.2-W1.3-P0.65-LS2.1-BL ! SC-70-6_L2.2-W1.3-P0.65-LS2.1-BL ! '{Value}' ,
+        ; U22 U23 
+SMA_L4.3-W2.6-LS5.1-RD ! SMA_L4.3-W2.6-LS5.1-RD ! '{Value}' ; D3 D4 
+SOIC-8_L5.0-W4.0-P1.27-LS6.0-BL ! SOIC-8_L5.0-W4.0-P1.27-LS6.0-BL ! '{Value}' ,
+        ; U10 U14 
+SOIC-8_L5.3-W5.3-P1.27-LS8.0-BL ! SOIC-8_L5.3-W5.3-P1.27-LS8.0-BL ! '{Value}' ,
+        ; U18 
+,
+        SOT-223-3_L6.5-W3.4-P2.30-LS7.0-BR ! SOT-223-3_L6.5-W3.4-P2.30-LS7.0-BR ! '{Value}' ,
+        ; U8 
+SOT-23 ! SOT-23 ! '{Value}' ; D5 D6 
+SOT-23_L2.9-W1.3-P1.90-LS2.4-BR ! SOT-23_L2.9-W1.3-P1.90-LS2.4-BR ! '{Value}' ,
+        ; Q1 Q2 Q3 Q4 Q7 Q15 Q17 
+,
+        SOT-23-3_L2.9-W1.3-P1.90-LS2.4-BR ! SOT-23-3_L2.9-W1.3-P1.90-LS2.4-BR ! '{Value}' ,
+        ; Q5 Q11 Q19 
+,
+        SOT-23-3_L2.9-W1.6-P1.90-LS2.8-BR ! SOT-23-3_L2.9-W1.6-P1.90-LS2.8-BR ! '{Value}' ,
+        ; Q6 
+,
+        SOT-23-3_L3.0-W1.7-P0.95-LS2.9-BR ! SOT-23-3_L3.0-W1.7-P0.95-LS2.9-BR ! '{Value}' ,
+        ; Q18 
+sot-23-3p ! sot-23-3p ! '{Value}' ; Q8 Q9 Q10 Q12 Q13 Q14 
+,
+        SOT-23-6_L2.9-W1.6-P0.95-LS2.8-BL ! SOT-23-6_L2.9-W1.6-P0.95-LS2.8-BL ! '{Value}' ,
+        ; U3 U6 
+,
+        SOT-23-6_L2.9-W1.6-P0.95-LS2.8-BR ! SOT-23-6_L2.9-W1.6-P0.95-LS2.8-BR ! '{Value}' ,
+        ; U7 
+,
+        SOT-363_L2.0-W1.3-P0.65-LS2.1-BR ! SOT-363_L2.0-W1.3-P0.65-LS2.1-BR ! '{Value}' ,
+        ; D2 
+SOT323-6L_L2.0-W1.3-LS2.1-BL ! SOT323-6L_L2.0-W1.3-LS2.1-BL ! '{Value}' ; U16 
+TF-SMD_XKTF-1307-18 ! TF-SMD_XKTF-1307-18 ! '{Value}' ; CARD2 
+,
+        TO-263-5_L10.2-W9.9-P1.70-LS14.4-TL ! TO-263-5_L10.2-W9.9-P1.70-LS14.4-TL ! '{Value}' ,
+        ; U5 
+$A_PROPERTIES
+$NETS
+'$1N14156' ; R32.1 R33.1 U5.5 
+'$1N15120' ; C16.2 L2.1 U3.6 
+'$1N15124' ; C16.1 U3.1 
+'$1N156972' ; R61.2 U20.55 
+'$1N157217' ; LORA.2 R61.1 
+'$1N219298' ; Q3.1 R6.2 
+'$1N219301' ; Q7.1 R21.2 
+'$1N219303' ; Q6.3 R8.1 R19.2 
+'$1N219304' ; D1.1 R1.1 R10.1 
+'$1N219315' ; Q4.1 R8.2 
+'$1N219322' ; R11.2 R14.2 U2.7 
+'$1N219324' ; R16.2 U2.8 
+'$1N219325' ; C17.1 R16.1 R20.2 U2.9 
+'$1N219326' ; R17.1 R20.1 
+'$1N219329' ; C4.1 L1.1 U2.13 U2.14 
+'$1N219330' ; C5.2 C14.2 C17.2 CN1.1 L1.2 Q7.3 R17.2 U2.10 
+'$1N219388' ; Q3.3 U1.2 
+'$1N219660' ; Q6.1 R10.2 
+'$1N219673' ; C15.2 Q3.2 Q4.2 Q6.2 R1.2 
+'$1N219967' ; H5.2 R72.2 R74.2 U22.6 U23.6 
+'$1N220337' ; Q2.1 R12.2 R13.2 
+'$1N220644' ; H2.2 R22.2 U3.3 
+'$1N220659' ; H2.1 R9.1 
+'$1N220661' ; H2.3 R7.2 
+'$1N220812' ; H3.1 R27.2 
+'$1N220814' ; H3.3 R28.2 
+'$1N220820' ; H3.2 R36.2 U6.3 
+'$1N232426' ; C4.2 U2.15 
+'$1N232428' ; R3.2 U2.4 
+'$1N25321' ; C24.1 U4.1 
+'$1N25347' ; C24.2 D3.1 L3.1 U4.8 
+'$1N25981' ; R24.1 R31.2 U4.4 
+'$1N27457' ; C25.1 U6.1 
+'$1N27465' ; C25.2 L4.1 U6.6 
+'$1N27856' ; D4.2 L5.2 U7.1 
+'$1N27899' ; R46.1 R48.2 U7.3 
+'$1N284612' ; H4.2 R29.1 
+'$1N284617' ; H4.1 Q11.3 
+'$1N284675' ; Q11.1 R44.2 R45.2 
+'$1N284885' ; C3.2 C12.2 Q4.3 R12.1 U2.1 
+'$1N284896' ; R4.2 U2.3 
+'$1N284900' ; H1.2 R4.1 
+'$1N284903' ; C13.2 H1.1 R11.1 U2.2 
+'$1N285302' ; C54.2 C55.2 C56.2 C57.2 Q15.3 U12.9 U12.10 
+'$1N292841' ; Q15.1 Q19.3 R53.2 
+'$1N292934' ; Q19.1 R55.2 
+'$1N299251' ; H4.4 U4.7 
+'$1N330138' ; Q1.1 Q5.3 R5.2 
+'$1N330143' ; Q5.1 R2.1 
+'$1N330213' ; C58.2 C62.2 Q17.3 Q18.2 U16.5 
+'$1N330234' ; Q17.1 R57.1 R58.2 
+'$1N35056' ; Q9.1 R40.1 R41.2 
+'$1N35060' ; Q9.3 U19.20 
+'$1N35062' ; R26.2 U19.12 
+'$1N35065' ; R30.2 U19.13 
+'$1N35068' ; R25.2 U19.11 
+'$1N35087' ; LED1.1 Q8.3 
+'$1N35088' ; Q8.1 R15.1 
+'$1N35089' ; LED1.2 R18.2 
+'$1N35110' ; Q10.1 R34.2 R35.1 
+'$1N35118' ; Q14.1 R42.2 R43.1 
+'$1N35136' ; C43.2 Q13.1 R38.2 
+'$1N35141' ; C42.1 Q12.1 R37.1 
+'$1N35148' ; C6.1 C7.1 C8.1 C9.2 C10.2 C11.2 Q1.3 U19.45 U19.46 
+'$1N36133' ; LAN.2 U17.21 
+'$1N36222' ; C68.2 U17.33 
+'$1N36366' ; C59.1 L6.1 U17.1 U17.2 
+'$1N36373' ; C66.2 L6.2 U17.35 
+'$1N36810' ; C67.2 U17.32 U21.3 
+'$1N36815' ; C74.2 U17.31 U21.1 
+'$1N37705' ; Q18.1 U16.3 
+'$1N39412' ; C80.2 U20.30 
+'$1N45053' ; LAN.1 R62.2 
+'$1N46192' ; R60.1 U20.60 
+'$1N88506' ; D7.10 R69.1 
+'$1N88557' ; D7.11 R70.1 
+'$1N99689' ; RF1.1 U19.37 
+'4G/~LAN' ; R2.2 R58.1 R74.1 U20.61 
+'ADC_VBAT' ; C84.2 R71.1 R73.2 U20.15 
+'CAT1_NETSTATUS' ; R15.2 U19.17 
+'CAT1_PWRKEY' ; R35.2 U20.17 
+'CAT1_RESET' ; R43.2 U20.14 
+'CAT1_UART_RX' ; Q12.3 U19.18 
+'CAT1_UART_TX' ; Q13.2 U19.19 
+'CAT1_WAKEUP' ; R40.2 U20.16 
+'E32_INT' ; U12.20 U20.20 
+'E32_NRST' ; U12.21 U20.21 
+'E32_PXEN' ; U12.6 U20.26 
+'E32_TXEN' ; R75.2 U12.7 U20.27 
+'LORA_POWER' ; R55.1 U20.37 
+'MCU_SWCLK' ; CN2.3 U20.49 
+'MCU_SWDIO' ; CN2.4 U20.46 
+'NT26E_RX' ; Q13.3 R39.1 U22.1 
+'NT26E_TX' ; Q12.2 U23.1 
+'POWER_CONTROL' ; R45.1 U20.56 
+'RD-' ; D7.7 U17.12 
+'RD+' ; D7.6 U17.11 
+'RS485_1_A' ; D5.1 R49.1 R50.2 U9.1 U10.6 
+'RS485_1_B' ; D5.2 R47.2 R49.2 U9.2 U10.7 
+'RS485_1_CTRL' ; U10.2 U10.3 U20.38 
+'RS485_2_A' ; D6.1 R52.1 R54.2 U13.1 U14.6 
+'RS485_2_B' ; D6.2 R51.2 R52.2 U13.2 U14.7 
+'RS485_2_CTRL' ; U14.2 U14.3 U20.34 
+'SD1_CLK' ; CARD2.5 R65.1 U20.53 
+'SD1_CMD' ; CARD2.3 R66.1 U20.54 
+'SD1_DAT0' ; CARD2.7 R64.1 U20.39 
+'SD1_DAT1' ; CARD2.8 R63.1 U20.40 
+'SD1_DAT2' ; CARD2.1 R68.1 U20.42 
+'SD1_DAT3' ; CARD2.2 R67.1 U20.52 
+'SIM_CLK' ; C29.2 CARD1.3 D2.4 R30.1 
+'SIM_DATA' ; C31.2 CARD1.7 D2.6 R23.2 R25.1 
+'SIM_RST' ; C30.2 CARD1.2 D2.5 R26.1 
+'SIM_VDD' ; C32.1 C41.2 CARD1.1 CARD1.6 D2.3 R23.1 U19.15 
+'SPI1_MISO' ; U18.2 U20.9 
+'SPI1_MOSI' ; U18.5 U20.11 
+'SPI1_SCK' ; U18.6 U20.10 
+'SPI1_SS0' ; U18.1 U20.8 
+'SPI2_MISO' ; U12.22 U20.22 
+'SPI2_MOSI' ; U12.23 U20.23 
+'SPI2_SCK' ; U12.24 U20.24 
+'SPI2_SS0' ; U12.25 U20.25 
+'TD-' ; D7.2 U17.14 
+'TD+' ; D7.1 U17.13 
+'UART1_RX' ; CN2.6 CN3.3 U20.44 
+'UART1_TX' ; CN2.5 CN3.2 U20.45 
+'UART2_RX' ; U10.1 U20.43 
+'UART2_TX' ; U10.4 U20.41 
+'UART3_RX' ; U14.1 U20.35 
+'UART3_TX' ; U14.4 U20.33 
+'UART4_RX' ; U20.62 U22.4 
+'UART4_TX' ; U20.2 U23.4 
+'V_RS4851_5/12V' ; C20.2 C21.2 L2.2 R7.1 R9.2 U11.2 
+'V_RS4851_ON/~OFF' ; U3.4 U20.51 
+'V_RS4852_5/12V' ; C35.2 C36.2 L4.2 R27.1 R28.1 U15.2 
+'V_RS4852_ON/~OFF' ; U6.4 U20.28 
+'VCC_15V' ; C18.2 C19.2 C33.2 C34.2 C51.1 C52.2 D4.1 R46.2 U3.5 U6.5 
+'VCC_33' ; C60.1 C61.1 C69.2 D7.3 D7.5 D7.9 D7.12 Q18.3 R56.2 U17.3 
+'VCC_3V3' ; C42.2 C46.2 C47.2 C48.2 C53.2 C63.1 C64.1 C65.1 C71.1 C72.1 C75.1 ,
+        C76.1 C78.1 C79.2 C83.2 C85.2 C86.2 CARD2.4 CN2.7 Q17.2 R37.2 R39.2 ,
+        R50.1 R54.1 R57.2 R59.1 R60.2 R63.2 R64.2 R65.2 R66.2 R67.2 R68.2 ,
+        R72.1 U8.2 U8.4 U10.8 U14.8 U18.3 U18.7 U18.8 U20.13 U20.19 U20.32 ,
+        U20.48 U20.64 U22.5 U23.5 
+'VCC_3V8' ; C39.2 C40.2 Q1.2 Q15.2 R5.1 R18.1 R32.2 R53.1 U5.4 
+'VCC_5V' ; C22.1 C23.2 C37.2 C38.2 C44.2 C45.2 L3.2 R24.2 U5.1 U5.2 U8.3 
+'VCC_7V4' ; C1.2 C2.2 C26.2 C27.2 C49.1 C50.2 H4.3 L5.1 Q2.2 R29.2 U2.16 U7.4 ,
+        U7.5 
+'VDD_EXT' ; C28.2 C43.1 R38.1 U19.26 
+'XTAL_IN' ; C81.2 U20.5 X2.1 
+'XTAL_OUT' ; C82.2 U20.6 X2.3 
+'XTAL32_IN' ; C77.1 U20.4 X1.2 
+'XTAL32_OUT' ; C73.1 U20.3 X1.1 
+'YOXO_100MLINK' ; R69.2 U17.23 
+'YOXO_DEF' ; U17.22 U20.59 
+'YOXO_NRST' ; U17.25 U20.57 
+'YOXO_RX' ; U17.37 U22.3 
+'YOXO_TX' ; U17.36 U23.3 
+ACT ; R70.2 U17.27 
+CAT1PWRKEY ; Q10.3 U19.7 
+CAT1RESET ; Q14.3 U19.16 
+GND ; C1.1 C2.1 C3.1 C5.1 C6.2 C7.2 C8.2 C9.1 C10.1 C11.1 C12.1 C13.1 C14.1 ,
+        C15.1 C18.1 C19.1 C20.1 C21.1 C22.2 C23.1 C26.1 C27.1 C28.1 C29.1 ,
+        C30.1 C31.1 C32.2 C33.1 C34.1 C35.1 C36.1 C37.1 C38.1 C39.1 C40.1 ,
+        C41.1 C44.1 C45.1 C46.1 C47.1 C48.1 C49.2 C50.1 C51.2 C52.1 C53.1 ,
+        C54.1 C55.1 C56.1 C57.1 C58.1 C59.2 C60.2 C61.2 C62.1 C63.2 C64.2 ,
+        C65.2 C66.1 C67.1 C68.1 C69.1 C70.1 C71.2 C72.2 C73.2 C74.1 C75.2 ,
+        C76.2 C77.2 C78.2 C79.1 C80.1 C81.1 C82.1 C83.1 C84.1 C85.1 C86.1 ,
+        CARD1.5 CARD1.9 CARD1.10 CARD1.11 CARD2.6 CARD2.9 CARD2.10 CARD2.11 ,
+        CARD2.12 CN1.2 CN2.1 CN3.1 D1.2 D2.2 D3.2 D5.3 D6.3 H5.1 LORA.1 Q5.2 ,
+        Q8.2 Q9.2 Q10.2 Q11.2 Q14.2 Q19.2 R3.1 R6.1 R13.1 R14.1 R19.1 R21.1 ,
+        R22.1 R31.1 R33.2 R34.1 R36.1 R41.1 R42.1 R44.1 R47.1 R48.1 R51.1 ,
+        R56.1 R62.1 R73.1 R75.1 RF1.2 RF1.3 U1.1 U2.11 U2.12 U3.2 U4.6 U4.9 ,
+        U5.3 U5.6 U6.2 U7.2 U8.1 U10.5 U11.1 U12.1 U12.2 U12.3 U12.4 U12.5 ,
+        U12.11 U12.12 U12.17 U12.18 U12.26 U12.28 U14.5 U15.1 U16.2 U17.49 ,
+        U18.4 U19.1 U19.10 U19.29 U19.36 U19.39 U19.40 U19.43 U19.44 U19.50 ,
+        U19.51 U19.52 U19.53 U19.81 U19.82 U19.83 U19.85 U19.103 U19.107 ,
+        U19.108 U19.109 U19.110 U19.111 U19.112 U20.12 U20.18 U20.31 U20.47 ,
+        U20.63 U21.2 U21.4 U22.2 U23.2 X2.2 X2.4 
+LINK ; U17.28 U20.58 
+NRST ; C70.2 CN2.2 R59.2 U20.7 
+PGND ; D7.8 D7.13 D7.14 
+VBAT ; Q2.3 Q7.2 R71.2 
+$SCHEDULE
+$END

Project/GateWay/MDK/GateWay.uvoptx

@@ -75,7 +75,7 @@
       <OPTFL>
         <tvExp>1</tvExp>
         <tvExpOptDlg>0</tvExpOptDlg>
-        <IsCurrentTarget>1</IsCurrentTarget>
+        <IsCurrentTarget>0</IsCurrentTarget>
       </OPTFL>
       <CpuCode>255</CpuCode>
       <DebugOpt>
@@ -135,7 +135,7 @@
         <SetRegEntry>
           <Number>0</Number>
           <Key>JL2CM3</Key>
-          <Name>-U4294967295 -O78 -S4 -ZTIFSpeedSel2000 -A0 -C0 -JU1 -JI127.0.0.1 -JP0 -RST0 -N00("ARM CoreSight SW-DP") -D00(2BA01477) -L00(0) -TO18 -TC10000000 -TP21 -TDS8027 -TDT0 -TDC1F -TIEFFFFFFFF -TIP8 -TB1 -TFE0 -FO15 -FD1FFF8000 -FC1000 -FN2 -FF0HC32F460_otp.FLM -FS03000C00 -FL03FC -FP0($$Device:HC32F460KETA$FlashARM\HC32F460_otp.FLM) -FF1HC32F460_512K.FLM -FS10 -FL180000 -FP1($$Device:HC32F460KETA$FlashARM\HC32F460_512K.FLM)</Name>
+          <Name>-U12345678 -O78 -S4 -ZTIFSpeedSel2000 -A0 -C0 -JU1 -JI127.0.0.1 -JP0 -RST0 -N00("ARM CoreSight SW-DP") -D00(2BA01477) -L00(0) -TO18 -TC10000000 -TP21 -TDS8027 -TDT0 -TDC1F -TIEFFFFFFFF -TIP8 -TB1 -TFE0 -FO15 -FD1FFF8000 -FC1000 -FN2 -FF0HC32F460_otp.FLM -FS03000C00 -FL03FC -FP0($$Device:HC32F460KETA$FlashARM\HC32F460_otp.FLM) -FF1HC32F460_512K.FLM -FS10 -FL180000 -FP1($$Device:HC32F460KETA$FlashARM\HC32F460_512K.FLM)</Name>
         </SetRegEntry>
         <SetRegEntry>
           <Number>0</Number>
@@ -250,7 +250,7 @@
       <DebugFlag>
         <trace>0</trace>
         <periodic>1</periodic>
-        <aLwin>1</aLwin>
+        <aLwin>0</aLwin>
         <aCover>0</aCover>
         <aSer1>0</aSer1>
         <aSer2>0</aSer2>
@@ -350,7 +350,7 @@
       <OPTFL>
         <tvExp>1</tvExp>
         <tvExpOptDlg>0</tvExpOptDlg>
-        <IsCurrentTarget>0</IsCurrentTarget>
+        <IsCurrentTarget>1</IsCurrentTarget>
       </OPTFL>
       <CpuCode>255</CpuCode>
       <DebugOpt>
@@ -410,7 +410,7 @@
         <SetRegEntry>
           <Number>0</Number>
           <Key>JL2CM3</Key>
-          <Name>-U4294967295 -O78 -S4 -ZTIFSpeedSel2000 -A0 -C0 -JU1 -JI127.0.0.1 -JP0 -RST0 -N00("ARM CoreSight SW-DP") -D00(2BA01477) -L00(0) -TO18 -TC10000000 -TP21 -TDS8027 -TDT0 -TDC1F -TIEFFFFFFFF -TIP8 -TB1 -TFE0 -FO8 -FD1FFF8000 -FC1000 -FN2 -FF0HC32F460_otp.FLM -FS03000C00 -FL03FC -FP0($$Device:HC32F460KETA$FlashARM\HC32F460_otp.FLM) -FF1HC32F460_512K.FLM -FS10 -FL180000 -FP1($$Device:HC32F460KETA$FlashARM\HC32F460_512K.FLM)</Name>
+          <Name>-U12345678 -O78 -S4 -ZTIFSpeedSel2000 -A0 -C0 -JU1 -JI127.0.0.1 -JP0 -RST0 -N00("ARM CoreSight SW-DP") -D00(2BA01477) -L00(0) -TO18 -TC10000000 -TP21 -TDS8027 -TDT0 -TDC1F -TIEFFFFFFFF -TIP8 -TB1 -TFE0 -FO14 -FD1FFF8000 -FC1000 -FN2 -FF0HC32F460_otp.FLM -FS03000C00 -FL03FC -FP0($$Device:HC32F460KETA$FlashARM\HC32F460_otp.FLM) -FF1HC32F460_512K.FLM -FS10 -FL180000 -FP1($$Device:HC32F460KETA$FlashARM\HC32F460_512K.FLM)</Name>
         </SetRegEntry>
         <SetRegEntry>
           <Number>0</Number>
@@ -438,27 +438,17 @@
         <Ww>
           <count>1</count>
           <WinNumber>1</WinNumber>
-          <ItemText>sData</ItemText>
+          <ItemText>EthStatus</ItemText>
         </Ww>
         <Ww>
           <count>2</count>
           <WinNumber>1</WinNumber>
-          <ItemText>CatOne.Status</ItemText>
+          <ItemText>EthRecvTimeoutCnt,0x0A</ItemText>
         </Ww>
         <Ww>
           <count>3</count>
           <WinNumber>1</WinNumber>
-          <ItemText>CatOneEthTxBuff</ItemText>
-        </Ww>
-        <Ww>
-          <count>4</count>
-          <WinNumber>1</WinNumber>
-          <ItemText>CatOneEthTxLen,0x0A</ItemText>
-        </Ww>
-        <Ww>
-          <count>5</count>
-          <WinNumber>1</WinNumber>
-          <ItemText>SCPara-&gt;RS485RxBuff</ItemText>
+          <ItemText>(60 * 1000),0x0A</ItemText>
         </Ww>
       </WatchWindow1>
       <WatchWindow2>
@@ -490,7 +480,7 @@
       <DebugFlag>
         <trace>0</trace>
         <periodic>1</periodic>
-        <aLwin>1</aLwin>
+        <aLwin>0</aLwin>
         <aCover>0</aCover>
         <aSer1>0</aSer1>
         <aSer2>0</aSer2>
@@ -653,18 +643,6 @@
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>..\source\User\Src\DebugCmd.c</PathWithFileName>
-      <FilenameWithoutPath>DebugCmd.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-    <File>
-      <GroupNumber>2</GroupNumber>
-      <FileNumber>10</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
       <PathWithFileName>..\source\User\Src\spiflash.c</PathWithFileName>
       <FilenameWithoutPath>spiflash.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
@@ -672,7 +650,7 @@
     </File>
     <File>
       <GroupNumber>2</GroupNumber>
-      <FileNumber>11</FileNumber>
+      <FileNumber>10</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
@@ -684,7 +662,7 @@
     </File>
     <File>
       <GroupNumber>2</GroupNumber>
-      <FileNumber>12</FileNumber>
+      <FileNumber>11</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
@@ -696,7 +674,7 @@
     </File>
     <File>
       <GroupNumber>2</GroupNumber>
-      <FileNumber>13</FileNumber>
+      <FileNumber>12</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
@@ -708,7 +686,7 @@
     </File>
     <File>
       <GroupNumber>2</GroupNumber>
-      <FileNumber>14</FileNumber>
+      <FileNumber>13</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
@@ -718,6 +696,18 @@
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
+    <File>
+      <GroupNumber>2</GroupNumber>
+      <FileNumber>14</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>..\source\User\Src\EthTask.c</PathWithFileName>
+      <FilenameWithoutPath>EthTask.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
   </Group>
 
   <Group>
@@ -933,8 +923,8 @@
   </Group>
 
   <Group>
-    <GroupName>Debug</GroupName>
-    <tvExp>0</tvExp>
+    <GroupName>GateWay_Debug</GroupName>
+    <tvExp>1</tvExp>
     <tvExpOptDlg>0</tvExpOptDlg>
     <cbSel>0</cbSel>
     <RteFlg>0</RteFlg>
@@ -945,8 +935,8 @@
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>..\source\Module\Debug\Debug.c</PathWithFileName>
-      <FilenameWithoutPath>Debug.c</FilenameWithoutPath>
+      <PathWithFileName>..\source\Module\GateWay_Debug\DebugCmd.c</PathWithFileName>
+      <FilenameWithoutPath>DebugCmd.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
@@ -1042,7 +1032,7 @@
 
   <Group>
     <GroupName>sx127x</GroupName>
-    <tvExp>0</tvExp>
+    <tvExp>1</tvExp>
     <tvExpOptDlg>0</tvExpOptDlg>
     <cbSel>0</cbSel>
     <RteFlg>0</RteFlg>
@@ -1078,7 +1068,7 @@
 
   <Group>
     <GroupName>::RTOS</GroupName>
-    <tvExp>0</tvExp>
+    <tvExp>1</tvExp>
     <tvExpOptDlg>0</tvExpOptDlg>
     <cbSel>0</cbSel>
     <RteFlg>1</RteFlg>

Project/GateWay/MDK/GateWay.uvprojx

@@ -341,7 +341,7 @@
               <MiscControls>--diag_suppress=186,66</MiscControls>
               <Define>__DEBUG,HC32F460,USE_DEVICE_DRIVER_LIB,JEUA</Define>
               <Undefine></Undefine>
-              <IncludePath>..\..\..\driver\inc;..\..\..\mcu\common;..\source\User\Inc;..\source\Module\Debug;..\source\Module\SDCard;..\source\Module\FatFS\source;..\source\Module\SX127x</IncludePath>
+              <IncludePath>..\..\..\driver\inc;..\..\..\mcu\common;..\source\User\Inc;..\source\Module\GateWay_Debug;..\source\Module\SDCard;..\source\Module\FatFS\source;..\source\Module\SX127x</IncludePath>
             </VariousControls>
           </Cads>
           <Aads>
@@ -468,11 +468,6 @@
               <FileType>1</FileType>
               <FilePath>..\source\User\Src\Public.c</FilePath>
             </File>
-            <File>
-              <FileName>DebugCmd.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>..\source\User\Src\DebugCmd.c</FilePath>
-            </File>
             <File>
               <FileName>spiflash.c</FileName>
               <FileType>1</FileType>
@@ -498,6 +493,11 @@
               <FileType>1</FileType>
               <FilePath>..\source\User\Src\utils.c</FilePath>
             </File>
+            <File>
+              <FileName>EthTask.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>..\source\User\Src\EthTask.c</FilePath>
+            </File>
           </Files>
         </Group>
         <Group>
@@ -591,132 +591,12 @@
           </Files>
         </Group>
         <Group>
-          <GroupName>Debug</GroupName>
-          <GroupOption>
-            <CommonProperty>
-              <UseCPPCompiler>0</UseCPPCompiler>
-              <RVCTCodeConst>0</RVCTCodeConst>
-              <RVCTZI>0</RVCTZI>
-              <RVCTOtherData>0</RVCTOtherData>
-              <ModuleSelection>0</ModuleSelection>
-              <IncludeInBuild>0</IncludeInBuild>
-              <AlwaysBuild>2</AlwaysBuild>
-              <GenerateAssemblyFile>2</GenerateAssemblyFile>
-              <AssembleAssemblyFile>2</AssembleAssemblyFile>
-              <PublicsOnly>2</PublicsOnly>
-              <StopOnExitCode>11</StopOnExitCode>
-              <CustomArgument></CustomArgument>
-              <IncludeLibraryModules></IncludeLibraryModules>
-              <ComprImg>1</ComprImg>
-            </CommonProperty>
-            <GroupArmAds>
-              <Cads>
-                <interw>2</interw>
-                <Optim>0</Optim>
-                <oTime>2</oTime>
-                <SplitLS>2</SplitLS>
-                <OneElfS>2</OneElfS>
-                <Strict>2</Strict>
-                <EnumInt>2</EnumInt>
-                <PlainCh>2</PlainCh>
-                <Ropi>2</Ropi>
-                <Rwpi>2</Rwpi>
-                <wLevel>0</wLevel>
-                <uThumb>2</uThumb>
-                <uSurpInc>2</uSurpInc>
-                <uC99>2</uC99>
-                <uGnu>2</uGnu>
-                <useXO>2</useXO>
-                <v6Lang>0</v6Lang>
-                <v6LangP>0</v6LangP>
-                <vShortEn>2</vShortEn>
-                <vShortWch>2</vShortWch>
-                <v6Lto>2</v6Lto>
-                <v6WtE>2</v6WtE>
-                <v6Rtti>2</v6Rtti>
-                <VariousControls>
-                  <MiscControls></MiscControls>
-                  <Define></Define>
-                  <Undefine></Undefine>
-                  <IncludePath></IncludePath>
-                </VariousControls>
-              </Cads>
-              <Aads>
-                <interw>2</interw>
-                <Ropi>2</Ropi>
-                <Rwpi>2</Rwpi>
-                <thumb>2</thumb>
-                <SplitLS>2</SplitLS>
-                <SwStkChk>2</SwStkChk>
-                <NoWarn>2</NoWarn>
-                <uSurpInc>2</uSurpInc>
-                <useXO>2</useXO>
-                <ClangAsOpt>0</ClangAsOpt>
-                <VariousControls>
-                  <MiscControls></MiscControls>
-                  <Define></Define>
-                  <Undefine></Undefine>
-                  <IncludePath></IncludePath>
-                </VariousControls>
-              </Aads>
-            </GroupArmAds>
-          </GroupOption>
+          <GroupName>GateWay_Debug</GroupName>
           <Files>
             <File>
-              <FileName>Debug.c</FileName>
+              <FileName>DebugCmd.c</FileName>
               <FileType>1</FileType>
-              <FilePath>..\source\Module\Debug\Debug.c</FilePath>
-              <FileOption>
-                <CommonProperty>
-                  <UseCPPCompiler>2</UseCPPCompiler>
-                  <RVCTCodeConst>0</RVCTCodeConst>
-                  <RVCTZI>0</RVCTZI>
-                  <RVCTOtherData>0</RVCTOtherData>
-                  <ModuleSelection>0</ModuleSelection>
-                  <IncludeInBuild>0</IncludeInBuild>
-                  <AlwaysBuild>2</AlwaysBuild>
-                  <GenerateAssemblyFile>2</GenerateAssemblyFile>
-                  <AssembleAssemblyFile>2</AssembleAssemblyFile>
-                  <PublicsOnly>2</PublicsOnly>
-                  <StopOnExitCode>11</StopOnExitCode>
-                  <CustomArgument></CustomArgument>
-                  <IncludeLibraryModules></IncludeLibraryModules>
-                  <ComprImg>1</ComprImg>
-                </CommonProperty>
-                <FileArmAds>
-                  <Cads>
-                    <interw>2</interw>
-                    <Optim>0</Optim>
-                    <oTime>2</oTime>
-                    <SplitLS>2</SplitLS>
-                    <OneElfS>2</OneElfS>
-                    <Strict>2</Strict>
-                    <EnumInt>2</EnumInt>
-                    <PlainCh>2</PlainCh>
-                    <Ropi>2</Ropi>
-                    <Rwpi>2</Rwpi>
-                    <wLevel>0</wLevel>
-                    <uThumb>2</uThumb>
-                    <uSurpInc>2</uSurpInc>
-                    <uC99>2</uC99>
-                    <uGnu>2</uGnu>
-                    <useXO>2</useXO>
-                    <v6Lang>0</v6Lang>
-                    <v6LangP>0</v6LangP>
-                    <vShortEn>2</vShortEn>
-                    <vShortWch>2</vShortWch>
-                    <v6Lto>2</v6Lto>
-                    <v6WtE>2</v6WtE>
-                    <v6Rtti>2</v6Rtti>
-                    <VariousControls>
-                      <MiscControls></MiscControls>
-                      <Define></Define>
-                      <Undefine></Undefine>
-                      <IncludePath></IncludePath>
-                    </VariousControls>
-                  </Cads>
-                </FileArmAds>
-              </FileOption>
+              <FilePath>..\source\Module\GateWay_Debug\DebugCmd.c</FilePath>
             </File>
           </Files>
         </Group>
@@ -1392,7 +1272,7 @@
               <MiscControls>--diag_suppress=186,66</MiscControls>
               <Define>__DEBUG,HC32F460,USE_DEVICE_DRIVER_LIB,JEUA,BOOT_ENABLE</Define>
               <Undefine></Undefine>
-              <IncludePath>..\..\..\driver\inc;..\..\..\mcu\common;..\source\User\Inc;..\source\Module\Debug;..\source\Module\SDCard;..\source\Module\FatFS\source;..\source\Module\SX127x</IncludePath>
+              <IncludePath>..\..\..\driver\inc;..\..\..\mcu\common;..\source\User\Inc;..\source\Module\Debug;..\source\Module\SDCard;..\source\Module\FatFS\source;..\source\Module\sx127x;..\source\Module\GateWay_Debug</IncludePath>
             </VariousControls>
           </Cads>
           <Aads>
@@ -1519,11 +1399,6 @@
               <FileType>1</FileType>
               <FilePath>..\source\User\Src\Public.c</FilePath>
             </File>
-            <File>
-              <FileName>DebugCmd.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>..\source\User\Src\DebugCmd.c</FilePath>
-            </File>
             <File>
               <FileName>spiflash.c</FileName>
               <FileType>1</FileType>
@@ -1549,6 +1424,11 @@
               <FileType>1</FileType>
               <FilePath>..\source\User\Src\utils.c</FilePath>
             </File>
+            <File>
+              <FileName>EthTask.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>..\source\User\Src\EthTask.c</FilePath>
+            </File>
           </Files>
         </Group>
         <Group>
@@ -1642,132 +1522,12 @@
           </Files>
         </Group>
         <Group>
-          <GroupName>Debug</GroupName>
-          <GroupOption>
-            <CommonProperty>
-              <UseCPPCompiler>0</UseCPPCompiler>
-              <RVCTCodeConst>0</RVCTCodeConst>
-              <RVCTZI>0</RVCTZI>
-              <RVCTOtherData>0</RVCTOtherData>
-              <ModuleSelection>0</ModuleSelection>
-              <IncludeInBuild>0</IncludeInBuild>
-              <AlwaysBuild>2</AlwaysBuild>
-              <GenerateAssemblyFile>2</GenerateAssemblyFile>
-              <AssembleAssemblyFile>2</AssembleAssemblyFile>
-              <PublicsOnly>2</PublicsOnly>
-              <StopOnExitCode>11</StopOnExitCode>
-              <CustomArgument></CustomArgument>
-              <IncludeLibraryModules></IncludeLibraryModules>
-              <ComprImg>1</ComprImg>
-            </CommonProperty>
-            <GroupArmAds>
-              <Cads>
-                <interw>2</interw>
-                <Optim>0</Optim>
-                <oTime>2</oTime>
-                <SplitLS>2</SplitLS>
-                <OneElfS>2</OneElfS>
-                <Strict>2</Strict>
-                <EnumInt>2</EnumInt>
-                <PlainCh>2</PlainCh>
-                <Ropi>2</Ropi>
-                <Rwpi>2</Rwpi>
-                <wLevel>0</wLevel>
-                <uThumb>2</uThumb>
-                <uSurpInc>2</uSurpInc>
-                <uC99>2</uC99>
-                <uGnu>2</uGnu>
-                <useXO>2</useXO>
-                <v6Lang>0</v6Lang>
-                <v6LangP>0</v6LangP>
-                <vShortEn>2</vShortEn>
-                <vShortWch>2</vShortWch>
-                <v6Lto>2</v6Lto>
-                <v6WtE>2</v6WtE>
-                <v6Rtti>2</v6Rtti>
-                <VariousControls>
-                  <MiscControls></MiscControls>
-                  <Define></Define>
-                  <Undefine></Undefine>
-                  <IncludePath></IncludePath>
-                </VariousControls>
-              </Cads>
-              <Aads>
-                <interw>2</interw>
-                <Ropi>2</Ropi>
-                <Rwpi>2</Rwpi>
-                <thumb>2</thumb>
-                <SplitLS>2</SplitLS>
-                <SwStkChk>2</SwStkChk>
-                <NoWarn>2</NoWarn>
-                <uSurpInc>2</uSurpInc>
-                <useXO>2</useXO>
-                <ClangAsOpt>0</ClangAsOpt>
-                <VariousControls>
-                  <MiscControls></MiscControls>
-                  <Define></Define>
-                  <Undefine></Undefine>
-                  <IncludePath></IncludePath>
-                </VariousControls>
-              </Aads>
-            </GroupArmAds>
-          </GroupOption>
+          <GroupName>GateWay_Debug</GroupName>
           <Files>
             <File>
-              <FileName>Debug.c</FileName>
+              <FileName>DebugCmd.c</FileName>
               <FileType>1</FileType>
-              <FilePath>..\source\Module\Debug\Debug.c</FilePath>
-              <FileOption>
-                <CommonProperty>
-                  <UseCPPCompiler>2</UseCPPCompiler>
-                  <RVCTCodeConst>0</RVCTCodeConst>
-                  <RVCTZI>0</RVCTZI>
-                  <RVCTOtherData>0</RVCTOtherData>
-                  <ModuleSelection>0</ModuleSelection>
-                  <IncludeInBuild>0</IncludeInBuild>
-                  <AlwaysBuild>2</AlwaysBuild>
-                  <GenerateAssemblyFile>2</GenerateAssemblyFile>
-                  <AssembleAssemblyFile>2</AssembleAssemblyFile>
-                  <PublicsOnly>2</PublicsOnly>
-                  <StopOnExitCode>11</StopOnExitCode>
-                  <CustomArgument></CustomArgument>
-                  <IncludeLibraryModules></IncludeLibraryModules>
-                  <ComprImg>1</ComprImg>
-                </CommonProperty>
-                <FileArmAds>
-                  <Cads>
-                    <interw>2</interw>
-                    <Optim>0</Optim>
-                    <oTime>2</oTime>
-                    <SplitLS>2</SplitLS>
-                    <OneElfS>2</OneElfS>
-                    <Strict>2</Strict>
-                    <EnumInt>2</EnumInt>
-                    <PlainCh>2</PlainCh>
-                    <Ropi>2</Ropi>
-                    <Rwpi>2</Rwpi>
-                    <wLevel>0</wLevel>
-                    <uThumb>2</uThumb>
-                    <uSurpInc>2</uSurpInc>
-                    <uC99>2</uC99>
-                    <uGnu>2</uGnu>
-                    <useXO>2</useXO>
-                    <v6Lang>0</v6Lang>
-                    <v6LangP>0</v6LangP>
-                    <vShortEn>2</vShortEn>
-                    <vShortWch>2</vShortWch>
-                    <v6Lto>2</v6Lto>
-                    <v6WtE>2</v6WtE>
-                    <v6Rtti>2</v6Rtti>
-                    <VariousControls>
-                      <MiscControls></MiscControls>
-                      <Define></Define>
-                      <Undefine></Undefine>
-                      <IncludePath></IncludePath>
-                    </VariousControls>
-                  </Cads>
-                </FileArmAds>
-              </FileOption>
+              <FilePath>..\source\Module\GateWay_Debug\DebugCmd.c</FilePath>
             </File>
           </Files>
         </Group>

Project/GateWay/MDK/RTE/RTOS/board.c

@@ -11,6 +11,9 @@
 #include <rthw.h>
 #include <rtthread.h>
 #include "bsp.h"
+#include "main.h"
+
+extern GateWayPara_t GateWay;
 
 #if defined(RT_USING_USER_MAIN) && defined(RT_USING_HEAP)
 /*
@@ -73,16 +76,24 @@ void rt_hw_board_init(void)
 static int uart_init(void)
 {
 //#error "TODO 2: Enable the hardware uart and config baudrate."
-		DbgUart_Config(500000);
-    return 0;
+	DbgOrCat1Uart_Config(500000);
+//  RS485Ch1_Config(500000);
+  return 0;
 }
 INIT_BOARD_EXPORT(uart_init);
 
 void rt_hw_console_output(const char *str)
 {
-//#error "TODO 3: Output the string 'str' through the uart."
 	rt_enter_critical();
-	DebugUartSend((uint8_t *)str, strlen(str));
+	if(GateWay.ConfigPara.DebugChannel == DEBUG_CH_RS485_1) {
+		RS485Ch1UartSend((uint8_t *)str, strlen(str));
+	}
+	else if(GateWay.ConfigPara.DebugChannel == DEBUG_CH_RS485_2) {
+		RS485Ch2UartSend((uint8_t *)str, strlen(str));
+	}
+	else {
+		DebugOrCat1UartSend((uint8_t *)str, strlen(str));
+	}
 	rt_exit_critical();
 }
 

Project/GateWay/MDK/RTE/_app_app/RTE_Components.h

@@ -0,0 +1,21 @@
+
+/*
+ * Auto generated Run-Time-Environment Configuration File
+ *      *** Do not modify ! ***
+ *
+ * Project: 'GateWay' 
+ * Target:  'app_app' 
+ */
+
+#ifndef RTE_COMPONENTS_H
+#define RTE_COMPONENTS_H
+
+
+/*
+ * Define the Device Header File: 
+ */
+#define CMSIS_device_header "HC32F460KETA.h"
+
+
+
+#endif /* RTE_COMPONENTS_H */

Project/GateWay/source/Module/AD7924/ad7924.c

@@ -1,2 +0,0 @@
-#include "bps.h"
-

Project/GateWay/source/Module/FatFS/.gitignore

@@ -0,0 +1,130 @@
+# ---> IAR
+# Compiled binaries
+*.o
+*.bin
+*.elf
+*.hex
+*.map
+*.out
+*.obj
+
+# Trash
+*.bak
+thumbs.db
+*.~*
+
+# IAR Settings  
+**/settings/*.crun  
+**/settings/*.dbgdt  
+**/settings/*.cspy  
+**/settings/*.cspy.*  
+**/settings/*.xcl  
+**/settings/*.dni  
+**/settings/*.wsdt  
+**/settings/*.wspos  
+
+# IAR Debug Exe  
+**/Exe/*.sim  
+
+# IAR Debug Obj  
+**/Obj/*.pbd  
+**/Obj/*.pbd.*  
+**/Obj/*.pbi  
+**/Obj/*.pbi.*  
+
+# IAR project "Debug" directory
+Debug/
+
+# IAR project "Release" directory
+Release/
+
+# IAR project settings directory
+settings/
+
+# IAR backup files
+Backup*
+
+# IAR .dep files
+*.dep
+# ---> IAR_EWARM
+# gitignore template for the IAR EWARM
+# website: https://www.iar.com/knowledge/support/technical-notes/ide/which-files-should-be-version-controlled/
+
+# Some tools will put the EWARM files
+# under a subdirectory with the same name
+# as the configuration.
+# Example
+# EWARM/Config1/Obj /List /Exe
+# EWARM/Config2/Obj /List /Exe
+EWARM/**/Obj
+EWARM/**/List
+EWARM/**/Exe
+
+# Autogenerated project files
+*.dep
+*.ewt
+
+# Autogenerated folder for debugger
+EWARM/settings
+
+# ---> uVision
+# git ignore file for Keil µVision Project
+
+# µVision 5 and µVision 4 Project screen layout file
+*.uvguix.*
+*.uvgui.*
+
+# Listing Files
+*.i
+*.lst
+*.m51
+*.m66
+*.map
+
+# Object Files
+*.axf
+*.b[0-2][0-9]
+*.b3[0-1]
+*.bak
+*.build_log.htm
+*.crf
+*.d
+*.dep
+*.elf
+*.htm
+*.iex
+*.lnp
+*.o
+*.obj
+*.sbr
+
+# Firmware Files
+*.bin
+*.h86
+*.hex
+
+# Build Files
+.bat
+
+# Debugger Files
+.ini
+
+# JLink Files
+JLinkLog.txt
+
+# Other Files
+
+# ---> VisualStudioCode
+.vscode/*
+!.vscode/settings.json
+!.vscode/tasks.json
+!.vscode/launch.json
+!.vscode/extensions.json
+!.vscode/*.code-snippets
+
+# Local History for Visual Studio Code
+.history/
+
+# Built Visual Studio Code Extensions
+*.vsix
+

Project/GateWay/source/Module/FatFS/README.md

@@ -0,0 +1,2 @@
+# FatFS
+

Project/GateWay/source/Module/GateWay_Debug/.gitignore

@@ -0,0 +1,130 @@
+# ---> IAR
+# Compiled binaries
+*.o
+*.bin
+*.elf
+*.hex
+*.map
+*.out
+*.obj
+
+# Trash
+*.bak
+thumbs.db
+*.~*
+
+# IAR Settings  
+**/settings/*.crun  
+**/settings/*.dbgdt  
+**/settings/*.cspy  
+**/settings/*.cspy.*  
+**/settings/*.xcl  
+**/settings/*.dni  
+**/settings/*.wsdt  
+**/settings/*.wspos  
+
+# IAR Debug Exe  
+**/Exe/*.sim  
+
+# IAR Debug Obj  
+**/Obj/*.pbd  
+**/Obj/*.pbd.*  
+**/Obj/*.pbi  
+**/Obj/*.pbi.*  
+
+# IAR project "Debug" directory
+Debug/
+
+# IAR project "Release" directory
+Release/
+
+# IAR project settings directory
+settings/
+
+# IAR backup files
+Backup*
+
+# IAR .dep files
+*.dep
+# ---> IAR_EWARM
+# gitignore template for the IAR EWARM
+# website: https://www.iar.com/knowledge/support/technical-notes/ide/which-files-should-be-version-controlled/
+
+# Some tools will put the EWARM files
+# under a subdirectory with the same name
+# as the configuration.
+# Example
+# EWARM/Config1/Obj /List /Exe
+# EWARM/Config2/Obj /List /Exe
+EWARM/**/Obj
+EWARM/**/List
+EWARM/**/Exe
+
+# Autogenerated project files
+*.dep
+*.ewt
+
+# Autogenerated folder for debugger
+EWARM/settings
+
+# ---> uVision
+# git ignore file for Keil µVision Project
+
+# µVision 5 and µVision 4 Project screen layout file
+*.uvguix.*
+*.uvgui.*
+
+# Listing Files
+*.i
+*.lst
+*.m51
+*.m66
+*.map
+
+# Object Files
+*.axf
+*.b[0-2][0-9]
+*.b3[0-1]
+*.bak
+*.build_log.htm
+*.crf
+*.d
+*.dep
+*.elf
+*.htm
+*.iex
+*.lnp
+*.o
+*.obj
+*.sbr
+
+# Firmware Files
+*.bin
+*.h86
+*.hex
+
+# Build Files
+.bat
+
+# Debugger Files
+.ini
+
+# JLink Files
+JLinkLog.txt
+
+# Other Files
+
+# ---> VisualStudioCode
+.vscode/*
+!.vscode/settings.json
+!.vscode/tasks.json
+!.vscode/launch.json
+!.vscode/extensions.json
+!.vscode/*.code-snippets
+
+# Local History for Visual Studio Code
+.history/
+
+# Built Visual Studio Code Extensions
+*.vsix
+

Project/GateWay/source/Module/GateWay_Debug/DebugCmd.h

@@ -2,6 +2,6 @@
 #define __DEBUG_CMD_H
 
 void Debug_Thread_Entry(void *parameter);
-void DebugRxOverhandler(void);
+void DebugOrCat1RxOverhandler(void);
 void Debug_Printf(char *format, ...);
 #endif

Project/GateWay/source/Module/GateWay_Debug/README.md

@@ -0,0 +1,5 @@
+# GateWay_Debug
+# 适用于Gateway项目
+# 单片机HC32F460
+# 转换为模块仓库 2026-05-14
+

Project/GateWay/source/Module/SDCard/.gitignore

@@ -0,0 +1,130 @@
+# ---> IAR
+# Compiled binaries
+*.o
+*.bin
+*.elf
+*.hex
+*.map
+*.out
+*.obj
+
+# Trash
+*.bak
+thumbs.db
+*.~*
+
+# IAR Settings  
+**/settings/*.crun  
+**/settings/*.dbgdt  
+**/settings/*.cspy  
+**/settings/*.cspy.*  
+**/settings/*.xcl  
+**/settings/*.dni  
+**/settings/*.wsdt  
+**/settings/*.wspos  
+
+# IAR Debug Exe  
+**/Exe/*.sim  
+
+# IAR Debug Obj  
+**/Obj/*.pbd  
+**/Obj/*.pbd.*  
+**/Obj/*.pbi  
+**/Obj/*.pbi.*  
+
+# IAR project "Debug" directory
+Debug/
+
+# IAR project "Release" directory
+Release/
+
+# IAR project settings directory
+settings/
+
+# IAR backup files
+Backup*
+
+# IAR .dep files
+*.dep
+# ---> IAR_EWARM
+# gitignore template for the IAR EWARM
+# website: https://www.iar.com/knowledge/support/technical-notes/ide/which-files-should-be-version-controlled/
+
+# Some tools will put the EWARM files
+# under a subdirectory with the same name
+# as the configuration.
+# Example
+# EWARM/Config1/Obj /List /Exe
+# EWARM/Config2/Obj /List /Exe
+EWARM/**/Obj
+EWARM/**/List
+EWARM/**/Exe
+
+# Autogenerated project files
+*.dep
+*.ewt
+
+# Autogenerated folder for debugger
+EWARM/settings
+
+# ---> uVision
+# git ignore file for Keil µVision Project
+
+# µVision 5 and µVision 4 Project screen layout file
+*.uvguix.*
+*.uvgui.*
+
+# Listing Files
+*.i
+*.lst
+*.m51
+*.m66
+*.map
+
+# Object Files
+*.axf
+*.b[0-2][0-9]
+*.b3[0-1]
+*.bak
+*.build_log.htm
+*.crf
+*.d
+*.dep
+*.elf
+*.htm
+*.iex
+*.lnp
+*.o
+*.obj
+*.sbr
+
+# Firmware Files
+*.bin
+*.h86
+*.hex
+
+# Build Files
+.bat
+
+# Debugger Files
+.ini
+
+# JLink Files
+JLinkLog.txt
+
+# Other Files
+
+# ---> VisualStudioCode
+.vscode/*
+!.vscode/settings.json
+!.vscode/tasks.json
+!.vscode/launch.json
+!.vscode/extensions.json
+!.vscode/*.code-snippets
+
+# Local History for Visual Studio Code
+.history/
+
+# Built Visual Studio Code Extensions
+*.vsix
+

Project/GateWay/source/Module/SDCard/README.md

@@ -0,0 +1,2 @@
+# SDCard
+

Project/GateWay/source/Module/SDCard/sdmmc_cmd.h

@@ -102,7 +102,7 @@ typedef struct stc_sdmmc_resp_card_status
     uint32_t    ERASE_SEQ_ERR       :1;     ///< An error in the sequence of erase commands occurred.
     uint32_t    BLOCK_LEN_ERR       :1;     ///< The transferred block length is not allowed for this card, or the number of transferred bytes does not match the block length.
     uint32_t    ADDRESS_ERROR       :1;     ///< A misaligned address which did not match the block length was used in the command.
-    uint32_t    OUT_OF_RANGE        :1;     ///< The command’s argument was out of the allowed range for this card.
+    uint32_t    OUT_OF_RANGE        :1;     ///< The command鈥檚 argument was out of the allowed range for this card.
 } stc_sdmmc_resp_card_status_t;
 
 /*******************************************************************************

Project/GateWay/source/Module/SHT20/SHT20.C

@@ -1,615 +0,0 @@
-#include "SHT20.h"
-
-
-SHT20Var_t SHT20;
-
-//---------- Defines -----------------------------------------------------------
-// CRC 累加和校验常量
-const uint32_t POLYNOMIAL = 0x131; //P(x)=x^8+x^5+x^4+1 = 100110001
-
-/*
-************************************************************
-*	函数名称：	SHT2x_CheckCrc
-*
-*	函数功能：	检查数据正确性
-*
-*	入口参数：	data：读取到的数据
-*				nbrOfBytes：需要校验的数量
-*				checksum：读取到的校对比验值
-*
-*	返回参数：	校验结果
-*
-*	说明：		0-成功		1-失败
-************************************************************
-*/
-uint8_t SHT2x_CheckCrc(uint8_t *data, uint8_t nbrOfBytes, uint8_t checksum)
-{
-	uint8_t crc = 0;
-	uint8_t bit = 0;
-	uint8_t byteCtr = 0;
-
-	//calculates 8-Bit checksum with given polynomial
-	for(byteCtr = 0; byteCtr < nbrOfBytes; ++byteCtr) {
-		crc ^= (data[byteCtr]);
-		for ( bit = 8; bit > 0; --bit) {
-			if (crc & 0x80) 
-				crc = (crc << 1) ^ POLYNOMIAL;
-			else 
-				crc = (crc << 1);
-		}
-	}
-
-	if(crc != checksum)
-		return 1;
-	return 0;
-	
-}
-
-void delay_us(int dlycnt)
-{
-	for(int i = 0; i < dlycnt; i++) {
-		uint8_t temp = 10;
-		while(temp--);
-	}
-}
-
-#ifdef I2C_SOFTWARE
-#define ACK								0            //应答信号
-#define NACK							1             //非应答信号
-#define SHT20_IN_SDA			SHT20_I2C_SDA_Read() //读取SDA值
-#define IIC_Delay()				delay_us(10)        //时钟延时
-
-/*================================================================
-[  Name  ]void IO_I2CInit(void)
-[Function]I2C初始化 空闲状态
-[  Notes ]
-[ Author ]LZH
-[  Data  ]2016.06.22
-================================================================*/
-void IO_I2CInit(void)
-{ 
- //
-}
-
-//
-/*================================================================
-[  Name  ]SHT20_I2C_SDA_Read
-[Function]读取SDA数据线上值
-[  Notes ]
-[ Author ]LZH
-[  Data  ]2016.06.22
-================================================================*/
-uint8_t SHT20_I2C_SDA_Read(void)   
-{
-	SHT20_SDA_IN();
-	if(SHT20_SDA_GET()) 
-		return 1;
-	else 
-		return 0; 
-}
- 
-/*================================================================
-[  Name  ]I2CStart
-[Function]开始
-[  Notes ]
-[ Author ]LZH
-[  Data  ]2016.06.22
-================================================================*/
-void I2CStart(void)
-{
-	//uint8_t retval;
-	SHT20_SDA_OUT();	//设置成输出
-	//SHT20_SCL_OUT();
-	SHT20_I2C_SDA_HIGH();	//为SDA下降启动做准备
-	SHT20_I2C_SCL_HIGH();	//在SCL高电平时，SDA为下降沿时候总线启动
-
-	IIC_Delay();
-	SHT20_I2C_SDA_LOW();	//突变，总线启动
-	IIC_Delay();
-	SHT20_I2C_SCL_LOW();
-	IIC_Delay();
-	
-//SHT20_SDA_IN();	 //设置成输入
-//	if(SHT20_IN_SDA)
-//  {	 
-//	  retval= NACK;
-//  }
-//	else
-//	{
-//		retval= ACK;
-//	}
-//	retval=retval;
-}
-
-/*================================================================
-[  Name  ]I2CStop
-[Function]结束
-[  Notes ]
-[ Author ]LZH
-[  Data  ]2016.06.22
-================================================================*/
-void I2CStop(void)
-{    
-	SHT20_SDA_OUT();	//设置成输出
-	SHT20_I2C_SDA_LOW();	//为SDA上升做准备
-	SHT20_I2C_SCL_LOW();
-
-	IIC_Delay();
-	SHT20_I2C_SCL_HIGH();	//在SCL高电平时，SDA为上升沿时候总线停止
-	IIC_Delay();
-	SHT20_I2C_SDA_HIGH();	//突变，总线停止
-	IIC_Delay();
-}
-
-/*================================================================
-[  Name  ]I2C_Write_Byte
-[Function]写一个字节  返回ACK或NACK
-[  Notes ]从高到低发
-[ Author ]LZH
-[  Data  ]2016.06.22
-================================================================*/
-uint8_t I2C_Write_Byte(uint8_t Write_Byte)         //Sendbyte
-{
-	uint8_t i,retval=3;
-
-	SHT20_SDA_OUT();	//设置成输出
-	//SHT20_SCL_OUT() ;
-	for(i = 0;i < 8;i++) {
-		if(Write_Byte & 0x80)	
-			SHT20_I2C_SDA_HIGH();	//判断发送位，先发送高位
-		else
-			SHT20_I2C_SDA_LOW();
-
-		//IIC_Delay();
-		SHT20_I2C_SCL_HIGH();	//为SCL下降做准备
-		IIC_Delay();
-		SHT20_I2C_SCL_LOW();	//突变，将数据位发送过去
-		IIC_Delay();
-		Write_Byte<<=1;	//数据左移一位
-	}	//字节发送完成，开始接收应答信号
-	IIC_Delay();
-	SHT20_I2C_SDA_HIGH();	//释放数据线
-	IIC_Delay();
-	SHT20_SDA_IN();	//设置成输入
-	//IIC_Delay();
-	SHT20_I2C_SCL_HIGH();	//为SCL下降做准备
-	IIC_Delay();
-
-	if(SHT20_IN_SDA)	 
-		retval= NACK;
-	else 
-		retval= ACK;
-
-	SHT20_I2C_SCL_LOW();
-	IIC_Delay();
-	return retval;
-}
-//
-/*================================================================
-[  Name  ]I2C_Read_Byte
-[Function]读一个字节，入库参数用于控制应答状态 ACK或NAC
-[  Notes ]从高到低
-[ Author ]LZH
-[  Data  ]2016.06.22
-================================================================*/
-uint8_t I2C_Read_Byte(uint8_t AckValue)//receivebyte
-{
-	uint8_t i;
-	uint8_t RXDATA=0;
-//	SHT20_SDA_OUT();	//设置成输出	
-//	SHT20_I2C_SDA_HIGH();	//首先置数据线为高电平
-//	SHT20_I2C_SCL_LOW();
-	SHT20_SDA_IN();	//设置成输入
-
-	for(i = 0;i < 8;i++) {
-		SHT20_I2C_SCL_HIGH();	//突变
-		IIC_Delay();
-		RXDATA <<= 1;	//读入数据，高位在前	
-		if(SHT20_IN_SDA)	RXDATA |= 0x01;	//收到高电平
-		else RXDATA &= 0xfe;	
-		IIC_Delay();
-		SHT20_I2C_SCL_LOW();
-		IIC_Delay();
-	}	//数据接收完成
-
-	SHT20_SDA_OUT();
-	if(AckValue)
-		SHT20_I2C_SDA_HIGH();
-	else
-		SHT20_I2C_SDA_LOW();
-
-	IIC_Delay();
-	SHT20_I2C_SCL_HIGH();
-	IIC_Delay();
-	SHT20_I2C_SCL_LOW();
-	IIC_Delay();
-
-	return RXDATA;	//返回读取到的数据
-}
-
-/*================================================================
-[  Name  ]SHT20_SoftReset
-[Function]SHT20软件复位
-[  Notes ]从高到低
-[ Author ]LZH
-[  Data  ]2016.06.22
-================================================================*/
-void SHT20_Reset(void)                    
-{
-	// IO_I2CInit();                       //I2C initialize
-	I2CStart();                      //start I2C
-	I2C_Write_Byte(SHT20_ADDRESS&0xfe);  //I2C address + write
-	I2C_Write_Byte(0xfe);                 //soft reset
-	I2CStop();                       //stop I2C
-}
-
-/*================================================================
-[  Name  ]SET_Resolution
-[Function]写寄存器 设置分辨率
-[  Notes ]从高到低
-[ Author ]LZH
-[  Data  ]2016.06.22
-================================================================*/
-void SET_Resolution(void)                    
-{
-	I2CStart();																			//Start I2C 
-	if(I2C_Write_Byte(SHT20_ADDRESS&0xfe) == ACK) {			//I2C address + write + ACK
-		if(I2C_Write_Byte(0xe6) == ACK) {							//写用户寄存器
-			if(I2C_Write_Byte(0x83) == ACK) 
-				__NOP();																		//设置分辨率  11bit RH% 测量时间:12ms(typ.) & 11bit T测量时间:9ms(typ.) 
-		}
-	}
-	I2CStop();																			//Stop I2C        
-}
- 
-/*================================================================
-[  Name  ]ReadSht20
-[Function]非主机模式，读取温湿度值
-[  Notes ]入口控制读取温度或湿度 复位需要15ms 温度转换最大需要85ms
-[ Author ]LZH  SHT20上电后等待20ms 再读取sht20
-[  Data  ]2016.06.22
-================================================================*/
-float SHT2x_MeasureHM(uint8_t whatdo)
-{
-	float temp;
-	uint8_t MSB,LSB,checksum=0,checktemp[2];
-	float Humidity,Temperature;
-	uint32_t waitt= 1000;  
-	//SET_Resolution(); //此处之前出过问题 所以屏蔽掉
-
-	I2CStart();        
-	if(I2C_Write_Byte(SHT20_ADDRESS&0xfe)==ACK) {									//I2C address + write + ACK
-		if(I2C_Write_Byte(whatdo)==ACK) {												//Command
-			do{
-				delay_us(100); //加入超时
-				I2CStart();    
-				if(--waitt==0)	
-					break;
-			} while(I2C_Write_Byte(SHT20_ADDRESS|0x01) == NACK);			//I2C address + read        + NACK 
-			
-			if(waitt != 0) {
-				MSB = I2C_Read_Byte(ACK);															//Data(MSB)
-				LSB = I2C_Read_Byte(ACK);															//Data(LSB)
-				checksum=I2C_Read_Byte(NACK);													//Checksum  + NACK 累加和校验值
-				I2CStop();																						//Stop I2C
-				checktemp[0]=MSB;
-				checktemp[1]=LSB;
-				if(SHT2x_CheckCrc(checktemp,2,checksum)) {						//累加和校验成功
-					LSB &= 0xfc;																				//Data (LSB) 后两位清零
-					temp = MSB*256 + LSB;																//十六进制转十进制
-					if (whatdo==((uint8_t)0xf5)) {													//No Hold Master Mode,read humidity       
-						/*-- calculate relative humidity [%RH] --*/ 
-						Humidity =(temp*125)/65536-6;											//公式: RH%= -6 + 125 * SRH/2^16														
-						return Humidity;																	//返回:humidity
-					}                                                                                                  
-					else{																								//No Hold Master Mode,read temperature        
-						/*-- calculate temperature [℃] --*/
-						Temperature = (temp*175.72)/65536-46.85;						//公式:T= -46.85 + 175.72 * ST/2^16
-						return Temperature;																	//返回:temperature
-					}
-				}
-			}
-		}
-	}
-	I2CStop();  //CT add
-	return 0;
-}
-//
-/********************************************************
-[  Name  ]GetMiddleNum
-[Function] 中值滤波
-[  Notes ] 传入数据buf bArray, iFilterLen滤波数据长度
-[ Author ] CSDN
-[  Data  ]2018.10.25
- 
-**********************************************************/
-
-float GetMiddleNum(float * bArray, uint8_t iFilterLen)
-{
-	uint8_t i,j;// 循环变量
-	float bTemp;
-
-	if(iFilterLen>100)
-		return 0;
-	// 用冒泡法对数组进行排序
-	for (j = 0; j < iFilterLen - 1; j ++) {
-		for (i = 0; i < iFilterLen - j - 1; i ++) {
-			if (bArray[i] > bArray[i + 1]) {
-				// 互换
-				bTemp = bArray[i];
-				bArray[i] = bArray[i + 1];
-				bArray[i + 1] = bTemp;
-			}
-		}
-	}
-	// 计算中值
-	if ((iFilterLen & 1) > 0) {
-		// 数组有奇数个元素，返回中间一个元素
-		bTemp = bArray[(iFilterLen -1) / 2];
-	}
-	else {
-		// 数组有偶数个元素，返回中间两个元素平均值
-		bTemp = (bArray[iFilterLen / 2-1] + bArray[iFilterLen / 2 ]) / 2;
-	}
-	return bTemp;
-}
-//
-/********************************************************
-[  Name  ]ReadSht20_Medium
-[Function] 获取中值
-[  Notes ] 读取完后关闭上拉 设为低 (解决干扰问题)
-[ Author ]  
-[  Data  ]2018.10.25
- 
-**********************************************************/
-float ReadSht20_Medium (void)
-{
-	float arry3[3];
-	//SHT20_I2C_SET_PULL_UP();  //开启引脚上拉
-	for(uint8_t ui=0; ui<3; ui++) {
-		arry3[ui]= SHT2x_MeasureHM(SHT20_Measurement_T_HM);
-		delay_us(20);
-	//printf("sht origin %.2f \r\n",arry3[ui]);
-	}
-	float retv = GetMiddleNum(arry3, 3);
-
-#ifdef I2C_SOFTWARE
-	//SHT20_I2C_SET_PULL_NO();  //关闭上拉
-	SHT20_I2C_LOW();          //读取完温度后拉低
-#endif
-	return retv;
-}
-
-#else
-
-/*
-************************************************************
-*	函数名称：	SHT20_reset
-*
-*	函数功能：	SHT20复位
-*
-*	入口参数：	无
-*
-*	返回参数：	无
-*
-*	说明：
-************************************************************
-*/
-void SHT20_Reset(void)
-{
-	uint8_t Data = SHT20_SOFT_RESET;
-	Sht20_Reg_Write(SHT20_ADDRESS, &Data, 1);
-	Sht20_Delay(15);
-}
-
-/*
-************************************************************
-*	函数名称：	SHT20_read_user_reg
-*
-*	函数功能：	SHT20读取用户寄存器
-*
-*	入口参数：	无
-*
-*	返回参数：	读取到的用户寄存器的值
-*
-*	说明：
-************************************************************
-*/
-uint8_t  SHT20_read_user_reg(void)
-{
-	uint8_t val = 0;
-	uint8_t reg = SHT20_READ_REG;
-	Sht20_Read(SHT20_ADDRESS, &reg, &val, 1);
-	return val;
-}
-
-/*
-************************************************************
-*	函数名称：	SHT2x_CalcTemperatureC
-*
-*	函数功能：	温度计算
-*
-*	入口参数：	u16sT：读取到的温度原始数据
-*
-*	返回参数：	计算后的温度数据
-*
-*	说明：
-************************************************************
-*/
-float SHT2x_CalcTemperatureC(uint16_t u16sT)
-{
-	float temperatureC = 0;            // variable for result
-
-	u16sT &= ~0x0003;           // clear bits [1..0] (status bits)
-	//-- calculate temperature [℃] --
-	temperatureC = -46.85 + 175.72 / 65536 * (float)u16sT; //T= -46.85 + 175.72 * ST/2^16
-
-	return temperatureC;
-}
-
-/*
-************************************************************
-*	函数名称：	SHT2x_CalcRH
-*
-*	函数功能：	湿度计算
-*
-*	入口参数：	u16sRH：读取到的湿度原始数据
-*
-*	返回参数：	计算后的湿度数据
-*
-*	说明：
-************************************************************
-*/
-float SHT2x_CalcRH(uint16_t u16sRH)
-{
-	float humidityRH = 0;              // variable for result
-
-	u16sRH &= ~0x0003;          // clear bits [1..0] (status bits)
-	//-- calculate relative humidity [%RH] --
-	//humidityRH = -6.0 + 125.0/65536 * (float)u16sRH; // RH= -6 + 125 * SRH/2^16
-	humidityRH = ((float)u16sRH * 0.00190735) - 6;
-
-	return humidityRH;
-}
-
-/*
-************************************************************
-*	函数名称：	SHT2x_MeasureHM
-*
-*	函数功能：	测量温湿度
-*
-*	入口参数：	cmd：测量温度还是湿度
-*
-*	返回参数：	测量结果
-*
-*	说明：
-************************************************************
-*/
-float SHT2x_MeasureHM(uint8_t cmd)
-{
-	uint8_t  checksum = 0;  //checksum
-	uint8_t  data[3];    //data array for checksum verification
-	uint16_t tmp = 0;
-	float t = 0;
-	
-	Sht20_Read(SHT20_ADDRESS, &cmd, data, 3);
-	checksum = data[2];
-	if(SHT2x_CheckCrc(data, 2, checksum) == 0) {
-		tmp = (data[0] << 8) + data[1];
-		if(cmd == SHT20_Measurement_T_NHM) 
-			t = SHT2x_CalcTemperatureC(tmp);
-		else 
-			t = SHT2x_CalcRH(tmp);
-	}
-
-	return t;
-}
-
-
-#endif
-
-/*
-************************************************************
-*	函数名称：	SHT20_GetValue
-*
-*	函数功能：	获取温湿度数据
-*
-*	入口参数：	无
-*
-*	返回参数：	无
-*
-*	说明：		温湿度结果保存在SHT20结构体里
-************************************************************
-*/
-void SHT20_GetValue(float *Tempreture, float *Humidity)
-{
-	if(Tempreture != NULL) {
-		*Tempreture = SHT20.Tempreture;
-	}
-	if(Humidity != NULL) {
-		*Humidity = SHT20.Humidity;
-	}
-	//SHT20_reset();
-}
-
-void SHT20Start(void)
-{
-	memset(&SHT20, 0x00, sizeof(SHT20));
-	SHT20.Sht20Status = SHT20_INIT;
-}
-void SHT20LoopHandler(void)
-{
-	uint8_t ret;
-	uint8_t rData[3];
-	
-	switch(SHT20.Sht20Status) {
-		case SHT20_IDLE:
-			break;
-		
-		case SHT20_INIT:
-			SHT20_Reset();
-			SHT20.Sht201mSDelayCnt = 200;
-			SHT20.Sht20Status = SHT20_READ_HUMI;
-			break;
-		
-		case SHT20_READ_TEMPR:
-			if(SHT20.Sht201mSDelayCnt > 0)
-				break;
-			SHT20.Cmd = SHT20_Measurement_T_NHM;
-			ret = SHT20_StartMeas(SHT20_ADDRESS, &SHT20.Cmd);
-			if(ret == true) {
-				SHT20.Sht201mSDelayCnt = 90;
-				SHT20.Sht20Status = SHT20_READ_DATA;
-			}
-			else {
-				SHT20.Sht201mSDelayCnt = 1000;
-				SHT20.Sht20Status = SHT20_INIT;
-			}
-			break;
-		
-		case SHT20_READ_HUMI:
-			if(SHT20.Sht201mSDelayCnt > 0)
-				break;
-			SHT20.Cmd = SHT20_Measurement_RH_NHM;
-			ret = SHT20_StartMeas(SHT20_ADDRESS, &SHT20.Cmd);
-			if(ret == true) {
-				SHT20.Sht201mSDelayCnt = 90;
-				SHT20.Sht20Status = SHT20_READ_DATA;
-			}
-			else {
-				SHT20.Sht201mSDelayCnt = 1000;
-				SHT20.Sht20Status = SHT20_INIT;
-			}
-			break;
-			
-		case SHT20_READ_DATA:
-			if(SHT20.Sht201mSDelayCnt > 0)
-				break;
-			ret = SHT20_Readata(SHT20_ADDRESS, rData, 3);
-			if(ret == true) {
-				if(SHT2x_CheckCrc(rData, 2, rData[2]) == 0) {
-					uint16_t tmp = (rData[0] << 8) + rData[1];
-					if(SHT20.Cmd == SHT20_Measurement_T_NHM) {
-						SHT20.Tempreture = SHT2x_CalcTemperatureC(tmp);
-						SHT20.Sht20Status = SHT20_READ_HUMI;
-					}
-					else {
-						SHT20.Humidity = SHT2x_CalcRH(tmp);
-						SHT20.Sht20Status = SHT20_READ_TEMPR;
-					}
-					SHT20.Sht201mSDelayCnt = 5;
-				}
-			}
-			else {
-				SHT20.Sht201mSDelayCnt = 1000;
-				SHT20.Sht20Status = SHT20_INIT;
-			}
-	}
-}
-
-void SHT201mSRoutine(void)
-{
-	if(SHT20.Sht201mSDelayCnt > 0)
-		SHT20.Sht201mSDelayCnt--;
-}
-

Project/GateWay/source/Module/SHT20/SHT20.H

@@ -1,156 +0,0 @@
-/***************************************************************
-*   File name    :  SHT20.h 
-*   Description  :  SHT20 Humidity and Temperature Sensors 
-*     M C U      :  STM32L051XX
-*   Compiler     :  Keil uVision V5.00a 
-*   Created by   :   
-*   Copyright    :  Copyright(c) 2018 
-*   Created data :  2018.03.16
-*   Modified data:  2018.03.16
-*   Vision       :  V1.0
-*****************************************************************/
-
-/*****************Function Declaration*************************/
-/*----define to easier to use-----*/
-#include <stdint.h>
-#include "bsp.h"
-
-typedef enum {
-	SHT20_IDLE,
-	SHT20_INIT,
-	SHT20_READ_TEMPR,
-	SHT20_READ_HUMI,
-	SHT20_READ_DATA
-}SHT20Status_m;
-
-typedef struct {
-	SHT20Status_m Sht20Status;
-	int Sht201mSDelayCnt;
-	float Tempreture;
-	float Humidity;
-	uint8_t Cmd;
-}SHT20Var_t;
-
-#define SHT20_Write_Add						0x80
-#define SHT20_Read_Add						0x81
-#define SHT20_Measurement_RH_HM		0XE5
-#define SHT20_Measurement_T_HM  	0XE3
-#define SHT20_Measurement_RH_NHM  0XF5  //非主机模式地址
-#define SHT20_Measurement_T_NHM		0XF3   //非主机模式地址
-#define SHT20_READ_REG						0XE7
-#define SHT20_WRITE_REG						0XE6
-#define SHT20_SOFT_RESET					0XFE
-
-//#define I2C_SOFTWARE
-
-#ifdef I2C_SOFTWARE
-
-#define SHT20_ADDRESS							0X80
-	
-#define	SHT20_SDA_IN()						I2C_SDA_IN()       //设置引脚输入模式   
-#define	SHT20_SDA_OUT()						I2C_SDA_OUT()     //设置引脚输出模式   
-#define	SHT20_SDA_GET()						I2C_SDA_GET()
-
-#define SHT20_I2C_SDA_LOW()				I2C_SDA_LOW()
-#define SHT20_I2C_SCL_LOW()				I2C_SCL_LOW()
-#define SHT20_I2C_SDA_HIGH()			I2C_SDA_HIGH()
-#define SHT20_I2C_SCL_HIGH()			I2C_SCL_HIGH()
-
-
-#define SHT20_I2C_LOW() {SHT20_I2C_SDA_LOW();SHT20_I2C_SCL_LOW();}  
- 
-/*================================================================
-[  Name  ]void IO_I2CInit(void)
-[Function]I2C初始化 空闲状态
-[  Notes ]
-[ Author ]LZH
-[  Data  ]2016.06.22
-================================================================*/
-void IO_I2CInit(void);
-
-/*================================================================
-[  Name  ]I2CStart
-[Function]开始
-[  Notes ]
-[ Author ]LZH
-[  Data  ]2016.06.22
-================================================================*/
-void I2CStart(void);
-
-/*================================================================
-[  Name  ]I2CStop
-[Function]结束
-[  Notes ]
-[ Author ]LZH
-[  Data  ]2016.06.22
-================================================================*/
-void I2CStop(void);
-
-/*================================================================
-[  Name  ]I2C_Write_Byte
-[Function]写一个字节  返回ACK或NACK
-[  Notes ]从高到低发
-[ Author ]LZH
-[  Data  ]2016.06.22
-================================================================*/
-uint8_t I2C_Write_Byte(uint8_t Write_Byte);
-
-/*================================================================
-[  Name  ]I2C_Read_Byte
-[Function]读一个字节，入库参数用于控制应答状态 ACK或NAC
-[  Notes ]从高到低
-[ Author ]LZH
-[  Data  ]2016.06.22
-================================================================*/
-uint8_t I2C_Read_Byte(uint8_t AckValue);
-
-
-/*================================================================
-[  Name  ]SHT20_SoftReset
-[Function]SHT20软件复位
-[  Notes ]从高到低
-[ Author ]LZH
-[  Data  ]2016.06.22
-================================================================*/
-void SHT20_SoftReset(void);
-
-/*================================================================
-[  Name  ]SET_Resolution
-[Function]写寄存器 设置分辨率
-[  Notes ]从高到低
-[ Author ]LZH
-[  Data  ]2016.06.22
-================================================================*/
-void SET_Resolution(void);
-
-/*================================================================
-[  Name  ]ReadSht20
-[Function]非主机模式，读取温湿度值
-[  Notes ]入口控制读取温度或湿度
-[ Author ]LZH
-[  Data  ]2016.06.22
-================================================================*/
-float ReadSht20(char whatdo);
-
-float ReadSht20_Medium (void);
-
-#else
-
-#define SHT20_ADDRESS							0X40
-
-#define	Sht20_Reg_Write(DevAddr, RegData, rLen)													I2C_Write(DevAddr, NULL, RegData, rLen)
-#define	Sht20_Read(DevAddr, RegAddr, rData, rLen)												I2C_Read(DevAddr, RegAddr, rData, rLen)
-#define	Sht20_Delay(x)																  
-
-void SHT20_reset(void);
-
-
-#endif
-void SHT20_GetValue(float *Tempreture, float *Humidity);
-void SHT20Start(void);
-void SHT20LoopHandler(void);
-void SHT201mSRoutine(void);
-
-
-
-

Project/GateWay/source/Module/sx127x/.gitignore

@@ -0,0 +1,130 @@
+# ---> IAR
+# Compiled binaries
+*.o
+*.bin
+*.elf
+*.hex
+*.map
+*.out
+*.obj
+
+# Trash
+*.bak
+thumbs.db
+*.~*
+
+# IAR Settings  
+**/settings/*.crun  
+**/settings/*.dbgdt  
+**/settings/*.cspy  
+**/settings/*.cspy.*  
+**/settings/*.xcl  
+**/settings/*.dni  
+**/settings/*.wsdt  
+**/settings/*.wspos  
+
+# IAR Debug Exe  
+**/Exe/*.sim  
+
+# IAR Debug Obj  
+**/Obj/*.pbd  
+**/Obj/*.pbd.*  
+**/Obj/*.pbi  
+**/Obj/*.pbi.*  
+
+# IAR project "Debug" directory
+Debug/
+
+# IAR project "Release" directory
+Release/
+
+# IAR project settings directory
+settings/
+
+# IAR backup files
+Backup*
+
+# IAR .dep files
+*.dep
+# ---> IAR_EWARM
+# gitignore template for the IAR EWARM
+# website: https://www.iar.com/knowledge/support/technical-notes/ide/which-files-should-be-version-controlled/
+
+# Some tools will put the EWARM files
+# under a subdirectory with the same name
+# as the configuration.
+# Example
+# EWARM/Config1/Obj /List /Exe
+# EWARM/Config2/Obj /List /Exe
+EWARM/**/Obj
+EWARM/**/List
+EWARM/**/Exe
+
+# Autogenerated project files
+*.dep
+*.ewt
+
+# Autogenerated folder for debugger
+EWARM/settings
+
+# ---> uVision
+# git ignore file for Keil µVision Project
+
+# µVision 5 and µVision 4 Project screen layout file
+*.uvguix.*
+*.uvgui.*
+
+# Listing Files
+*.i
+*.lst
+*.m51
+*.m66
+*.map
+
+# Object Files
+*.axf
+*.b[0-2][0-9]
+*.b3[0-1]
+*.bak
+*.build_log.htm
+*.crf
+*.d
+*.dep
+*.elf
+*.htm
+*.iex
+*.lnp
+*.o
+*.obj
+*.sbr
+
+# Firmware Files
+*.bin
+*.h86
+*.hex
+
+# Build Files
+.bat
+
+# Debugger Files
+.ini
+
+# JLink Files
+JLinkLog.txt
+
+# Other Files
+
+# ---> VisualStudioCode
+.vscode/*
+!.vscode/settings.json
+!.vscode/tasks.json
+!.vscode/launch.json
+!.vscode/extensions.json
+!.vscode/*.code-snippets
+
+# Local History for Visual Studio Code
+.history/
+
+# Built Visual Studio Code Extensions
+*.vsix
+

Project/GateWay/source/Module/sx127x/LICENSE

@@ -0,0 +1,8 @@
+ISC License:
+
+Copyright (c) 2004-2010 by Internet Systems Consortium, Inc. ("ISC")
+Copyright (c) 1995-2003 by Internet Software Consortium
+
+Permission to use, copy, modify, and/or distribute this software for any purpose with or without fee is hereby granted, provided that the above copyright notice and this permission notice appear in all copies.
+
+THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.

Project/GateWay/source/Module/sx127x/README.md

@@ -0,0 +1,2 @@
+# sx127x
+

Project/GateWay/source/Module/sx127x/sx127x.c

@@ -3,7 +3,7 @@
 
 #if (LORA_MODULE == SX1278W1)
 static Sx1276Type_t LoRaPara = {
-	.ucChannel = 4, 
+	.ucChannel = 8, 
 	.dwFreqHz = FREQ_CENT,
 	.ucPower = 20, 
 	.SignalBw = SX1276_BW_250K,
@@ -62,8 +62,7 @@ void SX1276WriteBuffer(uint8_t ucAddr, uint8_t *pucBuff, uint8_t ucLen)
 		LORA_SPI_READ_WRITE(pucBuff[ucCnt]);
 	}
 	LORA_SPI_NSS_SET();
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        }
-
+}
 void SX1276Write(uint8_t ucAddr, uint8_t ucData)
 {
     SX1276WriteBuffer(ucAddr, &ucData, 1);
@@ -295,8 +294,8 @@ void Sx1276LoRaInit(DataRevCallBack RxCallBack)
 	SX1276WriteBuffer(REG_LR_OPMODE, (uint8_t*)&(LoRaPara.RegBuff) + 1, SIZE_OF_REGISTERS);
 	
 	// set the RF settings
-	SX1276LoRaWriteChannel(LoRaPara.ucChannel);
-	//SX1276LoRaSetFreqHz(LoRaPara.dwFreqHz);
+	//SX1276LoRaWriteChannel(LoRaPara.ucChannel);
+	SX1276LoRaSetFreqHz(LoRaPara.dwFreqHz);
 	//REG_LR_MODEMCONFIG1
 	SX1276Read(REG_LR_MODEMCONFIG1, &(LoRaPara.RegBuff.RegModemConfig1));
 	//SignalBandwidth
@@ -315,11 +314,12 @@ void Sx1276LoRaInit(DataRevCallBack RxCallBack)
 	}
 	else{
 		SX1276LoRaSetNbTrigPeaks(3);
-		SX1276LoRaSetLowDatarateOptimize(false);		//低数据速率设置
+		SX1276LoRaSetLowDatarateOptimize(false);		//低数据速率设置
 	}
 	LoRaPara.RegBuff.RegModemConfig2 = (LoRaPara.RegBuff.RegModemConfig2 & RFLR_MODEMCONFIG2_SF_MASK ) | LoRaPara.SpreadFactor;
 	//PacketCrcOn
 	LoRaPara.RegBuff.RegModemConfig2 = (LoRaPara.RegBuff.RegModemConfig2 & RFLR_MODEMCONFIG2_RXPAYLOADCRC_MASK ) | SX1276_CRC_ON;	//SX1276_CRC_OFF
+	
 	SX1276Write(REG_LR_MODEMCONFIG2, LoRaPara.RegBuff.RegModemConfig2);
 	uint8_t Config2 = 0;
 	SX1276Read(REG_LR_MODEMCONFIG2, &Config2);
@@ -463,8 +463,8 @@ void Sx1276LoRaWakeup(void)
 }
 
 ////////////////////////////////////////
-//配置本层参数的函数
-//频道表
+//配置本层参数的函数
+//频道表
 const uint32_t gdwSx1276ChannelTbl[SX1276_CHANNEL_MAX]={
 	FREQ_CENT-FREQ_DEV*8, FREQ_CENT-FREQ_DEV*7, FREQ_CENT-FREQ_DEV*6, FREQ_CENT-FREQ_DEV*5,
 	FREQ_CENT-FREQ_DEV*4, FREQ_CENT-FREQ_DEV*3, FREQ_CENT-FREQ_DEV*2, FREQ_CENT-FREQ_DEV*1,
@@ -656,4 +656,14 @@ bool LoraSetRegPreamble(uint8_t RegPreamble)
 	LoRaPara.RegPreamble = RegPreamble;
 	return true;
 }
+bool LoraSetFreqCent(uint32_t FreqCent)
+{
+	if(FreqCent < 410000000 || FreqCent > 525000000)
+		return false;
+	LoRaPara.dwFreqHz = FreqCent;
+	return true;
+}
 #endif
+
+
+

Project/GateWay/source/Module/sx127x/sx127x.h

@@ -638,7 +638,7 @@ typedef enum{
 	SX1276_IH_ON=		(1)
 }Sx1276ImplicitHeaderOnType;
 
-//可变速率
+//可变速率
 typedef struct _AutoSfType{
 	Sx1276SpreadFactorType Sf;
 	uint8_t ucRssiMin, ucRssiMax;
@@ -747,20 +747,20 @@ typedef struct {
 //Down Link:
 //CH0-47:500.3-509.7MHz
 
-#define USE_915MHZ      0//=1使用915   =0使用433
+#define USE_915MHZ      0//=1使用915   =0使用433
 
 #if (USE_915MHZ == 1)
-  //中心频率，不定义则默认为449000000Hz
+  //中心频率，不定义则默认为449000000Hz
   #define FREQ_CENT       915000000ul
-  //860MHz-1GHz使用PA功放，不定义则默认不使用
-  //SX127x不定义，HOPERF模块需要定义
+  //860MHz-1GHz使用PA功放，不定义则默认不使用
+  //SX127x不定义，HOPERF模块需要定义
   #define USE_LORA_860_PA
 #endif
 
 /*
-中心频率配置：433100000ul + 200000*N
-*/
-#define CH0 	(433100000ul + 0) //测试频率
+中心频率配置：433100000ul + 200000*N
+*/					 
+#define CH0 	(433100000ul + 0) //测试频率
 #define CH1		(433100000ul + 200000)
 #define CH2		(433100000ul + 400000)
 #define CH3		(433100000ul + 600000)
@@ -825,6 +825,7 @@ void SX1276LoRaWriteRx(void);
 void SX1276LoRaWriteSleep(bool Sleep);
 Sx1276StateType_t SX1276LoRaReadStatus(void);
 void SX1276LoCalcRssiSnr(int16_t *pswRssi, int8_t *psbSnr);
+void SX1276Read(uint8_t ucAddr, uint8_t *pucData);
 void Sx1276LoRaSleep(void);
 void Sx1276LoRaWakeup(void);
 int GetSx1276RxRetValue(void);
@@ -836,5 +837,6 @@ bool LoraSetSignalBw(uint8_t SignalBw);
 bool LoraSetSpreadFactor(uint8_t SpreadFactor);
 bool LoraSetErrorCoding(uint8_t ErrorCoding);
 bool LoraSetRegPreamble(uint8_t RegPreamble);
+bool LoraSetFreqCent(uint32_t FreqCent);
 #endif
 

Project/GateWay/source/User/Inc/CatOneTask.h

@@ -1,36 +1,28 @@
 #ifndef __CAT_ONE_TASK_H
-#define	__CAT_ONE_TASK_H
+#define __CAT_ONE_TASK_H
 #include "main.h"
 #include "Public.h"
 
 #define	CAT_ONE_REV_TIMEOUT_MAX			(10 * 60 * 1000)
 #define	CAT_ONE_REV_LEN_MAX					512
 
-#define	CAT_ONE_POW_ON()						CAT1_POW_ON()
-#define	CAT_ONE_POW_OFF()						CAT1_POW_OFF()
-
-#define	CAT_ONE_LINKA_GET()					CAT1_LINKA_GET()
-#define	CAT_ONE_LINKB_GET()					CAT1_LINKB_GET()
-
-#define	CAT_ONE_DELAY_1MS(X)
-
 typedef enum {
 	CAT_ONE_AT_NULL,
-	CAT_ONE_AT,					//开机检测
-	CAT_ONE_ATE0,				//关回显
-	CAT_ONE_CPIN,				//识卡
+	CAT_ONE_AT,					//开机检测
+	CAT_ONE_ATE0,				//关回显
+	CAT_ONE_CPIN,				//识卡
 	CAT_ONE_IMEI,
-	CAT_ONE_LCCID,			//读卡
-	CAT_ONE_CEREG,			//查询注册状态
-	CAT_ONE_CGPADDR,		//查询IP地址
-	CAT_ONE_CSQ,				//查询信号强度
-	CAT_ONE_LDNSGIP,		//域名解析
-	CAT_ONE_LBS,				//获取基站定位信息
-	CAT_ONE_LIPOPEN,		//设置TCP服务器地址和端口
-	CAT_ONE_LIPSEND,		//发送数据
-	CAT_ONE_LTPCLOSE,		//断开连接
+	CAT_ONE_LCCID,			//读卡
+	CAT_ONE_CEREG,			//查询注册状态
+	CAT_ONE_CGPADDR,		//查询IP地址
+	CAT_ONE_CSQ,				//查询信号强度
+	CAT_ONE_LDNSGIP,		//域名解析
+	CAT_ONE_LBS,				//获取基站定位信息
+	CAT_ONE_LIPOPEN,		//设置TCP服务器地址和端口
+	CAT_ONE_LIPSEND,		//发送数据
+	CAT_ONE_LTPCLOSE,		//断开连接
 	CAT_ONE_LBSPARA,
-	CAT_ONE_CCLK,					//获取时间
+	CAT_ONE_CCLK,					//获取时间
 	CAT_ONE_AT_CMD_END,
 }CatOneATCMD_m;
 
@@ -67,7 +59,7 @@ typedef enum {
 }CatOneNetType_m;
 
 typedef struct {
-	CatOneStatus_m Status;
+	CatOneStatus_m Cat1Status;
 	CatOneStatus_m NextStatus;
 	CatOneRetStatus_m ATCmdRet;
 	uint32_t CatOne1mSDelayCnt;
@@ -82,18 +74,16 @@ typedef struct {
 	char SIM[32];
 	CatOneNetType_m  NetType;
 	bool TcpConnFlag;
-	
+
 	bool LBSFlag;
 	int Longitude;
 	int Latitude;
 	char CatOneSendBuff[1024];
-	
-	GateWayPara GateWay;	
+
+	GateWayPara GateWay;
 	DataRevCallBack CatOneRevCallBack;
 }CatOne_t, *pCatOne_t;
 
-CatOneRetStatus_m CatOneSend(uint8_t *sData, uint16_t sLen);
-void CatOneStart(void);
 void CatOneStop(void);
 void CatOneReset(void);
 void Cat1DBGOnOff(bool OnOff);
@@ -101,7 +91,9 @@ void CatOneGetLocationInfo(int *Longitude, int *Latitude);
 void CatOneGetIMEIAndSIM(char *Imei, char *Sim);
 bool CatOneGetStatus(void);
 bool CatOneEthSendQueue(uint8_t *sData, uint16_t sLen);
-void CatOne_Eth_Thread_Entry(void *parameter);
-void EthRxOverhandler(void);
+void CatOneTriggerRegister(void);
+void CatOne_Thread_Entry(void *parameter);
+void Cat1IrqCallback(uint8_t rData);
+void Cat1OverHandler(void);
 void CatReadImeiOrSim(char *Imei, char *Sim);
 #endif

Project/GateWay/source/User/Inc/EthTask.h

@@ -0,0 +1,47 @@
+#ifndef __ETH_TASK_H
+#define __ETH_TASK_H
+#include "main.h"
+#include "Public.h"
+
+#define ETH_RX_LEN_MAX						512
+
+#define ETH_RESET_DELAY_TIME_MAX			(5 * 60 * 1000)
+#define ETH_LINK_WAIT_TIME_MAX				(10 * 1000)
+#define ETH_RECV_TIMEOUT_MAX				(60 * 1000)
+#define ETH_SEND_RETRY_MAX					3
+#define ETH_FIRST_REG_DELAY					(5 * 1000)
+
+typedef enum {
+	ETH_IDEL,
+	ETH_RESET,
+	ETH_WAIT_LINK,
+	ETH_REG_SVR,
+	ETH_WAIT_SEND,
+	ETH_SEND_DATA,
+	ETH_WAIT_RECV,
+	ETH_OFF,
+} EthStatus_m;
+
+typedef struct {
+	EthStatus_m Status;
+	uint32_t ResetDelayCnt;
+	uint32_t LinkWaitCnt;
+	uint32_t RecvTimeoutCnt;
+	uint8_t SendRetryCnt;
+	bool FirstRegFlag;
+
+	GateWayPara GateWay;
+
+	uint8_t TxBuff[ETH_RX_LEN_MAX];
+	uint16_t TxLen;
+	uint8_t Payload[ETH_RX_LEN_MAX];
+	char SendASCII[ETH_RX_LEN_MAX * 2];
+} EthTask_t;
+
+void Eth_Thread_Entry(void *parameter);
+void EthIrqCallbackHandler(uint8_t rData);
+void EthOverHandler(void);
+void ETHStop(void);
+void ETHReset(void);
+void ETHTriggerRegister(void);
+#endif

Project/GateWay/source/User/Inc/Public.h

@@ -3,7 +3,7 @@
 
 #include "bsp.h"
 
-#define	LORA_LOWPOWER			//LORA低功耗设备，采用主动上报方式
+#define	LORA_LOWPOWER			//LORA低功耗设备，采用主动上报方式
 
 #define	SENSOR_DATA_LEN_MAX										50
 #define	SENSOR_NUM_MAX												16
@@ -12,8 +12,8 @@
 #define	REGISTER_INTERVAL_MAX									(2 * 60)
 #define	COMMUNIT_READ_SENSOR_INTERVAL_MAX			(1 * 60)
 
-#define	LORA_ERR_RESET_DLY_MAX								(10 * 60)				//LORA接收超时复位延时，单位秒
-#define	CAT1_ERR_RESET_DLY_MAX								(60 * 60)				//CAT1接收超时复位延时，单位秒
+#define	LORA_ERR_RESET_DLY_MAX								(10 * 60)				//LORA接收超时复位延时，单位秒
+#define	CAT1_ERR_RESET_DLY_MAX								(60 * 60)				//CAT1接收超时复位延时，单位秒
 
 typedef struct GateWay_t GateWayPara_t, *GateWayPara;
 
@@ -28,7 +28,6 @@ typedef enum {
 	DEBUG_CH_RS485_2,
 }DebugChannel_m;
 
-
 typedef enum {
 	DEV_TYPE_BROADCAST,
 	DEV_TYPE_INC_COMMUNIT = 0x8001,
@@ -56,7 +55,8 @@ typedef enum {
 	COMM_UNIT_CMD_READ,
 	COMM_UNIT_CMD_SET_SENSOR_COLL_TIME = 5,
 	COMM_UNIT_CMD_TIME_SYNC,
-	COMM_UNIT_CMD_CONT_LASER = 8,//激光独有指令
+	COMM_UNIT_CMD_CONT_LASER = 8,//激光独有指令
+	COMM_UNIT_CMD_GET_SIGNAL,		//0x09 查询Lora信号质量
 	COMM_UNIT_CMD_END,
 }CommUnitCmd_m;
 
@@ -71,40 +71,41 @@ typedef enum {
 	NET_COMM_CMD_ADD_UNIT,
 	NET_COMM_CMD_LP_DEV_CONFIG,
 	NET_COMM_CMD_ALARM,
-	NET_COMM_CMD_CONT_LASER,//激光独有指令
+	NET_COMM_CMD_CONT_LASER,//激光独有指令
 	NET_COMM_CMD_END,
 }NetCommCmd_m;
 
 typedef enum {
-	SENSOR_TYPE_NULL,								//0x0000 空设备
-	FORCE_6D,										//0x0001 六维应力
-	OSMOTIC_PRESSURE,								//0x0002 渗透压
-	ELASTIC_WAVEGUIDE,							//0x0003 弹性波导
-	DIELECTRIC_MASS,								//0x0004 介电质普
-	VIBRATE_SENSOR,								//0x0005 微振动传感器
-	CONT_DEFOR_3D,									//0x0006 三维连续变形
-	COMM_UNIT,										//0x0007 通讯单元
-	FORCE_3D,										//0x0008 三维应力
-	LASER_TRACING,									//0x0009 激光示踪
-	WATER_LEVEL,									//0x000A 水位计
-	_0x000B,											//0x000B 保留
-	_0x000C,											//0x000C 保留	
-	MULTI_PARAMETER_FUSION,						//0x000D 多参数融合
-	CRACK_DETECTION,								//0x000E 裂缝仪
-	_0x000F,											//0x000F 保留
-	ATTITUDE_MONITOR,								//0x0010 姿态检测
-	LASER_DISPLACE,								//0x0011 激光位移
-	REBAR_STRESS,									//0x0012 钢筋应力
-	ANCHOR_ROD_STRESS,							//0x0013 锚杆轴力
-	SURFACE_STRESS,								//0x0014 表面应力
-	PRESSURE,										//0x0015 压力
-	MICROWAVE_DISPLACE,							//0x0016 微波位移 
+	SENSOR_TYPE_NULL,								//0x0000 空设备
+	FORCE_6D,										//0x0001 六维应力
+	OSMOTIC_PRESSURE,								//0x0002 渗透压
+	ELASTIC_WAVEGUIDE,							//0x0003 弹性波导
+	DIELECTRIC_MASS,								//0x0004 介电质普
+	VIBRATE_SENSOR,								//0x0005 微振动传感器
+	CONT_DEFOR_3D,									//0x0006 三维连续变形
+	COMM_UNIT,										//0x0007 通讯单元
+	FORCE_3D,										//0x0008 三维应力
+	LASER_TRACING,									//0x0009 激光示踪
+	WATER_LEVEL,									//0x000A 水位计
+	_0x000B,											//0x000B 保留
+	_0x000C,											//0x000C 保留	
+	MULTI_PARAMETER_FUSION,						//0x000D 多参数融合
+	CRACK_DETECTION,								//0x000E 裂缝仪
+	_0x000F,											//0x000F 保留
+	ATTITUDE_MONITOR,								//0x0010 姿态检测
+	LASER_DISPLACE,								//0x0011 激光位移
+	REBAR_STRESS,									//0x0012 钢筋应力
+	ANCHOR_ROD_STRESS,							//0x0013 锚杆轴力
+	SURFACE_STRESS,								//0x0014 表面应力
+	PRESSURE,										//0x0015 压力
+	MICROWAVE_DISPLACE,							//0x0016 微波位移 
+	DISPLACEMENT = 0x0020,						//0x0020 位移监测传感器
 }SensorType_m;
 
-typedef struct {//主设备固定包头
-	uint8_t BatLevel;								//电池电量
-	int8_t RSSI;									//信号强度
-	int8_t Nsr;										//信噪比
+typedef struct {//主设备固定包头
+	uint8_t BatLevel;								//电池电量
+	int8_t RSSI;									//信号强度
+	int8_t Nsr;										//信噪比
 }__attribute__ ((packed))MasterDev_T,*MasterDevDp;
 
 typedef struct {
@@ -121,85 +122,101 @@ typedef struct {
 
 typedef struct {
 	MasterDev_T MasterDev;
-	int16_t PitchAngle;							//俯仰角偏斜	（范围±900）单位0.1°
-	int16_t RollAngle;								//横滚角偏斜	（范围±900）单位0.1°
-	int16_t YawAngle;								//偏航角偏斜	（范围0~3600）单位0.1°
-}__attribute__((packed))LaserTracingType_t;
+	int16_t PitchAngle;							//俯仰角偏斜	（范围±900）单位0.1°
+	int16_t RollAngle;								//横滚角偏斜	（范围±900）单位0.1°
+	int16_t YawAngle;								//偏航角偏斜	（范围0~3600）单位0.1°
+}__attribute__((packed))LaserTracingType_T;
 
-typedef struct {
-	uint8_t CommDevAddr[6];			//通讯单元地址
-	uint16_t CollectInterval;		//采集时间间隔
-	uint16_t ReportInterval;		//上报时间间隔
-	uint8_t ERInterval;				//紧急上报时间间隔
-	uint8_t ERTime;						//紧急上报时长
-}__attribute__((packed))SvrDownLPDevConfigPara_t;
+typedef struct {//0x0020 位移计
+  MasterDev_T MasterDev;
+	int16_t PitchAngle;							//俯仰角偏斜（范围±900）单位0.1°
+	int16_t RollAngle;								//横滚角偏斜（范围±900）单位0.1°
+	int16_t YawAngle;								//偏航角偏斜（范围0~3600）单位0.1°
+  float Temp;                     //温度
+	float Altitude;									//海拔（）单位cm
+	int16_t Distance;								//1轴应力值转位移（范围±300,单位0.1mm）
+}__attribute__ ((packed))Displacement_T,*DisplacementDp;
 
 typedef struct {
 	int Distance;
 }__attribute__((packed))LaserDistanceSensorType_t;
 
+typedef struct {
+	uint8_t CommDevAddr[6];			//通讯单元地址
+	uint16_t CollectInterval;		//采集时间间隔
+	uint16_t ReportInterval;		//上报时间间隔
+	uint8_t ERInterval;				//紧急上报时间间隔
+	uint8_t ERTime;						//紧急上报时长
+}__attribute__((packed))SvrDownLPDevConfigPara_t;
+
 typedef struct {
 	uint8_t AlarmType;
 	uint8_t AlarmState;
 	uint8_t AlarmPara;
 }__attribute__((packed))GateWayAlarmType_t;
 
-#define	LW_DEV_COLLECT_INTERVAL_MAX					300//默认300秒
-#define	LW_DEV_REPORT_INTERVAL_MAX						20//20分钟
-#define	LW_DEV_ER_INTERVAL_MAX							2//2分钟
-#define	LW_DEV_ER_TIME_MAX								20//20分钟
+#define	LW_DEV_COLLECT_INTERVAL_MAX					300//默认300秒
+#define	LW_DEV_REPORT_INTERVAL_MAX						20//20分钟
+#define	LW_DEV_ER_INTERVAL_MAX							2//2分钟
+#define	LW_DEV_ER_TIME_MAX								20//20分钟
 
 typedef struct {
-	uint16_t CollectInterval;		//采集时间间隔
-	uint16_t ReportInterval;		//上报时间间隔
-	uint8_t ERInterval;				//紧急上报时间间隔
-	uint8_t ERTime;						//紧急上报时长
-	uint32_t TimeStamp;				//时间戳
+	uint16_t CollectInterval;		//采集时间间隔
+	uint16_t ReportInterval;		//上报时间间隔
+	uint8_t ERInterval;				//紧急上报时间间隔
+	uint8_t ERTime;						//紧急上报时长
+	uint32_t TimeStamp;				//时间戳
 }__attribute__((packed))LPDevConfigPara_t;
 
 typedef struct {
 	bool RegFlag;
 	bool RevNewDataFlag;
-	bool CommStatus;	//通讯状态，1-在线，0-离线
-	bool	CailFlag;	//校准标志（低功耗）
-	bool	TimeSyncFlag;	//时间同步标志（低功耗）
-	bool	ContLaser;	//激光控制标志（低功耗）
-	bool	LaserOnOff;	//激光状态（低功耗）
+	bool CommStatus;	//通讯状态，1-在线，0-离线
+	bool	CailFlag;	//校准标志（低功耗）
+	bool	TimeSyncFlag;	//时间同步标志（低功耗）
+	bool	ContLaser;	//激光控制标志（低功耗）
+	bool	LaserOnOff;	//激光状态（低功耗）
 	uint32_t CommErrCnt;
 	uint8_t MasterMac[6];
-	uint8_t Mac[SENSOR_NUM_MAX][6];//第一位是主设备，后面全是子设备
+	uint8_t Mac[SENSOR_NUM_MAX][6];//第一位是主设备，后面全是子设备
 	uint8_t BatLevel;
-	int8_t RSSI;									//信号强度
-	int8_t Nsr;										//信噪比
+	int8_t RSSI;									//信号强度
+	int8_t Nsr;										//信噪比
 	uint16_t CUType;
 	uint8_t SensorN;
 	uint16_t SensorType[SENSOR_NUM_MAX];
-	//低功耗设备配置信息
-	bool ConfigFlag;			//配置标志，为1表示有新配置，应答低功耗设备时需要附带发送
-	uint16_t CollectInterval;		//采集时间间隔
-	uint16_t ReportInterval;		//上报时间间隔
-	uint8_t ERInterval;				//紧急上报时间间隔
-	uint8_t ERTime;						//紧急上报时长
-}CommUnitPara_t, *CommUnitPara;
+	//低功耗设备配置信息
+	bool ConfigFlag;			//配置标志，为1表示有新配置，应答低功耗设备时需要附带发送
+	uint16_t CollectInterval;		//采集时间间隔
+	uint16_t ReportInterval;		//上报时间间隔
+	uint8_t ERInterval;				//紧急上报时间间隔
+	uint8_t ERTime;						//紧急上报时长
+}__attribute__((packed))CommUnitPara_t, *CommUnitPara;
+
+typedef struct {
+	bool ExclFlag;
+	uint8_t ExclMac[6];//需要排除的通讯单元MAC
+}__attribute__((packed))ExclCommUnit_t, *ExclCommUnit;
 
 typedef struct {
 	uint8_t Data[SENSOR_NUM_MAX][SENSOR_DATA_LEN_MAX];
-}CommUnitData_t, *CommUnitData;
+}__attribute__((packed))CommUnitData_t, *CommUnitData;
 
 typedef struct {
 	CommUnitPara_t Para;
-}CommUnit_t, *CommUnit;
+}__attribute__((packed))CommUnit_t, *CommUnit;
 
 typedef struct {
-	bool Enable;		//串口使能
-	bool CommUnitEnable;		//通讯单元使能，开启（使用内部通讯单元功能，直接和传感器通讯），关闭（直接和RS485类型的通讯单元通讯）
-	bool QuerySensorFlag;		//查询传感器标志
-	bool UpgradeEnable;//升级功能使能
+	bool Enable;		//串口使能
+	bool CommUnitEnable;		//通讯单元使能，开启（使用内部通讯单元功能，直接和传感器通讯），关闭（直接和RS485类型的通讯单元通讯）
+	bool QuerySensorFlag;		//查询传感器标志
+	bool UpgradeEnable;//升级功能使能
 	uint8_t Power;
 	uint32_t BaudRate;
 	SendData RS485Send;
-	CommUnit_t CUData;
-}RS485Para_t, *RS485Para;
+	CommUnit_t CUPara;
+  CommUnitData_t CUData;
+}__attribute__((packed))RS485Para_t, *RS485Para;
 
 typedef struct {
 	uint8_t Header;
@@ -235,37 +252,56 @@ typedef struct {
 }LoraPara_t, *pLoraPara;
 
 typedef struct {
-	uint32_t SavFlag;									//存储标志
-	CommType_m Comm;									//网关通讯方式
-	uint8_t GwMac[6];									//网关mac
-	char SvrAddr[4];									//服务器地址
-	uint32_t SvrPort;									//服务器端口
-	uint32_t CommUnitReadInterval;				//通讯单元读取时间间隔,单位S
-	CommUnitPara_t CommUnitArray[COMMUNIT_NUM_MAX];			//注册的通讯单元信息
-	RS485Para_t Rs485Ch1;							//RS485通道1配置
-	RS485Para_t Rs485Ch2;							//RS485通道2配置
-	uint8_t DebugChannel;							//调试通道
-	LoraPara_t Lora;									//Lora配置
-	bool OutageFlag;									//断电报警标志
+	uint8_t DestAddr[4];								//目的服务器地址
+	uint16_t DestPort;									//目的服务器端口
+	uint8_t LocalAddr[4];								//本地客户端地址(预留)
+	uint16_t LocalPort;									//本地客户端端口(预留)
+}LTENetPara_t, *pLTENetPara;
+
+typedef struct {
+	uint8_t IpMode;								//IP模式：DHCP/静态
+	uint8_t IpAddr[4];								//本地IP地址
+	uint16_t IpPort;									//本地端口
+	uint8_t WorkMode;						//工作模式
+	uint8_t SubnetMask[4];						//子网掩码
+	uint8_t Gateway[4];								//网关
+	uint8_t DestIp[4];								//目的IP地址
+	uint16_t DestPort;								//目的端口
+}EthNetPara_t, *pEthNetPara;
+
+typedef struct {
+	uint32_t SavFlag;									//存储标志
+	CommType_m Comm;									//网关通讯方式
+	uint8_t GwMac[6];									//网关mac
+	LTENetPara_t LTENet;								//Cat1/4G服务器参数
+	EthNetPara_t EthNet;								//以太网网络参数
+	uint32_t CommUnitReadInterval;				//通讯单元读取时间间隔,单位S
+	CommUnitPara_t CommUnitArray[COMMUNIT_NUM_MAX];			//注册的通讯单元信息
+	ExclCommUnit_t ExclCommUnit[COMMUNIT_NUM_MAX];			//排除的通讯单元信息
+	RS485Para_t Rs485Ch1;							//RS485通道1配置
+	RS485Para_t Rs485Ch2;							//RS485通道2配置
+	uint8_t DebugChannel;							//调试通道
+	LoraPara_t Lora;									//Lora配置
+	bool OutageFlag;									//断电报警标志
 	uint16_t crc16;
 }__attribute__((packed))GWConfigPara_t, *GWConfigPara;
 
 struct GateWay_t{
-	bool TimeSyncFlag;								//时间同步标志
-	bool SvrRegFlag;									//服务器注册标志
-	uint8_t SvrMac[6];								//服务器mac
-	GWConfigPara_t ConfigPara;						//配置参数
+	bool TimeSyncFlag;								//时间同步标志
+	bool SvrRegFlag;									//服务器注册标志
+	uint8_t SvrMac[6];								//服务器mac
+	GWConfigPara_t ConfigPara;						//配置参数
 	CommUnitData_t CUDataArray[COMMUNIT_NUM_MAX];
-	uint8_t Battery;									//电池电量
-	uint16_t UploadInterval;						//上传间隔
-	uint32_t HistoryNum;								//历史数据数量
-	DataRevCallBack SvrRevCallBack;				//接收到服务器回调
-	DataRevResCallBack CommUnitRevCallBack;	//通讯单元接收回调
-	rt_mq_t NetSendData_MQ;							//网络发送数据队列，第一个字节用于存储消息长度, 第二字节存储命令字，后为数据
-	rt_mq_t LoraRev_MQ;								//Lora接收消息队列，第一个字节用于存储消息长度，后为数据
+	uint8_t Battery;									//电池电量
+	uint16_t UploadInterval;						//上传间隔
+	uint32_t HistoryNum;								//历史数据数量
+	DataRevCallBack SvrRevCallBack;				//接收到服务器回调
+	DataRevResCallBack CommUnitRevCallBack;	//通讯单元接收回调
+	rt_mq_t NetSendData_MQ;							//网络发送数据队列，第一个字节用于存储消息长度, 第二字节存储命令字，后为数据
+	rt_mq_t LoraRev_MQ;								//Lora接收消息队列，第一个字节用于存储消息长度，后为数据
 	rt_mutex_t UartRevMutex;
 	
-	uint8_t BatteryReadDlyCnt;		//读取电压延时，单位秒，防止4G发送拉低电池电压，造成断电误报
+	uint8_t BatteryReadDlyCnt;		//读取电压延时，单位秒，防止4G发送拉低电池电压，造成断电误报
 };
 
 int Cat1EthRevCallBack(GateWayPara GateWay, uint8_t *rData, uint16_t rLen);
@@ -277,6 +313,7 @@ int CommUnitAnalyze(GateWayPara GateWay, uint8_t *rData, uint16_t rLen, SendData
 void DebugAnalyze(GateWayPara GateWay, uint8_t *rData, uint16_t rLen);
 void CommUnitCmdSend(GateWayPara GateWay, uint8_t *CommUnitMac, CommUnitCmd_m Cmd, uint8_t *Payload, uint16_t PayloadLen, SendData Send);
 int CheckCommUnitReg(GateWayPara GateWay, uint8_t *CommUnitMac);
+int CheckCommUnitExcl(GateWayPara GateWay, uint8_t *CommUnitMac);
 int CommUintOrgData(GateWayPara GateWay, CommUnitPara CUPara, CommUnitData CUData, uint8_t *sData);
 void DebugDisplaySensorData(int SensorIdx, uint16_t SensorType, uint8_t *SensorData);
 #endif

Project/GateWay/source/User/Inc/RS485Task.h

@@ -36,7 +36,7 @@ typedef enum {
 	RS485_SENSOR_CMD_END,
 }RS485SensorCmd_m;
 
-//´«¸ÐÆ÷Êý¾Ý·¢ËͽṹÌå
+//传感器数据发送结构体
 typedef struct {
 	bool SendFlag;
 	uint8_t SensorCnt;

Project/GateWay/source/User/Inc/bsp.h

@@ -10,6 +10,9 @@
 #include "rtthread.h"
 #include "ff.h"
 
+#define	SOFTWARE_VERSION								10
+#define	HARDWARE_VERSION								12
+
 //#define	USE_BOOTLOADER
 
 //#define FLASH_SECTOR_SIZE           		0x2000ul                     
@@ -27,7 +30,7 @@
 //#define BOOT_PARA_ADDRESS								(FLASH_SIZE - FLASH_SECTOR_SIZE)
 //#define	BOOT_PARA_SIZE									(FLASH_SECTOR_SIZE)
 
-/* flash rom map  存储分区*/
+/* flash rom map  存储分区*/
 //boot 16k
 #define FLASH_BASE                ((uint32_t)0x00000000)  
 #define FLASH_SECTOR_SIZE          0x2000ul    
@@ -50,6 +53,7 @@
 
 #define	APP_START_FLAG						0x55AA5A5A
 #define	APP_UPDATE_FLAG						0xA5A5AA55
+#define	APP_BOOT_UPGRADE_FLAG				0x5A5A55A5
 
 
 #define	WATCH_DOG					1
@@ -59,36 +63,62 @@
 
 #define	RTC_IRQn													Int001_IRQn
 
-#define	LORA_DIO0_IRQn										Int005_IRQn
-
-#define	DBGUART_IRQn											Int006_IRQn
-#define	DBGUART_EI_IRQn										Int007_IRQn
-
-#define	RS485CH1_UART_IRQn								Int008_IRQn
-#define	RS485CH1_UART_EI_IRQn							Int009_IRQn
-
-#define	RS485CH2_UART_IRQn								Int010_IRQn
-#define	RS485CH2_UART_EI_IRQn							Int011_IRQn
-
-#define	ETH_OR_CAT1_UART_IRQn							Int012_IRQn
-#define	ETH_OR_CAT1_UART_EI_IRQn					Int013_IRQn
-
 #define	DBG_RXPIN_IRQn										Int002_IRQn
 
+#define	LORA_DIO0_IRQn										Int005_IRQn
 
-//DEBUG
-#define	DBG_USART_CH											(M4_USART1)
-#define	DBG_USART_RX_PORT									(PortA)
-#define	DBG_USART_RX_PIN									(Pin11)
-#define	DBG_USART_TX_PORT									(PortA)
-#define	DBG_USART_TX_PIN									(Pin12)
-#define	DBG_USART_RX_FUNC									(Func_Usart1_Rx)
-#define DBG_USART_TX_FUNC       	  			(Func_Usart1_Tx)
-#define DBG_USART_RI_NUM									(INT_USART1_RI)
-#define DBG_USART_EI_NUM									(INT_USART1_EI)
-#define DBG_USART_TI_NUM									(INT_USART1_TI)
-#define DBG_USART_TCI_NUM									(INT_USART1_TCI)
-#define	DBG_FCG1_PERIPH										(PWC_FCG1_PERIPH_USART1)
+#define	DBG_OR_CAT1_UART_IRQn							Int006_IRQn
+#define	DBG_OR_CAT1_UART_EI_IRQn					Int007_IRQn
+
+#define	ETH_UART_IRQn							        Int008_IRQn
+#define	ETH_UART_EI_IRQn					        Int009_IRQn
+
+#define	RS485CH1_UART_IRQn								Int010_IRQn
+#define	RS485CH1_UART_EI_IRQn							Int011_IRQn
+
+#define	RS485CH2_UART_IRQn								Int012_IRQn
+#define	RS485CH2_UART_EI_IRQn							Int013_IRQn
+
+
+//DEBUG or CAT1
+#define	DBG_OR_CAT1_USART_CH							(M4_USART1)
+#define	DBG_OR_CAT1_USART_RX_PORT					(PortA)
+#define	DBG_OR_CAT1_USART_RX_PIN					(Pin11)
+#define	DBG_OR_CAT1_USART_TX_PORT					(PortA)
+#define	DBG_OR_CAT1_USART_TX_PIN					(Pin12)
+#define	DBG_OR_CAT1_USART_RX_FUNC					(Func_Usart1_Rx)
+#define DBG_OR_CAT1_USART_TX_FUNC       	(Func_Usart1_Tx)
+#define DBG_OR_CAT1_USART_RI_NUM					(INT_USART1_RI)
+#define DBG_OR_CAT1_USART_EI_NUM					(INT_USART1_EI)
+#define DBG_OR_CAT1_USART_TI_NUM					(INT_USART1_TI)
+#define DBG_OR_CAT1_USART_TCI_NUM					(INT_USART1_TCI)
+#define	DBG_OR_CAT1_FCG1_PERIPH						(PWC_FCG1_PERIPH_USART1)
+
+#define DBG_OR_CAT1_CTRL_PORT							(PortB)
+#define DBG_OR_CAT1_CTRL_PIN							(Pin08)
+
+#if (HARDWARE_VERSION == 12)
+#define	DBG_ON()													PORT_SetBits(DBG_OR_CAT1_CTRL_PORT, DBG_OR_CAT1_CTRL_PIN)
+#define	CAT1_ON()													PORT_ResetBits(DBG_OR_CAT1_CTRL_PORT, DBG_OR_CAT1_CTRL_PIN)
+#elif (HARDWARE_VERSION >= 13)
+#define	DBG_ON()													PORT_ResetBits(DBG_OR_CAT1_CTRL_PORT, DBG_OR_CAT1_CTRL_PIN)
+#define	CAT1_ON()													PORT_SetBits(DBG_OR_CAT1_CTRL_PORT, DBG_OR_CAT1_CTRL_PIN)
+#endif
+
+#define	CAT1_PWR_KEY_PORT									(PortA)
+#define	CAT1_PWR_KEY_PIN									(Pin03)
+#define	CAT1_PWR_KEY_CLR()								PORT_SetBits(CAT1_PWR_KEY_PORT, CAT1_PWR_KEY_PIN)
+#define	CAT1_PWR_KEY_SET()								PORT_ResetBits(CAT1_PWR_KEY_PORT, CAT1_PWR_KEY_PIN)
+
+#define	CAT1_RESET_PORT										(PortA)
+#define	CAT1_RESET_PIN										(Pin00)
+#define	CAT1_RESET_CLR()									PORT_SetBits(CAT1_RESET_PORT, CAT1_RESET_PIN)
+#define	CAT1_RESET_SET()									PORT_ResetBits(CAT1_RESET_PORT, CAT1_RESET_PIN)
+
+#define	CAT1_WAKEUP_PORT									(PortA)
+#define	CAT1_WAKEUP_PIN										(Pin02)
+#define	CAT1_WAKEUP_CLR()									PORT_SetBits(CAT1_WAKEUP_PORT, CAT1_WAKEUP_PIN)
+#define	CAT1_WAKEUP_SET()									PORT_ResetBits(CAT1_WAKEUP_PORT, CAT1_WAKEUP_PIN)
 
 //RS485 Ch1
 #define	RS485_CH1_USART_CH								(M4_USART2)
@@ -148,44 +178,22 @@
 //#define	RS485_CH2_VOL_5V()								PORT_SetBits(RS485_CH2_VOL_CTRL_PORT, RS485_CH2_VOL_CTRL_PIN)
 //#define	RS485_CH2_VOL_12V()								PORT_ResetBits(RS485_CH2_VOL_CTRL_PORT, RS485_CH2_VOL_CTRL_PIN)
 
-//ETH OR CAT1
-#define	ETH_OR_CAT1_USART_CH							(M4_USART4)
-#define	ETH_OR_CAT1_USART_RX_PORT					(PortB)
-#define	ETH_OR_CAT1_USART_RX_PIN					(Pin09)
-#define	ETH_OR_CAT1_USART_TX_PORT					(PortC)
-#define	ETH_OR_CAT1_USART_TX_PIN					(Pin13)
-#define	ETH_OR_CAT1_USART_RX_FUNC					(Func_Usart4_Rx)
-#define ETH_OR_CAT1_USART_TX_FUNC       	(Func_Usart4_Tx)
-#define ETH_OR_CAT1_USART_RI_NUM					(INT_USART4_RI)
-#define ETH_OR_CAT1_USART_EI_NUM					(INT_USART4_EI)
-#define ETH_OR_CAT1_USART_TI_NUM					(INT_USART4_TI)
-#define ETH_OR_CAT1_USART_TCI_NUM					(INT_USART4_TCI)
-#define	ETH_OR_CAT1_FCG1_PERIPH						(PWC_FCG1_PERIPH_USART4)
+//ETH 
+#define	ETH_USART_CH							        (M4_USART4)
+#define	ETH_USART_RX_PORT					(PortB)
+#define	ETH_USART_RX_PIN					(Pin09)
+#define	ETH_USART_TX_PORT					(PortC)
+#define	ETH_USART_TX_PIN					(Pin13)
+#define	ETH_USART_RX_FUNC					(Func_Usart4_Rx)
+#define ETH_USART_TX_FUNC       	(Func_Usart4_Tx)
+#define ETH_USART_RI_NUM					(INT_USART4_RI)
+#define ETH_USART_EI_NUM					(INT_USART4_EI)
+#define ETH_USART_TI_NUM					(INT_USART4_TI)
+#define ETH_USART_TCI_NUM					(INT_USART4_TCI)
+#define	ETH_FCG1_PERIPH						(PWC_FCG1_PERIPH_USART4)
 
-#define ETH_OR_CAT1_CTRL_PORT							(PortB)
-#define ETH_OR_CAT1_CTRL_PIN							(Pin08)
-#define	ETH_ON()													PORT_SetBits(ETH_OR_CAT1_CTRL_PORT, ETH_OR_CAT1_CTRL_PIN)
-#define	CAT1_ON()													PORT_ResetBits(ETH_OR_CAT1_CTRL_PORT, ETH_OR_CAT1_CTRL_PIN)
-
-//#define ETH_OR_CAT1_TX_CTRL_PORT					(PortH)
-//#define ETH_OR_CAT1_TX_CTRL_PIN						(Pin02)
-//#define	ETH_ON()													{ PORT_SetBits(ETH_OR_CAT1_CTRL_PORT, ETH_OR_CAT1_CTRL_PIN); PORT_SetBits(ETH_OR_CAT1_TX_CTRL_PORT, ETH_OR_CAT1_TX_CTRL_PIN); }
-//#define	CAT1_ON()													{ PORT_ResetBits(ETH_OR_CAT1_CTRL_PORT, ETH_OR_CAT1_CTRL_PIN); PORT_ResetBits(ETH_OR_CAT1_TX_CTRL_PORT, ETH_OR_CAT1_TX_CTRL_PIN);}
-
-#define	CAT1_PWR_KEY_PORT									(PortA)
-#define	CAT1_PWR_KEY_PIN									(Pin03)
-#define	CAT1_PWR_KEY_CLR()								PORT_SetBits(CAT1_PWR_KEY_PORT, CAT1_PWR_KEY_PIN)
-#define	CAT1_PWR_KEY_SET()								PORT_ResetBits(CAT1_PWR_KEY_PORT, CAT1_PWR_KEY_PIN)
-
-#define	CAT1_RESET_PORT										(PortA)
-#define	CAT1_RESET_PIN										(Pin00)
-#define	CAT1_RESET_CLR()									PORT_SetBits(CAT1_RESET_PORT, CAT1_RESET_PIN)
-#define	CAT1_RESET_SET()									PORT_ResetBits(CAT1_RESET_PORT, CAT1_RESET_PIN)
-
-//#define	CAT1_POW_PORT											(PortA)
-//#define	CAT1_POW_PIN											(Pin00)
-//#define	CAT1_POW_ON()											PORT_SetBits(CAT1_POW_PORT, CAT1_POW_PIN)
-//#define	CAT1_POW_OFF()										PORT_ResetBits(CAT1_POW_PORT, CAT1_POW_PIN)
+#define	ETH_ON()													ETH_RESET_SET()
+#define	ETH_OFF()													ETH_RESET_CLR()
 
 #define	ETH_RESET_PORT										(PortB)
 #define	ETH_RESET_PIN											(Pin05)
@@ -332,7 +340,7 @@ bool SDCardWriteBlocks(uint32_t u32BlkStartAddr, uint32_t u32BlkEndAddr, uint8_t
 
 #define	BAT_COLL_ADC_CH										(ADC1_CH1)
 
-//帧头结构体
+//帧头结构体
 typedef struct {
 	uint8_t Header;
 	uint8_t SlvAddr;
@@ -340,20 +348,20 @@ typedef struct {
 	uint8_t PayloadLen;
 }update_protocol_hd_t;
 
-//主机下发升级请求载荷结构体
+//主机下发升级请求载荷结构体
 typedef struct {
 	uint16_t PackageNum;
 	uint32_t AppSize;
 	uint32_t AppCrc32;
 }__attribute__ ((packed))update_protocol_req_t;
 
-//从机请求下发结构体
+//从机请求下发结构体
 typedef struct {
 	uint16_t PackageIndex;
 	uint32_t PackageNum;
 }__attribute__ ((packed))update_protocol_get_t;
 
-//主机应答下发数据结构体
+//主机应答下发数据结构体
 typedef struct {
 	uint16_t PackageIndex;
 	uint16_t PackageNum;
@@ -372,9 +380,10 @@ typedef struct {
 
 void BSP_Init(void);
 
-void DbgUart_Config(uint32_t BaudRate);
-void DebugUartSend(uint8_t *sData, uint16_t sLen);
-void DbgRxIrqCallback(uint8_t rData);
+void DbgOrCat1Uart_Config(uint32_t BaudRate);
+void DebugOrCat1UartSend(uint8_t *sData, uint16_t sLen);
+void DbgOrCat1RxIrqCallback(uint8_t rData);
+void Cat1RxIrqCallback(uint8_t rData);
 
 void RS485Ch1_Config(uint32_t BaudRate);
 void RS485Ch1UartSend(uint8_t *sData, uint16_t sLen);
@@ -384,8 +393,9 @@ void RS485Ch2_Config(uint32_t BaudRate);
 void RS485Ch2UartSend(uint8_t *sData, uint16_t sLen);
 void RS485Ch2RxIrqCallback(uint8_t rData);
 
-void EthOrCat1UartSend(uint8_t *sData, uint16_t sLen);
-void EthOrCat1RxIrqCallback(uint8_t rData);
+void Eth_Config(uint32_t BaudRate);
+void EthUartSend(uint8_t *sData, uint16_t sLen);
+void EthIrqCallbackHandler(uint8_t rData);
 
 void LoraTxRxIrqCallback(void);
 

Project/GateWay/source/User/Inc/main.h

@@ -4,10 +4,7 @@
 #include "Public.h"
 #include "DebugCmd.h"
 
-#define	SOFTWARE_VERSION								12
-#define	HARDWARE_VERSION								12
-
-#define	MAC_ADDR_TYPE									1//0为测试服务器
+#define	MAC_ADDR_TYPE									0//0为测试服务器
 
 extern bool MainDispEn;
 #define	MAIN_DBG_LOG(...)									{ if(MainDispEn) Debug_Printf(__VA_ARGS__);}

Project/GateWay/source/User/Inc/protocol.h

@@ -8,10 +8,10 @@
 
 #define PROTOCOL_HEAD    (0x527A)
 
-#define PROTOCOL_FRAME_HEAD_SIZE (7)  // 最小帧长：头(2) + 地址(2) + 命令(1) + 长度(2) + CRC(2) 
+#define PROTOCOL_FRAME_HEAD_SIZE (7)  // 最小帧长：头(2) + 地址(2) + 命令(1) + 长度(2) + CRC(2) 
 
-#define PROTOCOL_FRAME_MIN_SIZE  (9)  // 最小帧长：头(2) + 地址(2) + 命令(1) + 长度(2) + CRC(2) 
-// 错误码定义
+#define PROTOCOL_FRAME_MIN_SIZE  (9)  // 最小帧长：头(2) + 地址(2) + 命令(1) + 长度(2) + CRC(2) 
+// 错误码定义
 typedef enum {
     PROTOCOL_SUCCESS = 0,
     PROTOCOL_ERR_INVALID_PARAM,

Project/GateWay/source/User/Inc/ringbuffer.h

@@ -1,5 +1,5 @@
 /******************************************************************************
- * @brief    环形缓冲区管理(参考linux/kfifo)
+ * @brief    环形缓冲区管理(参考linux/kfifo)
  *
  * Copyright (c) 2016~2020, <morro_luo@163.com>
  *
@@ -7,7 +7,7 @@
  *
  * Change Logs: 
  * Date           Author       Notes 
- * 2016-05-30     Morro        初版完成
+ * 2016-05-30     Morro        初版完成
  ******************************************************************************/
 
 #ifndef _RING_BUF_H_
@@ -19,12 +19,12 @@
 extern "C" {
 #endif
 
-/*环形缓冲区管理器*/
+/*环形缓冲区管理器*/
 typedef struct {
-     unsigned char *buf;    /*环形缓冲区        */
-     unsigned int size;     /*环形缓冲区        */
-     unsigned int front;    /*头指针            */
-     unsigned int rear;     /*尾指针            */
+     unsigned char *buf;    /*环形缓冲区        */
+     unsigned int size;     /*环形缓冲区        */
+     unsigned int front;    /*头指针            */
+     unsigned int rear;     /*尾指针            */
 }ring_buf_t;
 
 bool ring_buf_init(ring_buf_t *r,unsigned char *buf,unsigned int size);

Project/GateWay/source/User/Inc/spiflash.h

@@ -37,25 +37,25 @@ uint32_t SpiFlashReadId(void);
 #define	GATEWEY_PARA_SAV_ADDR										0x00
 #define	GATEWEY_PARA_SAV_SECTOR									0x00
 
-#define	LOG_INFO_START_SECTOR										0x01
-#define	LOG_SAV_START_SECTOR										0x02
+#define	LOG_INFO_START_SECTOR										0x02
+#define	LOG_SAV_START_SECTOR										0x03
 
 //#if (LORA_MODULE == WH_LR36_L)
 //#define	LOG_SAV_SIZE														78
-//#define	LOG_SAV_NUM_SECTOR											52			//每扇区存储数量
+//#define	LOG_SAV_NUM_SECTOR											52			//每扇区存储数量
 //#else
 //#define	LOG_SAV_SIZE														78  //150
-//#define	LOG_SAV_NUM_SECTOR											52  //27			//每扇区存储数量
+//#define	LOG_SAV_NUM_SECTOR											52  //27			//每扇区存储数量
 //#endif
 
 #define	LOG_SAV_SIZE_MAX													256
 #define	LOG_SAV_NUM_MAX													((SPIFLASH_SECTOR_NUM - LOG_SAV_START_SECTOR) * LOG_SAV_NUM_SECTOR)
 
 typedef struct {
-	uint32_t LogSavFlag;		//日志存储标志
-	uint32_t LogIdx;				//日志序号
-	uint32_t LogEndAddr;		//日志结束地址
-	uint32_t TimeStamp;			//存储时间
+	uint32_t LogSavFlag;		//日志存储标志
+	uint32_t LogIdx;				//日志序号
+	uint32_t LogEndAddr;		//日志结束地址
+	uint32_t TimeStamp;			//存储时间
 }LogHeader_t, *LogHeader;
 
 void SavMMC5983Calib(uint8_t *wData, uint32_t wLen);

Project/GateWay/source/User/Src/CatOneTask.c

@@ -4,48 +4,45 @@
 
 static rt_sem_t CatOneRev_Sem = RT_NULL;
 static rt_sem_t CatOneIRQ_Sem = RT_NULL;
-static rt_sem_t EthIRQ_Sem = RT_NULL;
 static rt_thread_t Cat1Rev_Thread = RT_NULL;
 
 static uint8_t CAT1DispEn = false;
 static CatOne_t CatOne;
 
-static char CatOneEthRxBuff[CAT_ONE_REV_LEN_MAX];
-static uint16_t CatOneEthRxLen;
+static char CatOneRxBuff[CAT_ONE_REV_LEN_MAX];
+static uint16_t CatOneRxLen;
 
-static uint8_t CatOneEthTxBuff[CAT_ONE_REV_LEN_MAX];
-static uint16_t CatOneEthTxLen;
+static uint8_t CatOneTxBuff[CAT_ONE_REV_LEN_MAX];
+static uint16_t CatOneTxLen;
 
 static uint8_t Payload[CAT_ONE_REV_LEN_MAX];
 static char CommUnitSendASCII[CAT_ONE_REV_LEN_MAX * 2];
-	
-static uint8_t EthRevTimeOutCnt;
 
+static uint8_t Cat1RevTimeOutCnt;
 static uint16_t CatSendErrCnt = 0;
 
 #define	CAT1_DBG_LOG(...)									{ if(CAT1DispEn) Debug_Printf(__VA_ARGS__);}
-//#define	CAT1_DBG_ARRAY(ARRAY, SIZE)			{ if(CAT1DispEn) {DBG_ARRAY(ARRAY,SIZE)}}
 
 #define	CATONE_RESET_DELAY_TIME_MAX				(5 * 60 * 1000)
 
 const char *CatOneATCmdStr[16] = {
 	"NULL",
-	"AT\r\n",						//开机检测
-	"ATE0\r\n",					//关回显
-	"AT+CPIN?\r\n",			//识卡
-//	"AT+CIMI\r\n",			//IMEI
+	"AT\r\n",						//开机检测
+	"ATE0\r\n",					//关回显
+	"AT+CPIN?\r\n",			//识卡
 	"AT+CGSN=1\r\n",
-	"AT+LCCID\r\n",			//读卡号			
-	"AT+CEREG?\r\n",		//查询注册状态
-	"AT+CGPADDR=1\r\n",	//查询IP地址
-	"AT+CSQ\r\n",				//查询信号强度
+	"AT+QCCID\r\n",			//读卡号
+	"AT+CEREG?\r\n",		//查询注册状态
+	"AT+CGPADDR=1\r\n",	//查询IP地址
+	"AT+CSQ\r\n",				//查询信号强度
 	"AT+LDNSGIP=gxjt.cui635.cn\r\n",
-	"AT+LBS=0\r\n",			//获取基站定位信息
-	"AT+LIPOPEN=",			//设置TCP服务器地址和端口，AT+LIPOPEN="TCP","114.55.52.96",6803
-	"AT+LIPSEND=",			//发送数据,	AT+LIPSEND=0,1,20,"31313131313131323232323232"
-	"AT+LIPCLOSE=0\r\n",//断开连接
-	"AT+LBSPARA=http://locator-aep.xiot.senthink.com:80/locator/v0.1/locate,B84E427D95B1DF4A3F49B18DDF714C72\r\n",
-	"AT+CCLK?\r\n",	//获取时间
+	"AT+QLBS\r\n",			//获取基站定位信息
+	"AT+QIOPEN=",			    //设置TCP服务器地址和端口
+	"AT+QISEND=",			//发送数据
+	"AT+QICLOSE=0\r\n",	//断开连接
+	"AT+QLBSCFG=\"server\",http://locator-aep.xiot.senthink.com:80/locator/v0.1/locate\r\n",
+	"AT+QLBSCFG=\"token\",45B516D3078467E84DD2CFBF3532A4CB\r\n",
+	"AT+CCLK?\r\n",    //获取时间
 };
 
 void Cat1DBGOnOff(bool OnOff)
@@ -58,41 +55,21 @@ void Cat1DBGOnOff(bool OnOff)
 }
 
 const CatOneATCMD_m CatOneModeSetCmdArray[] = {
-	CAT_ONE_AT_NULL, 
-	CAT_ONE_AT, 
-	CAT_ONE_ATE0, 
-	//CAT_ONE_LBSPARA,
+	CAT_ONE_AT_NULL,
+	CAT_ONE_AT,
+	CAT_ONE_ATE0,
 	CAT_ONE_LCCID,
 	CAT_ONE_IMEI,
-	CAT_ONE_CPIN, 
-	CAT_ONE_CEREG, 
+	CAT_ONE_CPIN,
+	CAT_ONE_CEREG,
 	CAT_ONE_CSQ,
-	//CAT_ONE_LDNSGIP,
-	//CAT_ONE_LBS,
 	CAT_ONE_CCLK,
 	CAT_ONE_AT_CMD_END
 };
 
-//CatOneRetStatus_m CatOneSend(uint8_t *sData, uint16_t sLen)
-//{
-//	rt_err_t result;
-//	
-//	if(CatOne.Status != CAT_ONE_IDEL && CatOne.Status != CAT_ONE_WAIT_SEND)
-//		return CAT_ONE_RET_ERR;
-//	
-//	//CatOne.Status = CAT_ONE_RESET;
-//	result = rt_mq_send(CatOneRev_MQ, sData, sLen);
-//  if(result != RT_EOK) {
-//		CAT1_DBG_LOG("CatOne MQ Send ERR...\r\n");
-//		return CAT_ONE_RET_ERR;
-//	}
-//	CAT1_DBG_LOG("CatOne Send Message: \r\n", sData);
-//	return CAT_ONE_RET_OK;
-//}
-
 void CatOneStop(void)
 {
-	CatOne.Status = CAT_ONE_OFF;
+	CatOne.Cat1Status = CAT_ONE_OFF;
 }
 
 void CatOneGetLocationInfo(int *Longitude, int *Latitude)
@@ -113,49 +90,48 @@ void CatOneGetIMEIAndSIM(char *Imei, char *Sim)
 	memcpy(Sim, CatOne.SIM, 20);
 }
 
-//返回true-busy, false-Idle
 bool CatOneGetStatus(void)
 {
-	if(CatOne.Status == CAT_ONE_IDEL)
+	if(CatOne.Cat1Status == CAT_ONE_IDEL)
 		return false;
 	return true;
 }
 
 void CatOneReset(void)
 {
-	CatOne.Status = CAT_ONE_RESET;
+	CatOne.Cat1Status = CAT_ONE_RESET;
 }
 
-void CatTimeSync(char *Data) 
+void CatTimeSync(char *Data)
 {
 	struct tm sTimet;
 	time_t sTime;
-  char *p;
-	
+	char *p;
+
 	p = strchr(Data, '\"');
 	if(p == NULL)
 		return;
-	
-	int ret = sscanf(p, "\"%d/%d/%d,%d:%d:%d+", 
+
+	int ret = sscanf(p, "\"%d/%d/%d,%d:%d:%d+",
 										&sTimet.tm_year, &sTimet.tm_mon, &sTimet.tm_mday,
 										&sTimet.tm_hour, &sTimet.tm_min, & sTimet.tm_sec);
 	if(ret != 6) {
-		int ret = sscanf(p, "\"%d/%d/%d,%d:%d:%d-", 
+		int ret = sscanf(p, "\"%d/%d/%d,%d:%d:%d-",
 										&sTimet.tm_year, &sTimet.tm_mon, &sTimet.tm_mday,
 										&sTimet.tm_hour, &sTimet.tm_min, & sTimet.tm_sec);
 		if(ret != 6)
 			return;
 	}
-	
+
 	sTimet.tm_isdst = 0;
 	if(sTimet.tm_year < 24 || sTimet.tm_year > 50)
 		return;
 	sTimet.tm_year += 100;
-	
+
 	if(sTimet.tm_mon > 12 || sTimet.tm_mon == 0)
 		return;
 	sTimet.tm_mon--;
-	
+
 	sTime = mktime(&sTimet);
 	TimeSync(sTime);
 	CAT1_DBG_LOG("Set Time:");
@@ -166,10 +142,10 @@ void CatOneAtCmdAnalyze(char *RxBuff)
 {
 	char *p;
 	int ret;
-	
+
 	CatOne.ATCmdRet = CAT_ONE_RET_OK;
 	CAT1_DBG_LOG(RxBuff);
-	
+
 	switch(CatOne.AtCmd) {
 		case CAT_ONE_AT:
 		case CAT_ONE_ATE0:
@@ -180,7 +156,7 @@ void CatOneAtCmdAnalyze(char *RxBuff)
 				CatOne.ATCmdRet = CAT_ONE_RET_ERR;
 			}
 			break;
-			
+
 		case CAT_ONE_IMEI:
 			if(strstr(RxBuff, "OK") == NULL) {
 				CatOne.ATCmdRet = CAT_ONE_RET_ERR;
@@ -196,39 +172,35 @@ void CatOneAtCmdAnalyze(char *RxBuff)
 			else {
 				memset(CatOne.IMEI, 0, 15);
 			}
-//			ret = sscanf(p, "+CGSN: \"%s\"\r\n", CatOne.IMEI);
-//			if(ret != 1) {
-//				memset(CatOne.IMEI, 0, 15);
-//			}
 			CatOne.IMEI[15] = 0;
 			break;
-		
-			case CAT_ONE_CCLK:
+
+		case CAT_ONE_CCLK:
 			if(strstr(RxBuff, "+CCLK") != NULL) {
 				CatTimeSync(RxBuff);
 			}
 			break;
-			
+
 		case CAT_ONE_LCCID:
 			if(strstr(RxBuff, "OK") == NULL) {
 				CatOne.ATCmdRet = CAT_ONE_RET_ERR;
 			}
-			p = strstr(RxBuff, "+LCCID");
+			p = strstr(RxBuff, "+QCCID");
 			if(p == NULL) {
 				CatOne.ATCmdRet = CAT_ONE_RET_ERR;
 			}
 			memset(CatOne.SIM, 0, 32);
-			ret = sscanf(p, "+LCCID: %s\r\n", CatOne.SIM);
+			ret = sscanf(p, "+QCCID: %s\r\n", CatOne.SIM);
 			if(ret != 1) {
 				memset(CatOne.SIM, 0, 32);
 			}
 			break;
-			
+
 		case CAT_ONE_LBS:
-			p = strstr(RxBuff, "+LBS");
+			p = strstr(RxBuff, "+QLBS");
 			if(p != NULL) {
 				double Longitude, Latitude;
-				int ret = sscanf(p, "+LBS: %lf,%lf\r\n", &Longitude, &Latitude);
+				int ret = sscanf(p, "+QLBS: %lf,%lf\r\n", &Longitude, &Latitude);
 				if(ret == 2) {
 					CatOne.LBSFlag = true;
 					CatOne.Longitude = Longitude * 100000;
@@ -239,7 +211,7 @@ void CatOneAtCmdAnalyze(char *RxBuff)
 
 		case CAT_ONE_LIPOPEN:
 			if(strstr(RxBuff, "OK") != NULL) {
-				CatOne.Status = CatOne.NextStatus;
+				CatOne.Cat1Status = CatOne.NextStatus;
 				CatOne.CatOne1mSDelayCnt = 10 * 1000;
 				return;
 			}
@@ -247,42 +219,42 @@ void CatOneAtCmdAnalyze(char *RxBuff)
 				if(strstr(RxBuff, "LIPOPEN: 0,1") != NULL) {
 					CAT1_DBG_LOG("Cat1 successfully to connect to the server.\r\n\r\n");
 					CatOne.TcpConnFlag = true;
-					CatOne.Status = CatOne.NextStatus;
+					CatOne.Cat1Status = CatOne.NextStatus;
 					rt_sem_release(CatOneRev_Sem);
 				}
 				else if(strstr(RxBuff, "LIPOPEN: 0,0") != NULL) {
 					CAT1_DBG_LOG("Cat1 failed to connect to the server.\r\n\r\n");
 					CatOne.TcpConnFlag = false;
-					CatOne.Status = CAT_ONE_OFF;
+					CatOne.Cat1Status = CAT_ONE_OFF;
 				}
 				return;
 			}
-			
+
 		case CAT_ONE_CPIN:
 			if(strstr(RxBuff, "READY") == NULL) {
 				CatOne.ATCmdRet = CAT_ONE_RET_ERR;
 			}
 			break;
-		
+
 		case CAT_ONE_CEREG:
 			if(strstr(RxBuff, "CEREG: 0,1") == NULL) {
 				CatOne.CatOne1mSDelayCnt = 3000;
 				CatOne.ATCmdRet = CAT_ONE_RET_ERR;
 			}
 			break;
-		
+
 		case CAT_ONE_CGPADDR:
 			if(strstr(RxBuff, "+CGPADDR") == NULL) {
 				CatOne.ATCmdRet = CAT_ONE_RET_ERR;
 			}
 			break;
-		
+
 		case CAT_ONE_CSQ:
 			if(strstr(RxBuff, "+CSQ") == NULL) {
 				CatOne.ATCmdRet = CAT_ONE_RET_ERR;
 			}
 			break;
-		
+
 		case CAT_ONE_LTPCLOSE:
 			if(strstr(RxBuff, "CLOSE OK") != NULL) {
 				break;
@@ -295,20 +267,20 @@ void CatOneAtCmdAnalyze(char *RxBuff)
 			}
 			CatOne.ATCmdRet = CAT_ONE_RET_ERR;
 			break;
-		case CAT_ONE_AT_NULL: 
+		case CAT_ONE_AT_NULL:
 			p = strstr(RxBuff, "+LIPURC");
 			if(p != NULL) {
 				char rData[120];
 				uint8_t  hData[60];
 				int rLen, hLen, ret;
-				
+
 				if(strstr(p, "+LIPURC: 0,0") != NULL) {
 					CAT1_DBG_LOG("TCP connection disconnected.\r\n\r\n");
 					CatOne.TcpConnFlag = false;
-					CatOne.Status = CAT_ONE_OFF;
+					CatOne.Cat1Status = CAT_ONE_OFF;
 					return;
 				}
-				
+
 				ret = sscanf(p, "+LIPURC: 0,1,%d,%s\r\n", &rLen, rData);
 				if(ret == 2) {
 					if(rLen < 24)
@@ -321,16 +293,15 @@ void CatOneAtCmdAnalyze(char *RxBuff)
 				else {
 					return;
 				}
-				//CatOne.Status = CAT_ONE_CLOSE_TCP;
-				rt_sem_release(CatOneRev_Sem);//接收任务
+				rt_sem_release(CatOneRev_Sem);
 				return;
 			}
 		default:
 			CatOne.ATCmdRet = CAT_ONE_RET_ERR;
-			
+
 	}
 	if(CatOne.ATCmdRet == CAT_ONE_RET_OK) {
-		CatOne.Status = CatOne.NextStatus;
+		CatOne.Cat1Status = CatOne.NextStatus;
 		if(CatOne.AtCmd == CAT_ONE_LIPSEND)
 			CatOne.CatOne1mSDelayCnt = 5 * 1000;
 		else
@@ -344,43 +315,43 @@ void CatOneAtCmdSend(CatOneATCMD_m Cmd, uint32_t Dly, CatOneStatus_m NextStatus)
 {
 	CatOne.AtCmd = Cmd;
 	if(CatOne.AtCmd == CAT_ONE_LIPSEND) {
-		HexToAscii(CatOneEthTxBuff, CommUnitSendASCII, CatOneEthTxLen);
-		sprintf(CatOne.CatOneSendBuff,"AT+LIPSEND=0,1,%d,\"%s\"\r\n",CatOneEthTxLen * 2, CommUnitSendASCII);
+		HexToAscii(CatOneTxBuff, CommUnitSendASCII, CatOneTxLen);
+		sprintf(CatOne.CatOneSendBuff,"AT+LIPSEND=0,1,%d,\"%s\"\r\n",CatOneTxLen * 2, CommUnitSendASCII);
 		CatOne.GateWay->BatteryReadDlyCnt = 30;
 	}
 	else if(CatOne.AtCmd == CAT_ONE_LIPOPEN) {
-		sprintf(CatOne.CatOneSendBuff,"AT+LIPOPEN=\"TCP\",\"%d.%d.%d.%d\",%d\r\n", 
-						CatOne.GateWay->ConfigPara.SvrAddr[0], 
-						CatOne.GateWay->ConfigPara.SvrAddr[1], 
-						CatOne.GateWay->ConfigPara.SvrAddr[2],
-						CatOne.GateWay->ConfigPara.SvrAddr[3], 
-						CatOne.GateWay->ConfigPara.SvrPort);
+		sprintf(CatOne.CatOneSendBuff,"AT+LIPOPEN=\"TCP\",\"%d.%d.%d.%d\",%d\r\n",
+						CatOne.GateWay->ConfigPara.LTENet.DestAddr[0],
+						CatOne.GateWay->ConfigPara.LTENet.DestAddr[1],
+						CatOne.GateWay->ConfigPara.LTENet.DestAddr[2],
+						CatOne.GateWay->ConfigPara.LTENet.DestAddr[3],
+						CatOne.GateWay->ConfigPara.LTENet.DestPort);
 	}
 	else {
 		strcpy(CatOne.CatOneSendBuff, CatOneATCmdStr[CatOne.AtCmd]);
 	}
 	CAT1_DBG_LOG(CatOne.CatOneSendBuff);
-	EthRevTimeOutCnt = 0;
-	EthOrCat1UartSend((uint8_t *)CatOne.CatOneSendBuff, strlen(CatOne.CatOneSendBuff));
+	Cat1RevTimeOutCnt = 0;
+	DebugOrCat1UartSend((uint8_t *)CatOne.CatOneSendBuff, strlen(CatOne.CatOneSendBuff));
 	CatOne.CatOne1mSDelayCnt = Dly;
-	CatOne.Status = CAT_ONE_WAIT_REV;
+	CatOne.Cat1Status = CAT_ONE_WAIT_REV;
 	CatOne.NextStatus = NextStatus;
 }
 
-int GateWayRegister(uint8_t *TxBuff)
+static int GateWayRegister(uint8_t *TxBuff)
 {
 	uint16_t UnitCommCnt = 0;
 	uint8_t *p = &TxBuff[0];
 	uint16_t len = 5;
-	
+
 	if(CatOne.GateWay->ConfigPara.Rs485Ch1.CommUnitEnable == true && CatOne.GateWay->ConfigPara.Rs485Ch1.Enable == true) {
 		UnitCommCnt++;
-		memcpy(&p[len], CatOne.GateWay->ConfigPara.Rs485Ch1.CUData.Para.Mac[0], 6);
+		memcpy(&p[len], CatOne.GateWay->ConfigPara.Rs485Ch1.CUPara.Para.Mac[0], 6);
 		len += 6;
 	}
 	if(CatOne.GateWay->ConfigPara.Rs485Ch2.CommUnitEnable == true && CatOne.GateWay->ConfigPara.Rs485Ch2.Enable == true) {
 		UnitCommCnt++;
-		memcpy(&p[len], CatOne.GateWay->ConfigPara.Rs485Ch2.CUData.Para.Mac[0], 6);
+		memcpy(&p[len], CatOne.GateWay->ConfigPara.Rs485Ch2.CUPara.Para.Mac[0], 6);
 		len += 6;
 	}
 	for(int i = 0; i < COMMUNIT_NUM_MAX; i++) {
@@ -406,18 +377,18 @@ void CatOneLoopHandler(void)
 	static rt_err_t result;
 	uint16_t ret;
 	static uint8_t Cat1RevErrCnt = 0;
-	
-	switch(CatOne.Status){
+
+	switch(CatOne.Cat1Status){
 		case CAT_ONE_IDEL:
 			rt_thread_delay(1);
 			if(CatOne.ResetDelayCnt > 0) {
 				CatOne.ResetDelayCnt--;
 			}
 			else {
-				CatOne.Status = CAT_ONE_RESET;
+				CatOne.Cat1Status = CAT_ONE_RESET;
 			}
 			break;
-		
+
 		case CAT_ONE_WAIT_REV:
 			result = rt_sem_take(CatOneRev_Sem, CatOne.CatOne1mSDelayCnt);
 			if(result != RT_EOK) {
@@ -426,16 +397,16 @@ void CatOneLoopHandler(void)
 					CatOneAtCmdSend(CatOne.AtCmd, 2000, CatOne.NextStatus);
 					CAT1_DBG_LOG("Cat1 Ret TimeOut, ReSend(%d)...\r\n", CatOne.AtCmdResendCnt);
 				}
-				else {		//3次错误，关机
+				else {
 					CAT1_DBG_LOG("Cat1 error, Close!\r\n");
 					if(CatOne.AtCmd == CAT_ONE_LIPSEND)
-						CatOne.Status = CAT_ONE_CLOSE_TCP;
+						CatOne.Cat1Status = CAT_ONE_CLOSE_TCP;
 					else
-						CatOne.Status = CAT_ONE_OFF;
+						CatOne.Cat1Status = CAT_ONE_OFF;
 				}
 			}
 			break;
-				
+
 		case CAT_ONE_INIT:
 			CatOne.AtCmdIdx++;
 			if(CatOneModeSetCmdArray[CatOne.AtCmdIdx] != CAT_ONE_AT_CMD_END) {
@@ -446,7 +417,7 @@ void CatOneLoopHandler(void)
 				CatOneAtCmdSend(CatOneModeSetCmdArray[CatOne.AtCmdIdx], 1000, CAT_ONE_INIT);
 			}
 			else {
-				CatOne.Status = CAT_ONE_TCP_CONN;
+				CatOne.Cat1Status = CAT_ONE_TCP_CONN;
 				CatOne.CatOne1mSDelayCnt = 0;
 				CatOne.AtCmdIdx = 0;
 				CatOne.AtCmd = CAT_ONE_AT_NULL;
@@ -456,59 +427,60 @@ void CatOneLoopHandler(void)
 		case CAT_ONE_TCP_CONN:
 			CatOneAtCmdSend(CAT_ONE_LIPOPEN, 2000, CAT_ONE_WAIT_CONN);
 			break;
-		
+
 		case CAT_ONE_WAIT_CONN:
 			if(CatOne.TcpConnFlag) {
 				if(CatOne.GateWay->SvrRegFlag == false)
-					CatOne.Status = CAT_ONE_REG_SVR;
-				else 
-					CatOne.Status = CAT_ONE_WAIT_SEND;
+					CatOne.Cat1Status = CAT_ONE_REG_SVR;
+				else
+					CatOne.Cat1Status = CAT_ONE_WAIT_SEND;
 			}
 			break;
-		
-		case CAT_ONE_REG_SVR:		//注册服务器	
-			ret = GateWayRegister(CatOneEthTxBuff);
-			rt_mq_send(CatOne.GateWay->NetSendData_MQ, CatOneEthTxBuff, ret);
-			CatOne.Status = CAT_ONE_WAIT_SEND;
+
+		case CAT_ONE_REG_SVR:
+			ret = GateWayRegister(CatOneTxBuff);
+			rt_mq_send(CatOne.GateWay->NetSendData_MQ, CatOneTxBuff, ret);
+			CatOne.Cat1Status = CAT_ONE_WAIT_SEND;
 			break;
-		
+
 		case CAT_ONE_WAIT_SEND:
 			result = rt_mq_recv(CatOne.GateWay->NetSendData_MQ, Payload, CAT_ONE_REV_LEN_MAX, 1000);
 			if(result == RT_EOK) {
-				CatOneEthTxLen = NetCommOrgData(CatOne.GateWay, Payload, CatOneEthTxBuff);
-				CatOne.Status = CAT_ONE_SEND_DATA;
+				CatSendErrCnt = 0;
+				CatOneTxLen = NetCommOrgData(CatOne.GateWay, Payload, CatOneTxBuff);
+				CatOne.Cat1Status = CAT_ONE_SEND_DATA;
 			}
 			else {
-				if(CatOne.Status == CAT_ONE_RESET || CatOne.Status == CAT_ONE_OFF)		//外部命令执行，状态改变
+				if(CatOne.Cat1Status == CAT_ONE_RESET || CatOne.Cat1Status == CAT_ONE_OFF)
 					return;
 				if(!CatOne.TcpConnFlag) {
-					CatOne.Status = CAT_ONE_OFF;
+					CatOne.Cat1Status = CAT_ONE_OFF;
 				}
 				else {
 					CatSendErrCnt++;
 					if(CatSendErrCnt > CAT1_ERR_RESET_DLY_MAX) {
-						CatOne.Status = CAT_ONE_RESET;
+						CatOne.Cat1Status = CAT_ONE_RESET;
 						CAT1_DBG_LOG("Cat1 has no data for a long time, Reset!\r\n");
 						CatSendErrCnt = 0;
 						break;
 					}
-					CatOne.Status = CAT_ONE_WAIT_SEND;
+					CatOne.Cat1Status = CAT_ONE_WAIT_SEND;
 				}
 			}
 			break;
-		
-		case CAT_ONE_SEND_DATA: 
+
+		case CAT_ONE_SEND_DATA:
 			CatOne.AtCmdResendCnt = 3;
 			Cat1RevErrCnt++;
 			if(Cat1RevErrCnt > 10) {
-				CatOne.Status = CAT_ONE_RESET;
+				CatOne.Cat1Status = CAT_ONE_RESET;
 				CAT1_DBG_LOG("Cat1 has no receive data for a long time, Reset!\r\n");
 				Cat1RevErrCnt = 0;
 				break;
 			}
 			CatOneAtCmdSend(CAT_ONE_LIPSEND, 5000, CAT_ONE_REV_DATA);
 			break;
-			
+
 		case CAT_ONE_REV_DATA:
 			result = rt_sem_take(CatOneRev_Sem, CatOne.CatOne1mSDelayCnt);
 			if(result != RT_EOK) {
@@ -520,75 +492,50 @@ void CatOneLoopHandler(void)
 			else {
 				Cat1RevErrCnt = 0;
 			}
-			if(CatOne.GateWay->SvrRegFlag == false)		//设备没注册，关闭4G，等待下一次重新注册
-				CatOne.Status = CAT_ONE_OFF;
+			if(CatOne.GateWay->SvrRegFlag == false)
+				CatOne.Cat1Status = CAT_ONE_OFF;
 			else
-				CatOne.Status = CAT_ONE_WAIT_SEND;
+				CatOne.Cat1Status = CAT_ONE_WAIT_SEND;
 			break;
 
 		case CAT_ONE_CLOSE_TCP:
 			CatOne.AtCmdResendCnt = 3;
 			CatOneAtCmdSend(CAT_ONE_LTPCLOSE, 1000, CAT_ONE_OFF);
 			break;
-		
+
 		case CAT_ONE_OFF:
-			//CAT1_POW_OFF();
 			CAT1_RESET_SET();
 			CAT1_PWR_KEY_CLR();
 			rt_thread_delay(3000);
 			CAT1_PWR_KEY_SET();
 			CatSendErrCnt = 0;
+			CatOne.GateWay->SvrRegFlag = false;
 			CAT1_DBG_LOG("Cat1 Power Off!\r\n");
-			CatOne.Status = CAT_ONE_IDEL;
+			CatOne.Cat1Status = CAT_ONE_IDEL;
 			CatOne.ResetDelayCnt = CATONE_RESET_DELAY_TIME_MAX;
+			DBG_ON();
 			break;
-			
+
 		case CAT_ONE_RESET:
 			CatSendErrCnt = 0;
+			CatOne.GateWay->SvrRegFlag = false;
 			CAT1_DBG_LOG("Cat1 Reset!\r\n");
+			CAT1_ON();
 			CAT1_RESET_CLR();
 			CAT1_PWR_KEY_SET();
-			//CAT1_POW_ON();
 			rt_thread_delay(50);
 			CAT1_RESET_SET();
 			CAT1_PWR_KEY_CLR();
 			rt_thread_delay(1000);
 			CAT1_PWR_KEY_SET();
-			CatOne.Status = CAT_ONE_INIT;
+			CatOne.Cat1Status = CAT_ONE_INIT;
 			CatOne.AtCmdIdx = 0;
 			rt_thread_delay(1000);
 			CatOne.GateWay->BatteryReadDlyCnt = 60;
-			break;	
+			break;
 	}
 }
 
-void EthLoopHandler(void)
-{
-	rt_err_t result;
-	
-	if(CatOne.GateWay->SvrRegFlag == false) {
-		if(CatOne.RegisterDelayCnt == 0) {
-			if(ETH_LINK_GET() == Reset) {
-				CatOne.RegisterDelayCnt = REGISTER_INTERVAL_MAX * 10;
-				uint8_t ret = GateWayRegister(CatOneEthTxBuff);
-				rt_mq_send(CatOne.GateWay->NetSendData_MQ, CatOneEthTxBuff, ret);
-			}
-		}
-		else {
-			CatOne.RegisterDelayCnt--;
-		}
-	}
-	result = rt_mq_recv(CatOne.GateWay->NetSendData_MQ, Payload, CAT_ONE_REV_LEN_MAX, 100);
-	if(result == RT_EOK) {
-		CatOneEthTxLen = NetCommOrgData(CatOne.GateWay, Payload, CatOneEthTxBuff);
-		HexToAscii(CatOneEthTxBuff, CommUnitSendASCII, CatOneEthTxLen);
-		EthRevTimeOutCnt = 0;
-		EthOrCat1UartSend((uint8_t *)CommUnitSendASCII, CatOneEthTxLen * 2);
-		CommUnitSendASCII[CatOneEthTxLen * 2] = 0;
-		CAT1_DBG_LOG("Eth Send: %s\r\n",CommUnitSendASCII);
-	} 
-}
-
 bool CatOneEthSendQueue(uint8_t *sData, uint16_t sLen)
 {
 	if(CatOne.GateWay->SvrRegFlag == false)
@@ -600,75 +547,49 @@ bool CatOneEthSendQueue(uint8_t *sData, uint16_t sLen)
 static void CatOneInit(GateWayPara GateWay)
 {
 	memset(&CatOne, 0x00, sizeof(CatOne_t));
-	CatOne.Status = CAT_ONE_RESET;
+	CatOne.Cat1Status = CAT_ONE_RESET;
 	CatOne.GateWay = GateWay;
 	CatOne.CatOneRevCallBack = GateWay->SvrRevCallBack;
 }
 
-void CatOneEthRev_Thread_Entry(void *parameter)
+void CatOneRev_Thread_Entry(void *parameter)
 {
 	rt_err_t result;
 	char RxBuffTemp[CAT_ONE_REV_LEN_MAX];
-	uint8_t HexData[CAT_ONE_REV_LEN_MAX / 2];
-	
+
 	GateWayPara GateWay = (GateWayPara)parameter;
-	
-	rt_kprintf("CatOneTthRev Thread is running!\r\n");
-	
+
+	rt_kprintf("CatOneRev Thread is running!\r\n");
+
 	while(1) {
-		if(GateWay->ConfigPara.Comm == CATONE_COMM) {
-			result = rt_sem_take(CatOneIRQ_Sem, 500);
-			if(result == RT_EOK) {
-				memcpy(RxBuffTemp, CatOneEthRxBuff, CatOneEthRxLen);
-				RxBuffTemp[CatOneEthRxLen] = 0;
-				CatOneAtCmdAnalyze(RxBuffTemp);
-				memset(CatOneEthRxBuff, 0x00, CAT_ONE_REV_LEN_MAX);
-				CatOneEthRxLen  = 0;
-			}
-			//CatOneEthRxLen  = 0;
-		}
-		else if(GateWay->ConfigPara.Comm == ETH_COMM) {
-			result = rt_sem_take(EthIRQ_Sem, 500);
-			if(result == RT_EOK) {
-				memcpy(RxBuffTemp, CatOneEthRxBuff, CatOneEthRxLen);
-				RxBuffTemp[CatOneEthRxLen] = 0;
-				CAT1_DBG_LOG("Eth Rev: %s\r\n",RxBuffTemp);
-				memset(HexData, 0x00, CatOneEthRxLen / 2);
-				uint8_t ret = AsciiToHex(RxBuffTemp, HexData, CatOneEthRxLen);
-				if(ret > 0)
-					GateWay->SvrRevCallBack(GateWay, HexData,  ret);
-				memset(CatOneEthRxBuff, 0x00, CAT_ONE_REV_LEN_MAX);
-				CatOneEthRxLen = 0;
-			}
-			//CatOneEthRxLen = 0;
+		result = rt_sem_take(CatOneIRQ_Sem, 500);
+		if(result == RT_EOK) {
+			memcpy(RxBuffTemp, CatOneRxBuff, CatOneRxLen);
+			RxBuffTemp[CatOneRxLen] = 0;
+			CatOneAtCmdAnalyze(RxBuffTemp);
+			memset(CatOneRxBuff, 0x00, CAT_ONE_REV_LEN_MAX);
+			CatOneRxLen = 0;
 		}
 	}
 }
 
-void CatOne_Eth_Thread_Entry(void *parameter)
+void CatOne_Thread_Entry(void *parameter)
 {
 	GateWayPara GateWay = (GateWayPara)parameter;
-	
-	CatOneRev_Sem  = rt_sem_create("cat1r_sem",	0, RT_IPC_FLAG_FIFO);
+
+	CatOneRev_Sem = rt_sem_create("cat1r_sem", 0, RT_IPC_FLAG_FIFO);
 	if(CatOneRev_Sem == RT_NULL) {
-		rt_kprintf("CatOne Sem Create Failed!\r\n");
+		rt_kprintf("CatOneRev Sem Create Failed!\r\n");
 	}
-	
-	EthIRQ_Sem  = rt_sem_create("eth_sem",	0, RT_IPC_FLAG_FIFO);
-	if(EthIRQ_Sem == RT_NULL) {
-		rt_kprintf("Eth Sem Create Failed!\r\n");
-	}
-	
-	CatOneIRQ_Sem  = rt_sem_create("cat1_sem",	0, RT_IPC_FLAG_FIFO);
+
+	CatOneIRQ_Sem = rt_sem_create("cat1i_sem", 0, RT_IPC_FLAG_FIFO);
 	if(CatOneIRQ_Sem == RT_NULL) {
 		rt_kprintf("CatOneIRQ Sem Create Failed!\r\n");
 	}
-	
+
 	CatOneInit(GateWay);
-	ETH_RESET_CLR();
-	rt_thread_delay(10);
-	ETH_RESET_SET();	
-	Cat1Rev_Thread = rt_thread_create("Cat1Rev", CatOneEthRev_Thread_Entry, parameter, 3000, 3, 20);
+
+	Cat1Rev_Thread = rt_thread_create("Cat1Rev", CatOneRev_Thread_Entry, parameter, 3000, 3, 20);
 	if (Cat1Rev_Thread != RT_NULL) {
 		rt_thread_startup(Cat1Rev_Thread);
 	}
@@ -676,44 +597,37 @@ void CatOne_Eth_Thread_Entry(void *parameter)
 		rt_kprintf("CatOneRev Thread Create Failed! Exit...\r\n");
 		return;
 	}
-	rt_kprintf("CatOne Thread is running！\r\n");
+	rt_kprintf("CatOne Thread is running!\r\n");
 
 	while(1) {
-		//rt_mutex_take(GateWay->UartRevMutex, RT_WAITING_FOREVER);
-		if(GateWay->ConfigPara.Comm == CATONE_COMM)
-			CatOneLoopHandler();
-		else if(GateWay->ConfigPara.Comm == ETH_COMM)
-			EthLoopHandler();
-		else
-			rt_thread_delay(1);
-		//rt_mutex_release(GateWay->UartRevMutex);
+		if(GateWay->ConfigPara.Comm != CATONE_COMM) {
+			rt_thread_delay(100);
+			continue;
+		}
+		CatOneLoopHandler();
 	}
 }
 
-
-void EthOrCat1RxIrqCallback(uint8_t rData)
-{	
-	if(EthRevTimeOutCnt == 0) 
-		CatOneEthRxLen = 0;
-	
-	if(CatOneEthRxLen < CAT_ONE_REV_LEN_MAX) {
-		CatOneEthRxBuff[CatOneEthRxLen++] = rData;
-	}
-	
-	EthRevTimeOutCnt = 3;
-}
-
-void EthRxOverhandler(void)
+void Cat1IrqCallback(uint8_t rData)
 {
-	if(EthRevTimeOutCnt > 0)
-		EthRevTimeOutCnt--;
-	
-	if(CatOneEthRxLen > 5 && EthRevTimeOutCnt == 0) {
-		EthRevTimeOutCnt = 20;
-		if(CatOne.GateWay->ConfigPara.Comm == CATONE_COMM)
-			rt_sem_release(CatOneIRQ_Sem);
-		else
-			rt_sem_release(EthIRQ_Sem);
+	if(Cat1RevTimeOutCnt == 0)
+		CatOneRxLen = 0;
+
+	if(CatOneRxLen < CAT_ONE_REV_LEN_MAX) {
+		CatOneRxBuff[CatOneRxLen++] = rData;
+	}
+
+	Cat1RevTimeOutCnt = 3;
+}
+
+void Cat1OverHandler(void)
+{
+	if(Cat1RevTimeOutCnt > 0)
+		Cat1RevTimeOutCnt--;
+
+	if(CatOneRxLen > 5 && Cat1RevTimeOutCnt == 0) {
+		Cat1RevTimeOutCnt = 20;
+		rt_sem_release(CatOneIRQ_Sem);
 	}
 }
 
@@ -728,3 +642,10 @@ void CatReadImeiOrSim(char *Imei, char *Sim)
 		Sim[20] = 0x00;
 	}
 }
+
+void CatOneTriggerRegister(void)
+{
+	CatOneStop();
+	CAT1_ON();
+	CatOneReset();
+}

Project/GateWay/source/User/Src/Encryption.c

@@ -1,6 +1,6 @@
 #include "encryption.h"
 
-//从机加密表
+//从机加密表
 const unsigned char EPT_Table[32][6] = {
 	{1, 6, 4, 2, 3, 5}, {2, 4, 6, 3, 5, 1}, {3, 5, 6, 2, 1, 4}, {5, 3, 2, 1, 4, 6},
 	{4, 2, 3, 1, 5, 6}, {6, 3, 5, 1, 4, 2}, {3, 5, 2, 6, 4, 1}, {2, 5, 4, 3, 1, 6},
@@ -12,7 +12,7 @@ const unsigned char EPT_Table[32][6] = {
 	{3, 6, 5, 4, 2, 1}, {1, 2, 6, 3, 5, 4}, {4, 6, 5, 3, 2, 1}, {5, 3, 4, 2, 6, 1}
 };
 
-//从机解密表：
+//从机解密表：
 const unsigned char DPT_Table[32][5] ={
 	{1, 4, 2, 3, 5}, {2, 4, 3, 5, 1}, {3, 5, 2, 1, 4}, {5, 3, 2, 1, 4},
 	{4, 2, 3, 1, 5}, {3, 5, 1, 4, 2}, {3, 5, 2, 4, 1}, {2, 5, 4, 3, 1},
@@ -24,7 +24,7 @@ const unsigned char DPT_Table[32][5] ={
 	{3, 5, 4, 2, 1}, {1, 2, 3, 5, 4}, {4, 5, 3, 2, 1}, {5, 3, 4, 2, 1}
 };
 
-//数据位加密表：
+//数据位加密表：
 const unsigned char EPT_D[32] = {
 	0x23, 0x4c, 0x92, 0x38, 0x52, 0xa4, 0x9a, 0x61, 
 	0x86, 0xc8, 0x70, 0x16, 0x32, 0x58, 0x62, 0x83, 
@@ -33,11 +33,11 @@ const unsigned char EPT_D[32] = {
 };
 
 /****************************************************************/
-/*			加密函数										*/
+/*			加密函数										*/
 /*																	*/
-/*函数入口:	*data,未加密的普通协议数据					*/
+/*函数入口:	*data,未加密的普通协议数据					*/
 /*																*/
-/*函数出口:	*EPT_data，生成的加密协议				*/
+/*函数出口:	*EPT_data，生成的加密协议				*/
 /****************************************************************/
 void Encrypt_Code(unsigned char *data, unsigned char *EPT_data) {
 	unsigned char Edata[6];
@@ -60,11 +60,11 @@ void Encrypt_Code(unsigned char *data, unsigned char *EPT_data) {
 }
 
 /****************************************************************/
-/*						解密函数							*/
+/*						解密函数							*/
 /*																*/
-/*函数入口：	*EPT_data，需要解密的加密协议	*/
+/*函数入口：	*EPT_data，需要解密的加密协议	*/
 /*																*/	
-/*函数出口：	*DPT_data，生成的普通协议			*/
+/*函数出口：	*DPT_data，生成的普通协议			*/
 /****************************************************************/
 void Decrypt_Code(unsigned char *EPT_data,unsigned char *DPT_data) {
 	unsigned char data[5];

Project/GateWay/source/User/Src/EthTask.c

@@ -0,0 +1,311 @@
+#include "EthTask.h"
+#include "Public.h"
+#include "DebugCmd.h"
+
+static rt_sem_t EthIRQ_Sem = RT_NULL;
+static rt_thread_t EthRev_Thread = RT_NULL;
+
+static EthTask_t Eth;
+
+static char EthRxBuff[ETH_RX_LEN_MAX];
+static uint16_t EthRxLen;
+static uint8_t EthRevTimeOutCnt;
+
+static uint8_t Payload[ETH_RX_LEN_MAX];
+static char CommUnitSendASCII[ETH_RX_LEN_MAX * 2];
+
+static bool EthDispEn = false;
+
+#define	ETH_DBG_LOG(...)									{ if(EthDispEn) Debug_Printf(__VA_ARGS__);}
+
+void ETHOnOff(bool OnOff)
+{
+	EthDispEn = OnOff;
+	if(OnOff)
+		Debug_Printf("\r\nEth Display Enable!\r\n\r\n");
+	else
+		Debug_Printf("\r\nEth Display Disable!\r\n\r\n");
+}
+
+void ETHStop(void)
+{
+	Eth.Status = ETH_OFF;
+}
+
+void ETHReset(void)
+{
+	Eth.Status = ETH_RESET;
+}
+
+void ETHTriggerRegister(void)
+{
+	Eth.Status = ETH_REG_SVR;
+}
+
+static int GateWayRegister(uint8_t *TxBuff)
+{
+	uint16_t UnitCommCnt = 0;
+	uint8_t *p = &TxBuff[0];
+	uint16_t len = 5;
+
+	if(Eth.GateWay->ConfigPara.Rs485Ch1.CommUnitEnable == true && Eth.GateWay->ConfigPara.Rs485Ch1.Enable == true) {
+		UnitCommCnt++;
+		memcpy(&p[len], Eth.GateWay->ConfigPara.Rs485Ch1.CUPara.Para.Mac[0], 6);
+		len += 6;
+	}
+	if(Eth.GateWay->ConfigPara.Rs485Ch2.CommUnitEnable == true && Eth.GateWay->ConfigPara.Rs485Ch2.Enable == true) {
+		UnitCommCnt++;
+		memcpy(&p[len], Eth.GateWay->ConfigPara.Rs485Ch2.CUPara.Para.Mac[0], 6);
+		len += 6;
+	}
+	for(int i = 0; i < COMMUNIT_NUM_MAX; i++) {
+		if(Eth.GateWay->ConfigPara.CommUnitArray[i].RegFlag == true) {
+			for(int j = 0; j < Eth.GateWay->ConfigPara.CommUnitArray[i].SensorN; j++)
+			{
+				memcpy(&p[len], Eth.GateWay->ConfigPara.CommUnitArray[i].Mac[j], 6);
+				len += 6;
+				UnitCommCnt++;
+			}
+		}
+	}
+	TxBuff[0] = (len - 3) & 0x00ff;
+	TxBuff[1] = ((len - 3) >> 8) & 0x00ff;
+	TxBuff[2] = NET_COMM_CMD_REG;
+	TxBuff[3] = UnitCommCnt & 0x00ff;
+	TxBuff[4] = (UnitCommCnt >> 8) & 0x00ff;
+	return len;
+}
+
+void EthLoopHandler(void)
+{
+	rt_err_t result;
+
+	switch(Eth.Status) {
+		case ETH_IDEL:
+			rt_thread_delay(1);
+			if(Eth.ResetDelayCnt > 0) {
+				Eth.ResetDelayCnt--;
+			}
+			else {
+				Eth.Status = ETH_RESET;
+			}
+			break;
+
+		case ETH_RESET:
+			ETH_DBG_LOG("ETH Reset!\r\n");
+			ETH_RESET_CLR();
+			rt_thread_delay(10);
+			ETH_RESET_SET();
+			rt_thread_delay(2000);
+			Eth.Status = ETH_WAIT_LINK;
+			Eth.LinkWaitCnt = 0;
+			Eth.FirstRegFlag = true;
+			break;
+
+		case ETH_WAIT_LINK:
+			if(Eth.LinkWaitCnt == 0) {
+				ETH_DBG_LOG("ETH Waiting for module ready...\r\n");
+				rt_thread_delay(2000);
+			}
+			if(ETH_LINK_GET() == Reset) {
+				ETH_DBG_LOG("ETH Link OK!\r\n");
+				if(Eth.GateWay->SvrRegFlag == false) {
+					Eth.Status = ETH_REG_SVR;
+				}
+				else {
+					Eth.Status = ETH_WAIT_SEND;
+				}
+			}
+			else {
+				Eth.LinkWaitCnt++;
+				if(Eth.LinkWaitCnt >= ETH_LINK_WAIT_TIME_MAX) {
+					ETH_DBG_LOG("ETH Link Timeout, Reset!\r\n");
+					Eth.Status = ETH_OFF;
+				}
+				rt_thread_delay(1);
+			}
+			break;
+
+		case ETH_REG_SVR:
+			{
+				if(Eth.FirstRegFlag) {
+					ETH_DBG_LOG("ETH First Register, waiting for system stable...\r\n");
+					rt_thread_delay(ETH_FIRST_REG_DELAY);
+					Eth.FirstRegFlag = false;
+				}
+
+				uint8_t ret = GateWayRegister(Eth.TxBuff);
+				rt_mq_send(Eth.GateWay->NetSendData_MQ, Eth.TxBuff, ret);
+				ETH_DBG_LOG("ETH Register Server...\r\n");
+				Eth.Status = ETH_WAIT_SEND;
+				Eth.SendRetryCnt = 0;
+			}
+			break;
+
+		case ETH_WAIT_SEND:
+			result = rt_mq_recv(Eth.GateWay->NetSendData_MQ, Payload, ETH_RX_LEN_MAX, 100);
+			if(result == RT_EOK) {
+				Eth.TxLen = NetCommOrgData(Eth.GateWay, Payload, Eth.TxBuff);
+				Eth.Status = ETH_SEND_DATA;
+			}
+			else {
+				if(Eth.Status == ETH_RESET || Eth.Status == ETH_OFF)
+					return;
+				if(ETH_LINK_GET() != Reset) {
+					ETH_DBG_LOG("ETH Link Lost!\r\n");
+					Eth.Status = ETH_OFF;
+				}
+				else {
+					rt_thread_delay(1);
+				}
+			}
+			break;
+
+		case ETH_SEND_DATA:
+			HexToAscii(Eth.TxBuff, CommUnitSendASCII, Eth.TxLen);
+			EthRevTimeOutCnt = 0;
+			EthUartSend((uint8_t *)CommUnitSendASCII, Eth.TxLen * 2);
+			CommUnitSendASCII[Eth.TxLen * 2] = 0;
+			ETH_DBG_LOG("Eth Send: %s\r\n", CommUnitSendASCII);
+
+			Eth.Status = ETH_WAIT_RECV;
+			Eth.RecvTimeoutCnt = 0;
+			Eth.SendRetryCnt = 0;
+			break;
+
+		case ETH_WAIT_RECV:
+			rt_thread_delay(1);
+			Eth.RecvTimeoutCnt++;
+
+			if(Eth.RecvTimeoutCnt >= ETH_RECV_TIMEOUT_MAX) {
+				ETH_DBG_LOG("ETH Recv Timeout!\r\n");
+				Eth.SendRetryCnt++;
+				if(Eth.SendRetryCnt >= ETH_SEND_RETRY_MAX) {
+					ETH_DBG_LOG("ETH Send Retry Max, Reset!\r\n");
+					Eth.Status = ETH_OFF;
+				}
+				else {
+					if(Eth.GateWay->SvrRegFlag == false) {
+						Eth.Status = ETH_REG_SVR;
+					}
+					else {
+						Eth.Status = ETH_WAIT_SEND;
+					}
+				}
+			}
+
+			if(ETH_LINK_GET() != Reset) {
+				ETH_DBG_LOG("ETH Link Lost During Wait!\r\n");
+				Eth.Status = ETH_OFF;
+			}
+
+			if(Eth.GateWay->SvrRegFlag == true) {
+				ETH_DBG_LOG("ETH Register Success!\r\n");
+				Eth.Status = ETH_WAIT_SEND;
+				Eth.RecvTimeoutCnt = 0;
+				Eth.SendRetryCnt = 0;
+			}
+
+			break;
+
+		case ETH_OFF:
+			ETH_DBG_LOG("ETH Power Off!\r\n");
+			Eth.GateWay->SvrRegFlag = false;
+			Eth.Status = ETH_IDEL;
+			Eth.ResetDelayCnt = ETH_RESET_DELAY_TIME_MAX;
+			break;
+
+		default:
+			Eth.Status = ETH_RESET;
+			break;
+	}
+}
+
+static void EthInit(GateWayPara GateWay)
+{
+	memset(&Eth, 0x00, sizeof(EthTask_t));
+	Eth.Status = ETH_RESET;
+	Eth.GateWay = GateWay;
+}
+
+void EthIrqCallbackHandler(uint8_t rData)
+{
+	if(EthRevTimeOutCnt == 0)
+		EthRxLen = 0;
+
+	if(EthRxLen < ETH_RX_LEN_MAX) {
+		EthRxBuff[EthRxLen++] = rData;
+	}
+
+	EthRevTimeOutCnt = 3;
+}
+
+void EthOverHandler(void)
+{
+	if(EthRevTimeOutCnt > 0)
+		EthRevTimeOutCnt--;
+
+	if(EthRxLen > 5 && EthRevTimeOutCnt == 0) {
+		EthRevTimeOutCnt = 20;
+		rt_sem_release(EthIRQ_Sem);
+	}
+}
+
+static void EthRev_Thread_Entry(void *parameter)
+{
+	rt_err_t result;
+	char RxBuffTemp[ETH_RX_LEN_MAX];
+	uint8_t HexData[ETH_RX_LEN_MAX / 2];
+
+	GateWayPara GateWay = (GateWayPara)parameter;
+
+	rt_kprintf("EthRev Thread is running!\r\n");
+
+	while(1) {
+		result = rt_sem_take(EthIRQ_Sem, 500);
+		if(result == RT_EOK) {
+			memcpy(RxBuffTemp, EthRxBuff, EthRxLen);
+			RxBuffTemp[EthRxLen] = 0;
+			ETH_DBG_LOG("Eth Rev: %s\r\n", RxBuffTemp);
+			memset(HexData, 0x00, EthRxLen / 2);
+			uint8_t ret = AsciiToHex(RxBuffTemp, HexData, EthRxLen);
+			if(ret > 0)
+				GateWay->SvrRevCallBack(GateWay, HexData, ret);
+			memset(EthRxBuff, 0x00, ETH_RX_LEN_MAX);
+			EthRxLen = 0;
+		}
+	}
+}
+
+void Eth_Thread_Entry(void *parameter)
+{
+	GateWayPara GateWay = (GateWayPara)parameter;
+
+	EthIRQ_Sem = rt_sem_create("ethi_sem", 0, RT_IPC_FLAG_FIFO);
+	if(EthIRQ_Sem == RT_NULL) {
+		rt_kprintf("EthIRQ Sem Create Failed!\r\n");
+	}
+
+	EthInit(GateWay);
+	ETH_RESET_CLR();
+	rt_thread_delay(10);
+	ETH_RESET_SET();
+
+	EthRev_Thread = rt_thread_create("EthRev", EthRev_Thread_Entry, parameter, 3000, 3, 20);
+	if (EthRev_Thread != RT_NULL) {
+		rt_thread_startup(EthRev_Thread);
+	}
+	else {
+		rt_kprintf("EthRev Thread Create Failed! Exit...\r\n");
+		return;
+	}
+	rt_kprintf("Eth Thread is running!\r\n");
+
+	while(1) {
+		if(GateWay->ConfigPara.Comm != ETH_COMM) {
+			rt_thread_delay(100);
+			continue;
+		}
+		EthLoopHandler();
+	}
+}

Project/GateWay/source/User/Src/LoraTask.c

@@ -3,7 +3,7 @@
 #include "CatOneTask.h"
 #include "DebugCmd.h"
 
-#define	UC_OFFLINE_TIME_INTERVAL_MAX				(2 * 60 * 60)//离线判断最大时间间隔，单位秒
+#define	UC_OFFLINE_TIME_INTERVAL_MAX				(2 * 60 * 60)//离线判断最大时间间隔，单位秒
 
 static rt_sem_t LoraDioIRQ_Sem = RT_NULL;
 static rt_thread_t LoraIRQ_Thread = RT_NULL;
@@ -14,7 +14,7 @@ void LoraSend(uint8_t* pucBuff, uint8_t ucLen)
 	Sx1276LoRaSendBuffer(pucBuff, ucLen);
 }
 
-//Lora接收消息统一放到消息队列，由接收任务处理
+//Lora接收消息统一放到消息队列，由接收任务处理
 int LoraRevCallBack(GateWayPara GateWay, uint8_t *rData, uint16_t rLen)
 {
 	uint8_t *sData;
@@ -41,7 +41,7 @@ void LoraIRQ_Thread_Entry(void *parameter)
 	rt_err_t result;
 	static uint16_t LoraErrCnt = 0;
 	
-	Debug_Printf("LoraRev Thread is running！\r\n");
+	Debug_Printf("LoraRev Thread is running!\r\n");
 	while(1) {
 		if(GateWay->ConfigPara.Lora.OnOff == false) {
 			rt_thread_delay(100);
@@ -55,9 +55,9 @@ void LoraIRQ_Thread_Entry(void *parameter)
 		}
 		else {
 			LoraErrCnt++;
-			if(LoraErrCnt > LORA_ERR_RESET_DLY_MAX) {		//15分钟内没有收到lora数据重启lora模块
+			if(LoraErrCnt > LORA_ERR_RESET_DLY_MAX) {		//15分钟内没有收到lora数据重启lora模块
 				LoraErrCnt = 0;
-				Debug_Printf("Lora Reset！\r\n");
+				Debug_Printf("Lora Reset!\r\n");
 				Sx1276LoRaInit(LoraRevCallBack);
 			}
 		}
@@ -66,7 +66,7 @@ void LoraIRQ_Thread_Entry(void *parameter)
 
 static void LoRaSendBuffer(uint8_t* pucBuff, uint16_t ucLen)
 {
-	if(GateWay->ConfigPara.Lora.OnOff)
+	if(GateWay->ConfigPara.Lora.OnOff == true)
 		Sx1276LoRaSendBuffer(pucBuff, ucLen);
 }
 
@@ -97,7 +97,7 @@ void Lora_Thread_Entry(void *parameter)
 		rt_thread_startup(LoraIRQ_Thread);
 	
 	Sx1276LoRaInit(LoraRevCallBack);
-	Debug_Printf("Lora Thread is running！\r\n");
+	Debug_Printf("Lora Thread is running!\r\n");
 #ifdef LORA_LOWPOWER
 	while(1) {
 		if(GateWay->ConfigPara.Lora.OnOff == false) {
@@ -108,10 +108,10 @@ void Lora_Thread_Entry(void *parameter)
 		result = rt_mq_recv(GateWay->LoraRev_MQ, Payload, 256, 1000);
 		if(result == RT_EOK) {
 			int ret = GateWay->CommUnitRevCallBack(GateWay, &Payload[1], Payload[0], LoRaSendBuffer);
-			if(ret == 0xff)	//注册信息
+			if(ret == 0xff)	//注册信息
 				continue;
 		}
-		else {	//离线判断    
+		else {	//离线判断    
 			for(int i = 0; i < COMMUNIT_NUM_MAX; i++) {
 				if(GateWay->ConfigPara.CommUnitArray[i].RegFlag == true) {
 					if(GateWay->ConfigPara.CommUnitArray[i].CommErrCnt < UC_OFFLINE_TIME_INTERVAL_MAX) {
@@ -131,7 +131,7 @@ void Lora_Thread_Entry(void *parameter)
 													GateWay->ConfigPara.CommUnitArray[i].Mac[0][3],
 													GateWay->ConfigPara.CommUnitArray[i].Mac[0][4],
 													GateWay->ConfigPara.CommUnitArray[i].Mac[0][5]);
-						CatOneEthSendQueue(MegData, 10);		//发送离线消息
+						CatOneEthSendQueue(MegData, 10);		//发送离线消息
 					}
 				}
 			}
@@ -142,15 +142,15 @@ void Lora_Thread_Entry(void *parameter)
 		if(UnitCommSendFlag == false && UnitCommReadDelayCnt >= GateWay->ConfigPara.CommUnitReadInterval) {
 			if(SendUnitCommIdx < COMMUNIT_NUM_MAX) {
 				if(GateWay->ConfigPara.CommUnitArray[SendUnitCommIdx].RegFlag && 
-					GateWay->ConfigPara.CommUnitArray[SendUnitCommIdx].Mac[2] == 0x01) {
+					GateWay->ConfigPara.CommUnitArray[SendUnitCommIdx].Mac[0][2] == 0x01) {
 					GateWay->ConfigPara.CommUnitArray[SendUnitCommIdx].RevNewDataFlag = false;	
 					Debug_Printf("Lora Read CommUnit: %02X:%02X:%02X:%02X:%02X:%02X\r\n",
-												GateWay->ConfigPara.CommUnitArray[SendUnitCommIdx].Mac[0],
-												GateWay->ConfigPara.CommUnitArray[SendUnitCommIdx].Mac[1],
-												GateWay->ConfigPara.CommUnitArray[SendUnitCommIdx].Mac[2],
-												GateWay->ConfigPara.CommUnitArray[SendUnitCommIdx].Mac[3],
-												GateWay->ConfigPara.CommUnitArray[SendUnitCommIdx].Mac[4],
-												GateWay->ConfigPara.CommUnitArray[SendUnitCommIdx].Mac[5]);	
+												GateWay->ConfigPara.CommUnitArray[SendUnitCommIdx].Mac[0][0],
+												GateWay->ConfigPara.CommUnitArray[SendUnitCommIdx].Mac[0][1],
+												GateWay->ConfigPara.CommUnitArray[SendUnitCommIdx].Mac[0][2],
+												GateWay->ConfigPara.CommUnitArray[SendUnitCommIdx].Mac[0][3],
+												GateWay->ConfigPara.CommUnitArray[SendUnitCommIdx].Mac[0][4],
+												GateWay->ConfigPara.CommUnitArray[SendUnitCommIdx].Mac[0][5]);	
 					CommUnitCmdSend(GateWay, GateWay->ConfigPara.CommUnitArray[SendUnitCommIdx].Mac[0], COMM_UNIT_CMD_READ, NULL, 0, Sx1276LoRaSendBuffer);
 					UnitCommSendFlag = true;
 				}
@@ -171,7 +171,7 @@ void Lora_Thread_Entry(void *parameter)
 		result = rt_mq_recv(GateWay->LoraRev_MQ, Payload, 256, 1000);
 		if(result == RT_EOK) {
 			int ret = GateWay->CommUnitRevCallBack(GateWay, &Payload[1], Payload[0], Sx1276LoRaSendBuffer);
-			if(ret == 0xff)	//注册信息
+			if(ret == 0xff)	//注册信息
 				continue;
 			
 			if(UnitCommSendFlag && GateWay->ConfigPara.CommUnitArray[SendUnitCommIdx].RevNewDataFlag) {
@@ -179,7 +179,7 @@ void Lora_Thread_Entry(void *parameter)
 				SendUnitCommIdx++;
 			}
 		}
-		else if(UnitCommSendFlag) {	//离线判断
+		else if(UnitCommSendFlag) {	//离线判断
 			GateWay->ConfigPara.CommUnitArray[SendUnitCommIdx].CommErrCnt++;
 			if(GateWay->ConfigPara.CommUnitArray[SendUnitCommIdx].CommErrCnt == 10) {
 				GateWay->ConfigPara.CommUnitArray[SendUnitCommIdx].CommErrCnt = 0;
@@ -190,7 +190,7 @@ void Lora_Thread_Entry(void *parameter)
 					MegData[2] = COMM_UNIT_CMD_READ;
 					memcpy(&MegData[3], GateWay->ConfigPara.CommUnitArray[SendUnitCommIdx].Mac[0], 6);
 					MegData[9] = GateWay->ConfigPara.CommUnitArray[SendUnitCommIdx].CommStatus;
-					CatOneEthSendQueue(MegData, 10);		//发送离线消息
+					CatOneEthSendQueue(MegData, 10);		//发送离线消息
 				}
 			}
 			UnitCommSendFlag = false;

Project/GateWay/source/User/Src/Public.c

@@ -5,35 +5,52 @@
 #include "spiflash.h"
 #include "CatOneTask.h"
 #include <stdlib.h>
+#include "sx127x.h"
 
-//传感器对应的数据长度
+//传感器对应的数据长度
 const uint8_t SensorTypeDataLen[] = {
-	0, 		//0x0000-保留
-	30, 		//0x0001-应力场检测单元
-	12, 		//0x0002-渗透压检测单元
-	14, 		//0x0003-弹性波导检测单元
-	10, 		//0x0004-介电质普检测单元
-	6,			//0x0005-微振动
-	6, 		//0x0006-三维连续变形检测单元
-	3,			//0x0007-通讯单元
-	18,		//0x0008-三维应力检测单元
-	9,			//0x0009-激光示踪(主设备)
-	12,		//0x000A-水位计
-	0,			//0x000B-保留
-	0,			//0x000C-保留
-	14,		//0x000D-二维应力场检测单元
-	9,			//0x000E-裂缝检测单元
-	8,			//0x0010-姿态检测单元
-	4,			//0x0011-激光位移检测单元
+	0, 		  //0x0000-保留
+	30, 		//0x0001-应力场检测单元
+	12, 		//0x0002-渗透压检测单元
+	14, 		//0x0003-弹性波导检测单元
+	10, 		//0x0004-介电质普检测单元
+	6,			//0x0005-微振动
+	6, 		  //0x0006-三维连续变形检测单元
+	3,			//0x0007-通讯单元
+	18,		  //0x0008-三维应力检测单元
+	9,			//0x0009-激光示踪(主设备)
+	12,		  //0x000A-水位计
+	0,			//0x000B-保留
+	0,			//0x000C-保留
+	14,		  //0x000D-二维应力场检测单元
+	9,			//0x000E-裂缝检测单元
+  0,			//0x000F-预留
+	8,			//0x0010-姿态检测单元
+	4,			//0x0011-激光位移检测单元
+  4,			//0x0012-表面应力传感器
+  4,			//0x0013-压力传感器
+  4,			//0x0014-微波测距传感器
+  0,			//0x0015-表贴式结冰传感器
+  0,			//0x0016-埋入式结冰传感器
+  4,			//0x0017-单通道钢筋应力传感器
+  4,			//0x0018-单通道锚杆轴力传感器
+  32,     //0x0019-8通道钢筋拉压力传感器
+  32,     //0x001A-8通道锚杆轴力传感器
+  0,      //0x001B-16通道钢筋应力传感器
+  0,      //0x001C-16通道锚杆轴力传感器
+  0,      //0x001D-爆炸冲击传感器
+  0,      //0x001E-随行支架传感器
+  0,      //0x001F-冻融循环传感器
+  19,     //0x0020-位移计
 };
 
 /*****************************************************************************************
-* 函数名称: CRC_Modbus
-* 功能描述: CRC16计算函数
-* 参    数: wBase, 多项式
-						Para，校验数据入口
-						Data, 校验数据长度入口
-* 返 回 值: crc16校验值
+* 函数名称: CRC_Modbus
+* 功能描述: CRC16计算函数
+* 参    数: wBase, 多项式
+						Para，校验数据入口
+						Data, 校验数据长度入口
+* 返 回 值: crc16校验值
 *****************************************************************************************/
 uint16_t CRC_Modbus(uint16_t wBase, __IO uint8_t *para, uint16_t length)
 {
@@ -56,12 +73,12 @@ uint16_t CRC_Modbus(uint16_t wBase, __IO uint8_t *para, uint16_t length)
 }
 
 /*****************************************************************************************
-* 函数名称: HexToAscii
-* 功能描述: HEX转换为ASCII字符串函数
-* 参    数: HexData, 16进制数据入口
-						ASCData，转换后的ASCII数据
-						sLen, 需要转的16进制数据长度
-* 返 回 值: 无
+* 函数名称: HexToAscii
+* 功能描述: HEX转换为ASCII字符串函数
+* 参    数: HexData, 16进制数据入口
+						ASCData，转换后的ASCII数据
+						sLen, 需要转的16进制数据长度
+* 返 回 值: 无
 *****************************************************************************************/
 void HexToAscii(uint8_t *HexData, char *ASCData, uint8_t sLen)
 {
@@ -88,12 +105,12 @@ void HexToAscii(uint8_t *HexData, char *ASCData, uint8_t sLen)
 }
 
 /*****************************************************************************************
-* 函数名称: AsciiToHex
-* 功能描述: AscII字符串转换为16进制数组
-* 参    数: ASCData, AscII字符串入口
-						HexData，转换后的数据
-						sLen, 需要转的字符串长度
-* 返 回 值: 无
+* 函数名称: AsciiToHex
+* 功能描述: AscII字符串转换为16进制数组
+* 参    数: ASCData, AscII字符串入口
+						HexData，转换后的数据
+						sLen, 需要转的字符串长度
+* 返 回 值: 无
 *****************************************************************************************/
 uint8_t AsciiToHex(char *ASCData, uint8_t *HexData, uint8_t sLen)
 {
@@ -125,11 +142,11 @@ uint8_t AsciiToHex(char *ASCData, uint8_t *HexData, uint8_t sLen)
 } 
 
 /*****************************************************************************************
-* 函数名称: ReadHistoryData
-* 功能描述: 读取历史数据
-* 参    数: rData,输入数据
-            rLen, 输入数据长度
-* 返 回 值: 无
+* 函数名称: ReadHistoryData
+* 功能描述: 读取历史数据
+* 参    数: rData,输入数据
+            rLen, 输入数据长度
+* 返 回 值: 无
 *****************************************************************************************/
 int ReadHistoryData(LogHeader LogH, uint8_t **Data, int Idx)
 {
@@ -137,11 +154,11 @@ int ReadHistoryData(LogHeader LogH, uint8_t **Data, int Idx)
 }
 
 /*****************************************************************************************
-* 函数名称: NetCommOrgData
-* 功能描述: 上报数据组织
-* 参    数: MegData, 消息队列数据
-						OutData, 输出数据出口
-* 返 回 值: 数据长度
+* 函数名称: NetCommOrgData
+* 功能描述: 上报数据组织
+* 参    数: MegData, 消息队列数据
+						OutData, 输出数据出口
+* 返 回 值: 数据长度
 *****************************************************************************************/
 int NetCommOrgData(GateWayPara GateWay, uint8_t *MegData, uint8_t *OutData)
 {
@@ -180,11 +197,11 @@ int NetCommOrgData(GateWayPara GateWay, uint8_t *MegData, uint8_t *OutData)
 }
 
 /*****************************************************************************************
-* 函数名称: CheckCommUnitReg
-* 功能描述: 检查设备是否注册
-* 参    数: GateWay,网关句柄
-            CommUnitMac, 待检查的设备MAC
-* 返 回 值: 已注册返回true,没注册返回false
+* 函数名称: CheckCommUnitReg
+* 功能描述: 检查设备是否注册
+* 参    数: GateWay,网关句柄
+            CommUnitMac, 待检查的设备MAC
+* 返 回 值: 已注册返回非0,没注册返回-1
 *****************************************************************************************/
 int CheckCommUnitReg(GateWayPara GateWay, uint8_t *CommUnitMac)
 {
@@ -196,17 +213,32 @@ int CheckCommUnitReg(GateWayPara GateWay, uint8_t *CommUnitMac)
 	}
 	return -1;
 }
-
-
 /*****************************************************************************************
-* 函数名称: CommUnitSendCmd
-* 功能描述: 网关下发通讯单元指令函数
-* 参    数: GateWay, 网关句柄
-						CommUnitMac，通讯单元MAC地址
-            Cmd, 命令字
-						Payload, 下发数据
-						PayloadLen， 下发数据长度
-* 返 回 值: 无
+* 函数名称: CheckCommUnitExcl
+* 功能描述: 检查设备是否排除
+* 参    数: GateWay,网关句柄
+            CommUnitMac, 待检查的设备MAC
+* 返 回 值: 已排除返回非0,没排除返回-1
+*****************************************************************************************/
+int CheckCommUnitExcl(GateWayPara GateWay, uint8_t *CommUnitMac)
+{
+	for(int i = 0; i < COMMUNIT_NUM_MAX; i++) {//判断是否被排除
+		if(memcmp(GateWay->ConfigPara.ExclCommUnit[i].ExclMac, CommUnitMac, 6) == 0) {
+			if(GateWay->ConfigPara.ExclCommUnit[i].ExclFlag == true)
+				return i;
+		}
+	}
+	return -1;
+}
+/*****************************************************************************************
+* 函数名称: CommUnitSendCmd
+* 功能描述: 网关下发通讯单元指令函数
+* 参    数: GateWay, 网关句柄
+						CommUnitMac，通讯单元MAC地址
+            Cmd, 命令字
+						Payload, 下发数据
+						PayloadLen， 下发数据长度
+* 返 回 值: 无
 *****************************************************************************************/
 void CommUnitCmdSend(GateWayPara GateWay, uint8_t *CommUnitMac, CommUnitCmd_m Cmd, uint8_t *Payload, uint16_t PayloadLen, SendData Send)
 {
@@ -225,7 +257,7 @@ void CommUnitCmdSend(GateWayPara GateWay, uint8_t *CommUnitMac, CommUnitCmd_m Cm
 	}
 	else {
 		int ret = CheckCommUnitReg(GateWay, CommUnitMac);
-		if(ret < 0)
+		if(ret < 0 && Cmd != COMM_UNIT_CMD_GET_SIGNAL)
 			return;
 		memcpy(CUHeader->DevMac, CommUnitMac, 6);
 		//CUHeader->DevType = GateWay->ConfigPara.CommUnitArray[ret].CUType;
@@ -247,12 +279,12 @@ void CommUnitCmdSend(GateWayPara GateWay, uint8_t *CommUnitMac, CommUnitCmd_m Cm
 }
 
 /*****************************************************************************************
-* 函数名称: CommUintOrgData
-* 功能描述: 上传传感器数据函数
-* 参    数: GWMac,网关mac地址
-            CUPara, 通讯单元参数
-						sData, 数据入口
-* 返 回 值: 数据长度
+* 函数名称: CommUintOrgData
+* 功能描述: 上传传感器数据函数
+* 参    数: CUPara, 通讯单元参数
+            CUData, 通讯单元数据
+						sData, 数据入口
+* 返 回 值: 数据长度
 *****************************************************************************************/
 int CommUintOrgData(GateWayPara GateWay, CommUnitPara CUPara, CommUnitData CUData, uint8_t *sData)
 {
@@ -298,8 +330,8 @@ int CommUintOrgData(GateWayPara GateWay, CommUnitPara CUPara, CommUnitData CUDat
 				case FORCE_3D:
 					break;
 				case LASER_TRACING:
-					memcpy(&sData[Len], CUData->Data[i], sizeof(LaserTracingType_t));
-					Len += sizeof(LaserTracingType_t);
+					memcpy(&sData[Len], CUData->Data[i], sizeof(LaserTracingType_T));
+					Len += sizeof(LaserTracingType_T);
 					break;
 				case WATER_LEVEL:
 					break;					
@@ -327,6 +359,10 @@ int CommUintOrgData(GateWayPara GateWay, CommUnitPara CUPara, CommUnitData CUDat
 					break;
 				case MICROWAVE_DISPLACE:
 					break;
+				case DISPLACEMENT:
+					memcpy(&sData[Len], CUData->Data[i], sizeof(Displacement_T));
+					Len += sizeof(Displacement_T);
+					break;
 			}
 			SensorN++;
 		}
@@ -374,8 +410,8 @@ void DebugDisplaySensorData(int SensorIdx, uint16_t SensorType, uint8_t *SensorD
 			break;
 		}
 		case LASER_TRACING: {
-			LaserTracingType_t Sensor;
-			memcpy((uint8_t *)&Sensor, SensorData, sizeof(LaserTracingType_t));
+			LaserTracingType_T Sensor;
+			memcpy((uint8_t *)&Sensor, SensorData, sizeof(LaserTracingType_T));
 			MAIN_DBG_LOG("Sensor%d Type %04x: PitchAngle=%04d, RollAngle=%04d, YawAngle=%04d\r\n", 
 										SensorIdx, SensorType, Sensor.PitchAngle, Sensor.RollAngle, Sensor.YawAngle);
 			break;
@@ -419,22 +455,29 @@ void DebugDisplaySensorData(int SensorIdx, uint16_t SensorType, uint8_t *SensorD
 		case MICROWAVE_DISPLACE: {
 			break;
 		}
+		case DISPLACEMENT: {
+			Displacement_T Sensor;
+			memcpy((uint8_t *)&Sensor, SensorData, sizeof(Displacement_T));
+			MAIN_DBG_LOG("Sensor%d Type %04x: PitchAngle=%04d, RollAngle=%04d, YawAngle=%04d, Temp=%06f, Altitude=%06f, Distance=%04d\r\n", 
+				SensorIdx, SensorType, Sensor.PitchAngle, Sensor.RollAngle, Sensor.YawAngle, Sensor.Temp, Sensor.Altitude, Sensor.Distance);
+			break;
+		}
 		default:
 			break;
 	}
 }
 
 /*****************************************************************************************
-* 函数名称: CommUnitAnalyze
-* 功能描述: 通讯单元数据解析，使用于LORA和RS485通讯
-* 参    数: rData,输入数据
-            rLen, 输入数据长度
-* 返 回 值: 返回接收到的通讯单元序号，错误返回-1
+* 函数名称: CommUnitAnalyze
+* 功能描述: 通讯单元数据解析，使用于LORA和RS485通讯
+* 参    数: rData,输入数据
+            rLen, 输入数据长度
+* 返 回 值: 返回接收到的通讯单元序号，错误返回-1
 *****************************************************************************************/
 int CommUnitAnalyze(GateWayPara GateWay, uint8_t *rData, uint16_t rLen, SendData Response)
 {
 	uint16_t check, crc16;
-	int CommUnitIdx;
+	int CommUnitIdx, ExclCommUnit;
 	uint16_t PayLoadLen;
 	uint8_t *PayLoad;
 	uint8_t *MegData;
@@ -454,15 +497,20 @@ int CommUnitAnalyze(GateWayPara GateWay, uint8_t *rData, uint16_t rLen, SendData
 	if(check != crc16)
 		return -1;
 	
-	if((CUHeader->Cmd != COMM_UNIT_CMD_REG) && (memcmp(GateWay->ConfigPara.GwMac, CUHeader->GWMac, 6) != 0))
+	if((CUHeader->Cmd != COMM_UNIT_CMD_REG && CUHeader->Cmd != COMM_UNIT_CMD_GET_SIGNAL) && (memcmp(GateWay->ConfigPara.GwMac, CUHeader->GWMac, 6) != 0))
 		return -1;
 	
-	CommUnitIdx = CheckCommUnitReg(GateWay, CUHeader->DevMac);
+	CommUnitIdx = CheckCommUnitReg(GateWay, CUHeader->DevMac);//判断是否是已注册的设备
 	if(CommUnitIdx < 0) {
-		if(CUHeader->Cmd != COMM_UNIT_CMD_REG)
+		if(CUHeader->Cmd != COMM_UNIT_CMD_REG && CUHeader->Cmd != COMM_UNIT_CMD_GET_SIGNAL){//判断是否是注册请求
 			return -1;
+    }
+    ExclCommUnit = CheckCommUnitExcl(GateWay, CUHeader->DevMac);//判断是否是被排除的设备
+    if(ExclCommUnit > -1) {
+      return -1;
+    }
 	}
-	
+  
 	switch(CUHeader->Cmd) {
 		case COMM_UNIT_CMD_REG:{
 			if(PayLoad[0] > SENSOR_NUM_MAX) {
@@ -472,7 +520,7 @@ int CommUnitAnalyze(GateWayPara GateWay, uint8_t *rData, uint16_t rLen, SendData
 //			if(CUHeader->PayloadLen < 2)
 //				return -1;
 			
-			if(CommUnitIdx >= 0) {		//设备存在
+			if(CommUnitIdx >= 0) {		//设备存在
 				MAIN_DBG_LOG("\r\nCommUnit has already been registered! Mac:%02X-%02X-%02X-%02X-%02X-%02X\r\n",
 									CUHeader->DevMac[0], CUHeader->DevMac[1], CUHeader->DevMac[2], CUHeader->DevMac[3], CUHeader->DevMac[4], CUHeader->DevMac[5]);
 				uint8_t ret = 1;
@@ -496,7 +544,7 @@ int CommUnitAnalyze(GateWayPara GateWay, uint8_t *rData, uint16_t rLen, SendData
 					GateWay->ConfigPara.CommUnitArray[i].ContLaser = false;
 					GateWay->ConfigPara.CommUnitArray[i].LaserOnOff = false;
 					
-					GateWay->ConfigPara.CommUnitArray[i].CUType = DEV_TYPE_EXT_COMMUNIT;//外置通讯单元
+					GateWay->ConfigPara.CommUnitArray[i].CUType = DEV_TYPE_EXT_COMMUNIT;//外置通讯单元
 					MAIN_DBG_LOG("\r\nCommUnit register succeed!\r\n");
 					
 					memcpy(GateWay->ConfigPara.CommUnitArray[i].MasterMac, &PayLoad[1], 6);
@@ -522,17 +570,19 @@ int CommUnitAnalyze(GateWayPara GateWay, uint8_t *rData, uint16_t rLen, SendData
 					uint8_t ret = 1;
 					CommUnitCmdSend(GateWay, CUHeader->DevMac, COMM_UNIT_CMD_REG, &ret, 1, Response);
 					
-					if(GateWay->SvrRegFlag) {	//网关已注册，向服务发送新设备添加指令
+					if(GateWay->SvrRegFlag) {	//网关已注册，向服务发送新设备添加指令
 						PayLoadLen = (GateWay->ConfigPara.CommUnitArray[i].SensorN * 6) + 2;
 						MegData = rt_malloc(PayLoadLen + 3);
 						MegData[0] = PayLoadLen & 0x00ff;;
 						MegData[1] = (PayLoadLen >> 8) & 0x00ff;
 						MegData[2] = NET_COMM_CMD_ADD_UNIT;
-						for(uint8_t i = 0; i < GateWay->ConfigPara.CommUnitArray[i].SensorN; i++)
+            MegData[3] = (GateWay->ConfigPara.CommUnitArray[i].SensorN) & 0x00ff;;
+						MegData[4] = (GateWay->ConfigPara.CommUnitArray[i].SensorN >> 8) & 0x00ff;
+						for(uint8_t k = 0; k < GateWay->ConfigPara.CommUnitArray[i].SensorN; k++)
 						{
-							memcpy(&MegData[3], GateWay->ConfigPara.CommUnitArray[i].Mac[i], 6);
+							memcpy(&MegData[5], GateWay->ConfigPara.CommUnitArray[i].Mac[k], 6);
 						}
-						CatOneEthSendQueue(MegData, PayLoadLen+3);
+						CatOneEthSendQueue(MegData, PayLoadLen+5);
 						rt_free(MegData);
 					}
 					return 0xff;
@@ -568,7 +618,7 @@ int CommUnitAnalyze(GateWayPara GateWay, uint8_t *rData, uint16_t rLen, SendData
 			else if(GateWay->ConfigPara.CommUnitArray[CommUnitIdx].ContLaser == true)
 			{
 				if(GateWay->ConfigPara.CommUnitArray[CommUnitIdx].LaserOnOff == true)
-				{//打开激光
+				{//打开激光
 					CommUnitCmdSend(GateWay, CUHeader->DevMac, COMM_UNIT_CMD_CONT_LASER, (uint8_t *)&GateWay->ConfigPara.CommUnitArray[CommUnitIdx].LaserOnOff, 1, Response);	
 				}
 				MAIN_DBG_LOG("Issue laser control commands.\r\n");
@@ -603,7 +653,7 @@ int CommUnitAnalyze(GateWayPara GateWay, uint8_t *rData, uint16_t rLen, SendData
 //			int16_t Rssi;
 //			int8_t Snr;
 //			SX1276LoCalcRssiSnr(&Rssi, &Snr);
-			MAIN_DBG_LOG("\r\nCUMac:%02X-%02X-%02X-%02X-%02X-%02X, Bat: %d%, SN: %d，Rssi:%d, Snr:%d\r\n", 
+			MAIN_DBG_LOG("\r\nCUMac:%02X-%02X-%02X-%02X-%02X-%02X, Bat: %d%, SN: %d, Rssi:%d, Snr:%d\r\n", 
 										CUHeader->DevMac[0], CUHeader->DevMac[1], CUHeader->DevMac[2], CUHeader->DevMac[3], CUHeader->DevMac[4], CUHeader->DevMac[5], 
 										GateWay->ConfigPara.CommUnitArray[CommUnitIdx].BatLevel, 
 										GateWay->ConfigPara.CommUnitArray[CommUnitIdx].SensorN, 
@@ -611,7 +661,7 @@ int CommUnitAnalyze(GateWayPara GateWay, uint8_t *rData, uint16_t rLen, SendData
 										GateWay->ConfigPara.CommUnitArray[CommUnitIdx].Nsr);
 			for(int i = 0; i < GateWay->ConfigPara.CommUnitArray[CommUnitIdx].SensorN; i++) {
 				memcpy(GateWay->CUDataArray[CommUnitIdx].Data[i], &PayLoad[0], SensorTypeDataLen[GateWay->ConfigPara.CommUnitArray[CommUnitIdx].SensorType[i]]);
-				//显示传感器数据
+				//显示传感器数据
 				DebugDisplaySensorData(i, GateWay->ConfigPara.CommUnitArray[CommUnitIdx].SensorType[i], GateWay->CUDataArray[CommUnitIdx].Data[i]);
 				len += SensorTypeDataLen[GateWay->ConfigPara.CommUnitArray[CommUnitIdx].SensorType[i]];
 			}
@@ -651,7 +701,7 @@ int CommUnitAnalyze(GateWayPara GateWay, uint8_t *rData, uint16_t rLen, SendData
 			else if(GateWay->ConfigPara.CommUnitArray[CommUnitIdx].ContLaser == true)
 			{
 				if(GateWay->ConfigPara.CommUnitArray[CommUnitIdx].LaserOnOff == true)
-				{//打开激光
+				{//打开激光
 					CommUnitCmdSend(GateWay, CUHeader->DevMac, COMM_UNIT_CMD_CONT_LASER, (uint8_t *)&GateWay->ConfigPara.CommUnitArray[CommUnitIdx].LaserOnOff, 1, Response);	
 				}
 				MAIN_DBG_LOG("Issue laser control commands.\r\n");
@@ -703,7 +753,7 @@ int CommUnitAnalyze(GateWayPara GateWay, uint8_t *rData, uint16_t rLen, SendData
 			else if(GateWay->ConfigPara.CommUnitArray[CommUnitIdx].ContLaser == true)
 			{
 				if(GateWay->ConfigPara.CommUnitArray[CommUnitIdx].LaserOnOff == true)
-				{//打开激光
+				{//打开激光
 					CommUnitCmdSend(GateWay, CUHeader->DevMac, COMM_UNIT_CMD_CONT_LASER, (uint8_t *)&GateWay->ConfigPara.CommUnitArray[CommUnitIdx].LaserOnOff, 1, Response);	
 				}
 				MAIN_DBG_LOG("Issue laser control commands.\r\n");
@@ -723,7 +773,7 @@ int CommUnitAnalyze(GateWayPara GateWay, uint8_t *rData, uint16_t rLen, SendData
 
 		case COMM_UNIT_CMD_CONT_LASER:{
 			if(PayLoad[0] == 0) {
-				//应答服务器
+				//应答服务器
 				MegData = rt_malloc(10);
 				MegData[0] = 7;
 				MegData[1] = 0;
@@ -742,7 +792,7 @@ int CommUnitAnalyze(GateWayPara GateWay, uint8_t *rData, uint16_t rLen, SendData
 									CUHeader->DevMac[0], CUHeader->DevMac[1], CUHeader->DevMac[2], CUHeader->DevMac[3], CUHeader->DevMac[4], CUHeader->DevMac[5]);
 			}
 			else if(PayLoad[0] == 1){
-				//应答服务器
+				//应答服务器
 				MegData = rt_malloc(10);
 				MegData[0] = 7;
 				MegData[1] = 0;
@@ -775,7 +825,7 @@ int CommUnitAnalyze(GateWayPara GateWay, uint8_t *rData, uint16_t rLen, SendData
 			else if(GateWay->ConfigPara.CommUnitArray[CommUnitIdx].ContLaser == true)
 			{
 				if(GateWay->ConfigPara.CommUnitArray[CommUnitIdx].LaserOnOff == true)
-				{//打开激光
+				{//打开激光
 					CommUnitCmdSend(GateWay, CUHeader->DevMac, COMM_UNIT_CMD_CONT_LASER, (uint8_t *)&GateWay->ConfigPara.CommUnitArray[CommUnitIdx].LaserOnOff, 1, Response);	
 				}
 				MAIN_DBG_LOG("Issue laser control commands.\r\n");
@@ -793,6 +843,19 @@ int CommUnitAnalyze(GateWayPara GateWay, uint8_t *rData, uint16_t rLen, SendData
 			WritePara((uint8_t *)&GateWay->ConfigPara, sizeof(GWConfigPara_t));
 			break;}			
 		
+				case COMM_UNIT_CMD_GET_SIGNAL:{
+			int16_t Rssi;
+			int8_t Snr;
+			uint8_t SignalPayload[2];
+			SX1276LoCalcRssiSnr(&Rssi, &Snr);
+			SignalPayload[0] = (uint8_t)Snr;
+			SignalPayload[1] = (uint8_t)(Rssi & 0xFF);
+			CommUnitCmdSend(GateWay, CUHeader->DevMac, COMM_UNIT_CMD_GET_SIGNAL, SignalPayload, 2, Response);
+			MAIN_DBG_LOG("\r\nCUMac:%02X-%02X-%02X-%02X-%02X-%02X, RX(Dev->GW): SNR:%d, RSSI:%d\r\n",
+					CUHeader->DevMac[0], CUHeader->DevMac[1], CUHeader->DevMac[2], CUHeader->DevMac[3], CUHeader->DevMac[4], CUHeader->DevMac[5],
+					Snr, Rssi);
+			break;}
+
 		default:
 			break;
 	}
@@ -800,11 +863,11 @@ int CommUnitAnalyze(GateWayPara GateWay, uint8_t *rData, uint16_t rLen, SendData
 }
 
 /*****************************************************************************************
-* 函数名称: Cat1RevCallBack
-* 功能描述: 4G接收回调函数
-* 参    数: rData，数据输入接口
-            rLen,  数据长度输入接口
-* 返 回 值: 无
+* 函数名称: Cat1RevCallBack
+* 功能描述: 4G接收回调函数
+* 参    数: rData，数据输入接口
+            rLen,  数据长度输入接口
+* 返 回 值: 无
 *****************************************************************************************/
 int Cat1EthRevCallBack(GateWayPara GateWay, uint8_t *rData, uint16_t rLen)
 {
@@ -846,30 +909,30 @@ int Cat1EthRevCallBack(GateWayPara GateWay, uint8_t *rData, uint16_t rLen)
 		
 		memcpy(&CommUintMac[0], Data, 6);
 		
-		if(GateWay->ConfigPara.Rs485Ch1.Enable == true) {	//内部通讯单元处理
+		if(GateWay->ConfigPara.Rs485Ch1.Enable == true) {	//内部通讯单元处理
 			if(GateWay->ConfigPara.Rs485Ch1.CommUnitEnable == true)
-				CommUnitCmdSend(GateWay, CommUintMac, COMM_UNIT_CMD_TIME_SYNC, &rData[14], 4, GateWay->ConfigPara.Rs485Ch1.RS485Send);			
+				CommUnitCmdSend(GateWay, CommUintMac, COMM_UNIT_CMD_TIME_SYNC, (uint8_t *)&NCHeader->Timestamp, 4, GateWay->ConfigPara.Rs485Ch1.RS485Send);			
 			else 
 				RS485CmdSend(GateWay, 1, &SCPara);
 		}
 		if(GateWay->ConfigPara.Rs485Ch2.Enable == true) {
 			if(GateWay->ConfigPara.Rs485Ch2.CommUnitEnable == true)
-				CommUnitCmdSend(GateWay, CommUintMac, COMM_UNIT_CMD_TIME_SYNC, &rData[14], 4, GateWay->ConfigPara.Rs485Ch2.RS485Send);
+				CommUnitCmdSend(GateWay, CommUintMac, COMM_UNIT_CMD_TIME_SYNC, (uint8_t *)&NCHeader->Timestamp, 4, GateWay->ConfigPara.Rs485Ch2.RS485Send);
 			else 
 				RS485CmdSend(GateWay, 2, &SCPara);
 		}
-		for(int i = 0; i < COMMUNIT_NUM_MAX; i++)//参数遍历
+		for(int i = 0; i < COMMUNIT_NUM_MAX; i++)//参数遍历
 		{
 			if(GateWay->ConfigPara.CommUnitArray[i].RegFlag == true)
-				GateWay->ConfigPara.CommUnitArray[i].TimeSyncFlag = true;//校时置位，等待下次此MAC主设备上传数据时下发校准指令（低功耗）
+				GateWay->ConfigPara.CommUnitArray[i].TimeSyncFlag = true;//校时置位，等待下次此MAC主设备上传数据时下发校准指令（低功耗）
 		}
-		//校准其他通讯网关
+		//校准其他通讯网关
 		//CommUnitCmdSend(GateWay, CommUintMac, COMM_UNIT_CMD_TIME_SYNC, &rData[14], 4, Sx1276LoRaSendBuffer);
 	}
 
 	switch(NCHeader->Cmd) {
 		case NET_COMM_CMD_REG:{
-			if(*Data == 1) {	//注册成功
+			if(*Data == 1) {	//注册成功
 				GateWay->SvrRegFlag = true;
 				//memcpy(GateWay->SvrMac, NCHeader->SvrMac, 6);
 				memset(GateWay->SvrMac, 0x00, 6);
@@ -884,7 +947,7 @@ int Cat1EthRevCallBack(GateWayPara GateWay, uint8_t *rData, uint16_t rLen)
 			break;}
 			
 		case NET_COMM_CMD_CAIL:{
-			//应答服务器
+			//应答服务器
 			MegData = rt_malloc(4);
 			MegData[0] = 1;
 			MegData[1] = 0;
@@ -893,34 +956,34 @@ int Cat1EthRevCallBack(GateWayPara GateWay, uint8_t *rData, uint16_t rLen)
 			sLen = 4;
 			CatOneEthSendQueue(MegData, sLen);
 			rt_free(MegData);
-			//开始校准
+			//开始校准
 			memcpy(&CommUintMac[0], Data, 6);
-			if(memcmp(CommUintMac, Data, 6) == 0) {	//校准所有传感器
+			if(memcmp(CommUintMac, Data, 6) == 0) {	//校准所有传感器
 				SensorCommPara_t SCPara;
 				SCPara.Cmd = RS485_SENSOR_CMD_CAIL;
 				SCPara.SensorAddr = 0x00;
 				//SCPara.SensorType = 0x00;
 				SCPara.CmdParaLen = 0;
 				SCPara.CmdPara = NULL;
-				if(GateWay->ConfigPara.Rs485Ch1.Enable == true) {	//内部通讯单元处理
+				if(GateWay->ConfigPara.Rs485Ch1.Enable == true) {	//内部通讯单元处理
 					if(GateWay->ConfigPara.Rs485Ch1.CommUnitEnable == true)
 						RS485CmdSend(GateWay, 1, &SCPara);
 					else 
 					  CommUnitCmdSend(GateWay, CommUintMac, COMM_UNIT_CMD_CAIL, NULL, 0, GateWay->ConfigPara.Rs485Ch1.RS485Send);
 				}
 				if(GateWay->ConfigPara.Rs485Ch2.Enable == true) {
-					if(GateWay->ConfigPara.Rs485Ch1.CommUnitEnable == true)
+					if(GateWay->ConfigPara.Rs485Ch2.CommUnitEnable == true)
 						RS485CmdSend(GateWay, 2, &SCPara);
 					else 
 					  CommUnitCmdSend(GateWay, CommUintMac, COMM_UNIT_CMD_CAIL, NULL, 0, GateWay->ConfigPara.Rs485Ch2.RS485Send);
 				}
 				
-				for(int i = 0; i < COMMUNIT_NUM_MAX; i++)//参数遍历
+				for(int i = 0; i < COMMUNIT_NUM_MAX; i++)//参数遍历
 				{
 					if(GateWay->ConfigPara.CommUnitArray[i].RegFlag == true)
-						GateWay->ConfigPara.CommUnitArray[i].CailFlag = true;//校准置位，等待下次此MAC主设备上传数据时下发校准指令（低功耗）
+						GateWay->ConfigPara.CommUnitArray[i].CailFlag = true;//校准置位，等待下次此MAC主设备上传数据时下发校准指令（低功耗）
 				}
-				//校准其他通讯网关
+				//校准其他通讯网关
 				//CommUnitCmdSend(GateWay, CommUintMac, COMM_UNIT_CMD_CAIL, NULL, 0, Sx1276LoRaSendBuffer);
 				MAIN_DBG_LOG("Calibrate all device.\r\n");
 			}
@@ -930,15 +993,15 @@ int Cat1EthRevCallBack(GateWayPara GateWay, uint8_t *rData, uint16_t rLen)
 					return -1;
 				if(GateWay->ConfigPara.CommUnitArray[ret].CUType !=  DEV_TYPE_EXT_COMMUNIT)
 					return -1;
-				if((GateWay->ConfigPara.CommUnitArray[ret].Mac[0][3] / 0x80) != 1) {//判断是否为通讯单元（主设备）
-					if(GateWay->ConfigPara.CommUnitArray[ret].Mac[0][2] == 1)//判断通讯类型
+				if((GateWay->ConfigPara.CommUnitArray[ret].Mac[0][3] / 0x80) != 1) {//判断是否为通讯单元（主设备）
+					if(GateWay->ConfigPara.CommUnitArray[ret].Mac[0][2] == 1)//判断通讯类型
 					{
-						GateWay->ConfigPara.CommUnitArray[ret].CailFlag = true;//校准置位，等待下次此MAC主设备上传数据时下发校准指令（低功耗）
-						//CommUnitCmdSend(GateWay, CommUintMac, COMM_UNIT_CMD_CAIL, NULL, 0, Sx1276LoRaSendBuffer);//查询模式
+						GateWay->ConfigPara.CommUnitArray[ret].CailFlag = true;//校准置位，等待下次此MAC主设备上传数据时下发校准指令（低功耗）
+						//CommUnitCmdSend(GateWay, CommUintMac, COMM_UNIT_CMD_CAIL, NULL, 0, Sx1276LoRaSendBuffer);//查询模式
 						MAIN_DBG_LOG("Calibrate Mac:%02X-%02X-%02X-%02X-%02X-%02X\r\n",
 							CommUintMac[0], CommUintMac[1], CommUintMac[2], CommUintMac[3], CommUintMac[4], CommUintMac[5]);
 					}
-					else if(GateWay->ConfigPara.CommUnitArray[ret].Mac[0][2] == 2)//判断通讯类型
+					else if(GateWay->ConfigPara.CommUnitArray[ret].Mac[0][2] == 2)//判断通讯类型
 					{
 						if(GateWay->ConfigPara.Rs485Ch1.Enable == true && !GateWay->ConfigPara.Rs485Ch1.CommUnitEnable) 
 						{
@@ -961,17 +1024,17 @@ int Cat1EthRevCallBack(GateWayPara GateWay, uint8_t *rData, uint16_t rLen)
 			MegData = rt_malloc(512);
 			uint16_t SensorCnt = 0;
 			sLen = 5;
-			if(GateWay->ConfigPara.Rs485Ch1.Enable == true) {	//内部通讯单元处理
+			if(GateWay->ConfigPara.Rs485Ch1.Enable == true) {	//内部通讯单元处理
 				if(GateWay->ConfigPara.Rs485Ch1.CommUnitEnable == true) {
 					SensorCnt++;
-					memcpy(&MegData[sLen], GateWay->ConfigPara.Rs485Ch1.CUData.Para.Mac[0], 6);
+					memcpy(&MegData[sLen], GateWay->ConfigPara.Rs485Ch1.CUPara.Para.Mac[0], 6);
 					sLen += 6;
 				}
 			}
 			if(GateWay->ConfigPara.Rs485Ch2.Enable == true) {
 				if(GateWay->ConfigPara.Rs485Ch2.CommUnitEnable == true) {
 					SensorCnt++;
-					memcpy(&MegData[sLen], GateWay->ConfigPara.Rs485Ch2.CUData.Para.Mac[0], 6);
+					memcpy(&MegData[sLen], GateWay->ConfigPara.Rs485Ch2.CUPara.Para.Mac[0], 6);
 					sLen += 6;
 				}
 			}
@@ -992,9 +1055,9 @@ int Cat1EthRevCallBack(GateWayPara GateWay, uint8_t *rData, uint16_t rLen)
 			MegData[sLen++] = (GateWay->HistoryNum >> 8) & 0x00ff;
 			MegData[sLen++] = (GateWay->HistoryNum >> 16) & 0x00ff;
 			MegData[sLen++] = (GateWay->HistoryNum >> 24) & 0x00ff;
-			MegData[0] = (sLen - 3) & 0x00ff;//数据体长度
-			MegData[1] = ((sLen - 3) >> 8) & 0x00ff;//数据体长度
-			MegData[2] = NET_COMM_CMD_READ_GW_INFO;//指令
+			MegData[0] = (sLen - 3) & 0x00ff;//数据体长度
+			MegData[1] = ((sLen - 3) >> 8) & 0x00ff;//数据体长度
+			MegData[2] = NET_COMM_CMD_READ_GW_INFO;//指令
 			MegData[3] = SensorCnt&0xFF;
 			MegData[4] = (SensorCnt >> 8)&0xFF;
 			CatOneEthSendQueue(MegData, sLen);
@@ -1003,7 +1066,7 @@ int Cat1EthRevCallBack(GateWayPara GateWay, uint8_t *rData, uint16_t rLen)
 		}
 		
 		case NET_COMM_CMD_GW_PARA_CONFIG:{
-			//应答服务器
+			//应答服务器
 			MegData = rt_malloc(4);
 			MegData[0] = 1;
 			MegData[1] = 0;
@@ -1051,8 +1114,9 @@ int Cat1EthRevCallBack(GateWayPara GateWay, uint8_t *rData, uint16_t rLen)
 			}
 		}
 			
+		break;
 		case NET_COMM_CMD_ADD_UNIT:{
-			if(*Data == 1) {	//录入成功
+			if(*Data == 1) {	//录入成功
 				MAIN_DBG_LOG("Adding CommUnit succeeded...\r\n");
 			}
 			else {
@@ -1061,7 +1125,7 @@ int Cat1EthRevCallBack(GateWayPara GateWay, uint8_t *rData, uint16_t rLen)
 		break;}
 		
 		case NET_COMM_CMD_LP_DEV_CONFIG: {
-			//开始配置
+			//开始配置
 			SvrDownLPDevConfigPara_t *LPDevConfig;
 			LPDevConfig = (SvrDownLPDevConfigPara_t *)Data;
 			int ret = memcmp(CommUintMac, LPDevConfig->CommDevAddr, 6);
@@ -1092,7 +1156,7 @@ int Cat1EthRevCallBack(GateWayPara GateWay, uint8_t *rData, uint16_t rLen)
 				MAIN_DBG_LOG("Main equipment parameter configuration. Mac:%02X-%02X-%02X-%02X-%02X-%02X\r\n",
 							CommUintMac[0], CommUintMac[1], CommUintMac[2], CommUintMac[3], CommUintMac[4], CommUintMac[5]);
 			}
-			//应答服务器
+			//应答服务器
 			MegData = rt_malloc(4);
 			MegData[0] = 1;
 			MegData[1] = 0;
@@ -1110,32 +1174,32 @@ int Cat1EthRevCallBack(GateWayPara GateWay, uint8_t *rData, uint16_t rLen)
 				return -1;
 			if(GateWay->ConfigPara.CommUnitArray[ret].CUType !=  DEV_TYPE_EXT_COMMUNIT)
 				return -1;
-			if((GateWay->ConfigPara.CommUnitArray[ret].Mac[0][3] / 0x80) != 1) {//判断是否为通讯单元（主设备）
-				if(GateWay->ConfigPara.CommUnitArray[ret].Mac[0][2] == 1)//判断通讯类型
+			if((GateWay->ConfigPara.CommUnitArray[ret].Mac[0][3] / 0x80) != 1) {//判断是否为通讯单元（主设备）
+				if(GateWay->ConfigPara.CommUnitArray[ret].Mac[0][2] == 1)//判断通讯类型
 				{
-					GateWay->ConfigPara.CommUnitArray[ret].LaserOnOff = Data[6];//服务器下发打开或者关闭激光
+					GateWay->ConfigPara.CommUnitArray[ret].LaserOnOff = Data[6];//服务器下发打开或者关闭激光
 					if(GateWay->ConfigPara.CommUnitArray[ret].LaserOnOff == true)
 					{
-						GateWay->ConfigPara.CommUnitArray[ret].ContLaser = true;//控制激光，等待下次此MAC主设备上传数据时下发打开激光指令（低功耗）
+						GateWay->ConfigPara.CommUnitArray[ret].ContLaser = true;//控制激光，等待下次此MAC主设备上传数据时下发打开激光指令（低功耗）
 						MAIN_DBG_LOG("Waiting for the laser response. Mac:%02X-%02X-%02X-%02X-%02X-%02X\r\n",
 							CommUintMac[0], CommUintMac[1], CommUintMac[2], CommUintMac[3], CommUintMac[4], CommUintMac[5]);
 					}
 					else if(GateWay->ConfigPara.CommUnitArray[ret].LaserOnOff == false)
-					{//直接发送
+					{//直接发送
 						MAIN_DBG_LOG("Waiting for the laser response. Mac:%02X-%02X-%02X-%02X-%02X-%02X\r\n",
 							CommUintMac[0], CommUintMac[1], CommUintMac[2], CommUintMac[3], CommUintMac[4], CommUintMac[5]);
 						GateWay->ConfigPara.CommUnitArray[ret].ContLaser = false;
-						CommUnitCmdSend(GateWay, CommUintMac, COMM_UNIT_CMD_CONT_LASER, (uint8_t *)&GateWay->ConfigPara.CommUnitArray[ret].LaserOnOff, 1, Sx1276LoRaSendBuffer);//查询模式
+						CommUnitCmdSend(GateWay, CommUintMac, COMM_UNIT_CMD_CONT_LASER, (uint8_t *)&GateWay->ConfigPara.CommUnitArray[ret].LaserOnOff, 1, Sx1276LoRaSendBuffer);//查询模式
 					}
 				}
-				else if(GateWay->ConfigPara.CommUnitArray[ret].Mac[0][2] == 2)//判断通讯类型
+				else if(GateWay->ConfigPara.CommUnitArray[ret].Mac[0][2] == 2)//判断通讯类型
 				{
 					if(GateWay->ConfigPara.Rs485Ch1.Enable == true && !GateWay->ConfigPara.Rs485Ch1.CommUnitEnable) 
 					{
-						GateWay->ConfigPara.CommUnitArray[ret].LaserOnOff = Data[6];//服务器下发打开或者关闭激光
+						GateWay->ConfigPara.CommUnitArray[ret].LaserOnOff = Data[6];//服务器下发打开或者关闭激光
 						if(GateWay->ConfigPara.CommUnitArray[ret].LaserOnOff == true)
 						{
-							GateWay->ConfigPara.CommUnitArray[ret].ContLaser = true;//控制激光，等待下次此MAC主设备上传数据时下发打开激光指令（低功耗）
+							GateWay->ConfigPara.CommUnitArray[ret].ContLaser = true;//控制激光，等待下次此MAC主设备上传数据时下发打开激光指令（低功耗）
 						}
 						else if(GateWay->ConfigPara.CommUnitArray[ret].LaserOnOff == false)
 						{
@@ -1144,10 +1208,10 @@ int Cat1EthRevCallBack(GateWayPara GateWay, uint8_t *rData, uint16_t rLen)
 					}
 					else if(GateWay->ConfigPara.Rs485Ch2.Enable == true && !GateWay->ConfigPara.Rs485Ch2.CommUnitEnable)
 					{
-						GateWay->ConfigPara.CommUnitArray[ret].LaserOnOff = Data[6];//服务器下发打开或者关闭激光
+						GateWay->ConfigPara.CommUnitArray[ret].LaserOnOff = Data[6];//服务器下发打开或者关闭激光
 						if(GateWay->ConfigPara.CommUnitArray[ret].LaserOnOff == true)
 						{
-							GateWay->ConfigPara.CommUnitArray[ret].ContLaser = true;//控制激光，等待下次此MAC主设备上传数据时下发打开激光指令（低功耗）
+							GateWay->ConfigPara.CommUnitArray[ret].ContLaser = true;//控制激光，等待下次此MAC主设备上传数据时下发打开激光指令（低功耗）
 						}
 						else if(GateWay->ConfigPara.CommUnitArray[ret].LaserOnOff == false)
 						{

Project/GateWay/source/User/Src/RS485Task.c

@@ -17,13 +17,13 @@ SensorCommPara_t SComm2Para;
 const uint8_t RS485SensorCmdPayLoadLen[RS485_SENSOR_CMD_END] = {0, 0, 0, 1, 0};
 
 /*****************************************************************************************
-* 函数名称: SavSensorData
-* 功能描述: 记录传感器数据
-* 参    数: SensorIdx, 传感器序号
-						Para，传感器结构指针
-						Data, 传感器数据
-						Len, 传感器数据长度
-* 返 回 值: 无
+* 函数名称: SavSensorData
+* 功能描述: 记录传感器数据
+* 参    数: SensorIdx, 传感器序号
+						Para，传感器结构指针
+						Data, 传感器数据
+						Len, 传感器数据长度
+* 返 回 值: 无
 *****************************************************************************************/
 static void SavSensorData(uint8_t SensorIdx, CommUnitData CUData, uint8_t *Data, uint8_t Len)
 {
@@ -36,13 +36,13 @@ static void SavSensorData(uint8_t SensorIdx, CommUnitData CUData, uint8_t *Data,
 }
 
 /*****************************************************************************************
-* 函数名称: RS485Analyze
-* 功能描述: 485数据解析
-* 参    数: SCPara, 传感器发送参数
-						Para, 传感器结构指针
-						rData, 传感器数据入口
-						rLen, 传感器数据长度
-* 返 回 值: 无
+* 函数名称: RS485Analyze
+* 功能描述: 485数据解析
+* 参    数: SCPara, 传感器发送参数
+						Para, 传感器结构指针
+						rData, 传感器数据入口
+						rLen, 传感器数据长度
+* 返 回 值: 无
 *****************************************************************************************/
 void RS485Analyze(GateWayPara GateWay, SensorCommPara SCPara, CommUnit Para, uint8_t *rData, uint8_t rLen)
 {
@@ -121,13 +121,13 @@ static void update_on_start(uint8_t* frame, int len, uint8_t* pload, int size)
     cfg.PackageNum = pReq->PackageNum;
     cfg.AppSize    = pReq->AppSize;
 	 /**
-	  操作FALSH ，写升级参数
+	  操作FALSH ，写升级参数
 	**/
     dev_boot_write_param(cfg);
 
     update_send_cmd(0x01, 1, pReq->PackageNum);
 
-    //重启进入BOOT
+    //重启进入BOOT
     NVIC_SystemReset();
 }
 
@@ -179,10 +179,10 @@ static int update_process(void* frame, int len)
 
 
 /*****************************************************************************************
-* 函数名称: RS485SensorCmdSend
-* 功能描述: 下发传感器指令函数
-* 参    数: Para,通讯参数入口
-* 返 回 值: 无
+* 函数名称: RS485SensorCmdSend
+* 功能描述: 下发传感器指令函数
+* 参    数: Para,通讯参数入口
+* 返 回 值: 无
 *****************************************************************************************/
 static void RS485SensorCmdSend(GateWayPara GateWay, SensorCommPara SensorComm)
 {
@@ -217,17 +217,17 @@ static void RS485SensorCmdSend(GateWayPara GateWay, SensorCommPara SensorComm)
 }
 
 /*****************************************************************************************
-* 函数名称: RS485SensorCmdSend
-* 功能描述: 下发传感器指令函数
-* 参    数: CommUintAddr， 通讯单元地址
-						Para,通讯参数入口
-* 返 回 值: 无
+* 函数名称: RS485SensorCmdSend
+* 功能描述: 下发传感器指令函数
+* 参    数: CommUintAddr， 通讯单元地址
+						Para,通讯参数入口
+* 返 回 值: 无
 *****************************************************************************************/
 void RS485CmdSend(GateWayPara GateWay, uint8_t CommUintAddr, SensorCommPara SensorComm)
 {
 	SensorCommPara SC;
 	
-	if(CommUintAddr)
+	if(CommUintAddr == 1)
 		SC = &SComm1Para;
 	else
 		SC = &SComm2Para;
@@ -243,12 +243,12 @@ void RS485CmdSend(GateWayPara GateWay, uint8_t CommUintAddr, SensorCommPara Sens
 
 
 /*****************************************************************************************
-* 函数名称: RS485LoopHandler
-* 功能描述: RS485循环处理函数
-* 参    数: GateWay, 网关参数句柄
-						RS485Ch, RS485通道句柄
-						SCPara， RS485通讯句柄
-* 返 回 值: 无
+* 函数名称: RS485LoopHandler
+* 功能描述: RS485循环处理函数
+* 参    数: GateWay, 网关参数句柄
+						RS485Ch, RS485通道句柄
+						SCPara， RS485通讯句柄
+* 返 回 值: 无
 *****************************************************************************************/
 static uint8_t CommUintData[512];
 int test = 0;
@@ -266,8 +266,8 @@ void RS485LoopHandler(GateWayPara GateWay, RS485Para RS485Ch, SensorCommPara SCP
 		return;
 	}
 	
-	if(RS485Ch->CommUnitEnable == true) {				//使用内置通讯单元
-		if(RS485Ch->QuerySensorFlag == true) {		//开机查找传感器
+	if(RS485Ch->CommUnitEnable == true) {				//使用内置通讯单元
+		if(RS485Ch->QuerySensorFlag == true) {		//开机查找传感器
 			if(SCPara->SensorCnt < SENSOR_NUM_MAX) {
 				rt_thread_delay(50);
 				SCPara->Cmd = RS485_SENSOR_CMD_QUERY;
@@ -289,18 +289,18 @@ void RS485LoopHandler(GateWayPara GateWay, RS485Para RS485Ch, SensorCommPara SCP
 				}
 			}
 		}
-		else if(RS485Ch->CUData.Para.SensorN > 0){
+		else if(RS485Ch->CUPara.Para.SensorN > 0){
 			SCPara->SendFlag = false;
 			if(SCPara->ReadSensorInterval > 0) {
 				SCPara->ReadSensorInterval--;  
 			}
 			else {
-				if(SCPara->ReadSensorCnt >= RS485Ch->CUData.Para.SensorN || SCPara->SensorCnt >= SENSOR_NUM_MAX) {
+				if(SCPara->ReadSensorCnt >= RS485Ch->CUPara.Para.SensorN || SCPara->SensorCnt >= SENSOR_NUM_MAX) {
 					SCPara->SensorCnt = 0;
 					SCPara->ReadSensorCnt = 0;
 					SCPara->ReadSensorInterval = GateWay->ConfigPara.CommUnitReadInterval * 5;
-					RS485Ch->CUData.Para.BatLevel = GateWay->Battery;
-					CommUintLen = CommUintOrgData(GateWay, &RS485Ch->CUData.Para, &SCPara->SensorData, CommUintData);
+					RS485Ch->CUPara.Para.BatLevel = GateWay->Battery;
+					CommUintLen = CommUintOrgData(GateWay, &RS485Ch->CUPara.Para, &SCPara->SensorData, CommUintData);
 					//AddLog(&CommUintData[2], CommUintLen - 2);
 					CatOneEthSendQueue(CommUintData, CommUintLen);
 					if(RS485Ch == &GateWay->ConfigPara.Rs485Ch1) {
@@ -312,11 +312,11 @@ void RS485LoopHandler(GateWayPara GateWay, RS485Para RS485Ch, SensorCommPara SCP
 					SCPara->SensorCnt = 0;
 				}
 				else {
-					if(RS485Ch->CUData.Para.SensorType[SCPara->SensorCnt] != 0) {
+					if(RS485Ch->CUPara.Para.SensorType[SCPara->SensorCnt] != 0) {
 						rt_thread_delay(50);
 						SCPara->Cmd = RS485_SENSOR_CMD_READ;
 						SCPara->SensorAddr = SCPara->SensorCnt + 1;
-						SCPara->SensorType = RS485Ch->CUData.Para.SensorType[SCPara->SensorCnt];
+						SCPara->SensorType = RS485Ch->CUPara.Para.SensorType[SCPara->SensorCnt];
 						SCPara->CmdParaLen = RS485SensorCmdPayLoadLen[RS485_SENSOR_CMD_READ];
 						SCPara->CmdPara = NULL;
 						//rt_mutex_take(GateWay->UartRevMutex, RT_WAITING_FOREVER);
@@ -328,7 +328,7 @@ void RS485LoopHandler(GateWayPara GateWay, RS485Para RS485Ch, SensorCommPara SCP
 			}
 		}
 	}
-	else {		//读取外置通讯单元
+	else {		//读取外置通讯单元
 		if(SCPara->RS485CommUnitReadTimeDelay >= (GateWay->ConfigPara.CommUnitReadInterval * 5) && SCPara->SendFlag == false) {
 			if(SCPara->SendUnitCommIdx < COMMUNIT_NUM_MAX) {
 				if(GateWay->ConfigPara.CommUnitArray[SCPara->SendUnitCommIdx].RegFlag && 
@@ -365,10 +365,10 @@ void RS485LoopHandler(GateWayPara GateWay, RS485Para RS485Ch, SensorCommPara SCP
 		RxLenTemp = SCPara->RS485RxLen;
 //		memset(SCPara->RS485RxBuff, 0x00, RS485_RX_BUFF_LEN_MAX);
 		SCPara->RS485RxLen = 0;
-		if(RxBuffTemp[0] == 0x7A && RS485Ch->UpgradeEnable == true) {	//升级
+		if(RxBuffTemp[0] == 0x7A && RS485Ch->UpgradeEnable == true) {	//升级
 			update_process(RxBuffTemp,RxLenTemp);
 		}
-		else if(RxBuffTemp[0] == 0x7A && RS485Ch->CommUnitEnable == true) {	//内置通讯单元数据解析
+		else if(RxBuffTemp[0] == 0x7A && RS485Ch->CommUnitEnable == true) {	//内置通讯单元数据解析
 			if(SCPara->SendFlag == false) {
 				SCPara->RS485RxLen = 0;
 				return;
@@ -376,12 +376,12 @@ void RS485LoopHandler(GateWayPara GateWay, RS485Para RS485Ch, SensorCommPara SCP
 			RS485Analyze(GateWay, SCPara, &RS485Ch->CUData, RxBuffTemp, RxLenTemp);
 			//rt_mutex_release(GateWay->UartRevMutex);
 		}
-		else if(RxBuffTemp[0] == 0x7B && RS485Ch->CommUnitEnable == false){		//读取外部通讯单元数据解析
+		else if(RxBuffTemp[0] == 0x7B && RS485Ch->CommUnitEnable == false){		//读取外部通讯单元数据解析
 			if(SCPara == &SComm1Para)
 				ret = GateWay->CommUnitRevCallBack(GateWay, RxBuffTemp, RxLenTemp, GateWay->ConfigPara.Rs485Ch1.RS485Send);
 			else
 				ret = GateWay->CommUnitRevCallBack(GateWay, RxBuffTemp, RxLenTemp, GateWay->ConfigPara.Rs485Ch2.RS485Send);
-			if(ret == 0xff) {	//注册信息
+			if(ret == 0xff) {	//注册信息
 				SCPara->RS485RxLen = 0;
 				return;
 			}
@@ -393,7 +393,7 @@ void RS485LoopHandler(GateWayPara GateWay, RS485Para RS485Ch, SensorCommPara SCP
 				return;
 			}
 		}
-		else {		//调试命令解析
+		else {		//调试命令解析
 			DebugAnalyze(GateWay, RxBuffTemp, RxLenTemp);
 		}
 		SCPara->RS485RxLen = 0;
@@ -402,7 +402,7 @@ void RS485LoopHandler(GateWayPara GateWay, RS485Para RS485Ch, SensorCommPara SCP
 	else {
 		if(RS485Ch->CommUnitEnable == true) {
 			//rt_mutex_release(GateWay->UartRevMutex);
-			if(SCPara->SendFlag == true) { //&& RS485Ch->CUData.Para.SensorN > 0 && RS485Ch->QuerySensorFlag == false){
+			if(SCPara->SendFlag == true) { //&& RS485Ch->CUPara.Para.SensorN > 0 && RS485Ch->QuerySensorFlag == false){
 				if(RS485Ch == &GateWay->ConfigPara.Rs485Ch1) {
 					test++;
 					MAIN_DBG_LOG("InCommUint1, Sensor %d Comm Error, Cmd %d...\r\n", SCPara->SensorAddr, SCPara->Cmd);
@@ -422,10 +422,11 @@ void RS485LoopHandler(GateWayPara GateWay, RS485Para RS485Ch, SensorCommPara SCP
 				if(GateWay->ConfigPara.CommUnitArray[SCPara->SendUnitCommIdx].CommStatus) {
 					GateWay->ConfigPara.CommUnitArray[SCPara->SendUnitCommIdx].CommStatus = 0;
 					MegData[0] = 7;
-					MegData[1] = COMM_UNIT_CMD_READ;
-					memcpy(&MegData[2], GateWay->ConfigPara.CommUnitArray[SCPara->SendUnitCommIdx].Mac[0], 6);
-					MegData[8] = GateWay->ConfigPara.CommUnitArray[SCPara->SendUnitCommIdx].CommStatus;
-					CatOneEthSendQueue(MegData, 9);		//发送离线消息
+					MegData[1] = 0;
+					MegData[2] = COMM_UNIT_CMD_READ;
+					memcpy(&MegData[3], GateWay->ConfigPara.CommUnitArray[SCPara->SendUnitCommIdx].Mac[0], 6);
+					MegData[9] = GateWay->ConfigPara.CommUnitArray[SCPara->SendUnitCommIdx].CommStatus;
+					CatOneEthSendQueue(MegData, 10);		//发送离线消息
 				}
 			}
 			SCPara->SendUnitCommIdx++;
@@ -435,10 +436,10 @@ void RS485LoopHandler(GateWayPara GateWay, RS485Para RS485Ch, SensorCommPara SCP
 }
 
 /*****************************************************************************************
-* 函数名称: RS485Ch1_Thread_Entry
-* 功能描述: RS485通道1任务函数
-* 参    数: 任务参数入口
-* 返 回 值: 无
+* 函数名称: RS485Ch1_Thread_Entry
+* 功能描述: RS485通道1任务函数
+* 参    数: 任务参数入口
+* 返 回 值: 无
 *****************************************************************************************/
 void RS485Ch1_Thread_Entry(void *parameter)
 {
@@ -455,20 +456,20 @@ void RS485Ch1_Thread_Entry(void *parameter)
 	InCommUnitMac[3] = GateWay->ConfigPara.GwMac[4];
 	InCommUnitMac[4] = GateWay->ConfigPara.GwMac[5];
 	RS485Ch = &GateWay->ConfigPara.Rs485Ch1;
-	memcpy(RS485Ch->CUData.Para.Mac, InCommUnitMac, 6);
+	memcpy(RS485Ch->CUPara.Para.Mac, InCommUnitMac, 6);
 	if(RS485Ch->CommUnitEnable == true) {
 		RS485_CH1_POW_ON();
-		RS485Ch->CUData.Para.SensorN = 0;
-		memset(RS485Ch->CUData.Para.SensorType, 0x00, sizeof(SENSOR_NUM_MAX * 2));
+		RS485Ch->CUPara.Para.SensorN = 0;
+		memset(RS485Ch->CUPara.Para.SensorType, 0x00, sizeof(SENSOR_NUM_MAX * 2));
 		RS485Ch->QuerySensorFlag = true;
-		RS485Ch->CUData.Para.CommStatus = true;
+		RS485Ch->CUPara.Para.CommStatus = true;
 	}
 	SCPara->RS485CommUnitReadTimeDelay = 100;
 	SCPara->RS485Rev_Sem  = rt_sem_create("rsch1sem",	0, RT_IPC_FLAG_FIFO);
 	if(SCPara->RS485Rev_Sem == RT_NULL) {
 		Debug_Printf("RS485Ch1Rev Sem Create Failed!\r\n");
 	}
-	Debug_Printf("RS485Ch1Rev Thread is running！\r\n");
+	Debug_Printf("RS485Ch1Rev Thread is running！\r\n");
 
 	rt_thread_delay(3000);
 	SCPara->InitOverFlag = true;
@@ -482,10 +483,10 @@ void RS485Ch1_Thread_Entry(void *parameter)
 }
 
 /*****************************************************************************************
-* 函数名称: RS485Ch1RxIrqCallback
-* 功能描述: RS485通道1中断处理回调函数
-* 参    数: rData 接收到的数据
-* 返 回 值: 无
+* 函数名称: RS485Ch1RxIrqCallback
+* 功能描述: RS485通道1中断处理回调函数
+* 参    数: rData 接收到的数据
+* 返 回 值: 无
 *****************************************************************************************/
 void RS485Ch1RxIrqCallback(uint8_t rData)
 {
@@ -499,10 +500,10 @@ void RS485Ch1RxIrqCallback(uint8_t rData)
 }
 
 /*****************************************************************************************
-* 函数名称: RS485Ch2_Thread_Entry
-* 功能描述: RS485通道1任务函数
-* 参    数: 任务参数入口
-* 返 回 值: 无
+* 函数名称: RS485Ch2_Thread_Entry
+* 功能描述: RS485通道1任务函数
+* 参    数: 任务参数入口
+* 返 回 值: 无
 *****************************************************************************************/
 void RS485Ch2_Thread_Entry(void *parameter)
 {
@@ -519,20 +520,20 @@ void RS485Ch2_Thread_Entry(void *parameter)
 	InCommUnitMac[3] = GateWay->ConfigPara.GwMac[4];
 	InCommUnitMac[4] = GateWay->ConfigPara.GwMac[5];
 	RS485Ch = &GateWay->ConfigPara.Rs485Ch2;
-	memcpy(RS485Ch->CUData.Para.Mac, InCommUnitMac, 6);
+	memcpy(RS485Ch->CUPara.Para.Mac, InCommUnitMac, 6);
 	if(RS485Ch->CommUnitEnable == true) {
 		RS485_CH2_POW_ON();
-		RS485Ch->CUData.Para.SensorN = 0;
-		memset(RS485Ch->CUData.Para.SensorType, 0x00, sizeof(SENSOR_NUM_MAX * 2));
+		RS485Ch->CUPara.Para.SensorN = 0;
+		memset(RS485Ch->CUPara.Para.SensorType, 0x00, sizeof(SENSOR_NUM_MAX * 2));
 		RS485Ch->QuerySensorFlag = true;
-		RS485Ch->CUData.Para.CommStatus = 1;
+		RS485Ch->CUPara.Para.CommStatus = 1;
 	}
 	SCPara->RS485CommUnitReadTimeDelay = 100;
 	SCPara->RS485Rev_Sem = rt_sem_create("rsch2sem",	0, RT_IPC_FLAG_FIFO);
 	if(SCPara->RS485Rev_Sem == RT_NULL) {
 		Debug_Printf("RS485Ch2Rev Sem Create Failed!\r\n");
 	}
-	Debug_Printf("RS485Ch2Rev Thread is running！\r\n");
+	Debug_Printf("RS485Ch2Rev Thread is running！\r\n");
 	rt_thread_delay(3000);
 	SCPara->InitOverFlag = true;
 	while(1) {
@@ -542,10 +543,10 @@ void RS485Ch2_Thread_Entry(void *parameter)
 }
 
 /*****************************************************************************************
-* 函数名称: RS485Ch2RxIrqCallback
-* 功能描述: RS485通道1中断处理回调函数
-* 参    数: rData 接收到的数据
-* 返 回 值: 无
+* 函数名称: RS485Ch2RxIrqCallback
+* 功能描述: RS485通道1中断处理回调函数
+* 参    数: rData 接收到的数据
+* 返 回 值: 无
 *****************************************************************************************/
 void RS485Ch2RxIrqCallback(uint8_t rData)
 {
@@ -565,7 +566,7 @@ void RS485RxOverhandler(void)
 	if(SComm1Para.RS485TimeOutCnt > 0)
 		SComm1Para.RS485TimeOutCnt--;
 	
-	if(SComm1Para.RS485RxLen > 5 && SComm1Para.RS485TimeOutCnt == 0) {
+	if(SComm1Para.RS485RxLen >= 1 && SComm1Para.RS485TimeOutCnt == 0) {
 		if(SComm1Para.InitOverFlag == true) {
 			rt_sem_release(SComm1Para.RS485Rev_Sem);
 			SComm1Para.RS485TimeOutCnt = 20;
@@ -579,7 +580,7 @@ void RS485RxOverhandler(void)
 	if(SComm2Para.RS485TimeOutCnt > 0)
 		SComm2Para.RS485TimeOutCnt--;
 	
-	if(SComm2Para.RS485RxLen > 5 && SComm2Para.RS485TimeOutCnt == 0) {
+	if(SComm2Para.RS485RxLen >= 1 && SComm2Para.RS485TimeOutCnt == 0) {
 		if(SComm2Para.InitOverFlag == true) {
 			SComm2Para.RS485TimeOutCnt = 20;
 			rt_sem_release(SComm2Para.RS485Rev_Sem);

Project/GateWay/source/User/Src/app_comm.c

@@ -1,5 +1,5 @@
 /*
-数据通信任务
+数据通信任务
 */
 #include "bsp.h"
 
@@ -31,7 +31,7 @@ static void rs485_rx_cb(uint8_t data)
 }
 
 /**
-返回值:成功:len,失败: 0
+返回值:成功:len,失败: 0
 ***/
 static int recive_frame(void)
 {
@@ -76,7 +76,7 @@ static void update_on_start(uint8_t* frame, int len, uint8_t* pload, int size)
 
     update_send_cmd(0x01, 1, pReq->PackageNum);
 
-    //重启进入BOOT
+    //重启进入BOOT
     NVIC_SystemReset();
 }
 
@@ -144,7 +144,7 @@ static void comm_process(uint8_t* frame, int len)
     uint8_t  frame_data[64] = {0};
     uint16_t frame_data_len = 0;
 
-    /***数据解码***/
+    /***数据解码***/
     int err = -1;
     
     err= protocol_unpack_frame(frame, len, &slave_addr, &frame_cmd, frame_data, &frame_data_len);
@@ -152,7 +152,7 @@ static void comm_process(uint8_t* frame, int len)
     if (err != PROTOCOL_SUCCESS)
         return ;
 
-    //TODO:获取本机地址
+    //TODO:获取本机地址
     uint8_t local_addr = 0;
     dev_cfg_get_devid(&local_addr);
 
@@ -209,7 +209,7 @@ static void comm_process(uint8_t* frame, int len)
            
            memcpy( &tp_data,&tp_info.tp_datas,sizeof(tp_data));
 
-           //兼容旧协议,没有用到的通道，填充无效数据
+           //兼容旧协议,没有用到的通道，填充无效数据
            for(int i=0; i <8-TP_SENSOR_NUM; i++){
            
                tp_data.channels[i+TP_SENSOR_NUM].status =1;
@@ -244,7 +244,7 @@ static void comm_process(uint8_t* frame, int len)
             
             app_collect_ad_get(&ad_data);
 
-           //兼容旧协议,没有用到的通道，填充无效数据
+           //兼容旧协议,没有用到的通道，填充无效数据
             for(int i=0; i <8-YB_SENSOR_NUM; i++){
            
                ad_data.channels[i+5].status =1;

Project/GateWay/source/User/Src/main.c

@@ -2,14 +2,14 @@
 #include <math.h>
 #include "main.h"
 #include "CatOneTask.h"
+#include "EthTask.h"
 #include "LoraTask.h"
-#include "CatOneTask.h"
 #include "RS485Task.h"
 #include "DebugCmd.h"
 #include "spiflash.h"
 
 
-//雅下： 81-00-00-06-00-01
+//雅下： 81-00-00-06-00-01
 //			81-00-00-06-00-02
 //			81-00-00-06-00-03
 //			81-00-00-06-00-04
@@ -34,7 +34,8 @@ static const uint8_t GateWayMac_BL10[6] = {0x81, 0x00, 0x00, 0x06, 0x00, 0x0A};
 bool MainDispEn = true;
 
 static rt_thread_t Lora_Thread = RT_NULL;
-static rt_thread_t Cat1Eth_Thread = RT_NULL;
+static rt_thread_t Cat1_Thread = RT_NULL;
+static rt_thread_t Eth_Thread = RT_NULL;
 static rt_thread_t RS485Ch1_Thread = RT_NULL;
 static rt_thread_t RS485Ch2_Thread = RT_NULL;
 static rt_thread_t Debug_Thread = RT_NULL;
@@ -60,10 +61,10 @@ int toPercentage(int voltage)
 }
 
 /*****************************************************************************************
-* 函数名称: MainDBGOnOff
-* 功能描述: 主调试信息开关函数
-* 参    数: OnOff,开关
-* 返 回 值: 无
+* 函数名称: MainDBGOnOff
+* 功能描述: 主调试信息开关函数
+* 参    数: OnOff,开关
+* 返 回 值: 无
 *****************************************************************************************/
 void MainDBGOnOff(bool OnOff)
 {
@@ -92,35 +93,6 @@ void SDCardTest(void)
 }
 #endif
 
-void InfTest(void)
-{
-	uint8_t sData[10] = {0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0A};
-	RS485_CH1_RX();
-	RS485_CH1_POW_ON();
- 	rt_thread_delay(100);
-	RS485_CH1_POW_OFF();
-
-	RS485_CH2_POW_ON();
-	rt_thread_delay(100);
-	RS485_CH2_POW_OFF();
-	
-	POWER_LED_OFF();
-	POWER_LED_ON();
-	LORA_RX_LED_SET();
-	LORA_RX_LED_CLR();
-	RS485_CH1_TX();
-	RS485_CH2_RX();
-	RS485Ch1_Config(500000);
-	RS485Ch2_Config(500000);
-	RS485Ch1UartSend(sData, 10);
-	rt_thread_delay(100);
-	
-	RS485_CH2_TX();
-	RS485_CH1_RX();
-	RS485Ch2UartSend(sData, 10);
-	rt_thread_delay(100);
-//	SDCardTest();
-}
 
 void GateWayInit(void)
 {
@@ -129,18 +101,35 @@ void GateWayInit(void)
 	Debug_Printf("FlashID: %08x\r\n", FlashID);
 	
 	memset((uint8_t *)&GateWay.ConfigPara, 0x00, sizeof(GWConfigPara_t));
+	boot_para_t bootParam;
+	dev_boot_read_param(&bootParam);
+	if(bootParam.AppFlag == APP_BOOT_UPGRADE_FLAG) {
+		rt_kprintf("Boot upgrade detected, erasing external Flash...\r\n");
+		SpiFlashEraseChip();
+		bootParam.AppFlag = 0;
+		dev_boot_write_param(bootParam);
+	}
+
 	int ret = ReadPara((uint8_t *)&GateWay.ConfigPara, sizeof(GWConfigPara_t));
 	if(GateWay.ConfigPara.SavFlag != LOG_SAV_FLAG) {
 		memset((uint8_t *)&GateWay.ConfigPara, 0x00, sizeof(GWConfigPara_t));
 		GateWay.ConfigPara.SavFlag = LOG_SAV_FLAG;
 		GateWay.ConfigPara.Comm = CATONE_COMM;
-//		memcpy(GateWay.ConfigPara.GwMac, GateWayMac, 6);
-		GateWay.ConfigPara.SvrAddr[0] = 8;
-		GateWay.ConfigPara.SvrAddr[1] = 137;
-		GateWay.ConfigPara.SvrAddr[2] = 104;
-		GateWay.ConfigPara.SvrAddr[3] = 4;
-		GateWay.ConfigPara.SvrPort = 8007;
-		GateWay.ConfigPara.CommUnitReadInterval = COMMUNIT_READ_SENSOR_INTERVAL_MAX;
+#if MAC_ADDR_TYPE == 0//测试服务器
+	GateWay.ConfigPara.LTENet.DestAddr[0] = 39;
+	GateWay.ConfigPara.LTENet.DestAddr[1] = 106;
+	GateWay.ConfigPara.LTENet.DestAddr[2] = 103;
+	GateWay.ConfigPara.LTENet.DestAddr[3] = 147;
+	GateWay.ConfigPara.LTENet.DestPort = 8080;
+#elif MAC_ADDR_TYPE > 0
+	GateWay.ConfigPara.LTENet.DestAddr[0] = 103;
+	GateWay.ConfigPara.LTENet.DestAddr[1] = 217;
+	GateWay.ConfigPara.LTENet.DestAddr[2] = 192;
+	GateWay.ConfigPara.LTENet.DestAddr[3] = 248;
+	GateWay.ConfigPara.LTENet.DestPort = 12111;
+#endif
+
+		GateWay.ConfigPara.CommUnitReadInterval = COMMUNIT_READ_SENSOR_INTERVAL_MAX;//非低功耗设备
 		memset(GateWay.ConfigPara.CommUnitArray, 0x00, sizeof(CommUnitData_t) * COMMUNIT_NUM_MAX);
 		GateWay.ConfigPara.Rs485Ch1.Enable = true;
 		GateWay.ConfigPara.Rs485Ch1.CommUnitEnable = false;
@@ -151,7 +140,9 @@ void GateWayInit(void)
 		GateWay.ConfigPara.Rs485Ch2.BaudRate = 500000;
 		GateWay.ConfigPara.Rs485Ch2.UpgradeEnable = false;
 		GateWay.ConfigPara.Rs485Ch2.CommUnitEnable = false;
-		GateWay.ConfigPara.Rs485Ch2.Power = true;
+		GateWay.ConfigPara.Rs485Ch2.Power = false;
+		GateWay.ConfigPara.Rs485Ch1.RS485Send = RS485Ch1UartSend;
+		GateWay.ConfigPara.Rs485Ch2.RS485Send = RS485Ch2UartSend;
 		
 		GateWay.ConfigPara.Lora.OnOff = true;
 		GateWay.ConfigPara.Lora.ucChannel = 8;
@@ -161,49 +152,21 @@ void GateWayInit(void)
 		GateWay.ConfigPara.Lora.ErrorCoding = 2;
 		GateWay.ConfigPara.Lora.RegPreamble = 10;
 		GateWay.ConfigPara.Lora.FreqCent = FREQ_CENT;
+		
 		GateWay.ConfigPara.OutageFlag = false;
 		GateWay.ConfigPara.DebugChannel = DEBUG_CH_RS485_1;
-	}
-	
-	if(GateWay.ConfigPara.OutageFlag != true && GateWay.ConfigPara.OutageFlag != false)
-		GateWay.ConfigPara.OutageFlag = false;
-	
-	GateWay.SvrRegFlag = false;
-	memset(GateWay.SvrMac, 0x00, 6);
-	GateWay.ConfigPara.Rs485Ch1.RS485Send = RS485Ch1UartSend;
-	GateWay.ConfigPara.Rs485Ch2.RS485Send = RS485Ch2UartSend;
-	
-	GateWay.ConfigPara.Rs485Ch1.Enable = true;
-	GateWay.ConfigPara.Rs485Ch1.CommUnitEnable = false;
-	GateWay.ConfigPara.Rs485Ch1.UpgradeEnable = true;
-	GateWay.ConfigPara.Rs485Ch1.BaudRate = 500000;
-	GateWay.ConfigPara.Rs485Ch1.Power = false;
-	GateWay.ConfigPara.Rs485Ch2.Enable = true;
-	GateWay.ConfigPara.Rs485Ch2.BaudRate = 500000;
-	GateWay.ConfigPara.Rs485Ch2.CommUnitEnable = false;
-	GateWay.ConfigPara.Rs485Ch2.UpgradeEnable = false;
-	GateWay.ConfigPara.Rs485Ch2.Power = false;
-
-	GateWay.ConfigPara.Lora.OnOff = true;
-	GateWay.ConfigPara.Lora.ucChannel = 8;
-	GateWay.ConfigPara.Lora.ucPower = 20;
-	GateWay.ConfigPara.Lora.SignalBw = 8;
-	GateWay.ConfigPara.Lora.SpreadFactor = 9;
-	GateWay.ConfigPara.Lora.ErrorCoding = 2;
-	GateWay.ConfigPara.Lora.RegPreamble = 10;
-	GateWay.ConfigPara.Lora.FreqCent = FREQ_CENT;
-	
+		
 #if MAC_ADDR_TYPE == 0
 	memcpy(GateWay.ConfigPara.GwMac, GateWayMac_Test, 6);
-	GateWay.ConfigPara.DebugChannel = DEBUG_CH_DBG;
+	GateWay.ConfigPara.DebugChannel = DEBUG_CH_RS485_1;
 #elif MAC_ADDR_TYPE == 1
 	memcpy(GateWay.ConfigPara.GwMac, GateWayMac_BL1, 6);
-	//GateWay.ConfigPara.DebugChannel = DEBUG_CH_RS485_1;
-	GateWay.ConfigPara.DebugChannel = DEBUG_CH_DBG;
+	GateWay.ConfigPara.DebugChannel = DEBUG_CH_RS485_1;
+//	GateWay.ConfigPara.DebugChannel = DEBUG_CH_DBG;
 #elif MAC_ADDR_TYPE == 2
 	memcpy(GateWay.ConfigPara.GwMac, GateWayMac_BL2, 6);
 	GateWay.ConfigPara.DebugChannel = DEBUG_CH_RS485_1;
-	//GateWay.ConfigPara.DebugChannel = DEBUG_CH_DBG;
+//	GateWay.ConfigPara.DebugChannel = DEBUG_CH_DBG;
 #elif MAC_ADDR_TYPE == 3
 	memcpy(GateWay.ConfigPara.GwMac, GateWayMac_BL3, 6);
 	GateWay.ConfigPara.DebugChannel = DEBUG_CH_RS485_1;
@@ -229,26 +192,14 @@ void GateWayInit(void)
 	memcpy(GateWay.ConfigPara.GwMac, GateWayMac_BL10, 6);
 	GateWay.ConfigPara.DebugChannel = DEBUG_CH_RS485_1;
 #endif
-
-#if MAC_ADDR_TYPE == 0//测试服务器
-	GateWay.ConfigPara.SvrAddr[0] = 39;
-	GateWay.ConfigPara.SvrAddr[1] = 106;
-	GateWay.ConfigPara.SvrAddr[2] = 103;
-	GateWay.ConfigPara.SvrAddr[3] = 147;
-	GateWay.ConfigPara.SvrPort = 8080;
-#elif MAC_ADDR_TYPE > 0
-//	GateWay.ConfigPara.SvrAddr[0] = 39;
-//	GateWay.ConfigPara.SvrAddr[1] = 106;
-//	GateWay.ConfigPara.SvrAddr[2] = 103;
-//	GateWay.ConfigPara.SvrAddr[3] = 147;
-//	GateWay.ConfigPara.SvrPort = 8080;
-	GateWay.ConfigPara.SvrAddr[0] = 103;
-	GateWay.ConfigPara.SvrAddr[1] = 217;
-	GateWay.ConfigPara.SvrAddr[2] = 192;
-	GateWay.ConfigPara.SvrAddr[3] = 248;
-	GateWay.ConfigPara.SvrPort = 12111;
-#endif
-
+	}
+	
+	if(GateWay.ConfigPara.OutageFlag != true && GateWay.ConfigPara.OutageFlag != false)
+		GateWay.ConfigPara.OutageFlag = false;
+	
+	GateWay.SvrRegFlag = false;
+	memset(GateWay.SvrMac, 0x00, 6);
+	
 	if(GateWay.ConfigPara.DebugChannel == DEBUG_CH_RS485_1) {
 		GateWay.ConfigPara.Rs485Ch1.Enable = true;
 		GateWay.ConfigPara.Rs485Ch1.BaudRate = 500000;
@@ -289,6 +240,11 @@ void GateWayInit(void)
 		LoraSetChannel(GateWay.ConfigPara.Lora.ucChannel);
 		//WritePara((uint8_t *)&GateWay.ConfigPara, sizeof(GWConfigPara_t));
 	}
+	if(LoraSetFreqCent(GateWay.ConfigPara.Lora.FreqCent) == false)
+	{
+		GateWay.ConfigPara.Lora.FreqCent = 433100000;
+		LoraSetFreqCent(GateWay.ConfigPara.Lora.FreqCent);
+	}
 	if(LoraSetPower(GateWay.ConfigPara.Lora.ucPower) == false) {
 		GateWay.ConfigPara.Lora.ucPower = 20;
 		LoraSetPower(GateWay.ConfigPara.Lora.ucPower);
@@ -311,12 +267,12 @@ void GateWayInit(void)
 	}
 	if(GateWay.ConfigPara.Lora.RegPreamble > 0xFE) {
 		GateWay.ConfigPara.Lora.RegPreamble = 10;
+		LoraSetRegPreamble(GateWay.ConfigPara.Lora.RegPreamble);
 		//WritePara((uint8_t *)&GateWay.ConfigPara, sizeof(GWConfigPara_t));
 	}
-	LoraSetRegPreamble(GateWay.ConfigPara.Lora.RegPreamble);
 	
 	WritePara((uint8_t *)&GateWay.ConfigPara, sizeof(GWConfigPara_t));
-	
+
 	LogInit();
 	
 	Header.LogEndAddr = 0;
@@ -333,10 +289,14 @@ void GateWayInit(void)
 	else
 		rt_kprintf("History Num: 0\r\n");
 	if(GateWay.ConfigPara.Comm == CATONE_COMM) {
+		DbgOrCat1Uart_Config(115200);
 		CAT1_ON();
 	}
 	else {
+		DBG_ON();
 		ETH_ON();
+		rt_thread_delay(1000);
+		ETHReset();
 	}
 }
 
@@ -353,16 +313,16 @@ void OutageUpdate(uint8_t AlarmType, bool AlarmState, uint8_t Batt)
 	Alarm->AlarmType = AlarmType;
 	Alarm->AlarmState = AlarmState;
 	Alarm->AlarmPara = Batt;
-	CatOneEthSendQueue(MegData, 6);		//发送报警信息     
+	CatOneEthSendQueue(MegData, 6);		//发送报警信息     
 }
 
 /*****************************************************************************************
-* 函数名称: main
-* 功能描述: 主函数
-* 参    数: 无
-* 返 回 值: 运行错误返回-1
+* 函数名称: main
+* 功能描述: 主函数
+* 参    数: 无
+* 返 回 值: 运行错误返回-1
 *****************************************************************************************/
-static	uint8_t LastBattery = 0xff;	//上一次电池电压
+static	uint8_t LastBattery = 0xff;	//上一次电池电压
 int main(void) 
 {	
 	uint16_t OneSecondDlyCnt = 0;
@@ -373,7 +333,7 @@ int main(void)
 	uint8_t AlarmType = 0;
 	
 	GateWayInit();
-	
+
 	rt_kprintf("\r\n\r\n");
 	rt_kprintf("****************************************************\r\n");
 	rt_kprintf("**                                                **\r\n");
@@ -426,14 +386,20 @@ int main(void)
 		return -1;
 	
 	Debug_Thread = rt_thread_create("DebugUart", Debug_Thread_Entry, &GateWay, 2048, 3, 20);
-	if (RS485Ch2_Thread != RT_NULL)
+	if (Debug_Thread != RT_NULL)
 		rt_thread_startup(Debug_Thread);
 	else
 		return -1;
 		
-	Cat1Eth_Thread = rt_thread_create("Cat1Eth", CatOne_Eth_Thread_Entry, &GateWay, 4096, 3, 20);
-	if (Cat1Eth_Thread != RT_NULL)
-		rt_thread_startup(Cat1Eth_Thread);
+	Cat1_Thread = rt_thread_create("Cat1", CatOne_Thread_Entry, &GateWay, 4096, 3, 20);
+	if (Cat1_Thread != RT_NULL)
+		rt_thread_startup(Cat1_Thread);
+	else
+		return -1;
+
+	Eth_Thread = rt_thread_create("Eth", Eth_Thread_Entry, &GateWay, 4096, 3, 20);
+	if (Eth_Thread != RT_NULL)
+		rt_thread_startup(Eth_Thread);
 	else
 		return -1;
 	
@@ -450,9 +416,9 @@ int main(void)
 				POWER_LED_OFF();
 			}
 		}
-		EthRxOverhandler();
+		EthOverHandler();
 		RS485RxOverhandler();
-		DebugRxOverhandler();
+		DebugOrCat1RxOverhandler();
 		if(OneSecondDlyCnt % 200 == 0) {
 			FeedDog();
 			LORA_RX_TOGGLE();
@@ -469,15 +435,15 @@ int main(void)
 			
 			uint16_t ADValue = GetADCBuffPoint();
 			//V = (AD * 3.3 / 4096) * (R1+R2) / R1; R1 = 200, R2 = 120
-			//计算出常数为0.0021484375，扩大1000倍
+			//计算出常数为0.0021484375，扩大1000倍
 			float Voltage = ADValue * 2.1484375;
 			GateWay.Battery = toPercentage(Voltage);
 			
-			//上电判断电量
+			//上电判断电量
 			if(LastBattery == 0xff) {
 				LastBattery = GateWay.Battery;
 			
-				if(GateWay.ConfigPara.OutageFlag == true)	{	//有报警
+				if(GateWay.ConfigPara.OutageFlag == true)	{	//有报警
 					AlarmType = 1;
 				}
 				else {
@@ -487,7 +453,7 @@ int main(void)
 				BatteryUpdateDlyCnt = 10;
 			}
 			else {
-				if(GateWay.ConfigPara.OutageFlag == false) {		//没有告警，判断电池电压是否降低
+				if(GateWay.ConfigPara.OutageFlag == false) {		//没有告警，判断电池电压是否降低
 					if(GateWay.Battery <= LastBattery) {
 						if(LastBattery <= 5) {
 							GateWay.ConfigPara.OutageFlag = true;
@@ -508,7 +474,7 @@ int main(void)
 							BatteryUpdateDlyCnt = 20 * 60;
 						}
 					}
-					else {		//充电，更新上一次电池电压
+					else {		//充电，更新上一次电池电压
 						LastBattery = GateWay.Battery;
 					}
 				}
@@ -535,14 +501,14 @@ int main(void)
 							AlarmType = 0;
 						}
 					}
-					else {	//电池继续放电，更新上一次电池电压
+					else {	//电池继续放电，更新上一次电池电压
 						LastBattery = GateWay.Battery;
 					}
 				}
 			}
 			BatteryUpdateDlyCnt--;
 			if(BatteryUpdateDlyCnt == 0) {
-				if(GateWay.ConfigPara.OutageFlag)	{	//有报警
+				if(GateWay.ConfigPara.OutageFlag)	{	//有报警
 					BatteryUpdateDlyCnt = 20 * 60;
 				}
 				else {

Project/GateWay/source/User/Src/protocol.c

@@ -11,7 +11,7 @@ int protocol_pack_frame(
     uint16_t *packed_len)
 {
 
-    // 构建基础帧头
+    // 构建基础帧头
 
     buffer[0] = PROTOCOL_HEAD & 0xFF;  
     buffer[1] = (PROTOCOL_HEAD >> 8) & 0xFF;
@@ -23,21 +23,21 @@ int protocol_pack_frame(
     buffer[5] = payload_len & 0xFF;  
     buffer[6] = (payload_len >> 8) & 0xFF;
 
-    // 复制有效载荷（保持小端格式）
+    // 复制有效载荷（保持小端格式）
     if (payload_len > 0 && payload != NULL) {
         memcpy(buffer + PROTOCOL_FRAME_HEAD_SIZE , payload, payload_len);
     }
 
-     // 设置实际长度
+     // 设置实际长度
     int fram_len = PROTOCOL_FRAME_MIN_SIZE + payload_len;
     
     
-    // 计算CRC（覆盖地址、命令、长度和有效载荷）
+    // 计算CRC（覆盖地址、命令、长度和有效载荷）
     uint16_t crc = 0xFFFF;
     
     crc = modbus_crc16(buffer,fram_len -2);
     
-    // 写入CRC（保持小端格式）
+    // 写入CRC（保持小端格式）
 
     buffer[fram_len-2] = (uint8_t)(crc & 0xFF);
     buffer[fram_len-1] = (uint8_t)(crc >> 8);
@@ -56,15 +56,19 @@ int protocol_unpack_frame(
     uint8_t *payload,
     uint16_t *payload_len
 ) {
-    // 参数校验
+    // 参数校验
     if (frame == NULL || slave_addr == NULL || command == NULL || payload_len == NULL) {
         return PROTOCOL_ERR_INVALID_PARAM;
     }
+    if (frame_len > 64) {
+        return PROTOCOL_ERR_BUFFER_OVERFLOW;
+    }
+
     if (frame_len < PROTOCOL_FRAME_MIN_SIZE) {
         return PROTOCOL_ERR_INVALID_PARAM;
     }
 
-    // 帧头校验
+    // 帧头校验
     uint16_t header = (frame[0] | frame[1] <<8);
     
     if (header != PROTOCOL_HEAD) {
@@ -72,7 +76,7 @@ int protocol_unpack_frame(
         return PROTOCOL_ERR_INVALID_PARAM;
     }
 
-    // 基础字段解析
+    // 基础字段解析
     *slave_addr  =   (frame[2] | frame[3] << 8);
     
     
@@ -81,7 +85,7 @@ int protocol_unpack_frame(
     
     *payload_len =   (frame[5] | frame[6] << 8);
     
-    // 数据完整性校验
+    // 数据完整性校验
     if (*payload_len > (frame_len - PROTOCOL_FRAME_MIN_SIZE)) {
         
         return PROTOCOL_ERR_BUFFER_OVERFLOW;
@@ -93,7 +97,7 @@ int protocol_unpack_frame(
     
     calc_crc =  modbus_crc16((uint8_t *)frame, frame_size -2 );
 
-    // 校验CRC（保持小端格式）
+    // 校验CRC（保持小端格式）
     union{
     
         uint16_t value;
@@ -111,7 +115,7 @@ int protocol_unpack_frame(
         return PROTOCOL_ERR_CRC;
     }
 
-    // 复制有效载荷（保持小端格式）
+    // 复制有效载荷（保持小端格式）
     if (*payload_len > 0 && payload != NULL) {
         memcpy(payload, frame + PROTOCOL_FRAME_HEAD_SIZE, *payload_len);
     }

Project/GateWay/source/User/Src/ringbuffer.c

@@ -1,5 +1,5 @@
 /******************************************************************************
- * @brief    环形缓冲区管理(参考linux/kfifo)
+ * @brief    环形缓冲区管理(参考linux/kfifo)
  *
  * Copyright (c) 2016~2020, <morro_luo@163.com>
  *
@@ -7,7 +7,7 @@
  *
  * Change Logs: 
  * Date           Author       Notes 
- * 2016-05-30     Morro        初版完成
+ * 2016-05-30     Morro        初版完成
  ******************************************************************************/
 #include "ringbuffer.h"
 #include <string.h>
@@ -16,10 +16,10 @@
 #define min(a,b) ( (a) < (b) )? (a):(b)     
      
 /*
- *@brief      构造一个空环形缓冲区
- *@param[in]  r    - 环形缓冲区管理器
- *@param[in]  buf  - 数据缓冲区
- *@param[in]  len  - buf长度(必须是2的N次幂)
+ *@brief      构造一个空环形缓冲区
+ *@param[in]  r    - 环形缓冲区管理器
+ *@param[in]  buf  - 数据缓冲区
+ *@param[in]  len  - buf长度(必须是2的N次幂)
  *@retval     bool
  */
 bool ring_buf_init(ring_buf_t *r,unsigned char *buf, unsigned int len)
@@ -31,8 +31,8 @@ bool ring_buf_init(ring_buf_t *r,unsigned char *buf, unsigned int len)
 }
 
 /*
- *@brief      清空环形缓冲区 
- *@param[in]  r - 待清空的环形缓冲区
+ *@brief      清空环形缓冲区 
+ *@param[in]  r - 待清空的环形缓冲区
  *@retval     none
  */
 void ring_buf_clr(ring_buf_t *r)
@@ -41,8 +41,8 @@ void ring_buf_clr(ring_buf_t *r)
 }
 
 /*
- *@brief      获取环形缓冲区数据长度
- *@retval     环形缓冲区中有效字节数 
+ *@brief      获取环形缓冲区数据长度
+ *@retval     环形缓冲区中有效字节数 
  */
 int ring_buf_len(ring_buf_t *r)
 {
@@ -50,10 +50,10 @@ int ring_buf_len(ring_buf_t *r)
 }
 
 /*
- *@brief       将指定长度的数据放到环形缓冲区中 
- *@param[in]   buf - 数据缓冲区
- *             len - 缓冲区长度 
- *@retval      实际放到中的数据 
+ *@brief       将指定长度的数据放到环形缓冲区中 
+ *@param[in]   buf - 数据缓冲区
+ *             len - 缓冲区长度 
+ *@retval      实际放到中的数据 
  */
 int ring_buf_put(ring_buf_t *r,unsigned char *buf,unsigned int len)
 {
@@ -70,10 +70,10 @@ int ring_buf_put(ring_buf_t *r,unsigned char *buf,unsigned int len)
 }
 
 /*
- *@brief       从环形缓冲区中读取指定长度的数据 
- *@param[in]   len - 读取长度 
- *@param[out]  buf - 输出数据缓冲区
- *@retval      实际读取长度 
+ *@brief       从环形缓冲区中读取指定长度的数据 
+ *@param[in]   len - 读取长度 
+ *@param[out]  buf - 输出数据缓冲区
+ *@retval      实际读取长度 
  */
 int ring_buf_get(ring_buf_t *r,unsigned char *buf,unsigned int len)
 {

Project/GateWay/source/User/Src/spiflash.c

@@ -33,12 +33,13 @@ static void SpiFlashWaitForWriteEnd(void)
 	SpiFlashSendByte(SPIFLASH_CMD_RDSR);
 	do{
 		flashstatus = SpiFlashReadByte();
+		FeedDog();
 	}
 	while ((flashstatus & SPIFLASH_WIP_FLAG) == SPIFLASH_WIP_FLAG); 
 	SpiFlashSetNss();
 }
 
-//扇区擦除
+//扇区擦除
 void SpiFlashEraseSector(uint32_t SectorAddr)
 {
 #ifdef FLASH_TEST
@@ -56,7 +57,7 @@ void SpiFlashEraseSector(uint32_t SectorAddr)
 #endif
 }
 
-//整片擦除
+//整片擦除
 void SpiFlashEraseChip(void)
 {
 	SpiFlashWriteEnable();
@@ -66,7 +67,7 @@ void SpiFlashEraseChip(void)
 	SpiFlashWaitForWriteEnd();
 }
 
-//写数据
+//写数据
 void SpiFlashWriteData(uint8_t* wData, uint32_t wAddr, uint16_t wLen)
 {
 #ifdef FLASH_TEST
@@ -88,15 +89,15 @@ void SpiFlashWriteData(uint8_t* wData, uint32_t wAddr, uint16_t wLen)
 
 void SpiFlashWriteAnyLengthData(uint8_t* wData, uint32_t wAddr, uint16_t wLen)
 {
-	uint16_t PageCnt;	//需要写入页数
-	uint16_t FirstPageWriteSize;	//在起始地址不为页起始地址的情况下，先写入当前页剩余空间
-	uint16_t LastPageWriteSize;	//最后一页写入长度
+	uint16_t PageCnt;	//需要写入页数
+	uint16_t FirstPageWriteSize;	//在起始地址不为页起始地址的情况下，先写入当前页剩余空间
+	uint16_t LastPageWriteSize;	//最后一页写入长度
 	uint32_t AddrOffset = 0;
 	uint32_t WriteAddr;
 	LogHeader LogH;
 	WriteAddr = wAddr;
 	
-	//写入的长度超出最大空间，从起始开始写起
+	//写入的长度超出最大空间，从起始开始写起
 	if((WriteAddr + wLen) > SPIFLASH_SIZE) {
 		LogH = (LogHeader)wData;
 		WriteAddr = LOG_SAV_START_SECTOR * SPIFLASH_SECTORSIZE;
@@ -105,21 +106,21 @@ void SpiFlashWriteAnyLengthData(uint8_t* wData, uint32_t wAddr, uint16_t wLen)
 	
 	uint16_t FirstPageRemainSpace = SPIFLASH_PAGESIZE - (WriteAddr % SPIFLASH_PAGESIZE);
 	
-//	//判断是否跨扇区，跨扇区需要先擦除下一扇区
-//	CheckDelSecter(wAddr, wLen);
+//	//判断是否跨扇区，跨扇区需要先擦除下一扇区
+	CheckDelSecter(wAddr, wLen);
 	
 	if(wLen < FirstPageRemainSpace) {
-		FirstPageWriteSize = wLen;		//计算首页写入长度
+		FirstPageWriteSize = wLen;		//计算首页写入长度
 		PageCnt = 0;
 		LastPageWriteSize = 0;
 	} 
 	else {
 //		FirstPageWriteSize = FirstPageRemainSpace % SPIFLASH_PAGESIZE;
-//		PageCnt = (wLen - (FirstPageWriteSize % SPIFLASH_PAGESIZE)) / SPIFLASH_PAGESIZE;		//计算需要写入多少整页
-//		LastPageWriteSize = (wLen - (FirstPageWriteSize % SPIFLASH_PAGESIZE)) % SPIFLASH_PAGESIZE;	//计算剩余需要写入的长度
+//		PageCnt = (wLen - (FirstPageWriteSize % SPIFLASH_PAGESIZE)) / SPIFLASH_PAGESIZE;		//计算需要写入多少整页
+//		LastPageWriteSize = (wLen - (FirstPageWriteSize % SPIFLASH_PAGESIZE)) % SPIFLASH_PAGESIZE;	//计算剩余需要写入的长度
 		FirstPageWriteSize = FirstPageRemainSpace;
-		PageCnt = (wLen - FirstPageWriteSize) / SPIFLASH_PAGESIZE;		//计算需要写入多少整页
-		LastPageWriteSize = (wLen - FirstPageWriteSize) % SPIFLASH_PAGESIZE;	//计算剩余需要写入的长度
+		PageCnt = (wLen - FirstPageWriteSize) / SPIFLASH_PAGESIZE;		//计算需要写入多少整页
+		LastPageWriteSize = (wLen - FirstPageWriteSize) % SPIFLASH_PAGESIZE;	//计算剩余需要写入的长度
 	}
 	
 	if(FirstPageWriteSize > 0) {	
@@ -169,17 +170,17 @@ uint32_t SpiFlashReadId(void)
 
 typedef struct {
 	uint16_t Flag;
-	uint16_t LoopSavFlag;					//循环存储标志
-	uint32_t LogCnt;							//日志最大数量
-	uint32_t FirstLogStartAddr;		//第一个数据的起始地址
-	uint32_t LastLogEndAddr;			//最后一个数据的结束地址
+	uint16_t LoopSavFlag;					//循环存储标志
+	uint32_t LogCnt;							//日志最大数量
+	uint32_t FirstLogStartAddr;		//第一个数据的起始地址
+	uint32_t LastLogEndAddr;			//最后一个数据的结束地址
 }LogNumSav_t;
 
 static LogNumSav_t LogNumArray[256];
 static __IO uint32_t gLogCnt = 0;
-static __IO uint32_t FirstLogStartAddr = 0;			//第一个日志起始地址
-static __IO uint32_t LastLogEndAddr = 0;				//最后一个日志结束地址
-static __IO uint16_t LoopSavFlag = 0;						//循环存储标志
+static __IO uint32_t FirstLogStartAddr = 0;			//第一个日志起始地址
+static __IO uint32_t LastLogEndAddr = 0;				//最后一个日志结束地址
+static __IO uint16_t LoopSavFlag = 0;						//循环存储标志
 static uint16_t LogNumIdx;
 
 uint16_t ReadLoopSavFlag(void)
@@ -234,7 +235,7 @@ void LogInit(void)
 			break;
 		}
 	}
-	if(LogNumIdx == 0xffff) {			//256条记录满，读最后一条记录
+	if(LogNumIdx == 0xffff) {			//256条记录满，读最后一条记录
 		LogNumIdx = 0;
 		SetLogNum(LogNumArray[255].LogCnt);
 		SetLoopSavFlag(LogNumArray[255].LoopSavFlag);
@@ -242,7 +243,7 @@ void LogInit(void)
 		SetLastLogEndAddr(LogNumArray[255].LastLogEndAddr);
 		return;
 	}
-	if(LogNumIdx == 0) {			//没有记录
+	if(LogNumIdx == 0) {			//没有记录
 		LogNumIdx = 0;
 		SetLogNum(0);
 		SetLoopSavFlag(0);
@@ -285,17 +286,17 @@ void SavLogNum(uint32_t LogNum)
 }
 
 /*****************************************************************************************
-* 函数名称: CheckDelSecter
-* 功能描述: 检查需要删除的扇区，跨扇区删除下一扇区，如果到了删除最后一个扇区，循环到起始扇区
-* 参    数: wAddr, 写入地址
-						wLen, 写入长度
-* 返 回 值: 返回写入起始地址
+* 函数名称: CheckDelSecter
+* 功能描述: 检查需要删除的扇区，跨扇区删除下一扇区，如果到了删除最后一个扇区，循环到起始扇区
+* 参    数: wAddr, 写入地址
+						wLen, 写入长度
+* 返 回 值: 返回写入起始地址
 *****************************************************************************************/
 uint8_t LogBuff[LOG_SAV_SIZE_MAX];
 const uint8_t SavFlag[4] ={0xAA, 0x55, 0x55, 0xAA};
 void CheckDelSecter(uint32_t wAddr, uint16_t wLen)
 {
-	uint32_t DelOffsetAddr, FindFirstLogAddr;				//存储起始地址
+	uint32_t DelOffsetAddr, FindFirstLogAddr;				//存储起始地址
 	uint32_t DelSectorNum = 0;
 	uint32_t SurplusSpace = SPIFLASH_SECTORSIZE - (wAddr % SPIFLASH_SECTORSIZE);
 	
@@ -307,7 +308,7 @@ void CheckDelSecter(uint32_t wAddr, uint16_t wLen)
 		FindFirstLogAddr = DelOffsetAddr + SPIFLASH_SECTORSIZE;
 	}
 	else {
-		if(wLen < SurplusSpace) {	//长度没有超过扇区剩余容量
+		if(wLen < SurplusSpace) {	//长度没有超过扇区剩余容量
 			SetLastLogEndAddr(wAddr + wLen);
 			return;
 		}
@@ -331,7 +332,7 @@ void CheckDelSecter(uint32_t wAddr, uint16_t wLen)
 	while(1) {
 		SpiFlashReadAnyLengthData(LogBuff, ReadAddr, LOG_SAV_SIZE_MAX);
 		int i;
-		for(i = 0; i < LOG_SAV_SIZE_MAX; i++) {
+		for(i = 0; i <= LOG_SAV_SIZE_MAX - 4; i++) {
 			if(memcmp(&LogBuff[i], SavFlag, 4) == 0) {
 				SetFirstLogStartAddr(ReadAddr + i);
 				return;;
@@ -339,7 +340,7 @@ void CheckDelSecter(uint32_t wAddr, uint16_t wLen)
 		}
 		if(i == LOG_SAV_SIZE_MAX) {
 			ReadAddr += LOG_SAV_SIZE_MAX;
-			if(ReadAddr >= SPIFLASH_SIZE) {		//找不到下一条数据，重置flash
+			if(ReadAddr >= SPIFLASH_SIZE) {		//找不到下一条数据，重置flash
 				Debug_Printf("Add LOG Error, Next Data No Find!\r\n");
 				SetLogNum(0);
 				SetLoopSavFlag(0);
@@ -380,7 +381,7 @@ void AddLog(uint8_t *wData, uint32_t wLen)
 	LogH->TimeStamp = TimeTs();
 	memcpy(&LogBuffTemp[sizeof(LogHeader_t)], wData, wLen);
 	
-	//判断是否跨扇区，跨扇区需要先擦除下一扇区
+	//判断是否跨扇区，跨扇区需要先擦除下一扇区
 	CheckDelSecter(LLEndAddr, LogSize);
 	if(LogH->LogEndAddr > SPIFLASH_SIZE) {
 		LLEndAddr = LOG_SAV_START_SECTOR * SPIFLASH_SECTORSIZE;
@@ -394,13 +395,13 @@ void AddLog(uint8_t *wData, uint32_t wLen)
 
 
 /*****************************************************************************************
-* 函数名称: ReadLog
-* 功能描述: 读取日志
-* 参    数: Header, 上一包日志头信息，连续读取时传入上一包数据信息，缩短日志遍历时间，
-										Header->LogEndAddr为0读取第一包数据,LogIdx数据无效
-						rData, 日志出口，需要释放
-						LogIdx, 读取的日志的序号，为0读取Header->LogEndAddr对应日志
-* 返 回 值: 返回数据长度
+* 函数名称: ReadLog
+* 功能描述: 读取日志
+* 参    数: Header, 上一包日志头信息，连续读取时传入上一包数据信息，缩短日志遍历时间，
+										Header->LogEndAddr为0读取第一包数据,LogIdx数据无效
+						rData, 日志出口，需要释放
+						LogIdx, 读取的日志的序号，为0读取Header->LogEndAddr对应日志
+* 返 回 值: 返回数据长度
 *****************************************************************************************/
 int ReadLog(LogHeader Header, uint8_t **rData, uint32_t LogIdx)
 {	
@@ -425,7 +426,7 @@ int ReadLog(LogHeader Header, uint8_t **rData, uint32_t LogIdx)
 	while(1) {
 		SpiFlashReadAnyLengthData((uint8_t *)Header, FSAddr, sizeof(LogHeader_t));
 		if(Header->LogSavFlag != LOG_SAV_FLAG) {
-			if((SPIFLASH_SIZE - FSAddr) < LOG_SAV_SIZE_MAX)	{	//判断是否到片尾
+			if((SPIFLASH_SIZE - FSAddr) < LOG_SAV_SIZE_MAX)	{	//判断是否到片尾
 				FSAddr = LOG_SAV_START_SECTOR * SPIFLASH_SECTOR_NUM;
 				continue;
 			}
@@ -460,15 +461,15 @@ int ReadLog(LogHeader Header, uint8_t **rData, uint32_t LogIdx)
 
 
 /*****************************************************************************************
-* 函数名称: ReadPara
-* 功能描述: 读取参数
-* 参    数: Para, 网关参数
-						ParaLen, 参数长度
-* 返 回 值: 无
+* 函数名称: ReadPara
+* 功能描述: 读取参数
+* 参    数: Para, 网关参数
+						ParaLen, 参数长度
+* 返 回 值: 无
 *****************************************************************************************/
 int ReadPara(uint8_t *Para, uint32_t ParaLen)
 {	
-	SpiFlashReadAnyLengthData(Para, GATEWEY_PARA_SAV_ADDR, ParaLen);		//读取片尾数据
+	SpiFlashReadAnyLengthData(Para, GATEWEY_PARA_SAV_ADDR, ParaLen);		//读取片尾数据
 	uint16_t Check = CRC_Modbus(0xA001, Para, ParaLen - 2);
 	GWConfigPara CfgPara = (GWConfigPara)Para;
 	if(CfgPara->crc16 != Check)
@@ -477,11 +478,11 @@ int ReadPara(uint8_t *Para, uint32_t ParaLen)
 }
 
 /*****************************************************************************************
-* 函数名称: WritePara
-* 功能描述: 写入参数
-* 参    数: Para, 网关参数
-						ParaLen, 参数长度
-* 返 回 值: 无
+* 函数名称: WritePara
+* 功能描述: 写入参数
+* 参    数: Para, 网关参数
+						ParaLen, 参数长度
+* 返 回 值: 无
 *****************************************************************************************/
 int WritePara(uint8_t *Para, uint32_t ParaLen)
 {	
@@ -490,7 +491,7 @@ int WritePara(uint8_t *Para, uint32_t ParaLen)
 	uint16_t Check = CRC_Modbus(0xA001, Para, ParaLen - 2);
 	GWConfigPara CfgPara = (GWConfigPara)Para;
 	CfgPara->crc16 = Check;
-	SpiFlashWriteAnyLengthData(Para, GATEWEY_PARA_SAV_ADDR, ParaLen);		//读取片尾数据
+	SpiFlashWriteAnyLengthData(Para, GATEWEY_PARA_SAV_ADDR, ParaLen);		//读取片尾数据
 	return 0;
 }
 

Project/GateWay/source/User/Src/utils.c

@@ -1,16 +1,16 @@
 #include "utils.h"
 
 /*
-生成多项式 (x^16 + x^15 + x^2 + 1）
+鐢熸垚澶氶」寮?(x^16 + x^15 + x^2 + 1锛?
 */
 uint16_t modbus_crc16(uint8_t* data, int length)
 {
 
-    uint16_t crc = 0xFFFF;  // 初始值FFFF
-    uint16_t polynomial = 0x8005;  // 多项式8005
+    uint16_t crc = 0xFFFF;  // 鍒濆鍊糉FFF
+    uint16_t polynomial = 0x8005;  // 澶氶」寮?005
 
     for (int  i = 0; i < length; i++) {
-        // 输入反转(REFIN)：对每个字节进行位反转
+        // 杈撳叆鍙嶈浆(REFIN)锛氬姣忎釜瀛楄妭杩涜浣嶅弽杞?
         uint8_t byte = data[i];
         uint8_t reversed_byte = 0;
 
@@ -19,10 +19,10 @@ uint16_t modbus_crc16(uint8_t* data, int length)
             byte >>= 1;
         }
 
-        crc ^= (reversed_byte << 8);  // 与高字节异或
+        crc ^= (reversed_byte << 8);  // 涓庨珮瀛楄妭寮傛垨
 
         for (int j = 0; j < 8; j++) {
-            if (crc & 0x8000) {  // 检查最高位
+            if (crc & 0x8000) {  // 妫€鏌ユ渶楂樹綅
                 crc = (crc << 1) ^ polynomial;
             } else {
                 crc <<= 1;
@@ -30,7 +30,7 @@ uint16_t modbus_crc16(uint8_t* data, int length)
         }
     }
 
-    // 输出反转(REFOUT)：对16位CRC结果进行位反转
+    // 杈撳嚭鍙嶈浆(REFOUT)锛氬16浣岰RC缁撴灉杩涜浣嶅弽杞?
     uint16_t reversed_crc = 0;
 
     for (int i = 0; i < 16; i++) {
@@ -38,6 +38,6 @@ uint16_t modbus_crc16(uint8_t* data, int length)
         crc >>= 1;
     }
 
-    // 结果异或值(XOROUT)：0000（实际不变）
+    // 缁撴灉寮傛垨鍊?XOROUT)锛?000锛堝疄闄呬笉鍙橈級
     return reversed_crc ^ 0x0000;
 }

README_BACKUP_377.md

@@ -0,0 +1,8 @@
+<<<<<<< HEAD
+# GateWay
+
+一代网关
+=======
+# LaserTracing_Debug
+
+>>>>>>> aaff1aeec5ea03de83eee8888e10da1bf6a62ded

README_BACKUP_442.md

@@ -0,0 +1,8 @@
+<<<<<<< HEAD
+# GateWay
+
+一代网关
+=======
+# LaserTracing_Debug
+
+>>>>>>> aaff1aeec5ea03de83eee8888e10da1bf6a62ded

README_LOCAL_377.md

@@ -0,0 +1,3 @@
+# GateWay
+
+一代网关

README_LOCAL_442.md

@@ -0,0 +1,3 @@
+# GateWay
+
+一代网关

README_REMOTE_377.md

@@ -0,0 +1,2 @@
+# LaserTracing_Debug
+

README_REMOTE_442.md

@@ -0,0 +1,2 @@
+# LaserTracing_Debug
+

temp.py

@@ -0,0 +1 @@
+old=b"b'\xb7\xb5\xbb\xd8\xd6\xb5,\xd5\xe2\xc0\xef\xbc\xf2\xb5\xa5\xb5\xc8\xb4\xfd\xba\xf3\xbc\xcc\xd0\xf8 */\r\n\t}\r\n\tCAT1_DBG_LOG("ETH Init check done");\r\n\r\n\t/* \xb2\xbd\xd6\xe81: \xd2\xbb\xb4\xce\xd0\xd4\xd0\xb4\xc8\xeb\xb4\xd30x00\xbf\xaa\xca\xbc\xb5\xc4\xcd\xf8\xc2\xe7\xb2\xce\xca\xfd(LocalIP~WorkMode, \xb9\xb20x15\xd7\xd6\xbd\xda)\r\n\t * \xc6\xab\xd2\xc60x00~0x14: LocalIP(4) + NetMask(4) + Gateway(4) + DestIP(4) + LocalPort(2) + DestPort(2) + WorkMode(1)\r\n\t */\r\n\tidx = 0;\r\n\tcmdBuf[idx++] = 0xED; cmdBuf[idx++] = 0xF2; cmdBuf[idx++] = 0xA3; cmdBuf[idx++] = 0x56;\r\n\tcmdBuf[idx++] = 0xCA; cmdBuf[idx++] = 0xDB; cmdBuf[idx++] = 0x91; cmdBuf[idx++] = 0x84;\r\n\tcmdBuf[idx++] = 0xB0; cmdBuf[idx++] = 0xD7;\r\n\tcmdBuf[idx++] = 0x03;   /* \xc3\xfc\xc1\xee\xc0\xe0\xd0\xcd: \xd0\xb4\xb2\xce\xca\xfd\xb2\xa2\xb1\xa3\xb4\xe6\xb5\xbdFlash */\r\n\tcmdBuf[idx++] = 0x00;   /* \xc6\xab\xd2\xc6: 0x00 */\r\n\tcmdBuf[idx++] = 0x15;   /* \xb3\xa4\xb6\xc8: 21\xd7\xd6\xbd\xda */\r\n\r\n\t/* Local IP */\r\n\tcmdBuf[idx++] = pCfg->EthNet.IpAddr[0];\r\n\tcmdBuf[idx++] = pCfg->EthNet.IpAddr[1];\r\n\tcmdBuf[idx++] = pCfg->EthNet.IpAddr[2];\r\n\tcmdBuf[idx++] = pCfg->EthNet.IpAddr[3];\r\n\t/* Net Mask */\r\n\tcmdBuf[idx++] = pCfg->EthNet.SubnetMask[0];\r\n\tcmdBuf[idx++] = pCfg->EthNet.SubnetMask[1];\r\n\tcmdBuf[idx++] = pCfg->EthNet.SubnetMask[2];\r\n\tcmdBuf[idx++] = pCfg->EthNet.SubnetMask[3];\r\n\t/* Gateway */\r\n\tcmdBuf[idx++] = pCfg->EthNet.Gateway[0];\r\n\tcmdBuf[idx++] = pCfg->EthNet.Gateway[1];\r\n\tcmdBuf[idx++] = pCfg->EthNet.Gateway[2];\r\n\tcmdBuf[idx++] = pCfg->EthNet.Gateway[3];\r\n\t/* Dest IP */\r\n\tcmdBuf[idx++] = pCfg->EthNet.DestIp[0];\r\n\tcmdBuf[idx++] = pCfg->EthNet.DestIp[1];\r\n\tcmdBuf[idx++] = pCfg->EthNet.DestIp[2];\r\n\tcmdBuf[idx++] = pCfg->EthNet.DestIp[3];\r\n\t/* Local Port (\xb4\xf3\xb6\xcb) */\r\n\tcmdBuf[idx++] = (uint8_t)(pCfg->EthNet.IpPort >> 8);\r\n\tcmdBuf[idx++] = (uint8_t)(pCfg->EthNet.IpPort & 0xFF);\r\n\t/* Dest Port (\xb4\xf3\xb6\xcb) */\r\n\tcmdBuf[idx++] = (uint8_t)(pCfg->EthNet.DestPort >> 8);\r\n\tcmdBuf[idx++] = (uint8_t)(pCfg->EthNet.DestPort & 0xFF);\r\n\t/* Work Mode: 0=TCP Server, 1=TCP Client, 2=UDP */\r\n\tif(pCfg->EthNet.WorkMode == ETH_MODE_TCP_SERVER) {\r\n\t\tcmdBuf[idx++] = 0x00;\r\n\t} else if(pCfg->EthNet.WorkMode == ETH_MODE_TCP_CLIENT) {\r\n\t\tcmdBuf[idx++] = 0x01;\r\n\t} else {\r\n\t\tcmdBuf[idx++] = 0x02;\r\n\t}\r\n\r\n\tCAT1_DBG_LOG("ETH Write IP/Mode, len=%d", idx);\r\n'"