Merge remote-tracking branch 'qmk/master' into merge-2024-09-07

This commit is contained in:
Ilya Zhuravlev 2024-09-07 19:49:19 -06:00
commit a780dd1cb1
7600 changed files with 37202 additions and 168275 deletions

View file

@ -16,7 +16,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
),
[_FN] = LAYOUT(
KC_F, KC_TRNS, RGB_HUI,
RGB_TOG, RGB_MOD, RGB_HUD
KC_F, KC_TRNS, UG_HUEU,
UG_TOGG, UG_NEXT, UG_HUED
)
};

View file

@ -1,145 +0,0 @@
/* Copyright 2020 Matthew Dias
*
* 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
enum layer_names {
_QWERTY,
_LOWER,
_RAISE,
_ADJUST,
};
enum jnao_keycodes {
QWERTY = SAFE_RANGE,
LOWER,
RAISE,
};
// Defines for task manager and such
#define CALTDEL LCTL(LALT(KC_DEL))
#define TSKMGR LCTL(LSFT(KC_ESC))
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
/* Qwerty
* ,-----------------------------------------------------------------------------------.
* | Esc | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 0 | Del |
* |------+------+------+------+------+------+------+------+------+------+------+------|
* | Tab | Q | W | E | R | T | Y | U | I | O | P | Bksp |
* |------+------+------+------+------+-------------+------+------+------+------+------|
* | Caps | A | S | D | F | G | H | J | K | L | ; | Enter|
* |------+------+------+------+------+------|------+------+------+------+------+------|
* | Shift| Z | X | C | V | B | N | M | , | . | / | ' |
* |------+------+------+------+------+------+------+------+------+------+------+------|
* | Ctrl | ` | GUI | ALT |Lower | Space |Raise | Left | Down | Up |Right |
* `-----------------------------------------------------------------------------------'
*/
[_QWERTY] = LAYOUT_ortho_5x12(
KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_DEL,
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_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_ENT,
OSM(MOD_LSFT), KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_QUOT,
KC_LCTL, KC_GRV, KC_LGUI, KC_LALT, LOWER, KC_SPC, KC_SPC, RAISE, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT
),
/* Lower
* ,-----------------------------------------------------------------------------------.
* | ~ | F1 | F2 | F3 | F4 | F5 | F6 | F7 | F8 | F9 | F10 | F11 |
* |------+------+------+------+------+-------------+------+------+------+------+------|
* | Esc | ! | @ | # | $ | % | ^ | & | * | ( | ) | Del |
* |------+------+------+------+------+-------------+------+------+------+------+------|
* | | F1 | F2 | F3 | F4 | F5 | F6 | _ | + | { | } |Enter |
* |------+------+------+------+------+------|------+------+------+------+------+------|
* | | F7 | F8 | F9 | F10 | F11 | F12 | | | Mute | | | |
* |------+------+------+------+------+------+------+------+------+------+------+------|
* | | | | |Lower | Bksp |Raise | Next | Vol- | Vol+ | Play |
* `-----------------------------------------------------------------------------------'
*/
[_LOWER] = LAYOUT_ortho_5x12(
KC_TILD, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11,
KC_ESC, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_DEL,
_______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, _______,
_______, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, KC_MUTE, _______, KC_PIPE,
_______, _______, _______, _______, _______, KC_BSPC, KC_BSPC, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY
),
/* Raise
* ,-----------------------------------------------------------------------------------.
* | ` | F1 | F2 | F3 | F4 | F5 | F6 | F7 | F8 | F9 | F10 | F11 |
* |------+------+------+------+------+------+------+------+------+------+------+------|
* | Esc | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 0 | Del |
* |------+------+------+------+------+-------------+------+------+------+------+------|
* | | 4 | 5 | 6 | + | F5 | F6 | - | = | [ | ] |Enter |
* |------+------+------+------+------+------|------+------+------+------+------+------|
* |Enter | 7 | 8 | 9 | - | F11 | F12 |ISO # |ISO / | Mute | | \ |
* |------+------+------+------+------+------+------+------+------+------+------+------|
* | | , | 0 | . |Lower | Bksp |Raise | Next | Vol- | Vol+ | Play |
* `-----------------------------------------------------------------------------------'
*/
[_RAISE] = LAYOUT_ortho_5x12(
KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11,
KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_DEL,
_______, KC_4, KC_5, KC_6, KC_PLUS, KC_F5, KC_F6, KC_MINS, KC_EQL, KC_LBRC, KC_RBRC, _______,
KC_ENT, KC_7, KC_8, KC_9, KC_MINS, KC_F11, KC_F12, KC_NUHS, KC_NUBS, KC_MUTE, _______, KC_BSLS,
_______, KC_COMM, KC_0, KC_DOT, _______, KC_BSPC, KC_BSPC, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY
),
/* Adjust (Lower + Raise)
* ,-----------------------------------------------------------------------------------.
* | ESC | F1 | F2 | F3 |ALTF4 | F5 | F6 | F7 | F8 | F9 | F10 | F11 |
* |------+------+------+------+------+------+------+------+------+------+------+------|
* |Taskmg| | | | | | | | | | |caltde|
* |------+------+------+------+------+-------------+------+------+------+------+------|
* | | | |Aud on|Audoff|AGnorm|AGswap|Qwerty| | | | |
* |------+------+------+------+------+------|------+------+------+------+------+------|
* | |Voice-|Voice+|Mus on|Musoff|MIDIon|MIDIof| | | | | |
* |------+------+------+------+------+------+------+------+------+------+------+------|
* | | | | | | | | | | | |QK_BOOT |
* `-----------------------------------------------------------------------------------'
*/
[_ADJUST] = LAYOUT_ortho_5x12(
KC_ESC, KC_F1, KC_F2, KC_F3, LALT(KC_F4), KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11,
TSKMGR, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, CALTDEL,
_______, _______, _______, AU_ON, AU_OFF, AG_NORM, AG_SWAP, QWERTY, _______, _______, _______, _______,
_______, AU_PREV, AU_NEXT, MU_ON, MU_OFF, MI_ON, MI_OFF, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT
)
};
bool process_record_user(uint16_t keycode, keyrecord_t *record) {
switch (keycode) {
case LOWER:
if (record->event.pressed) {
layer_on(_LOWER);
update_tri_layer(_LOWER, _RAISE, _ADJUST);
} else {
layer_off(_LOWER);
update_tri_layer(_LOWER, _RAISE, _ADJUST);
}
return false;
case RAISE:
if (record->event.pressed) {
layer_on(_RAISE);
update_tri_layer(_LOWER, _RAISE, _ADJUST);
} else {
layer_off(_RAISE);
update_tri_layer(_LOWER, _RAISE, _ADJUST);
}
return false;
}
return true;
};

