From 14d74a5846a327b66d7e6fc99b2b8ce3afb9fe7c Mon Sep 17 00:00:00 2001 From: CommanderRedYT Date: Tue, 7 Dec 2021 15:54:34 +0100 Subject: [PATCH] Added namespace --- main/displays/menus/selectbuildservermenu.cpp | 2 +- main/displays/menus/selectotabuildmenu.cpp | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/main/displays/menus/selectbuildservermenu.cpp b/main/displays/menus/selectbuildservermenu.cpp index 5ffa52d..702a4cc 100644 --- a/main/displays/menus/selectbuildservermenu.cpp +++ b/main/displays/menus/selectbuildservermenu.cpp @@ -15,7 +15,7 @@ #ifdef FEATURE_OTA -using namespace buildserver; +using namespace buildserver::SelectBuild; using namespace espgui; namespace { diff --git a/main/displays/menus/selectotabuildmenu.cpp b/main/displays/menus/selectotabuildmenu.cpp index 0db149b..8f05880 100644 --- a/main/displays/menus/selectotabuildmenu.cpp +++ b/main/displays/menus/selectotabuildmenu.cpp @@ -19,7 +19,7 @@ #define MESSAGE(text) constructMenuItem, DefaultFont, StaticColor, DummyAction>>() using namespace espgui; -using namespace buildserver; +using namespace buildserver::SelectBuild; namespace { template @@ -50,7 +50,7 @@ private: SelectBuildMenu::SelectBuildMenu() { - if (count_available_buildserver() < 1) + if (buildserver::count_available_buildserver() < 1) { MESSAGE(TEXT_OTA_NOBUILDSERVERAVAILABLE); constructMenuItem, SwitchScreenAction, StaticMenuItemIcon<&espgui::icons::back>>>(); @@ -115,6 +115,7 @@ void SelectBuildMenu::update() void SelectBuildMenu::buildMenuFromJson() { + ESP_LOGW("BOBBY", "Building menu"); auto &latest = constructMenuItem>(); latest.setHash("latest"); latest.setUrl(url_for_latest);