浏览代码

2021.01.07 / Amos

Actions:
1. ATE add file for previous commit.

Files:
1. As follow commit history
amos 4 年之前
父节点
当前提交
1646a3493c
共有 1 个文件被更改,包括 36 次插入47 次删除
  1. 36 47
      EVSE/Projects/ATE/Apps/define.h

+ 36 - 47
EVSE/Projects/ATE/Apps/define.h

@@ -388,6 +388,8 @@ struct ChargingInfoData
 	unsigned char		PreviousSystemStatus;		// 0: Booting, 1: idle, 2: authorizing, 3: preparing, 4: charging, 5: terminating, 6: alarm, 7: fault
 	unsigned char		ATEStatus;
 	unsigned char		PreviousATEStatus;
+	unsigned char		ATEState;
+	unsigned char		PreviousATEState;
 	int 			ReservationId;
 	unsigned char 		IsAvailable;
 	float MaximumChargingVoltage;	//0~6553.5 volt
@@ -678,11 +680,11 @@ struct VCCU_V2G_EVSEPresentVoltage_DATA1
 	u_int8_t VCCU_V2G_EVSEPresentVoltage_Un :4;
 };
 
-struct VCCU_V2G_EVSEPresentVoltage_DATA
+struct VCCU_V2G_EVSEPresentVoltage
 {
 	struct VCCU_V2G_EVSEPresentVoltage_DATA1 DATA1;
 	u_int8_t VCCU_V2G_EVSEPresentVoltage_Mu;
-	u_int8_t VCCU_V2G_EVSEPresentVoltage_Va;
+	u_int16_t VCCU_V2G_EVSEPresentVoltage_Va;
 	u_int8_t VCCU_V2G_EVSEPresentVolta_0000;
 };
 
@@ -786,15 +788,15 @@ struct VCCU_V2G_EVSEMaximumPowerLimit_DATA
 	u_int8_t VCCU_V2G_EVSEMaximumPower_0001;
 };
 
-struct VCCU_V2G_EVSEMaximumCurrentLim_DATA1
+struct VCCU_V2G_EVSEMaximumCurrentLim_DATA
 {
 	u_int8_t VCCU_V2G_EVSEMaximumCurre_0002 :4;
 	u_int8_t VCCU_V2G_EVSEMaximumCurrentLim :2;
 };
 
-struct VCCU_V2G_EVSEMaximumCurrentLim_DATA
+struct VCCU_V2G_EVSEMaximumCurrentLim
 {
-	struct VCCU_V2G_EVSEMaximumCurrentLim_DATA1 DATA1;
+	struct VCCU_V2G_EVSEMaximumCurrentLim_DATA DATA;
 	u_int8_t VCCU_V2G_EVSEMaximumCurre_0003;
 	u_int16_t VCCU_V2G_EVSEMaximumCurre_0000;
 	u_int8_t VCCU_V2G_EVSEMaximumCurre_0001;
@@ -862,6 +864,7 @@ struct VCCU_V2G_EVMaximumPowerLimit_DATA
 	u_int8_t VCCU_V2G_EVMaximumPowerLimit_U;
 };
 
+
 struct VCCU_V2G_EVMaximumCurrentLimit_DATA1
 {
 	u_int8_t VCCU_V2G_EVMaximumCurrent_0000 :4;//VCCU_V2G_EVMaximumCurrentLimit_Unit A
@@ -875,13 +878,12 @@ struct VCCU_V2G_EVMaximumCurrentLimit
 		u_int8_t value:8;
 	}VCCU_V2G_EVMaximumCurrent_0002;
 	struct{
-		u_int16_t value:8;
+		u_int16_t value:16;
 	}VCCU_V2G_EVMaximumCurrent_0003;
 	struct{
 		u_int8_t value:8;
 	}VCCU_V2G_EVMaximumCurrent_0001;
 };
-
 struct VCCU_V2G_EVEnergyRequest_DATA1
 {
 	u_int8_t VCCU_V2G_EVEnergyRequest_Unit :4;
@@ -1089,6 +1091,30 @@ struct VCCU_ChargeFromVehicle
 	}bits;
 };
 
