2020-12-08 / Eason Yang

Action
1.Improved : InitEthernet() for initial eth0
2.Rename : Version
3.Improved : added logic for authorization OFFLINE_POLICY_FREE_CHARGE
4.Added : Initialzation TelecomEnabled for 1: Enable

File
1. main.c
Action 1
Action 2
Action 3

2. Module_FactoryConfig.c
Action 4

Version : V0.47.XX.XXXX.XX

EVSE/Projects/Noodoe/Apps/Module_FactoryConfig.c

@@ -314,6 +314,7 @@ int main(int argc, char *argv[])
 	SysConfig.AthInterface.WifiDhcpClient = 0;	// 0: Enable	1: Disable
 
 	strcpy((char*)SysConfig.TelecomInterface.TelcomApn, "");
+	SysConfig.TelecomInterface.TelcomEnabled = 1; 	//0: disable, 1: enable
 	SysConfig.TelecomInterface.TelcomSimStatus = 0;	// SIM card status
 	SysConfig.TelecomInterface.TelcomModemMode = 0;	//0: No services	1: CDMA		2: GSM/GPRS	3: WCDMA	4: GSM/WCDMA	5: TD_SCDMA		6: Unknown
 

EVSE/Projects/Noodoe/Apps/main.c

@@ -937,20 +937,17 @@ void InitEthernet()
 	//unsigned int address;
 
 	//Init Eth0 for internet
-	if(isInterfaceUp("eth0")==PASS)
-	{
-		memset(tmpbuf,0,256);
-		sprintf(tmpbuf,"/sbin/ifconfig eth0 %s netmask %s up &",
-		ShmSysConfigAndInfo->SysConfig.Eth0Interface.EthIpAddress,
-		ShmSysConfigAndInfo->SysConfig.Eth0Interface.EthSubmaskAddress);
-		system(tmpbuf);
-		memset(tmpbuf,0,256);
-		sprintf(tmpbuf,"route add default gw %s eth0 &",
-		ShmSysConfigAndInfo->SysConfig.Eth0Interface.EthGatewayAddress);
-		system(tmpbuf);
-		system("/sbin/ifconfig eth0:1 192.168.201.201 netmask 255.255.255.248 up &");
-		system("ifconfig lo up &");
-	}
+	memset(tmpbuf,0,256);
+	sprintf(tmpbuf,"/sbin/ifconfig eth0 %s netmask %s up &",
+	ShmSysConfigAndInfo->SysConfig.Eth0Interface.EthIpAddress,
+	ShmSysConfigAndInfo->SysConfig.Eth0Interface.EthSubmaskAddress);
+	system(tmpbuf);
+	memset(tmpbuf,0,256);
+	sprintf(tmpbuf,"route add default gw %s eth0 &",
+	ShmSysConfigAndInfo->SysConfig.Eth0Interface.EthGatewayAddress);
+	system(tmpbuf);
+	system("/sbin/ifconfig eth0:1 192.168.201.201 netmask 255.255.255.248 up &");
+	system("ifconfig lo up &");
 
 	if(isInterfaceUp("eth1")==PASS)
 	{
@@ -1273,7 +1270,7 @@ void get_firmware_version(unsigned char gun_index)
 	strcpy((char*)ShmSysConfigAndInfo->SysInfo.CsuPrimFwRev, ShmCharger->gun_info[gun_index].ver.Version_FW);
 
 	// Get CSU root file system version
-	sprintf((char*)ShmSysConfigAndInfo->SysInfo.CsuRootFsFwRev, "V0.46.00.0000.00");
+	sprintf((char*)ShmSysConfigAndInfo->SysInfo.CsuRootFsFwRev, "V0.47.00.0000.00");
 
 	// Get AC connector type from model name
 	for(uint8_t idx=0;idx<3;idx++)
@@ -2591,9 +2588,8 @@ int main(void)
 						{
 							case START_METHOD_RFID:
 								if((ShmOCPP16Data->SpMsg.bits.AuthorizeConf) ||
-								   (!ShmOCPP16Data->OcppConnStatus && (ShmSysConfigAndInfo->SysConfig.OfflinePolicy == OFF_POLICY_FREE)) ||
-								   (!ShmOCPP16Data->OcppConnStatus && (ShmSysConfigAndInfo->SysConfig.OfflinePolicy == OFF_POLICY_LOCALLIST) && (strcmp((char *)&ShmSysConfigAndInfo->SysConfig.OcppServerURL,"") == 0)) ||
-								   (ShmSysConfigAndInfo->SysConfig.OfflinePolicy == OFF_POLICY_NOCHARGE))
+								   (!ShmOCPP16Data->OcppConnStatus && ((ShmSysConfigAndInfo->SysConfig.OfflinePolicy == OFF_POLICY_FREE) || (ShmSysConfigAndInfo->SysConfig.OfflinePolicy == OFF_POLICY_NOCHARGE))) ||
+								   (!ShmOCPP16Data->OcppConnStatus && (ShmSysConfigAndInfo->SysConfig.OfflinePolicy == OFF_POLICY_LOCALLIST) && (strcmp((char *)&ShmSysConfigAndInfo->SysConfig.OcppServerURL,"") == 0)))
 								{
 									DEBUG_INFO("ShmOCPP16Data->Authorize.ResponseIdTagInfo.Status: %s \n", ShmOCPP16Data->Authorize.ResponseIdTagInfo.Status);