diff --git a/DATA/800COMPUTER.db b/DATA/800COMPUTER.db
index 177e000..894ed39 100644
Binary files a/DATA/800COMPUTER.db and b/DATA/800COMPUTER.db differ
diff --git a/DATA/Chart.db b/DATA/Chart.db
index 58431a4..621a323 100644
Binary files a/DATA/Chart.db and b/DATA/Chart.db differ
diff --git a/DATA/LOG.db b/DATA/LOG.db
index d82f2f7..763303b 100644
Binary files a/DATA/LOG.db and b/DATA/LOG.db differ
diff --git a/Properties/Resources.Designer.cs b/Properties/Resources.Designer.cs
index 06e432e..b46b95e 100644
--- a/Properties/Resources.Designer.cs
+++ b/Properties/Resources.Designer.cs
@@ -375,6 +375,15 @@ namespace DyeingComputer.Properties {
}
}
+ ///
+ /// 查找类似 EmergencyStop 的本地化字符串。
+ ///
+ public static string EmergencyStop {
+ get {
+ return ResourceManager.GetString("EmergencyStop", resourceCulture);
+ }
+ }
+
///
/// 查找类似 End of program 的本地化字符串。
///
@@ -429,6 +438,15 @@ namespace DyeingComputer.Properties {
}
}
+ ///
+ /// 查找类似 Fault 的本地化字符串。
+ ///
+ public static string Fault {
+ get {
+ return ResourceManager.GetString("Fault", resourceCulture);
+ }
+ }
+
///
/// 查找类似 Finish 的本地化字符串。
///
@@ -744,6 +762,15 @@ namespace DyeingComputer.Properties {
}
}
+ ///
+ /// 查找类似 OtherCircuits 的本地化字符串。
+ ///
+ public static string OtherCircuits {
+ get {
+ return ResourceManager.GetString("OtherCircuits", resourceCulture);
+ }
+ }
+
///
/// 查找类似 OutTheCloth 的本地化字符串。
///
diff --git a/Properties/Resources.en-US.resx b/Properties/Resources.en-US.resx
index 7940fba..5273536 100644
--- a/Properties/Resources.en-US.resx
+++ b/Properties/Resources.en-US.resx
@@ -528,4 +528,13 @@
Timeout
+
+ EmergencyStop
+
+
+ Other Circuits
+
+
+ Fault
+
\ No newline at end of file
diff --git a/Properties/Resources.resx b/Properties/Resources.resx
index 95cbe17..f9f4769 100644
--- a/Properties/Resources.resx
+++ b/Properties/Resources.resx
@@ -528,4 +528,13 @@
Timeout
+
+ EmergencyStop
+
+
+ OtherCircuits
+
+
+ Fault
+
\ No newline at end of file
diff --git a/Properties/Resources.zh-CN.resx b/Properties/Resources.zh-CN.resx
index 53d40b7..6c272fa 100644
--- a/Properties/Resources.zh-CN.resx
+++ b/Properties/Resources.zh-CN.resx
@@ -528,4 +528,13 @@
超时
+
+ 紧急停止
+
+
+ 其它电路
+
+
+ 故障
+
\ No newline at end of file
diff --git a/Properties/Resources.zh-TW.resx b/Properties/Resources.zh-TW.resx
index e5e1fae..02852e2 100644
--- a/Properties/Resources.zh-TW.resx
+++ b/Properties/Resources.zh-TW.resx
@@ -526,6 +526,15 @@
目前有運行工藝，是否開始新工藝
-
+ 超時
+
+
+ 緊急停止
+
+
+ 其它電路
+
+
+ 故障
\ No newline at end of file
diff --git a/ViewModel/MainWindowViewModel.cs b/ViewModel/MainWindowViewModel.cs
index faa6393..76b12fd 100644
--- a/ViewModel/MainWindowViewModel.cs
+++ b/ViewModel/MainWindowViewModel.cs
@@ -367,25 +367,36 @@ namespace DyeingComputer.ViewModel
Alert_red = false;
Alert_bell = false;
}
+
+ if ((Selet_dtm("1010") < 1) || (Selet_dtm("1010") > 160))
+ { ERRinf.ERRinf_w(errTabler, Resources.Temperature + Resources.Sensor + Resources.Malfunction, "ERE101"); } //温度故障提示
+ else { ERRinf.ERRinf_d(errTabler, "ERR101"); }
+ if (Selet_dtd("2001")) { ERRinf.ERRinf_w(errTabler, Resources.Fault + ":" + Resources.EmergencyStop, "ERE100"); } //急停
+ else { ERRinf.ERRinf_d(errTabler, "ERE100"); }
+ if (Selet_dtd("2008")) { ERRinf.ERRinf_w(errTabler, Resources.Fault + ":" + Resources.Blower, "ERE102"); } //风机
+ else { ERRinf.ERRinf_d(errTabler, "ERE102"); }
+ if (Selet_dtd("2009")) { ERRinf.ERRinf_w(errTabler, Resources.Fault + ":" + Resources.Pump + "-0", "ERE103"); } //主泵
+ else { ERRinf.ERRinf_d(errTabler, "ERE103"); }
+ if (Selet_dtd("2012")) { ERRinf.ERRinf_w(errTabler, Resources.Fault + ":" + Resources.Wiggle, "ERE109"); } //摆布故障
+ else { ERRinf.ERRinf_d(errTabler, "ERE109"); }
+ if (Selet_dtd("2013")) { ERRinf.ERRinf_w(errTabler, Resources.Fault + ":" + Resources.OtherCircuits, "ERE108"); } //其它电器故障
+ else { ERRinf.ERRinf_d(errTabler, "ERE108"); }
+ if (Selet_dtd("2014")) { ERRinf.ERRinf_w(errTabler, Resources.Fault + ":" + Resources.Pump + "-1", "ERE104-1"); } //加料泵
+ else { ERRinf.ERRinf_d(errTabler, "ERE100"); }
+ if (Selet_dtd("2015")) { ERRinf.ERRinf_w(errTabler, Resources.Fault + ":" + Resources.Pump + "-2", "ERE104-2"); } //加料泵
+ else { ERRinf.ERRinf_d(errTabler, "ERE100"); }
+ if (Selet_dtd("2016")) { ERRinf.ERRinf_w(errTabler, Resources.Fault + ":" + Resources.Pump + "-3", "ERE104-3"); } //加料泵
+ else { ERRinf.ERRinf_d(errTabler, "ERE100"); }
}
void Tick_Event_5S()//Tick_Event周期执行事件5S
{
if(WORK_RUN !=0) Chart();//写入记录
- if ((Selet_dtm("1010") < 1) || (Selet_dtm("1010") > 160))
- {
- ERRinf.ERRinf_w(errTabler, Resources.Temperature + Resources.Sensor + Resources.Malfunction, "ERE101");
- } //温度故障提示
- else
- {
- ERRinf.ERRinf_d(errTabler, "ERR101");
- }
-
if ((Selet_dtm("1025") > 0) && (Selet_dtd("3021") || Selet_dtd("3022")))
{
- if (Selet_dtm("1030") == 0 )
+ if (Selet_dtm("1030") == 0)
{
- ERRinf.ERRinf_w(errTabler, Resources.ClothWheel+ "1 :"+ Resources.Timeout , "ERE110-1");
+ ERRinf.ERRinf_w(errTabler, Resources.ClothWheel + "1 :" + Resources.Timeout, "ERE110-1");
}
else { ERRinf.ERRinf_d(errTabler, "ERE110-1"); }
}//布轮1检测超时
@@ -469,7 +480,6 @@ namespace DyeingComputer.ViewModel
}
else { ERRinf.ERRinf_d(errTabler, "ERE110-11"); }
}//布轮11检测超时
-
if ((Selet_dtm("1057") > 0) && (Selet_dtd("3073") || Selet_dtd("3074")))
{
if (Selet_dtm("1058") == 0)