2023-02-18 / Simon Xue [DD360Tcc_V2.23]

Action
1. Merge master.
2. [Mod] Modify define.h and define.c

Files
As the following commit history files

Image Version: V2.23.XX.XXXX.XX

EVSE/Projects/DD360Tcci/Apps/Define/define.c

@@ -63,7 +63,7 @@ char Currency[54][4]=
 "ZAR" // - South African Rand
 };
 
-char FaultStatusCode[40][6]=
+char FaultStatusCode[FaultCodeLength * 8][6]=
 {
 "011001", //CHAdeMO output fuse blew
 "011002", //CCS output fuse blew
@@ -107,7 +107,7 @@ char FaultStatusCode[40][6]=
 "011040"  //Parallel output relay driving fault
 };
 
-char AlarmStatusCode[160][6]=
+char AlarmStatusCode[AlarmCodeLength * 8][6]=
 {
 "012200", //System L1 input OVP
 "012201", //System L2 input OVP
@@ -271,7 +271,7 @@ char AlarmStatusCode[160][6]=
 "012359",   // reserved
 };
 
-char InfoStatusCode[384][6]=
+char InfoStatusCode[InfoCodeLength * 8][6]=
 {
 //Information comes from EVSE
 "013600", //Normal stop charging by user

EVSE/Projects/DD360Tcci/Apps/Define/define.h

@@ -162,6 +162,15 @@ Storage							0x0A200000-0x7FFFFFFF		1886 MB
     #define GENERAL_GUN_QUANTITY    0
     #define PSU_QUANTITY            2
     #define ONE_CONNECTOR_USE       0
+#elif defined DQC480
+    #define MAX_PSU_QUANTITY        62
+    #define CHAdeMO_QUANTITY        0
+    #define CCS_QUANTITY            0
+    #define GB_QUANTITY             0
+    #define AC_QUANTITY             0
+    #define GENERAL_GUN_QUANTITY    4
+    #define PSU_QUANTITY            6
+    #define ONE_CONNECTOR_USE       0
 #else
     #define MAX_PSU_QUANTITY        62
     #define CHAdeMO_QUANTITY        2
@@ -200,7 +209,7 @@ Storage							0x0A200000-0x7FFFFFFF		1886 MB
 #define ShmSmartBoxKey          1016
 
 #define FaultCodeLength         5
-#define AlarmCodeLength         20
+#define AlarmCodeLength         22
 #define InfoCodeLength          41
 
 /**************************************************************************************/
@@ -347,6 +356,10 @@ enum CoreProfile {
 	 CharingProfileRefreshInterval,
 	 CpoName,
 	 OcppSoftwareVersion,
+	 AuthDownloadlinkCertificate,
+	 RfidEndianType,
+	 AuthorizeTimeout,
+	 Enable15118,
 	 _CoreProfile_CNT
 };
 
@@ -610,7 +623,12 @@ struct SysConfigData
     unsigned char           MaintainServerSecurityPassword[41]; // Maintain server AuthorizationKey for security profile
     unsigned char           PowerSharingServerIP[512];          // Local power sharing server ip address
     unsigned int            PowerSharingCapacityPower;          // Local power sharing capacity power
-    unsigned char           MaxChargingSoc;                     //0: unlimit, 1 ~ 100 percent
+    unsigned char           MaxChargingSoc;                     // 0: unlimit, 1 ~ 100 percent
+    unsigned char           FanControlPolicy;                   // 0: Auto mode     1: Quite mode
+    unsigned short          MaxChargingVoltage;                 // 0: rating value, 1 ~ RATING_VOLTAGE volt
+    unsigned char           isEnalbleFirewall;                  // 0: Disable   1: Enable
+    unsigned char           FirewallAcceptAddr[10][128];        // Max accepted server address is 10
+    unsigned char           isEnable15118;                      // 0: Disable  1: Enable
 };
 
 struct DERATING_BY_OTP
@@ -728,6 +746,7 @@ struct ChargingInfoData
     unsigned char       _TotalPsuCount;                 // Psu count for connector
     unsigned char       _TakePsuGpCount;                // Get the used psu group count
     struct DERATING_BY_OTP deratingByConnOtp;
+    unsigned char       ParentIdTag[21];
 };
 
 typedef struct
