summaryrefslogtreecommitdiff
path: root/keyboards/comet46
diff options
context:
space:
mode:
authorZach White <skullydazed@gmail.com>2021-05-11 10:10:31 -0700
committerGitHub <noreply@github.com>2021-05-11 10:10:31 -0700
commit38d8d5445ebd60932d602184b1f27a112ac79f71 (patch)
treedd8f2a826c1f600916d63261b2407ec7219b1c4a /keyboards/comet46
parentd84cbc3cecd0254df776fc56e9baaa1b1823a6d1 (diff)
Remove KEYMAP and LAYOUT_kc (#12160)
* alias KEYMAP to LAYOUT * remove KEYMAP and LAYOUT_kc
Diffstat (limited to 'keyboards/comet46')
-rw-r--r--keyboards/comet46/comet46.h14
-rw-r--r--keyboards/comet46/keymaps/satt/keymap.c74
2 files changed, 35 insertions, 53 deletions
diff --git a/keyboards/comet46/comet46.h b/keyboards/comet46/comet46.h
index b6598f0178..c108d4193b 100644
--- a/keyboards/comet46/comet46.h
+++ b/keyboards/comet46/comet46.h
@@ -6,20 +6,6 @@
// This a shortcut to help you visually see your layout.
// The first section contains all of the arguements
// The second converts the arguments into a two-dimensional array
-#define LAYOUT_kc( \
- k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k10, k11,\
- k12, k13, k14, k15, k16, k17, k18, k19, k20, k21, k22, k23, k24, k25,\
- k26, k27, k28, k29, k31, k32, k33, k34, k35, k36, k37, k38, k41, k42,\
- k43, k44, k45, k46, k47, k48 \
-) \
-{ \
- { KC_##k13, KC_##k01, KC_##k26, KC_##k12, KC_##k00, KC_##k11, KC_##k25, KC_##k42, KC_##k10, KC_##k24}, \
- { KC_##k03, KC_##k28, KC_##k14, KC_##k02, KC_##k27, KC_##k41, KC_##k09, KC_##k23, KC_##k38, KC_##k08}, \
- { KC_##k31, KC_##k16, KC_##k04, KC_##k29, KC_##k15, KC_##k22, KC_##k37, KC_##k07, KC_##k21, KC_##k36}, \
- { KC_NO, KC_##k32, KC_##k17, KC_##k05, KC_##k43, KC_##k48, KC_##k06, KC_##k20, KC_##k35, KC_NO }, \
- { KC_NO, KC_##k45, KC_##k33, KC_##k18, KC_##k44, KC_##k47, KC_##k19, KC_##k34, KC_##k46, KC_NO }, \
-}
-
#define LAYOUT( \
k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k10, k11,\
k12, k13, k14, k15, k16, k17, k18, k19, k20, k21, k22, k23, k24, k25,\
diff --git a/keyboards/comet46/keymaps/satt/keymap.c b/keyboards/comet46/keymaps/satt/keymap.c
index eec40eff49..98c3c175be 100644
--- a/keyboards/comet46/keymaps/satt/keymap.c
+++ b/keyboards/comet46/keymaps/satt/keymap.c
@@ -75,94 +75,90 @@ enum custom_keycodes {
#define KC_CAD LCA(KC_DEL)
#define KC_RST RESET
-// Fillers to make layering more clear
-#define KC_ KC_TRNS
-#define KC_XXXX KC_NO
-
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
- [_QWERTY] = LAYOUT_kc(
+ [_QWERTY] = LAYOUT(
//,----+----+----+----+----+----+ +----+----+----+----+----+----.
- CAEC, Q , W , E , R , T , Y , U , I , O , P ,DEL ,
+ KC_CAEC, KC_Q , KC_W , KC_E , KC_R , KC_T , KC_Y , KC_U , KC_I , KC_O , KC_P ,KC_DEL ,
//|----+----+----+----+----+----+----+ +----+----+----+----+----+----+----|
- CSTB, A , S , D , F , G ,LPRN, RPRN, H , J , K , L ,SCLN,BSPC,
+ KC_CSTB, KC_A , KC_S , KC_D , KC_F , KC_G ,KC_LPRN, KC_RPRN, KC_H , KC_J , KC_K , KC_L ,KC_SCLN,KC_BSPC,
//|----+----+----+----+----+----+----| |----+----+----+----+----+----+----|
- LSFT, Z , X , C , V , B ,LBRC, RBRC, N , M ,COMM,DOT ,SLSH,QUOT,
+ KC_LSFT, KC_Z , KC_X , KC_C , KC_V , KC_B ,KC_LBRC, KC_RBRC, KC_N , KC_M ,KC_COMM,KC_DOT ,KC_SLSH,KC_QUOT,
//|----+----+----+----+----+----+----| |----+----+----+----+----+----+----|
- IMOF,LWR ,SPCT, ENSF,RSE ,IMON
+ KC_IMOF,KC_LWR ,KC_SPCT, KC_ENSF,KC_RSE ,KC_IMON
// +----+----+---/ \---+----+----+
),
- [_LOWER] = LAYOUT_kc(
+ [_LOWER] = LAYOUT(
//,----+----+----+----+----+----+ +----+----+----+----+----+----.
- ,EXLM, AT ,HASH,DLR ,PERC, CIRC,AMPR,ASTR,LPRN,RPRN, ,
+ _______,KC_EXLM, KC_AT ,KC_HASH,KC_DLR ,KC_PERC, KC_CIRC,KC_AMPR,KC_ASTR,KC_LPRN,KC_RPRN,_______,
//|----+----+----+----+----+----+----+ +----+----+----+----+----+----+----|
- , F1 , F2 , F3 , F4 , F5 , F6 , GRV ,BSLS,MINS,EQL ,LBRC,RBRC, ,
+ _______, KC_F1 , KC_F2 , KC_F3 , KC_F4 , KC_F5 , KC_F6 , KC_GRV ,KC_BSLS,KC_MINS,KC_EQL ,KC_LBRC,KC_RBRC,_______,
//|----+----+----+----+----+----+----| |----+----+----+----+----+----+----|
- , F7 , F8 , F9 , F10, F11, F12, TILD,PIPE,UNDS,PLUS,LCBR,RCBR, ,
+ _______, KC_F7 , KC_F8 , KC_F9 , KC_F10, KC_F11, KC_F12, KC_TILD,KC_PIPE,KC_UNDS,KC_PLUS,KC_LCBR,KC_RCBR,_______,
//|----+----+----+----+----+----+----| |----+----+----+----+----+----+----|
- , , , , ,
+ _______,_______,_______, _______,_______,_______
// +----+----+---/ \---+----+----+
),
- [_RAISE] = LAYOUT_kc(
+ [_RAISE] = LAYOUT(
//,----+----+----+----+----+----+ +----+----+----+----+----+----.
- , 1 , 2 , 3 , 4 , 5 , 6 , 7 , 8 , 9 , 0 , ,
+ _______, KC_1 , KC_2 , KC_3 , KC_4 , KC_5 , KC_6 , KC_7 , KC_8 , KC_9 , KC_0 ,_______,
//|----+----+----+----+----+----+----+ +----+----+----+----+----+----+----|
- , , , , , , , XXXX,LEFT,DOWN, UP ,RGHT,END , ,
+ _______,_______,_______,_______,_______,_______,_______, XXXXXXX,KC_LEFT,KC_DOWN, KC_UP ,KC_RGHT,KC_END ,_______,
//|----+----+----+----+----+----+----| |----+----+----+----+----+----+----|
- , , , , , , , HOME,XXXX,PGDN,PGUP,XXXX,XXXX, ,
+ _______,_______,_______,_______,_______,_______,_______, KC_HOME,XXXXXXX,KC_PGDN,KC_PGUP,XXXXXXX,XXXXXXX,_______,
//|----+----+----+----+----+----+----| |----+----+----+----+----+----+----|
- , , , , ,
+ _______,_______,_______, _______,_______,_______
// +----+----+---/ \---+----+----+
),
- [_PSEUDO_US] = LAYOUT_kc(
+ [_PSEUDO_US] = LAYOUT(
//,----+----+----+----+----+----+ +----+----+----+----+----+----.
- CAEC, Q , W , E , R , T , Y , U , I , O , P ,DEL ,
+ KC_CAEC, KC_Q , KC_W , KC_E , KC_R , KC_T , KC_Y , KC_U , KC_I , KC_O , KC_P ,KC_DEL ,
//|----+----+----+----+----+----+----+ +----+----+----+----+----+----+----|
- CSTB, A , S , D , F , G ,JLPR, JRPR, H , J , K , L ,J2US,BSPC,
+ KC_CSTB, KC_A , KC_S , KC_D , KC_F , KC_G ,KC_JLPR, KC_JRPR, KC_H , KC_J , KC_K , KC_L ,KC_J2US,KC_BSPC,
//|----+----+----+----+----+----+----| |----+----+----+----+----+----+----|
- LSFT, Z , X , C , V , B ,J2US, J2US, N , M ,COMM,DOT ,SLSH,J2US,
+ KC_LSFT, KC_Z , KC_X , KC_C , KC_V , KC_B ,KC_J2US, KC_J2US, KC_N , KC_M ,KC_COMM,KC_DOT ,KC_SLSH,KC_J2US,
//|----+----+----+----+----+----+----| |----+----+----+----+----+----+----|
- IMOF,P_LW,SPCT, ENSF,P_RS,IMON
+ KC_IMOF,KC_P_LW,KC_SPCT, KC_ENSF,KC_P_RS,KC_IMON
// +----+----+---/ \---+----+----+
),
- [_PSEUDO_US_LOWER] = LAYOUT_kc(
+ [_PSEUDO_US_LOWER] = LAYOUT(
//,----+----+----+----+----+----+ +----+----+----+----+----+----.
- ,EXLM,JAT ,HASH,DLR ,PERC, JCIR,JAMP,JAST,JLPR,JRPR, ,
+ _______,KC_EXLM,KC_JAT ,KC_HASH,KC_DLR ,KC_PERC, KC_JCIR,KC_JAMP,KC_JAST,KC_JLPR,KC_JRPR,_______,
//|----+----+----+----+----+----+----+ +----+----+----+----+----+----+----|
- , F1 , F2 , F3 , F4 , F5 , F6 , JGRV,JBSL,MINS,JEQL,JLBR,JRBR, ,
+ _______, KC_F1 , KC_F2 , KC_F3 , KC_F4 , KC_F5 , KC_F6 , KC_JGRV,KC_JBSL,KC_MINS,KC_JEQL,KC_JLBR,KC_JRBR,_______,
//|----+----+----+----+----+----+----| |----+----+----+----+----+----+----|
- , F7 , F8 , F9 , F10, F11, F12, JTIL,JPIP,JUND,JPLU,JLCB,JRCB, ,
+ _______, KC_F7 , KC_F8 , KC_F9 , KC_F10, KC_F11, KC_F12, KC_JTIL,KC_JPIP,KC_JUND,KC_JPLU,KC_JLCB,KC_JRCB,_______,
//|----+----+----+----+----+----+----| |----+----+----+----+----+----+----|
- , , , , ,
+ _______,_______,_______, _______,_______,_______
// +----+----+---/ \---+----+----+
),
- [_PSEUDO_US_RAISE] = LAYOUT_kc(
+ [_PSEUDO_US_RAISE] = LAYOUT(
//,----+----+----+----+----+----+ +----+----+----+----+----+----.
- , 1 , 2 , 3 , 4 , 5 , 6 , 7 , 8 , 9 , 0 , ,
+ _______, KC_1 , KC_2 , KC_3 , KC_4 , KC_5 , KC_6 , KC_7 , KC_8 , KC_9 , KC_0 ,_______,
//|----+----+----+----+----+----+----+ +----+----+----+----+----+----+----|
- , , , , , ,JZHT, XXXX,LEFT,DOWN, UP ,RGHT,END , ,
+ _______,_______,_______,_______,_______,_______,KC_JZHT, XXXXXXX,KC_LEFT,KC_DOWN, KC_UP ,KC_RGHT,KC_END ,_______,
//|----+----+----+----+----+----+----| |----+----+----+----+----+----+----|
- , , , , , , , HOME,XXXX,PGDN,PGUP,XXXX,XXXX, ,
+ _______,_______,_______,_______,_______,_______,_______, KC_HOME,XXXXXXX,KC_PGDN,KC_PGUP,XXXXXXX,XXXXXXX,_______,
//|----+----+----+----+----+----+----| |----+----+----+----+----+----+----|
- , , , , ,
+ _______,_______,_______, _______,_______,_______
// +----+----+---/ \---+----+----+
),
- [_ADJUST] = LAYOUT_kc(
+ [_ADJUST] = LAYOUT(
//,----+----+----+----+----+----+ +----+----+----+----+----+----.
- , , , , , , , , , , , ,
+ _______,_______,_______,_______,_______,_______, _______,_______,_______,_______,_______,_______,
//|----+----+----+----+----+----+----+ +----+----+----+----+----+----+----|
- , , , , , ,CAD , QWRT, , , , , , ,
+ _______,_______,_______,_______,_______,_______,KC_CAD , KC_QWRT,_______,_______,_______,_______,_______,_______,
//|----+----+----+----+----+----+----| |----+----+----+----+----+----+----|
- , , , , , ,RST , P_US, , , , , , ,
+ _______,_______,_______,_______,_______,_______,KC_RST , KC_P_US,_______,_______,_______,_______,_______,_______,
//|----+----+----+----+----+----+----| |----+----+----+----+----+----+----|
- , , , , ,
+ _______,_______,_______, _______,_______,_______
// +----+----+---/ \---+----+----+
)