更新 'EVSE/Projects/define.h'

1. modify  OCPP16Data struct  2. remove GUN_NUM  constant

EVSE/Projects/define.h

@@ -40,7 +40,6 @@ Storage					0x05A00000-0x7FFFFFFF		1958 MB
 #define CHAdeMO_QUANTITY	1
 #define CCS_QUANTITY		1
 #define GB_QUANTITY		1
-#define GUN_NUM				1		//OCPP
 
 
 /*SystemLog message*/
@@ -2687,112 +2686,126 @@ struct OCPP16Data
 	unsigned char 							OcppConnStatus;			//0: disconnected, 1: connected
 	union
 	{
-		//Operations Initiated by Charge Point
-		unsigned char CpMsgValue[2*GUN_NUM];
-		struct
-		{
-			//CpMsgValue[0]
-		    	unsigned char BootNotificationReq:1;					//bit 0,
-			unsigned char BootNotificationConf:1;					//bit 1,
-			unsigned char AuthorizeReq:1; 						//bit 2,
-			unsigned char AuthorizeConf:1;						//bit 3,
-			unsigned char DataTransferReq:1;						//bit 4,
-			unsigned char DataTransferConf:1;						//bit 5,
-			unsigned char DiagnosticsStatusNotificationReq:1;		//bit 6,
-			unsigned char DiagnosticsStatusNotificationConf:1;		//bit 7,
-			//CpMsgValue[1]
-		    	unsigned char FirmwareStatusNotificationReq:1;			//bit 0,
-			unsigned char FirmwareStatusNotificationConf:1;			//bit 1,
-			unsigned char StartTransactionReq:1; 					//bit 2,
-			unsigned char StartTransactionConf:1;					//bit 3,
-			unsigned char StopTransactionReq:1;					//bit 4,
-			unsigned char StopTransactionConf:1;					//bit 5,
-			unsigned char :2;									//bit 6,7 , reserved
-		}bits[GUN_NUM];
+	//Operations Initiated by Charge Point
+	unsigned char CpMsgValue[CHAdeMO_QUANTITY + CCS_QUANTITY + GB_QUANTITY];
+	struct
+	{
+	//CpMsgValue[0]
+	unsigned char DataTransferReq:1;	//bit 0,
+	unsigned char DataTransferConf:1;	//bit 1,
+	unsigned char StartTransactionReq:1; //bit 2,
+	unsigned char StartTransactionConf:1;	//bit 3,
+	unsigned char StopTransactionReq:1;	//bit 4,
+	unsigned char StopTransactionConf:1;	//bit 5,
+	unsigned char :2;	//bit 6,7 , reserved
+	}bits;
 	}CpMsg;
 	union
 	{
-		//Operations Initiated by Central System
-		unsigned char CsMsgValue[5*GUN_NUM];
-		struct
-		{
-			//CsMsgValue[0]
-		    	unsigned char CancelReservationReq:1;				//bit 0,
-			unsigned char CancelReservationConf:1;				//bit 1,
-			unsigned char ChangeAvailabilityReq:1; 				//bit 2,
-			unsigned char ChangeAvailabilityConf:1;				//bit 3,
-			unsigned char ChangeConfigurationReq:1;				//bit 4,
-			unsigned char ChangeConfigurationConf:1;				//bit 5,
-			unsigned char ClearCacheReq:1;						//bit 6,
-			unsigned char ClearCacheConf:1;						//bit 7,
-			//CsMsgValue[1]
-		    	unsigned char ClearChargingProfileReq:1;				//bit 0,
-			unsigned char ClearChargingProfileConf:1;				//bit 1,
-			unsigned char DataTransferReq:1; 						//bit 2,
-			unsigned char DataTransferConf:1;						//bit 3,
-			unsigned char GetCompositeScheduleReq:1;			//bit 4,
-			unsigned char GetCompositeScheduleConf:1;			//bit 5,
-			unsigned char GetConfigurationReq:1;					//bit 6,
-			unsigned char GetConfigurationConf:1;				//bit 7,
-			//CsMsgValue[2]
-		    	unsigned char GetDiagnosticsReq:1;					//bit 0,
-			unsigned char GetDiagnosticsConf:1;					//bit 1,
-			unsigned char GetLocalListVersionReq:1; 				//bit 2,
-			unsigned char GetLocalListVersionConf:1;				//bit 3,
-			unsigned char RemoteStartTransactionReq:1;			//bit 4,
-			unsigned char RemoteStartTransactionConf:1;			//bit 5,
-			unsigned char RemoteStopTransactionReq:1;			//bit 6,
-			unsigned char RemoteStopTransactionConf:1;			//bit 7,
-			//CsMsgValue[3]
-		    	unsigned char ReserveNowReq:1;						//bit 0,
-			unsigned char ReserveNowConf:1;						//bit 1,
-			unsigned char ResetReq:1; 							//bit 2,
-			unsigned char ResetConf:1;							//bit 3,
-			unsigned char SendLocalListReq:1;						//bit 4,
-			unsigned char SendLocalListConf:1;					//bit 5,
-			unsigned char SetChargingProfileReq:1;					//bit 6,
-			unsigned char SetChargingProfileConf:1;				//bit 7,
-			//CsMsgValue[4]
-		    	unsigned char TriggerMessageReq:1;					//bit 0,
-			unsigned char TriggerMessageConf:1;					//bit 1,
-			unsigned char UnlockConnectorReq:1; 					//bit 2,
-			unsigned char UnlockConnectorConf:1;					//bit 3,
-			unsigned char UpdateFirmwareReq:1;					//bit 4,
-			unsigned char UpdateFirmwareConf:1;					//bit 5,
-			unsigned char :2;									//bit 6,7
-		}bits[GUN_NUM];
+	//Operations Initiated by Sequence Point
+	unsigned char SpMsgValue[1];
+	struct {
+	//SpMsgValue[0]
+	unsigned char BootNotificationReq :1;	//bit 0,
+	unsigned char BootNotificationConf :1;	//bit 1,
+	unsigned char AuthorizeReq :1; //bit 2,
+	unsigned char AuthorizeConf :1;	//bit 3,
+	unsigned char DiagnosticsStatusNotificationReq :1;	//bit 4,
+	unsigned char DiagnosticsStatusNotificationConf :1;	//bit 5,
+	unsigned char FirmwareStatusNotificationReq :1; //bit 6,
+	unsigned char FirmwareStatusNotificationConf :1; //bit 7,
+	} bits;
+	} SpMsg;
+	union
+	{
+	//Operations Initiated by Central System
+	unsigned char CsMsgValue[3 * (CHAdeMO_QUANTITY + CCS_QUANTITY + GB_QUANTITY)];
+	struct
+	{
+	//CsMsgValue[0]
+	unsigned char CancelReservationReq :1;	//bit 0,
+	unsigned char CancelReservationConf :1;	//bit 1,
+	unsigned char ChangeAvailabilityReq :1; //bit 2,
+	unsigned char ChangeAvailabilityConf :1;	//bit 3,
+	unsigned char ReserveNowReq :1;	//bit 4,
+	unsigned char ReserveNowConf :1;	//bit 5,
+	unsigned char SetChargingProfileReq :1;	//bit 6,
+	unsigned char SetChargingProfileConf :1;	//bit 7,
+	//CsMsgValue[1]
+	unsigned char TriggerMessageReq :1;	//bit 0,
+	unsigned char TriggerMessageConf :1;	//bit 1,
+	unsigned char UnlockConnectorReq :1; //bit 2,
+	unsigned char UnlockConnectorConf :1;	//bit 3,
+	unsigned char RemoteStartTransactionReq :1;	//bit 4,
+	unsigned char RemoteStartTransactionConf :1; //bit 5,
+	unsigned char RemoteStopTransactionReq :1;	//bit 6,
+	unsigned char RemoteStopTransactionConf :1;	//bit 7,
+	//CsMsgValue[2]
+	unsigned char ClearChargingProfileReq :1;	//bit 0,
+	unsigned char ClearChargingProfileConf :1;	//bit 1,
+	unsigned char DataTransferReq :1; //bit 2,
+	unsigned char DataTransferConf :1;	//bit 3,
+	unsigned char GetCompositeScheduleReq :1;	//bit 4,
+	unsigned char GetCompositeScheduleConf :1;	//bit 5,
+	unsigned char :2;	//bit 6,7
+	}bits;
 	}CsMsg;
