TyroneGit/CapMachine
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

更改了当前项目的小的适配

Browse Source
This commit is contained in:
Tyrone CT
2025-09-18 17:05:25 +08:00
parent ac593a3bf6
commit 59ea3aa8f0
4 changed files with 27 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
CapMachine.Wpf/Services/MachineRtDataService.cs
View File

@@ -655,7 +655,7 @@ namespace CapMachine.Wpf.Services
SVAddress = "", SVAddress = "",
MVAddress = "", MVAddress = "",
IsMeter = false, IsMeter = false,
Precision = 10, Precision = 1,
DecimalPoint = 1, DecimalPoint = 1,
Samp = 1, Samp = 1,
ValueType = typeof(short), ValueType = typeof(short),
@@ -712,7 +712,7 @@ namespace CapMachine.Wpf.Services
SVAddress = "", SVAddress = "",
MVAddress = "", MVAddress = "",
IsMeter = false, IsMeter = false,
Precision = 1000, Precision = 1,
DecimalPoint = 2, DecimalPoint = 2,
Samp = 1, Samp = 1,
ValueType = typeof(short), ValueType = typeof(short),
@@ -731,7 +731,7 @@ namespace CapMachine.Wpf.Services
SVAddress = "", SVAddress = "",
MVAddress = "", MVAddress = "",
IsMeter = false, IsMeter = false,
Precision = 10, Precision = 1,
DecimalPoint = 1, DecimalPoint = 1,
Samp = 1, Samp = 1,
ValueType = typeof(short), ValueType = typeof(short),
@@ -1201,7 +1201,7 @@ namespace CapMachine.Wpf.Services
//itemTag.Value.EngPvValue = 0; //itemTag.Value.EngPvValue = 0;
break; break;
case CanLinEnum.CANFD: 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; break;
case CanLinEnum.Lin: case CanLinEnum.Lin:
//通信转速 Dbc中间配置名称的转速数据读取出来 给PLC //通信转速 Dbc中间配置名称的转速数据读取出来 给PLC
@@ -1222,7 +1222,7 @@ namespace CapMachine.Wpf.Services
//itemTag.Value.EngPvValue = 0; //itemTag.Value.EngPvValue = 0;
break; break;
case CanLinEnum.CANFD: 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; break;
case CanLinEnum.Lin: case CanLinEnum.Lin:
//通信转速 Dbc中间配置名称的转速数据读取出来 给PLC //通信转速 Dbc中间配置名称的转速数据读取出来 给PLC
@@ -1243,7 +1243,7 @@ namespace CapMachine.Wpf.Services
//itemTag.Value.EngPvValue = 0; //itemTag.Value.EngPvValue = 0;
break; break;
case CanLinEnum.CANFD: 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; break;
case CanLinEnum.Lin: case CanLinEnum.Lin:
//通信转速 Dbc中间配置名称的转速数据读取出来 给PLC //通信转速 Dbc中间配置名称的转速数据读取出来 给PLC
@@ -1264,7 +1264,7 @@ namespace CapMachine.Wpf.Services
//itemTag.Value.EngPvValue = 0; //itemTag.Value.EngPvValue = 0;
break; break;
case CanLinEnum.CANFD: 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; break;
case CanLinEnum.Lin: case CanLinEnum.Lin:
//通信转速 Dbc中间配置名称的转速数据读取出来 给PLC //通信转速 Dbc中间配置名称的转速数据读取出来 给PLC

14
CapMachine.Wpf/ViewModels/CANConfigViewModel.cs
View File

