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

esp8266 compiles

Browse Source
This commit is contained in:
Michael Miller
2024-04-20 22:47:37 -07:00
parent 2bbf213d5c
commit 80f98be0b2
3 changed files with 98 additions and 125 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/internal/methods/NeoEsp32RmtMethod.h
View File

@@ -566,7 +566,7 @@ public:
NeoEsp32RmtMethodBase(uint8_t pin, uint16_t pixelCount, size_t elementSize, size_t settingsSize) : NeoEsp32RmtMethodBase(uint8_t pin, uint16_t pixelCount, size_t elementSize, size_t settingsSize) :
_pin(pin), _pin(pin),
_sizeData(pixelCount* elementSize + settingsSize), _sizeDataSending(pixelCount* elementSize + settingsSize),
_pixelCount(pixelCount) _pixelCount(pixelCount)
{ {
construct(); construct();
@@ -574,7 +574,7 @@ public:
NeoEsp32RmtMethodBase(uint8_t pin, uint16_t pixelCount, size_t elementSize, size_t settingsSize, NeoBusChannel channel) : NeoEsp32RmtMethodBase(uint8_t pin, uint16_t pixelCount, size_t elementSize, size_t settingsSize, NeoBusChannel channel) :
_pin(pin), _pin(pin),
_sizeData(pixelCount* elementSize + settingsSize), _sizeDataSending(pixelCount* elementSize + settingsSize),
_pixelCount(pixelCount), _pixelCount(pixelCount),
_channel(channel) _channel(channel)
{ {
@@ -677,7 +677,7 @@ public:
} }
// now start the RMT transmit with the editing buffer before we swap // now start the RMT transmit with the editing buffer before we swap
ESP_ERROR_CHECK_WITHOUT_ABORT(rmt_write_sample(_channel.RmtChannelNumber, _dataSending, _sizeData, false)); ESP_ERROR_CHECK_WITHOUT_ABORT(rmt_write_sample(_channel.RmtChannelNumber, _dataSending, _sizeDataSending, false));
} }
} }
@@ -688,7 +688,7 @@ public:
private: private:
const uint8_t _pin; // output pin number const uint8_t _pin; // output pin number
const uint16_t _pixelCount; // count of pixels in the strip const uint16_t _pixelCount; // count of pixels in the strip
const size_t _sizeData; // Size of '_data*' buffers const size_t _sizeDataSending; // Size of '_data*' buffers
const T_CHANNEL _channel; // holds instance for multi channel support const T_CHANNEL _channel; // holds instance for multi channel support
@@ -698,7 +698,7 @@ private:
void construct() void construct()
{ {
_dataSending = static_cast<uint8_t*>(malloc(_sizeData)); _dataSending = static_cast<uint8_t*>(malloc(_sizeDataSending));
// no need to initialize it, it gets overwritten on every send // no need to initialize it, it gets overwritten on every send
} }

211
src/internal/methods/NeoEsp8266DmaMethod.h
View File

