Skip to content

Commit 115237b

Browse files
authored
Merge pull request #31 from dhalbert/char-fixes-and-float
Fix a couple of Characteristic bugs and add FloatCharacteristic
2 parents 2d5ef97 + abcfb21 commit 115237b

File tree

2 files changed

+49
-2
lines changed

2 files changed

+49
-2
lines changed

adafruit_ble/characteristics/__init__.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ def __bind_locally(self, service, initial_value):
7474
if max_length is None:
7575
max_length = len(initial_value)
7676
return _bleio.Characteristic.add_to_service(
77-
service,
77+
service.bleio_service,
7878
self.uuid.bleio_uuid,
7979
initial_value=initial_value,
8080
max_length=max_length,
@@ -138,4 +138,4 @@ def __get__(self, obj, cls=None):
138138

139139
def __set__(self, obj, value):
140140
encoded = struct.pack(self._struct_format, *value)
141-
super.__set__(obj, encoded)
141+
super().__set__(obj, encoded)

adafruit_ble/characteristics/float.py

Lines changed: 47 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,47 @@
1+
# The MIT License (MIT)
2+
#
3+
# Copyright (c) 2019 Scott Shawcroft for Adafruit Industries
4+
#
5+
# Permission is hereby granted, free of charge, to any person obtaining a copy
6+
# of this software and associated documentation files (the "Software"), to deal
7+
# in the Software without restriction, including without limitation the rights
8+
# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
9+
# copies of the Software, and to permit persons to whom the Software is
10+
# furnished to do so, subject to the following conditions:
11+
#
12+
# The above copyright notice and this permission notice shall be included in
13+
# all copies or substantial portions of the Software.
14+
#
15+
# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
16+
# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
17+
# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
18+
# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
19+
# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
20+
# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
21+
# THE SOFTWARE.
22+
"""
23+
`float`
24+
====================================================
25+
26+
This module provides float characteristics that are usable directly as attributes.
27+
28+
"""
29+
30+
from . import StructCharacteristic
31+
32+
__version__ = "0.0.0-auto.0"
33+
__repo__ = "https://github.com/adafruit/Adafruit_CircuitPython_BLE.git"
34+
35+
class FloatCharacteristic(StructCharacteristic):
36+
"""32-bit float"""
37+
# TODO: Valid set values as within range.
38+
def __init__(self, **kwargs):
39+
if "initial_value" in kwargs:
40+
kwargs["initial_value"] = (kwargs["initial_value"],)
41+
super().__init__("<f", **kwargs)
42+
43+
def __get__(self, obj, cls=None):
44+
return super().__get__(obj)[0]
45+
46+
def __set__(self, obj, value):
47+
super().__set__(obj, (value,))

0 commit comments

Comments
 (0)