+struct VCCU_Requests
+{
+	u_int8_t VCCU_LED0_Request;//0.0
+	u_int8_t VCCU_LED1_Request;//0.0
+	u_int8_t VCCU_LED2_Request;//0.0
+	struct{
+		u_int8_t VCCU_HighSideOut0_Request:2;//3 0:Disable 1:Enable 2:Resvrved 3:SNA
+		u_int8_t VCCU_HighSideOut1_Request:2;//3 0:Disable 1:Enable 2:Resvrved 3:SNA
+		u_int8_t VCCU_HighSideOut2_Request:2;//3 0:Disable 1:Enable 2:Resvrved 3:SNA
+		u_int8_t VCCU_HighSideOut3_Request:2;//3 0:Disable 1:Enable 2:Resvrved 3:SNA
+	}byte3;
+	struct{
+		u_int8_t VCCU_HighSideOut4_Request:2;//3 0:Disable 1: Enable 2:Resvrved 3:SNA
+		u_int8_t VCCU_RTC_TimerRequest:2;//3 0:Not_requested 1:Requested 2:Resvrved 3:SNA
+		u_int8_t VCCU_PlugLock_MotorRequest:3;//7 0:Stop 1:DirectionA 2:DirectionB 3:Measurement 4:Reserved1 5:Reserved2 6:Reserved3 7:SNA
+	}byte4;
+	u_int8_t VCCU_RTC_TimerValue;//0
+	struct{
+		u_int8_t VCCU_ControlPilot_ChargeModeRe:3;//7 0:ModeB 1:ModeC 2:ModeD 3:Reserved1 4:Reserved2 5:Reserved3 6:Error 7:SNA
+		u_int8_t VCCU_ChargeUnit_Request:2;//3 0:Disable 1:Enable 2:EnableVentilation 3:SNA
+		u_int8_t VCCU_Inlet_MotorRequest:2;//3 0:Lock 1:Unlock 2:Reserved 3:SNA
+	}byte6;
+};
+
 struct VCCU_ChargeToVehicle
 {
 	struct{
@@ -1097,46 +1123,6 @@ struct VCCU_ChargeToVehicle
 	}bits;
 };
 
-struct VCCU_Requests_DATA4
-{
-	u_int8_t VCCU_HighSideOut0_Request:2;
-	u_int8_t VCCU_HighSideOut1_Request:2;
-	u_int8_t VCCU_HighSideOut2_Request:2;
-	u_int8_t VCCU_HighSideOut3_Request:2;
-};
-
-struct VCCU_Requests_DATA5
-{
-	u_int8_t VCCU_HighSideOut4_Request:2;
-	u_int8_t VCCU_RTC_TimerRequest:2;
-	u_int8_t VCCU_PlugLock_MotorRequest:3;
-};
-
-struct VCCU_Requests_DATA7
-{
-	u_int8_t VCCU_ControlPilot_ChargeModeRe:3;
-	u_int8_t VCCU_ChargeUnit_Request:2;
-	u_int8_t VCCU_Inlet_MotorRequest:2;
-};
-
-struct VCCU_Requests
-{
-	struct{
-		u_int8_t value:8;
-	}VCCU_LED0_Request;
-	struct{
-		u_int8_t value:8;
-	}VCCU_LED1_Request;
-	struct{
-		u_int8_t value:8;
-	}VCCU_LED2_Request;
-	struct VCCU_Requests_DATA4 DATA4;
-	struct VCCU_Requests_DATA5 DATA5;
-	struct{
-		u_int8_t value:8;
-	}VCCU_RTC_TimerValue;
-	struct VCCU_Requests_DATA7 DATA7;
-};
 
 struct VCCU_RTCStatus_DATA1
 {
@@ -1452,8 +1438,11 @@ struct VCCU
 	struct VCCU_V2G_EVMaximumCurrentLimit	v2g_EVMaximumCurrentLimit;
 	struct VCCU_V2G_EVTargetCurrent			v2g_EVTargetCurrent;
 	struct VCCU_V2G_EVTargetVoltage			v2g_EVTargetVoltage;
+	struct VCCU_V2G_EVSEPresentVoltage		v2g_EVSEPresentVoltage;
+	struct VCCU_V2G_EVSEMaximumCurrentLim	v2g_EVSEMaximumCurrentLim;
 	struct VCCU_PTC0						ptc0;
 	struct VCCU_PTC1						ptc1;
+	struct VCCU_Requests					requests;
 };
 
 enum MOTHERBOARD_MSG_TYPE{