Merge branch 'master' of https://git.phihong.com.tw:30000/System_Integration/CSU3_AM335x

EVSE/Projects/define.h

@@ -253,8 +253,7 @@ struct ChargingInfoData
 	unsigned char 		Evboard_id;				// for EV board
 	unsigned char 		StopChargeFlag;			// for EV board
 	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
-	unsigned char 		OrderCharging;	
+	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
@@ -344,6 +343,7 @@ struct SysInfoData
 	unsigned char 		InternetConn;					//0: disconnected, 1: connected
 	/**************Backend***************/
 	unsigned char 		OcppConnStatus;					//0: disconnected, 1: connected
+	char 				OrderCharging;
 	/**************Alston***************/
 	unsigned char 		WaitForPlugit;					//0: none scan, 1: scanning
 	unsigned char 		PageIndex;						//0 : Initialize