don't include UUID for included services with 128 bit uuid

This commit is contained in:
matthias.ringwald@gmail.com 2014-02-28 11:57:53 +00:00
parent 0ba323c3d3
commit 4e4a1ebe01
2 changed files with 9 additions and 5 deletions

View File

@ -210,9 +210,11 @@ def parseIncludeService(fout, parts):
uuid = parseUUID(parts[1])
uuid_size = len(uuid)
if uuid_size > 2:
uuid_size = 0
# print "Include Service ", keyForUUID(uuid)
size = 2 + 2 + 2 + uuid_size + 2 + 4
size = 2 + 2 + 2 + 2 + 4 + uuid_size
keyUUID = keyForUUID(uuid)
@ -223,7 +225,8 @@ def parseIncludeService(fout, parts):
write_16(fout, 0x2802)
write_16(fout, services[keyUUID][0])
write_16(fout, services[keyUUID][1])
write_uuid(uuid)
if uuid_size > 0:
write_uuid(uuid)
fout.write("\n")
handle = handle + 1

View File

@ -11,8 +11,9 @@ CHARACTERISTIC, 2A04, READ | WRITE | DYNAMIC,
PRIMARY_SERVICE, GATT_SERVICE
CHARACTERISTIC, GATT_SERVICE_CHANGED, READ,
// SECONDARY_SERVICE, FF10
// CHARACTERISTIC, FF11, READ | WRITE | DYNAMIC,
SECONDARY_SERVICE, 0000FF10-0000-1000-8000-00805F9B34FB
CHARACTERISTIC, FF11, READ | WRITE | DYNAMIC,
//
// SECONDARY_SERVICE, FFFF
// INCLUDE_SERVICE, FF10
@ -93,7 +94,7 @@ CHARACTERISTIC, F10E, READ | WRITE | AUTHENTICATED_SIGNED_WRITE | DYNAMIC,
// Primary Service with 128-bit UUID, included service
PRIMARY_SERVICE, 0000F001-0000-1000-8000-00805F9B34FB
INCLUDE_SERVICE, FFF4
INCLUDE_SERVICE, 0000FF10-0000-1000-8000-00805F9B34FB
// Characteristics 16 and 128 bit with different authoriztion/authentication/encryption requirements and read/write flags
// - no requirements
CHARACTERISTIC, F200, READ | WRITE | DYNAMIC | NOTIFY | INDICATE | RELIABLE_WRITE,