2023-01-03 / Wendell

Actions:
1. add alarm bit: NormalOutputRelayWelding, NormalOutputRelayDrivingFault

Files
1. As follow commit history

EVSE/Projects/define.h

@@ -614,10 +614,10 @@ struct SysConfigData
     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			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           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
 };
 
 struct DERATING_BY_OTP
@@ -735,7 +735,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];
+    unsigned char       ParentIdTag[21];
 };
 
 typedef struct
@@ -933,21 +933,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;
@@ -956,7 +956,7 @@ typedef union
             unsigned char reversedVoltage:1;
             unsigned char suMeasureFailureOccurred:1;
         }bits;
-        
+
 }DcmbStatusFlag;
 
 typedef union
@@ -977,15 +977,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];
@@ -996,9 +996,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;
@@ -1013,32 +1013,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[2048];
-	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;
@@ -1556,8 +1554,8 @@ char AlarmStatusCode[176][6]=
     "012355",   // Meter Start Transaction Error
     "012356",   // Meter Stop Transaction Error
     "012357",   // Meter Get Transaction Ocmf Error
-    "012358",   // reserved
-    "012359",   // reserved
+    "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)
@@ -1734,17 +1732,17 @@ struct AlarmCodeData
             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 UUPsu_AbnormalDischargeCircuit:1;		//bit 7
+            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
+            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
@@ -1756,27 +1754,28 @@ struct AlarmCodeData
             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 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
+            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
+            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;
 };
@@ -4301,7 +4300,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;
 };