feedc0de/bobbycar-boardcomputer-firmware
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed query functions

Browse Source
This commit is contained in:
CommanderRedYT
2022-02-18 18:56:20 +01:00
parent 168baeac83
commit 4db8690677
2 changed files with 13 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
main/displays/menus/featureflagsmenu.cpp
View File

@@ -45,7 +45,12 @@ public:
} }
else else
{ {
return m_flag.isBeta() ? TFT_ORANGE : TFT_GREY; if (m_flag.isEnabled.value)
{
return TFT_RED;
}
else
return m_flag.isBeta() ? TFT_ORANGE : TFT_GREY;
} }
} }
@@ -80,9 +85,10 @@ public:
FeatureFlagsMenu::FeatureFlagsMenu() FeatureFlagsMenu::FeatureFlagsMenu()
{ {
configs.callForEveryFeature([&](ConfiguredFeatureFlag &feature){ configs.callForEveryFeature([&](ConfiguredFeatureFlag &feature){
const std::string name = feature.getTaskName();
if (const auto err = checkInitializedByName(feature.getTaskName()); !err) { if (const auto err = checkInitializedByName(name); err)
constructMenuItem<FeatureFlagMenuItem>(feature, *err); {
constructMenuItem<FeatureFlagMenuItem>(feature, *err);
} }
else else
constructMenuItem<FeatureFlagMenuItem>(feature, true); constructMenuItem<FeatureFlagMenuItem>(feature, true);

6
main/taskmanager.cpp
View File

@@ -141,6 +141,7 @@ tl::expected<bool, std::string> checkInitializedByName(std::string name)
{ {
for (auto &schedulerTask : schedulerTasks) for (auto &schedulerTask : schedulerTasks)
{ {
// ESP_LOGE(TAG, "%s == %s", schedulerTask.name(), name.c_str());
if (schedulerTask.name() == name) if (schedulerTask.name() == name)
return schedulerTask.isInitialized(); return schedulerTask.isInitialized();
} }
@@ -148,11 +149,10 @@ tl::expected<bool, std::string> checkInitializedByName(std::string name)
} }
bool checkEnabledByName(std::string name) { bool checkEnabledByName(std::string name) {
bool enabled = false; bool enabled = true;
// iterate over all feature flags (runForEveryFeature()) // iterate over all feature flags (runForEveryFeature())
configs.callForEveryFeature([&](ConfiguredFeatureFlag &feature) { configs.callForEveryFeature([&](ConfiguredFeatureFlag &feature) {
ESP_LOGE(TAG, "checkEnabledByName: %s == %s", feature.getTaskName().c_str(), name.c_str()); if (feature.getTaskName() == name)
if (feature.getTaskName() == name && !enabled)
enabled = feature.isEnabled.value; enabled = feature.isEnabled.value;
}); });
return enabled; return enabled;