@@ -925,21 +944,21 @@ typedef union
 
 struct DC_METER_INFO
 {
-    double presetVoltage;						// resolution: 1.000v
-	double presentCurrent;					// resolution: 1.000a
-	double presentPower;						// resolution: 1.000kw
-	double totlizeImportEnergy;			// resolution: 1.000kwh
-	double totlizeExportEnergy;			// resolution: 1.000kwh
-	unsigned char timestamp[32];
-	unsigned char LinkStatus;								// 0 = unknow ,1 = link , 2 miss link
+    double presetVoltage;                       // resolution: 1.000v
+    double presentCurrent;                      // resolution: 1.000a
+    double presentPower;                        // resolution: 1.000kw
+    double totlizeImportEnergy;                 // resolution: 1.000kwh
+    double totlizeExportEnergy;                 // resolution: 1.000kwh
+    unsigned char timestamp[32];
+    unsigned char LinkStatus;                   // 0 = unknow ,1 = link , 2 miss link
 };
 
 typedef union
 {
-		unsigned char Status;
+        unsigned char Status;
         struct
         {
-	    			unsigned char suLinkStatusIsOk:1;
+            unsigned char suLinkStatusIsOk:1;
             unsigned char muFatalErrorOccured:1;
             unsigned char transactionIsOnGoing:1;
             unsigned char tamperingIsDetected:1;
@@ -948,7 +967,7 @@ typedef union
             unsigned char reversedVoltage:1;
             unsigned char suMeasureFailureOccurred:1;
         }bits;
-        
+
 }DcmbStatusFlag;
 
 typedef union
@@ -969,15 +988,15 @@ typedef union
             unsigned char muStateIsFailed:1;
             unsigned char res:5;
         }bits;
-        
+
 }DcmbErrorFlag;
-   
+
 struct DC_METER_STATUS_INFO
 {
-	unsigned short StatusValue;
-	DcmbStatusFlag MeterStatusFlag;
-    
-	unsigned char applicationFirmwareVersion[16];
+    unsigned short StatusValue;
+    DcmbStatusFlag MeterStatusFlag;
+
+    unsigned char applicationFirmwareVersion[16];
     unsigned char applicationFirmwareAuthTag[32];
     unsigned char legalFirmwareVersion[16];
     unsigned char legalFirmwareAuthTag[32];
@@ -988,9 +1007,9 @@ struct DC_METER_STATUS_INFO
     unsigned char ipAddress[32];
     unsigned char meterId[32];
 
-	unsigned short ErrorValue;
- 	DcmbErrorFlag MeterErrorFlag;
-   
+    unsigned short ErrorValue;
+    DcmbErrorFlag MeterErrorFlag;
+
     unsigned char publicKey[140];
     unsigned char publicKeyOcmf[200];
     unsigned short indexOfLastTransaction;
@@ -1005,32 +1024,30 @@ struct DC_METER_TRANSACTION_HEAD
     unsigned short tariffId;
     unsigned short cableId;
     unsigned short userData[32];
-    
 };
 
 struct DC_METER_TRANSACTION_ACTION
 {
-	struct DC_METER_TRANSACTION_HEAD head;
-	unsigned char transactionOCMF[512];
-	unsigned char OcmfInfoReady;                // 0 = nothing, 1 = ocmp info ready
-	unsigned char ActionCmd;                   // 1 = transaction Start, 2 transaction Stop, sync time
+    struct DC_METER_TRANSACTION_HEAD head;
+    unsigned char transactionOCMF[2048];
+    unsigned char OcmfInfoReady;                // 0 = nothing, 1 = ocmp info ready
+    unsigned char ActionCmd;                    // 1 = transaction Start, 2 transaction Stop, sync time
 };
 
 typedef union
 {
-				unsigned char Status;
+        unsigned char Status;
         struct
         {
-	    			unsigned char intermediateRead:1;
+            unsigned char intermediateRead:1;
             unsigned char res:7;
         }bits;
-        
 }DcmbTransactionReadlevel;
 
 struct DC_METER_TRANSACTION_RESULT
 {
-	unsigned short paginationCounter;
-	struct DC_METER_TRANSACTION_HEAD head;
+    unsigned short paginationCounter;
+    struct DC_METER_TRANSACTION_HEAD head;
     unsigned char timestampStart[32];
     unsigned char timestampStop[32];
     unsigned int transactionDuration;
@@ -1205,6 +1222,7 @@ struct SysInfoData
     struct BAZEL8           bazel8;                     // Bazel8 payment used
     struct Enegate          enegate;                    // Enegate payment used
     unsigned char           PsuLostQuantity;
+    unsigned char           isDispenserLog;             // 0: off       1: on
 };
 
 struct SysConfigAndInfo
@@ -1458,18 +1476,18 @@ char AlarmStatusCode[160][6]=
 	"012261",	//GB groundfault detection timeout (GFD)
 	"012262",	//Circuit Short L1
 	"012263",	// PSU Duplicate ID
-	"012264", 	// Psu Fault : Infy => Output Short Circuit，UU => Abnormal discharge circuit
+	"012264", 	// Psu Fault : Infy => Output Short Circuit
 	"012265", 	// PSU Discharge Abnormal
 	"012266", 	// PSU Dc Side ShutDown
 	"012267", 	// PSU Failure Alarm
 	"012268", 	// PSU Protection Alarm
-	"012269", 	// Psu Fault : Infy => Fan Fault，UU => Fan Fault
+	"012269", 	// Psu Fault : Infy => Fan Fault
 	"012270", 	// PSU Input UVP
 	"012271",	// PSU Input OVP
 	"012272", 	// PSU WalkIn State
