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/InterruptableSensorBase.h b/frc971/wpilib/ahal/InterruptableSensorBase.h
index 59ddc9e..c52463b 100644
--- a/frc971/wpilib/ahal/InterruptableSensorBase.h
+++ b/frc971/wpilib/ahal/InterruptableSensorBase.h
@@ -46,9 +46,6 @@
virtual WaitResult WaitForInterrupt(double timeout,
bool ignorePrevious = true);
- // Enables interrupts to occur based on the current configuration.
- virtual void EnableInterrupts();
-
// Returns the timestamp for the most recent rising interrupt.
virtual hal::fpga_clock::time_point ReadRisingTimestamp();
// Returns the timestamp for the most recent falling interrupt.
@@ -61,7 +58,7 @@
protected:
HAL_InterruptHandle m_interrupt = HAL_kInvalidHandle;
- void AllocateInterrupts(bool watcher);
+ void AllocateInterrupts();
};
} // namespace frc