Skip to content

samples: bluetooth: fast_pair: locator_tag: Use SMP UUIDs from header #17457

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Oct 9, 2024
Merged

samples: bluetooth: fast_pair: locator_tag: Use SMP UUIDs from header #17457

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5dfd21a
manifest: Update sdk-zephyr revision
mkapala-nordic Sep 24, 2024
d3d2559
samples: bluetooth: fast_pair: locator_tag: Use SMP UUIDs from header
mkapala-nordic Sep 24, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 4 additions & 12 deletions samples/bluetooth/fast_pair/locator_tag/src/dfu.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,8 @@
#include <bluetooth/services/fast_pair/fast_pair.h>
#include <bluetooth/services/fast_pair/fmdn.h>

#include <zephyr/mgmt/mcumgr/transport/smp_bt.h>

#include "app_dfu.h"
#include "app_factory_reset.h"
#include "app_fp_adv.h"
Expand All @@ -25,17 +27,7 @@ LOG_MODULE_DECLARE(fp_fmdn, LOG_LEVEL_INF);
/* DFU mode timeout in minutes. */
#define DFU_MODE_TIMEOUT_MIN (5)

/* UUID of the SMP service used for the DFU. */
#define BT_UUID_SMP_SVC_VAL \
BT_UUID_128_ENCODE(0x8d53dc1d, 0x1db7, 0x4cd3, 0x868b, 0x8a527460aa84)

/* UUID of the SMP characteristic used for the DFU. */
#define BT_UUID_SMP_CHAR_VAL \
BT_UUID_128_ENCODE(0xda2e7828, 0xfbce, 0x4e01, 0xae9e, 0x261174997c48)

#define BT_UUID_SMP_CHAR BT_UUID_DECLARE_128(BT_UUID_SMP_CHAR_VAL)

static const struct bt_data data = BT_DATA_BYTES(BT_DATA_UUID128_ALL, BT_UUID_SMP_SVC_VAL);
static const struct bt_data data = BT_DATA_BYTES(BT_DATA_UUID128_ALL, SMP_BT_SVC_UUID_VAL);
static bool dfu_mode;

APP_FP_ADV_TRIGGER_REGISTER(fp_adv_trigger_dfu, "dfu");
Expand Down Expand Up @@ -83,7 +75,7 @@ APP_FACTORY_RESET_CALLBACKS_REGISTER(factory_reset_cbs, dfu_factory_reset_prepar

bool app_dfu_bt_gatt_operation_allow(const struct bt_uuid *uuid)
{
if (bt_uuid_cmp(uuid, BT_UUID_SMP_CHAR) != 0) {
if (bt_uuid_cmp(uuid, SMP_BT_CHR_UUID) != 0) {
return true;
}

Expand Down
2 changes: 1 addition & 1 deletion west.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ manifest:
# https://developer.nordicsemi.com/nRF_Connect_SDK/doc/latest/zephyr/guides/modules.html
- name: zephyr
repo-path: sdk-zephyr
revision: b83478a230e79d24d69592274f2a93c9c83958a9
revision: d3d3f66845737630687c9018cdb687319b74ec17
import:
# In addition to the zephyr repository itself, NCS also
# imports the contents of zephyr/west.yml at the above
Expand Down
Loading