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

refactor rotate and shift

Browse Source 
fixed bug
improved speed slightly
added ClearTo for range of pixels
This commit is contained in:
Makuna
2016-04-07 13:55:37 -07:00
parent aca0fe3b67
commit 6390316aed
3 changed files with 163 additions and 110 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
library.properties
View File

@@ -1,5 +1,5 @@
name=NeoPixelBus by Makuna
version=2.0.9
version=2.0.91
author=Michael C. Miller (makuna@live.com)
maintainer=Michael C. Miller (makuna@live.com)
sentence=A library that makes controlling NeoPixels (WS2811, WS2812 & SK6812) easy.

217
src/NeoPixelBus.h
View File

@@ -161,145 +161,109 @@ public:
void ClearTo(typename T_COLOR_FEATURE::ColorObject color)
{
uint8_t temp[T_COLOR_FEATURE::PixelSize];
uint8_t* pixels = _method.getPixels();
T_COLOR_FEATURE::applyPixelColor(temp, 0, color);
uint8_t* pixels = _method.getPixels();
uint8_t* pFirst = T_COLOR_FEATURE::getPixelAddress(pixels, 0);
uint8_t* pLast = T_COLOR_FEATURE::getPixelAddress(pixels, _countPixels);
uint8_t* pFront = temp;
while (pFirst < pLast)
{
T_COLOR_FEATURE::copyIncPixel(pFirst, pFront);
}
T_COLOR_FEATURE::replicatePixel(pixels, temp, _countPixels);
Dirty();
};
void RotateLeft(uint16_t rotationCount, uint16_t first = 0, uint16_t last = 0xffff)
void ClearTo(typename T_COLOR_FEATURE::ColorObject color, uint16_t first, uint16_t last)
{
if (last >= _countPixels)
{
last = _countPixels - 1;
}
if (first < _countPixels &&
last < _countPixels &&
first < last &&
(last - first) >= rotationCount)
first < last)
{
// store in temp
uint8_t temp[rotationCount * T_COLOR_FEATURE::PixelSize];
uint8_t temp[T_COLOR_FEATURE::PixelSize];
uint8_t* pixels = _method.getPixels();
uint8_t* pFirst = T_COLOR_FEATURE::getPixelAddress(temp, 0);
uint8_t* pLast = T_COLOR_FEATURE::getPixelAddress(temp, rotationCount - 1);
uint8_t* pFront = T_COLOR_FEATURE::getPixelAddress(pixels, first);
while (pFirst <= pLast)
{
T_COLOR_FEATURE::moveIncPixel(pFirst, pFront);
}
// shift data
ShiftLeft(rotationCount, first, last);
T_COLOR_FEATURE::applyPixelColor(temp, 0, color);
// move temp back
pFirst = T_COLOR_FEATURE::getPixelAddress(temp, 0);
pFront = T_COLOR_FEATURE::getPixelAddress(pixels, last - (rotationCount - 1));
while (pFirst <= pLast)
{
T_COLOR_FEATURE::moveIncPixel(pFront, pFirst);
}
T_COLOR_FEATURE::replicatePixel(pFront, temp, last - first + 1);
Dirty();
}
}
void ShiftLeft(uint16_t shiftCount, uint16_t first = 0, uint16_t last = 0xffff)
void RotateLeft(uint16_t rotationCount)
{
if (last >= _countPixels)
if ((_countPixels - 1) >= rotationCount)
{
last = _countPixels - 1;
}
if (first < _countPixels &&
last < _countPixels &&
first < last &&
(last - first) >= shiftCount)
{
uint8_t* pixels = _method.getPixels();
uint8_t* pFirst = T_COLOR_FEATURE::getPixelAddress(pixels, first);
uint8_t* pLast = T_COLOR_FEATURE::getPixelAddress(pixels, last);
uint8_t* pFront = T_COLOR_FEATURE::getPixelAddress(pixels, first + shiftCount);
while (pFront <= pLast)
{
T_COLOR_FEATURE::moveIncPixel(pFirst, pFront);
}
Dirty();
_rotateLeft(rotationCount, 0, _countPixels - 1);
}
}
void RotateRight(uint16_t rotationCount, uint16_t first = 0, uint16_t last = 0xffff)
void RotateLeft(uint16_t rotationCount, uint16_t first, uint16_t last)
{
if (last >= _countPixels)
{
last = _countPixels - 1;
}
if (first < _countPixels &&
last < _countPixels &&
first < last &&
(last - first) >= rotationCount)
{
// store in temp
uint8_t temp[rotationCount * T_COLOR_FEATURE::PixelSize];
uint8_t* pixels = _method.getPixels();
uint8_t* pFirst = T_COLOR_FEATURE::getPixelAddress(temp, 0);
uint8_t* pLast = T_COLOR_FEATURE::getPixelAddress(temp, rotationCount - 1);
uint8_t* pBack = T_COLOR_FEATURE::getPixelAddress(pixels, last);
while (pLast >= pFirst)
{
T_COLOR_FEATURE::moveDecPixel(pLast, pBack);
_rotateLeft(rotationCount, first, last);
}
}
// shift data
ShiftRight(rotationCount, first, last);
// move temp back
pLast = T_COLOR_FEATURE::getPixelAddress(temp, rotationCount - 1);
pBack = T_COLOR_FEATURE::getPixelAddress(pixels, first + rotationCount - 1);
while (pLast >= pFirst)
void ShiftLeft(uint16_t shiftCount)
{
T_COLOR_FEATURE::moveDecPixel(pBack, pLast);
}
if ((_countPixels - 1) >= shiftCount)
{
_shiftLeft(shiftCount, 0, _countPixels - 1);
Dirty();
}
}
void ShiftRight(uint16_t shiftCount, uint16_t first = 0, uint16_t last = 0xffff)
void ShiftLeft(uint16_t shiftCount, uint16_t first, uint16_t last)
{
if (last >= _countPixels)
{
last = _countPixels - 1;
}
if (first < _countPixels &&
last < _countPixels &&
first < last &&
(last - first) >= shiftCount)
{
uint8_t* pixels = _method.getPixels();
uint8_t* pFirst = T_COLOR_FEATURE::getPixelAddress(pixels, first);
uint8_t* pLast = T_COLOR_FEATURE::getPixelAddress(pixels, last);
uint8_t* pBack = T_COLOR_FEATURE::getPixelAddress(pixels, last - shiftCount);
while (pBack >= pFirst)
{
T_COLOR_FEATURE::moveDecPixel(pLast, pBack);
_shiftLeft(shiftCount, first, last);
Dirty();
}
}
void RotateRight(uint16_t rotationCount)
{
if ((_countPixels - 1) >= rotationCount)
{
_rotateRight(rotationCount, 0, _countPixels - 1);
}
}
void RotateRight(uint16_t rotationCount, uint16_t first, uint16_t last)
{
if (first < _countPixels &&
last < _countPixels &&
first < last &&
(last - first) >= rotationCount)
{
_rotateRight(rotationCount, first, last);
}
}
void ShiftRight(uint16_t shiftCount)
{
if ((_countPixels - 1) >= shiftCount)
{
_shiftRight(shiftCount, 0, _countPixels - 1);
Dirty();
}
}
void ShiftRight(uint16_t shiftCount, uint16_t first, uint16_t last)
{
if (first < _countPixels &&
last < _countPixels &&
first < last &&
(last - first) >= shiftCount)
{
_shiftRight(shiftCount, first, last);
Dirty();
}
}
@@ -309,5 +273,72 @@ private:
uint8_t _state; // internal state
T_METHOD _method;
void _rotateLeft(uint16_t rotationCount, uint16_t first, uint16_t last)
{
// store in temp
uint8_t temp[rotationCount * T_COLOR_FEATURE::PixelSize];
uint8_t* pixels = _method.getPixels();
uint8_t* pFront = T_COLOR_FEATURE::getPixelAddress(pixels, first);
T_COLOR_FEATURE::movePixelsInc(temp, pFront, rotationCount);
// shift data
_shiftLeft(rotationCount, first, last);
// move temp back
pFront = T_COLOR_FEATURE::getPixelAddress(pixels, last - (rotationCount - 1));
T_COLOR_FEATURE::movePixelsInc(pFront, temp, rotationCount);
Dirty();
}
void _shiftLeft(uint16_t shiftCount, uint16_t first, uint16_t last)
{
uint16_t front = first + shiftCount;
uint16_t count = last - front + 1;
uint8_t* pixels = _method.getPixels();
uint8_t* pFirst = T_COLOR_FEATURE::getPixelAddress(pixels, first);
uint8_t* pFront = T_COLOR_FEATURE::getPixelAddress(pixels, front);
T_COLOR_FEATURE::movePixelsInc(pFirst, pFront, count);
// intentional no dirty
}
void _rotateRight(uint16_t rotationCount, uint16_t first, uint16_t last)
{
// store in temp
uint8_t temp[rotationCount * T_COLOR_FEATURE::PixelSize];
uint8_t* pixels = _method.getPixels();
uint8_t* pFront = T_COLOR_FEATURE::getPixelAddress(pixels, last - (rotationCount - 1));
T_COLOR_FEATURE::movePixelsDec(temp, pFront, rotationCount);
// shift data
_shiftRight(rotationCount, first, last);
// move temp back
pFront = T_COLOR_FEATURE::getPixelAddress(pixels, first);
T_COLOR_FEATURE::movePixelsDec(pFront, temp, rotationCount);
Dirty();
}
void _shiftRight(uint16_t shiftCount, uint16_t first, uint16_t last)
{
uint16_t front = first + shiftCount;
uint16_t count = last - front + 1;
uint8_t* pixels = _method.getPixels();
uint8_t* pFirst = T_COLOR_FEATURE::getPixelAddress(pixels, first);
uint8_t* pFront = T_COLOR_FEATURE::getPixelAddress(pixels, front);
T_COLOR_FEATURE::movePixelsDec(pFront, pFirst, count);
// intentional no dirty
}
};