-	"012273", 	// Psu Fault : Infy => Power Limited State，UU => Dc OVP and shutdown
-	"012274", 	// Psu Fault : Infy => Id Repeat，UU => Id Repeat
-	"012275", 	// Psu Fault : Infy => Severe Uneven Current，UU => Pfc internal unbalance
+	"012273", 	// Psu Fault : Infy => Power Limited State
+	"012274", 	// Psu Fault : Infy => Id Repeat
+	"012275", 	// Psu Fault : Infy => Severe Uneven Current
 	"012276", 	// PSU Three Phase Input Inadequate
 	"012277", 	// PSU Three Phase Onput Imbalance
 	"012278", 	// PSU Ffc Side ShutDown
@@ -1501,18 +1519,18 @@ char AlarmStatusCode[160][6]=
 	"012304",   // connection disconnected from power cabinet
 	"012305",   // Meter communication timeout
 	"012306",   // The dip switch of the PSU may be incorrect
-    "012307",   // Psu Fault : Infy => Fuse Burn-Out，UU => Pfc internal OVP
-    "012308",   // Psu Fault : Infy => Pfc And Dcdc Communication Fault，UU => Pfc And Dcdc Communication Fault
-    "012309",   // Psu Fault : Infy => Bus Voltage Unbalance，UU => Dc output voltage unbalance
-    "012310",   // Psu Fault : Infy => Bus Over Voltage，UU => Ac site OVP
-    "012311",   // Psu Fault : Infy => Bus Voltage Abnormal，UU => Ac site UVP
-    "012312",   // Psu Fault : Infy => Bus Under Voltage，UU => Pfc internal UVP
-    "012313",   // Psu Fault : Infy => Input Phase Loss，UU => Dc to Dc don’t work
-    "012314",   // Psu Fault : Infy => Fan Full Speed，UU => Fan don’t work
-    "012315",   // Psu Fault : Infy => Temperature Power Limit，UU => env OTP、Pfc OTP、output relay broken、Dc OTP
-    "012316",   // Psu Fault : Infy => Ac Power Limit，UU => Ac OVP and shutdown
-    "012317",   // Psu Fault : Infy => Dcdc Eeprom Fault，UU => Dc to Dc broken
-    "012318",   // Psu Fault : Infy => Pfc Eeprom Fault，UU => Pfc broken
+    "012307",   // Psu Fault : Infy => Fuse Burn-Out
+    "012308",   // Psu Fault : Infy => Pfc And Dcdc Communication Fault
+    "012309",   // Psu Fault : Infy => Bus Voltage Unbalance
+    "012310",   // Psu Fault : Infy => Bus Over Voltage
+    "012311",   // Psu Fault : Infy => Bus Voltage Abnormal
+    "012312",   // Psu Fault : Infy => Bus Under Voltage
+    "012313",   // Psu Fault : Infy => Input Phase Loss
+    "012314",   // Psu Fault : Infy => Fan Full Speed
+    "012315",   // Psu Fault : Infy => Temperature Power Limit
+    "012316",   // Psu Fault : Infy => Ac Power Limit
+    "012317",   // Psu Fault : Infy => Dcdc Eeprom Fault
+    "012318",   // Psu Fault : Infy => Pfc Eeprom Fault
     "012319",   // Psu Dcdc Over Voltage
     "012320",   // System CHAdeMO output UCP
     "012321",   // System CCS output UCP
@@ -1527,33 +1545,49 @@ char AlarmStatusCode[160][6]=
     "012330",   // Psu Fault : Infy => Psu Dc to Dc OTP，UU => env UTP
     "012331",   // Psu Fault : Infy => Psu Dc to Dc OVP，UU => Dc output OVP
     "012332",   // Chiller Tube OTP
-    "012333",   // Psu Fault : Infy => DC input ovp (Phase OVP)，UU => Dc output UVP
-    "012334",   // reserved
-    "012335",   // reserved
-    "012336",   // reserved
-    "012337",   // reserved
-    "012338",   // reserved
-    "012339",   // reserved
-    "012340",   // reserved
-    "012341",   // reserved
-    "012342",   // reserved
+    "012333",   // Psu Fault : Infy => DC input ovp (Phase OVP)
+    "012334",   // psu fault
+    "012335",   // Psu Fault : UU => Abnormal discharge circuit(12264)
+    "012336",   // Psu Fault : UU => Fan Fault (12269)
+    "012337",   // Psu Fault : UU => Id Repeat (12274)
+    "012338",   // Psu Fault : UU => Pfc internal unbalance (12275)
+    "012339",   // Psu Fault :UU => Pfc And Dcdc Communication Fault)(12308)
+    "012340",   // Psu Fault :UU => Dc output voltage unbalance(12309)
+    "012341",   // Psu Fault : UU => Dc to Dc don’t work(12313)
+    "012342",   // Psu Fault : UU => Fan don’t work(12314)
     "012343",   // Tilt sensor self-test failed
     "012344",   // AC: Meter IC communication timeout
     "012345",   // AC: Pilot negative error
     "012346",   // Psu Communication error with CSU
     "012347",   // AC: Local power sharing communication error (Slave disconnect from Master)
     "012348",   // Chiller Alarm failure
