Browse Source

2020-03-13 / Alston Lin

Actions
1. Add item for sampling psu current variable
2. Add item to handle extra errors

Files
1. As follow commit history.
Alston 5 năm trước cách đây
mục cha
commit
e799c88800
2 tập tin đã thay đổi với 13 bổ sung11 xóa
  1. 2 0
      EVSE/Projects/define.h
  2. 11 11
      EVSE/Projects/define.h.bak

+ 2 - 0
EVSE/Projects/define.h

@@ -406,6 +406,7 @@ struct ChargingInfoData
 	unsigned char		IsReadyToCharging;
 	unsigned char		CcsAuthentication;		// 0:EIM, 1:EIM & PnC mixed
 	unsigned char		AcCcsChargingMode;		// 0:BC (PWM) only, 1:BC & PLC mixed
+	unsigned short		SampleChargingCur[2];
 };
 
 struct SysInfoData
@@ -485,6 +486,7 @@ struct WARNING_CODE_INFO
 	unsigned char PageIndex;
 	unsigned char WarningCode[10][7];
 	unsigned char Level;
+	unsigned char ExtraErrProcess;						// 0 : none, 1 : input uvp..
 };
 
 struct SysConfigAndInfo

+ 11 - 11
EVSE/Projects/define.h.bak

@@ -85,13 +85,13 @@ Storage							0x0A200000-0x7FFFFFFF		1886 MB
 	#define PSU_QUANTITY            2
 	#define ONE_CONNECTOR_USE       0
 #elif PlugIt360
-        #define MAX_PSU_QUANTITY        62
-        #define CHAdeMO_QUANTITY        0
-        #define CCS_QUANTITY            1
-        #define GB_QUANTITY             0
-        #define AC_QUANTITY             0
-        #define PSU_QUANTITY            2
-        #define ONE_CONNECTOR_USE       0
+    #define MAX_PSU_QUANTITY        62
+    #define CHAdeMO_QUANTITY        0
+    #define CCS_QUANTITY            1
+    #define GB_QUANTITY             0
+    #define AC_QUANTITY             0
+    #define PSU_QUANTITY            2
+    #define ONE_CONNECTOR_USE       0
 #else
 	#define MAX_PSU_QUANTITY        62
 	#define CHAdeMO_QUANTITY        1
@@ -102,7 +102,6 @@ Storage							0x0A200000-0x7FFFFFFF		1886 MB
 	#define ONE_CONNECTOR_USE       0
 #endif
 
-
 /*SystemLog message*/
 #define SystemLogMessage			//for debug info save to log file
 #define ConsloePrintLog				//for debug info print to console
@@ -322,7 +321,7 @@ struct SysConfigData
 	unsigned short			Ccs2PlugInTimes;			//0~65535
 	unsigned short			ChademoPlugInTimes;			//0~65535
 	unsigned char 			PsuAcInputType;				//0: 220, 1: 277
-	unsigned short 			RatingCurrent;				//0: Depend on Model name,	1 ~ rating value amp
+	unsigned short 		RatingCurrent;				//0: Depend on Model name,	1 ~ rating value amp
 	unsigned char			isAPP;						//for AuthorisationMode=0; 0:false, 1:true
 	unsigned char			isQRCode;					//for AuthorisationMode=0; 0:false, 1:true
 	unsigned char			isRFID;						//for AuthorisationMode=0; 0:false, 1:true
@@ -341,8 +340,8 @@ struct SysConfigData
 	unsigned char 			FtpServer[256];				//the ftp server for Phihong server to do data transimission
 	struct EthConfigData	Eth0Interface;
 	struct EthConfigData	Eth1Interface;
-	struct WifiConfigData 		AthInterface;
-	struct TeleConfigData		TelecomInterface;
+	struct WifiConfigData 	AthInterface;
+	struct TeleConfigData	TelecomInterface;
 	struct BtConfigData		Bluetooth;
 	/**************Backend***************/
 	unsigned int 			BackendConnTimeout;			//default : 300s
@@ -477,6 +476,7 @@ struct SysInfoData
 	unsigned char 		SystemPage;
 	unsigned char 		ConnectorPage;
 	unsigned char		IsAlternatvieConf;				// 0 : normal, 1 : alternative
+	unsigned char		StartToChargingFlag;			// 0 : Stop, 1 : Start
 };
 
 struct WARNING_CODE_INFO