Forráskód Böngészése

* * * * * * * * * 2019.09.12 / Kathy Yeh
Actions:
1. add items:
(1) Timeout_Secs, Ping_Pong_Interval for struct OCPP16Data
(2) ReservationId. AcChargingVoltage . AcChargingCurrent for struct ChargingInfoData
(3) add AcPhaseCount for struct SysConfigData

2. modify items:
(1)StopReason -> StopReason[20] for struct StructStopTransaction
(2)ErrorCode -> ErrorCode[25] for struct StructStatusNotification
(3)Status -> Status[20] for struct StructStatusNotification
(4)CoreProfile[28] -> CoreProfile[34] for struct OCPP16ConfigurationTable

Files:
1. As follow commit history.

Image version: D0.00.XX.XXXX.PH
Image checksum: XXXXXXXX

Hardware PWB P/N : XXXXXXX
Hardware Version : XXXXXXX

Kathy Yeh 5 éve
szülő
commit
68af8415c0
1 módosított fájl, 15 hozzáadás és 6 törlés
  1. 15 6
      EVSE/Projects/define.h

+ 15 - 6
EVSE/Projects/define.h

@@ -131,6 +131,7 @@ struct SysConfigData
 	unsigned short			Ccs1PlugInTime;				//0~65535
 	unsigned short			Ccs2PlugInTimes;			//0~65535
 	unsigned short			ChademoPlugInTimes;			//0~65535
+	unsigned char			chargePointVendor[32];	//the Vendor of the ChargePoint
 	/**************Charging***************/
 	unsigned short			MaxChargingEnergy;			//0: no limit,	1 ~ 65535	kWh
 	unsigned short			MaxChargingPower;			//0: rating value, 1 ~ RATING_POWER	kW"
@@ -163,6 +164,7 @@ struct ChargingInfoData
 	unsigned char			type_index;
 	unsigned char			SystemStatus;				//0: Booting, 1: idle, 2: authorizing, 3: preparing, 4: charging, 5: terminating, 6: alarm, 7: fault
 	unsigned char			PreviousSystemStatus;		// 0: Booting, 1: idle, 2: authorizing, 3: preparing, 4: charging, 5: terminating, 6: alarm, 7: fault
+	int 					ReservationId;	
 	unsigned char			CardNumber[32];
 	float					MaximumChargingVoltage;		//0~6553.5 volt
 	float					AvailableChargingCurrent;	//0~6553.5 amp
@@ -2582,7 +2584,7 @@ struct StructStopTransaction
 	int 						MeterStop;
 	unsigned char 				Timestamp[28];
 	int 						TransactionId;
-	unsigned char 				StopReason;				/*	"EmergencyStop",
+	unsigned char 				StopReason[20];				/*	"EmergencyStop",
 															"EVDisconnected",
 															"HardReset",
 															"Local",
@@ -2601,7 +2603,7 @@ struct StructStopTransaction
 struct StructStatusNotification
 {
 	int 			ConnectorId;
-	unsigned char 	ErrorCode;				/*	"ConnectorLockFailure",
+	unsigned char 	ErrorCode[25];				/*	"ConnectorLockFailure",
 								                "EVCommunicationError",
 								                "GroundFailure",
 								                "HighTemperature",
@@ -2620,7 +2622,7 @@ struct StructStatusNotification
 								            */
 
 	unsigned char 	Info[50];
-	unsigned char 	Status;					/*	"Available",
+	unsigned char 	Status[20];					/*	"Available",
 								                "Preparing",
 								                "Charging",
 								                "SuspendedEVSE",
@@ -2641,13 +2643,14 @@ struct StructCancelReservation
 {
 	int 				ReservationId;
 	unsigned char 		ResponseStatus[16];		//Accepted, Rejected
-
+	unsigned char 		guid[37];
 };
 struct StructChangeAvailability
 {
 	int 				ConnectorId;
 	unsigned char 		Type[16];					//Inoperative, Operative
 	unsigned char 		ResponseStatus[16];		//Accepted, Rejected, Scheduled
+	unsigned char 		guid[37];
 };
 struct StructChangeConfiguration
 {
@@ -2725,6 +2728,7 @@ struct StructRemoteStartTransaction
 	unsigned char 					IdTag[20];
 	struct StructChargingProfile	ChargingProfile;
 	unsigned char 					ResponseStatus[10];	//Accepted,	Rejected
+	unsigned char 					guid[37];
 };
 struct StructRemoteStopTransaction
 {
@@ -2739,11 +2743,13 @@ struct StructReserveNow
 	unsigned char 		ParentIdTag[20];
 	int					ReservationId;
 	unsigned char 		ResponseStatus[12];		//Accepted, Faulted, Occupied, Rejected, Unavailable
+	unsigned char 		guid[37];   			//OCPP Server request message uuid
 };
 struct StructReset
 {
 	unsigned char		Type[8];			//Hard,	Soft
 	unsigned char 		ResponseStatus[10];	//Accepted,	Rejected
+	unsigned char 		guid[37];   		//OCPP Server request message uuid
 };
 struct StructSendLocalList
 {
@@ -2775,6 +2781,7 @@ struct StructUnlockConnector
 {
 	int					ConnectorId;
 	unsigned char 		ResponseStatus[16];	//Unlocked,	UnlockFailed, NotSupported
+	unsigned char 		guid[37];   		//OCPP Server request message uuid
 };
 struct StructUpdateFirmware
 {
@@ -2794,7 +2801,7 @@ struct OCPP16ConfigurationItem
 struct OCPP16ConfigurationTable
 {
 	//please refer to OCPP 1.6 chapter 9
-	struct OCPP16ConfigurationItem 			CoreProfile[28];
+	struct OCPP16ConfigurationItem 			CoreProfile[34];
 	struct OCPP16ConfigurationItem 			LocalAuthListManagementProfile[3];
 	struct OCPP16ConfigurationItem 			ReservationProfile[1];
 	struct OCPP16ConfigurationItem 			SmartChargingProfile[5];
@@ -2802,9 +2809,11 @@ struct OCPP16ConfigurationTable
 
 struct OCPP16Data
 {
-	unsigned char 							OcppServerURL[512];		//http: non-secure OCPP 1.5-S, https: secure OCPP 1.5-S, ws: non-secure OCPP 1.6-J, wss: secure OCPP 1.6-J"
+		unsigned char 							OcppServerURL[512];		//http: non-secure OCPP 1.5-S, https: secure OCPP 1.5-S, ws: non-secure OCPP 1.6-J, wss: secure OCPP 1.6-J"
 		unsigned char 							ChargeBoxId[128];
 		unsigned char 							OcppConnStatus;			//0: disconnected, 1: connected
+		unsigned int 							Timeout_Secs;
+		unsigned short 							Ping_Pong_Interval;
 		union
 		{
 			//Operations Initiated by Charge Point