diff --git a/CapMachine.Wpf/Models/CsvRecordModel.cs b/CapMachine.Wpf/Models/CsvRecordModel.cs
index 1376884..30df758 100644
--- a/CapMachine.Wpf/Models/CsvRecordModel.cs
+++ b/CapMachine.Wpf/Models/CsvRecordModel.cs
@@ -210,19 +210,7 @@ namespace CapMachine.Wpf.Models
///
[Name("PTC出水温度[℃]")]
public double PTCExpTemp { get; set; }
-
- ///
- /// AT04_01[℃]
- ///
- [Name("AT04_01[℃]")]
- public double AT04_01Temp { get; set; }
-
- ///
- /// AT04_02[℃]
- ///
- [Name("AT04_02[℃]")]
- public double AT04_02Temp { get; set; }
-
+
///
/// 通讯Cmp母线电流[A]
///
diff --git a/CapMachine.Wpf/Models/CsvRecordModelMap.cs b/CapMachine.Wpf/Models/CsvRecordModelMap.cs
index 0c45509..18feb2d 100644
--- a/CapMachine.Wpf/Models/CsvRecordModelMap.cs
+++ b/CapMachine.Wpf/Models/CsvRecordModelMap.cs
@@ -48,8 +48,6 @@ namespace CapMachine.Wpf.Models
Map(m => m.PTCFlow).Name("PTC流量[L/min]");
Map(m => m.PTCEntTemp).Name("PTC入水温度[℃]");
Map(m => m.PTCExpTemp).Name("PTC出水温度[℃]");
- Map(m => m.AT04_01Temp).Name("AT04_01[℃]");
- Map(m => m.AT04_02Temp).Name("AT04_02[℃]");
Map(m => m.ComCapBusCur).Name("通讯Cmp母线电流[A]");
Map(m => m.ComCapBusVol).Name("通讯Cmp母线电压[V]");
Map(m => m.ComCapInvTemp).Name("通讯Cmp逆变器温度[℃]");
diff --git a/CapMachine.Wpf/Models/LightChart/ChartManager.cs b/CapMachine.Wpf/Models/LightChart/ChartManager.cs
index 8e027b1..6b66f12 100644
--- a/CapMachine.Wpf/Models/LightChart/ChartManager.cs
+++ b/CapMachine.Wpf/Models/LightChart/ChartManager.cs
@@ -261,10 +261,6 @@ namespace CapMachine.Wpf.Models.LightChart
return CurHistoryData.Select(a => new ChartPoint() { Value = a.PTCEntTemp, Time = a.CreateTime }).OrderBy(a => a.Time).ToList();
case "PTC出水温度[℃]":
return CurHistoryData.Select(a => new ChartPoint() { Value = a.PTCExpTemp, Time = a.CreateTime }).OrderBy(a => a.Time).ToList();
- case "AT04_01[℃]":
- return CurHistoryData.Select(a => new ChartPoint() { Value = a.AT04_01Temp, Time = a.CreateTime }).OrderBy(a => a.Time).ToList();
- case "AT04_02[℃]":
- return CurHistoryData.Select(a => new ChartPoint() { Value = a.AT04_02Temp, Time = a.CreateTime }).OrderBy(a => a.Time).ToList();
case "通讯Cmp母线电流[A]":
return CurHistoryData.Select(a => new ChartPoint() { Value = a.ComCapBusCur, Time = a.CreateTime }).OrderBy(a => a.Time).ToList();
case "通讯Cmp母线电压[V]":
diff --git a/CapMachine.Wpf/Services/DataRecordService.cs b/CapMachine.Wpf/Services/DataRecordService.cs
index 81b814f..255ea79 100644
--- a/CapMachine.Wpf/Services/DataRecordService.cs
+++ b/CapMachine.Wpf/Services/DataRecordService.cs
@@ -134,8 +134,6 @@ namespace CapMachine.Wpf.Services
new Columns(){ Name="PTC流量[L/min]",MapType=typeof(float).ToString(),IsIdentity=false,IsPrimary=false},
new Columns(){ Name="PTC入水温度[℃]",MapType=typeof(float).ToString(),IsIdentity=false,IsPrimary=false},
new Columns(){ Name="PTC出水温度[℃]",MapType=typeof(float).ToString(),IsIdentity=false,IsPrimary=false},
- new Columns(){ Name="AT04_01[℃]",MapType=typeof(float).ToString(),IsIdentity=false,IsPrimary=false},
- new Columns(){ Name="AT04_02[℃]",MapType=typeof(float).ToString(),IsIdentity=false,IsPrimary=false},
new Columns(){ Name="通讯Cmp母线电流[A]",MapType=typeof(float).ToString(),IsIdentity=false,IsPrimary=false},
new Columns(){ Name="通讯Cmp母线电压[V]",MapType=typeof(float).ToString(),IsIdentity=false,IsPrimary=false},
new Columns(){ Name="通讯Cmp逆变器温度[℃]",MapType=typeof(float).ToString(),IsIdentity=false,IsPrimary=false},
diff --git a/CapMachine.Wpf/Services/MachineRtDataService.cs b/CapMachine.Wpf/Services/MachineRtDataService.cs
index b6d4527..729a787 100644
--- a/CapMachine.Wpf/Services/MachineRtDataService.cs
+++ b/CapMachine.Wpf/Services/MachineRtDataService.cs
@@ -178,10 +178,7 @@ namespace CapMachine.Wpf.Services
TagManger.AddTag(new Tag("PTC流量", "PTC流量[L/min]", "PTCFlow", "程序", "VW15054", 100, 0, 10, "L/min", new ShortTagValue(), false) { DecimalPoint = 1 });
TagManger.AddTag(new Tag("PTC入水温度", "PTC入水温度[℃]", "PTCEntTemp", "程序", "VW15056", 100, 0, 10, "℃", new ShortTagValue(), false) { DecimalPoint = 1 });
TagManger.AddTag(new Tag("PTC出水温度", "PTC出水温度[℃]", "PTCExpTemp", "程序", "VW15058", 100, 0, 10, "℃", new ShortTagValue(), false) { DecimalPoint = 1 });
-
- TagManger.AddTag(new Tag("AT04_01", "AT04_01[℃]", "AT04_01Temp", "程序", "VW70", 100, 0, 10, "℃", new ShortTagValue(), false) { DecimalPoint = 1 });
- TagManger.AddTag(new Tag("AT04_02", "AT04_02[℃]", "AT04_02Temp", "程序", "VW72", 100, 0, 10, "℃", new ShortTagValue(), false) { DecimalPoint = 1 });
-
+
TagManger.AddTag(new Tag("通讯Cmp母线电流", "通讯Cmp母线电流[A]", "ComCapBusCur", "程序", "VW14102", 100, 0, 100, "A", new ShortTagValue(), false) { DecimalPoint = 2 });
TagManger.AddTag(new Tag("通讯Cmp母线电压", "通讯Cmp母线电压[V]", "ComCapBusVol", "程序", "VW14104", 100, 0, 1, "V", new ShortTagValue(), false) { DecimalPoint = 0 });
TagManger.AddTag(new Tag("通讯Cmp逆变器温度", "通讯Cmp逆变器温度[℃]", "ComCapInvTemp", "程序", "VW14106", 100, 0, 1, "℃", new ShortTagValue(), false) { DecimalPoint = 0 });
@@ -1636,20 +1633,24 @@ namespace CapMachine.Wpf.Services
break;
}
- ////压缩机压缩机功率限制实时赋值
- //switch (ConfigService.CanLinRunStateModel.CurSysSelectedCanLin)
- //{
- // case CanLinEnum.Can:
- // //获取PLC的功率限制，更新到CAN的功率限制
- // CanDriveService.UpdateCapPwLimitCmdData(OperateResultValue.Content[0]);
- // break;
- // case CanLinEnum.Lin:
- // //获取PLC的功率限制，更新到LIN的功率限制
- // LinDriveService.UpdateCapPwLimitCmdData(OperateResultValue.Content[0]);
- // break;
- // default:
- // break;
- //}
+ //压缩机压缩机功率限制实时赋值
+ switch (ConfigService.CanLinRunStateModel.CurSysSelectedCanLin)
+ {
+ case CanLinEnum.Can:
+ //获取PLC的功率限制，更新到CAN的功率限制
+ CanDriveService.UpdateCapPwLimitCmdData(OperateResultValue.Content[2]);
+ break;
+ case CanLinEnum.CANFD:
+ //获取PLC的功率限制，更新到CAN的功率限制
+ CanFdDriveService.UpdateCapPwLimitCmdData(OperateResultValue.Content[2]);
+ break;
+ case CanLinEnum.Lin:
+ //获取PLC的功率限制，更新到LIN的功率限制
+ LinDriveService.UpdateCapPwLimitCmdData(OperateResultValue.Content[2]);
+ break;
+ default:
+ break;
+ }
//压缩机 PTC使能 实时赋值