Merge remote-tracking branch 'qmk/master' into merge-2023-09-08

This commit is contained in:
Ilya Zhuravlev 2023-09-08 20:53:27 -06:00
commit e390a34128
6126 changed files with 113768 additions and 45875 deletions

View file

@ -1,24 +0,0 @@
/* Copyright 2020-2021 doodboard
*
* 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/>.
*/
#pragma once
/* media key slowdown for windows */
#define TAP_CODE_DELAY 20
#ifdef RGBLIGHT_ENABLE
#define RGBLED_NUM 8 // Number of LEDs
#endif

View file

@ -18,6 +18,12 @@
{"pin_a": "F5", "pin_b": "F6", "resolution": 2}
]
},
"qmk": {
"tap_keycode_delay": 20
},
"rgblight": {
"led_count": 8
},
"ws2812": {
"pin": "D3"
},

View file

@ -13,4 +13,3 @@ AUDIO_ENABLE = no # Audio output
ENCODER_ENABLE = yes
OLED_ENABLE = yes
OLED_DRIVER = SSD1306

View file

@ -1,24 +0,0 @@
/* Copyright 2020-2021 doodboard
*
* 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/>.
*/
#pragma once
/* media key slowdown for windows */
#define TAP_CODE_DELAY 20
#ifdef RGBLIGHT_ENABLE
#define RGBLED_NUM 8 // Number of LEDs
#endif

View file

@ -18,6 +18,12 @@
{"pin_a": "F6", "pin_b": "F5", "resolution": 2}
]
},
"qmk": {
"tap_keycode_delay": 20
},
"rgblight": {
"led_count": 8
},
"ws2812": {
"pin": "D3"
},

View file

@ -13,4 +13,3 @@ AUDIO_ENABLE = no # Audio output
ENCODER_ENABLE = yes
OLED_ENABLE = yes
OLED_DRIVER = SSD1306