diff --git a/hal/src/main/native/athena/FRCDriverStation.cpp b/hal/src/main/native/athena/FRCDriverStation.cpp index 55b86e7bc8..d32bf7acaf 100644 --- a/hal/src/main/native/athena/FRCDriverStation.cpp +++ b/hal/src/main/native/athena/FRCDriverStation.cpp @@ -372,18 +372,10 @@ HAL_Bool HAL_IsNewControlData(void) { return true; } -/** - * Waits for the newest DS packet to arrive. Note that this is a blocking call. - */ void HAL_WaitForDSData(void) { HAL_WaitForDSDataTimeout(0); } -/** - * Waits for the newest DS packet to arrive. If timeout is <= 0, this will wait - * forever. Otherwise, it will wait until either a new packet, or the timeout - * time has passed. Returns true on new data, false on timeout. - */ HAL_Bool HAL_WaitForDSDataTimeout(double timeout) { std::unique_lock lock{*newDSDataAvailableMutex}; int& lastCount = GetThreadLocalLastCount(); diff --git a/wpilibc/src/main/native/cpp/PowerDistributionPanel.cpp b/wpilibc/src/main/native/cpp/PowerDistributionPanel.cpp index ed7296020f..32c449f675 100644 --- a/wpilibc/src/main/native/cpp/PowerDistributionPanel.cpp +++ b/wpilibc/src/main/native/cpp/PowerDistributionPanel.cpp @@ -18,9 +18,6 @@ using namespace frc; PowerDistributionPanel::PowerDistributionPanel() : PowerDistributionPanel(0) {} -/** - * Initialize the PDP. - */ PowerDistributionPanel::PowerDistributionPanel(int module) : m_module(module) { int32_t status = 0; m_handle = HAL_InitializePDP(module, &status); diff --git a/wpilibc/src/main/native/include/frc/PowerDistributionPanel.h b/wpilibc/src/main/native/include/frc/PowerDistributionPanel.h index ba285bc08f..9e5ebbaae8 100644 --- a/wpilibc/src/main/native/include/frc/PowerDistributionPanel.h +++ b/wpilibc/src/main/native/include/frc/PowerDistributionPanel.h @@ -20,7 +20,18 @@ class SendableBuilder; class PowerDistributionPanel : public Sendable, public SendableHelper { public: + /** + * Constructs a PowerDistributionPanel. + * + * Uses the default CAN ID (0). + */ PowerDistributionPanel(); + + /** + * Constructs a PowerDistributionPanel. + * + * @param module The CAN ID of the PDP + */ explicit PowerDistributionPanel(int module); PowerDistributionPanel(PowerDistributionPanel&&) = default; diff --git a/wpilibj/src/main/java/edu/wpi/first/wpilibj/PowerDistributionPanel.java b/wpilibj/src/main/java/edu/wpi/first/wpilibj/PowerDistributionPanel.java index 05067c4c32..eed3e0550e 100644 --- a/wpilibj/src/main/java/edu/wpi/first/wpilibj/PowerDistributionPanel.java +++ b/wpilibj/src/main/java/edu/wpi/first/wpilibj/PowerDistributionPanel.java @@ -19,7 +19,7 @@ public class PowerDistributionPanel implements Sendable, AutoCloseable { private final int m_module; /** - * Constructor. + * Constructs a PowerDistributionPanel. * * @param module The CAN ID of the PDP */ @@ -32,7 +32,11 @@ public class PowerDistributionPanel implements Sendable, AutoCloseable { SendableRegistry.addLW(this, "PowerDistributionPanel", module); } - /** Constructor. Uses the default CAN ID (0). */ + /** + * Constructs a PowerDistributionPanel. + * + *

Uses the default CAN ID (0). + */ public PowerDistributionPanel() { this(0); }