~ruther/qmk_firmware

006ec86786da874938f54e9b1d0f4a5f049de546 — fauxpark 5 years ago 19f7348 
[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
patch browse .tar.gz 
5 files changed, 10 insertions(+), 32 deletions(-)

M keyboards/converter/xt_usb/info.json
M keyboards/converter/xt_usb/keymaps/default/keymap.c
D keyboards/converter/xt_usb/led.c
M keyboards/converter/xt_usb/rules.mk
M keyboards/converter/xt_usb/xt_usb.h

M keyboards/converter/xt_usb/info.json => keyboards/converter/xt_usb/info.json +2 -2
@@ 40,7 40,7 @@
        {"label":"O", "x":11.75, "y":1},
        {"label":"P", "x":12.75, "y":1},
        {"label":"[", "x":13.75, "y":1},
        {"label":"]", "x":14.75, "y":1},
        {"label":"]", "x":14.75, "y":1, "w": 1.25},
        {"label":"7", "x":17, "y":1},
        {"label":"8", "x":18, "y":1},
        {"label":"9", "x":19, "y":1},


@@ 79,7 79,7 @@
        {"label":".", "x":12.5, "y":3},
        {"label":"/", "x":13.5, "y":3},
        {"label":"Shift", "x":14.5, "y":3, "w":1.5},
        {"label":"Print Screen", "x":16, "y":3},
        {"label":"*", "x":16, "y":3},
        {"label":"1", "x":17, "y":3},
        {"label":"2", "x":18, "y":3},
        {"label":"3", "x":19, "y":3},


M keyboards/converter/xt_usb/keymaps/default/keymap.c => keyboards/converter/xt_usb/keymaps/default/keymap.c +2 -2
@@ 10,7 10,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     * |-------|  |------------------------------------------------------|Ent|---------------|
     * | F5| F6|  | Ctrl |  A|  S|  D|  F|  G|  H|  J|  K|  L|  ;|  '|  `|   |  4|  5|  6|   |
     * |-------|  |----------------------------------------------------------------------|   |
     * | F7| F8|  |Shif|  \|  Z|  X|  C|  V|  B|  N|  M|  ,|  .|  /|Shift|PrS|  1|  2|  3|  +|
     * | F7| F8|  |Shif|  \|  Z|  X|  C|  V|  B|  N|  M|  ,|  .|  /|Shift|  *|  1|  2|  3|  +|
     * |-------|  |----------------------------------------------------------------------|   |
     * | F9|F10|  |  Alt  |               Space                  |CapsLck|   0   |   .   |   |
     * `-------'  `--------------------------------------------------------------------------'


@@ 19,7 19,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    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,
    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,
    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,
    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,
    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,
    KC_F9,  KC_F10,   KC_LALT,                                    KC_SPC,                                       KC_CAPS,          KC_P0,          KC_PDOT
    ),



D keyboards/converter/xt_usb/led.c => keyboards/converter/xt_usb/led.c +0 -22
@@ 1,22 0,0 @@
/*
Copyright 2016 Ethan Apodaca <papodaca@gmail.com>

This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 2 of the License, or
(at your option) any later version.

This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
GNU General Public License for more details.

You should have received a copy of the GNU General Public License
along with this program.  If not, see <http://www.gnu.org/licenses/>.
*/

#include "led.h"

void led_set(uint8_t usb_led) {
  //XT Keyboards do not have LEDs, nothing to do.
}


M keyboards/converter/xt_usb/rules.mk => keyboards/converter/xt_usb/rules.mk +1 -1
@@ 23,7 23,7 @@ NKRO_ENABLE      = yes  # USB Nkey Rollover
XT_ENABLE        = yes
CUSTOM_MATRIX    = yes

SRC = matrix.c led.c
SRC += matrix.c

# Optimize size but this may cause error "relocation truncated to fit"
#EXTRALDFLAGS = -Wl,--relax


