From 2d90571f0d9b86d7d7fbf414bbadd5092143c670 Mon Sep 17 00:00:00 2001 From: petter <39340152+petterhs@users.noreply.github.com> Date: Fri, 8 Jan 2021 14:21:52 +0100 Subject: [PATCH] change Notification Event UUID --- src/components/ble/AlertNotificationService.cpp | 4 ++-- src/components/ble/AlertNotificationService.h | 10 ++++++---- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/src/components/ble/AlertNotificationService.cpp b/src/components/ble/AlertNotificationService.cpp index 9b9b4e9e..14d58d51 100644 --- a/src/components/ble/AlertNotificationService.cpp +++ b/src/components/ble/AlertNotificationService.cpp @@ -9,7 +9,7 @@ using namespace Pinetime::Controllers; constexpr ble_uuid16_t AlertNotificationService::ansUuid; constexpr ble_uuid16_t AlertNotificationService::ansCharUuid; -constexpr ble_uuid16_t AlertNotificationService::ansEventUuid; +constexpr ble_uuid128_t AlertNotificationService::notificationEventUuid; int AlertNotificationCallback(uint16_t conn_handle, uint16_t attr_handle, struct ble_gatt_access_ctxt *ctxt, void *arg) { @@ -35,7 +35,7 @@ AlertNotificationService::AlertNotificationService ( System::SystemTask& systemT .flags = BLE_GATT_CHR_F_WRITE }, { - .uuid = (ble_uuid_t *) &ansEventUuid, + .uuid = (ble_uuid_t *) ¬ificationEventUuid, .access_cb = AlertNotificationCallback, .arg = this, .flags = BLE_GATT_CHR_F_NOTIFY, diff --git a/src/components/ble/AlertNotificationService.h b/src/components/ble/AlertNotificationService.h index 558cdf54..7c99d3de 100644 --- a/src/components/ble/AlertNotificationService.h +++ b/src/components/ble/AlertNotificationService.h @@ -7,6 +7,9 @@ #undef max #undef min +//c7e50000-78fc-48fe-8e23-433b3a1942d1 +#define NOTIFICATION_EVENT_SERVICE_UUID_BASE {0xd1, 0x42, 0x19, 0x3a, 0x3b, 0x43, 0x23, 0x8e, 0xfe, 0x48, 0xfc, 0x78, 0x00, 0x00, 0xe5, 0xc7} + namespace Pinetime { namespace System { @@ -45,7 +48,6 @@ namespace Pinetime { static constexpr uint16_t ansId {0x1811}; static constexpr uint16_t ansCharId {0x2a46}; - static constexpr uint16_t ansEventCharId = {0x2a47}; static constexpr ble_uuid16_t ansUuid { .u { .type = BLE_UUID_TYPE_16 }, @@ -57,9 +59,9 @@ namespace Pinetime { .value = ansCharId }; - static constexpr ble_uuid16_t ansEventUuid { - .u { .type = BLE_UUID_TYPE_16 }, - .value = ansEventCharId + static constexpr ble_uuid128_t notificationEventUuid { + .u { .type = BLE_UUID_TYPE_128 }, + .value = NOTIFICATION_EVENT_SERVICE_UUID_BASE }; struct ble_gatt_chr_def characteristicDefinition[3];