[Improve][AX80][main]

2022.04.14 / Folus Wen

Actions:
1. Fix wrong variable name.

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

@@ -957,7 +957,7 @@ int tcpSocketClient(void)
 	struct Message		output;
 
 	bzero(&info,sizeof(info));
-	if(ShmSysConfigAndInfo->SysConfig.isEnableLocalPowerSharging == 1)
+	if(ShmSysConfigAndInfo->SysConfig.isEnableLocalPowerSharing == 1)
 	{
 		ghbn = gethostbyname((char*)"127.0.0.1");
 	}
@@ -1329,7 +1329,7 @@ int main(void)
 	}
 
 	// Enable server if rotary switch not slave mode
-	if(ShmSysConfigAndInfo->SysConfig.isEnableLocalPowerSharging == 1)
+	if(ShmSysConfigAndInfo->SysConfig.isEnableLocalPowerSharing == 1)
 	{
 		// TCP socket server start
 		if(fork() == 0)

EVSE/Modularization/WebService.c

@@ -1121,7 +1121,7 @@ int main(int argc, char *argv[]) {
 			}
 			if( json_object_object_get_ex(jobj, "isEnableLocalPowerSharging", &val_obj) ) {
 				isEnableLocalPowerSharging = json_object_get_int(val_obj);
-				ShmSysConfigAndInfo->SysConfig.isEnableLocalPowerSharging = isEnableLocalPowerSharging;
+				ShmSysConfigAndInfo->SysConfig.isEnableLocalPowerSharing = isEnableLocalPowerSharging;
 			}
 			if( json_object_object_get_ex(jobj, "OcppReceiptrURL", &val_obj) ) {
 				OcppReceiptrURL = (char*)json_object_get_string(val_obj);
@@ -2541,7 +2541,7 @@ int main(int argc, char *argv[]) {
 		chargePointVendor = json_object_new_string((char *)&ShmSysConfigAndInfo->SysConfig.chargePointVendor);
 		MaintainServerURL = json_object_new_string((char *)&ShmSysConfigAndInfo->SysConfig.MaintainServerURL);
 		if(strcmp(IsDO, "AX") == 0 ){
-			isEnableLocalPowerSharging = json_object_new_int(ShmSysConfigAndInfo->SysConfig.isEnableLocalPowerSharging);
+			isEnableLocalPowerSharging = json_object_new_int(ShmSysConfigAndInfo->SysConfig.isEnableLocalPowerSharing);
 		}
 		if(strcmp(IsDO, "AX") == 0|| strcmp(IsAcDc, "D") == 0){
 			OcppReceiptrURL = json_object_new_string((char *)&ShmSysConfigAndInfo->SysConfig.OcppReceiptrURL);

EVSE/Projects/AX80/Apps/Module_ConfigTools.c

@@ -517,14 +517,14 @@ int main(void)
 			{
 				memset(cmd, 0x00, ARRAY_SIZE(cmd));
 				printf("\n ***** localloadbalance ***************************");
-				printf("\n  Current local loading balance: %d", ShmSysConfigAndInfo->SysConfig.isEnableLocalPowerSharging);
+				printf("\n  Current local loading balance: %d", ShmSysConfigAndInfo->SysConfig.isEnableLocalPowerSharing);
 				printf("\n  0: Disable.");
 				printf("\n  1: Enable.");
 				printf("\n **************************************************");
 				printf("\n  Please input local load balance mode: ");
 				scanf("%s", &cmd[0]);
 
-				ShmSysConfigAndInfo->SysConfig.isEnableLocalPowerSharging = ((0<=atoi(cmd))&&(atoi(cmd)<=1)?atoi(cmd):0);
+				ShmSysConfigAndInfo->SysConfig.isEnableLocalPowerSharing = ((0<=atoi(cmd))&&(atoi(cmd)<=1)?atoi(cmd):0);
 				if(ShmSysConfigAndInfo->SysConfig.RfidCardNumEndian)
 					DEBUG_INFO("Local loading balance: Enable\n");
 				else

EVSE/Projects/AX80/Apps/main.c

@@ -2844,15 +2844,27 @@ void InitEthernet()
 					}
 				}
 
+				// Check is need to reset WIFI/4G module power
 				if(!ShmSysConfigAndInfo->SysInfo.OcppConnStatus &&
-				   (((ShmSysConfigAndInfo->SysConfig.AthInterface.WifiMode == 1) && (ShmStatusCodeData->InfoCode.InfoEvents.bits.InternetDisconnectViaWiFi == ON)) || (((ShmSysConfigAndInfo->SysConfig.AthInterface.WifiMode == 2) && (ShmStatusCodeData->InfoCode.InfoEvents.bits.ApDisconnectViaWiFi == ON)))))
+
+				   ((ShmSysConfigAndInfo->SysConfig.AthInterface.WifiMode == 0) ||
+					((ShmSysConfigAndInfo->SysConfig.AthInterface.WifiMode == 1) && (ShmStatusCodeData->InfoCode.InfoEvents.bits.InternetDisconnectViaWiFi == ON)) ||
+					((ShmSysConfigAndInfo->SysConfig.AthInterface.WifiMode == 2) && (ShmStatusCodeData->InfoCode.InfoEvents.bits.ApDisconnectViaWiFi == ON))) &&
+
+				   ((ShmSysConfigAndInfo->SysConfig.TelecomInterface.TelcomEnabled == 0) ||
+				    ((ShmSysConfigAndInfo->SysConfig.TelecomInterface.TelcomEnabled == 1) && (ShmStatusCodeData->InfoCode.InfoEvents.bits.ApnDisconnectVia4Gi == ON))))
 				{
 					if(getDiffSecNow(startTime[0][TMR_IDX_RESET_WIFI]) > TIMEOUT_SPEC_RESET_WIFI_MODULE)
 					{
-						DEBUG_WARN("WIFI/4G module reset.\n");
-						gpio_set_value(GPIO_OUT_RST_4G_WIFI, ON);
-						sleep(1);
-						gpio_set_value(GPIO_OUT_RST_4G_WIFI, OFF);
+						if((ShmSysConfigAndInfo->SysConfig.AthInterface.WifiMode != 0) || (ShmSysConfigAndInfo->SysConfig.TelecomInterface.TelcomEnabled != 0))
+						{
+							DEBUG_WARN("WIFI/4G module reset.\n");
+							gpio_set_value(GPIO_OUT_RST_4G_WIFI, ON);
+							sleep(1);
+							gpio_set_value(GPIO_OUT_RST_4G_WIFI, OFF);
+						}
+
+						refreshStartTimer(&startTime[0][TMR_IDX_RESET_WIFI]);
 					}
 				}
 				else
@@ -2873,7 +2885,7 @@ void InitEthernet()
 			}
 
 			// Bridge ethernet to uap0 to get dynamic ip address
-			if(ShmSysConfigAndInfo->SysConfig.isEnableLocalPowerSharging &&
+			if(ShmSysConfigAndInfo->SysConfig.isEnableLocalPowerSharing &&
 			  (ShmSysConfigAndInfo->SysConfig.AthInterface.WifiMode == 2) &&
 			  (isUap0up() == PASS) &&
 			  (access("/sys/class/net/br0/address", F_OK) == -1))
@@ -4236,7 +4248,7 @@ void checkTask()
 		}
 
 		if((system("pidof -s Module_PowerSharing > /dev/null") != 0) &&
-			ShmSysConfigAndInfo->SysConfig.isEnableLocalPowerSharging)
+			ShmSysConfigAndInfo->SysConfig.isEnableLocalPowerSharing)
 		{
 			DEBUG_INFO("Module_PowerSharing not running, restart it.\n");
 			system ("/root/Module_PowerSharing &");
@@ -4640,7 +4652,7 @@ void checkChargingProfileLimit(uint8_t gun_index)
 	}
 
 	// Charging session target current check if OCPP disconnect and power sharing server connected
-	if(ShmSysConfigAndInfo->SysConfig.isEnableLocalPowerSharging > 0)
+	if(ShmSysConfigAndInfo->SysConfig.isEnableLocalPowerSharing > 0)
 	{
 		if(ShmSysConfigAndInfo->SysInfo.localSharingInfo.isConnectedSharingServer)
 		   ShmCharger->gun_info[gun_index].targetCurrent = ShmSysConfigAndInfo->SysInfo.localSharingInfo.AvailableShargingCurrent[gun_index]>ShmCharger->gun_info[gun_index].primaryMcuState.rating_current?ShmCharger->gun_info[gun_index].primaryMcuState.rating_current:ShmSysConfigAndInfo->SysInfo.localSharingInfo.AvailableShargingCurrent[gun_index];