[Improve][Modularization][Module_EventLog]

2021.12.20 / Folus Wen

Actions:
1. Wifi & 4G connection record status variable fix.

Files:
1. As follow commit history

Image version: D0.00.XX.XXXX.XX
Image checksum: XXXXXXXX

Hardware PWB P/N : XXXXXXX
Hardware Version : XXXXXXX

EVSE/Modularization/Module_EventLogging.c

@@ -440,8 +440,8 @@ int DB_Network_Insert_Record(sqlite3 *db)
 				ShmSysConfigAndInfo->SysInfo.InternetConn,
 				ShmSysConfigAndInfo->SysInfo.OcppConnStatus,
 				!ShmStatusCodeData->InfoCode.InfoEvents.bits.InternetDisconnectViaEthernet,
-				!ShmStatusCodeData->InfoCode.InfoEvents.bits.InternetDisconnectViaWiFi,
-				!ShmStatusCodeData->InfoCode.InfoEvents.bits.InternetDisconnectVia4Gi,
+				(ShmSysConfigAndInfo->SysConfig.AthInterface.WifiMode!=1?0:!ShmStatusCodeData->InfoCode.InfoEvents.bits.ApDisconnectViaWiFi),
+				(ShmSysConfigAndInfo->SysConfig.TelecomInterface.TelcomEnabled!=1?0:!ShmStatusCodeData->InfoCode.InfoEvents.bits.ApnDisconnectVia4Gi),
 				ShmSysConfigAndInfo->SysConfig.AthInterface.WifiRssi,
 				ShmSysConfigAndInfo->SysConfig.TelecomInterface.TelcomRssi);
 	}
@@ -451,7 +451,7 @@ int DB_Network_Insert_Record(sqlite3 *db)
 				ShmSysConfigAndInfo->SysInfo.InternetConn,
 				ShmSysConfigAndInfo->SysInfo.OcppConnStatus,
 				!ShmStatusCodeData->InfoCode.InfoEvents.bits.InternetDisconnectViaEthernet,
-				!ShmStatusCodeData->InfoCode.InfoEvents.bits.InternetDisconnectViaWiFi,
+				(ShmSysConfigAndInfo->SysConfig.AthInterface.WifiMode!=1?0:!ShmStatusCodeData->InfoCode.InfoEvents.bits.ApDisconnectViaWiFi),
 				0,
 				ShmSysConfigAndInfo->SysConfig.AthInterface.WifiRssi,
 				0);
@@ -463,7 +463,7 @@ int DB_Network_Insert_Record(sqlite3 *db)
 				ShmSysConfigAndInfo->SysInfo.OcppConnStatus,
 				!ShmStatusCodeData->InfoCode.InfoEvents.bits.InternetDisconnectViaEthernet,
 				0,
-				!ShmStatusCodeData->InfoCode.InfoEvents.bits.InternetDisconnectVia4Gi,
+				(ShmSysConfigAndInfo->SysConfig.TelecomInterface.TelcomEnabled!=1?0:!ShmStatusCodeData->InfoCode.InfoEvents.bits.ApnDisconnectVia4Gi),
 				0,
 				ShmSysConfigAndInfo->SysConfig.TelecomInterface.TelcomRssi);
 	}
@@ -718,8 +718,8 @@ int main(void)
 		if((netPreviousStatus.isInternet != ShmSysConfigAndInfo->SysInfo.InternetConn) ||
 		   (netPreviousStatus.isOcppConnected != ShmSysConfigAndInfo->SysInfo.OcppConnStatus) ||
 	       (netPreviousStatus.ethIsInternet != ShmStatusCodeData->InfoCode.InfoEvents.bits.InternetDisconnectViaEthernet) ||
-		   (netPreviousStatus.maln0IsInternet != ShmStatusCodeData->InfoCode.InfoEvents.bits.InternetDisconnectViaWiFi) ||
-		   (netPreviousStatus.ppp0IsInternet != ShmStatusCodeData->InfoCode.InfoEvents.bits.InternetDisconnectVia4Gi) ||
+		   (netPreviousStatus.maln0IsInternet != ShmStatusCodeData->InfoCode.InfoEvents.bits.ApDisconnectViaWiFi) ||
+		   (netPreviousStatus.ppp0IsInternet != ShmStatusCodeData->InfoCode.InfoEvents.bits.ApnDisconnectVia4Gi) ||
 		   (netPreviousStatus.rssiWifi != ShmSysConfigAndInfo->SysConfig.AthInterface.WifiRssi) ||
 		   (netPreviousStatus.rssi4g != ShmSysConfigAndInfo->SysConfig.TelecomInterface.TelcomRssi))
 		{
@@ -728,8 +728,8 @@ int main(void)
 			netPreviousStatus.isInternet = ShmSysConfigAndInfo->SysInfo.InternetConn;
 			netPreviousStatus.isOcppConnected = ShmSysConfigAndInfo->SysInfo.OcppConnStatus;
 			netPreviousStatus.ethIsInternet = ShmStatusCodeData->InfoCode.InfoEvents.bits.InternetDisconnectViaEthernet;
-			netPreviousStatus.maln0IsInternet = ShmStatusCodeData->InfoCode.InfoEvents.bits.InternetDisconnectViaWiFi;
-			netPreviousStatus.ppp0IsInternet = ShmStatusCodeData->InfoCode.InfoEvents.bits.InternetDisconnectVia4Gi;
+			netPreviousStatus.maln0IsInternet = ShmStatusCodeData->InfoCode.InfoEvents.bits.ApDisconnectViaWiFi;
+			netPreviousStatus.ppp0IsInternet = ShmStatusCodeData->InfoCode.InfoEvents.bits.ApnDisconnectVia4Gi;
 			netPreviousStatus.rssiWifi = ShmSysConfigAndInfo->SysConfig.AthInterface.WifiRssi;
 			netPreviousStatus.rssi4g = ShmSysConfigAndInfo->SysConfig.TelecomInterface.TelcomRssi;
 		}