Team2890/allwpilib
4
0
Fork 0
mirror of https://github.com/wpilibsuite/allwpilib synced 2026-06-19 00:41:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

[wpiutil] Update Color.RGBChannel enum to all caps

Browse Source
This commit is contained in:
Peter Johnson
2026-03-17 00:00:37 -07:00
parent 410c11994e
commit b86204bf45
4 changed files with 27 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
wpiutil/src/main/java/org/wpilib/util/Color.java
View File

@@ -147,9 +147,9 @@ public class Color {
public static Color fromHSV(int h, int s, int v) {
int rgb = hsvToRgb(h, s, v);
return new Color(
unpackRGB(rgb, RGBChannel.kRed),
unpackRGB(rgb, RGBChannel.kGreen),
unpackRGB(rgb, RGBChannel.kBlue));
unpackRGB(rgb, RGBChannel.RED),
unpackRGB(rgb, RGBChannel.GREEN),
unpackRGB(rgb, RGBChannel.BLUE));
}
@Override
@@ -273,11 +273,11 @@ public class Color {
/** Represents a color channel in an RGB color. */
public enum RGBChannel {
/** The red channel of an RGB color. */
kRed,
RED,
/** The green channel of an RGB color. */
kGreen,
GREEN,
/** The blue channel of an RGB color. */
kBlue
BLUE
}
/**
@@ -305,9 +305,9 @@ public class Color {
*/
public static int unpackRGB(int packedColor, RGBChannel channel) {
return switch (channel) {
case kRed -> (packedColor >> 16) & 0xFF;
case kGreen -> (packedColor >> 8) & 0xFF;
case kBlue -> packedColor & 0xFF;
case RED -> (packedColor >> 16) & 0xFF;
case GREEN -> (packedColor >> 8) & 0xFF;
case BLUE -> packedColor & 0xFF;
};
}
@@ -323,9 +323,9 @@ public class Color {
int packedRGB = lerpRGB(a.red, a.green, a.blue, b.red, b.green, b.blue, t);
return new Color(
unpackRGB(packedRGB, RGBChannel.kRed),
unpackRGB(packedRGB, RGBChannel.kGreen),
unpackRGB(packedRGB, RGBChannel.kBlue));
unpackRGB(packedRGB, RGBChannel.RED),
unpackRGB(packedRGB, RGBChannel.GREEN),
unpackRGB(packedRGB, RGBChannel.BLUE));
}
/**

6
wpiutil/src/test/java/org/wpilib/util/ColorTest.java
View File

@@ -127,9 +127,9 @@ class ColorTest {
@MethodSource("hsvToRgbProvider")
void hsvToRgb(int h, int s, int v, int r, int g, int b) {
int rgb = Color.hsvToRgb(h, s, v);
int R = Color.unpackRGB(rgb, Color.RGBChannel.kRed);
int G = Color.unpackRGB(rgb, Color.RGBChannel.kGreen);
int B = Color.unpackRGB(rgb, Color.RGBChannel.kBlue);
int R = Color.unpackRGB(rgb, Color.RGBChannel.RED);
int G = Color.unpackRGB(rgb, Color.RGBChannel.GREEN);
int B = Color.unpackRGB(rgb, Color.RGBChannel.BLUE);
assertAll(
() -> assertEquals(r, R, "R value didn't match"),