2021-11-15 / Eason Yang

Action:
1. Improve : Preparing to charging logic improved.

File:
1. main.c
Action 1

Firmware version: V0.70.XX.XXXX.XX

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

@@ -2292,7 +2292,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.69.00.0000.00");
+	sprintf((char*)ShmSysConfigAndInfo->SysInfo.CsuRootFsFwRev, "V0.70.00.0000.00");
 
 	// Get AC connector type from model name
 	for(uint8_t idx=0;idx<3;idx++)
@@ -4260,14 +4260,15 @@ int main(void)
 					}
 					else if((ShmSysConfigAndInfo->SysInfo.AcChargingData[gun_index].PilotState == CP_STATE_B) || (ShmSysConfigAndInfo->SysInfo.AcChargingData[gun_index].PilotState == CP_STATE_C))
 					{
-						setRequest(gun_index,ON);
 						ftime(&startTime[gun_index][TMR_IDX_HANDSHAKING]);
 						ShmCharger->gun_info[gun_index].isGunPlugged = YES;
 						
 						// Set relay on when the system is state C
-						//setRelay(gun_index,ON);
-						//if((ShmCharger->gun_info[gun_index].primaryMcuState.relay_state == ON))
-						//{
+						if(ShmSysConfigAndInfo->SysInfo.AcChargingData[gun_index].PilotState == CP_STATE_C)
+							setRequest(gun_index,ON);
+						
+						if((ShmCharger->gun_info[gun_index].primaryMcuState.relay_state == ON) || (ShmCharger->gun_info[gun_index].targetCurrent == 0))
+						{
 							ocpp_set_unlocker_req(gun_index, OFF);
 							ShmSysConfigAndInfo->SysInfo.AcChargingData[gun_index].PresentChargedEnergy = 0;
 							getDateTimeString((char*)ShmSysConfigAndInfo->SysInfo.AcChargingData[gun_index].StartDateTime);
@@ -4278,7 +4279,7 @@ int main(void)
 							ocpp_set_starttransaction_req(gun_index, ON);
 
 							setChargerMode(gun_index, SYS_MODE_CHARGING);
-						//}
+						}
 					}
 
 					break;