@@ -141,7 +141,6 @@ public:
const static uint32_t I2sBaseClockDivisor = 10; // 0-63 const static uint32_t I2sBaseClockDivisor = 10; // 0-63
const static uint32_t ByteSendTimeUs = 10; // us it takes to send a single pixel element const static uint32_t ByteSendTimeUs = 10; // us it takes to send a single pixel element
const static uint32_t ResetTimeUs = 12470; const static uint32_t ResetTimeUs = 12470;
const static uint32_t InterPixelTimeUs = 20;
}; };
class NeoEsp8266DmaInvertedSpeed800KbpsBase : public NeoEsp8266DmaInvertedSpeedBase class NeoEsp8266DmaInvertedSpeed800KbpsBase : public NeoEsp8266DmaInvertedSpeedBase
@@ -216,80 +215,17 @@ public:
const static uint32_t I2sBaseClockDivisor = 10; // 0-63 const static uint32_t I2sBaseClockDivisor = 10; // 0-63
const static uint32_t ByteSendTimeUs = 10; // us it takes to send a single pixel element at 800khz speed const static uint32_t ByteSendTimeUs = 10; // us it takes to send a single pixel element at 800khz speed
const static uint32_t ResetTimeUs = 12470; const static uint32_t ResetTimeUs = 12470;
const static uint32_t InterPixelTimeUs = 20;
}; };
template<typename T_SPEED> class NeoEsp8266DmaEncode : public T_SPEED template<typename T_SPEED> class NeoEsp8266DmaMethodBase : NeoEsp8266I2sMethodCore
{
public:
static size_t SpacingPixelSize(size_t sizePixel)
{
return sizePixel;
}
static void FillBuffers(uint8_t* i2sBuffer,
const uint8_t* data,
size_t sizeData,
[[maybe_unused]] size_t sizePixel)
{
uint16_t* pDma = (uint16_t*)i2sBuffer;
const uint8_t* pEnd = data + sizeData;
for (const uint8_t* pData = data; pData < pEnd; pData++)
{
*(pDma++) = T_SPEED::Convert(((*pData) & 0x0f));
*(pDma++) = T_SPEED::Convert(((*pData) >> 4) & 0x0f);
}
}
};
template<typename T_SPEED> class NeoEsp8266DmaPixelSpacingEncode : public T_SPEED
{
public:
static size_t SpacingPixelSize(size_t sizePixel)
{
return sizePixel + T_SPEED::InterPixelTimeUs / T_SPEED::ByteSendTimeUs;
}
static void FillBuffers(uint8_t* i2sBuffer,
const uint8_t* data,
size_t sizeData,
size_t sizePixel)
{
uint16_t* pDma = (uint16_t*)i2sBuffer;
const uint8_t* pEnd = data + sizeData;
uint8_t element = 0;
for (const uint8_t* pData = data; pData < pEnd; pData++)
{
*(pDma++) = T_SPEED::Convert(((*pData) & 0x0f));
*(pDma++) = T_SPEED::Convert(((*pData) >> 4) & 0x0f);
element++;
if (element == sizePixel)
{
element = 0;
for (uint8_t padding = 0;
padding < (T_SPEED::InterPixelTimeUs / T_SPEED::ByteSendTimeUs);
padding++)
{
*(pDma++) = T_SPEED::IdleLevel * 0xffff;
*(pDma++) = T_SPEED::IdleLevel * 0xffff;
}
}
}
}
};
template<typename T_ENCODER> class NeoEsp8266DmaMethodBase : NeoEsp8266I2sMethodCore
{ {
public: public:
typedef NeoNoSettings SettingsObject; typedef NeoNoSettings SettingsObject;
NeoEsp8266DmaMethodBase(uint16_t pixelCount, size_t elementSize, size_t settingsSize) : NeoEsp8266DmaMethodBase(uint16_t pixelCount, size_t elementSize, size_t settingsSize) :
_sizePixel(elementSize), _pixelCount(pixelCount)
_sizeData(pixelCount * elementSize + settingsSize)
{ {
size_t dmaPixelSize = DmaBytesPerPixelBytes * T_ENCODER::SpacingPixelSize(_sizePixel); size_t dmaPixelSize = DmaBytesPerPixelBytes * elementSize;
size_t dmaSettingsSize = DmaBytesPerPixelBytes * settingsSize; size_t dmaSettingsSize = DmaBytesPerPixelBytes * settingsSize;
size_t i2sBufferSize = pixelCount * dmaPixelSize + dmaSettingsSize; size_t i2sBufferSize = pixelCount * dmaPixelSize + dmaSettingsSize;
@@ -297,15 +233,12 @@ public:
i2sBufferSize = NeoUtil::RoundUp(i2sBufferSize, c_I2sByteBoundarySize); i2sBufferSize = NeoUtil::RoundUp(i2sBufferSize, c_I2sByteBoundarySize);
// calculate a buffer size that takes reset amount of time // calculate a buffer size that takes reset amount of time
size_t i2sResetSize = T_ENCODER::ResetTimeUs * DmaBytesPerPixelBytes / T_ENCODER::ByteSendTimeUs; size_t i2sResetSize = T_SPEED::ResetTimeUs * DmaBytesPerPixelBytes / T_SPEED::ByteSendTimeUs;
// size is rounded up to nearest c_I2sByteBoundarySize // size is rounded up to nearest c_I2sByteBoundarySize
i2sResetSize = NeoUtil::RoundUp(i2sResetSize, c_I2sByteBoundarySize); i2sResetSize = NeoUtil::RoundUp(i2sResetSize, c_I2sByteBoundarySize);
size_t is2BufMaxBlockSize = (c_maxDmaBlockSize / dmaPixelSize) * dmaPixelSize; size_t is2BufMaxBlockSize = (c_maxDmaBlockSize / dmaPixelSize) * dmaPixelSize;
_data = static_cast<uint8_t*>(malloc(_sizeData)); AllocateI2s(i2sBufferSize, i2sResetSize, is2BufMaxBlockSize, T_SPEED::IdleLevel);
// data cleared later in Begin()
AllocateI2s(i2sBufferSize, i2sResetSize, is2BufMaxBlockSize, T_ENCODER::IdleLevel);
} }
NeoEsp8266DmaMethodBase([[maybe_unused]] uint8_t pin, uint16_t pixelCount, size_t elementSize, size_t settingsSize) : NeoEsp8266DmaMethodBase([[maybe_unused]] uint8_t pin, uint16_t pixelCount, size_t elementSize, size_t settingsSize) :
@@ -323,16 +256,14 @@ public:
} }
// wait for any pending sends to complete // wait for any pending sends to complete
// due to internal i2s caching/send delays, this can more that once the data size // due to internal i2s caching/send delays, this can more than once the data size
uint32_t time = micros(); uint32_t time = micros();
while ((micros() - time) < ((getPixelTime() + T_ENCODER::ResetTimeUs) * waits)) while ((micros() - time) < ((getPixelTime() + T_SPEED::ResetTimeUs) * waits))
{ {
yield(); yield();
} }
FreeI2s(); FreeI2s();
free(_data);
} }
bool IsReadyToUpdate() const bool IsReadyToUpdate() const
@@ -342,37 +273,66 @@ public:
void Initialize() void Initialize()
{ {
InitializeI2s(T_ENCODER::I2sClockDivisor, T_ENCODER::I2sBaseClockDivisor); InitializeI2s(T_SPEED::I2sClockDivisor, T_SPEED::I2sBaseClockDivisor);
} }
void IRAM_ATTR Update(bool) template <typename T_COLOR_OBJECT,
typename T_COLOR_FEATURE,
typename T_SHADER>
void Update(
T_COLOR_OBJECT* pixels,
size_t countPixels,
const typename T_COLOR_FEATURE::SettingsObject& featureSettings,
const T_SHADER& shader)
{ {
// wait for not actively sending data // wait for not actively sending data
while (!IsReadyToUpdate()) while (!IsReadyToUpdate())
{ {
yield(); yield();
} }
T_ENCODER::FillBuffers(_i2sBuffer, _data, _sizeData, _sizePixel);
const size_t sendDataSize = T_COLOR_FEATURE::SettingsSize >= T_COLOR_FEATURE::PixelSize ? T_COLOR_FEATURE::SettingsSize : T_COLOR_FEATURE::PixelSize;
uint8_t sendData[sendDataSize];
uint8_t* dma = _i2sBuffer;
// if there are settings at the front
//
if (T_COLOR_FEATURE::applyFrontSettings(sendData, sendDataSize, featureSettings))
{
FillBuffer(sendData, T_COLOR_FEATURE::SettingsSize, &dma);
}
// fill primary color data
//
T_COLOR_OBJECT* pixel = pixels;
const T_COLOR_OBJECT* pixelEnd = pixel + countPixels;
uint16_t stripCount = _pixelCount;
while (stripCount--)
{
typename T_COLOR_FEATURE::ColorObject color = shader.Apply(*pixel);
T_COLOR_FEATURE::applyPixelColor(sendData, sendDataSize, color);
FillBuffer(sendData, T_COLOR_FEATURE::PixelSize, &dma);
pixel++;
if (pixel >= pixelEnd)
{
// restart at first
pixel = pixels;
}
}
// if there are settings at the back
//
if (T_COLOR_FEATURE::applyBackSettings(sendData, sendDataSize, featureSettings))
{
FillBuffer(sendData, T_COLOR_FEATURE::SettingsSize, &dma);
}
WriteI2s(); WriteI2s();
} }
bool AlwaysUpdate()
{
// this method requires update to be called only if changes to buffer
return false;
}
uint8_t* getData() const
{
return _data;
};
size_t getDataSize() const
{
return _sizeData;
}
void applySettings([[maybe_unused]] const SettingsObject& settings) void applySettings([[maybe_unused]] const SettingsObject& settings)
{ {
} }
@@ -380,46 +340,59 @@ public:
private: private:
// due to encoding required for i2s, we need 4 bytes to encode the pulses // due to encoding required for i2s, we need 4 bytes to encode the pulses
static const uint16_t DmaBytesPerPixelBytes = 4; static const uint16_t DmaBytesPerPixelBytes = 4;
const uint16_t _pixelCount; // count of pixels in the strip
const size_t _sizePixel; // size of a pixel in _data
const size_t _sizeData; // Size of '_data' buffer
uint8_t* _data; // Holds LED color values
uint32_t getPixelTime() const uint32_t getPixelTime() const
{ {
return (T_ENCODER::ByteSendTimeUs * GetSendSize() / DmaBytesPerPixelBytes); return (T_SPEED::ByteSendTimeUs * GetSendSize() / DmaBytesPerPixelBytes);
}; };
void FillBuffer(
const uint8_t* sendData,
size_t sendDataSize,
uint8_t** i2sBuffer)
{
uint16_t* pDma = reinterpret_cast<uint16_t*>(*i2sBuffer);
const uint8_t* pEnd = sendData + sendDataSize;
while (sendData < pEnd)
{
*(pDma++) = T_SPEED::Convert(((*sendData) & 0x0f));
*(pDma++) = T_SPEED::Convert(((*sendData) >> 4) & 0x0f);
sendData++;
}
*i2sBuffer = reinterpret_cast<uint8_t*>(pDma);
}
}; };
// normal // normal
typedef NeoEsp8266DmaMethodBase<NeoEsp8266DmaEncode<NeoEsp8266DmaSpeedWs2812x>> NeoEsp8266DmaWs2812xMethod; typedef NeoEsp8266DmaMethodBase<NeoEsp8266DmaSpeedWs2812x> NeoEsp8266DmaWs2812xMethod;
typedef NeoEsp8266DmaMethodBase<NeoEsp8266DmaEncode<NeoEsp8266DmaSpeedWs2805>> NeoEsp8266DmaWs2805Method; typedef NeoEsp8266DmaMethodBase<NeoEsp8266DmaSpeedWs2805> NeoEsp8266DmaWs2805Method;
typedef NeoEsp8266DmaWs2805Method NeoEsp8266DmaWs2814Method; typedef NeoEsp8266DmaWs2805Method NeoEsp8266DmaWs2814Method;
typedef NeoEsp8266DmaMethodBase<NeoEsp8266DmaEncode<NeoEsp8266DmaSpeedSk6812>> NeoEsp8266DmaSk6812Method; typedef NeoEsp8266DmaMethodBase<NeoEsp8266DmaSpeedSk6812> NeoEsp8266DmaSk6812Method;
typedef NeoEsp8266DmaMethodBase<NeoEsp8266DmaEncode<NeoEsp8266DmaSpeedTm1814>> NeoEsp8266DmaTm1814Method; typedef NeoEsp8266DmaMethodBase<NeoEsp8266DmaSpeedTm1814> NeoEsp8266DmaTm1814Method;
typedef NeoEsp8266DmaMethodBase<NeoEsp8266DmaEncode<NeoEsp8266DmaSpeedTm1829>> NeoEsp8266DmaTm1829Method; typedef NeoEsp8266DmaMethodBase<NeoEsp8266DmaSpeedTm1829> NeoEsp8266DmaTm1829Method;
typedef NeoEsp8266DmaTm1814Method NeoEsp8266DmaTm1914Method; typedef NeoEsp8266DmaTm1814Method NeoEsp8266DmaTm1914Method;
typedef NeoEsp8266DmaMethodBase<NeoEsp8266DmaEncode<NeoEsp8266DmaSpeed800Kbps>> NeoEsp8266Dma800KbpsMethod; typedef NeoEsp8266DmaMethodBase<NeoEsp8266DmaSpeed800Kbps> NeoEsp8266Dma800KbpsMethod;
typedef NeoEsp8266DmaMethodBase<NeoEsp8266DmaEncode<NeoEsp8266DmaSpeed400Kbps>> NeoEsp8266Dma400KbpsMethod; typedef NeoEsp8266DmaMethodBase<NeoEsp8266DmaSpeed400Kbps> NeoEsp8266Dma400KbpsMethod;
typedef NeoEsp8266DmaMethodBase<NeoEsp8266DmaEncode<NeoEsp8266DmaSpeedApa106>> NeoEsp8266DmaApa106Method; typedef NeoEsp8266DmaMethodBase<NeoEsp8266DmaSpeedApa106> NeoEsp8266DmaApa106Method;
typedef NeoEsp8266DmaMethodBase<NeoEsp8266DmaPixelSpacingEncode<NeoEsp8266DmaSpeedIntertek>> NeoEsp8266DmaIntertekMethod; typedef NeoEsp8266DmaMethodBase<NeoEsp8266DmaSpeedIntertek> NeoEsp8266DmaIntertekMethod;
// inverted // inverted
typedef NeoEsp8266DmaMethodBase<NeoEsp8266DmaEncode<NeoEsp8266DmaInvertedSpeedWs2812x>> NeoEsp8266DmaInvertedWs2812xMethod; typedef NeoEsp8266DmaMethodBase<NeoEsp8266DmaInvertedSpeedWs2812x> NeoEsp8266DmaInvertedWs2812xMethod;
typedef NeoEsp8266DmaMethodBase<NeoEsp8266DmaEncode<NeoEsp8266DmaInvertedSpeedWs2805>> NeoEsp8266DmaInvertedWs2805Method; typedef NeoEsp8266DmaMethodBase<NeoEsp8266DmaInvertedSpeedWs2805> NeoEsp8266DmaInvertedWs2805Method;
typedef NeoEsp8266DmaInvertedWs2805Method NeoEsp8266DmaInvertedWs2814Method; typedef NeoEsp8266DmaInvertedWs2805Method NeoEsp8266DmaInvertedWs2814Method;
typedef NeoEsp8266DmaMethodBase<NeoEsp8266DmaEncode<NeoEsp8266DmaInvertedSpeedSk6812>> NeoEsp8266DmaInvertedSk6812Method; typedef NeoEsp8266DmaMethodBase<NeoEsp8266DmaInvertedSpeedSk6812> NeoEsp8266DmaInvertedSk6812Method;
typedef NeoEsp8266DmaMethodBase<NeoEsp8266DmaEncode<NeoEsp8266DmaInvertedSpeedTm1814>> NeoEsp8266DmaInvertedTm1814Method; typedef NeoEsp8266DmaMethodBase<NeoEsp8266DmaInvertedSpeedTm1814> NeoEsp8266DmaInvertedTm1814Method;
typedef NeoEsp8266DmaMethodBase<NeoEsp8266DmaEncode<NeoEsp8266DmaInvertedSpeedTm1829>> NeoEsp8266DmaInvertedTm1829Method; typedef NeoEsp8266DmaMethodBase<NeoEsp8266DmaInvertedSpeedTm1829> NeoEsp8266DmaInvertedTm1829Method;
typedef NeoEsp8266DmaInvertedTm1814Method NeoEsp8266DmaInvertedTm1914Method; typedef NeoEsp8266DmaInvertedTm1814Method NeoEsp8266DmaInvertedTm1914Method;
typedef NeoEsp8266DmaMethodBase<NeoEsp8266DmaEncode<NeoEsp8266DmaInvertedSpeed800Kbps>> NeoEsp8266DmaInverted800KbpsMethod; typedef NeoEsp8266DmaMethodBase<NeoEsp8266DmaInvertedSpeed800Kbps> NeoEsp8266DmaInverted800KbpsMethod;
typedef NeoEsp8266DmaMethodBase<NeoEsp8266DmaEncode<NeoEsp8266DmaInvertedSpeed400Kbps>> NeoEsp8266DmaInverted400KbpsMethod; typedef NeoEsp8266DmaMethodBase<NeoEsp8266DmaInvertedSpeed400Kbps> NeoEsp8266DmaInverted400KbpsMethod;
typedef NeoEsp8266DmaMethodBase<NeoEsp8266DmaEncode<NeoEsp8266DmaInvertedSpeedApa106>> NeoEsp8266DmaInvertedApa106Method; typedef NeoEsp8266DmaMethodBase<NeoEsp8266DmaInvertedSpeedApa106> NeoEsp8266DmaInvertedApa106Method;
typedef NeoEsp8266DmaMethodBase<NeoEsp8266DmaPixelSpacingEncode<NeoEsp8266DmaInvertedSpeedIntertek>> NeoEsp8266DmaInvertedIntertekMethod; typedef NeoEsp8266DmaMethodBase<NeoEsp8266DmaInvertedSpeedIntertek> NeoEsp8266DmaInvertedIntertekMethod;
// Dma method is the default method for Esp8266 // Dma method is the default method for Esp8266
typedef NeoEsp8266DmaWs2812xMethod NeoWs2813Method; typedef NeoEsp8266DmaWs2812xMethod NeoWs2813Method;

2
src/internal/methods/NeoEsp8266I2sMethodCore.h
View File

@@ -326,7 +326,7 @@ protected:
I2SC |= I2STXS; // Start transmission I2SC |= I2STXS; // Start transmission
} }
void WriteI2s() void IRAM_ATTR WriteI2s()
{ {
// first two items are the state blocks // first two items are the state blocks
slc_queue_item* itemLoopBreaker = &(_i2sBufDesc[1]); slc_queue_item* itemLoopBreaker = &(_i2sBufDesc[1]);