From 4b6ba6d446398890ea792f5e57762399d40862e9 Mon Sep 17 00:00:00 2001
From: "Nicholas H.Tollervey" <ntoll@ntoll.org>
Date: Mon, 18 Nov 2019 15:24:01 +0000
Subject: [PATCH 1/5] Add an AdafruitRadio Advertisement class.

---
 adafruit_ble/advertising/adafruit.py | 25 ++++++++++++++++---------
 1 file changed, 16 insertions(+), 9 deletions(-)

diff --git a/adafruit_ble/advertising/adafruit.py b/adafruit_ble/advertising/adafruit.py
index 44f65c0..73a7c9b 100755
--- a/adafruit_ble/advertising/adafruit.py
+++ b/adafruit_ble/advertising/adafruit.py
@@ -43,6 +43,8 @@
 _MANUFACTURING_DATA_ADT = const(0xff)
 _ADAFRUIT_COMPANY_ID = const(0x0822)
 _COLOR_DATA_ID = const(0x0000)
+_RADIO_DATA_ID = const(0x0001)  # TODO: check this isn't already taken.
+
 
 class AdafruitColor(Advertisement):
     """Broadcast a single RGB color."""
@@ -61,12 +63,17 @@ class AdafruitColor(Advertisement):
     color = ManufacturerDataField(_COLOR_DATA_ID, "<I")
     """Color to broadcast as RGB integer."""
 
-# TODO: Add radio packets.
-#
-# class AdafruitRadio(Advertisement):
-#     prefix = b"\x06\xff\xff\xff\x00\x01"
-#
-#     channel = Struct()
-#     address =
-#     group =
-#     data =
+
+class AdafruitRadio(Advertisement):
+    prefix = struct.pack("<BBHBH",
+                         0x6,
+                         _MANUFACTURING_DATA_ADT,
+                         _ADAFRUIT_COMPANY_ID,
+                         struct.calcsize("<HI"),
+                         _RADIO_DATA_ID)
+    manufacturer_data = LazyField(ManufacturerData,
+                                  "manufacturer_data",
+                                  advertising_data_type=_MANUFACTURING_DATA_ADT,
+                                  company_id=_ADAFRUIT_COMPANY_ID,
+                                  key_encoding="<H")
+    msg = ManufacturerDataField(_RADIO_DATA_ID, "<24s")  # 31 byte ads

From 7a73b104ce495c7342655547af221abbb32fe4b8 Mon Sep 17 00:00:00 2001
From: "Nicholas H.Tollervey" <ntoll@ntoll.org>
Date: Mon, 18 Nov 2019 15:48:26 +0000
Subject: [PATCH 2/5] Doh... calculate the message size correctly. ;-)

---
 adafruit_ble/advertising/adafruit.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/adafruit_ble/advertising/adafruit.py b/adafruit_ble/advertising/adafruit.py
index 73a7c9b..cff2d0d 100755
--- a/adafruit_ble/advertising/adafruit.py
+++ b/adafruit_ble/advertising/adafruit.py
@@ -69,7 +69,7 @@ class AdafruitRadio(Advertisement):
                          0x6,
                          _MANUFACTURING_DATA_ADT,
                          _ADAFRUIT_COMPANY_ID,
-                         struct.calcsize("<HI"),
+                         struct.calcsize("<H24s"),
                          _RADIO_DATA_ID)
     manufacturer_data = LazyField(ManufacturerData,
                                   "manufacturer_data",

From 2d6b912059eacb9fd4a456094f27cdd84044e111 Mon Sep 17 00:00:00 2001
From: "Nicholas H.Tollervey" <ntoll@ntoll.org>
Date: Mon, 25 Nov 2019 18:15:46 +0000
Subject: [PATCH 3/5] Support 255 byte advertisements in AdafruitRadio class.

---
 adafruit_ble/advertising/adafruit.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/adafruit_ble/advertising/adafruit.py b/adafruit_ble/advertising/adafruit.py
index cff2d0d..7688908 100755
--- a/adafruit_ble/advertising/adafruit.py
+++ b/adafruit_ble/advertising/adafruit.py
@@ -69,11 +69,11 @@ class AdafruitRadio(Advertisement):
                          0x6,
                          _MANUFACTURING_DATA_ADT,
                          _ADAFRUIT_COMPANY_ID,
-                         struct.calcsize("<H24s"),
+                         struct.calcsize("<H248s"),
                          _RADIO_DATA_ID)
     manufacturer_data = LazyField(ManufacturerData,
                                   "manufacturer_data",
                                   advertising_data_type=_MANUFACTURING_DATA_ADT,
                                   company_id=_ADAFRUIT_COMPANY_ID,
                                   key_encoding="<H")
-    msg = ManufacturerDataField(_RADIO_DATA_ID, "<24s")  # 31 byte ads
+    msg = ManufacturerDataField(_RADIO_DATA_ID, "<248s")  # 255 byte ads

From 96ab6d89696b9551770395879dd66865bdaa8d0a Mon Sep 17 00:00:00 2001
From: "Nicholas H.Tollervey" <ntoll@ntoll.org>
Date: Wed, 18 Dec 2019 10:19:40 +0000
Subject: [PATCH 4/5] Remove length from prefix.

---
 adafruit_ble/advertising/adafruit.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/adafruit_ble/advertising/adafruit.py b/adafruit_ble/advertising/adafruit.py
index 7688908..d7c4048 100755
--- a/adafruit_ble/advertising/adafruit.py
+++ b/adafruit_ble/advertising/adafruit.py
@@ -65,11 +65,10 @@ class AdafruitColor(Advertisement):
 
 
 class AdafruitRadio(Advertisement):
-    prefix = struct.pack("<BBHBH",
+    prefix = struct.pack("<BBHH",
                          0x6,
                          _MANUFACTURING_DATA_ADT,
                          _ADAFRUIT_COMPANY_ID,
-                         struct.calcsize("<H248s"),
                          _RADIO_DATA_ID)
     manufacturer_data = LazyField(ManufacturerData,
                                   "manufacturer_data",

From 7f05c51a5809e07771261e8176c84eda78f00c99 Mon Sep 17 00:00:00 2001
From: "Nicholas H.Tollervey" <ntoll@ntoll.org>
Date: Thu, 19 Dec 2019 10:13:23 +0000
Subject: [PATCH 5/5] Fixes docstring problem.

---
 adafruit_ble/advertising/adafruit.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/adafruit_ble/advertising/adafruit.py b/adafruit_ble/advertising/adafruit.py
index d7c4048..45b1083 100755
--- a/adafruit_ble/advertising/adafruit.py
+++ b/adafruit_ble/advertising/adafruit.py
@@ -65,6 +65,7 @@ class AdafruitColor(Advertisement):
 
 
 class AdafruitRadio(Advertisement):
+    """Broadcast arbitrary bytes as a radio message."""
     prefix = struct.pack("<BBHH",
                          0x6,
                          _MANUFACTURING_DATA_ADT,