@@ -96,13 +96,13 @@ namespace CapMachine.Wpf.ViewModels
ReadNameCbxItems = new ObservableCollection<CbxItems>() ReadNameCbxItems = new ObservableCollection<CbxItems>()
{ {
new CbxItems(){ Key="通讯Cmp转速",Text="通讯Cmp转速"}, new CbxItems(){ Key="通讯转速",Text="通讯转速"},
new CbxItems(){ Key="通讯Cmp母线电压",Text="通讯Cmp母线电压"}, new CbxItems(){ Key="通讯母线电压",Text="通讯母线电压"},
new CbxItems(){ Key="通讯Cmp母线电流",Text="通讯Cmp母线电流"}, new CbxItems(){ Key="通讯母线电流",Text="通讯母线电流"},
new CbxItems(){ Key="通讯Cmp逆变器温度",Text="通讯Cmp逆变器温度"}, new CbxItems(){ Key="通讯逆变器温度",Text="通讯逆变器温度"},
new CbxItems(){ Key="通讯Cmp相电流",Text="通讯Cmp相电流"}, new CbxItems(){ Key="通讯相电流",Text="通讯相电流"},
new CbxItems(){ Key="通讯Cmp功率",Text="通讯Cmp功率"}, new CbxItems(){ Key="通讯功率",Text="通讯功率"},
new CbxItems(){ Key="通讯Cmp芯片温度",Text="通讯Cmp芯片温度"}, new CbxItems(){ Key="通讯芯片温度",Text="通讯芯片温度"},
new CbxItems(){ Key="通讯PTC入水温度",Text="通讯PTC入水温度"}, new CbxItems(){ Key="通讯PTC入水温度",Text="通讯PTC入水温度"},
new CbxItems(){ Key="通讯PTC出水温度",Text="通讯PTC出水温度"}, new CbxItems(){ Key="通讯PTC出水温度",Text="通讯PTC出水温度"},

28
CapMachine.Wpf/ViewModels/CANFDConfigViewModel.cs
View File

@@ -1,31 +1,17 @@
using AutoMapper; using AutoMapper;
using CapMachine.Core; using CapMachine.Core;
using CapMachine.Model;
using CapMachine.Model.CANLIN; using CapMachine.Model.CANLIN;
using CapMachine.Wpf.CanDrive; using CapMachine.Wpf.CanDrive;
using CapMachine.Wpf.Dtos; using CapMachine.Wpf.Dtos;
using CapMachine.Wpf.PrismEvent;
using CapMachine.Wpf.Services; using CapMachine.Wpf.Services;
using Ganss.Excel;
using ImTools; using ImTools;
using Microsoft.VisualBasic;
using Microsoft.Win32; using Microsoft.Win32;
using NPOI.SS.UserModel.Charts;
using Prism.Commands; using Prism.Commands;
using Prism.Events; using Prism.Events;
using Prism.Regions; using Prism.Regions;
using Prism.Services.Dialogs; using Prism.Services.Dialogs;
using Syncfusion.Windows.Tools.Controls;
using System;
using System.Collections.Generic;
using System.Collections.ObjectModel; 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.Controls;
using System.Windows.Documents;
using static CapMachine.Wpf.Models.ComEnum; using static CapMachine.Wpf.Models.ComEnum;
namespace CapMachine.Wpf.ViewModels namespace CapMachine.Wpf.ViewModels
@@ -113,13 +99,13 @@ namespace CapMachine.Wpf.ViewModels
ReadNameCbxItems = new ObservableCollection<CbxItems>() ReadNameCbxItems = new ObservableCollection<CbxItems>()
{ {
new CbxItems(){ Key="通讯Cmp转速",Text="通讯Cmp转速"}, new CbxItems(){ Key="通讯转速",Text="通讯转速"},
new CbxItems(){ Key="通讯Cmp母线电压",Text="通讯Cmp母线电压"}, new CbxItems(){ Key="通讯母线电压",Text="通讯母线电压"},
new CbxItems(){ Key="通讯Cmp母线电流",Text="通讯Cmp母线电流"}, new CbxItems(){ Key="通讯母线电流",Text="通讯母线电流"},
new CbxItems(){ Key="通讯Cmp逆变器温度",Text="通讯Cmp逆变器温度"}, new CbxItems(){ Key="通讯逆变器温度",Text="通讯逆变器温度"},
new CbxItems(){ Key="通讯Cmp相电流",Text="通讯Cmp相电流"}, new CbxItems(){ Key="通讯相电流",Text="通讯相电流"},
new CbxItems(){ Key="通讯Cmp功率",Text="通讯Cmp功率"}, new CbxItems(){ Key="通讯功率",Text="通讯功率"},
new CbxItems(){ Key="通讯Cmp芯片温度",Text="通讯Cmp芯片温度"}, new CbxItems(){ Key="通讯芯片温度",Text="通讯芯片温度"},
new CbxItems(){ Key="通讯PTC入水温度",Text="通讯PTC入水温度"}, new CbxItems(){ Key="通讯PTC入水温度",Text="通讯PTC入水温度"},
new CbxItems(){ Key="通讯PTC出水温度",Text="通讯PTC出水温度"}, new CbxItems(){ Key="通讯PTC出水温度",Text="通讯PTC出水温度"},

12
CapMachine.Wpf/ViewModels/LinConfigViewModel.cs
View File

@@ -80,12 +80,12 @@ namespace CapMachine.Wpf.ViewModels
ReadNameCbxItems = new ObservableCollection<CbxItems>() ReadNameCbxItems = new ObservableCollection<CbxItems>()
{ {
new CbxItems(){ Key="通讯Cmp转速",Text="通讯Cmp转速"}, new CbxItems(){ Key="通讯转速",Text="通讯转速"},
new CbxItems(){ Key="通讯Cmp母线电压",Text="通讯Cmp母线电压"}, new CbxItems(){ Key="通讯母线电压",Text="通讯母线电压"},
new CbxItems(){ Key="通讯Cmp母线电流",Text="通讯Cmp母线电流"}, new CbxItems(){ Key="通讯母线电流",Text="通讯母线电流"},
new CbxItems(){ Key="通讯Cmp相电流",Text="通讯Cmp相电流"}, new CbxItems(){ Key="通讯相电流",Text="通讯相电流"},
new CbxItems(){ Key="通讯Cmp功率",Text="通讯Cmp功率"}, new CbxItems(){ Key="通讯功率",Text="通讯功率"},
new CbxItems(){ Key="通讯Cmp芯片温度",Text="通讯Cmp芯片温度"}, new CbxItems(){ Key="通讯芯片温度",Text="通讯芯片温度"},
new CbxItems(){ Key="通讯PTC入水温度",Text="通讯PTC入水温度"}, new CbxItems(){ Key="通讯PTC入水温度",Text="通讯PTC入水温度"},
new CbxItems(){ Key="通讯PTC出水温度",Text="通讯PTC出水温度"}, new CbxItems(){ Key="通讯PTC出水温度",Text="通讯PTC出水温度"},