frodovdr
/
hyperion.ng
mirror of https://github.com/hyperion-project/hyperion.ng.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge branch 'master' of https://github.com/tvdzwan/hyperion 

Former-commit-id: bb47417f5e1dcee74b6e6791083b888a9e871f72
This commit is contained in:
johan 2014-01-28 00:39:23 +01:00
parent b846b0b15d b4c49c9ec4
commit 1bc65a78ac
4 changed files with 21 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libsrc/leddevice/LedDeviceWs2812b.cpp
View File

@ -6,7 +6,7 @@
#include "LedDeviceWs2812b.h" #include "LedDeviceWs2812b.h"
LedDeviceWs2812b::LedDeviceWs2812b() : LedDeviceWs2812b::LedDeviceWs2812b() :
LedRs232Device("/dev/ttyAMA0", 2000000) LedRs232Device("/dev/ttyUSB0", 2000000)
{ {
// empty // empty
} }

1
libsrc/leddevice/LedRs232Device.cpp
View File

@ -31,6 +31,7 @@ int LedRs232Device::open()
{ {
try try
{ {
std::cout << "Opening UART: " << mDeviceName << std::endl;
_rs232Port.setPort(mDeviceName); _rs232Port.setPort(mDeviceName);
_rs232Port.setBaudrate(mBaudRate_Hz); _rs232Port.setBaudrate(mBaudRate_Hz);
_rs232Port.open(); _rs232Port.open();

8
test/TestNonInvWs2812b.cpp
View File

@ -62,7 +62,7 @@ void printClockSignal(const std::vector<uint8_t> & signal)
int main() int main()
{ {
const std::vector<uint8_t> data(9, 0xff); const std::vector<uint8_t> data(9, 0x00);
std::vector<uint8_t> encData = encode(data); std::vector<uint8_t> encData = encode(data);
for (uint8_t encByte : encData) for (uint8_t encByte : encData)
@ -88,7 +88,7 @@ int main()
// Configure the port // Configure the port
struct termios options; struct termios options;
tcgetattr(uart0_filestream, &options); tcgetattr(uart0_filestream, &options);
options.c_cflag = B4000000 | CS8 | CLOCAL; options.c_cflag = B2500000 | CS8 | CLOCAL;
options.c_iflag = IGNPAR; options.c_iflag = IGNPAR;
options.c_oflag = 0; options.c_oflag = 0;
options.c_lflag = 0; options.c_lflag = 0;
@ -96,11 +96,11 @@ int main()
tcflush(uart0_filestream, TCIFLUSH); tcflush(uart0_filestream, TCIFLUSH);
tcsetattr(uart0_filestream, TCSANOW, &options); tcsetattr(uart0_filestream, TCSANOW, &options);
char c = getchar(); getchar();
const int breakLength_ms = 1; const int breakLength_ms = 1;
encData = std::vector<uint8_t>(128, 0x10); encData = std::vector<uint8_t>(128, 0x00);
write(uart0_filestream, encData.data(), encData.size()); write(uart0_filestream, encData.data(), encData.size());

28
test/TestNonUniformWs2812b.cpp
View File

@ -46,7 +46,7 @@ void printClockSignal(const std::vector<uint8_t> & signal)
int main() int main()
{ {
const std::vector<uint8_t> white{0xff, 0xff, 0xff}; const std::vector<uint8_t> white{0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff};
const std::vector<uint8_t> green{0xff, 0x00, 0x00}; const std::vector<uint8_t> green{0xff, 0x00, 0x00};
const std::vector<uint8_t> red {0x00, 0xff, 0x00}; const std::vector<uint8_t> red {0x00, 0xff, 0x00};
const std::vector<uint8_t> blue {0x00, 0x00, 0xff}; const std::vector<uint8_t> blue {0x00, 0x00, 0xff};
@ -87,20 +87,22 @@ int main()
const std::vector<uint8_t> encBlackData = encode(black); const std::vector<uint8_t> encBlackData = encode(black);
//std::cout << "Writing GREEN ("; printClockSignal(encode(green)); std::cout << ")" << std::endl; //std::cout << "Writing GREEN ("; printClockSignal(encode(green)); std::cout << ")" << std::endl;
const std::vector<uint8_t> garbage {0x0f}; // const std::vector<uint8_t> garbage {0x0f};
write(uart0_filestream, garbage.data(), garbage.size()); // write(uart0_filestream, garbage.data(), garbage.size());
write(uart0_filestream, encGreenData.data(), encGreenData.size()); // write(uart0_filestream, encGreenData.data(), encGreenData.size());
write(uart0_filestream, encRedData.data(), encRedData.size()); // write(uart0_filestream, encRedData.data(), encRedData.size());
write(uart0_filestream, encBlueData.data(), encBlueData.size()); // write(uart0_filestream, encBlueData.data(), encBlueData.size());
write(uart0_filestream, encGrayData.data(), encGrayData.size()); // write(uart0_filestream, encGrayData.data(), encGrayData.size());
write(uart0_filestream, encBlackData.data(), encBlackData.size()); // write(uart0_filestream, encBlackData.data(), encBlackData.size());
} // }
{ // {
getchar(); // getchar();
const std::vector<uint8_t> encData = encode(white); const std::vector<uint8_t> encData = encode(white);
std::cout << "Writing WHITE ("; printClockSignal(encode(white)); std::cout << ")" << std::endl; std::cout << "Writing WHITE ("; printClockSignal(encode(white)); std::cout << ")" << std::endl;
const std::vector<uint8_t> garbage {0x0f}; // const std::vector<uint8_t> garbage {0x0f};
write(uart0_filestream, garbage.data(), garbage.size()); // write(uart0_filestream, garbage.data(), garbage.size());
write(uart0_filestream, encData.data(), encData.size());
write(uart0_filestream, encData.data(), encData.size());
write(uart0_filestream, encData.data(), encData.size()); write(uart0_filestream, encData.data(), encData.size());
} }
{ {