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

Esp32 Fixes (#366)

Browse Source 
Fix improper ifdef/else/endif
DRAM_ATTR on ISR const data
ISR allows LEVEL1 int
This commit is contained in:
Michael Miller
2020-08-29 11:55:44 -07:00
committed by GitHub
parent 23751b1c6d
commit 5e205c8814
2 changed files with 47 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/internal/Esp32_i2s.c
View File

@ -256,11 +256,11 @@ void i2sSetPins(uint8_t bus_num, int8_t out, bool invert) {
i2sSignal = I2S1O_DATA_OUT23_IDX; i2sSignal = I2S1O_DATA_OUT23_IDX;
} }
else else
#else #endif
{ {
i2sSignal = I2S0O_DATA_OUT23_IDX; i2sSignal = I2S0O_DATA_OUT23_IDX;
} }
#endif
gpio_matrix_out(out, i2sSignal, invert, false); gpio_matrix_out(out, i2sSignal, invert, false);
} }
} else if (I2S[bus_num].out >= 0) { } else if (I2S[bus_num].out >= 0) {
@ -374,11 +374,11 @@ void i2sInit(uint8_t bus_num, uint32_t bits_per_sample, uint32_t sample_rate, i2
i2sIntSource = ETS_I2S1_INTR_SOURCE; i2sIntSource = ETS_I2S1_INTR_SOURCE;
} }
else else
#else #endif
{ {
i2sIntSource = ETS_I2S0_INTR_SOURCE; i2sIntSource = ETS_I2S0_INTR_SOURCE;
} }
#endif
esp_intr_alloc(i2sIntSource, ESP_INTR_FLAG_IRAM | ESP_INTR_FLAG_LEVEL1, &i2sDmaISR, &I2S[bus_num], &I2S[bus_num].isr_handle); esp_intr_alloc(i2sIntSource, ESP_INTR_FLAG_IRAM | ESP_INTR_FLAG_LEVEL1, &i2sDmaISR, &I2S[bus_num], &I2S[bus_num].isr_handle);
// enable send intr // enable send intr

86
src/internal/NeoEsp32RmtMethod.h
View File

