Merge branch 'master' of http://www.scserverddns.top:13000/sc/DyeingComputer
This commit is contained in:
commit
bbd291e577
1 file changed
+2
-2
@@ -276,7 +276,7 @@ namespace DyeingComputer.ViewModel
|
|||||||
Dictionary<string, object> Chart_new = new Dictionary<string, object>();//缓存函数
|
Dictionary<string, object> Chart_new = new Dictionary<string, object>();//缓存函数
|
||||||
Chart_new.Add("DYELOT", work_Numder);
|
Chart_new.Add("DYELOT", work_Numder);
|
||||||
Chart_new.Add("Time", sys_Time);
|
Chart_new.Add("Time", sys_Time);
|
||||||
Chart_new.Add("MST", string.Format(" {0:###.#}", TEMP_tar));
|
Chart_new.Add("MST", string.Format(" {0:###.#}", TEMP_co));
|
||||||
Chart_new.Add("MTT", Selet_dtm("1010"));
|
Chart_new.Add("MTT", Selet_dtm("1010"));
|
||||||
Chart_new.Add("MTL", Selet_dtm("1015"));
|
Chart_new.Add("MTL", Selet_dtm("1015"));
|
||||||
Chart_new.Add("MTH", Selet_dtm("1009"));
|
Chart_new.Add("MTH", Selet_dtm("1009"));
|
||||||
@@ -305,7 +305,7 @@ namespace DyeingComputer.ViewModel
|
|||||||
private static bool STEP_finish = false; //步骤结束
|
private static bool STEP_finish = false; //步骤结束
|
||||||
private static int STEP_TIME = 0; //步骤计时S
|
private static int STEP_TIME = 0; //步骤计时S
|
||||||
private static int THL_mode = 0; //温控模式 0保温 1加热 2降
|
private static int THL_mode = 0; //温控模式 0保温 1加热 2降
|
||||||
private static double TEMP_co = 0; //计算温度
|
private static double TEMP_co = 0.5; //计算温度
|
||||||
private static double TEMP_tar = 0.5; //目标温度
|
private static double TEMP_tar = 0.5; //目标温度
|
||||||
private bool Alert_yellow = false; //警报黄灯
|
private bool Alert_yellow = false; //警报黄灯
|
||||||
private bool Alert_red = false; //警报红灯
|
private bool Alert_red = false; //警报红灯
|
||||||
|
|||||||
Reference in new issue
Block a user