feat(debug): 新增 up 上传网关状态和 reg 重新注册命令

1.  修正所有RS485通道配置结构体的成员命名错误，将CUData改为CUPara
2.  新增bsp头文件引用，补充ETHStop、ETHReset相关调用
3.  调整通信切换时的服务器注册标志重置与外设复位逻辑

DebugCmd.c

@@ -1,4 +1,5 @@
 #include "main.h"
+#include "bsp.h"
 #include "CatOneTask.h"
 #include "RS485Task.h"
 #include "Public.h"
@@ -301,9 +302,9 @@ void DebugCmdRS485Ctrl(int argc, char *argv[])
 				if(idx == 1) {
 					GateWay->ConfigPara.Rs485Ch1.CommUnitEnable = true;
 					GateWay->ConfigPara.Rs485Ch1.QuerySensorFlag = true;
-					GateWay->ConfigPara.Rs485Ch1.CUData.Para.SensorN = 0;
+					GateWay->ConfigPara.Rs485Ch1.CUPara.Para.SensorN = 0;
-					memset(GateWay->ConfigPara.Rs485Ch1.CUData.Para.SensorType, 0x00, SENSOR_NUM_MAX * 2);
+					memset(GateWay->ConfigPara.Rs485Ch1.CUPara.Para.SensorType, 0x00, SENSOR_NUM_MAX * 2);
-					GateWay->ConfigPara.Rs485Ch1.CUData.Para.CommStatus = true;
+					GateWay->ConfigPara.Rs485Ch1.CUPara.Para.CommStatus = true;
 					RS485Ch1_Config(9600);
 					GateWay->ConfigPara.Rs485Ch1.BaudRate = 9600;
 					SComm1Para.SensorCnt = 0;
@@ -311,9 +312,9 @@ void DebugCmdRS485Ctrl(int argc, char *argv[])
 				else if(idx == 2) {
 					GateWay->ConfigPara.Rs485Ch2.CommUnitEnable = true;
 					GateWay->ConfigPara.Rs485Ch2.QuerySensorFlag = true;
-					GateWay->ConfigPara.Rs485Ch2.CUData.Para.SensorN = 0;
+					GateWay->ConfigPara.Rs485Ch2.CUPara.Para.SensorN = 0;
-					memset(GateWay->ConfigPara.Rs485Ch2.CUData.Para.SensorType, 0x00, SENSOR_NUM_MAX * 2);
+					memset(GateWay->ConfigPara.Rs485Ch2.CUPara.Para.SensorType, 0x00, SENSOR_NUM_MAX * 2);
-					GateWay->ConfigPara.Rs485Ch2.CUData.Para.CommStatus = true;
+					GateWay->ConfigPara.Rs485Ch2.CUPara.Para.CommStatus = true;
 					RS485Ch2_Config(9600);
 					GateWay->ConfigPara.Rs485Ch2.BaudRate = 9600;
 					SComm2Para.SensorCnt = 0;
@@ -323,11 +324,11 @@ void DebugCmdRS485Ctrl(int argc, char *argv[])
 			else if(strstr(argv[3], "off") != NULL){
 				if(idx == 1) {
 					GateWay->ConfigPara.Rs485Ch1.CommUnitEnable = false;
-					GateWay->ConfigPara.Rs485Ch1.CUData.Para.CommStatus = false;
+					GateWay->ConfigPara.Rs485Ch1.CUPara.Para.CommStatus = false;
 				}
 				else if(idx == 2) {
 					GateWay->ConfigPara.Rs485Ch2.CommUnitEnable = false;
-					GateWay->ConfigPara.Rs485Ch2.CUData.Para.CommStatus = false;
+					GateWay->ConfigPara.Rs485Ch2.CUPara.Para.CommStatus = false;
 				}
 				DBG_LOG("RS485Ch%d Disable!\r\n", idx);
 			}
@@ -475,10 +476,10 @@ void DebugCmdLsCommUnit(int argc, char *argv[])
 	if(GateWay->ConfigPara.Rs485Ch1.CommUnitEnable == true) {
 		DBG_LOG("DevType: 8001\r\n");
 		DBG_LOG("DevMac: 01-80-02-00-00-01\r\n");
-		DBG_LOG("SensorNum: %d\r\n", GateWay->ConfigPara.Rs485Ch1.CUData.Para.SensorN);
+		DBG_LOG("SensorNum: %d\r\n", GateWay->ConfigPara.Rs485Ch1.CUPara.Para.SensorN);
 		DBG_LOG("SensorType: ");
-		for(int i = 0; i < GateWay->ConfigPara.Rs485Ch1.CUData.Para.SensorN; i++) {
+		for(int i = 0; i < GateWay->ConfigPara.Rs485Ch1.CUPara.Para.SensorN; i++) {
-			DBG_LOG("%04X ", GateWay->ConfigPara.Rs485Ch1.CUData.Para.SensorType[i]);
+			DBG_LOG("%04X ", GateWay->ConfigPara.Rs485Ch1.CUPara.Para.SensorType[i]);
 		}
 		DBG_LOG("\r\n\r\n");
 	}
@@ -486,10 +487,10 @@ void DebugCmdLsCommUnit(int argc, char *argv[])
 	if(GateWay->ConfigPara.Rs485Ch2.CommUnitEnable == true) {
 		DBG_LOG("DevType: 8002\r\n");
 		DBG_LOG("DevMac: 01-80-02-00-00-02\r\n");
-		DBG_LOG("SensorNum: %d\r\n", GateWay->ConfigPara.Rs485Ch2.CUData.Para.SensorN);
+		DBG_LOG("SensorNum: %d\r\n", GateWay->ConfigPara.Rs485Ch2.CUPara.Para.SensorN);
 		DBG_LOG("SensorType: ");
-		for(int i = 0; i < GateWay->ConfigPara.Rs485Ch2.CUData.Para.SensorN; i++) {
+		for(int i = 0; i < GateWay->ConfigPara.Rs485Ch2.CUPara.Para.SensorN; i++) {
-			DBG_LOG("%04X ", GateWay->ConfigPara.Rs485Ch2.CUData.Para.SensorType[i]);
+			DBG_LOG("%04X ", GateWay->ConfigPara.Rs485Ch2.CUPara.Para.SensorType[i]);
 		}
 		DBG_LOG("\r\n\r\n");
 	}
@@ -643,7 +644,7 @@ void DebugCmdLsExclCommUnit(int argc, char *argv[])
 	for(int i = 0; i < COMMUNIT_NUM_MAX; i++) {
 		if(GateWay->ConfigPara.ExclCommUnit[i].ExclFlag == true) {
 			CUCnt++;
-			DBG_LOG("DevMac: %02X-%02X-%02X-%02X-%02X-%02X\r\n", 
+			DBG_LOG("Exclude DevMac: %02X-%02X-%02X-%02X-%02X-%02X\r\n", 
 							GateWay->ConfigPara.ExclCommUnit[i].ExclMac[0], 
 							GateWay->ConfigPara.ExclCommUnit[i].ExclMac[1], 
 							GateWay->ConfigPara.ExclCommUnit[i].ExclMac[2],
@@ -678,7 +679,9 @@ void DebugCmdSetComm(int argc, char *argv[])
 	}
 	
 	if(strcmp(argv[1], "cat1") == 0) {
+		GateWay->SvrRegFlag = false;
 		GateWay->ConfigPara.Comm = CATONE_COMM;
+		ETHStop();
 		CAT1_ON();
 		CatOneReset();
 		DBG_LOG("Set the communication method to Cat1.\r\n");
@@ -692,12 +695,12 @@ void DebugCmdSetComm(int argc, char *argv[])
 			rt_thread_delay(3000);
 			CAT1_PWR_KEY_SET();
 		}
-	
+		GateWay->SvrRegFlag = false;
 		GateWay->ConfigPara.Comm = ETH_COMM;
 		ETH_ON();
+		ETHReset();
 		WritePara((uint8_t *)&GateWay->ConfigPara, sizeof(GWConfigPara_t));
 	}
-	
 }
 
 /*****************************************************************************************
@@ -900,6 +903,76 @@ void DebugCmdRestoreFactory(int argc, char *argv[])
 	while(1);
 }
 
+/*****************************************************************************************
+* 函数名称: DebugCmdUpload
+* 功能描述: 上传当前网关状态
+* 参    数: argc, 输入参数数量
+						argv, 输入参数
+* 返 回 值: 无
+*****************************************************************************************/
+static void DebugCmdUpload(int argc, char *argv[])
+{
+	DBG_LOG("\r\n");
+	if(strcmp(argv[1], "?") == 0) {
+		DBG_LOG("Debug Cmd: up\r\n");
+		DBG_LOG("  brief --> Upload current gateway status to server.\r\n\r\n");
+		return;
+	}
+
+	if(GateWay->SvrRegFlag == false) {
+		DBG_LOG("Server not registered, please register first.\r\n");
+		return;
+	}
+
+	uint8_t MegData[6];
+	uint8_t len = sizeof(GateWayAlarmType_t);
+	MegData[0] = len & 0x00ff;
+	MegData[1] = (len >> 8) & 0x00ff;
+	MegData[2] = NET_COMM_CMD_ALARM;
+
+	MegData[3] = 0x00;
+	MegData[4] = GateWay->ConfigPara.OutageFlag ? 1 : 0;
+	MegData[5] = GateWay->Battery;
+
+	if(CatOneEthSendQueue(MegData, 6) == true) {
+		DBG_LOG("Gateway status uploaded.\r\n");
+	}
+	else {
+		DBG_LOG("Gateway status upload failed.\r\n");
+	}
+}
+
+/*****************************************************************************************
+* 函数名称: DebugCmdRegister
+* 功能描述: 重新向上位机发起注册
+* 参    数: argc, 输入参数数量
+						argv, 输入参数
+* 返 回 值: 无
+*****************************************************************************************/
+static void DebugCmdRegister(int argc, char *argv[])
+{
+	DBG_LOG("\r\n");
+	if(strcmp(argv[1], "?") == 0) {
+		DBG_LOG("Debug Cmd: reg\r\n");
+		DBG_LOG("  brief --> Re-register to the server.\r\n\r\n");
+		return;
+	}
+
+	GateWay->SvrRegFlag = false;
+
+	if(GateWay->ConfigPara.Comm == CATONE_COMM) {
+		CatOneTriggerRegister();
+		DBG_LOG("Trigger Cat1 re-registration immediately.\r\n");
+	}
+	else if(GateWay->ConfigPara.Comm == ETH_COMM) {
+		ETHTriggerRegister();
+		DBG_LOG("Trigger ETH re-registration immediately.\r\n");
+	}
+	else {
+		DBG_LOG("Unknown communication type.\r\n");
+	}
+}
+
 /*****************************************************************************************
 * 函数名称: DebugCmdRestoreFactory
 * 功能描述: 恢复出厂设置
@@ -1051,15 +1124,15 @@ void DebugCmdQuerySensor(int argc, char *argv[])
 	if(GateWay->ConfigPara.Rs485Ch1.Enable == true && GateWay->ConfigPara.Rs485Ch1.CommUnitEnable == true) {
 		DBG_LOG("Query Rs485Ch1...\r\n");
 		GateWay->ConfigPara.Rs485Ch1.QuerySensorFlag = true;
-		GateWay->ConfigPara.Rs485Ch1.CUData.Para.SensorN = 0;
+		GateWay->ConfigPara.Rs485Ch1.CUPara.Para.SensorN = 0;
-		memset(GateWay->ConfigPara.Rs485Ch1.CUData.Para.SensorType, 0x00, sizeof(GateWay->ConfigPara.Rs485Ch1.CUData.Para.SensorType));
+		memset(GateWay->ConfigPara.Rs485Ch1.CUPara.Para.SensorType, 0x00, sizeof(GateWay->ConfigPara.Rs485Ch1.CUPara.Para.SensorType));
 		SComm1Para.SensorCnt = 0;
 	}
 	if(GateWay->ConfigPara.Rs485Ch2.Enable == true && GateWay->ConfigPara.Rs485Ch2.CommUnitEnable == true) {
 		DBG_LOG("Query Rs485Ch2...\r\n");
 		GateWay->ConfigPara.Rs485Ch2.QuerySensorFlag = true;
-		GateWay->ConfigPara.Rs485Ch2.CUData.Para.SensorN = 0;
+		GateWay->ConfigPara.Rs485Ch2.CUPara.Para.SensorN = 0;
-		memset(GateWay->ConfigPara.Rs485Ch2.CUData.Para.SensorType, 0x00, sizeof(GateWay->ConfigPara.Rs485Ch2.CUData.Para.SensorType));
+		memset(GateWay->ConfigPara.Rs485Ch2.CUPara.Para.SensorType, 0x00, sizeof(GateWay->ConfigPara.Rs485Ch2.CUPara.Para.SensorType));
 		SComm2Para.SensorCnt = 0;
 	}
 }
@@ -1252,17 +1325,17 @@ static void DebugCmdGetPara(int argc, char *argv[])
 	DBG_LOG("Svr Port: %d\r\n", GateWay->ConfigPara.SvrPort);
 	DBG_LOG("Register Status: %d\r\n", GateWay->SvrRegFlag);
 	DBG_LOG("RS485Ch1 Mac: %02X-%02X-%02X-%02X-%02X-%02X\r\n",
-					GateWay->ConfigPara.Rs485Ch1.CUData.Para.Mac[0][0],GateWay->ConfigPara.Rs485Ch1.CUData.Para.Mac[0][1],
+					GateWay->ConfigPara.Rs485Ch1.CUPara.Para.Mac[0][0],GateWay->ConfigPara.Rs485Ch1.CUPara.Para.Mac[0][1],
-					GateWay->ConfigPara.Rs485Ch1.CUData.Para.Mac[0][2],GateWay->ConfigPara.Rs485Ch1.CUData.Para.Mac[0][3],
+					GateWay->ConfigPara.Rs485Ch1.CUPara.Para.Mac[0][2],GateWay->ConfigPara.Rs485Ch1.CUPara.Para.Mac[0][3],
-					GateWay->ConfigPara.Rs485Ch1.CUData.Para.Mac[0][4],GateWay->ConfigPara.Rs485Ch1.CUData.Para.Mac[0][5]);
+					GateWay->ConfigPara.Rs485Ch1.CUPara.Para.Mac[0][4],GateWay->ConfigPara.Rs485Ch1.CUPara.Para.Mac[0][5]);
 	DBG_LOG("RS485Ch1: %s, ", (GateWay->ConfigPara.Rs485Ch1.Enable == true) ? "Enable" : "Disable");
 	DBG_LOG("InCommUnit %s, ", (GateWay->ConfigPara.Rs485Ch1.CommUnitEnable == true) ? "Enable" : "Disable");
 	DBG_LOG("Vout %s, ", (GateWay->ConfigPara.Rs485Ch1.Power == true) ? "Enable" : "Disable");
 	DBG_LOG("Baudrate %d\r\n", GateWay->ConfigPara.Rs485Ch1.BaudRate);
 	DBG_LOG("RS485Ch2 Mac: %02X-%02X-%02X-%02X-%02X-%02X\r\n",
-					GateWay->ConfigPara.Rs485Ch2.CUData.Para.Mac[0][0],GateWay->ConfigPara.Rs485Ch2.CUData.Para.Mac[0][1],
+					GateWay->ConfigPara.Rs485Ch2.CUPara.Para.Mac[0][0],GateWay->ConfigPara.Rs485Ch2.CUPara.Para.Mac[0][1],
-					GateWay->ConfigPara.Rs485Ch2.CUData.Para.Mac[0][2],GateWay->ConfigPara.Rs485Ch2.CUData.Para.Mac[0][3],
+					GateWay->ConfigPara.Rs485Ch2.CUPara.Para.Mac[0][2],GateWay->ConfigPara.Rs485Ch2.CUPara.Para.Mac[0][3],
-					GateWay->ConfigPara.Rs485Ch2.CUData.Para.Mac[0][4],GateWay->ConfigPara.Rs485Ch2.CUData.Para.Mac[0][5]);
+					GateWay->ConfigPara.Rs485Ch2.CUPara.Para.Mac[0][4],GateWay->ConfigPara.Rs485Ch2.CUPara.Para.Mac[0][5]);
 	DBG_LOG("RS485Ch2: %s, ", (GateWay->ConfigPara.Rs485Ch2.Enable == true) ? "Enable" : "Disable");
 	DBG_LOG("InCommUnit %s, ", (GateWay->ConfigPara.Rs485Ch2.CommUnitEnable == true) ? "Enable" : "Disable");
 	DBG_LOG("Vout %s, ", (GateWay->ConfigPara.Rs485Ch2.Power == true) ? "Enable" : "Disable");
@@ -1359,7 +1432,7 @@ static void DebugCmdCali(int argc, char *argv[])
 		return;
 	}
 	
-	if(memcmp(mac, GateWay->ConfigPara.Rs485Ch1.CUData.Para.Mac[0], 6) == 0) {
+	if(memcmp(mac, GateWay->ConfigPara.Rs485Ch1.CUPara.Para.Mac[0], 6) == 0) {
 		if(!GateWay->ConfigPara.Rs485Ch1.Enable || !GateWay->ConfigPara.Rs485Ch1.CommUnitEnable) {
 			DBG_LOG("Internal communication unit 1 is turned off!\r\n");
 			return;
@@ -1369,7 +1442,7 @@ static void DebugCmdCali(int argc, char *argv[])
 		return;
 	}
 	
-	if(memcmp(mac, GateWay->ConfigPara.Rs485Ch2.CUData.Para.Mac[0], 6) == 0) {
+	if(memcmp(mac, GateWay->ConfigPara.Rs485Ch2.CUPara.Para.Mac[0], 6) == 0) {
 		if(!GateWay->ConfigPara.Rs485Ch2.Enable || !GateWay->ConfigPara.Rs485Ch2.CommUnitEnable) {
 			DBG_LOG("Internal communication unit 2 is turned off!\r\n");
 			return;
@@ -1458,7 +1531,7 @@ static void DebugLaserConfig(int argc, char *argv[])
 	
 	if(strcmp(argv[2], "on") == 0 || strcmp(argv[2], "off") == 0)
 	{
-		if(memcmp(mac, GateWay->ConfigPara.Rs485Ch1.CUData.Para.Mac[0], 6) == 0) {
+		if(memcmp(mac, GateWay->ConfigPara.Rs485Ch1.CUPara.Para.Mac[0], 6) == 0) {
 			if(!GateWay->ConfigPara.Rs485Ch1.Enable || !GateWay->ConfigPara.Rs485Ch1.CommUnitEnable) {
 				DBG_LOG("Internal communication unit 1 is turned off!\r\n");
 				return;
@@ -1468,7 +1541,7 @@ static void DebugLaserConfig(int argc, char *argv[])
 			return;
 		}
 	
-		if(memcmp(mac, GateWay->ConfigPara.Rs485Ch2.CUData.Para.Mac[0], 6) == 0) {
+		if(memcmp(mac, GateWay->ConfigPara.Rs485Ch2.CUPara.Para.Mac[0], 6) == 0) {
 			if(!GateWay->ConfigPara.Rs485Ch2.Enable || !GateWay->ConfigPara.Rs485Ch2.CommUnitEnable) {
 				DBG_LOG("Internal communication unit 2 is turned off!\r\n");
 				return;
@@ -1848,6 +1921,14 @@ void DebugCmdHelp(int argc, char *argv[])
 	len = strlen("reboot ?\r\n");
 	memcpy(Data, "reboot ?\r\n", len);
 	DebugAnalyze(GateWay, Data, len);
+
+	len = strlen("up ?\r\n");
+	memcpy(Data, "up ?\r\n", len);
+	DebugAnalyze(GateWay, Data, len);
+
+	len = strlen("reg ?\r\n");
+	memcpy(Data, "reg ?\r\n", len);
+	DebugAnalyze(GateWay, Data, len);
 }
 
 const DBGFunType DebugFun[DEBUG_CMD_CNT] = {
@@ -1877,4 +1958,6 @@ const DBGFunType DebugFun[DEBUG_CMD_CNT] = {
 	"lpcfg",			DebugCmdLPConfig,
 	"lora",				DebugLoraConfig,
 	"reboot",			DebugCmdReboot,
+	"up",				  DebugCmdUpload,
+	"reg",				DebugCmdRegister,
 };