mirror of
https://github.com/qmk/qmk_firmware.git
synced 2024-12-02 16:05:09 +00:00
Merge remote-tracking branch 'origin/develop' into xap
This commit is contained in:
QMK Bot
commit
d9372d6fcb
@ -1060,7 +1060,7 @@
|
||||
"target": "lyso1/lefishe"
|
||||
},
|
||||
"lets_split_eh/eh": {
|
||||
"target": "maple_computing/lets_split_eh/eh"
|
||||
"target": "maple_computing/lets_split_eh"
|
||||
},
|
||||
"ls_60": {
|
||||
"target": "weirdo/ls_60"
|
||||
@ -1080,6 +1080,9 @@
|
||||
"macro1": {
|
||||
"target": "laneware/macro1"
|
||||
},
|
||||
"maple_computing/lets_split_eh/eh": {
|
||||
"target": "maple_computing/lets_split_eh"
|
||||
},
|
||||
"massdrop/thekey": {
|
||||
"target": "drop/thekey/v1"
|
||||
},
|
||||
|
||||
@ -1,22 +1,18 @@
|
||||
{
|
||||
"keyboard_name": "bear_face",
|
||||
"manufacturer": "chemicalwill",
|
||||
"url": "https://github.com/chemicalwill/bear_face_pcb",
|
||||
"maintainer": "chemicalwill",
|
||||
"debounce": 6,
|
||||
"manufacturer": "will-hedges",
|
||||
"url": "https://github.com/will-hedges",
|
||||
"maintainer": "will-hedges",
|
||||
"usb": {
|
||||
"vid": "0xFEED",
|
||||
"pid": "0x09F5",
|
||||
"force_nkro": true
|
||||
"pid": "0x09F5"
|
||||
},
|
||||
"features": {
|
||||
"backlight": true,
|
||||
"bootmagic": false,
|
||||
"bootmagic": true,
|
||||
"command": false,
|
||||
"console": false,
|
||||
"extrakey": true,
|
||||
"mousekey": false,
|
||||
"nkro": true
|
||||
"mousekey": false
|
||||
},
|
||||
"qmk": {
|
||||
"locking": {
|
||||
@ -24,16 +20,14 @@
|
||||
"resync": true
|
||||
}
|
||||
},
|
||||
"indicators": {
|
||||
"caps_lock": "F7"
|
||||
},
|
||||
"matrix_pins": {
|
||||
"cols": ["B5", "C7", "C6", "F0", "E6", "B7", "D0", "D1", "D2", "D3", "D5", "D4", "D6", "D7", "B4"],
|
||||
"rows": ["F5", "F6", "F4", "F1", "B0", "B6"]
|
||||
},
|
||||
"diode_direction": "COL2ROW",
|
||||
"backlight": {
|
||||
"driver": "timer",
|
||||
"as_caps_lock": true,
|
||||
"driver": "software",
|
||||
"pin": "F7"
|
||||
},
|
||||
"processor": "atmega32u4",
|
||||
|
||||
@ -1 +0,0 @@
|
||||
DEFAULT_FOLDER = bear_face/v1
|
||||
@ -1,9 +1,13 @@
|
||||
{
|
||||
"keyboard_name": "bear_face v1",
|
||||
"usb": {
|
||||
"device_version": "1.0.0"
|
||||
},
|
||||
"backlight": {
|
||||
"on_state": 0
|
||||
},
|
||||
"layouts": {
|
||||
"LAYOUT_83_ansi": {
|
||||
"LAYOUT": {
|
||||
"layout": [
|
||||
{"matrix": [0, 0], "x": 0, "y": 0, "w": 1.5},
|
||||
{"matrix": [0, 1], "x": 1.5, "y": 0},
|
||||
|
||||
@ -1,19 +1,5 @@
|
||||
/*
|
||||
Copyright 2020 chemicalwill <https://github.com/chemicalwill>
|
||||
|
||||
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/>.
|
||||
*/
|
||||
/* Copyright 2024 will-hedges */
|
||||
/* SPDX-License-Identifier: GPL-2.0-or-later */
|
||||
|
||||
#include QMK_KEYBOARD_H
|
||||
|
||||
@ -28,13 +14,13 @@ enum layers {
|
||||
|
||||
//custom keycode enums
|
||||
enum custom_keycodes {
|
||||
BASE_QWER = SAFE_RANGE,
|
||||
BASE_QWER = QK_USER,
|
||||
BASE_COLE,
|
||||
BASE_DVOR
|
||||
};
|
||||
|
||||
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
|
||||
[_QWER] = LAYOUT_83_ansi(
|
||||
[_QWER] = LAYOUT(
|
||||
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_NO, KC_DEL,
|
||||
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_HOME,
|
||||
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_PGUP,
|
||||
@ -43,7 +29,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
|
||||
KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(_FN1), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT
|
||||
),
|
||||
|
||||
[_COLE] = LAYOUT_83_ansi(
|
||||
[_COLE] = LAYOUT(
|
||||
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_NO, KC_DEL,
|
||||
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_HOME,
|
||||
KC_TAB, KC_Q, KC_W, KC_F, KC_P, KC_G, KC_J, KC_L, KC_U, KC_Y, KC_SCLN, KC_LBRC, KC_RBRC, KC_BSLS, KC_PGUP,
|
||||
@ -52,7 +38,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
|
||||
KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(_FN1), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT
|
||||
),
|
||||
|
||||
[_DVOR] = LAYOUT_83_ansi(
|
||||
[_DVOR] = LAYOUT(
|
||||
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_NO, KC_DEL,
|
||||
KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_LBRC, KC_RBRC, KC_BSPC, KC_HOME,
|
||||
KC_TAB, KC_QUOT, KC_COMM, KC_DOT, KC_P, KC_Y, KC_F, KC_G, KC_C, KC_R, KC_L, KC_SLSH, KC_EQL, KC_BSLS, KC_PGUP,
|
||||
@ -61,7 +47,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
|
||||
KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(_FN1), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT
|
||||
),
|
||||
|
||||
[_FN1] = LAYOUT_83_ansi(
|
||||
[_FN1] = LAYOUT(
|
||||
_______, KC_MUTE, KC_VOLD, KC_VOLU, KC_MPRV, KC_MPLY, KC_MNXT, _______, _______, KC_PSCR, KC_SCRL, KC_PAUS, _______, _______, KC_INS,
|
||||
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_CALC, BASE_QWER,
|
||||
_______, _______, _______, _______, QK_BOOT, _______, _______, _______, _______, QK_BOOT, _______, _______, _______, _______, BASE_COLE,
|
||||
@ -71,7 +57,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
|
||||
),
|
||||
|
||||
/*
|
||||
[_BLANK] = LAYOUT_83_ansi(
|
||||
[_BLANK] = LAYOUT(
|
||||
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
|
||||
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
|
||||
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
|
||||
@ -82,8 +68,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
|
||||
*/
|
||||
};
|
||||
|
||||
//macros to allow the user to set whatever default layer they want, even after reboot
|
||||
|
||||
// macros to allow the user to set whatever default layer they want, even after reboot
|
||||
bool process_record_user(uint16_t keycode, keyrecord_t *record) {
|
||||
switch (keycode) {
|
||||
case BASE_QWER:
|
||||
|
||||
@ -1,8 +1,106 @@
|
||||
{
|
||||
"keyboard_name": "bear_face v2",
|
||||
"usb": {
|
||||
"device_version": "2.0.0"
|
||||
"device_version": "2.1.0"
|
||||
},
|
||||
"backlight": {
|
||||
"on_state": 0
|
||||
},
|
||||
"layouts": {
|
||||
"LAYOUT_all": {
|
||||
"layout": [
|
||||
{"matrix": [0, 0], "x": 0, "y": 0, "w": 1.5},
|
||||
{"matrix": [0, 1], "x": 1.5, "y": 0},
|
||||
{"matrix": [0, 2], "x": 2.5, "y": 0},
|
||||
{"matrix": [0, 3], "x": 3.5, "y": 0},
|
||||
{"matrix": [0, 4], "x": 4.5, "y": 0},
|
||||
{"matrix": [0, 5], "x": 5.5, "y": 0},
|
||||
{"matrix": [0, 6], "x": 6.5, "y": 0},
|
||||
{"matrix": [0, 7], "x": 7.5, "y": 0},
|
||||
{"matrix": [0, 8], "x": 8.5, "y": 0},
|
||||
{"matrix": [0, 9], "x": 9.5, "y": 0},
|
||||
{"matrix": [0, 10], "x": 10.5, "y": 0},
|
||||
{"matrix": [0, 11], "x": 11.5, "y": 0},
|
||||
{"matrix": [0, 12], "x": 12.5, "y": 0},
|
||||
{"matrix": [0, 13], "x": 13.5, "y": 0},
|
||||
{"matrix": [0, 14], "x": 14.5, "y": 0, "w": 1.5},
|
||||
|
||||
{"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": [1, 12], "x": 12, "y": 1},
|
||||
{"matrix": [1, 13], "x": 13, "y": 1, "w": 2},
|
||||
{"matrix": [1, 14], "x": 15, "y": 1},
|
||||
|
||||
{"matrix": [2, 0], "x": 0, "y": 2, "w": 1.5},
|
||||
{"matrix": [2, 1], "x": 1.5, "y": 2},
|
||||
{"matrix": [2, 2], "x": 2.5, "y": 2},
|
||||
{"matrix": [2, 3], "x": 3.5, "y": 2},
|
||||
{"matrix": [2, 4], "x": 4.5, "y": 2},
|
||||
{"matrix": [2, 5], "x": 5.5, "y": 2},
|
||||
{"matrix": [2, 6], "x": 6.5, "y": 2},
|
||||
{"matrix": [2, 7], "x": 7.5, "y": 2},
|
||||
{"matrix": [2, 8], "x": 8.5, "y": 2},
|
||||
{"matrix": [2, 9], "x": 9.5, "y": 2},
|
||||
{"matrix": [2, 10], "x": 10.5, "y": 2},
|
||||
{"matrix": [2, 11], "x": 11.5, "y": 2},
|
||||
{"matrix": [2, 12], "x": 12.5, "y": 2},
|
||||
{"matrix": [2, 13], "x": 13.5, "y": 2, "w": 1.5},
|
||||
{"matrix": [2, 14], "x": 15, "y": 2},
|
||||
|
||||
{"matrix": [3, 0], "x": 0, "y": 3, "w": 1.75},
|
||||
{"matrix": [3, 1], "x": 1.75, "y": 3},
|
||||
{"matrix": [3, 2], "x": 2.75, "y": 3},
|
||||
{"matrix": [3, 3], "x": 3.75, "y": 3},
|
||||
{"matrix": [3, 4], "x": 4.75, "y": 3},
|
||||
{"matrix": [3, 5], "x": 5.75, "y": 3},
|
||||
{"matrix": [3, 6], "x": 6.75, "y": 3},
|
||||
{"matrix": [3, 7], "x": 7.75, "y": 3},
|
||||
{"matrix": [3, 8], "x": 8.75, "y": 3},
|
||||
{"matrix": [3, 9], "x": 9.75, "y": 3},
|
||||
{"matrix": [3, 10], "x": 10.75, "y": 3},
|
||||
{"matrix": [3, 11], "x": 11.75, "y": 3},
|
||||
{"matrix": [3, 12], "x": 12.75, "y": 3},
|
||||
{"matrix": [3, 13], "x": 13.75, "y": 2, "w": 1.25, "h": 2},
|
||||
{"matrix": [3, 14], "x": 15, "y": 3},
|
||||
|
||||
{"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
|
||||
{"matrix": [4, 1], "x": 1.25, "y": 4},
|
||||
{"matrix": [4, 2], "x": 2.25, "y": 4},
|
||||
{"matrix": [4, 3], "x": 3.25, "y": 4},
|
||||
{"matrix": [4, 4], "x": 4.25, "y": 4},
|
||||
{"matrix": [4, 5], "x": 5.25, "y": 4},
|
||||
{"matrix": [4, 6], "x": 6.25, "y": 4},
|
||||
{"matrix": [4, 7], "x": 7.25, "y": 4},
|
||||
{"matrix": [4, 8], "x": 8.25, "y": 4},
|
||||
{"matrix": [4, 9], "x": 9.25, "y": 4},
|
||||
{"matrix": [4, 10], "x": 10.25, "y": 4},
|
||||
{"matrix": [4, 11], "x": 11.25, "y": 4},
|
||||
{"matrix": [4, 12], "x": 12.25, "y": 4, "w": 1.75},
|
||||
{"matrix": [4, 13], "x": 14, "y": 4},
|
||||
{"matrix": [4, 14], "x": 15, "y": 4},
|
||||
|
||||
{"matrix": [5, 0], "x": 0, "y": 5, "w": 1.25},
|
||||
{"matrix": [5, 1], "x": 1.25, "y": 5, "w": 1.25},
|
||||
{"matrix": [5, 2], "x": 2.5, "y": 5, "w": 1.25},
|
||||
{"matrix": [5, 5], "x": 3.75, "y": 5, "w": 6.25},
|
||||
{"matrix": [5, 9], "x": 10, "y": 5},
|
||||
{"matrix": [5, 10], "x": 11, "y": 5},
|
||||
{"matrix": [5, 11], "x": 12, "y": 5},
|
||||
{"matrix": [5, 12], "x": 13, "y": 5},
|
||||
{"matrix": [5, 13], "x": 14, "y": 5},
|
||||
{"matrix": [5, 14], "x": 15, "y": 5}
|
||||
]
|
||||
},
|
||||
"LAYOUT_83_ansi": {
|
||||
"layout": [
|
||||
{"matrix": [0, 0], "x": 0, "y": 0, "w": 1.5},
|
||||
|
||||
@ -1,19 +1,5 @@
|
||||
/*
|
||||
Copyright 2020 chemicalwill <https://github.com/chemicalwill>
|
||||
|
||||
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/>.
|
||||
*/
|
||||
/* Copyright 2024 will-hedges */
|
||||
/* SPDX-License-Identifier: GPL-2.0-or-later */
|
||||
|
||||
#include QMK_KEYBOARD_H
|
||||
|
||||
@ -28,7 +14,7 @@ enum layers {
|
||||
|
||||
//custom keycode enums
|
||||
enum custom_keycodes {
|
||||
BASE_QWER = SAFE_RANGE,
|
||||
BASE_QWER = QK_USER,
|
||||
BASE_COLE,
|
||||
BASE_DVOR
|
||||
};
|
||||
@ -82,8 +68,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
|
||||
*/
|
||||
};
|
||||
|
||||
//macros to allow the user to set whatever default layer they want, even after reboot
|
||||
|
||||
// macros to allow the user to set whatever default layer they want, even after reboot
|
||||
bool process_record_user(uint16_t keycode, keyrecord_t *record) {
|
||||
switch (keycode) {
|
||||
case BASE_QWER:
|
||||
|
||||
@ -13,3 +13,7 @@ This layout replaces the stock layout on the Vortex Race 3.
|
||||
* 'Reset' will put the keyboard into DFU mode
|
||||
* 'APP' sends 'KC_APP'
|
||||
* Base layer toggles for QWERTY, COLEMAK, and DVORAK layouts (will persist after reboot)
|
||||
|
||||
- New things in v2:
|
||||
* Option of ANSI or ISO layout
|
||||
* Optional stepped caps (will require compatible plate)
|
||||
|
||||
@ -1,19 +1,5 @@
|
||||
/*
|
||||
Copyright 2020 chemicalwill <https://github.com/chemicalwill>
|
||||
|
||||
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/>.
|
||||
*/
|
||||
/* Copyright 2024 will-hedges */
|
||||
/* SPDX-License-Identifier: GPL-2.0-or-later */
|
||||
|
||||
#include QMK_KEYBOARD_H
|
||||
|
||||
@ -28,7 +14,7 @@ enum layers {
|
||||
|
||||
//custom keycode enums
|
||||
enum custom_keycodes {
|
||||
BASE_QWER = SAFE_RANGE,
|
||||
BASE_QWER = QK_USER,
|
||||
BASE_COLE,
|
||||
BASE_DVOR
|
||||
};
|
||||
@ -82,8 +68,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
|
||||
*/
|
||||
};
|
||||
|
||||
//macros to allow the user to set whatever default layer they want, even after reboot
|
||||
|
||||
//macros to allow the user to set whatever default layer they want, even after reboot
|
||||
bool process_record_user(uint16_t keycode, keyrecord_t *record) {
|
||||
switch (keycode) {
|
||||
case BASE_QWER:
|
||||
|
||||
@ -14,7 +14,7 @@ enum layers {
|
||||
|
||||
//custom keycode enums
|
||||
enum custom_keycodes {
|
||||
BASE_QWER = QK_KB_0,
|
||||
BASE_QWER = QK_USER,
|
||||
BASE_COLE,
|
||||
BASE_DVOR
|
||||
};
|
||||
|
||||
@ -14,7 +14,7 @@ enum layers {
|
||||
|
||||
//custom keycode enums
|
||||
enum custom_keycodes {
|
||||
BASE_QWER = SAFE_RANGE,
|
||||
BASE_QWER = QK_USER,
|
||||
BASE_COLE,
|
||||
BASE_DVOR
|
||||
};
|
||||
|
||||
@ -1,2 +0,0 @@
|
||||
# Disable unsupported hardware
|
||||
AUDIO_SUPPORTED = no
|
||||
@ -19,6 +19,7 @@
|
||||
"rgblight": {
|
||||
"led_count": 12,
|
||||
"split_count": [6, 6],
|
||||
"sleep": true,
|
||||
"animations": {
|
||||
"breathing": true,
|
||||
"rainbow_mood": true,
|
||||
@ -42,7 +43,7 @@
|
||||
"processor": "atmega32u4",
|
||||
"bootloader": "atmel-dfu",
|
||||
"features": {
|
||||
"bootmagic": false,
|
||||
"bootmagic": true,
|
||||
"mousekey": false,
|
||||
"extrakey": true,
|
||||
"nkro": true,
|
||||
@ -8,6 +8,6 @@ Keyboard Maintainer: [Christopher Poole (That-Canadian)](https://github.com/That
|
||||
|
||||
Make example for this keyboard (after setting up your build environment):
|
||||
|
||||
make maple_computing/lets_split_eh/eh:default
|
||||
make maple_computing/lets_split_eh:default
|
||||
|
||||
See [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) then the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information.
|
||||
|
||||
@ -1 +1,2 @@
|
||||
DEFAULT_FOLDER = maple_computing/lets_split_eh/eh
|
||||
# Disable unsupported hardware
|
||||
AUDIO_SUPPORTED = no
|
||||
|
||||
Loading…
Reference in New Issue
Block a user