Merge commit '4ee017201227ce16a4edef20912b357e8f303483' into master
Update WPILib for the 2022 beta test. This now actually runs on my RIO
2.0!
Change-Id: I6d335f61c6abe50facca76f4f5014537e742f1ac
Signed-off-by: Austin Schuh <austin.linux@gmail.com>
diff --git a/frc971/wpilib/ahal/SensorBase.h b/frc971/wpilib/ahal/SensorBase.h
index a4de9cc..39c5130 100644
--- a/frc971/wpilib/ahal/SensorBase.h
+++ b/frc971/wpilib/ahal/SensorBase.h
@@ -10,19 +10,18 @@
#include <cstdint>
#include "frc971/wpilib/ahal/ErrorBase.h"
+#include "hal/PowerDistribution.h"
namespace frc {
inline int GetDefaultSolenoidModule() { return 0; }
-bool CheckSolenoidModule(int moduleNumber);
bool CheckDigitalChannel(int channel);
bool CheckRelayChannel(int channel);
bool CheckPWMChannel(int channel);
bool CheckAnalogInputChannel(int channel);
bool CheckAnalogOutputChannel(int channel);
-bool CheckSolenoidChannel(int channel);
-bool CheckPDPChannel(int channel);
+bool CheckPDPChannel(int channel, HAL_PowerDistributionType type);
extern const int kDigitalChannels;
extern const int kAnalogInputs;