diff --git a/CapMachine.Wpf/Services/MachineRtDataService.cs b/CapMachine.Wpf/Services/MachineRtDataService.cs
index 0cfd352..edaa3f7 100644
--- a/CapMachine.Wpf/Services/MachineRtDataService.cs
+++ b/CapMachine.Wpf/Services/MachineRtDataService.cs
@@ -572,7 +572,7 @@ namespace CapMachine.Wpf.Services
Name = "压缩机表面温度1[℃]",//名称带单位
NameNoUnit = "压缩机表面温度1",//无单位名称
EnName = "CapSurfTemp1",//英文名称
- Group = "程序",//分组
+ Group = "CAN",//分组
MinValue = 0,
MaxValue = 100,
Unit = "℃",
@@ -591,7 +591,7 @@ namespace CapMachine.Wpf.Services
Name = "压缩机表面温度2[℃]",//名称带单位
NameNoUnit = "压缩机表面温度2",//无单位名称
EnName = "CapSurfTemp2",//英文名称
- Group = "程序",//分组
+ Group = "CAN",//分组
MinValue = 0,
MaxValue = 100,
Unit = "℃",
@@ -610,7 +610,7 @@ namespace CapMachine.Wpf.Services
Name = "压缩机表面温度3[℃]",//名称带单位
NameNoUnit = "压缩机表面温度3",//无单位名称
EnName = "CapSurfTemp3",//英文名称
- Group = "程序",//分组
+ Group = "CAN",//分组
MinValue = 0,
MaxValue = 100,
Unit = "℃",
@@ -629,7 +629,7 @@ namespace CapMachine.Wpf.Services
Name = "通讯母线电压[V]",//名称带单位
NameNoUnit = "通讯母线电压",//无单位名称
EnName = "ComCapBusVol",//英文名称
- Group = "程序",//分组
+ Group = "CAN",//分组
MinValue = 0,
MaxValue = 100,
Unit = "V",
@@ -648,7 +648,7 @@ namespace CapMachine.Wpf.Services
Name = "通讯母线电流[A]",//名称带单位
NameNoUnit = "通讯母线电流",//无单位名称
EnName = "ComCapBusCur",//英文名称
- Group = "程序",//分组
+ Group = "CAN",//分组
MinValue = 0,
MaxValue = 100,
Unit = "A",
@@ -667,7 +667,7 @@ namespace CapMachine.Wpf.Services
Name = "通讯相电流[A]",//名称带单位
NameNoUnit = "通讯相电流",//无单位名称
EnName = "ComCapPhCur",//英文名称
- Group = "程序",//分组
+ Group = "CAN",//分组
MinValue = 0,
MaxValue = 100,
Unit = "A",
@@ -686,7 +686,7 @@ namespace CapMachine.Wpf.Services
Name = "通讯功率[W]",//名称带单位
NameNoUnit = "通讯功率",//无单位名称
EnName = "ComCapPw",//英文名称
- Group = "程序",//分组
+ Group = "CAN",//分组
MinValue = 0,
MaxValue = 100,
Unit = "W",
@@ -705,7 +705,7 @@ namespace CapMachine.Wpf.Services
Name = "通讯芯片温度[℃]",//名称带单位
NameNoUnit = "通讯芯片温度",//无单位名称
EnName = "ComCapChipTemp",//英文名称
- Group = "程序",//分组
+ Group = "CAN",//分组
MinValue = 0,
MaxValue = 100,
Unit = "℃",
@@ -724,7 +724,7 @@ namespace CapMachine.Wpf.Services
Name = "过冷度[K]",//名称带单位
NameNoUnit = "过冷度",//无单位名称
EnName = "Subcooling",//英文名称
- Group = "程序",//分组
+ Group = "计算",//分组
MinValue = 0,
MaxValue = 100,
Unit = "K",
@@ -743,7 +743,7 @@ namespace CapMachine.Wpf.Services
Name = "过热度[K]",//名称带单位
NameNoUnit = "过热度",//无单位名称
EnName = "Superheat",//英文名称
- Group = "程序",//分组
+ Group = "计算",//分组
MinValue = 0,
MaxValue = 100,
Unit = "K",
@@ -851,6 +851,7 @@ namespace CapMachine.Wpf.Services
PubRtDataStart();
}
+
#region 手自动的操作
////
diff --git a/CapMachine.Wpf/Services/PPCService.cs b/CapMachine.Wpf/Services/PPCService.cs
index a02fc38..df6adf7 100644
--- a/CapMachine.Wpf/Services/PPCService.cs
+++ b/CapMachine.Wpf/Services/PPCService.cs
@@ -56,17 +56,21 @@ namespace CapMachine.Wpf.Services
//SpeedTag = TagManager.DicTags.GetValueOrDefault("转速[rpm]");
//ExPressTag = TagManager.DicTags.GetValueOrDefault("排气压力[MpaA]");
//ExTempTag = TagManager.DicTags.GetValueOrDefault("排气温度[℃]");
- InhPressTag = TagManager.DicTags.GetValueOrDefault("吸气压力[MpaA]");
- InhTempTag = TagManager.DicTags.GetValueOrDefault("吸气温度[℃]");
+ InhPressTag = TagManager.DicTags.GetValueOrDefault("吸气压力[MpaA]")!;
+ InhTempTag = TagManager.DicTags.GetValueOrDefault("吸气温度[℃]")!;
//ComCapBusVolTag = TagManager.DicTags.GetValueOrDefault("通讯母线电压[V]");
//ComCapBusCurTag = TagManager.DicTags.GetValueOrDefault("通讯母线电流[A]");
//ComCapPwTag = TagManager.DicTags.GetValueOrDefault("通讯功率[W]");
//OS2TempTag = TagManager.DicTags.GetValueOrDefault("吸气混合器温度[℃]");
- TxvFrTempTag = TagManager.DicTags.GetValueOrDefault("膨胀阀前温度[℃]");
- TxvFrPressTag = TagManager.DicTags.GetValueOrDefault("膨胀阀前压力[MpaA]");
+ TxvFrTempTag = TagManager.DicTags.GetValueOrDefault("膨胀阀前温度[℃]")!;
+ TxvFrPressTag = TagManager.DicTags.GetValueOrDefault("膨胀阀前压力[MpaA]")!;
//Cond1TempTag = TagManager.DicTags.GetValueOrDefault("冷凝器出口水温[℃]");
//CondInTempTag = TagManager.DicTags.GetValueOrDefault("冷凝器进口温度[℃]");
+ Superheat = TagManager.DicTags.GetValueOrDefault("过热度[K]");
+ Subcool = TagManager.DicTags.GetValueOrDefault("过冷度[K]");
+
+
SuperHeatCoolConfig.FluidsPath = ConfigHelper.GetValue("FluidsPath");
SuperHeatCoolConfig.Cryogen = ConfigHelper.GetValue("Cryogen");
@@ -108,16 +112,26 @@ namespace CapMachine.Wpf.Services
///
public ITag TxvFrPressTag { get; set; }
-
///
/// 过热度
///
- public double Superheat { get; set; }
+ public ITag Superheat { get; set; }
///
/// 过冷度
///
- public double Subcool { get; set; }
+ public ITag Subcool { get; set; }
+
+
+ /////
+ ///// 过热度
+ /////
+ //public double Superheat { get; set; }
+
+ /////
+ ///// 过冷度
+ /////
+ //public double Subcool { get; set; }
/////
///// 制冷剂
@@ -223,17 +237,17 @@ namespace CapMachine.Wpf.Services
IRefProp64.SATPdll(ref p, x, ref kph, ref te, ref Dl, ref Dv, xliq, xvap, ref iErr, ref herr, ref herrLen);
if (iErr == 0)
- Superheat = InhTempTag.EngPvValue - (te - 273.15);
+ Superheat.EngPvValue = InhTempTag.EngPvValue - (te - 273.15);
//textBox5.Text = String.Format("{0:n4}", Convert.ToDouble(textBox1.Text) - (te - 273.15));//textBox1 Comp.吸气温度（℃）
else
- Superheat = 0;
+ Superheat.EngPvValue = 0;
IRefProp64.SATPdll(ref p1, x, ref kph, ref te1, ref Dl, ref Dv, xliq, xvap, ref iErr, ref herr, ref herrLen);
if (iErr == 0)
- Subcool = TxvFrTempTag.EngPvValue - (te1 - 273.15);//textBox4 Evap.膨胀阀前温度（℃）
+ Subcool.EngPvValue = TxvFrTempTag.EngPvValue - (te1 - 273.15);//textBox4 Evap.膨胀阀前温度（℃）
//GuoLengDu = (te1 - 273.15) - ListKRLogCellValue.Find(a => a.Name == "膨胀阀前温度").Value;//textBox4 Evap.膨胀阀前温度（℃）
//textBox6.Text = String.Format("{0:n4}", Convert.ToDouble(textBox4.Text) - (te1 - 273.15));//textBox4 Evap.膨胀阀前温度（℃）
else
- Subcool = 0;
+ Subcool.EngPvValue = 0;
}
catch (Exception ex)
{
@@ -327,20 +341,20 @@ namespace CapMachine.Wpf.Services
if (iErr == 0)
//GuoReDu = ListRtKPMeter.Find(a => a.MeterName == "吸入温度").RtPV - (te - 273.15);
- Superheat = InhTempTag.EngPvValue - (te - 273.15);
+ Superheat.EngPvValue = InhTempTag.EngPvValue - (te - 273.15);
//textBox5.Text = String.Format("{0:n4}", Convert.ToDouble(textBox1.Text) - (te - 273.15));//textBox1 Comp.吸气温度（℃）
else
- Superheat = 0;
+ Superheat.EngPvValue = 0;
IRefProp64.SATPdll(ref p1, x, ref kph, ref te1, ref Dl, ref Dv, xliq, xvap, ref iErr, ref herr, ref herrLen);
if (iErr == 0)
//GuoLengDu = ListKRLogCellValue.Find(a => a.Name == "膨胀阀前温度").Value - (te1 - 273.15);//textBox4 Evap.膨胀阀前温度（℃）
- Subcool = TxvFrTempTag.EngPvValue - (te1 - 273.15);//textBox4 Evap.膨胀阀前温度（℃）
+ Subcool.EngPvValue = TxvFrTempTag.EngPvValue - (te1 - 273.15);//textBox4 Evap.膨胀阀前温度（℃）
//textBox6.Text = String.Format("{0:n4}", Convert.ToDouble(textBox4.Text) - (te1 - 273.15));//textBox4 Evap.膨胀阀前温度（℃）
else
- Subcool = 0;
+ Subcool.EngPvValue = 0;
}
catch (Exception ex)
diff --git a/CapMachine.Wpf/Views/MonitorView.xaml b/CapMachine.Wpf/Views/MonitorView.xaml
index b9fc481..1ef593d 100644
--- a/CapMachine.Wpf/Views/MonitorView.xaml
+++ b/CapMachine.Wpf/Views/MonitorView.xaml
@@ -450,22 +450,7 @@
CommandParameter="{x:Static Dock.Left}"
Content="{materialDesign:PackIcon Kind=ArrowUp}"
Foreground="White" />
-
+