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

增加了初始弹窗，但是没有成功

Browse Source 
更改了CAN和LIN协调
更改了配置程序的名称顺序
This commit is contained in:
Tyrone CT
2025-01-11 12:04:34 +08:00
parent 620c5e8178
commit e49a48fb25
53 changed files with 5118 additions and 131 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
CapMachine.Wpf/Views/ProConfigView.xaml
View File

@@ -654,7 +654,7 @@
<DataGridTemplateColumn>
<DataGridTemplateColumn.Header>
<TextBlock FontWeight="Bold" Text="COND1温度&#x0A;(℃)" />
<TextBlock FontWeight="Bold" Text="冷凝器出口水温&#x0A;(℃)" />
</DataGridTemplateColumn.Header>
<DataGridTemplateColumn.CellTemplate>
<DataTemplate>
@@ -663,6 +663,17 @@
</DataGridTemplateColumn.CellTemplate>
</DataGridTemplateColumn>
<DataGridTemplateColumn>
<DataGridTemplateColumn.Header>
<TextBlock FontWeight="Bold" Text="吸气混合器温度&#x0A;(℃)" />
</DataGridTemplateColumn.Header>
<DataGridTemplateColumn.CellTemplate>
<DataTemplate>
<TextBlock Text="{Binding MeterOS2TempInfo}" TextWrapping="Wrap" />
</DataTemplate>
</DataGridTemplateColumn.CellTemplate>
</DataGridTemplateColumn>
<!--<DataGridTemplateColumn>
<DataGridTemplateColumn.Header>
<TextBlock FontWeight="Bold" Text="润滑油压力&#x0A;(MpaA)" />
@@ -696,17 +707,6 @@
</DataGridTemplateColumn.CellTemplate>
</DataGridTemplateColumn>-->
<DataGridTemplateColumn>
<DataGridTemplateColumn.Header>
<TextBlock FontWeight="Bold" Text="LV电压&#x0A;(V)" />
</DataGridTemplateColumn.Header>
<DataGridTemplateColumn.CellTemplate>
<DataTemplate>
<TextBlock Text="{Binding MeterLVVolInfo}" TextWrapping="Wrap" />
</DataTemplate>
</DataGridTemplateColumn.CellTemplate>
</DataGridTemplateColumn>
<DataGridTemplateColumn>
<DataGridTemplateColumn.Header>
<TextBlock FontWeight="Bold" Text="HV电压&#x0A;(V)" />
@@ -720,11 +720,11 @@
<DataGridTemplateColumn>
<DataGridTemplateColumn.Header>
<TextBlock FontWeight="Bold" Text="压缩机环境湿度&#x0A;(%)" />
<TextBlock FontWeight="Bold" Text="LV电压&#x0A;(V)" />
</DataGridTemplateColumn.Header>
<DataGridTemplateColumn.CellTemplate>
<DataTemplate>
<TextBlock Text="{Binding MeterEnvRHInfo}" TextWrapping="Wrap" />
<TextBlock Text="{Binding MeterLVVolInfo}" TextWrapping="Wrap" />
</DataTemplate>
</DataGridTemplateColumn.CellTemplate>
</DataGridTemplateColumn>
@@ -740,6 +740,18 @@
</DataGridTemplateColumn.CellTemplate>
</DataGridTemplateColumn>
<DataGridTemplateColumn>
<DataGridTemplateColumn.Header>
<TextBlock FontWeight="Bold" Text="压缩机环境湿度&#x0A;(%)" />
</DataGridTemplateColumn.Header>
<DataGridTemplateColumn.CellTemplate>
<DataTemplate>
<TextBlock Text="{Binding MeterEnvRHInfo}" TextWrapping="Wrap" />
</DataTemplate>
</DataGridTemplateColumn.CellTemplate>
</DataGridTemplateColumn>
<!--<DataGridTemplateColumn>
<DataGridTemplateColumn.Header>
<TextBlock FontWeight="Bold" Text="EVAP出口温度(℃)&#x0A;(℃)" />
@@ -762,17 +774,6 @@
</DataGridTemplateColumn.CellTemplate>
</DataGridTemplateColumn>-->
<DataGridTemplateColumn>
<DataGridTemplateColumn.Header>
<TextBlock FontWeight="Bold" Text="OS2温度&#x0A;(℃)" />
</DataGridTemplateColumn.Header>
<DataGridTemplateColumn.CellTemplate>
<DataTemplate>
<TextBlock Text="{Binding MeterOS2TempInfo}" TextWrapping="Wrap" />
</DataTemplate>
</DataGridTemplateColumn.CellTemplate>
</DataGridTemplateColumn>
<!--<DataGridTemplateColumn>
<DataGridTemplateColumn.Header>
<TextBlock FontWeight="Bold" Text="PTC入口温度 &#x0A;(℃)" />