2020-05-29 /Edward Lien

Actions:
1.Change : main.c Reason : Fixed stop charging need to match startmethod.

Files:
1. As follow commit history

Image version: D0.08.XX.XXXX.XX
Image checksum: XXXXXXXX

Hardware PWB P/N : XXXXXXX
Hardware Version : XXXXXXX

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

@@ -1182,7 +1182,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.07.00.0000.00");
+	sprintf((char*)ShmSysConfigAndInfo->SysInfo.CsuRootFsFwRev, "D0.08.00.0000.00");
 
 	// Get AC connector type from model name
 	for(uint8_t idx=0;idx<3;idx++)
@@ -2323,7 +2323,7 @@ int main(void)
 						}
 						
 						ShmCharger->gun_info[gun_index].ccsHandshakeState = HANDSHAKE_DUTY_5;
-						ShmCharger->gun_info[gun_index].chargingMode = CHARGING_MODE_BC;
+						ShmCharger->gun_info[gun_index].chargingMode = CHARGING_MODE_BS;
 					}
 
 					if(((ShmSysConfigAndInfo->SysConfig.AuthorisationMode == AUTH_MODE_DISABLE) && (ShmSysConfigAndInfo->SysInfo.AcChargingData[gun_index].PilotState == CP_STATE_B)) ||
@@ -2537,7 +2537,7 @@ int main(void)
 								ShmCharger->gun_info[gun_index].primaryMcuCp_Pwn_Duty.max_current = CCS_PWM_DUTY_CP_STAT_E;
 								ShmCharger->gun_info[gun_index].mcuFlag.isSetCpPwmDuty = ON;						
 								ShmCharger->gun_info[gun_index].ccsHandshakeState = HANDSHAKE_CP_STATE_E;
-								ShmCharger->gun_info[gun_index].chargingMode = CHARGING_MODE_BC;
+								ShmCharger->gun_info[gun_index].chargingMode = CHARGING_MODE_BS;
 								DEBUG_INFO("CCS 2 secs handshake timeout.\r\n");
 							}							
 							break;	
@@ -2654,7 +2654,7 @@ int main(void)
 					}
 					switch(ShmCharger->gun_info[gun_index].chargingMode)
 					{
-						case CHARGING_MODE_BC:
+						case CHARGING_MODE_BS:
 							if((ShmCharger->gun_info[gun_index].rfidReq == ON) ||
 							   (ShmCharger->gun_info[gun_index].bleConfigData.isRequestStop == ON) ||
 							   (ShmOCPP16Data->CsMsg.bits[gun_index].RemoteStopTransactionReq == ON)||
@@ -2862,7 +2862,7 @@ int main(void)
 								}
 							}						
 							break;
-						case CHARGING_MODE_HL:
+						case CHARGING_MODE_HLC:
 							
 							break;
 						default:
@@ -2888,7 +2888,7 @@ int main(void)
 					}
 					switch(ShmCharger->gun_info[gun_index].chargingMode)
 					{
-						case CHARGING_MODE_BC:
+						case CHARGING_MODE_BS:
 								// If RFID SN different with start user, it need to authorize ID
 								if((ShmCharger->gun_info[gun_index].rfidReq == ON) && !isMatchStartUser(gun_index))
 								{
@@ -2938,6 +2938,8 @@ int main(void)
 											}
 										}
 										DEBUG_INFO("End request User Id : %s\r\n", ShmSysConfigAndInfo->SysConfig.UserId);
+										DEBUG_INFO("Start method : %d...\r\n ", ShmSysConfigAndInfo->SysInfo.AcChargingData[gun_index].StartMethod);
+
 
 										if(ShmSysConfigAndInfo->SysInfo.AcChargingData[gun_index].StartMethod == START_METHOD_RFID)
 										{
@@ -2972,6 +2974,21 @@ int main(void)
 													break;
 											}
 										}
+										else if(ShmSysConfigAndInfo->SysInfo.AcChargingData[gun_index].StartMethod == START_METHOD_BACKEND)
+										{
+											ShmCharger->gun_info[gun_index].rfidReq = OFF;
+											DEBUG_INFO("Need to match with start method : START_METHOD_BACKEND...\r\n");
+											setChargerMode(gun_index, SYS_MODE_CHARGING);
+										}
+										else if (ShmSysConfigAndInfo->SysInfo.AcChargingData[gun_index].StartMethod == START_METHOD_BLE)
+										{
+											ShmCharger->gun_info[gun_index].rfidReq = OFF;
+											DEBUG_INFO("Need to match with start method : START_METHOD_BLE...\r\n");
+											setChargerMode(gun_index, SYS_MODE_CHARGING);
+										}
+										else
+										{}
+
 									}
 									else
 									{
@@ -3047,7 +3064,7 @@ int main(void)
 									}
 								}
 								break;
-						case CHARGING_MODE_HL:
+						case CHARGING_MODE_HLC:
 								break;
 						default:
 								break;
@@ -3061,7 +3078,7 @@ int main(void)
 					
 					switch(ShmCharger->gun_info[gun_index].chargingMode)
 					{
-						case CHARGING_MODE_BC:
+						case CHARGING_MODE_BS:
 								if(ShmOCPP16Data->MsMsg.bits.ResetReq)
 								{
 									if(strcmp((char*)ShmOCPP16Data->Reset.Type, "Hard")==0)
@@ -3104,7 +3121,7 @@ int main(void)
 								DB_Insert_Record(localDb, gun_index);
 								setChargerMode(gun_index, SYS_MODE_IDLE);
 								break;
-						case CHARGING_MODE_HL:
+						case CHARGING_MODE_HLC:
 								break;
 						default:
 								break;

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

@@ -132,8 +132,8 @@
 #define HANDSHAKE_NORMAL_CP				5
 #define HANDSHAKE_NORMAL_CCS			6
 
-#define	CHARGING_MODE_BC				0
-#define	CHARGING_MODE_HL				1
+#define	CHARGING_MODE_BS				0
+#define	CHARGING_MODE_HLC				1
 
 
 #define DEBUG_INFO(format, args...) StoreLogMsg("[%s:%d][%s][Info] "format, __FILE__, __LINE__, __FUNCTION__, ##args)