Merge branch 'master' into AW-Regular

EVSE/Modularization/Infypwr_PsuCommObj.c

@@ -572,7 +572,7 @@ void SetWalkInConfig(byte group, byte enable, byte sec)
 	SendCmdToPsu(cmd, data, sizeof(data));
 }
 
-void SetDirModulePresentOutput(byte group, int voltage, int current, byte _switch)
+void SetDirModulePresentOutput(byte group, int voltage, int current, byte _switch, byte _interRelay)
 {
 	byte data[8];
 	uint cmd = TEST_PRESENT_OUT;  //0x180100E5
@@ -587,6 +587,8 @@ void SetDirModulePresentOutput(byte group, int voltage, int current, byte _switc
 	data[3] = current & 0xFF;
 	// ¶} / Ãö
 	data[4] = _switch;
+	// Internal Relay
+	data[5] = _interRelay;
 
 	if (group == SYSTEM_CMD)
 		cmd |= INFYPWR_BROADCAST;

EVSE/Modularization/Infypwr_PsuCommObj.h

@@ -138,7 +138,7 @@ void FanNoiseInfo(byte group, byte value);
 void SetWalkInConfig(byte group, byte enable, byte sec);
 
 /*Ver : 9.06 used*/
-void SetDirModulePresentOutput(byte group, int voltage, int current, byte _switch);
+void SetDirModulePresentOutput(byte group, int voltage, int current, byte _switch, byte _interRelay);
 /*Get Cmd*/
 void GetStatus(byte group);
 void GetFanSpeed(byte group);

EVSE/Projects/define.h

@@ -1101,15 +1101,15 @@ char InfoStatusCode[384][6]=
 	"023808",	//CCS:CCS_SECC_ResponseCode_FAILED_reserved_5
 	"023809",	//CCS:CCS_SECC_TIMEOUT_SLAC_TT_EVSE_SLAC_init
 	"023810",	//CCS:CCS_SECC_TIMEOUT_SLAC_TP_match_response
-	"023811",	//CCS:CCS_SECC_TIMEOUT_SLAC_TT_match_sequence
+	"023811",	//CCS:CCS_SECC_TIMEOUT_CM_START_ATTEN_CHAR_IND
 	"023812",	//CCS:CCS_SECC_TIMEOUT_SLAC_TT_EVSE_match_MNBC
 	"023813",	//CCS:CCS_SECC_TIMEOUT_SLAC_TP_EVSE_avg_atten_calc
-	"023814",	//CCS:CCS_SECC_TIMEOUT_SLAC_TT_match_response
-	"023815",	//CCS:CCS_SECC_TIMEOUT_SLAC_TP_EVSE_match_session
+	"023814",	//CCS:CCS_SECC_TIMEOUT_SLAC_CM_ATTEN_CHAR_RSP
+	"023815",	//CCS:CCS_SECC_TIMEOUT_SLAC_CM_VALIDATE_REQ_1ST__CM_SLAC_MATCH_REQ
 	"023816",	//CCS:CCS_SECC_TIMEOUT_SLAC_TT_EVSE_assoc_session
 	"023817",	//CCS:CCS_SECC_TIMEOUT_SLAC_TT_EVSE_vald_toggle
-	"023818",	//CCS:CCS_SECC_TIMEOUT_SLAC_reserved_1
-	"023819",	//CCS:CCS_SECC_TIMEOUT_SLAC_reserved_2
+	"023818",	//CCS:CCS_SECC_TIMEOUT_SLAC_CM_MNBC_SOUND_IND
+	"023819",	//CCS:CCS_SECC_TIMEOUT_SLAC_CM_VALIDATE_REQ_2ND__CM_SLAC_MATCH_REQ
 	"023820",	//CCS:CCS_SECC_TIMEOUT_SLAC_reserved_3
 	"023821",	//CCS:CCS_SECC_TIMEOUT_SLAC_reserved_4
 	"023822",	//CCS:CCS_SECC_TIMEOUT_SLAC_reserved_5
@@ -1448,7 +1448,8 @@ struct InfoCodeData
 			unsigned char CcsTP_EVSE_match_session:1;			//bit 3
 			unsigned char CcsTT_EVSE_assoc_session:1;			//bit 4
 			unsigned char CcsTT_EVSE_vald_toggle:1;			//bit 5
-			unsigned char :2;					//bit 6~7 reserved
+			unsigned char CcsSeccSlacTimeoutCmMnbcSound:1;			//bit 6 reserved
+			unsigned char CcsSeccSlacTimeoutCmValidateReq:1;			//bit 7 reserved
 			//InfoVal[19]
 			unsigned char :3;					//bit 0~2 reserved
 			unsigned char CcsUDP_TT_match_join:1;			//bit 3