4 files changed, 28 insertions, 10 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