Merge branch 'master' into AW-CCS

EVSE/Modularization/Module_4g.c

@@ -2,9 +2,9 @@
  *  Module_4g.c
  *
  *  Created on: 2019-11-29
- *  Update on: 2023-01-18
+ *  Update on: 2023-02-01
  *  Author: Eason Yang / Folus Wen
- *  Version: V0.16
+ *  Version: V0.17
  */
 
 #include    <sys/types.h>
@@ -112,7 +112,7 @@ void substr(char *dest, const char* src, unsigned int start, unsigned int cnt);
 
 char *portName[3] 				= {"/dev/ttyUSB2", "/dev/ttyACM2", "/dev/ttyACM2"};
 char *valid_Internet[2] 		= {"8.8.8.8", "180.76.76.76"};
-char *Version_And_Date[2]		= {"V0.16","2023-01-18"};
+char *Version_And_Date[2]		= {"V0.17","2023-02-01"};
 pid_t	pid;
 
 struct dongle_info
@@ -1824,7 +1824,7 @@ int main(void)
 		else
 		{
 			// Disable 4G
-			ShmStatusCodeData->InfoCode.InfoEvents.bits.InternetDisconnectVia4Gi = 0;
+			ShmStatusCodeData->InfoCode.InfoEvents.bits.InternetDisconnectVia4Gi = 1;
 			ShmStatusCodeData->InfoCode.InfoEvents.bits.ApnDisconnectVia4Gi= 0;
 			ShmStatusCodeData->AlarmCode.AlarmEvents.bits.Telecom4GModuleCommFail = 0;
 			ShmStatusCodeData->FaultCode.FaultEvents.bits.Telecom4GModuleBroken = 0;

EVSE/Modularization/Module_Wifi.c

@@ -2,9 +2,9 @@
  *  Module_Wifi.c
  *
  *  Created on: 2020-01-14
- *  Update on: 2022-02-09
+ *  Update on: 2023-02-01
  *  Author: Jerry Wang, Eason Yang, Folus Wen
- *  Version: V0.14
+ *  Version: V0.26
  *
  *  Issue tracking:
  *  1. Set AP mode should be waiting for 30 seconds.
@@ -261,7 +261,7 @@ int isValidCheckSum(uint8_t *message);
 char *Support_InterfaceSTA[2]	= {"mlan0", "wlan0"};
 char *Support_InterfaceAP[1]	= {"uap0"};
 char *valid_Internet[3]			= {"8.8.8.8", "180.76.76.76", "192.168.10.10"};
-char *Version_And_Date[2]		= {"V0.25","2022-06-27"};
+char *Version_And_Date[2]		= {"V0.26","2023-02-01"};
 int protocol_Version [] 		= {0,7,0};
 
 int StoreLogMsg(const char *fmt, ...)
@@ -4758,7 +4758,7 @@ void proc_killConnection()
 	char cmdBuf[512];
 	
 	// Initialization flags when network is disable mode
-	ShmStatusCodeData->InfoCode.InfoEvents.bits.InternetDisconnectViaWiFi=OFF;
+	ShmStatusCodeData->InfoCode.InfoEvents.bits.InternetDisconnectViaWiFi=ON;
 	ShmStatusCodeData->InfoCode.InfoEvents.bits.ApDisconnectViaWiFi=OFF;
 	ShmSysConfigAndInfo->SysConfig.AthInterface.WifiNetworkConn=OFF;
 	ShmStatusCodeData->FaultCode.FaultEvents.bits.WiFiModuleBroken=OFF;