Merge pull request #612 from WildernessLabs/AddBluetoothMacAddress

Add support for Bluetooth MAC address.
WildernessLabs · Jan 7, 2025 · 5f9dde0 · 5f9dde0
2 parents 3fe6a6c + 9c10919
commit 5f9dde0
Showing 1 changed file with 7 additions and 1 deletion.
diff --git a/Source/v2/Meadow.HCom/DeviceInfo.cs b/Source/v2/Meadow.HCom/DeviceInfo.cs
@@ -30,6 +30,7 @@ public string? this[string propname]
     public string? SerialNumber => this["SerialNo"];
     public string? MacAddress => this["WiFiMAC"];
     public string? SoftAPMacAddress => this["SoftAPMac"];
+    public string?BluetoothMacAddress => this["BtMac"];
 
     /// <summary>
     /// String representation of an unknown MAC address.
@@ -72,6 +73,11 @@ public override string ToString()
             macCount++;
             macAddresses += $"\tAP: {SoftAPMacAddress}{Environment.NewLine}";
         }
+        if (!string.IsNullOrEmpty(BluetoothMacAddress) && BluetoothMacAddress != UNKNOWN_MAC_ADDRESS)
+        {
+            macCount++;
+            macAddresses += $"\tBluetooth: {BluetoothMacAddress}{Environment.NewLine}";
+        }
         if (macCount > 0)
         {
             if (macCount > 1)
@@ -82,7 +88,7 @@ public override string ToString()
             {
                 deviceInfo.AppendLine("    MAC Address - ");
             }
-            deviceInfo.AppendLine($"{macAddresses}");
+            deviceInfo.Append($"{macAddresses}");
         }
 
         deviceInfo.AppendLine();