[Keyboard][Phoebe] Update default keymap, fix LAYOUT macro (#7604)

* fix LAYOUT macro * Phoebe: Update default keymap * Replace XXXXXXX macro with the previous key instead
author: Max Rumpf <max.rumpf1998@gmail.com> 2019-12-12 04:39:04 +0100
committer: Drashna Jaelre <drashna@live.com> 2019-12-11 19:39:04 -0800
commit: bbad6e1ae7c68b4bf19c9d13f7347ce2b664fed6 (patch)
tree: 48d01ab43366077e28d0a7ca00426f586b15cc7e /keyboards/maxr1998/phoebe
parent: efb21c00ce8090303456dc9c22665a69c3fc298a (diff)
download: qmk_firmware-bbad6e1ae7c68b4bf19c9d13f7347ce2b664fed6.tar.gz
qmk_firmware-bbad6e1ae7c68b4bf19c9d13f7347ce2b664fed6.zip
2 files changed, 15 insertions, 15 deletions
diff --git a/keyboards/maxr1998/phoebe/keymaps/default/keymap.c b/keyboards/maxr1998/phoebe/keymaps/default/keymap.c
index 1bf6f291d..2d25d85e6 100644
--- a/keyboards/maxr1998/phoebe/keymaps/default/keymap.c
+++ b/keyboards/maxr1998/phoebe/keymaps/default/keymap.c
@@ -18,11 +18,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 /* Qwertz
 * ,-----------------------------------------------------------------------------------.
- * | Esc  |   1  |   2  |   3  |   4  |   5  |   6  |   7  |   8  |   9  |   0  | Bspc |
+ * | Esc  |   1  |   2  |   3  |   4  |   5  |   6  |   7  |   8  |   9  |   0  |   ?  |
 * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Grv  |   Q  |   W  |   E  |   R  |   T  |   Z  |   U  |   I  |   O  |   P  | Enter|
+ * | ^  ° |   Q  |   W  |   E  |   R  |   T  |   Z  |   U  |   I  |   O  |   P  | Bspc |
 * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Tab  |   A  |   S  |   D  |   F  |   G  |   H  |   J  |   K  |   L  | +* ~ |   ?  |
+ * | Tab  |   A  |   S  |   D  |   F  |   G  |   H  |   J  |   K  |   L  | +* ~ | Enter|
 * |------+------+------+------+------+------+------+------+------+------+------+------|
 * | Shift|   Y  |   X  |   C  |   V  |   B  |   N  |   M  |   ,  |   .  |  Up  | Shift|
 * |------+------+------+------+------+------+------+------+------+------+------+------|
@@ -30,9 +30,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 * `-----------------------------------------------------------------------------------'
 */
 [_QWERTZ] = LAYOUT(
-  KC_ESC,  DE_1,    DE_2,    DE_3,    DE_4,    DE_5,    DE_6,    DE_7,    DE_8,    DE_9,    DE_0,    KC_BSPC,
+  KC_ESC,  DE_1,    DE_2,    DE_3,    DE_4,    DE_5,    DE_6,    DE_7,    DE_8,    DE_9,    DE_0,    DE_QST,
-  KC_GRV,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_ENT,
+  KC_GRV,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_BSPC,
-  KC_TAB,  KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    DE_PLUS, DE_QST,
+  KC_TAB,  KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    DE_PLUS, KC_ENT,
  KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_UP,   KC_RSFT,
  KC_LCTL, KC_LGUI, KC_LALT, KC_LALT, KC_SC,       KC_SPC,       KC_ALGR, KC_FN,   KC_LEFT, KC_DOWN, KC_RGHT
 ),
@@ -41,7 +41,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 * ,-----------------------------------------------------------------------------------.
 * |      |      |      |      |      |      |      |      |      |      |      |      |
 * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |      |      |      |      |      |      |      |
+ * | ´  ` |      |      |      |      |      |      |      |      |      |      |      |
 * |------+------+------+------+------+------+------+------+------+------+------+------|
 * |      |      |      |      |      |      |      |      |      |      |  #'  |      |
 * |------+------+------+------+------+------+------+------+------+------+------+------|
@@ -52,7 +52,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 */
 [_SC] = LAYOUT(
  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+  DE_ACUT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, DE_HASH, _______,
  _______, DE_LESS, _______, _______, _______, _______, _______, _______, _______, _______, DE_MINS, _______,
  _______, _______, _______, XXXXXXX, _______,      _______,     _______, XXXXXXX, _______, _______, _______
@@ -60,11 +60,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 /* Function layer
 * ,-----------------------------------------------------------------------------------.
- * |      |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |  F7  |  F8  |  F9  | F10  | Del  |
+ * |      |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |  F7  |  F8  | F10  | F11  | F12  |
 * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |      |      |   Ü  |      |   Ö  | F11  |      |
+ * |      |      |      |      |      |      |      |   Ü  |  F9  |   Ö  |      | Del  |
 * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Lock |   Ä  |   ß  |      |      | GAME |      | RGBS | RGBB | RGBS | F12  |      |
+ * | Lock |   Ä  |   ß  |      |      | GAME |      | RGBS | RGBB | RGBS |      |      |
 * |------+------+------+------+------+------+------+------+------+------+------+------|
 * |      |      |      |      |      |      |      | RGBH-| RGBT | RGBH+| PgUp |      |
 * |------+------+------+------+------+------+------+------+------+------+------+------|
@@ -72,9 +72,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 * `-----------------------------------------------------------------------------------'
 */
 [_FN] = LAYOUT(
-  _______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_DEL,
+  _______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F10,  KC_F11,  KC_F12,
-  _______, _______, _______, _______, _______, _______, _______, DE_UE,   _______, DE_OE,   KC_F11,  _______,
+  _______, _______, _______, _______, _______, _______, _______, DE_UE,   KC_F9,   DE_OE,   _______, KC_DEL,
-  KC_LOCK, DE_AE,   DE_SS,   _______, _______, G_1,     _______, RGB_M_P, RGB_M_B, RGB_M_SW,KC_F12,  _______,
+  KC_LOCK, DE_AE,   DE_SS,   _______, _______, G_1,     _______, RGB_M_P, RGB_M_B, RGB_M_SW,_______, _______,
  _______, _______, _______, _______, _______, _______, _______, RGB_HUD, RGB_TOG, RGB_HUI, KC_PGUP, _______,
  XXXXXXX, _______, XXXXXXX, XXXXXXX, XXXXXXX,      _______,     XXXXXXX, XXXXXXX, KC_HOME, KC_PGDN, KC_END
 ),
diff --git a/keyboards/maxr1998/phoebe/phoebe.h b/keyboards/maxr1998/phoebe/phoebe.h
index 2bf5a2d79..f3e61756a 100644
--- a/keyboards/maxr1998/phoebe/phoebe.h
+++ b/keyboards/maxr1998/phoebe/phoebe.h
@@ -14,5 +14,5 @@
      { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b }, \
      { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b }, \
      { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b }, \
-      { k40, k41, k42, k43, k44,    k45,   k47, k48, k49, k4a, k4b } \
+      { k40, k41, k42, k43, k44, k45, k45, k47, k48, k49, k4a, k4b } \
 }
