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

This commit is contained in:
QMK Bot
2025-09-06 21:48:43 +00:00
16 changed files with 4 additions and 96 deletions

View File

@@ -1,31 +0,0 @@
/*
Copyright 2022 an_achronism (@an-achronism)
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 RP2040_BOOTLOADER_DOUBLE_TAP_RESET
/* 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

View File

@@ -16,7 +16,5 @@
#pragma once #pragma once
#define RP2040_BOOTLOADER_DOUBLE_TAP_RESET
#define BACKLIGHT_PWM_DRIVER PWMD5 #define BACKLIGHT_PWM_DRIVER PWMD5
#define BACKLIGHT_PWM_CHANNEL RP2040_PWM_CHANNEL_A #define BACKLIGHT_PWM_CHANNEL RP2040_PWM_CHANNEL_A

View File

@@ -2,9 +2,6 @@
// SPDX-License-Identifier: GPL-2.0-or-later // SPDX-License-Identifier: GPL-2.0-or-later
#pragma once #pragma once
#define RP2040_BOOTLOADER_DOUBLE_TAP_RESET
#define RP2040_BOOTLOADER_DOUBLE_TAP_RESET_TIMEOUT 200U
#define AUDIO_PIN GP29 #define AUDIO_PIN GP29
#define AUDIO_PWM_DRIVER PWMD6 #define AUDIO_PWM_DRIVER PWMD6
#define AUDIO_PWM_CHANNEL RP2040_PWM_CHANNEL_B #define AUDIO_PWM_CHANNEL RP2040_PWM_CHANNEL_B

View File

@@ -2,9 +2,6 @@
// SPDX-License-Identifier: GPL-2.0-or-later // SPDX-License-Identifier: GPL-2.0-or-later
#pragma once #pragma once
#define RP2040_BOOTLOADER_DOUBLE_TAP_RESET
#define RP2040_BOOTLOADER_DOUBLE_TAP_RESET_TIMEOUT 200U
#define AUDIO_PIN GP29 #define AUDIO_PIN GP29
#define AUDIO_PWM_DRIVER PWMD6 #define AUDIO_PWM_DRIVER PWMD6
#define AUDIO_PWM_CHANNEL RP2040_PWM_CHANNEL_B #define AUDIO_PWM_CHANNEL RP2040_PWM_CHANNEL_B

View File

@@ -1,11 +1,11 @@
// Copyright 2022 jack (@waffle87) // Copyright 2022 jack (@waffle87)
// SPDX-License-Identifier: GPL-2.0-or-later // SPDX-License-Identifier: GPL-2.0-or-later
#pragma once #pragma once
#define RP2040_BOOTLOADER_DOUBLE_TAP_RESET
#define RP2040_BOOTLOADER_DOUBLE_TAP_RESET_TIMEOUT 200U
#define SERIAL_USART_FULL_DUPLEX #define SERIAL_USART_FULL_DUPLEX
#define SERIAL_USART_TX_PIN GP0 #define SERIAL_USART_TX_PIN GP0
#define SERIAL_USART_RX_PIN GP1 #define SERIAL_USART_RX_PIN GP1
#define I2C_DRIVER I2CD1 #define I2C_DRIVER I2CD1
#define I2C1_SDA_PIN GP22 #define I2C1_SDA_PIN GP22
#define I2C1_SCL_PIN GP23 #define I2C1_SCL_PIN GP23

View File

@@ -2,8 +2,6 @@
// SPDX-License-Identifier: GPL-2.0-or-later // SPDX-License-Identifier: GPL-2.0-or-later
#pragma once #pragma once
#define RP2040_BOOTLOADER_DOUBLE_TAP_RESET
#define I2C_DRIVER I2CD1 #define I2C_DRIVER I2CD1
#define I2C1_SDA_PIN GP22 #define I2C1_SDA_PIN GP22
#define I2C1_SCL_PIN GP23 #define I2C1_SCL_PIN GP23

View File

@@ -16,8 +16,5 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
#pragma once #pragma once
#define RP2040_BOOTLOADER_DOUBLE_TAP_RESET // Activates the double-tap behavior
#define RP2040_BOOTLOADER_DOUBLE_TAP_RESET_TIMEOUT 200U // Timeout window in ms in which the double tap can occur.
#define BACKLIGHT_PWM_DRIVER PWMD6 #define BACKLIGHT_PWM_DRIVER PWMD6
#define BACKLIGHT_PWM_CHANNEL RP2040_PWM_CHANNEL_A #define BACKLIGHT_PWM_CHANNEL RP2040_PWM_CHANNEL_A

View File

@@ -16,8 +16,5 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
#pragma once #pragma once
#define RP2040_BOOTLOADER_DOUBLE_TAP_RESET // Activates the double-tap behavior
#define RP2040_BOOTLOADER_DOUBLE_TAP_RESET_TIMEOUT 200U // Timeout window in ms in which the double tap can occur.
#define BACKLIGHT_PWM_DRIVER PWMD6 #define BACKLIGHT_PWM_DRIVER PWMD6
#define BACKLIGHT_PWM_CHANNEL RP2040_PWM_CHANNEL_A #define BACKLIGHT_PWM_CHANNEL RP2040_PWM_CHANNEL_A

View File

@@ -1,8 +0,0 @@
// Copyright 2024 Florent (@FLinguenheld)
// SPDX-License-Identifier: GPL-2.0-or-later
#pragma once
/* Flash */
#define RP2040_BOOTLOADER_DOUBLE_TAP_RESET // Activates the double-tap behavior
#define RP2040_BOOTLOADER_DOUBLE_TAP_RESET_TIMEOUT 200U // In ms in which the double tap can occur

