diff options
author | Nick <nick.win999@gmail.com> | 2020-09-07 12:22:18 -0500 |
---|---|---|
committer | Nick <nick.win999@gmail.com> | 2020-09-07 12:22:18 -0500 |
commit | fa40558f73ae0b7f693d93ec931aecf9d52167a1 (patch) | |
tree | 3ab362de33ea29d2489d8a4414f88044b4e7137c /app/include/dt-bindings | |
parent | bc282a0a4f1af4f6f78a0dd63e5b022eb76a603c (diff) | |
parent | 61b249666b13f7f356c0e77ee5eb500d672d7dce (diff) |
Merge commit '61b249666b13f7f356c0e77ee5eb500d672d7dce' into boards/dz60rgb
Diffstat (limited to 'app/include/dt-bindings')
-rw-r--r-- | app/include/dt-bindings/zmk/keys.h | 13 | ||||
-rw-r--r-- | app/include/dt-bindings/zmk/kscan-mock.h | 8 | ||||
-rw-r--r-- | app/include/dt-bindings/zmk/reset.h | 12 |
3 files changed, 28 insertions, 5 deletions
diff --git a/app/include/dt-bindings/zmk/keys.h b/app/include/dt-bindings/zmk/keys.h index e2c3160..cd9261d 100644 --- a/app/include/dt-bindings/zmk/keys.h +++ b/app/include/dt-bindings/zmk/keys.h @@ -50,12 +50,12 @@ #define LBKT 0x2F #define RBKT 0x30 #define BSLH 0x31 - +#define TILD 0x32 #define SCLN 0x33 #define QUOT 0x34 #define GRAV 0x35 #define CMMA 0x36 -#define DOT 0x37 +#define DOT 0x37 #define FSLH 0x38 #define CLCK 0x39 #define F1 0x3A @@ -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 @@ -141,6 +146,4 @@ #define MOD_RCTL (1 << 0x04) #define MOD_RSFT (1 << 0x05) #define MOD_RALT (1 << 0x06) -#define MOD_RGUI (1 << 0x07) - -#define ZK_IS_CONSUMER(k) (ZK_KEY(k) >= 0x100) +#define MOD_RGUI (1 << 0x07)
\ 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..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..b513649 --- /dev/null +++ b/app/include/dt-bindings/zmk/reset.h @@ -0,0 +1,12 @@ +/* + * Copyright (c) 2020 Peter Johanson <peter@peterjohanson.com> + * + * 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 |