2020-04-08 /Edward Lien

1.Bugs fixed about BLE stop charging request.

Files:
1. As follow commit history

Image version: D0.15.60.6007.BT
Image checksum: XXXXXXXX

Hardware PWB P/n : xxxxxxxx
Hardware Version : XXXXXXXX

EVSE/Projects/BYTON-GB/Apps/main.c

@@ -1068,7 +1068,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.14.60.6007.BT");
+	sprintf((char*)ShmSysConfigAndInfo->SysInfo.CsuRootFsFwRev, "D0.15.60.6007.BT");
 
 	// Get AC connector type from model name
 	for(uint8_t idx=0;idx<3;idx++)
@@ -2385,7 +2385,7 @@ int main(void)
 										   (!ShmOCPP16Data->OcppConnStatus&&(ShmSysConfigAndInfo->SysConfig.OfflinePolicy == OFF_POLICY_FREE)) ||
 										   (!ShmOCPP16Data->OcppConnStatus&&((isValidLocalWhiteCard() == PASS)||(isValidPHCard() == PASS)) && (ShmSysConfigAndInfo->SysConfig.OfflinePolicy == OFF_POLICY_LOCALLIST)))
 										{
-											DEBUG_INFO("Authorize pass.\r\n");
+											DEBUG_INFO("Start Authorize pass.\r\n");
 											//setSpeaker(ON,SPEAKER_SHORT);
 											setLedMotion(gun_index,LED_ACTION_RFID_PASS);
 											sleep(3);
@@ -2680,7 +2680,8 @@ int main(void)
 
 							// Off-line max condition check
 							if((ShmSysConfigAndInfo->SysConfig.AuthorisationMode == AUTH_MODE_DISABLE) ||
-							   ((ShmSysConfigAndInfo->SysConfig.AuthorisationMode == AUTH_MODE_ENABLE) && (ShmSysConfigAndInfo->SysConfig.OfflinePolicy != OFF_POLICY_NOCHARGE)))
+							   ((ShmSysConfigAndInfo->SysConfig.AuthorisationMode == AUTH_MODE_ENABLE) && (ShmSysConfigAndInfo->SysConfig.OfflinePolicy != OFF_POLICY_NOCHARGE)) ||
+							   (ShmSysConfigAndInfo->SysInfo.AcChargingData[gun_index].StartMethod == START_METHOD_BLE))
 							{
 								if(((ShmSysConfigAndInfo->SysConfig.OfflineMaxChargeDuration > 0) ? (ShmSysConfigAndInfo->SysInfo.AcChargingData[gun_index].PresentChargedDuration >= (ShmSysConfigAndInfo->SysConfig.OfflineMaxChargeDuration*60)) : (ShmSysConfigAndInfo->SysConfig.MaxChargingDuration > 0) && (ShmSysConfigAndInfo->SysInfo.AcChargingData[gun_index].PresentChargedDuration >= (ShmSysConfigAndInfo->SysConfig.MaxChargingDuration*60))))
 								{
@@ -2849,20 +2850,24 @@ int main(void)
 						//if(ShmCharger->gun_info[gun_index].legacyRequest.isLegacyRequest == ON)
 							//setSpeaker(ON,SPEAKER_SHORT);
 						
-						if((ShmSysConfigAndInfo->SysInfo.AcChargingData[gun_index].StartMethod == START_METHOD_RFID) && (ShmSysConfigAndInfo->SysInfo.AcChargingData[gun_index].PilotState != CP_STATE_A) )
+						if((ShmCharger->gun_info[gun_index].primaryMcuState.relay_state)&&(ShmCharger->gun_info[gun_index].legacyRequest.isLegacyRequest == ON))
 						{
-							DEBUG_INFO("Authorize pass.\r\n");
-							//setSpeaker(ON,SPEAKER_SHORT);
-							setLedMotion(gun_index,LED_ACTION_RFID_PASS);
-							sleep(3);								
+							if((ShmSysConfigAndInfo->SysInfo.AcChargingData[gun_index].StartMethod == START_METHOD_RFID) && (ShmSysConfigAndInfo->SysInfo.AcChargingData[gun_index].PilotState != CP_STATE_A) )
+							{
+								DEBUG_INFO("End Authorize pass.\r\n");						
+								//setSpeaker(ON,SPEAKER_SHORT);
+								setLedMotion(gun_index,LED_ACTION_RFID_PASS);
+								sleep(3);		
+							}
+							else
+							{}
 						}
 						else
 						{}
-						
+					
 						setRelay(gun_index, OFF);
+						setLedMotion(gun_index,LED_ACTION_STOP);
 						
-					
-
 						if(!ShmCharger->gun_info[gun_index].primaryMcuState.relay_state)
 						{
 

board-support/linux-4.9.59+gitAUTOINC+a75d8e9305-ga75d8e9305/.version

@@ -1 +1 @@
-23
+41