+	union
+	{
+	//Operations Initiated by Main System
+	unsigned char MsMsgValue[2];
+	struct {
+	//CsMsgValue[0]
+	unsigned char ChangeConfigurationReq :1;	//bit 0,
+	unsigned char ChangeConfigurationConf :1;	//bit 1,
+	unsigned char ClearCacheReq :1;	//bit 2,
+	unsigned char ClearCacheConf :1;	//bit 3,
+	unsigned char GetConfigurationReq :1;	//bit 4,
+	unsigned char GetConfigurationConf :1;	//bit 5,
+	unsigned char UpdateFirmwareReq :1;	//bit 6,
+	unsigned char UpdateFirmwareConf :1;	//bit 7,
+	//CsMsgValue[1]
+	unsigned char GetDiagnosticsReq :1;	//bit 0,
+	unsigned char GetDiagnosticsConf :1;	//bit 1,
+	unsigned char GetLocalListVersionReq :1; //bit 2,
+	unsigned char GetLocalListVersionConf :1;	//bit 3,
+	unsigned char ResetReq :1; //bit 4,
+	unsigned char ResetConf :1;	//bit 5,
+	unsigned char SendLocalListReq :1;	//bit 6,
+	unsigned char SendLocalListConf :1;	//bit 7,
+	} bits;
+	} MsMsg;
 	struct StructBootNotification 				BootNotification;
 	struct StructHeartbeat					Heartbeat;
