forked from bbulkow/FastLED-idf
Getting very close to compiling.
Current next problem has to do with defining some pins to do different things.
This commit is contained in:
1 parent
5b81ce6431
commit
2e70c9ef5a
10 files changed
+255
-24
No files matched your search
@@ -10,7 +10,9 @@ set(srcs
|
||||
"noise.cpp"
|
||||
"platforms.cpp"
|
||||
"power_mgt.cpp"
|
||||
"wiring.cpp")
|
||||
"wiring.cpp"
|
||||
"hal/esp32-hal-misc.c"
|
||||
)
|
||||
|
||||
# everything needs the ESP32 flag, not sure why this won't work
|
||||
# going to hack by adding the ESP32 define in the h file
|
||||
|
||||
@@ -6,6 +6,9 @@
|
||||
|
||||
// BB hack
|
||||
#define ESP32
|
||||
#define FASTLED_NO_PINMAP
|
||||
|
||||
#include "esp32-hal.h"
|
||||
|
||||
#if (__GNUC__ > 4) || (__GNUC__ == 4 && __GNUC_MINOR__ >= 4)
|
||||
#define FASTLED_HAS_PRAGMA_MESSAGE
|
||||
|
||||
@@ -452,11 +452,20 @@ public:
|
||||
|
||||
CHSVPalette16( const CHSVPalette16& rhs)
|
||||
{
|
||||
memmove8( &(entries[0]), &(rhs.entries[0]), sizeof( entries));
|
||||
for (int i=0;i<16;i++) {
|
||||
entries[i] = rhs.entries[i];
|
||||
}
|
||||
// GCC8+ complains
|
||||
//memmove8( &(entries[0]), &(rhs.entries[0]), sizeof( entries));
|
||||
}
|
||||
CHSVPalette16& operator=( const CHSVPalette16& rhs)
|
||||
{
|
||||
memmove8( &(entries[0]), &(rhs.entries[0]), sizeof( entries));
|
||||
// BB
|
||||
for (int i=0;i<16;i++) {
|
||||
entries[i] = rhs.entries[i];
|
||||
}
|
||||
// GCC8+ complains
|
||||
//memmove8( &(entries[0]), &(rhs.entries[0]), sizeof( entries));
|
||||
return *this;
|
||||
}
|
||||
|
||||
@@ -555,11 +564,19 @@ public:
|
||||
|
||||
CHSVPalette256( const CHSVPalette256& rhs)
|
||||
{
|
||||
memmove8( &(entries[0]), &(rhs.entries[0]), sizeof( entries));
|
||||
for (int i=0;i<256;i++) {
|
||||
entries[i] = rhs.entries[i];
|
||||
}
|
||||
// GCC8 complains
|
||||
//memmove8( &(entries[0]), &(rhs.entries[0]), sizeof( entries));
|
||||
}
|
||||
CHSVPalette256& operator=( const CHSVPalette256& rhs)
|
||||
{
|
||||
memmove8( &(entries[0]), &(rhs.entries[0]), sizeof( entries));
|
||||
for (int i=0;i<256;i++) {
|
||||
entries[i] = rhs.entries[i];
|
||||
}
|
||||
// GCC complains
|
||||
//memmove8( &(entries[0]), &(rhs.entries[0]), sizeof( entries));
|
||||
return *this;
|
||||
}
|
||||
|
||||
@@ -660,20 +677,33 @@ public:
|
||||
|
||||
CRGBPalette16( const CRGBPalette16& rhs)
|
||||
{
|
||||
memmove8( &(entries[0]), &(rhs.entries[0]), sizeof( entries));
|
||||
for (int i=0;i<16;i++) {
|
||||
entries[i] = rhs.entries[i];
|
||||
}
|
||||
// GCC complains class-memaccess
|
||||
//memmove8( &(entries[0]), &(rhs.entries[0]), sizeof( entries));
|
||||
}
|
||||
CRGBPalette16( const CRGB rhs[16])
|
||||
{
|
||||
memmove8( &(entries[0]), &(rhs[0]), sizeof( entries));
|
||||
for (int i=0;i<16;i++) {
|
||||
entries[i] = rhs[i];
|
||||
}
|
||||
//memmove8( &(entries[0]), &(rhs[0]), sizeof( entries));
|
||||
}
|
||||
CRGBPalette16& operator=( const CRGBPalette16& rhs)
|
||||
{
|
||||
memmove8( &(entries[0]), &(rhs.entries[0]), sizeof( entries));
|
||||
for (int i=0;i<16;i++) {
|
||||
entries[i] = rhs.entries[i];
|
||||
}
|
||||
//memmove8( &(entries[0]), &(rhs.entries[0]), sizeof( entries));
|
||||
return *this;
|
||||
}
|
||||
CRGBPalette16& operator=( const CRGB rhs[16])
|
||||
{
|
||||
memmove8( &(entries[0]), &(rhs[0]), sizeof( entries));
|
||||
for (int i=0;i<16;i++) {
|
||||
entries[i] = rhs[i];
|
||||
}
|
||||
// memmove8( &(entries[0]), &(rhs[0]), sizeof( entries));
|
||||
return *this;
|
||||
}
|
||||
|
||||
@@ -928,11 +958,18 @@ public:
|
||||
|
||||
CHSVPalette32( const CHSVPalette32& rhs)
|
||||
{
|
||||
memmove8( &(entries[0]), &(rhs.entries[0]), sizeof( entries));
|
||||
for (int i=0;i<32;i++){
|
||||
entries[i] = rhs.entries[i];
|
||||
}
|
||||
// GCC complains BB
|
||||
//memmove8( &(entries[0]), &(rhs.entries[0]), sizeof( entries));
|
||||
}
|
||||
CHSVPalette32& operator=( const CHSVPalette32& rhs)
|
||||
{
|
||||
memmove8( &(entries[0]), &(rhs.entries[0]), sizeof( entries));
|
||||
for (int i=0;i<32;i++) {
|
||||
entries[i] = rhs.entries[i];
|
||||
}
|
||||
//memmove8( &(entries[0]), &(rhs.entries[0]), sizeof( entries));
|
||||
return *this;
|
||||
}
|
||||
|
||||
@@ -1034,20 +1071,32 @@ public:
|
||||
|
||||
CRGBPalette32( const CRGBPalette32& rhs)
|
||||
{
|
||||
memmove8( &(entries[0]), &(rhs.entries[0]), sizeof( entries));
|
||||
for (int i=0;i<32;i++) {
|
||||
entries[i] = rhs.entries[i];
|
||||
}
|
||||
//memmove8( &(entries[0]), &(rhs.entries[0]), sizeof( entries));
|
||||
}
|
||||
CRGBPalette32( const CRGB rhs[32])
|
||||
{
|
||||
memmove8( &(entries[0]), &(rhs[0]), sizeof( entries));
|
||||
for (int i=0;i<32;i++) {
|
||||
entries[i] = rhs[i];
|
||||
}
|
||||
//memmove8( &(entries[0]), &(rhs[0]), sizeof( entries));
|
||||
}
|
||||
CRGBPalette32& operator=( const CRGBPalette32& rhs)
|
||||
{
|
||||
memmove8( &(entries[0]), &(rhs.entries[0]), sizeof( entries));
|
||||
for (int i=0;i<32;i++) {
|
||||
entries[i] = rhs.entries[i];
|
||||
}
|
||||
//memmove8( &(entries[0]), &(rhs.entries[0]), sizeof( entries));
|
||||
return *this;
|
||||
}
|
||||
CRGBPalette32& operator=( const CRGB rhs[32])
|
||||
{
|
||||
memmove8( &(entries[0]), &(rhs[0]), sizeof( entries));
|
||||
{
|
||||
for (int i=0;i<32;i++) {
|
||||
entries[i] = rhs[i];
|
||||
}
|
||||
//memmove8( &(entries[0]), &(rhs[0]), sizeof( entries));
|
||||
return *this;
|
||||
}
|
||||
|
||||
@@ -1322,20 +1371,32 @@ public:
|
||||
|
||||
CRGBPalette256( const CRGBPalette256& rhs)
|
||||
{
|
||||
memmove8( &(entries[0]), &(rhs.entries[0]), sizeof( entries));
|
||||
for (int i=0;i<256;i++) {
|
||||
entries[i] = rhs.entries[i];
|
||||
}
|
||||
//memmove8( &(entries[0]), &(rhs.entries[0]), sizeof( entries));
|
||||
}
|
||||
CRGBPalette256( const CRGB rhs[256])
|
||||
{
|
||||
memmove8( &(entries[0]), &(rhs[0]), sizeof( entries));
|
||||
for (int i=0;i<256;i++) {
|
||||
entries[i] = rhs[i];
|
||||
}
|
||||
//memmove8( &(entries[0]), &(rhs[0]), sizeof( entries));
|
||||
}
|
||||
CRGBPalette256& operator=( const CRGBPalette256& rhs)
|
||||
{
|
||||
memmove8( &(entries[0]), &(rhs.entries[0]), sizeof( entries));
|
||||
for (int i=0;i<256;i++) {
|
||||
entries[i] = rhs.entries[i];
|
||||
}
|
||||
//memmove8( &(entries[0]), &(rhs.entries[0]), sizeof( entries));
|
||||
return *this;
|
||||
}
|
||||
CRGBPalette256& operator=( const CRGB rhs[256])
|
||||
{
|
||||
memmove8( &(entries[0]), &(rhs[0]), sizeof( entries));
|
||||
for (int i=0;i<256;i++) {
|
||||
entries[i] = rhs[i];
|
||||
}
|
||||
//memmove8( &(entries[0]), &(rhs[0]), sizeof( entries));
|
||||
return *this;
|
||||
}
|
||||
|
||||
|
||||
@@ -61,6 +61,7 @@
|
||||
#include <Arduino.h>
|
||||
#endif
|
||||
|
||||
#define CLKS_PER_US (F_CPU/1000000)
|
||||
// F_CPU is almost certainly not defined BB
|
||||
//#define CLKS_PER_US (F_CPU/1000000)
|
||||
|
||||
#endif
|
||||
@@ -103,7 +103,7 @@ extern "C" {
|
||||
#include "driver/gpio.h"
|
||||
#include "driver/periph_ctrl.h"
|
||||
#include "rom/lldesc.h"
|
||||
#include "esp_intr.h"
|
||||
#include "esp_intr_alloc.h"
|
||||
#include "esp_log.h"
|
||||
|
||||
#ifdef __cplusplus
|
||||
|
||||
@@ -92,7 +92,7 @@ extern "C" {
|
||||
#endif
|
||||
|
||||
#include "esp32-hal.h"
|
||||
#include "esp_intr.h"
|
||||
#include "esp_intr_alloc.h"
|
||||
#include "driver/gpio.h"
|
||||
#include "driver/rmt.h"
|
||||
#include "driver/periph_ctrl.h"
|
||||
|
||||
@@ -1,5 +1,14 @@
|
||||
#pragma once
|
||||
|
||||
// In order to get the GPIO structure, we need
|
||||
// enough of the headers.
|
||||
#include <esp_types.h>
|
||||
#include "esp_err.h"
|
||||
#include "freertos/FreeRTOS.h"
|
||||
#include "freertos/xtensa_api.h"
|
||||
#include "driver/gpio.h"
|
||||
#include "soc/gpio_periph.h"
|
||||
|
||||
FASTLED_NAMESPACE_BEGIN
|
||||
|
||||
template<uint8_t PIN, uint32_t MASK> class _ESPPIN {
|
||||
|
||||
Reference in new issue
Block a user