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

[wpilib] Rename AddressableLED.ColorOrder constants to all caps

Browse Source
This commit is contained in:
Peter Johnson
2026-03-17 17:09:25 -07:00
parent 87e677d4af
commit c5738fcbad
2 changed files with 21 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
wpilibc/src/main/native/include/wpi/hardware/led/AddressableLED.hpp
View File

@@ -34,12 +34,12 @@ class AddressableLED {
* Order that color data is sent over the wire.
*/
enum ColorOrder {
kRGB = HAL_ALED_RGB, ///< RGB order
kRBG = HAL_ALED_RBG, ///< RBG order
kBGR = HAL_ALED_BGR, ///< BGR order
kBRG = HAL_ALED_BRG, ///< BRG order
kGBR = HAL_ALED_GBR, ///< GBR order
kGRB = HAL_ALED_GRB ///< GRB order. This is the default order.
RGB = HAL_ALED_RGB, ///< RGB order
RBG = HAL_ALED_RBG, ///< RBG order
BGR = HAL_ALED_BGR, ///< BGR order
BRG = HAL_ALED_BRG, ///< BRG order
GBR = HAL_ALED_GBR, ///< GBR order
GRB = HAL_ALED_GRB ///< GRB order. This is the default order.
};
class LEDData : public HAL_AddressableLEDData {
@@ -174,7 +174,7 @@ class AddressableLED {
int m_channel;
int m_start{0};
int m_length{0};
ColorOrder m_colorOrder{kGRB};
ColorOrder m_colorOrder{GRB};
};
constexpr auto format_as(AddressableLED::ColorOrder order) {

28
wpilibj/src/main/java/org/wpilib/hardware/led/AddressableLED.java
View File

@@ -23,17 +23,17 @@ public class AddressableLED implements AutoCloseable {
/** Order that color data is sent over the wire. */
public enum ColorOrder {
/** RGB order. */
kRGB(AddressableLEDJNI.COLOR_ORDER_RGB),
RGB(AddressableLEDJNI.COLOR_ORDER_RGB),
/** RBG order. */
kRBG(AddressableLEDJNI.COLOR_ORDER_RBG),
RBG(AddressableLEDJNI.COLOR_ORDER_RBG),
/** BGR order. */
kBGR(AddressableLEDJNI.COLOR_ORDER_BGR),
BGR(AddressableLEDJNI.COLOR_ORDER_BGR),
/** BRG order. */
kBRG(AddressableLEDJNI.COLOR_ORDER_BRG),
BRG(AddressableLEDJNI.COLOR_ORDER_BRG),
/** GBR order. */
kGBR(AddressableLEDJNI.COLOR_ORDER_GBR),
GBR(AddressableLEDJNI.COLOR_ORDER_GBR),
/** GRB order. This is the default order. */
kGRB(AddressableLEDJNI.COLOR_ORDER_GRB);
GRB(AddressableLEDJNI.COLOR_ORDER_GRB);
/** The native value for this ColorOrder. */
public final int value;
@@ -50,13 +50,13 @@ public class AddressableLED implements AutoCloseable {
*/
public ColorOrder fromValue(int value) {
return switch (value) {
case AddressableLEDJNI.COLOR_ORDER_RBG -> kRBG;
case AddressableLEDJNI.COLOR_ORDER_BGR -> kBGR;
case AddressableLEDJNI.COLOR_ORDER_BRG -> kBRG;
case AddressableLEDJNI.COLOR_ORDER_GRB -> kGRB;
case AddressableLEDJNI.COLOR_ORDER_GBR -> kGBR;
case AddressableLEDJNI.COLOR_ORDER_RGB -> kRGB;
default -> kGRB;
case AddressableLEDJNI.COLOR_ORDER_RBG -> RBG;
case AddressableLEDJNI.COLOR_ORDER_BGR -> BGR;
case AddressableLEDJNI.COLOR_ORDER_BRG -> BRG;
case AddressableLEDJNI.COLOR_ORDER_GRB -> GRB;
case AddressableLEDJNI.COLOR_ORDER_GBR -> GBR;
case AddressableLEDJNI.COLOR_ORDER_RGB -> RGB;
default -> GRB;
};
}
}
@@ -65,7 +65,7 @@ public class AddressableLED implements AutoCloseable {
private final int m_handle;
private int m_start;
private int m_length;
private ColorOrder m_colorOrder = ColorOrder.kGRB;
private ColorOrder m_colorOrder = ColorOrder.GRB;
/**
* Constructs a new driver for a specific channel.