Эх сурвалжийг харах

2019-12-27 / Folus Wen

Actions:
1. Module_Wifi.c reduce duplicate debug output info.

Files:
1. As follow commit history
FolusWen 5 жил өмнө
parent
commit
c7b9612427

BIN
EVSE/Modularization/Module_Wifi


+ 24 - 5
EVSE/Modularization/Module_Wifi.c

@@ -80,6 +80,12 @@ struct interface_info
 	char staticIPAddr[24];
 }Wifi;
 
+struct Display_Request
+{
+	unsigned char isShowed_IF_info:1;
+	unsigned char isShowed_IP_info:1;
+}dispReq;
+
 struct auth_info
 {
 	int auth_type;
@@ -209,6 +215,7 @@ int InitShareMemory()
 //==========================================
 void getParameters(void)
 {
+	DEBUG_INFO("============= Configuration ===============\r\n");
 	strcpy((char*)Wifi_A.ssid, (const char*)ShmSysConfigAndInfo->SysConfig.AthInterface.WifiSsid);
 	DEBUG_INFO("Wifi SSID: %s\n", Wifi_A.ssid);
 	strcpy((char*)Wifi_A.passwd, (const char*)ShmSysConfigAndInfo->SysConfig.AthInterface.WifiPassword);
@@ -218,6 +225,7 @@ void getParameters(void)
 	DEBUG_INFO("Wifi Static IP: %s\n", Wifi.staticIPAddr);
 	Wifi.ipType = ShmSysConfigAndInfo->SysConfig.AthInterface.WifiDhcpClient;
 	DEBUG_INFO("DHCP client flag: %d\n", Wifi.ipType);
+	DEBUG_INFO("===========================================\r\n");
 }
 
 //==========================================
@@ -358,10 +366,20 @@ int getInterfaceInfo()
 	}
 	pclose(fp);
 
-	DEBUG_INFO("MAC: %s\n", Wifi.currentMAC);
-	DEBUG_INFO("IP address: %s\n", Wifi.currentIPAddr);
-	DEBUG_INFO("Net mask: %s\n", Wifi.currentNetmask);
-	DEBUG_INFO("Default gateway: %s\n", Wifi.currentGateway);
+	if(!dispReq.isShowed_IF_info)
+	{
+		DEBUG_INFO("MAC: %s\n", Wifi.currentMAC);
+		dispReq.isShowed_IF_info = true;
+	}
+
+	if(!dispReq.isShowed_IP_info)
+	{
+		DEBUG_INFO("IP address: %s\n", Wifi.currentIPAddr);
+		DEBUG_INFO("Net mask: %s\n", Wifi.currentNetmask);
+		DEBUG_INFO("Default gateway: %s\n", Wifi.currentGateway);
+		dispReq.isShowed_IP_info = true;
+	}
+
 
 	strcpy((char*)ShmSysConfigAndInfo->SysConfig.AthInterface.WifiIpAddress, (const char*)Wifi.currentIPAddr);
 	strcpy((char*)ShmSysConfigAndInfo->SysConfig.AthInterface.WifiSubmaskAddress, (const char*)Wifi.currentNetmask);
@@ -859,6 +877,7 @@ void proc_sta()
 	switch(Wifi_module_sts)
 	{
 		case STA_STATE_INIT:
+			dispReq.isShowed_IF_info = false;
 			// get info from shared memory
 			getParameters();
 
@@ -881,7 +900,7 @@ void proc_sta()
 			}
 			break;
 		case STA_STATE_DEVICE_DETECT:
-
+			dispReq.isShowed_IP_info = false;
 			if(!isSetWPA_OK && (setWPAconf() == PASS))
 			{
 				isSetWPA_OK = true;

BIN
EVSE/Modularization/OcppBackend


BIN
EVSE/rootfs/root/Module_Wifi


BIN
EVSE/rootfs/root/OcppBackend