Keymap: Clean-up of dshields keymaps. (#3983)

author: Daniel Shields <daniel.shields@bcs.org> 2018-09-27 19:47:26 +0100
committer: Drashna Jaelre <drashna@live.com> 2018-09-27 11:47:26 -0700
commit: 8b2591c707abe670dbd1ab21237870bc989d0614 (patch)
tree: 8e14febc473f4773cff7f679fd7dab172ba8ec34
parent: 13e166d9c42845e2622605e94d4a0c38fa5443a0 (diff)
download: qmk_firmware-8b2591c707abe670dbd1ab21237870bc989d0614.tar.gz
qmk_firmware-8b2591c707abe670dbd1ab21237870bc989d0614.zip
4 files changed, 2 insertions, 63 deletions
diff --git a/keyboards/model01/keymaps/dshields/config.h b/keyboards/model01/keymaps/dshields/config.h
index 86a4dd531..4d609e436 100644
--- a/keyboards/model01/keymaps/dshields/config.h
+++ b/keyboards/model01/keymaps/dshields/config.h
@@ -1,8 +1,5 @@
 #pragma once
-#define _______ KC_TRNS
-#define XXXXXXX KC_NO
 #define USB_MAX_POWER_CONSUMPTION 100
 #define ONESHOT_TAP_TOGGLE        2
 #define ONESHOT_TIMEOUT           3000
diff --git a/keyboards/model01/keymaps/dshields/rules.mk b/keyboards/model01/keymaps/dshields/rules.mk
index 4d1abd88a..6c605daec 100644
--- a/keyboards/model01/keymaps/dshields/rules.mk
+++ b/keyboards/model01/keymaps/dshields/rules.mk
@@ -1,2 +1 @@
-# used by default keymap
+MOUSEKEY_ENABLE = yes
-MOUSEKEY_ENABLE = yes       # Mouse keys(+4700)
diff --git a/keyboards/planck/keymaps/dshields/config.h b/keyboards/planck/keymaps/dshields/config.h
index 9ba854ef0..b149530b8 100644
--- a/keyboards/planck/keymaps/dshields/config.h
+++ b/keyboards/planck/keymaps/dshields/config.h
@@ -1,15 +1,4 @@
-#ifndef CONFIG_USER_H
+#pragma once
-#define CONFIG_USER_H
-#include "../../config.h"
-#define QMK_ESC_OUTPUT F1
-#define QMK_ESC_INPUT  D5
-#define QMK_LED        E6
-#define QMK_SPEAKER    C6
-#define _______ KC_TRNS
-#define XXXXXXX KC_NO
 #define USB_MAX_POWER_CONSUMPTION 100
 #define ONESHOT_TAP_TOGGLE        2
@@ -39,5 +28,3 @@
 // mod-tap keys
 #define MT_SPC  SFT_T(KC_SPC)
-#endif
diff --git a/keyboards/planck/keymaps/dshields/keymap.c b/keyboards/planck/keymaps/dshields/keymap.c
index a39dc5e77..11abaa6b0 100644
--- a/keyboards/planck/keymaps/dshields/keymap.c
+++ b/keyboards/planck/keymaps/dshields/keymap.c
@@ -17,68 +17,24 @@ enum planck_keycodes { DYNAMIC_MACRO_RANGE = SAFE_RANGE };
 #endif
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    /* Default
-     * ,-----------------------------------------------------------------------------------.
-     * |   Q  |   W  |   E  |   R  |   T  | Esc  | Bksp |   Y  |   U  |   I  |   O  |   P  |
-     * |------+------+------+------+------+-------------+------+------+------+------+------|
-     * |   A  |   S  |   D  |   F  |   G  | Tab  | Enter|   H  |   J  |   K  |   L  |   ;  |
-     * |------+------+------+------+------+------|------+------+------+------+------+------|
-     * |   Z  |   X  |   C  |   V  |   B  | Shift|DmPlay|   N  |   M  |   ,  |   .  |   /  |
-     * |------+------+------+------+------+------+------+------+------+------+------+------|
-     * | Ctrl | Super| Alt  | Fun  | Lower|    Space    | Raise| Left | Down |  Up  |Right |
-     * `-----------------------------------------------------------------------------------'
-     */
    [DEF] = LAYOUT_planck_grid(
        KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_ESC,  KC_BSPC, KC_Y,    KC_U,    KC_I,    KC_O,    KC_P   ,
        KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_TAB,  KC_ENT,  KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN,
        KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    OSM_SFT, DM_PLAY, KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,
        OSM_CTL, KC_LGUI, OSM_ALT, OSL_FUN, OSL_LWR, MT_SPC,  MT_SPC,  OSL_RSE, KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT
    ),
-    /* Lower
-     * ,-----------------------------------------------------------------------------------.
-     * |   !  |   @  |   #  |   $  |   %  |      |      |   ^  |   &  |   *  |   (  |   )  |
-     * |------+------+------+------+------+-------------+------+------+------+------+------|
-     * |   ~  |      |      |      |      |      |      |   _  |   +  |      |   {  |   }  |
-     * |------+------+------+------+------+------|------+------+------+------+------+------|
-     * |      |      |      |      |      |      |      |      |      |      |   "  |   |  |
-     * |------+------+------+------+------+------+------+------+------+------+------+------|
-     * |      |      |      |      |      |             |      | Home | PgDn | PgUp | End  |
-     * `-----------------------------------------------------------------------------------'
-     */
    [LWR] = LAYOUT_planck_grid(
        KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC, _______, _______, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN,
        KC_TILD, _______, _______, _______, _______, _______, _______, KC_UNDS, KC_PLUS, _______, KC_LCBR, KC_RCBR,
        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_DQUO, KC_PIPE,
        _______, _______, _______, _______, _______, _______, _______, _______, KC_HOME, KC_PGDN, KC_PGUP, KC_END 
    ),
-    /* Raise
-     * ,-----------------------------------------------------------------------------------.
-     * |   1  |   2  |   3  |   4  |   5  |      |      |   6  |   7  |   8  |   9  |   0  |
-     * |------+------+------+------+------+-------------+------+------+------+------+------|
-     * |   `  |      |      |      |      |      |      |   -  |   =  |      |   [  |   ]  |
-     * |------+------+------+------+------+------|------+------+------+------+------+------|
-     * |      |      |      |      |      |      |      |      |      |      |   '  |   \  |
-     * |------+------+------+------+------+------+------+------+------+------+------+------|
-     * |      |      |      |      |      |             |      | Home | PgDn | PgUp | End  |
-     * `-----------------------------------------------------------------------------------'
-     */
    [RSE] = LAYOUT_planck_grid(
        KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    _______, _______, KC_6,    KC_7,    KC_8,    KC_9,    KC_0   ,
        KC_GRV,  _______, _______, _______, _______, _______, _______, KC_MINS, KC_EQL,  _______, KC_LBRC, KC_RBRC,
        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_QUOT, KC_BSLS,
        _______, _______, _______, _______, _______, _______, _______, _______, KC_HOME, KC_PGDN, KC_PGUP, KC_END 
    ),
-    /* Function
-     * ,-----------------------------------------------------------------------------------.
-     * |  F1  |  F2  |  F3  |  F4  |  F5  | Reset|Delete|  F6  |  F7  |  F8  |  F9  | F10  |
-     * |------+------+------+------+------+-------------+------+------+------+------+------|
-     * | F11  | F12  | F13  | F14  | F15  |      |      |      |MsWhLt|MsWhDn|MsWhUp|MsWhRt|
-     * |------+------+------+------+------+------|------+------+------+------+------+------|
-     * |BlTggl|BlStep|      |      |      |DmStrt|DmStop|      |      |MsBtn1|MsBtn2|MsBtn3|
-     * |------+------+------+------+------+------+------+------+------+------+------+------|
-     * |      |      |      |      |      |             |      |MsLeft|MsDown| MsUp |MsRght|
-     * `-----------------------------------------------------------------------------------'
-     */
    [FUN] = LAYOUT_planck_grid(
        KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   RESET,   KC_DEL,  KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10 ,
        KC_F11,  KC_F12,  KC_F13,  KC_F14,  KC_F15,  _______, _______, _______, KC_WH_L, KC_WH_D, KC_WH_U, KC_WH_R,
author	Daniel Shields <daniel.shields@bcs.org>	2018-09-27 19:47:26 +0100
committer	Drashna Jaelre <drashna@live.com>	2018-09-27 11:47:26 -0700
commit	8b2591c707abe670dbd1ab21237870bc989d0614 (patch)
tree	8e14febc473f4773cff7f679fd7dab172ba8ec34
parent	13e166d9c42845e2622605e94d4a0c38fa5443a0 (diff)
download	qmk_firmware-8b2591c707abe670dbd1ab21237870bc989d0614.tar.gz qmk_firmware-8b2591c707abe670dbd1ab21237870bc989d0614.zip

diff --git a/keyboards/model01/keymaps/dshields/config.h b/keyboards/model01/keymaps/dshields/config.h index 86a4dd531..4d609e436 100644 --- a/keyboards/model01/keymaps/dshields/config.h +++ b/keyboards/model01/keymaps/dshields/config.h
@@ -1,8 +1,5 @@
1	#pragma once	1	#pragma once
2		2
3	#define _______ KC_TRNS
4	#define XXXXXXX KC_NO
5
6	#define USB_MAX_POWER_CONSUMPTION 100	3	#define USB_MAX_POWER_CONSUMPTION 100
7	#define ONESHOT_TAP_TOGGLE 2	4	#define ONESHOT_TAP_TOGGLE 2
8	#define ONESHOT_TIMEOUT 3000	5	#define ONESHOT_TIMEOUT 3000


diff --git a/keyboards/model01/keymaps/dshields/rules.mk b/keyboards/model01/keymaps/dshields/rules.mk index 4d1abd88a..6c605daec 100644 --- a/keyboards/model01/keymaps/dshields/rules.mk +++ b/keyboards/model01/keymaps/dshields/rules.mk
@@ -1,2 +1 @@
1	# used by default keymap		MOUSEKEY_ENABLE = yes
2	MOUSEKEY_ENABLE = yes # Mouse keys(+4700)


diff --git a/keyboards/planck/keymaps/dshields/config.h b/keyboards/planck/keymaps/dshields/config.h index 9ba854ef0..b149530b8 100644 --- a/keyboards/planck/keymaps/dshields/config.h +++ b/keyboards/planck/keymaps/dshields/config.h
@@ -1,15 +1,4 @@
1	#ifndef CONFIG_USER_H	1	#pragma once
2	#define CONFIG_USER_H
3
4	#include "../../config.h"
5
6	#define QMK_ESC_OUTPUT F1
7	#define QMK_ESC_INPUT D5
8	#define QMK_LED E6
9	#define QMK_SPEAKER C6
10
11	#define _______ KC_TRNS
12	#define XXXXXXX KC_NO
13		2
14	#define USB_MAX_POWER_CONSUMPTION 100	3	#define USB_MAX_POWER_CONSUMPTION 100
15	#define ONESHOT_TAP_TOGGLE 2	4	#define ONESHOT_TAP_TOGGLE 2
@@ -39,5 +28,3 @@
39	// mod-tap keys	28	// mod-tap keys
40	#define MT_SPC SFT_T(KC_SPC)	29	#define MT_SPC SFT_T(KC_SPC)
41		30
42	#endif
43


diff --git a/keyboards/planck/keymaps/dshields/keymap.c b/keyboards/planck/keymaps/dshields/keymap.c index a39dc5e77..11abaa6b0 100644 --- a/keyboards/planck/keymaps/dshields/keymap.c +++ b/keyboards/planck/keymaps/dshields/keymap.c
@@ -17,68 +17,24 @@ enum planck_keycodes { DYNAMIC_MACRO_RANGE = SAFE_RANGE };
17	#endif	17	#endif
18		18
19	const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {	19	const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
20	/* Default
21	* ,-----------------------------------------------------------------------------------.
22	* \| Q \| W \| E \| R \| T \| Esc \| Bksp \| Y \| U \| I \| O \| P \|
23	* \|------+------+------+------+------+-------------+------+------+------+------+------\|
24	* \| A \| S \| D \| F \| G \| Tab \| Enter\| H \| J \| K \| L \| ; \|
25	* \|------+------+------+------+------+------\|------+------+------+------+------+------\|
26	* \| Z \| X \| C \| V \| B \| Shift\|DmPlay\| N \| M \| , \| . \| / \|
27	* \|------+------+------+------+------+------+------+------+------+------+------+------\|
28	* \| Ctrl \| Super\| Alt \| Fun \| Lower\| Space \| Raise\| Left \| Down \| Up \|Right \|
29	* `-----------------------------------------------------------------------------------'
30	*/
31	[DEF] = LAYOUT_planck_grid(	20	[DEF] = LAYOUT_planck_grid(
32	KC_Q, KC_W, KC_E, KC_R, KC_T, KC_ESC, KC_BSPC, KC_Y, KC_U, KC_I, KC_O, KC_P ,	21	KC_Q, KC_W, KC_E, KC_R, KC_T, KC_ESC, KC_BSPC, KC_Y, KC_U, KC_I, KC_O, KC_P ,
33	KC_A, KC_S, KC_D, KC_F, KC_G, KC_TAB, KC_ENT, KC_H, KC_J, KC_K, KC_L, KC_SCLN,	22	KC_A, KC_S, KC_D, KC_F, KC_G, KC_TAB, KC_ENT, KC_H, KC_J, KC_K, KC_L, KC_SCLN,
34	KC_Z, KC_X, KC_C, KC_V, KC_B, OSM_SFT, DM_PLAY, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH,	23	KC_Z, KC_X, KC_C, KC_V, KC_B, OSM_SFT, DM_PLAY, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH,
35	OSM_CTL, KC_LGUI, OSM_ALT, OSL_FUN, OSL_LWR, MT_SPC, MT_SPC, OSL_RSE, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT	24	OSM_CTL, KC_LGUI, OSM_ALT, OSL_FUN, OSL_LWR, MT_SPC, MT_SPC, OSL_RSE, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT
36	),	25	),
37	/* Lower
38	* ,-----------------------------------------------------------------------------------.
39	* \| ! \| @ \| # \| $ \| % \| \| \| ^ \| & \| * \| ( \| ) \|
40	* \|------+------+------+------+------+-------------+------+------+------+------+------\|
41	* \| ~ \| \| \| \| \| \| \| _ \| + \| \| { \| } \|
42	* \|------+------+------+------+------+------\|------+------+------+------+------+------\|
43	* \| \| \| \| \| \| \| \| \| \| \| " \| \| \|
44	* \|------+------+------+------+------+------+------+------+------+------+------+------\|
45	* \| \| \| \| \| \| \| \| Home \| PgDn \| PgUp \| End \|
46	* `-----------------------------------------------------------------------------------'
47	*/
48	[LWR] = LAYOUT_planck_grid(	26	[LWR] = LAYOUT_planck_grid(
49	KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, _______, _______, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN,	27	KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, _______, _______, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN,
50	KC_TILD, _______, _______, _______, _______, _______, _______, KC_UNDS, KC_PLUS, _______, KC_LCBR, KC_RCBR,	28	KC_TILD, _______, _______, _______, _______, _______, _______, KC_UNDS, KC_PLUS, _______, KC_LCBR, KC_RCBR,
51	_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_DQUO, KC_PIPE,	29	_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_DQUO, KC_PIPE,
52	_______, _______, _______, _______, _______, _______, _______, _______, KC_HOME, KC_PGDN, KC_PGUP, KC_END	30	_______, _______, _______, _______, _______, _______, _______, _______, KC_HOME, KC_PGDN, KC_PGUP, KC_END
53	),	31	),
54	/* Raise
55	* ,-----------------------------------------------------------------------------------.
56	* \| 1 \| 2 \| 3 \| 4 \| 5 \| \| \| 6 \| 7 \| 8 \| 9 \| 0 \|
57	* \|------+------+------+------+------+-------------+------+------+------+------+------\|
58	* \| ` \| \| \| \| \| \| \| - \| = \| \| [ \| ] \|
59	* \|------+------+------+------+------+------\|------+------+------+------+------+------\|
60	* \| \| \| \| \| \| \| \| \| \| \| ' \| \ \|
61	* \|------+------+------+------+------+------+------+------+------+------+------+------\|
62	* \| \| \| \| \| \| \| \| Home \| PgDn \| PgUp \| End \|
63	* `-----------------------------------------------------------------------------------'
64	*/
65	[RSE] = LAYOUT_planck_grid(	32	[RSE] = LAYOUT_planck_grid(
66	KC_1, KC_2, KC_3, KC_4, KC_5, _______, _______, KC_6, KC_7, KC_8, KC_9, KC_0 ,	33	KC_1, KC_2, KC_3, KC_4, KC_5, _______, _______, KC_6, KC_7, KC_8, KC_9, KC_0 ,
67	KC_GRV, _______, _______, _______, _______, _______, _______, KC_MINS, KC_EQL, _______, KC_LBRC, KC_RBRC,	34	KC_GRV, _______, _______, _______, _______, _______, _______, KC_MINS, KC_EQL, _______, KC_LBRC, KC_RBRC,
68	_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_QUOT, KC_BSLS,	35	_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_QUOT, KC_BSLS,
69	_______, _______, _______, _______, _______, _______, _______, _______, KC_HOME, KC_PGDN, KC_PGUP, KC_END	36	_______, _______, _______, _______, _______, _______, _______, _______, KC_HOME, KC_PGDN, KC_PGUP, KC_END
70	),	37	),
71	/* Function
72	* ,-----------------------------------------------------------------------------------.
73	* \| F1 \| F2 \| F3 \| F4 \| F5 \| Reset\|Delete\| F6 \| F7 \| F8 \| F9 \| F10 \|
74	* \|------+------+------+------+------+-------------+------+------+------+------+------\|
75	* \| F11 \| F12 \| F13 \| F14 \| F15 \| \| \| \|MsWhLt\|MsWhDn\|MsWhUp\|MsWhRt\|
76	* \|------+------+------+------+------+------\|------+------+------+------+------+------\|
77	* \|BlTggl\|BlStep\| \| \| \|DmStrt\|DmStop\| \| \|MsBtn1\|MsBtn2\|MsBtn3\|
78	* \|------+------+------+------+------+------+------+------+------+------+------+------\|
79	* \| \| \| \| \| \| \| \|MsLeft\|MsDown\| MsUp \|MsRght\|
80	* `-----------------------------------------------------------------------------------'
81	*/
82	[FUN] = LAYOUT_planck_grid(	38	[FUN] = LAYOUT_planck_grid(
83	KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, RESET, KC_DEL, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10 ,	39	KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, RESET, KC_DEL, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10 ,
84	KC_F11, KC_F12, KC_F13, KC_F14, KC_F15, _______, _______, _______, KC_WH_L, KC_WH_D, KC_WH_U, KC_WH_R,	40	KC_F11, KC_F12, KC_F13, KC_F14, KC_F15, _______, _______, _______, KC_WH_L, KC_WH_D, KC_WH_U, KC_WH_R,