From dd086af866003889a69b3af4f06551fd12ad1f35 Mon Sep 17 00:00:00 2001
From: Alec Delaney <tekktrik@gmail.com>
Date: Tue, 8 Feb 2022 13:04:03 -0500
Subject: [PATCH 1/2] Use newly exposed BLE constants

---
 adafruit_ble_adafruit/adafruit_service.py | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/adafruit_ble_adafruit/adafruit_service.py b/adafruit_ble_adafruit/adafruit_service.py
index d1212dd..b1561a8 100644
--- a/adafruit_ble_adafruit/adafruit_service.py
+++ b/adafruit_ble_adafruit/adafruit_service.py
@@ -33,6 +33,7 @@
 
 from adafruit_ble.advertising import Advertisement, LazyObjectField
 from adafruit_ble.advertising.standard import ManufacturerData, ManufacturerDataField
+from adafruit_ble.advertising.adafruit import MANUFACTURING_DATA_ADT, ADAFRUIT_COMPANY_ID
 from adafruit_ble.attributes import Attribute
 from adafruit_ble.characteristics import Characteristic
 from adafruit_ble.characteristics.int import Int32Characteristic, Uint32Characteristic
@@ -40,8 +41,6 @@
 from adafruit_ble.services import Service
 
 
-_MANUFACTURING_DATA_ADT = const(0xFF)
-_ADAFRUIT_COMPANY_ID = const(0x0822)
 _PID_DATA_ID = const(0x0001)  # This is the same as the Radio data id, unfortunately.
 
 
@@ -53,8 +52,8 @@ class AdafruitServerAdvertisement(
     match_prefixes = (
         struct.pack(
             "<BHBH",
-            _MANUFACTURING_DATA_ADT,
-            _ADAFRUIT_COMPANY_ID,
+            MANUFACTURING_DATA_ADT,
+            ADAFRUIT_COMPANY_ID,
             struct.calcsize("<HH"),
             _PID_DATA_ID,
         ),
@@ -62,8 +61,8 @@ class AdafruitServerAdvertisement(
     manufacturer_data = LazyObjectField(
         ManufacturerData,
         "manufacturer_data",
-        advertising_data_type=_MANUFACTURING_DATA_ADT,
-        company_id=_ADAFRUIT_COMPANY_ID,
+        advertising_data_type=MANUFACTURING_DATA_ADT,
+        company_id=ADAFRUIT_COMPANY_ID,
         key_encoding="<H",
     )
     pid = ManufacturerDataField(_PID_DATA_ID, "<H")

From a670ede3d450b775df4e86efad14fc234a3c1542 Mon Sep 17 00:00:00 2001
From: Alec Delaney <tekktrik@gmail.com>
Date: Tue, 8 Feb 2022 13:04:50 -0500
Subject: [PATCH 2/2] Reformatted per pre-commit

---
 adafruit_ble_adafruit/adafruit_service.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/adafruit_ble_adafruit/adafruit_service.py b/adafruit_ble_adafruit/adafruit_service.py
index b1561a8..7826b2c 100644
--- a/adafruit_ble_adafruit/adafruit_service.py
+++ b/adafruit_ble_adafruit/adafruit_service.py
@@ -33,7 +33,10 @@
 
 from adafruit_ble.advertising import Advertisement, LazyObjectField
 from adafruit_ble.advertising.standard import ManufacturerData, ManufacturerDataField
-from adafruit_ble.advertising.adafruit import MANUFACTURING_DATA_ADT, ADAFRUIT_COMPANY_ID
+from adafruit_ble.advertising.adafruit import (
+    MANUFACTURING_DATA_ADT,
+    ADAFRUIT_COMPANY_ID,
+)
 from adafruit_ble.attributes import Attribute
 from adafruit_ble.characteristics import Characteristic
 from adafruit_ble.characteristics.int import Int32Characteristic, Uint32Characteristic