diff --git a/hal/src/main/java/edu/wpi/first/hal/AddressableLEDJNI.java b/hal/src/main/java/edu/wpi/first/hal/AddressableLEDJNI.java index c9a2185bf03..4d4c1975ad3 100644 --- a/hal/src/main/java/edu/wpi/first/hal/AddressableLEDJNI.java +++ b/hal/src/main/java/edu/wpi/first/hal/AddressableLEDJNI.java @@ -53,7 +53,8 @@ public class AddressableLEDJNI extends JNIWrapper { /** * Sets the bit timing. * - *
By default, the driver is set up to drive WS2812Bs, so nothing needs to be set for those. + *
By default, the driver is set up to drive WS2812B and WS2815, so nothing needs to be set for + * those. * * @param handle the Addressable LED handle * @param highTime0NanoSeconds high time for 0 bit (default 400ns) @@ -72,7 +73,7 @@ public static native void setBitTiming( /** * Sets the sync time. * - *
The sync time is the time to hold output so LEDs enable. Default set for WS2812B. + *
The sync time is the time to hold output so LEDs enable. Default set for WS2812B and WS2815. * * @param handle the Addressable LED handle * @param syncTimeMicroSeconds the sync time (default 280us) diff --git a/hal/src/main/native/include/hal/AddressableLED.h b/hal/src/main/native/include/hal/AddressableLED.h index 1fba59ce810..3181e7e2bbe 100644 --- a/hal/src/main/native/include/hal/AddressableLED.h +++ b/hal/src/main/native/include/hal/AddressableLED.h @@ -77,8 +77,8 @@ void HAL_WriteAddressableLEDData(HAL_AddressableLEDHandle handle, /** * Sets the bit timing. * - *
By default, the driver is set up to drive WS2812Bs, so nothing needs to - * be set for those. + *
By default, the driver is set up to drive WS2812B and WS2815, so nothing + * needs to be set for those. * * @param[in] handle the Addressable LED handle * @param[in] highTime0NanoSeconds high time for 0 bit (default 400ns) @@ -98,7 +98,7 @@ void HAL_SetAddressableLEDBitTiming(HAL_AddressableLEDHandle handle, * Sets the sync time. * *
The sync time is the time to hold output so LEDs enable. Default set for - * WS2812B. + * WS2812B and WS2815. * * @param[in] handle the Addressable LED handle * @param[in] syncTimeMicroSeconds the sync time (default 280us) diff --git a/wpilibc/src/main/native/include/frc/AddressableLED.h b/wpilibc/src/main/native/include/frc/AddressableLED.h index d395ab0d924..c7af8528607 100644 --- a/wpilibc/src/main/native/include/frc/AddressableLED.h +++ b/wpilibc/src/main/native/include/frc/AddressableLED.h @@ -19,10 +19,10 @@ namespace frc { /** - * A class for driving addressable LEDs, such as WS2812Bs and NeoPixels. + * A class for driving addressable LEDs, such as WS2812B, WS2815, and NeoPixels. * - * By default, the timing supports WS2812B LEDs, but is configurable using - * SetBitTiming() + * By default, the timing supports WS2812B and WS2815 LEDs, but is configurable + * using SetBitTiming() * *
Only 1 LED driver is currently supported by the roboRIO. However, * multiple LED strips can be connected in series and controlled from the @@ -130,8 +130,8 @@ class AddressableLED { /** * Sets the bit timing. * - *
By default, the driver is set up to drive WS2812Bs, so nothing needs to - * be set for those. + *
By default, the driver is set up to drive WS2812B and WS2815, so nothing + * needs to be set for those. * * @param highTime0 high time for 0 bit (default 400ns) * @param lowTime0 low time for 0 bit (default 900ns) @@ -146,7 +146,7 @@ class AddressableLED { * Sets the sync time. * *
The sync time is the time to hold output so LEDs enable. Default set for - * WS2812B. + * WS2812B and WS2815. * * @param syncTime the sync time (default 280us) */ diff --git a/wpilibj/src/main/java/edu/wpi/first/wpilibj/AddressableLED.java b/wpilibj/src/main/java/edu/wpi/first/wpilibj/AddressableLED.java index bb097ab94f8..a8c160fa4bb 100644 --- a/wpilibj/src/main/java/edu/wpi/first/wpilibj/AddressableLED.java +++ b/wpilibj/src/main/java/edu/wpi/first/wpilibj/AddressableLED.java @@ -10,9 +10,10 @@ import edu.wpi.first.hal.PWMJNI; /** - * A class for driving addressable LEDs, such as WS2812Bs and NeoPixels. + * A class for driving addressable LEDs, such as WS2812B, WS2815, and NeoPixels. * - *
By default, the timing supports WS2812B LEDs, but is configurable using setBitTiming() + *
By default, the timing supports WS2812B and WS2815 LEDs, but is configurable using + * setBitTiming() * *
Only 1 LED driver is currently supported by the roboRIO. However, multiple LED strips can be * connected in series and controlled from the single driver. @@ -70,7 +71,8 @@ public void setData(AddressableLEDBuffer buffer) { /** * Sets the bit timing. * - *
By default, the driver is set up to drive WS2812Bs, so nothing needs to be set for those. + *
By default, the driver is set up to drive WS2812B and WS2815, so nothing needs to be set for + * those. * * @param highTime0NanoSeconds high time for 0 bit (default 400ns) * @param lowTime0NanoSeconds low time for 0 bit (default 900ns) @@ -93,7 +95,7 @@ public void setBitTiming( /** * Sets the sync time. * - *
The sync time is the time to hold output so LEDs enable. Default set for WS2812B. + *
The sync time is the time to hold output so LEDs enable. Default set for WS2812B and WS2815. * * @param syncTimeMicroSeconds the sync time (default 280us) */