2020-03-27 /Edward Lien

1.PH RFID mode combine in whitelist mode.

Files:
1. As follow commit history

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

Hardware PWB P/n : xxxxxxxx
Hardware Version : XXXXXXXX

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

@@ -1065,7 +1065,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.10.60.6007.BT");
+	sprintf((char*)ShmSysConfigAndInfo->SysInfo.CsuRootFsFwRev, "D0.11.60.6007.BT");
 
 	// Get AC connector type from model name
 	for(uint8_t idx=0;idx<3;idx++)
@@ -2263,9 +2263,10 @@ int main(void)
 										switch(ShmSysConfigAndInfo->SysConfig.OfflinePolicy)
 										{
 											case OFF_POLICY_LOCALLIST:
-											case OFF_POLICY_PH_RFID:
 												ShmOCPP16Data->SpMsg.bits.AuthorizeReq = ON;
 												break;
+											case OFF_POLICY_PH_RFID:
+												break;
 											case OFF_POLICY_FREE:
 												break;
 											case OFF_POLICY_NOCHARGE:
@@ -2298,14 +2299,12 @@ int main(void)
 									if(ShmOCPP16Data->SpMsg.bits.AuthorizeConf ||
 									  (ShmSysConfigAndInfo->SysConfig.AuthorisationMode == AUTH_MODE_FREE) ||
 									  !ShmOCPP16Data->OcppConnStatus ||
-									  ((isValidLocalWhiteCard() == PASS) && (ShmSysConfigAndInfo->SysConfig.OfflinePolicy == OFF_POLICY_LOCALLIST))||
-									  ((isValidPHCard() == PASS) && (ShmSysConfigAndInfo->SysConfig.OfflinePolicy == OFF_POLICY_PH_RFID)))
+									  (((isValidLocalWhiteCard() == PASS) || (isValidPHCard() == PASS)) && (ShmSysConfigAndInfo->SysConfig.OfflinePolicy == OFF_POLICY_LOCALLIST)))
 									{
 										if((strcmp((char*)ShmOCPP16Data->Authorize.ResponseIdTagInfo.Status, "Accepted")==0) ||
 										   (ShmSysConfigAndInfo->SysConfig.AuthorisationMode == AUTH_MODE_FREE) ||
 										   (!ShmOCPP16Data->OcppConnStatus&&(ShmSysConfigAndInfo->SysConfig.OfflinePolicy == OFF_POLICY_FREE)) ||
-										   ((isValidLocalWhiteCard() == PASS) && (ShmSysConfigAndInfo->SysConfig.OfflinePolicy == OFF_POLICY_LOCALLIST)) ||
-										   ((isValidPHCard() == PASS) && (ShmSysConfigAndInfo->SysConfig.OfflinePolicy == OFF_POLICY_PH_RFID)))
+										   (((isValidLocalWhiteCard() == PASS)||(isValidPHCard() == PASS)) && (ShmSysConfigAndInfo->SysConfig.OfflinePolicy == OFF_POLICY_LOCALLIST)))
 										{
 											DEBUG_INFO("Authorize pass.\r\n");
 											//setSpeaker(ON,SPEAKER_SHORT);

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

@@ -1 +1 @@
-28
+29