Skip to content
This repository was archived by the owner on May 6, 2021. It is now read-only.

Commit 1fda06d

Browse files
committed
Numerous mods for ws2812b to no avail.
1 parent 022ed45 commit 1fda06d

File tree

4 files changed

+21
-18
lines changed

4 files changed

+21
-18
lines changed

libsrc/leddevice/LedDeviceWs2812b.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
#include "LedDeviceWs2812b.h"
77

88
LedDeviceWs2812b::LedDeviceWs2812b() :
9-
LedRs232Device("/dev/ttyAMA0", 2000000)
9+
LedRs232Device("/dev/ttyUSB0", 2000000)
1010
{
1111
// empty
1212
}

libsrc/leddevice/LedRs232Device.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ int LedRs232Device::open()
3131
{
3232
try
3333
{
34+
std::cout << "Opening UART: " << mDeviceName << std::endl;
3435
_rs232Port.setPort(mDeviceName);
3536
_rs232Port.setBaudrate(mBaudRate_Hz);
3637
_rs232Port.open();

test/TestNonInvWs2812b.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ void printClockSignal(const std::vector<uint8_t> & signal)
6262

6363
int main()
6464
{
65-
const std::vector<uint8_t> data(9, 0xff);
65+
const std::vector<uint8_t> data(9, 0x00);
6666
std::vector<uint8_t> encData = encode(data);
6767

6868
for (uint8_t encByte : encData)
@@ -88,19 +88,19 @@ int main()
8888
// Configure the port
8989
struct termios options;
9090
tcgetattr(uart0_filestream, &options);
91-
options.c_cflag = B4000000 | CS8 | CLOCAL;
91+
options.c_cflag = B2500000 | CS8 | CLOCAL;
9292
options.c_iflag = IGNPAR;
9393
options.c_oflag = 0;
9494
options.c_lflag = 0;
9595

9696
tcflush(uart0_filestream, TCIFLUSH);
9797
tcsetattr(uart0_filestream, TCSANOW, &options);
9898

99-
char c = getchar();
99+
getchar();
100100

101101
const int breakLength_ms = 1;
102102

103-
encData = std::vector<uint8_t>(128, 0x10);
103+
encData = std::vector<uint8_t>(128, 0x00);
104104

105105
write(uart0_filestream, encData.data(), encData.size());
106106

test/TestNonUniformWs2812b.cpp

Lines changed: 15 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ void printClockSignal(const std::vector<uint8_t> & signal)
4646

4747
int main()
4848
{
49-
const std::vector<uint8_t> white{0xff, 0xff, 0xff};
49+
const std::vector<uint8_t> white{0xff,0xff,0xff, 0xff,0xff,0xff, 0xff,0xff,0xff};
5050
const std::vector<uint8_t> green{0xff, 0x00, 0x00};
5151
const std::vector<uint8_t> red {0x00, 0xff, 0x00};
5252
const std::vector<uint8_t> blue {0x00, 0x00, 0xff};
@@ -87,20 +87,22 @@ int main()
8787
const std::vector<uint8_t> encBlackData = encode(black);
8888

8989
//std::cout << "Writing GREEN ("; printClockSignal(encode(green)); std::cout << ")" << std::endl;
90-
const std::vector<uint8_t> garbage {0x0f};
91-
write(uart0_filestream, garbage.data(), garbage.size());
92-
write(uart0_filestream, encGreenData.data(), encGreenData.size());
93-
write(uart0_filestream, encRedData.data(), encRedData.size());
94-
write(uart0_filestream, encBlueData.data(), encBlueData.size());
95-
write(uart0_filestream, encGrayData.data(), encGrayData.size());
96-
write(uart0_filestream, encBlackData.data(), encBlackData.size());
97-
}
98-
{
99-
getchar();
90+
// const std::vector<uint8_t> garbage {0x0f};
91+
// write(uart0_filestream, garbage.data(), garbage.size());
92+
// write(uart0_filestream, encGreenData.data(), encGreenData.size());
93+
// write(uart0_filestream, encRedData.data(), encRedData.size());
94+
// write(uart0_filestream, encBlueData.data(), encBlueData.size());
95+
// write(uart0_filestream, encGrayData.data(), encGrayData.size());
96+
// write(uart0_filestream, encBlackData.data(), encBlackData.size());
97+
// }
98+
// {
99+
// getchar();
100100
const std::vector<uint8_t> encData = encode(white);
101101
std::cout << "Writing WHITE ("; printClockSignal(encode(white)); std::cout << ")" << std::endl;
102-
const std::vector<uint8_t> garbage {0x0f};
103-
write(uart0_filestream, garbage.data(), garbage.size());
102+
// const std::vector<uint8_t> garbage {0x0f};
103+
// write(uart0_filestream, garbage.data(), garbage.size());
104+
write(uart0_filestream, encData.data(), encData.size());
105+
write(uart0_filestream, encData.data(), encData.size());
104106
write(uart0_filestream, encData.data(), encData.size());
105107
}
106108
{

0 commit comments

Comments
 (0)