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

[wpilibc] Refactor AnalogTrigger to use shared_ptr (#7010)

Browse Source
This commit is contained in:
Ryan Blue
2024-08-29 00:34:28 -04:00
committed by GitHub
parent c9ad26b723
commit dc18f71004
2 changed files with 61 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
wpilibc/src/main/native/cpp/AnalogTrigger.cpp
View File

@@ -18,24 +18,36 @@
using namespace frc;
AnalogTrigger::AnalogTrigger(int channel)
: AnalogTrigger(new AnalogInput(channel)) {
: AnalogTrigger(std::make_shared<AnalogInput>(channel)) {
m_ownsAnalog = true;
wpi::SendableRegistry::AddChild(this, m_analogInput);
wpi::SendableRegistry::AddChild(this, m_analogInput.get());
}
AnalogTrigger::AnalogTrigger(AnalogInput* input) {
m_analogInput = input;
AnalogTrigger::AnalogTrigger(AnalogInput& input)
: AnalogTrigger{{&input, wpi::NullDeleter<AnalogInput>{}}} {}
AnalogTrigger::AnalogTrigger(AnalogInput* input)
: AnalogTrigger{{input, wpi::NullDeleter<AnalogInput>{}}} {}
AnalogTrigger::AnalogTrigger(std::shared_ptr<AnalogInput> input)
: m_analogInput{std::move(input)} {
int32_t status = 0;
m_trigger = HAL_InitializeAnalogTrigger(input->m_port, &status);
FRC_CheckErrorStatus(status, "Channel {}", input->GetChannel());
m_trigger = HAL_InitializeAnalogTrigger(m_analogInput->m_port, &status);
FRC_CheckErrorStatus(status, "Channel {}", m_analogInput->GetChannel());
int index = GetIndex();
HAL_Report(HALUsageReporting::kResourceType_AnalogTrigger, index + 1);
wpi::SendableRegistry::AddLW(this, "AnalogTrigger", index);
}
AnalogTrigger::AnalogTrigger(DutyCycle* input) {
m_dutyCycle = input;
AnalogTrigger::AnalogTrigger(DutyCycle& input)
: AnalogTrigger{{&input, wpi::NullDeleter<DutyCycle>{}}} {}
AnalogTrigger::AnalogTrigger(DutyCycle* input)
: AnalogTrigger{{input, wpi::NullDeleter<DutyCycle>{}}} {}
AnalogTrigger::AnalogTrigger(std::shared_ptr<DutyCycle> input)
: m_dutyCycle{input} {
int32_t status = 0;
m_trigger = HAL_InitializeAnalogTriggerDutyCycle(input->m_handle, &status);
FRC_CheckErrorStatus(status, "Channel {}", m_dutyCycle->GetSourceChannel());
@@ -49,10 +61,6 @@ AnalogTrigger::~AnalogTrigger() {
int32_t status = 0;
HAL_CleanAnalogTrigger(m_trigger, &status);
FRC_ReportError(status, "Channel {}", GetSourceChannel());
if (m_ownsAnalog) {
delete m_analogInput;
}
}
void AnalogTrigger::SetLimitsVoltage(double lower, double upper) {