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/PWM.cc b/frc971/wpilib/ahal/PWM.cc
index 0bf38a3..31b9863 100644
--- a/frc971/wpilib/ahal/PWM.cc
+++ b/frc971/wpilib/ahal/PWM.cc
@@ -10,10 +10,10 @@
#include <sstream>
+#include "frc971/wpilib/ahal/WPIErrors.h"
+#include "glog/logging.h"
#include "hal/HAL.h"
#include "hal/Ports.h"
-#include "frc971/wpilib/ahal/Utility.h"
-#include "frc971/wpilib/ahal/WPIErrors.h"
using namespace frc;
@@ -37,7 +37,7 @@
}
int32_t status = 0;
- m_handle = HAL_InitializePWMPort(HAL_GetPort(channel), &status);
+ m_handle = HAL_InitializePWMPort(HAL_GetPort(channel), nullptr, &status);
if (status != 0) {
// wpi_setErrorWithContextRange(status, 0, HAL_GetNumPWMChannels(),
// channel,
@@ -271,7 +271,7 @@
HAL_SetPWMPeriodScale(m_handle, 0, &status); // Don't squelch any outputs
break;
default:
- wpi_assert(false);
+ LOG(FATAL) << "Invalid multiplier " << mult;
}
HAL_FATAL_ERROR();