kb01/zmk
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

refactor: Move to zephyr/ include paths.

Browse source 
* Zephyr moved to properly namespaced headers, so major "rip
  the bandaid" commit to move us to those everywhere.
This commit is contained in:
Peter Johanson 2022-10-08 00:46:08 -04:00 • committed by Pete Johanson
parent 35a1c5a3d4
commit 3a958c667f
116 changed files with 332 additions and 329 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
app/boards/arm/mikoto/pinmux.c
View file

@ -4,12 +4,12 @@
* SPDX-License-Identifier: MIT
*/
#include <kernel.h>
#include <device.h>
#include <init.h>
#include <drivers/gpio.h>
#include <sys/sys_io.h>
#include <devicetree.h>
#include <zephyr/kernel.h>
#include <zephyr/device.h>
#include <zephyr/init.h>
#include <zephyr/drivers/gpio.h>
#include <zephyr/sys/sys_io.h>
#include <zephyr/devicetree.h>
static int pinmux_mikoto_init(const struct device *port) {
ARG_UNUSED(port);

12
app/boards/arm/nrfmicro/pinmux.c
View file

@ -4,12 +4,12 @@
* SPDX-License-Identifier: MIT
*/
#include <kernel.h>
#include <device.h>
#include <init.h>
#include <drivers/gpio.h>
#include <sys/sys_io.h>
#include <devicetree.h>
#include <zephyr/kernel.h>
#include <zephyr/device.h>
#include <zephyr/init.h>
#include <zephyr/drivers/gpio.h>
#include <zephyr/sys/sys_io.h>
#include <zephyr/devicetree.h>
static int pinmux_nrfmicro_init(const struct device *port) {
ARG_UNUSED(port);

12
app/boards/arm/puchi_ble/pinmux.c
View file

@ -4,12 +4,12 @@
* SPDX-License-Identifier: MIT
*/
#include <kernel.h>
#include <device.h>
#include <init.h>
#include <drivers/gpio.h>
#include <sys/sys_io.h>
#include <devicetree.h>
#include <zephyr/kernel.h>
#include <zephyr/device.h>
#include <zephyr/init.h>
#include <zephyr/drivers/gpio.h>
#include <zephyr/sys/sys_io.h>
#include <zephyr/devicetree.h>
static int pinmux_puchi_ble_init(const struct device *port) {
ARG_UNUSED(port);

14
app/drivers/display/il0323.c
View file

@ -7,16 +7,16 @@
#define DT_DRV_COMPAT gooddisplay_il0323
#include <string.h>
#include <device.h>
#include <init.h>
#include <drivers/display.h>
#include <drivers/gpio.h>
#include <drivers/spi.h>
#include <sys/byteorder.h>
#include <zephyr/device.h>
#include <zephyr/init.h>
#include <zephyr/drivers/display.h>
#include <zephyr/drivers/gpio.h>
#include <zephyr/drivers/spi.h>
#include <zephyr/sys/byteorder.h>
#include "il0323_regs.h"
#include <logging/log.h>
#include <zephyr/logging/log.h>
LOG_MODULE_REGISTER(il0323, CONFIG_DISPLAY_LOG_LEVEL);
/**

14
app/drivers/gpio/gpio_595.c
View file

@ -12,15 +12,15 @@
#include <errno.h>
#include <kernel.h>
#include <device.h>
#include <init.h>
#include <sys/byteorder.h>
#include <drivers/gpio.h>
#include <drivers/spi.h>
#include <zephyr/kernel.h>
#include <zephyr/device.h>
#include <zephyr/init.h>
#include <zephyr/sys/byteorder.h>
#include <zephyr/drivers/gpio.h>
#include <zephyr/drivers/spi.h>
#define LOG_LEVEL CONFIG_GPIO_LOG_LEVEL
#include <logging/log.h>
#include <zephyr/logging/log.h>
LOG_MODULE_REGISTER(gpio_595);
/** Configuration data */

8
app/drivers/gpio/gpio_mcp23017.c
View file

@ -12,9 +12,9 @@
#include <errno.h>
#include <kernel.h>
#include <device.h>
#include <init.h>
#include <zephyr/kernel.h>
#include <zephyr/device.h>
#include <zephyr/init.h>
#include <sys/byteorder.h>
#include <drivers/gpio.h>
#include <drivers/i2c.h>
@ -22,7 +22,7 @@
#include "gpio_mcp23017.h"
#define LOG_LEVEL CONFIG_GPIO_LOG_LEVEL
#include <logging/log.h>
#include <zephyr/logging/log.h>
LOG_MODULE_REGISTER(gpio_mcp23017);
/**

2
app/drivers/gpio/gpio_mcp23017.h
View file

@ -11,7 +11,7 @@
#ifndef ZEPHYR_DRIVERS_GPIO_GPIO_MCP23017_H_
#define ZEPHYR_DRIVERS_GPIO_GPIO_MCP23017_H_
#include <kernel.h>
#include <zephyr/kernel.h>
#include <drivers/gpio.h>
#include <drivers/i2c.h>

2
app/drivers/kscan/debounce.h
View file

@ -8,7 +8,7 @@
#include <stdbool.h>
#include <stdint.h>
#include <sys/util.h>
#include <zephyr/sys/util.h>
#define DEBOUNCE_COUNTER_BITS 14
#define DEBOUNCE_COUNTER_MAX BIT_MASK(DEBOUNCE_COUNTER_BITS)

4
app/drivers/kscan/kscan_composite.c
View file

@ -6,9 +6,9 @@
#define DT_DRV_COMPAT zmk_kscan_composite
#include <device.h>
#include <zephyr/device.h>
#include <drivers/kscan.h>
#include <logging/log.h>
#include <zephyr/logging/log.h>
LOG_MODULE_DECLARE(zmk, CONFIG_ZMK_LOG_LEVEL);
#define MATRIX_NODE_ID DT_DRV_INST(0)

8
app/drivers/kscan/kscan_gpio_demux.c
View file

@ -6,10 +6,10 @@
#define DT_DRV_COMPAT zmk_kscan_gpio_demux
#include <device.h>
#include <drivers/kscan.h>
#include <drivers/gpio.h>
#include <logging/log.h>
#include <zephyr/device.h>
#include <zephyr/drivers/kscan.h>
#include <zephyr/drivers/gpio.h>
#include <zephyr/logging/log.h>
LOG_MODULE_DECLARE(zmk, CONFIG_ZMK_LOG_LEVEL);

14
app/drivers/kscan/kscan_gpio_direct.c
View file

@ -6,13 +6,13 @@
#include "debounce.h"
#include <device.h>
#include <devicetree.h>
#include <drivers/gpio.h>
#include <drivers/kscan.h>
#include <kernel.h>
#include <logging/log.h>
#include <sys/util.h>
#include <zephyr/device.h>
#include <zephyr/devicetree.h>
#include <zephyr/drivers/gpio.h>
#include <zephyr/drivers/kscan.h>
#include <zephyr/kernel.h>
#include <zephyr/logging/log.h>
#include <zephyr/sys/util.h>
LOG_MODULE_DECLARE(zmk, CONFIG_ZMK_LOG_LEVEL);

16
app/drivers/kscan/kscan_gpio_matrix.c
View file

@ -6,14 +6,14 @@
#include "debounce.h"
#include <device.h>
#include <devicetree.h>
#include <drivers/gpio.h>
#include <drivers/kscan.h>
#include <kernel.h>
#include <logging/log.h>
#include <sys/__assert.h>
#include <sys/util.h>
#include <zephyr/device.h>
#include <zephyr/devicetree.h>
#include <zephyr/drivers/gpio.h>
#include <zephyr/drivers/kscan.h>
#include <zephyr/kernel.h>
#include <zephyr/logging/log.h>
#include <zephyr/sys/__assert.h>
#include <zephyr/sys/util.h>
LOG_MODULE_DECLARE(zmk, CONFIG_ZMK_LOG_LEVEL);

6
app/drivers/kscan/kscan_mock.c
View file

@ -7,9 +7,9 @@
#define DT_DRV_COMPAT zmk_kscan_mock
#include <stdlib.h>
#include <device.h>
#include <drivers/kscan.h>
#include <logging/log.h>
#include <zephyr/device.h>
#include <zephyr/drivers/kscan.h>
#include <zephyr/logging/log.h>
LOG_MODULE_DECLARE(zmk, CONFIG_ZMK_LOG_LEVEL);

2
app/drivers/sensor/battery/battery_common.c
View file

@ -5,7 +5,7 @@
*/
#include <errno.h>
#include <drivers/sensor.h>
#include <zephyr/drivers/sensor.h>
#include "battery_common.h"

2
app/drivers/sensor/battery/battery_common.h
View file

@ -6,7 +6,7 @@
#pragma once
#include <drivers/sensor.h>
#include <zephyr/drivers/sensor.h>
#include <stdint.h>
struct battery_value {

10
app/drivers/sensor/battery/battery_nrf_vddh.c
View file

@ -9,11 +9,11 @@
#define DT_DRV_COMPAT zmk_battery_nrf_vddh
#include <device.h>
#include <devicetree.h>
#include <drivers/adc.h>
#include <drivers/sensor.h>
#include <logging/log.h>
#include <zephyr/device.h>
#include <zephyr/devicetree.h>
#include <zephyr/drivers/adc.h>
#include <zephyr/drivers/sensor.h>
#include <zephyr/logging/log.h>
#include "battery_common.h"

6
app/drivers/sensor/battery/battery_voltage_divider.c
View file

@ -6,12 +6,12 @@
#define DT_DRV_COMPAT zmk_battery_voltage_divider
#include <device.h>
#include <devicetree.h>
#include <zephyr/device.h>
#include <zephyr/devicetree.h>
#include <drivers/gpio.h>
#include <drivers/adc.h>
#include <drivers/sensor.h>
#include <logging/log.h>
#include <zephyr/logging/log.h>
#include "battery_common.h"

14
app/drivers/sensor/ec11/ec11.c
View file

@ -6,13 +6,13 @@
#define DT_DRV_COMPAT alps_ec11
#include <device.h>
#include <drivers/gpio.h>
#include <sys/util.h>
#include <kernel.h>
#include <drivers/sensor.h>
#include <sys/__assert.h>
#include <logging/log.h>
#include <zephyr/device.h>
#include <zephyr/drivers/gpio.h>
#include <zephyr/sys/util.h>
#include <zephyr/kernel.h>
#include <zephyr/drivers/sensor.h>
#include <zephyr/sys/__assert.h>
#include <zephyr/logging/log.h>
#include "ec11.h"

6
app/drivers/sensor/ec11/ec11.h
View file

@ -6,9 +6,9 @@
#pragma once
#include <device.h>
#include <drivers/gpio.h>
#include <sys/util.h>
#include <zephyr/device.h>
#include <zephyr/drivers/gpio.h>
#include <zephyr/sys/util.h>
struct ec11_config {
const char *a_label;

12
app/drivers/sensor/ec11/ec11_trigger.c
View file

@ -6,17 +6,17 @@
#define DT_DRV_COMPAT alps_ec11
#include <device.h>
#include <drivers/gpio.h>
#include <sys/util.h>
#include <kernel.h>
#include <drivers/sensor.h>
#include <zephyr/device.h>
#include <zephyr/drivers/gpio.h>
#include <zephyr/sys/util.h>
#include <zephyr/kernel.h>
#include <zephyr/drivers/sensor.h>
#include "ec11.h"
extern struct ec11_data ec11_driver;
#include <logging/log.h>
#include <zephyr/logging/log.h>
LOG_MODULE_DECLARE(EC11, CONFIG_SENSOR_LOG_LEVEL);
static inline void setup_int(const struct device *dev, bool enable) {

4
app/include/drivers/behavior.h
View file

@ -8,9 +8,9 @@
#include <zephyr/types.h>
#include <stddef.h>
#include <sys/util.h>
#include <zephyr/sys/util.h>
#include <string.h>
#include <device.h>
#include <zephyr/device.h>
#include <zmk/keys.h>
#include <zmk/behavior.h>

2
app/include/drivers/ext_power.h
View file

@ -8,7 +8,7 @@
#include <zephyr/types.h>
#include <stddef.h>
#include <device.h>
#include <zephyr/device.h>
#ifdef __cplusplus
extern "C" {

2
app/include/linker/zmk-events.ld
View file

@ -4,7 +4,7 @@
* SPDX-License-Identifier: MIT
*/
#include <linker/linker-defs.h>
#include <zephyr/linker/linker-defs.h>
__event_type_start = .; \
KEEP(*(".event_type")); \

2
app/include/zmk/behavior_queue.h
View file

@ -6,7 +6,7 @@
#pragma once
#include <kernel.h>
#include <zephyr/kernel.h>
#include <stdint.h>
#include <zmk/behavior.h>

2
app/include/zmk/ble/profile.h
View file

@ -6,7 +6,7 @@
#pragma once
#include <bluetooth/addr.h>
#include <zephyr/bluetooth/addr.h>
#define ZMK_BLE_PROFILE_NAME_MAX 15

2
app/include/zmk/display/widgets/battery_status.h
View file

@ -7,7 +7,7 @@
#pragma once
#include <lvgl.h>
#include <kernel.h>
#include <zephyr/kernel.h>
struct zmk_widget_battery_status {
sys_snode_t node;

2
app/include/zmk/display/widgets/layer_status.h
View file

@ -7,7 +7,7 @@
#pragma once
#include <lvgl.h>
#include <kernel.h>
#include <zephyr/kernel.h>
struct zmk_widget_layer_status {
sys_snode_t node;

2
app/include/zmk/display/widgets/output_status.h
View file

@ -7,7 +7,7 @@
#pragma once
#include <lvgl.h>
#include <kernel.h>
#include <zephyr/kernel.h>
struct zmk_widget_output_status {
sys_snode_t node;

2
app/include/zmk/display/widgets/peripheral_status.h
View file

@ -7,7 +7,7 @@
#pragma once
#include <lvgl.h>
#include <kernel.h>
#include <zephyr/kernel.h>
struct zmk_widget_peripheral_status {
sys_snode_t node;

2
app/include/zmk/display/widgets/wpm_status.h
View file

@ -7,7 +7,7 @@
#pragma once
#include <lvgl.h>
#include <kernel.h>
#include <zephyr/kernel.h>
struct zmk_widget_wpm_status {
sys_snode_t node;

2
app/include/zmk/event_manager.h
View file

@ -7,7 +7,7 @@
#pragma once
#include <stddef.h>
#include <kernel.h>
#include <zephyr/kernel.h>
#include <zephyr/types.h>
struct zmk_event_type {

2
app/include/zmk/events/activity_state_changed.h
View file

@ -6,7 +6,7 @@
#pragma once
#include <zephyr.h>
#include <zephyr/kernel.h>
#include <zmk/event_manager.h>
#include <zmk/activity.h>

2
app/include/zmk/events/battery_state_changed.h
View file

@ -6,7 +6,7 @@
#pragma once
#include <zephyr.h>
#include <zephyr/kernel.h>
#include <zmk/event_manager.h>
struct zmk_battery_state_changed {

4
app/include/zmk/events/ble_active_profile_changed.h
View file

@ -6,9 +6,9 @@
#pragma once
#include <zephyr.h>
#include <zephyr/kernel.h>
#include <zmk/event_manager.h>
#include <device.h>
#include <zephyr/device.h>
#include <zmk/ble/profile.h>

2
app/include/zmk/events/endpoint_selection_changed.h
View file

@ -6,7 +6,7 @@
#pragma once
#include <zephyr.h>
#include <zephyr/kernel.h>
#include <zmk/endpoints_types.h>
#include <zmk/event_manager.h>

2
app/include/zmk/events/keycode_state_changed.h
View file

@ -6,7 +6,7 @@
#pragma once
#include <zephyr.h>
#include <zephyr/kernel.h>
#include <zmk/event_manager.h>
#include <zmk/keys.h>

2
app/include/zmk/events/layer_state_changed.h
View file

@ -6,7 +6,7 @@
#pragma once
#include <zephyr.h>
#include <zephyr/kernel.h>
#include <zmk/event_manager.h>
struct zmk_layer_state_changed {

2
app/include/zmk/events/modifiers_state_changed.h
View file

@ -6,7 +6,7 @@
#pragma once
#include <zephyr.h>
#include <zephyr/kernel.h>
#include <zmk/keys.h>
#include <zmk/event_manager.h>

2
app/include/zmk/events/position_state_changed.h
View file

@ -6,7 +6,7 @@
#pragma once
#include <zephyr.h>
#include <zephyr/kernel.h>
#include <zmk/event_manager.h>
#define ZMK_POSITION_STATE_CHANGE_SOURCE_LOCAL UINT8_MAX

4
app/include/zmk/events/sensor_event.h
View file

@ -6,9 +6,9 @@
#pragma once
#include <zephyr.h>
#include <zephyr/kernel.h>
#include <zmk/event_manager.h>
#include <device.h>
#include <zephyr/device.h>
struct zmk_sensor_event {
uint8_t sensor_number;
const struct device *sensor;

2
app/include/zmk/events/split_peripheral_status_changed.h
View file

@ -6,7 +6,7 @@
#pragma once
#include <zephyr.h>
#include <zephyr/kernel.h>
#include <zmk/event_manager.h>
struct zmk_split_peripheral_status_changed {

4
app/include/zmk/events/usb_conn_state_changed.h
View file

@ -6,8 +6,8 @@
#pragma once
#include <zephyr.h>
#include <usb/usb_device.h>
#include <zephyr/kernel.h>
#include <zephyr/usb/usb_device.h>
#include <zmk/event_manager.h>
#include <zmk/usb.h>

2
app/include/zmk/events/wpm_state_changed.h
View file

@ -6,7 +6,7 @@
#pragma once
#include <zephyr.h>
#include <zephyr/kernel.h>
#include <zmk/event_manager.h>
#include <zmk/wpm.h>

4
app/include/zmk/hid.h
View file

@ -6,8 +6,8 @@
#pragma once
#include <usb/usb_device.h>
#include <usb/class/usb_hid.h>
#include <zephyr/usb/usb_device.h>
#include <zephyr/usb/class/usb_hid.h>
#include <zmk/keys.h>
#include <dt-bindings/zmk/hid_usage.h>

2
app/include/zmk/keys.h
View file

@ -6,7 +6,7 @@
#pragma once
#include <zephyr.h>
#include <zephyr/kernel.h>
#include <dt-bindings/zmk/keys.h>
typedef uint32_t zmk_key_t;

2
app/include/zmk/matrix.h
View file

@ -6,7 +6,7 @@
#pragma once
#include <devicetree.h>
#include <zephyr/devicetree.h>
#define ZMK_MATRIX_NODE_ID DT_CHOSEN(zmk_kscan)

2
app/include/zmk/split/bluetooth/central.h
View file

@ -1,7 +1,7 @@
#pragma once
#include <bluetooth/addr.h>
#include <zephyr/bluetooth/addr.h>
#include <zmk/behavior.h>
int zmk_split_bt_invoke_behavior(uint8_t source, struct zmk_behavior_binding *binding,

2
app/include/zmk/split/bluetooth/uuid.h
View file

@ -6,7 +6,7 @@
#pragma once
#include <bluetooth/uuid.h>
#include <zephyr/bluetooth/uuid.h>
#ifndef BT_UUID_NUM_OF_DIGITALS
#define BT_UUID_NUM_OF_DIGITALS BT_UUID_DECLARE_16(0x2909)

4
app/include/zmk/usb.h
View file

@ -6,8 +6,8 @@
#pragma once
#include <usb/usb_device.h>
#include <usb/class/usb_hid.h>
#include <zephyr/usb/usb_device.h>
#include <zephyr/usb/class/usb_hid.h>
#include <zmk/keys.h>
#include <zmk/hid.h>

14
app/src/activity.c
View file

@ -4,12 +4,12 @@
* SPDX-License-Identifier: MIT
*/
#include <device.h>
#include <init.h>
#include <kernel.h>
#include <pm/pm.h>
#include <zephyr/device.h>
#include <zephyr/init.h>
#include <zephyr/kernel.h>
#include <zephyr/pm/pm.h>
#include <logging/log.h>
#include <zephyr/logging/log.h>
LOG_MODULE_DECLARE(zmk, CONFIG_ZMK_LOG_LEVEL);
@ -74,8 +74,8 @@ void activity_work_handler(struct k_work *work) {
} else
#endif /* IS_ENABLED(CONFIG_ZMK_SLEEP) */
if (inactive_time > MAX_IDLE_MS) {
set_state(ZMK_ACTIVITY_IDLE);
}
set_state(ZMK_ACTIVITY_IDLE);
}
}
K_WORK_DEFINE(activity_work, activity_work_handler);

14
app/src/backlight.c
View file

@ -4,14 +4,14 @@
* SPDX-License-Identifier: MIT
*/
#include <device.h>
#include <devicetree.h>
#include <init.h>
#include <kernel.h>
#include <zephyr/device.h>
#include <zephyr/devicetree.h>
#include <zephyr/drivers/led.h>
#include <zephyr/init.h>
#include <zephyr/kernel.h>
#include <drivers/led.h>
#include <logging/log.h>
#include <settings/settings.h>
#include <zephyr/logging/log.h>
#include <zephyr/settings/settings.h>
#include <zmk/activity.h>
#include <zmk/backlight.h>

14
app/src/battery.c
View file

@ -4,14 +4,14 @@
* SPDX-License-Identifier: MIT
*/
#include <device.h>
#include <devicetree.h>
#include <init.h>
#include <kernel.h>
#include <drivers/sensor.h>
#include <bluetooth/services/bas.h>
#include <zephyr/device.h>
#include <zephyr/devicetree.h>
#include <zephyr/init.h>
#include <zephyr/kernel.h>
#include <zephyr/drivers/sensor.h>
#include <zephyr/bluetooth/services/bas.h>
#include <logging/log.h>
#include <zephyr/logging/log.h>
LOG_MODULE_DECLARE(zmk, CONFIG_ZMK_LOG_LEVEL);

4
app/src/behavior_queue.c
View file

@ -6,8 +6,8 @@
#include <zmk/behavior_queue.h>
#include <kernel.h>
#include <logging/log.h>
#include <zephyr/kernel.h>
#include <zephyr/logging/log.h>
#include <drivers/behavior.h>
LOG_MODULE_DECLARE(zmk, CONFIG_ZMK_LOG_LEVEL);

4
app/src/behaviors/behavior_backlight.c
View file

@ -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>

10
app/src/behaviors/behavior_bt.c
View file

@ -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>

4
app/src/behaviors/behavior_caps_word.c
View file

@ -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>

6
app/src/behaviors/behavior_ext_power.c
View file

@ -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)

4
app/src/behaviors/behavior_hold_tap.c
View file

@ -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>

4
app/src/behaviors/behavior_key_press.c
View file

@ -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>

4
app/src/behaviors/behavior_key_repeat.c
View file

@ -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>

4
app/src/behaviors/behavior_key_toggle.c
View file

@ -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>

4
app/src/behaviors/behavior_macro.c
View file

@ -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>

4
app/src/behaviors/behavior_mod_morph.c
View file

@ -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>

4
app/src/behaviors/behavior_momentary_layer.c
View file

@ -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>

4
app/src/behaviors/behavior_none.c
View file

@ -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>

6
app/src/behaviors/behavior_outputs.c
View file

@ -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)

7
app/src/behaviors/behavior_reset.c
View file

@ -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>

4
app/src/behaviors/behavior_rgb_underglow.c
View file

@ -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>

8
app/src/behaviors/behavior_sensor_rotate_key_press.c
View file

@ -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>

4
app/src/behaviors/behavior_sticky_key.c
View file

@ -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>

4
app/src/behaviors/behavior_tap_dance.c
View file

@ -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>

4
app/src/behaviors/behavior_to_layer.c
View file

@ -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>

4
app/src/behaviors/behavior_toggle_layer.c
View file

@ -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>

4
app/src/behaviors/behavior_transparent.c
View file

@ -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>

22
app/src/ble.c
View file

@ -4,29 +4,29 @@
* SPDX-License-Identifier: MIT
*/
#include <device.h>
#include <init.h>
#include <zephyr/device.h>
#include <zephyr/init.h>
#include <errno.h>
#include <math.h>
#include <stdlib.h>
#include <stdio.h>
#include <settings/settings.h>
#include <bluetooth/bluetooth.h>
#include <bluetooth/conn.h>
#include <bluetooth/hci.h>
#include <bluetooth/uuid.h>
#include <bluetooth/gatt.h>
#include <bluetooth/hci_err.h>
#include <zephyr/settings/settings.h>
#include <zephyr/bluetooth/bluetooth.h>
#include <zephyr/bluetooth/conn.h>
#include <zephyr/bluetooth/hci.h>
#include <zephyr/bluetooth/uuid.h>
#include <zephyr/bluetooth/gatt.h>
#include <zephyr/bluetooth/hci_err.h>
#if IS_ENABLED(CONFIG_SETTINGS)
#include <settings/settings.h>
#include <zephyr/settings/settings.h>
#endif
#include <logging/log.h>
#include <zephyr/logging/log.h>
LOG_MODULE_DECLARE(zmk, CONFIG_ZMK_LOG_LEVEL);

9
app/src/combo.c
View file

@ -6,11 +6,12 @@
#define DT_DRV_COMPAT zmk_combos
#include <device.h>
#include <zephyr/device.h>
#include <zephyr/logging/log.h>
#include <zephyr/sys/dlist.h>
#include <zephyr/kernel.h>
#include <drivers/behavior.h>
#include <logging/log.h>
#include <sys/dlist.h>
#include <kernel.h>
#include <zmk/behavior.h>
#include <zmk/event_manager.h>

6
app/src/conditional_layer.c
View file

@ -7,10 +7,10 @@
#define DT_DRV_COMPAT zmk_conditional_layers
#include <stdint.h>
#include <kernel.h>
#include <zephyr/kernel.h>
#include <devicetree.h>
#include <logging/log.h>
#include <zephyr/devicetree.h>
#include <zephyr/logging/log.h>
#include <zmk/event_manager.h>
#include <zmk/keymap.h>

10
app/src/display/main.c
View file

@ -4,12 +4,12 @@
* SPDX-License-Identifier: MIT
*/
#include <kernel.h>
#include <init.h>
#include <device.h>
#include <devicetree.h>
#include <zephyr/kernel.h>
#include <zephyr/init.h>
#include <zephyr/device.h>
#include <zephyr/devicetree.h>
#include <logging/log.h>
#include <zephyr/logging/log.h>
LOG_MODULE_DECLARE(zmk, CONFIG_ZMK_LOG_LEVEL);
#include <drivers/display.h>

2
app/src/display/status_screen.c
View file

@ -11,7 +11,7 @@
#include <zmk/display/widgets/wpm_status.h>
#include <zmk/display/status_screen.h>
#include <logging/log.h>
#include <zephyr/logging/log.h>
LOG_MODULE_DECLARE(zmk, CONFIG_ZMK_LOG_LEVEL);
#if IS_ENABLED(CONFIG_ZMK_WIDGET_BATTERY_STATUS)

6
app/src/display/widgets/battery_status.c
View file

@ -4,10 +4,10 @@
* SPDX-License-Identifier: MIT
*/
#include <kernel.h>
#include <bluetooth/services/bas.h>
#include <zephyr/kernel.h>
#include <zephyr/bluetooth/services/bas.h>
#include <logging/log.h>
#include <zephyr/logging/log.h>
LOG_MODULE_DECLARE(zmk, CONFIG_ZMK_LOG_LEVEL);
#include <zmk/display.h>

4
app/src/display/widgets/layer_status.c
View file

@ -4,8 +4,8 @@
* SPDX-License-Identifier: MIT
*/
#include <kernel.h>
#include <logging/log.h>
#include <zephyr/kernel.h>
#include <zephyr/logging/log.h>
LOG_MODULE_DECLARE(zmk, CONFIG_ZMK_LOG_LEVEL);
#include <zmk/display.h>

5
app/src/display/widgets/output_status.c
View file

@ -4,10 +4,9 @@
* SPDX-License-Identifier: MIT
*/
#include <kernel.h>
#include <bluetooth/services/bas.h>
#include <zephyr/kernel.h>
#include <logging/log.h>
#include <zephyr/logging/log.h>
LOG_MODULE_DECLARE(zmk, CONFIG_ZMK_LOG_LEVEL);
#include <zmk/display.h>

5
app/src/display/widgets/peripheral_status.c
View file

@ -4,10 +4,9 @@
* SPDX-License-Identifier: MIT
*/
#include <kernel.h>
#include <bluetooth/services/bas.h>
#include <zephyr/kernel.h>
#include <logging/log.h>
#include <zephyr/logging/log.h>
LOG_MODULE_DECLARE(zmk, CONFIG_ZMK_LOG_LEVEL);
#include <zmk/display.h>

2
app/src/display/widgets/wpm_status.c
View file

@ -4,7 +4,7 @@
* SPDX-License-Identifier: MIT
*/
#include <logging/log.h>
#include <zephyr/logging/log.h>
LOG_MODULE_DECLARE(zmk, CONFIG_ZMK_LOG_LEVEL);
#include <zmk/display.h>

6
app/src/endpoints.c
View file

@ -4,8 +4,8 @@
* SPDX-License-Identifier: MIT
*/
#include <init.h>
#include <settings/settings.h>
#include <zephyr/init.h>
#include <zephyr/settings/settings.h>
#include <zmk/ble.h>
#include <zmk/endpoints.h>
@ -18,7 +18,7 @@
#include <zmk/events/usb_conn_state_changed.h>
#include <zmk/events/endpoint_selection_changed.h>
#include <logging/log.h>
#include <zephyr/logging/log.h>
LOG_MODULE_DECLARE(zmk, CONFIG_ZMK_LOG_LEVEL);
#define DEFAULT_ENDPOINT \

4
app/src/event_manager.c
View file

@ -4,8 +4,8 @@
* SPDX-License-Identifier: MIT
*/
#include <zephyr.h>
#include <logging/log.h>
#include <zephyr/kernel.h>
#include <zephyr/logging/log.h>
LOG_MODULE_DECLARE(zmk, CONFIG_ZMK_LOG_LEVEL);

2
app/src/events/activity_state_changed.c
View file

@ -4,7 +4,7 @@
* SPDX-License-Identifier: MIT
*/
#include <kernel.h>
#include <zephyr/kernel.h>
#include <zmk/events/activity_state_changed.h>
ZMK_EVENT_IMPL(zmk_activity_state_changed);

2
app/src/events/battery_state_changed.c
View file

@ -4,7 +4,7 @@
* SPDX-License-Identifier: MIT
*/
#include <kernel.h>
#include <zephyr/kernel.h>
#include <zmk/events/battery_state_changed.h>
ZMK_EVENT_IMPL(zmk_battery_state_changed);

2
app/src/events/ble_active_profile_changed.c
View file

@ -4,7 +4,7 @@
* SPDX-License-Identifier: MIT
*/
#include <kernel.h>
#include <zephyr/kernel.h>
#include <zmk/events/ble_active_profile_changed.h>
ZMK_EVENT_IMPL(zmk_ble_active_profile_changed);

2
app/src/events/endpoint_selection_changed.c
View file

@ -4,7 +4,7 @@
* SPDX-License-Identifier: MIT
*/
#include <kernel.h>
#include <zephyr/kernel.h>
#include <zmk/events/endpoint_selection_changed.h>
ZMK_EVENT_IMPL(zmk_endpoint_selection_changed);

2
app/src/events/keycode_state_changed.c
View file

@ -4,7 +4,7 @@
* SPDX-License-Identifier: MIT
*/
#include <kernel.h>
#include <zephyr/kernel.h>
#include <zmk/events/keycode_state_changed.h>
ZMK_EVENT_IMPL(zmk_keycode_state_changed);

2
app/src/events/layer_state_changed.c
View file

@ -4,7 +4,7 @@
* SPDX-License-Identifier: MIT
*/
#include <kernel.h>
#include <zephyr/kernel.h>
#include <zmk/events/layer_state_changed.h>
ZMK_EVENT_IMPL(zmk_layer_state_changed);

2
app/src/events/modifiers_state_changed.c
View file

@ -4,7 +4,7 @@
* SPDX-License-Identifier: MIT
*/
#include <kernel.h>
#include <zephyr/kernel.h>
#include <zmk/events/modifiers_state_changed.h>
ZMK_EVENT_IMPL(zmk_modifiers_state_changed);

2
app/src/events/position_state_changed.c
View file

@ -4,7 +4,7 @@
* SPDX-License-Identifier: MIT
*/
#include <kernel.h>
#include <zephyr/kernel.h>
#include <zmk/events/position_state_changed.h>
ZMK_EVENT_IMPL(zmk_position_state_changed);

2
app/src/events/sensor_event.c
View file

@ -4,7 +4,7 @@
* SPDX-License-Identifier: MIT
*/
#include <kernel.h>
#include <zephyr/kernel.h>
#include <zmk/events/sensor_event.h>
ZMK_EVENT_IMPL(zmk_sensor_event);

2
app/src/events/split_peripheral_status_changed.c
View file

@ -4,7 +4,7 @@
* SPDX-License-Identifier: MIT
*/
#include <kernel.h>
#include <zephyr/kernel.h>
#include <zmk/events/split_peripheral_status_changed.h>
ZMK_EVENT_IMPL(zmk_split_peripheral_status_changed);

2
app/src/events/usb_conn_state_changed.c
View file

@ -4,7 +4,7 @@
* SPDX-License-Identifier: MIT
*/
#include <kernel.h>
#include <zephyr/kernel.h>
#include <zmk/events/usb_conn_state_changed.h>
ZMK_EVENT_IMPL(zmk_usb_conn_state_changed);

2
app/src/events/wpm_state_changed.c
View file

@ -4,7 +4,7 @@
* SPDX-License-Identifier: MIT
*/
#include <kernel.h>
#include <zephyr/kernel.h>
#include <zmk/events/wpm_state_changed.h>
ZMK_EVENT_IMPL(zmk_wpm_state_changed);

15
app/src/ext_power_generic.c
View file

@ -7,17 +7,18 @@
#define DT_DRV_COMPAT zmk_ext_power_generic
#include <stdio.h>
#include <device.h>
#include <pm/device.h>
#include <init.h>
#include <kernel.h>
#include <settings/settings.h>
#include <drivers/gpio.h>
#include <zephyr/device.h>
#include <zephyr/pm/device.h>
#include <zephyr/init.h>
#include <zephyr/kernel.h>
#include <zephyr/settings/settings.h>
#include <zephyr/drivers/gpio.h>
#include <drivers/ext_power.h>
#if DT_HAS_COMPAT_STATUS_OKAY(DT_DRV_COMPAT)
#include <logging/log.h>
#include <zephyr/logging/log.h>
LOG_MODULE_DECLARE(zmk, CONFIG_ZMK_LOG_LEVEL);
struct ext_power_generic_config {

2
app/src/hid.c
View file

@ -5,7 +5,7 @@
*/
#include "zmk/keys.h"
#include <logging/log.h>
#include <zephyr/logging/log.h>
LOG_MODULE_DECLARE(zmk, CONFIG_ZMK_LOG_LEVEL);
#include <zmk/hid.h>

Some files were not shown because too many files have changed in this diff Show more