~ruther/qmk_firmware

add7c13d612e08180d575383dc12217b4d061884 — Joe Scotto 1 year, 1 month ago b9d6526 
Update ScottoAlp handwired keyboard to 12 column layout (#22962)

Co-authored-by: Ryan <fauxpark@gmail.com>
patch browse .tar.gz 
4 files changed, 90 insertions(+), 72 deletions(-)

M keyboards/handwired/scottokeebs/scottoalp/info.json
M keyboards/handwired/scottokeebs/scottoalp/keymaps/default/keymap.c
M keyboards/handwired/scottokeebs/scottoalp/readme.md
M keyboards/scottokeebs/scotto34/info.json

M keyboards/handwired/scottokeebs/scottoalp/info.json => keyboards/handwired/scottokeebs/scottoalp/info.json +52 -48
@@ 2,6 2,12 @@
    "manufacturer": "ScottoKeebs",
    "keyboard_name": "ScottoAlp",
    "maintainer": "joe-scotto",
    "bootmagic": {
        "matrix": [0, 1]
    },
    "build": {
        "lto": true
    },
    "development_board": "promicro",
    "diode_direction": "COL2ROW",
    "features": {


@@ 13,10 19,7 @@
        "nkro": true
    },
    "matrix_pins": {
        //  4, 5, 6, 7, 8, 9, A3, A2, A1, A0
        "cols": ["D4", "C6", "D7", "E6", "B4", "B5", "F4", "F5", "F6", "F7"],

        // 15, 14, 16, 10
        "cols": ["D1", "D4", "C6", "D7", "E6", "B4", "B5", "F4", "F5", "F6", "F7", "D0"],
        "rows": ["B1", "B3", "B2", "B6"]
    },
    "url": "https://scottokeebs.com",


@@ 26,51 29,52 @@
        "vid": "0x534B"
    },
    "layouts": {
        "LAYOUT_ortho_3x10_5": {
        "LAYOUT": {
            "layout": [
                // Row 1
                { "matrix": [0, 0], "x": 0, "y": 0 },
                { "matrix": [0, 1], "x": 1, "y": 0 },
                { "matrix": [0, 2], "x": 2, "y": 0 },
                { "matrix": [0, 3], "x": 3, "y": 0 },
                { "matrix": [0, 4], "x": 4, "y": 0 },
                { "matrix": [0, 5], "x": 5, "y": 0 },
                { "matrix": [0, 6], "x": 6, "y": 0 },
                { "matrix": [0, 7], "x": 7, "y": 0 },
                { "matrix": [0, 8], "x": 8, "y": 0 },
                { "matrix": [0, 9], "x": 9, "y": 0 },

                // Row 2
                { "matrix": [1, 0], "x": 0, "y": 1 },
                { "matrix": [1, 1], "x": 1, "y": 1 },
                { "matrix": [1, 2], "x": 2, "y": 1 },
                { "matrix": [1, 3], "x": 3, "y": 1 },
                { "matrix": [1, 4], "x": 4, "y": 1 },
                { "matrix": [1, 5], "x": 5, "y": 1 },
                { "matrix": [1, 6], "x": 6, "y": 1 },
                { "matrix": [1, 7], "x": 7, "y": 1 },
                { "matrix": [1, 8], "x": 8, "y": 1 },
                { "matrix": [1, 9], "x": 9, "y": 1 },

                // Row 3
                { "matrix": [2, 0], "x": 0, "y": 2 },
                { "matrix": [2, 1], "x": 1, "y": 2 },
                { "matrix": [2, 2], "x": 2, "y": 2 },
                { "matrix": [2, 3], "x": 3, "y": 2 },
                { "matrix": [2, 4], "x": 4, "y": 2 },
                { "matrix": [2, 5], "x": 5, "y": 2 },
                { "matrix": [2, 6], "x": 6, "y": 2 },
                { "matrix": [2, 7], "x": 7, "y": 2 },
                { "matrix": [2, 8], "x": 8, "y": 2 },
                { "matrix": [2, 9], "x": 9, "y": 2 },

                // Row 4
                { "matrix": [3, 1], "x": 1.5, "y": 3 },
                { "matrix": [3, 2], "x": 2.5, "y": 3 },
                { "matrix": [3, 4], "x": 3.5, "y": 3, "w": 3 },
                { "matrix": [3, 6], "x": 6.5, "y": 3 },
                { "matrix": [3, 7], "x": 7.5, "y": 3 }
                {"matrix": [0, 0], "x": 0, "y": 0},
                {"matrix": [0, 1], "x": 1, "y": 0},
                {"matrix": [0, 2], "x": 2, "y": 0},
                {"matrix": [0, 3], "x": 3, "y": 0},
                {"matrix": [0, 4], "x": 4, "y": 0},
                {"matrix": [0, 5], "x": 5, "y": 0},
                {"matrix": [0, 6], "x": 6, "y": 0},
                {"matrix": [0, 7], "x": 7, "y": 0},
                {"matrix": [0, 8], "x": 8, "y": 0},
                {"matrix": [0, 9], "x": 9, "y": 0},
                {"matrix": [0, 10], "x": 10, "y": 0},
                {"matrix": [0, 11], "x": 11, "y": 0},
                {"matrix": [1, 0], "x": 0, "y": 1},
                {"matrix": [1, 1], "x": 1, "y": 1},
                {"matrix": [1, 2], "x": 2, "y": 1},
                {"matrix": [1, 3], "x": 3, "y": 1},
                {"matrix": [1, 4], "x": 4, "y": 1},
                {"matrix": [1, 5], "x": 5, "y": 1},
                {"matrix": [1, 6], "x": 6, "y": 1},
                {"matrix": [1, 7], "x": 7, "y": 1},
                {"matrix": [1, 8], "x": 8, "y": 1},
                {"matrix": [1, 9], "x": 9, "y": 1},
                {"matrix": [1, 10], "x": 10, "y": 1},
                {"matrix": [1, 11], "x": 11, "y": 1},
                {"matrix": [2, 0], "x": 0, "y": 2},
                {"matrix": [2, 1], "x": 1, "y": 2},
                {"matrix": [2, 2], "x": 2, "y": 2},
                {"matrix": [2, 3], "x": 3, "y": 2},
                {"matrix": [2, 4], "x": 4, "y": 2},
                {"matrix": [2, 5], "x": 5, "y": 2},
                {"matrix": [2, 6], "x": 6, "y": 2},
                {"matrix": [2, 7], "x": 7, "y": 2},
                {"matrix": [2, 8], "x": 8, "y": 2},
                {"matrix": [2, 9], "x": 9, "y": 2},
                {"matrix": [2, 10], "x": 10, "y": 2},
                {"matrix": [2, 11], "x": 11, "y": 2},
                {"matrix": [3, 1], "x": 0, "y": 3},
                {"matrix": [3, 2], "x": 2, "y": 3},
                {"matrix": [3, 3], "x": 3, "y": 3},
                {"matrix": [3, 5], "x": 5, "y": 3},
                {"matrix": [3, 7], "x": 7, "y": 3},
                {"matrix": [3, 8], "x": 8, "y": 3},
                {"matrix": [3, 9], "x": 9, "y": 3}
            ]
        }
    }
}
}
\ No newline at end of file


