aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/avr
diff options
context:
space:
mode:
authorJoshua Diamond <josh@windowoffire.com>2020-06-19 22:59:28 -0400
committerGitHub <noreply@github.com>2020-06-20 12:59:28 +1000
commit18e561b82cdb71bed0162b3ce4083a2d269e5336 (patch)
tree6e016ac5a1e8cbca871b04646e477307dc366280 /drivers/avr
parentc7851484457e5ab604962ae7c914b863b8de0cb2 (diff)
downloadfirmware-18e561b82cdb71bed0162b3ce4083a2d269e5336.tar.gz
firmware-18e561b82cdb71bed0162b3ce4083a2d269e5336.tar.bz2
firmware-18e561b82cdb71bed0162b3ce4083a2d269e5336.zip
Fix incorrect delay when setting WS2812 (and similar) leds (#9302)
* Fix incorrect delay when setting WS2812 (and similar) leds * Add documentation for WS2812_DELAY_MICROSECONDS * Remove improper cast to uint8_t Co-authored-by: Sergey Vlasov <sigprof@gmail.com> * Remove unneeded cast to uint8_t and correct math Co-authored-by: Sergey Vlasov <sigprof@gmail.com> * microseconds -> µs Co-authored-by: Ryan <fauxpark@gmail.com> * Make documentation better match the spec sheet. Co-authored-by: Ryan <fauxpark@gmail.com> * Rename macro to match spec sheet * Further correction to the delay maths for the SPI case. Co-authored-by: Joel Challis <git@zvecr.com> * Move ws2812_common.h to the drivers directory * Revert "Further correction to the delay maths for the SPI case." This reverts commit e61b56a2cfc7dfec9992a7a3af92afa50e5b8ec0. * Remove ws2812_setleds_pin(); consolidate ws2812.h Co-authored-by: Sergey Vlasov <sigprof@gmail.com> Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: Joel Challis <git@zvecr.com>
Diffstat (limited to 'drivers/avr')
-rw-r--r--drivers/avr/ws2812.c20
-rw-r--r--drivers/avr/ws2812.h40
2 files changed, 5 insertions, 55 deletions
diff --git a/drivers/avr/ws2812.c b/drivers/avr/ws2812.c
index 5c3d72dcb..dd2ef8991 100644
--- a/drivers/avr/ws2812.c
+++ b/drivers/avr/ws2812.c
@@ -36,25 +36,15 @@
static inline void ws2812_sendarray_mask(uint8_t *data, uint16_t datlen, uint8_t masklo, uint8_t maskhi);
-// Setleds for standard RGB
-void inline ws2812_setleds(LED_TYPE *ledarray, uint16_t number_of_leds) {
- // wrap up usage of RGB_DI_PIN
- ws2812_setleds_pin(ledarray, number_of_leds, RGB_DI_PIN);
-}
-
-void ws2812_setleds_pin(LED_TYPE *ledarray, uint16_t number_of_leds, uint8_t pin) {
- DDRx_ADDRESS(RGB_DI_PIN) |= pinmask(pin);
+void ws2812_setleds(LED_TYPE *ledarray, uint16_t number_of_leds) {
+ DDRx_ADDRESS(RGB_DI_PIN) |= pinmask(RGB_DI_PIN);
- uint8_t masklo = ~(pinmask(pin)) & PORTx_ADDRESS(pin);
- uint8_t maskhi = pinmask(pin) | PORTx_ADDRESS(pin);
+ uint8_t masklo = ~(pinmask(RGB_DI_PIN)) & PORTx_ADDRESS(RGB_DI_PIN);
+ uint8_t maskhi = pinmask(RGB_DI_PIN) | PORTx_ADDRESS(RGB_DI_PIN);
ws2812_sendarray_mask((uint8_t *)ledarray, number_of_leds * sizeof(LED_TYPE), masklo, maskhi);
-#ifdef RGBW
- _delay_us(80);
-#else
- _delay_us(50);
-#endif
+ _delay_us(WS2812_TRST_US);
}
/*
diff --git a/drivers/avr/ws2812.h b/drivers/avr/ws2812.h
deleted file mode 100644
index 88eb08189..000000000
--- a/drivers/avr/ws2812.h
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * light weight WS2812 lib include
- *
- * Version 2.3 - Nev 29th 2015
- * Author: Tim (cpldcpu@gmail.com)
- *
- * Please do not change this file! All configuration is handled in "ws2812_config.h"
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum/color.h"
-
-/* User Interface
- *
- * Input:
- * ledarray: An array of GRB data describing the LED colors
- * number_of_leds: The number of LEDs to write
- * pin (optional): A pin_t definition for the line to drive
- *
- * The functions will perform the following actions:
- * - Set the data-out pin as output
- * - Send out the LED data
- * - Wait 50us to reset the LEDs
- */
-void ws2812_setleds(LED_TYPE *ledarray, uint16_t number_of_leds);
-void ws2812_setleds_pin(LED_TYPE *ledarray, uint16_t number_of_leds, uint8_t pin);