2020-04-14 / Eason Yang

1.Change : Module_4g.c Reason : Fixed LoadConfiguration method.

EVSE/Modularization/Module_4g.c

@@ -1060,17 +1060,6 @@ int main(void)
 
 		return 0;
 	}
-	else if(Load4gConfiguration() == FAIL)
-	{
-		DEBUG_ERROR("4G configuration value NG\n");
-		if(ShmStatusCodeData!=NULL)
-		{
-			ShmStatusCodeData->AlarmCode.AlarmEvents.bits.Telecom4GModuleCommFail=1;
-		}
-		sleep(5);
-
-		return 0;
-	}
 
 	for(;;)
 	{
@@ -1185,37 +1174,48 @@ int main(void)
 					}
 					else
 					{
-						#ifdef SystemLogMessage
-						DEBUG_WARN("PPP interface not found.\n");
-						#endif
-
-						memset(ShmSysConfigAndInfo->SysConfig.TelecomInterface.TelcomIpAddress, 0 , sizeof ShmSysConfigAndInfo->SysConfig.TelecomInterface.TelcomIpAddress);
-
-						Dongle.cnt_pppFail++;
-						if(Dongle.cnt_pppFail > 5)
+						if(Load4gConfiguration() == FAIL)
+						{
+							DEBUG_ERROR("4G configuration value NG.\n");
+							if(ShmStatusCodeData!=NULL)
+							{
+								ShmStatusCodeData->AlarmCode.AlarmEvents.bits.Telecom4GModuleCommFail=1;
+							}
+						}
+						else
 						{
 							#ifdef SystemLogMessage
-							DEBUG_INFO("Dongle hardware reset...\n");
+							DEBUG_WARN("PPP interface not found.\n");
 							#endif
 
-							rstModule();
-						}
+							memset(ShmSysConfigAndInfo->SysConfig.TelecomInterface.TelcomIpAddress, 0 , sizeof ShmSysConfigAndInfo->SysConfig.TelecomInterface.TelcomIpAddress);
 
-						system("killall 4GDetection");
-						sleep(2);
+							Dongle.cnt_pppFail++;
+							if(Dongle.cnt_pppFail > 5)
+							{
+								#ifdef SystemLogMessage
+								DEBUG_INFO("Dongle hardware reset...\n");
+								#endif
 
-						if(Dongle.Model == DONGLE_QUECTEL)
-						{
-							system("/root/ppp/4GDetection /dev/ttyUSB3 &");
-							printf("4GDetection for primary device.\n");
-						}
-						else if(Dongle.Model == DONGLE_UBLOX)
-						{
-							system("/root/ppp/4GDetection /dev/ttyACM0 &");
-							printf("4GDetection for second device.\n");
+								rstModule();
+							}
+
+							system("killall 4GDetection");
+							sleep(2);
+
+							if(Dongle.Model == DONGLE_QUECTEL)
+							{
+								system("/root/ppp/4GDetection /dev/ttyUSB3 &");
+								printf("4GDetection for primary device.\n");
+							}
+							else if(Dongle.Model == DONGLE_UBLOX)
+							{
+								system("/root/ppp/4GDetection /dev/ttyACM0 &");
+								printf("4GDetection for second device.\n");
+							}
+							else
+							{}
 						}
-						else
-						{}
 
 						sleep(CheckConnectionInterval);
 					}