Fix address selection not updating bindings

Author: bytedreamer

src/Core/ViewModels/Pages/ConnectViewModel.cs

@@ -77,7 +77,7 @@ private void DeviceManagementServiceOnNakReplyReceived(object? sender, string na
 
     [ObservableProperty] private int _selectedBaudRate = 9600;
 
-    [ObservableProperty] private byte _selectedAddress;
+    [ObservableProperty] private double _selectedAddress;
 
     [ObservableProperty] private byte _connectedAddress;
 
@@ -249,9 +249,9 @@ await _dialogService.ShowMessageDialog("Connect", $"Invalid security key entered
 
         await _deviceManagementService.Shutdown();
         await _deviceManagementService.Connect(
-            serialPortConnectionService.GetConnection(serialPortName, SelectedBaudRate), SelectedAddress,
+            serialPortConnectionService.GetConnection(serialPortName, SelectedBaudRate), (byte)SelectedAddress,
             UseSecureChannel, UseDefaultKey, securityKey);
-        ConnectedAddress = SelectedAddress;
+        ConnectedAddress = (byte)SelectedAddress;
         ConnectedBaudRate = SelectedBaudRate;
     }
 }

src/UI/Windows/Views/Controls/SetCommunicationControl.xaml

@@ -20,13 +20,15 @@
             <ComboBox Name="BaudRateComboBox"
                       Margin="0 0 20 0"
                       ItemsSource="{Binding AvailableBaudRates}"
-                      SelectedItem="{Binding SelectedBaudRate}"/>
+                      SelectedItem="{Binding SelectedBaudRate, Mode=TwoWay}"/>
         </StackPanel>
         <StackPanel Grid.Column="1" Orientation="Vertical">
             <Label Content="Address"
                    Target="{Binding ElementName=BaudRateComboBox}" />
             <ui:NumberBox Name="AddressNumberBox"
-                          Value="{Binding SelectedAddress}"
+                          TextChanged="AddressNumberBox_OnTextChanged"
+                          ValueChanged="AddressNumberBox_OnValueChanged"
+                          Value="{Binding SelectedAddress, Mode=TwoWay}"
                           Margin="0 0 20 0"
                           Minimum="0"
                           Maximum="127"

src/UI/Windows/Views/Controls/SetCommunicationControl.xaml.cs

@@ -1,5 +1,7 @@
 using System.ComponentModel;
 using System.Runtime.CompilerServices;
+using System.Windows.Controls;
+using Wpf.Ui.Controls;
 
 namespace OSDPBench.Windows.Views.Controls;
 
@@ -10,8 +12,8 @@ public SetCommunicationControl(int[] availableBaudRates, uint connectedBaudRate,
         DataContext = this;
 
         AvailableBaudRates = availableBaudRates;
-        _selectedBaudRate = (int)connectedBaudRate;
-        _selectedAddress = connectedAddress;
+        SelectedBaudRate = (int)connectedBaudRate;
+        SelectedAddress = connectedAddress;
 
         InitializeComponent();
     }
@@ -25,8 +27,8 @@ public int SelectedBaudRate
         set => SetField(ref _selectedBaudRate, value);
     }
 
-    private byte _selectedAddress;
-    public byte SelectedAddress
+    private double _selectedAddress;
+    public double SelectedAddress
     {
         get => _selectedAddress;
         set => SetField(ref _selectedAddress, value);
@@ -45,4 +47,14 @@ private void SetField<T>(ref T field, T value, [CallerMemberName] string? proper
         field = value;
         OnPropertyChanged(propertyName);
     }
+
+    private void AddressNumberBox_OnTextChanged(object sender, TextChangedEventArgs e)
+    {
+        SelectedAddress = AddressNumberBox.Value ?? 0;
+    }
+
+    private void AddressNumberBox_OnValueChanged(object sender, NumberBoxValueChangedEventArgs args)
+    {
+        SelectedAddress = AddressNumberBox.Value ?? 0;
+    }
 }

src/UI/Windows/Views/Pages/ConnectPage.xaml