@ -110,9 +110,9 @@ public:
class NeoEsp32RmtSpeedWs2811 : public NeoEsp32RmtSpeedBase class NeoEsp32RmtSpeedWs2811 : public NeoEsp32RmtSpeedBase
{ {
public: public:
const static uint32_t RmtBit0 = Item32Val(300, 950); const static DRAM_ATTR uint32_t RmtBit0 = Item32Val(300, 950);
const static uint32_t RmtBit1 = Item32Val(900, 350); const static DRAM_ATTR uint32_t RmtBit1 = Item32Val(900, 350);
const static uint16_t RmtDurationReset = FromNs(300000); // 300us const static DRAM_ATTR uint16_t RmtDurationReset = FromNs(300000); // 300us
static void IRAM_ATTR Translate(const void* src, static void IRAM_ATTR Translate(const void* src,
rmt_item32_t* dest, rmt_item32_t* dest,
@ -125,9 +125,9 @@ public:
class NeoEsp32RmtSpeedWs2812x : public NeoEsp32RmtSpeedBase class NeoEsp32RmtSpeedWs2812x : public NeoEsp32RmtSpeedBase
{ {
public: public:
const static uint32_t RmtBit0 = Item32Val(400, 850); const static DRAM_ATTR uint32_t RmtBit0 = Item32Val(400, 850);
const static uint32_t RmtBit1 = Item32Val(800, 450); const static DRAM_ATTR uint32_t RmtBit1 = Item32Val(800, 450);
const static uint16_t RmtDurationReset = FromNs(300000); // 300us const static DRAM_ATTR uint16_t RmtDurationReset = FromNs(300000); // 300us
static void IRAM_ATTR Translate(const void* src, static void IRAM_ATTR Translate(const void* src,
rmt_item32_t* dest, rmt_item32_t* dest,
@ -140,9 +140,9 @@ public:
class NeoEsp32RmtSpeedSk6812 : public NeoEsp32RmtSpeedBase class NeoEsp32RmtSpeedSk6812 : public NeoEsp32RmtSpeedBase
{ {
public: public:
const static uint32_t RmtBit0 = Item32Val(400, 850); const static DRAM_ATTR uint32_t RmtBit0 = Item32Val(400, 850);
const static uint32_t RmtBit1 = Item32Val(800, 450); const static DRAM_ATTR uint32_t RmtBit1 = Item32Val(800, 450);
const static uint16_t RmtDurationReset = FromNs(80000); // 80us const static DRAM_ATTR uint16_t RmtDurationReset = FromNs(80000); // 80us
static void IRAM_ATTR Translate(const void* src, static void IRAM_ATTR Translate(const void* src,
rmt_item32_t* dest, rmt_item32_t* dest,
@ -156,9 +156,9 @@ public:
class NeoEsp32RmtSpeedTm1814 : public NeoEsp32RmtInvertedSpeedBase class NeoEsp32RmtSpeedTm1814 : public NeoEsp32RmtInvertedSpeedBase
{ {
public: public:
const static uint32_t RmtBit0 = Item32Val(360, 890); const static DRAM_ATTR uint32_t RmtBit0 = Item32Val(360, 890);
const static uint32_t RmtBit1 = Item32Val(720, 530); const static DRAM_ATTR uint32_t RmtBit1 = Item32Val(720, 530);
const static uint16_t RmtDurationReset = FromNs(200000); // 200us const static DRAM_ATTR uint16_t RmtDurationReset = FromNs(200000); // 200us
static void IRAM_ATTR Translate(const void* src, static void IRAM_ATTR Translate(const void* src,
rmt_item32_t* dest, rmt_item32_t* dest,
@ -171,9 +171,9 @@ public:
class NeoEsp32RmtSpeed800Kbps : public NeoEsp32RmtSpeedBase class NeoEsp32RmtSpeed800Kbps : public NeoEsp32RmtSpeedBase
{ {
public: public:
const static uint32_t RmtBit0 = Item32Val(400, 850); const static DRAM_ATTR uint32_t RmtBit0 = Item32Val(400, 850);
const static uint32_t RmtBit1 = Item32Val(800, 450); const static DRAM_ATTR uint32_t RmtBit1 = Item32Val(800, 450);
const static uint16_t RmtDurationReset = FromNs(50000); // 50us const static DRAM_ATTR uint16_t RmtDurationReset = FromNs(50000); // 50us
static void IRAM_ATTR Translate(const void* src, static void IRAM_ATTR Translate(const void* src,
rmt_item32_t* dest, rmt_item32_t* dest,
@ -186,9 +186,9 @@ public:
class NeoEsp32RmtSpeed400Kbps : public NeoEsp32RmtSpeedBase class NeoEsp32RmtSpeed400Kbps : public NeoEsp32RmtSpeedBase
{ {
public: public:
const static uint32_t RmtBit0 = Item32Val(800, 1700); const static DRAM_ATTR uint32_t RmtBit0 = Item32Val(800, 1700);
const static uint32_t RmtBit1 = Item32Val(1600, 900); const static DRAM_ATTR uint32_t RmtBit1 = Item32Val(1600, 900);
const static uint16_t RmtDurationReset = FromNs(50000); // 50us const static DRAM_ATTR uint16_t RmtDurationReset = FromNs(50000); // 50us
static void IRAM_ATTR Translate(const void* src, static void IRAM_ATTR Translate(const void* src,
rmt_item32_t* dest, rmt_item32_t* dest,
@ -201,9 +201,9 @@ public:
class NeoEsp32RmtSpeedApa106 : public NeoEsp32RmtSpeedBase class NeoEsp32RmtSpeedApa106 : public NeoEsp32RmtSpeedBase
{ {
public: public:
const static uint32_t RmtBit0 = Item32Val(400, 1250); const static DRAM_ATTR uint32_t RmtBit0 = Item32Val(400, 1250);
const static uint32_t RmtBit1 = Item32Val(1250, 400); const static DRAM_ATTR uint32_t RmtBit1 = Item32Val(1250, 400);
const static uint16_t RmtDurationReset = FromNs(50000); // 50us const static DRAM_ATTR uint16_t RmtDurationReset = FromNs(50000); // 50us
static void IRAM_ATTR Translate(const void* src, static void IRAM_ATTR Translate(const void* src,
rmt_item32_t* dest, rmt_item32_t* dest,
@ -216,9 +216,9 @@ public:
class NeoEsp32RmtInvertedSpeedWs2811 : public NeoEsp32RmtInvertedSpeedBase class NeoEsp32RmtInvertedSpeedWs2811 : public NeoEsp32RmtInvertedSpeedBase
{ {
public: public:
const static uint32_t RmtBit0 = Item32Val(300, 950); const static DRAM_ATTR uint32_t RmtBit0 = Item32Val(300, 950);
const static uint32_t RmtBit1 = Item32Val(900, 350); const static DRAM_ATTR uint32_t RmtBit1 = Item32Val(900, 350);
const static uint16_t RmtDurationReset = FromNs(300000); // 300us const static DRAM_ATTR uint16_t RmtDurationReset = FromNs(300000); // 300us
static void IRAM_ATTR Translate(const void* src, static void IRAM_ATTR Translate(const void* src,
rmt_item32_t* dest, rmt_item32_t* dest,
@ -231,9 +231,9 @@ public:
class NeoEsp32RmtInvertedSpeedWs2812x : public NeoEsp32RmtInvertedSpeedBase class NeoEsp32RmtInvertedSpeedWs2812x : public NeoEsp32RmtInvertedSpeedBase
{ {
public: public:
const static uint32_t RmtBit0 = Item32Val(400, 850); const static DRAM_ATTR uint32_t RmtBit0 = Item32Val(400, 850);
const static uint32_t RmtBit1 = Item32Val(800, 450); const static DRAM_ATTR uint32_t RmtBit1 = Item32Val(800, 450);
const static uint16_t RmtDurationReset = FromNs(300000); // 300us const static DRAM_ATTR uint16_t RmtDurationReset = FromNs(300000); // 300us
static void IRAM_ATTR Translate(const void* src, static void IRAM_ATTR Translate(const void* src,
rmt_item32_t* dest, rmt_item32_t* dest,
@ -246,9 +246,9 @@ public:
class NeoEsp32RmtInvertedSpeedSk6812 : public NeoEsp32RmtInvertedSpeedBase class NeoEsp32RmtInvertedSpeedSk6812 : public NeoEsp32RmtInvertedSpeedBase
{ {
public: public:
const static uint32_t RmtBit0 = Item32Val(400, 850); const static DRAM_ATTR uint32_t RmtBit0 = Item32Val(400, 850);
const static uint32_t RmtBit1 = Item32Val(800, 450); const static DRAM_ATTR uint32_t RmtBit1 = Item32Val(800, 450);
const static uint16_t RmtDurationReset = FromNs(80000); // 80us const static DRAM_ATTR uint16_t RmtDurationReset = FromNs(80000); // 80us
static void IRAM_ATTR Translate(const void* src, static void IRAM_ATTR Translate(const void* src,
rmt_item32_t* dest, rmt_item32_t* dest,
@ -262,9 +262,9 @@ public:
class NeoEsp32RmtInvertedSpeedTm1814 : public NeoEsp32RmtSpeedBase class NeoEsp32RmtInvertedSpeedTm1814 : public NeoEsp32RmtSpeedBase
{ {
public: public:
const static uint32_t RmtBit0 = Item32Val(360, 890); const static DRAM_ATTR uint32_t RmtBit0 = Item32Val(360, 890);
const static uint32_t RmtBit1 = Item32Val(720, 530); const static DRAM_ATTR uint32_t RmtBit1 = Item32Val(720, 530);
const static uint16_t RmtDurationReset = FromNs(200000); // 200us const static DRAM_ATTR uint16_t RmtDurationReset = FromNs(200000); // 200us
static void IRAM_ATTR Translate(const void* src, static void IRAM_ATTR Translate(const void* src,
rmt_item32_t* dest, rmt_item32_t* dest,
@ -277,9 +277,9 @@ public:
class NeoEsp32RmtInvertedSpeed800Kbps : public NeoEsp32RmtInvertedSpeedBase class NeoEsp32RmtInvertedSpeed800Kbps : public NeoEsp32RmtInvertedSpeedBase
{ {
public: public:
const static uint32_t RmtBit0 = Item32Val(400, 850); const static DRAM_ATTR uint32_t RmtBit0 = Item32Val(400, 850);
const static uint32_t RmtBit1 = Item32Val(800, 450); const static DRAM_ATTR uint32_t RmtBit1 = Item32Val(800, 450);
const static uint16_t RmtDurationReset = FromNs(50000); // 50us const static DRAM_ATTR uint16_t RmtDurationReset = FromNs(50000); // 50us
static void IRAM_ATTR Translate(const void* src, static void IRAM_ATTR Translate(const void* src,
rmt_item32_t* dest, rmt_item32_t* dest,
@ -292,9 +292,9 @@ public:
class NeoEsp32RmtInvertedSpeed400Kbps : public NeoEsp32RmtInvertedSpeedBase class NeoEsp32RmtInvertedSpeed400Kbps : public NeoEsp32RmtInvertedSpeedBase
{ {
public: public:
const static uint32_t RmtBit0 = Item32Val(800, 1700); const static DRAM_ATTR uint32_t RmtBit0 = Item32Val(800, 1700);
const static uint32_t RmtBit1 = Item32Val(1600, 900); const static DRAM_ATTR uint32_t RmtBit1 = Item32Val(1600, 900);
const static uint16_t RmtDurationReset = FromNs(50000); // 50us const static DRAM_ATTR uint16_t RmtDurationReset = FromNs(50000); // 50us
static void IRAM_ATTR Translate(const void* src, static void IRAM_ATTR Translate(const void* src,
rmt_item32_t* dest, rmt_item32_t* dest,
@ -307,9 +307,9 @@ public:
class NeoEsp32RmtInvertedSpeedApa106 : public NeoEsp32RmtInvertedSpeedBase class NeoEsp32RmtInvertedSpeedApa106 : public NeoEsp32RmtInvertedSpeedBase
{ {
public: public:
const static uint32_t RmtBit0 = Item32Val(400, 1250); const static DRAM_ATTR uint32_t RmtBit0 = Item32Val(400, 1250);
const static uint32_t RmtBit1 = Item32Val(1250, 400); const static DRAM_ATTR uint32_t RmtBit1 = Item32Val(1250, 400);
const static uint16_t RmtDurationReset = FromNs(50000); // 50us const static DRAM_ATTR uint16_t RmtDurationReset = FromNs(50000); // 50us
static void IRAM_ATTR Translate(const void* src, static void IRAM_ATTR Translate(const void* src,
rmt_item32_t* dest, rmt_item32_t* dest,
@ -422,7 +422,7 @@ public:
config.clk_div = T_SPEED::RmtClockDivider; config.clk_div = T_SPEED::RmtClockDivider;
ESP_ERROR_CHECK(rmt_config(&config)); ESP_ERROR_CHECK(rmt_config(&config));
ESP_ERROR_CHECK(rmt_driver_install(T_CHANNEL::RmtChannelNumber, 0, ESP_INTR_FLAG_IRAM)); ESP_ERROR_CHECK(rmt_driver_install(T_CHANNEL::RmtChannelNumber, 0, ESP_INTR_FLAG_IRAM | ESP_INTR_FLAG_LEVEL1));
ESP_ERROR_CHECK(rmt_translator_init(T_CHANNEL::RmtChannelNumber, T_SPEED::Translate)); ESP_ERROR_CHECK(rmt_translator_init(T_CHANNEL::RmtChannelNumber, T_SPEED::Translate));
} }