Moved to external cpp file

This commit is contained in:
Andrew Melvin
2015-08-26 17:36:32 +01:00
parent 6a669f9390
commit e620850707
4 changed files with 72 additions and 0 deletions

View File

@@ -42,11 +42,14 @@ License along with NeoPixel. If not, see
#define UART_INV_MASK (0x3f<<19)
#define UART 1
extern void ICACHE_RAM_ATTR send_pixels_UART(uint8_t* pixels, uint8_t* end);
#else
// due to linker overriding the ICACHE_RAM_ATTR for cpp files, these methods are
// moved into a C file so the attribute will be applied correctly
extern "C" void ICACHE_RAM_ATTR send_pixels_800(uint8_t* pixels, uint8_t* end, uint8_t pin);
extern "C" void ICACHE_RAM_ATTR send_pixels_400(uint8_t* pixels, uint8_t* end, uint8_t pin);
#endif
#endif
@@ -782,6 +785,8 @@ void NeoPixelBus::Show(void)
send_pixels_800(p, end, _pin);
#else
send_pixels_UART(p, end);
char buff[4];
do

View File

@@ -37,6 +37,7 @@ License along with NeoPixel. If not, see
// NeoPixelBus library include to support the slower bus speeds
//#define INCLUDE_NEO_KHZ400_SUPPORT
class NeoPixelBus
{
public:

View File

@@ -36,6 +36,18 @@ inline uint32_t _getCycleCount()
#define CYCLES_400_T1H (F_CPU / 833333)
#define CYCLES_400 (F_CPU / 400000)
#define UART_INV_MASK (0x3f<<19)
#define UART 1
#include "eagle_soc.h"
#include "uart_register.h"
const char data[4] = { 0b00110111, 0b00000111, 0b00110100, 0b00000100 };
void ICACHE_RAM_ATTR send_pixels_800(uint8_t* pixels, uint8_t* end, uint8_t pin)
{
const uint32_t pinRegister = _BV(pin);

54
NeoPixelesp8266uart.cpp Normal file
View File

@@ -0,0 +1,54 @@
/*
NeoPixelEsp8266.h - NeoPixel library helper functions for Esp8266 using cycle count
Copyright (c) 2015 Michael C. Miller. All right reserved.
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
License as published by the Free Software Foundation; either
version 2.1 of the License, or (at your option) any later version.
This library 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
Lesser General Public License for more details.
You should have received a copy of the GNU Lesser General Public
License along with this library; if not, write to the Free Software
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
#include <Arduino.h>
#include <eagle_soc.h>
#include "uart_register.h"
#if defined(ESP8266)
#define UART_INV_MASK (0x3f<<19)
#define UART 1
const char data[4] = { 0b00110111, 0b00000111, 0b00110100, 0b00000100 };
void ICACHE_RAM_ATTR send_pixels_UART(uint8_t* pixels, uint8_t* end)
{
char buff[4];
do
{
uint8_t subpix = *pixels++;
buff[0] = data[(subpix >> 6) & 3];
buff[1] = data[(subpix >> 4) & 3];
buff[2] = data[(subpix >> 2) & 3];
buff[3] = data[subpix & 3];
Serial1.write(buff, sizeof(buff));
} while (pixels < end);
}
#endif