aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornoroadsleft <18669334+noroadsleft@users.noreply.github.com>2018-12-11 09:47:06 -0800
committerDrashna Jaelre <drashna@live.com>2018-12-11 09:47:06 -0800
commit7c63c0a95075f6fb4dd94d020ceb5816e6bcca2c (patch)
treed0a44226cfe4046584d226eb0930a2a42fd90f43
parenta5a46f3d36801ed7ae537f92a248c2ca5b8b8e05 (diff)
downloadqmk_firmware-7c63c0a95075f6fb4dd94d020ceb5816e6bcca2c.tar.gz
qmk_firmware-7c63c0a95075f6fb4dd94d020ceb5816e6bcca2c.zip
handwired/practice60: Configurator Support and refactor (#4603)
* handwired/practice60: Configurator Support * handwired/practice60: refactor - layout macro rows did not have an equal number of arguments in all rows of the matrix - white space changes for readability/alignment
-rw-r--r--keyboards/handwired/practice60/info.json74
-rw-r--r--keyboards/handwired/practice60/keymaps/default/keymap.c18
-rw-r--r--keyboards/handwired/practice60/practice60.h21
3 files changed, 93 insertions, 20 deletions
diff --git a/keyboards/handwired/practice60/info.json b/keyboards/handwired/practice60/info.json
new file mode 100644
index 000000000..cffbcf492
--- /dev/null
+++ b/keyboards/handwired/practice60/info.json
@@ -0,0 +1,74 @@
1{
2 "keyboard_name": "Practice 60",
3 "url": "",
4 "maintainer": "qmk",
5 "width": 15,
6 "height": 5,
7 "layouts": {
8 "LAYOUT_60_ansi": {
9 "layout": [
10 {"label":"`", "x":0, "y":0},
11 {"label":"1", "x":1, "y":0},
12 {"label":"2", "x":2, "y":0},
13 {"label":"3", "x":3, "y":0},
14 {"label":"4", "x":4, "y":0},
15 {"label":"5", "x":5, "y":0},
16 {"label":"6", "x":6, "y":0},
17 {"label":"7", "x":7, "y":0},
18 {"label":"8", "x":8, "y":0},
19 {"label":"9", "x":9, "y":0},
20 {"label":"0", "x":10, "y":0},
21 {"label":"-", "x":11, "y":0},
22 {"label":"=", "x":12, "y":0},
23 {"label":"Backspace", "x":13, "y":0, "w":2},
24 {"label":"Tab", "x":0, "y":1, "w":1.5},
25 {"label":"Q", "x":1.5, "y":1},
26 {"label":"W", "x":2.5, "y":1},
27 {"label":"E", "x":3.5, "y":1},
28 {"label":"R", "x":4.5, "y":1},
29 {"label":"T", "x":5.5, "y":1},
30 {"label":"Y", "x":6.5, "y":1},
31 {"label":"U", "x":7.5, "y":1},
32 {"label":"I", "x":8.5, "y":1},
33 {"label":"O", "x":9.5, "y":1},
34 {"label":"P", "x":10.5, "y":1},
35 {"label":"[", "x":11.5, "y":1},
36 {"label":"]", "x":12.5, "y":1},
37 {"label":"\\", "x":13.5, "y":1, "w":1.5},
38 {"label":"Caps Lock", "x":0, "y":2, "w":1.75},
39 {"label":"A", "x":1.75, "y":2},
40 {"label":"S", "x":2.75, "y":2},
41 {"label":"D", "x":3.75, "y":2},
42 {"label":"F", "x":4.75, "y":2},
43 {"label":"G", "x":5.75, "y":2},
44 {"label":"H", "x":6.75, "y":2},
45 {"label":"J", "x":7.75, "y":2},
46 {"label":"K", "x":8.75, "y":2},
47 {"label":"L", "x":9.75, "y":2},
48 {"label":";", "x":10.75, "y":2},
49 {"label":"'", "x":11.75, "y":2},
50 {"label":"Enter", "x":12.75, "y":2, "w":2.25},
51 {"label":"Shift", "x":0, "y":3, "w":2.25},
52 {"label":"Z", "x":2.25, "y":3},
53 {"label":"X", "x":3.25, "y":3},
54 {"label":"C", "x":4.25, "y":3},
55 {"label":"V", "x":5.25, "y":3},
56 {"label":"B", "x":6.25, "y":3},
57 {"label":"N", "x":7.25, "y":3},
58 {"label":"M", "x":8.25, "y":3},
59 {"label":",", "x":9.25, "y":3},
60 {"label":".", "x":10.25, "y":3},
61 {"label":"/", "x":11.25, "y":3},
62 {"label":"Shift", "x":12.25, "y":3, "w":2.75},
63 {"label":"Ctrl", "x":0, "y":4, "w":1.25},
64 {"label":"GUI", "x":1.25, "y":4, "w":1.25},
65 {"label":"Alt", "x":2.5, "y":4, "w":1.25},
66 {"label":"Space", "x":3.75, "y":4, "w":6.25},
67 {"label":"Alt", "x":10, "y":4, "w":1.25},
68 {"label":"GUI", "x":11.25, "y":4, "w":1.25},
69 {"label":"Menu", "x":12.5, "y":4, "w":1.25},
70 {"label":"Ctrl", "x":13.75, "y":4, "w":1.25}
71 ]
72 }
73 }
74}
diff --git a/keyboards/handwired/practice60/keymaps/default/keymap.c b/keyboards/handwired/practice60/keymaps/default/keymap.c
index afea72b11..ac6e75509 100644
--- a/keyboards/handwired/practice60/keymaps/default/keymap.c
+++ b/keyboards/handwired/practice60/keymaps/default/keymap.c
@@ -31,18 +31,18 @@ enum custom_keycodes {
31 31
32const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { 32const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
33 [_BASE] = LAYOUT_60_ansi( 33 [_BASE] = LAYOUT_60_ansi(
34 KC_GESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, \ 34 KC_GESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, \
35 KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, MT(MOD_LSFT, KC_Y), KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, \ 35 KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, MT(MOD_LSFT, KC_Y), KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, \
36 KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, \ 36 KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, \
37 KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, \ 37 KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, \
38 KC_LCTL , KC_LGUI , KC_LALT , KC_SPC , KC_RALT , KC_RGUI , MO(_FN1) , KC_RCTL 38 KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RGUI, MO(_FN1), KC_RCTL
39 ), 39 ),
40 40
41 [_FN1] = LAYOUT_60_ansi( 41 [_FN1] = LAYOUT_60_ansi(
42 KC_GESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_BSPC, \ 42 KC_GESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_BSPC, \
43 RGB_TOG, RGB_MOD, KC_UP, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ 43 RGB_TOG, RGB_MOD, KC_UP, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \
44 _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, _______, _______, _______,\ 44 _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, _______, _______, _______, \
45 BL_INC, BL_DEC, BL_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ 45 BL_INC, BL_DEC, BL_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, _______, \
46 KC_GRV, _______, _______, _______, _______, _______, _______, _______ 46 KC_GRV, _______, _______, _______, _______, _______, _______, _______
47 ) 47 )
48}; 48};
diff --git a/keyboards/handwired/practice60/practice60.h b/keyboards/handwired/practice60/practice60.h
index ffcf50614..5ebba8fb8 100644
--- a/keyboards/handwired/practice60/practice60.h
+++ b/keyboards/handwired/practice60/practice60.h
@@ -3,16 +3,15 @@
3#include "quantum.h" 3#include "quantum.h"
4 4
5#define LAYOUT_60_ansi( \ 5#define LAYOUT_60_ansi( \
6 K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, \ 6 K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, \
7 K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, \ 7 K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, \
8 K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, \ 8 K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, \
9 K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, \ 9 K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, \
10 K40, K41, K42, K43, K49, K4A, K4B, K4C \ 10 K40, K41, K42, K43, K49, K4A, K4B, K4C \
11) { \ 11) { \
12 { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D }, \ 12 { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D }, \
13 { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D }, \ 13 { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D }, \
14 { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C }, \ 14 { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, KC_NO }, \
15 { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B }, \ 15 { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, KC_NO, KC_NO }, \
16 { K40, K41, K42, K43, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, K49, K4A, K4B, K4C }, \ 16 { K40, K41, K42, K43, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, K49, K4A, K4B, K4C, KC_NO } \
17} 17}
18