mirror of
https://github.com/wpilibsuite/allwpilib
synced 2026-06-19 00:41:43 +00:00
[wpilibc] Fix HSV to RGB conversion off-by-one error (#8722)
`Color::FromHSV` didn't match the Java `Color.fromHSV` in some saturated
edge cases, introducing an off-by-one error when the HSV color should
correspond complete saturation of one or two of the primary colors.
Example:
- Java: `Color.fromHSV(0, 255, 255) -> (255, 0, 0)`
- C++: `Color::FromHSV(0, 255, 255) -> (255, 1, 1)`
This also means the following methods are also transitively affected:
- `AddressableLED::LEDData::SetHSV`
- `LEDPattern::Rainbow`
This off-by-one error is introduced by a rounding error from the chroma
calculation, which was dividing by 256 rather than the appropriate
maximum value of 255 like in Java:
7ca35e5678/wpilibj/src/main/java/edu/wpi/first/wpilibj/util/Color.java (L176-L177)
Also port appropriate tests from Java to C++ to catch this bug.
I found this bug when I tried to port `AddressableLEDBuffer` to RobotPy.
Codex found the root cause :)
This commit is contained in:
@@ -385,6 +385,61 @@ TEST(LEDPatternTest, RainbowFullSize) {
|
||||
}
|
||||
}
|
||||
|
||||
TEST(LEDPatternTest, LEDDataSetHSVExactRgbValues) {
|
||||
struct TestCase {
|
||||
int h;
|
||||
int s;
|
||||
int v;
|
||||
int r;
|
||||
int g;
|
||||
int b;
|
||||
};
|
||||
|
||||
constexpr TestCase kCases[] = {
|
||||
{0, 0, 0, 0, 0, 0}, {0, 0, 255, 255, 255, 255},
|
||||
{0, 255, 255, 255, 0, 0}, {60, 255, 255, 0, 255, 0},
|
||||
{120, 255, 255, 0, 0, 255}, {30, 255, 255, 255, 255, 0},
|
||||
{90, 255, 255, 0, 255, 255}, {150, 255, 255, 255, 0, 255},
|
||||
{0, 255, 128, 128, 0, 0}, {60, 255, 128, 0, 128, 0},
|
||||
{120, 255, 128, 0, 0, 128},
|
||||
};
|
||||
|
||||
for (const auto& test : kCases) {
|
||||
SCOPED_TRACE(::testing::Message() << "SetHSV(" << test.h << ", " << test.s
|
||||
<< ", " << test.v << ")");
|
||||
AddressableLED::LEDData data;
|
||||
data.SetHSV(test.h, test.s, test.v);
|
||||
|
||||
EXPECT_EQ(test.r, data.r & 0xFF);
|
||||
EXPECT_EQ(test.g, data.g & 0xFF);
|
||||
EXPECT_EQ(test.b, data.b & 0xFF);
|
||||
}
|
||||
}
|
||||
|
||||
TEST(LEDPatternTest, RainbowFullSizeExactRgbValues) {
|
||||
std::array<AddressableLED::LEDData, 180> buffer;
|
||||
LEDPattern::Rainbow(255, 255).ApplyTo(buffer);
|
||||
|
||||
struct TestCase {
|
||||
int index;
|
||||
int r;
|
||||
int g;
|
||||
int b;
|
||||
};
|
||||
|
||||
constexpr TestCase kCases[] = {
|
||||
{0, 255, 0, 0}, {30, 255, 255, 0}, {60, 0, 255, 0},
|
||||
{90, 0, 255, 255}, {120, 0, 0, 255}, {150, 255, 0, 255},
|
||||
};
|
||||
|
||||
for (const auto& test : kCases) {
|
||||
SCOPED_TRACE(::testing::Message() << "LED " << test.index);
|
||||
EXPECT_EQ(test.r, buffer[test.index].r & 0xFF);
|
||||
EXPECT_EQ(test.g, buffer[test.index].g & 0xFF);
|
||||
EXPECT_EQ(test.b, buffer[test.index].b & 0xFF);
|
||||
}
|
||||
}
|
||||
|
||||
TEST(LEDPatternTest, RainbowHalfSize) {
|
||||
std::array<AddressableLED::LEDData, 90> buffer;
|
||||
int saturation = 42;
|
||||
|
||||
Reference in New Issue
Block a user