diff --git a/CapMachine.Wpf/Services/MachineRtDataService.cs b/CapMachine.Wpf/Services/MachineRtDataService.cs index 32e8ab0..63c614b 100644 --- a/CapMachine.Wpf/Services/MachineRtDataService.cs +++ b/CapMachine.Wpf/Services/MachineRtDataService.cs @@ -655,7 +655,7 @@ namespace CapMachine.Wpf.Services SVAddress = "", MVAddress = "", IsMeter = false, - Precision = 10, + Precision = 1, DecimalPoint = 1, Samp = 1, ValueType = typeof(short), @@ -712,7 +712,7 @@ namespace CapMachine.Wpf.Services SVAddress = "", MVAddress = "", IsMeter = false, - Precision = 1000, + Precision = 1, DecimalPoint = 2, Samp = 1, ValueType = typeof(short), @@ -731,7 +731,7 @@ namespace CapMachine.Wpf.Services SVAddress = "", MVAddress = "", IsMeter = false, - Precision = 10, + Precision = 1, DecimalPoint = 1, Samp = 1, ValueType = typeof(short), @@ -1201,7 +1201,7 @@ namespace CapMachine.Wpf.Services //itemTag.Value.EngPvValue = 0; break; case CanLinEnum.CANFD: - SiemensDrive.Write(itemTag.Value.PVAddress, (short)CanFdDriveService.GetDbcValueByName("通讯Cmp母线电压")); + SiemensDrive.Write(itemTag.Value.PVAddress, (short)CanFdDriveService.GetDbcValueByName("通讯Cmp母线电压") * itemTag.Value.Precision); break; case CanLinEnum.Lin: //通信转速 Dbc中间配置名称的转速数据读取出来 给PLC @@ -1222,7 +1222,7 @@ namespace CapMachine.Wpf.Services //itemTag.Value.EngPvValue = 0; break; case CanLinEnum.CANFD: - SiemensDrive.Write(itemTag.Value.PVAddress, (short)CanFdDriveService.GetDbcValueByName("通讯Cmp母线电流")); + SiemensDrive.Write(itemTag.Value.PVAddress, (short)CanFdDriveService.GetDbcValueByName("通讯Cmp母线电流") * itemTag.Value.Precision); break; case CanLinEnum.Lin: //通信转速 Dbc中间配置名称的转速数据读取出来 给PLC @@ -1243,7 +1243,7 @@ namespace CapMachine.Wpf.Services //itemTag.Value.EngPvValue = 0; break; case CanLinEnum.CANFD: - SiemensDrive.Write(itemTag.Value.PVAddress, (short)CanFdDriveService.GetDbcValueByName("通讯Cmp相电流")); + SiemensDrive.Write(itemTag.Value.PVAddress, (short)CanFdDriveService.GetDbcValueByName("通讯Cmp相电流") * itemTag.Value.Precision); break; case CanLinEnum.Lin: //通信转速 Dbc中间配置名称的转速数据读取出来 给PLC @@ -1264,7 +1264,7 @@ namespace CapMachine.Wpf.Services //itemTag.Value.EngPvValue = 0; break; case CanLinEnum.CANFD: - SiemensDrive.Write(itemTag.Value.PVAddress, (short)CanFdDriveService.GetDbcValueByName("通讯Cmp功率")); + SiemensDrive.Write(itemTag.Value.PVAddress, (short)CanFdDriveService.GetDbcValueByName("通讯Cmp功率") * itemTag.Value.Precision); break; case CanLinEnum.Lin: //通信转速 Dbc中间配置名称的转速数据读取出来 给PLC diff --git a/CapMachine.Wpf/ViewModels/CANConfigViewModel.cs b/CapMachine.Wpf/ViewModels/CANConfigViewModel.cs index d32eca0..084558a 100644 --- a/CapMachine.Wpf/ViewModels/CANConfigViewModel.cs +++ b/CapMachine.Wpf/ViewModels/CANConfigViewModel.cs @@ -96,13 +96,13 @@ namespace CapMachine.Wpf.ViewModels ReadNameCbxItems = new ObservableCollection() { - new CbxItems(){ Key="通讯Cmp转速",Text="通讯Cmp转速"}, - new CbxItems(){ Key="通讯Cmp母线电压",Text="通讯Cmp母线电压"}, - new CbxItems(){ Key="通讯Cmp母线电流",Text="通讯Cmp母线电流"}, - new CbxItems(){ Key="通讯Cmp逆变器温度",Text="通讯Cmp逆变器温度"}, - new CbxItems(){ Key="通讯Cmp相电流",Text="通讯Cmp相电流"}, - new CbxItems(){ Key="通讯Cmp功率",Text="通讯Cmp功率"}, - new CbxItems(){ Key="通讯Cmp芯片温度",Text="通讯Cmp芯片温度"}, + new CbxItems(){ Key="通讯转速",Text="通讯转速"}, + new CbxItems(){ Key="通讯母线电压",Text="通讯母线电压"}, + new CbxItems(){ Key="通讯母线电流",Text="通讯母线电流"}, + new CbxItems(){ Key="通讯逆变器温度",Text="通讯逆变器温度"}, + new CbxItems(){ Key="通讯相电流",Text="通讯相电流"}, + new CbxItems(){ Key="通讯功率",Text="通讯功率"}, + new CbxItems(){ Key="通讯芯片温度",Text="通讯芯片温度"}, new CbxItems(){ Key="通讯PTC入水温度",Text="通讯PTC入水温度"}, new CbxItems(){ Key="通讯PTC出水温度",Text="通讯PTC出水温度"}, diff --git a/CapMachine.Wpf/ViewModels/CANFDConfigViewModel.cs b/CapMachine.Wpf/ViewModels/CANFDConfigViewModel.cs index ad9a28b..9d29275 100644 --- a/CapMachine.Wpf/ViewModels/CANFDConfigViewModel.cs +++ b/CapMachine.Wpf/ViewModels/CANFDConfigViewModel.cs @@ -1,31 +1,17 @@ using AutoMapper; using CapMachine.Core; -using CapMachine.Model; using CapMachine.Model.CANLIN; using CapMachine.Wpf.CanDrive; using CapMachine.Wpf.Dtos; -using CapMachine.Wpf.PrismEvent; using CapMachine.Wpf.Services; -using Ganss.Excel; using ImTools; -using Microsoft.VisualBasic; using Microsoft.Win32; -using NPOI.SS.UserModel.Charts; using Prism.Commands; using Prism.Events; using Prism.Regions; using Prism.Services.Dialogs; -using Syncfusion.Windows.Tools.Controls; -using System; -using System.Collections.Generic; using System.Collections.ObjectModel; -using System.Linq; -using System.Runtime.InteropServices; -using System.Text; -using System.Threading.Tasks; -using System.Windows; using System.Windows.Controls; -using System.Windows.Documents; using static CapMachine.Wpf.Models.ComEnum; namespace CapMachine.Wpf.ViewModels @@ -113,13 +99,13 @@ namespace CapMachine.Wpf.ViewModels ReadNameCbxItems = new ObservableCollection() { - new CbxItems(){ Key="通讯Cmp转速",Text="通讯Cmp转速"}, - new CbxItems(){ Key="通讯Cmp母线电压",Text="通讯Cmp母线电压"}, - new CbxItems(){ Key="通讯Cmp母线电流",Text="通讯Cmp母线电流"}, - new CbxItems(){ Key="通讯Cmp逆变器温度",Text="通讯Cmp逆变器温度"}, - new CbxItems(){ Key="通讯Cmp相电流",Text="通讯Cmp相电流"}, - new CbxItems(){ Key="通讯Cmp功率",Text="通讯Cmp功率"}, - new CbxItems(){ Key="通讯Cmp芯片温度",Text="通讯Cmp芯片温度"}, + new CbxItems(){ Key="通讯转速",Text="通讯转速"}, + new CbxItems(){ Key="通讯母线电压",Text="通讯母线电压"}, + new CbxItems(){ Key="通讯母线电流",Text="通讯母线电流"}, + new CbxItems(){ Key="通讯逆变器温度",Text="通讯逆变器温度"}, + new CbxItems(){ Key="通讯相电流",Text="通讯相电流"}, + new CbxItems(){ Key="通讯功率",Text="通讯功率"}, + new CbxItems(){ Key="通讯芯片温度",Text="通讯芯片温度"}, new CbxItems(){ Key="通讯PTC入水温度",Text="通讯PTC入水温度"}, new CbxItems(){ Key="通讯PTC出水温度",Text="通讯PTC出水温度"}, diff --git a/CapMachine.Wpf/ViewModels/LinConfigViewModel.cs b/CapMachine.Wpf/ViewModels/LinConfigViewModel.cs index 7962ad2..ed78528 100644 --- a/CapMachine.Wpf/ViewModels/LinConfigViewModel.cs +++ b/CapMachine.Wpf/ViewModels/LinConfigViewModel.cs @@ -80,12 +80,12 @@ namespace CapMachine.Wpf.ViewModels ReadNameCbxItems = new ObservableCollection() { - new CbxItems(){ Key="通讯Cmp转速",Text="通讯Cmp转速"}, - new CbxItems(){ Key="通讯Cmp母线电压",Text="通讯Cmp母线电压"}, - new CbxItems(){ Key="通讯Cmp母线电流",Text="通讯Cmp母线电流"}, - new CbxItems(){ Key="通讯Cmp相电流",Text="通讯Cmp相电流"}, - new CbxItems(){ Key="通讯Cmp功率",Text="通讯Cmp功率"}, - new CbxItems(){ Key="通讯Cmp芯片温度",Text="通讯Cmp芯片温度"}, + new CbxItems(){ Key="通讯转速",Text="通讯转速"}, + new CbxItems(){ Key="通讯母线电压",Text="通讯母线电压"}, + new CbxItems(){ Key="通讯母线电流",Text="通讯母线电流"}, + new CbxItems(){ Key="通讯相电流",Text="通讯相电流"}, + new CbxItems(){ Key="通讯功率",Text="通讯功率"}, + new CbxItems(){ Key="通讯芯片温度",Text="通讯芯片温度"}, new CbxItems(){ Key="通讯PTC入水温度",Text="通讯PTC入水温度"}, new CbxItems(){ Key="通讯PTC出水温度",Text="通讯PTC出水温度"},