2020-06-29 / Eason Yang

1.Change : Module_Wifi.c
Reason :
a) Remove : DEBUG_INFO print out
b) Rename : Version D0.05

EVSE/Modularization/Module_Wifi.c

@@ -2,9 +2,9 @@
  *  Module_Wifi.c
  *
  *  Created on: 2020-01-14
- *  Update on: 2020-06-18
+ *  Update on: 2020-06-29
  *  Author: Jerry Wang, Eason Yang, Folus Wen
- *  Version: D0.04
+ *  Version: D0.05
  */
 
 #include 	<sys/time.h>
@@ -2222,8 +2222,6 @@ int tcpSocketServerStart(void)
 
 						break;
 					case WIFI_CMD_PROTOCOL_VERSION:
-						DEBUG_INFO("WIFI_CMD_PROTOCOL_VERSION...\r\n");
-						
 						tx_size = 12;
 						outBuffer[0]  = 0xff;
 						outBuffer[1]  = 0xff;
@@ -2237,14 +2235,9 @@ int tcpSocketServerStart(void)
 						outBuffer[9]  = (protocol_Version[2] >> 0x00) & 0xff;
 						outBuffer[10] = (protocol_Version[2] >> 0x08) & 0xff;
 						outBuffer[11] = chksumCal(outBuffer);
-						
-						for(uint8_t count = 0;count< tx_size;count++)  
-							DEBUG_INFO("outBuffer[%d] : %X...\r\n",count, outBuffer[count]);
-					
+
 						break;
 					case WIFI_CMD_GET_MODEL_NAME:
-						DEBUG_INFO("WIFI_CMD_GET_MODEL_NAME...\r\n");
-						
 						tx_size = 70;
 						outBuffer[0] = 0xff;
 						outBuffer[1] = 0xff;
@@ -2256,8 +2249,6 @@ int tcpSocketServerStart(void)
 						
 						break;
 					case WIFI_CMD_GET_SERIAL_NUMBER:
-						DEBUG_INFO("WIFI_CMD_GET_SERIAL_NUMBER...\r\n");
-						
 						tx_size = 70;
 						outBuffer[0] = 0xff;
 						outBuffer[1] = 0xff;
@@ -2269,8 +2260,6 @@ int tcpSocketServerStart(void)
 						
 						break;
 					case WIFI_CMD_GET_SYSTEM_TIME:
-						DEBUG_INFO("WIFI_CMD_GET_SYSTEM_TIME...\r\n");
-					
 						tx_size = 10;
 						outBuffer[0] = 0xff;
 						outBuffer[1] = 0xff;
@@ -2285,8 +2274,6 @@ int tcpSocketServerStart(void)
 						
 						break;
 					case WIFI_CMD_GET_WHITE_CARD:
-						DEBUG_INFO("WIFI_CMD_GET_WHITE_CARD...\r\n");
-						
 						tx_size = 40;
 						outBuffer[0] = 0xff;
 						outBuffer[1] = 0xff;
@@ -2300,8 +2287,6 @@ int tcpSocketServerStart(void)
 
 						break;
 					case WIFI_CMD_GET_SYS_ALARM_CODE:
-						DEBUG_INFO("WIFI_CMD_GET_SYS_ALARM_CODE...\r\n");
-						
 						tx_size = 70;
 						outBuffer[0] = 0xff;
 						outBuffer[1] = 0xff;
@@ -2315,8 +2300,6 @@ int tcpSocketServerStart(void)
 
 						break;
 					case WIFI_CMD_GET_SYS_ID:
-						DEBUG_INFO("WIFI_CMD_GET_SYS_ID...\r\n");
-						
 						tx_size = 70;
 						outBuffer[0] = 0xff;
 						outBuffer[1] = 0xff;
@@ -2328,8 +2311,6 @@ int tcpSocketServerStart(void)
 
 						break;
 					case WIFI_CMD_GET_RATING_CURRENT:
-						DEBUG_INFO("WIFI_CMD_GET_RATING_CURRENT...\r\n");
-						
 						tx_size = 10;
 						outBuffer[0] = 0xff;
 						outBuffer[1] = 0xff;