View File

@@ -1,8 +0,0 @@
// Copyright 2024 Florent (@FLinguenheld)
// SPDX-License-Identifier: GPL-2.0-or-later
#pragma once
/* Flash */
#define RP2040_BOOTLOADER_DOUBLE_TAP_RESET // Activates the double-tap behavior
#define RP2040_BOOTLOADER_DOUBLE_TAP_RESET_TIMEOUT 200U // In ms in which the double tap can occur

View File

@@ -25,6 +25,3 @@
#define I2C_DRIVER I2CD1 #define I2C_DRIVER I2CD1
#define I2C1_SDA_PIN GP10 #define I2C1_SDA_PIN GP10
#define I2C1_SCL_PIN GP11 #define I2C1_SCL_PIN GP11
#define RP2040_BOOTLOADER_DOUBLE_TAP_RESET // Activates the double-tap behavior
#define RP2040_BOOTLOADER_DOUBLE_TAP_RESET_TIMEOUT 200U // Timeout window in ms in which the double tap can occur.

View File

@@ -19,6 +19,3 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define I2C_DRIVER I2CD1 #define I2C_DRIVER I2CD1
#define I2C1_SCL_PIN GP27 #define I2C1_SCL_PIN GP27
#define I2C1_SDA_PIN GP26 #define I2C1_SDA_PIN GP26
#define RP2040_BOOTLOADER_DOUBLE_TAP_RESET
#define RP2040_BOOTLOADER_DOUBLE_TAP_RESET_TIMEOUT 200U

View File

@@ -23,4 +23,3 @@
#define RP2040_BOOTLOADER_DOUBLE_TAP_RESET #define RP2040_BOOTLOADER_DOUBLE_TAP_RESET
#define RP2040_BOOTLOADER_DOUBLE_TAP_RESET_TIMEOUT 500U #define RP2040_BOOTLOADER_DOUBLE_TAP_RESET_TIMEOUT 500U
#define RP2040_BOOTLOADER_DOUBLE_TAP_RESET_LED_MASK 0U

View File

@@ -3,26 +3,6 @@
#pragma once #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
#define RP2040_BOOTLOADER_DOUBLE_TAP_RESET
#define RP2040_BOOTLOADER_DOUBLE_TAP_RESET_TIMEOUT 200U
#define SERIAL_USART_FULL_DUPLEX #define SERIAL_USART_FULL_DUPLEX
#define SERIAL_USART_TX_PIN GP10 #define SERIAL_USART_TX_PIN GP10
#define SERIAL_USART_RX_PIN GP9 #define SERIAL_USART_RX_PIN GP9

View File

@@ -2,8 +2,7 @@
// SPDX-License-Identifier: GPL-2.0-or-later // SPDX-License-Identifier: GPL-2.0-or-later
#pragma once #pragma once
#define RP2040_BOOTLOADER_DOUBLE_TAP_RESET
#define RP2040_BOOTLOADER_DOUBLE_TAP_RESET_TIMEOUT 200U
#define SERIAL_USART_FULL_DUPLEX #define SERIAL_USART_FULL_DUPLEX
#define SERIAL_USART_TX_PIN GP9 #define SERIAL_USART_TX_PIN GP9
#define SERIAL_USART_RX_PIN GP8 #define SERIAL_USART_RX_PIN GP8

View File

@@ -21,5 +21,4 @@
#define SERIAL_USART_RX_PIN GP1 #define SERIAL_USART_RX_PIN GP1
#define RP2040_BOOTLOADER_DOUBLE_TAP_RESET #define RP2040_BOOTLOADER_DOUBLE_TAP_RESET
#define RP2040_BOOTLOADER_DOUBLE_TAP_RESET_TIMEOUT 200U
#define RP2040_BOOTLOADER_DOUBLE_TAP_RESET_LED GP17 #define RP2040_BOOTLOADER_DOUBLE_TAP_RESET_LED GP17