~ruther/qmk_firmware

eb742d7a3feb8a6f50e264abe9d218ff9df2ec84 — QMK Bot 2 years ago 62a9c72 + 5b2eb4e
Merge remote-tracking branch 'origin/master' into develop
M keyboards/plywrks/ahgase/ahgase.h => keyboards/plywrks/ahgase/ahgase.h +2 -2
@@ 25,7 25,7 @@
// Full right shift
// Full left shift
// 6.25u bottom row
#define LAYOUT_ansi( \
#define LAYOUT_tkl_f13_ansi( \
    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, k0f, k0g, \
    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1e, k1f, k1g, \
    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, k2e, k2f, k2g, \


@@ 46,7 46,7 @@
// Full right shift
// Split left shift
// 6.25u bottom row
#define LAYOUT_iso( \
#define LAYOUT_tkl_f13_iso( \
    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, k0f, k0g, \
    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1e, k1f, k1g, \
    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c,      k2e, k2f, k2g, \

M keyboards/plywrks/ahgase/info.json => keyboards/plywrks/ahgase/info.json +10 -2
@@ 8,8 8,16 @@
        "pid": "0x7902",
        "device_version": "0.0.1"
    },
    "layout_aliases": {
        "LAYOUT_ansi": "LAYOUT_tkl_f13_ansi",
        "LAYOUT_iso": "LAYOUT_tkl_f13_iso"
    },
    "community_layouts": [
        "tkl_f13_ansi",
        "tkl_f13_iso"
    ],
    "layouts": {
        "LAYOUT_ansi": {
        "LAYOUT_tkl_f13_ansi": {
            "layout": [
                {"x":0, "y":0},
                {"x":1.25, "y":0},


@@ 106,7 114,7 @@
                {"x":17.25, "y":5.25}
            ]
        },
        "LAYOUT_iso": {
        "LAYOUT_tkl_f13_iso": {
            "layout": [
                {"x":0, "y":0},
                {"x":1.25, "y":0},

M keyboards/plywrks/ahgase/keymaps/default/keymap.c => keyboards/plywrks/ahgase/keymaps/default/keymap.c +1 -1
@@ 16,7 16,7 @@
#include QMK_KEYBOARD_H

const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    [0] = LAYOUT_ansi(
    [0] = LAYOUT_tkl_f13_ansi(
        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_F13,  KC_PSCR, KC_SLCK, 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/plywrks/ahgase/keymaps/iso/keymap.c => keyboards/plywrks/ahgase/keymaps/iso/keymap.c +1 -1
@@ 16,7 16,7 @@
#include QMK_KEYBOARD_H

const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    [0] = LAYOUT_iso(
    [0] = LAYOUT_tkl_f13_iso(
        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_F13,  KC_PSCR, KC_SLCK, 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_DEL,  KC_END,  KC_PGDN,