From 7b7548196a67b244d28c9d46c1acf8e654c59144 Mon Sep 17 00:00:00 2001 From: cpapplefamily Date: Sun, 1 Nov 2020 00:27:05 -0500 Subject: [PATCH] [wpilib] AnalogPotentiometer: provide scaled value to Dashboard (#2824) Previously this sent just the raw analog value; the scaled value is likely what users expect. Co-authored-by: Corey Applegate --- wpilibc/src/main/native/cpp/AnalogPotentiometer.cpp | 3 ++- .../main/java/edu/wpi/first/wpilibj/AnalogPotentiometer.java | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/wpilibc/src/main/native/cpp/AnalogPotentiometer.cpp b/wpilibc/src/main/native/cpp/AnalogPotentiometer.cpp index 4fc33ade89..7948a9dd45 100644 --- a/wpilibc/src/main/native/cpp/AnalogPotentiometer.cpp +++ b/wpilibc/src/main/native/cpp/AnalogPotentiometer.cpp @@ -44,5 +44,6 @@ double AnalogPotentiometer::Get() const { double AnalogPotentiometer::PIDGet() { return Get(); } void AnalogPotentiometer::InitSendable(SendableBuilder& builder) { - m_analog_input->InitSendable(builder); + builder.AddDoubleProperty( + "Value", [=]() { return Get(); }, nullptr); } diff --git a/wpilibj/src/main/java/edu/wpi/first/wpilibj/AnalogPotentiometer.java b/wpilibj/src/main/java/edu/wpi/first/wpilibj/AnalogPotentiometer.java index dc2bdef833..f0d57b56bb 100644 --- a/wpilibj/src/main/java/edu/wpi/first/wpilibj/AnalogPotentiometer.java +++ b/wpilibj/src/main/java/edu/wpi/first/wpilibj/AnalogPotentiometer.java @@ -159,7 +159,7 @@ public class AnalogPotentiometer implements Potentiometer, Sendable, AutoCloseab @Override public void initSendable(SendableBuilder builder) { if (m_analogInput != null) { - m_analogInput.initSendable(builder); + builder.addDoubleProperty("Value", this::get, null); } }