refactor(split): move event listener out of Bluetooth directory

xudongzheng · Dec 23, 2023 · dd19b75 · dd19b75
1 parent a593c72
commit dd19b75
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 6 deletions.
diff --git a/app/include/zmk/split/bluetooth/service.h → app/include/zmk/split/service.h b/app/include/zmk/split/bluetooth/service.h → app/include/zmk/split/service.h
diff --git a/app/src/split/CMakeLists.txt b/app/src/split/CMakeLists.txt
@@ -1,6 +1,10 @@
 # Copyright (c) 2022 The ZMK Contributors
 # SPDX-License-Identifier: MIT
 
+if (CONFIG_ZMK_SPLIT_BLE AND (NOT CONFIG_ZMK_SPLIT_ROLE_CENTRAL))
+  target_sources(app PRIVATE listener.c)
+endif()
+
 if (CONFIG_ZMK_SPLIT_BLE)
     add_subdirectory(bluetooth)
-endif()
+endif()
diff --git a/app/src/split/bluetooth/CMakeLists.txt b/app/src/split/bluetooth/CMakeLists.txt
@@ -2,10 +2,9 @@
 # SPDX-License-Identifier: MIT
 
 if (NOT CONFIG_ZMK_SPLIT_ROLE_CENTRAL)
-  target_sources(app PRIVATE split_listener.c)
   target_sources(app PRIVATE service.c)
   target_sources(app PRIVATE peripheral.c)
 endif()
 if (CONFIG_ZMK_SPLIT_ROLE_CENTRAL)
   target_sources(app PRIVATE central.c)
-endif()
+endif()
diff --git a/app/src/split/bluetooth/central.c b/app/src/split/bluetooth/central.c
@@ -23,7 +23,7 @@ LOG_MODULE_DECLARE(zmk, CONFIG_ZMK_LOG_LEVEL);
 #include <zmk/behavior.h>
 #include <zmk/sensors.h>
 #include <zmk/split/bluetooth/uuid.h>
-#include <zmk/split/bluetooth/service.h>
+#include <zmk/split/service.h>
 #include <zmk/event_manager.h>
 #include <zmk/events/position_state_changed.h>
 #include <zmk/events/sensor_event.h>

diff --git a/app/src/split/bluetooth/service.c b/app/src/split/bluetooth/service.c
@@ -20,7 +20,7 @@ LOG_MODULE_DECLARE(zmk, CONFIG_ZMK_LOG_LEVEL);
 #include <zmk/behavior.h>
 #include <zmk/matrix.h>
 #include <zmk/split/bluetooth/uuid.h>
-#include <zmk/split/bluetooth/service.h>
+#include <zmk/split/service.h>
 
 #if IS_ENABLED(CONFIG_ZMK_SPLIT_PERIPHERAL_HID_INDICATORS)
 #include <zmk/events/hid_indicators_changed.h>

diff --git a/app/src/split/bluetooth/split_listener.c → app/src/split/listener.c b/app/src/split/bluetooth/split_listener.c → app/src/split/listener.c
@@ -7,7 +7,7 @@
 #include <zephyr/device.h>
 #include <zephyr/logging/log.h>
 
-#include <zmk/split/bluetooth/service.h>
+#include <zmk/split/service.h>
 
 LOG_MODULE_DECLARE(zmk, CONFIG_ZMK_LOG_LEVEL);