@@ -152,13 +152,15 @@
                                 <ComboBox Name="BaudRateComboBox"
 										  Margin="0 0 20 0"
                                           ItemsSource="{Binding ViewModel.AvailableBaudRates}"
-                                          SelectedItem="{Binding ViewModel.SelectedBaudRate}"/>
+                                          SelectedItem="{Binding  Path=ViewModel.SelectedBaudRate, Mode=TwoWay}"/>
                             </StackPanel>
                             <StackPanel Grid.Row="0" Grid.Column="1" Orientation="Vertical">
                                 <Label Content="Address"
 										   Target="{Binding ElementName=AddressNumberBox}" />
                                 <ui:NumberBox Name="AddressNumberBox"
-											  Value="{Binding ViewModel.SelectedAddress}"
+											  Value="{Binding Path=ViewModel.SelectedAddress, Mode=TwoWay}"
+											  TextChanged="AddressNumberBox_OnTextChanged"
+											  ValueChanged="AddressNumberBox_OnValueChanged"
 											  Margin="0 0 20 0"
                                               Minimum="0"
 											  Maximum="127"
@@ -171,19 +173,19 @@
 	                            <StackPanel Orientation="Horizontal">
 		                            <CheckBox Name="UseSecureChannelCheckBox"
 		                                      Content="Use Secure Channel" 
-		                                      IsChecked="{Binding ViewModel.UseSecureChannel}"/>
+		                                      IsChecked="{Binding Path=ViewModel.UseSecureChannel,  Mode=TwoWay}"/>
 
 		                            <CheckBox Name="UseDefaultKeyCheckBox"
 		                                      Content="Use Default Key" 
 		                                      Margin="10,0,0,0"
 		                                      IsEnabled="{Binding ElementName=UseSecureChannelCheckBox, Path=IsChecked}"
-		                                      IsChecked="{Binding ViewModel.UseDefaultKey}"/>
+		                                      IsChecked="{Binding  Path=ViewModel.UseDefaultKey,  Mode=TwoWay}"/>
 	                            </StackPanel>
 
 	                            <StackPanel Orientation="Vertical">
 		                            <Label Content="Security Key"
 		                                   Target="{Binding ElementName=AddressNumberBox}" />
-                                    <TextBox Text="{Binding ViewModel.SecurityKey}">
+                                    <TextBox Text="{Binding Path=ViewModel.SecurityKey,  Mode=TwoWay}">
                                         <TextBox.Style>
                                             <Style TargetType="TextBox" BasedOn="{StaticResource {x:Type TextBox}}">
                                                 <!-- Only add the specific triggers needed -->

src/UI/Windows/Views/Pages/ConnectPage.xaml.cs

@@ -1,5 +1,7 @@
-using OSDPBench.Core.ViewModels.Pages;
+using System.Windows.Controls;
+using OSDPBench.Core.ViewModels.Pages;
 using Wpf.Ui.Abstractions.Controls;
+using Wpf.Ui.Controls;
 
 namespace OSDPBench.Windows.Views.Pages;
 
@@ -27,4 +29,14 @@ public ConnectPage(ConnectViewModel viewModel)
     public ConnectViewModel ViewModel { get; }
 
     public IEnumerable<string> ConnectionTypes => ["Discover", "Manual"];
+
+    private void AddressNumberBox_OnTextChanged(object sender, TextChangedEventArgs e)
+    {
+        ViewModel.SelectedAddress = AddressNumberBox.Value ?? 0;
+    }
+
+    private void AddressNumberBox_OnValueChanged(object sender, NumberBoxValueChangedEventArgs args)
+    {
+        ViewModel.SelectedAddress = AddressNumberBox.Value ?? 0;
+    }
 }

src/UI/Windows/Views/Pages/ManagePage.xaml.cs

@@ -108,7 +108,7 @@ private void SetCommunicationActionControl()
         {
             ViewModel.DeviceActionParameter = new CommunicationParameters(
                 ViewModel.ConnectedPortName, (uint)actionControl.SelectedBaudRate,
-                actionControl.SelectedAddress);
+                (byte)actionControl.SelectedAddress);
         };
         DeviceActionControl.Children.Add(actionControl);
     }