Merge remote-tracking branch 'origin/master' into develop

author: Drashna Jael're <drashna@live.com> 2021-10-15 22:32:41 -0700
committer: Drashna Jael're <drashna@live.com> 2021-10-15 22:32:41 -0700
commit: e5662aa53dc957e293a2201ebfd5d885144240a7 (patch)
tree: c04c70497191a1327801950ba8a729d6026f3c9c /layouts
parent: a27c949a32651c69037777a2dd3924910efb35f5 (diff)
parent: 9a0addc77e3e48b908b846fc78326d4a20c30bc9 (diff)
download: qmk_firmware-e5662aa53dc957e293a2201ebfd5d885144240a7.tar.gz
qmk_firmware-e5662aa53dc957e293a2201ebfd5d885144240a7.zip
4 files changed, 4 insertions, 4 deletions
diff --git a/layouts/community/ergodox/drashna/keymap.c b/layouts/community/ergodox/drashna/keymap.c
index 430328fed..dd47899d7 100644
--- a/layouts/community/ergodox/drashna/keymap.c
+++ b/layouts/community/ergodox/drashna/keymap.c
@@ -174,7 +174,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
             KC_MAKE, _______, _______, _______, _______, _______, UC_MOD,                  KC_NUKE, _________________ADJUST_R1_________________, KC_RST,
             VRSN,    _________________ADJUST_L1_________________, _______,                 _______, _________________ADJUST_R1_________________, EEP_RST,
             _______, _________________ADJUST_L2_________________,                                   _________________ADJUST_R2_________________, RGB_IDL,
-             _______, _________________ADJUST_L3_________________, _______,                 _______, _________________ADJUST_R3_________________, TG_MODS,
+             KEYLOCK, _________________ADJUST_L3_________________, _______,                 _______, _________________ADJUST_R3_________________, TG_MODS,
             _______, _______, _______, _______, _______,                                                     _______, _______, _______, _______, _______,
                                                          _______, _______,                 _______, _______,
                                                                   _______,                 _______,
diff --git a/layouts/community/ortho_4x12/drashna/keymap.c b/layouts/community/ortho_4x12/drashna/keymap.c
index cb3166c94..3ba9cf64f 100644
--- a/layouts/community/ortho_4x12/drashna/keymap.c
+++ b/layouts/community/ortho_4x12/drashna/keymap.c
@@ -106,7 +106,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    KC_MAKE, _________________ADJUST_L1_________________, _________________ADJUST_R1_________________, KC_RST,
    VRSN,    _________________ADJUST_L2_________________, _________________ADJUST_R2_________________, EEP_RST,
    TH_LVL,  _________________ADJUST_L3_________________, _________________ADJUST_R3_________________, RGB_IDL,
-    HPT_TOG, _______, _______, _______, _______, KC_NUKE, _______, _______, _______, _______, _______, TG_MODS
+    KEYLOCK, _______, _______, _______, _______, KC_NUKE, _______, _______, _______, _______, _______, TG_MODS
  )
 };
diff --git a/layouts/community/ortho_5x12/drashna/keymap.c b/layouts/community/ortho_5x12/drashna/keymap.c
index 01b06d627..ab70be282 100644
--- a/layouts/community/ortho_5x12/drashna/keymap.c
+++ b/layouts/community/ortho_5x12/drashna/keymap.c
@@ -124,7 +124,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  KC_MAKE, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_RST,
  VRSN,    _________________ADJUST_L1_________________, _________________ADJUST_R1_________________, EEP_RST,
  _______, _________________ADJUST_L2_________________, _________________ADJUST_R2_________________, RGB_IDL,
-  _______, _________________ADJUST_L3_________________, _________________ADJUST_R3_________________, TG_MODS,
+  KEYLOCK, _________________ADJUST_L3_________________, _________________ADJUST_R3_________________, TG_MODS,
  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
 )
 };
diff --git a/layouts/community/split_3x6_3/drashna/keymap.c b/layouts/community/split_3x6_3/drashna/keymap.c
index a3145a404..7c31972e3 100644
--- a/layouts/community/split_3x6_3/drashna/keymap.c
+++ b/layouts/community/split_3x6_3/drashna/keymap.c
@@ -89,7 +89,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  [_ADJUST] = LAYOUT_split_3x6_3_wrapper( \
    KC_MAKE, _________________ADJUST_L1_________________,                    _________________ADJUST_R1_________________, KC_RESET,
    VRSN,    _________________ADJUST_L2_________________,                    _________________ADJUST_R2_________________, EEP_RST,
-    MG_NKRO, _________________ADJUST_L3_________________,                    _________________ADJUST_R3_________________, RGB_IDL,
+    KEYLOCK, _________________ADJUST_L3_________________,                    _________________ADJUST_R3_________________, RGB_IDL,
                                     HPT_TOG, KC_NUKE, _______,        _______, TG_MODS, HPT_FBK
  )
 };
author	Drashna Jael're <drashna@live.com>	2021-10-15 22:32:41 -0700
committer	Drashna Jael're <drashna@live.com>	2021-10-15 22:32:41 -0700
commit	e5662aa53dc957e293a2201ebfd5d885144240a7 (patch)
tree	c04c70497191a1327801950ba8a729d6026f3c9c /layouts
parent	a27c949a32651c69037777a2dd3924910efb35f5 (diff)
parent	9a0addc77e3e48b908b846fc78326d4a20c30bc9 (diff)
download	qmk_firmware-e5662aa53dc957e293a2201ebfd5d885144240a7.tar.gz qmk_firmware-e5662aa53dc957e293a2201ebfd5d885144240a7.zip

