RC fixes. Release Candidate 2.

Am6er · Dec 20, 2023 · d938e93 · d938e93
1 parent 204a0b6
commit d938e93
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 8 deletions.
diff --git a/BecquerelMonitor/DeviceConfigForm.cs b/BecquerelMonitor/DeviceConfigForm.cs
@@ -275,10 +275,23 @@ void PrepareDeviceForm(DeviceType type)
                     {
                         this.inputDeviceForm.FormClosing();
                     }
-                    this.inputDeviceForm = (InputDeviceForm)Activator.CreateInstance(type.DeviceConfigFormType, new object[]
+                    try
                     {
-                        this
-                    });
+                        this.inputDeviceForm = (InputDeviceForm)Activator.CreateInstance(type.DeviceConfigFormType, new object[]
+                        {
+                            this
+                        });
+                    } catch (Exception ex)
+                    {
+                        if (ex.Message.IndexOf("Windows.Devices.Bluetooth.BluetoothLEDevice") > 0)
+                        {
+                            MessageBox.Show("Error while loading Radiacode section. It seems, that you don't have BLE support on your OS.");
+                        } else
+                        {
+                            MessageBox.Show("Device specific section. It seems, that you don't have BLE support on your OS.");
+                        }
+                        return;
+                    }
                     this.tabControl1.TabPages[1].Controls.Clear();
                     this.tabControl1.TabPages[1].Controls.Add(this.inputDeviceForm);
                     if (type.Name == "AtomSpectraVCP")

diff --git a/BecquerelMonitor/RadiaCodeDeviceForm.cs b/BecquerelMonitor/RadiaCodeDeviceForm.cs
@@ -5,6 +5,7 @@
 using BecquerelMonitor.Properties;
 using System.Linq;
 using System.Threading;
+using System.Diagnostics;
 
 namespace BecquerelMonitor
 {
@@ -45,9 +46,10 @@ private void ScanBLEDevices()
             adressBLE.Clear();
             devices.Clear();
             if (watcher == null) watcher = new BluetoothLEAdvertisementWatcher();
+            Thread.Sleep(200);
             watcher.Stop();
-            watcher.SignalStrengthFilter.InRangeThresholdInDBm = -110;
-            watcher.SignalStrengthFilter.OutOfRangeThresholdInDBm = -110;
+            //watcher.SignalStrengthFilter.InRangeThresholdInDBm = -110;
+            //watcher.SignalStrengthFilter.OutOfRangeThresholdInDBm = -110;
             watcher.ScanningMode = BluetoothLEScanningMode.Active;
             watcher.Received += Watcher_Recived;
             watcher.Start();
@@ -58,14 +60,18 @@ private async void Watcher_Recived(BluetoothLEAdvertisementWatcher sender, Bluet
             dev = await BluetoothLEDevice.FromBluetoothAddressAsync(args.BluetoothAddress);
             Tuple<ulong, BluetoothLEDevice> tup = new Tuple<ulong, BluetoothLEDevice>(args.BluetoothAddress, dev);
 
-            if (dev != null)
+            if (dev != null && args != null)
             {
-                if (dev.Name == null) return;
-                if (dev.Name.IndexOf("RadiaCode-10") == -1) return;
+                try
+                {
+                    if (dev.Name == null) return;
+                    if (dev.Name.IndexOf("RadiaCode-10") == -1) return;
+                } catch (Exception) { }
                 if (!devices.ContainsKey(args.BluetoothAddress))
                 {
                     try
                     {
+                        Trace.WriteLine($"Found {dev.Name} with addr {args.BluetoothAddress}");
                         devices.Add(args.BluetoothAddress, dev);
                         String name = dev.Name.Split('#')[1];
                         comboBox1.Invoke(new Action(() =>