diff options
| author | Nick Winans <nick.win999@gmail.com> | 2020-11-10 13:31:11 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-11-10 13:31:11 -0600 |
| commit | 413a917d1492ede36f9c5cc4495596a85f43deb1 (patch) | |
| tree | 5ea4d0bf00b454757aafc955d3d5cc150cc29bef /app | |
| parent | 0be904c34f6a7d709fd5e292d56b183469c4a9e7 (diff) | |
| parent | 348a44a8a387e38922e7e275b1ba9af790648016 (diff) | |
Merge branch 'main' into underglow/add-config_
Diffstat (limited to 'app')
| -rw-r--r-- | app/boards/shields/microdox/microdox.conf | 4 | ||||
| -rw-r--r-- | app/dts/behaviors/key_press.dtsi | 2 | ||||
| -rw-r--r-- | app/dts/behaviors/sensor_rotate_key_press.dtsi | 2 | ||||
| -rw-r--r-- | app/src/hid.c | 1 |
4 files changed, 2 insertions, 7 deletions
diff --git a/app/boards/shields/microdox/microdox.conf b/app/boards/shields/microdox/microdox.conf index 974243c..0d38398 100644 --- a/app/boards/shields/microdox/microdox.conf +++ b/app/boards/shields/microdox/microdox.conf @@ -1,6 +1,6 @@ -# Uncomment the following lines to enable the Corne RGB Underglow +# Uncomment the following lines to enable the Microdox RGB Underglow # CONFIG_ZMK_RGB_UNDERGLOW=y # CONFIG_WS2812_STRIP=y -# Uncomment the following line to enable the Corne OLED Display +# Uncomment the following line to enable the Microdox OLED Display # CONFIG_ZMK_DISPLAY=y diff --git a/app/dts/behaviors/key_press.dtsi b/app/dts/behaviors/key_press.dtsi index 77050aa..e066832 100644 --- a/app/dts/behaviors/key_press.dtsi +++ b/app/dts/behaviors/key_press.dtsi @@ -1,6 +1,4 @@ -#include <dt-bindings/zmk/hid_usage_pages.h> - / { behaviors { /* DEPRECATED: `cp` will be removed in the future */ diff --git a/app/dts/behaviors/sensor_rotate_key_press.dtsi b/app/dts/behaviors/sensor_rotate_key_press.dtsi index 5433994..d06eca2 100644 --- a/app/dts/behaviors/sensor_rotate_key_press.dtsi +++ b/app/dts/behaviors/sensor_rotate_key_press.dtsi @@ -1,6 +1,4 @@ -#include <dt-bindings/zmk/hid_usage_pages.h> - / { behaviors { /* DEPRECATED: `inc_dec_cp` will be removed in the future */ diff --git a/app/src/hid.c b/app/src/hid.c index 7e733d9..b84a693 100644 --- a/app/src/hid.c +++ b/app/src/hid.c @@ -9,7 +9,6 @@ LOG_MODULE_DECLARE(zmk, CONFIG_ZMK_LOG_LEVEL); #include <zmk/hid.h> #include <dt-bindings/zmk/modifiers.h> -#include <dt-bindings/zmk/hid_usage_pages.h> static struct zmk_hid_keypad_report kp_report = { .report_id = 1, .body = {.modifiers = 0, ._reserved = 0, .keys = {0}}}; |