lunny/qmk_firmware-mirror
1
0
Fork 0
mirror of https://github.com/qmk/qmk_firmware synced 2024-12-22 16:36:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

Change default ARM hardware PWM WS2812 tick frequency to 800kHz (#24508)

Browse Source
This commit is contained in:
David Hoelscher 2024-10-28 01:29:43 -05:00 committed by GitHub
parent 2c0cdcf7b2
commit 7630a80791
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
12 changed files with 11 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
keyboards/bastardkb/charybdis/3x5/blackpill/config.h
View File

@ -29,7 +29,6 @@
#define WS2812_EXTERNAL_PULLUP #define WS2812_EXTERNAL_PULLUP
#define WS2812_PWM_DMA_STREAM STM32_DMA1_STREAM1 #define WS2812_PWM_DMA_STREAM STM32_DMA1_STREAM1
#define WS2812_PWM_DMA_CHANNEL 3 #define WS2812_PWM_DMA_CHANNEL 3
#define WS2812_PWM_TARGET_PERIOD 800000
/* Serial configuration for split keyboard. */ /* Serial configuration for split keyboard. */
#define SERIAL_USART_TX_PIN A9 #define SERIAL_USART_TX_PIN A9

1
keyboards/bastardkb/charybdis/3x6/blackpill/config.h
View File

@ -27,7 +27,6 @@
#define WS2812_EXTERNAL_PULLUP #define WS2812_EXTERNAL_PULLUP
#define WS2812_PWM_DMA_STREAM STM32_DMA1_STREAM1 #define WS2812_PWM_DMA_STREAM STM32_DMA1_STREAM1
#define WS2812_PWM_DMA_CHANNEL 3 #define WS2812_PWM_DMA_CHANNEL 3
#define WS2812_PWM_TARGET_PERIOD 800000
/* Serial configuration for split keyboard. */ /* Serial configuration for split keyboard. */
#define SERIAL_USART_TX_PIN A9 #define SERIAL_USART_TX_PIN A9

1
keyboards/bastardkb/charybdis/4x6/blackpill/config.h
View File

@ -29,7 +29,6 @@
#define WS2812_EXTERNAL_PULLUP #define WS2812_EXTERNAL_PULLUP
#define WS2812_PWM_DMA_STREAM STM32_DMA1_STREAM1 #define WS2812_PWM_DMA_STREAM STM32_DMA1_STREAM1
#define WS2812_PWM_DMA_CHANNEL 3 #define WS2812_PWM_DMA_CHANNEL 3
#define WS2812_PWM_TARGET_PERIOD 800000
/* Serial configuration for split keyboard. */ /* Serial configuration for split keyboard. */
#define SERIAL_USART_TX_PIN A9 #define SERIAL_USART_TX_PIN A9

1
keyboards/bastardkb/scylla/blackpill/config.h
View File

@ -29,7 +29,6 @@
#define WS2812_EXTERNAL_PULLUP #define WS2812_EXTERNAL_PULLUP
#define WS2812_PWM_DMA_STREAM STM32_DMA1_STREAM1 #define WS2812_PWM_DMA_STREAM STM32_DMA1_STREAM1
#define WS2812_PWM_DMA_CHANNEL 3 #define WS2812_PWM_DMA_CHANNEL 3
#define WS2812_PWM_TARGET_PERIOD 800000
/* Serial configuration for split keyboard. */ /* Serial configuration for split keyboard. */
#define SERIAL_USART_TX_PIN A9 #define SERIAL_USART_TX_PIN A9

1
keyboards/bastardkb/skeletyl/blackpill/config.h
View File

@ -29,7 +29,6 @@
#define WS2812_EXTERNAL_PULLUP #define WS2812_EXTERNAL_PULLUP
#define WS2812_PWM_DMA_STREAM STM32_DMA1_STREAM1 #define WS2812_PWM_DMA_STREAM STM32_DMA1_STREAM1
#define WS2812_PWM_DMA_CHANNEL 3 #define WS2812_PWM_DMA_CHANNEL 3
#define WS2812_PWM_TARGET_PERIOD 800000
/* Serial configuration for split keyboard. */ /* Serial configuration for split keyboard. */
#define SERIAL_USART_TX_PIN A9 #define SERIAL_USART_TX_PIN A9

1
keyboards/bastardkb/tbkmini/blackpill/config.h
View File

@ -29,7 +29,6 @@
#define WS2812_EXTERNAL_PULLUP #define WS2812_EXTERNAL_PULLUP
#define WS2812_PWM_DMA_STREAM STM32_DMA1_STREAM1 #define WS2812_PWM_DMA_STREAM STM32_DMA1_STREAM1
#define WS2812_PWM_DMA_CHANNEL 3 #define WS2812_PWM_DMA_CHANNEL 3
#define WS2812_PWM_TARGET_PERIOD 800000
/* Serial configuration for split keyboard. */ /* Serial configuration for split keyboard. */
#define SERIAL_USART_TX_PIN A9 #define SERIAL_USART_TX_PIN A9

1
keyboards/handwired/macroboard/config.h
View File

@ -22,4 +22,3 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define WS2812_PWM_PAL_MODE 2 #define WS2812_PWM_PAL_MODE 2
#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_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_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

1
keyboards/handwired/tractyl_manuform/5x6_right/f411/config.h
View File

@ -28,7 +28,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
//#define WS2812_PWM_COMPLEMENTARY_OUTPUT // Define for a complementary timer output (TIMx_CHyN); omit for a normal timer output (TIMx_CHy). //#define WS2812_PWM_COMPLEMENTARY_OUTPUT // Define for a complementary timer output (TIMx_CHyN); omit for a normal timer output (TIMx_CHy).
#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_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_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 #define DEBUG_LED_PIN C13

3
keyboards/mode/m60h/config.h
View File

@ -6,5 +6,4 @@
#define WS2812_PWM_DRIVER PWMD4 #define WS2812_PWM_DRIVER PWMD4
#define WS2812_PWM_CHANNEL 4 #define WS2812_PWM_CHANNEL 4
#define WS2812_PWM_DMA_STREAM STM32_DMA1_STREAM6 #define WS2812_PWM_DMA_STREAM STM32_DMA1_STREAM6
#define WS2812_PWM_DMA_CHANNEL 2 #define WS2812_PWM_DMA_CHANNEL 2
#define WS2812_PWM_TARGET_PERIOD 800000

3
keyboards/mode/m60h_f/config.h
View File

@ -6,5 +6,4 @@
#define WS2812_PWM_DRIVER PWMD4 #define WS2812_PWM_DRIVER PWMD4
#define WS2812_PWM_CHANNEL 4 #define WS2812_PWM_CHANNEL 4
#define WS2812_PWM_DMA_STREAM STM32_DMA1_STREAM6 #define WS2812_PWM_DMA_STREAM STM32_DMA1_STREAM6
#define WS2812_PWM_DMA_CHANNEL 2 #define WS2812_PWM_DMA_CHANNEL 2
#define WS2812_PWM_TARGET_PERIOD 800000

3
keyboards/mode/m60s/config.h
View File

@ -6,5 +6,4 @@
#define WS2812_PWM_DRIVER PWMD4 #define WS2812_PWM_DRIVER PWMD4
#define WS2812_PWM_CHANNEL 4 #define WS2812_PWM_CHANNEL 4
#define WS2812_PWM_DMA_STREAM STM32_DMA1_STREAM6 #define WS2812_PWM_DMA_STREAM STM32_DMA1_STREAM6
#define WS2812_PWM_DMA_CHANNEL 2 #define WS2812_PWM_DMA_CHANNEL 2
#define WS2812_PWM_TARGET_PERIOD 800000

37
platforms/chibios/drivers/ws2812_pwm.c
View File

@ -79,15 +79,15 @@
# endif # endif
#endif #endif
#ifndef WS2812_PWM_TARGET_PERIOD // Default is 800000Hz, which has a period of 1.25us
//# define WS2812_PWM_TARGET_PERIOD 800000 // Original code is 800k...? #ifndef WS2812_PWM_FREQUENCY
# define WS2812_PWM_TARGET_PERIOD 80000 // TODO: work out why 10x less on f303/f4x1 # define WS2812_PWM_FREQUENCY (1000000000 / WS2812_TIMING)
#endif #endif
/* --- PRIVATE CONSTANTS ---------------------------------------------------- */ /* --- PRIVATE CONSTANTS ---------------------------------------------------- */
#define WS2812_PWM_FREQUENCY (CPU_CLOCK / 2) /**< Clock frequency of PWM, must be valid with respect to system clock! */ #define WS2812_PWM_TICK_FREQUENCY (CPU_CLOCK / 2) /**< Clock frequency of PWM ticks, must be valid with respect to system clock! */
#define WS2812_PWM_PERIOD (WS2812_PWM_FREQUENCY / WS2812_PWM_TARGET_PERIOD) /**< Clock period in ticks. 1 / 800kHz = 1.25 uS (as per datasheet) */ #define WS2812_PWM_PERIOD (WS2812_PWM_TICK_FREQUENCY / WS2812_PWM_FREQUENCY) /**< Clock period in PWM ticks. */
/** /**
* @brief Number of bit-periods to hold the data line low at the end of a frame * @brief Number of bit-periods to hold the data line low at the end of a frame
@ -102,37 +102,16 @@
/** /**
* @brief High period for a zero, in ticks * @brief High period for a zero, in ticks
*
* Per the datasheet:
* WS2812:
* - T0H: 200 nS to 500 nS, inclusive
* - T0L: 650 nS to 950 nS, inclusive
* WS2812B:
* - T0H: 200 nS to 500 nS, inclusive
* - T0L: 750 nS to 1050 nS, inclusive
*
* The duty cycle is calculated for a high period of 350 nS.
*/ */
#define WS2812_DUTYCYCLE_0 (WS2812_PWM_FREQUENCY / (1000000000 / 350)) #define WS2812_DUTYCYCLE_0 (WS2812_PWM_TICK_FREQUENCY / (1000000000 / WS2812_T0H))
#if (WS2812_DUTYCYCLE_0 > 255) #if (WS2812_DUTYCYCLE_0 > 255)
# error WS2812 PWM driver: High period for a 0 is more than a byte # error WS2812 PWM driver: High period for a 0 is more than a byte
#endif #endif
/** /**
* @brief High period for a one, in ticks * @brief High period for a one, in ticks
*
* Per the datasheet:
* WS2812:
* - T1H: 550 nS to 850 nS, inclusive
* - T1L: 450 nS to 750 nS, inclusive
* WS2812B:
* - T1H: 750 nS to 1050 nS, inclusive
* - T1L: 200 nS to 500 nS, inclusive
*
* The duty cycle is calculated for a high period of 800 nS.
* This is in the middle of the specifications of the WS2812 and WS2812B.
*/ */
#define WS2812_DUTYCYCLE_1 (WS2812_PWM_FREQUENCY / (1000000000 / 800)) #define WS2812_DUTYCYCLE_1 (WS2812_PWM_TICK_FREQUENCY / (1000000000 / WS2812_T1H))
#if (WS2812_DUTYCYCLE_1 > 255) #if (WS2812_DUTYCYCLE_1 > 255)
# error WS2812 PWM driver: High period for a 1 is more than a byte # error WS2812 PWM driver: High period for a 1 is more than a byte
#endif #endif
@ -322,7 +301,7 @@ void ws2812_init(void) {
// PWM Configuration // PWM Configuration
//#pragma GCC diagnostic ignored "-Woverride-init" // Turn off override-init warning for this struct. We use the overriding ability to set a "default" channel config //#pragma GCC diagnostic ignored "-Woverride-init" // Turn off override-init warning for this struct. We use the overriding ability to set a "default" channel config
static const PWMConfig ws2812_pwm_config = { static const PWMConfig ws2812_pwm_config = {
.frequency = WS2812_PWM_FREQUENCY, .frequency = WS2812_PWM_TICK_FREQUENCY,
.period = WS2812_PWM_PERIOD, // Mit dieser Periode wird UDE-Event erzeugt und ein neuer Wert (Länge WS2812_BIT_N) vom DMA ins CCR geschrieben .period = WS2812_PWM_PERIOD, // Mit dieser Periode wird UDE-Event erzeugt und ein neuer Wert (Länge WS2812_BIT_N) vom DMA ins CCR geschrieben
.callback = NULL, .callback = NULL,
.channels = .channels =