aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornoroadsleft <xxiinophobia@yahoo.com>2018-10-25 23:45:14 -0700
committerMechMerlin <30334081+mechmerlin@users.noreply.github.com>2018-10-26 07:03:46 -0700
commit8cf15bffa0693caa99d1b9ddc5c6ecc0936f2605 (patch)
tree13b9b3b22281f3e7cc5bab9a4392c8857f519b7e
parent340dd097580f27d9f8ffaad78371869d883220d1 (diff)
downloadqmk_firmware-8cf15bffa0693caa99d1b9ddc5c6ecc0936f2605.tar.gz
qmk_firmware-8cf15bffa0693caa99d1b9ddc5c6ecc0936f2605.zip
JD45: jeebak keymap refactor
- config.h deleted (file was redundant) - layout macro LAYOUT_JD45 removed (identical to new macro LAYOUT) - ../../config.h include line redundant due to past changes to build script - keymap.c - updated to use macro LAYOUT - redundant KC_TRNS and KC_NO definitions removed
Diffstat
-rw-r--r--keyboards/jd45/keymaps/jeebak/config.h16
-rw-r--r--keyboards/jd45/keymaps/jeebak/keymap.c22
2 files changed, 9 insertions, 29 deletions
diff --git a/keyboards/jd45/keymaps/jeebak/config.h b/keyboards/jd45/keymaps/jeebak/config.h
deleted file mode 100644
index bfaa12893..000000000
--- a/keyboards/jd45/keymaps/jeebak/config.h
+++ /dev/null
@@ -1,16 +0,0 @@
1#include "../../config.h"
2
3/**
4 *JD45 keymap definition macro
5 */
6#define LAYOUT_JD45( \
7 K01, K02, K03, K04, K05, K06, K07, K08, K09, K10, K11, K12, K13, \
8 K14, K15, K16, K17, K18, K19, K20, K21, K22, K23, K24, K25, \
9 K26, K27, K28, K29, K30, K31, K32, K33, K34, K35, K36, K37, \
10 K38, K39, K40, K41, K42, K43, K44, K45, K46, K47 \
11) { \
12 { K01, K02, K03, K04, K05, K06, K07, K08, K09, K10, K11, K12, K13 }, \
13 { K14, K15, K16, K17, K18, K19, K20, K21, K22, K23, K24, K25, KC_NO }, \
14 { K26, K27, K28, K29, K30, K31, K32, K33, K34, K35, K36, K37, KC_NO }, \
15 { K38, K39, K40, K41, K42, KC_NO, K43, KC_NO, K44, K45, K46, K47, KC_NO } \
16}
diff --git a/keyboards/jd45/keymaps/jeebak/keymap.c b/keyboards/jd45/keymaps/jeebak/keymap.c
index c711939fc..bb6c82938 100644
--- a/keyboards/jd45/keymaps/jeebak/keymap.c
+++ b/keyboards/jd45/keymaps/jeebak/keymap.c
@@ -48,10 +48,6 @@ enum macro_keycodes
48 KC_AG_TAB_R, 48 KC_AG_TAB_R,
49}; 49};
50 50
51// Fillers to make layering more clear
52#define _______ KC_TRNS
53#define XXXXXXX KC_NO
54
55// Custom macros 51// Custom macros
56#define CTL_ESC CTL_T(KC_ESC) // Tap for Esc, hold for Ctrl 52#define CTL_ESC CTL_T(KC_ESC) // Tap for Esc, hold for Ctrl
57#define SFT_ENT SFT_T(KC_ENT) // Tap for Enter, hold for Shift 53#define SFT_ENT SFT_T(KC_ENT) // Tap for Enter, hold for Shift
@@ -91,7 +87,7 @@ enum macro_keycodes
91 */ 87 */
92 88
93const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { 89const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
94 [_QWERTY] = LAYOUT_JD45( 90 [_QWERTY] = LAYOUT(
95 /*,--------+-------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------.*/ 91 /*,--------+-------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------.*/
96 HPR_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC, KC_BSPC, 92 HPR_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC, KC_BSPC,
97 /*|--------`-------`--------`--------`--------`--------`--------`--------`--------`--------`--------`--------`--------|*/ 93 /*|--------`-------`--------`--------`--------`--------`--------`--------`--------`--------`--------`--------`--------|*/
@@ -113,7 +109,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
113 * | RGUI | Alt | GUI | Lower | TC/Space | TC/Space | Raise | Vol- | Vol+ | Play | 109 * | RGUI | Alt | GUI | Lower | TC/Space | TC/Space | Raise | Vol- | Vol+ | Play |
114 * `-------+-------+-------+-------+---^^^----+---^^^----+---------+--------+--------+----------' 110 * `-------+-------+-------+-------+---^^^----+---^^^----+---------+--------+--------+----------'
115 */ 111 */
116 [_COLEMAK] = LAYOUT_JD45( 112 [_COLEMAK] = LAYOUT(
117 /*,--------+-------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------.*/ 113 /*,--------+-------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------.*/
118 HPR_TAB, KC_Q, KC_W, KC_F, KC_P, KC_G, KC_J, KC_L, KC_U, KC_Y, KC_SCLN, KC_BSPC, KC_BSPC, 114 HPR_TAB, KC_Q, KC_W, KC_F, KC_P, KC_G, KC_J, KC_L, KC_U, KC_Y, KC_SCLN, KC_BSPC, KC_BSPC,
119 /*|--------`-------`--------`--------`--------`--------`--------`--------`--------`--------`--------`--------`--------|*/ 115 /*|--------`-------`--------`--------`--------`--------`--------`--------`--------`--------`--------`--------`--------|*/
@@ -135,7 +131,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
135 * | RGUI | Alt | GUI | Lower | TC/Space | TC/Space | Raise | Vol- | Vol+ | Play | 131 * | RGUI | Alt | GUI | Lower | TC/Space | TC/Space | Raise | Vol- | Vol+ | Play |
136 * `-------+-------+-------+-------+---^^^----+---^^^----+---------+--------+--------+----------' 132 * `-------+-------+-------+-------+---^^^----+---^^^----+---------+--------+--------+----------'
137 */ 133 */
138 [_DVORAK] = LAYOUT_JD45( 134 [_DVORAK] = LAYOUT(
139 /*,--------+-------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------.*/ 135 /*,--------+-------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------.*/
140 HPR_TAB, KC_QUOT, KC_COMM, KC_DOT, KC_P, KC_Y, KC_F, KC_G, KC_C, KC_R, KC_L, KC_BSPC, KC_BSPC, 136 HPR_TAB, KC_QUOT, KC_COMM, KC_DOT, KC_P, KC_Y, KC_F, KC_G, KC_C, KC_R, KC_L, KC_BSPC, KC_BSPC,
141 /*|--------`-------`--------`--------`--------`--------`--------`--------`--------`--------`--------`--------`--------|*/ 137 /*|--------`-------`--------`--------`--------`--------`--------`--------`--------`--------`--------`--------`--------|*/
@@ -157,7 +153,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
157 * | Brite | | | | | | | Prev | Next | Mute | 153 * | Brite | | | | | | | Prev | Next | Mute |
158 * `-------+-------+-------+-------+---^^^----+---^^^----+---------+--------+--------+----------' 154 * `-------+-------+-------+-------+---^^^----+---^^^----+---------+--------+--------+----------'
159 */ 155 */
160 [_LOWER] = LAYOUT_JD45( 156 [_LOWER] = LAYOUT(
161 /*,--------+-------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------.*/ 157 /*,--------+-------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------.*/
162 KC_TILD, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_BSPC, KC_BSPC, 158 KC_TILD, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_BSPC, KC_BSPC,
163 /*|--------`-------`--------`--------`--------`--------`--------`--------`--------`--------`--------`--------`--------|*/ 159 /*|--------`-------`--------`--------`--------`--------`--------`--------`--------`--------`--------`--------`--------|*/
@@ -179,7 +175,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
179 * | Brite | | | | | | | Prev | Next | Mute | 175 * | Brite | | | | | | | Prev | Next | Mute |
180 * `-------+-------+-------+-------+---^^^----+---^^^----+---------+--------+--------+----------' 176 * `-------+-------+-------+-------+---^^^----+---^^^----+---------+--------+--------+----------'
181 */ 177 */
182 [_RAISE] = LAYOUT_JD45( 178 [_RAISE] = LAYOUT(
183 /*,--------+-------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------.*/ 179 /*,--------+-------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------.*/
184 KC_0, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_BSPC, KC_BSPC, 180 KC_0, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_BSPC, KC_BSPC,
185 /*|--------`-------`--------`--------`--------`--------`--------`--------`--------`--------`--------`--------`--------|*/ 181 /*|--------`-------`--------`--------`--------`--------`--------`--------`--------`--------`--------`--------`--------|*/
@@ -205,7 +201,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
205 * seem to work on Mac. Presumably they'll work under Windows. 201 * seem to work on Mac. Presumably they'll work under Windows.
206 */ 202 */
207 203
208 [_TOUCHCURSOR] = LAYOUT_JD45( 204 [_TOUCHCURSOR] = LAYOUT(
209 /*,--------+-------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------.*/ 205 /*,--------+-------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------.*/
210 ALT_TAB, CMD_TAB, CTL_TAB, KC_LGUI, KC_LSFT, KC_TILD, KC_INS, KC_HOME, KC_UP, KC_END, KC_BSPC, _______, _______, 206 ALT_TAB, CMD_TAB, CTL_TAB, KC_LGUI, KC_LSFT, KC_TILD, KC_INS, KC_HOME, KC_UP, KC_END, KC_BSPC, _______, _______,
211 /*|--------`-------`--------`--------`--------`--------`--------`--------`--------`--------`--------`--------`--------|*/ 207 /*|--------`-------`--------`--------`--------`--------`--------`--------`--------`--------`--------`--------`--------|*/
@@ -228,7 +224,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
228 * `-------+-------+-------+-------+---^^^----+---^^^----+---------+--------+--------+----------' 224 * `-------+-------+-------+-------+---^^^----+---^^^----+---------+--------+--------+----------'
229 */ 225 */
230 226
231 [_MOUSECURSOR] = LAYOUT_JD45( 227 [_MOUSECURSOR] = LAYOUT(
232 /*,--------+-------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------.*/ 228 /*,--------+-------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------.*/
233 _______, _______, KC_ACL0, _______, _______, _______, _______, KC_WH_L, KC_MS_U, KC_WH_R, KC_BTN2, _______, _______, 229 _______, _______, KC_ACL0, _______, _______, _______, _______, KC_WH_L, KC_MS_U, KC_WH_R, KC_BTN2, _______, _______,
234 /*|--------`-------`--------`--------`--------`--------`--------`--------`--------`--------`--------`--------`--------|*/ 230 /*|--------`-------`--------`--------`--------`--------`--------`--------`--------`--------`--------`--------`--------|*/
@@ -251,7 +247,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
251 * `-------+-------+-------+-------+---^^^----+---^^^----+---------+--------+--------+----------' 247 * `-------+-------+-------+-------+---^^^----+---^^^----+---------+--------+--------+----------'
252 */ 248 */
253 249
254 [_PLOVER] = LAYOUT_JD45( 250 [_PLOVER] = LAYOUT(
255 /*,--------+-------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------.*/ 251 /*,--------+-------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------.*/
256 KC_1, KC_1, KC_1, KC_1, KC_1, KC_1, KC_1, KC_1, KC_1, KC_1, KC_1, KC_1, KC_1, 252 KC_1, KC_1, KC_1, KC_1, KC_1, KC_1, KC_1, KC_1, KC_1, KC_1, KC_1, KC_1, KC_1,
257 /*|--------`-------`--------`--------`--------`--------`--------`--------`--------`--------`--------`--------`--------|*/ 253 /*|--------`-------`--------`--------`--------`--------`--------`--------`--------`--------`--------`--------`--------|*/
@@ -273,7 +269,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
273 * | | | | | | | | | | Reset | 269 * | | | | | | | | | | Reset |
274 * `-------+-------+-------+-------+---^^^----+---^^^----+---------+--------+--------+----------' 270 * `-------+-------+-------+-------+---^^^----+---^^^----+---------+--------+--------+----------'
275 */ 271 */
276 [_ADJUST] = LAYOUT_JD45( 272 [_ADJUST] = LAYOUT(
277 /*,--------+-------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------.*/ 273 /*,--------+-------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------.*/
278 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL, 274 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL,
279 /*|--------`-------`--------`--------`--------`--------`--------`--------`--------`--------`--------`--------`--------|*/ 275 /*|--------`-------`--------`--------`--------`--------`--------`--------`--------`--------`--------`--------`--------|*/
generated by cgit v1.2.3 (git 2.25.1) at 2025-07-14 02:50:36 +0000