Skip to content

Implementing WS2812b signal transmission in SPI plugin. #1382

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Ph0N37Ic5 wants to merge 22 commits into
base: master
Choose a base branch
from
Open

Implementing WS2812b signal transmission in SPI plugin. #1382

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
05e72b1
Added encoding for WS2812b.
Ph0N37Ic5 Feb 24, 2018
fdfdeb9
Update SPIOutput.h
Ph0N37Ic5 Feb 24, 2018
7a7b040
Merge pull request #2 from Ph0N37Ic5/Ph0N37Ic5-patch-WS2812b-1-1
Ph0N37Ic5 Feb 24, 2018
c17d0d0
Merge pull request #1 from Ph0N37Ic5/Ph0N37Ic5-patch-WS2812b-1
Ph0N37Ic5 Feb 24, 2018
960ee4b
Changes to be committed:
Ph0N37Ic5 Feb 24, 2018
8e3ccf9
Sync to upstream master.
Ph0N37Ic5 Feb 24, 2018
c94f8f1
Sync to upstream master.
Ph0N37Ic5 Feb 24, 2018
58f0ed4
Sync to upstream master, and updated code.
Ph0N37Ic5 Feb 24, 2018
9205b56
Minor bugfixes, should compile now.
Ph0N37Ic5 Feb 24, 2018
791c585
Merge branch 'master' into master
Ph0N37Ic5 Feb 24, 2018
9c22386
Added some tests of WS2812b.
Ph0N37Ic5 Feb 24, 2018
585d41f
Lint
Ph0N37Ic5 Feb 24, 2018
826061f
Merge branch 'master' of https://github.com/Ph0N37Ic5/ola
Ph0N37Ic5 Feb 24, 2018
7e3f8af
Fished out a small copy bug, and added a comment.
Ph0N37Ic5 Feb 24, 2018
9f0f5be
Scriptkiddied in some tests, hopefully they work.
Ph0N37Ic5 Feb 24, 2018
c511698
Beautification, and adding 2 calls to InternalWriteDMX
Ph0N37Ic5 Feb 24, 2018
0c99492
The output and the test now agrees.
Ph0N37Ic5 Feb 24, 2018
c17ef87
Lint
Ph0N37Ic5 Feb 25, 2018
2629090
Lint lint.
Ph0N37Ic5 Feb 25, 2018
d510fec
The lint that lint didn't find.
Ph0N37Ic5 Feb 25, 2018
7d0a5f2
Merge branch 'master' into master
Ph0N37Ic5 Feb 25, 2018
d90feca
Added a bit of debugging to the SPIOutput.cpp constructor. Incremente…
Ph0N37Ic5 Feb 27, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 6 additions & 4 deletions plugins/spi/SPIOutput.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -915,17 +915,19 @@ void SPIOutput::IndividualWS2812bControl(const DmxBuffer &buffer) {
// Convert RGB to GRB
unsigned int offset = first_slot + i * WS2812B_SLOTS_PER_PIXEL;

//Get DMX data
// Get DMX data
uint8_t r = 0;
uint8_t g = 0;
uint8_t b = 0;
if(offset < buffer.Size() - 2) {
if ( offset < buffer.Size() - 2 ) {
r = buffer.Get(offset);
g = buffer.Get(offset + 1);
b = buffer.Get(offset + 2);
} // fill further pixel data only if the pixel data is empty
else if(output[i * WS2812B_SPI_BYTES_PER_PIXEL] != 0)
} else if ( output[i * WS2812B_SPI_BYTES_PER_PIXEL] != 0 ) {
// fill further pixel data only if the pixel data is empty
break;
}

uint8_t low = 0, mid = 0, high = 0;

WS2812bByteMapper(g, &low, &mid, &high);
Expand Down
128 changes: 64 additions & 64 deletions plugins/spi/SPIOutputTest.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1173,13 +1173,13 @@ void SPIOutputTest::testIndividualWS2812bControl() {
// get fake SPI data stream
data = backend.GetData(0, &length);
// this is the expected spi data stream:
const uint8_t EXPECTED1[] = { 0x92, 0x4D, 0x34, //Pixel 1 Green (10)
0x92, 0x49, 0x26, //Pixel 1 Red (1)
0x9B, 0x49, 0xA4, //Pixel 1 Blue (100)
0x92, 0x49, 0x24, //Pixel 2 Green (0)
0x92, 0x49, 0x24, //Pixel 2 Red (0)
0x92, 0x49, 0x24 //Pixel 2 Blue (0)
};
const uint8_t EXPECTED1[] = { 0x92, 0x4D, 0x34, // Pixel 1 Green (10)
0x92, 0x49, 0x26, // Pixel 1 Red (1)
0x9B, 0x49, 0xA4, // Pixel 1 Blue (100)
0x92, 0x49, 0x24, // Pixel 2 Green (0)
0x92, 0x49, 0x24, // Pixel 2 Red (0)
0x92, 0x49, 0x24 // Pixel 2 Blue (0)
};
Copy link
Member

@peternewman peternewman Feb 25, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can we align with the } above if you're going to leave it on it's own line please, like the one below.

// check for Equality
OLA_ASSERT_DATA_EQUALS(EXPECTED1, arraysize(EXPECTED1), data, length);
// check if the output writes are 1
Expand All @@ -1189,12 +1189,12 @@ void SPIOutputTest::testIndividualWS2812bControl() {
buffer.SetFromString("255,128,0,10,20,30");
output.WriteDMX(buffer);
data = backend.GetData(0, &length);
const uint8_t EXPECTED2[] = { 0xD2, 0x49, 0x24, //Pixel 1 Green (128)
0xDB, 0x6D, 0xB6, //Pixel 1 Red (255)
0x92, 0x49, 0x24, //Pixel 1 Blue (0)
0x92, 0x69, 0xA4, //Pixel 2 Green (20)
0x92, 0x4D, 0x34, //Pixel 2 Red (10)
0x92, 0x6D, 0xB4 //Pixel 2 Blue (30)
const uint8_t EXPECTED2[] = { 0xD2, 0x49, 0x24, // Pixel 1 Green (128)
0xDB, 0x6D, 0xB6, // Pixel 1 Red (255)
0x92, 0x49, 0x24, // Pixel 1 Blue (0)
0x92, 0x69, 0xA4, // Pixel 2 Green (20)
0x92, 0x4D, 0x34, // Pixel 2 Red (10)
0x92, 0x6D, 0xB4 // Pixel 2 Blue (30)
};
OLA_ASSERT_DATA_EQUALS(EXPECTED2, arraysize(EXPECTED2), data, length);
OLA_ASSERT_EQ(2u, backend.Writes(0));
Expand All @@ -1205,12 +1205,12 @@ void SPIOutputTest::testIndividualWS2812bControl() {
buffer.SetFromString("34,56,78");
output.WriteDMX(buffer);
data = backend.GetData(0, &length);
const uint8_t EXPECTED3[] = { 0x93, 0x6D, 0x24, //Pixel 1 Green (56)
0x93, 0x49, 0x34, //Pixel 1 Red (34)
0x9A, 0x4D, 0xB4, //Pixel 1 Blue (78)
0x92, 0x69, 0xA4, //Pixel 2 Green (20)
0x92, 0x4D, 0x34, //Pixel 2 Red (10)
0x92, 0x6D, 0xB4 //Pixel 2 Blue (30)
const uint8_t EXPECTED3[] = { 0x93, 0x6D, 0x24, // Pixel 1 Green (56)
0x93, 0x49, 0x34, // Pixel 1 Red (34)
0x9A, 0x4D, 0xB4, // Pixel 1 Blue (78)
0x92, 0x69, 0xA4, // Pixel 2 Green (20)
0x92, 0x4D, 0x34, // Pixel 2 Red (10)
0x92, 0x6D, 0xB4 // Pixel 2 Blue (30)
};
OLA_ASSERT_DATA_EQUALS(EXPECTED3, arraysize(EXPECTED3), data, length);
OLA_ASSERT_EQ(3u, backend.Writes(0));
Expand All @@ -1232,12 +1232,12 @@ void SPIOutputTest::testIndividualWS2812bControl() {
buffer.SetFromString("1,2,3,4,5,6,7,8");
output.WriteDMX(buffer);
data = backend.GetData(0, &length);
const uint8_t EXPECTED5[] = { 0x92, 0x49, 0xA4, //Pixel 1 Green (4)
0x92, 0x49, 0x36, //Pixel 1 Red (3)
0x92, 0x49, 0xA6, //Pixel 1 Blue (5)
0x92, 0x49, 0xB6, //Pixel 2 Green (7)
0x92, 0x49, 0xB4, //Pixel 2 Red (6)
0x92, 0x4D, 0x24 //Pixel 2 Blue (8)
const uint8_t EXPECTED5[] = { 0x92, 0x49, 0xA4, // Pixel 1 Green (4)
0x92, 0x49, 0x36, // Pixel 1 Red (3)
0x92, 0x49, 0xA6, // Pixel 1 Blue (5)
0x92, 0x49, 0xB6, // Pixel 2 Green (7)
0x92, 0x49, 0xB4, // Pixel 2 Red (6)
0x92, 0x4D, 0x24 // Pixel 2 Blue (8)
};
OLA_ASSERT_DATA_EQUALS(EXPECTED5, arraysize(EXPECTED5), data, length);
OLA_ASSERT_EQ(4u, backend.Writes(0));
Expand Down Expand Up @@ -1268,13 +1268,13 @@ void SPIOutputTest::testIndividualWS2812bControl() {
data = backend.GetData(1, &length);
// this is the expected spi data stream:
// StartFrame is missing --> port is >0 !
const uint8_t EXPECTED7[] = { 0x92, 0x4D, 0x34, //Pixel 1 Green (10)
0x92, 0x49, 0x26, //Pixel 1 Red (1)
0x9B, 0x49, 0xA4, //Pixel 1 Blue (100)
0x92, 0x49, 0x24, //Pixel 2 Green (0)
0x92, 0x49, 0x24, //Pixel 2 Red (0)
0x92, 0x49, 0x24 //Pixel 2 Blue (0)
};
const uint8_t EXPECTED7[] = { 0x92, 0x4D, 0x34, // Pixel 1 Green (10)
0x92, 0x49, 0x26, // Pixel 1 Red (1)
0x9B, 0x49, 0xA4, // Pixel 1 Blue (100)
0x92, 0x49, 0x24, // Pixel 2 Green (0)
0x92, 0x49, 0x24, // Pixel 2 Red (0)
0x92, 0x49, 0x24 // Pixel 2 Blue (0)
};
// check for Equality
OLA_ASSERT_DATA_EQUALS(EXPECTED7, arraysize(EXPECTED7), data, length);
// check if the output writes are 1
Expand Down Expand Up @@ -1307,13 +1307,13 @@ void SPIOutputTest::testCombinedWS2812bControl() {
// get fake SPI data stream
data = backend.GetData(0, &length);
// this is the expected spi data stream:
const uint8_t EXPECTED1[] = { 0x92, 0x4D, 0x34, //Pixel 1 Green (10)
0x92, 0x49, 0x26, //Pixel 1 Red (1)
0x9B, 0x49, 0xA4, //Pixel 1 Blue (100)
0x92, 0x4D, 0x34, //Pixel 2 Green (10)
0x92, 0x49, 0x26, //Pixel 2 Red (1)
0x9B, 0x49, 0xA4 //Pixel 2 Blue (100)
};
const uint8_t EXPECTED1[] = { 0x92, 0x4D, 0x34, // Pixel 1 Green (10)
0x92, 0x49, 0x26, // Pixel 1 Red (1)
0x9B, 0x49, 0xA4, // Pixel 1 Blue (100)
0x92, 0x4D, 0x34, // Pixel 2 Green (10)
0x92, 0x49, 0x26, // Pixel 2 Red (1)
0x9B, 0x49, 0xA4 // Pixel 2 Blue (100)
};
// check for Equality
OLA_ASSERT_DATA_EQUALS(EXPECTED1, arraysize(EXPECTED1), data, length);
// check if the output writes are 1
Expand All @@ -1323,12 +1323,12 @@ void SPIOutputTest::testCombinedWS2812bControl() {
buffer.SetFromString("255,128,0,10,20,30");
output.WriteDMX(buffer);
data = backend.GetData(0, &length);
const uint8_t EXPECTED2[] = { 0xD2, 0x49, 0x24, //Pixel 1 Green (128)
0xDB, 0x6D, 0xB6, //Pixel 1 Red (255)
0x92, 0x49, 0x24, //Pixel 1 Blue (0)
0xD2, 0x49, 0x24, //Pixel 2 Green (128)
0xDB, 0x6D, 0xB6, //Pixel 2 Red (255)
0x92, 0x49, 0x24 //Pixel 2 Blue (0)
const uint8_t EXPECTED2[] = { 0xD2, 0x49, 0x24, // Pixel 1 Green (128)
0xDB, 0x6D, 0xB6, // Pixel 1 Red (255)
0x92, 0x49, 0x24, // Pixel 1 Blue (0)
0xD2, 0x49, 0x24, // Pixel 2 Green (128)
0xDB, 0x6D, 0xB6, // Pixel 2 Red (255)
0x92, 0x49, 0x24 // Pixel 2 Blue (0)
};
OLA_ASSERT_DATA_EQUALS(EXPECTED2, arraysize(EXPECTED2), data, length);
OLA_ASSERT_EQ(2u, backend.Writes(0));
Expand All @@ -1339,12 +1339,12 @@ void SPIOutputTest::testCombinedWS2812bControl() {
buffer.SetFromString("34,56,78");
output.WriteDMX(buffer);
data = backend.GetData(0, &length);
const uint8_t EXPECTED3[] = { 0x93, 0x6D, 0x24, //Pixel 1 Green (56)
0x93, 0x49, 0x34, //Pixel 1 Red (34)
0x9A, 0x4D, 0xB4, //Pixel 1 Blue (78)
0x93, 0x6D, 0x24, //Pixel 2 Green (56)
0x93, 0x49, 0x34, //Pixel 2 Red (34)
0x9A, 0x4D, 0xB4 //Pixel 2 Blue (78)
const uint8_t EXPECTED3[] = { 0x93, 0x6D, 0x24, // Pixel 1 Green (56)
0x93, 0x49, 0x34, // Pixel 1 Red (34)
0x9A, 0x4D, 0xB4, // Pixel 1 Blue (78)
0x93, 0x6D, 0x24, // Pixel 2 Green (56)
0x93, 0x49, 0x34, // Pixel 2 Red (34)
0x9A, 0x4D, 0xB4 // Pixel 2 Blue (78)
};
OLA_ASSERT_DATA_EQUALS(EXPECTED3, arraysize(EXPECTED3), data, length);
OLA_ASSERT_EQ(3u, backend.Writes(0));
Comment on lines +1336 to +1350
Copy link
Member

@peternewman peternewman Aug 10, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm not sure this is relevant for the combined mode?

Expand All @@ -1366,12 +1366,12 @@ void SPIOutputTest::testCombinedWS2812bControl() {
buffer.SetFromString("1,2,3,4,5,6,7,8");
output.WriteDMX(buffer);
data = backend.GetData(0, &length);
const uint8_t EXPECTED5[] = { 0x92, 0x49, 0xA4, //Pixel 1 Green (4)
0x92, 0x49, 0x36, //Pixel 1 Red (3)
0x92, 0x49, 0xA6, //Pixel 1 Blue (5)
0x92, 0x49, 0xA4, //Pixel 2 Green (4)
0x92, 0x49, 0x36, //Pixel 2 Red (3)
0x92, 0x49, 0xA6 //Pixel 2 Blue (5)
const uint8_t EXPECTED5[] = { 0x92, 0x49, 0xA4, // Pixel 1 Green (4)
0x92, 0x49, 0x36, // Pixel 1 Red (3)
0x92, 0x49, 0xA6, // Pixel 1 Blue (5)
0x92, 0x49, 0xA4, // Pixel 2 Green (4)
0x92, 0x49, 0x36, // Pixel 2 Red (3)
0x92, 0x49, 0xA6 // Pixel 2 Blue (5)
};
OLA_ASSERT_DATA_EQUALS(EXPECTED5, arraysize(EXPECTED5), data, length);
OLA_ASSERT_EQ(4u, backend.Writes(0));
Expand Down Expand Up @@ -1402,13 +1402,13 @@ void SPIOutputTest::testCombinedWS2812bControl() {
data = backend.GetData(1, &length);
// this is the expected spi data stream:
// StartFrame is missing --> port is >0 !
const uint8_t EXPECTED7[] = { 0x92, 0x4D, 0x34, //Pixel 1 Green (10)
0x92, 0x49, 0x26, //Pixel 1 Red (1)
0x9B, 0x49, 0xA4, //Pixel 1 Blue (100)
0x92, 0x4D, 0x34, //Pixel 2 Green (10)
0x92, 0x49, 0x26, //Pixel 2 Red (1)
0x9B, 0x49, 0xA4 //Pixel 2 Blue (100)
};
const uint8_t EXPECTED7[] = { 0x92, 0x4D, 0x34, // Pixel 1 Green (10)
0x92, 0x49, 0x26, // Pixel 1 Red (1)
0x9B, 0x49, 0xA4, // Pixel 1 Blue (100)
0x92, 0x4D, 0x34, // Pixel 2 Green (10)
0x92, 0x49, 0x26, // Pixel 2 Red (1)
0x9B, 0x49, 0xA4 // Pixel 2 Blue (100)
};
// check for Equality
OLA_ASSERT_DATA_EQUALS(EXPECTED7, arraysize(EXPECTED7), data, length);
// check if the output writes are 1
Expand Down