Fix HID for iOS

Author: tannewt

adafruit_ble/characteristics/__init__.py

@@ -125,9 +125,9 @@ def __bind_locally(self, service, initial_value):
             initial_value = bytes(self.max_length)
         max_length = self.max_length
         if max_length is None and initial_value is None:
-            max_length = 20
-            initial_value = bytes(max_length)
-        if max_length is None:
+            max_length = 0
+            initial_value = b""
+        elif max_length is None:
             max_length = len(initial_value)
         return _bleio.Characteristic.add_to_service(
             service.bleio_service, self.uuid.bleio_uuid, initial_value=initial_value,
@@ -141,6 +141,8 @@ def __get__(self, service, cls=None):
 
     def __set__(self, service, value):
         self._ensure_bound(service, value)
+        if value == None:
+            value = b""
         bleio_characteristic = service.bleio_characteristics[self.field_name]
         bleio_characteristic.value = value
 

adafruit_ble/services/standard/device_info.py

@@ -53,7 +53,8 @@ def __init__(self, *, manufacturer,
                  software_revision,
                  model_number=None,
                  serial_number=None,
-                 firmware_revision=None):
+                 firmware_revision=None,
+                 hardware_revision=None):
         if model_number is None:
             model_number = sys.platform
         if serial_number is None:
@@ -65,4 +66,5 @@ def __init__(self, *, manufacturer,
                          software_revision=software_revision,
                          model_number=model_number,
                          serial_number=serial_number,
-                         firmware_revision=firmware_revision)
+                         firmware_revision=firmware_revision,
+                         hardware_revision=hardware_revision)

adafruit_ble/services/standard/hid.py

@@ -140,7 +140,6 @@ class HIDService(Service):
         hid = HIDServer()
     """
     uuid = StandardUUID(0x1812)
-    default_field_name = "hid"
 
     boot_keyboard_in = Characteristic(uuid=StandardUUID(0x2A22),
                                       properties=(Characteristic.READ |
@@ -191,7 +190,7 @@ class HIDService(Service):
                                     max_value=1)
     """Controls whether the device should be suspended (0) or not (1)."""
 
-    def __init__(self, hid_descriptor):
+    def __init__(self, hid_descriptor=None, service=None):
         super().__init__(report_map=hid_descriptor)
         self._init_devices()
 
@@ -279,10 +278,3 @@ def get_report_info(collection, reports):
             if input_size > 0:
                 self.devices.append(ReportIn(self, report_id, usage_page, usage,
                                              max_length=input_size // 8))
-
-
-    @classmethod
-    def from_remote_service(cls, remote_service):
-        """Creates a HIDService from a remote service"""
-        self = super(cls).from_remote_service(remote_service)
-        self._init_devices() # pylint: disable=protected-access