Merge remote-tracking branch 'upstream/main' into underglow/state-persistence

4 files changed, 50 insertions, 3 deletions

diff --git a/app/include/dt-bindings/zmk/bt.h b/app/include/dt-bindings/zmk/bt.h
new file mode 100644
index 0000000..05fd65c
--- /dev/null
+++ b/app/include/dt-bindings/zmk/bt.h
@@ -0,0 +1,21 @@
+/*
+ * Copyright (c) 2020 Peter Johanson <peter@peterjohanson.com>
+ *
+ * SPDX-License-Identifier: MIT
+ */
+
+#define BT_CLR_CMD 0
+#define BT_NXT_CMD 1
+#define BT_PRV_CMD 2
+#define BT_SEL_CMD 3
+// #define BT_FULL_RESET_CMD   4
+
+/*
+Note: Some future commands will include additional parameters, so we
+defines these aliases up front.
+*/
+
+#define BT_CLR BT_CLR_CMD 0
+#define BT_NXT BT_NXT_CMD 0
+#define BT_PRV BT_PRV_CMD 0
+#define BT_SEL BT_SEL_CMD
\ No newline at end of file
diff --git a/app/include/dt-bindings/zmk/keys.h b/app/include/dt-bindings/zmk/keys.h
index 0a52857..d3dd634 100644
--- a/app/include/dt-bindings/zmk/keys.h
+++ b/app/include/dt-bindings/zmk/keys.h
@@ -55,7 +55,7 @@
 #define QUOT 0x34
 #define GRAV 0x35
 #define CMMA 0x36
-#define DOT  0x37
+#define DOT 0x37
 #define FSLH 0x38
 #define CLCK 0x39
 #define F1 0x3A
@@ -77,8 +77,8 @@
 #define INS 0x49
 #define HOME 0x4A
 #define PGUP 0x4B
-#define DEL  0x4C
-#define END  0x4D
+#define DEL 0x4C
+#define END 0x4D
 #define PGDN 0x4E
 #define RARW 0x4F
 #define LARW 0x50
@@ -92,6 +92,11 @@
 
 #define GUI 0x65
 
+#define UNDO 0x7A
+#define CUT 0x7B
+#define COPY 0x7C
+#define PSTE 0x7D
+
 #define CURU 0xB4
 
 #define LPRN 0xB6
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..d481899
--- /dev/null
+++ b/app/include/dt-bindings/zmk/kscan-mock.h
@@ -0,0 +1,8 @@
+#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/reset.h b/app/include/dt-bindings/zmk/reset.h
new file mode 100644
index 0000000..2b3d876
--- /dev/null
+++ b/app/include/dt-bindings/zmk/reset.h
@@ -0,0 +1,13 @@
+/*
+ * Copyright (c) 2020 The ZMK Contributors
+ *
+ * SPDX-License-Identifier: MIT
+ */
+
+#define RST_WARM 0x00
+#define RST_COLD 0x01
+
+// AdaFruit nrf52 Bootloader Specific. See
+// https://github.com/adafruit/Adafruit_nRF52_Bootloader/blob/d6b28e66053eea467166f44875e3c7ec741cb471/src/main.c#L107
+
+#define RST_UF2 0x57
\ No newline at end of file