From 88f13ebab6a3c1c3fbb343c96740f11e7c19392c Mon Sep 17 00:00:00 2001 From: Joakim Andersson Date: Thu, 4 Jul 2019 17:09:24 +0200 Subject: [PATCH] Bluetooth: services: Move Current Time service sample Move the Current Time service into the sample that demonstrates it. This avoids long build paths Signed-off-by: Joakim Andersson --- samples/bluetooth/peripheral/CMakeLists.txt | 4 +--- samples/bluetooth/{gatt => peripheral/src}/cts.c | 0 samples/bluetooth/{gatt => peripheral/src}/cts.h | 0 samples/bluetooth/peripheral/src/main.c | 2 +- 4 files changed, 2 insertions(+), 4 deletions(-) rename samples/bluetooth/{gatt => peripheral/src}/cts.c (100%) rename samples/bluetooth/{gatt => peripheral/src}/cts.h (100%) diff --git a/samples/bluetooth/peripheral/CMakeLists.txt b/samples/bluetooth/peripheral/CMakeLists.txt index 8527169a88b..372514f0c1c 100644 --- a/samples/bluetooth/peripheral/CMakeLists.txt +++ b/samples/bluetooth/peripheral/CMakeLists.txt @@ -6,7 +6,5 @@ project(peripheral) target_sources(app PRIVATE src/main.c - ../gatt/cts.c + src/cts.c ) - -zephyr_library_include_directories($ENV{ZEPHYR_BASE}/samples/bluetooth) diff --git a/samples/bluetooth/gatt/cts.c b/samples/bluetooth/peripheral/src/cts.c similarity index 100% rename from samples/bluetooth/gatt/cts.c rename to samples/bluetooth/peripheral/src/cts.c diff --git a/samples/bluetooth/gatt/cts.h b/samples/bluetooth/peripheral/src/cts.h similarity index 100% rename from samples/bluetooth/gatt/cts.h rename to samples/bluetooth/peripheral/src/cts.h diff --git a/samples/bluetooth/peripheral/src/main.c b/samples/bluetooth/peripheral/src/main.c index 95dce1e0843..1b23d1998b9 100644 --- a/samples/bluetooth/peripheral/src/main.c +++ b/samples/bluetooth/peripheral/src/main.c @@ -24,7 +24,7 @@ #include #include -#include +#include "cts.h" /* Custom Service Variables */ static struct bt_uuid_128 vnd_uuid = BT_UUID_INIT_128(