feedc0de/NeoPixelBus
1
0
Fork 0
forked from Makuna/NeoPixelBus
Code Pull Requests Activity

Reasonable with Glitches

Browse Source
This commit is contained in:
Makuna
2015-05-01 12:12:53 -07:00
parent 3853080e4e
commit 70816eeb52
3 changed files with 56 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

77
NeoPixelBus.cpp
View File

@@ -76,16 +76,57 @@ void NeoPixelBus::Begin(void)
#if defined(ESP8266) #if defined(ESP8266)
#pragma optimize( "", off ) #pragma optimize( "", off )
void send_ws_0_800(uint8_t gpio) { void ICACHE_FLASH_ATTR send_ws_0_800(uint32_t pinRegister) {
uint8_t i; uint8_t i;
i = 4; while (i--) GPIO_REG_WRITE(GPIO_OUT_W1TS_ADDRESS, 1 << gpio);
i = 6; while (i--) GPIO_REG_WRITE(GPIO_OUT_W1TC_ADDRESS, 1 << gpio); i = 4; while (i--) GPIO_REG_WRITE(GPIO_OUT_W1TS_ADDRESS, pinRegister);
i = 6; while (i--) GPIO_REG_WRITE(GPIO_OUT_W1TC_ADDRESS, pinRegister);
} }
void send_ws_1_800(uint8_t gpio) { void ICACHE_FLASH_ATTR send_ws_1_800(uint32_t pinRegister) {
uint8_t i; uint8_t i;
i = 9; while (i--) GPIO_REG_WRITE(GPIO_OUT_W1TS_ADDRESS, 1 << gpio);
i = 2; while (i--) GPIO_REG_WRITE(GPIO_OUT_W1TC_ADDRESS, 1 << gpio); i = 8; while (i--) GPIO_REG_WRITE(GPIO_OUT_W1TS_ADDRESS, pinRegister);
i = 1; while (i--) GPIO_REG_WRITE(GPIO_OUT_W1TC_ADDRESS, pinRegister);
}
//void ICACHE_FLASH_ATTR send_subpix_800(uint8_t subpix, uint8_t pin)
//{
// uint8_t mask;
// for (mask = 0x80; mask; mask >>= 1)
// {
// if (subpix & mask)
// {
// send_ws_1_800(pin);
// }
// else
// {
// send_ws_0_800(pin);
// }
// }
//}
void ICACHE_FLASH_ATTR send_pixels_800(uint8_t* pixels, uint8_t* end, uint8_t pin)
{
uint8_t mask;
uint8_t subpix;
uint32_t pinRegister = _BV(pin);
while (pixels < end)
{
subpix = *pixels++;
for (mask = 0x80; mask; mask >>= 1)
{
if (subpix & mask)
{
send_ws_1_800(pinRegister);
}
else
{
send_ws_0_800(pinRegister);
}
}
}
} }
void send_ws_0_400(uint8_t gpio) { void send_ws_0_400(uint8_t gpio) {
@@ -747,21 +788,11 @@ void NeoPixelBus::Show(void)
{ {
#endif #endif
// 800 KHz bitstream // 800 KHz bitstream
while (p < end) send_pixels_800(p, end, _pin);
{ //while (p < end)
uint8_t subpix = *p++; //{
for (uint8_t mask = 0x80; mask; mask >>= 1) // send_subpix_800(*p++, _pin);
{ //}
if (subpix & mask)
{
send_ws_1_800(_pin);
}
else
{
send_ws_0_800(_pin);
}
}
}
#ifdef INCLUDE_NEO_KHZ400_SUPPORT #ifdef INCLUDE_NEO_KHZ400_SUPPORT
} }
else else
@@ -769,8 +800,8 @@ void NeoPixelBus::Show(void)
// 400 kHz bitstream // 400 kHz bitstream
while (p < end) while (p < end)
{ {
uint8_t subpix = *p++; subpix = *p++;
for (uint8_t mask = 0x80; mask; mask >>= 1) for (mask = 0x80; mask; mask >>= 1)
{ {
if (subpix & mask) if (subpix & mask)
{ {

11
NeoPixelBus.h
View File

@@ -15,17 +15,9 @@ You should have received a copy of the GNU Lesser General Public
License along with NeoPixel. If not, see License along with NeoPixel. If not, see
<http://www.gnu.org/licenses/>. <http://www.gnu.org/licenses/>.
--------------------------------------------------------------------*/ --------------------------------------------------------------------*/
#pragma once
#ifndef NEOPIXELBUS_H
#define NEOPIXELBUS_H
#if (ARDUINO >= 100)
#include <Arduino.h> #include <Arduino.h>
#else
#include <WProgram.h>
#include <pins_arduino.h>
#endif
#include "RgbColor.h" #include "RgbColor.h"
// '_flagsPixels' flags for LED _pixels (third parameter to constructor): // '_flagsPixels' flags for LED _pixels (third parameter to constructor):
@@ -125,4 +117,3 @@ private:
}; };
#endif // NEOPIXELBUS_H

11
RgbColor.h
View File

@@ -13,16 +13,9 @@ You should have received a copy of the GNU Lesser General Public
License along with NeoPixel. If not, see License along with NeoPixel. If not, see
<http://www.gnu.org/licenses/>. <http://www.gnu.org/licenses/>.
--------------------------------------------------------------------*/ --------------------------------------------------------------------*/
#pragma once
#ifndef RGBCOLOR_H
#define RGBCOLOR_H
#if (ARDUINO >= 100)
#include <Arduino.h> #include <Arduino.h>
#else
#include <WProgram.h>
#include <pins_arduino.h>
#endif
// ------------------------------------------------------------------------ // ------------------------------------------------------------------------
// RgbColor represents a color object that is represented by Red, Green, Blue // RgbColor represents a color object that is represented by Red, Green, Blue
@@ -95,5 +88,3 @@ struct RgbColor
uint8_t B; uint8_t B;
}; };
#endif // RGBCOLOR_H