frodovdr/hyperion.ng
1
0
Fork 0
mirror of https://github.com/hyperion-project/hyperion.ng.git synced 2023-10-10 13:36:59 +02:00
Code Issues Releases Wiki Activity

Revert "Update LedDeviceAPA102.cpp by pcaffardi"

Browse Source 
Former-commit-id: 493b32c03f922cc26d9fb4fce4778636f6a96e84
This commit is contained in:
wisc17 2016-02-09 20:21:49 +01:00
parent cf34f45daa
commit d6b5dc7ae6
1 changed files with 18 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
libsrc/leddevice/LedDeviceAPA102.cpp
View File

@ -1,7 +1,9 @@
// STL includes // STL includes
#include <cstring> #include <cstring>
#include <cstdio> #include <cstdio>
#include <iostream> #include <iostream>
#include <algorithm>
// Linux includes // Linux includes
#include <fcntl.h> #include <fcntl.h>
@ -17,46 +19,27 @@ LedDeviceAPA102::LedDeviceAPA102(const std::string& outputDevice, const unsigned
// empty // empty
} }
#define MIN(a,b) ((a)<(b)?(a):(b))
#define MAX(a,b) ((a)>(b)?(a):(b))
#define APA102_START_FRAME_BYTES 4
#define APA102_LED_BYTES 4
#define APA102_END_FRAME_BITS_MIN 32
#define APA102_END_FRAME_BITS(leds) MAX((((leds-1)/2)+1),APA102_END_FRAME_BITS_MIN)
#define APA102_END_FRAME_BYTES(leds) (((APA102_END_FRAME_BITS(leds)-1)/8)+1)
#define APA102_LED_HEADER 0xe0
#define APA102_LED_MAX_INTENSITY 0x1f
int LedDeviceAPA102::write(const std::vector<ColorRgb> &ledValues) int LedDeviceAPA102::write(const std::vector<ColorRgb> &ledValues)
{ {
const unsigned int startFrameSize = APA102_START_FRAME_BYTES; const unsigned int startFrameSize = 4;
const unsigned int ledsCount = ledValues.size() ; const unsigned int endFrameSize = std::max<unsigned int>(((ledValues.size() + 15) / 16), 4);
const unsigned int ledsSize = ledsCount * APA102_LED_BYTES ; const unsigned int mLedCount = (ledValues.size() * 4) + startFrameSize + endFrameSize;
const unsigned int endFrameBits = APA102_END_FRAME_BITS(ledsCount) ; if(_ledBuffer.size() != mLedCount){
const unsigned int endFrameSize = APA102_END_FRAME_BYTES(ledsCount) ; _ledBuffer.resize(mLedCount, 0xFF);
const unsigned int transferSize = startFrameSize + ledsSize + endFrameSize ; _ledBuffer[0] = 0x00;
_ledBuffer[1] = 0x00;
if(_ledBuffer.size() != transferSize){ _ledBuffer[2] = 0x00;
_ledBuffer.resize(transferSize, 0x00); _ledBuffer[3] = 0x00;
} }
unsigned idx = 0, i; for (unsigned iLed=1; iLed<=ledValues.size(); ++iLed) {
for (i=0; i<APA102_START_FRAME_BYTES; i++) { const ColorRgb& rgb = ledValues[iLed-1];
_ledBuffer[idx++] = 0x00 ; _ledBuffer[iLed*4] = 0xFF;
_ledBuffer[iLed*4+1] = rgb.red;
_ledBuffer[iLed*4+2] = rgb.green;
_ledBuffer[iLed*4+3] = rgb.blue;
} }
for (i=0; i<ledsCount; i++) {
const ColorRgb& rgb = ledValues[i];
_ledBuffer[idx++] = APA102_LED_HEADER + APA102_LED_MAX_INTENSITY;
_ledBuffer[idx++] = rgb.red;
_ledBuffer[idx++] = rgb.green;
_ledBuffer[idx++] = rgb.blue;
}
for(i=0; i<endFrameSize; i++)
_ledBuffer[idx++] = 0x00 ;
return writeBytes(_ledBuffer.size(), _ledBuffer.data()); return writeBytes(_ledBuffer.size(), _ledBuffer.data());
} }