|
@@ -746,23 +746,42 @@ 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.WifiNetworkConn == YES)
|
|
|
+ if(ShmSysConfigAndInfo->SysConfig.AthInterface.WifiMode == WIFI_MODE_STA)
|
|
|
{
|
|
|
- _wifi_conn_status = true;
|
|
|
- ChangeDisplay2Value(__wifi_status, _wifi_connect);
|
|
|
- ChangeDisplay2Value(__ethernet_status, _disappear);
|
|
|
+ if (ShmSysConfigAndInfo->SysConfig.AthInterface.WifiNetworkConn == YES)
|
|
|
+ {
|
|
|
+ _wifi_conn_status = true;
|
|
|
+ ChangeDisplay2Value(__ethernet_status, _disappear);
|
|
|
+ ChangeDisplay2Value(__wifi_status, _wifi_connect);
|
|
|
+ }
|
|
|
+ else
|
|
|
+ {
|
|
|
+ _wifi_conn_status = false;
|
|
|
+ if(ShmSysConfigAndInfo->SysConfig.TelecomInterface.TelcomNetworkConn == YES)
|
|
|
+ {
|
|
|
+ ChangeDisplay2Value(__wifi_status, _disappear);
|
|
|
+ ChangeDisplay2Value(__ethernet_status, _ethernet_connect);
|
|
|
+ }
|
|
|
+ else
|
|
|
+ {
|
|
|
+ ChangeDisplay2Value(__ethernet_status, _disappear);
|
|
|
+ ChangeDisplay2Value(__wifi_status, _wifi_disconnect);
|
|
|
+ }
|
|
|
+ }
|
|
|
}
|
|
|
else
|
|
|
{
|
|
|
_wifi_conn_status = false;
|
|
|
ChangeDisplay2Value(__wifi_status, _disappear);
|
|
|
- }
|
|
|
-
|
|
|
- if (!_wifi_conn_status)
|
|
|
- {
|
|
|
+
|
|
|
if (ShmSysConfigAndInfo->SysConfig.TelecomInterface.TelcomNetworkConn == YES)
|
|
|
{
|
|
|
ChangeDisplay2Value(__ethernet_status, _ethernet_connect);
|