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
@@ -27,7 +27,7 @@ HALSIMGUI_DATASOURCE_DOUBLE_INDEXED(CTREPCMCompressorCurrent,
|
||||
"Compressor Current");
|
||||
HALSIMGUI_DATASOURCE_BOOLEAN_INDEXED2(CTREPCMSolenoidOutput, "Solenoid");
|
||||
|
||||
class CompressorSimModel : public glass::CompressorModel {
|
||||
class CompressorSimModel : public wpi::glass::CompressorModel {
|
||||
public:
|
||||
explicit CompressorSimModel(int32_t index)
|
||||
: m_index{index},
|
||||
@@ -40,12 +40,12 @@ class CompressorSimModel : public glass::CompressorModel {
|
||||
|
||||
bool Exists() override { return HALSIM_GetCTREPCMInitialized(m_index); }
|
||||
|
||||
glass::BooleanSource* GetRunningData() override { return &m_running; }
|
||||
glass::BooleanSource* GetEnabledData() override { return &m_enabled; }
|
||||
glass::BooleanSource* GetPressureSwitchData() override {
|
||||
wpi::glass::BooleanSource* GetRunningData() override { return &m_running; }
|
||||
wpi::glass::BooleanSource* GetEnabledData() override { return &m_enabled; }
|
||||
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_SetCTREPCMCompressorOn(m_index, val);
|
||||
@@ -68,7 +68,7 @@ class CompressorSimModel : public glass::CompressorModel {
|
||||
CTREPCMCompressorCurrentSource 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} {}
|
||||
@@ -77,7 +77,7 @@ class SolenoidSimModel : public glass::SolenoidModel {
|
||||
|
||||
bool Exists() override { return HALSIM_GetCTREPCMInitialized(m_index); }
|
||||
|
||||
glass::BooleanSource* GetOutputData() override { return &m_output; }
|
||||
wpi::glass::BooleanSource* GetOutputData() override { return &m_output; }
|
||||
|
||||
void SetOutput(bool val) override {
|
||||
HALSIM_SetCTREPCMSolenoidOutput(m_index, m_channel, val);
|
||||
@@ -89,7 +89,7 @@ class SolenoidSimModel : public glass::SolenoidModel {
|
||||
CTREPCMSolenoidOutputSource m_output;
|
||||
};
|
||||
|
||||
class PCMSimModel : public glass::PneumaticControlModel {
|
||||
class PCMSimModel : public wpi::glass::PneumaticControlModel {
|
||||
public:
|
||||
explicit PCMSimModel(int32_t index)
|
||||
: m_index{index},
|
||||
@@ -103,7 +103,7 @@ class PCMSimModel : 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 "PCM"; }
|
||||
@@ -117,7 +117,7 @@ class PCMSimModel : public glass::PneumaticControlModel {
|
||||
int m_solenoidInitCount = 0;
|
||||
};
|
||||
|
||||
class PCMsSimModel : public glass::PneumaticControlsModel {
|
||||
class PCMsSimModel : public wpi::glass::PneumaticControlsModel {
|
||||
public:
|
||||
PCMsSimModel() : m_models(HAL_GetNumCTREPCMModules()) {}
|
||||
|
||||
@@ -126,7 +126,7 @@ class PCMsSimModel : 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:
|
||||
@@ -151,7 +151,7 @@ void PCMSimModel::Update() {
|
||||
}
|
||||
|
||||
void PCMSimModel::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;
|
||||
}
|
||||
@@ -179,7 +179,7 @@ void PCMsSimModel::Update() {
|
||||
}
|
||||
|
||||
void PCMsSimModel::ForEachPneumaticControl(
|
||||
wpi::function_ref<void(glass::PneumaticControlModel& model, int index)>
|
||||
wpi::util::function_ref<void(wpi::glass::PneumaticControlModel& model, int index)>
|
||||
func) {
|
||||
int32_t numCTREPCMs = m_models.size();
|
||||
for (int32_t i = 0; i < numCTREPCMs; ++i) {
|
||||
@@ -199,10 +199,10 @@ bool PCMSimGui::PCMsAnyInitialized() {
|
||||
return false;
|
||||
}
|
||||
|
||||
bool PCMSimGui::PCMsAnySolenoids(glass::PneumaticControlsModel* model) {
|
||||
bool PCMSimGui::PCMsAnySolenoids(wpi::glass::PneumaticControlsModel* model) {
|
||||
bool any = false;
|
||||
static_cast<PCMsSimModel*>(model)->ForEachPneumaticControl(
|
||||
[&](glass::PneumaticControlModel& CTREPCM, int) {
|
||||
[&](wpi::glass::PneumaticControlModel& CTREPCM, int) {
|
||||
if (static_cast<PCMSimModel*>(&CTREPCM)->GetNumSolenoids() > 0) {
|
||||
any = true;
|
||||
}
|
||||
@@ -210,7 +210,7 @@ bool PCMSimGui::PCMsAnySolenoids(glass::PneumaticControlsModel* model) {
|
||||
return any;
|
||||
}
|
||||
|
||||
std::unique_ptr<glass::PneumaticControlsModel> PCMSimGui::GetPCMsModel() {
|
||||
std::unique_ptr<wpi::glass::PneumaticControlsModel> PCMSimGui::GetPCMsModel() {
|
||||
return std::make_unique<PCMsSimModel>();
|
||||
}
|
||||
|
||||
@@ -220,8 +220,8 @@ void PCMSimGui::Initialize() {
|
||||
[] { return std::make_unique<PCMsSimModel>(); });
|
||||
|
||||
SimDeviceGui::GetDeviceTree().Add(
|
||||
HALSimGui::halProvider->GetModel("CTREPCMs"), [](glass::Model* model) {
|
||||
glass::DisplayCompressorsDevice(
|
||||
HALSimGui::halProvider->GetModel("CTREPCMs"), [](wpi::glass::Model* model) {
|
||||
wpi::glass::DisplayCompressorsDevice(
|
||||
static_cast<PCMsSimModel*>(model),
|
||||
HALSimGui::halProvider->AreOutputsEnabled());
|
||||
});
|
||||
|
||||
Reference in New Issue
Block a user