mirror of
https://github.com/wpilibsuite/allwpilib
synced 2026-06-19 00:41:43 +00:00
SCRIPT namespace replacements
This commit is contained in:
committed by
Peter Johnson
parent
ae6c043632
commit
9aca8e0fd6
@@ -26,7 +26,7 @@ HALSIMGUI_DATASOURCE_DOUBLE_INDEXED(REVPHCompressorCurrent,
|
||||
"Compressor Current");
|
||||
HALSIMGUI_DATASOURCE_BOOLEAN_INDEXED2(REVPHSolenoidOutput, "Solenoid");
|
||||
|
||||
class CompressorSimModel : public glass::CompressorModel {
|
||||
class CompressorSimModel : public wpi::glass::CompressorModel {
|
||||
public:
|
||||
explicit CompressorSimModel(int32_t index)
|
||||
: m_index{index},
|
||||
@@ -38,12 +38,12 @@ class CompressorSimModel : public glass::CompressorModel {
|
||||
|
||||
bool Exists() override { return HALSIM_GetREVPHInitialized(m_index); }
|
||||
|
||||
glass::BooleanSource* GetRunningData() override { return &m_running; }
|
||||
glass::BooleanSource* GetEnabledData() override { return nullptr; }
|
||||
glass::BooleanSource* GetPressureSwitchData() override {
|
||||
wpi::glass::BooleanSource* GetRunningData() override { return &m_running; }
|
||||
wpi::glass::BooleanSource* GetEnabledData() override { return nullptr; }
|
||||
wpi::glass::BooleanSource* GetPressureSwitchData() override {
|
||||
return &m_pressureSwitch;
|
||||
}
|
||||
glass::DoubleSource* GetCurrentData() override { return &m_current; }
|
||||
wpi::glass::DoubleSource* GetCurrentData() override { return &m_current; }
|
||||
|
||||
void SetRunning(bool val) override {
|
||||
HALSIM_SetREVPHCompressorOn(m_index, val);
|
||||
@@ -63,7 +63,7 @@ class CompressorSimModel : public glass::CompressorModel {
|
||||
REVPHCompressorCurrentSource m_current;
|
||||
};
|
||||
|
||||
class SolenoidSimModel : public glass::SolenoidModel {
|
||||
class SolenoidSimModel : public wpi::glass::SolenoidModel {
|
||||
public:
|
||||
SolenoidSimModel(int32_t index, int32_t channel)
|
||||
: m_index{index}, m_channel{channel}, m_output{index, channel} {}
|
||||
@@ -72,7 +72,7 @@ class SolenoidSimModel : public glass::SolenoidModel {
|
||||
|
||||
bool Exists() override { return HALSIM_GetREVPHInitialized(m_index); }
|
||||
|
||||
glass::BooleanSource* GetOutputData() override { return &m_output; }
|
||||
wpi::glass::BooleanSource* GetOutputData() override { return &m_output; }
|
||||
|
||||
void SetOutput(bool val) override {
|
||||
HALSIM_SetREVPHSolenoidOutput(m_index, m_channel, val);
|
||||
@@ -84,7 +84,7 @@ class SolenoidSimModel : public glass::SolenoidModel {
|
||||
REVPHSolenoidOutputSource m_output;
|
||||
};
|
||||
|
||||
class PHSimModel : public glass::PneumaticControlModel {
|
||||
class PHSimModel : public wpi::glass::PneumaticControlModel {
|
||||
public:
|
||||
explicit PHSimModel(int32_t index)
|
||||
: m_index{index},
|
||||
@@ -98,7 +98,7 @@ class PHSimModel : public glass::PneumaticControlModel {
|
||||
CompressorSimModel* GetCompressor() override { return &m_compressor; }
|
||||
|
||||
void ForEachSolenoid(
|
||||
wpi::function_ref<void(glass::SolenoidModel& model, int index)> func)
|
||||
wpi::util::function_ref<void(wpi::glass::SolenoidModel& model, int index)> func)
|
||||
override;
|
||||
|
||||
std::string_view GetName() override { return "PH"; }
|
||||
@@ -112,7 +112,7 @@ class PHSimModel : public glass::PneumaticControlModel {
|
||||
int m_solenoidInitCount = 0;
|
||||
};
|
||||
|
||||
class PHsSimModel : public glass::PneumaticControlsModel {
|
||||
class PHsSimModel : public wpi::glass::PneumaticControlsModel {
|
||||
public:
|
||||
PHsSimModel() : m_models(HAL_GetNumREVPHModules()) {}
|
||||
|
||||
@@ -121,7 +121,7 @@ class PHsSimModel : public glass::PneumaticControlsModel {
|
||||
bool Exists() override { return true; }
|
||||
|
||||
void ForEachPneumaticControl(
|
||||
wpi::function_ref<void(glass::PneumaticControlModel& model, int index)>
|
||||
wpi::util::function_ref<void(wpi::glass::PneumaticControlModel& model, int index)>
|
||||
func) override;
|
||||
|
||||
private:
|
||||
@@ -146,7 +146,7 @@ void PHSimModel::Update() {
|
||||
}
|
||||
|
||||
void PHSimModel::ForEachSolenoid(
|
||||
wpi::function_ref<void(glass::SolenoidModel& model, int index)> func) {
|
||||
wpi::util::function_ref<void(wpi::glass::SolenoidModel& model, int index)> func) {
|
||||
if (m_solenoidInitCount == 0) {
|
||||
return;
|
||||
}
|
||||
@@ -174,7 +174,7 @@ void PHsSimModel::Update() {
|
||||
}
|
||||
|
||||
void PHsSimModel::ForEachPneumaticControl(
|
||||
wpi::function_ref<void(glass::PneumaticControlModel& model, int index)>
|
||||
wpi::util::function_ref<void(wpi::glass::PneumaticControlModel& model, int index)>
|
||||
func) {
|
||||
int32_t numREVPHs = m_models.size();
|
||||
for (int32_t i = 0; i < numREVPHs; ++i) {
|
||||
@@ -194,10 +194,10 @@ bool PHSimGui::PHsAnyInitialized() {
|
||||
return false;
|
||||
}
|
||||
|
||||
bool PHSimGui::PHsAnySolenoids(glass::PneumaticControlsModel* model) {
|
||||
bool PHSimGui::PHsAnySolenoids(wpi::glass::PneumaticControlsModel* model) {
|
||||
bool any = false;
|
||||
static_cast<PHsSimModel*>(model)->ForEachPneumaticControl(
|
||||
[&](glass::PneumaticControlModel& REVPH, int) {
|
||||
[&](wpi::glass::PneumaticControlModel& REVPH, int) {
|
||||
if (static_cast<PHSimModel*>(&REVPH)->GetNumSolenoids() > 0) {
|
||||
any = true;
|
||||
}
|
||||
@@ -205,7 +205,7 @@ bool PHSimGui::PHsAnySolenoids(glass::PneumaticControlsModel* model) {
|
||||
return any;
|
||||
}
|
||||
|
||||
std::unique_ptr<glass::PneumaticControlsModel> PHSimGui::GetPHsModel() {
|
||||
std::unique_ptr<wpi::glass::PneumaticControlsModel> PHSimGui::GetPHsModel() {
|
||||
return std::make_unique<PHsSimModel>();
|
||||
}
|
||||
|
||||
@@ -215,8 +215,8 @@ void PHSimGui::Initialize() {
|
||||
[] { return std::make_unique<PHsSimModel>(); });
|
||||
|
||||
SimDeviceGui::GetDeviceTree().Add(
|
||||
HALSimGui::halProvider->GetModel("REVPHs"), [](glass::Model* model) {
|
||||
glass::DisplayCompressorsDevice(
|
||||
HALSimGui::halProvider->GetModel("REVPHs"), [](wpi::glass::Model* model) {
|
||||
wpi::glass::DisplayCompressorsDevice(
|
||||
static_cast<PHsSimModel*>(model),
|
||||
HALSimGui::halProvider->AreOutputsEnabled());
|
||||
});
|
||||
|
||||
Reference in New Issue
Block a user