Merge branch 'AW-Regular' of https://git.phihong.com.tw:30000/System_Integration/CSU3_AM335x into AW-Regular

EVSE/Modularization/ocppfiles/MessageHandler.c

@@ -3808,7 +3808,7 @@ int sendStopTransactionRequest(int gun_index)
 	sprintf(TempStopTransaction, "/Storage/OCPP/TempStopTransaction_%d", (gun_index+1));
 	//int idx_sample=0;
 
-	DEBUG_ERROR("sendStopTransactionRequest \n");
+	DEBUG_INFO("sendStopTransactionRequest \n");
 	memset(queuedata, 0, ARRAY_SIZE(queuedata));
 
 	//=========================== ENERGY_ACTIVE_IMPORT_REGISTER =======================================

EVSE/Projects/AW-CCS/Apps/main.c

@@ -33,7 +33,7 @@
 #define TIMEOUT_SPEC_HANDSHAKING_LED			185000
 #define TIMEOUT_SPEC_LOGPPRINTOUT				30000
 #define TIMEOUT_SPEC_PROFILE_PREPARE			5000
-#define TIMEOUT_SPEC_BS_HLC_HANDSHAKE			30000
+#define TIMEOUT_SPEC_BS_HLC_HANDSHAKE			60000
 #define TIMEOUT_SPEC_EV_READY					30000
 #define TIMEOUT_SPEC_CCS_HEARTBEAT_COUNT_RESET	10000
 #define TIMEOUT_SPEC_CCS_HANDSHAKE				120000
@@ -1361,7 +1361,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, "D0.38.00.0000.00");
+	sprintf((char*)ShmSysConfigAndInfo->SysInfo.CsuRootFsFwRev, "D0.39.00.0000.00");
 
 	// Get AC connector type from model name
 	for(uint8_t idx=0;idx<3;idx++)
@@ -2197,9 +2197,9 @@ void checkConnectionTimeout()
 		if(strcmp((char *)ShmOCPP16Data->ConfigurationTable.CoreProfile[ConnectionTimeOut].ItemData,"") != 0)
 		{
 			ShmCharger->timeoutSpec.Setting_Timeout_Spec = atoi((char *)ShmOCPP16Data->ConfigurationTable.CoreProfile[ConnectionTimeOut].ItemData);
-			if(ShmCharger->timeoutSpec.Setting_Timeout_Spec <= 0)
+			if(ShmCharger->timeoutSpec.Setting_Timeout_Spec < TIMEOUT_SPEC_BS_HLC_HANDSHAKE)
 			{
-				ShmCharger->timeoutSpec.Present_Timeout_Spec = TIMEOUT_SPEC_HANDSHAKING;
+				ShmCharger->timeoutSpec.Present_Timeout_Spec = TIMEOUT_SPEC_BS_HLC_HANDSHAKE;
 				//DEBUG_INFO("Handshaking timeout specification follow by OCPP Configuration : Fail. Value can't be zero or less than zero.\n.");
 			}
 			else
@@ -2268,7 +2268,8 @@ int main(void)
 		//==========================================
 		// Check task processing
 		//==========================================
-		checkTask();
+		if(ShmSysConfigAndInfo->SysInfo.AcChargingData[0].SystemStatus != SYS_MODE_BOOTING)
+			checkTask();
 
 		//==========================================
 		// Check connection timeout specification
@@ -2722,7 +2723,7 @@ 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)) ||
+								   (!ShmOCPP16Data->OcppConnStatus && (ShmSysConfigAndInfo->SysConfig.OfflinePolicy == OFF_POLICY_LOCALLIST) && (strcmp((char *)&ShmSysConfigAndInfo->SysConfig.OcppServerURL,"") == 0) ) ||
 								   (ShmSysConfigAndInfo->SysConfig.OfflinePolicy == OFF_POLICY_NOCHARGE))
 								{
 									if((strcmp((char*)ShmOCPP16Data->Authorize.ResponseIdTagInfo.Status, "Accepted")==0) ||
@@ -2813,7 +2814,7 @@ int main(void)
 								{
 									ShmCharger->gun_info[gun_index].acCcsInfo.ChargingPermission = OFF;	
 									ShmCharger->gun_info[gun_index].acCcsInfo.EVSENotification = NOTIFICATION_STOP;
-									DEBUG_INFO("BS/HLC 2 secs handshake timeout.\n");
+									DEBUG_INFO("BS/HLC %d secs handshake timeout.\n", (TIMEOUT_SPEC_BS_HLC_HANDSHAKE/1000));
 								}
 								
 								if((ShmCharger->gun_info[gun_index].acCcsInfo.ChargingPermission == OFF) && (ShmCharger->gun_info[gun_index].acCcsInfo.CpSetPWMDuty != CCS_PWM_DUTY_5))
@@ -3238,7 +3239,7 @@ int main(void)
 								{
 									if(ShmOCPP16Data->SpMsg.bits.AuthorizeConf ||
 									  (ShmSysConfigAndInfo->SysConfig.AuthorisationMode == AUTH_MODE_DISABLE) ||
-									  (!ShmOCPP16Data->OcppConnStatus && (ShmSysConfigAndInfo->SysConfig.OfflinePolicy == OFF_POLICY_LOCALLIST)) ||
+									  (!ShmOCPP16Data->OcppConnStatus && (ShmSysConfigAndInfo->SysConfig.OfflinePolicy == OFF_POLICY_LOCALLIST) && (strcmp((char *)&ShmSysConfigAndInfo->SysConfig.OcppServerURL,"") == 0)) ||
 									  (!ShmOCPP16Data->OcppConnStatus && (ShmSysConfigAndInfo->SysConfig.OfflinePolicy == OFF_POLICY_FREE)))
 									{
 										if((strcmp((char*)ShmOCPP16Data->Authorize.ResponseIdTagInfo.Status, "Accepted")==0) ||
@@ -3710,7 +3711,7 @@ int main(void)
 									{
 										if((strcmp((char*)ShmOCPP16Data->Authorize.ResponseIdTagInfo.Status, "Accepted")==0) ||
 										   (ShmSysConfigAndInfo->SysConfig.AuthorisationMode == AUTH_MODE_DISABLE) ||
-										   (!ShmOCPP16Data->OcppConnStatus && (isValidLocalWhiteCard() == PASS) && (ShmSysConfigAndInfo->SysConfig.OfflinePolicy == OFF_POLICY_LOCALLIST)) ||
+										   (!ShmOCPP16Data->OcppConnStatus && (isValidLocalWhiteCard() == PASS) && (ShmSysConfigAndInfo->SysConfig.OfflinePolicy == OFF_POLICY_LOCALLIST) && (strcmp((char *)&ShmSysConfigAndInfo->SysConfig.OcppServerURL,"") == 0)) ||
 										   (!ShmOCPP16Data->OcppConnStatus && (ShmSysConfigAndInfo->SysConfig.OfflinePolicy == OFF_POLICY_FREE)))
 										{
 											ShmCharger->gun_info[gun_index].isAuthPassEnd = ON;