aioble/peripheral.py: Place multiple UUIDs in single advertisement LTV.

When multiple UUIDs of the same size are advertised, they should all be
listed in a single LTV.  Supplement to the Bluetooth Core Specification,
Part A, §1.1.1:  "A packet or data block shall not contain more than one
instance for each Service UUID data size."

When aioble construct the advertisement data, it is creating a new data
block for each UUID that contains only that single UUID.  Rather than,
e.g., a single 16-bit UUID block with a list of multiple UUIDs.

Not only is this against the specification, it wastes two bytes of limited
advertisement space per UUID beyond the first for the repeated data block
length and type fields.

Fix this by grouping each UUID size together.

Signed-off-by: Trent Piepho <tpiepho@gmail.com>

micropython/bluetooth/aioble-peripheral/manifest.py

@@ -1,4 +1,4 @@
-metadata(version="0.2.0")
+metadata(version="0.2.1")
 
 require("aioble-core")
 

micropython/bluetooth/aioble/aioble/peripheral.py

@@ -129,14 +129,13 @@ async def advertise(
         # Services are prioritised to go in the advertising data because iOS supports
         # filtering scan results by service only, so services must come first.
         if services:
-            for uuid in services:
+            for uuid_len, code in (
-                b = bytes(uuid)
+                (2, _ADV_TYPE_UUID16_COMPLETE),
-                if len(b) == 2:
+                (4, _ADV_TYPE_UUID32_COMPLETE),
-                    resp_data = _append(adv_data, resp_data, _ADV_TYPE_UUID16_COMPLETE, b)
+                (16, _ADV_TYPE_UUID128_COMPLETE),
-                elif len(b) == 4:
+            ):
-                    resp_data = _append(adv_data, resp_data, _ADV_TYPE_UUID32_COMPLETE, b)
+                if uuids := [bytes(uuid) for uuid in services if len(bytes(uuid)) == uuid_len]:
-                elif len(b) == 16:
+                    resp_data = _append(adv_data, resp_data, code, b"".join(uuids))
-                    resp_data = _append(adv_data, resp_data, _ADV_TYPE_UUID128_COMPLETE, b)
 
         if name:
             resp_data = _append(adv_data, resp_data, _ADV_TYPE_NAME, name)

micropython/bluetooth/aioble/manifest.py

@@ -3,7 +3,7 @@
 # code. This allows (for development purposes) all the files to live in the
 # one directory.
 
-metadata(version="0.5.0")
+metadata(version="0.5.1")
 
 # Default installation gives you everything. Install the individual
 # components (or a combination of them) if you want a more minimal install.