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

Error handling for build selection

Browse Source
This commit is contained in:
CommanderRedYT
2022-03-04 21:49:33 +01:00
parent e4daf6cf3c
commit af255ec098
4 changed files with 6 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -6,12 +6,11 @@
// local includes // local includes
#include "actions/dummyaction.h" #include "actions/dummyaction.h"
#include "actions/switchscreenaction.h" #include "actions/switchscreenaction.h"
#include "bobbyerrorhandler.h"
#include "buildserver.h" #include "buildserver.h"
#include "displays/menus/otamenu.h" #include "displays/menus/otamenu.h"
#include "globals.h"
#include "icons/back.h" #include "icons/back.h"
#include "icons/reboot.h" #include "icons/reboot.h"
#include "utils.h"
#include "newsettings.h" #include "newsettings.h"
namespace { namespace {
@ -124,7 +123,7 @@ void SelectBuildserverBranchMenu::update()
check_descriptor_request(); check_descriptor_request();
if (!request_failed.empty()) if (!request_failed.empty())
{ {
this->buildMenuRequestError(request_failed); BobbyErrorHandler{}.errorOccured(fmt::format("Error: {}", request_failed));
request_failed = {}; request_failed = {};
} }
} }
@ -154,12 +153,3 @@ void SelectBuildserverBranchMenu::back()
{ {
espgui::switchScreen<OtaMenu>(); espgui::switchScreen<OtaMenu>();
} }
void SelectBuildserverBranchMenu::buildMenuRequestError(std::string error)
{
using namespace espgui;
auto &item = constructMenuItem<makeComponent<MenuItem, ChangeableText, DefaultFont, StaticColor<TFT_RED>, DummyAction>>();
item.setTitle(error);
constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_BACK>, SwitchScreenAction<OtaMenu>, StaticMenuItemIcon<&espgui::icons::back>>>();
}

1
main/displays/menus/selectbuildserverbranch.h
View File

@ -11,7 +11,6 @@ public:
std::string text() const override; std::string text() const override;
void buildMenuRequestError(std::string error);
void update() override; void update() override;
void back() override; void back() override;
}; };

16
main/displays/menus/selectotabuildmenu.cpp
View File

@ -6,13 +6,12 @@
#include "fmt/core.h" #include "fmt/core.h"
// local includes // local includes
#include "buildserver.h"
#include "utils.h"
#include "actions/dummyaction.h" #include "actions/dummyaction.h"
#include "actions/switchscreenaction.h" #include "actions/switchscreenaction.h"
#include "icons/back.h" #include "bobbyerrorhandler.h"
#include "buildserver.h"
#include "displays/menus/otamenu.h" #include "displays/menus/otamenu.h"
#include "globals.h" #include "icons/back.h"
#include "newsettings.h" #include "newsettings.h"
#define MESSAGE(text) constructMenuItem<makeComponent<MenuItem, StaticText<text>, DefaultFont, StaticColor<TFT_RED>, DummyAction>>() #define MESSAGE(text) constructMenuItem<makeComponent<MenuItem, StaticText<text>, DefaultFont, StaticColor<TFT_RED>, DummyAction>>()
@ -108,7 +107,7 @@ void SelectBuildMenu::update()
check_descriptor_request(); check_descriptor_request();
if (!request_failed.empty()) if (!request_failed.empty())
{ {
this->buildMenuRequestError(request_failed); BobbyErrorHandler{}.errorOccured(fmt::format("Error: {}", request_failed));
request_failed = {}; request_failed = {};
} }
} }
@ -139,13 +138,6 @@ void SelectBuildMenu::buildMenuFromJson()
constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_BACK>, SwitchScreenAction<OtaMenu>, StaticMenuItemIcon<&espgui::icons::back>>>(); constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_BACK>, SwitchScreenAction<OtaMenu>, StaticMenuItemIcon<&espgui::icons::back>>>();
} }
void SelectBuildMenu::buildMenuRequestError(std::string error)
{
auto &item = constructMenuItem<makeComponent<MenuItem, ChangeableText, DefaultFont, StaticColor<TFT_RED>, DummyAction>>();
item.setTitle(error);
constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_BACK>, SwitchScreenAction<OtaMenu>, StaticMenuItemIcon<&espgui::icons::back>>>();
}
void SelectBuildMenu::back() void SelectBuildMenu::back()
{ {
switchScreen<OtaMenu>(); switchScreen<OtaMenu>();

1
main/displays/menus/selectotabuildmenu.h
View File

@ -17,5 +17,4 @@ public:
private: private:
void buildMenuFromJson(); void buildMenuFromJson();
void buildMenuRequestError(std::string error);
}; };