Team2890/allwpilib
4
0
Fork 0
mirror of https://github.com/wpilibsuite/allwpilib synced 2026-06-20 00:51:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

[wpiutil] Upgrade to fmt 9.0.0 (#4337)

Browse Source 
fmt removed fmt::make_args_checked since it's no longer needed for
constexpr format string checks.

fmt deprecated implicit conversions from enums to integers in format
arguments, so I added explicit static casts.
This commit is contained in:
Tyler Veness
2022-08-16 15:35:26 -07:00
committed by GitHub
parent 340465c929
commit 151dabb2af
38 changed files with 3522 additions and 3364 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
wpilibc/src/main/native/cpp/ADIS16448_IMU.cpp
View File

@@ -56,7 +56,7 @@ inline void ADISReportError(int32_t status, const char* file, int line,
const char* function, const S& format,
Args&&... args) {
frc::ReportErrorV(status, file, line, function, format,
fmt::make_args_checked<Args...>(format, args...));
fmt::make_format_args(args...));
}
} // namespace

2
wpilibc/src/main/native/cpp/ADIS16470_IMU.cpp
View File

@@ -50,7 +50,7 @@ inline void ADISReportError(int32_t status, const char* file, int line,
const char* function, const S& format,
Args&&... args) {
frc::ReportErrorV(status, file, line, function, format,
fmt::make_args_checked<Args...>(format, args...));
fmt::make_format_args(args...));
}
} // namespace

6
wpilibc/src/main/native/cpp/DriverStation.cpp
View File

