deprecation fixes

wpilibsuite · Oct 10, 2024 · 83a0ab9 · 83a0ab9
1 parent f89bd2f
commit 83a0ab9
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 42 deletions.
diff --git a/wpilibc/src/main/native/cpp/simulation/SolenoidSim.cpp b/wpilibc/src/main/native/cpp/simulation/SolenoidSim.cpp
@@ -25,36 +25,28 @@ SolenoidSim::SolenoidSim(PneumaticsModuleType type, int channel)
           PneumaticsBase::GetDefaultForType(type), type)},
       m_channel{channel} {}
 
-bool SolenoidSim::Get() const {
-  return m_module->GetSolenoidOutput(m_channel);
-}
-
 bool SolenoidSim::GetOutput() const {
   return m_module->GetSolenoidOutput(m_channel);
 }
 
-void SolenoidSim::Set(bool output) {
-  m_module->SetSolenoidOutput(m_channel, output);
-}
-
 void SolenoidSim::SetOutput(bool output) {
   m_module->SetSolenoidOutput(m_channel, output);
 }
 
 bool SolenoidSim::IsOn() {
-  return Get();
+  return m_module->GetSolenoidOutput(m_channel);
 }
 
 bool SolenoidSim::IsOff() {
-  return !Get();
+  return !m_module->GetSolenoidOutput(m_channel);
 }
 
 void SolenoidSim::SetOn() {
-  Set(true);
+  m_module->SetSolenoidOutput(m_channel, true);
 }
 
 void SolenoidSim::SetOff() {
-  Set(false);
+  m_module->SetSolenoidOutput(m_channel, false);
 }
 
 std::unique_ptr<CallbackStore> SolenoidSim::RegisterOutputCallback(

diff --git a/wpilibc/src/main/native/include/frc/simulation/SolenoidSim.h b/wpilibc/src/main/native/include/frc/simulation/SolenoidSim.h
@@ -22,26 +22,14 @@ class SolenoidSim {
    * Returns the solenoid output.
    * @return the solenoid output.
    */
-  bool Get() const;
-
-  /**
-   * Returns the solenoid output.
-   * @return the solenoid output.
-   */
-  [[deprecated("Use Get method instead.")]]
+  [[deprecated("Use IsOn or IsOff methods instead.")]]
   bool GetOutput() const;
 
   /**
    * Sets the solenoid output.
    * @param output The new solenoid output.
    */
-  void Set(bool output);
-
-  /**
-   * Sets the solenoid output.
-   * @param output The new solenoid output.
-   */
-  [[deprecated("Use Set method instead.")]]
+  [[deprecated("Use SetOn or SetOff methods instead.")]]
   void SetOutput(bool output);
 
   /**

diff --git a/wpilibj/src/main/java/edu/wpi/first/wpilibj/Solenoid.java b/wpilibj/src/main/java/edu/wpi/first/wpilibj/Solenoid.java
@@ -88,18 +88,6 @@ public boolean get() {
     return (currentAll & m_mask) != 0;
   }
 
-  /**
-   * Read the current value of the solenoid.
-   *
-   * @return True if the solenoid output is on or false if the solenoid output is off.
-   * @deprecated Use get instead
-   */
-  @Deprecated
-  public boolean getOutput() {
-    int currentAll = m_module.getSolenoids();
-    return (currentAll & m_mask) != 0;
-  }
-
   /**
    * Returns true if the solenoid is on.
    *

diff --git a/wpilibj/src/main/java/edu/wpi/first/wpilibj/simulation/SolenoidSim.java b/wpilibj/src/main/java/edu/wpi/first/wpilibj/simulation/SolenoidSim.java
@@ -49,8 +49,10 @@ public SolenoidSim(PneumaticsModuleType moduleType, int channel) {
    * Check the solenoid output.
    *
    * @return the solenoid output
+   * @deprecated Use isOn or isOff instead
    */
-  public boolean get() {
+  @Deprecated
+  public boolean getOutput() {
     return m_module.getSolenoidOutput(m_channel);
   }
 
@@ -74,20 +76,22 @@ public boolean isOff() {
 
   /** Turns the solenoid on. */
   public void setOn() {
-    set(true);
+    m_module.setSolenoidOutput(m_channel, true);
   }
 
   /** Turns the solenoid off. */
   public void setOff() {
-    set(false);
+    m_module.setSolenoidOutput(m_channel, false);
   }
 
   /**
    * Change the solenoid output.
    *
    * @param output the new solenoid output
+   * @deprecated Use setOn or setOff instead.
    */
-  public void set(boolean output) {
+  @Deprecated
+  public void setOutput(boolean output) {
     m_module.setSolenoidOutput(m_channel, output);
   }