-    "012349",   // reserved
-    "012350",   // reserved
-    "012351",   // reserved
+    "012349",   // Meter2CommTimeout
+    "012350",   // Meter3CommTimeout
+    "012351",   // Meter4CommTimeout
     "012352",   // Payment system communication timeout
-    "012353",   // reserved
-    "012354",   // reserved
-    "012355",   // reserved
-    "012356",   // reserved
-    "012357",   // reserved
-    "012358",   // reserved
-    "012359",   // reserved
+    "012353",   // Meter Slave Los Link
+    "012354",   // Meter Sync Time Error
+    "012355",   // Meter Start Transaction Error
+    "012356",   // Meter Stop Transaction Error
+    "012357",   // Meter Get Transaction Ocmf Error
+    "012358",   // Normal Output Relay Welding
+    "012359",   // Normal Output Relay Driving Fault
+    "012360",   // Psu Fault : UU => Dc OVP and shutdown (12273)
+    "012361",   // Psu Fault : UU => Ac OVP and shutdown (12316)
+    "012362",   // Psu Fault : UU => Pfc internal OVP (12307)
+    "012363",   // Psu Fault : UU => Pfc internal UVP (12312)
+    "012364",   // Psu Fault : UU => Ac site OVP (12310)
+    "012365",   // Psu Fault : UU => Ac site UVP (12311)
+    "012366",   // Psu Fault : UU => Dc output OVP (12331)
+    "012367",   // Psu Fault : UU => Dc output UVP (12333)
+    "012368",   // Psu Fault : UU => env UTP (12330)
+    "012369",   // Psu Fault : UU => env OTP、Pfc OTP、output relay broken、Dc OTP (12315)
+    "012370",   // Psu Fault :UU => Dc to Dc broken (12315)
+    "012371",   // Psu Fault :UU => Pfc broken (12318)
+    "012372",   // reserved
+    "012373",   // reserved
+    "012374",   // reserved
+    "012375",   // reserved
 };
 */
 struct AlarmCodeData
