aboutsummaryrefslogtreecommitdiff
path: root/keyboards/jd45
diff options
context:
space:
mode:
authornoroadsleft <xxiinophobia@yahoo.com>2018-10-25 23:38:45 -0700
committerMechMerlin <30334081+mechmerlin@users.noreply.github.com>2018-10-26 07:03:46 -0700
commit899731679d262023a9e25eba805b3674b1ceb82e (patch)
treeccd0184936eebf8dae982dcab2d81f85ab9ce223 /keyboards/jd45
parent39addf8bc99e6282e655298c2c24da07a5ef77f8 (diff)
downloadqmk_firmware-899731679d262023a9e25eba805b3674b1ceb82e.tar.gz
qmk_firmware-899731679d262023a9e25eba805b3674b1ceb82e.zip
JD45: blakedietz keymap refactor
- config.h - updated to more-preferred format - layout macro LAYOUT_JD45 removed (identical to new macro LAYOUT) - keymap.c - updated to use macro LAYOUT - redundant KC_TRNS and KC_NO definitions removed
Diffstat (limited to 'keyboards/jd45')
-rw-r--r--keyboards/jd45/keymaps/blakedietz/config.h19
-rw-r--r--keyboards/jd45/keymaps/blakedietz/keymap.c18
2 files changed, 9 insertions, 28 deletions
diff --git a/keyboards/jd45/keymaps/blakedietz/config.h b/keyboards/jd45/keymaps/blakedietz/config.h
index 38d850ef6..eb4cf3bdf 100644
--- a/keyboards/jd45/keymaps/blakedietz/config.h
+++ b/keyboards/jd45/keymaps/blakedietz/config.h
@@ -1,19 +1,4 @@
1#include "../../config.h" 1#pragma once
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}
17 2
18/** 3/**
19 * This makes it possible to do rolling combos (zx) with keys that convert to other keys on hold (z becomes ctrl when 4 * This makes it possible to do rolling combos (zx) with keys that convert to other keys on hold (z becomes ctrl when
@@ -28,4 +13,4 @@
28#define MOUSEKEY_DELAY 0 13#define MOUSEKEY_DELAY 0
29#define MOUSEKEY_TIME_TO_MAX 5 14#define MOUSEKEY_TIME_TO_MAX 5
30#define MOUSEKEY_MAX_SPEED 2 15#define MOUSEKEY_MAX_SPEED 2
31#define MOUSEKEY_WHEEL_DELAY 0 \ No newline at end of file 16#define MOUSEKEY_WHEEL_DELAY 0
diff --git a/keyboards/jd45/keymaps/blakedietz/keymap.c b/keyboards/jd45/keymaps/blakedietz/keymap.c
index bde760a22..a40a2c604 100644
--- a/keyboards/jd45/keymaps/blakedietz/keymap.c
+++ b/keyboards/jd45/keymaps/blakedietz/keymap.c
@@ -45,10 +45,6 @@ enum macro_keycodes
45 KC_AG_TAB_R, 45 KC_AG_TAB_R,
46}; 46};
47 47
48// Fillers to make layering more clear
49#define _______ KC_TRNS
50#define XXXXXXX KC_NO
51
52/** 48/**
53 * This section of macros is for tap or hold functionality. Keys will fire off the second symbol in the name if tapped 49 * This section of macros is for tap or hold functionality. Keys will fire off the second symbol in the name if tapped
54 * or fire the first symbol in the name if held. For example 50 * or fire the first symbol in the name if held. For example
@@ -101,7 +97,7 @@ enum macro_keycodes
101 * `-------+-------+-------+-------+---^^^----+---^^^----+---------+--------+--------+----------' 97 * `-------+-------+-------+-------+---^^^----+---^^^----+---------+--------+--------+----------'
102 */ 98 */
103const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { 99const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
104 [_QWERTY] = LAYOUT_JD45( 100 [_QWERTY] = LAYOUT(
105 /*,--------+-------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------.*/ 101 /*,--------+-------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------.*/
106 KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC, ALL_T(KC_NO), 102 KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC, ALL_T(KC_NO),
107 /*|--------`-------`--------`--------`--------`--------`--------`--------`--------`--------`--------`--------`--------|*/ 103 /*|--------`-------`--------`--------`--------`--------`--------`--------`--------`--------`--------`--------`--------|*/
@@ -124,7 +120,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
124 * | | | | | | | | Prev | Next | Mute | 120 * | | | | | | | | Prev | Next | Mute |
125 * `-------+-------+-------+-------+---^^^----+---^^^----+---------+--------+--------+----------' 121 * `-------+-------+-------+-------+---^^^----+---^^^----+---------+--------+--------+----------'
126 */ 122 */
127 [_LOWER] = LAYOUT_JD45( 123 [_LOWER] = LAYOUT(
128 /*,--------+-------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------.*/ 124 /*,--------+-------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------.*/
129 KC_GRV, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_BSPC, KC_BSPC, 125 KC_GRV, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_BSPC, KC_BSPC,
130 /*|--------`-------`--------`--------`--------`--------`--------`--------`--------`--------`--------`--------`--------|*/ 126 /*|--------`-------`--------`--------`--------`--------`--------`--------`--------`--------`--------`--------`--------|*/
@@ -146,7 +142,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
146 * | | | | | | | | Prev | Next | Mute | 142 * | | | | | | | | Prev | Next | Mute |
147 * `-------+-------+-------+-------+---^^^----+---^^^----+---------+--------+--------+----------' 143 * `-------+-------+-------+-------+---^^^----+---^^^----+---------+--------+--------+----------'
148 */ 144 */
149 [_RAISE] = LAYOUT_JD45( 145 [_RAISE] = LAYOUT(
150 /*,--------+-------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------.*/ 146 /*,--------+-------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------.*/
151 KC_TILD, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_BSPC, KC_BSPC, 147 KC_TILD, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_BSPC, KC_BSPC,
152 /*|--------`-------`--------`--------`--------`--------`--------`--------`--------`--------`--------`--------`--------|*/ 148 /*|--------`-------`--------`--------`--------`--------`--------`--------`--------`--------`--------`--------`--------|*/
@@ -169,7 +165,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
169 * `-------+-------+-------+-------+---^^^----+---^^^----+---------+--------+--------+----------' 165 * `-------+-------+-------+-------+---^^^----+---^^^----+---------+--------+--------+----------'
170 */ 166 */
171 167
172 [_MOUSECURSOR] = LAYOUT_JD45( 168 [_MOUSECURSOR] = LAYOUT(
173 /*,--------+-------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------.*/ 169 /*,--------+-------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------.*/
174 _______, _______, _______, KC_MS_U, _______, _______, _______, KC_ACL2, KC_ACL1, KC_ACL0, _______, _______, _______, 170 _______, _______, _______, KC_MS_U, _______, _______, _______, KC_ACL2, KC_ACL1, KC_ACL0, _______, _______, _______,
175 /*|--------`-------`--------`--------`--------`--------`--------`--------`--------`--------`--------`--------`--------|*/ 171 /*|--------`-------`--------`--------`--------`--------`--------`--------`--------`--------`--------`--------`--------|*/
@@ -191,7 +187,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
191 * | | | | | | | | | | Reset | 187 * | | | | | | | | | | Reset |
192 * `-------+-------+-------+-------+---^^^----+---^^^----+---------+--------+--------+----------' 188 * `-------+-------+-------+-------+---^^^----+---^^^----+---------+--------+--------+----------'
193 */ 189 */
194 [_ADJUST] = LAYOUT_JD45( 190 [_ADJUST] = LAYOUT(
195 191
196 /*,--------+-------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------.*/ 192 /*,--------+-------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------.*/
197 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL, 193 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL,
@@ -214,7 +210,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
214 * | | | | | | | | | | | 210 * | | | | | | | | | | |
215 * `-------+-------+-------+-------+---^^^----+---^^^----+---------+--------+--------+----------' 211 * `-------+-------+-------+-------+---^^^----+---^^^----+---------+--------+--------+----------'
216 */ 212 */
217 [_VIM] = LAYOUT_JD45( 213 [_VIM] = LAYOUT(
218 /*,--------+-------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------.*/ 214 /*,--------+-------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------.*/
219 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, 215 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
220 /*|--------`-------`--------`--------`--------`--------`--------`--------`--------`--------`--------`--------`--------|*/ 216 /*|--------`-------`--------`--------`--------`--------`--------`--------`--------`--------`--------`--------`--------|*/
@@ -236,7 +232,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
236 * | | | | | | | | | | | 232 * | | | | | | | | | | |
237 * `-------+-------+-------+-------+---^^^----+---^^^----+---------+--------+--------+----------' 233 * `-------+-------+-------+-------+---^^^----+---^^^----+---------+--------+--------+----------'
238 */ 234 */
239 [_MEDIA] = LAYOUT_JD45( 235 [_MEDIA] = LAYOUT(
240 /*,--------+-------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------.*/ 236 /*,--------+-------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------.*/
241 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, 237 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
242 /*|--------`-------`--------`--------`--------`--------`--------`--------`--------`--------`--------`--------`--------|*/ 238 /*|--------`-------`--------`--------`--------`--------`--------`--------`--------`--------`--------`--------`--------|*/
generated by cgit v1.2.3 (git 2.25.1) at 2025-07-01 23:13:46 +0000