@@ -2341,10 +2322,7 @@ int tcpSocketServerStart(void)
 						outBuffer[7] = (ShmSysConfigAndInfo->SysConfig.AcRatingCurrent>>0x08) & 0xff;
 						outBuffer[8] = (ShmSysConfigAndInfo->SysConfig.AcRatingCurrent>>0x00) & 0xff;
 						outBuffer[9] = chksumCal(outBuffer);
-						
-						for(uint8_t count = 0;count< tx_size;count++)  
-							DEBUG_INFO("outBuffer[%d] : %X...\r\n",count, outBuffer[count]);
-					
+											
 						break;
 					case WIFI_CMD_GET_VER_RFS:
 						tx_size = 38;
@@ -2448,8 +2426,6 @@ int tcpSocketServerStart(void)
 						
 						break;
 					case WIFI_CMD_GET_EVSE_CONFIG:
-						DEBUG_INFO("WIFI_CMD_GET_EVSE_CONFIG...\r\n");
-						
 						tx_size = 16;
 						outBuffer[0]  = 0xff;
 						outBuffer[1]  = 0xff;
@@ -2467,14 +2443,9 @@ int tcpSocketServerStart(void)
 						outBuffer[13] = (ShmSysConfigAndInfo->SysConfig.AcMaxChargingCurrent>>0x08) & 0xff;
 						outBuffer[14] = (ShmSysConfigAndInfo->SysConfig.AcMaxChargingCurrent>>0x00) & 0xff;
 						outBuffer[15] = chksumCal(outBuffer);
-						
-						for(uint8_t count = 0;count< tx_size;count++)  
-							DEBUG_INFO("outBuffer[%d] : %X...\r\n",count, outBuffer[count]);
 
 						break;
 					case WIFI_CMD_GET_GUN_STS:
-						DEBUG_INFO("WIFI_CMD_GET_GUN_STS...\r\n");
-						
 						tx_size = 21;
 						outBuffer[0] = 0xff;
 						outBuffer[1] = 0xff;
@@ -2485,13 +2456,8 @@ int tcpSocketServerStart(void)
 						getConnectorInfo(inputBuffer[9], outBuffer);
 						outBuffer[20] = chksumCal(outBuffer);
 						
-						for(uint8_t count = 0;count< tx_size;count++)  
-							DEBUG_INFO("outBuffer[%d] : %X...\r\n",count, outBuffer[count]);
-
 						break;
 					case WIFI_CMD_GET_GUN_USER:
-						DEBUG_INFO("WIFI_CMD_GET_GUN_USER...\r\n");
-						
 						tx_size = 40;
 						outBuffer[0] = 0xff;
 						outBuffer[1] = 0xff;
@@ -2502,13 +2468,8 @@ int tcpSocketServerStart(void)
 						getConnectorUser(inputBuffer[9], outBuffer);
 						outBuffer[39] = chksumCal(outBuffer);
 						
-						for(uint8_t count = 0;count< tx_size;count++)  
-							DEBUG_INFO("outBuffer[%d] : %X...\r\n",count, outBuffer[count]);
-						
 						break;
 					case WIFI_CMD_GET_SCHEDULE:
-						DEBUG_INFO("WIFI_CMD_GET_SCHEDULE...\r\n");
-					
 						tx_size = 10;
 						outBuffer[0] = 0xff;
 						outBuffer[1] = 0xff;
@@ -2519,9 +2480,6 @@ int tcpSocketServerStart(void)
 						getConnectorSchedule(inputBuffer[9], outBuffer);
 						outBuffer[9] = chksumCal(outBuffer);
 						
-						for(uint8_t count = 0;count< tx_size;count++)  
-							DEBUG_INFO("outBuffer[%d] : %X...\r\n",count, outBuffer[count]);
-
 						break;
 					case WIFI_CMD_GET_NETWORK_STS:
 						tx_size = 7;
@@ -2590,7 +2548,6 @@ int tcpSocketServerStart(void)
 
 						break;
 					case WIFI_CMD_GET_WIFI_MODE:
-						DEBUG_INFO("WIFI_CMD_GET_WIFI_MODE...\r\n");
 						tx_size = 7;
 						outBuffer[0] = 0xff;
 						outBuffer[1] = 0xff;
@@ -2646,8 +2603,6 @@ int tcpSocketServerStart(void)
 
 						break;
 					case WIFI_CMD_GET_WIFI_MAC:
-						DEBUG_INFO("WIFI_CMD_GET_WIFI_MAC...\r\n");
-						
 						tx_size = 24;
 						outBuffer[0] = 0xff;
 						outBuffer[1] = 0xff;
@@ -2657,9 +2612,6 @@ int tcpSocketServerStart(void)
 						memcpy(&outBuffer[5], ShmSysConfigAndInfo->SysConfig.AthInterface.WifiMacAddress, ARRAY_SIZE(ShmSysConfigAndInfo->SysConfig.AthInterface.WifiMacAddress));
 						outBuffer[23] = chksumCal(outBuffer);
 						
-						for(uint8_t count = 0;count< tx_size;count++)  
-							DEBUG_INFO("outBuffer[%d] : %X...\r\n",count, outBuffer[count]);
-
 						break;
 					case WIFI_CMD_GET_WIFI_IP:
 						tx_size = 22;
@@ -2794,18 +2746,10 @@ int tcpSocketServerStart(void)
 						
 						break;
 					case WIFI_CMD_SET_SYSTEM_TIME:
-						DEBUG_INFO("WIFI_CMD_SET_SYSTEM_TIME...\r\n");
-						
-						DEBUG_INFO("inputBuffer[9] : %X...\r\n", inputBuffer[9]);
-						DEBUG_INFO("inputBuffer[10] : %X...\r\n", inputBuffer[10]);
-						DEBUG_INFO("inputBuffer[11] : %X...\r\n", inputBuffer[11]);
-						DEBUG_INFO("inputBuffer[12] : %X...\r\n", inputBuffer[12]);
 
 						rawtime = (inputBuffer[9]<<0) | (inputBuffer[10]<<8) | (inputBuffer[11]<<16) |(inputBuffer[12]<<24);
 						ts = *localtime(&rawtime);
 						