@@ -1564,7 +1598,7 @@ struct AlarmCodeData
 		unsigned char AlarmVal[AlarmCodeLength];
 		struct
 		{
-			//AlarmVal[0]
+			//AlarmVal[0] 012200 - 012207
 		    unsigned char SystemL1InputOVP:1;					//bit 0
 			unsigned char SystemL2InputOVP:1;					//bit 1
 			unsigned char SystemL3InputOVP:1;   				//bit 2
@@ -1573,7 +1607,7 @@ struct AlarmCodeData
 			unsigned char SystemL3InputUVP:1;					//bit 5
 			unsigned char PsuL1InputOVP:1;						//bit 6
 			unsigned char PsuL2InputOVP:1;						//bit 7
-			//AlarmVal[1]
+			//AlarmVal[1] 012208 - 012215
 			unsigned char PsuL3InputOVP:1;						//bit 0
 			unsigned char PsuL1InputUVP:1;						//bit 1
 			unsigned char PsuL2InputUVP:1;						//bit 2
@@ -1582,7 +1616,7 @@ struct AlarmCodeData
 			unsigned char SystemL2InputDrop:1;					//bit 5
 			unsigned char SystemL3InputDrop:1;					//bit 6
 			unsigned char SystemAcOutputOVP:1;					//bit 7
-			//AlarmVal[2]
+			//AlarmVal[2] 012216 - 012223
 			unsigned char SystemAcOutputOCP:1;					//bit 0
 			unsigned char SystemChademoOutputOVP:1;				//bit 1
 			unsigned char SystemChademoOutputOCP:1;				//bit 2
@@ -1591,7 +1625,7 @@ struct AlarmCodeData
 			unsigned char SystemGbOutputOVP:1;					//bit 5
 			unsigned char SystemGbOutputOCP:1;					//bit 6
 			unsigned char SystemAmbientOTP :1;					//bit 7
-			//AlarmVal[3]
+			//AlarmVal[3] 012224 - 012231
 			unsigned char SystemCriticalPointOTP:1;				//bit 0
 			unsigned char PsuAmbientOTP:1;						//bit 1
 			unsigned char PsuCriticalPointOTP:1;				//bit 2
@@ -1600,7 +1634,7 @@ struct AlarmCodeData
 			unsigned char ChademoConnectorOTP:1;				//bit 5
 			unsigned char CcsConnectorOTP:1;					//bit 6
 			unsigned char GbConnectorOTP:1;						//bit 7
-			 //AlarmVal[4]
+			 //AlarmVal[4] 012232 - 012239
 			unsigned char AcConnectorOTP:1;						//bit 0
 			unsigned char RcdTrip:1;							//bit 1
 			unsigned char ChademoGfdTrip:1;						//bit 2
@@ -1609,7 +1643,7 @@ struct AlarmCodeData
 			unsigned char SpdTrip:1;							//bit 5
 			unsigned char MainPowerBreakerTrip:1;				//bit 6
 			unsigned char AuxPowerBreakerTrip:1;				//bit 7
-			//AlarmVal[5]
+			//AlarmVal[5] 012240 - 012247
 			unsigned char PsuCommunicationFail:1;				//bit 0
 			unsigned char WiFiModuleCommFail:1;					//bit 1
 			unsigned char Telecom4GModuleCommFail:1;			//bit 2
@@ -1618,7 +1652,7 @@ struct AlarmCodeData
 			unsigned char LcmModuleCommFail:1;					//bit 5
 			unsigned char AuxPowerModuleCommFail:1;				//bit 6
 			unsigned char RelayBoardCommFail:1;					//bit 7
-			//AlarmVal[6]
+			//AlarmVal[6] 012248 - 012255
 			unsigned char CcsModuleCommFail:1;					//bit 0
 			unsigned char ChademoModuleCommFail:1;				//bit 1
 			unsigned char GbModuleCommFail:1;					//bit 2
@@ -1627,7 +1661,7 @@ struct AlarmCodeData
 			unsigned char SystemFanDecay:1;						//bit 5
 			unsigned char FailToCreateShareMemory:1;			//bit 6
 			unsigned char CsuInitFailed:1;						//bit 7
-			//AlarmVal[7]
+			//AlarmVal[7] 012256 - 012263
 			unsigned char AcGroundfaultFail:1;					//bit 0
 			unsigned char McuSelftestFail:1;					//bit 1
 			unsigned char RelaySelftestFail:1;					//bit 2
@@ -1636,7 +1670,7 @@ struct AlarmCodeData
 			unsigned char GbGroundfaultTimeout:1;				//bit 5
 			unsigned char CircuitShort:1;						//bit 6
 			unsigned char PsuDuplicateID:1;						//bit 7
-			//AlarmVal[8]
+			//AlarmVal[8] 012264 - 012271
 			unsigned char PsuOutputShortCircuit :1;				//bit 0
 			unsigned char PsuDischargeAbnormal :1;				//bit 1
 			unsigned char PsuDcSideShutDown :1;					//bit 2
@@ -1645,7 +1679,7 @@ struct AlarmCodeData
 			unsigned char PsuFanFailureAlarm :1;				//bit 5
 			unsigned char PsuInputUVP:1;						//bit 6
 			unsigned char PsuInputOVP:1;						//bit 7
-			//AlarmVal[9]
+			//AlarmVal[9] 012272 - 012279
 			unsigned char PsuWalkInState :1;					//bit 0
 			unsigned char PsuPowerLimitedState :1;				//bit 1
 			unsigned char PsuIdRepeat :1;						//bit 2
@@ -1654,7 +1688,7 @@ struct AlarmCodeData
 			unsigned char PsuThreePhaseOnputImbalance :1;		//bit 5
 			unsigned char PsuFfcSideShutDown :1;				//bit 6
 			unsigned char PsuNoResource:1;						//bit 7
-			//AlarmVal[10]
+			//AlarmVal[10] 012280 - 012287
 			unsigned char RelayboardStestFail :1;				//bit 0
 			unsigned char FanboardStestFail :1;					//bit 1
 			unsigned char PrimaryStestFail :1;					//bit 2
@@ -1662,8 +1696,8 @@ struct AlarmCodeData
 			unsigned char CCSboardStestFail :1;					//bit 4
 			unsigned char AcContactStestFail :1;				//bit 5
 			unsigned char PsuModuleStestFail :1;				//bit 6
-			unsigned char ModelNameNoneMatchStestFail:1;		//bit 7	
-			//AlarmVal[11]
+			unsigned char ModelNameNoneMatchStestFail:1;		//bit 7
+			//AlarmVal[11] 012288 - 012295
 			unsigned char CcsOutputUVPFail :1;					//bit 0
 			unsigned char ChademoOutputUVPFail :1;				//bit 1
 			unsigned char GbtOutputUVPFail :1;					//bit 2
@@ -1672,7 +1706,7 @@ struct AlarmCodeData
 			unsigned char LedboardStestFail:1;					//bit 5
 			unsigned char AcSystemInputOVP:1;					//bit 6
 			unsigned char AcSystemInputUVP:1;					//bit 7
-			//AlarmVal[12]
+			//AlarmVal[12] 012296 - 012303
 			unsigned char ChademoGroundWarning :1;					//bit 0
 			unsigned char CcsGroundfaultWarning :1;					//bit 1
 			unsigned char GbGroundfaultWarning :1;					//bit 2
@@ -1681,16 +1715,16 @@ struct AlarmCodeData
 			unsigned char CircuitShortL2:1;							//bit 5
 			unsigned char CircuitShortL3:1;							//bit 6
 			unsigned char CcsLiquidChillerWaterLevelWarning:1;      //bit 7
-			//AlarmVal[13]
+			//AlarmVal[13] 012304 - 012311
             unsigned char DisconnectedFromDo:1;                     //bit 0
-            unsigned char MeterCommTimeout:1;                       //bit 1
+            unsigned char Meter1CommTimeout:1;                       //bit 1
             unsigned char PsuDipSwitchStestFail:1;                  //bit 2
             unsigned char PsuFuseBurnOut:1;                         //bit 3
             unsigned char PsuPfcAndDcdcCommFault:1;                 //bit 4
             unsigned char PsuBusVoltageUnbalance:1;                 //bit 5
             unsigned char PsuBusOverVoltage:1;                      //bit 6
             unsigned char PsuBusVoltageAbnormal:1;                  //bit 7
-            //AlarmVal[14]
+            //AlarmVal[14] 012312 - 012319
             unsigned char PsuBusUnderVoltage:1;                     //bit 0
             unsigned char PsuInputPhaseLoss:1;                      //bit 1
             unsigned char PsuFanFullSpeed:1;                        //bit 2
@@ -1699,7 +1733,7 @@ struct AlarmCodeData
             unsigned char PsuDcdcEepromFault:1;                     //bit 5
             unsigned char PsuPfcEepromFault:1;                      //bit 6
             unsigned char PsuDcdcOverVoltage:1;                     //bit 7
-            //AlarmVal[15]
+            //AlarmVal[15] 012320 - 012327
             unsigned char SystemChademoOutputUCP:1;                 //bit 0
             unsigned char SystemCCSOutputUCP:1;                     //bit 1
             unsigned char SystemGBTOutputUCP:1;                     //bit 2
@@ -1708,32 +1742,57 @@ struct AlarmCodeData
             unsigned char AbnormalVoltageOnOutputLine_2:1;          //bit 5
             unsigned char SystemTaskLost:1;                         //bit 6
             unsigned char DcInputOVP:1;                             //bit 7
-            //AlarmVal[16]
+            //AlarmVal[16] 012328 - 012335
             unsigned char DcInputUVP:1;                             //bit 0
             unsigned char PsuCanCommFault:1;                        //bit 1
             unsigned char PsuDcDcOtp:1;                             //bit 2
             unsigned char PsuDcDcOvp:1;                             //bit 3
             unsigned char ChillerTubeOTP : 1;                       //bit 4
             unsigned char PsuPhaseOvp:1;                            //bit 5
-            unsigned char :2;                                       //reserved bit 6 ~ bit 7
-            //AlarmVal[17]
-            unsigned char :7;                                       //reserved bit 0 ~ bit 6
-            unsigned char TiltSensorStestFail:1;                    //reserved bit 7
-            //AlarmVal[18]
+            unsigned char PsuFault:1;                               //bit 6
+            unsigned char UUPsu_AbnormalDischargeCircuit:1;         //bit 7
+            //AlarmVal[17] 012336 - 012343
+            unsigned char UUPsu_FanFault :1;                        //bit 0
+            unsigned char UUPsu_IDRepeat :1;                        //bit 1
+            unsigned char UUPsu_PfcInterUnbalance :1;               //bit 2
+            unsigned char UUPsu_PfcAndDcdcCommFault :1;             //bit 3
+            unsigned char UUPsu_DcOutputVolUnbalance :1;            //bit 4
+            unsigned char UUPsu_DctoDcDontWork :1;                  //bit 5
+            unsigned char UUPsu_FanDontWork :1;                     //bit 6
+            unsigned char TiltSensorStestFail:1;                    //bit 7
+            //AlarmVal[18] 012344 - 012351
             unsigned char MeterIcCommTimeout:1;                     //bit 0
             unsigned char PilotNegativeError:1;                     //bit 1
             unsigned char PsuComminicationErrWithCSU:1;             //bit 2
             unsigned char LocalPowerSharingCommunicationError:1;    //bit 3
             unsigned char ChillerAlarmFail:1;                       //bit 4
-			unsigned char :3;                                       //reserved bit 4 ~ bit 7
-            //AlarmVal[19]
+            unsigned char Meter2CommTimeout:1;                      //bit 5
+            unsigned char Meter3CommTimeout:1;                      //bit 6
+            unsigned char Meter4CommTimeout:1;                      //bit 7
+            //AlarmVal[19] 012352 - 012359
             unsigned char PaymentCommTimeout:1;                     //Payment system communication timeout
-           	unsigned char MeterSlaveLosLink:1;                     	//DCMB meter slave module los link
-            unsigned char MeterSyncTimeError:1;            					//DCMB meter Sync Time Error
+            unsigned char MeterSlaveLosLink:1;                      //DCMB meter slave module los link
+            unsigned char MeterSyncTimeError:1;                     //DCMB meter Sync Time Error
             unsigned char MetertStartTransactionError:1;            //DCMB meter Start Transaction Error
             unsigned char MetertStopTransactionError:1;             //DCMB meter Stop Transaction Error
-            unsigned char MetertGetTransactionOcmfError:1;          //DCMB meter Get OCMF Error        	
-            unsigned char :2;                                       //reserved bit 1 ~ bit 7
+            unsigned char MetertGetTransactionOcmfError:1;          //DCMB meter Get OCMF Error
+            unsigned char NormalOutputRelayWelding:1;               //bit 6
+            unsigned char NormalOutputRelayDrivingFault:1;          //bit 7
+            //AlarmVal[20] 012360 - 012367 //LW_MERGE_UU
+            unsigned char UUPsu_DcOVPAndShutdown :1;                //bit 0
+            unsigned char UUPsu_AcOVPAndShutdown :1;                //bit 1
+            unsigned char UUPsu_PfcInternalOVP :1;                  //bit 2
+            unsigned char UUPsu_PfcInternalUVP :1;                  //bit 3
+            unsigned char UUPsu_AcSiteOVP :1;                       //bit 4
+            unsigned char UUPsu_AcSiteUVP :1;                       //bit 5
+            unsigned char UUPsu_DcOutputOVP :1;                     //bit 6
+            unsigned char UUPsu_DcOutputUVP :1;                     //bit 7
+            //AlarmVal[21] 012368 - 012375 //LW_MERGE_UU
+            unsigned char UUPsu_EnvUTP :1;                          //bit 0
+            unsigned char UUPsu_EnvPfcDcOTP_RelayBroken :1;         //bit1
+            unsigned char UUPsu_DCtoDC_Broken :1;                   //bit 2
+            unsigned char UUPsu_PfcBroken :1;                       //bit 3
+            unsigned char :4;                                       //reserved bit 4 ~ bit 7
 		}bits;
 	}AlarmEvents;
 };
