[Bug fix][Modularization][Module_4g]

2021.07.06 / Folus Wen

Actions:
1. ShmSysConfigAndInfo->SysConfig.TelecomInterface.TelcomNetworkConn fix to only check APN connection status.
2. Add OCPP server connection status for pppd restart condition.

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_4g.c

@@ -1305,12 +1305,13 @@ TOP:
 								DEBUG_INFO("Status: PPP interface found...\n");
 								DEBUG_INFO("========================================\n");
 								DEBUG_INFO("PPP IP: %s\n", ShmSysConfigAndInfo->SysConfig.TelecomInterface.TelcomIpAddress);
+								DEBUG_INFO("Telecom network connection: %d\n", ShmSysConfigAndInfo->SysConfig.TelecomInterface.TelcomNetworkConn);
 								DEBUG_INFO("========================================\n");
+								ShmSysConfigAndInfo->SysConfig.TelecomInterface.TelcomNetworkConn = 1;
 
 								Dongle.cnt_pppFail = 0;
 								if(isReachableInternet() == PASS)
 								{
-									ShmSysConfigAndInfo->SysConfig.TelecomInterface.TelcomNetworkConn = 1;
 									ShmStatusCodeData->AlarmCode.AlarmEvents.bits.Telecom4GModuleCommFail = 0;
 									ShmStatusCodeData->InfoCode.InfoEvents.bits.InternetDisconnectVia4Gi = 0;
 									ShmStatusCodeData->InfoCode.InfoEvents.bits.ApnDisconnectVia4Gi = 0;
@@ -1325,7 +1326,6 @@ TOP:
 									DEBUG_INFO("========================================\n");
 									DEBUG_INFO("Status: 4G Device connecting...\n");
 									DEBUG_INFO("========================================\n");
-									DEBUG_INFO("Network connection: %d\n", ShmSysConfigAndInfo->SysConfig.TelecomInterface.TelcomNetworkConn);
 									DEBUG_INFO("Dongle internet valid result: Pass\n");
 									DEBUG_INFO("========================================\n");
 								
@@ -1341,12 +1341,11 @@ TOP:
 								{
 									DEBUG_INFO("Dongle internet valid result: Fail %d time\n", Dongle.cnt_InternetFail);
 
-									ShmSysConfigAndInfo->SysConfig.TelecomInterface.TelcomNetworkConn = 0;
 									ShmStatusCodeData->InfoCode.InfoEvents.bits.InternetDisconnectVia4Gi = 1;
 									ShmStatusCodeData->InfoCode.InfoEvents.bits.ApnDisconnectVia4Gi = 1;
 
 									Dongle.cnt_InternetFail++;
-									if(Dongle.cnt_InternetFail > 3)
+									if((Dongle.cnt_InternetFail > 3) && !ShmSysConfigAndInfo->SysInfo.OcppConnStatus)
 									{
 										system("killall 4GDetection");
 										system("killall pppd");
@@ -1361,6 +1360,8 @@ TOP:
 							}
 							else
 							{
+								ShmSysConfigAndInfo->SysConfig.TelecomInterface.TelcomNetworkConn = 0;
+
 								if(Load4gConfiguration() == FAIL)
 								{
 									DEBUG_ERROR("4G configuration value NG.\n");