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

增加PTC功能

Browse Source
This commit is contained in:
Tyrone CT
2025-08-06 14:28:03 +08:00
parent 035a16fe60
commit c4be5e0929
9 changed files with 450 additions and 147 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -66,6 +66,11 @@ namespace CapMachine.Wpf.ViewModels
new CbxItems(){ Key="功率限制",Text="功率限制"},
new CbxItems(){ Key="使能",Text="使能"},
new CbxItems(){ Key="Anti_Sleep",Text="Anti_Sleep"},
new CbxItems(){ Key="PTC使能",Text="PTC使能"},
new CbxItems(){ Key="PTC功率",Text="PTC功率"},
new CbxItems(){ Key="PTC水流量",Text="PTC水流量"},
new CbxItems(){ Key="PTC水温",Text="PTC水温"},
};
@@ -77,6 +82,13 @@ namespace CapMachine.Wpf.ViewModels
new CbxItems(){ Key="通讯相电流",Text="通讯相电流"},
new CbxItems(){ Key="通讯功率",Text="通讯功率"},
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母线电流"},
new CbxItems(){ Key="通讯PTC膜温",Text="通讯PTC膜温"},
new CbxItems(){ Key="通讯PTC模块温度",Text="通讯PTC模块温度"},
};
InitLoadCanConfigPro();

52
CapMachine.Wpf/ViewModels/ProConfigViewModel.cs
View File

