2020-08-31 / Eason Yang

Action
1. Fixed : StartCharging method
2. Fixed : StopCharging method
3. Added : Print log function
4. Replace : Connection limit to 3 times
5. Rename : Version
6. Added : Print out log for UDP and TCP

File
1.Module_Wifi
Action1
Action2
Action4
Action3
Action5
Action6

Version : V0.09

EVSE/Modularization/Module_Wifi.c

@@ -4,7 +4,7 @@
  *  Created on: 2020-01-14
  *  Update on: 2020-08-18
  *  Author: Jerry Wang, Eason Yang, Folus Wen
- *  Version: V0.08
+ *  Version: V0.09
  */
 
 #include 	<sys/time.h>
@@ -47,6 +47,8 @@
 #define FAIL			   			-1
 #define ON							1
 #define OFF							0
+#define YES							1
+#define NO							0
 #define true			    		1
 #define false						0
 #define IP_TYPE_DHCP				0
@@ -74,7 +76,7 @@
 #define LISTEN_PORT_UDP				54088
 #define LISTEN_PORT_TCP				54089
 
-#define	CONNECTION_LIMIT			1
+#define	CONNECTION_LIMIT			3
 #define MtdBlockSize				0x600000
 
 #define REGISTER					0x01
@@ -83,6 +85,8 @@
 #define UBLOX
 //#define MT7601U
 
+#define DEBUG
+
 #define DB_FILE						"/Storage/ChargeLog/puk_pin_list.db"
 
 enum WIFI_COMMAND
@@ -289,6 +293,24 @@ int DiffTimeb(struct timeb ST, struct timeb ET)
 	return (StopTime-StartTime)*1000+ET.millitm-ST.millitm;
 }
 
+//==========================================
+// Print out log function
+//==========================================
+void displayMessage(uint8_t *data, uint16_t len, uint8_t isRX)
+{
+	uint8_t output[8192];
+
+	sprintf((char*)output, "%s", (isRX?"RX: ":"TX: "));
+	for(uint16_t idx = 0;idx<len;idx++)
+	{
+		sprintf((char*)output, "%s%02x ", output, data[idx]);
+	}
+
+#ifdef DEBUG
+	DEBUG_INFO("%s\n", output);
+#endif
+}
+
 //==========================================
 // Init all share memory
 //==========================================
@@ -761,10 +783,13 @@ int setWPAconf()
 			system(cmdBuf);
 			#ifdef UBLOX			
 				sprintf(cmdBuf, "mlanutl mlan0 hostcmd /root/u-blox_tools/ed_mac_ctrl_V1_8801.conf ed_mac_ctrl");
-                        	system(cmdBuf);
+                system(cmdBuf);
 				sprintf(cmdBuf, "mlanutl mlan0 regrdwr 2 0x70");
-
-                        	system(cmdBuf);
+				system(cmdBuf);
+				sprintf(cmdBuf, "mlanutl mlan0 deepsleep 0");
+				system(cmdBuf);
+				sprintf(cmdBuf, "mlanutl mlan0 psmode 0");
+				system(cmdBuf);
 			#endif
 			sprintf(cmdBuf, "/root/wpa_supplicant -i %s -c /etc/wpa.conf -B", Wifi.currentInterface);
 			system(cmdBuf);
@@ -940,6 +965,7 @@ int udpSocketServerStart(void)
 		{
 			DEBUG_INFO("Revieve from: %s:%d\r\n", inet_ntoa(peeraddr.sin_addr), htons(peeraddr.sin_port));
 			DEBUG_INFO("read_size: %d\r\n",read_size);
+			displayMessage(inputBuffer, read_size, YES);
 			
 			if(read_size>=6)
 			{
@@ -977,9 +1003,6 @@ int udpSocketServerStart(void)
 						outBuffer[7] = 0x00;
 						outBuffer[8] = 0x00;
 					}
-					
-					for(uint8_t count = 5; count < 9 ;count++)  
-						DEBUG_INFO("outBuffer[%d] : %X...\r\n",count, outBuffer[count]);
 
 					if(parseMAC(mac)==PASS)
 					{
@@ -999,10 +1022,7 @@ int udpSocketServerStart(void)
 						outBuffer[13] 	= 0x00;
 						outBuffer[14] 	= 0x00;
 					}
-					
-					for(uint8_t count = 9; count < 15 ;count++)  
-						DEBUG_INFO("outBuffer[%d] : %X...\r\n",count, outBuffer[count]);
-					
+
 					memcpy(&outBuffer[15], ShmSysConfigAndInfo->SysConfig.ModelName, 0x0e);
 					memcpy(&outBuffer[29], ShmSysConfigAndInfo->SysConfig.SerialNumber, 0x0b);
 
@@ -1013,6 +1033,7 @@ int udpSocketServerStart(void)
 					}
 					outBuffer[40] = chksum;
 
+					displayMessage(outBuffer, tx_size, NO);
 					sendto(sockFd, outBuffer, tx_size, 0, (struct sockaddr *)&peeraddr, peerlen);
 				}
 			}
@@ -1672,7 +1693,7 @@ uint8_t startConnectorCharging(uint8_t gun_index)
 				// AC
 				if(ShmSysConfigAndInfo->SysInfo.AcChargingData[idxAC].SystemStatus == SYS_MODE_IDLE)
 				{
-					ShmOCPP16Data->CsMsg.bits[AC_GUN_IDX].RemoteStartTransactionReq = ON;
+					ShmOCPP16Data->CsMsg.bits[idxAC].RemoteStartTransactionReq = ON;
 					result = ON;
 				}
 
@@ -1796,7 +1817,7 @@ uint8_t stopConnectorCharging(uint8_t gun_index)
 				// AC
 				if(ShmSysConfigAndInfo->SysInfo.AcChargingData[idxAC].SystemStatus != SYS_MODE_IDLE)
 				{
-					ShmOCPP16Data->CsMsg.bits[AC_GUN_IDX].RemoteStopTransactionReq = ON;
+					ShmOCPP16Data->CsMsg.bits[idxAC].RemoteStopTransactionReq = ON;
 					result = ON;
 				}
 
@@ -2081,6 +2102,8 @@ int tcpSocketServerStart(void)
 
 		while((read_size = recv(clientSockFd, inputBuffer, sizeof(inputBuffer), 0)) > 0)
 		{
+			displayMessage(inputBuffer, read_size, YES);
+
 			if(isValidCheckSum(inputBuffer) && (randomChk != ((inputBuffer[4]<<24) | (inputBuffer[5]<<16) | (inputBuffer[6]<<8) | (inputBuffer[7]<<0))))
 			{
 				randomChk = ((inputBuffer[4]<<24) | (inputBuffer[5]<<16) | (inputBuffer[6]<<8) | (inputBuffer[7]<<0));
@@ -3159,6 +3182,7 @@ int tcpSocketServerStart(void)
 				outBuffer[5] = chksumCal(outBuffer);
 			}
 
+			displayMessage(outBuffer, tx_size, NO);
 			send(clientSockFd, outBuffer, tx_size, 0);
 		}