Merge remote-tracking branch 'origin/develop' into xap

This commit is contained in:
QMK Bot 2025-03-09 23:41:33 +00:00
commit 99249c88c1
36 changed files with 142 additions and 122 deletions

View File

@ -554,6 +554,7 @@
"items": {
"type": "object",
"additionalProperties": false,
"required": ["x", "y"],
"properties": {
"matrix": {
"type": "array",
@ -640,6 +641,7 @@
"items": {
"type": "object",
"additionalProperties": false,
"required": ["x", "y"],
"properties": {
"matrix": {
"type": "array",

View File

@ -1,7 +1,8 @@
// Copyright 2022 Martin Arnstad (@arnstadm)
// SPDX-License-Identifier: GPL-2.0-or-later
#pragma once
/* Set HSE clock since it differs from F411 default */
#define STM32_HSECLK 16000000
#include_next <board.h>
#undef STM32_HSECLK
#define STM32_HSECLK 16000000U

View File

@ -1,23 +0,0 @@
// Copyright 2022 Martin Arnstad (@arnstadm)
// SPDX-License-Identifier: GPL-2.0-or-later
#pragma once
/*
* Feature disable options
* These options are also useful to firmware size reduction.
*/
/* disable debug print */
//#define NO_DEBUG
/* disable print */
//#define NO_PRINT
/* disable action features */
//#define NO_ACTION_LAYER
//#define NO_ACTION_TAPPING
//#define NO_ACTION_ONESHOT
/* Set HSE clock since it differs from F411 default */
#define STM32_HSECLK 16000000

View File

@ -0,0 +1,8 @@
// Copyright 2020 Purdea Andrei
// SPDX-License-Identifier: GPL-2.0-or-later
#pragma once
#include_next <board.h>
#undef STM32_HSECLK
#define STM32_HSECLK 16000000U

View File

@ -21,8 +21,6 @@
#define SERIAL_NUMBER DEF_SERIAL_NUMBER
#endif
#define STM32_HSECLK 16000000
#define SOLENOID_PIN B5
#define HAPTIC_ENABLE_PIN C13
#define SOLENOID_DEFAULT_DWELL 20

View File

@ -0,0 +1,8 @@
// Copyright 2025 @ Keychron (https://www.keychron.com)
// SPDX-License-Identifier: GPL-2.0-or-later
#pragma once
#include_next <board.h>
#undef STM32_HSECLK
#define STM32_HSECLK 16000000U

View File

@ -18,9 +18,6 @@
#include_next <mcuconf.h>
#undef STM32_HSECLK
#define STM32_HSECLK 16000000U
#undef STM32_PLLM_VALUE
#define STM32_PLLM_VALUE 8

View File

@ -0,0 +1,8 @@
// Copyright 2025 @ Keychron (https://www.keychron.com)
// SPDX-License-Identifier: GPL-2.0-or-later
#pragma once
#include_next <board.h>
#undef STM32_HSECLK
#define STM32_HSECLK 16000000U

View File

@ -18,9 +18,6 @@
#include_next <mcuconf.h>
#undef STM32_HSECLK
#define STM32_HSECLK 16000000U
#undef STM32_PLLM_VALUE
#define STM32_PLLM_VALUE 8

View File

@ -0,0 +1,8 @@
// Copyright 2024 @ Keychron (https://www.keychron.com)
// SPDX-License-Identifier: GPL-2.0-or-later
#pragma once
#include_next <board.h>
#undef STM32_HSECLK
#define STM32_HSECLK 16000000U

View File

@ -18,9 +18,6 @@
#include_next <mcuconf.h>
#undef STM32_HSECLK
#define STM32_HSECLK 16000000U
#undef STM32_PLLM_VALUE
#define STM32_PLLM_VALUE 8

View File

@ -0,0 +1,8 @@
// Copyright 2024 astro
// SPDX-License-Identifier: GPL-2.0-or-later
#pragma once
#include_next <board.h>
#undef STM32_HSECLK
#define STM32_HSECLK 16000000U

View File

@ -1,21 +0,0 @@
/**
* Copyright 2024 astro
*
* 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 BOARD_OTG_NOVBUSSENS 1
#define STM32_HSECLK 16000000U

View File

@ -0,0 +1,8 @@
// Copyright 2022 Martin Arnstad (@arnstadm)
// SPDX-License-Identifier: GPL-2.0-or-later
#pragma once
#include_next <board.h>
#undef STM32_HSECLK
#define STM32_HSECLK 16000000U

View File

@ -0,0 +1,8 @@
// Copyright 2022 Moritz Plattner
// SPDX-License-Identifier: GPL-2.0-or-later
#pragma once
#include_next <board.h>
#undef STM32_HSECLK
#define STM32_HSECLK 16000000U

View File

@ -67,6 +67,3 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#ifdef ENABLE_RGB_MATRIX_TYPING_HEATMAP
#define RGB_MATRIX_TYPING_HEATMAP_SLIM
#endif
/* Set HSE clock since it differs from F411 default */
#define STM32_HSECLK 16000000

View File

@ -0,0 +1,8 @@
// Copyright 2020 Purdea Andrei
// SPDX-License-Identifier: GPL-2.0-or-later
#pragma once
#include_next <board.h>
#undef STM32_HSECLK
#define STM32_HSECLK 16000000U

View File

@ -21,8 +21,6 @@
#define SERIAL_NUMBER DEF_SERIAL_NUMBER
#endif
#define STM32_HSECLK 16000000
#define SOLENOID_PIN B5
#define HAPTIC_ENABLE_PIN C13
#define SOLENOID_DEFAULT_DWELL 20

View File

@ -0,0 +1,8 @@
// Copyright 2020 Purdea Andrei
// SPDX-License-Identifier: GPL-2.0-or-later
#pragma once
#include_next <board.h>
#undef STM32_HSECLK
#define STM32_HSECLK 16000000U

View File

@ -21,8 +21,6 @@
#define SERIAL_NUMBER DEF_SERIAL_NUMBER
#endif
#define STM32_HSECLK 16000000
#define SOLENOID_PIN B5
#define HAPTIC_ENABLE_PIN C13
#define SOLENOID_DEFAULT_DWELL 20

View File

@ -0,0 +1,8 @@
// Copyright 2020 Purdea Andrei
// SPDX-License-Identifier: GPL-2.0-or-later
#pragma once
#include_next <board.h>
#undef STM32_HSECLK
#define STM32_HSECLK 16000000U

View File

@ -21,8 +21,6 @@
#define SERIAL_NUMBER DEF_SERIAL_NUMBER
#endif
#define STM32_HSECLK 16000000
#define SOLENOID_PIN B5
#define HAPTIC_ENABLE_PIN C13
#define SOLENOID_DEFAULT_DWELL 20

View File

@ -0,0 +1,8 @@
// Copyright 2020 Purdea Andrei
// SPDX-License-Identifier: GPL-2.0-or-later
#pragma once
#include_next <board.h>
#undef STM32_HSECLK
#define STM32_HSECLK 16000000U

View File

@ -21,8 +21,6 @@
#define SERIAL_NUMBER DEF_SERIAL_NUMBER
#endif
#define STM32_HSECLK 16000000
#define SOLENOID_PIN B5
#define HAPTIC_ENABLE_PIN C13
#define SOLENOID_DEFAULT_DWELL 20

View File

@ -0,0 +1,8 @@
// Copyright 2020 Purdea Andrei
// SPDX-License-Identifier: GPL-2.0-or-later
#pragma once
#include_next <board.h>
#undef STM32_HSECLK
#define STM32_HSECLK 16000000U

View File

@ -21,8 +21,6 @@
#define SERIAL_NUMBER DEF_SERIAL_NUMBER
#endif
#define STM32_HSECLK 16000000
#define SOLENOID_PIN B5
#define HAPTIC_ENABLE_PIN C13
#define SOLENOID_DEFAULT_DWELL 20

View File

@ -0,0 +1,8 @@
// Copyright 2022 QMK
// SPDX-License-Identifier: GPL-2.0-or-later
#pragma once
#include_next <board.h>
#undef STM32_HSECLK
#define STM32_HSECLK 16000000U

View File

@ -1,7 +0,0 @@
// Copyright 2022 QMK
// SPDX-License-Identifier: GPL-2.0-or-later
#pragma once
/* Set HSE clock since it differs from F411 default */
#define STM32_HSECLK 16000000

View File

@ -0,0 +1,8 @@
// Copyright 2022 Harrison Chan (Xelus)
// SPDX-License-Identifier: GPL-2.0-or-later
#pragma once
#include_next <board.h>
#undef STM32_HSECLK
#define STM32_HSECLK 16000000U

View File

@ -28,6 +28,3 @@
// Hardware Defines
#define EARLY_INIT_PERFORM_BOOTLOADER_JUMP TRUE
// HSE CLK
#define STM32_HSECLK 16000000

View File

@ -0,0 +1,8 @@
// Copyright 2022 Harrison Chan (Xelus)
// SPDX-License-Identifier: GPL-2.0-or-later
#pragma once
#include_next <board.h>
#undef STM32_HSECLK
#define STM32_HSECLK 16000000U

View File

@ -28,6 +28,3 @@
// Hardware Defines
#define EARLY_INIT_PERFORM_BOOTLOADER_JUMP TRUE
// HSE CLK
#define STM32_HSECLK 16000000

View File

@ -0,0 +1,8 @@
// Copyright 2022 Harrison Chan (Xelus)
// SPDX-License-Identifier: GPL-2.0-or-later
#pragma once
#include_next <board.h>
#undef STM32_HSECLK
#define STM32_HSECLK 16000000U

View File

@ -1,19 +0,0 @@
/* Copyright 2022 Harrison Chan (Xelus)
*
* 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 STM32_HSECLK 16000000

View File

@ -0,0 +1,8 @@
// Copyright 2022 Harrison Chan (Xelus)
// SPDX-License-Identifier: GPL-2.0-or-later
#pragma once
#include_next <board.h>
#undef STM32_HSECLK
#define STM32_HSECLK 16000000U

View File

@ -1,19 +0,0 @@
/* Copyright 2022 Harrison Chan (Xelus)
*
* 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 STM32_HSECLK 16000000