summaryrefslogtreecommitdiff
path: root/keyboards/mixi
diff options
context:
space:
mode:
authorNick Brassel <nick@tzarc.org>2022-05-29 07:57:11 +1000
committerNick Brassel <nick@tzarc.org>2022-05-29 07:57:11 +1000
commitb835171008eaeaa992a1b8e390af8bce6f5f0b8f (patch)
treede22c239cc47556f8be7538f95f48ad75b86d110 /keyboards/mixi
parentf5d091a9d58c8349437e9d52de87294258cbd256 (diff)
parent0c8f78020d01ee5c45481d7d93b9b0d9f7b95103 (diff)
Merge branch 'develop' -- breaking changes 2022-05-28.
Diffstat (limited to 'keyboards/mixi')
-rw-r--r--keyboards/mixi/keymaps/default/keymap.c4
-rw-r--r--keyboards/mixi/keymaps/via/keymap.c4
2 files changed, 4 insertions, 4 deletions
diff --git a/keyboards/mixi/keymaps/default/keymap.c b/keyboards/mixi/keymaps/default/keymap.c
index 916bd5e3d0..22877c1101 100644
--- a/keyboards/mixi/keymaps/default/keymap.c
+++ b/keyboards/mixi/keymaps/default/keymap.c
@@ -44,7 +44,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
* .--------------------------------------.
* | N/A | N/A | Hold: Layer 2 |
* |--------------|-------|---------------|
- * | RESET EEPROM | RESET | DEBUG MODE |
+ * | QK_BOOT EEPROM | QK_BOOT | DEBUG MODE |
* |--------------|-------|---------------|
* | N/A | N/A | N/A |
* '--------------------------------------'
@@ -52,7 +52,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[2] =
LAYOUT(
KC_NO , KC_NO, KC_TRNS,
- EEP_RST, RESET, DEBUG ,
+ EEP_RST, QK_BOOT, DEBUG ,
KC_NO , KC_NO, KC_NO
)
diff --git a/keyboards/mixi/keymaps/via/keymap.c b/keyboards/mixi/keymaps/via/keymap.c
index 5eb9e12365..927e16659c 100644
--- a/keyboards/mixi/keymaps/via/keymap.c
+++ b/keyboards/mixi/keymaps/via/keymap.c
@@ -44,7 +44,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
* .--------------------------------------.
* | N/A | N/A | Hold: Layer 2 |
* |--------------|-------|---------------|
- * | RESET EEPROM | RESET | DEBUG MODE |
+ * | QK_BOOT EEPROM | QK_BOOT | DEBUG MODE |
* |--------------|-------|---------------|
* | N/A | N/A | N/A |
* '--------------------------------------'
@@ -52,7 +52,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[2] =
LAYOUT(
KC_NO , KC_NO, KC_TRNS,
- EEP_RST, RESET, DEBUG ,
+ EEP_RST, QK_BOOT, DEBUG ,
KC_NO , KC_NO, KC_NO
),