From cbdaf7a666afaa9a3dcea4793de44eb692a2c9ce Mon Sep 17 00:00:00 2001 From: xyy <544939200@qq.com> Date: Thu, 14 May 2026 09:01:14 +0800 Subject: [PATCH] --- 头罩视野slove/头罩视野/Views/VisiData.xaml.cs | 51 ------------------- 1 file changed, 51 deletions(-) diff --git a/头罩视野slove/头罩视野/Views/VisiData.xaml.cs b/头罩视野slove/头罩视野/Views/VisiData.xaml.cs index a523e46..fa8a49b 100644 --- a/头罩视野slove/头罩视野/Views/VisiData.xaml.cs +++ b/头罩视野slove/头罩视野/Views/VisiData.xaml.cs @@ -239,57 +239,6 @@ namespace 头罩视野.Views } } - private async Task ReadAndUpdateFloatAsync(int address, int length, System.Windows.Controls.TextBlock control, string format, string unit) - { - try - { - ushort[] registers = await Task.Run(async () => - await _modbusMaster.ReadHoldingRegistersAsync(1, (ushort)address, (ushort)length) - ); - - if (registers != null && registers.Length >= 2) - { - float value = c.UshortToFloat(registers[1], registers[0]); - Dispatcher.Invoke(() => control.Text = value.ToString(format) + unit); - } - else if (registers != null && registers.Length >= 1) - { - int value = registers[0]; - Dispatcher.Invoke(() => control.Text = value.ToString(format) + unit); - } - } - catch (Exception ex) - { - System.Diagnostics.Debug.WriteLine($"读取地址{address}失败:{ex.Message}"); - } - } - - private async Task ReadAndUpdateIntAsync(int address, int length, System.Windows.Controls.Control control, string format) - { - try - { - ushort[] registers = await Task.Run(() => - _modbusMaster.ReadHoldingRegisters(1, (ushort)address, (ushort)length) - ); - - if (registers != null && registers.Length >= 1) - { - int value = registers[0]; - Dispatcher.Invoke(() => - { - if (control is System.Windows.Controls.ContentControl contentControl) - contentControl.Content = value.ToString(format); - else if (control is System.Windows.Controls.TextBox textBox) - textBox.Text = value.ToString(format); - }); - } - } - catch (Exception ex) - { - System.Diagnostics.Debug.WriteLine($"读取地址{address}失败:{ex.Message}"); - } - } - private void ShowError(string msg) => MessageBox.Show(msg, "错误", MessageBoxButton.OK, MessageBoxImage.Error); private void GoHome(object s, RoutedEventArgs e) => NavigationService.Content = null; private void GoTest(object s, RoutedEventArgs e) => NavigationService.Content = new Views.PageTest();