aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIkta <48316247+IktaS@users.noreply.github.com>2021-02-21 13:19:06 +0700
committerGitHub <noreply@github.com>2021-02-20 22:19:06 -0800
commit311bff3d5669cbea59293afe372ee40c254f72e2 (patch)
treebb7d9765facbdb9509eed7dd967d3a08e94d80c8
parenta3934664dde5a794049f365b41eaa1f0f15be569 (diff)
downloadqmk_firmware-311bff3d5669cbea59293afe372ee40c254f72e2.tar.gz
qmk_firmware-311bff3d5669cbea59293afe372ee40c254f72e2.zip
[Keyboard] Pill60: fix default keymap shift key, fix info.json to default keymap (#11919)
Diffstat
-rw-r--r--keyboards/handwired/pill60/info.json106
-rw-r--r--keyboards/handwired/pill60/keymaps/default/keymap.c4
2 files changed, 55 insertions, 55 deletions
diff --git a/keyboards/handwired/pill60/info.json b/keyboards/handwired/pill60/info.json
index bb44c9eb9..e7690568e 100644
--- a/keyboards/handwired/pill60/info.json
+++ b/keyboards/handwired/pill60/info.json
@@ -5,68 +5,68 @@
5 "width": 15, 5 "width": 15,
6 "height": 5, 6 "height": 5,
7 "layouts": { 7 "layouts": {
8 "layout_default": { 8 "LAYOUT_default": {
9 "layout": [ 9 "layout": [
10 {"label": "Encoder", "x": 0, "y": 0}, 10 {"label": "Enc", "x": 0, "y": 0, "w": 1},
11 11
12 {"label": "Esc", "x": 0, "y": 1}, 12 {"label": "Esc", "x": 0, "y": 1, "w": 1},
13 {"label": "1","x": 1, "y": 1}, 13 {"label": "1","x": 1, "y": 1, "w": 1},
14 {"label": "2","x": 2, "y": 1}, 14 {"label": "2","x": 2, "y": 1, "w": 1},
15 {"label": "3","x": 3, "y": 1}, 15 {"label": "3","x": 3, "y": 1, "w": 1},
16 {"label": "4","x": 4, "y": 1}, 16 {"label": "4","x": 4, "y": 1, "w": 1},
17 {"label": "5","x": 5, "y": 1}, 17 {"label": "5","x": 5, "y": 1, "w": 1},
18 {"label": "6","x": 6, "y": 1}, 18 {"label": "6","x": 6, "y": 1, "w": 1},
19 {"label": "7","x": 7, "y": 1}, 19 {"label": "7","x": 7, "y": 1, "w": 1},
20 {"label": "8","x": 8, "y": 1}, 20 {"label": "8","x": 8, "y": 1, "w": 1},
21 {"label": "9","x": 9, "y": 1}, 21 {"label": "9","x": 9, "y": 1, "w": 1},
22 {"label": "0","x": 10, "y": 1}, 22 {"label": "0","x": 10, "y": 1, "w": 1},
23 {"label": "-","x": 11, "y": 1}, 23 {"label": "-","x": 11, "y": 1, "w": 1},
24 {"label": "=","x": 12, "y": 1}, 24 {"label": "=","x": 12, "y": 1, "w": 1},
25 {"label": "Backspace","x": 13, "y": 1}, 25 {"label": "\\","x": 13, "y": 1, "w": 1},
26 {"label": "Delete","x": 14, "y": 1}, 26 {"label": "Del","x": 14, "y": 1, "w": 1},
27 27
28 {"label": "Tab","x": 0, "y": 2, "w": 1.5}, 28 {"label": "Tab","x": 0, "y": 2, "w": 1.5},
29 {"label": "Q","x": 1.5, "y": 2}, 29 {"label": "Q","x": 1.5, "y": 2, "w": 1},
30 {"label": "W","x": 2.5, "y": 2}, 30 {"label": "W","x": 2.5, "y": 2, "w": 1},
31 {"label": "E","x": 3.5, "y": 2}, 31 {"label": "E","x": 3.5, "y": 2, "w": 1},
32 {"label": "R","x": 4.5, "y": 2}, 32 {"label": "R","x": 4.5, "y": 2, "w": 1},
33 {"label": "T","x": 5.5, "y": 2}, 33 {"label": "T","x": 5.5, "y": 2, "w": 1},
34 {"label": "Y","x": 6.5, "y": 2}, 34 {"label": "Y","x": 6.5, "y": 2, "w": 1},
35 {"label": "U","x": 7.5, "y": 2}, 35 {"label": "U","x": 7.5, "y": 2, "w": 1},
36 {"label": "I","x": 8.5, "y": 2}, 36 {"label": "I","x": 8.5, "y": 2, "w": 1},
37 {"label": "O","x": 9.5, "y": 2}, 37 {"label": "O","x": 9.5, "y": 2, "w": 1},
38 {"label": "P","x": 10.5, "y": 2}, 38 {"label": "P","x": 10.5, "y": 2, "w": 1},
39 {"label": "[","x": 11.5, "y": 2}, 39 {"label": "[","x": 11.5, "y": 2, "w": 1},
40 {"label": "]","x": 12.5, "y": 2}, 40 {"label": "]","x": 12.5, "y": 2, "w": 1},
41 {"label": "\\","x": 13.5, "y": 2, "w": 1.5}, 41 {"label": "Backspace","x": 13.5, "y": 2, "w": 1.5},
42 42
43 {"label": "Caps","x": 0, "y": 3, "w": 1.75}, 43 {"label": "Caps","x": 0, "y": 3, "w": 1.75},
44 {"label": "A","x": 1.75, "y": 3}, 44 {"label": "A","x": 1.75, "y": 3, "w": 1},
45 {"label": "S","x": 2.75, "y": 3}, 45 {"label": "S","x": 2.75, "y": 3, "w": 1},
46 {"label": "D","x": 3.75, "y": 3}, 46 {"label": "D","x": 3.75, "y": 3, "w": 1},
47 {"label": "F","x": 4.75, "y": 3}, 47 {"label": "F","x": 4.75, "y": 3, "w": 1},
48 {"label": "G","x": 5.75, "y": 3}, 48 {"label": "G","x": 5.75, "y": 3, "w": 1},
49 {"label": "H","x": 6.75, "y": 3}, 49 {"label": "H","x": 6.75, "y": 3, "w": 1},
50 {"label": "J","x": 7.75, "y": 3}, 50 {"label": "J","x": 7.75, "y": 3, "w": 1},
51 {"label": "K","x": 8.75, "y": 3}, 51 {"label": "K","x": 8.75, "y": 3, "w": 1},
52 {"label": "L","x": 9.75, "y": 3}, 52 {"label": "L","x": 9.75, "y": 3, "w": 1},
53 {"label": ";","x": 10.75, "y": 3}, 53 {"label": ";","x": 10.75, "y": 3, "w": 1},
54 {"label": "'","x": 11.75, "y": 3}, 54 {"label": "'","x": 11.75, "y": 3, "w": 1},
55 {"label": "Enter","x": 12.75, "y": 3, "w": 2.25}, 55 {"label": "Enter","x": 12.75, "y": 3, "w": 2.25},
56 56
57 {"label": "L Shift","x": 0, "y": 4, "w": 2.25}, 57 {"label": "L Shift","x": 0, "y": 4, "w": 2.25},
58 {"label": "Z","x": 2.25, "y": 4}, 58 {"label": "Z","x": 2.25, "y": 4, "w": 1},
59 {"label": "X","x": 3.25, "y": 4}, 59 {"label": "X","x": 3.25, "y": 4, "w": 1},
60 {"label": "C","x": 4.25, "y": 4}, 60 {"label": "C","x": 4.25, "y": 4, "w": 1},
61 {"label": "V","x": 5.25, "y": 4}, 61 {"label": "V","x": 5.25, "y": 4, "w": 1},
62 {"label": "B","x": 6.25, "y": 4}, 62 {"label": "B","x": 6.25, "y": 4, "w": 1},
63 {"label": "N","x": 7.25, "y": 4}, 63 {"label": "N","x": 7.25, "y": 4, "w": 1},
64 {"label": "M","x": 8.25, "y": 4}, 64 {"label": "M","x": 8.25, "y": 4, "w": 1},
65 {"label": ",","x": 9.25, "y": 4}, 65 {"label": ",","x": 9.25, "y": 4, "w": 1},
66 {"label": ".","x": 10.25, "y": 4}, 66 {"label": ".","x": 10.25, "y": 4, "w": 1},
67 {"label": "/","x": 11.25, "y": 4}, 67 {"label": "/","x": 11.25, "y": 4, "w": 1},
68 {"label": "R Shift","x": 12.25, "y": 4, "w": 1.75}, 68 {"label": "R Shift","x": 12.25, "y": 4, "w": 1.75},
69 {"label": "FN","x": 14, "y": 4}, 69 {"label": "FN","x": 14, "y": 4, "w": 1},
70 70
71 {"label": "L CTRL","x": 0, "y": 5, "w": 1.25}, 71 {"label": "L CTRL","x": 0, "y": 5, "w": 1.25},
72 {"label": "L GUI","x": 1.25, "y": 5, "w": 1.25}, 72 {"label": "L GUI","x": 1.25, "y": 5, "w": 1.25},
@@ -74,7 +74,7 @@
74 {"label": "Space","x": 3.75, "y": 5, "w": 6.25}, 74 {"label": "Space","x": 3.75, "y": 5, "w": 6.25},
75 {"label": "R ALT","x": 10, "y": 5, "w": 1.25}, 75 {"label": "R ALT","x": 10, "y": 5, "w": 1.25},
76 {"label": "R GUI","x": 11.25, "y": 5, "w": 1.25}, 76 {"label": "R GUI","x": 11.25, "y": 5, "w": 1.25},
77 {"label": "R MENU","x": 12.5, "y": 5, "w": 1.25}, 77 {"label": "FN","x": 12.5, "y": 5, "w": 1.25},
78 {"label": "R CTRL","x": 13.75, "y": 5, "w": 1.25} 78 {"label": "R CTRL","x": 13.75, "y": 5, "w": 1.25}
79 ] 79 ]
80 } 80 }
diff --git a/keyboards/handwired/pill60/keymaps/default/keymap.c b/keyboards/handwired/pill60/keymaps/default/keymap.c
index 6edcb0c2c..d9f0fa727 100644
--- a/keyboards/handwired/pill60/keymaps/default/keymap.c
+++ b/keyboards/handwired/pill60/keymaps/default/keymap.c
@@ -28,7 +28,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
28 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_BSLS, KC_DEL, 28 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_BSLS, KC_DEL,
29 KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSPC, 29 KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSPC,
30 KC_LCTL, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, 30 KC_LCTL, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT,
31 KC_RSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_LSFT, MO(_FL), 31 KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, MO(_FL),
32 MO(_FL), KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RGUI, MO(_FL), KC_RCTL 32 MO(_FL), KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RGUI, MO(_FL), KC_RCTL
33 ), 33 ),
34 [_FL] = LAYOUT( 34 [_FL] = LAYOUT(
@@ -44,7 +44,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
44#ifdef OLED_DRIVER_ENABLE 44#ifdef OLED_DRIVER_ENABLE
45 45
46static void render_oled(void) { 46static void render_oled(void) {
47 oled_write_P(PSTR("Ikta's Pill60"), false); 47 oled_write_P(PSTR("Pill60"), false);
48 oled_write_P(PSTR("\n\n"), false); 48 oled_write_P(PSTR("\n\n"), false);
49 led_t led_usb_state = host_keyboard_led_state(); 49 led_t led_usb_state = host_keyboard_led_state();
50 oled_write_ln_P(PSTR("CPSLK"), led_usb_state.caps_lock); 50 oled_write_ln_P(PSTR("CPSLK"), led_usb_state.caps_lock);
generated by cgit v1.2.3 (git 2.25.1) at 2025-11-19 04:27:34 +0000