From 2c20c5f158e0a7ae1be9c391e6dc459ec8aa7587 Mon Sep 17 00:00:00 2001
From: Vit Nemecky <vico@centrum.cz>
Date: Sat, 15 Feb 2025 19:12:14 +0100
Subject: [PATCH 1/3] Fix detection of BuWizz2 having firmware 1.2.30

---
 .../DeviceManagement/BluetoothDeviceManager.cs         | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/BrickController2/BrickController2/DeviceManagement/BluetoothDeviceManager.cs b/BrickController2/BrickController2/DeviceManagement/BluetoothDeviceManager.cs
index 821959b4d..f753f433e 100644
--- a/BrickController2/BrickController2/DeviceManagement/BluetoothDeviceManager.cs
+++ b/BrickController2/BrickController2/DeviceManagement/BluetoothDeviceManager.cs
@@ -87,6 +87,16 @@ public async Task<bool> ScanAsync(Func<DeviceType, string, string, byte[]?, Task
                         }
                     }
                     break;
+                case "05-45": // BuWizz2 has new ID since firmware 1.2.30
+                    if (advertismentData.TryGetValue(ADTYPE_LOCAL_NAME_COMPLETE, out byte[]? buwizzName))
+                    {
+                        var completeLocalNameString = BitConverter.ToString(buwizzName).ToLower();
+                        if (completeLocalNameString == "42-75-57-69-7a-7a-32") // BuWizz2
+                        {
+                            return (DeviceType.BuWizz2, manufacturerData);
+                        }
+                    }
+                    break;
                 case "97-03":
                     if (manufacturerDataString.Length >= 11)
                     {

From 4203caaca26e9c8e06bba41465deaab449972e7d Mon Sep 17 00:00:00 2001
From: Vit Nemecky <vico@centrum.cz>
Date: Sat, 15 Feb 2025 19:43:12 +0100
Subject: [PATCH 2/3] Fix build error due to my fork diffs

---
 .../BrickController2/DeviceManagement/BluetoothDeviceManager.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/BrickController2/BrickController2/DeviceManagement/BluetoothDeviceManager.cs b/BrickController2/BrickController2/DeviceManagement/BluetoothDeviceManager.cs
index f753f433e..25c075cc1 100644
--- a/BrickController2/BrickController2/DeviceManagement/BluetoothDeviceManager.cs
+++ b/BrickController2/BrickController2/DeviceManagement/BluetoothDeviceManager.cs
@@ -88,7 +88,7 @@ public async Task<bool> ScanAsync(Func<DeviceType, string, string, byte[]?, Task
                     }
                     break;
                 case "05-45": // BuWizz2 has new ID since firmware 1.2.30
-                    if (advertismentData.TryGetValue(ADTYPE_LOCAL_NAME_COMPLETE, out byte[]? buwizzName))
+                    if (advertismentData.TryGetValue(0x09, out byte[]? buwizzName))
                     {
                         var completeLocalNameString = BitConverter.ToString(buwizzName).ToLower();
                         if (completeLocalNameString == "42-75-57-69-7a-7a-32") // BuWizz2

From 94ce7f3f52d0a0fcbd415e47eae76499ec1dfcb9 Mon Sep 17 00:00:00 2001
From: Vit Nemecky <vico@centrum.cz>
Date: Wed, 14 May 2025 20:38:20 +0200
Subject: [PATCH 3/3] fix detection - use manufacturer data instead of the
 local name

---
 .../BluetoothDeviceManager.cs                 | 28 +++++++------------
 1 file changed, 10 insertions(+), 18 deletions(-)

diff --git a/BrickController2/BrickController2/DeviceManagement/BluetoothDeviceManager.cs b/BrickController2/BrickController2/DeviceManagement/BluetoothDeviceManager.cs
index 25c075cc1..0e5ddde8b 100644
--- a/BrickController2/BrickController2/DeviceManagement/BluetoothDeviceManager.cs
+++ b/BrickController2/BrickController2/DeviceManagement/BluetoothDeviceManager.cs
@@ -74,27 +74,19 @@ public async Task<bool> ScanAsync(Func<DeviceType, string, string, byte[]?, Task
                 case "98-01": return (DeviceType.SBrick, manufacturerData);
                 case "48-4d": return (DeviceType.BuWizz, manufacturerData);
                 case "4e-05":
-                    if (advertismentData.TryGetValue(0x09, out byte[]? completeLocalName))
+                    // detect using manufacterer data prefix
+                    if (!manufacturerDataString.StartsWith("4e-05-42-57-03-"))
                     {
-                        var completeLocalNameString = BitConverter.ToString(completeLocalName).ToLower();
-                        if (completeLocalNameString == "42-75-57-69-7a-7a") // BuWizz
-                        {
-                            return (DeviceType.BuWizz2, manufacturerData);
-                        }
-                        else
-                        {
-                            return (DeviceType.BuWizz3, manufacturerData);
-                        }
+                        return (DeviceType.BuWizz2, manufacturerData);
                     }
-                    break;
-                case "05-45": // BuWizz2 has new ID since firmware 1.2.30
-                    if (advertismentData.TryGetValue(0x09, out byte[]? buwizzName))
+                    else
                     {
-                        var completeLocalNameString = BitConverter.ToString(buwizzName).ToLower();
-                        if (completeLocalNameString == "42-75-57-69-7a-7a-32") // BuWizz2
-                        {
-                            return (DeviceType.BuWizz2, manufacturerData);
-                        }
+                        return (DeviceType.BuWizz3, manufacturerData);
+                    }
+                case "05-45": // BuWizz2 has new ID since firmware 1.2.30 - use BuWizz2 prefix
+                    if (manufacturerDataString.StartsWith("05-45-42-57-02-"))
+                    {
+                        return (DeviceType.BuWizz2, manufacturerData);
                     }
                     break;
                 case "97-03":