Browse Source

2021.11.05 / Wendell
Actions
1. change location: AutoAuth_Disable & EVCCID_Authorize

Files
1. As follow commit history

Wendell 3 years ago
parent
commit
ca1f763100
1 changed files with 18 additions and 18 deletions
  1. 18 18
      EVSE/Projects/define.h

+ 18 - 18
EVSE/Projects/define.h

@@ -512,8 +512,6 @@ struct SysConfigData
 	unsigned char 			AcConnectorCount;			// For DC type
 	unsigned char			SwitchDebugFlag;			// Console Debug
 	unsigned char			AlwaysGfdFlag;
-	unsigned char                   AutoAuth_Disable;           //for Auto Authorize, 0:Disable Auto Authorize 1:Auto Authorize
-	unsigned char                   EVCCID_Authorize;           //for EVCCID Authorize enable/disable
 	/**************Charging***************/
 	unsigned short			MaxChargingEnergy;			//0: no limit,	1 ~ 65535	kWh
 	unsigned short			MaxChargingPower;			//0: rating value, 1 ~ RATING_POWER	kW
@@ -555,6 +553,8 @@ struct SysConfigData
 
     unsigned char           OcppReceiptrURL[512];       // Charging receipt display URL
     unsigned char           isAuthrizeByEVCCID;         // is Authorize by EVCCID (CCS)
+    unsigned char           AutoAuth_Disable;           //for Auto Authorize, 0:Disable Auto Authorize 1:Auto Authorize
+    unsigned char           EVCCID_Authorize;           //for EVCCID Authorize enable/disable
 };
 
 struct ChargingInfoData
@@ -630,8 +630,8 @@ struct ChargingInfoData
 	unsigned char 		ConnectorWarningCode[7];
 	unsigned char 		ConnectorAlarmCode[7];
 	unsigned char 		EvConnAlarmCode[7];
-	float 				ChargingProfileCurrent;			//0~6553.5 amp
-	float 				ChargingProfilePower;			//0~6553.5 W
+	float 				ChargingProfileCurrent;			// unit: 0.1A
+	float 				ChargingProfilePower;			// unit: 1W
 	float 				PresentChargingVoltageL2;		//0~6553.5 volt
 	float 				PresentChargingVoltageL3;		//0~6553.5 volt
 	float 				PresentChargingCurrentL2;		//0~6553.5 amp	
@@ -653,7 +653,7 @@ struct ChargingInfoData
     float               CurrentOffered;                 //0~6553.5 amp
     struct timespec     ConnectorTimeout;
     unsigned char       PantographFlag;                 // 0: normal gun type,  1: pantograph gun type
-    unsigned char 	Replug_flag;
+    unsigned char       Replug_flag;
     unsigned char       isEVCCIDVerify;
 };
 
@@ -944,7 +944,7 @@ struct SysInfoData
 	/**************Backend***************/
 	unsigned char 		OcppConnStatus;					//0: disconnected, 1: connected
 	char 				OrderCharging;
-    float               MaxChargingProfilePower;        //0~6553.5 W
+    float               MaxChargingProfilePower;        // unit: 1W
 	/**************Alston***************/
 	unsigned char 		WaitForPlugit;					//0: none scan, 1: scanning
 	unsigned char 		PageIndex;						//0 : Initialize
@@ -1296,7 +1296,7 @@ char AlarmStatusCode[160][6]=
     "012325",   // Connector 2 detects abnormal voltage on the output line
     "012326",   // System task is lost
     "012327",   // reserved
-	"012328",   // reserved
+    "012328",   // reserved
     "012329",   // reserved
     "012330",   // reserved
     "012331",   // reserved
@@ -1319,7 +1319,7 @@ char AlarmStatusCode[160][6]=
     "012348",   // reserved
     "012349",   // reserved
     "012350",   // reserved
-	"012351",   // reserved
+    "012351",   // reserved
     "012352",   // reserved
     "012353",   // reserved
     "012354",   // reserved
@@ -1481,16 +1481,16 @@ struct AlarmCodeData
             unsigned char AbnormalVoltageOnOutputLine_2:1;          //bit 5
             unsigned char SystemTaskLost:1;                         //bit 6
             unsigned char Reserved:1;                               //bit 7
-			//AlarmVal[16]
-            unsigned char :8;										//reserved bit 0 ~ bit 7
+            //AlarmVal[16]
+            unsigned char :8;                                       //reserved bit 0 ~ bit 7
             //AlarmVal[17]
-            unsigned char :8;										//reserved bit 0 ~ bit 7
+            unsigned char :8;                                       //reserved bit 0 ~ bit 7
             //AlarmVal[18]
-            unsigned char MeterIcCommTimeout:1;						//bit 0
-            unsigned char PilotNegativeError:1;						//bit 1
-            unsigned char :6;										//reserved bit 2 ~ bit 7
+            unsigned char MeterIcCommTimeout:1;                     //bit 0
+            unsigned char PilotNegativeError:1;                     //bit 1
+            unsigned char :6;                                       //reserved bit 2 ~ bit 7
             //AlarmVal[19]
-            unsigned char :8;										//reserved bit 0 ~ bit 7
+            unsigned char :8;                                       //reserved bit 0 ~ bit 7
 		}bits;
 	}AlarmEvents;
 };
@@ -4677,7 +4677,7 @@ struct OCPP16Data
             unsigned char InstallCertificateConf :1;                //bit 3
             unsigned char SignedUpdateFirmwareReq :1;               //bit 4
             unsigned char SignedUpdateFirmwareConf :1;              //bit 5
-            unsigned char isRemoteStartWaitReq :1;					//bit 6
+            unsigned char isRemoteStartWaitReq :1;                  //bit 6
             unsigned char :1;                                       //bit 7
         } bits;
     } MsMsg;
@@ -6028,8 +6028,8 @@ struct OCPP20Data
 			unsigned char UnpublishFirmwareConf :1;
 			unsigned char UpdateFirmwareReq :1;
 			unsigned char UpdateFirmwareConf :1;
-			unsigned char isRemoteStartWaitReq :1;
-			unsigned char :1;
+            unsigned char isRemoteStartWaitReq :1;
+            unsigned char :1;
 		} bits;
 	} MsMsg;