Merge remote-tracking branch 'origin/master' into develop
This commit is contained in:
QMK Bot
commit
05a2f0453a
|
|
@ -0,0 +1,6 @@
|
|||
// Copyright 2022 Salicylic-acid3 (@Salicylic-acid3)
|
||||
// SPDX-License-Identifier: GPL-2.0-or-later
|
||||
|
||||
#pragma once
|
||||
|
||||
#define SPLIT_HAND_PIN B6
|
||||
|
|
@ -0,0 +1,129 @@
|
|||
{
|
||||
"manufacturer": "Salicylic-acid3",
|
||||
"keyboard_name": "guide68",
|
||||
"maintainer": "Salicylic-acid3",
|
||||
"bootloader": "caterina",
|
||||
"diode_direction": "COL2ROW",
|
||||
"features": {
|
||||
"bootmagic": true,
|
||||
"command": false,
|
||||
"console": false,
|
||||
"extrakey": true,
|
||||
"mousekey": true,
|
||||
"rgblight": true,
|
||||
"nkro": false
|
||||
},
|
||||
"matrix_pins": {
|
||||
"cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2", "B5"],
|
||||
"rows": ["D4", "C6", "D7", "E6", "B4"]
|
||||
},
|
||||
"debounce": 5,
|
||||
"processor": "atmega32u4",
|
||||
"url": "",
|
||||
"usb": {
|
||||
"vid": "0x04D8",
|
||||
"pid": "0xE6DD",
|
||||
"device_version": "1.0.0"
|
||||
},
|
||||
"rgblight": {
|
||||
"led_count": 12,
|
||||
"pin": "D3",
|
||||
"animations": {
|
||||
"alternating": true,
|
||||
"breathing": true,
|
||||
"christmas": true,
|
||||
"knight": true,
|
||||
"rainbow_mood": true,
|
||||
"rainbow_swirl": true,
|
||||
"rgb_test": true,
|
||||
"snake": true,
|
||||
"static_gradient": true,
|
||||
"twinkle": true
|
||||
},
|
||||
"sleep": true,
|
||||
"max_brightness": 255,
|
||||
"split": true,
|
||||
"split_count": [ 6, 6 ]
|
||||
},
|
||||
"split": {
|
||||
"enabled": true,
|
||||
"transport": {
|
||||
"protocol": "serial"
|
||||
},
|
||||
"soft_serial_pin": "D0"
|
||||
},
|
||||
"layouts": {
|
||||
"LAYOUT": {
|
||||
"layout": [
|
||||
{"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":[5,0], "x":7, "y":0},
|
||||
{"matrix":[5,1], "x":8, "y":0},
|
||||
{"matrix":[5,2], "x":9, "y":0},
|
||||
{"matrix":[5,3], "x":10, "y":0},
|
||||
{"matrix":[5,4], "x":11, "y":0},
|
||||
{"matrix":[5,5], "x":12, "y":0},
|
||||
{"matrix":[5,6], "x":13, "y":0},
|
||||
{"matrix":[5,7], "x":14, "y":0},
|
||||
{"matrix":[6,7], "x":15, "y":0},
|
||||
{"matrix":[1,0], "x":0, "y":1, "w":1.5},
|
||||
{"matrix":[1,1], "x":1.5, "y":1},
|
||||
{"matrix":[1,2], "x":2.5, "y":1},
|
||||
{"matrix":[1,3], "x":3.5, "y":1},
|
||||
{"matrix":[1,4], "x":4.5, "y":1},
|
||||
{"matrix":[1,5], "x":5.5, "y":1},
|
||||
{"matrix":[6,0], "x":7.5, "y":1},
|
||||
{"matrix":[6,1], "x":8.5, "y":1},
|
||||
{"matrix":[6,2], "x":9.5, "y":1},
|
||||
{"matrix":[6,3], "x":10.5, "y":1},
|
||||
{"matrix":[6,4], "x":11.5, "y":1},
|
||||
{"matrix":[6,5], "x":12.5, "y":1},
|
||||
{"matrix":[6,6], "x":13.5, "y":1},
|
||||
{"matrix":[7,7], "x":14.5, "y":1, "w":1.5},
|
||||
{"matrix":[2,0], "x":0, "y":2, "w":1.75},
|
||||
{"matrix":[2,1], "x":1.75, "y":2},
|
||||
{"matrix":[2,2], "x":2.75, "y":2},
|
||||
{"matrix":[2,3], "x":3.75, "y":2},
|
||||
{"matrix":[2,4], "x":4.75, "y":2},
|
||||
{"matrix":[2,5], "x":5.75, "y":2},
|
||||
{"matrix":[7,0], "x":7.75, "y":2},
|
||||
{"matrix":[7,1], "x":8.75, "y":2},
|
||||
{"matrix":[7,2], "x":9.75, "y":2},
|
||||
{"matrix":[7,3], "x":10.75, "y":2},
|
||||
{"matrix":[7,4], "x":11.75, "y":2},
|
||||
{"matrix":[7,5], "x":12.75, "y":2},
|
||||
{"matrix":[7,6], "x":13.75, "y":2, "w":2.25},
|
||||
{"matrix":[3,0], "x":0, "y":3, "w":2},
|
||||
{"matrix":[3,1], "x":2, "y":3},
|
||||
{"matrix":[3,2], "x":3, "y":3},
|
||||
{"matrix":[3,3], "x":4, "y":3},
|
||||
{"matrix":[3,4], "x":5, "y":3},
|
||||
{"matrix":[3,5], "x":6, "y":3},
|
||||
{"matrix":[8,0], "x":8, "y":3},
|
||||
{"matrix":[8,1], "x":9, "y":3},
|
||||
{"matrix":[8,2], "x":10, "y":3},
|
||||
{"matrix":[8,3], "x":11, "y":3},
|
||||
{"matrix":[8,4], "x":12, "y":3},
|
||||
{"matrix":[8,5], "x":13, "y":3},
|
||||
{"matrix":[8,6], "x":14, "y":3},
|
||||
{"matrix":[8,7], "x":15, "y":3},
|
||||
{"matrix":[4,0], "x":0, "y":4, "w":1.25},
|
||||
{"matrix":[4,1], "x":1.25, "y":4, "w":1.25},
|
||||
{"matrix":[4,2], "x":2.5, "y":4, "w":1.25},
|
||||
{"matrix":[4,3], "x":3.75, "y":4, "w":1.5},
|
||||
{"matrix":[4,4], "x":5.25, "y":4, "w":1.5},
|
||||
{"matrix":[9,0], "x":7.75, "y":4, "w":1.5},
|
||||
{"matrix":[9,1], "x":9.25, "y":4, "w":1.25},
|
||||
{"matrix":[9,3], "x":10.5, "y":4, "w":1.25},
|
||||
{"matrix":[9,4], "x":11.75, "y":4, "w":1.25},
|
||||
{"matrix":[9,5], "x":13, "y":4},
|
||||
{"matrix":[9,6], "x":14, "y":4},
|
||||
{"matrix":[9,7], "x":15, "y":4}
|
||||
]
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,47 @@
|
|||
/* Copyright 2022 Salicylic_acid3
|
||||
*
|
||||
* 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 QMK_KEYBOARD_H
|
||||
|
||||
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
|
||||
/*
|
||||
* ┌───┬───┬───┬───┬───┬───┐ ┌───┬───┬───┬───┬───┬───┬───┬───┬───┐
|
||||
* │Esc│ 1 │ 2 │ 3 │ 4 │ 5 │ │ 6 │ 7 │ 8 │ 9 │ 0 │ - │ = │ ~ │BS │
|
||||
* ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┐ └─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤
|
||||
* │ Tab │ Q │ W │ E │ R │ T │ │ Y │ U │ I │ O │ P │ [ │ ] │ \ │
|
||||
* ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┐ └┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤
|
||||
* │ Caps │ A │ S │ D │ F │ G │ │ H │ J │ K │ L │ ; │ ' │ Enter │
|
||||
* ├──────┴┬──┴┬──┴┬──┴┬──┴┬──┴┐ └┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬───┬───┤
|
||||
* │ Shift │ Z │ X │ C │ V │ B │ │ N │ M │ , │ . │ / │ S │ ↑ │L1 │
|
||||
* ├────┬──┴─┬─┴──┬┴───┴┬──┴──┬┘ ┌┴───┴┬──┴─┬─┴──┬┴───┼───┼───┼───┤
|
||||
* │Ctrl│GUI │Alt │ Spc │ Spc │ │ Spc │Spc │Alt │menu│ ← │ ↓ │ → │
|
||||
* └────┴────┴────┴─────┴─────┘ └─────┴────┴────┴────┴───┴───┴───┘
|
||||
*/
|
||||
[0] = LAYOUT(
|
||||
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_GRV, KC_BSPC,
|
||||
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_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT,
|
||||
KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, MO(1),
|
||||
KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_SPC, KC_SPC, KC_SPC, KC_RALT, KC_APP, KC_LEFT,KC_DOWN, KC_RGHT
|
||||
),
|
||||
[1] = LAYOUT(
|
||||
KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
|
||||
KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
|
||||
KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
|
||||
KC_TRNS, KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
|
||||
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
|
||||
)
|
||||
};
|
||||
|
|
@ -0,0 +1,61 @@
|
|||
/* Copyright 2022 Salicylic_acid3
|
||||
*
|
||||
* 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 QMK_KEYBOARD_H
|
||||
|
||||
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
|
||||
/*
|
||||
* ┌───┬───┬───┬───┬───┬───┐ ┌───┬───┬───┬───┬───┬───┬───┬───┬───┐
|
||||
* │Esc│ 1 │ 2 │ 3 │ 4 │ 5 │ │ 6 │ 7 │ 8 │ 9 │ 0 │ - │ = │ ~ │BS │
|
||||
* ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┐ └─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤
|
||||
* │ Tab │ Q │ W │ E │ R │ T │ │ Y │ U │ I │ O │ P │ [ │ ] │ \ │
|
||||
* ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┐ └┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤
|
||||
* │ Caps │ A │ S │ D │ F │ G │ │ H │ J │ K │ L │ ; │ ' │ Enter │
|
||||
* ├──────┴┬──┴┬──┴┬──┴┬──┴┬──┴┐ └┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬───┬───┤
|
||||
* │ Shift │ Z │ X │ C │ V │ B │ │ N │ M │ , │ . │ / │ S │ ↑ │L1 │
|
||||
* ├────┬──┴─┬─┴──┬┴───┴┬──┴──┬┘ ┌┴───┴┬──┴─┬─┴──┬┴───┼───┼───┼───┤
|
||||
* │Ctrl│GUI │Alt │ Spc │ Spc │ │ Spc │Spc │Alt │menu│ ← │ ↓ │ → │
|
||||
* └────┴────┴────┴─────┴─────┘ └─────┴────┴────┴────┴───┴───┴───┘
|
||||
*/
|
||||
[0] = LAYOUT(
|
||||
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_GRV, KC_BSPC,
|
||||
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_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT,
|
||||
KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, MO(1),
|
||||
KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_SPC, KC_SPC, KC_SPC, KC_RALT, KC_APP, KC_LEFT,KC_DOWN, KC_RGHT
|
||||
),
|
||||
[1] = LAYOUT(
|
||||
KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
|
||||
KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
|
||||
KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
|
||||
KC_TRNS, KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
|
||||
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
|
||||
),
|
||||
[2] = LAYOUT(
|
||||
KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
|
||||
KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
|
||||
KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
|
||||
KC_TRNS, KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
|
||||
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
|
||||
),
|
||||
[3] = LAYOUT(
|
||||
KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
|
||||
KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
|
||||
KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
|
||||
KC_TRNS, KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
|
||||
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
|
||||
)
|
||||
};
|
||||
|
|
@ -0,0 +1 @@
|
|||
VIA_ENABLE = yes
|
||||
|
|
@ -0,0 +1,27 @@
|
|||
# guide68
|
||||
|
||||
|
||||
|
||||
This is 68 keys Row-staggered Split keyboard.
|
||||
|
||||
* Keyboard Maintainer: [Salicylic-acid3](https://github.com/Salicylic-acid3)
|
||||
* Hardware Supported: guide68 PCB, Pro Micro
|
||||
* Hardware Availability: [PCB & Case Data](https://github.com/Salicylic-acid3/PCB_Data)
|
||||
|
||||
Make example for this keyboard (after setting up your build environment):
|
||||
|
||||
make salicylic_acid3/guide68:default
|
||||
|
||||
Flashing example for this keyboard:
|
||||
|
||||
make salicylic_acid3/guide68:default:flash
|
||||
|
||||
See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
|
||||
|
||||
## Bootloader
|
||||
|
||||
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
|
||||
* **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
|
||||
|
|
@ -0,0 +1 @@
|
|||
# This file intentionally left blank
|
||||
Loading…
Reference in New Issue