Эх сурвалжийг харах

2021-03-27 / Wendell
Actinos
1. fix conflict

Files
1. As follow commit histoty

Wendell 4 жил өмнө
parent
commit
8659f01da2

+ 1 - 11
EVSE/Projects/define.h

@@ -403,15 +403,7 @@ typedef union
         unsigned int res:29;
         unsigned int res:29;
     }bits;
     }bits;
 }ChargingStop;
 }ChargingStop;
-/*
+
-typedef struct
-{
-    unsigned char DispenserQuantity;
-    unsigned char ConnectorQuantity;
-    unsigned char WiringSetting[8];
-    unsigned char PowerCabinetReserved[32];
-}PowerCabinetDispenserWiringInfo;
-*/
 struct SysConfigData
 struct SysConfigData
 {
 {
 	/**************System***************/
 	/**************System***************/
@@ -472,8 +464,6 @@ struct SysConfigData
 	unsigned char			ShowInformation;
 	unsigned char			ShowInformation;
 	unsigned char           isReqFirstUpgrade;          //EVSE is request first upgrade from PH server
 	unsigned char           isReqFirstUpgrade;          //EVSE is request first upgrade from PH server
 	unsigned char           isEnableLocalPowerSharging; //0: Disable power sharing  1: Enable power sharing
 	unsigned char           isEnableLocalPowerSharging; //0: Disable power sharing  1: Enable power sharing
-	/************PowerCabinet************/
-
 };
 };
 
 
 struct ChargingInfoData
 struct ChargingInfoData