Hbbisenieks keymap update to remove kc_ keymaps (#12391)

* hbbisenieks keymap * change from kc_ keymap * Apply suggestions from code review Co-authored-by: Takeshi ISHII <2170248+mtei@users.noreply.github.com> Co-authored-by: Hilary Brenum <hilary.brenum@tanium.com> Co-authored-by: Zach White <skullydazed@drpepper.org> Co-authored-by: Takeshi ISHII <2170248+mtei@users.noreply.github.com>
author: Hilary B. Brenum <HBBisenieks@users.noreply.github.com> 2021-05-08 09:35:32 -0700
committer: GitHub <noreply@github.com> 2021-05-08 09:35:32 -0700
commit: 067a6f017477938f965b1c4af4dace288d906730 (patch)
tree: cc78a24cfdc21f038d414c1930424509a2ceb794
parent: 189e0d5b983088342aee58e9e1d5dd76c0ace384 (diff)
download: qmk_firmware-067a6f017477938f965b1c4af4dace288d906730.tar.gz
qmk_firmware-067a6f017477938f965b1c4af4dace288d906730.zip
2 files changed, 40 insertions, 38 deletions
diff --git a/keyboards/keebio/iris/keymaps/hbbisenieks/config.h b/keyboards/keebio/iris/keymaps/hbbisenieks/config.h
index 48f448fa2..bb3fe2508 100644
--- a/keyboards/keebio/iris/keymaps/hbbisenieks/config.h
+++ b/keyboards/keebio/iris/keymaps/hbbisenieks/config.h
@@ -17,6 +17,9 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #pragma once
+#include "config_common.h"
 /* Use I2C or Serial, not both */
 #define USE_SERIAL
diff --git a/keyboards/keebio/iris/keymaps/hbbisenieks/keymap.c b/keyboards/keebio/iris/keymaps/hbbisenieks/keymap.c
index 9916fc5ee..a886bf7a3 100644
--- a/keyboards/keebio/iris/keymaps/hbbisenieks/keymap.c
+++ b/keyboards/keebio/iris/keymaps/hbbisenieks/keymap.c
@@ -16,8 +16,6 @@ enum custom_keycodes {
  CHUS,
 };
-#define KC_ KC_TRNS
 #define KC_CAPW LGUI(LSFT(KC_3))        // Capture whole screen
 #define KC_CPYW LGUI(LSFT(LCTL(KC_3)))  // Copy whole screen
 #define KC_CAPP LGUI(LSFT(KC_4))        // Capture portion of screen
@@ -49,46 +47,47 @@ enum custom_keycodes {
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  [_QWERTY] = LAYOUT_kc(
+  [_QWERTY] = LAYOUT(
-  //,----+----+----+----+----+----.              ,----+----+----+----+----+----.
+  //,-------+-------+-------+-------+-------+-------.                    ,-------+-------+-------+-------+-------+-------.
-     GRV , 1  , 2  , 3  , 4  , 5  ,                6  , 7  , 8  , 9  , 0  ,BSPC,
+     KC_GRV , KC_1  , KC_2  , KC_3  , KC_4  , KC_5  ,                      KC_6  , KC_7  , KC_8  , KC_9  , KC_0  ,KC_BSPC,
-  //|----+----+----+----+----+----|              |----+----+----+----+----+----|
+  //|-------+-------+-------+-------+-------+-------|                    |-------+-------+-------+-------+-------+-------|
-     TAB , Q  , W  , E  , R  , T  ,                Y  , U  , I  , O  , P  ,BSLS,
+     KC_TAB , KC_Q  , KC_W  , KC_E  , KC_R  , KC_T  ,                      KC_Y  , KC_U  , KC_I  , KC_O  , KC_P  ,KC_BSLS,
-  //|----+----+----+----+----+----|              |----+----+----+----+----+----|
+  //|-------+-------+-------+-------+-------+-------|                    |-------+-------+-------+-------+-------+-------|
-     ESC , A  , S  , D  , F  , G  ,                H  , J  , K  , L  ,SCLN,QUOT,
+     KC_ESC , KC_A  , KC_S  , KC_D  , KC_F  , KC_G  ,                      KC_H  , KC_J  , KC_K  , KC_L  ,KC_SCLN,KC_QUOT,
-  //|----+----+----+----+----+----+----.    ,----|----+----+----+----+----+----|
+  //|-------+-------+-------+-------+-------+-------+-------.    ,-------|-------+-------+-------+-------+-------+-------|
-     LSBR, Z  , X  , C  , V  , B  ,TT_L,     TT_R, N  , M  ,COMM,DOT ,SLSH,RSBR,
+     KC_LSBR, KC_Z  , KC_X  , KC_C  , KC_V  , KC_B  ,KC_TT_L,     KC_TT_R, KC_N  , KC_M  ,KC_COMM,KC_DOT ,KC_SLSH,KC_RSBR,
-  //`----+----+----+--+-+----+----+----/    \----+----+----+----+----+----+----'
+  //`-------+-------+-------+---+---+-------+-------+-------/    \-------+-------+-------+---+---+-------+-------+-------'
-                       LCTL,SMIN,LGUI,         ENT ,SPC ,LALT
+                                 KC_LCTL,KC_SMIN,KC_LGUI,             KC_ENT ,KC_SPC ,KC_LALT
-  //                  `----+----+----'        `----+----+----'
+  //                            `-------+-------+-------'            `-------+-------+-------'
  ),
-  [_LOWER] = LAYOUT_kc(
+  [_LOWER] = LAYOUT(
-  //,----+----+----+----+----+----.              ,----+----+----+----+----+----.
+  //,-------+-------+-------+-------+-------+-------.                    ,-------+-------+-------+-------+-------+-------.
-     TILD,EXLM, AT ,HASH,DLR ,PERC,               CIRC,AMPR,ASTR,MINS,EQL ,    ,
+     KC_TILD,KC_EXLM, KC_AT ,KC_HASH,KC_DLR ,KC_PERC,                     KC_CIRC,KC_AMPR,KC_ASTR,KC_MINS,KC_EQL ,_______,
-  //|----+----+----+----+----+----|              |----+----+----+----+----+----|
+  //|-------+-------+-------+-------+-------+-------|                    |-------+-------+-------+-------+-------+-------|
-         ,SLOK,    , UP ,    ,RGBT,                P7 , P8 , P9 , E  , F  ,LPRN,
+     _______,KC_SLOK,_______, KC_UP ,_______,KC_RGBT,                      KC_P7 , KC_P8 , KC_P9 , KC_E  , KC_F  ,KC_LPRN,
-  //|----+----+----+----+----+----|              |----+----+----+----+----+----|
+  //|-------+-------+-------+-------+-------+-------|                    |-------+-------+-------+-------+-------+-------|
-     DEL ,    ,LEFT,DOWN,RGHT,GUSR,                P4 , P5 , P6 , C  , D  ,RPRN,
+     KC_DEL ,_______,KC_LEFT,KC_DOWN,KC_RGHT,KC_GUSR,                      KC_P4 , KC_P5 , KC_P6 , KC_C  , KC_D  ,KC_RPRN,
-  //|----+----+----+----+----+----+----.    ,----|----+----+----+----+----+----|
+  //|-------+-------+-------+-------+-------+-------+-------.    ,-------|-------+-------+-------+-------+-------+-------|
-     BL_S,    ,    ,    ,HGRP,CHUS,    ,         , P1 , P2 , P3 , A  , B  ,    ,
+     KC_BL_S,_______,_______,_______,KC_HGRP,KC_CHUS,_______,     _______, KC_P1 , KC_P2 , KC_P3 , KC_A  , KC_B  ,_______,
-  //`----+----+----+--+-+----+----+----/    \----+----+----+----+----+----+----'
+  //`-------+-------+-------+---+---+-------+-------+-------/    \-------+-------+-------+---+---+-------+-------+-------'
-                           ,    ,    ,         DOT , P0 ,COLN
+                                 _______,_______,_______,             KC_DOT , KC_P0 ,KC_COLN
-  //                  `----+----+----'        `----+----+----'
+  //                            `-------+-------+-------'            `-------+-------+-------'
  ),
-  [_RAISE] = LAYOUT_kc(
+  [_RAISE] = LAYOUT(
-  //,----+----+----+----+----+----.              ,----+----+----+----+----+----.
+  //,-------+-------+-------+-------+-------+-------.                    ,-------+-------+-------+-------+-------+-------.
-     F12 , F1 , F2 , F3 , F4 , F5 ,                F6 , F7 , F8 , F9 ,F10 ,F11 ,
+     KC_F12 , KC_F1 , KC_F2 , KC_F3 , KC_F4 , KC_F5 ,                      KC_F6 , KC_F7 , KC_F8 , KC_F9 ,KC_F10 ,KC_F11 ,
-  //|----+----+----+----+----+----|              |----+----+----+----+----+----|
+  //|-------+-------+-------+-------+-------+-------|                    |-------+-------+-------+-------+-------+-------|
-         ,RGBT,RGBM,    ,    ,    ,                   ,AMPR,MUTE,    ,    ,    ,
+     _______,KC_RGBT,KC_RGBM,_______,_______,_______,                     _______,KC_AMPR,KC_MUTE,_______,_______,_______,
-  //|----+----+----+----+----+----|              |----+----+----+----+----+----|
+  //|-------+-------+-------+-------+-------+-------|                    |-------+-------+-------+-------+-------+-------|
-         ,CAPW,CPYW,CAPP,CPYP,PGUP,               EQL ,HOME,VOLU,MRWD,MFFD,    ,
+     _______,KC_CAPW,KC_CPYW,KC_CAPP,KC_CPYP,KC_PGUP,                     KC_EQL ,KC_HOME,KC_VOLU,KC_MRWD,KC_MFFD,_______,
-  //|----+----+----+----+----+----+----.    ,----|----+----+----+----+----+----|
+  //|-------+-------+-------+-------+-------+-------+-------.    ,-------|-------+-------+-------+-------+-------+-------|
-         ,    ,    ,    ,    ,PGDN,    ,         ,PLUS,END ,VOLD,MPLY,MSTP,    ,
+     _______,_______,_______,_______,_______,KC_PGDN,_______,     _______,KC_PLUS,KC_END ,KC_VOLD,KC_MPLY,KC_MSTP,_______,
-  //`----+----+----+--+-+----+----+----/    \----+----+----+----+----+----+----'
+  //`-------+-------+-------+---+---+-------+-------+-------/    \-------+-------+-------+---+---+-------+-------+-------'
-                           ,    ,    ,             ,    ,
+                                 _______,_______,_______,             _______,_______,_______
-  //                  `----+----+----'        `----+----+----'
+  //                            `-------+-------+-------'            `-------+-------+-------'
  ),
  [_ADJUST] = LAYOUT(
author	Hilary B. Brenum <HBBisenieks@users.noreply.github.com>	2021-05-08 09:35:32 -0700
committer	GitHub <noreply@github.com>	2021-05-08 09:35:32 -0700
commit	067a6f017477938f965b1c4af4dace288d906730 (patch)
tree	cc78a24cfdc21f038d414c1930424509a2ceb794
parent	189e0d5b983088342aee58e9e1d5dd76c0ace384 (diff)
download	qmk_firmware-067a6f017477938f965b1c4af4dace288d906730.tar.gz qmk_firmware-067a6f017477938f965b1c4af4dace288d906730.zip

diff --git a/keyboards/keebio/iris/keymaps/hbbisenieks/config.h b/keyboards/keebio/iris/keymaps/hbbisenieks/config.h index 48f448fa2..bb3fe2508 100644 --- a/keyboards/keebio/iris/keymaps/hbbisenieks/config.h +++ b/keyboards/keebio/iris/keymaps/hbbisenieks/config.h
@@ -17,6 +17,9 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
17		17
18	#pragma once	18	#pragma once
19		19
		20	#include "config_common.h"
		21
		22
20	/* Use I2C or Serial, not both */	23	/* Use I2C or Serial, not both */
21		24
22	#define USE_SERIAL	25	#define USE_SERIAL


diff --git a/keyboards/keebio/iris/keymaps/hbbisenieks/keymap.c b/keyboards/keebio/iris/keymaps/hbbisenieks/keymap.c index 9916fc5ee..a886bf7a3 100644 --- a/keyboards/keebio/iris/keymaps/hbbisenieks/keymap.c +++ b/keyboards/keebio/iris/keymaps/hbbisenieks/keymap.c
@@ -16,8 +16,6 @@ enum custom_keycodes {
16	CHUS,	16	CHUS,
17	};	17	};
18		18
19	#define KC_ KC_TRNS
20
21	#define KC_CAPW LGUI(LSFT(KC_3)) // Capture whole screen	19	#define KC_CAPW LGUI(LSFT(KC_3)) // Capture whole screen
22	#define KC_CPYW LGUI(LSFT(LCTL(KC_3))) // Copy whole screen	20	#define KC_CPYW LGUI(LSFT(LCTL(KC_3))) // Copy whole screen
23	#define KC_CAPP LGUI(LSFT(KC_4)) // Capture portion of screen	21	#define KC_CAPP LGUI(LSFT(KC_4)) // Capture portion of screen
@@ -49,46 +47,47 @@ enum custom_keycodes {
49		47
50	const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {	48	const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
51		49
52	[_QWERTY] = LAYOUT_kc(	50	[_QWERTY] = LAYOUT(
53	//,----+----+----+----+----+----. ,----+----+----+----+----+----.	51	//,-------+-------+-------+-------+-------+-------. ,-------+-------+-------+-------+-------+-------.
54	GRV , 1 , 2 , 3 , 4 , 5 , 6 , 7 , 8 , 9 , 0 ,BSPC,	52	KC_GRV , KC_1 , KC_2 , KC_3 , KC_4 , KC_5 , KC_6 , KC_7 , KC_8 , KC_9 , KC_0 ,KC_BSPC,
55	//\|----+----+----+----+----+----\| \|----+----+----+----+----+----\|	53	//\|-------+-------+-------+-------+-------+-------\| \|-------+-------+-------+-------+-------+-------\|
56	TAB , Q , W , E , R , T , Y , U , I , O , P ,BSLS,	54	KC_TAB , KC_Q , KC_W , KC_E , KC_R , KC_T , KC_Y , KC_U , KC_I , KC_O , KC_P ,KC_BSLS,
57	//\|----+----+----+----+----+----\| \|----+----+----+----+----+----\|	55	//\|-------+-------+-------+-------+-------+-------\| \|-------+-------+-------+-------+-------+-------\|
58	ESC , A , S , D , F , G , H , J , K , L ,SCLN,QUOT,	56	KC_ESC , KC_A , KC_S , KC_D , KC_F , KC_G , KC_H , KC_J , KC_K , KC_L ,KC_SCLN,KC_QUOT,
59	//\|----+----+----+----+----+----+----. ,----\|----+----+----+----+----+----\|	57	//\|-------+-------+-------+-------+-------+-------+-------. ,-------\|-------+-------+-------+-------+-------+-------\|
60	LSBR, Z , X , C , V , B ,TT_L, TT_R, N , M ,COMM,DOT ,SLSH,RSBR,	58	KC_LSBR, KC_Z , KC_X , KC_C , KC_V , KC_B ,KC_TT_L, KC_TT_R, KC_N , KC_M ,KC_COMM,KC_DOT ,KC_SLSH,KC_RSBR,
61	//`----+----+----+--+-+----+----+----/ \----+----+----+----+----+----+----'	59	//`-------+-------+-------+---+---+-------+-------+-------/ \-------+-------+-------+---+---+-------+-------+-------'
62	LCTL,SMIN,LGUI, ENT ,SPC ,LALT	60	KC_LCTL,KC_SMIN,KC_LGUI, KC_ENT ,KC_SPC ,KC_LALT
63	// `----+----+----' `----+----+----'	61	// `-------+-------+-------' `-------+-------+-------'
64	),	62	),
65		63
66	[_LOWER] = LAYOUT_kc(	64	[_LOWER] = LAYOUT(
67	//,----+----+----+----+----+----. ,----+----+----+----+----+----.	65	//,-------+-------+-------+-------+-------+-------. ,-------+-------+-------+-------+-------+-------.
68	TILD,EXLM, AT ,HASH,DLR ,PERC, CIRC,AMPR,ASTR,MINS,EQL , ,	66	KC_TILD,KC_EXLM, KC_AT ,KC_HASH,KC_DLR ,KC_PERC, KC_CIRC,KC_AMPR,KC_ASTR,KC_MINS,KC_EQL ,_______,
69	//\|----+----+----+----+----+----\| \|----+----+----+----+----+----\|	67	//\|-------+-------+-------+-------+-------+-------\| \|-------+-------+-------+-------+-------+-------\|
70	,SLOK, , UP , ,RGBT, P7 , P8 , P9 , E , F ,LPRN,	68	_______,KC_SLOK,_______, KC_UP ,_______,KC_RGBT, KC_P7 , KC_P8 , KC_P9 , KC_E , KC_F ,KC_LPRN,
71	//\|----+----+----+----+----+----\| \|----+----+----+----+----+----\|	69	//\|-------+-------+-------+-------+-------+-------\| \|-------+-------+-------+-------+-------+-------\|
72	DEL , ,LEFT,DOWN,RGHT,GUSR, P4 , P5 , P6 , C , D ,RPRN,	70	KC_DEL ,_______,KC_LEFT,KC_DOWN,KC_RGHT,KC_GUSR, KC_P4 , KC_P5 , KC_P6 , KC_C , KC_D ,KC_RPRN,
73	//\|----+----+----+----+----+----+----. ,----\|----+----+----+----+----+----\|	71	//\|-------+-------+-------+-------+-------+-------+-------. ,-------\|-------+-------+-------+-------+-------+-------\|
74	BL_S, , , ,HGRP,CHUS, , , P1 , P2 , P3 , A , B , ,	72	KC_BL_S,_______,_______,_______,KC_HGRP,KC_CHUS,_______, _______, KC_P1 , KC_P2 , KC_P3 , KC_A , KC_B ,_______,
75	//`----+----+----+--+-+----+----+----/ \----+----+----+----+----+----+----'	73	//`-------+-------+-------+---+---+-------+-------+-------/ \-------+-------+-------+---+---+-------+-------+-------'
76	, , , DOT , P0 ,COLN	74	_______,_______,_______, KC_DOT , KC_P0 ,KC_COLN
77	// `----+----+----' `----+----+----'	75	// `-------+-------+-------' `-------+-------+-------'
78	),	76	),
79		77
80	[_RAISE] = LAYOUT_kc(	78	[_RAISE] = LAYOUT(
81	//,----+----+----+----+----+----. ,----+----+----+----+----+----.	79	//,-------+-------+-------+-------+-------+-------. ,-------+-------+-------+-------+-------+-------.
82	F12 , F1 , F2 , F3 , F4 , F5 , F6 , F7 , F8 , F9 ,F10 ,F11 ,	80	KC_F12 , KC_F1 , KC_F2 , KC_F3 , KC_F4 , KC_F5 , KC_F6 , KC_F7 , KC_F8 , KC_F9 ,KC_F10 ,KC_F11 ,
83	//\|----+----+----+----+----+----\| \|----+----+----+----+----+----\|	81	//\|-------+-------+-------+-------+-------+-------\| \|-------+-------+-------+-------+-------+-------\|
84	,RGBT,RGBM, , , , ,AMPR,MUTE, , , ,	82	_______,KC_RGBT,KC_RGBM,_______,_______,_______, _______,KC_AMPR,KC_MUTE,_______,_______,_______,
85	//\|----+----+----+----+----+----\| \|----+----+----+----+----+----\|	83	//\|-------+-------+-------+-------+-------+-------\| \|-------+-------+-------+-------+-------+-------\|
86	,CAPW,CPYW,CAPP,CPYP,PGUP, EQL ,HOME,VOLU,MRWD,MFFD, ,	84	_______,KC_CAPW,KC_CPYW,KC_CAPP,KC_CPYP,KC_PGUP, KC_EQL ,KC_HOME,KC_VOLU,KC_MRWD,KC_MFFD,_______,
87	//\|----+----+----+----+----+----+----. ,----\|----+----+----+----+----+----\|	85	//\|-------+-------+-------+-------+-------+-------+-------. ,-------\|-------+-------+-------+-------+-------+-------\|
88	, , , , ,PGDN, , ,PLUS,END ,VOLD,MPLY,MSTP, ,	86	_______,_______,_______,_______,_______,KC_PGDN,_______, _______,KC_PLUS,KC_END ,KC_VOLD,KC_MPLY,KC_MSTP,_______,
89	//`----+----+----+--+-+----+----+----/ \----+----+----+----+----+----+----'	87	//`-------+-------+-------+---+---+-------+-------+-------/ \-------+-------+-------+---+---+-------+-------+-------'
90	, , , , ,	88	_______,_______,_______, _______,_______,_______
91	// `----+----+----' `----+----+----'	89	// `-------+-------+-------' `-------+-------+-------'
		90
92	),	91	),
93		92
94	[_ADJUST] = LAYOUT(	93	[_ADJUST] = LAYOUT(