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-04-26 10:02:53 +08:00
parent 2f80b50e0b
commit 55c9e1c216
6 changed files with 88 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
CapMachine.Wpf/Services/CanDriveService.cs
View File

@@ -85,6 +85,18 @@ namespace CapMachine.Wpf.Services
#region 程序驱动CAN #region 程序驱动CAN
private int _AutoSpeedSv;
/// <summary>
/// 转速SV
/// </summary>
public int AutoSpeedSv
{
get { return _AutoSpeedSv; }
set { _AutoSpeedSv = value; RaisePropertyChanged(); }
}
/// <summary> /// <summary>
/// 转速 指令数据 实例 /// 转速 指令数据 实例
/// </summary> /// </summary>
@@ -143,6 +155,8 @@ namespace CapMachine.Wpf.Services
{ {
if (SpeedCanCmdData != null) if (SpeedCanCmdData != null)
{ {
AutoSpeedSv = (int)SpeedData;
//首先是否判断是有斜率 //首先是否判断是有斜率
if (SpeedCanCmdData.LogicRuleDto == null) if (SpeedCanCmdData.LogicRuleDto == null)
{ {
@@ -153,7 +167,7 @@ namespace CapMachine.Wpf.Services
{ {
//LogicRuleService.ApplyExpressionFast(SpeedData, SpeedCanCmdData.LogicRuleDto); //LogicRuleService.ApplyExpressionFast(SpeedData, SpeedCanCmdData.LogicRuleDto);
SpeedCanCmdData.SignalCmdValue = LogicRuleService.ApplyExpressionFast(SpeedData, SpeedCanCmdData.LogicRuleDto); SpeedCanCmdData.SignalCmdValue = LogicRuleService.ApplyExpressionFast(SpeedData, SpeedCanCmdData.LogicRuleDto);
Console.WriteLine($"实时转换后转速值：{SpeedCanCmdData.SignalCmdValue}-SV值:{SpeedData}" ); Console.WriteLine($"实时转换后转速值：{SpeedCanCmdData.SignalCmdValue}-SV值:{SpeedData}");
} }
} }

13
CapMachine.Wpf/Services/LinDriveService.cs
View File

@@ -80,6 +80,18 @@ namespace CapMachine.Wpf.Services
#region 程序驱动CAN #region 程序驱动CAN
private int _AutoSpeedSv;
/// <summary>
/// 转速SV
/// </summary>
public int AutoSpeedSv
{
get { return _AutoSpeedSv; }
set { _AutoSpeedSv = value; RaisePropertyChanged(); }
}
/// <summary> /// <summary>
/// 转速 指令数据 实例 /// 转速 指令数据 实例
/// </summary> /// </summary>
@@ -139,6 +151,7 @@ namespace CapMachine.Wpf.Services
{ {
if (SpeedLinCmdData != null) if (SpeedLinCmdData != null)
{ {
AutoSpeedSv = (int)SpeedData;
SpeedLinCmdData.SignalCmdValue = SpeedData; SpeedLinCmdData.SignalCmdValue = SpeedData;
} }
//if (EnableLinCmdData != null) //if (EnableLinCmdData != null)

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

@@ -2285,7 +2285,7 @@ namespace CapMachine.Wpf.Services
/// <returns></returns> /// <returns></returns>
public bool SysReset() public bool SysReset()
{ {
return true; //return true;
//取消XXX //取消XXX
var FindData = ListHandSwitchData.Where(a => a.Name == "复位"); var FindData = ListHandSwitchData.Where(a => a.Name == "复位");
@@ -2310,7 +2310,7 @@ namespace CapMachine.Wpf.Services
/// <returns></returns> /// <returns></returns>
public bool SysMute() public bool SysMute()
{ {
return true; //return true;
//取消XXX //取消XXX
var FindData = ListHandSwitchData.Where(a => a.Name == "消音"); var FindData = ListHandSwitchData.Where(a => a.Name == "消音");
@@ -2336,18 +2336,18 @@ namespace CapMachine.Wpf.Services
/// <returns></returns> /// <returns></returns>
public bool SysStart() public bool SysStart()
{ {
return true; //return true;
//取消XXX //取消XXX
//var Result = SiemensDrive.Write("M0.4", true); var Result = SiemensDrive.Write("M0.4", true);
//if (Result.IsSuccess) if (Result.IsSuccess)
//{ {
// return true; return true;
//} }
//else else
//{ {
// return false; return false;
//} }
} }
@@ -2357,7 +2357,7 @@ namespace CapMachine.Wpf.Services
/// <returns></returns> /// <returns></returns>
public bool SysEnd() public bool SysEnd()
{ {
return true; //return true;
//取消XXX //取消XXX
var Result = SiemensDrive.Write("M0.7", true); var Result = SiemensDrive.Write("M0.7", true);
@@ -2379,7 +2379,7 @@ namespace CapMachine.Wpf.Services
/// <returns></returns> /// <returns></returns>
public bool SysPause() public bool SysPause()
{ {
return true; //return true;
//取消XXX //取消XXX
var StateResult = SiemensDrive.ReadBool("M0.6"); var StateResult = SiemensDrive.ReadBool("M0.6");

22
CapMachine.Wpf/Views/CANConfigView.xaml
View File

@@ -569,6 +569,28 @@
</StackPanel> </StackPanel>
<StackPanel
Grid.Row="1"
Grid.Column="2"
Orientation="Horizontal">
<TextBlock
Margin="5,0,5,0"
VerticalAlignment="Center"
FontFamily="/Assets/Fonts/#iconfont"
FontSize="18"
Foreground="LimeGreen"
Text="&#xe673;" />
<TextBlock
Width="auto"
Foreground="LimeGreen"
Style="{StaticResource TextBlockStyle}"
Text="自动转速(rpm)" />
<TextBlock
Margin="5,0"
Foreground="LimeGreen"
Style="{StaticResource TextBlockStyle}"
Text="{Binding CanDriveService.AutoSpeedSv}" />
</StackPanel>
</Grid> </Grid>
</Grid> </Grid>

23
CapMachine.Wpf/Views/LINConfigView.xaml
View File

@@ -573,6 +573,29 @@
</StackPanel> </StackPanel>
<StackPanel
Grid.Row="1"
Grid.Column="2"
Orientation="Horizontal">
<TextBlock
Margin="5,0,5,0"
VerticalAlignment="Center"
FontFamily="/Assets/Fonts/#iconfont"
FontSize="18"
Foreground="LimeGreen"
Text="&#xe673;" />
<TextBlock
Width="auto"
Foreground="LimeGreen"
Style="{StaticResource TextBlockStyle}"
Text="自动转速(rpm)" />
<TextBlock
Margin="5,0"
Foreground="LimeGreen"
Style="{StaticResource TextBlockStyle}"
Text="{Binding LinDriveService.AutoSpeedSv}" />
</StackPanel>
</Grid> </Grid>
</Grid> </Grid>

2
CapMachine.Wpf/Views/MonitorView.xaml
View File

@@ -875,7 +875,7 @@
</StackPanel> </StackPanel>
</Grid>--> </Grid>-->
<materialDesign:Card Margin="0,0" materialDesign:ElevationAssist.Elevation="Dp2"> <materialDesign:Card Margin="0,0" materialDesign:ElevationAssist.Elevation="Dp2">
<ItemsControl IsEnabled="False" ItemsSource="{Binding ListHandSwitchData}"> <ItemsControl IsEnabled="True" ItemsSource="{Binding ListHandSwitchData}">
<ItemsControl.ItemsPanel> <ItemsControl.ItemsPanel>
<ItemsPanelTemplate> <ItemsPanelTemplate>
<StackPanel Orientation="Vertical" /> <StackPanel Orientation="Vertical" />