From 1e01c03c8ad055ee0f66e4b3a90a44ce855e8c76 Mon Sep 17 00:00:00 2001 From: DanPeled <98838880+DanPeled@users.noreply.github.com> Date: Tue, 18 Feb 2025 18:32:12 +0200 Subject: [PATCH 1/6] Added support for AddressableLEDBuffer in sim --- .../java/edu/wpi/first/wpilibj/AddressableLEDBuffer.java | 7 +++++++ .../wpi/first/wpilibj/simulation/AddressableLEDSim.java | 9 +++++++++ 2 files changed, 16 insertions(+) diff --git a/wpilibj/src/main/java/edu/wpi/first/wpilibj/AddressableLEDBuffer.java b/wpilibj/src/main/java/edu/wpi/first/wpilibj/AddressableLEDBuffer.java index 28bbc4b4c5e..f9d1dc51cae 100644 --- a/wpilibj/src/main/java/edu/wpi/first/wpilibj/AddressableLEDBuffer.java +++ b/wpilibj/src/main/java/edu/wpi/first/wpilibj/AddressableLEDBuffer.java @@ -89,4 +89,11 @@ public int getBlue(int index) { public AddressableLEDBufferView createView(int startingIndex, int endingIndex) { return new AddressableLEDBufferView(this, startingIndex, endingIndex); } + + /** + * Returns the internal byte array of the buffer + */ + public byte[] getBytes() { + return m_buffer; + } } diff --git a/wpilibj/src/main/java/edu/wpi/first/wpilibj/simulation/AddressableLEDSim.java b/wpilibj/src/main/java/edu/wpi/first/wpilibj/simulation/AddressableLEDSim.java index 83ef08e73f0..624b2e96251 100644 --- a/wpilibj/src/main/java/edu/wpi/first/wpilibj/simulation/AddressableLEDSim.java +++ b/wpilibj/src/main/java/edu/wpi/first/wpilibj/simulation/AddressableLEDSim.java @@ -208,6 +208,15 @@ public byte[] getData() { public void setData(byte[] data) { AddressableLEDDataJNI.setData(m_index, data); } + + /** + * Change the LED data. + * + * @param data the new data + */ + public void setData(AddressableLEDBuffer buffer) { + setData(buffer.getBytes()); + } /** Reset all simulation data for this LED object. */ public void resetData() { From c685ba77c263843ae57b623701354f4bc6763703 Mon Sep 17 00:00:00 2001 From: DanPeled <98838880+DanPeled@users.noreply.github.com> Date: Tue, 18 Feb 2025 19:38:12 +0200 Subject: [PATCH 2/6] Added missing import --- .../java/edu/wpi/first/wpilibj/simulation/AddressableLEDSim.java | 1 + 1 file changed, 1 insertion(+) diff --git a/wpilibj/src/main/java/edu/wpi/first/wpilibj/simulation/AddressableLEDSim.java b/wpilibj/src/main/java/edu/wpi/first/wpilibj/simulation/AddressableLEDSim.java index 624b2e96251..42b2cb703dc 100644 --- a/wpilibj/src/main/java/edu/wpi/first/wpilibj/simulation/AddressableLEDSim.java +++ b/wpilibj/src/main/java/edu/wpi/first/wpilibj/simulation/AddressableLEDSim.java @@ -6,6 +6,7 @@ import edu.wpi.first.hal.simulation.AddressableLEDDataJNI; import edu.wpi.first.hal.simulation.ConstBufferCallback; +import edu.wpi.first.wpilibj.AddressableLEDBuffer; import edu.wpi.first.hal.simulation.NotifyCallback; import edu.wpi.first.wpilibj.AddressableLED; import java.util.NoSuchElementException; From 1e30a9696f2d9145248e3d84bd0139fcd47c7d4f Mon Sep 17 00:00:00 2001 From: DanPeled <98838880+DanPeled@users.noreply.github.com> Date: Tue, 18 Feb 2025 19:41:38 +0200 Subject: [PATCH 3/6] format --- .../main/java/edu/wpi/first/wpilibj/AddressableLEDBuffer.java | 4 +--- .../edu/wpi/first/wpilibj/simulation/AddressableLEDSim.java | 4 ++-- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/wpilibj/src/main/java/edu/wpi/first/wpilibj/AddressableLEDBuffer.java b/wpilibj/src/main/java/edu/wpi/first/wpilibj/AddressableLEDBuffer.java index f9d1dc51cae..ff4dfc519ab 100644 --- a/wpilibj/src/main/java/edu/wpi/first/wpilibj/AddressableLEDBuffer.java +++ b/wpilibj/src/main/java/edu/wpi/first/wpilibj/AddressableLEDBuffer.java @@ -90,9 +90,7 @@ public AddressableLEDBufferView createView(int startingIndex, int endingIndex) { return new AddressableLEDBufferView(this, startingIndex, endingIndex); } - /** - * Returns the internal byte array of the buffer - */ + /** Returns the internal byte array of the buffer */ public byte[] getBytes() { return m_buffer; } diff --git a/wpilibj/src/main/java/edu/wpi/first/wpilibj/simulation/AddressableLEDSim.java b/wpilibj/src/main/java/edu/wpi/first/wpilibj/simulation/AddressableLEDSim.java index 42b2cb703dc..76cde96d1a3 100644 --- a/wpilibj/src/main/java/edu/wpi/first/wpilibj/simulation/AddressableLEDSim.java +++ b/wpilibj/src/main/java/edu/wpi/first/wpilibj/simulation/AddressableLEDSim.java @@ -6,9 +6,9 @@ import edu.wpi.first.hal.simulation.AddressableLEDDataJNI; import edu.wpi.first.hal.simulation.ConstBufferCallback; -import edu.wpi.first.wpilibj.AddressableLEDBuffer; import edu.wpi.first.hal.simulation.NotifyCallback; import edu.wpi.first.wpilibj.AddressableLED; +import edu.wpi.first.wpilibj.AddressableLEDBuffer; import java.util.NoSuchElementException; /** Class to control a simulated addressable LED. */ @@ -209,7 +209,7 @@ public byte[] getData() { public void setData(byte[] data) { AddressableLEDDataJNI.setData(m_index, data); } - + /** * Change the LED data. * From db59933e697c31e509d9e643182f2b3babb90d33 Mon Sep 17 00:00:00 2001 From: DanPeled <98838880+DanPeled@users.noreply.github.com> Date: Wed, 19 Feb 2025 10:21:55 +0200 Subject: [PATCH 4/6] Correct param names, format --- .../java/edu/wpi/first/wpilibj/AddressableLEDBuffer.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/wpilibj/src/main/java/edu/wpi/first/wpilibj/AddressableLEDBuffer.java b/wpilibj/src/main/java/edu/wpi/first/wpilibj/AddressableLEDBuffer.java index ff4dfc519ab..b6b8e541165 100644 --- a/wpilibj/src/main/java/edu/wpi/first/wpilibj/AddressableLEDBuffer.java +++ b/wpilibj/src/main/java/edu/wpi/first/wpilibj/AddressableLEDBuffer.java @@ -90,7 +90,11 @@ public AddressableLEDBufferView createView(int startingIndex, int endingIndex) { return new AddressableLEDBufferView(this, startingIndex, endingIndex); } - /** Returns the internal byte array of the buffer */ + /** + * Returns the internal byte array of the buffer + * + * @return internal buffer byte array + */ public byte[] getBytes() { return m_buffer; } From f8b804c1ce77585be80fa027dca055acf033cba8 Mon Sep 17 00:00:00 2001 From: DanPeled <98838880+DanPeled@users.noreply.github.com> Date: Wed, 19 Feb 2025 10:24:32 +0200 Subject: [PATCH 5/6] format --- .../edu/wpi/first/wpilibj/simulation/AddressableLEDSim.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wpilibj/src/main/java/edu/wpi/first/wpilibj/simulation/AddressableLEDSim.java b/wpilibj/src/main/java/edu/wpi/first/wpilibj/simulation/AddressableLEDSim.java index 76cde96d1a3..19e2d2f0160 100644 --- a/wpilibj/src/main/java/edu/wpi/first/wpilibj/simulation/AddressableLEDSim.java +++ b/wpilibj/src/main/java/edu/wpi/first/wpilibj/simulation/AddressableLEDSim.java @@ -213,7 +213,7 @@ public void setData(byte[] data) { /** * Change the LED data. * - * @param data the new data + * @param buffer the new data buffer */ public void setData(AddressableLEDBuffer buffer) { setData(buffer.getBytes()); From 688df7ec0cad8c3ef94877891b35f7189811c610 Mon Sep 17 00:00:00 2001 From: DanPeled <98838880+DanPeled@users.noreply.github.com> Date: Thu, 20 Feb 2025 10:59:49 +0200 Subject: [PATCH 6/6] Added period to end of doc --- .../main/java/edu/wpi/first/wpilibj/AddressableLEDBuffer.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wpilibj/src/main/java/edu/wpi/first/wpilibj/AddressableLEDBuffer.java b/wpilibj/src/main/java/edu/wpi/first/wpilibj/AddressableLEDBuffer.java index b6b8e541165..4d918f3b981 100644 --- a/wpilibj/src/main/java/edu/wpi/first/wpilibj/AddressableLEDBuffer.java +++ b/wpilibj/src/main/java/edu/wpi/first/wpilibj/AddressableLEDBuffer.java @@ -91,7 +91,7 @@ public AddressableLEDBufferView createView(int startingIndex, int endingIndex) { } /** - * Returns the internal byte array of the buffer + * Returns the internal byte array of the buffer. * * @return internal buffer byte array */