Mercurial Repositories > eric / file diff

--- a/src/eric7/MicroPython/BluetoothDialogs/BluetoothAdvertisement.py	Wed Mar 08 19:48:26 2023 +0100
+++ b/src/eric7/MicroPython/BluetoothDialogs/BluetoothAdvertisement.py	Thu Mar 09 11:13:35 2023 +0100
@@ -33,6 +33,7 @@
     0xE0: "Google",
     0x75: "Samsung Electronics Co. Ltd.",
     0x87: "Garmin International Inc.",
+    0x822: "adafruit industries",
 }
 
 
@@ -49,7 +50,7 @@
         @type str
         """
         self.__address = address
-        self.__name = ""
+        ##self.__name = ""
         self.__rssi = 0
         self.__connectable = False
 
@@ -131,6 +132,32 @@
         return dataChunks
 
     @property
+    def completeName(self):
+        """
+        Public method to get the complete advertised name, if available.
+
+        @return advertised name
+        @rtype str
+        """
+        for n in self.__decodeField(ADV_TYPE_COMPLETE_NAME):
+            return str(n, "utf-8").replace("\x00", "") if n else ""
+
+        return ""
+
+    @property
+    def shortName(self):
+        """
+        Public method to get the shortened advertised name, if available.
+
+        @return advertised name
+        @rtype str
+        """
+        for n in self.__decodeField(ADV_TYPE_SHORT_NAME):
+            return str(n, "utf-8").replace("\x00", "") if n else ""
+
+        return ""
+
+    @property
     def name(self):
         """
         Public method to get the complete or shortened advertised name, if available.
@@ -138,10 +165,7 @@
         @return advertised name
         @rtype str
         """
-        for n in self.__decodeField(ADV_TYPE_COMPLETE_NAME, ADV_TYPE_SHORT_NAME):
-            return str(n, "utf-8").replace("\x00", "") if n else ""
-
-        return ""
+        return self.completeName or self.shortName
 
     @property
     def rssi(self):