M keyboards/converter/xt_usb/xt_usb.h => keyboards/converter/xt_usb/xt_usb.h +5 -5
@@ 26,7 26,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 * |-------|  |------------------------------------------------------|Ent|---------------|
 * | F5| F6|  | Ctrl |  A|  S|  D|  F|  G|  H|  J|  K|  L|  ;|  '|  `|   |  4|  5|  6|   |
 * |-------|  |----------------------------------------------------------------------|   |
 * | F7| F8|  |Shif|  \|  Z|  X|  C|  V|  B|  N|  M|  ,|  .|  /|Shift|PrS|  1|  2|  3|  +|
 * | F7| F8|  |Shif|  \|  Z|  X|  C|  V|  B|  N|  M|  ,|  .|  /|Shift|  *|  1|  2|  3|  +|
 * |-------|  |----------------------------------------------------------------------|   |
 * | F9|F10|  |  Alt  |               Space                  |CapsLck|   0   |   .   |   |
 * `-------'  `--------------------------------------------------------------------------'


@@ 38,7 38,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 * |-------|  |------------------------------------------------------| 1C|---------------|
 * | 3F| 40|  | 1D   | 1E| 1F| 20| 21| 22| 23| 24| 25| 26| 27| 28| 29|   | 4B| 4C| 4D|   |
 * |-------|  |----------------------------------------------------------------------|   |
 * | 41| 42|  | 2A | 2B| 2C| 2D| 2E| 2F| 30| 31| 32| 33| 34| 35|  36 |*37| 4F| 50| 51| 4E|
 * | 41| 42|  | 2A | 2B| 2C| 2D| 2E| 2F| 30| 31| 32| 33| 34| 35|  36 | 37| 4F| 50| 51| 4E|
 * |-------|  |----------------------------------------------------------------------|   |
 * | 43| 44|  |  38   |              39                      |  3A   |  52   |  53   |   |
 * `-------'  `--------------------------------------------------------------------------'


@@ 47,7 47,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
    K3B,K3C,  K01,K02,K03,K04,K05,K06,K07,K08,K09,K0A,K0B,K0C,K0D,K0E,    K45,    K46, \
    K3D,K3E,  K0F,K10,K11,K12,K13,K14,K15,K16,K17,K18,K19,K1A,K1B,    K47,K48,K49,K4A, \
    K3F,K40,  K1D,K1E,K1F,K20,K21,K22,K23,K24,K25,K26,K27,K28,K29,K1C,K4B,K4C,K4D,     \
    K41,K42,  K2A,K2B,K2C,K2D,K2E,K2F,K30,K31,K32,K33,K34,K35,K36,K54,K4F,K50,K51,K4E, \
    K41,K42,  K2A,K2B,K2C,K2D,K2E,K2F,K30,K31,K32,K33,K34,K35,K36,K37,K4F,K50,K51,K4E, \
    K43,K44,  K38,                    K39,                    K3A,    K52,    K53      \
) { \
    { 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/>.
    { K18,   K19,   K1A,   K1B,   K1C,   K1D,   K1E,   K1F   }, \
    { K20,   K21,   K22,   K23,   K24,   K25,   K26,   K27   }, \
    { K28,   K29,   K2A,   K2B,   K2C,   K2D,   K2E,   K2F   }, \
    { K30,   K31,   K32,   K33,   K34,   K35,   K36,   KC_NO }, \
    { K30,   K31,   K32,   K33,   K34,   K35,   K36,   K37   }, \
    { K38,   K39,   K3A,   K3B,   K3C,   K3D,   K3E,   K3F   }, \
    { K40,   K41,   K42,   K43,   K44,   K45,   K46,   K47   }, \
    { K48,   K49,   K4A,   K4B,   K4C,   K4D,   K4E,   K4F   }, \
    { K50,   K51,   K52,   K53,   K54,   KC_NO, KC_NO, KC_NO }, \
    { K50,   K51,   K52,   K53,   KC_NO, KC_NO, KC_NO, KC_NO }, \
    { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO }, \
    { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO }, \
    { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO }, \