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

Fix Esp32 Warnings (#218)

Browse Source
This commit is contained in:
Michael Miller
2018-08-12 09:54:03 -07:00
committed by GitHub
parent f2316eee7f
commit 399b10b740
2 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/internal/Esp32_i2s.c
View File

@@ -393,7 +393,9 @@ esp_err_t i2sSetSampleRate(uint8_t bus_num, uint32_t rate, uint8_t bits) {
double denom = (double)1 / 63; double denom = (double)1 / 63;
int channel = 2; int channel = 2;
double mclk, clkmdiv; // double mclk;
double clkmdiv;
int factor; int factor;
if (bits == 8) { if (bits == 8) {
@@ -413,11 +415,11 @@ esp_err_t i2sSetSampleRate(uint8_t bus_num, uint32_t rate, uint8_t bits) {
clkmDecimals = ((clkmdiv - clkmInteger) / denom); clkmDecimals = ((clkmdiv - clkmInteger) / denom);
if (bits == 8) { if (bits == 8) {
mclk = rate* factor; // mclk = rate* factor;
bck = 60; bck = 60;
bits = 16; bits = 16;
} else { } else {
mclk = (double)clkmInteger + (denom* clkmDecimals); // mclk = (double)clkmInteger + (denom* clkmDecimals);
bck = factor/(bits* channel); bck = factor/(bits* channel);
} }

4
src/internal/NeoEspBitBangMethod.h
View File

@@ -121,7 +121,7 @@ public:
delay(1); // required delay(1); // required
portMUX_TYPE updateMux = portMUX_INITIALIZER_UNLOCKED; portMUX_TYPE updateMux = portMUX_INITIALIZER_UNLOCKED;
taskENTER_CRITICAL(&updateMux); portENTER_CRITICAL(&updateMux);
#else #else
noInterrupts(); noInterrupts();
#endif #endif
@@ -129,7 +129,7 @@ public:
T_SPEED::send_pixels(_pixels, _pixels + _sizePixels, _pin); T_SPEED::send_pixels(_pixels, _pixels + _sizePixels, _pin);
#if defined(ARDUINO_ARCH_ESP32) #if defined(ARDUINO_ARCH_ESP32)
taskEXIT_CRITICAL(&updateMux); portEXIT_CRITICAL(&updateMux);
#else #else
interrupts(); interrupts();
#endif #endif