refactor: Move to zephyr/ include paths.

* Zephyr moved to properly namespaced headers, so major "rip the bandaid" commit to move us to those everywhere.
2022-10-08 00:46:08 -04:00
parent 35a1c5a3d4
commit 3a958c667f
116 changed files with 332 additions and 329 deletions
--- a/app/src/behaviors/behavior_backlight.c
+++ b/app/src/behaviors/behavior_backlight.c
@@ -6,9 +6,9 @@

 #define DT_DRV_COMPAT zmk_behavior_backlight

-#include <device.h>
+#include <zephyr/device.h>
 #include <drivers/behavior.h>
-#include <logging/log.h>
+#include <zephyr/logging/log.h>

 #include <dt-bindings/zmk/backlight.h>
 #include <zmk/backlight.h>
--- a/app/src/behaviors/behavior_bt.c
+++ b/app/src/behaviors/behavior_bt.c
@@ -6,14 +6,16 @@

 #define DT_DRV_COMPAT zmk_behavior_bluetooth

-#include <device.h>
+#include <zephyr/device.h>
+#include <zephyr/bluetooth/conn.h>
+
+#include <zephyr/logging/log.h>
+LOG_MODULE_DECLARE(zmk, CONFIG_ZMK_LOG_LEVEL);
+
 #include <drivers/behavior.h>
 #include <dt-bindings/zmk/bt.h>
-#include <bluetooth/conn.h>
-#include <logging/log.h>
 #include <zmk/behavior.h>

-LOG_MODULE_DECLARE(zmk, CONFIG_ZMK_LOG_LEVEL);

 #include <zmk/ble.h>

--- a/app/src/behaviors/behavior_caps_word.c
+++ b/app/src/behaviors/behavior_caps_word.c
@@ -6,9 +6,9 @@

 #define DT_DRV_COMPAT zmk_behavior_caps_word

-#include <device.h>
+#include <zephyr/device.h>
 #include <drivers/behavior.h>
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 #include <zmk/behavior.h>

 #include <zmk/endpoints.h>
--- a/app/src/behaviors/behavior_ext_power.c
+++ b/app/src/behaviors/behavior_ext_power.c
@@ -6,14 +6,14 @@

 #define DT_DRV_COMPAT zmk_behavior_ext_power

-#include <device.h>
-#include <devicetree.h>
+#include <zephyr/device.h>
+#include <zephyr/devicetree.h>
 #include <drivers/behavior.h>
 #include <drivers/ext_power.h>

 #include <dt-bindings/zmk/ext_power.h>

-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_DECLARE(zmk, CONFIG_ZMK_LOG_LEVEL);

 #if DT_HAS_COMPAT_STATUS_OKAY(DT_DRV_COMPAT)
--- a/app/src/behaviors/behavior_hold_tap.c
+++ b/app/src/behaviors/behavior_hold_tap.c
@@ -6,11 +6,11 @@

 #define DT_DRV_COMPAT zmk_behavior_hold_tap

-#include <device.h>
+#include <zephyr/device.h>
 #include <drivers/behavior.h>
 #include <zmk/keys.h>
 #include <dt-bindings/zmk/keys.h>
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 #include <zmk/behavior.h>
 #include <zmk/matrix.h>
 #include <zmk/endpoints.h>
--- a/app/src/behaviors/behavior_key_press.c
+++ b/app/src/behaviors/behavior_key_press.c
@@ -6,9 +6,9 @@

 #define DT_DRV_COMPAT zmk_behavior_key_press

-#include <device.h>
+#include <zephyr/device.h>
 #include <drivers/behavior.h>
-#include <logging/log.h>
+#include <zephyr/logging/log.h>

 #include <zmk/event_manager.h>
 #include <zmk/events/keycode_state_changed.h>
--- a/app/src/behaviors/behavior_key_repeat.c
+++ b/app/src/behaviors/behavior_key_repeat.c
@@ -6,9 +6,9 @@

 #define DT_DRV_COMPAT zmk_behavior_key_repeat

-#include <device.h>
+#include <zephyr/device.h>
 #include <drivers/behavior.h>
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 #include <zmk/behavior.h>
 #include <zmk/hid.h>

--- a/app/src/behaviors/behavior_key_toggle.c
+++ b/app/src/behaviors/behavior_key_toggle.c
@@ -6,9 +6,9 @@

 #define DT_DRV_COMPAT zmk_behavior_key_toggle

-#include <device.h>
+#include <zephyr/device.h>
 #include <drivers/behavior.h>
-#include <logging/log.h>
+#include <zephyr/logging/log.h>

 #include <zmk/hid.h>
 #include <zmk/event_manager.h>
--- a/app/src/behaviors/behavior_macro.c
+++ b/app/src/behaviors/behavior_macro.c
@@ -6,9 +6,9 @@

 #define DT_DRV_COMPAT zmk_behavior_macro

-#include <device.h>
+#include <zephyr/device.h>
 #include <drivers/behavior.h>
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 #include <zmk/behavior.h>
 #include <zmk/behavior_queue.h>
 #include <zmk/keymap.h>
--- a/app/src/behaviors/behavior_mod_morph.c
+++ b/app/src/behaviors/behavior_mod_morph.c
@@ -6,9 +6,9 @@

 #define DT_DRV_COMPAT zmk_behavior_mod_morph

-#include <device.h>
+#include <zephyr/device.h>
 #include <drivers/behavior.h>
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 #include <zmk/behavior.h>

 #include <zmk/matrix.h>
