Merge branch 'master' of http://192.168.0.12:13000/sc/DyeingComputer
This commit is contained in:
commit
62cd3c6e33
1 file changed
+4
-2
@@ -1134,7 +1134,8 @@ namespace DyeingComputer.ViewModel
|
||||
}
|
||||
if ((TEMP_co - T) > 5)
|
||||
{
|
||||
ERRinf.ERRinf_w(errTabler, Status_Str + "[" + Resources.Heats + Resources.LnsufficientPower + "]", "201-1");//写入
|
||||
ERRinf.ERRinf_w(errTabler, Resources.Heats + ":" + Resources.Target + Resources.Temperature + string.Format(" {0:###.#}", STEP_P1) + "°C" +
|
||||
"[" + Resources.Heats + Resources.LnsufficientPower + "]", "201-1");//写入
|
||||
}
|
||||
else
|
||||
{
|
||||
@@ -1166,7 +1167,8 @@ namespace DyeingComputer.ViewModel
|
||||
}
|
||||
if ((T - TEMP_co) > 5)
|
||||
{
|
||||
ERRinf.ERRinf_w(errTabler, Status_Str + "[" + Resources.Cooling + Resources.LnsufficientPower + "]", "201-2");//写入
|
||||
ERRinf.ERRinf_w(errTabler, Resources.Cooling + ":" + Resources.Target + Resources.Temperature + string.Format(" {0:###.#}", STEP_P1) + "°C" +
|
||||
"[" + Resources.Cooling + Resources.LnsufficientPower + "]", "201-2");//写入
|
||||
}
|
||||
else
|
||||
{
|
||||
|
||||
Reference in new issue
Block a user