@@ -2564,6 +2623,9 @@ struct ConnInfo
 {
     unsigned char ConnectorStaus;
     unsigned char NeedToFetch;
+    unsigned char SystemStatus;
+    unsigned char Type;
+    unsigned char Index;
 };
 
 struct SmartBoxData
@@ -2747,6 +2809,8 @@ struct GBTData
 /**************************ISO15118_2014: 2014************************************/
 /**************************ISO15118_2018: 2018************************************/
 /************************************************************************************/
+#undef FALSE
+#undef TRUE
 typedef enum boolean { FALSE, TRUE } BOOL;
 enum ResponseCodeType_DIN70121		{ OK_DIN70121 = 0, OK_NewSessionEstablished_DIN70121 = 1, OK_OldSessionJoined_DIN70121 = 2, OK_CertificateExpiresSoon_DIN70121 = 3,
 									   FAILED_DIN70121 = 4, FAILED_SequenceError_DIN70121 = 5, FAILED_ServiceIDInvalid_DIN70121 = 6, FAILED_UnknownSession_DIN70121 = 7,
@@ -4255,7 +4319,7 @@ struct PrimaryMcuData
             unsigned char Key2:1;                               //bit 3,    H: ON,      L:OFF
             unsigned char Key3:1;                               //bit 4,    H: ON,      L:OFF
             unsigned char Ac_Drop;                              //bit 4,    H: Trigger, L:Normal
-			unsigned char :2;                                   //bit 5~7,  Reserved
+            unsigned char :2;                                   //bit 6~7,  Reserved
         }bits;
     }InputDet;
 };
