From 573e1c09e79bb0dd542cd4844b1b7e7c97dbda85 Mon Sep 17 00:00:00 2001 From: MechMerlin <30334081+mechmerlin@users.noreply.github.com> Date: Thu, 26 Jul 2018 14:34:38 -0700 Subject: [PATCH] Keyboard: Update KEYMAP to LAYOUT for ckeys obelus (#3495) --- keyboards/ckeys/obelus/keymaps/default/keymap.c | 12 ++++++------ keyboards/ckeys/obelus/obelus.h | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/keyboards/ckeys/obelus/keymaps/default/keymap.c b/keyboards/ckeys/obelus/keymaps/default/keymap.c index a9b15e934..c2c8e4a05 100644 --- a/keyboards/ckeys/obelus/keymaps/default/keymap.c +++ b/keyboards/ckeys/obelus/keymaps/default/keymap.c @@ -18,7 +18,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * | | | | | * `---------------------- ' */ -[0] = KEYMAP( /* LAYER SELECT */ +[0] = LAYOUT( /* LAYER SELECT */ KC_TRNS, KC_TRNS, KC_TRNS, RESET, \ TO(4), KC_TRNS, KC_TRNS, KC_TRNS, \ TO(1), TO(2), TO(3), KC_TRNS, \ @@ -35,7 +35,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * | 0 | . | / | = | * `---------------------- ' */ -[1] = KEYMAP( /* NUMPAD */ +[1] = LAYOUT( /* NUMPAD */ KC_P7, KC_P8, KC_P9, KC_PAST, \ KC_P4, KC_P5, KC_P6, KC_PMNS, \ KC_P1, KC_P2, KC_P3, KC_PPLS, \ @@ -52,7 +52,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * | | | | | * `---------------------- ' */ -[5] = KEYMAP( /* NUMPAD SUPPLEMENT */ +[5] = LAYOUT( /* NUMPAD SUPPLEMENT */ KC_NLCK, KC_TRNS, KC_TRNS, TO(0), \ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, \ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, \ @@ -69,7 +69,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * |LEFT |DOWN |RIGHT|ENTER| * `---------------------- ' */ -[2] = KEYMAP( /* NAV CLUSTER */ +[2] = LAYOUT( /* NAV CLUSTER */ KC_INS, KC_PGUP, KC_TAB, KC_PSCR, \ KC_DEL, KC_PGDN, KC_VOLD, KC_VOLU, \ KC_HOME, KC_UP, KC_END, TO(0), \ @@ -86,7 +86,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * |CTRL | C | R |SPACE| * `---------------------- ' */ -[3] = KEYMAP( /* GAMING */ +[3] = LAYOUT( /* GAMING */ LT(4, KC_ESC), KC_1, KC_2, KC_3, \ KC_TAB, KC_Q, KC_W, KC_E, \ KC_LSFT, KC_A, KC_S, KC_D, \ @@ -103,7 +103,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * |TOGGL|MODE | | | * `---------------------- ' */ -[4] = KEYMAP( /* NUMPAD SUPPLEMENT */ +[4] = LAYOUT( /* NUMPAD SUPPLEMENT */ KC_NO, KC_NO, KC_NO, KC_NO, \ KC_NO, KC_NO, KC_NO, KC_NO, \ KC_NO, KC_NO, KC_NO, KC_NO, \ diff --git a/keyboards/ckeys/obelus/obelus.h b/keyboards/ckeys/obelus/obelus.h index 8444be897..21bc4d723 100644 --- a/keyboards/ckeys/obelus/obelus.h +++ b/keyboards/ckeys/obelus/obelus.h @@ -7,7 +7,7 @@ // The following is an example using the Planck MIT layout // The first section contains all of the arguements // The second converts the arguments into a two-dimensional array -#define KEYMAP( \ +#define LAYOUT( \ k00, k01, k02, k03, \ k10, k11, k12, k13, \ k20, k21, k22, k23, \