standard charac lengths; use board names

Author: dhalbert

adafruit_ble_adafruit/addressable_pixel_service.py

@@ -73,14 +73,13 @@ def __init__(self):
         super().__init__(
             properties=Characteristic.WRITE,
             read_perm=Attribute.NO_ACCESS,
-            # max length will be set on binding.
+            max_length=512,
         )
 
     def bind(self, service):
         """Binds the characteristic to the given Service."""
         # Set Characteristic's max length, based on value from AddressablePixelService.
         # + 3 is for size of start and flags
-        self.max_length = service.data_length + 3
         bound_characteristic = super().bind(service)
         return _bleio.PacketBuffer(bound_characteristic, buffer_size=1)
 
@@ -106,9 +105,7 @@ class AddressablePixelService(AdafruitService):
     _pixel_packet = _PixelPacket()
     """Pixel-setting data. max_length is supplied on binding."""
 
-    def __init__(self, data_length, service=None):
-        # Used by _PixelPacket when binding is done.
-        self.data_length = data_length
+    def __init__(self, service=None):
         self._pixel_packet_buf = None
         super().__init__(service=service)
 

adafruit_ble_adafruit/microphone_service.py

@@ -37,31 +37,17 @@
 from adafruit_ble_adafruit.adafruit_service import AdafruitService
 
 
-class _SoundSamples(Characteristic):  # pylint: disable=too-few-public-methods
-    """The Characteristic's max_length is passed from the service,
-    so defer setting it until binding happens.
-    """
-
-    def __init__(self):
-        super().__init__(
-            uuid=AdafruitService.adafruit_service_uuid(0xB01),
-            properties=(Characteristic.READ | Characteristic.NOTIFY),
-            write_perm=Attribute.NO_ACCESS,
-        )
-
-    def __bind_locally(self, service, initial_value):
-        # The service instantiation determines how many samples
-        # to send.
-        self.max_length = service.num_samples * 2
-        return super().__bind_locally(service, initial_value)
-
-
 class MicrophoneService(AdafruitService):  # pylint: disable=too-few-public-methods
     """Digital microphone data."""
 
     uuid = AdafruitService.adafruit_service_uuid(0xB00)
 
-    sound_samples = _SoundSamples()
+    sound_samples = Characteristic(
+        uuid=AdafruitService.adafruit_service_uuid(0xB01),
+        properties=(Characteristic.READ | Characteristic.NOTIFY),
+        write_perm=Attribute.NO_ACCESS,
+        max_length=512,
+    )
     """
     Array of 16-bit sound samples, varying based on period.
     If num_channel == 2, the samples alternate left and right channels.
@@ -76,8 +62,3 @@ class MicrophoneService(AdafruitService):  # pylint: disable=too-few-public-meth
 
     measurement_period = AdafruitService.measurement_period_charac()
     """Initially 1000ms."""
-
-    def __init__(self, num_samples, service=None):
-        # Used by _SoundSamples when binding is done.
-        self.num_samples = num_samples
-        super().__init__(service=service)

examples/ble_adafruit_circuitplayground_bluefruit.py

@@ -27,7 +27,7 @@
 
 # 3 RGB bytes * 10 pixels.
 NEOPIXEL_BUF_LENGTH = const(3 * 10)
-neopixel_svc = AddressablePixelService(NEOPIXEL_BUF_LENGTH)
+neopixel_svc = AddressablePixelService()
 neopixel_buf = bytearray(NEOPIXEL_BUF_LENGTH)
 # Take over NeoPixel control from cp.
 cp._pixels.deinit()  # pylint: disable=protected-access
@@ -48,7 +48,12 @@
 tone_svc = ToneService()
 
 ble = BLERadio()
+# The Web Bluetooth dashboard identifies known boards by their
+# advertised name, not by advertising manufacturer data.
+ble.name = "CPlay"
 
+# The Bluefruit Playground app looks in the manufacturer data
+# in the advertisement. That data uses the USB PID as a unique ID.
 # Adafruit Circuit Playground Bluefruit USB PID:
 # Arduino: 0x8045,  CircuitPython: 0x8046, app supports either
 adv = AdafruitServerAdvertisement(0x8046)
@@ -90,14 +95,14 @@
 
         tone = tone_svc.tone
         if tone is not None:
-            freq, duration = tone
+            freq, duration_msecs = tone
             if freq != 0:
-                if duration != 0:
+                if duration_msecs != 0:
                     # Note that this blocks. Alternatively we could
                     # use now_msecs to time a tone in a non-blocking
                     # way, but then the other updates might make the
                     # tone interval less consistent.
-                    cp.play_tone(freq, duration)
+                    cp.play_tone(freq, duration_msecs / 1000)
                 else:
                     cp.stop_tone()
                     cp.start_tone(freq)

examples/ble_adafruit_clue.py

@@ -31,7 +31,7 @@
 
 # CLUE has just one board pixel. 3 RGB bytes * 1 pixel.
 NEOPIXEL_BUF_LENGTH = const(3 * 1)
-neopixel_svc = AddressablePixelService(NEOPIXEL_BUF_LENGTH)
+neopixel_svc = AddressablePixelService()
 neopixel_buf = bytearray(NEOPIXEL_BUF_LENGTH)
 # Take over NeoPixel control from clue.
 clue._pixel.deinit()  # pylint: disable=protected-access
@@ -55,7 +55,7 @@
 
 # Send 256 16-bit samples at a time.
 MIC_NUM_SAMPLES = const(256)
-mic_svc = MicrophoneService(MIC_NUM_SAMPLES)
+mic_svc = MicrophoneService()
 mic_svc.number_of_channels = 1
 mic_svc.measurement_period = 100
 mic_last_update = 0
@@ -68,7 +68,12 @@
 tone_svc = ToneService()
 
 ble = BLERadio()
+# The Web Bluetooth dashboard identifies known boards by their
+# advertised name, not by advertising manufacturer data.
+ble.name = "CLUE"
 
+# The Bluefruit Playground app looks in the manufacturer data
+# in the advertisement. That data uses the USB PID as a unique ID.
 # Adafruit CLUE USB PID:
 # Arduino: 0x8071,  CircuitPython: 0x8072, app supports either
 adv = AdafruitServerAdvertisement(0x8072)
@@ -128,14 +133,14 @@
 
         tone = tone_svc.tone
         if tone is not None:
-            freq, duration = tone
+            freq, duration_msecs = tone
             if freq != 0:
-                if duration != 0:
+                if duration_msecs != 0:
                     # Note that this blocks. Alternatively we could
                     # use now_msecs to time a tone in a non-blocking
                     # way, but then the other updates might make the
                     # tone interval less consistent.
-                    clue.play_tone(freq, duration)
+                    clue.play_tone(freq, duration_msecs / 1000)
                 else:
                     clue.stop_tone()
                     clue.start_tone(freq)