2020-06-03 /Edward Lien

Actions:
1.Change : main.h Reason : Add Ac_Ccs_Info items.
2.Merge from master.

Files:
1. As follow commit history

Image version: D0.09.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.08.00.0000.00");
+	sprintf((char*)ShmSysConfigAndInfo->SysInfo.CsuRootFsFwRev, "D0.09.00.0000.00");
 
 	// Get AC connector type from model name
 	for(uint8_t idx=0;idx<3;idx++)

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

@@ -478,16 +478,37 @@ typedef struct CCS_INFO
 	uint8_t		EVCCID[8];
 	uint8_t		EVSEID[40];
 	uint8_t		CCSLibRev[32];
-	uint16_t	CSUAlarmCode;
-	uint16_t	CCSAlarmCode;
-	uint8_t		PaymentOption;					/* 0x00 EIM
-												   0x01 Pnc */
+	uint8_t		EVSEModelName[32];
+	uint16_t	CSUAlarmStatusCode;
+	uint16_t	CCSAlarmStatusCode;
+	uint8_t		PaymentOption;					/* 0x00 EIM, 0x01 Pnc */
 	float		EVSEMaxCurrent;					/*unit: 1 amp*/
 	float		EVSEMinCurrent;					/*unit: 1 amp*/
 	float		EVSENominalVoltage;				/*unit: 1 volt*/
-	uint8_t		MeterID;						/*unit: 1 amp*/
+	uint8_t		MeterID[32];					/*unit: 1 amp*/
 	float		MeterReadingValue;				/*unit: Wh*/
-
+	uint8_t		EVOperation;					/*0:Charge, 1:Discharge*/
+	uint8_t		EVChargeProgress;				/*0: Stop
+													1: Start
+													2: Renegotiate
+													3: Standby */
+	uint8_t		SetCPPWMDuty;					/*unit: 1%
+													0: 0%
+													5: 5%
+													100: 100%*/
+	uint8_t		SetCP2StateE;					/*0:disable, 1:enable*/
+	uint8_t		CPPresentPWMDuty;				/*unit:1%*/
+	uint8_t		CPPresentState;					/*1: A (12V, no PWM)
+													2: B1 (9V, no PWM)
+													3: B2 (9V, with PWM)
+													4: C (6V, with PWM)
+													5: D (3V, with PWM)
+													6: E (0V, no PWM)
+													7: F (-12V, no PWM)
+													8: G (>12V)
+													9: H  (<12V)*/
+	float		CPPositiveVoltage;				/*uint: 1V*/
+	float		CPNegativeVoltage;				/*uint: 1V*/
 	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
@@ -495,7 +516,21 @@ typedef struct CCS_INFO
 												 
 	uint16_t	RcdStatus:1;					/* 0x00 no error
 												   0x01 an error */
-}Ccs_Info;
+	uint16_t	TempFlag3:1;
+	uint16_t	TempFlag4:1;
+	uint16_t	TempFlag5:1;
+	uint16_t	TempFlag6:1;
+	uint16_t	TempFlag7:1;
+	uint16_t	TempFlag8:1;
+	uint16_t	TempFlag9:1;
+	uint16_t	TempFlag10:1;
+	uint16_t	TempFlag11:1;
+	uint16_t	TempFlag12:1;
+	uint16_t	TempFlag13:1;
+	uint16_t	TempFlag14:1;
+	uint16_t	TempFlag15:1;
+	
+}Ac_Ccs_Info;
 
 typedef struct GUN_INFO
 {
@@ -520,7 +555,7 @@ typedef struct GUN_INFO
 	Mcu_Reset_Request								mcuResetRequest;
 	Set_Breathe_Led_Timing							setBreatheLedTiming;
 	Set_Led_Brightness								setLedBrightness;
-	Ccs_Info										ccsInfo;
+	Ac_Ccs_Info										acCcsInfo;
 	uint8_t											ccsHandshakeState;
 	uint8_t											chargingMode;
 	uint16_t										targetCurrent;