@@ -4959,10 +5023,13 @@ enum OCPP20CtrlrVariable
 	OCPPCommCtrlr_WebSocketPingInterval,
 	OCPPCommCtrlr_ResetRetries,
 	OCPPCommCtrlr_PublicKeyWithSignedMeterValue,
-    OCPPCommCtrlr_StatusNotificationPeriodically,
+    OCPPCommCtrlr_VariableVersion,
+	OCPPCommCtrlr_StatusNotificationPeriodically,
     OCPPCommCtrlr_StatusNotificationInterval,
 	OCPPCommCtrlr_CharingProfileRefreshInterval,
-    OCPPCommCtrlr_VariableVersion,
+    OCPPCommCtrlr_RfidEndianType,
+	OCPPCommCtrlr_AuthorizeTimeout,
+	OCPPCommCtrlr_Enable15118,
 	ReservationCtrlr_Enabled,
 	ReservationCtrlr_Available,
 	ReservationCtrlr_NonEvseSpecific,
@@ -5395,10 +5462,10 @@ struct ReportDataType
 
 struct SetMonitoringDataType
 {
-	unsigned int id;												// Optional. An id SHALL only be given to replace an existing monitor. The Charging Station handles the generation of id’s for new monitors.
+	int id;												            // Optional. An id SHALL only be given to replace an existing monitor. The Charging Station handles the generation of id’s for new monitors.
 	float value;													// Required. Value for threshold or delta monitoring. For Periodic or PeriodicClockAligned this is the interval in seconds.
 	unsigned char type[32];											// Required. The type of this monitor, e.g. a threshold, delta or periodic monitor.
-	unsigned char severity;											// Required. The severity that will be assigned to an event that is triggered by this monitor.
+	unsigned char severity;											    // Required. The severity that will be assigned to an event that is triggered by this monitor.
 	unsigned char transaction;										// Optional. Monitor only active when a transaction is ongoing on a component relevant to this transaction. Default = false.
 	struct ComponentType component;									// Required. Component for which monitor is set.
 	struct VariableType variable;									// Required. Variable for which monitor is set.
@@ -6021,12 +6088,52 @@ struct StructReaderStatus
     unsigned char ReportReaderStatusReq:1;
 };
 
