diff options
Diffstat (limited to 'keyboards')
116 files changed, 426 insertions, 329 deletions
diff --git a/keyboards/acheron/apollo/87h/delta/config.h b/keyboards/acheron/apollo/87h/delta/config.h index 578a443e88..17c09f0f57 100644 --- a/keyboards/acheron/apollo/87h/delta/config.h +++ b/keyboards/acheron/apollo/87h/delta/config.h @@ -28,5 +28,5 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #define WS2812_PWM_DRIVER PWMD1 #define WS2812_PWM_CHANNEL 3 #define WS2812_PWM_PAL_MODE 1 -#define WS2812_DMA_STREAM STM32_DMA2_STREAM5 -#define WS2812_DMA_CHANNEL 6 +#define WS2812_PWM_DMA_STREAM STM32_DMA2_STREAM5 +#define WS2812_PWM_DMA_CHANNEL 6 diff --git a/keyboards/acheron/apollo/87htsc/config.h b/keyboards/acheron/apollo/87htsc/config.h index 578a443e88..17c09f0f57 100644 --- a/keyboards/acheron/apollo/87htsc/config.h +++ b/keyboards/acheron/apollo/87htsc/config.h @@ -28,5 +28,5 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #define WS2812_PWM_DRIVER PWMD1 #define WS2812_PWM_CHANNEL 3 #define WS2812_PWM_PAL_MODE 1 -#define WS2812_DMA_STREAM STM32_DMA2_STREAM5 -#define WS2812_DMA_CHANNEL 6 +#define WS2812_PWM_DMA_STREAM STM32_DMA2_STREAM5 +#define WS2812_PWM_DMA_CHANNEL 6 diff --git a/keyboards/acheron/apollo/88htsc/config.h b/keyboards/acheron/apollo/88htsc/config.h index 578a443e88..17c09f0f57 100644 --- a/keyboards/acheron/apollo/88htsc/config.h +++ b/keyboards/acheron/apollo/88htsc/config.h @@ -28,5 +28,5 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #define WS2812_PWM_DRIVER PWMD1 #define WS2812_PWM_CHANNEL 3 #define WS2812_PWM_PAL_MODE 1 -#define WS2812_DMA_STREAM STM32_DMA2_STREAM5 -#define WS2812_DMA_CHANNEL 6 +#define WS2812_PWM_DMA_STREAM STM32_DMA2_STREAM5 +#define WS2812_PWM_DMA_CHANNEL 6 diff --git a/keyboards/acheron/athena/alpha/config.h b/keyboards/acheron/athena/alpha/config.h index ba5c2dedf2..c9f1d29f24 100644 --- a/keyboards/acheron/athena/alpha/config.h +++ b/keyboards/acheron/athena/alpha/config.h @@ -27,8 +27,8 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #define WS2812_PWM_DRIVER PWMD1 #define WS2812_PWM_CHANNEL 3 #define WS2812_PWM_PAL_MODE 1 -#define WS2812_DMA_STREAM STM32_DMA2_STREAM5 -#define WS2812_DMA_CHANNEL 6 +#define WS2812_PWM_DMA_STREAM STM32_DMA2_STREAM5 +#define WS2812_PWM_DMA_CHANNEL 6 // If this is defined, the caps lock LED will turn on and off according to the state of caps lock. If not, the LED will shine like all other LEDs despite the caps lock state. #define CAPSLOCK_INDICATOR diff --git a/keyboards/acheron/athena/beta/config.h b/keyboards/acheron/athena/beta/config.h index 30c29fa686..b2a8d2edf8 100644 --- a/keyboards/acheron/athena/beta/config.h +++ b/keyboards/acheron/athena/beta/config.h @@ -28,8 +28,8 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #define WS2812_PWM_DRIVER PWMD1 #define WS2812_PWM_CHANNEL 3 #define WS2812_PWM_PAL_MODE 1 -#define WS2812_DMA_STREAM STM32_DMA2_STREAM5 -#define WS2812_DMA_CHANNEL 6 +#define WS2812_PWM_DMA_STREAM STM32_DMA2_STREAM5 +#define WS2812_PWM_DMA_CHANNEL 6 // If this is defined, the caps lock LED will turn on and off according to the state of caps lock. If not, the LED will shine like all other LEDs despite the caps lock state. #define CAPSLOCK_INDICATOR diff --git a/keyboards/acheron/shark/beta/config.h b/keyboards/acheron/shark/beta/config.h index d862fd016d..1182d39d3b 100644 --- a/keyboards/acheron/shark/beta/config.h +++ b/keyboards/acheron/shark/beta/config.h @@ -27,7 +27,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #define WS2812_PWM_DRIVER PWMD1 #define WS2812_PWM_CHANNEL 3 #define WS2812_PWM_PAL_MODE 1 -#define WS2812_DMA_STREAM STM32_DMA2_STREAM5 -#define WS2812_DMA_CHANNEL 6 +#define WS2812_PWM_DMA_STREAM STM32_DMA2_STREAM5 +#define WS2812_PWM_DMA_CHANNEL 6 #define EEPROM_I2C_24LC256 diff --git a/keyboards/acheron/themis/87h/config.h b/keyboards/acheron/themis/87h/config.h index ed1229c779..fb2a5e1ed7 100644 --- a/keyboards/acheron/themis/87h/config.h +++ b/keyboards/acheron/themis/87h/config.h @@ -24,5 +24,5 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #define WS2812_PWM_DRIVER PWMD1 #define WS2812_PWM_CHANNEL 3 #define WS2812_PWM_PAL_MODE 1 -#define WS2812_DMA_STREAM STM32_DMA2_STREAM5 -#define WS2812_DMA_CHANNEL 6 +#define WS2812_PWM_DMA_STREAM STM32_DMA2_STREAM5 +#define WS2812_PWM_DMA_CHANNEL 6 diff --git a/keyboards/acheron/themis/87htsc/config.h b/keyboards/acheron/themis/87htsc/config.h index ed1229c779..fb2a5e1ed7 100644 --- a/keyboards/acheron/themis/87htsc/config.h +++ b/keyboards/acheron/themis/87htsc/config.h @@ -24,5 +24,5 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #define WS2812_PWM_DRIVER PWMD1 #define WS2812_PWM_CHANNEL 3 #define WS2812_PWM_PAL_MODE 1 -#define WS2812_DMA_STREAM STM32_DMA2_STREAM5 -#define WS2812_DMA_CHANNEL 6 +#define WS2812_PWM_DMA_STREAM STM32_DMA2_STREAM5 +#define WS2812_PWM_DMA_CHANNEL 6 diff --git a/keyboards/acheron/themis/88htsc/config.h b/keyboards/acheron/themis/88htsc/config.h index ed1229c779..fb2a5e1ed7 100644 --- a/keyboards/acheron/themis/88htsc/config.h +++ b/keyboards/acheron/themis/88htsc/config.h @@ -24,5 +24,5 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #define WS2812_PWM_DRIVER PWMD1 #define WS2812_PWM_CHANNEL 3 #define WS2812_PWM_PAL_MODE 1 -#define WS2812_DMA_STREAM STM32_DMA2_STREAM5 -#define WS2812_DMA_CHANNEL 6 +#define WS2812_PWM_DMA_STREAM STM32_DMA2_STREAM5 +#define WS2812_PWM_DMA_CHANNEL 6 diff --git a/keyboards/artifact/lvl/rev_hs01/config.h b/keyboards/artifact/lvl/rev_hs01/config.h index 674fb1110c..8dec2b56f2 100755 --- a/keyboards/artifact/lvl/rev_hs01/config.h +++ b/keyboards/artifact/lvl/rev_hs01/config.h @@ -19,7 +19,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. /* RGB Light */ #define WS2812_PWM_DRIVER PWMD1 -#define WS2812_DMA_STREAM STM32_DMA1_STREAM5 -#define WS2812_DMA_CHANNEL 5 +#define WS2812_PWM_DMA_STREAM STM32_DMA1_STREAM5 +#define WS2812_PWM_DMA_CHANNEL 5 #define WS2812_BYTE_ORDER WS2812_BYTE_ORDER_RGB diff --git a/keyboards/aurora65/config.h b/keyboards/aurora65/config.h index ec0853212c..1b51399c8d 100644 --- a/keyboards/aurora65/config.h +++ b/keyboards/aurora65/config.h @@ -22,6 +22,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #define WS2812_PWM_CHANNEL 3 #define WS2812_PWM_PAL_MODE 2 #define WS2812_PWM_COMPLEMENTARY_OUTPUT -#define WS2812_DMA_STREAM STM32_DMA1_STREAM5 -#define WS2812_DMA_CHANNEL 5 +#define WS2812_PWM_DMA_STREAM STM32_DMA1_STREAM5 +#define WS2812_PWM_DMA_CHANNEL 5 #define WS2812_BYTE_ORDER WS2812_BYTE_ORDER_RGB diff --git a/keyboards/bastardkb/charybdis/3x5/blackpill/config.h b/keyboards/bastardkb/charybdis/3x5/blackpill/config.h index 68901305c4..0467a1261f 100644 --- a/keyboards/bastardkb/charybdis/3x5/blackpill/config.h +++ b/keyboards/bastardkb/charybdis/3x5/blackpill/config.h @@ -27,8 +27,8 @@ #define WS2812_PWM_CHANNEL 2 #define WS2812_PWM_PAL_MODE 1 #define WS2812_EXTERNAL_PULLUP -#define WS2812_DMA_STREAM STM32_DMA1_STREAM1 -#define WS2812_DMA_CHANNEL 3 +#define WS2812_PWM_DMA_STREAM STM32_DMA1_STREAM1 +#define WS2812_PWM_DMA_CHANNEL 3 #define WS2812_PWM_TARGET_PERIOD 800000 /* Serial configuration for split keyboard. */ diff --git a/keyboards/bastardkb/charybdis/3x5/v2/stemcell/config.h b/keyboards/bastardkb/charybdis/3x5/v2/stemcell/config.h index 6aa20712f6..7a2bdd0aa8 100644 --- a/keyboards/bastardkb/charybdis/3x5/v2/stemcell/config.h +++ b/keyboards/bastardkb/charybdis/3x5/v2/stemcell/config.h @@ -30,8 +30,8 @@ #define WS2812_PWM_DRIVER PWMD2 #define WS2812_PWM_CHANNEL 4 #define WS2812_PWM_PAL_MODE 1 -#define WS2812_DMA_STREAM STM32_DMA1_STREAM7 -#define WS2812_DMA_CHANNEL 3 +#define WS2812_PWM_DMA_STREAM STM32_DMA1_STREAM7 +#define WS2812_PWM_DMA_CHANNEL 3 /* CRC. */ #define CRC8_USE_TABLE diff --git a/keyboards/bastardkb/charybdis/3x6/blackpill/config.h b/keyboards/bastardkb/charybdis/3x6/blackpill/config.h index 985e79fabd..b41a1d3f57 100644 --- a/keyboards/bastardkb/charybdis/3x6/blackpill/config.h +++ b/keyboards/bastardkb/charybdis/3x6/blackpill/config.h @@ -25,8 +25,8 @@ #define WS2812_PWM_CHANNEL 2 #define WS2812_PWM_PAL_MODE 1 #define WS2812_EXTERNAL_PULLUP -#define WS2812_DMA_STREAM STM32_DMA1_STREAM1 -#define WS2812_DMA_CHANNEL 3 +#define WS2812_PWM_DMA_STREAM STM32_DMA1_STREAM1 +#define WS2812_PWM_DMA_CHANNEL 3 #define WS2812_PWM_TARGET_PERIOD 800000 /* Serial configuration for split keyboard. */ diff --git a/keyboards/bastardkb/charybdis/3x6/v2/stemcell/config.h b/keyboards/bastardkb/charybdis/3x6/v2/stemcell/config.h index 6aa20712f6..7a2bdd0aa8 100644 --- a/keyboards/bastardkb/charybdis/3x6/v2/stemcell/config.h +++ b/keyboards/bastardkb/charybdis/3x6/v2/stemcell/config.h @@ -30,8 +30,8 @@ #define WS2812_PWM_DRIVER PWMD2 #define WS2812_PWM_CHANNEL 4 #define WS2812_PWM_PAL_MODE 1 -#define WS2812_DMA_STREAM STM32_DMA1_STREAM7 -#define WS2812_DMA_CHANNEL 3 +#define WS2812_PWM_DMA_STREAM STM32_DMA1_STREAM7 +#define WS2812_PWM_DMA_CHANNEL 3 /* CRC. */ #define CRC8_USE_TABLE diff --git a/keyboards/bastardkb/charybdis/4x6/blackpill/config.h b/keyboards/bastardkb/charybdis/4x6/blackpill/config.h index 68901305c4..0467a1261f 100644 --- a/keyboards/bastardkb/charybdis/4x6/blackpill/config.h +++ b/keyboards/bastardkb/charybdis/4x6/blackpill/config.h @@ -27,8 +27,8 @@ #define WS2812_PWM_CHANNEL 2 #define WS2812_PWM_PAL_MODE 1 #define WS2812_EXTERNAL_PULLUP -#define WS2812_DMA_STREAM STM32_DMA1_STREAM1 -#define WS2812_DMA_CHANNEL 3 +#define WS2812_PWM_DMA_STREAM STM32_DMA1_STREAM1 +#define WS2812_PWM_DMA_CHANNEL 3 #define WS2812_PWM_TARGET_PERIOD 800000 /* Serial configuration for split keyboard. */ diff --git a/keyboards/bastardkb/charybdis/4x6/v2/stemcell/config.h b/keyboards/bastardkb/charybdis/4x6/v2/stemcell/config.h index 6aa20712f6..7a2bdd0aa8 100644 --- a/keyboards/bastardkb/charybdis/4x6/v2/stemcell/config.h +++ b/keyboards/bastardkb/charybdis/4x6/v2/stemcell/config.h @@ -30,8 +30,8 @@ #define WS2812_PWM_DRIVER PWMD2 #define WS2812_PWM_CHANNEL 4 #define WS2812_PWM_PAL_MODE 1 -#define WS2812_DMA_STREAM STM32_DMA1_STREAM7 -#define WS2812_DMA_CHANNEL 3 +#define WS2812_PWM_DMA_STREAM STM32_DMA1_STREAM7 +#define WS2812_PWM_DMA_CHANNEL 3 /* CRC. */ #define CRC8_USE_TABLE diff --git a/keyboards/bastardkb/scylla/blackpill/config.h b/keyboards/bastardkb/scylla/blackpill/config.h index 0c40ed74bc..1d86b474ee 100644 --- a/keyboards/bastardkb/scylla/blackpill/config.h +++ b/keyboards/bastardkb/scylla/blackpill/config.h @@ -27,8 +27,8 @@ #define WS2812_PWM_CHANNEL 2 #define WS2812_PWM_PAL_MODE 1 #define WS2812_EXTERNAL_PULLUP -#define WS2812_DMA_STREAM STM32_DMA1_STREAM1 -#define WS2812_DMA_CHANNEL 3 +#define WS2812_PWM_DMA_STREAM STM32_DMA1_STREAM1 +#define WS2812_PWM_DMA_CHANNEL 3 #define WS2812_PWM_TARGET_PERIOD 800000 /* Serial configuration for split keyboard. */ diff --git a/keyboards/bastardkb/scylla/v2/stemcell/config.h b/keyboards/bastardkb/scylla/v2/stemcell/config.h index 0bbfd39aee..ca1cc0f719 100644 --- a/keyboards/bastardkb/scylla/v2/stemcell/config.h +++ b/keyboards/bastardkb/scylla/v2/stemcell/config.h @@ -30,8 +30,8 @@ #define WS2812_PWM_DRIVER PWMD2 #define WS2812_PWM_CHANNEL 4 #define WS2812_PWM_PAL_MODE 1 -#define WS2812_DMA_STREAM STM32_DMA1_STREAM7 -#define WS2812_DMA_CHANNEL 3 +#define WS2812_PWM_DMA_STREAM STM32_DMA1_STREAM7 +#define WS2812_PWM_DMA_CHANNEL 3 /* CRC. */ #define CRC8_USE_TABLE diff --git a/keyboards/bastardkb/skeletyl/blackpill/config.h b/keyboards/bastardkb/skeletyl/blackpill/config.h index 0c40ed74bc..1d86b474ee 100644 --- a/keyboards/bastardkb/skeletyl/blackpill/config.h +++ b/keyboards/bastardkb/skeletyl/blackpill/config.h @@ -27,8 +27,8 @@ #define WS2812_PWM_CHANNEL 2 #define WS2812_PWM_PAL_MODE 1 #define WS2812_EXTERNAL_PULLUP -#define WS2812_DMA_STREAM STM32_DMA1_STREAM1 -#define WS2812_DMA_CHANNEL 3 +#define WS2812_PWM_DMA_STREAM STM32_DMA1_STREAM1 +#define WS2812_PWM_DMA_CHANNEL 3 #define WS2812_PWM_TARGET_PERIOD 800000 /* Serial configuration for split keyboard. */ diff --git a/keyboards/bastardkb/skeletyl/v2/stemcell/config.h b/keyboards/bastardkb/skeletyl/v2/stemcell/config.h index 0bbfd39aee..ca1cc0f719 100644 --- a/keyboards/bastardkb/skeletyl/v2/stemcell/config.h +++ b/keyboards/bastardkb/skeletyl/v2/stemcell/config.h @@ -30,8 +30,8 @@ #define WS2812_PWM_DRIVER PWMD2 #define WS2812_PWM_CHANNEL 4 #define WS2812_PWM_PAL_MODE 1 -#define WS2812_DMA_STREAM STM32_DMA1_STREAM7 -#define WS2812_DMA_CHANNEL 3 +#define WS2812_PWM_DMA_STREAM STM32_DMA1_STREAM7 +#define WS2812_PWM_DMA_CHANNEL 3 /* CRC. */ #define CRC8_USE_TABLE diff --git a/keyboards/bastardkb/tbkmini/blackpill/config.h b/keyboards/bastardkb/tbkmini/blackpill/config.h index 0c40ed74bc..1d86b474ee 100644 --- a/keyboards/bastardkb/tbkmini/blackpill/config.h +++ b/keyboards/bastardkb/tbkmini/blackpill/config.h @@ -27,8 +27,8 @@ #define WS2812_PWM_CHANNEL 2 #define WS2812_PWM_PAL_MODE 1 #define WS2812_EXTERNAL_PULLUP -#define WS2812_DMA_STREAM STM32_DMA1_STREAM1 -#define WS2812_DMA_CHANNEL 3 +#define WS2812_PWM_DMA_STREAM STM32_DMA1_STREAM1 +#define WS2812_PWM_DMA_CHANNEL 3 #define WS2812_PWM_TARGET_PERIOD 800000 /* Serial configuration for split keyboard. */ diff --git a/keyboards/bastardkb/tbkmini/v2/stemcell/config.h b/keyboards/bastardkb/tbkmini/v2/stemcell/config.h index 0bbfd39aee..ca1cc0f719 100644 --- a/keyboards/bastardkb/tbkmini/v2/stemcell/config.h +++ b/keyboards/bastardkb/tbkmini/v2/stemcell/config.h @@ -30,8 +30,8 @@ #define WS2812_PWM_DRIVER PWMD2 #define WS2812_PWM_CHANNEL 4 #define WS2812_PWM_PAL_MODE 1 -#define WS2812_DMA_STREAM STM32_DMA1_STREAM7 -#define WS2812_DMA_CHANNEL 3 +#define WS2812_PWM_DMA_STREAM STM32_DMA1_STREAM7 +#define WS2812_PWM_DMA_CHANNEL 3 /* CRC. */ #define CRC8_USE_TABLE diff --git a/keyboards/bestway/config.h b/keyboards/bestway/config.h index c63a25d9a6..1800a114a0 100644 --- a/keyboards/bestway/config.h +++ b/keyboards/bestway/config.h @@ -18,5 +18,5 @@ #define WS2812_PWM_DRIVER PWMD2 #define WS2812_PWM_CHANNEL 4 -#define WS2812_DMA_STREAM STM32_DMA1_STREAM2 -#define WS2812_DMA_CHANNEL 2 +#define WS2812_PWM_DMA_STREAM STM32_DMA1_STREAM2 +#define WS2812_PWM_DMA_CHANNEL 2 diff --git a/keyboards/black_hellebore/config.h b/keyboards/black_hellebore/config.h index 53910fed09..e748b3d185 100644 --- a/keyboards/black_hellebore/config.h +++ b/keyboards/black_hellebore/config.h @@ -20,5 +20,5 @@ #define WS2812_PWM_CHANNEL 1 #define WS2812_PWM_PAL_MODE 1 //TIM1_CH1N (AF1) #define WS2812_PWM_COMPLEMENTARY_OUTPUT -#define WS2812_DMA_STREAM STM32_DMA1_STREAM6 -#define WS2812_DMA_CHANNEL 7 //7 works, CxS[3:0] 0111 = TIM1_UP on Channel 6? (RM0394.pdf pg.298) +#define WS2812_PWM_DMA_STREAM STM32_DMA1_STREAM6 +#define WS2812_PWM_DMA_CHANNEL 7 //7 works, CxS[3:0] 0111 = TIM1_UP on Channel 6? (RM0394.pdf pg.298) diff --git a/keyboards/crypt_macro/config.h b/keyboards/crypt_macro/config.h index 4d9d9bf5c2..701ad8da86 100644 --- a/keyboards/crypt_macro/config.h +++ b/keyboards/crypt_macro/config.h @@ -24,6 +24,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #define WS2812_PWM_DRIVER PWMD3 #define WS2812_PWM_CHANNEL 1 #define WS2812_PWM_PAL_MODE 1 -#define WS2812_DMA_STREAM STM32_DMA1_STREAM3 -#define WS2812_DMA_CHANNEL 3 +#define WS2812_PWM_DMA_STREAM STM32_DMA1_STREAM3 +#define WS2812_PWM_DMA_CHANNEL 3 #define WS2812_BYTE_ORDER WS2812_BYTE_ORDER_RGB diff --git a/keyboards/custommk/evo70_r2/config.h b/keyboards/custommk/evo70_r2/config.h index 62606cf1ee..bd8744204c 100644 --- a/keyboards/custommk/evo70_r2/config.h +++ b/keyboards/custommk/evo70_r2/config.h @@ -78,8 +78,8 @@ #define WS2812_PWM_DRIVER PWMD1 #define WS2812_PWM_CHANNEL 3 #define WS2812_PWM_PAL_MODE 1 -#define WS2812_DMA_STREAM STM32_DMA2_STREAM5 -#define WS2812_DMA_CHANNEL 6 +#define WS2812_PWM_DMA_STREAM STM32_DMA2_STREAM5 +#define WS2812_PWM_DMA_CHANNEL 6 #define TAP_CODE_DELAY 10 diff --git a/keyboards/ebastler/isometria_75/rev1/config.h b/keyboards/ebastler/isometria_75/rev1/config.h index 0fc8019a1d..19a79c9df6 100644 --- a/keyboards/ebastler/isometria_75/rev1/config.h +++ b/keyboards/ebastler/isometria_75/rev1/config.h @@ -26,8 +26,8 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #define WS2812_PWM_DRIVER PWMD2 #define WS2812_PWM_CHANNEL 2 #define WS2812_PWM_PAL_MODE 2 -#define WS2812_DMA_STREAM STM32_DMA1_STREAM2 -#define WS2812_DMA_CHANNEL 2 +#define WS2812_PWM_DMA_STREAM STM32_DMA1_STREAM2 +#define WS2812_PWM_DMA_CHANNEL 2 /* ADC - will be used for battery monitoring once BT support is added */ /* #define ADC_PIN B0 */ diff --git a/keyboards/edi/hardlight/mk2/config.h b/keyboards/edi/hardlight/mk2/config.h index 73f4b2baae..52636c6484 100644 --- a/keyboards/edi/hardlight/mk2/config.h +++ b/keyboards/edi/hardlight/mk2/config.h @@ -28,8 +28,8 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #define WS2812_PWM_DRIVER PWMD1 #define WS2812_PWM_CHANNEL 3 #define WS2812_PWM_PAL_MODE 2 -#define WS2812_DMA_STREAM STM32_DMA1_STREAM5 -#define WS2812_DMA_CHANNEL 3 +#define WS2812_PWM_DMA_STREAM STM32_DMA1_STREAM5 +#define WS2812_PWM_DMA_CHANNEL 3 #define WS2812_EXTERNAL_PULLUP /* I2C driver overrides */ diff --git a/keyboards/geekboards/macropad_v2/config.h b/keyboards/geekboards/macropad_v2/config.h index 6aed50ec2f..dca98f0c95 100644 --- a/keyboards/geekboards/macropad_v2/config.h +++ b/keyboards/geekboards/macropad_v2/config.h @@ -19,7 +19,7 @@ #define WS2812_PWM_DRIVER PWMD3 #define WS2812_PWM_CHANNEL 2 #define WS2812_PWM_PAL_MODE 1 -#define WS2812_DMA_STREAM STM32_DMA1_STREAM3 -#define WS2812_DMA_CHANNEL 3 +#define WS2812_PWM_DMA_STREAM STM32_DMA1_STREAM3 +#define WS2812_PWM_DMA_CHANNEL 3 #define WAIT_FOR_USB diff --git a/keyboards/handwired/cyberstar/config.h b/keyboards/handwired/cyberstar/config.h index 4d9d9bf5c2..701ad8da86 100644 --- a/keyboards/handwired/cyberstar/config.h +++ b/keyboards/handwired/cyberstar/config.h @@ -24,6 +24,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #define WS2812_PWM_DRIVER PWMD3 #define WS2812_PWM_CHANNEL 1 #define WS2812_PWM_PAL_MODE 1 -#define WS2812_DMA_STREAM STM32_DMA1_STREAM3 -#define WS2812_DMA_CHANNEL 3 +#define WS2812_PWM_DMA_STREAM STM32_DMA1_STREAM3 +#define WS2812_PWM_DMA_CHANNEL 3 #define WS2812_BYTE_ORDER WS2812_BYTE_ORDER_RGB diff --git a/keyboards/handwired/macroboard/config.h b/keyboards/handwired/macroboard/config.h index 95e7d9d1aa..b8e437bddf 100644 --- a/keyboards/handwired/macroboard/config.h +++ b/keyboards/handwired/macroboard/config.h @@ -20,8 +20,8 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #define WS2812_PWM_DRIVER PWMD4 #define WS2812_PWM_CHANNEL 4 #define WS2812_PWM_PAL_MODE 2 -#define WS2812_DMA_STREAM STM32_DMA1_STREAM6 // DMA Stream for TIMx_UP, see the respective reference manual for the appropriate values for your MCU. -#define WS2812_DMA_CHANNEL 2 // DMA Channel for TIMx_UP, see the respective reference manual for the appropriate values for your MCU. +#define WS2812_PWM_DMA_STREAM STM32_DMA1_STREAM6 // DMA Stream for TIMx_UP, see the respective reference manual for the appropriate values for your MCU. +#define WS2812_PWM_DMA_CHANNEL 2 // DMA Channel for TIMx_UP, see the respective reference manual for the appropriate values for your MCU. #define WS2812_PWM_TARGET_PERIOD 800000 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ diff --git a/keyboards/handwired/tractyl_manuform/5x6_right/f303/config.h b/keyboards/handwired/tractyl_manuform/5x6_right/f303/config.h index 3a7f97f8d2..a2818e7176 100644 --- a/keyboards/handwired/tractyl_manuform/5x6_right/f303/config.h +++ b/keyboards/handwired/tractyl_manuform/5x6_right/f303/config.h @@ -26,8 +26,8 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #define WS2812_PWM_CHANNEL 1 // default: 2 #define WS2812_PWM_PAL_MODE 2 // Pin "alternate function", see the respective datasheet for the appropriate values for your MCU. default: 2 //#define WS2812_PWM_COMPLEMENTARY_OUTPUT // Define for a complementary timer output (TIMx_CHyN); omit for a normal timer output (TIMx_CHy). -// #define WS2812_DMA_STREAM STM32_DMA1_STREAM3 // DMA Stream for TIMx_UP, see the respective reference manual for the appropriate values for your MCU. -#define WS2812_DMA_CHANNEL 3 // DMA Channel for TIMx_UP, see the respective reference manual for the appropriate values for your MCU. +// #define WS2812_PWM_DMA_STREAM STM32_DMA1_STREAM3 // DMA Stream for TIMx_UP, see the respective reference manual for the appropriate values for your MCU. +#define WS2812_PWM_DMA_CHANNEL 3 // DMA Channel for TIMx_UP, see the respective reference manual for the appropriate values for your MCU. #define DEBUG_LED_PIN C13 diff --git a/keyboards/handwired/tractyl_manuform/5x6_right/f411/config.h b/keyboards/handwired/tractyl_manuform/5x6_right/f411/config.h index 2ad18267ad..87f830e175 100644 --- a/keyboards/handwired/tractyl_manuform/5x6_right/f411/config.h +++ b/keyboards/handwired/tractyl_manuform/5x6_right/f411/config.h @@ -27,8 +27,8 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #define WS2812_PWM_PAL_MODE 1 // Pin "alternate function", see the respective datasheet for the appropriate values for your MCU. default: 2 #define WS2812_EXTERNAL_PULLUP //#define WS2812_PWM_COMPLEMENTARY_OUTPUT // Define for a complementary timer output (TIMx_CHyN); omit for a normal timer output (TIMx_CHy). -#define WS2812_DMA_STREAM STM32_DMA1_STREAM7 // DMA Stream for TIMx_UP, see the respective reference manual for the appropriate values for your MCU. -#define WS2812_DMA_CHANNEL 3 // DMA Channel for TIMx_UP, see the respective reference manual for the appropriate values for your MCU. +#define WS2812_PWM_DMA_STREAM STM32_DMA1_STREAM7 // DMA Stream for TIMx_UP, see the respective reference manual for the appropriate values for your MCU. +#define WS2812_PWM_DMA_CHANNEL 3 // DMA Channel for TIMx_UP, see the respective reference manual for the appropriate values for your MCU. #define WS2812_PWM_TARGET_PERIOD 800000 #define DEBUG_LED_PIN C13 diff --git a/keyboards/jacky_studio/piggy60/rev2/config.h b/keyboards/jacky_studio/piggy60/rev2/config.h index 2747834991..8c9b292fb4 100644 --- a/keyboards/jacky_studio/piggy60/rev2/config.h +++ b/keyboards/jacky_studio/piggy60/rev2/config.h @@ -19,5 +19,5 @@ #define WS2812_PWM_DRIVER PWMD4 #define WS2812_PWM_CHANNEL 4 #define WS2812_PWM_PAL_MODE 2 -#define WS2812_DMA_STREAM STM32_DMA1_STREAM7 -#define WS2812_DMA_CHANNEL 7 +#define WS2812_PWM_DMA_STREAM STM32_DMA1_STREAM7 +#define WS2812_PWM_DMA_CHANNEL 7 diff --git a/keyboards/kabedon/kabedon98e/config.h b/keyboards/kabedon/kabedon98e/config.h index 514a1121b3..8eb549c134 100644 --- a/keyboards/kabedon/kabedon98e/config.h +++ b/keyboards/kabedon/kabedon98e/config.h @@ -17,8 +17,8 @@ #define WS2812_PWM_DRIVER PWMD3 #define WS2812_PWM_CHANNEL 1 -#define WS2812_DMA_STREAM STM32_DMA1_STREAM3 -#define WS2812_DMA_CHANNEL 3 +#define WS2812_PWM_DMA_STREAM STM32_DMA1_STREAM3 +#define WS2812_PWM_DMA_CHANNEL 3 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE diff --git a/keyboards/kprepublic/bm16a/v2/config.h b/keyboards/kprepublic/bm16a/v2/config.h index 3ef55f3d42..8014b69a98 100644 --- a/keyboards/kprepublic/bm16a/v2/config.h +++ b/keyboards/kprepublic/bm16a/v2/config.h @@ -5,5 +5,5 @@ #define WS2812_PWM_DRIVER PWMD4 #define WS2812_PWM_CHANNEL 4 -#define WS2812_DMA_STREAM STM32_DMA1_STREAM7 -#define WS2812_DMA_CHANNEL 7 +#define WS2812_PWM_DMA_STREAM STM32_DMA1_STREAM7 +#define WS2812_PWM_DMA_CHANNEL 7 diff --git a/keyboards/linworks/whale75/config.h b/keyboards/linworks/whale75/config.h index 629c1dcf70..84b3c45cd9 100644 --- a/keyboards/linworks/whale75/config.h +++ b/keyboards/linworks/whale75/config.h @@ -24,5 +24,5 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #define WS2812_PWM_DRIVER PWMD4 #define WS2812_PWM_CHANNEL 4 #define WS2812_PWM_PAL_MODE 2 -#define WS2812_DMA_STREAM STM32_DMA1_STREAM7 -#define WS2812_DMA_CHANNEL 7 +#define WS2812_PWM_DMA_STREAM STM32_DMA1_STREAM7 +#define WS2812_PWM_DMA_CHANNEL 7 diff --git a/keyboards/loki65/config.h b/keyboards/loki65/config.h index 3627f4c7e6..ac6b9f5ceb 100644 --- a/keyboards/loki65/config.h +++ b/keyboards/loki65/config.h @@ -24,6 +24,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #define WS2812_PWM_DRIVER PWMD1 #define WS2812_PWM_CHANNEL 2 #define WS2812_PWM_PAL_MODE 2 -#define WS2812_DMA_STREAM STM32_DMA1_STREAM5 -#define WS2812_DMA_CHANNEL 5 +#define WS2812_PWM_DMA_STREAM STM32_DMA1_STREAM5 +#define WS2812_PWM_DMA_CHANNEL 5 #define WS2812_BYTE_ORDER WS2812_BYTE_ORDER_RGB diff --git a/keyboards/mariorion_v25/prod/config.h b/keyboards/mariorion_v25/prod/config.h index 042f7662d8..8895d16ece 100644 --- a/keyboards/mariorion_v25/prod/config.h +++ b/keyboards/mariorion_v25/prod/config.h @@ -7,9 +7,9 @@ #define WS2812_PWM_DRIVER PWMD17 #define WS2812_PWM_CHANNEL 1 -#define WS2812_DMA_STREAM STM32_DMA1_STREAM1 -#define WS2812_DMA_CHANNEL 1 -// #define WS2812_DMAMUX_ID STM32_DMAMUX1_TIM17_UP +#define WS2812_PWM_DMA_STREAM STM32_DMA1_STREAM1 +#define WS2812_PWM_DMA_CHANNEL 1 +// #define WS2812_PWM_DMAMUX_ID STM32_DMAMUX1_TIM17_UP #define INDICATOR_0 C9 #define INDICATOR_1 C8 diff --git a/keyboards/mariorion_v25/proto/config.h b/keyboards/mariorion_v25/proto/config.h index 6865f2dbb0..894b8fbf9e 100644 --- a/keyboards/mariorion_v25/proto/config.h +++ b/keyboards/mariorion_v25/proto/config.h @@ -7,9 +7,9 @@ #define WS2812_PWM_DRIVER PWMD17 #define WS2812_PWM_CHANNEL 1 -#define WS2812_DMA_STREAM STM32_DMA1_STREAM1 -#define WS2812_DMA_CHANNEL 1 -// #define WS2812_DMAMUX_ID STM32_DMAMUX1_TIM17_UP +#define WS2812_PWM_DMA_STREAM STM32_DMA1_STREAM1 +#define WS2812_PWM_DMA_CHANNEL 1 +// #define WS2812_PWM_DMAMUX_ID STM32_DMAMUX1_TIM17_UP #define INDICATOR_0 C8 #define INDICATOR_1 C7 diff --git a/keyboards/mechlovin/olly/octagon/halconf.h b/keyboards/mechlovin/olly/octagon/halconf.h index 3635a5c4a2..55add1de63 100644 --- a/keyboards/mechlovin/olly/octagon/halconf.h +++ b/keyboards/mechlovin/olly/octagon/halconf.h @@ -20,6 +20,4 @@ #define HAL_USE_SPI TRUE - #include_next <halconf.h> - diff --git a/keyboards/mechlovin/olly/octagon/info.json b/keyboards/mechlovin/olly/octagon/info.json index 3ef290d351..81b78b0b1c 100644 --- a/keyboards/mechlovin/olly/octagon/info.json +++ b/keyboards/mechlovin/olly/octagon/info.json @@ -8,20 +8,25 @@ "pid": "0xD750", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "nkro": true, + "led_matrix": true, + "rgblight": true + }, + "build": { + "lto": true + }, "rgblight": { "saturation_steps": 8, "brightness_steps": 8, "led_count": 26, "animations": { "breathing": true, - "rainbow_mood": true, "rainbow_swirl": true, - "snake": true, - "knight": true, - "christmas": true, "static_gradient": true, - "rgb_test": true, - "alternating": true, "twinkle": true } }, diff --git a/keyboards/mechlovin/olly/octagon/keymaps/default/keymap.c b/keyboards/mechlovin/olly/octagon/keymaps/default/keymap.c index fcb4929654..353f5f5d6d 100644 --- a/keyboards/mechlovin/olly/octagon/keymaps/default/keymap.c +++ b/keyboards/mechlovin/olly/octagon/keymaps/default/keymap.c @@ -15,16 +15,13 @@ */ #include QMK_KEYBOARD_H -#define LT1_CAP LT(1, KC_CAPS) - const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [0] = LAYOUT_split_bs( KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_PSCR, KC_PAUS, KC_DEL, KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_DEL, KC_HOME, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_PGUP, - LT1_CAP, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_NUHS, KC_ENT, KC_PGDN, + KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_NUHS, KC_ENT, KC_PGDN, KC_LSFT, KC_NUBS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_LSFT, KC_UP, KC_END, - KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(1), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT - ), - + KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, _______, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT + ) }; diff --git a/keyboards/mechlovin/olly/octagon/keymaps/default/readme.md b/keyboards/mechlovin/olly/octagon/keymaps/default/readme.md deleted file mode 100644 index 17d8ba9e07..0000000000 --- a/keyboards/mechlovin/olly/octagon/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for octagon
\ No newline at end of file diff --git a/keyboards/mechlovin/olly/octagon/keymaps/via/keymap.c b/keyboards/mechlovin/olly/octagon/keymaps/via/keymap.c index 2de37e94d3..353f5f5d6d 100644 --- a/keyboards/mechlovin/olly/octagon/keymaps/via/keymap.c +++ b/keyboards/mechlovin/olly/octagon/keymaps/via/keymap.c @@ -15,40 +15,13 @@ */ #include QMK_KEYBOARD_H -#define LT1_CAP LT(1, KC_CAPS) - const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [0] = LAYOUT_split_bs( KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_PSCR, KC_PAUS, KC_DEL, KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_DEL, KC_HOME, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_PGUP, - LT1_CAP, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_NUHS, KC_ENT, KC_PGDN, + KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_NUHS, KC_ENT, KC_PGDN, KC_LSFT, KC_NUBS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_LSFT, KC_UP, KC_END, - KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(1), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT - ), - [1] = LAYOUT_split_bs( - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS - ), - [1] = LAYOUT_split_bs( - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS - ), - [1] = LAYOUT_split_bs( - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS - ), - + KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, _______, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT + ) }; diff --git a/keyboards/mechlovin/olly/octagon/mcuconf.h b/keyboards/mechlovin/olly/octagon/mcuconf.h index 607305e567..6e4987337d 100644 --- a/keyboards/mechlovin/olly/octagon/mcuconf.h +++ b/keyboards/mechlovin/olly/octagon/mcuconf.h @@ -19,7 +19,6 @@ #include_next <mcuconf.h> - #undef STM32_SPI_USE_SPI1 #define STM32_SPI_USE_SPI1 TRUE diff --git a/keyboards/mechlovin/olly/octagon/octagon.c b/keyboards/mechlovin/olly/octagon/octagon.c index 185ee32a3e..c89565168b 100644 --- a/keyboards/mechlovin/olly/octagon/octagon.c +++ b/keyboards/mechlovin/olly/octagon/octagon.c @@ -55,12 +55,13 @@ led_config_t g_led_config = { 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - } + } }; - bool led_matrix_indicators_kb(void) { - if (!led_matrix_indicators_user()) { return false; } + if (!led_matrix_indicators_user()) { + return false; + } if (host_keyboard_led_state().caps_lock) { led_matrix_set_value(87, 0xFF); led_matrix_set_value(47, 0xFF); @@ -80,33 +81,25 @@ bool led_matrix_indicators_kb(void) { return true; } - layer_state_t layer_state_set_kb(layer_state_t state) { - // if on layer 1, turn on L1 LED, otherwise off. - if (get_highest_layer(state) == 0) { - led_matrix_set_value(90, 0xFF); - } else { - led_matrix_set_value(90, 0x00); - } - // if on layer 2, turn on L2 LED, otherwise off. - if (get_highest_layer(state) == 1) { - led_matrix_set_value(91, 0xFF); - } else { - led_matrix_set_value(91, 0x00); - } - - // if on layer 3, turn on L3 LED, otherwise off. - if (get_highest_layer(state) == 2) { - led_matrix_set_value(92, 0xFF); - } else { - led_matrix_set_value(92, 0x00); - } - - // if on layer 4, turn on L4 LED, otherwise off. - if (get_highest_layer(state) == 3) { - led_matrix_set_value(93, 0xFF); - } else { - led_matrix_set_value(93, 0x00); + switch (get_highest_layer(state)) { + case 0: + led_matrix_set_value(90, 0xFF); + break; + case 1: + led_matrix_set_value(91, 0xFF); + break; + case 2: + led_matrix_set_value(92, 0xFF); + break; + case 3: + led_matrix_set_value(93, 0xFF); + break; + default: + led_matrix_set_value(90, 0x00); + led_matrix_set_value(91, 0x00); + led_matrix_set_value(92, 0x00); + led_matrix_set_value(93, 0x00); } return layer_state_set_user(state); -}
\ No newline at end of file +} diff --git a/keyboards/mechlovin/olly/octagon/readme.md b/keyboards/mechlovin/olly/octagon/readme.md index 6f1833a571..5bf144ff5b 100644 --- a/keyboards/mechlovin/olly/octagon/readme.md +++ b/keyboards/mechlovin/olly/octagon/readme.md @@ -1,6 +1,6 @@ # Olly Octagon - + A replacement PCB for Duck Octagon 75% keyboard. @@ -24,5 +24,5 @@ Enter the bootloader in 3 ways: * **Bootmagic reset**: Hold down the key at (0,0) in the matrix (Escape) and plug in the keyboard * **Bootloader reset**: Hold down the key at (0,14) in the matrix (Backspace) and plug in the keyboard -* **Keycode in layout**: Press the key mapped to `RESET` if it is available +* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available * **Hardware reset**: Press reset button (located on the bottom side of the PCB) diff --git a/keyboards/mechlovin/olly/octagon/rules.mk b/keyboards/mechlovin/olly/octagon/rules.mk index 97303c7e2f..6e7633bfe0 100644 --- a/keyboards/mechlovin/olly/octagon/rules.mk +++ b/keyboards/mechlovin/olly/octagon/rules.mk @@ -1,14 +1 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = yes # Console for debug -COMMAND_ENABLE = yes # Commands for debug and configuration -NKRO_ENABLE = yes # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output -LED_MATRIX_ENABLE = yes -RGBLIGHT_ENABLE = yes
\ No newline at end of file +# This file intentionally left blank diff --git a/keyboards/meetlab/kalice/config.h b/keyboards/meetlab/kalice/config.h index 80bae79fd8..052bfa4bdf 100644 --- a/keyboards/meetlab/kalice/config.h +++ b/keyboards/meetlab/kalice/config.h @@ -19,5 +19,5 @@ #define WS2812_PWM_DRIVER PWMD1 #define WS2812_PWM_CHANNEL 2 #define WS2812_PWM_COMPLEMENTARY_OUTPUT -#define WS2812_DMA_STREAM STM32_DMA1_STREAM5 -#define WS2812_DMA_CHANNEL 5
\ No newline at end of file +#define WS2812_PWM_DMA_STREAM STM32_DMA1_STREAM5 +#define WS2812_PWM_DMA_CHANNEL 5
\ No newline at end of file diff --git a/keyboards/meetlab/rena/config.h b/keyboards/meetlab/rena/config.h index ef8715e384..6a6a4a2cae 100644 --- a/keyboards/meetlab/rena/config.h +++ b/keyboards/meetlab/rena/config.h @@ -18,5 +18,5 @@ #define WS2812_PWM_DRIVER PWMD2 #define WS2812_PWM_CHANNEL 3 -#define WS2812_DMA_STREAM STM32_DMA1_STREAM2 -#define WS2812_DMA_CHANNEL 2 +#define WS2812_PWM_DMA_STREAM STM32_DMA1_STREAM2 +#define WS2812_PWM_DMA_CHANNEL 2 diff --git a/keyboards/misterknife/knife66/config.h b/keyboards/misterknife/knife66/config.h index 7f7e117303..2b8d7b8b9f 100644 --- a/keyboards/misterknife/knife66/config.h +++ b/keyboards/misterknife/knife66/config.h @@ -20,5 +20,5 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #define WS2812_PWM_DRIVER PWMD1 // default: PWMD1 #define WS2812_PWM_CHANNEL 2 // default: 2 #define WS2812_PWM_PAL_MODE 2 // Pin "alternate function", see the respective datasheet for the appropriate values for your MCU. default: 2 -#define WS2812_DMA_STREAM STM32_DMA1_STREAM5 // DMA Stream for TIMx_UP, see the respective reference manual for the appropriate values for your MCU. -#define WS2812_DMA_CHANNEL 5 // DMA Channel for TIMx_UP, see the respective reference manual for the appropriate values for your MCU. +#define WS2812_PWM_DMA_STREAM STM32_DMA1_STREAM5 // DMA Stream for TIMx_UP, see the respective reference manual for the appropriate values for your MCU. +#define WS2812_PWM_DMA_CHANNEL 5 // DMA Channel for TIMx_UP, see the respective reference manual for the appropriate values for your MCU. diff --git a/keyboards/misterknife/knife66_iso/config.h b/keyboards/misterknife/knife66_iso/config.h index cb847450ba..f9f0707ff1 100644 --- a/keyboards/misterknife/knife66_iso/config.h +++ b/keyboards/misterknife/knife66_iso/config.h @@ -20,5 +20,5 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #define WS2812_PWM_DRIVER PWMD1 // default: PWMD1 #define WS2812_PWM_CHANNEL 2 // default: 2 #define WS2812_PWM_PAL_MODE 2 // Pin "alternate function", see the respective datasheet for the appropriate values for your MCU. default: 2 -#define WS2812_DMA_STREAM STM32_DMA1_STREAM5 // DMA Stream for TIMx_UP, see the respective reference manual for the appropriate values for your MCU. -#define WS2812_DMA_CHANNEL 5 // DMA Channel for TIMx_UP, see the respective reference manual for the appropriate values for your MCU. +#define WS2812_PWM_DMA_STREAM STM32_DMA1_STREAM5 // DMA Stream for TIMx_UP, see the respective reference manual for the appropriate values for your MCU. +#define WS2812_PWM_DMA_CHANNEL 5 // DMA Channel for TIMx_UP, see the respective reference manual for the appropriate values for your MCU. diff --git a/keyboards/mode/m256wh/config.h b/keyboards/mode/m256wh/config.h index c976b6bcc5..06f1658ea5 100644 --- a/keyboards/mode/m256wh/config.h +++ b/keyboards/mode/m256wh/config.h @@ -21,7 +21,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #define WS2812_PWM_DRIVER PWMD1 #define WS2812_PWM_CHANNEL 3 #define WS2812_PWM_PAL_MODE 1 -#define WS2812_DMA_STREAM STM32_DMA2_STREAM5 -#define WS2812_DMA_CHANNEL 6 +#define WS2812_PWM_DMA_STREAM STM32_DMA2_STREAM5 +#define WS2812_PWM_DMA_CHANNEL 6 #define EECONFIG_KB_DATA_SIZE (1) diff --git a/keyboards/mode/m256ws/config.h b/keyboards/mode/m256ws/config.h index c976b6bcc5..06f1658ea5 100644 --- a/keyboards/mode/m256ws/config.h +++ b/keyboards/mode/m256ws/config.h @@ -21,7 +21,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #define WS2812_PWM_DRIVER PWMD1 #define WS2812_PWM_CHANNEL 3 #define WS2812_PWM_PAL_MODE 1 -#define WS2812_DMA_STREAM STM32_DMA2_STREAM5 -#define WS2812_DMA_CHANNEL 6 +#define WS2812_PWM_DMA_STREAM STM32_DMA2_STREAM5 +#define WS2812_PWM_DMA_CHANNEL 6 #define EECONFIG_KB_DATA_SIZE (1) diff --git a/keyboards/mode/m60h/config.h b/keyboards/mode/m60h/config.h index f984cf28de..cde4ffdbc6 100644 --- a/keyboards/mode/m60h/config.h +++ b/keyboards/mode/m60h/config.h @@ -5,6 +5,6 @@ #define WS2812_PWM_DRIVER PWMD4 #define WS2812_PWM_CHANNEL 4 -#define WS2812_DMA_STREAM STM32_DMA1_STREAM6 -#define WS2812_DMA_CHANNEL 2 +#define WS2812_PWM_DMA_STREAM STM32_DMA1_STREAM6 +#define WS2812_PWM_DMA_CHANNEL 2 #define WS2812_PWM_TARGET_PERIOD 800000
\ No newline at end of file diff --git a/keyboards/mode/m60h_f/config.h b/keyboards/mode/m60h_f/config.h index f984cf28de..cde4ffdbc6 100644 --- a/keyboards/mode/m60h_f/config.h +++ b/keyboards/mode/m60h_f/config.h @@ -5,6 +5,6 @@ #define WS2812_PWM_DRIVER PWMD4 #define WS2812_PWM_CHANNEL 4 -#define WS2812_DMA_STREAM STM32_DMA1_STREAM6 -#define WS2812_DMA_CHANNEL 2 +#define WS2812_PWM_DMA_STREAM STM32_DMA1_STREAM6 +#define WS2812_PWM_DMA_CHANNEL 2 #define WS2812_PWM_TARGET_PERIOD 800000
\ No newline at end of file diff --git a/keyboards/mode/m60s/config.h b/keyboards/mode/m60s/config.h index f984cf28de..cde4ffdbc6 100644 --- a/keyboards/mode/m60s/config.h +++ b/keyboards/mode/m60s/config.h @@ -5,6 +5,6 @@ #define WS2812_PWM_DRIVER PWMD4 #define WS2812_PWM_CHANNEL 4 -#define WS2812_DMA_STREAM STM32_DMA1_STREAM6 -#define WS2812_DMA_CHANNEL 2 +#define WS2812_PWM_DMA_STREAM STM32_DMA1_STREAM6 +#define WS2812_PWM_DMA_CHANNEL 2 #define WS2812_PWM_TARGET_PERIOD 800000
\ No newline at end of file diff --git a/keyboards/mwstudio/mmk_3/config.h b/keyboards/mwstudio/mmk_3/config.h index 0265d3ed6e..f8916cddd0 100644 --- a/keyboards/mwstudio/mmk_3/config.h +++ b/keyboards/mwstudio/mmk_3/config.h @@ -22,5 +22,5 @@ #define WS2812_PWM_DRIVER PWMD4 #define WS2812_PWM_CHANNEL 3 #define WS2812_PWM_PAL_MODE 1 -#define WS2812_DMA_STREAM STM32_DMA1_STREAM7 -#define WS2812_DMA_CHANNEL 2 +#define WS2812_PWM_DMA_STREAM STM32_DMA1_STREAM7 +#define WS2812_PWM_DMA_CHANNEL 2 diff --git a/keyboards/mwstudio/mw660/config.h b/keyboards/mwstudio/mw660/config.h index 87659c1f67..58d0eee9e0 100644 --- a/keyboards/mwstudio/mw660/config.h +++ b/keyboards/mwstudio/mw660/config.h @@ -20,5 +20,5 @@ #define WS2812_PWM_CHANNEL 3 // default: 2 //#define WS2812_PWM_COMPLEMENTARY_OUTPUT // Define for a complementary timer output (TIMx_CHyN); omit for a normal timer output (TIMx_CHy). #define WS2812_PWM_PAL_MODE 1 // Pin "alternate function", see the respective datasheet for the appropriate values for your MCU. default: 2 -#define WS2812_DMA_STREAM STM32_DMA1_STREAM7 // DMA Stream for TIMx_UP, see the respective reference manual for the appropriate values for your MCU. -#define WS2812_DMA_CHANNEL 2
\ No newline at end of file +#define WS2812_PWM_DMA_STREAM STM32_DMA1_STREAM7 // DMA Stream for TIMx_UP, see the respective reference manual for the appropriate values for your MCU. +#define WS2812_PWM_DMA_CHANNEL 2
\ No newline at end of file diff --git a/keyboards/novelkeys/nk20/config.h b/keyboards/novelkeys/nk20/config.h index 317cc2c3e8..750a033568 100644 --- a/keyboards/novelkeys/nk20/config.h +++ b/keyboards/novelkeys/nk20/config.h @@ -20,5 +20,5 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #define WS2812_PWM_DRIVER PWMD3 #define WS2812_PWM_CHANNEL 2 #define WS2812_PWM_PAL_MODE 1 -#define WS2812_DMA_STREAM STM32_DMA1_STREAM3 -#define WS2812_DMA_CHANNEL 3 +#define WS2812_PWM_DMA_STREAM STM32_DMA1_STREAM3 +#define WS2812_PWM_DMA_CHANNEL 3 diff --git a/keyboards/novelkeys/nk65b/config.h b/keyboards/novelkeys/nk65b/config.h index 40e3b54053..eaddb87b82 100755 --- a/keyboards/novelkeys/nk65b/config.h +++ b/keyboards/novelkeys/nk65b/config.h @@ -20,5 +20,5 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #define WS2812_PWM_DRIVER PWMD3 #define WS2812_PWM_CHANNEL 1 #define WS2812_PWM_PAL_MODE 1 -#define WS2812_DMA_STREAM STM32_DMA1_STREAM3 -#define WS2812_DMA_CHANNEL 3 +#define WS2812_PWM_DMA_STREAM STM32_DMA1_STREAM3 +#define WS2812_PWM_DMA_CHANNEL 3 diff --git a/keyboards/novelkeys/nk87b/config.h b/keyboards/novelkeys/nk87b/config.h index a79137e7d9..933d4ed5c0 100644 --- a/keyboards/novelkeys/nk87b/config.h +++ b/keyboards/novelkeys/nk87b/config.h @@ -20,5 +20,5 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #define WS2812_PWM_DRIVER PWMD3 #define WS2812_PWM_CHANNEL 3 #define WS2812_PWM_PAL_MODE 1 -#define WS2812_DMA_STREAM STM32_DMA1_STREAM3 -#define WS2812_DMA_CHANNEL 3 +#define WS2812_PWM_DMA_STREAM STM32_DMA1_STREAM3 +#define WS2812_PWM_DMA_CHANNEL 3 diff --git a/keyboards/novelkeys/nk_plus/config.h b/keyboards/novelkeys/nk_plus/config.h index 40e3b54053..eaddb87b82 100644 --- a/keyboards/novelkeys/nk_plus/config.h +++ b/keyboards/novelkeys/nk_plus/config.h @@ -20,5 +20,5 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #define WS2812_PWM_DRIVER PWMD3 #define WS2812_PWM_CHANNEL 1 #define WS2812_PWM_PAL_MODE 1 -#define WS2812_DMA_STREAM STM32_DMA1_STREAM3 -#define WS2812_DMA_CHANNEL 3 +#define WS2812_PWM_DMA_STREAM STM32_DMA1_STREAM3 +#define WS2812_PWM_DMA_CHANNEL 3 diff --git a/keyboards/planck/ez/config.h b/keyboards/planck/ez/config.h index 74d8d21155..e4fa0924d3 100644 --- a/keyboards/planck/ez/config.h +++ b/keyboards/planck/ez/config.h @@ -46,8 +46,8 @@ // #define WS2812_TIM_CH 2 // #define PORT_WS2812 GPIOA // #define PIN_WS2812 1 -// #define WS2812_DMA_STREAM STM32_DMA1_STREAM2 // DMA stream for TIMx_UP (look up in reference manual under DMA Channel selection) -//#define WS2812_DMA_CHANNEL 7 // DMA channel for TIMx_UP +// #define WS2812_PWM_DMA_STREAM STM32_DMA1_STREAM2 // DMA stream for TIMx_UP (look up in reference manual under DMA Channel selection) +//#define WS2812_PWM_DMA_CHANNEL 7 // DMA channel for TIMx_UP //#define WS2812_EXTERNAL_PULLUP #define IS31FL3737_I2C_ADDRESS_1 IS31FL3737_I2C_ADDRESS_GND diff --git a/keyboards/planck/rev6/config.h b/keyboards/planck/rev6/config.h index 7fec8be56b..0935fad358 100644 --- a/keyboards/planck/rev6/config.h +++ b/keyboards/planck/rev6/config.h @@ -46,5 +46,5 @@ #define WS2812_PWM_DRIVER PWMD2 #define WS2812_PWM_CHANNEL 2 #define WS2812_PWM_PAL_MODE 1 -#define WS2812_DMA_STREAM STM32_DMA1_STREAM2 -#define WS2812_DMA_CHANNEL 2 +#define WS2812_PWM_DMA_STREAM STM32_DMA1_STREAM2 +#define WS2812_PWM_DMA_CHANNEL 2 diff --git a/keyboards/planck/rev6_drop/config.h b/keyboards/planck/rev6_drop/config.h index 7fec8be56b..0935fad358 100644 --- a/keyboards/planck/rev6_drop/config.h +++ b/keyboards/planck/rev6_drop/config.h @@ -46,5 +46,5 @@ #define WS2812_PWM_DRIVER PWMD2 #define WS2812_PWM_CHANNEL 2 #define WS2812_PWM_PAL_MODE 1 -#define WS2812_DMA_STREAM STM32_DMA1_STREAM2 -#define WS2812_DMA_CHANNEL 2 +#define WS2812_PWM_DMA_STREAM STM32_DMA1_STREAM2 +#define WS2812_PWM_DMA_CHANNEL 2 diff --git a/keyboards/planck/rev7/config.h b/keyboards/planck/rev7/config.h index a5e49c8a53..9ccbf4cc8a 100644 --- a/keyboards/planck/rev7/config.h +++ b/keyboards/planck/rev7/config.h @@ -27,8 +27,8 @@ #define WS2812_PWM_DRIVER PWMD2 #define WS2812_PWM_CHANNEL 2 #define WS2812_PWM_PAL_MODE 1 -#define WS2812_DMA_STREAM STM32_DMA1_STREAM2 -#define WS2812_DMA_CHANNEL 2 +#define WS2812_PWM_DMA_STREAM STM32_DMA1_STREAM2 +#define WS2812_PWM_DMA_CHANNEL 2 /* * Feature disable options diff --git a/keyboards/preonic/rev3/config.h b/keyboards/preonic/rev3/config.h index 7800131a90..6a842105b2 100644 --- a/keyboards/preonic/rev3/config.h +++ b/keyboards/preonic/rev3/config.h @@ -44,5 +44,5 @@ #define WS2812_PWM_DRIVER PWMD2 #define WS2812_PWM_CHANNEL 2 #define WS2812_PWM_PAL_MODE 1 -#define WS2812_DMA_STREAM STM32_DMA1_STREAM2 -#define WS2812_DMA_CHANNEL 2 +#define WS2812_PWM_DMA_STREAM STM32_DMA1_STREAM2 +#define WS2812_PWM_DMA_CHANNEL 2 diff --git a/keyboards/preonic/rev3_drop/config.h b/keyboards/preonic/rev3_drop/config.h index 7800131a90..6a842105b2 100644 --- a/keyboards/preonic/rev3_drop/config.h +++ b/keyboards/preonic/rev3_drop/config.h @@ -44,5 +44,5 @@ #define WS2812_PWM_DRIVER PWMD2 #define WS2812_PWM_CHANNEL 2 #define WS2812_PWM_PAL_MODE 1 -#define WS2812_DMA_STREAM STM32_DMA1_STREAM2 -#define WS2812_DMA_CHANNEL 2 +#define WS2812_PWM_DMA_STREAM STM32_DMA1_STREAM2 +#define WS2812_PWM_DMA_CHANNEL 2 diff --git a/keyboards/protozoa/p01/config.h b/keyboards/protozoa/p01/config.h index fd58bda912..3b14a164f6 100644 --- a/keyboards/protozoa/p01/config.h +++ b/keyboards/protozoa/p01/config.h @@ -21,5 +21,5 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #define WS2812_PWM_DRIVER PWMD1 #define WS2812_PWM_CHANNEL 2 #define WS2812_PWM_PAL_MODE 2 -#define WS2812_DMA_STREAM STM32_DMA1_STREAM5 -#define WS2812_DMA_CHANNEL 5 +#define WS2812_PWM_DMA_STREAM STM32_DMA1_STREAM5 +#define WS2812_PWM_DMA_CHANNEL 5 diff --git a/keyboards/qwertykeys/qk100/ansi/info.json b/keyboards/qwertykeys/qk100/ansi/info.json index 3469f1c62e..fb52f388de 100644 --- a/keyboards/qwertykeys/qk100/ansi/info.json +++ b/keyboards/qwertykeys/qk100/ansi/info.json @@ -140,7 +140,6 @@ "hue_breathing": true, "hue_pendulum": true, "hue_wave": true, - "pixel_fractal": true, "pixel_flow": true, "pixel_rain": true, "typing_heatmap": true, @@ -148,15 +147,11 @@ "solid_reactive_simple": true, "solid_reactive": true, "solid_reactive_wide": true, - "solid_reactive_multiwide": true, "solid_reactive_cross": true, - "solid_reactive_multicross": true, "solid_reactive_nexus": true, - "solid_reactive_multinexus": true, "splash": true, "multisplash": true, - "solid_splash": true, - "solid_multisplash": true + "solid_splash": true }, "default": { "val": 128 @@ -270,4 +265,4 @@ ] } } -}
\ No newline at end of file +} diff --git a/keyboards/qwertykeys/qk100/ansi/keymaps/via/rules.mk b/keyboards/qwertykeys/qk100/ansi/keymaps/via/rules.mk index 43061db1dd..1e5b99807c 100644 --- a/keyboards/qwertykeys/qk100/ansi/keymaps/via/rules.mk +++ b/keyboards/qwertykeys/qk100/ansi/keymaps/via/rules.mk @@ -1,2 +1 @@ VIA_ENABLE = yes -LTO_ENABLE = yes
\ No newline at end of file diff --git a/keyboards/qwertykeys/qk100/info.json b/keyboards/qwertykeys/qk100/info.json index d020ca8ad2..6edea6dff7 100644 --- a/keyboards/qwertykeys/qk100/info.json +++ b/keyboards/qwertykeys/qk100/info.json @@ -1,6 +1,5 @@ { "manufacturer": "Qwertykeys", - "url": "", "maintainer": "Qwertykeys", "usb": { "vid": "0x4F53" @@ -17,6 +16,9 @@ "rgblight": true, "nkro": true }, + "build": { + "lto": true + }, "processor": "STM32F103", "bootloader": "stm32duino", "ws2812": { @@ -47,4 +49,4 @@ "dynamic_keymap": { "layer_count": 2 } -}
\ No newline at end of file +} diff --git a/keyboards/rgbkb/mun/config.h b/keyboards/rgbkb/mun/config.h index b247fa91cd..74db14c061 100644 --- a/keyboards/rgbkb/mun/config.h +++ b/keyboards/rgbkb/mun/config.h @@ -54,8 +54,8 @@ #define WS2812_PWM_DRIVER PWMD3 #define WS2812_PWM_CHANNEL 2 #define WS2812_PWM_PAL_MODE 2 -#define WS2812_DMA_STREAM STM32_DMA1_STREAM3 -#define WS2812_DMA_CHANNEL 3 +#define WS2812_PWM_DMA_STREAM STM32_DMA1_STREAM3 +#define WS2812_PWM_DMA_CHANNEL 3 #define TOUCH_UPDATE_INTERVAL 33 #define OLED_UPDATE_INTERVAL 33 diff --git a/keyboards/rgbkb/sol3/config.h b/keyboards/rgbkb/sol3/config.h index 2d3caeea4e..8348b44f96 100644 --- a/keyboards/rgbkb/sol3/config.h +++ b/keyboards/rgbkb/sol3/config.h @@ -46,8 +46,8 @@ #define WS2812_PWM_DRIVER PWMD3 #define WS2812_PWM_CHANNEL 2 #define WS2812_PWM_PAL_MODE 2 -#define WS2812_DMA_STREAM STM32_DMA1_STREAM3 -#define WS2812_DMA_CHANNEL 3 +#define WS2812_PWM_DMA_STREAM STM32_DMA1_STREAM3 +#define WS2812_PWM_DMA_CHANNEL 3 #define TOUCH_UPDATE_INTERVAL 33 #define OLED_UPDATE_INTERVAL 33 diff --git a/keyboards/skyloong/dt40/config.h b/keyboards/skyloong/dt40/config.h index b0aa978063..7e101addcb 100644 --- a/keyboards/skyloong/dt40/config.h +++ b/keyboards/skyloong/dt40/config.h @@ -24,5 +24,5 @@ #define WS2812_PWM_DRIVER PWMD3 #define WS2812_PWM_CHANNEL 1 #define WS2812_PWM_PAL_MODE 2 -#define WS2812_DMA_STREAM STM32_DMA1_STREAM3 -#define WS2812_DMA_CHANNEL 3 +#define WS2812_PWM_DMA_STREAM STM32_DMA1_STREAM3 +#define WS2812_PWM_DMA_CHANNEL 3 diff --git a/keyboards/smithrune/iron165r2/f411/config.h b/keyboards/smithrune/iron165r2/f411/config.h index 8ed73d3ff4..bcd506ade3 100644 --- a/keyboards/smithrune/iron165r2/f411/config.h +++ b/keyboards/smithrune/iron165r2/f411/config.h @@ -24,5 +24,5 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #define WS2812_PWM_DRIVER PWMD1 #define WS2812_PWM_CHANNEL 3 #define WS2812_PWM_PAL_MODE 1 -#define WS2812_DMA_STREAM STM32_DMA2_STREAM5 -#define WS2812_DMA_CHANNEL 6 +#define WS2812_PWM_DMA_STREAM STM32_DMA2_STREAM5 +#define WS2812_PWM_DMA_CHANNEL 6 diff --git a/keyboards/smithrune/magnus/m75h/config.h b/keyboards/smithrune/magnus/m75h/config.h index e72ba06969..18fd960d8f 100644 --- a/keyboards/smithrune/magnus/m75h/config.h +++ b/keyboards/smithrune/magnus/m75h/config.h @@ -25,5 +25,5 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #define WS2812_PWM_DRIVER PWMD1 #define WS2812_PWM_CHANNEL 3 #define WS2812_PWM_PAL_MODE 1 -#define WS2812_DMA_STREAM STM32_DMA2_STREAM5 -#define WS2812_DMA_CHANNEL 6 +#define WS2812_PWM_DMA_STREAM STM32_DMA2_STREAM5 +#define WS2812_PWM_DMA_CHANNEL 6 diff --git a/keyboards/smithrune/magnus/m75s/config.h b/keyboards/smithrune/magnus/m75s/config.h index 1e8874caa4..95fb2a420c 100644 --- a/keyboards/smithrune/magnus/m75s/config.h +++ b/keyboards/smithrune/magnus/m75s/config.h @@ -27,5 +27,5 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #define WS2812_PWM_DRIVER PWMD1 #define WS2812_PWM_CHANNEL 3 #define WS2812_PWM_PAL_MODE 1 -#define WS2812_DMA_STREAM STM32_DMA2_STREAM5 -#define WS2812_DMA_CHANNEL 6 +#define WS2812_PWM_DMA_STREAM STM32_DMA2_STREAM5 +#define WS2812_PWM_DMA_CHANNEL 6 diff --git a/keyboards/spaceholdings/nebula68/config.h b/keyboards/spaceholdings/nebula68/config.h index 1b2441556b..85d3261dd1 100755 --- a/keyboards/spaceholdings/nebula68/config.h +++ b/keyboards/spaceholdings/nebula68/config.h @@ -20,8 +20,8 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #define WS2812_PWM_DRIVER PWMD3 // default: PWMD2 #define WS2812_PWM_CHANNEL 2 // default: 2 #define WS2812_PWM_PAL_MODE 2 // Pin "alternate function", see the respective datasheet for the appropriate values for your MCU. default: 2 -#define WS2812_DMA_STREAM STM32_DMA1_STREAM3 // DMA Stream for TIMx_UP, see the respective reference manual for the appropriate values for your MCU. -#define WS2812_DMA_CHANNEL 3 // DMA Channel for TIMx_UP, see the respective reference manual for the appropriate values for your MCU. +#define WS2812_PWM_DMA_STREAM STM32_DMA1_STREAM3 // DMA Stream for TIMx_UP, see the respective reference manual for the appropriate values for your MCU. +#define WS2812_PWM_DMA_CHANNEL 3 // DMA Channel for TIMx_UP, see the respective reference manual for the appropriate values for your MCU. /* Backlight options */ diff --git a/keyboards/splitkb/kyria/rev1/config.h b/keyboards/splitkb/kyria/rev1/config.h index d666099135..4f130293e2 100644 --- a/keyboards/splitkb/kyria/rev1/config.h +++ b/keyboards/splitkb/kyria/rev1/config.h @@ -33,9 +33,9 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. # define WS2812_PWM_DRIVER PWMD2 // default: PWMD2 # define WS2812_PWM_CHANNEL 4 // default: 2 # define WS2812_PWM_PAL_MODE 1 // Pin "alternate function", see the respective datasheet for the appropriate values for your MCU. default: 2 -# define WS2812_DMA_STREAM STM32_DMA1_STREAM2 // DMA Stream for TIMx_UP, see the respective reference manual for the appropriate values for your MCU. -# define WS2812_DMA_CHANNEL 2 // DMA Channel for TIMx_UP, see the respective reference manual for the appropriate values for your MCU. -# define WS2812_DMAMUX_ID STM32_DMAMUX1_TIM2_UP // DMAMUX configuration for TIMx_UP -- only required if your MCU has a DMAMUX peripheral, see the respective reference manual for the appropriate values for your MCU. +# define WS2812_PWM_DMA_STREAM STM32_DMA1_STREAM2 // DMA Stream for TIMx_UP, see the respective reference manual for the appropriate values for your MCU. +# define WS2812_PWM_DMA_CHANNEL 2 // DMA Channel for TIMx_UP, see the respective reference manual for the appropriate values for your MCU. +# define WS2812_PWM_DMAMUX_ID STM32_DMAMUX1_TIM2_UP // DMAMUX configuration for TIMx_UP -- only required if your MCU has a DMAMUX peripheral, see the respective reference manual for the appropriate values for your MCU. #else # define WS2812_DI_PIN D3 # define SOFT_SERIAL_PIN D2 diff --git a/keyboards/splitkb/kyria/rev2/config.h b/keyboards/splitkb/kyria/rev2/config.h index 452e011f0a..54d8f0985a 100644 --- a/keyboards/splitkb/kyria/rev2/config.h +++ b/keyboards/splitkb/kyria/rev2/config.h @@ -38,9 +38,9 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. # define WS2812_PWM_DRIVER PWMD2 // default: PWMD2 # define WS2812_PWM_CHANNEL 4 // default: 2 # define WS2812_PWM_PAL_MODE 1 // Pin "alternate function", see the respective datasheet for the appropriate values for your MCU. default: 2 -# define WS2812_DMA_STREAM STM32_DMA1_STREAM2 // DMA Stream for TIMx_UP, see the respective reference manual for the appropriate values for your MCU. -# define WS2812_DMA_CHANNEL 2 // DMA Channel for TIMx_UP, see the respective reference manual for the appropriate values for your MCU. -# define WS2812_DMAMUX_ID STM32_DMAMUX1_TIM2_UP // DMAMUX configuration for TIMx_UP -- only required if your MCU has a DMAMUX peripheral, see the respective reference manual for the appropriate values for your MCU. +# define WS2812_PWM_DMA_STREAM STM32_DMA1_STREAM2 // DMA Stream for TIMx_UP, see the respective reference manual for the appropriate values for your MCU. +# define WS2812_PWM_DMA_CHANNEL 2 // DMA Channel for TIMx_UP, see the respective reference manual for the appropriate values for your MCU. +# define WS2812_PWM_DMAMUX_ID STM32_DMAMUX1_TIM2_UP // DMAMUX configuration for TIMx_UP -- only required if your MCU has a DMAMUX peripheral, see the respective reference manual for the appropriate values for your MCU. #else # define WS2812_DI_PIN D3 # define SOFT_SERIAL_PIN D2 diff --git a/keyboards/tg67/config.h b/keyboards/tg67/config.h index 7ede76f551..0d54e925ae 100644 --- a/keyboards/tg67/config.h +++ b/keyboards/tg67/config.h @@ -19,5 +19,5 @@ #define WS2812_PWM_DRIVER PWMD1 #define WS2812_PWM_CHANNEL 3 #define WS2812_PWM_COMPLEMENTARY_OUTPUT -#define WS2812_DMA_STREAM STM32_DMA1_STREAM5 -#define WS2812_DMA_CHANNEL 5 +#define WS2812_PWM_DMA_STREAM STM32_DMA1_STREAM5 +#define WS2812_PWM_DMA_CHANNEL 5 diff --git a/keyboards/tkw/grandiceps/config.h b/keyboards/tkw/grandiceps/config.h index a963fbfb51..a02e14f91f 100644 --- a/keyboards/tkw/grandiceps/config.h +++ b/keyboards/tkw/grandiceps/config.h @@ -20,5 +20,5 @@ #define WS2812_PWM_DRIVER PWMD3 #define WS2812_PWM_CHANNEL 4 #define WS2812_PWM_PAL_MODE 2 -#define WS2812_DMA_STREAM STM32_DMA1_STREAM2 -#define WS2812_DMA_CHANNEL 5 +#define WS2812_PWM_DMA_STREAM STM32_DMA1_STREAM2 +#define WS2812_PWM_DMA_CHANNEL 5 diff --git a/keyboards/tkw/stoutgat/v2/config.h b/keyboards/tkw/stoutgat/v2/config.h index bf68edcfae..79f47b9bb3 100644 --- a/keyboards/tkw/stoutgat/v2/config.h +++ b/keyboards/tkw/stoutgat/v2/config.h @@ -18,8 +18,8 @@ #define WS2812_PWM_DRIVER PWMD3 #define WS2812_PWM_CHANNEL 4 #define WS2812_PWM_PAL_MODE 2 -#define WS2812_DMA_STREAM STM32_DMA1_STREAM2 -#define WS2812_DMA_CHANNEL 5 +#define WS2812_PWM_DMA_STREAM STM32_DMA1_STREAM2 +#define WS2812_PWM_DMA_CHANNEL 5 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE diff --git a/keyboards/tweetydabird/lotus58/elite_c/info.json b/keyboards/tweetydabird/lotus58/elite_c/info.json index 606784570c..af1a9f913c 100644 --- a/keyboards/tweetydabird/lotus58/elite_c/info.json +++ b/keyboards/tweetydabird/lotus58/elite_c/info.json @@ -1,3 +1,32 @@ { - "bootloader": "atmel-dfu" + "build": { + "lto": true + }, + "development_board": "elite_c", + "pin_compatible": "elite_c", + "encoder": { + "rotary": [ + {"pin_a": "F5", "pin_b": "F4", "resolution": 2} + ] + }, + "matrix_pins": { + "cols": ["B1", "B2", "B3", "B6", "F7", "F6"], + "rows": ["D4", "C6", "D7", "E6", "B4"] + }, + "split": { + "encoder": { + "right": { + "rotary": [ + {"pin_a": "F4", "pin_b": "F5", "resolution": 2} + ] + } + }, + "handedness": { + "pin": "B5" + }, + "soft_serial_pin": "D2", + }, + "ws2812": { + "pin": "D3" + }, } diff --git a/keyboards/tweetydabird/lotus58/info.json b/keyboards/tweetydabird/lotus58/info.json index 646843e765..f4660c3ad9 100644 --- a/keyboards/tweetydabird/lotus58/info.json +++ b/keyboards/tweetydabird/lotus58/info.json @@ -1,17 +1,9 @@ { "manufacturer": "Tweetys Wild Thinking", - "keyboard_name": "Lotus 58 Glow (QMK)", + "keyboard_name": "Lotus 58 Glow", "maintainer": "TweetyDaBird", "bootloader_instructions": "Short marked pads on PCB, or hold top-outer key when plugging in each hand.", - "build": { - "lto": true - }, "diode_direction": "COL2ROW", - "encoder": { - "rotary": [ - {"pin_a": "F5", "pin_b": "F4", "resolution": 2} - ] - }, "features": { "bootmagic": true, "command": false, @@ -25,12 +17,6 @@ "split": true, "tri_layer": true }, - "matrix_pins": { - "cols": ["B1", "B2", "B3", "B6", "F7", "F6"], - "rows": ["D4", "C6", "D7", "E6", "B4"] - }, - "pin_compatible": "promicro", - "processor": "atmega32u4", "rgblight": { "default": { "val": 87 @@ -46,19 +32,7 @@ "matrix": [5, 0] }, "enabled": true, - "encoder": { - "right": { - "rotary": [ - {"pin_a": "F4", "pin_b": "F5", "resolution": 2} - ] - } - }, - "handedness": { - "pin": "B5" - }, - "soft_serial_pin": "D2", "transport": { - "protocol": "serial", "sync": { "indicators": true, "layer_state": true, @@ -78,9 +52,6 @@ "pid": "0x23B0", "vid": "0xFEED" }, - "ws2812": { - "pin": "D3" - }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/tweetydabird/lotus58/nanoboot/info.json b/keyboards/tweetydabird/lotus58/nanoboot/info.json new file mode 100644 index 0000000000..e7586e6f2f --- /dev/null +++ b/keyboards/tweetydabird/lotus58/nanoboot/info.json @@ -0,0 +1,32 @@ +{ + "build": { + "lto": true + }, + "pin_compatible": "promicro", + "processor": "atmega32u4", + "encoder": { + "rotary": [ + {"pin_a": "F5", "pin_b": "F4", "resolution": 2} + ] + }, + "matrix_pins": { + "cols": ["B1", "B2", "B3", "B6", "F7", "F6"], + "rows": ["D4", "C6", "D7", "E6", "B4"] + }, + "split": { + "encoder": { + "right": { + "rotary": [ + {"pin_a": "F4", "pin_b": "F5", "resolution": 2} + ] + } + }, + "handedness": { + "pin": "B5" + }, + "soft_serial_pin": "D2", + }, + "ws2812": { + "pin": "D3" + }, +} diff --git a/keyboards/tweetydabird/lotus58/promicro/info.json b/keyboards/tweetydabird/lotus58/promicro/info.json index 56062f7ad3..62ee0355ef 100644 --- a/keyboards/tweetydabird/lotus58/promicro/info.json +++ b/keyboards/tweetydabird/lotus58/promicro/info.json @@ -1,3 +1,31 @@ { - "bootloader": "caterina" + "build": { + "lto": true + }, + "development_board": "promicro", + "encoder": { + "rotary": [ + {"pin_a": "F5", "pin_b": "F4", "resolution": 2} + ] + }, + "matrix_pins": { + "cols": ["B1", "B2", "B3", "B6", "F7", "F6"], + "rows": ["D4", "C6", "D7", "E6", "B4"] + }, + "split": { + "encoder": { + "right": { + "rotary": [ + {"pin_a": "F4", "pin_b": "F5", "resolution": 2} + ] + } + }, + "handedness": { + "pin": "B5" + }, + "soft_serial_pin": "D2", + }, + "ws2812": { + "pin": "D3" + }, } diff --git a/keyboards/tweetydabird/lotus58/rp2040_ce/config.h b/keyboards/tweetydabird/lotus58/rp2040_ce/config.h new file mode 100644 index 0000000000..e4a23b7d7f --- /dev/null +++ b/keyboards/tweetydabird/lotus58/rp2040_ce/config.h @@ -0,0 +1,9 @@ +// Copyright 2024 Markus Knutsson (@TweetyDaBird) +// SPDX-License-Identifier: GPL-2.0-or-later +#pragma once + +#define SERIAL_PIO_USE_PIO1 // Force the usage of PIO1 peripheral, by default the Serial implementation uses the PIO0 peripheral + +#define I2C_DRIVER I2CD1 +#define I2C1_SDA_PIN GP2 +#define I2C1_SCL_PIN GP3 diff --git a/keyboards/tweetydabird/lotus58/rp2040_ce/halconf.h b/keyboards/tweetydabird/lotus58/rp2040_ce/halconf.h new file mode 100644 index 0000000000..2e098f5113 --- /dev/null +++ b/keyboards/tweetydabird/lotus58/rp2040_ce/halconf.h @@ -0,0 +1,21 @@ +/* Copyright 2022 QMK + * + * 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 HAL_USE_I2C TRUE + +#include_next <halconf.h> diff --git a/keyboards/tweetydabird/lotus58/rp2040_ce/info.json b/keyboards/tweetydabird/lotus58/rp2040_ce/info.json new file mode 100644 index 0000000000..c8bf711747 --- /dev/null +++ b/keyboards/tweetydabird/lotus58/rp2040_ce/info.json @@ -0,0 +1,29 @@ +{ + "development_board": "promicro_rp2040", + "encoder": { + "rotary": [ + {"pin_a": "GP28", "pin_b": "GP29", "resolution": 2} + ] + }, + "matrix_pins": { + "cols": ["GP22", "GP23", "GP20", "GP21", "GP26", "GP27"], + "rows": ["GP4", "GP5", "GP6", "GP7", "GP8"] + }, + "split": { + "encoder": { + "right": { + "rotary": [ + {"pin_a": "GP29", "pin_b": "GP28", "resolution": 2} + ] + } + }, + "soft_serial_pin": "GP1", + "handedness": { + "pin": "GP9" + } + }, + "ws2812": { + "driver": "vendor", + "pin": "GP0" + } +} diff --git a/keyboards/tweetydabird/lotus58/rp2040_ce/mcuconf.h b/keyboards/tweetydabird/lotus58/rp2040_ce/mcuconf.h new file mode 100644 index 0000000000..2ae39bf675 --- /dev/null +++ b/keyboards/tweetydabird/lotus58/rp2040_ce/mcuconf.h @@ -0,0 +1,22 @@ +/* Copyright 2022 QMK + * + * 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_next <mcuconf.h> + +#undef RP_I2C_USE_I2C1 +#define RP_I2C_USE_I2C1 TRUE diff --git a/keyboards/tweetydabird/lotus58/rp2040_ce/rules.mk b/keyboards/tweetydabird/lotus58/rp2040_ce/rules.mk new file mode 100644 index 0000000000..161ec22b16 --- /dev/null +++ b/keyboards/tweetydabird/lotus58/rp2040_ce/rules.mk @@ -0,0 +1 @@ +SERIAL_DRIVER = vendor diff --git a/keyboards/tzarc/djinn/config.h b/keyboards/tzarc/djinn/config.h index 74bb00edc2..24357b6a35 100644 --- a/keyboards/tzarc/djinn/config.h +++ b/keyboards/tzarc/djinn/config.h @@ -39,9 +39,9 @@ #define WS2812_PWM_DRIVER PWMD20 #define WS2812_PWM_CHANNEL 1 #define WS2812_PWM_PAL_MODE 3 -#define WS2812_DMA_STREAM STM32_DMA1_STREAM1 -#define WS2812_DMA_CHANNEL 1 -#define WS2812_DMAMUX_ID STM32_DMAMUX1_TIM20_UP +#define WS2812_PWM_DMA_STREAM STM32_DMA1_STREAM1 +#define WS2812_PWM_DMA_CHANNEL 1 +#define WS2812_PWM_DMAMUX_ID STM32_DMAMUX1_TIM20_UP // Audio configuration #define AUDIO_PIN A5 diff --git a/keyboards/tzarc/djinn/djinn_portscan_matrix.c b/keyboards/tzarc/djinn/djinn_portscan_matrix.c index cb73c47def..ac81ad18c1 100644 --- a/keyboards/tzarc/djinn/djinn_portscan_matrix.c +++ b/keyboards/tzarc/djinn/djinn_portscan_matrix.c @@ -1,7 +1,8 @@ // Copyright 2018-2022 Nick Brassel (@tzarc) // SPDX-License-Identifier: GPL-2.0-or-later +#include <ch.h> +#include <hal.h> #include "quantum.h" -#include <hal_pal.h> #include "djinn.h" #define GPIOB_BITMASK (1 << 13 | 1 << 14 | 1 << 15) // B13, B14, B15 @@ -34,6 +35,8 @@ void matrix_wait_for_port(stm32_gpio_t *port, uint32_t target_bitmask) { } } +static void dummy_vt_callback(virtual_timer_t *vtp, void *p) {} + void matrix_init_custom(void) { for (int i = 0; i < MATRIX_ROWS; ++i) { setPinInputHigh(row_pins[i]); @@ -41,6 +44,11 @@ void matrix_init_custom(void) { for (int i = 0; i < MATRIX_COLS; ++i) { setPinInputHigh(col_pins[i]); } + + // Start a virtual timer so we'll still get periodic wakeups, now that USB SOF doesn't wake up the main loop + static virtual_timer_t vt; + chVTObjectInit(&vt); + chVTSetContinuous(&vt, TIME_MS2I(10), dummy_vt_callback, NULL); } bool matrix_scan_custom(matrix_row_t current_matrix[]) { diff --git a/keyboards/tzarc/ghoul/rev1/stm32/config.h b/keyboards/tzarc/ghoul/rev1/stm32/config.h index 1dbc164039..a835b341db 100644 --- a/keyboards/tzarc/ghoul/rev1/stm32/config.h +++ b/keyboards/tzarc/ghoul/rev1/stm32/config.h @@ -28,8 +28,8 @@ #define WS2812_PWM_DRIVER PWMD3 #define WS2812_PWM_CHANNEL 1 #define WS2812_PWM_PAL_MODE 2 -#define WS2812_DMA_STREAM STM32_DMA1_STREAM2 -#define WS2812_DMA_CHANNEL 5 +#define WS2812_PWM_DMA_STREAM STM32_DMA1_STREAM2 +#define WS2812_PWM_DMA_CHANNEL 5 #define RGB_ENABLE_PIN C0 // ADC Configuration diff --git a/keyboards/viendi8l/config.h b/keyboards/viendi8l/config.h index 050a0cca22..a449301c2b 100644 --- a/keyboards/viendi8l/config.h +++ b/keyboards/viendi8l/config.h @@ -37,5 +37,5 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #define WS2812_PWM_DRIVER PWMD1 #define WS2812_PWM_CHANNEL 3 #define WS2812_PWM_PAL_MODE 1 -#define WS2812_DMA_STREAM STM32_DMA2_STREAM5 -#define WS2812_DMA_CHANNEL 6 +#define WS2812_PWM_DMA_STREAM STM32_DMA2_STREAM5 +#define WS2812_PWM_DMA_CHANNEL 6 diff --git a/keyboards/vinhcatba/uncertainty/config.h b/keyboards/vinhcatba/uncertainty/config.h index 5c02b78efe..82671dfdc0 100644 --- a/keyboards/vinhcatba/uncertainty/config.h +++ b/keyboards/vinhcatba/uncertainty/config.h @@ -11,8 +11,8 @@ #define WS2812_PWM_CHANNEL 4 // CH4 #define WS2812_PWM_PAL_MODE 2 // AF2 -#define WS2812_DMA_STREAM STM32_DMA1_STREAM2 // DMA1 Stream 2 for TIM3_UP (table 28 in reference manual) -#define WS2812_DMA_CHANNEL 5 // DMA Channel 5 for TIM3_UP (table 28 in reference manual) +#define WS2812_PWM_DMA_STREAM STM32_DMA1_STREAM2 // DMA1 Stream 2 for TIM3_UP (table 28 in reference manual) +#define WS2812_PWM_DMA_CHANNEL 5 // DMA Channel 5 for TIM3_UP (table 28 in reference manual) #define I2C1_CLOCK_SPEED 400000 diff --git a/keyboards/xelus/ninjin/config.h b/keyboards/xelus/ninjin/config.h index 9db59dcc66..7a8ac2f013 100644 --- a/keyboards/xelus/ninjin/config.h +++ b/keyboards/xelus/ninjin/config.h @@ -20,8 +20,8 @@ #define WS2812_PWM_DRIVER PWMD1 #define WS2812_PWM_CHANNEL 3 #define WS2812_PWM_PAL_MODE 2 -#define WS2812_DMA_STREAM STM32_DMA1_STREAM5 -#define WS2812_DMA_CHANNEL 3 +#define WS2812_PWM_DMA_STREAM STM32_DMA1_STREAM5 +#define WS2812_PWM_DMA_CHANNEL 3 #define WS2812_EXTERNAL_PULLUP /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ diff --git a/keyboards/xelus/valor/rev2/config.h b/keyboards/xelus/valor/rev2/config.h index f601945a15..9491d1f175 100644 --- a/keyboards/xelus/valor/rev2/config.h +++ b/keyboards/xelus/valor/rev2/config.h @@ -40,9 +40,9 @@ #define WS2812_PWM_DRIVER PWMD1 #define WS2812_PWM_CHANNEL 2 #define WS2812_PWM_PAL_MODE 1 -#define WS2812_DMA_STREAM STM32_DMA1_STREAM6 -#define WS2812_DMA_CHANNEL 7 -#define WS2812_DMAMUX_ID STM32_DMAMUX1_TIM1_UP +#define WS2812_PWM_DMA_STREAM STM32_DMA1_STREAM6 +#define WS2812_PWM_DMA_CHANNEL 7 +#define WS2812_PWM_DMAMUX_ID STM32_DMAMUX1_TIM1_UP // RGB Pullup #define WS2812_EXTERNAL_PULLUP diff --git a/keyboards/yandrstudio/buff67v3/config.h b/keyboards/yandrstudio/buff67v3/config.h index 9d3f3e44c0..7ff7636087 100644 --- a/keyboards/yandrstudio/buff67v3/config.h +++ b/keyboards/yandrstudio/buff67v3/config.h @@ -23,8 +23,8 @@ # define WS2812_PWM_DRIVER PWMD3 // default: PWMD2 # define WS2812_PWM_CHANNEL 1 // default: 2 -# define WS2812_DMA_STREAM STM32_DMA1_STREAM3 // DMA Stream for TIMx_UP, see the respective reference manual for the appropriate values for your MCU. -# define WS2812_DMA_CHANNEL 3 // DMA Channel for TIMx_UP, see the respective reference manual for the appropriate values for your MCU. +# define WS2812_PWM_DMA_STREAM STM32_DMA1_STREAM3 // DMA Stream for TIMx_UP, see the respective reference manual for the appropriate values for your MCU. +# define WS2812_PWM_DMA_CHANNEL 3 // DMA Channel for TIMx_UP, see the respective reference manual for the appropriate values for your MCU. #endif diff --git a/keyboards/yandrstudio/eau_r2/config.h b/keyboards/yandrstudio/eau_r2/config.h index aa9b295e02..3a741b3dff 100644 --- a/keyboards/yandrstudio/eau_r2/config.h +++ b/keyboards/yandrstudio/eau_r2/config.h @@ -17,5 +17,5 @@ #define WS2812_PWM_DRIVER PWMD1 #define WS2812_PWM_CHANNEL 1 -#define WS2812_DMA_STREAM STM32_DMA1_STREAM5 -#define WS2812_DMA_CHANNEL 5 +#define WS2812_PWM_DMA_STREAM STM32_DMA1_STREAM5 +#define WS2812_PWM_DMA_CHANNEL 5 diff --git a/keyboards/yandrstudio/nightstar75/config.h b/keyboards/yandrstudio/nightstar75/config.h index 4d5c662999..f29bd573b8 100644 --- a/keyboards/yandrstudio/nightstar75/config.h +++ b/keyboards/yandrstudio/nightstar75/config.h @@ -20,5 +20,5 @@ #define WS2812_PWM_DRIVER PWMD3 // default: PWMD2 #define WS2812_PWM_CHANNEL 2 // default: 2 #define WS2812_PWM_PAL_MODE 2 -#define WS2812_DMA_STREAM STM32_DMA1_STREAM3 -#define WS2812_DMA_CHANNEL 3 +#define WS2812_PWM_DMA_STREAM STM32_DMA1_STREAM3 +#define WS2812_PWM_DMA_CHANNEL 3 diff --git a/keyboards/yandrstudio/nz64/config.h b/keyboards/yandrstudio/nz64/config.h index 81b549b60d..6dd155f74e 100644 --- a/keyboards/yandrstudio/nz64/config.h +++ b/keyboards/yandrstudio/nz64/config.h @@ -18,5 +18,5 @@ #define WS2812_PWM_DRIVER PWMD3 // default: PWMD2 #define WS2812_PWM_CHANNEL 2 // default: 2 #define WS2812_PWM_PAL_MODE 2 // Pin "alternate function", see the respective datasheet for the appropriate values for your MCU. default: 2 -#define WS2812_DMA_STREAM STM32_DMA1_STREAM2 // DMA Stream for TIMx_UP, see the respective reference manual for the appropriate values for your MCU. -#define WS2812_DMA_CHANNEL 5 // DMA Channel for TIMx_UP, see the respective reference manual for the appropriate values for your MCU. +#define WS2812_PWM_DMA_STREAM STM32_DMA1_STREAM2 // DMA Stream for TIMx_UP, see the respective reference manual for the appropriate values for your MCU. +#define WS2812_PWM_DMA_CHANNEL 5 // DMA Channel for TIMx_UP, see the respective reference manual for the appropriate values for your MCU. diff --git a/keyboards/yandrstudio/nz67v2/config.h b/keyboards/yandrstudio/nz67v2/config.h index 7ecdfeafcf..a7ae3e713c 100644 --- a/keyboards/yandrstudio/nz67v2/config.h +++ b/keyboards/yandrstudio/nz67v2/config.h @@ -18,5 +18,5 @@ #define WS2812_PWM_DRIVER PWMD3 // default: PWMD2 #define WS2812_PWM_CHANNEL 2 // default: 2 -#define WS2812_DMA_STREAM STM32_DMA1_STREAM3 // DMA Stream for TIMx_UP, see the respective reference manual for the appropriate values for your MCU. -#define WS2812_DMA_CHANNEL 3 // DMA Channel for TIMx_UP, see the respective reference manual for the appropriate values for your MCU. +#define WS2812_PWM_DMA_STREAM STM32_DMA1_STREAM3 // DMA Stream for TIMx_UP, see the respective reference manual for the appropriate values for your MCU. +#define WS2812_PWM_DMA_CHANNEL 3 // DMA Channel for TIMx_UP, see the respective reference manual for the appropriate values for your MCU. diff --git a/keyboards/yandrstudio/tg67/config.h b/keyboards/yandrstudio/tg67/config.h index 686696be7d..99deee32ac 100644 --- a/keyboards/yandrstudio/tg67/config.h +++ b/keyboards/yandrstudio/tg67/config.h @@ -18,5 +18,5 @@ #define WS2812_PWM_DRIVER PWMD3 #define WS2812_PWM_CHANNEL 2 #define WS2812_PWM_PAL_MODE 2 -#define WS2812_DMA_STREAM STM32_DMA1_STREAM3 -#define WS2812_DMA_CHANNEL 3 +#define WS2812_PWM_DMA_STREAM STM32_DMA1_STREAM3 +#define WS2812_PWM_DMA_CHANNEL 3 diff --git a/keyboards/yandrstudio/yr6095/config.h b/keyboards/yandrstudio/yr6095/config.h index 05a8922788..9837216626 100644 --- a/keyboards/yandrstudio/yr6095/config.h +++ b/keyboards/yandrstudio/yr6095/config.h @@ -19,5 +19,5 @@ #define WS2812_PWM_DRIVER PWMD3 #define WS2812_PWM_CHANNEL 2 -#define WS2812_DMA_STREAM STM32_DMA1_STREAM3 -#define WS2812_DMA_CHANNEL 3 +#define WS2812_PWM_DMA_STREAM STM32_DMA1_STREAM3 +#define WS2812_PWM_DMA_CHANNEL 3 diff --git a/keyboards/yandrstudio/yr80/config.h b/keyboards/yandrstudio/yr80/config.h index 08e10e243e..71d8e72587 100644 --- a/keyboards/yandrstudio/yr80/config.h +++ b/keyboards/yandrstudio/yr80/config.h @@ -21,5 +21,5 @@ #define WS2812_PWM_DRIVER PWMD3 #define WS2812_PWM_CHANNEL 2 #define WS2812_PWM_PAL_MODE 2 -#define WS2812_DMA_STREAM STM32_DMA1_STREAM3 -#define WS2812_DMA_CHANNEL 3 +#define WS2812_PWM_DMA_STREAM STM32_DMA1_STREAM3 +#define WS2812_PWM_DMA_CHANNEL 3 diff --git a/keyboards/yanghu/unicorne/config.h b/keyboards/yanghu/unicorne/config.h index 99d38fe44a..8e625c6336 100644 --- a/keyboards/yanghu/unicorne/config.h +++ b/keyboards/yanghu/unicorne/config.h @@ -31,6 +31,6 @@ #define WS2812_PWM_DRIVER PWMD3 #define WS2812_PWM_CHANNEL 4 #define WS2812_PWM_PAL_MODE 2 -#define WS2812_DMA_STREAM STM32_DMA1_STREAM2 -#define WS2812_DMA_CHANNEL 5 +#define WS2812_PWM_DMA_STREAM STM32_DMA1_STREAM2 +#define WS2812_PWM_DMA_CHANNEL 5 #define WS2812_EXTERNAL_PULLUP diff --git a/keyboards/ymdk/id75/config.h b/keyboards/ymdk/id75/config.h index 14ed1d644c..cb5ac78304 100644 --- a/keyboards/ymdk/id75/config.h +++ b/keyboards/ymdk/id75/config.h @@ -19,5 +19,5 @@ #define WS2812_PWM_DRIVER PWMD4 #define WS2812_PWM_CHANNEL 4 #define WS2812_PWM_PAL_MODE 2 -#define WS2812_DMA_STREAM STM32_DMA1_STREAM7 -#define WS2812_DMA_CHANNEL 7 +#define WS2812_PWM_DMA_STREAM STM32_DMA1_STREAM7 +#define WS2812_PWM_DMA_CHANNEL 7 diff --git a/keyboards/ymdk/ymd75/rev4/iso/config.h b/keyboards/ymdk/ymd75/rev4/iso/config.h index 58c4b34d61..3a0dddaad8 100644 --- a/keyboards/ymdk/ymd75/rev4/iso/config.h +++ b/keyboards/ymdk/ymd75/rev4/iso/config.h @@ -5,5 +5,5 @@ #define WS2812_PWM_DRIVER PWMD4 #define WS2812_PWM_CHANNEL 4 #define WS2812_PWM_PAL_MODE 2 -#define WS2812_DMA_STREAM STM32_DMA1_STREAM7 -#define WS2812_DMA_CHANNEL 7 +#define WS2812_PWM_DMA_STREAM STM32_DMA1_STREAM7 +#define WS2812_PWM_DMA_CHANNEL 7 diff --git a/keyboards/zvecr/split_blackpill/config.h b/keyboards/zvecr/split_blackpill/config.h index 4173935642..dd26e9ca32 100644 --- a/keyboards/zvecr/split_blackpill/config.h +++ b/keyboards/zvecr/split_blackpill/config.h @@ -20,8 +20,8 @@ #define WS2812_PWM_DRIVER PWMD3 #define WS2812_PWM_CHANNEL 1 -#define WS2812_DMA_STREAM STM32_DMA1_STREAM3 -#define WS2812_DMA_CHANNEL 3 +#define WS2812_PWM_DMA_STREAM STM32_DMA1_STREAM3 +#define WS2812_PWM_DMA_CHANNEL 3 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE diff --git a/keyboards/zvecr/zv48/config.h b/keyboards/zvecr/zv48/config.h index e503f07b80..a67a46a185 100644 --- a/keyboards/zvecr/zv48/config.h +++ b/keyboards/zvecr/zv48/config.h @@ -22,8 +22,8 @@ #define WS2812_PWM_DRIVER PWMD3 #define WS2812_PWM_CHANNEL 4 #define WS2812_PWM_PAL_MODE 2 -#define WS2812_DMA_STREAM STM32_DMA1_STREAM2 -#define WS2812_DMA_CHANNEL 5 +#define WS2812_PWM_DMA_STREAM STM32_DMA1_STREAM2 +#define WS2812_PWM_DMA_CHANNEL 5 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE |