更改了单位和屏蔽了一些功能
This commit is contained in:
@@ -699,18 +699,23 @@
|
||||
<ItemGroup>
|
||||
<Reference Include="Arction.DirectX">
|
||||
<HintPath>C:\Program Files (x86)\Arction\LightningChart .NET SDK v.10\LibNET4\Arction.DirectX.dll</HintPath>
|
||||
<Private>True</Private>
|
||||
</Reference>
|
||||
<Reference Include="Arction.Licensing">
|
||||
<HintPath>C:\Program Files (x86)\Arction\LightningChart .NET SDK v.10\LibNET4\Arction.Licensing.dll</HintPath>
|
||||
<Private>True</Private>
|
||||
</Reference>
|
||||
<Reference Include="Arction.RenderingDefinitions">
|
||||
<HintPath>C:\Program Files (x86)\Arction\LightningChart .NET SDK v.10\LibNET4\Arction.RenderingDefinitions.dll</HintPath>
|
||||
<Private>True</Private>
|
||||
</Reference>
|
||||
<Reference Include="Arction.Wpf.Charting.LightningChart">
|
||||
<HintPath>C:\Program Files (x86)\Arction\LightningChart .NET SDK v.10\LibNET4\Arction.Wpf.Charting.LightningChart.dll</HintPath>
|
||||
<Private>True</Private>
|
||||
</Reference>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<Folder Include="Models\ProModelPars\" />
|
||||
<Folder Include="Tool\" />
|
||||
<Folder Include="LocalDll\" />
|
||||
</ItemGroup>
|
||||
|
||||
@@ -70,7 +70,7 @@ namespace CapMachine.Wpf.Dtos
|
||||
/// <summary>
|
||||
/// 吸气压力 信息
|
||||
/// </summary>
|
||||
[Column("吸气压力(MpaA)")]
|
||||
[Column("吸气压力(BarA)")]
|
||||
public double InhPress
|
||||
{
|
||||
get { return _InhPress; }
|
||||
@@ -81,7 +81,7 @@ namespace CapMachine.Wpf.Dtos
|
||||
/// <summary>
|
||||
/// 排气压力 信息
|
||||
/// </summary>
|
||||
[Column("排气压力(MpaA)")]
|
||||
[Column("排气压力(BarA)")]
|
||||
public double ExPress
|
||||
{
|
||||
get { return _ExPress; }
|
||||
@@ -125,7 +125,7 @@ namespace CapMachine.Wpf.Dtos
|
||||
/// <summary>
|
||||
/// COND2压力 信息
|
||||
/// </summary>
|
||||
[Column("COND2压力(MpaA)")]
|
||||
[Column("COND2压力(BarA)")]
|
||||
public double Cond2Press
|
||||
{
|
||||
get { return _Cond2Press; }
|
||||
@@ -158,7 +158,7 @@ namespace CapMachine.Wpf.Dtos
|
||||
/// <summary>
|
||||
/// 润滑油压力 信息
|
||||
/// </summary>
|
||||
[Column("润滑油压力(MpaA)")]
|
||||
[Column("润滑油压力(BarA)")]
|
||||
public double LubePress
|
||||
{
|
||||
get { return _LubePress; }
|
||||
|
||||
@@ -69,7 +69,7 @@ namespace CapMachine.Wpf.Models
|
||||
new ConfigChartYAxis(){ Index=2,Min=0,Max=8000,Name="转速",Unit="rpm"},
|
||||
new ConfigChartYAxis(){ Index=3,Min=0,Max=100,Name="电压",Unit="V"},
|
||||
new ConfigChartYAxis(){ Index=4,Min=0,Max=100,Name="电流",Unit="A"},
|
||||
new ConfigChartYAxis(){ Index=5,Min=0,Max=5,Name="压力",Unit="MpaA"},
|
||||
new ConfigChartYAxis(){ Index=5,Min=0,Max=5,Name="压力",Unit="BarA"},
|
||||
new ConfigChartYAxis(){ Index=6,Min=0,Max=5,Name="流量",Unit="L/min"},
|
||||
new ConfigChartYAxis(){ Index=7,Min=0,Max=5,Name="功率",Unit="W"},
|
||||
};
|
||||
|
||||
Binary file not shown.
@@ -105,12 +105,12 @@ namespace CapMachine.Wpf.Services
|
||||
new Columns(){ Name="Id",MapType="System.Int64",IsIdentity=true,IsPrimary=true},
|
||||
new Columns(){ Name="工况",MapType="System.String",IsIdentity=false,IsPrimary=false,StringLength=100},
|
||||
new Columns(){ Name="转速[rpm]",MapType=typeof(float).ToString(),IsIdentity=false,IsPrimary=false},
|
||||
new Columns(){ Name="排气压力[MpaA]",MapType=typeof(float).ToString(),IsIdentity=false,IsPrimary=false},
|
||||
new Columns(){ Name="吸气压力[MpaA]",MapType=typeof(float).ToString(),IsIdentity=false,IsPrimary=false},
|
||||
new Columns(){ Name="排气压力[BarA]",MapType=typeof(float).ToString(),IsIdentity=false,IsPrimary=false},
|
||||
new Columns(){ Name="吸气压力[BarA]",MapType=typeof(float).ToString(),IsIdentity=false,IsPrimary=false},
|
||||
new Columns(){ Name="吸气温度[℃]",MapType=typeof(float).ToString(),IsIdentity=false,IsPrimary=false},
|
||||
new Columns(){ Name="COND1温度[℃]",MapType=typeof(float).ToString(),IsIdentity=false,IsPrimary=false},
|
||||
new Columns(){ Name="润滑油压力[MpaA]",MapType=typeof(float).ToString(),IsIdentity=false,IsPrimary=false},
|
||||
new Columns(){ Name="COND2压力[MpaA]",MapType=typeof(float).ToString(),IsIdentity=false,IsPrimary=false},
|
||||
new Columns(){ Name="润滑油压力[BarA]",MapType=typeof(float).ToString(),IsIdentity=false,IsPrimary=false},
|
||||
new Columns(){ Name="COND2压力[BarA]",MapType=typeof(float).ToString(),IsIdentity=false,IsPrimary=false},
|
||||
new Columns(){ Name="OCR[%]",MapType=typeof(float).ToString(),IsIdentity=false,IsPrimary=false},
|
||||
new Columns(){ Name="HV[V]",MapType=typeof(float).ToString(),IsIdentity=false,IsPrimary=false},
|
||||
new Columns(){ Name="HV[A]",MapType=typeof(float).ToString(),IsIdentity=false,IsPrimary=false},
|
||||
@@ -126,10 +126,10 @@ namespace CapMachine.Wpf.Services
|
||||
new Columns(){ Name="冷媒流量[L/min]",MapType=typeof(float).ToString(),IsIdentity=false,IsPrimary=false},
|
||||
new Columns(){ Name="润滑油流量[L/min]",MapType=typeof(float).ToString(),IsIdentity=false,IsPrimary=false},
|
||||
new Columns(){ Name="排气温度[℃]",MapType=typeof(float).ToString(),IsIdentity=false,IsPrimary=false},
|
||||
new Columns(){ Name="膨胀阀前压力[MpaA]",MapType=typeof(float).ToString(),IsIdentity=false,IsPrimary=false},
|
||||
new Columns(){ Name="膨胀阀前压力[BarA]",MapType=typeof(float).ToString(),IsIdentity=false,IsPrimary=false},
|
||||
new Columns(){ Name="膨胀阀前温度[℃]",MapType=typeof(float).ToString(),IsIdentity=false,IsPrimary=false},
|
||||
new Columns(){ Name="EVAP出口压力[MpaA]",MapType=typeof(float).ToString(),IsIdentity=false,IsPrimary=false},
|
||||
new Columns(){ Name="腔内压力[MpaA]",MapType=typeof(float).ToString(),IsIdentity=false,IsPrimary=false},
|
||||
new Columns(){ Name="EVAP出口压力[BarA]",MapType=typeof(float).ToString(),IsIdentity=false,IsPrimary=false},
|
||||
new Columns(){ Name="腔内压力[BarA]",MapType=typeof(float).ToString(),IsIdentity=false,IsPrimary=false},
|
||||
new Columns(){ Name="压缩机表面温度[℃]",MapType=typeof(float).ToString(),IsIdentity=false,IsPrimary=false},
|
||||
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},
|
||||
@@ -612,8 +612,6 @@ namespace CapMachine.Wpf.Services
|
||||
IsRecord = false;
|
||||
MessageBox.Show("当前试验信息未填写，无法开始记录数据", "提示", MessageBoxButton.OK, MessageBoxImage.Hand);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
|
||||
@@ -141,12 +141,12 @@ namespace CapMachine.Wpf.Services
|
||||
|
||||
////三电 Sample
|
||||
TagManger.AddTag(new Tag<short>("转速", "转速[rpm]", "Speed", "程序", "VW15000", 100, 0, 1, "rpm", new ShortTagValue(), true) { DecimalPoint = 0 });
|
||||
TagManger.AddTag(new Tag<short>("排气压力", "排气压力[MpaA]", "ExPress", "程序", "VW15002", 100, 0, 100, "MpaA", new ShortTagValue(), true) { DecimalPoint = 2 });
|
||||
TagManger.AddTag(new Tag<short>("吸气压力", "吸气压力[MpaA]", "InhPress", "程序", "VW15004", 100, 0, 100, "MpaA", new ShortTagValue(), true) { DecimalPoint = 2 });
|
||||
TagManger.AddTag(new Tag<short>("排气压力", "排气压力[BarA]", "ExPress", "程序", "VW15002", 100, 0, 100, "BarA", new ShortTagValue(), true) { DecimalPoint = 2 });
|
||||
TagManger.AddTag(new Tag<short>("吸气压力", "吸气压力[BarA]", "InhPress", "程序", "VW15004", 100, 0, 100, "BarA", new ShortTagValue(), true) { DecimalPoint = 2 });
|
||||
TagManger.AddTag(new Tag<short>("吸气温度", "吸气温度[℃]", "InhTemp", "程序", "VW15006", 100, 0, 10, "℃", new ShortTagValue(), true) { DecimalPoint = 1 });
|
||||
TagManger.AddTag(new Tag<short>("COND1温度", "COND1温度[℃]", "Cond1Temp", "程序", "VW15008", 100, 0, 10, "℃", new ShortTagValue(), true) { DecimalPoint = 1 });
|
||||
TagManger.AddTag(new Tag<short>("润滑油压力", "润滑油压力[MpaA]", "LubePress", "程序", "VW15010", 100, 0, 100, "MpaA", new ShortTagValue(), true) { DecimalPoint = 2 });
|
||||
TagManger.AddTag(new Tag<short>("COND2压力", "COND2压力[MpaA]", "Cond2Press", "程序", "VW15012", 100, 0, 100, "MpaA", new ShortTagValue(), false) { DecimalPoint = 2 });
|
||||
TagManger.AddTag(new Tag<short>("润滑油压力", "润滑油压力[BarA]", "LubePress", "程序", "VW15010", 100, 0, 100, "BarA", new ShortTagValue(), true) { DecimalPoint = 2 });
|
||||
TagManger.AddTag(new Tag<short>("COND2压力", "COND2压力[BarA]", "Cond2Press", "程序", "VW15012", 100, 0, 100, "BarA", new ShortTagValue(), false) { DecimalPoint = 2 });
|
||||
TagManger.AddTag(new Tag<short>("OCR", "OCR[%]", "OCR", "程序", "VW15014", 100, 0, 10, "%", new ShortTagValue(), true) { DecimalPoint = 1 });
|
||||
TagManger.AddTag(new Tag<short>("HV[V]", "HV[V]", "HV", "程序", "VW15016", 100, 0, 10, "V", new ShortTagValue(), true) { DecimalPoint = 1 });
|
||||
TagManger.AddTag(new Tag<short>("HV[A]", "HV[A]", "HVCur", "程序", "VW15018", 100, 0, 1, "A", new ShortTagValue(), false) { DecimalPoint = 1 });
|
||||
@@ -156,7 +156,7 @@ namespace CapMachine.Wpf.Services
|
||||
TagManger.AddTag(new Tag<short>("LV[A]", "LV[A]", "LVCur", "程序", "VW15024", 100, 0, 100, "A", new ShortTagValue(), false) { DecimalPoint = 2 });
|
||||
TagManger.AddTag(new Tag<short>("环境温度", "环境温度[℃]", "EnvTemp", "程序", "VW15026", 100, 0, 10, "℃", new ShortTagValue(), true) { DecimalPoint = 1 });
|
||||
//TagManger.AddTag(new Tag<short>("环境湿度", "环境湿度[%]", "EnvRH", "程序", "VW15028", 100, 0, 10, "%", new ShortTagValue(), true) { DecimalPoint = 1 });
|
||||
TagManger.AddTag(new Tag<short>("环境湿度", "环境湿度[%]", "EnvRH", "程序", "VW15028", 100, 0, 1, "%", new ShortTagValue(), true) { DecimalPoint = 1 });
|
||||
TagManger.AddTag(new Tag<short>("环境湿度", "环境湿度[%]", "EnvRH", "程序", "VW15028", 100, 0, 10, "%", new ShortTagValue(), true) { DecimalPoint = 1 });
|
||||
TagManger.AddTag(new Tag<short>("OS1温度", "OS1温度[℃]", "OS1Temp", "程序", "VW15030", 100, 0, 10, "℃", new ShortTagValue(), false) { DecimalPoint = 1 });
|
||||
TagManger.AddTag(new Tag<short>("OS2温度", "OS2温度[℃]", "OS2Temp", "程序", "VW15032", 100, 0, 10, "℃", new ShortTagValue(), false) { DecimalPoint = 1 });
|
||||
TagManger.AddTag(new Tag<short>("COND2温度", "COND2温度[℃]", "Cond2Temp", "程序", "VW15034", 100, 0, 10, "℃", new ShortTagValue(), false) { DecimalPoint = 1 });
|
||||
@@ -165,10 +165,10 @@ namespace CapMachine.Wpf.Services
|
||||
TagManger.AddTag(new Tag<short>("冷媒流量", "冷媒流量[L/min]", "VRV", "程序", "VW15038", 100, 0, 10, "L/min", new ShortTagValue(), false) { DecimalPoint = 1 });
|
||||
TagManger.AddTag(new Tag<short>("润滑油流量", "润滑油流量[L/min]", "LubeFlow", "程序", "VW15040", 100, 0, 1, "L/min", new ShortTagValue(), false) { DecimalPoint = 1 });
|
||||
TagManger.AddTag(new Tag<short>("排气温度", "排气温度[℃]", "ExTemp", "程序", "VW15042", 100, 0, 10, "℃", new ShortTagValue(), true) { DecimalPoint = 1 });
|
||||
TagManger.AddTag(new Tag<short>("膨胀阀前压力", "膨胀阀前压力[MpaA]", "TxvFrPress", "程序", "VW15044", 100, 0, 100, "MpaA", new ShortTagValue(), false) { DecimalPoint = 2 });
|
||||
TagManger.AddTag(new Tag<short>("膨胀阀前压力", "膨胀阀前压力[BarA]", "TxvFrPress", "程序", "VW15044", 100, 0, 100, "BarA", new ShortTagValue(), false) { DecimalPoint = 2 });
|
||||
TagManger.AddTag(new Tag<short>("膨胀阀前温度", "膨胀阀前温度[℃]", "TxvFrTemp", "程序", "VW15046", 100, 0, 10, "℃", new ShortTagValue(), false) { DecimalPoint = 1 });
|
||||
TagManger.AddTag(new Tag<short>("EVAP出口压力", "EVAP出口压力[MpaA]", "EVAPExpPress", "程序", "VW15048", 100, 0, 100, "MpaA", new ShortTagValue(), false) { DecimalPoint = 2 });
|
||||
TagManger.AddTag(new Tag<short>("腔内压力", "腔内压力[MpaA]", "IntrplPress", "程序", "VW15050", 100, 0, 100, "MpaA", new ShortTagValue(), false) { DecimalPoint = 2 });
|
||||
TagManger.AddTag(new Tag<short>("EVAP出口压力", "EVAP出口压力[BarA]", "EVAPExpPress", "程序", "VW15048", 100, 0, 100, "BarA", new ShortTagValue(), false) { DecimalPoint = 2 });
|
||||
TagManger.AddTag(new Tag<short>("腔内压力", "腔内压力[BarA]", "IntrplPress", "程序", "VW15050", 100, 0, 100, "BarA", new ShortTagValue(), false) { DecimalPoint = 2 });
|
||||
TagManger.AddTag(new Tag<short>("压缩机表面温度", "压缩机表面温度[℃]", "CapSurfTemp", "程序", "VW15052", 100, 0, 10, "℃", new ShortTagValue(), false) { DecimalPoint = 1 });
|
||||
TagManger.AddTag(new Tag<short>("PTC流量", "PTC流量[L/min]", "PTCFlow", "程序", "VW15054", 100, 0, 1, "L/min", new ShortTagValue(), false) { DecimalPoint = 1 });
|
||||
TagManger.AddTag(new Tag<short>("PTC入水温度", "PTC入水温度[℃]", "PTCEntTemp", "程序", "VW15056", 100, 0, 10, "℃", new ShortTagValue(), false) { DecimalPoint = 1 });
|
||||
@@ -192,7 +192,7 @@ namespace CapMachine.Wpf.Services
|
||||
#region SongZhi
|
||||
|
||||
////【SongZhi】
|
||||
|
||||
|
||||
//TagManger.AddTag(new Tag<short>(new ShortTagValue())
|
||||
//{
|
||||
// Name = "转速[rpm]",//名称带单位
|
||||
@@ -884,6 +884,9 @@ namespace CapMachine.Wpf.Services
|
||||
/// <returns></returns>
|
||||
public bool SysReset()
|
||||
{
|
||||
return true;
|
||||
|
||||
//取消XXX
|
||||
var FindData = ListHandSwitchData.Where(a => a.Name == "复位");
|
||||
if (FindData.Count() > 0)
|
||||
{
|
||||
@@ -906,6 +909,9 @@ namespace CapMachine.Wpf.Services
|
||||
/// <returns></returns>
|
||||
public bool SysMute()
|
||||
{
|
||||
return true;
|
||||
|
||||
//取消XXX
|
||||
var FindData = ListHandSwitchData.Where(a => a.Name == "消音");
|
||||
if (FindData.Count() > 0)
|
||||
{
|
||||
@@ -929,15 +935,18 @@ namespace CapMachine.Wpf.Services
|
||||
/// <returns></returns>
|
||||
public bool SysStart()
|
||||
{
|
||||
var Result = SiemensDrive.Write("M0.4", true);
|
||||
if (Result.IsSuccess)
|
||||
{
|
||||
return true;
|
||||
}
|
||||
else
|
||||
{
|
||||
return false;
|
||||
}
|
||||
return true;
|
||||
|
||||
//取消XXX
|
||||
//var Result = SiemensDrive.Write("M0.4", true);
|
||||
//if (Result.IsSuccess)
|
||||
//{
|
||||
// return true;
|
||||
//}
|
||||
//else
|
||||
//{
|
||||
// return false;
|
||||
//}
|
||||
}
|
||||
|
||||
|
||||
@@ -947,6 +956,9 @@ namespace CapMachine.Wpf.Services
|
||||
/// <returns></returns>
|
||||
public bool SysEnd()
|
||||
{
|
||||
return true;
|
||||
|
||||
//取消XXX
|
||||
var Result = SiemensDrive.Write("M0.7", true);
|
||||
if (Result.IsSuccess)
|
||||
{
|
||||
@@ -966,6 +978,9 @@ namespace CapMachine.Wpf.Services
|
||||
/// <returns></returns>
|
||||
public bool SysPause()
|
||||
{
|
||||
return true;
|
||||
|
||||
//取消XXX
|
||||
var StateResult = SiemensDrive.ReadBool("M0.6");
|
||||
if (StateResult.IsSuccess)
|
||||
{
|
||||
@@ -1170,13 +1185,13 @@ namespace CapMachine.Wpf.Services
|
||||
switch (ConfigService.CanLinRunStateModel.CurSysSelectedCanLin)
|
||||
{
|
||||
case CanLinEnum.Can:
|
||||
//通信转速 Dbc中间配置名称的转速数据读取出来 给PLC
|
||||
SiemensDrive.Write(itemTag.Value.PVAddress, (short)CanDriveService.GetDbcSpeedValueBySpeedName("通讯转速"));
|
||||
//通信转速 Dbc中间配置名称的转速数据读取出来 给PLC 取消XXX
|
||||
//SiemensDrive.Write(itemTag.Value.PVAddress, (short)CanDriveService.GetDbcSpeedValueBySpeedName("通讯转速"));
|
||||
//itemTag.Value.EngPvValue = 0;
|
||||
break;
|
||||
case CanLinEnum.Lin:
|
||||
//通信转速 Dbc中间配置名称的转速数据读取出来 给PLC
|
||||
SiemensDrive.Write(itemTag.Value.PVAddress, (short)LinDriveService.GetLdfSpeedValueBySpeedName("通讯转速"));
|
||||
//通信转速 Dbc中间配置名称的转速数据读取出来 给PLC 取消XXX
|
||||
//SiemensDrive.Write(itemTag.Value.PVAddress, (short)LinDriveService.GetLdfSpeedValueBySpeedName("通讯转速"));
|
||||
//itemTag.Value.EngPvValue = 0;
|
||||
break;
|
||||
default:
|
||||
@@ -1188,13 +1203,13 @@ namespace CapMachine.Wpf.Services
|
||||
switch (ConfigService.CanLinRunStateModel.CurSysSelectedCanLin)
|
||||
{
|
||||
case CanLinEnum.Can:
|
||||
//通信转速 Dbc中间配置名称的转速数据读取出来 给PLC
|
||||
SiemensDrive.Write(itemTag.Value.PVAddress, (short)(CanDriveService.GetDbcValueByName("通讯母线电压") * itemTag.Value.Precision));
|
||||
//通信转速 Dbc中间配置名称的转速数据读取出来 给PLC 取消XXX
|
||||
//SiemensDrive.Write(itemTag.Value.PVAddress, (short)(CanDriveService.GetDbcValueByName("通讯母线电压") * itemTag.Value.Precision));
|
||||
//itemTag.Value.EngPvValue = 0;
|
||||
break;
|
||||
case CanLinEnum.Lin:
|
||||
//通信转速 Dbc中间配置名称的转速数据读取出来 给PLC
|
||||
SiemensDrive.Write(itemTag.Value.PVAddress, (short)(LinDriveService.GetLdfValueByName("通讯母线电压") * itemTag.Value.Precision));
|
||||
//通信转速 Dbc中间配置名称的转速数据读取出来 给PLC 取消XXX
|
||||
//SiemensDrive.Write(itemTag.Value.PVAddress, (short)(LinDriveService.GetLdfValueByName("通讯母线电压") * itemTag.Value.Precision));
|
||||
//itemTag.Value.EngPvValue = 0;
|
||||
break;
|
||||
default:
|
||||
@@ -1206,13 +1221,13 @@ namespace CapMachine.Wpf.Services
|
||||
switch (ConfigService.CanLinRunStateModel.CurSysSelectedCanLin)
|
||||
{
|
||||
case CanLinEnum.Can:
|
||||
//通信转速 Dbc中间配置名称的转速数据读取出来 给PLC
|
||||
SiemensDrive.Write(itemTag.Value.PVAddress, (short)(CanDriveService.GetDbcValueByName("通讯母线电流") * itemTag.Value.Precision));
|
||||
//通信转速 Dbc中间配置名称的转速数据读取出来 给PLC 取消XXX
|
||||
//SiemensDrive.Write(itemTag.Value.PVAddress, (short)(CanDriveService.GetDbcValueByName("通讯母线电流") * itemTag.Value.Precision));
|
||||
//itemTag.Value.EngPvValue = 0;
|
||||
break;
|
||||
case CanLinEnum.Lin:
|
||||
//通信转速 Dbc中间配置名称的转速数据读取出来 给PLC
|
||||
SiemensDrive.Write(itemTag.Value.PVAddress, (short)(LinDriveService.GetLdfValueByName("通讯母线电流") * itemTag.Value.Precision));
|
||||
//通信转速 Dbc中间配置名称的转速数据读取出来 给PLC 取消XXX
|
||||
//SiemensDrive.Write(itemTag.Value.PVAddress, (short)(LinDriveService.GetLdfValueByName("通讯母线电流") * itemTag.Value.Precision));
|
||||
//itemTag.Value.EngPvValue = 0;
|
||||
break;
|
||||
default:
|
||||
@@ -1224,13 +1239,13 @@ namespace CapMachine.Wpf.Services
|
||||
switch (ConfigService.CanLinRunStateModel.CurSysSelectedCanLin)
|
||||
{
|
||||
case CanLinEnum.Can:
|
||||
//通信转速 Dbc中间配置名称的转速数据读取出来 给PLC
|
||||
SiemensDrive.Write(itemTag.Value.PVAddress, (short)(CanDriveService.GetDbcValueByName("通讯相电流") * itemTag.Value.Precision));
|
||||
//通信转速 Dbc中间配置名称的转速数据读取出来 给PLC 取消XXX
|
||||
//SiemensDrive.Write(itemTag.Value.PVAddress, (short)(CanDriveService.GetDbcValueByName("通讯相电流") * itemTag.Value.Precision));
|
||||
//itemTag.Value.EngPvValue = 0;
|
||||
break;
|
||||
case CanLinEnum.Lin:
|
||||
//通信转速 Dbc中间配置名称的转速数据读取出来 给PLC
|
||||
SiemensDrive.Write(itemTag.Value.PVAddress, (short)(LinDriveService.GetLdfValueByName("通讯相电流") * itemTag.Value.Precision));
|
||||
//通信转速 Dbc中间配置名称的转速数据读取出来 给PLC 取消XXX
|
||||
//SiemensDrive.Write(itemTag.Value.PVAddress, (short)(LinDriveService.GetLdfValueByName("通讯相电流") * itemTag.Value.Precision));
|
||||
//itemTag.Value.EngPvValue = 0;
|
||||
break;
|
||||
default:
|
||||
@@ -1242,13 +1257,13 @@ namespace CapMachine.Wpf.Services
|
||||
switch (ConfigService.CanLinRunStateModel.CurSysSelectedCanLin)
|
||||
{
|
||||
case CanLinEnum.Can:
|
||||
//通信转速 Dbc中间配置名称的转速数据读取出来 给PLC
|
||||
SiemensDrive.Write(itemTag.Value.PVAddress, (short)(CanDriveService.GetDbcValueByName("通讯功率") * itemTag.Value.Precision));
|
||||
//通信转速 Dbc中间配置名称的转速数据读取出来 给PLC 取消XXX
|
||||
//SiemensDrive.Write(itemTag.Value.PVAddress, (short)(CanDriveService.GetDbcValueByName("通讯功率") * itemTag.Value.Precision));
|
||||
//itemTag.Value.EngPvValue = 0;
|
||||
break;
|
||||
case CanLinEnum.Lin:
|
||||
//通信转速 Dbc中间配置名称的转速数据读取出来 给PLC
|
||||
SiemensDrive.Write(itemTag.Value.PVAddress, (short)(LinDriveService.GetLdfValueByName("通讯功率") * itemTag.Value.Precision));
|
||||
//通信转速 Dbc中间配置名称的转速数据读取出来 给PLC 取消XXX
|
||||
//SiemensDrive.Write(itemTag.Value.PVAddress, (short)(LinDriveService.GetLdfValueByName("通讯功率") * itemTag.Value.Precision));
|
||||
//itemTag.Value.EngPvValue = 0;
|
||||
break;
|
||||
default:
|
||||
@@ -1260,13 +1275,13 @@ namespace CapMachine.Wpf.Services
|
||||
switch (ConfigService.CanLinRunStateModel.CurSysSelectedCanLin)
|
||||
{
|
||||
case CanLinEnum.Can:
|
||||
//通信转速 Dbc中间配置名称的转速数据读取出来 给PLC
|
||||
SiemensDrive.Write(itemTag.Value.PVAddress, (short)(CanDriveService.GetDbcValueByName("通讯芯片温度") * itemTag.Value.Precision));
|
||||
//通信转速 Dbc中间配置名称的转速数据读取出来 给PLC 取消XXX
|
||||
//SiemensDrive.Write(itemTag.Value.PVAddress, (short)(CanDriveService.GetDbcValueByName("通讯芯片温度") * itemTag.Value.Precision));
|
||||
//itemTag.Value.EngPvValue = 0;
|
||||
break;
|
||||
case CanLinEnum.Lin:
|
||||
//通信转速 Dbc中间配置名称的转速数据读取出来 给PLC
|
||||
SiemensDrive.Write(itemTag.Value.PVAddress, (short)(LinDriveService.GetLdfValueByName("通讯芯片温度") * itemTag.Value.Precision));
|
||||
//通信转速 Dbc中间配置名称的转速数据读取出来 给PLC 取消XXX
|
||||
//SiemensDrive.Write(itemTag.Value.PVAddress, (short)(LinDriveService.GetLdfValueByName("通讯芯片温度") * itemTag.Value.Precision));
|
||||
//itemTag.Value.EngPvValue = 0;
|
||||
break;
|
||||
default:
|
||||
@@ -1368,10 +1383,10 @@ namespace CapMachine.Wpf.Services
|
||||
}
|
||||
}
|
||||
|
||||
//手自动切换按钮条件
|
||||
AutoHandSwtichConditionState.AlarmStateResult = SiemensDrive.ReadBool(AutoHandSwtichConditionState.AlarmAddress);
|
||||
AutoHandSwtichConditionState.HandStateResult = SiemensDrive.ReadBool(AutoHandSwtichConditionState.HandStateAddress);
|
||||
AutoHandSwtichConditionState.SumResult();
|
||||
////手自动切换按钮条件 取消XXX
|
||||
//AutoHandSwtichConditionState.AlarmStateResult = SiemensDrive.ReadBool(AutoHandSwtichConditionState.AlarmAddress);
|
||||
//AutoHandSwtichConditionState.HandStateResult = SiemensDrive.ReadBool(AutoHandSwtichConditionState.HandStateAddress);
|
||||
//AutoHandSwtichConditionState.SumResult();
|
||||
|
||||
break;
|
||||
default:
|
||||
@@ -1383,55 +1398,60 @@ namespace CapMachine.Wpf.Services
|
||||
//Console.WriteLine("Add Elapsed output runTime:{0}", stopwatch.Elapsed.TotalSeconds.ToString());
|
||||
//stopwatch.Reset();
|
||||
|
||||
OperateResultAlarm = SiemensDrive.ReadBool("V0.0", 15);
|
||||
if (OperateResultAlarm.IsSuccess)
|
||||
{
|
||||
foreach (var item in AlarmService.ListAlarmRunCell)
|
||||
{
|
||||
item.UpdateBoolValue(OperateResultAlarm.Content[item.Index]);
|
||||
}
|
||||
}
|
||||
////读取报警信息 取消报警XXX
|
||||
//OperateResultAlarm = SiemensDrive.ReadBool("V0.0", 15);
|
||||
//if (OperateResultAlarm.IsSuccess)
|
||||
//{
|
||||
// foreach (var item in AlarmService.ListAlarmRunCell)
|
||||
// {
|
||||
// item.UpdateBoolValue(OperateResultAlarm.Content[item.Index]);
|
||||
// }
|
||||
//}
|
||||
|
||||
//循环读取手自动切换
|
||||
foreach (var item in ListHandSwitchData)
|
||||
{
|
||||
item.StateOperateResult = SiemensDrive.ReadBool(item.StateAddress);
|
||||
if (item.StateOperateResult.IsSuccess)
|
||||
{
|
||||
item.State = item.StateOperateResult.Content;
|
||||
//根据PLC得到执行的步骤数据，更新到CAN和LIN的数据
|
||||
if (item.Name!.Equals("使能"))
|
||||
{
|
||||
switch (ConfigService.CanLinRunStateModel.CurSysSelectedCanLin)
|
||||
{
|
||||
case CanLinEnum.Can:
|
||||
//获取PLC的使能状态，更新到CAN的使能状态
|
||||
CanDriveService.UpdateCapEnableCmdData(item.State);
|
||||
//itemTag.Value.EngPvValue = 0;
|
||||
break;
|
||||
case CanLinEnum.Lin:
|
||||
//获取PLC的使能状态，更新到LIN的使能状态
|
||||
LinDriveService.UpdateCapEnableCmdData(item.State);
|
||||
//itemTag.Value.EngPvValue = 0;
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
////循环读取手自动切换 取消XXX
|
||||
//foreach (var item in ListHandSwitchData)
|
||||
//{
|
||||
// item.StateOperateResult = SiemensDrive.ReadBool(item.StateAddress);
|
||||
// if (item.StateOperateResult.IsSuccess)
|
||||
// {
|
||||
// item.State = item.StateOperateResult.Content;
|
||||
// //根据PLC得到执行的步骤数据，更新到CAN和LIN的数据
|
||||
// if (item.Name!.Equals("使能"))
|
||||
// {
|
||||
// switch (ConfigService.CanLinRunStateModel.CurSysSelectedCanLin)
|
||||
// {
|
||||
// case CanLinEnum.Can:
|
||||
// //获取PLC的使能状态，更新到CAN的使能状态
|
||||
// CanDriveService.UpdateCapEnableCmdData(item.State);
|
||||
// //itemTag.Value.EngPvValue = 0;
|
||||
// break;
|
||||
// case CanLinEnum.Lin:
|
||||
// //获取PLC的使能状态，更新到LIN的使能状态
|
||||
// LinDriveService.UpdateCapEnableCmdData(item.State);
|
||||
// //itemTag.Value.EngPvValue = 0;
|
||||
// break;
|
||||
// default:
|
||||
// break;
|
||||
// }
|
||||
// }
|
||||
// }
|
||||
//}
|
||||
|
||||
//拓展信息的展示
|
||||
foreach (var itemQuickTag in CurSysExdInfo.QuickTags)
|
||||
{
|
||||
itemQuickTag.OperateResultSource = SiemensDrive.Read(itemQuickTag.ValueAddress, itemQuickTag.ByteLength);
|
||||
}
|
||||
CurSysExdInfo.SumRunTime();
|
||||
//布尔拓展信息的展示
|
||||
foreach (var itemQuickTag in SysExdBoolInfos.QuickTags)
|
||||
{
|
||||
itemQuickTag.OperateResultSource = SiemensDrive.Read(itemQuickTag.ValueAddress, itemQuickTag.ByteLength);
|
||||
}
|
||||
|
||||
////拓展信息的展示 取消XXX
|
||||
//foreach (var itemQuickTag in CurSysExdInfo.QuickTags)
|
||||
//{
|
||||
// itemQuickTag.OperateResultSource = SiemensDrive.Read(itemQuickTag.ValueAddress, itemQuickTag.ByteLength);
|
||||
//}
|
||||
|
||||
|
||||
//CurSysExdInfo.SumRunTime();
|
||||
|
||||
////布尔拓展信息的展示 取消XXX
|
||||
//foreach (var itemQuickTag in SysExdBoolInfos.QuickTags)
|
||||
//{
|
||||
// itemQuickTag.OperateResultSource = SiemensDrive.Read(itemQuickTag.ValueAddress, itemQuickTag.ByteLength);
|
||||
//}
|
||||
|
||||
}
|
||||
catch (Exception ex)
|
||||
|
||||
@@ -54,16 +54,16 @@ namespace CapMachine.Wpf.Services
|
||||
TagManager = MachineRtDataService.TagManger;
|
||||
|
||||
//SpeedTag = TagManager.DicTags.GetValueOrDefault("转速[rpm]");
|
||||
//ExPressTag = TagManager.DicTags.GetValueOrDefault("排气压力[MpaA]");
|
||||
//ExPressTag = TagManager.DicTags.GetValueOrDefault("排气压力[BarA]");
|
||||
//ExTempTag = TagManager.DicTags.GetValueOrDefault("排气温度[℃]");
|
||||
InhPressTag = TagManager.DicTags.GetValueOrDefault("吸气压力[MpaA]")!;
|
||||
InhPressTag = TagManager.DicTags.GetValueOrDefault("吸气压力[BarA]")!;
|
||||
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]")!;
|
||||
TxvFrPressTag = TagManager.DicTags.GetValueOrDefault("膨胀阀前压力[BarA]")!;
|
||||
//Cond1TempTag = TagManager.DicTags.GetValueOrDefault("冷凝器出口水温[℃]");
|
||||
//CondInTempTag = TagManager.DicTags.GetValueOrDefault("冷凝器进口温度[℃]");
|
||||
|
||||
|
||||
25
CapMachine.Wpf/Services/ProRuntimeService.cs
Normal file
25
CapMachine.Wpf/Services/ProRuntimeService.cs
Normal file
@@ -0,0 +1,25 @@
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using System.Text;
|
||||
using System.Threading.Tasks;
|
||||
|
||||
namespace CapMachine.Wpf.Services
|
||||
{
|
||||
/// <summary>
|
||||
/// 程序运行时服务
|
||||
/// 负责程序的解析、运行、调度等功能
|
||||
/// </summary>
|
||||
public class ProRuntimeService
|
||||
{
|
||||
/// <summary>
|
||||
/// 实例化函数
|
||||
/// </summary>
|
||||
public ProRuntimeService()
|
||||
{
|
||||
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
}
|
||||
@@ -51,16 +51,16 @@ namespace CapMachine.Wpf.ViewModels
|
||||
ListMeterTag = TagManager.DicTags.Values.Where(a => a.IsMeter == true).ToList();
|
||||
|
||||
SpeedTag = TagManager.DicTags.GetValueOrDefault("转速[rpm]");
|
||||
ExPressTag = TagManager.DicTags.GetValueOrDefault("排气压力[MpaA]");
|
||||
ExPressTag = TagManager.DicTags.GetValueOrDefault("排气压力[BarA]");
|
||||
ExTempTag = TagManager.DicTags.GetValueOrDefault("排气温度[℃]");
|
||||
InhPressTag = TagManager.DicTags.GetValueOrDefault("吸气压力[MpaA]");
|
||||
InhPressTag = TagManager.DicTags.GetValueOrDefault("吸气压力[BarA]");
|
||||
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]");
|
||||
TxvFrPressTag = TagManager.DicTags.GetValueOrDefault("膨胀阀前压力[BarA]");
|
||||
Cond1TempTag = TagManager.DicTags.GetValueOrDefault("冷凝器出口水温[℃]");
|
||||
CondInTempTag = TagManager.DicTags.GetValueOrDefault("冷凝器进口温度[℃]");
|
||||
|
||||
|
||||
@@ -170,6 +170,7 @@
|
||||
HandValueCommand="{Binding Source={StaticResource Proxy}, Path=Data.HandValueCmd}"
|
||||
HandValueMVParameter="{Binding EngMvValue}"
|
||||
HandValueSVParameter="{Binding EngSvValue}"
|
||||
IsEnabled="False"
|
||||
MeterName="{Binding NameNoUnit}"
|
||||
PVValue="{Binding EngPvValue}"
|
||||
SVValue="{Binding EngSvValue}"
|
||||
@@ -837,7 +838,7 @@
|
||||
</StackPanel>
|
||||
</Grid>-->
|
||||
<materialDesign:Card Margin="0,0" materialDesign:ElevationAssist.Elevation="Dp2">
|
||||
<ItemsControl ItemsSource="{Binding ListHandSwitchData}">
|
||||
<ItemsControl IsEnabled="False" ItemsSource="{Binding ListHandSwitchData}">
|
||||
<ItemsControl.ItemsPanel>
|
||||
<ItemsPanelTemplate>
|
||||
<StackPanel Orientation="Vertical" />
|
||||
@@ -867,7 +868,7 @@
|
||||
|
||||
<!--<svg1:SVGImage Grid.Column="1" Source="E:\图库资源\SVGEdit\CapMachineOutput.svg" RenderTransformOrigin="0.5,0.5" VerticalContentAlignment="Center" HorizontalContentAlignment="Center" Margin="3" />-->
|
||||
<!-- inkscape -->
|
||||
<Canvas Grid.Column="1">
|
||||
<Canvas Grid.Column="1" Visibility="Visible">
|
||||
<Canvas.Background>
|
||||
<ImageBrush ImageSource="\Assets\Images\CapMachineOutput1.png" />
|
||||
</Canvas.Background>
|
||||
@@ -1002,15 +1003,15 @@
|
||||
CellTitle="吸气口温度"
|
||||
CellUnit="{Binding InhTempTag.Unit}"
|
||||
CellValue="{Binding InhTempTag.EngPvValueStr}" />
|
||||
<Controls:ValueShow
|
||||
<!--<Controls:ValueShow
|
||||
Canvas.Left="551"
|
||||
Canvas.Top="272"
|
||||
HorizontalAlignment="Center"
|
||||
VerticalAlignment="Top"
|
||||
CellTitle="吸气压力MV"
|
||||
CellUnit="%"
|
||||
CellValue="{Binding InhPressTag.EngMvValue}" />
|
||||
<Controls:ValueShow
|
||||
CellValue="{Binding InhPressTag.EngMvValue}" />-->
|
||||
<!--<Controls:ValueShow
|
||||
Canvas.Left="1003"
|
||||
Canvas.Top="152"
|
||||
HorizontalAlignment="Left"
|
||||
@@ -1065,7 +1066,7 @@
|
||||
VerticalAlignment="Center"
|
||||
CellTitle="吸气温度MV"
|
||||
CellUnit="%"
|
||||
CellValue="{Binding InhTempTag.EngMvValue}" />
|
||||
CellValue="{Binding InhTempTag.EngMvValue}" />-->
|
||||
<Label
|
||||
Canvas.Left="1339"
|
||||
Canvas.Top="225"
|
||||
|
||||
@@ -621,7 +621,7 @@
|
||||
|
||||
<DataGridTemplateColumn>
|
||||
<DataGridTemplateColumn.Header>
|
||||
<TextBlock FontWeight="Bold" Text="排气压力
(MpaA)" />
|
||||
<TextBlock FontWeight="Bold" Text="排气压力
(BarA)" />
|
||||
</DataGridTemplateColumn.Header>
|
||||
<DataGridTemplateColumn.CellTemplate>
|
||||
<DataTemplate>
|
||||
@@ -632,7 +632,7 @@
|
||||
|
||||
<DataGridTemplateColumn>
|
||||
<DataGridTemplateColumn.Header>
|
||||
<TextBlock FontWeight="Bold" Text="吸气压力
(MpaA)" />
|
||||
<TextBlock FontWeight="Bold" Text="吸气压力
(BarA)" />
|
||||
</DataGridTemplateColumn.Header>
|
||||
<DataGridTemplateColumn.CellTemplate>
|
||||
<DataTemplate>
|
||||
@@ -676,7 +676,7 @@
|
||||
|
||||
<!--<DataGridTemplateColumn>
|
||||
<DataGridTemplateColumn.Header>
|
||||
<TextBlock FontWeight="Bold" Text="润滑油压力
(MpaA)" />
|
||||
<TextBlock FontWeight="Bold" Text="润滑油压力
(BarA)" />
|
||||
</DataGridTemplateColumn.Header>
|
||||
<DataGridTemplateColumn.CellTemplate>
|
||||
<DataTemplate>
|
||||
@@ -687,7 +687,7 @@
|
||||
|
||||
<DataGridTemplateColumn>
|
||||
<DataGridTemplateColumn.Header>
|
||||
<TextBlock FontWeight="Bold" Text="COND2压力
(MpaA)" />
|
||||
<TextBlock FontWeight="Bold" Text="COND2压力
(BarA)" />
|
||||
</DataGridTemplateColumn.Header>
|
||||
<DataGridTemplateColumn.CellTemplate>
|
||||
<DataTemplate>
|
||||
@@ -1371,7 +1371,7 @@
|
||||
VerticalAlignment="Center"
|
||||
FontSize="12"
|
||||
FontWeight="Bold"
|
||||
Text="排气压力 (MpaA)" />
|
||||
Text="排气压力 (BarA)" />
|
||||
</StackPanel>
|
||||
</TabItem.Header>
|
||||
<Controls:MeterConfig
|
||||
@@ -1405,7 +1405,7 @@
|
||||
VerticalAlignment="Center"
|
||||
FontSize="12"
|
||||
FontWeight="Bold"
|
||||
Text="吸气压力 (MpaA)" />
|
||||
Text="吸气压力 (BarA)" />
|
||||
</StackPanel>
|
||||
</TabItem.Header>
|
||||
<Controls:MeterConfig
|
||||
@@ -1508,7 +1508,7 @@
|
||||
VerticalAlignment="Center"
|
||||
FontSize="12"
|
||||
FontWeight="Bold"
|
||||
Text="润滑油压力 (MpaA)" />
|
||||
Text="润滑油压力 (BarA)" />
|
||||
</StackPanel>
|
||||
</TabItem.Header>
|
||||
<Controls:MeterConfig
|
||||
@@ -1576,7 +1576,7 @@
|
||||
VerticalAlignment="Center"
|
||||
FontSize="12"
|
||||
FontWeight="Bold"
|
||||
Text="COND2压力 (MpaA)" />
|
||||
Text="COND2压力 (BarA)" />
|
||||
</StackPanel>
|
||||
</TabItem.Header>
|
||||
<Controls:MeterConfig
|
||||
|
||||
@@ -167,11 +167,11 @@
|
||||
MappingName="Speed"
|
||||
NumberDecimalDigits="0" />
|
||||
<syncfusion:GridNumericColumn
|
||||
HeaderText="排气压力(MpaA)"
|
||||
HeaderText="排气压力(BarA)"
|
||||
MappingName="ExPress"
|
||||
NumberDecimalDigits="2" />
|
||||
<syncfusion:GridNumericColumn
|
||||
HeaderText="吸气压力(MpaA)"
|
||||
HeaderText="吸气压力(BarA)"
|
||||
MappingName="InhPress"
|
||||
NumberDecimalDigits="2" />
|
||||
<syncfusion:GridNumericColumn
|
||||
@@ -184,11 +184,11 @@
|
||||
MappingName="Cond1Temp"
|
||||
NumberDecimalDigits="1" />
|
||||
<syncfusion:GridNumericColumn
|
||||
HeaderText="润滑油压力(MpaA)"
|
||||
HeaderText="润滑油压力(BarA)"
|
||||
MappingName="LubePress"
|
||||
NumberDecimalDigits="2" />
|
||||
<syncfusion:GridNumericColumn
|
||||
HeaderText="COND2压力(MpaA)"
|
||||
HeaderText="COND2压力(BarA)"
|
||||
MappingName="Cond2Press"
|
||||
NumberDecimalDigits="2" />
|
||||
<syncfusion:GridNumericColumn
|
||||
|
||||
Reference in New Issue
Block a user