@@ -179,8 +179,7 @@ static void ReportJoystickUnpluggedErrorV(fmt::string_view format,
template <typename S, typename... Args>
static inline void ReportJoystickUnpluggedError(const S& format,
Args&&... args) {
ReportJoystickUnpluggedErrorV(
format, fmt::make_args_checked<Args...>(format, args...));
ReportJoystickUnpluggedErrorV(format, fmt::make_format_args(args...));
}
/**
@@ -194,8 +193,7 @@ static void ReportJoystickUnpluggedWarningV(fmt::string_view format,
template <typename S, typename... Args>
static inline void ReportJoystickUnpluggedWarning(const S& format,
Args&&... args) {
ReportJoystickUnpluggedWarningV(
format, fmt::make_args_checked<Args...>(format, args...));
ReportJoystickUnpluggedWarningV(format, fmt::make_format_args(args...));
}
static int& GetDSLastCount() {

2
wpilibc/src/main/native/cpp/I2C.cpp
View File

@@ -25,7 +25,7 @@ I2C::I2C(Port port, int deviceAddress)
}
HAL_InitializeI2C(m_port, &status);
FRC_CheckErrorStatus(status, "Port {}", port);
FRC_CheckErrorStatus(status, "Port {}", static_cast<int>(port));
HAL_Report(HALUsageReporting::kResourceType_I2C, deviceAddress);
}

2
wpilibc/src/main/native/cpp/PWM.cpp
View File

@@ -117,7 +117,7 @@ void PWM::SetPeriodMultiplier(PeriodMultiplier mult) {
break;
default:
throw FRC_MakeError(err::InvalidParameter, "PeriodMultiplier value {}",
mult);
static_cast<int>(mult));
}
FRC_CheckErrorStatus(status, "Channel {}", m_channel);

30
wpilibc/src/main/native/cpp/SPI.cpp
View File

@@ -77,7 +77,7 @@ void SPI::Accumulator::Update() {
// get amount of data available
int32_t numToRead =
HAL_ReadSPIAutoReceivedData(m_port, m_buf, 0, 0, &status);
FRC_CheckErrorStatus(status, "Port {}", m_port);
FRC_CheckErrorStatus(status, "Port {}", static_cast<int>(m_port));
// only get whole responses; +1 is for timestamp
numToRead -= numToRead % m_xferSize;
@@ -91,7 +91,7 @@ void SPI::Accumulator::Update() {
// read buffered data
HAL_ReadSPIAutoReceivedData(m_port, m_buf, numToRead, 0, &status);
FRC_CheckErrorStatus(status, "Port {}", m_port);
FRC_CheckErrorStatus(status, "Port {}", static_cast<int>(m_port));
// loop over all responses
for (int32_t off = 0; off < numToRead; off += m_xferSize) {
@@ -158,7 +158,7 @@ void SPI::Accumulator::Update() {
SPI::SPI(Port port) : m_port(static_cast<HAL_SPIPort>(port)) {
int32_t status = 0;
HAL_InitializeSPI(m_port, &status);
FRC_CheckErrorStatus(status, "Port {}", m_port);
FRC_CheckErrorStatus(status, "Port {}", static_cast<int>(m_port));
HAL_Report(HALUsageReporting::kResourceType_SPI,
static_cast<uint8_t>(port) + 1);
@@ -209,13 +209,13 @@ void SPI::SetClockActiveHigh() {
void SPI::SetChipSelectActiveHigh() {
int32_t status = 0;
HAL_SetSPIChipSelectActiveHigh(m_port, &status);
FRC_CheckErrorStatus(status, "Port {}", m_port);
FRC_CheckErrorStatus(status, "Port {}", static_cast<int>(m_port));
}
void SPI::SetChipSelectActiveLow() {
int32_t status = 0;
HAL_SetSPIChipSelectActiveLow(m_port, &status);
FRC_CheckErrorStatus(status, "Port {}", m_port);
FRC_CheckErrorStatus(status, "Port {}", static_cast<int>(m_port));
}
int SPI::Write(uint8_t* data, int size) {
@@ -245,13 +245,13 @@ int SPI::Transaction(uint8_t* dataToSend, uint8_t* dataReceived, int size) {
void SPI::InitAuto(int bufferSize) {
int32_t status = 0;
HAL_InitSPIAuto(m_port, bufferSize, &status);
FRC_CheckErrorStatus(status, "Port {}", m_port);
FRC_CheckErrorStatus(status, "Port {}", static_cast<int>(m_port));
}
void SPI::FreeAuto() {
int32_t status = 0;
HAL_FreeSPIAuto(m_port, &status);
FRC_CheckErrorStatus(status, "Port {}", m_port);
FRC_CheckErrorStatus(status, "Port {}", static_cast<int>(m_port));
}
void SPI::SetAutoTransmitData(wpi::span<const uint8_t> dataToSend,
@@ -259,13 +259,13 @@ void SPI::SetAutoTransmitData(wpi::span<const uint8_t> dataToSend,
int32_t status = 0;
HAL_SetSPIAutoTransmitData(m_port, dataToSend.data(), dataToSend.size(),
zeroSize, &status);
FRC_CheckErrorStatus(status, "Port {}", m_port);
FRC_CheckErrorStatus(status, "Port {}", static_cast<int>(m_port));
}
void SPI::StartAutoRate(units::second_t period) {
int32_t status = 0;
HAL_StartSPIAutoRate(m_port, period.value(), &status);
FRC_CheckErrorStatus(status, "Port {}", m_port);
FRC_CheckErrorStatus(status, "Port {}", static_cast<int>(m_port));
}
void SPI::StartAutoTrigger(DigitalSource& source, bool rising, bool falling) {
@@ -274,19 +274,19 @@ void SPI::StartAutoTrigger(DigitalSource& source, bool rising, bool falling) {
static_cast<HAL_AnalogTriggerType>(
source.GetAnalogTriggerTypeForRouting()),
rising, falling, &status);
FRC_CheckErrorStatus(status, "Port {}", m_port);
FRC_CheckErrorStatus(status, "Port {}", static_cast<int>(m_port));
}
void SPI::StopAuto() {
int32_t status = 0;
HAL_StopSPIAuto(m_port, &status);
FRC_CheckErrorStatus(status, "Port {}", m_port);
FRC_CheckErrorStatus(status, "Port {}", static_cast<int>(m_port));
}
void SPI::ForceAutoRead() {
int32_t status = 0;
HAL_ForceSPIAutoRead(m_port, &status);
FRC_CheckErrorStatus(status, "Port {}", m_port);
FRC_CheckErrorStatus(status, "Port {}", static_cast<int>(m_port));
}
int SPI::ReadAutoReceivedData(uint32_t* buffer, int numToRead,
@@ -294,14 +294,14 @@ int SPI::ReadAutoReceivedData(uint32_t* buffer, int numToRead,
int32_t status = 0;
int32_t val = HAL_ReadSPIAutoReceivedData(m_port, buffer, numToRead,
timeout.value(), &status);
FRC_CheckErrorStatus(status, "Port {}", m_port);
FRC_CheckErrorStatus(status, "Port {}", static_cast<int>(m_port));
return val;
}
int SPI::GetAutoDroppedCount() {
int32_t status = 0;
int32_t val = HAL_GetSPIAutoDroppedCount(m_port, &status);
FRC_CheckErrorStatus(status, "Port {}", m_port);
FRC_CheckErrorStatus(status, "Port {}", static_cast<int>(m_port));
return val;
}
@@ -310,7 +310,7 @@ void SPI::ConfigureAutoStall(HAL_SPIPort port, int csToSclkTicks,
int32_t status = 0;
HAL_ConfigureSPIAutoStall(m_port, csToSclkTicks, stallTicks, pow2BytesPerRead,
&status);
FRC_CheckErrorStatus(status, "Port {}", m_port);
FRC_CheckErrorStatus(status, "Port {}", static_cast<int>(m_port));
}
void SPI::InitAccumulator(units::second_t period, int cmd, int xferSize,

19
wpilibc/src/main/native/cpp/SerialPort.cpp
View File

@@ -20,15 +20,16 @@ SerialPort::SerialPort(int baudRate, Port port, int dataBits,
m_portHandle =
HAL_InitializeSerialPort(static_cast<HAL_SerialPort>(port), &status);
FRC_CheckErrorStatus(status, "Port {}", port);
FRC_CheckErrorStatus(status, "Port {}", static_cast<int>(port));
HAL_SetSerialBaudRate(m_portHandle, baudRate, &status);
FRC_CheckErrorStatus(status, "SetSerialBaudRate {}", baudRate);
HAL_SetSerialDataBits(m_portHandle, dataBits, &status);
FRC_CheckErrorStatus(status, "SetSerialDataBits {}", dataBits);
HAL_SetSerialParity(m_portHandle, parity, &status);
FRC_CheckErrorStatus(status, "SetSerialParity {}", parity);
FRC_CheckErrorStatus(status, "SetSerialParity {}", static_cast<int>(parity));
HAL_SetSerialStopBits(m_portHandle, stopBits, &status);
FRC_CheckErrorStatus(status, "SetSerialStopBits {}", stopBits);
FRC_CheckErrorStatus(status, "SetSerialStopBits {}",
static_cast<int>(stopBits));
// Set the default timeout to 5 seconds.
SetTimeout(5_s);
@@ -50,15 +51,16 @@ SerialPort::SerialPort(int baudRate, std::string_view portName, Port port,
m_portHandle =
HAL_InitializeSerialPortDirect(static_cast<HAL_SerialPort>(port),
std::string(portName).c_str(), &status);
FRC_CheckErrorStatus(status, "Port {}", port);
FRC_CheckErrorStatus(status, "Port {}", static_cast<int>(port));
HAL_SetSerialBaudRate(m_portHandle, baudRate, &status);
FRC_CheckErrorStatus(status, "SetSerialBaudRate {}", baudRate);
HAL_SetSerialDataBits(m_portHandle, dataBits, &status);
FRC_CheckErrorStatus(status, "SetSerialDataBits {}", dataBits);
HAL_SetSerialParity(m_portHandle, parity, &status);
FRC_CheckErrorStatus(status, "SetSerialParity {}", parity);
FRC_CheckErrorStatus(status, "SetSerialParity {}", static_cast<int>(parity));
HAL_SetSerialStopBits(m_portHandle, stopBits, &status);
FRC_CheckErrorStatus(status, "SetSerialStopBits {}", stopBits);
FRC_CheckErrorStatus(status, "SetSerialStopBits {}",
static_cast<int>(stopBits));
// Set the default timeout to 5 seconds.
SetTimeout(5_s);
@@ -81,7 +83,8 @@ SerialPort::~SerialPort() {
void SerialPort::SetFlowControl(SerialPort::FlowControl flowControl) {
int32_t status = 0;
HAL_SetSerialFlowControl(m_portHandle, flowControl, &status);
FRC_CheckErrorStatus(status, "SetFlowControl {}", flowControl);
FRC_CheckErrorStatus(status, "SetFlowControl {}",
static_cast<int>(flowControl));
}
void SerialPort::EnableTermination(char terminator) {
@@ -143,7 +146,7 @@ void SerialPort::SetWriteBufferSize(int size) {
void SerialPort::SetWriteBufferMode(SerialPort::WriteBufferMode mode) {
int32_t status = 0;
HAL_SetSerialWriteMode(m_portHandle, mode, &status);
FRC_CheckErrorStatus(status, "SetWriteBufferMode {}", mode);
FRC_CheckErrorStatus(status, "SetWriteBufferMode {}", static_cast<int>(mode));
}
void SerialPort::Flush() {