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

[wpilibc] Revert "Return reference from GetInstance" (#3342)

Browse Source 
This reverts commit a79faace1b.

This change will be superseded in a non-breaking way by changing to static functions and deprecating GetInstance() entirely.
This commit is contained in:
Peter Johnson
2021-05-09 18:16:07 -07:00
committed by GitHub
parent 3cc2da3328
commit 3fe8fc75aa
18 changed files with 63 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
wpilibOldCommands/src/main/native/cpp/commands/Scheduler.cpp
View File

@@ -201,19 +201,19 @@ Scheduler::Scheduler() : m_impl(new Impl) {
HAL_Report(HALUsageReporting::kResourceType_Command,
HALUsageReporting::kCommand_Scheduler);
SendableRegistry::GetInstance().AddLW(this, "Scheduler");
auto& scheduler = frc::LiveWindow::GetInstance();
scheduler.enabled = [this] {
SetEnabled(false);
RemoveAll();
auto scheduler = frc::LiveWindow::GetInstance();
scheduler->enabled = [this] {
this->SetEnabled(false);
this->RemoveAll();
};
scheduler.disabled = [this] { SetEnabled(true); };
scheduler->disabled = [this] { this->SetEnabled(true); };
}
Scheduler::~Scheduler() {
SendableRegistry::GetInstance().Remove(this);
auto& scheduler = frc::LiveWindow::GetInstance();
scheduler.enabled = nullptr;
scheduler.disabled = nullptr;
auto scheduler = frc::LiveWindow::GetInstance();
scheduler->enabled = nullptr;
scheduler->disabled = nullptr;
}
void Scheduler::Impl::Remove(Command* command) {