-	struct StructAuthorize		 			Authorize[GUN_NUM];
-	struct StructStartTransaction				StartTransaction[GUN_NUM];
-	struct StructStopTransaction				StopTransaction[GUN_NUM];
-	struct StructStatusNotification				StatusNotification[GUN_NUM];
-	struct StructCancelReservation			CancelReservation[GUN_NUM];
-	struct StructChangeAvailability			ChangeAvailability;
-	struct StructChangeConfiguration			ChangeConfiguration[GUN_NUM];
-	struct StructClearCache					ClearCache[GUN_NUM];
-	struct StructClearChargingProfile			ClearChargingProfile[GUN_NUM];
-	struct StructDataTransfer					DataTransfer[GUN_NUM];
+	struct StructAuthorize		 			Authorize[CHAdeMO_QUANTITY+ CCS_QUANTITY + GB_QUANTITY];
+	struct StructStartTransaction				StartTransaction[CHAdeMO_QUANTITY+ CCS_QUANTITY + GB_QUANTITY];
+	struct StructStopTransaction				StopTransaction[CHAdeMO_QUANTITY+ CCS_QUANTITY + GB_QUANTITY];
+	struct StructStatusNotification				StatusNotification[CHAdeMO_QUANTITY+ CCS_QUANTITY + GB_QUANTITY];
+	struct StructCancelReservation			CancelReservation[CHAdeMO_QUANTITY+ CCS_QUANTITY + GB_QUANTITY];
+	struct StructChangeAvailability			ChangeAvailability[CHAdeMO_QUANTITY+ CCS_QUANTITY + GB_QUANTITY];
+	struct StructChangeConfiguration			ChangeConfiguration;
+	struct StructClearCache					ClearCache;
+	struct StructClearChargingProfile			ClearChargingProfile[CHAdeMO_QUANTITY+ CCS_QUANTITY + GB_QUANTITY];
+	struct StructDataTransfer					DataTransfer[CHAdeMO_QUANTITY+ CCS_QUANTITY + GB_QUANTITY];
 	struct StructDiagnosticsStatusNotification	DiagnosticsStatusNotification;
 	struct StructFirmwareStatusNotification		FirmwareStatusNotification;
-	struct StructGetCompositeSchedule		GetCompositeSchedule[GUN_NUM];
+	struct StructGetCompositeSchedule		GetCompositeSchedule[CHAdeMO_QUANTITY+ CCS_QUANTITY + GB_QUANTITY];
 	struct StructGetConfiguration				GetConfiguration;
-	struct StructGetDiagnostics				GetDiagnostics[GUN_NUM];
-	struct StructGetLocalListVersion			GetLocalListVersion[GUN_NUM];
-	struct StructMeterValues					MeterValues[GUN_NUM];
-	struct StructRemoteStartTransaction		RemoteStartTransaction[GUN_NUM];
-	struct StructRemoteStopTransaction		RemoteStopTransaction[GUN_NUM];
-	struct StructReserveNow					ReserveNow[GUN_NUM];
+	struct StructGetDiagnostics				GetDiagnostics;
+	struct StructGetLocalListVersion			GetLocalListVersion;
+	struct StructMeterValues					MeterValues[CHAdeMO_QUANTITY+ CCS_QUANTITY + GB_QUANTITY];
+	struct StructRemoteStartTransaction		RemoteStartTransaction[CHAdeMO_QUANTITY+ CCS_QUANTITY + GB_QUANTITY];
+	struct StructRemoteStopTransaction		RemoteStopTransaction[CHAdeMO_QUANTITY+ CCS_QUANTITY + GB_QUANTITY];
+	struct StructReserveNow					ReserveNow[CHAdeMO_QUANTITY+ CCS_QUANTITY + GB_QUANTITY];
 	struct StructReset						Reset;
-	struct StructSendLocalList				SendLocalList[GUN_NUM];
-	struct StructSetChargingProfile			SetChargingProfile[GUN_NUM];
-	struct StructTriggerMessage				TriggerMessage[GUN_NUM];
-	struct StructUnlockConnector			UnlockConnector[GUN_NUM];
+	struct StructSendLocalList				SendLocalList;
+	struct StructSetChargingProfile			SetChargingProfile[CHAdeMO_QUANTITY+ CCS_QUANTITY + GB_QUANTITY];
+	struct StructTriggerMessage				TriggerMessage[CHAdeMO_QUANTITY+ CCS_QUANTITY + GB_QUANTITY];
+	struct StructUnlockConnector			UnlockConnector[CHAdeMO_QUANTITY+ CCS_QUANTITY + GB_QUANTITY];
 	struct StructUpdateFirmware				UpdateFirmware;
 	struct OCPP16ConfigurationTable			ConfigurationTable;
-	struct StructChargingProfile				(*CHAdeMOChargingProfile)[GUN_NUM];
-	struct StructChargingProfile				(*CcsChargingProfile)[GUN_NUM];
+	struct StructChargingProfile			CHAdeMOChargingProfile[CHAdeMO_QUANTITY];
+	struct StructChargingProfile		    CcsChargingProfile[CCS_QUANTITY];
 };