Merge remote-tracking branch 'qmk/master' into merge-2025-06-21

This commit is contained in:
Ilya Zhuravlev 2025-06-21 16:00:42 -06:00
commit 7b247bc800
3559 changed files with 29294 additions and 11618 deletions

View file

@ -1,6 +1,5 @@
{
"manufacturer": "4pplet",
"url": "",
"maintainer": "4pplet",
"usb": {
"vid": "0x4444"

View file

@ -26,8 +26,6 @@
},
"features": {
"bootmagic": true,
"command": false,
"console": false,
"extrakey": true,
"mousekey": false,
"nkro": false

View file

@ -10,8 +10,6 @@
},
"features": {
"bootmagic": true,
"command": false,
"console": false,
"extrakey": true,
"mousekey": false,
"nkro": false

View file

@ -1,7 +1,6 @@
{
"keyboard_name": "Perk60 ISO Rev A",
"manufacturer": "4pplet",
"url": "",
"maintainer": "4pplet",
"usb": {
"vid": "0x4444",
@ -42,8 +41,6 @@
},
"features": {
"bootmagic": true,
"command": false,
"console": false,
"extrakey": true,
"mousekey": false,
"nkro": true,

View file

@ -14,7 +14,20 @@ 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 "rev_a.h"
#include "quantum.h"
#ifndef CAPS_LOCK_ENABLE
# define CAPS_LOCK_ENABLE true
#endif
#ifndef CAPS_LOCK_COLOR
# define CAPS_LOCK_COLOR RGB_RED
#endif
#ifndef CAPS_LED_GROUP
// change what leds to target, for example LED_FLAG_KEYLIGHT for alpas or LED_FLAG_MODIFIER for modifiers
# define CAPS_LED_GROUP LED_FLAG_INDICATOR
#endif
#ifdef RGB_MATRIX_ENABLE
const is31fl3733_led_t PROGMEM g_is31fl3733_leds[IS31FL3733_LED_COUNT] = {

View file

@ -1,23 +0,0 @@
/*
Copyright 2022 Stefan Sundin "4pplet" <4pplet@protonmail.com>
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
#define CAPS_LOCK_ENABLE true
#define CAPS_LOCK_COLOR RGB_RED
#define CAPS_LED_GROUP LED_FLAG_INDICATOR // change what leds to target, for example LED_FLAG_KEYLIGHT for alpas or LED_FLAG_MODIFIER for modifiers
#include "quantum.h"

View file

@ -31,8 +31,6 @@
},
"features": {
"bootmagic": true,
"command": false,
"console": false,
"extrakey": true,
"mousekey": false,
"nkro": true,

View file

@ -27,8 +27,6 @@
},
"features": {
"bootmagic": true,
"command": false,
"console": false,
"extrakey": true,
"mousekey": false,
"nkro": true,

View file

@ -19,8 +19,6 @@
"bootmagic": true,
"mousekey": true,
"extrakey": true,
"console": false,
"command": false,
"nkro": true,
"rgblight": true,
"key_lock": true

View file

@ -10,8 +10,6 @@
},
"features": {
"bootmagic": true,
"command": false,
"console": false,
"extrakey": true,
"mousekey": false,
"nkro": false

View file

@ -30,8 +30,6 @@
},
"features": {
"bootmagic": true,
"command": false,
"console": false,
"extrakey": true,
"mousekey": false,
"nkro": false,

View file

@ -14,7 +14,11 @@ 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 "rev_b.h"
#include "quantum.h"
#ifndef CAPS_LOCK_ENABLE
# define CAPS_LOCK_ENABLE true
#endif
bool led_update_kb(led_t led_state) {
bool res = led_update_user(led_state);

View file

@ -1,22 +0,0 @@
/*
Copyright 2020 Stefan Sundin "4pplet" <4pplet@protonmail.com>
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
#define CAPS_LOCK_ENABLE true
//#define CAPS_LOCK_COLOR HSV_ORANGE
#include "quantum.h"

View file

@ -10,8 +10,6 @@
},
"features": {
"bootmagic": true,
"command": false,
"console": false,
"extrakey": true,
"mousekey": false,
"nkro": false,

View file

@ -14,7 +14,11 @@ 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 "rev_c.h"
#include "quantum.h"
#ifndef CAPS_LOCK_ENABLE
# define CAPS_LOCK_ENABLE true
#endif
bool led_update_kb(led_t led_state) {
bool res = led_update_user(led_state);

View file

@ -1,22 +0,0 @@
/*
Copyright 2022 Stefan Sundin "4pplet" <mail@4pplet.com>
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
#define CAPS_LOCK_ENABLE true
//#define CAPS_LOCK_COLOR HSV_ORANGE
#include "quantum.h"

View file

@ -14,7 +14,11 @@ 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 "rev_d.h"
#include "quantum.h"
#ifndef CAPS_LOCK_ENABLE
# define CAPS_LOCK_ENABLE true
#endif
bool led_update_kb(led_t led_state) {
bool res = led_update_user(led_state);

View file

@ -1,22 +0,0 @@
/*
Copyright 2022 Stefan Sundin "4pplet" <mail@4pplet.com>
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
#define CAPS_LOCK_ENABLE true
//#define CAPS_LOCK_COLOR HSV_ORANGE
#include "quantum.h"

View file

@ -11,8 +11,6 @@
},
"features": {
"bootmagic": true,
"command": false,
"console": false,
"extrakey": true,
"key_lock": true,
"mousekey": true,

View file

@ -14,7 +14,15 @@ 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 "rev_e.h"
#include "quantum.h"
#ifndef CAPS_LOCK_ENABLE
# define CAPS_LOCK_ENABLE true
#endif
#ifndef CAPS_LOCK_COLOR
# define CAPS_LOCK_COLOR HSV_GREEN
#endif
void keyboard_pre_init_kb(void) {
rgblight_set_effect_range(0, 16);

View file

@ -1,22 +0,0 @@
/*
Copyright 2022 Stefan Sundin "4pplet" <mail@4pplet.com>
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
#include "quantum.h"
#define CAPS_LOCK_ENABLE true
#define CAPS_LOCK_COLOR HSV_GREEN

View file

@ -11,8 +11,6 @@
},
"features": {
"bootmagic": true,
"command": false,
"console": false,
"extrakey": true,
"key_lock": true,
"mousekey": true,

View file

@ -11,8 +11,6 @@
},
"features": {
"bootmagic": true,
"command": false,
"console": false,
"extrakey": true,
"key_lock": true,
"mousekey": true,

View file

@ -1,6 +1,5 @@
{
"manufacturer": "4pplet",
"url": "",
"maintainer": "4pplet",
"usb": {
"vid": "0x4444"

View file

@ -14,8 +14,6 @@
},
"features": {
"bootmagic": true,
"command": false,
"console": false,
"extrakey": true,
"mousekey": true,
"nkro": true,

View file

@ -14,7 +14,19 @@ 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 "rev_a.h"
#include "quantum.h"
#ifndef CAPS_LOCK_ENABLE
# define CAPS_LOCK_ENABLE 1
#endif
#ifndef SCROLL_LOCK_ENABLE
# define SCROLL_LOCK_ENABLE 1
#endif
// If colors are defined, they will be static. If not defined, color for indicators can be set in VIA.
//#define CAPS_LOCK_COLOR HSV_GREEN
//#define SCROLL_LOCK_COLOR HSV_GREEN
bool led_update_kb(led_t led_state) {
bool res = led_update_user(led_state);

View file

@ -1,26 +0,0 @@
/*
Copyright 2022 Stefan Sundin "4pplet" <mail@4pplet.com>
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
#define CAPS_LOCK_ENABLE 1
#define SCROLL_LOCK_ENABLE 1
// If colors are defined, they will be static. If not defined, color for incicators can be set in VIA.
//#define CAPS_LOCK_COLOR HSV_GREEN
//#define SCROLL_LOCK_COLOR HSV_GREEN
#include "quantum.h"

View file

@ -14,7 +14,19 @@ 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 "rev_b.h"
#include "quantum.h"
#ifndef CAPS_LOCK_ENABLE
# define CAPS_LOCK_ENABLE 1
#endif
#ifndef SCROLL_LOCK_ENABLE
# define SCROLL_LOCK_ENABLE 1
#endif
// If colors are defined, they will be static. If not defined, color for indicators can be set in VIA.
//#define CAPS_LOCK_COLOR HSV_GREEN
//#define SCROLL_LOCK_COLOR HSV_GREEN
bool led_update_kb(led_t led_state) {
bool res = led_update_user(led_state);

View file

@ -1,26 +0,0 @@
/*
Copyright 2022 Stefan Sundin "4pplet" <mail@4pplet.com>
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
#define CAPS_LOCK_ENABLE 1
#define SCROLL_LOCK_ENABLE 1
// If colors are defined, they will be static. If not defined, color for incicators can be set in VIA.
//#define CAPS_LOCK_COLOR HSV_GREEN
//#define SCROLL_LOCK_COLOR HSV_GREEN
#include "quantum.h"

View file

@ -14,7 +14,19 @@ 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 "rev_b_ansi.h"
#include "quantum.h"
#ifndef CAPS_LOCK_ENABLE
# define CAPS_LOCK_ENABLE 1
#endif
#ifndef SCROLL_LOCK_ENABLE
# define SCROLL_LOCK_ENABLE 1
#endif
// If colors are defined, they will be static. If not defined, color for indicators can be set in VIA.
//#define CAPS_LOCK_COLOR HSV_GREEN
//#define SCROLL_LOCK_COLOR HSV_GREEN
bool led_update_kb(led_t led_state) {
bool res = led_update_user(led_state);

View file

@ -1,26 +0,0 @@
/*
Copyright 2022 Stefan Sundin "4pplet" <mail@4pplet.com>
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
#define CAPS_LOCK_ENABLE 1
#define SCROLL_LOCK_ENABLE 1
// If colors are defined, they will be static. If not defined, color for incicators can be set in VIA.
//#define CAPS_LOCK_COLOR HSV_GREEN
//#define SCROLL_LOCK_COLOR HSV_GREEN
#include "quantum.h"

View file

@ -10,8 +10,6 @@
},
"features": {
"bootmagic": true,
"command": false,
"console": false,
"extrakey": true,
"mousekey": true,
"nkro": true