@@ -2750,9 +2750,14 @@ namespace CapMachine.Wpf.ViewModels
CapEnable = SelectedSlopMeterSpeed.CapEnable,
OutLock = SelectedSlopMeterSpeed.OutLock,
//ParNo = SelectedSlopMeterSpeed.ParNo,
PIDNo = SelectedSlopMeterSpeed.PIDNo,
AlarmNo = SelectedSlopMeterSpeed.AlarmNo,
LimitNo = SelectedSlopMeterSpeed.LimitNo,
//PIDNo = SelectedSlopMeterSpeed.PIDNo,
//AlarmNo = SelectedSlopMeterSpeed.AlarmNo,
//LimitNo = SelectedSlopMeterSpeed.LimitNo,
PTCPw1 = SelectedSlopMeterSpeed.PTCPw1,
PTCPw2 = SelectedSlopMeterSpeed.PTCPw2,
PTCWaterFlow = SelectedSlopMeterSpeed.PTCWaterFlow,
PTCWaterTemp = SelectedSlopMeterSpeed.PTCWaterTemp,
//StepNo = AutoGetMeterSpeedStepNo(),
};
@@ -2780,13 +2785,17 @@ namespace CapMachine.Wpf.ViewModels
.Set(a => a.Constant, SelectedConstSpeedValue)
.Set(a => a.KeepTime, SelectedConstSpeedTimeValue)
//.Set(a => a.ParNo, SelectedSlopMeterSpeed.ParNo)
.Set(a => a.PIDNo, SelectedSlopMeterSpeed.PIDNo)
.Set(a => a.LimitNo, SelectedSlopMeterSpeed.LimitNo)
.Set(a => a.AlarmNo, SelectedSlopMeterSpeed.AlarmNo)
//.Set(a => a.PIDNo, SelectedSlopMeterSpeed.PIDNo)
//.Set(a => a.LimitNo, SelectedSlopMeterSpeed.LimitNo)
//.Set(a => a.AlarmNo, SelectedSlopMeterSpeed.AlarmNo)
.Set(a => a.OutLock, SelectedSlopMeterSpeed.OutLock)
.Set(a => a.CapEnable, SelectedSlopMeterSpeed.CapEnable)
.Set(a => a.Ev, SelectedSlopMeterSpeed.Ev)
.Set(a => a.PTCEnable, SelectedSlopMeterSpeed.PTCEnable)
.Set(a => a.PTCPw1, SelectedSlopMeterSpeed.PTCPw1)
.Set(a => a.PTCPw2, SelectedSlopMeterSpeed.PTCPw2)
.Set(a => a.PTCWaterFlow, SelectedSlopMeterSpeed.PTCWaterFlow)
.Set(a => a.PTCWaterTemp, SelectedSlopMeterSpeed.PTCWaterTemp)
.Set(a => a.InhExhValve, SelectedSlopMeterSpeed.InhExhValve)
.Where(a => a.Id == ConstantData!.Id)
.ExecuteAffrows();
@@ -2854,9 +2863,13 @@ namespace CapMachine.Wpf.ViewModels
InhExhValve = SelectedData.InhExhValve,
OutLock = SelectedData.OutLock,
//ParNo = SelectedData.ParNo,
AlarmNo = SelectedData.AlarmNo,
LimitNo = SelectedData.LimitNo,
PIDNo = SelectedData.PIDNo,
//AlarmNo = SelectedData.AlarmNo,
//LimitNo = SelectedData.LimitNo,
//PIDNo = SelectedData.PIDNo,
PTCPw1 = SelectedData.PTCPw1,
PTCPw2 = SelectedData.PTCPw2,
PTCWaterFlow = SelectedData.PTCWaterFlow,
PTCWaterTemp = SelectedData.PTCWaterTemp,
ProStep = SelectedData.ProStep,
ProStepId = SelectedData.ProStepId,
StartValue = SelectedData.StartValue,
@@ -2942,9 +2955,13 @@ namespace CapMachine.Wpf.ViewModels
CapEnable = SelectedSlopMeterSpeed.CapEnable,
OutLock = SelectedSlopMeterSpeed.OutLock,
//ParNo = SelectedSlopMeterSpeed.ParNo,
AlarmNo = SelectedSlopMeterSpeed.AlarmNo,
LimitNo = SelectedSlopMeterSpeed.LimitNo,
PIDNo = SelectedSlopMeterSpeed.PIDNo,
//AlarmNo = SelectedSlopMeterSpeed.AlarmNo,
//LimitNo = SelectedSlopMeterSpeed.LimitNo,
//PIDNo = SelectedSlopMeterSpeed.PIDNo,
PTCPw1 = SelectedSlopMeterSpeed.PTCPw1,
PTCPw2 = SelectedSlopMeterSpeed.PTCPw2,
PTCWaterFlow = SelectedSlopMeterSpeed.PTCWaterFlow,
PTCWaterTemp = SelectedSlopMeterSpeed.PTCWaterTemp,
ValueType = ConfigValueType.Slope,
StepNo = AutoGetMeterSpeedStepNo(),
};
@@ -3025,13 +3042,18 @@ namespace CapMachine.Wpf.ViewModels
.Set(a => a.StepNo, SelectedSlopMeterSpeed.StepNo)
//.Set(a => a.ParNo, SelectedSlopMeterSpeed.ParNo)
.Set(a => a.PIDNo, SelectedSlopMeterSpeed.PIDNo)
.Set(a => a.LimitNo, SelectedSlopMeterSpeed.LimitNo)
.Set(a => a.AlarmNo, SelectedSlopMeterSpeed.AlarmNo)
//.Set(a => a.PIDNo, SelectedSlopMeterSpeed.PIDNo)
//.Set(a => a.LimitNo, SelectedSlopMeterSpeed.LimitNo)
//.Set(a => a.AlarmNo, SelectedSlopMeterSpeed.AlarmNo)
.Set(a => a.OutLock, SelectedSlopMeterSpeed.OutLock)
.Set(a => a.CapEnable, SelectedSlopMeterSpeed.CapEnable)
.Set(a => a.Ev, SelectedSlopMeterSpeed.Ev)
.Set(a => a.PTCEnable, SelectedSlopMeterSpeed.PTCEnable)
.Set(a => a.PTCPw1, SelectedSlopMeterSpeed.PTCPw1)
.Set(a => a.PTCPw2, SelectedSlopMeterSpeed.PTCPw2)
.Set(a => a.PTCWaterFlow, SelectedSlopMeterSpeed.PTCWaterFlow)
.Set(a => a.PTCWaterTemp, SelectedSlopMeterSpeed.PTCWaterTemp)
.Set(a => a.InhExhValve, SelectedSlopMeterSpeed.InhExhValve)
.Where(a => a.Id == SelectedSlopMeterSpeed.Id)
.ExecuteAffrows();