M keyboards/handwired/scottokeebs/scottoalp/keymaps/default/keymap.c => keyboards/handwired/scottokeebs/scottoalp/keymaps/default/keymap.c +20 -20
@@ 18,28 18,28 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
#include QMK_KEYBOARD_H

const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    [0] = LAYOUT_ortho_3x10_5(
        KC_Q,         KC_W,    KC_E,    KC_R,    KC_T,           KC_Y, KC_U,          KC_I,         KC_O,   KC_P,
        KC_A,         KC_S,    KC_D,    KC_F,    KC_G,           KC_H, KC_J,          KC_K,         KC_L,   KC_BSPC,
        LSFT_T(KC_Z), KC_X,    KC_C,    KC_V,    KC_B,           KC_N, KC_M,          KC_COMMA,     KC_DOT, RSFT_T(KC_SLSH),
                      KC_LGUI, KC_LALT,          LGUI_T(KC_SPC),       LT(1, KC_TAB), LT(2, KC_ENT)
    [0] = LAYOUT(
        KC_TAB,  KC_Q,         KC_W,    KC_E,    KC_R,    KC_T,           KC_Y, KC_U,          KC_I,          KC_O,   KC_P,            KC_BSPC,
        KC_ENT,  KC_A,         KC_S,    KC_D,    KC_F,    KC_G,           KC_H, KC_J,          KC_K,          KC_L,   KC_BSPC,         KC_QUOT,
        KC_LSFT, LSFT_T(KC_Z), KC_X,    KC_C,    KC_V,    KC_B,           KC_N, KC_M,          KC_COMMA,      KC_DOT, RSFT_T(KC_SLSH), KC_RSFT,
                 KC_ESC,       KC_LGUI, KC_LALT,          LGUI_T(KC_SPC),       LT(1, KC_TAB), LT(2, KC_ENT), KC_ESC
    ),
    [1] = LAYOUT_ortho_3x10_5(
        KC_UNDS,         KC_MINS, KC_PLUS, KC_EQL,  KC_COLN, KC_GRV,   KC_MRWD, KC_MPLY, KC_MFFD, KC_DEL,
        KC_LCBR,         KC_LPRN, KC_RPRN, KC_RCBR, KC_PIPE, KC_ESC,   KC_LEFT, KC_UP,   KC_DOWN, KC_RGHT,
        LSFT_T(KC_LBRC), KC_QUOT, KC_DQUO, KC_RBRC, KC_SCLN, KC_TILDE, KC_VOLD, KC_MUTE, KC_VOLU, RSFT_T(KC_BSLS),
                         KC_TRNS, KC_TRNS,          KC_TRNS,           KC_TRNS, KC_TRNS
    [1] = LAYOUT(
        KC_TRNS, KC_UNDS,         KC_MINS, KC_PLUS, KC_EQL,  KC_COLN, KC_GRV,   KC_MRWD, KC_MPLY, KC_MFFD, KC_DEL,          KC_TRNS,
        KC_TRNS, KC_LCBR,         KC_LPRN, KC_RPRN, KC_RCBR, KC_PIPE, KC_ESC,   KC_LEFT, KC_UP,   KC_DOWN, KC_RGHT,         KC_TRNS,
        KC_TRNS, LSFT_T(KC_LBRC), KC_QUOT, KC_DQUO, KC_RBRC, KC_SCLN, KC_TILDE, KC_VOLD, KC_MUTE, KC_VOLU, RSFT_T(KC_BSLS), KC_TRNS,
                 KC_TRNS,         KC_TRNS, KC_TRNS,          KC_TRNS,           KC_TRNS, KC_TRNS, KC_TRNS
    ),
    [2] = LAYOUT_ortho_3x10_5(
        KC_EXLM, KC_AT,   KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_CAPS, KC_BSPC,
        KC_1,    KC_2,    KC_3,    KC_4,   KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,
        KC_LSFT, KC_NO,   KC_NO,   KC_NO,  MO(3),   KC_NO,   KC_NO,   KC_COMM, KC_DOT,  RSFT_T(KC_SLSH),
                 KC_TRNS, KC_TRNS,         KC_TRNS,          KC_TRNS, KC_TRNS
    [2] = LAYOUT(
        KC_TRNS, KC_EXLM, KC_AT,   KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_CAPS, KC_BSPC,         KC_TRNS,
        KC_TRNS, KC_1,    KC_2,    KC_3,    KC_4,   KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,            KC_TRNS,
        KC_TRNS, KC_LSFT, KC_NO,   KC_NO,   KC_NO,  MO(3),   KC_NO,   KC_NO,   KC_COMM, KC_DOT,  RSFT_T(KC_SLSH), KC_TRNS,
                 KC_TRNS, KC_TRNS, KC_TRNS,         KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS
    ),
    [3] = LAYOUT_ortho_3x10_5(
        KC_NO,  KC_NO, KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO, KC_NO,   KC_NO, KC_NO, 
        KC_F1,  KC_F2, KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7, KC_F8,   KC_F9, KC_F10,
        KC_F11, KC_NO, KC_NO,   QK_BOOT, KC_TRNS, KC_NO,   KC_NO, KC_NO,   KC_NO, KC_F12,
                       KC_TRNS, KC_TRNS,          KC_TRNS,        KC_TRNS, KC_TRNS
    [3] = LAYOUT(
        KC_TRNS, KC_NO,  KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO, KC_NO,   KC_NO,   KC_NO,  KC_TRNS,
        KC_TRNS, KC_F1,  KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7, KC_F8,   KC_F9,   KC_F10, KC_TRNS,
        KC_TRNS, KC_F11, KC_NO,   KC_NO,   QK_BOOT, KC_TRNS, KC_NO,   KC_NO, KC_NO,   KC_NO,   KC_F12, KC_TRNS,
                         KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,        KC_TRNS, KC_TRNS, KC_TRNS
    )
};
\ No newline at end of file


M keyboards/handwired/scottokeebs/scottoalp/readme.md => keyboards/handwired/scottokeebs/scottoalp/readme.md +2 -2
@@ 2,7 2,7 @@

![ScottoAlp](https://i.imgur.com/XKpYcMgh.jpeg)

A 35-key ortholinear keyboard with a 3u spacebar and is compatible with both MX or Alps. Case files available [here](https://github.com/joe-scotto/scottokeebs).
A 35 or 43-key ortholinear keyboard with a 3u spacebar and is compatible with both MX or Alps. Case files available [here](https://github.com/joe-scotto/scottokeebs).

*   Keyboard Maintainer: [Joe Scotto](https://github.com/joe-scotto)
*   Hardware Supported: ATmega32U4


@@ 22,6 22,6 @@ See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_to

Enter the bootloader in 3 ways:

* **Bootmagic reset**: Hold down the key at (0,0) in the matrix (usually the top left key or Escape) and plug in the keyboard
* **Bootmagic reset**: Hold down the key at (0,1) in the matrix (usually the top left key or Escape) and plug in the keyboard
* **Physical reset button**: Briefly press the button on the back of the PCB - some may have pads you must short instead
* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available
\ No newline at end of file


M keyboards/scottokeebs/scotto34/info.json => keyboards/scottokeebs/scotto34/info.json +16 -2
@@ 21,7 21,7 @@
    "url": "https://scottokeebs.com",
    "usb": {
        "device_version": "1.0.0",
        "pid": "0x1013",
        "pid": "0x1019",
        "vid": "0x534B"
    },
    "ws2812": {


@@ 29,7 29,21 @@
        "driver": "vendor"
    },
    "rgblight": {
        "led_count": 1
        "led_count": 5,
        "default": {
            "animation": "rainbow_swirl"
        },
        "animations": {
            "breathing": true,
            "rainbow_mood": true,
            "rainbow_swirl": true,
            "snake": true,
            "knight": true,
            "christmas": true,
            "static_gradient": true,
            "alternating": true,
            "twinkle": true
        }
    },
    "community_layouts": ["split_3x5_2"],
    "layouts": {
Do not follow this link