浏览代码

Merge branch 'master' of https://git.phihong.com.tw:30000/System_Integration/CSU3_AM335x

FolusWen 3 年之前
父节点
当前提交
f09aacd206
共有 1 个文件被更改,包括 44 次插入2 次删除
  1. 44 2
      EVSE/Projects/define.h

+ 44 - 2
EVSE/Projects/define.h

@@ -170,7 +170,7 @@ Storage							0x0A200000-0x7FFFFFFF		1886 MB
 #define ShmRelay2BdKey			1013
 
 #define FaultCodeLength         5
-#define AlarmCodeLength         16
+#define AlarmCodeLength         20
 #define InfoCodeLength          41
 
 /**************************************************************************************/
@@ -1146,7 +1146,7 @@ struct FaultCodeData
 	}FaultEvents;
 };
 
-char AlarmStatusCode[128][6]=
+char AlarmStatusCode[160][6]=
 {
 	"012200",	//System L1 input OVP
 	"012201",	//System L2 input OVP
@@ -1276,6 +1276,38 @@ char AlarmStatusCode[128][6]=
     "012325",   // Connector 2 detects abnormal voltage on the output line
     "012326",   // System task is lost
     "012327",   // reserved
+	"012328",   // reserved
+    "012329",   // reserved
+    "012330",   // reserved
+    "012331",   // reserved
+    "012332",   // reserved
+    "012333",   // reserved
+    "012334",   // reserved
+    "012335",   // reserved
+    "012336",   // reserved
+    "012337",   // reserved
+    "012338",   // reserved
+    "012339",   // reserved
+    "012340",   // reserved
+    "012341",   // reserved
+    "012342",   // reserved
+    "012343",   // reserved
+    "012344",   // AC: Meter IC communication timeout
+    "012345",   // AC: Pilot negative error
+    "012346",   // reserved
+    "012347",   // reserved
+    "012348",   // reserved
+    "012349",   // reserved
+    "012350",   // reserved
+	"012351",   // reserved
+    "012352",   // reserved
+    "012353",   // reserved
+    "012354",   // reserved
+    "012355",   // reserved
+    "012356",   // reserved
+    "012357",   // reserved
+    "012358",   // reserved
+    "012359",   // reserved
 };
 struct AlarmCodeData
 {
@@ -1429,6 +1461,16 @@ struct AlarmCodeData
             unsigned char AbnormalVoltageOnOutputLine_2:1;          //bit 5
             unsigned char SystemTaskLost:1;                         //bit 6
             unsigned char Reserved:1;                               //bit 7
+			//AlarmVal[16]
+            unsigned char :8;										//reserved bit 0 ~ bit 7
+            //AlarmVal[17]
+            unsigned char :8;										//reserved bit 0 ~ bit 7
+            //AlarmVal[18]
+            unsigned char MeterIcCommTimeout:1;						//bit 0
+            unsigned char PilotNegativeError:1;						//bit 1
+            unsigned char :6;										//reserved bit 2 ~ bit 7
+            //AlarmVal[19]
+            unsigned char :8;										//reserved bit 0 ~ bit 7
 		}bits;
 	}AlarmEvents;
 };