summaryrefslogtreecommitdiff
path: root/app/include
diff options
context:
space:
mode:
Diffstat (limited to 'app/include')
-rw-r--r--app/include/dt-bindings/zmk/kscan-mock.h9
-rw-r--r--app/include/dt-bindings/zmk/kscan_mock.h14
-rw-r--r--app/include/dt-bindings/zmk/matrix-transform.h5
-rw-r--r--app/include/dt-bindings/zmk/matrix_transform.h10
-rw-r--r--app/include/zmk/event_manager.h (renamed from app/include/zmk/event-manager.h)0
-rw-r--r--app/include/zmk/events/activity_state_changed.h (renamed from app/include/zmk/events/activity-state-changed.h)2
-rw-r--r--app/include/zmk/events/battery_state_changed.h (renamed from app/include/zmk/events/battery-state-changed.h)2
-rw-r--r--app/include/zmk/events/ble_active_profile_changed.h (renamed from app/include/zmk/events/ble-active-profile-changed.h)2
-rw-r--r--app/include/zmk/events/keycode_state_changed.h (renamed from app/include/zmk/events/keycode-state-changed.h)2
-rw-r--r--app/include/zmk/events/layer_state_changed.h (renamed from app/include/zmk/events/layer-state-changed.h)2
-rw-r--r--app/include/zmk/events/modifiers_state_changed.h (renamed from app/include/zmk/events/modifiers-state-changed.h)2
-rw-r--r--app/include/zmk/events/position_state_changed.h (renamed from app/include/zmk/events/position-state-changed.h)2
-rw-r--r--app/include/zmk/events/sensor_event.h (renamed from app/include/zmk/events/sensor-event.h)2
-rw-r--r--app/include/zmk/events/usb_conn_state_changed.h (renamed from app/include/zmk/events/usb-conn-state-changed.h)2
14 files changed, 37 insertions, 19 deletions
diff --git a/app/include/dt-bindings/zmk/kscan-mock.h b/app/include/dt-bindings/zmk/kscan-mock.h
index eff218b..4ed666c 100644
--- a/app/include/dt-bindings/zmk/kscan-mock.h
+++ b/app/include/dt-bindings/zmk/kscan-mock.h
@@ -4,11 +4,6 @@
* SPDX-License-Identifier: MIT
*/
-#pragma once
+#warning "kscan-mock.h has been deprecated and superseded by kscan_mock.h"
-#define ZMK_MOCK_IS_PRESS(v) ((v & (0x01 << 31)) != 0)
-#define ZMK_MOCK_PRESS(row, col, msec) (row + (col << 8) + (msec << 16) + (0x01 << 31))
-#define ZMK_MOCK_RELEASE(row, col, msec) (row + (col << 8) + (msec << 16))
-#define ZMK_MOCK_ROW(v) (v & 0xFF)
-#define ZMK_MOCK_COL(v) ((v >> 8) & 0xFF)
-#define ZMK_MOCK_MSEC(v) ((v & ~(0x01 << 31)) >> 16)
+#include "kscan_mock.h" \ No newline at end of file
diff --git a/app/include/dt-bindings/zmk/kscan_mock.h b/app/include/dt-bindings/zmk/kscan_mock.h
new file mode 100644
index 0000000..eff218b
--- /dev/null
+++ b/app/include/dt-bindings/zmk/kscan_mock.h
@@ -0,0 +1,14 @@
+/*
+ * Copyright (c) 2020 The ZMK Contributors
+ *
+ * SPDX-License-Identifier: MIT
+ */
+
+#pragma once
+
+#define ZMK_MOCK_IS_PRESS(v) ((v & (0x01 << 31)) != 0)
+#define ZMK_MOCK_PRESS(row, col, msec) (row + (col << 8) + (msec << 16) + (0x01 << 31))
+#define ZMK_MOCK_RELEASE(row, col, msec) (row + (col << 8) + (msec << 16))
+#define ZMK_MOCK_ROW(v) (v & 0xFF)
+#define ZMK_MOCK_COL(v) ((v >> 8) & 0xFF)
+#define ZMK_MOCK_MSEC(v) ((v & ~(0x01 << 31)) >> 16)
diff --git a/app/include/dt-bindings/zmk/matrix-transform.h b/app/include/dt-bindings/zmk/matrix-transform.h
index 2989cb6..223b142 100644
--- a/app/include/dt-bindings/zmk/matrix-transform.h
+++ b/app/include/dt-bindings/zmk/matrix-transform.h
@@ -4,7 +4,6 @@
* SPDX-License-Identifier: MIT
*/
-#define KT_ROW(item) (item >> 8)
-#define KT_COL(item) (item & 0xFF)
+#warning "matrix-transform.h has been deprecated and superseded by matrix_transform.h"
-#define RC(row, col) (((row) << 8) + (col)) \ No newline at end of file
+#include "matrix_transform.h" \ No newline at end of file
diff --git a/app/include/dt-bindings/zmk/matrix_transform.h b/app/include/dt-bindings/zmk/matrix_transform.h
new file mode 100644
index 0000000..2989cb6
--- /dev/null
+++ b/app/include/dt-bindings/zmk/matrix_transform.h
@@ -0,0 +1,10 @@
+/*
+ * Copyright (c) 2020 The ZMK Contributors
+ *
+ * SPDX-License-Identifier: MIT
+ */
+
+#define KT_ROW(item) (item >> 8)
+#define KT_COL(item) (item & 0xFF)
+
+#define RC(row, col) (((row) << 8) + (col)) \ No newline at end of file
diff --git a/app/include/zmk/event-manager.h b/app/include/zmk/event_manager.h
index 31c5322..31c5322 100644
--- a/app/include/zmk/event-manager.h
+++ b/app/include/zmk/event_manager.h
diff --git a/app/include/zmk/events/activity-state-changed.h b/app/include/zmk/events/activity_state_changed.h
index cd4c618..511fbad 100644
--- a/app/include/zmk/events/activity-state-changed.h
+++ b/app/include/zmk/events/activity_state_changed.h
@@ -7,7 +7,7 @@
#pragma once
#include <zephyr.h>
-#include <zmk/event-manager.h>
+#include <zmk/event_manager.h>
#include <zmk/activity.h>
struct activity_state_changed {
diff --git a/app/include/zmk/events/battery-state-changed.h b/app/include/zmk/events/battery_state_changed.h
index a983820..47e44ba 100644
--- a/app/include/zmk/events/battery-state-changed.h
+++ b/app/include/zmk/events/battery_state_changed.h
@@ -7,7 +7,7 @@
#pragma once
#include <zephyr.h>
-#include <zmk/event-manager.h>
+#include <zmk/event_manager.h>
struct battery_state_changed {
struct zmk_event_header header;
diff --git a/app/include/zmk/events/ble-active-profile-changed.h b/app/include/zmk/events/ble_active_profile_changed.h
index 4491dfc..fa16126 100644
--- a/app/include/zmk/events/ble-active-profile-changed.h
+++ b/app/include/zmk/events/ble_active_profile_changed.h
@@ -7,7 +7,7 @@
#pragma once
#include <zephyr.h>
-#include <zmk/event-manager.h>
+#include <zmk/event_manager.h>
#include <device.h>
#include <zmk/ble/profile.h>
diff --git a/app/include/zmk/events/keycode-state-changed.h b/app/include/zmk/events/keycode_state_changed.h
index 7dc87e2..28282b6 100644
--- a/app/include/zmk/events/keycode-state-changed.h
+++ b/app/include/zmk/events/keycode_state_changed.h
@@ -9,7 +9,7 @@
#include <zephyr.h>
#include <dt-bindings/zmk/modifiers.h>
#include <dt-bindings/zmk/hid_usage_pages.h>
-#include <zmk/event-manager.h>
+#include <zmk/event_manager.h>
#include <zmk/keys.h>
struct keycode_state_changed {
diff --git a/app/include/zmk/events/layer-state-changed.h b/app/include/zmk/events/layer_state_changed.h
index 352c602..cf24002 100644
--- a/app/include/zmk/events/layer-state-changed.h
+++ b/app/include/zmk/events/layer_state_changed.h
@@ -7,7 +7,7 @@
#pragma once
#include <zephyr.h>
-#include <zmk/event-manager.h>
+#include <zmk/event_manager.h>
struct layer_state_changed {
struct zmk_event_header header;
diff --git a/app/include/zmk/events/modifiers-state-changed.h b/app/include/zmk/events/modifiers_state_changed.h
index d2e02f8..c4daede 100644
--- a/app/include/zmk/events/modifiers-state-changed.h
+++ b/app/include/zmk/events/modifiers_state_changed.h
@@ -8,7 +8,7 @@
#include <zephyr.h>
#include <zmk/keys.h>
-#include <zmk/event-manager.h>
+#include <zmk/event_manager.h>
struct modifiers_state_changed {
struct zmk_event_header header;
diff --git a/app/include/zmk/events/position-state-changed.h b/app/include/zmk/events/position_state_changed.h
index 7058276..0f1ac1b 100644
--- a/app/include/zmk/events/position-state-changed.h
+++ b/app/include/zmk/events/position_state_changed.h
@@ -7,7 +7,7 @@
#pragma once
#include <zephyr.h>
-#include <zmk/event-manager.h>
+#include <zmk/event_manager.h>
struct position_state_changed {
struct zmk_event_header header;
diff --git a/app/include/zmk/events/sensor-event.h b/app/include/zmk/events/sensor_event.h
index 0bd3ccf..14fb2d3 100644
--- a/app/include/zmk/events/sensor-event.h
+++ b/app/include/zmk/events/sensor_event.h
@@ -7,7 +7,7 @@
#pragma once
#include <zephyr.h>
-#include <zmk/event-manager.h>
+#include <zmk/event_manager.h>
#include <device.h>
struct sensor_event {
diff --git a/app/include/zmk/events/usb-conn-state-changed.h b/app/include/zmk/events/usb_conn_state_changed.h
index d6cc698..b38fb9f 100644
--- a/app/include/zmk/events/usb-conn-state-changed.h
+++ b/app/include/zmk/events/usb_conn_state_changed.h
@@ -9,7 +9,7 @@
#include <zephyr.h>
#include <usb/usb_device.h>
-#include <zmk/event-manager.h>
+#include <zmk/event_manager.h>
#include <zmk/usb.h>
struct usb_conn_state_changed {
generated by cgit v1.2.3 (git 2.25.1) at 2025-04-30 19:28:46 +0000