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

CAN的定时发送的更改和一些其他的改动

Browse Source
This commit is contained in:
Tyrone CT
2025-05-06 11:03:51 +08:00
parent 16eaa230d8
commit df4b481bbb
7 changed files with 238 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -383,7 +383,6 @@
</StackPanel>
</Button>
</StackPanel>
</Grid>
<Grid Grid.Row="1">
@@ -578,19 +577,93 @@
VerticalAlignment="Center"
FontFamily="/Assets/Fonts/#iconfont"
FontSize="18"
Foreground="LimeGreen"
Foreground="DodgerBlue"
Text="&#xe673;" />
<TextBlock
Width="auto"
Foreground="LimeGreen"
Foreground="DodgerBlue"
Style="{StaticResource TextBlockStyle}"
Text="自动转速(rpm)" />
<TextBlock
Margin="5,0"
Foreground="LimeGreen"
Foreground="DodgerBlue"
Style="{StaticResource TextBlockStyle}"
Text="{Binding CanDriveService.AutoSpeedSv}" />
</StackPanel>
<StackPanel Grid.Column="2" Orientation="Horizontal">
<TextBlock
Margin="5,0,5,0"
VerticalAlignment="Center"
FontFamily="/Assets/Fonts/#iconfont"
FontSize="18"
Foreground="DodgerBlue"
Text="&#xe95a;" />
<TextBlock
Width="auto"
Foreground="DodgerBlue"
Style="{StaticResource TextBlockStyle}"
Text="CAN手自动" />
<ToggleButton
Width="70"
Margin="10,0,0,0"
Command="{Binding CanAutoHandCmd}"
CommandParameter="{Binding RelativeSource={RelativeSource Self}}"
FontSize="11"
ToolTip="自动时：接受程序步骤的转速控制；手动时：手动发送转速数据">
<ToggleButton.Style>
<Style BasedOn="{StaticResource MaterialDesignSwitchToggleButton}" TargetType="ToggleButton">
<Style.Triggers>
<Trigger Property="IsChecked" Value="True">
<Setter Property="Content" Value="自动" />
</Trigger>
<Trigger Property="IsChecked" Value="False">
<Setter Property="Content" Value="手动" />
</Trigger>
</Style.Triggers>
</Style>
</ToggleButton.Style>
</ToggleButton>
</StackPanel>
<StackPanel
Grid.Row="1"
Grid.Column="1"
Orientation="Horizontal">
<TextBlock
Margin="5,0,5,0"
VerticalAlignment="Center"
FontFamily="/Assets/Fonts/#iconfont"
FontSize="18"
Foreground="DodgerBlue"
Text="&#xe921;" />
<TextBlock
Width="auto"
Foreground="DodgerBlue"
Style="{StaticResource TextBlockStyle}"
Text="CAN使能" />
<ToggleButton
Width="70"
Margin="10,0,0,0"
Command="{Binding CanHandEnableCmd}"
CommandParameter="{Binding RelativeSource={RelativeSource Self}}"
FontSize="11"
ToolTip="使能时：触发报文中使能；禁用时：触发报文中使能=False">
<ToggleButton.Style>
<Style BasedOn="{StaticResource MaterialDesignSwitchToggleButton}" TargetType="ToggleButton">
<Style.Triggers>
<Trigger Property="IsChecked" Value="True">
<Setter Property="Content" Value="使能" />
</Trigger>
<Trigger Property="IsChecked" Value="False">
<Setter Property="Content" Value="禁用" />
</Trigger>
</Style.Triggers>
</Style>
</ToggleButton.Style>
</ToggleButton>
</StackPanel>
</Grid>
</Grid>
@@ -998,6 +1071,8 @@
</TabItem>
<TabItem Header="CAN报文">
<ListView
BorderBrush="Black"
BorderThickness="1"
ItemsSource="{Binding HightDriveMsgService.DisplayMessages}"
ScrollViewer.IsDeferredScrollingEnabled="True"
VirtualizingPanel.CacheLength="1,1"