--- a/app/src/behaviors/behavior_momentary_layer.c
+++ b/app/src/behaviors/behavior_momentary_layer.c
@@ -6,9 +6,9 @@

 #define DT_DRV_COMPAT zmk_behavior_momentary_layer

-#include <device.h>
+#include <zephyr/device.h>
 #include <drivers/behavior.h>
-#include <logging/log.h>
+#include <zephyr/logging/log.h>

 #include <zmk/keymap.h>
 #include <zmk/behavior.h>
--- a/app/src/behaviors/behavior_none.c
+++ b/app/src/behaviors/behavior_none.c
@@ -6,9 +6,9 @@

 #define DT_DRV_COMPAT zmk_behavior_none

-#include <device.h>
+#include <zephyr/device.h>
 #include <drivers/behavior.h>
-#include <logging/log.h>
+#include <zephyr/logging/log.h>

 #include <zmk/behavior.h>

--- a/app/src/behaviors/behavior_outputs.c
+++ b/app/src/behaviors/behavior_outputs.c
@@ -6,8 +6,8 @@

 #define DT_DRV_COMPAT zmk_behavior_outputs

-#include <device.h>
-#include <devicetree.h>
+#include <zephyr/device.h>
+#include <zephyr/devicetree.h>
 #include <drivers/behavior.h>

 #include <dt-bindings/zmk/outputs.h>
@@ -15,7 +15,7 @@
 #include <zmk/behavior.h>
 #include <zmk/endpoints.h>

-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_DECLARE(zmk, CONFIG_ZMK_LOG_LEVEL);

 #if DT_HAS_COMPAT_STATUS_OKAY(DT_DRV_COMPAT)
--- a/app/src/behaviors/behavior_reset.c
+++ b/app/src/behaviors/behavior_reset.c
@@ -6,10 +6,11 @@

 #define DT_DRV_COMPAT zmk_behavior_reset

-#include <device.h>
-#include <sys/reboot.h>
+#include <zephyr/device.h>
+#include <zephyr/sys/reboot.h>
+#include <zephyr/logging/log.h>
+
 #include <drivers/behavior.h>
-#include <logging/log.h>

 #include <zmk/behavior.h>

--- a/app/src/behaviors/behavior_rgb_underglow.c
+++ b/app/src/behaviors/behavior_rgb_underglow.c
@@ -6,9 +6,9 @@

 #define DT_DRV_COMPAT zmk_behavior_rgb_underglow

-#include <device.h>
+#include <zephyr/device.h>
 #include <drivers/behavior.h>
-#include <logging/log.h>
+#include <zephyr/logging/log.h>

 #include <dt-bindings/zmk/rgb.h>
 #include <zmk/rgb_underglow.h>
--- a/app/src/behaviors/behavior_sensor_rotate_key_press.c
+++ b/app/src/behaviors/behavior_sensor_rotate_key_press.c
@@ -6,11 +6,11 @@

 #define DT_DRV_COMPAT zmk_behavior_sensor_rotate_key_press

-#include <device.h>
-#include <drivers/behavior.h>
-#include <logging/log.h>
+#include <zephyr/device.h>
+#include <zephyr/drivers/sensor.h>
+#include <zephyr/logging/log.h>

-#include <drivers/sensor.h>
+#include <drivers/behavior.h>
 #include <zmk/event_manager.h>
 #include <zmk/events/keycode_state_changed.h>

--- a/app/src/behaviors/behavior_sticky_key.c
+++ b/app/src/behaviors/behavior_sticky_key.c
@@ -6,9 +6,9 @@

 #define DT_DRV_COMPAT zmk_behavior_sticky_key

-#include <device.h>
+#include <zephyr/device.h>
 #include <drivers/behavior.h>
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 #include <zmk/behavior.h>

 #include <zmk/matrix.h>
--- a/app/src/behaviors/behavior_tap_dance.c
+++ b/app/src/behaviors/behavior_tap_dance.c
@@ -6,9 +6,9 @@

 #define DT_DRV_COMPAT zmk_behavior_tap_dance

-#include <device.h>
+#include <zephyr/device.h>
 #include <drivers/behavior.h>
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 #include <zmk/behavior.h>
 #include <zmk/keymap.h>
 #include <zmk/matrix.h>
--- a/app/src/behaviors/behavior_to_layer.c
+++ b/app/src/behaviors/behavior_to_layer.c
@@ -6,9 +6,9 @@

 #define DT_DRV_COMPAT zmk_behavior_to_layer

-#include <device.h>
+#include <zephyr/device.h>
 #include <drivers/behavior.h>
-#include <logging/log.h>
+#include <zephyr/logging/log.h>

 #include <zmk/keymap.h>
 #include <zmk/behavior.h>
--- a/app/src/behaviors/behavior_toggle_layer.c
+++ b/app/src/behaviors/behavior_toggle_layer.c
@@ -6,9 +6,9 @@

 #define DT_DRV_COMPAT zmk_behavior_toggle_layer

-#include <device.h>
+#include <zephyr/device.h>
 #include <drivers/behavior.h>
-#include <logging/log.h>
+#include <zephyr/logging/log.h>

 #include <zmk/keymap.h>
 #include <zmk/behavior.h>
--- a/app/src/behaviors/behavior_transparent.c
+++ b/app/src/behaviors/behavior_transparent.c
@@ -6,9 +6,9 @@

 #define DT_DRV_COMPAT zmk_behavior_transparent

-#include <device.h>
+#include <zephyr/device.h>
 #include <drivers/behavior.h>
-#include <logging/log.h>
+#include <zephyr/logging/log.h>

 #include <zmk/behavior.h>