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

CAN FD 波特率等参数的增加和联动配置

Browse Source
This commit is contained in:
Tyrone CT
2025-07-09 22:15:19 +08:00
parent 6a2ce24cbb
commit 42c4502a8d
14 changed files with 430 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

66
CapMachine.Wpf/Views/CANFDConfigView.xaml
View File

@@ -405,8 +405,70 @@
FontFamily="/Assets/Fonts/#iconfont"
FontSize="18"
Text="" />
<TextBlock Style="{StaticResource TextBlockStyle}" Text="波特率" />
<TextBox Style="{StaticResource TextBoxStyle}" Text="{Binding SelectedCANConfigExdDto.BaudRate}" />
<TextBlock Style="{StaticResource TextBlockStyle}" Text="仲裁波特率" />
<ComboBox
Width="100"
DisplayMemberPath="Text"
FontSize="16"
ItemsSource="{Binding ArbBaudRateCbxItems}"
SelectedValue="{Binding SelectedCANConfigExdDto.ArbBaudRate, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
SelectedValuePath="Key" />
<!--<TextBox Style="{StaticResource TextBoxStyle}" Text="{Binding SelectedCANConfigExdDto.DataBaudRate}" />-->
</StackPanel>
<StackPanel Grid.Column="1" Orientation="Horizontal">
<TextBlock
Margin="10,0,10,0"
VerticalAlignment="Center"
FontFamily="/Assets/Fonts/#iconfont"
FontSize="18"
Text="&#xe9f8;" />
<TextBlock Style="{StaticResource TextBlockStyle}" Text="数据波特率" />
<ComboBox
Width="100"
DisplayMemberPath="Text"
FontSize="16"
ItemsSource="{Binding DataBaudRateCbxItems}"
SelectedValue="{Binding SelectedCANConfigExdDto.DataBaudRate, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
SelectedValuePath="Key" />
<!--<TextBox Style="{StaticResource TextBoxStyle}" Text="{Binding SelectedCANConfigExdDto.ArbBaudRate}" />-->
</StackPanel>
<StackPanel
Grid.Row="0"
Grid.Column="2"
Orientation="Horizontal">
<TextBlock
Margin="5,0,5,0"
VerticalAlignment="Center"
FontFamily="/Assets/Fonts/#iconfont"
FontSize="18"
Text="&#xe9f8;" />
<TextBlock
Width="auto"
Style="{StaticResource TextBlockStyle}"
Text="ISO标准" />
<ToggleButton
Margin="5,0,5,0"
IsChecked="{Binding SelectedCANConfigExdDto.ISOEnable}"
Style="{StaticResource MaterialDesignSwitchToggleButton}"
ToolTip="{Binding Name}" />
<TextBlock
Margin="5,0,5,0"
VerticalAlignment="Center"
FontFamily="/Assets/Fonts/#iconfont"
FontSize="18"
Text="&#xe9f8;" />
<TextBlock
Width="auto"
Style="{StaticResource TextBlockStyle}"
Text="终端电阻" />
<ToggleButton
Margin="5,0,5,0"
IsChecked="{Binding SelectedCANConfigExdDto.ResEnable}"
Style="{StaticResource MaterialDesignSwitchToggleButton}"
ToolTip="{Binding Name}" />
</StackPanel>
<StackPanel Grid.Row="1" Orientation="Horizontal">