summaryrefslogtreecommitdiff
path: root/app/src
diff options
context:
space:
mode:
authorinnovaker <66737976+innovaker@users.noreply.github.com>2020-12-22 15:56:00 +0000
committerPete Johanson <peter@peterjohanson.com>2020-12-28 01:15:35 -0500
commit842aa5a842e117b7b00e49258ca0bde44dc0c789 (patch)
tree5202f081b9af5480610645aa53eab11d45a09105 /app/src
parent6927abee6ef0c604fae1c8544fc933a56be14e77 (diff)
refactor: replace filename hyphens with underscores
Aligns *.h and *.c to underscore naming convention. These were kept (with warnings) for backwards compatibility with external boards/shields: - kscan-mock.h - matrix-transform.h They should be removed in the future. PR: #523
Diffstat (limited to 'app/src')
-rw-r--r--app/src/activity.c8
-rw-r--r--app/src/battery.c4
-rw-r--r--app/src/behaviors/behavior_hold_tap.c8
-rw-r--r--app/src/behaviors/behavior_key_press.c4
-rw-r--r--app/src/behaviors/behavior_sensor_rotate_key_press.c4
-rw-r--r--app/src/behaviors/behavior_sticky_key.c8
-rw-r--r--app/src/ble.c4
-rw-r--r--app/src/display/main.c4
-rw-r--r--app/src/display/widgets/battery_status.c6
-rw-r--r--app/src/display/widgets/output_status.c6
-rw-r--r--app/src/endpoints.c6
-rw-r--r--app/src/event_manager.c2
-rw-r--r--app/src/events/activity_state_changed.c2
-rw-r--r--app/src/events/battery_state_changed.c2
-rw-r--r--app/src/events/ble_active_profile_changed.c2
-rw-r--r--app/src/events/keycode_state_changed.c2
-rw-r--r--app/src/events/layer_state_changed.c2
-rw-r--r--app/src/events/modifiers_state_changed.c2
-rw-r--r--app/src/events/position_state_changed.c2
-rw-r--r--app/src/events/sensor_event.c2
-rw-r--r--app/src/events/usb_conn_state_changed.c2
-rw-r--r--app/src/hid_listener.c6
-rw-r--r--app/src/keymap.c8
-rw-r--r--app/src/kscan.c4
-rw-r--r--app/src/matrix_transform.c2
-rw-r--r--app/src/sensors.c4
-rw-r--r--app/src/split/bluetooth/central.c4
-rw-r--r--app/src/split_listener.c4
-rw-r--r--app/src/usb.c4
29 files changed, 59 insertions, 59 deletions
diff --git a/app/src/activity.c b/app/src/activity.c
index c441fa9..8fe912a 100644
--- a/app/src/activity.c
+++ b/app/src/activity.c
@@ -12,10 +12,10 @@
LOG_MODULE_DECLARE(zmk, CONFIG_ZMK_LOG_LEVEL);
-#include <zmk/event-manager.h>
-#include <zmk/events/activity-state-changed.h>
-#include <zmk/events/position-state-changed.h>
-#include <zmk/events/sensor-event.h>
+#include <zmk/event_manager.h>
+#include <zmk/events/activity_state_changed.h>
+#include <zmk/events/position_state_changed.h>
+#include <zmk/events/sensor_event.h>
#include <zmk/activity.h>
diff --git a/app/src/battery.c b/app/src/battery.c
index 7a09ad7..917af9c 100644
--- a/app/src/battery.c
+++ b/app/src/battery.c
@@ -14,8 +14,8 @@
LOG_MODULE_DECLARE(zmk, CONFIG_ZMK_LOG_LEVEL);
-#include <zmk/event-manager.h>
-#include <zmk/events/battery-state-changed.h>
+#include <zmk/event_manager.h>
+#include <zmk/events/battery_state_changed.h>
const struct device *battery;
diff --git a/app/src/behaviors/behavior_hold_tap.c b/app/src/behaviors/behavior_hold_tap.c
index 556273e..d303960 100644
--- a/app/src/behaviors/behavior_hold_tap.c
+++ b/app/src/behaviors/behavior_hold_tap.c
@@ -14,10 +14,10 @@
#include <zmk/behavior.h>
#include <zmk/matrix.h>
#include <zmk/endpoints.h>
-#include <zmk/event-manager.h>
-#include <zmk/events/position-state-changed.h>
-#include <zmk/events/keycode-state-changed.h>
-#include <zmk/events/modifiers-state-changed.h>
+#include <zmk/event_manager.h>
+#include <zmk/events/position_state_changed.h>
+#include <zmk/events/keycode_state_changed.h>
+#include <zmk/events/modifiers_state_changed.h>
#include <zmk/behavior.h>
LOG_MODULE_DECLARE(zmk, CONFIG_ZMK_LOG_LEVEL);
diff --git a/app/src/behaviors/behavior_key_press.c b/app/src/behaviors/behavior_key_press.c
index aa19ca9..df0828a 100644
--- a/app/src/behaviors/behavior_key_press.c
+++ b/app/src/behaviors/behavior_key_press.c
@@ -10,8 +10,8 @@
#include <drivers/behavior.h>
#include <logging/log.h>
-#include <zmk/event-manager.h>
-#include <zmk/events/keycode-state-changed.h>
+#include <zmk/event_manager.h>
+#include <zmk/events/keycode_state_changed.h>
#include <zmk/behavior.h>
LOG_MODULE_DECLARE(zmk, CONFIG_ZMK_LOG_LEVEL);
diff --git a/app/src/behaviors/behavior_sensor_rotate_key_press.c b/app/src/behaviors/behavior_sensor_rotate_key_press.c
index a0e0acc..1e659a1 100644
--- a/app/src/behaviors/behavior_sensor_rotate_key_press.c
+++ b/app/src/behaviors/behavior_sensor_rotate_key_press.c
@@ -11,8 +11,8 @@
#include <logging/log.h>
#include <drivers/sensor.h>
-#include <zmk/event-manager.h>
-#include <zmk/events/keycode-state-changed.h>
+#include <zmk/event_manager.h>
+#include <zmk/events/keycode_state_changed.h>
LOG_MODULE_DECLARE(zmk, CONFIG_ZMK_LOG_LEVEL);
diff --git a/app/src/behaviors/behavior_sticky_key.c b/app/src/behaviors/behavior_sticky_key.c
index 4695c7a..643ae48 100644
--- a/app/src/behaviors/behavior_sticky_key.c
+++ b/app/src/behaviors/behavior_sticky_key.c
@@ -13,10 +13,10 @@
#include <zmk/matrix.h>
#include <zmk/endpoints.h>
-#include <zmk/event-manager.h>
-#include <zmk/events/position-state-changed.h>
-#include <zmk/events/keycode-state-changed.h>
-#include <zmk/events/modifiers-state-changed.h>
+#include <zmk/event_manager.h>
+#include <zmk/events/position_state_changed.h>
+#include <zmk/events/keycode_state_changed.h>
+#include <zmk/events/modifiers_state_changed.h>
#include <zmk/hid.h>
LOG_MODULE_DECLARE(zmk, CONFIG_ZMK_LOG_LEVEL);
diff --git a/app/src/ble.c b/app/src/ble.c
index 9cfef4b..4d42287 100644
--- a/app/src/ble.c
+++ b/app/src/ble.c
@@ -32,8 +32,8 @@ LOG_MODULE_DECLARE(zmk, CONFIG_ZMK_LOG_LEVEL);
#include <zmk/ble.h>
#include <zmk/keys.h>
#include <zmk/split/bluetooth/uuid.h>
-#include <zmk/event-manager.h>
-#include <zmk/events/ble-active-profile-changed.h>
+#include <zmk/event_manager.h>
+#include <zmk/events/ble_active_profile_changed.h>
static struct bt_conn *auth_passkey_entry_conn;
static uint8_t passkey_entries[6] = {0, 0, 0, 0, 0, 0};
diff --git a/app/src/display/main.c b/app/src/display/main.c
index ea1e21a..0bef656 100644
--- a/app/src/display/main.c
+++ b/app/src/display/main.c
@@ -14,8 +14,8 @@ LOG_MODULE_DECLARE(zmk, CONFIG_ZMK_LOG_LEVEL);
#include <drivers/display.h>
#include <lvgl.h>
-#include <zmk/event-manager.h>
-#include <zmk/events/activity-state-changed.h>
+#include <zmk/event_manager.h>
+#include <zmk/events/activity_state_changed.h>
#include <zmk/display/status_screen.h>
#define ZMK_DISPLAY_NAME CONFIG_LVGL_DISPLAY_DEV_NAME
diff --git a/app/src/display/widgets/battery_status.c b/app/src/display/widgets/battery_status.c
index b412da2..346c519 100644
--- a/app/src/display/widgets/battery_status.c
+++ b/app/src/display/widgets/battery_status.c
@@ -11,9 +11,9 @@ LOG_MODULE_DECLARE(zmk, CONFIG_ZMK_LOG_LEVEL);
#include <zmk/display/widgets/battery_status.h>
#include <zmk/usb.h>
-#include <zmk/events/usb-conn-state-changed.h>
-#include <zmk/event-manager.h>
-#include <zmk/events/battery-state-changed.h>
+#include <zmk/events/usb_conn_state_changed.h>
+#include <zmk/event_manager.h>
+#include <zmk/events/battery_state_changed.h>
static sys_slist_t widgets = SYS_SLIST_STATIC_INIT(&widgets);
static lv_style_t label_style;
diff --git a/app/src/display/widgets/output_status.c b/app/src/display/widgets/output_status.c
index 143c778..9a72511 100644
--- a/app/src/display/widgets/output_status.c
+++ b/app/src/display/widgets/output_status.c
@@ -10,9 +10,9 @@
LOG_MODULE_DECLARE(zmk, CONFIG_ZMK_LOG_LEVEL);
#include <zmk/display/widgets/output_status.h>
-#include <zmk/event-manager.h>
-#include <zmk/events/usb-conn-state-changed.h>
-#include <zmk/events/ble-active-profile-changed.h>
+#include <zmk/event_manager.h>
+#include <zmk/events/usb_conn_state_changed.h>
+#include <zmk/events/ble_active_profile_changed.h>
#include <zmk/usb.h>
#include <zmk/ble.h>
#include <zmk/endpoints.h>
diff --git a/app/src/endpoints.c b/app/src/endpoints.c
index b126f33..9f32f19 100644
--- a/app/src/endpoints.c
+++ b/app/src/endpoints.c
@@ -13,9 +13,9 @@
#include <dt-bindings/zmk/hid_usage_pages.h>
#include <zmk/usb.h>
#include <zmk/hog.h>
-#include <zmk/event-manager.h>
-#include <zmk/events/ble-active-profile-changed.h>
-#include <zmk/events/usb-conn-state-changed.h>
+#include <zmk/event_manager.h>
+#include <zmk/events/ble_active_profile_changed.h>
+#include <zmk/events/usb_conn_state_changed.h>
#include <logging/log.h>
LOG_MODULE_DECLARE(zmk, CONFIG_ZMK_LOG_LEVEL);
diff --git a/app/src/event_manager.c b/app/src/event_manager.c
index 8c454e9..872f5c8 100644
--- a/app/src/event_manager.c
+++ b/app/src/event_manager.c
@@ -9,7 +9,7 @@
LOG_MODULE_DECLARE(zmk, CONFIG_ZMK_LOG_LEVEL);
-#include <zmk/event-manager.h>
+#include <zmk/event_manager.h>
extern struct zmk_event_type *__event_type_start[];
extern struct zmk_event_type *__event_type_end[];
diff --git a/app/src/events/activity_state_changed.c b/app/src/events/activity_state_changed.c
index 47aefea..001e6a1 100644
--- a/app/src/events/activity_state_changed.c
+++ b/app/src/events/activity_state_changed.c
@@ -5,6 +5,6 @@
*/
#include <kernel.h>
-#include <zmk/events/activity-state-changed.h>
+#include <zmk/events/activity_state_changed.h>
ZMK_EVENT_IMPL(activity_state_changed); \ No newline at end of file
diff --git a/app/src/events/battery_state_changed.c b/app/src/events/battery_state_changed.c
index 4b937e3..ed6147a 100644
--- a/app/src/events/battery_state_changed.c
+++ b/app/src/events/battery_state_changed.c
@@ -5,6 +5,6 @@
*/
#include <kernel.h>
-#include <zmk/events/battery-state-changed.h>
+#include <zmk/events/battery_state_changed.h>
ZMK_EVENT_IMPL(battery_state_changed); \ No newline at end of file
diff --git a/app/src/events/ble_active_profile_changed.c b/app/src/events/ble_active_profile_changed.c
index 06988e2..e2d172f 100644
--- a/app/src/events/ble_active_profile_changed.c
+++ b/app/src/events/ble_active_profile_changed.c
@@ -5,6 +5,6 @@
*/
#include <kernel.h>
-#include <zmk/events/ble-active-profile-changed.h>
+#include <zmk/events/ble_active_profile_changed.h>
ZMK_EVENT_IMPL(ble_active_profile_changed); \ No newline at end of file
diff --git a/app/src/events/keycode_state_changed.c b/app/src/events/keycode_state_changed.c
index 9a1984a..d46126b 100644
--- a/app/src/events/keycode_state_changed.c
+++ b/app/src/events/keycode_state_changed.c
@@ -5,6 +5,6 @@
*/
#include <kernel.h>
-#include <zmk/events/keycode-state-changed.h>
+#include <zmk/events/keycode_state_changed.h>
ZMK_EVENT_IMPL(keycode_state_changed);
diff --git a/app/src/events/layer_state_changed.c b/app/src/events/layer_state_changed.c
index e456711..e7f8039 100644
--- a/app/src/events/layer_state_changed.c
+++ b/app/src/events/layer_state_changed.c
@@ -5,6 +5,6 @@
*/
#include <kernel.h>
-#include <zmk/events/layer-state-changed.h>
+#include <zmk/events/layer_state_changed.h>
ZMK_EVENT_IMPL(layer_state_changed); \ No newline at end of file
diff --git a/app/src/events/modifiers_state_changed.c b/app/src/events/modifiers_state_changed.c
index 8becd02..4143796 100644
--- a/app/src/events/modifiers_state_changed.c
+++ b/app/src/events/modifiers_state_changed.c
@@ -5,6 +5,6 @@
*/
#include <kernel.h>
-#include <zmk/events/modifiers-state-changed.h>
+#include <zmk/events/modifiers_state_changed.h>
ZMK_EVENT_IMPL(modifiers_state_changed); \ No newline at end of file
diff --git a/app/src/events/position_state_changed.c b/app/src/events/position_state_changed.c
index f8f1a26..b80314b 100644
--- a/app/src/events/position_state_changed.c
+++ b/app/src/events/position_state_changed.c
@@ -5,6 +5,6 @@
*/
#include <kernel.h>
-#include <zmk/events/position-state-changed.h>
+#include <zmk/events/position_state_changed.h>
ZMK_EVENT_IMPL(position_state_changed); \ No newline at end of file
diff --git a/app/src/events/sensor_event.c b/app/src/events/sensor_event.c
index c6b80cd..6811e7d 100644
--- a/app/src/events/sensor_event.c
+++ b/app/src/events/sensor_event.c
@@ -5,6 +5,6 @@
*/
#include <kernel.h>
-#include <zmk/events/sensor-event.h>
+#include <zmk/events/sensor_event.h>
ZMK_EVENT_IMPL(sensor_event); \ No newline at end of file
diff --git a/app/src/events/usb_conn_state_changed.c b/app/src/events/usb_conn_state_changed.c
index d845f6d..c299da7 100644
--- a/app/src/events/usb_conn_state_changed.c
+++ b/app/src/events/usb_conn_state_changed.c
@@ -5,6 +5,6 @@
*/
#include <kernel.h>
-#include <zmk/events/usb-conn-state-changed.h>
+#include <zmk/events/usb_conn_state_changed.h>
ZMK_EVENT_IMPL(usb_conn_state_changed); \ No newline at end of file
diff --git a/app/src/hid_listener.c b/app/src/hid_listener.c
index 534831c..cf8835a 100644
--- a/app/src/hid_listener.c
+++ b/app/src/hid_listener.c
@@ -9,9 +9,9 @@
LOG_MODULE_DECLARE(zmk, CONFIG_ZMK_LOG_LEVEL);
-#include <zmk/event-manager.h>
-#include <zmk/events/keycode-state-changed.h>
-#include <zmk/events/modifiers-state-changed.h>
+#include <zmk/event_manager.h>
+#include <zmk/events/keycode_state_changed.h>
+#include <zmk/events/modifiers_state_changed.h>
#include <zmk/hid.h>
#include <dt-bindings/zmk/hid_usage_pages.h>
#include <zmk/endpoints.h>
diff --git a/app/src/keymap.c b/app/src/keymap.c
index cab6d47..cafe2ff 100644
--- a/app/src/keymap.c
+++ b/app/src/keymap.c
@@ -14,10 +14,10 @@ LOG_MODULE_DECLARE(zmk, CONFIG_ZMK_LOG_LEVEL);
#include <drivers/behavior.h>
#include <zmk/behavior.h>
-#include <zmk/event-manager.h>
-#include <zmk/events/position-state-changed.h>
-#include <zmk/events/layer-state-changed.h>
-#include <zmk/events/sensor-event.h>
+#include <zmk/event_manager.h>
+#include <zmk/events/position_state_changed.h>
+#include <zmk/events/layer_state_changed.h>
+#include <zmk/events/sensor_event.h>
static zmk_keymap_layers_state _zmk_keymap_layer_state = 0;
static uint8_t _zmk_keymap_layer_default = 0;
diff --git a/app/src/kscan.c b/app/src/kscan.c
index c22d71b..6b84490 100644
--- a/app/src/kscan.c
+++ b/app/src/kscan.c
@@ -12,8 +12,8 @@
LOG_MODULE_DECLARE(zmk, CONFIG_ZMK_LOG_LEVEL);
#include <zmk/matrix_transform.h>
-#include <zmk/event-manager.h>
-#include <zmk/events/position-state-changed.h>
+#include <zmk/event_manager.h>
+#include <zmk/events/position_state_changed.h>
#define ZMK_KSCAN_EVENT_STATE_PRESSED 0
#define ZMK_KSCAN_EVENT_STATE_RELEASED 1
diff --git a/app/src/matrix_transform.c b/app/src/matrix_transform.c
index 33be93d..8f54f31 100644
--- a/app/src/matrix_transform.c
+++ b/app/src/matrix_transform.c
@@ -7,7 +7,7 @@
#include <zephyr.h>
#include <zmk/matrix_transform.h>
#include <zmk/matrix.h>
-#include <dt-bindings/zmk/matrix-transform.h>
+#include <dt-bindings/zmk/matrix_transform.h>
#ifdef ZMK_KEYMAP_TRANSFORM_NODE
diff --git a/app/src/sensors.c b/app/src/sensors.c
index 5b4f683..5e9ef15 100644
--- a/app/src/sensors.c
+++ b/app/src/sensors.c
@@ -13,8 +13,8 @@
LOG_MODULE_DECLARE(zmk, CONFIG_ZMK_LOG_LEVEL);
#include <zmk/sensors.h>
-#include <zmk/event-manager.h>
-#include <zmk/events/sensor-event.h>
+#include <zmk/event_manager.h>
+#include <zmk/events/sensor_event.h>
#if ZMK_KEYMAP_HAS_SENSORS
diff --git a/app/src/split/bluetooth/central.c b/app/src/split/bluetooth/central.c
index c41894f..5ad83ad 100644
--- a/app/src/split/bluetooth/central.c
+++ b/app/src/split/bluetooth/central.c
@@ -19,8 +19,8 @@ LOG_MODULE_DECLARE(zmk, CONFIG_ZMK_LOG_LEVEL);
#include <zmk/ble.h>
#include <zmk/split/bluetooth/uuid.h>
-#include <zmk/event-manager.h>
-#include <zmk/events/position-state-changed.h>
+#include <zmk/event_manager.h>
+#include <zmk/events/position_state_changed.h>
#include <init.h>
static int start_scan(void);
diff --git a/app/src/split_listener.c b/app/src/split_listener.c
index b2adfb2..153ed99 100644
--- a/app/src/split_listener.c
+++ b/app/src/split_listener.c
@@ -14,8 +14,8 @@
LOG_MODULE_DECLARE(zmk, CONFIG_ZMK_LOG_LEVEL);
-#include <zmk/event-manager.h>
-#include <zmk/events/position-state-changed.h>
+#include <zmk/event_manager.h>
+#include <zmk/events/position_state_changed.h>
#include <zmk/hid.h>
#include <zmk/endpoints.h>
diff --git a/app/src/usb.c b/app/src/usb.c
index 2b3de78..7900ace 100644
--- a/app/src/usb.c
+++ b/app/src/usb.c
@@ -12,8 +12,8 @@
#include <zmk/hid.h>
#include <zmk/keymap.h>
-#include <zmk/event-manager.h>
-#include <zmk/events/usb-conn-state-changed.h>
+#include <zmk/event_manager.h>
+#include <zmk/events/usb_conn_state_changed.h>
LOG_MODULE_DECLARE(zmk, CONFIG_ZMK_LOG_LEVEL);