diff options
author | fauxpark <fauxpark@gmail.com> | 2019-10-26 12:23:11 +1100 |
---|---|---|
committer | Drashna Jaelre <drashna@live.com> | 2019-10-25 18:23:11 -0700 |
commit | 006ec86786da874938f54e9b1d0f4a5f049de546 (patch) | |
tree | d929f44b102c4b4de50f276a0e7b0a32e28438a7 | |
parent | 19f73483d872b43b72374f2dacbb96ff1742624e (diff) | |
download | qmk_firmware-006ec86786da874938f54e9b1d0f4a5f049de546.tar.gz qmk_firmware-006ec86786da874938f54e9b1d0f4a5f049de546.zip |
[Keyboard] Fix Print Screen key for XT to USB converter (#7039)
* Fix Print Screen key for XT to USB converter
* While I'm here, get rid of led.c as it does absolutely nothing
* Fix info.json too
* "]" key is 1.25U and stepped on the Model F XT
-rw-r--r-- | keyboards/converter/xt_usb/info.json | 4 | ||||
-rw-r--r-- | keyboards/converter/xt_usb/keymaps/default/keymap.c | 4 | ||||
-rw-r--r-- | keyboards/converter/xt_usb/led.c | 22 | ||||
-rw-r--r-- | keyboards/converter/xt_usb/rules.mk | 2 | ||||
-rw-r--r-- | keyboards/converter/xt_usb/xt_usb.h | 10 |
5 files changed, 10 insertions, 32 deletions
diff --git a/keyboards/converter/xt_usb/info.json b/keyboards/converter/xt_usb/info.json index 1fde77d1f..2de390ae0 100644 --- a/keyboards/converter/xt_usb/info.json +++ b/keyboards/converter/xt_usb/info.json | |||
@@ -40,7 +40,7 @@ | |||
40 | {"label":"O", "x":11.75, "y":1}, | 40 | {"label":"O", "x":11.75, "y":1}, |
41 | {"label":"P", "x":12.75, "y":1}, | 41 | {"label":"P", "x":12.75, "y":1}, |
42 | {"label":"[", "x":13.75, "y":1}, | 42 | {"label":"[", "x":13.75, "y":1}, |
43 | {"label":"]", "x":14.75, "y":1}, | 43 | {"label":"]", "x":14.75, "y":1, "w": 1.25}, |
44 | {"label":"7", "x":17, "y":1}, | 44 | {"label":"7", "x":17, "y":1}, |
45 | {"label":"8", "x":18, "y":1}, | 45 | {"label":"8", "x":18, "y":1}, |
46 | {"label":"9", "x":19, "y":1}, | 46 | {"label":"9", "x":19, "y":1}, |
@@ -79,7 +79,7 @@ | |||
79 | {"label":".", "x":12.5, "y":3}, | 79 | {"label":".", "x":12.5, "y":3}, |
80 | {"label":"/", "x":13.5, "y":3}, | 80 | {"label":"/", "x":13.5, "y":3}, |
81 | {"label":"Shift", "x":14.5, "y":3, "w":1.5}, | 81 | {"label":"Shift", "x":14.5, "y":3, "w":1.5}, |
82 | {"label":"Print Screen", "x":16, "y":3}, | 82 | {"label":"*", "x":16, "y":3}, |
83 | {"label":"1", "x":17, "y":3}, | 83 | {"label":"1", "x":17, "y":3}, |
84 | {"label":"2", "x":18, "y":3}, | 84 | {"label":"2", "x":18, "y":3}, |
85 | {"label":"3", "x":19, "y":3}, | 85 | {"label":"3", "x":19, "y":3}, |
diff --git a/keyboards/converter/xt_usb/keymaps/default/keymap.c b/keyboards/converter/xt_usb/keymaps/default/keymap.c index 3ef606070..b44b946e8 100644 --- a/keyboards/converter/xt_usb/keymaps/default/keymap.c +++ b/keyboards/converter/xt_usb/keymaps/default/keymap.c | |||
@@ -10,7 +10,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
10 | * |-------| |------------------------------------------------------|Ent|---------------| | 10 | * |-------| |------------------------------------------------------|Ent|---------------| |
11 | * | F5| F6| | Ctrl | A| S| D| F| G| H| J| K| L| ;| '| `| | 4| 5| 6| | | 11 | * | F5| F6| | Ctrl | A| S| D| F| G| H| J| K| L| ;| '| `| | 4| 5| 6| | |
12 | * |-------| |----------------------------------------------------------------------| | | 12 | * |-------| |----------------------------------------------------------------------| | |
13 | * | F7| F8| |Shif| \| Z| X| C| V| B| N| M| ,| .| /|Shift|PrS| 1| 2| 3| +| | 13 | * | F7| F8| |Shif| \| Z| X| C| V| B| N| M| ,| .| /|Shift| *| 1| 2| 3| +| |
14 | * |-------| |----------------------------------------------------------------------| | | 14 | * |-------| |----------------------------------------------------------------------| | |
15 | * | F9|F10| | Alt | Space |CapsLck| 0 | . | | | 15 | * | F9|F10| | Alt | Space |CapsLck| 0 | . | | |
16 | * `-------' `--------------------------------------------------------------------------' | 16 | * `-------' `--------------------------------------------------------------------------' |
@@ -19,7 +19,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
19 | KC_F1, KC_F2, KC_ESC, 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, KC_NLCK, KC_SLCK, | 19 | KC_F1, KC_F2, KC_ESC, 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, KC_NLCK, KC_SLCK, |
20 | KC_F3, KC_F4, 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_P7, KC_P8, KC_P9, KC_PMNS, | 20 | KC_F3, KC_F4, 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_P7, KC_P8, KC_P9, KC_PMNS, |
21 | KC_F5, KC_F6, 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_GRV, KC_ENT, KC_P4, KC_P5, KC_P6, | 21 | KC_F5, KC_F6, 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_GRV, KC_ENT, KC_P4, KC_P5, KC_P6, |
22 | KC_F7, KC_F8, KC_LSFT,KC_BSLS,KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM,KC_DOT, KC_SLSH,KC_RSFT,KC_PSCR,KC_P1, KC_P2, KC_P3, KC_PPLS, | 22 | KC_F7, KC_F8, KC_LSFT,KC_BSLS,KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM,KC_DOT, KC_SLSH,KC_RSFT,KC_PAST,KC_P1, KC_P2, KC_P3, KC_PPLS, |
23 | KC_F9, KC_F10, KC_LALT, KC_SPC, KC_CAPS, KC_P0, KC_PDOT | 23 | KC_F9, KC_F10, KC_LALT, KC_SPC, KC_CAPS, KC_P0, KC_PDOT |
24 | ), | 24 | ), |
25 | 25 | ||
diff --git a/keyboards/converter/xt_usb/led.c b/keyboards/converter/xt_usb/led.c deleted file mode 100644 index 6fa077032..000000000 --- a/keyboards/converter/xt_usb/led.c +++ /dev/null | |||
@@ -1,22 +0,0 @@ | |||
1 | /* | ||
2 | Copyright 2016 Ethan Apodaca <papodaca@gmail.com> | ||
3 | |||
4 | This program is free software: you can redistribute it and/or modify | ||
5 | it under the terms of the GNU General Public License as published by | ||
6 | the Free Software Foundation, either version 2 of the License, or | ||
7 | (at your option) any later version. | ||
8 | |||
9 | This program is distributed in the hope that it will be useful, | ||
10 | but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
11 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
12 | GNU General Public License for more details. | ||
13 | |||
14 | You should have received a copy of the GNU General Public License | ||
15 | along with this program. If not, see <http://www.gnu.org/licenses/>. | ||
16 | */ | ||
17 | |||
18 | #include "led.h" | ||
19 | |||
20 | void led_set(uint8_t usb_led) { | ||
21 | //XT Keyboards do not have LEDs, nothing to do. | ||
22 | } | ||
diff --git a/keyboards/converter/xt_usb/rules.mk b/keyboards/converter/xt_usb/rules.mk index 05b70519c..444e5f02d 100644 --- a/keyboards/converter/xt_usb/rules.mk +++ b/keyboards/converter/xt_usb/rules.mk | |||
@@ -23,7 +23,7 @@ NKRO_ENABLE = yes # USB Nkey Rollover | |||
23 | XT_ENABLE = yes | 23 | XT_ENABLE = yes |
24 | CUSTOM_MATRIX = yes | 24 | CUSTOM_MATRIX = yes |
25 | 25 | ||
26 | SRC = matrix.c led.c | 26 | SRC += matrix.c |
27 | 27 | ||
28 | # Optimize size but this may cause error "relocation truncated to fit" | 28 | # Optimize size but this may cause error "relocation truncated to fit" |
29 | #EXTRALDFLAGS = -Wl,--relax | 29 | #EXTRALDFLAGS = -Wl,--relax |
diff --git a/keyboards/converter/xt_usb/xt_usb.h b/keyboards/converter/xt_usb/xt_usb.h index 9785158b4..88d9f576c 100644 --- a/keyboards/converter/xt_usb/xt_usb.h +++ b/keyboards/converter/xt_usb/xt_usb.h | |||
@@ -26,7 +26,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. | |||
26 | * |-------| |------------------------------------------------------|Ent|---------------| | 26 | * |-------| |------------------------------------------------------|Ent|---------------| |
27 | * | F5| F6| | Ctrl | A| S| D| F| G| H| J| K| L| ;| '| `| | 4| 5| 6| | | 27 | * | F5| F6| | Ctrl | A| S| D| F| G| H| J| K| L| ;| '| `| | 4| 5| 6| | |
28 | * |-------| |----------------------------------------------------------------------| | | 28 | * |-------| |----------------------------------------------------------------------| | |
29 | * | F7| F8| |Shif| \| Z| X| C| V| B| N| M| ,| .| /|Shift|PrS| 1| 2| 3| +| | 29 | * | F7| F8| |Shif| \| Z| X| C| V| B| N| M| ,| .| /|Shift| *| 1| 2| 3| +| |
30 | * |-------| |----------------------------------------------------------------------| | | 30 | * |-------| |----------------------------------------------------------------------| | |
31 | * | F9|F10| | Alt | Space |CapsLck| 0 | . | | | 31 | * | F9|F10| | Alt | Space |CapsLck| 0 | . | | |
32 | * `-------' `--------------------------------------------------------------------------' | 32 | * `-------' `--------------------------------------------------------------------------' |
@@ -38,7 +38,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. | |||
38 | * |-------| |------------------------------------------------------| 1C|---------------| | 38 | * |-------| |------------------------------------------------------| 1C|---------------| |
39 | * | 3F| 40| | 1D | 1E| 1F| 20| 21| 22| 23| 24| 25| 26| 27| 28| 29| | 4B| 4C| 4D| | | 39 | * | 3F| 40| | 1D | 1E| 1F| 20| 21| 22| 23| 24| 25| 26| 27| 28| 29| | 4B| 4C| 4D| | |
40 | * |-------| |----------------------------------------------------------------------| | | 40 | * |-------| |----------------------------------------------------------------------| | |
41 | * | 41| 42| | 2A | 2B| 2C| 2D| 2E| 2F| 30| 31| 32| 33| 34| 35| 36 |*37| 4F| 50| 51| 4E| | 41 | * | 41| 42| | 2A | 2B| 2C| 2D| 2E| 2F| 30| 31| 32| 33| 34| 35| 36 | 37| 4F| 50| 51| 4E| |
42 | * |-------| |----------------------------------------------------------------------| | | 42 | * |-------| |----------------------------------------------------------------------| | |
43 | * | 43| 44| | 38 | 39 | 3A | 52 | 53 | | | 43 | * | 43| 44| | 38 | 39 | 3A | 52 | 53 | | |
44 | * `-------' `--------------------------------------------------------------------------' | 44 | * `-------' `--------------------------------------------------------------------------' |
@@ -47,7 +47,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. | |||
47 | K3B,K3C, K01,K02,K03,K04,K05,K06,K07,K08,K09,K0A,K0B,K0C,K0D,K0E, K45, K46, \ | 47 | K3B,K3C, K01,K02,K03,K04,K05,K06,K07,K08,K09,K0A,K0B,K0C,K0D,K0E, K45, K46, \ |
48 | K3D,K3E, K0F,K10,K11,K12,K13,K14,K15,K16,K17,K18,K19,K1A,K1B, K47,K48,K49,K4A, \ | 48 | K3D,K3E, K0F,K10,K11,K12,K13,K14,K15,K16,K17,K18,K19,K1A,K1B, K47,K48,K49,K4A, \ |
49 | K3F,K40, K1D,K1E,K1F,K20,K21,K22,K23,K24,K25,K26,K27,K28,K29,K1C,K4B,K4C,K4D, \ | 49 | K3F,K40, K1D,K1E,K1F,K20,K21,K22,K23,K24,K25,K26,K27,K28,K29,K1C,K4B,K4C,K4D, \ |
50 | K41,K42, K2A,K2B,K2C,K2D,K2E,K2F,K30,K31,K32,K33,K34,K35,K36,K54,K4F,K50,K51,K4E, \ | 50 | K41,K42, K2A,K2B,K2C,K2D,K2E,K2F,K30,K31,K32,K33,K34,K35,K36,K37,K4F,K50,K51,K4E, \ |
51 | K43,K44, K38, K39, K3A, K52, K53 \ | 51 | K43,K44, K38, K39, K3A, K52, K53 \ |
52 | ) { \ | 52 | ) { \ |
53 | { KC_NO, K01, K02, K03, K04, K05, K06, K07 }, \ | 53 | { KC_NO, K01, K02, K03, K04, K05, K06, K07 }, \ |
@@ -56,11 +56,11 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. | |||
56 | { K18, K19, K1A, K1B, K1C, K1D, K1E, K1F }, \ | 56 | { K18, K19, K1A, K1B, K1C, K1D, K1E, K1F }, \ |
57 | { K20, K21, K22, K23, K24, K25, K26, K27 }, \ | 57 | { K20, K21, K22, K23, K24, K25, K26, K27 }, \ |
58 | { K28, K29, K2A, K2B, K2C, K2D, K2E, K2F }, \ | 58 | { K28, K29, K2A, K2B, K2C, K2D, K2E, K2F }, \ |
59 | { K30, K31, K32, K33, K34, K35, K36, KC_NO }, \ | 59 | { K30, K31, K32, K33, K34, K35, K36, K37 }, \ |
60 | { K38, K39, K3A, K3B, K3C, K3D, K3E, K3F }, \ | 60 | { K38, K39, K3A, K3B, K3C, K3D, K3E, K3F }, \ |
61 | { K40, K41, K42, K43, K44, K45, K46, K47 }, \ | 61 | { K40, K41, K42, K43, K44, K45, K46, K47 }, \ |
62 | { K48, K49, K4A, K4B, K4C, K4D, K4E, K4F }, \ | 62 | { K48, K49, K4A, K4B, K4C, K4D, K4E, K4F }, \ |
63 | { K50, K51, K52, K53, K54, KC_NO, KC_NO, KC_NO }, \ | 63 | { K50, K51, K52, K53, KC_NO, KC_NO, KC_NO, KC_NO }, \ |
64 | { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO }, \ | 64 | { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO }, \ |
65 | { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO }, \ | 65 | { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO }, \ |
66 | { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO }, \ | 66 | { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO }, \ |