Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Feature/magic wand integration #31

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Feature/magic wand integration #31

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
45d28a4
this CmakeLists.txt inteferes with using as a component
jrluppold Jul 30, 2021
d36effc
Use RMT not I2S to drive neopixels
jrluppold Jul 30, 2021
c65386e
do not include functions already defined in mw
jrluppold Nov 4, 2021
ebe44f6
undef DEFINED_IN_MPID_ESP32 so fastled can call millis()
robert-alfaro Jul 13, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 0 additions & 6 deletions CMakeLists.txt
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion components/FastLED-idf/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ set(srcs
"hal/esp32-hal-misc.c"
"hal/esp32-hal-gpio.c"
# remove the following if you want I2S instead of RMT hardware, just put a pound in front
# "platforms/esp/32/clockless_rmt_esp32.cpp"
"platforms/esp/32/clockless_rmt_esp32.cpp"
)

# everything needs the ESP32 flag, not sure why this won't work
Expand Down
2 changes: 1 addition & 1 deletion components/FastLED-idf/FastLED.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@

// prefer I2S? Comment this in.
// Not the default because haven't tried it as much, does work
#define FASTLED_ESP32_I2S
//#define FASTLED_ESP32_I2S

#include "esp32-hal.h"

Expand Down
6 changes: 5 additions & 1 deletion components/FastLED-idf/hal/esp32-hal-misc.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,8 @@
//Source: https://github.com/pcbreflux/espressif/blob/master/esp32/arduino/sketchbook/ESP32_int_temp_sensor/ESP32_int_temp_sensor.ino
uint8_t temprature_sens_read();

//#define DEFINED_IN_MPID_ESP32
#ifndef DEFINED_IN_MPID_ESP32
float temperatureRead()
{
return (temprature_sens_read() - 32) / 1.8;
Expand All @@ -51,6 +53,7 @@ void __yield()
}

void yield() __attribute__ ((weak, alias("__yield")));
#endif

#if 0

Expand Down Expand Up @@ -136,6 +139,7 @@ BaseType_t xTaskCreateUniversal( TaskFunction_t pxTaskCode,

#endif // test, don't think these are needed

#ifndef DEFINED_IN_MPID_ESP32
unsigned long IRAM_ATTR micros()
{
return (unsigned long) (esp_timer_get_time());
Expand All @@ -160,5 +164,5 @@ void IRAM_ATTR delayMicroseconds(uint32_t us)
} while ((esp_timer_get_time() - now) < us);
}
}

#endif