View file

@ -1 +0,0 @@
VIA_ENABLE = yes

View file

@ -49,10 +49,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
* `-------------'
*/
[_RGB] = LAYOUT(
RGB_RMOD, RGB_MOD,
RGB_HUD, RGB_HUI,
RGB_SAD, RGB_SAI,
RGB_TOG, KC_TRNS
UG_PREV, UG_NEXT,
UG_HUED, UG_HUEU,
UG_SATD, UG_SATU,
UG_TOGG, KC_TRNS
),
/* Function

View file

@ -1,94 +0,0 @@
// Below layout is based upon /u/That-Canadian's planck layout
#include QMK_KEYBOARD_H
// Each layer gets a name for readability, which is then used in the keymap matrix below.
// The underscores don't mean anything - you can have a layer called STUFF or any other name.
// Layer names don't all need to be of the same length, obviously, and you can also skip them
// entirely and just use numbers.
enum layer_names {
_QWERTY,
_FUNC,
_RGB,
_LAYER3
};
// Defines for task manager and such
#define CALTDEL LCTL(LALT(KC_DEL))
#define TSKMGR LCTL(LSFT(KC_ESC))
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
/* Qwerty
* ,-------------.
* | 1 | 2 |
* |------+------|
* | 3 | 4 |
* |------+------|
* | 5 | 6 |
* |------+------|
* | FUNC | 8 |
* `-------------'
*/
[_QWERTY] = LAYOUT(
KC_1, KC_2,
KC_3, KC_4,
KC_5, KC_6,
MO(_FUNC), TG(_RGB)
),
/* Function
* ,-------------.
* | Q |CALDEL|
* |------+------|
* | A |TSKMGR|
* |------+------|
* | Z | X |
* |------+------|
* | | C |
* `-------------'
*/
[_FUNC] = LAYOUT(
KC_Q, CALTDEL,
KC_A, TSKMGR,
KC_Z, KC_X,
KC_TRNS, KC_C
),
/* RGB
* ,-------------.
* | MODE-| MODE+|
* |------+------|
* | HUE- | HUE+ |
* |------+------|
* | SAT- | SAT+ |
* |------+------|
* |TOGGLE| |
* `-------------'
*/
[_RGB] = LAYOUT(
RGB_RMOD, RGB_MOD,
RGB_HUD, RGB_HUI,
RGB_SAD, RGB_SAI,
RGB_TOG, KC_TRNS
),
/* Layer 3
* ,-------------.
* | | |
* |------+------|
* | | |
* |------+------|
* | | |
* |------+------|
* | | |
* `-------------'
*/
[_LAYER3] = LAYOUT(
KC_TRNS, KC_TRNS,
KC_TRNS, KC_TRNS,
KC_TRNS, KC_TRNS,
KC_TRNS, KC_TRNS
)
};

