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

[hal] Resource classes: Use expected, refactor errors (#8768)

Browse Source 
Also revamp SetLastError et al; Instead of taking status by pointer,
take by value and return new status instead. Rename from SetLast to Make
to make this new usage obvious.

Also move declarations for the error functions from duplicated in the
per-target HALInternal.hpp to a common ErrorHandling.hpp.
This commit is contained in:
Peter Johnson
2026-04-17 20:19:38 -07:00
committed by GitHub
parent 6cb6903780
commit a97214df43
31 changed files with 309 additions and 406 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
hal/src/main/native/sim/PWM.cpp
View File

@@ -6,9 +6,9 @@
#include "DigitalInternal.hpp"
#include "HALInitializer.hpp"
#include "HALInternal.hpp"
#include "PortsInternal.hpp"
#include "mockdata/PWMDataInternal.hpp"
#include "wpi/hal/ErrorHandling.hpp"
#include "wpi/hal/handles/HandlesInternal.hpp"
using namespace wpi::hal;
@@ -25,9 +25,9 @@ HAL_DigitalHandle HAL_InitializePWMPort(int32_t channel,
wpi::hal::init::CheckInit();
if (channel < 0 || channel >= kNumPWMChannels) {
*status = RESOURCE_OUT_OF_RANGE;
wpi::hal::SetLastErrorIndexOutOfRange(status, "Invalid Index for PWM", 0,
kNumPWMChannels, channel);
*status =
MakeErrorIndexOutOfRange(RESOURCE_OUT_OF_RANGE, "Invalid Index for PWM",
0, kNumPWMChannels, channel);
return HAL_INVALID_HANDLE;
}
@@ -39,22 +39,15 @@ HAL_DigitalHandle HAL_InitializePWMPort(int32_t channel,
channel = remapMXPPWMChannel(channel) + 10; // remap MXP to proper channel
}
HAL_DigitalHandle handle;
auto resource =
digitalChannelHandles->Allocate(channel, HAL_HandleEnum::PWM, "PWM");
auto port = digitalChannelHandles->Allocate(channel, HAL_HandleEnum::PWM,
&handle, status);
if (*status != 0) {
if (port) {
wpi::hal::SetLastErrorPreviouslyAllocated(status, "PWM or DIO", channel,
port->previousAllocation);
} else {
wpi::hal::SetLastErrorIndexOutOfRange(status, "Invalid Index for PWM", 0,
kNumPWMChannels, channel);
}
if (!resource) {
*status = resource.error();
return HAL_INVALID_HANDLE; // failed to allocate. Pass error back.
}
auto [handle, port] = *resource;
port->channel = origChannel;
SimPWMData[origChannel].initialized = true;