58
src/internal/NeoColorFeatures.h
View File

@@ -36,25 +36,38 @@ public:
return pPixels + indexPixel * PixelSize;
}
static void copyIncPixel(uint8_t*& pPixelDest, uint8_t* pPixelSrc)
static void replicatePixel(uint8_t* pPixelDest, uint8_t* pPixelSrc, uint16_t count)
{
*pPixelDest++ = *pPixelSrc++;
*pPixelDest++ = *pPixelSrc++;
*pPixelDest++ = *pPixelSrc;
uint8_t* pEnd = pPixelDest + (count * PixelSize);
while (pPixelDest < pEnd)
{
*pPixelDest++ = pPixelSrc[0];
*pPixelDest++ = pPixelSrc[1];
*pPixelDest++ = pPixelSrc[2];
}
}
static void moveIncPixel(uint8_t*& pPixelDest, uint8_t*& pPixelSrc)
static void movePixelsInc(uint8_t* pPixelDest, uint8_t* pPixelSrc, uint16_t count)
{
uint8_t* pEnd = pPixelDest + (count * PixelSize);
while (pPixelDest < pEnd)
{
*pPixelDest++ = *pPixelSrc++;
*pPixelDest++ = *pPixelSrc++;
*pPixelDest++ = *pPixelSrc++;
}
}
static void moveDecPixel(uint8_t*& pPixelDest, uint8_t*& pPixelSrc)
static void movePixelsDec(uint8_t* pPixelDest, uint8_t* pPixelSrc, uint16_t count)
{
*pPixelDest-- = *pPixelSrc--;
*pPixelDest-- = *pPixelSrc--;
*pPixelDest-- = *pPixelSrc--;
uint8_t* pDestBack = pPixelDest + (count * PixelSize);
uint8_t* pSrcBack = pPixelSrc + (count * PixelSize);
while (pDestBack > pPixelDest)
{
*--pDestBack = *--pSrcBack;
*--pDestBack = *--pSrcBack;
*--pDestBack = *--pSrcBack;
}
}
typedef RgbColor ColorObject;
@@ -70,30 +83,39 @@ public:
return pPixels + indexPixel * PixelSize;
}
static void copyIncPixel(uint8_t*& pPixelDest, uint8_t* pPixelSrc)
static void replicatePixel(uint8_t* pPixelDest, uint8_t* pPixelSrc, uint16_t count)
{
uint32_t* pDest = (uint32_t*)pPixelDest;
uint32_t* pSrc = (uint32_t*)pPixelSrc;
uint32_t* pEnd = pDest + count;
while (pDest < pEnd)
{
*pDest++ = *pSrc;
pPixelDest = (uint8_t*)pDest;
}
}
static void moveIncPixel(uint8_t*& pPixelDest, uint8_t*& pPixelSrc)
static void movePixelsInc(uint8_t* pPixelDest, uint8_t* pPixelSrc, uint16_t count)
{
uint32_t* pDest = (uint32_t*)pPixelDest;
uint32_t* pSrc = (uint32_t*)pPixelSrc;
uint32_t* pEnd = pDest + count;
while (pDest < pEnd)
{
*pDest++ = *pSrc++;
pPixelDest = (uint8_t*)pDest;
pPixelSrc = (uint8_t*)pSrc;
}
}
static void moveDecPixel(uint8_t*& pPixelDest, uint8_t*& pPixelSrc)
static void movePixelsDec(uint8_t* pPixelDest, uint8_t* pPixelSrc, uint16_t count)
{
uint32_t* pDest = (uint32_t*)pPixelDest;
uint32_t* pSrc = (uint32_t*)pPixelSrc;
*pDest-- = *pSrc--;
pPixelDest = (uint8_t*)pDest;
pPixelSrc = (uint8_t*)pSrc;
uint32_t* pDestBack = pDest + count;
uint32_t* pSrcBack = pSrc + count;
while (pDestBack > pDest)
{
*--pDestBack = *--pSrcBack;
}
}
typedef RgbwColor ColorObject;