Procházet zdrojové kódy

2023-03-06 / Wendell

Actions:
1. modify quantity of PsuGroup

Files
1. As follow commit history
Wendell před 2 roky
rodič
revize
d520c2cabd
1 změnil soubory, kde provedl 40 přidání a 40 odebrání
  1. 40 40
      EVSE/Projects/define.h

+ 40 - 40
EVSE/Projects/define.h

@@ -629,7 +629,7 @@ struct SysConfigData
     unsigned char           isEnalbleFirewall;                  // 0: Disable   1: Enable
     unsigned char           FirewallAcceptAddr[10][128];        // Max accepted server address is 10
     unsigned char           isEnable15118;                      // 0: Disable  1: Enable
-    unsigned char           isEnableR2R;			// 0: Disable  1: Enable
+    unsigned char           isEnableR2R;                        // 0: Disable  1: Enable
 };
 
 struct DERATING_BY_OTP
@@ -2572,9 +2572,9 @@ struct PsuData
 {
     unsigned char           SystemInitialPsuQuantity;       // psu quantity after ac/dc contactor on
 	unsigned char           SystemPresentPsuQuantity;
-	unsigned short          SystemAvailableCurrent;			//abcd=abc.d amp
-	unsigned int            SystemAvailablePower;			//Watt
-	struct PsuGroupData     PsuGroup[4];
+	unsigned short          SystemAvailableCurrent;			// unit: 0.1A
+	unsigned int            SystemAvailablePower;			// unit: 0.1kW
+	struct PsuGroupData     PsuGroup[CONNECTOR_QUANTITY];
 	unsigned char           GroupCount;
 	unsigned char           Work_Step;
 	struct PsuModuleVer     PsuVersion[MAX_PSU_QUANTITY];
@@ -5017,12 +5017,12 @@ enum OCPP20CtrlrVariable
 	OCPPCommCtrlr_ResetRetries,
 	OCPPCommCtrlr_PublicKeyWithSignedMeterValue,
     OCPPCommCtrlr_VariableVersion,
-	OCPPCommCtrlr_StatusNotificationPeriodically,
+    OCPPCommCtrlr_StatusNotificationPeriodically,
     OCPPCommCtrlr_StatusNotificationInterval,
 	OCPPCommCtrlr_CharingProfileRefreshInterval,
     OCPPCommCtrlr_RfidEndianType,
-	OCPPCommCtrlr_AuthorizeTimeout,
-	OCPPCommCtrlr_Enable15118,
+    OCPPCommCtrlr_AuthorizeTimeout,
+    OCPPCommCtrlr_Enable15118,
 	ReservationCtrlr_Enabled,
 	ReservationCtrlr_Available,
 	ReservationCtrlr_NonEvseSpecific,
@@ -5458,7 +5458,7 @@ struct SetMonitoringDataType
 	int id;												            // Optional. An id SHALL only be given to replace an existing monitor. The Charging Station handles the generation of id’s for new monitors.
 	float value;													// Required. Value for threshold or delta monitoring. For Periodic or PeriodicClockAligned this is the interval in seconds.
 	unsigned char type[32];											// Required. The type of this monitor, e.g. a threshold, delta or periodic monitor.
-	unsigned char severity;											    // Required. The severity that will be assigned to an event that is triggered by this monitor.
+	unsigned char severity;											// Required. The severity that will be assigned to an event that is triggered by this monitor.
 	unsigned char transaction;										// Optional. Monitor only active when a transaction is ongoing on a component relevant to this transaction. Default = false.
 	struct ComponentType component;									// Required. Component for which monitor is set.
 	struct VariableType variable;									// Required. Variable for which monitor is set.
@@ -6083,25 +6083,25 @@ struct StructReaderStatus
 
 struct StructOccupancyFeeDisplay
 {
-	unsigned char occupancySN[64];
-	int   actionId;
+    unsigned char occupancySN[64];
+    int   actionId;
     unsigned char OccupancyFeeDisplayReq:1;
 };
 
 struct StructSetOccupancyPrice
 {
-	float   price;
+    float   price;
     unsigned char SetOccupancyPriceReq:1;
 };
 
 struct StructOccupancyFeeAct
 {
-	unsigned char occupancySN[64];
-	int action;
+    unsigned char occupancySN[64];
+    int action;
 
-	int   response_duration;
-	float response_occupancyFee;
-	unsigned char response_status[10];
+    int   response_duration;
+    float response_occupancyFee;
+    unsigned char response_status[10];
     unsigned char response_occupancySN[37];
     unsigned char response_startTime[64];
 
@@ -6110,11 +6110,11 @@ struct StructOccupancyFeeAct
 
 struct StructOccupancyDeductResult
 {
-	unsigned char deductResult:1;
-	float amount;
-	unsigned char occupancySN[37];
-	unsigned char creditNo[64];
-	unsigned char approvalNo[20];
+    unsigned char deductResult:1;
+    float amount;
+    unsigned char occupancySN[37];
+    unsigned char creditNo[64];
+    unsigned char approvalNo[20];
 };
 
 struct StructTcciCustomData
@@ -6150,24 +6150,24 @@ struct OCMFData
 
 struct OCPP16_V2g_Extend
 {
-	struct Authorize_20						Authorize;
-	struct CertificateSigned_20				CertificateSigned;
-	struct DeleteCertificate_20				DeleteCertificate;
-	struct Get15118EVCertificate_20			Get15118EVCertificate;
-	struct GetCertificateStatus_20			GetCertificateStatus;
-	struct GetInstalledCertificateIds_20	GetInstalledCertificateIds;
-	struct InstallCertificate_20			InstallCertificate;
-	struct SignCertificate_20				SignCertificate;
+    struct Authorize_20                     Authorize;
+    struct CertificateSigned_20             CertificateSigned;
+    struct DeleteCertificate_20             DeleteCertificate;
+    struct Get15118EVCertificate_20         Get15118EVCertificate;
+    struct GetCertificateStatus_20          GetCertificateStatus;
+    struct GetInstalledCertificateIds_20    GetInstalledCertificateIds;
+    struct InstallCertificate_20            InstallCertificate;
+    struct SignCertificate_20               SignCertificate;
 
 
-	unsigned char							AuthorizeReq:1;
-	unsigned char							AuthorizeConf:1;
-	unsigned char							Get15118EVCertificateReq:1;
-	unsigned char 							Get15118EVCertificateConf:1;
-	unsigned char							GetCertificateStatusReq:1;
-	unsigned char 							GetCertificateStatusConf:1;
-	unsigned char							SignCertificateReq:1;
-	unsigned char							SignCertificateConf:1;
+    unsigned char                           AuthorizeReq:1;
+    unsigned char                           AuthorizeConf:1;
+    unsigned char                           Get15118EVCertificateReq:1;
+    unsigned char                           Get15118EVCertificateConf:1;
+    unsigned char                           GetCertificateStatusReq:1;
+    unsigned char                           GetCertificateStatusConf:1;
+    unsigned char                           SignCertificateReq:1;
+    unsigned char                           SignCertificateConf:1;
 };
 
 struct OCPP16Data
@@ -6364,7 +6364,7 @@ struct OCPP16Data
     struct StructSessionTarget                      SessionTarget[CONNECTOR_QUANTITY];
     struct StructTcciCustomData                     TcciCustomData;
     struct OCMFData                                 OcmfData[CONNECTOR_QUANTITY];
-    struct OCPP16_V2g_Extend						v2g_extend;
+    struct OCPP16_V2g_Extend                        v2g_extend;
 };
 
 struct OCPP20Data
@@ -6378,8 +6378,8 @@ struct OCPP20Data
 	struct ReportDataType                   ControllerComponentVariable[CtrlrVariable_CNT];
 	struct SetMonitoringDataType            MonitoringComponentVariable[10];
 	struct NetworkConnectionProfile_20      NetworkConnectionProfile[10];
-	unsigned int                            MonitoringLevel;
-	unsigned char                           MonitoringBase[20];
+    unsigned int                            MonitoringLevel;
+    unsigned char                           MonitoringBase[20];
 
 	union
 	{