Keyboard: Update KEYMAP to LAYOUT for ckeys obelus (#3495)

author: MechMerlin <30334081+mechmerlin@users.noreply.github.com> 2018-07-26 14:34:38 -0700
committer: Drashna Jaelre <drashna@live.com> 2018-07-26 14:34:38 -0700
commit: 573e1c09e79bb0dd542cd4844b1b7e7c97dbda85 (patch)
tree: ef1d1dfd0905c61918b1f7f4e0d374d49340e841
parent: 4deb5de438f409be159182c38a1da3e50f042d59 (diff)
download: qmk_firmware-573e1c09e79bb0dd542cd4844b1b7e7c97dbda85.tar.gz
qmk_firmware-573e1c09e79bb0dd542cd4844b1b7e7c97dbda85.zip
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, \
author	MechMerlin <30334081+mechmerlin@users.noreply.github.com>	2018-07-26 14:34:38 -0700
committer	Drashna Jaelre <drashna@live.com>	2018-07-26 14:34:38 -0700
commit	573e1c09e79bb0dd542cd4844b1b7e7c97dbda85 (patch)
tree	ef1d1dfd0905c61918b1f7f4e0d374d49340e841
parent	4deb5de438f409be159182c38a1da3e50f042d59 (diff)
download	qmk_firmware-573e1c09e79bb0dd542cd4844b1b7e7c97dbda85.tar.gz qmk_firmware-573e1c09e79bb0dd542cd4844b1b7e7c97dbda85.zip

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] = {
18	* \| \| \| \| \|	18	* \| \| \| \| \|
19	* `---------------------- '	19	* `---------------------- '
20	*/	20	*/
21	[0] = KEYMAP( /* LAYER SELECT */	21	[0] = LAYOUT( /* LAYER SELECT */
22	KC_TRNS, KC_TRNS, KC_TRNS, RESET, \	22	KC_TRNS, KC_TRNS, KC_TRNS, RESET, \
23	TO(4), KC_TRNS, KC_TRNS, KC_TRNS, \	23	TO(4), KC_TRNS, KC_TRNS, KC_TRNS, \
24	TO(1), TO(2), TO(3), KC_TRNS, \	24	TO(1), TO(2), TO(3), KC_TRNS, \
@@ -35,7 +35,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
35	* \| 0 \| . \| / \| = \|	35	* \| 0 \| . \| / \| = \|
36	* `---------------------- '	36	* `---------------------- '
37	*/	37	*/
38	[1] = KEYMAP( /* NUMPAD */	38	[1] = LAYOUT( /* NUMPAD */
39	KC_P7, KC_P8, KC_P9, KC_PAST, \	39	KC_P7, KC_P8, KC_P9, KC_PAST, \
40	KC_P4, KC_P5, KC_P6, KC_PMNS, \	40	KC_P4, KC_P5, KC_P6, KC_PMNS, \
41	KC_P1, KC_P2, KC_P3, KC_PPLS, \	41	KC_P1, KC_P2, KC_P3, KC_PPLS, \
@@ -52,7 +52,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
52	* \| \| \| \| \|	52	* \| \| \| \| \|
53	* `---------------------- '	53	* `---------------------- '
54	*/	54	*/
55	[5] = KEYMAP( /* NUMPAD SUPPLEMENT */	55	[5] = LAYOUT( /* NUMPAD SUPPLEMENT */
56	KC_NLCK, KC_TRNS, KC_TRNS, TO(0), \	56	KC_NLCK, KC_TRNS, KC_TRNS, TO(0), \
57	KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, \	57	KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, \
58	KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, \	58	KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, \
@@ -69,7 +69,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
69	* \|LEFT \|DOWN \|RIGHT\|ENTER\|	69	* \|LEFT \|DOWN \|RIGHT\|ENTER\|
70	* `---------------------- '	70	* `---------------------- '
71	*/	71	*/
72	[2] = KEYMAP( /* NAV CLUSTER */	72	[2] = LAYOUT( /* NAV CLUSTER */
73	KC_INS, KC_PGUP, KC_TAB, KC_PSCR, \	73	KC_INS, KC_PGUP, KC_TAB, KC_PSCR, \
74	KC_DEL, KC_PGDN, KC_VOLD, KC_VOLU, \	74	KC_DEL, KC_PGDN, KC_VOLD, KC_VOLU, \
75	KC_HOME, KC_UP, KC_END, TO(0), \	75	KC_HOME, KC_UP, KC_END, TO(0), \
@@ -86,7 +86,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
86	* \|CTRL \| C \| R \|SPACE\|	86	* \|CTRL \| C \| R \|SPACE\|
87	* `---------------------- '	87	* `---------------------- '
88	*/	88	*/
89	[3] = KEYMAP( /* GAMING */	89	[3] = LAYOUT( /* GAMING */
90	LT(4, KC_ESC), KC_1, KC_2, KC_3, \	90	LT(4, KC_ESC), KC_1, KC_2, KC_3, \
91	KC_TAB, KC_Q, KC_W, KC_E, \	91	KC_TAB, KC_Q, KC_W, KC_E, \
92	KC_LSFT, KC_A, KC_S, KC_D, \	92	KC_LSFT, KC_A, KC_S, KC_D, \
@@ -103,7 +103,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
103	* \|TOGGL\|MODE \| \| \|	103	* \|TOGGL\|MODE \| \| \|
104	* `---------------------- '	104	* `---------------------- '
105	*/	105	*/
106	[4] = KEYMAP( /* NUMPAD SUPPLEMENT */	106	[4] = LAYOUT( /* NUMPAD SUPPLEMENT */
107	KC_NO, KC_NO, KC_NO, KC_NO, \	107	KC_NO, KC_NO, KC_NO, KC_NO, \
108	KC_NO, KC_NO, KC_NO, KC_NO, \	108	KC_NO, KC_NO, KC_NO, KC_NO, \
109	KC_NO, KC_NO, KC_NO, KC_NO, \	109	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 @@
7	// The following is an example using the Planck MIT layout	7	// The following is an example using the Planck MIT layout
8	// The first section contains all of the arguements	8	// The first section contains all of the arguements
9	// The second converts the arguments into a two-dimensional array	9	// The second converts the arguments into a two-dimensional array
10	#define KEYMAP( \	10	#define LAYOUT( \
11	k00, k01, k02, k03, \	11	k00, k01, k02, k03, \
12	k10, k11, k12, k13, \	12	k10, k11, k12, k13, \
13	k20, k21, k22, k23, \	13	k20, k21, k22, k23, \