2016-09-21 20:35:51

by Szymon Janc

[permalink] [raw]
Subject: [PATCH 1/2] test/example-gatt-server: Fix few copy-paste errors

---
test/example-gatt-server | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/test/example-gatt-server b/test/example-gatt-server
index 44ceb70..ecf614f 100755
--- a/test/example-gatt-server
+++ b/test/example-gatt-server
@@ -535,11 +535,11 @@ class TestEncryptCharacteristic(Characteristic):
CharacteristicUserDescriptionDescriptor(bus, 3, self))

def ReadValue(self, options):
- print('TestCharacteristic Read: ' + repr(self.value))
+ print('TestEncryptCharacteristic Read: ' + repr(self.value))
return self.value

def WriteValue(self, value, options):
- print('TestCharacteristic Write: ' + repr(value))
+ print('TestEncryptCharacteristic Write: ' + repr(value))
self.value = value

class TestEncryptDescriptor(Descriptor):
@@ -576,16 +576,16 @@ class TestSecureCharacteristic(Characteristic):
['secure-read', 'secure-write'],
service)
self.value = []
- self.add_descriptor(TestEncryptDescriptor(bus, 2, self))
+ self.add_descriptor(TestSecureDescriptor(bus, 2, self))
self.add_descriptor(
CharacteristicUserDescriptionDescriptor(bus, 3, self))

def ReadValue(self, options):
- print('TestCharacteristic Read: ' + repr(self.value))
+ print('TestSecureCharacteristic Read: ' + repr(self.value))
return self.value

def WriteValue(self, value, options):
- print('TestCharacteristic Write: ' + repr(value))
+ print('TestSecureCharacteristic Write: ' + repr(value))
self.value = value


--
2.7.4



2016-09-22 08:06:18

by Luiz Augusto von Dentz

[permalink] [raw]
Subject: Re: [PATCH 1/2] test/example-gatt-server: Fix few copy-paste errors

Hi Szymon,

On Wed, Sep 21, 2016 at 11:35 PM, Szymon Janc <[email protected]> wrote:
> ---
> test/example-gatt-server | 10 +++++-----
> 1 file changed, 5 insertions(+), 5 deletions(-)
>
> diff --git a/test/example-gatt-server b/test/example-gatt-server
> index 44ceb70..ecf614f 100755
> --- a/test/example-gatt-server
> +++ b/test/example-gatt-server
> @@ -535,11 +535,11 @@ class TestEncryptCharacteristic(Characteristic):
> CharacteristicUserDescriptionDescriptor(bus, 3, self))
>
> def ReadValue(self, options):
> - print('TestCharacteristic Read: ' + repr(self.value))
> + print('TestEncryptCharacteristic Read: ' + repr(self.value))
> return self.value
>
> def WriteValue(self, value, options):
> - print('TestCharacteristic Write: ' + repr(value))
> + print('TestEncryptCharacteristic Write: ' + repr(value))
> self.value = value
>
> class TestEncryptDescriptor(Descriptor):
> @@ -576,16 +576,16 @@ class TestSecureCharacteristic(Characteristic):
> ['secure-read', 'secure-write'],
> service)
> self.value = []
> - self.add_descriptor(TestEncryptDescriptor(bus, 2, self))
> + self.add_descriptor(TestSecureDescriptor(bus, 2, self))
> self.add_descriptor(
> CharacteristicUserDescriptionDescriptor(bus, 3, self))
>
> def ReadValue(self, options):
> - print('TestCharacteristic Read: ' + repr(self.value))
> + print('TestSecureCharacteristic Read: ' + repr(self.value))
> return self.value
>
> def WriteValue(self, value, options):
> - print('TestCharacteristic Write: ' + repr(value))
> + print('TestSecureCharacteristic Write: ' + repr(value))
> self.value = value
>
>
> --
> 2.7.4

Applied, thanks.

--
Luiz Augusto von Dentz

2016-09-21 20:35:52

by Szymon Janc

[permalink] [raw]
Subject: [PATCH 2/2] test/example-gatt-server: Make test service primary

This allows to test from Android until included services support is
added.
---
test/example-gatt-server | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/example-gatt-server b/test/example-gatt-server
index ecf614f..52c2029 100755
--- a/test/example-gatt-server
+++ b/test/example-gatt-server
@@ -438,7 +438,7 @@ class TestService(Service):
TEST_SVC_UUID = '12345678-1234-5678-1234-56789abcdef0'

def __init__(self, bus, index):
- Service.__init__(self, bus, index, self.TEST_SVC_UUID, False)
+ Service.__init__(self, bus, index, self.TEST_SVC_UUID, True)
self.add_characteristic(TestCharacteristic(bus, 0, self))
self.add_characteristic(TestEncryptCharacteristic(bus, 1, self))
self.add_characteristic(TestSecureCharacteristic(bus, 2, self))
--
2.7.4