author	Max Rumpf <max.rumpf1998@gmail.com>	2019-12-12 04:39:04 +0100
committer	Drashna Jaelre <drashna@live.com>	2019-12-11 19:39:04 -0800
commit	bbad6e1ae7c68b4bf19c9d13f7347ce2b664fed6 (patch)
tree	48d01ab43366077e28d0a7ca00426f586b15cc7e /keyboards/maxr1998/phoebe
parent	efb21c00ce8090303456dc9c22665a69c3fc298a (diff)
download	qmk_firmware-bbad6e1ae7c68b4bf19c9d13f7347ce2b664fed6.tar.gz qmk_firmware-bbad6e1ae7c68b4bf19c9d13f7347ce2b664fed6.zip

diff --git a/keyboards/maxr1998/phoebe/keymaps/default/keymap.c b/keyboards/maxr1998/phoebe/keymaps/default/keymap.c index 1bf6f291d..2d25d85e6 100644 --- a/keyboards/maxr1998/phoebe/keymaps/default/keymap.c +++ b/keyboards/maxr1998/phoebe/keymaps/default/keymap.c
@@ -18,11 +18,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
18		18
19	/* Qwertz	19	/* Qwertz
20	* ,-----------------------------------------------------------------------------------.	20	* ,-----------------------------------------------------------------------------------.
21	* \| Esc \| 1 \| 2 \| 3 \| 4 \| 5 \| 6 \| 7 \| 8 \| 9 \| 0 \| Bspc \|	21	* \| Esc \| 1 \| 2 \| 3 \| 4 \| 5 \| 6 \| 7 \| 8 \| 9 \| 0 \| ? \|
22	* \|------+------+------+------+------+------+------+------+------+------+------+------\|	22	* \|------+------+------+------+------+------+------+------+------+------+------+------\|
23	* \| Grv \| Q \| W \| E \| R \| T \| Z \| U \| I \| O \| P \| Enter\|	23	* \| ^ ° \| Q \| W \| E \| R \| T \| Z \| U \| I \| O \| P \| Bspc \|
24	* \|------+------+------+------+------+------+------+------+------+------+------+------\|	24	* \|------+------+------+------+------+------+------+------+------+------+------+------\|
25	* \| Tab \| A \| S \| D \| F \| G \| H \| J \| K \| L \| +* ~ \| ? \|	25	* \| Tab \| A \| S \| D \| F \| G \| H \| J \| K \| L \| +* ~ \| Enter\|
26	* \|------+------+------+------+------+------+------+------+------+------+------+------\|	26	* \|------+------+------+------+------+------+------+------+------+------+------+------\|
27	* \| Shift\| Y \| X \| C \| V \| B \| N \| M \| , \| . \| Up \| Shift\|	27	* \| Shift\| Y \| X \| C \| V \| B \| N \| M \| , \| . \| Up \| Shift\|
28	* \|------+------+------+------+------+------+------+------+------+------+------+------\|	28	* \|------+------+------+------+------+------+------+------+------+------+------+------\|
@@ -30,9 +30,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
30	* `-----------------------------------------------------------------------------------'	30	* `-----------------------------------------------------------------------------------'
31	*/	31	*/
32	[_QWERTZ] = LAYOUT(	32	[_QWERTZ] = LAYOUT(
33	KC_ESC, DE_1, DE_2, DE_3, DE_4, DE_5, DE_6, DE_7, DE_8, DE_9, DE_0, KC_BSPC,	33	KC_ESC, DE_1, DE_2, DE_3, DE_4, DE_5, DE_6, DE_7, DE_8, DE_9, DE_0, DE_QST,
34	KC_GRV, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_ENT,	34	KC_GRV, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC,
35	KC_TAB, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, DE_PLUS, DE_QST,	35	KC_TAB, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, DE_PLUS, KC_ENT,
36	KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_UP, KC_RSFT,	36	KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_UP, KC_RSFT,
37	KC_LCTL, KC_LGUI, KC_LALT, KC_LALT, KC_SC, KC_SPC, KC_ALGR, KC_FN, KC_LEFT, KC_DOWN, KC_RGHT	37	KC_LCTL, KC_LGUI, KC_LALT, KC_LALT, KC_SC, KC_SPC, KC_ALGR, KC_FN, KC_LEFT, KC_DOWN, KC_RGHT
38	),	38	),
@@ -41,7 +41,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
41	* ,-----------------------------------------------------------------------------------.	41	* ,-----------------------------------------------------------------------------------.
42	* \| \| \| \| \| \| \| \| \| \| \| \| \|	42	* \| \| \| \| \| \| \| \| \| \| \| \| \|
43	* \|------+------+------+------+------+------+------+------+------+------+------+------\|	43	* \|------+------+------+------+------+------+------+------+------+------+------+------\|
44	* \| \| \| \| \| \| \| \| \| \| \| \| \|	44	* \| ´ ` \| \| \| \| \| \| \| \| \| \| \| \|
45	* \|------+------+------+------+------+------+------+------+------+------+------+------\|	45	* \|------+------+------+------+------+------+------+------+------+------+------+------\|
46	* \| \| \| \| \| \| \| \| \| \| \| #' \| \|	46	* \| \| \| \| \| \| \| \| \| \| \| #' \| \|
47	* \|------+------+------+------+------+------+------+------+------+------+------+------\|	47	* \|------+------+------+------+------+------+------+------+------+------+------+------\|
@@ -52,7 +52,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
52	*/	52	*/
53	[_SC] = LAYOUT(	53	[_SC] = LAYOUT(
54	_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,	54	_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
55	_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,	55	DE_ACUT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
56	_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, DE_HASH, _______,	56	_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, DE_HASH, _______,
57	_______, DE_LESS, _______, _______, _______, _______, _______, _______, _______, _______, DE_MINS, _______,	57	_______, DE_LESS, _______, _______, _______, _______, _______, _______, _______, _______, DE_MINS, _______,
58	_______, _______, _______, XXXXXXX, _______, _______, _______, XXXXXXX, _______, _______, _______	58	_______, _______, _______, XXXXXXX, _______, _______, _______, XXXXXXX, _______, _______, _______
@@ -60,11 +60,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
60		60
61	/* Function layer	61	/* Function layer
62	* ,-----------------------------------------------------------------------------------.	62	* ,-----------------------------------------------------------------------------------.
63	* \| \| F1 \| F2 \| F3 \| F4 \| F5 \| F6 \| F7 \| F8 \| F9 \| F10 \| Del \|	63	* \| \| F1 \| F2 \| F3 \| F4 \| F5 \| F6 \| F7 \| F8 \| F10 \| F11 \| F12 \|
64	* \|------+------+------+------+------+------+------+------+------+------+------+------\|	64	* \|------+------+------+------+------+------+------+------+------+------+------+------\|
65	* \| \| \| \| \| \| \| \| Ü \| \| Ö \| F11 \| \|	65	* \| \| \| \| \| \| \| \| Ü \| F9 \| Ö \| \| Del \|
66	* \|------+------+------+------+------+------+------+------+------+------+------+------\|	66	* \|------+------+------+------+------+------+------+------+------+------+------+------\|
67	* \| Lock \| Ä \| ß \| \| \| GAME \| \| RGBS \| RGBB \| RGBS \| F12 \| \|	67	* \| Lock \| Ä \| ß \| \| \| GAME \| \| RGBS \| RGBB \| RGBS \| \| \|
68	* \|------+------+------+------+------+------+------+------+------+------+------+------\|	68	* \|------+------+------+------+------+------+------+------+------+------+------+------\|
69	* \| \| \| \| \| \| \| \| RGBH-\| RGBT \| RGBH+\| PgUp \| \|	69	* \| \| \| \| \| \| \| \| RGBH-\| RGBT \| RGBH+\| PgUp \| \|
70	* \|------+------+------+------+------+------+------+------+------+------+------+------\|	70	* \|------+------+------+------+------+------+------+------+------+------+------+------\|
@@ -72,9 +72,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
72	* `-----------------------------------------------------------------------------------'	72	* `-----------------------------------------------------------------------------------'
73	*/	73	*/
74	[_FN] = LAYOUT(	74	[_FN] = LAYOUT(
75	_______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_DEL,	75	_______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F10, KC_F11, KC_F12,
76	_______, _______, _______, _______, _______, _______, _______, DE_UE, _______, DE_OE, KC_F11, _______,	76	_______, _______, _______, _______, _______, _______, _______, DE_UE, KC_F9, DE_OE, _______, KC_DEL,
77	KC_LOCK, DE_AE, DE_SS, _______, _______, G_1, _______, RGB_M_P, RGB_M_B, RGB_M_SW,KC_F12, _______,	77	KC_LOCK, DE_AE, DE_SS, _______, _______, G_1, _______, RGB_M_P, RGB_M_B, RGB_M_SW,_______, _______,
78	_______, _______, _______, _______, _______, _______, _______, RGB_HUD, RGB_TOG, RGB_HUI, KC_PGUP, _______,	78	_______, _______, _______, _______, _______, _______, _______, RGB_HUD, RGB_TOG, RGB_HUI, KC_PGUP, _______,
79	XXXXXXX, _______, XXXXXXX, XXXXXXX, XXXXXXX, _______, XXXXXXX, XXXXXXX, KC_HOME, KC_PGDN, KC_END	79	XXXXXXX, _______, XXXXXXX, XXXXXXX, XXXXXXX, _______, XXXXXXX, XXXXXXX, KC_HOME, KC_PGDN, KC_END
80	),	80	),


diff --git a/keyboards/maxr1998/phoebe/phoebe.h b/keyboards/maxr1998/phoebe/phoebe.h index 2bf5a2d79..f3e61756a 100644 --- a/keyboards/maxr1998/phoebe/phoebe.h +++ b/keyboards/maxr1998/phoebe/phoebe.h
@@ -14,5 +14,5 @@
14	{ k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b }, \	14	{ k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b }, \
15	{ k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b }, \	15	{ k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b }, \
16	{ k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b }, \	16	{ k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b }, \
17	{ k40, k41, k42, k43, k44, k45, k47, k48, k49, k4a, k4b } \	17	{ k40, k41, k42, k43, k44, k45, k45, k47, k48, k49, k4a, k4b } \
18	}	18	}