+struct StructOccupancyFeeDisplay
+{
+	unsigned char occupancySN[64];
+	int   actionId;
+    unsigned char OccupancyFeeDisplayReq:1;
+};
+
+struct StructSetOccupancyPrice
+{
+	float   price;
+    unsigned char SetOccupancyPriceReq:1;
+};
+
+struct StructOccupancyFeeAct
+{
+	unsigned char occupancySN[64];
+	int action;
+
+	int   response_duration;
+	float response_occupancyFee;
+	unsigned char response_status[10];
+    unsigned char response_occupancySN[37];
+    unsigned char response_startTime[64];
+
+    unsigned char OccupancyFeeActReq:1;
+};
+
+struct StructOccupancyDeductResult
+{
+	unsigned char deductResult:1;
+	float amount;
+	unsigned char occupancySN[37];
+	unsigned char creditNo[64];
+	unsigned char approvalNo[20];
+};
+
 struct StructTcciCustomData
 {
     struct StructChargerInfo ChargerInfo;
     struct StructWeatherInfo WeatherInfo;
     struct StructCreditDeductResult DeductInfo;
     struct StructReaderStatus ReaderStatus[CONNECTOR_QUANTITY];
+    struct StructOccupancyFeeDisplay OccupancyFeeDisplay[CONNECTOR_QUANTITY];
+    struct StructSetOccupancyPrice SetOccupancyPrice;
+    struct StructOccupancyFeeAct OccupancyFeeAct[CONNECTOR_QUANTITY];
+    struct StructOccupancyDeductResult OccupancyDeductResult;
     unsigned char TriggerReaderReq[3];
     unsigned char SerialNo[CONNECTOR_QUANTITY][37];
     unsigned char VEMData[CONNECTOR_QUANTITY][65];
@@ -6036,7 +6143,8 @@ struct StructTcciCustomData
     unsigned char ChargerInfoConf:1;
     unsigned char WeatherInfoReq:1;
     unsigned char WeatherInfoConf:1;
-    unsigned char :3;                  // bit 5-7 , reserved
+    unsigned char ReportOccupancyDeductReq:1;
+    unsigned char :2;                  // bit 6-7 , reserved
 };
 
 struct OCMFData
@@ -6077,6 +6185,9 @@ struct OCPP16Data
     unsigned int                            Timeout_Secs;
     unsigned short                          Ping_Pong_Interval;
     long int                                procDogTime;            // Process watch dog refresh timer
+    unsigned int                            isBootNotificationDone;
+    unsigned char                           preOcppServerURL[512];
+
     union
     {
         //Operations Initiated by Charge Point
@@ -6272,7 +6383,10 @@ struct OCPP20Data
 	unsigned short 							Ping_Pong_Interval;
 	long int                                procDogTime;            // Process watch dog refresh timer
 	struct ReportDataType                   ControllerComponentVariable[CtrlrVariable_CNT];
+	struct SetMonitoringDataType            MonitoringComponentVariable[10];
 	struct NetworkConnectionProfile_20      NetworkConnectionProfile[10];
+	unsigned int                            MonitoringLevel;
+	unsigned char                           MonitoringBase[20];
 
 	union
 	{
@@ -6493,7 +6607,7 @@ struct OCPP20Data
 	struct GetLog_20							GetLog;
 	struct GetMonitoringReport_20				GetMonitoringReport;
 	struct GetReport_20							GetReport;
-	struct GetTransactionStatus_20				GetTransactionStatus[CONNECTOR_QUANTITY];
+	struct GetTransactionStatus_20				GetTransactionStatus;
 	struct GetVariables_20						GetVariables;
 	struct Heartbeat_20							Heartbeat;
 	struct InstallCertificate_20				InstallCertificate;