diff options
Diffstat (limited to 'drivers/avr')
-rw-r--r-- | drivers/avr/ws2812.c | 20 | ||||
-rw-r--r-- | drivers/avr/ws2812.h | 40 |
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 @@ | |||
36 | 36 | ||
37 | static inline void ws2812_sendarray_mask(uint8_t *data, uint16_t datlen, uint8_t masklo, uint8_t maskhi); | 37 | static inline void ws2812_sendarray_mask(uint8_t *data, uint16_t datlen, uint8_t masklo, uint8_t maskhi); |
38 | 38 | ||
39 | // Setleds for standard RGB | 39 | void ws2812_setleds(LED_TYPE *ledarray, uint16_t number_of_leds) { |
40 | void inline ws2812_setleds(LED_TYPE *ledarray, uint16_t number_of_leds) { | 40 | DDRx_ADDRESS(RGB_DI_PIN) |= pinmask(RGB_DI_PIN); |
41 | // wrap up usage of RGB_DI_PIN | ||
42 | ws2812_setleds_pin(ledarray, number_of_leds, RGB_DI_PIN); | ||
43 | } | ||
44 | |||
45 | void ws2812_setleds_pin(LED_TYPE *ledarray, uint16_t number_of_leds, uint8_t pin) { | ||
46 | DDRx_ADDRESS(RGB_DI_PIN) |= pinmask(pin); | ||
47 | 41 | ||
48 | uint8_t masklo = ~(pinmask(pin)) & PORTx_ADDRESS(pin); | 42 | uint8_t masklo = ~(pinmask(RGB_DI_PIN)) & PORTx_ADDRESS(RGB_DI_PIN); |
49 | uint8_t maskhi = pinmask(pin) | PORTx_ADDRESS(pin); | 43 | uint8_t maskhi = pinmask(RGB_DI_PIN) | PORTx_ADDRESS(RGB_DI_PIN); |
50 | 44 | ||
51 | ws2812_sendarray_mask((uint8_t *)ledarray, number_of_leds * sizeof(LED_TYPE), masklo, maskhi); | 45 | ws2812_sendarray_mask((uint8_t *)ledarray, number_of_leds * sizeof(LED_TYPE), masklo, maskhi); |
52 | 46 | ||
53 | #ifdef RGBW | 47 | _delay_us(WS2812_TRST_US); |
54 | _delay_us(80); | ||
55 | #else | ||
56 | _delay_us(50); | ||
57 | #endif | ||
58 | } | 48 | } |
59 | 49 | ||
60 | /* | 50 | /* |
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 @@ | |||
1 | /* | ||
2 | * light weight WS2812 lib include | ||
3 | * | ||
4 | * Version 2.3 - Nev 29th 2015 | ||
5 | * Author: Tim (cpldcpu@gmail.com) | ||
6 | * | ||
7 | * Please do not change this file! All configuration is handled in "ws2812_config.h" | ||
8 | * | ||
9 | * This program is free software: you can redistribute it and/or modify | ||
10 | * it under the terms of the GNU General Public License as published by | ||
11 | * the Free Software Foundation, either version 2 of the License, or | ||
12 | * (at your option) any later version. | ||
13 | * | ||
14 | * This program is distributed in the hope that it will be useful, | ||
15 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
16 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
17 | * GNU General Public License for more details. | ||
18 | * | ||
19 | * You should have received a copy of the GNU General Public License | ||
20 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | ||
21 | */ | ||
22 | |||
23 | #pragma once | ||
24 | |||
25 | #include "quantum/color.h" | ||
26 | |||
27 | /* User Interface | ||
28 | * | ||
29 | * Input: | ||
30 | * ledarray: An array of GRB data describing the LED colors | ||
31 | * number_of_leds: The number of LEDs to write | ||
32 | * pin (optional): A pin_t definition for the line to drive | ||
33 | * | ||
34 | * The functions will perform the following actions: | ||
35 | * - Set the data-out pin as output | ||
36 | * - Send out the LED data | ||
37 | * - Wait 50us to reset the LEDs | ||
38 | */ | ||
39 | void ws2812_setleds(LED_TYPE *ledarray, uint16_t number_of_leds); | ||
40 | void ws2812_setleds_pin(LED_TYPE *ledarray, uint16_t number_of_leds, uint8_t pin); | ||