2023-01-03/Alston Lin

Actions
1. Differentiate between infy and uu power error codes
Files
1. define.h

EVSE/Projects/define.h

@@ -1396,7 +1396,7 @@ struct FaultCodeData
 	}FaultEvents;
 };
 
-char AlarmStatusCode[160][6]=
+char AlarmStatusCode[176][6]=
 {
 	"012200",	//System L1 input OVP
 	"012201",	//System L2 input OVP
@@ -1462,18 +1462,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
@@ -1505,18 +1505,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
@@ -1528,28 +1528,28 @@ char AlarmStatusCode[160][6]=
     "012327",   // System DC input ovp
     "012328",   // System DC input uvp
     "012329",   // Psu Fault : Infy => Psu Can Communication Fault，UU =>
-    "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
+    "012330",   // Psu Fault : Infy => Psu Dc to Dc OTP
+    "012331",   // Psu Fault : Infy => Psu Dc to Dc OVP
     "012332",   // Chiller Tube OTP
-    "012333",   // Psu Fault : Infy => DC input ovp (Phase OVP)，UU => Dc output UVP
+    "012333",   // Psu Fault : Infy => DC input ovp (Phase OVP)
     "012334",   // psu fault
-    "012335",   // reserved
-    "012336",   // reserved
-    "012337",   // reserved
-    "012338",   // reserved
-    "012339",   // reserved
-    "012340",   // reserved
-    "012341",   // reserved
-    "012342",   // reserved
+    "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",   // Meter Slave Los Link
     "012354",   // Meter Sync Time Error
@@ -1558,6 +1558,22 @@ char AlarmStatusCode[160][6]=
     "012357",   // Meter Get Transaction Ocmf Error
     "012358",   // reserved
     "012359",   // reserved
+    "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
 {
@@ -1567,7 +1583,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
@@ -1576,7 +1592,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
@@ -1585,7 +1601,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
@@ -1594,7 +1610,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
@@ -1603,7 +1619,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
@@ -1612,7 +1628,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
@@ -1621,7 +1637,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
@@ -1630,7 +1646,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
@@ -1639,7 +1655,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
@@ -1648,7 +1664,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
@@ -1657,7 +1673,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
@@ -1665,8 +1681,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
@@ -1675,7 +1691,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
@@ -1684,7 +1700,7 @@ 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 Meter1CommTimeout:1;                       //bit 1
             unsigned char PsuDipSwitchStestFail:1;                  //bit 2
@@ -1693,7 +1709,7 @@ struct AlarmCodeData
             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
@@ -1702,7 +1718,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
@@ -1711,19 +1727,25 @@ 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 PsuFault:1;                               //bit 6
-            unsigned char :1;                                       //reserved 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
@@ -1732,14 +1754,29 @@ struct AlarmCodeData
             unsigned char Meter2CommTimeout:1;                      //bit 5
             unsigned char Meter3CommTimeout:1;                      //bit 6
             unsigned char Meter4CommTimeout:1;                      //bit 7
-            //AlarmVal[19]
+            //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 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 MetertGetTransactionOcmfError:1;          //DCMB meter Get OCMF Error
             unsigned char :2;                                       //reserved bit 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;
 };
@@ -2568,6 +2605,9 @@ struct ConnInfo
 {
     unsigned char ConnectorStaus;
     unsigned char NeedToFetch;
+    unsigned char SystemStatus;
+    unsigned char Type;
+    unsigned char Index;
 };
 
 struct SmartBoxData