diff --git a/layouts/community/ergodox/drashna/keymap.c b/layouts/community/ergodox/drashna/keymap.c index 430328fed..dd47899d7 100644 --- a/layouts/community/ergodox/drashna/keymap.c +++ b/layouts/community/ergodox/drashna/keymap.c
@@ -174,7 +174,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
174	KC_MAKE, _______, _______, _______, _______, _______, UC_MOD, KC_NUKE, _________________ADJUST_R1_________________, KC_RST,	174	KC_MAKE, _______, _______, _______, _______, _______, UC_MOD, KC_NUKE, _________________ADJUST_R1_________________, KC_RST,
175	VRSN, _________________ADJUST_L1_________________, _______, _______, _________________ADJUST_R1_________________, EEP_RST,	175	VRSN, _________________ADJUST_L1_________________, _______, _______, _________________ADJUST_R1_________________, EEP_RST,
176	_______, _________________ADJUST_L2_________________, _________________ADJUST_R2_________________, RGB_IDL,	176	_______, _________________ADJUST_L2_________________, _________________ADJUST_R2_________________, RGB_IDL,
177	_______, _________________ADJUST_L3_________________, _______, _______, _________________ADJUST_R3_________________, TG_MODS,	177	KEYLOCK, _________________ADJUST_L3_________________, _______, _______, _________________ADJUST_R3_________________, TG_MODS,
178	_______, _______, _______, _______, _______, _______, _______, _______, _______, _______,	178	_______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
179	_______, _______, _______, _______,	179	_______, _______, _______, _______,
180	_______, _______,	180	_______, _______,


diff --git a/layouts/community/ortho_4x12/drashna/keymap.c b/layouts/community/ortho_4x12/drashna/keymap.c index cb3166c94..3ba9cf64f 100644 --- a/layouts/community/ortho_4x12/drashna/keymap.c +++ b/layouts/community/ortho_4x12/drashna/keymap.c
@@ -106,7 +106,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
106	KC_MAKE, _________________ADJUST_L1_________________, _________________ADJUST_R1_________________, KC_RST,	106	KC_MAKE, _________________ADJUST_L1_________________, _________________ADJUST_R1_________________, KC_RST,
107	VRSN, _________________ADJUST_L2_________________, _________________ADJUST_R2_________________, EEP_RST,	107	VRSN, _________________ADJUST_L2_________________, _________________ADJUST_R2_________________, EEP_RST,
108	TH_LVL, _________________ADJUST_L3_________________, _________________ADJUST_R3_________________, RGB_IDL,	108	TH_LVL, _________________ADJUST_L3_________________, _________________ADJUST_R3_________________, RGB_IDL,
109	HPT_TOG, _______, _______, _______, _______, KC_NUKE, _______, _______, _______, _______, _______, TG_MODS	109	KEYLOCK, _______, _______, _______, _______, KC_NUKE, _______, _______, _______, _______, _______, TG_MODS
110	)	110	)
111		111
112	};	112	};


diff --git a/layouts/community/ortho_5x12/drashna/keymap.c b/layouts/community/ortho_5x12/drashna/keymap.c index 01b06d627..ab70be282 100644 --- a/layouts/community/ortho_5x12/drashna/keymap.c +++ b/layouts/community/ortho_5x12/drashna/keymap.c
@@ -124,7 +124,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
124	KC_MAKE, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_RST,	124	KC_MAKE, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_RST,
125	VRSN, _________________ADJUST_L1_________________, _________________ADJUST_R1_________________, EEP_RST,	125	VRSN, _________________ADJUST_L1_________________, _________________ADJUST_R1_________________, EEP_RST,
126	_______, _________________ADJUST_L2_________________, _________________ADJUST_R2_________________, RGB_IDL,	126	_______, _________________ADJUST_L2_________________, _________________ADJUST_R2_________________, RGB_IDL,
127	_______, _________________ADJUST_L3_________________, _________________ADJUST_R3_________________, TG_MODS,	127	KEYLOCK, _________________ADJUST_L3_________________, _________________ADJUST_R3_________________, TG_MODS,
128	_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______	128	_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
129	)	129	)
130	};	130	};


diff --git a/layouts/community/split_3x6_3/drashna/keymap.c b/layouts/community/split_3x6_3/drashna/keymap.c index a3145a404..7c31972e3 100644 --- a/layouts/community/split_3x6_3/drashna/keymap.c +++ b/layouts/community/split_3x6_3/drashna/keymap.c
@@ -89,7 +89,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
89	[_ADJUST] = LAYOUT_split_3x6_3_wrapper( \	89	[_ADJUST] = LAYOUT_split_3x6_3_wrapper( \
90	KC_MAKE, _________________ADJUST_L1_________________, _________________ADJUST_R1_________________, KC_RESET,	90	KC_MAKE, _________________ADJUST_L1_________________, _________________ADJUST_R1_________________, KC_RESET,
91	VRSN, _________________ADJUST_L2_________________, _________________ADJUST_R2_________________, EEP_RST,	91	VRSN, _________________ADJUST_L2_________________, _________________ADJUST_R2_________________, EEP_RST,
92	MG_NKRO, _________________ADJUST_L3_________________, _________________ADJUST_R3_________________, RGB_IDL,	92	KEYLOCK, _________________ADJUST_L3_________________, _________________ADJUST_R3_________________, RGB_IDL,
93	HPT_TOG, KC_NUKE, _______, _______, TG_MODS, HPT_FBK	93	HPT_TOG, KC_NUKE, _______, _______, TG_MODS, HPT_FBK
94	)	94	)
95	};	95	};