2020-06-11 /Edward Lien

Actions:
1.pass SerialNumber to UserId in START_METHOD_FREE.
2.change CcsHeartBeat name.

Files:
1. As follow commit history

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

Hardware PWB P/N : XXXXXXX
Hardware Version : XXXXXXX

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

@@ -22,7 +22,7 @@
 #define TMR_IDX_LOGPPRINTOUT			2
 #define TMR_IDX_PROFILE_PREPARE			3
 #define TMR_IDX_BS_HLC_HANDSHAKE		4
-#define TMR_IDX_CCS_SOCKET_COUNT_RESET	5
+#define TMR_IDX_CCS_HEARTBEAT_COUNT_RESET	5
 #define TMR_IDX_6						6
 #define TMR_IDX_7						7
 #define TMR_IDX_8						8
@@ -34,7 +34,7 @@
 #define TIMEOUT_SPEC_LOGPPRINTOUT				30000
 #define TIMEOUT_SPEC_PROFILE_PREPARE			5000
 #define TIMEOUT_SPEC_BS_HLC_HANDSHAKE			2000
-#define TIMEOUT_SPEC_CCS_SOCKET_COUNT_RESET		10000
+#define TIMEOUT_SPEC_CCS_HEARTBEAT_COUNT_RESET		10000
 #define TIMEOUT_SPEC_CCS_HANDSHAKE				120000
 
 #define MtdBlockSize 					0x600000
@@ -1204,7 +1204,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.12.00.0000.00");
+	sprintf((char*)ShmSysConfigAndInfo->SysInfo.CsuRootFsFwRev, "D0.13.00.0000.00");
 
 	// Get AC connector type from model name
 	for(uint8_t idx=0;idx<3;idx++)
@@ -2427,6 +2427,7 @@ int main(void)
 						else
 						{
 							ShmSysConfigAndInfo->SysInfo.AcChargingData[gun_index].StartMethod = START_METHOD_FREE;
+							memcpy(ShmSysConfigAndInfo->SysConfig.UserId, ShmSysConfigAndInfo->SysConfig.SerialNumber, ARRAY_SIZE(ShmSysConfigAndInfo->SysConfig.SerialNumber));
 							DEBUG_INFO("Start Method : FREE..\r\n");
 						}
 
@@ -2705,7 +2706,7 @@ int main(void)
 									
 									setChargerMode(gun_index, SYS_MODE_CHARGING);
 									
-									ftime(&startTime[gun_index][TMR_IDX_CCS_SOCKET_COUNT_RESET]);
+									ftime(&startTime[gun_index][TMR_IDX_CCS_HEARTBEAT_COUNT_RESET]);
 								}	
 
 								//120 sec timeout
@@ -3009,17 +3010,17 @@ int main(void)
 							}						
 							break;
 						case CHARGING_MODE_HLC:
-							//if time up, clear CCS socket count
-							if(DiffTimebWithNow(startTime[gun_index][TMR_IDX_CCS_SOCKET_COUNT_RESET]) > TIMEOUT_SPEC_CCS_SOCKET_COUNT_RESET)
+							//if time up, clear CCS MSG count
+							if(DiffTimebWithNow(startTime[gun_index][TMR_IDX_CCS_HEARTBEAT_COUNT_RESET]) > TIMEOUT_SPEC_CCS_HEARTBEAT_COUNT_RESET)
 							{
-									ftime(&startTime[gun_index][TMR_IDX_CCS_SOCKET_COUNT_RESET]);
-									if(ShmCharger->gun_info[gun_index].acCcsInfo.CCSSocketCount > 0)
+									ftime(&startTime[gun_index][TMR_IDX_CCS_HEARTBEAT_COUNT_RESET]);
+									if(ShmCharger->gun_info[gun_index].acCcsInfo.CcsHeartBeat > 0)
 									{
-										ShmCharger->gun_info[gun_index].acCcsInfo.CCSSocketCount = 0;
+										ShmCharger->gun_info[gun_index].acCcsInfo.CcsHeartBeat = 0;
 									}
 									else
 									{
-										DEBUG_INFO("CCS could not get socket from car.\r\n");
+										DEBUG_INFO("CCS could not get MSG from car.\r\n");
 										
 										//setChargerMode(gun_index, SYS_MODE_TERMINATING);
 										//setRelay(gun_index, OFF);	

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

@@ -546,7 +546,7 @@ typedef struct CCS_INFO
 													9: H  (<12V)*/
 	float		CPPositiveVoltage;				/*uint: 1V*/
 	float		CPNegativeVoltage;				/*uint: 1V*/
-	uint32_t	CCSSocketCount;				/*unit: 1*/
+	uint32_t	CcsHeartBeat;				/*unit: 1*/
 	uint16_t 	ChargingPermission:1;				/*0x00: Not ready yet, stay in idle mode or go into terminating process.
 												  0x01: start charging process*/
 	uint16_t 	ConnectorLockerStatus:1;			/*0x00: released