[Improve][DM30][DW30][General]: Modify the Wi-Fi mode define to config.h

2020.06.15 / TC Hsu

Actions: Remove the wifi mode define in Module_LcmControl.c, add new wifi mode enum in config.h

Image version    : N/A
Image checksum   : N/A

Hardware PWB P/N : N/A
Hardware Version : N/A

Files:

	modified:   EVSE/Projects/DM30/Apps/Config.h
	modified:   EVSE/Projects/DM30/Apps/FactoryConfig.c
	modified:   EVSE/Projects/DM30/Apps/Module_LcmControl.c
	modified:   EVSE/Projects/DW30/Apps/Config.h
	modified:   EVSE/Projects/DW30/Apps/FactoryConfig.c
	modified:   EVSE/Projects/DW30/Apps/Module_LcmControl.c

EVSE/Projects/DM30/Apps/Config.h

@@ -166,4 +166,12 @@ enum _CHARGER_TYPE
     _CHARGER_TYPE_UL                    = 1,
 };
 
+enum _SYS_WIFI_MODE
+{
+    _SYS_WIFI_MODE_DISABLE              = 0,
+    _SYS_WIFI_MODE_STATION              = 1,
+    _SYS_WIFI_MODE_AP                   = 2,
+    _SYS_WIFI_MODE_ADHOC                = 3,
+};
+
 #endif /* CONFIG_H_ */

EVSE/Projects/DM30/Apps/FactoryConfig.c

@@ -148,7 +148,7 @@ int main(int argc,char *argv[])
     strcpy((char *) SysConfig.Eth1Interface.EthIpAddress, "192.168.0.10");
     strcpy((char *) SysConfig.Eth1Interface.EthSubmaskAddress, "255.255.255.0");
     strcpy((char *) SysConfig.Eth1Interface.EthGatewayAddress, "192.168.0.254");
-    SysConfig.AthInterface.WifiMode = 1;
+    SysConfig.AthInterface.WifiMode = _SYS_WIFI_MODE_AP;
     strcpy((char *) SysConfig.AthInterface.WifiSsid, "B1_I3");
     strcpy((char *) SysConfig.AthInterface.WifiPassword, "062547588");
     SysConfig.AthInterface.WifiRssi = 0;

EVSE/Projects/DM30/Apps/Module_LcmControl.c

@@ -758,15 +758,10 @@ void RefreshPageAnimation(byte value)
     }
 }
 
-#define WIFI_MODE_DISABLE           0
-#define WIFI_MODE_STA               1
-#define WIFI_MODE_AP                2
-#define WIFI_MODE_ADHOC             3
-
 void RefreshConnStatus()
 {
     // Wifi priority is higher than Ethernet
-    if(ShmSysConfigAndInfo->SysConfig.AthInterface.WifiMode == WIFI_MODE_STA)
+    if(ShmSysConfigAndInfo->SysConfig.AthInterface.WifiMode == _SYS_WIFI_MODE_STATION)
     {
         if (ShmSysConfigAndInfo->SysConfig.AthInterface.WifiNetworkConn == YES)
         {

EVSE/Projects/DW30/Apps/Config.h

@@ -166,4 +166,12 @@ enum _CHARGER_TYPE
     _CHARGER_TYPE_UL                    = 1,
 };
 
+enum _SYS_WIFI_MODE
+{
+    _SYS_WIFI_MODE_DISABLE              = 0,
+    _SYS_WIFI_MODE_STATION              = 1,
+    _SYS_WIFI_MODE_AP                   = 2,
+    _SYS_WIFI_MODE_ADHOC                = 3,
+};
+
 #endif /* CONFIG_H_ */

EVSE/Projects/DW30/Apps/FactoryConfig.c

@@ -148,7 +148,7 @@ int main(int argc,char *argv[])
     strcpy((char *) SysConfig.Eth1Interface.EthIpAddress, "192.168.0.10");
     strcpy((char *) SysConfig.Eth1Interface.EthSubmaskAddress, "255.255.255.0");
     strcpy((char *) SysConfig.Eth1Interface.EthGatewayAddress, "192.168.0.254");
-    SysConfig.AthInterface.WifiMode = 1;
+    SysConfig.AthInterface.WifiMode = _SYS_WIFI_MODE_AP;
     strcpy((char *) SysConfig.AthInterface.WifiSsid, "B1_I3");
     strcpy((char *) SysConfig.AthInterface.WifiPassword, "062547588");
     SysConfig.AthInterface.WifiRssi = 0;

EVSE/Projects/DW30/Apps/Module_LcmControl.c

@@ -758,15 +758,10 @@ void RefreshPageAnimation(byte value)
     }
 }
 
-#define WIFI_MODE_DISABLE           0
-#define WIFI_MODE_STA               1
-#define WIFI_MODE_AP                2
-#define WIFI_MODE_ADHOC             3
-
 void RefreshConnStatus()
 {
     // Wifi priority is higher than Ethernet
-    if(ShmSysConfigAndInfo->SysConfig.AthInterface.WifiMode == WIFI_MODE_STA)
+    if(ShmSysConfigAndInfo->SysConfig.AthInterface.WifiMode == _SYS_WIFI_MODE_STATION)
     {
         if (ShmSysConfigAndInfo->SysConfig.AthInterface.WifiNetworkConn == YES)
         {