Pārlūkot izejas kodu

Merge branch 'master' into DM30

FolusWen 5 gadi atpakaļ
vecāks
revīzija
d8f9b2b8fb
3 mainītis faili ar 40 papildinājumiem un 14 dzēšanām
  1. 40 14
      EVSE/Modularization/Module_Wifi.c
  2. 0 0
      a
  3. 0 0
      b

+ 40 - 14
EVSE/Modularization/Module_Wifi.c

@@ -102,14 +102,15 @@ enum WIFI_COMMAND
 	WIFI_CMD_GET_ETH_IP				= 0x45,
 	WIFI_CMD_GET_ETH_SUBMASK		= 0x47,
 	WIFI_CMD_GET_ETH_GATEWAY		= 0x49,
-	WIFI_CMD_GET_WIFI_SSID			= 0x54,
-	WIFI_CMD_GET_WIFI_PASSWD		= 0x56,
-	WIFI_CMD_GET_WIFI_RSSI			= 0x58,
-	WIFI_CMD_GET_WIFI_DHCP			= 0x59,
-	WIFI_CMD_GET_WIFI_MAC			= 0x5b,
-	WIFI_CMD_GET_WIFI_IP			= 0x5c,
-	WIFI_CMD_GET_WIFI_NETMASK		= 0x5e,
-	WIFI_CMD_GET_WIFI_GATEWAY		= 0x60,
+	WIFI_CMD_GET_WIFI_MODE			= 0x54,
+	WIFI_CMD_GET_WIFI_SSID			= 0x56,
+	WIFI_CMD_GET_WIFI_PASSWD		= 0x58,
+	WIFI_CMD_GET_WIFI_RSSI			= 0x5a,
+	WIFI_CMD_GET_WIFI_DHCP			= 0x5b,
+	WIFI_CMD_GET_WIFI_MAC			= 0x5d,
+	WIFI_CMD_GET_WIFI_IP			= 0x5e,
+	WIFI_CMD_GET_WIFI_NETMASK		= 0x60,
+	WIFI_CMD_GET_WIFI_GATEWAY		= 0x62,
 	WIFI_CMD_GET_TELE_APN			= 0x6b,
 	WIFI_CMD_GET_TELE_RSSI			= 0x6d,
 	WIFI_CMD_GET_TELE_CHAAP_ID		= 0x6e,
@@ -132,12 +133,13 @@ enum WIFI_COMMAND
 	WIFI_CMD_SET_ETH_IP				= 0x46,
 	WIFI_CMD_SET_ETH_SUBMASK		= 0x48,
 	WIFI_CMD_SET_ETH_GATEWAY		= 0x4a,
-	WIFI_CMD_SET_WIFI_SSID			= 0x55,
-	WIFI_CMD_SET_WIFI_PASSWD		= 0x57,
-	WIFI_CMD_SET_WIFI_DHCP			= 0x5a,
-	WIFI_CMD_SET_WIFI_IP			= 0x5d,
-	WIFI_CMD_SET_WIFI_NETMASK		= 0x5f,
-	WIFI_CMD_SET_WIFI_GATEWAY		= 0x61,
+	WIFI_CMD_SET_WIFI_MODE			= 0x55,
+	WIFI_CMD_SET_WIFI_SSID			= 0x57,
+	WIFI_CMD_SET_WIFI_PASSWD		= 0x59,
+	WIFI_CMD_SET_WIFI_DHCP			= 0x5c,
+	WIFI_CMD_SET_WIFI_IP			= 0x5f,
+	WIFI_CMD_SET_WIFI_NETMASK		= 0x61,
+	WIFI_CMD_SET_WIFI_GATEWAY		= 0x63,
 	WIFI_CMD_SET_TELE_APN			= 0x6c,
 	WIFI_CMD_SET_TELE_CHAAP_ID		= 0x6f,
 	WIFI_CMD_SET_TELE_CHAAP_PASSWD	= 0x71,
@@ -1651,6 +1653,17 @@ int tcpSocketServerStart(void)
 						memcpy(&outBuffer[5], ShmSysConfigAndInfo->SysConfig.Eth0Interface.EthGatewayAddress, ARRAY_SIZE(ShmSysConfigAndInfo->SysConfig.Eth0Interface.EthGatewayAddress));
 						outBuffer[21] = chksumCal(outBuffer);
 
+						break;
+					case WIFI_CMD_GET_WIFI_MODE:
+						tx_size = 7;
+						outBuffer[0] = 0xff;
+						outBuffer[1] = 0xff;
+						outBuffer[2] = 0x01;
+						outBuffer[3] = 0x01;
+						outBuffer[4] = WIFI_CMD_GET_WIFI_MODE;
+						outBuffer[5] = ShmSysConfigAndInfo->SysConfig.AthInterface.WifiMode;
+						outBuffer[6] = chksumCal(outBuffer);
+
 						break;
 					case WIFI_CMD_GET_WIFI_SSID:
 						tx_size = 261;
@@ -2023,6 +2036,19 @@ int tcpSocketServerStart(void)
 						outBuffer[5] = 0x01;
 						outBuffer[6] = chksumCal(outBuffer);
 
+						break;
+					case WIFI_CMD_SET_WIFI_MODE:
+						ShmSysConfigAndInfo->SysConfig.AthInterface.WifiMode = inputBuffer[9];
+
+						tx_size = 7;
+						outBuffer[0] = 0xff;
+						outBuffer[1] = 0xff;
+						outBuffer[2] = 0x00;
+						outBuffer[3] = 0x03;
+						outBuffer[4] = WIFI_CMD_SET_WIFI_MODE;
+						outBuffer[5] = 0x01;
+						outBuffer[6] = chksumCal(outBuffer);
+
 						break;
 					case WIFI_CMD_SET_WIFI_SSID:
 						memcpy(ShmSysConfigAndInfo->SysConfig.AthInterface.WifiSsid, &inputBuffer[9], 256);

+ 0 - 0
a


+ 0 - 0
b