2021-03-27 / Wendell

Actinos
1. fix conflict

Files
1. As follow commit histoty

EVSE/Projects/define.h

@@ -403,7 +403,15 @@ typedef union
         unsigned int res:29;
     }bits;
 }ChargingStop;
-
+/*
+typedef struct
+{
+    unsigned char DispenserQuantity;
+    unsigned char ConnectorQuantity;
+    unsigned char WiringSetting[8];
+    unsigned char PowerCabinetReserved[32];
+}PowerCabinetDispenserWiringInfo;
+*/
 struct SysConfigData
 {
 	/**************System***************/
@@ -464,6 +472,8 @@ struct SysConfigData
 	unsigned char			ShowInformation;
 	unsigned char           isReqFirstUpgrade;          //EVSE is request first upgrade from PH server
 	unsigned char           isEnableLocalPowerSharging; //0: Disable power sharing  1: Enable power sharing
+	/************PowerCabinet************/
+
 };
 
 struct ChargingInfoData
@@ -1627,16 +1637,16 @@ char InfoStatusCode[384][6]=
 	"023975",	//GBT: ERROR_CODE_BSM_TEMPERATURE
 	"023976",	//GBT: ERROR_CODE_BSM_ISOLATE
 	"023977",	//GBT: ERROR_CODE_BSM_OUTPUT_CONNECTOR
-	"023978",	// Authorization failed
+	"023978",	// Reserved
 	"023979",	// EV full charging
-        "023980",       // ERROR_CODE_CHADEMO_BMS_CHARGE_ALLOW_ERROR
-        "023981",       // ERROR_CODE_CHADEMO_OUTPUT_VOLTAGE_MORE_THEN_10_PERCENT
-        "023982",       // ERROR_CODE_CHADEMO_ADC_LESS_THAN_10V
-        "023983",       // STOP by EV with unknow reason
-	"023984",       // Reserved
-	"023985",       // Reserved
-	"023986",       // Reserved
-	"023987",       // Reserved
+    "023980",   // ERROR_CODE_CHADEMO_BMS_CHARGE_ALLOW_ERROR
+    "023981",   // ERROR_CODE_CHADEMO_OUTPUT_VOLTAGE_MORE_THEN_10_PERCENT
+    "023982",   // ERROR_CODE_CHADEMO_ADC_LESS_THAN_10V
+    "023983",   // STOP by EV with unknow reason
+    "023984",   // Reserved
+    "023985",   // Reserved
+    "023986",   // Reserved
+    "023987",   // Reserved
 	"033900",	//disconnected from backend through Ethernet
 	"033901",	//disconnected from backend through WiFi
 	"033902",	//disconnected from backend through 3G/4G
@@ -1966,28 +1976,28 @@ struct InfoCodeData
 			unsigned char ERROR_CODE_BSM_CELL_OVER_VOLTAGE :1;		//bit 6
 			unsigned char ERROR_CODE_BSM_CELL_UNDER_VOLTAGE :1;		//bit 7
 			//InfoVal[38]
-			unsigned char ERROR_CODE_BSM_OVER_SOC :1;			//bit 0
-			unsigned char ERROR_CODE_BSM_UNDER_SOC :1;			//bit 1
-			unsigned char ERROR_CODE_BSM_CURRENT :1;			//bit 2
+			unsigned char ERROR_CODE_BSM_OVER_SOC :1;				//bit 0
+			unsigned char ERROR_CODE_BSM_UNDER_SOC :1;				//bit 1
+			unsigned char ERROR_CODE_BSM_CURRENT :1;				//bit 2
 			unsigned char ERROR_CODE_BSM_TEMPERATURE :1;			//bit 3
-			unsigned char ERROR_CODE_BSM_ISOLATE :1;			//bit 4
+			unsigned char ERROR_CODE_BSM_ISOLATE :1;				//bit 4
 			unsigned char ERROR_CODE_BSM_OUTPUT_CONNECTOR :1;		//bit 5
-			unsigned char :1;						//bit 6 reserved
-			unsigned char EV_Full_Charging:1;				//bit 7
-			//InfoVal[39]
-			unsigned char CHADEMO_BMS_CHARGE_ALLOW_ERROR:1;			//bit 0
-			unsigned char CHADEMO_OUTPUT_VOLTAGE_MORE_THEN_10_PERCENT:1;    //bit 1
-			unsigned char CHADEMO_ADC_LESS_THAN_10V:1;			//bit 2
-			unsigned char Stop_by_EV_with_unknow_reason:1;			//bit 3
-			unsigned char :4;						//bit 4 ~ 7	reserved
+			unsigned char :1;										//bit 6
+			unsigned char EV_Full_Charging:1;                       //bit 7
+            //InfoVal[39]
+            unsigned char CHADEMO_BMS_CHARGE_ALLOW_ERROR:1;         //bit 0
+            unsigned char CHADEMO_OUTPUT_VOLTAGE_MORE_THEN_10_PERCENT:1; //bit 1
+            unsigned char CHADEMO_ADC_LESS_THAN_10V:1;              //bit 2
+            unsigned char Stop_by_EV_with_unknow_reason:1;          //bit 3
+            unsigned char :4;                                       //bit 4 ~ 7 reserved
 			//InfoVal[40]
 			unsigned char BackendDisconnectedViaEthernet:1;			//bit 0
-			unsigned char BackendDisconnectViaWiFi:1;			//bit 1
-			unsigned char BackendDisconnectVia4G:1;				//bit 2
-			unsigned char BackendRemoteStart:1;				//bit 3
-			unsigned char BackendRemoteStop:1;				//bit 4
-			unsigned char BackendRemoteReset:1;				//bit 5
-			unsigned char AuthorizationFailed:1;				//bit 6
+			unsigned char BackendDisconnectViaWiFi:1;				//bit 1
+			unsigned char BackendDisconnectVia4G:1;					//bit 2
+			unsigned char BackendRemoteStart:1;						//bit 3
+			unsigned char BackendRemoteStop:1;						//bit 4
+			unsigned char BackendRemoteReset:1;						//bit 5
+			unsigned char AuthorizationFailed:1;					//bit 6
 			unsigned char :1;										//bit 7	reserved
 		}bits;
 	}InfoEvents;