~ruther/qmk_firmware

1e5f2f517b0f1fbc2d2703f49fbd62dc7046b722 — QMK Bot 2 years ago d18fc1c + 3bf2b96
Merge remote-tracking branch 'origin/master' into develop
M keyboards/kibou/winter/info.json => keyboards/kibou/winter/info.json +4 -1
@@ 26,8 26,11 @@
        "pid": "0xA003",
        "vid": "0x586A"
    },
    "layout_aliases": {
        "LAYOUT": "LAYOUT_tkl_ansi_wkl"
    },
    "layouts": {
        "LAYOUT": {
        "LAYOUT_tkl_ansi_wkl": {
            "layout": [
                { "matrix": [0, 0], "x": 0, "y": 0 },
                { "matrix": [0, 2], "x": 2, "y": 0 },

M keyboards/kibou/winter/keymaps/default/keymap.c => keyboards/kibou/winter/keymaps/default/keymap.c +1 -1
@@ 4,7 4,7 @@
#include QMK_KEYBOARD_H

const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    [0] = LAYOUT(
    [0] = LAYOUT_tkl_ansi_wkl(
		KC_ESC,           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_PSCR, KC_SCRL, KC_PAUS, 
		KC_GRV,  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_INS,  KC_HOME, KC_PGUP, 
		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_BSLS,  KC_DEL,  KC_END,  KC_PGDN, 

M keyboards/kibou/winter/keymaps/via/keymap.c => keyboards/kibou/winter/keymaps/via/keymap.c +1 -1
@@ 4,7 4,7 @@
#include QMK_KEYBOARD_H

const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    [0] = LAYOUT(
    [0] = LAYOUT_tkl_ansi_wkl(
		KC_ESC,           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_PSCR, KC_SCRL, KC_PAUS, 
		KC_GRV,  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_INS,  KC_HOME, KC_PGUP, 
		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_BSLS,  KC_DEL,  KC_END,  KC_PGDN,