Merge branch 'main' into underglow/add-config_

This commit is contained in:
Nick Winans
2020-11-10 13:31:11 -06:00
committed by GitHub
7 changed files with 160 additions and 9 deletions

View File

@@ -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

View File

@@ -1,6 +1,4 @@
#include <dt-bindings/zmk/hid_usage_pages.h>
/ {
behaviors {
/* DEPRECATED: `cp` will be removed in the future */

View File

@@ -1,6 +1,4 @@
#include <dt-bindings/zmk/hid_usage_pages.h>
/ {
behaviors {
/* DEPRECATED: `inc_dec_cp` will be removed in the future */

View File

@@ -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}}};