Merge branch 'AW-CCS' of https://git.phihong.com.tw:30000/system_integration/csu3_am335x into AW-CCS

EVSE/Projects/AW-CCS/Apps/main.c

@@ -2922,16 +2922,61 @@ void InitEthernet()
 				}
 			}
 
-			if(ShmStatusCodeData->InfoCode.InfoEvents.bits.InternetDisconnectViaEthernet &&
-			   ((ShmSysConfigAndInfo->SysConfig.AthInterface.WifiMode == 0) || ShmStatusCodeData->InfoCode.InfoEvents.bits.InternetDisconnectViaWiFi) &&
-			   ((ShmSysConfigAndInfo->SysConfig.TelecomInterface.TelcomEnabled == 0) || ShmStatusCodeData->InfoCode.InfoEvents.bits.InternetDisconnectVia4Gi) &&
-			   (ShmOCPP16Data->OcppConnStatus != PASS))
+			// Network status
+			switch(ShmSysConfigAndInfo->SysConfig.ModelName[10])
 			{
-				ShmSysConfigAndInfo->SysInfo.InternetConn = OFF;
-			}
-			else
-			{
-				ShmSysConfigAndInfo->SysInfo.InternetConn = ON;
+				case 'E':
+					if((ShmStatusCodeData->InfoCode.InfoEvents.bits.InternetDisconnectViaEthernet) &&
+					   (ShmOCPP16Data->OcppConnStatus != PASS))
+					{
+						ShmSysConfigAndInfo->SysInfo.InternetConn = OFF;
+					}
+					else
+					{
+						ShmSysConfigAndInfo->SysInfo.InternetConn = ON;
+					}
+
+					break;
+				case 'W':
+					if((ShmStatusCodeData->InfoCode.InfoEvents.bits.InternetDisconnectViaEthernet) &&
+					   ((ShmSysConfigAndInfo->SysConfig.AthInterface.WifiMode == 0) || ShmStatusCodeData->InfoCode.InfoEvents.bits.InternetDisconnectViaWiFi) &&
+					   (ShmOCPP16Data->OcppConnStatus != PASS))
+					{
+						ShmSysConfigAndInfo->SysInfo.InternetConn = OFF;
+					}
+					else
+					{
+						ShmSysConfigAndInfo->SysInfo.InternetConn = ON;
+					}
+
+					break;
+				case 'T':
+					if((ShmStatusCodeData->InfoCode.InfoEvents.bits.InternetDisconnectViaEthernet) &&
+					   ((ShmSysConfigAndInfo->SysConfig.TelecomInterface.TelcomEnabled == 0) || ShmStatusCodeData->InfoCode.InfoEvents.bits.InternetDisconnectVia4Gi) &&
+					   (ShmOCPP16Data->OcppConnStatus != PASS))
+					{
+						ShmSysConfigAndInfo->SysInfo.InternetConn = OFF;
+					}
+					else
+					{
+						ShmSysConfigAndInfo->SysInfo.InternetConn = ON;
+					}
+
+					break;
+				case 'D':
+					if((ShmStatusCodeData->InfoCode.InfoEvents.bits.InternetDisconnectViaEthernet) &&
+					   ((ShmSysConfigAndInfo->SysConfig.AthInterface.WifiMode == 0) || ShmStatusCodeData->InfoCode.InfoEvents.bits.InternetDisconnectViaWiFi) &&
+					   ((ShmSysConfigAndInfo->SysConfig.TelecomInterface.TelcomEnabled == 0) || ShmStatusCodeData->InfoCode.InfoEvents.bits.InternetDisconnectVia4Gi) &&
+					   (ShmOCPP16Data->OcppConnStatus != PASS))
+					{
+						ShmSysConfigAndInfo->SysInfo.InternetConn = OFF;
+					}
+					else
+					{
+						ShmSysConfigAndInfo->SysInfo.InternetConn = ON;
+					}
+
+					break;
 			}
 
 			//============================================================