Merge pull request #58 from kevincar/develop

Develop
kevincar · Nov 1, 2021 · 81044dd · 81044dd
2 parents 8db03e3 + 788c32a
commit 81044dd
Show file tree

Hide file tree

Showing 9 changed files with 233 additions and 293 deletions.
diff --git a/bless/__init__.py b/bless/__init__.py
@@ -27,13 +27,13 @@
 elif sys.platform == "win32":
 
     # Server
-    from bless.backends.dotnet.server import (  # noqa: F401
-        BlessServerDotNet as BlessServer,
+    from bless.backends.winrt.server import (  # noqa: F401
+        BlessServerWinRT as BlessServer,
     )
 
     # Characteristic Classes
-    from bless.backends.dotnet.characteristic import (  # noqa: F401
-        BlessGATTCharacteristicDotNet as BlessGATTCharacteristic,
+    from bless.backends.winrt.characteristic import (  # noqa: F401
+        BlessGATTCharacteristicWinRT as BlessGATTCharacteristic,
     )
 
 

diff --git a/bless/backends/dotnet/service.py b/bless/backends/dotnet/service.py
diff --git a/bless/backends/dotnet/utils.py b/bless/backends/dotnet/utils.py
diff --git a/bless/backends/dotnet/__init__.py → bless/backends/winrt/__init__.py b/bless/backends/dotnet/__init__.py → bless/backends/winrt/__init__.py
diff --git a/bless/backends/dotnet/characteristic.py → bless/backends/winrt/characteristic.py b/bless/backends/dotnet/characteristic.py → bless/backends/winrt/characteristic.py
@@ -1,16 +1,11 @@
 from uuid import UUID
 from typing import Union, Optional
 
-from bleak.backends.dotnet.characteristic import (  # type: ignore
-    BleakGATTCharacteristicDotNet,
-)
-from bleak.backends.dotnet.utils import (  # type: ignore
-    wrap_IAsyncOperation,
+from bleak.backends.winrt.characteristic import (  # type: ignore
+    BleakGATTCharacteristicWinRT,
 )
 
-from System import Guid  # type: ignore
-from Windows.Foundation import IAsyncOperation  # type: ignore
-from Windows.Devices.Bluetooth.GenericAttributeProfile import (  # type: ignore
+from bleak_winrt.windows.devices.bluetooth.genericattributeprofile import (  # type: ignore # noqa: E501
     GattProtectionLevel,
     GattLocalCharacteristicParameters,
     GattLocalCharacteristic,
@@ -26,11 +21,11 @@
 )
 
 
-class BlessGATTCharacteristicDotNet(
-    BlessGATTCharacteristic, BleakGATTCharacteristicDotNet
+class BlessGATTCharacteristicWinRT(
+    BlessGATTCharacteristic, BleakGATTCharacteristicWinRT
 ):
     """
-    DotNet implementation of the BlessGATTCharacteristic
+    WinRT implementation of the BlessGATTCharacteristic
     """
 
     def __init__(
@@ -62,40 +57,35 @@ def __init__(
 
     async def init(self, service: BlessGATTService):
         """
-        Initialize the DotNet GattLocalCharacteristic object
+        Initialize the WinRT GattLocalCharacteristic object
 
         Parameters
         ----------
-        service : BlessGATTServiceDotNet
+        service : BlessGATTServiceWinRT
             The service to assign the characteristic to
         """
-        charguid: Guid = Guid.Parse(self._uuid)
-
         char_parameters: GattLocalCharacteristicParameters = (
             GattLocalCharacteristicParameters()
         )
-        char_parameters.CharacteristicProperties = self._properties.value
-        char_parameters.ReadProtectionLevel = (
-            BlessGATTCharacteristicDotNet.permissions_to_protection_level(
+        char_parameters.characteristic_properties = self._properties.value
+        char_parameters.read_protection_level = (
+            BlessGATTCharacteristicWinRT.permissions_to_protection_level(
                 self._permissions, True
             )
         )
-        char_parameters.WriteProtectionLevel = (
-            BlessGATTCharacteristicDotNet.permissions_to_protection_level(
+        char_parameters.write_protection_level = (
+            BlessGATTCharacteristicWinRT.permissions_to_protection_level(
                 self._permissions, False
             )
         )
 
         characteristic_result: GattLocalCharacteristicResult = (
-            await wrap_IAsyncOperation(
-                IAsyncOperation[GattLocalCharacteristicResult](
-                    service.obj.CreateCharacteristicAsync(charguid, char_parameters)
-                ),
-                return_type=GattLocalCharacteristicResult,
+            await service.obj.create_characteristic_async(
+                UUID(self._uuid), char_parameters
             )
         )
 
-        gatt_char: GattLocalCharacteristic = characteristic_result.Characteristic
+        gatt_char: GattLocalCharacteristic = characteristic_result.characteristic
         super(BlessGATTCharacteristic, self).__init__(obj=gatt_char)
 
     @staticmethod
@@ -118,11 +108,11 @@ def permissions_to_protection_level(
         GattProtectionLevel
             The protection level equivalent
         """
-        result: GattProtectionLevel = GattProtectionLevel.Plain
+        result: GattProtectionLevel = GattProtectionLevel.PLAIN
         shift_value: int = 3 if read else 4
         permission_value: int = permissions.value >> shift_value
         if permission_value & 1:
-            result |= GattProtectionLevel.EncryptionRequired
+            result |= GattProtectionLevel.ENCRYPTION_REQURIED
         return result
 
     @property