View file

@ -1,3 +0,0 @@
VIA_ENABLE = yes
LTO_ENABLE = yes
RGBLIGHT_ENABLE = yes

View file

@ -18,9 +18,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once
/* Split Defines */
#define SPLIT_HAND_PIN D3
// The 'EH' has previously forced use of I2C so this default has been kept
// however users can undef to use serial
#define USE_I2C

View file

@ -1,2 +0,0 @@
# Disable unsupported hardware
AUDIO_SUPPORTED = no

View file

@ -19,6 +19,7 @@
"rgblight": {
"led_count": 12,
"split_count": [6, 6],
"sleep": true,
"animations": {
"breathing": true,
"rainbow_mood": true,
@ -37,12 +38,17 @@
},
"split": {
"enabled": true,
"soft_serial_pin": "D0"
"handedness": {
"pin": "D3"
},
"serial": {
"pin": "D0"
}
},
"processor": "atmega32u4",
"bootloader": "atmel-dfu",
"features": {
"bootmagic": false,
"bootmagic": true,
"mousekey": false,
"extrakey": true,
"nkro": true,

View file

@ -89,8 +89,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
* `-----------------------------------------------------------------------------------'
*/
[_ADJUST] = LAYOUT(
TSKMGR, _______, _______, _______, _______, _______, _______, RGB_MOD, RGB_VAI, RGB_SAI, RGB_HUI, CALTDEL,
_______, _______, _______, _______, _______, _______, _______, RGB_RMOD,RGB_VAD, RGB_SAD, RGB_HUD, RGB_TOG,
TSKMGR, _______, _______, _______, _______, _______, _______, UG_NEXT, UG_VALU, UG_SATU, UG_HUEU, CALTDEL,
_______, _______, _______, _______, _______, _______, _______, UG_PREV, UG_VALD, UG_SATD, UG_HUED, UG_TOGG,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, BL_STEP,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT
),

View file

@ -98,8 +98,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
* `-----------------------------------------------------------------------------------'
*/
[_ADJUST] = LAYOUT(
TSKMGR, _______, _______, _______, _______, _______, KC_DEL, _______, RGB_VAI, RGB_SAI, RGB_HUI, CALTDEL,
_______, _______, _______, _______, _______, _______, _______, DVORAK, RGB_VAD, RGB_SAD, RGB_HUD, RGB_TOG,
TSKMGR, _______, _______, _______, _______, _______, KC_DEL, _______, UG_VALU, UG_SATU, UG_HUEU, CALTDEL,
_______, _______, _______, _______, _______, _______, _______, DVORAK, UG_VALD, UG_SATD, UG_HUED, UG_TOGG,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, BL_STEP,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT
),

View file

@ -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.

View file

@ -1 +1,2 @@
DEFAULT_FOLDER = maple_computing/lets_split_eh/eh
# Disable unsupported hardware
AUDIO_SUPPORTED = no

View file

@ -15,7 +15,9 @@
"diode_direction": "COL2ROW",
"split": {
"enabled": true,
"soft_serial_pin": "D0"
"serial": {
"pin": "D0"
}
},
"processor": "atmega32u4",
"bootloader": "caterina",

View file

@ -26,20 +26,20 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
/* FN 1 Layer
* ,-----------------------------------------------.
* |RGB_TOG|RGB_HUD|RGB_HUI|RGB_SAD|RGB_SAI| FN_1 |
* |UG_TOGG|UG_HUED|UG_HUEU|UG_SATD|UG_SATU| FN_1 |
* `-----------------------------------------------'
*/
[_FN_1] = LAYOUT(
RGB_TOG, RGB_HUD, RGB_HUI, RGB_SAD, RGB_SAI, _______
UG_TOGG, UG_HUED, UG_HUEU, UG_SATD, UG_SATU, _______
),
/* FN 2 Layer
* ,-----------------------------------------------.
* | FN_2 |RGB_VAD|RGB_VAI|RGB_MOD|TSKMGR | QK_BOOT |
* | FN_2 |UG_VALD|UG_VALU|UG_NEXT|TSKMGR | QK_BOOT |
* `-----------------------------------------------'
*/
[_FN_2] = LAYOUT(
_______, RGB_VAD, RGB_VAI, RGB_MOD, TSKMGR, QK_BOOT
_______, UG_VALD, UG_VALU, UG_NEXT, TSKMGR, QK_BOOT
)
};