-						DEBUG_INFO("rawtime : %d...\r\n", rawtime);
-	
 						sprintf((char*)cmdBuf, "date -u -s \"%04d-%02d-%02d %02d:%02d:%02d\"", (ts.tm_year+1900),
 																							   (ts.tm_mon+1),
 																							   	ts.tm_mday,
@@ -2824,20 +2768,11 @@ int tcpSocketServerStart(void)
 						outBuffer[4] = WIFI_CMD_SET_SYSTEM_TIME;
 						outBuffer[5] = 0x01;
 						outBuffer[6] = chksumCal(outBuffer);
-						
-						for(uint8_t count = 0;count< tx_size;count++)  
-							DEBUG_INFO("outBuffer[%d] : %X...\r\n",count, outBuffer[count]);
 
 						break;
 					case WIFI_CMD_SET_WHITE_CARD:
-						DEBUG_INFO("WIFI_CMD_SET_WHITE_CARD...\r\n");
-
-						for(uint8_t count = 0;count< 40;count++)  
-							DEBUG_INFO("inputBuffer[%d] : %X...\r\n",count, inputBuffer[count]);
-
 						if((0<=inputBuffer[9]) && (inputBuffer[9]<10))
 						{
-							DEBUG_INFO("inputBuffer[10] : %X...\r\n", inputBuffer[10]);
 							if(inputBuffer[10] == REGISTER)
 							{
 								// Register white card 
@@ -2864,9 +2799,6 @@ int tcpSocketServerStart(void)
 						outBuffer[5] = inputBuffer[9];
 						outBuffer[7] = chksumCal(outBuffer);
 						
-						for(uint8_t count = 0;count< tx_size;count++)  
-							DEBUG_INFO("outBuffer[%d] : %X...\r\n",count, outBuffer[count]);
-
 						break;
 					case WIFI_CMD_SET_FACTORY_RESET:
 						ShmSysConfigAndInfo->SysInfo.FactoryConfiguration = ON;
@@ -2882,49 +2814,29 @@ int tcpSocketServerStart(void)
 
 						break;
 					case WIFI_CMD_SET_EVSE_CONFIG:
-						DEBUG_INFO("WIFI_CMD_SET_EVSE_CONFIG...\r\n");
-
-						for(uint8_t count = 0;count< 22;count++)  
-							DEBUG_INFO("inputBuffer[%d] : %X...\r\n",count, inputBuffer[count]);
-						
 						if((inputBuffer[9]>>4)&0x01)
 						{
 							SysConfigTemporarily.AcMaxChargingCurrent =  (inputBuffer[18]) | (inputBuffer[19]<<8);
-							DEBUG_INFO("AcMaxChargingCurrent : %d...\r\n", SysConfigTemporarily.AcMaxChargingCurrent);
-							DEBUG_INFO("inputBuffer[18] : %X \r\n",inputBuffer[18]);
-							DEBUG_INFO("inputBuffer[19] : %X \r\n",inputBuffer[19]);
 						}
 						
 						if((inputBuffer[9]>>3)&0x01)
 						{
 							SysConfigTemporarily.MaxChargingEnergy =  (inputBuffer[10]) | (inputBuffer[11]<<8);
-							DEBUG_INFO("MaxChargingEnergy : %d...\r\n", SysConfigTemporarily.MaxChargingEnergy);
-							DEBUG_INFO("inputBuffer[10] : %X \r\n",inputBuffer[10]);
-							DEBUG_INFO("inputBuffer[11] : %X \r\n",inputBuffer[11]);
 						}
 
 						if((inputBuffer[9]>>2)&0x01)
 						{
 							SysConfigTemporarily.MaxChargingPower = (inputBuffer[12]) | (inputBuffer[13]<<8);
-							DEBUG_INFO("MaxChargingPower : %d...\r\n", SysConfigTemporarily.MaxChargingPower);
-							DEBUG_INFO("inputBuffer[12] : %X \r\n",inputBuffer[12]);
-							DEBUG_INFO("inputBuffer[13] : %X \r\n",inputBuffer[13]);
 						}
 
 						if((inputBuffer[9]>>1)&0x01)
 						{
 							SysConfigTemporarily.MaxChargingCurrent = (inputBuffer[14]) | (inputBuffer[15]<<8);
-							DEBUG_INFO("MaxChargingCurrent : %d...\r\n", SysConfigTemporarily.MaxChargingCurrent);
-							DEBUG_INFO("inputBuffer[14] : %X \r\n",inputBuffer[14]);
-							DEBUG_INFO("inputBuffer[15] : %X \r\n",inputBuffer[15]);
 						}
 
 						if(inputBuffer[9]&0x01)
 						{
 							SysConfigTemporarily.MaxChargingDuration = (inputBuffer[16]) | (inputBuffer[17]<<8);
-							DEBUG_INFO("MaxChargingDuration : %d...\r\n", SysConfigTemporarily.MaxChargingDuration);
-							DEBUG_INFO("inputBuffer[16] : %X \r\n",inputBuffer[16]);
-							DEBUG_INFO("inputBuffer[17] : %X \r\n",inputBuffer[17]);
 						}
 
 						tx_size = 7;
@@ -2936,9 +2848,6 @@ int tcpSocketServerStart(void)
 						outBuffer[5] = 0x01;
 						outBuffer[6] = chksumCal(outBuffer);
 						
-						for(uint8_t count = 0;count< tx_size;count++)  
-							DEBUG_INFO("outBuffer[%d] : %X...\r\n",count, outBuffer[count]);
-
 						break;
 					case WIFI_CMD_SET_CHARGING_START:
 						tx_size = 7;
@@ -3034,11 +2943,8 @@ int tcpSocketServerStart(void)
 
 						break;
 					case WIFI_CMD_SET_WIFI_MODE:
-						DEBUG_INFO("WIFI_CMD_SET_WIFI_MODE...\r\n");
-						DEBUG_INFO("Result : %d...\r\n", inputBuffer[9]);
 
 						SysConfigTemporarily.AthInterface.WifiMode = inputBuffer[9];
-						DEBUG_INFO("WifiMode : %d...\r\n", SysConfigTemporarily.AthInterface.WifiMode);
 						
 						tx_size = 7;
 						outBuffer[0] = 0xff;
@@ -3048,13 +2954,9 @@ int tcpSocketServerStart(void)
 						outBuffer[4] = WIFI_CMD_SET_WIFI_MODE;
 						outBuffer[5] = 0x01;
 						outBuffer[6] = chksumCal(outBuffer);
-						
-						for(uint8_t count = 0;count< tx_size;count++)  
-							DEBUG_INFO("outBuffer[%d] : %X...\r\n",count, outBuffer[count]);
 
 						break;
 					case WIFI_CMD_SET_WIFI_SSID:
-						DEBUG_INFO("WIFI_CMD_SET_WIFI_SSID...\r\n");
 						
 						memset(SysConfigTemporarily.AthInterface.WifiSsid, 0x00, ARRAY_SIZE(SysConfigTemporarily.AthInterface.WifiSsid));
 						memcpy(SysConfigTemporarily.AthInterface.WifiSsid, &inputBuffer[9], (((inputBuffer[2] << 8) | inputBuffer[3])-6));
@@ -3070,7 +2972,6 @@ int tcpSocketServerStart(void)
 						
 						break;
 					case WIFI_CMD_SET_WIFI_PASSWD:
-						DEBUG_INFO("WIFI_CMD_SET_WIFI_PASSWD...\r\n");
 						
 						memset(SysConfigTemporarily.AthInterface.WifiPassword, 0x00, ARRAY_SIZE(SysConfigTemporarily.AthInterface.WifiPassword));
 						memcpy(SysConfigTemporarily.AthInterface.WifiPassword, &inputBuffer[9], (((inputBuffer[2] << 8) | inputBuffer[3])-6));
@@ -3086,13 +2987,9 @@ int tcpSocketServerStart(void)
 						
 						break;
 					case WIFI_CMD_SET_WIFI_DHCP:
-						DEBUG_INFO("WIFI_CMD_SET_WIFI_DHCP...\r\n");
 						
 						SysConfigTemporarily.AthInterface.WifiDhcpClient = inputBuffer[9]^1;
 						
-						DEBUG_INFO("SysConfigTemporarily.AthInterface.WifiDhcpClient : %d...\r\n", SysConfigTemporarily.AthInterface.WifiDhcpClient);
-						DEBUG_INFO("ShmSysConfigAndInfo->SysConfig.AthInterface.WifiDhcpClient : %d...\r\n", ShmSysConfigAndInfo->SysConfig.AthInterface.WifiDhcpClient);
-						
 						tx_size = 7;
 						outBuffer[0] = 0xff;
 						outBuffer[1] = 0xff;
@@ -3209,7 +3106,6 @@ int tcpSocketServerStart(void)
 
 						break;
 					case WIFI_CMD_SET_CONFIRM:
-						DEBUG_INFO("WIFI_CMD_SET_CONFIRM...\r\n");
 						
 						// Copy SysConfigTemporarily to ShmSysConfigAndInfo->SysConfig
 						memcpy(&ShmSysConfigAndInfo->SysConfig,&SysConfigTemporarily, sizeof(struct SysConfigData));
@@ -3224,13 +3120,9 @@ int tcpSocketServerStart(void)
 						outBuffer[6] = chksumCal(outBuffer);
 						
 						Sys_Flag.isPkill = ON;
-						
-						for(uint8_t count = 0;count< tx_size;count++)  
-							DEBUG_INFO("outBuffer[%d] : %X...\r\n",count, outBuffer[count]);
 
 						break;
 					case WIFI_CMD_SET_DISCARD:
-						DEBUG_INFO("WIFI_CMD_SET_DISCARD...\r\n");
 						
 						// Copy ShmSysConfigAndInfo to SysConfigTemporarily
 						memcpy(&SysConfigTemporarily, &ShmSysConfigAndInfo->SysConfig, sizeof(struct SysConfigData));
@@ -3843,11 +3735,6 @@ int main(void)
 	DEBUG_INFO("=================[State 0]===================\n");
 	for(;;)
 	{
-		DEBUG_INFO("WifiMode : %d...\r\n",ShmSysConfigAndInfo->SysConfig.AthInterface.WifiMode);
-		DEBUG_INFO("InternetDisconnectViaWiFi : %d...\r\n",ShmStatusCodeData->InfoCode.InfoEvents.bits.InternetDisconnectViaWiFi);
-		DEBUG_INFO("ApDisconnectViaWiFi : %d...\r\n",ShmStatusCodeData->InfoCode.InfoEvents.bits.ApDisconnectViaWiFi);
-		DEBUG_INFO("WifiNetworkConn : %d...\r\n",ShmSysConfigAndInfo->SysConfig.AthInterface.WifiNetworkConn);
-
 		switch(ShmSysConfigAndInfo->SysConfig.AthInterface.WifiMode)
 		{
 			case WIFI_MODE_STA:
@@ -3867,4 +3754,4 @@ int main(void)
 	}
 
 	return 0;
-}
+}