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

Fixed spelling

Browse Source
This commit is contained in:
CommanderRedYT
2022-06-15 10:55:35 +02:00
parent ff104923d7
commit d829c0d5cb
14 changed files with 40 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
main/actions/ledstripanimationactions.h
View File

@ -16,7 +16,7 @@ public:
void triggered() override
{
if (auto result = configs.write_config(configs.ledstrip.animationType, type); !result)
BobbyErrorHandler{}.errorOccured(std::move(result).error());
BobbyErrorHandler{}.errorOccurred(std::move(result).error());
}
};

2
main/bobbyerrorhandler.cpp
View File

@ -6,7 +6,7 @@
// local includes
#include "displays/bobbypopupdisplay.h"
void BobbyErrorHandler::errorOccured(std::string &&error)
void BobbyErrorHandler::errorOccurred(std::string &&error)
{
auto newDisplay = std::make_unique<BobbyPopupDisplay>(std::move(error), std::move(espgui::currentDisplay));
newDisplay->initOverlay();

2
main/bobbyerrorhandler.h
View File

@ -5,5 +5,5 @@
struct BobbyErrorHandler : public virtual espgui::ErrorHandlerInterface
{
void errorOccured(std::string &&error) override;
void errorOccurred(std::string &&error) override;
};

8
main/displays/buttoncalibratedisplay.cpp
View File

@ -56,7 +56,7 @@ void ButtonCalibrateDisplay::update()
if (auto result = configs.write_config(configs.dpadMappingLeft, m_leftButton); !result)
{
BobbyErrorHandler{}.errorOccured(std::move(result).error());
BobbyErrorHandler{}.errorOccurred(std::move(result).error());
return;
}
else
@ -66,7 +66,7 @@ void ButtonCalibrateDisplay::update()
if (auto result = configs.write_config(configs.dpadMappingRight, m_rightButton); !result)
{
BobbyErrorHandler{}.errorOccured(std::move(result).error());
BobbyErrorHandler{}.errorOccurred(std::move(result).error());
return;
}
else
@ -75,7 +75,7 @@ void ButtonCalibrateDisplay::update()
}
if (auto result = configs.write_config(configs.dpadMappingUp, m_upButton); !result)
{
BobbyErrorHandler{}.errorOccured(std::move(result).error());
BobbyErrorHandler{}.errorOccurred(std::move(result).error());
return;
}
else
@ -84,7 +84,7 @@ void ButtonCalibrateDisplay::update()
}
if (auto result = configs.write_config(configs.dpadMappingDown, m_downButton); !result)
{
BobbyErrorHandler{}.errorOccured(std::move(result).error());
BobbyErrorHandler{}.errorOccurred(std::move(result).error());
return;
}
else

10
main/displays/menus/candebugmenu.cpp
View File

@ -182,7 +182,7 @@ public:
{
const auto result = twai_initiate_recovery();
ESP_LOGI(TAG, "twai_initiate_recovery() returned %s", esp_err_to_name(result));
BobbyErrorHandler{}.errorOccured(fmt::format("twai_initiate_recovery() returned {}", esp_err_to_name(result)));
BobbyErrorHandler{}.errorOccurred(fmt::format("twai_initiate_recovery() returned {}", esp_err_to_name(result)));
}
};
@ -193,7 +193,7 @@ public:
{
const auto result = twai_stop();
ESP_LOGI(TAG, "twai_stop() returned %s", esp_err_to_name(result));
BobbyErrorHandler{}.errorOccured(fmt::format("twai_stop() returned {}", esp_err_to_name(result)));
BobbyErrorHandler{}.errorOccurred(fmt::format("twai_stop() returned {}", esp_err_to_name(result)));
}
};
@ -204,7 +204,7 @@ public:
{
const auto result = twai_start();
ESP_LOGI(TAG, "twai_start() returned %s", esp_err_to_name(result));
BobbyErrorHandler{}.errorOccured(fmt::format("twai_start() returned {}", esp_err_to_name(result)));
BobbyErrorHandler{}.errorOccurred(fmt::format("twai_start() returned {}", esp_err_to_name(result)));
}
};
@ -215,7 +215,7 @@ public:
{
const auto result = twai_driver_uninstall();
ESP_LOGI(TAG, "twai_driver_uninstall() returned %s", esp_err_to_name(result));
BobbyErrorHandler{}.errorOccured(fmt::format("twai_driver_uninstall() returned {}", esp_err_to_name(result)));
BobbyErrorHandler{}.errorOccurred(fmt::format("twai_driver_uninstall() returned {}", esp_err_to_name(result)));
}
};
@ -230,7 +230,7 @@ public:
const auto result = twai_driver_install(&g_config, &t_config, &f_config);
ESP_LOGI(TAG, "twai_driver_install() returned %s", esp_err_to_name(result));
BobbyErrorHandler{}.errorOccured(fmt::format("twai_driver_install() returned {}", esp_err_to_name(result)));
BobbyErrorHandler{}.errorOccurred(fmt::format("twai_driver_install() returned {}", esp_err_to_name(result)));
}
};
} // namespace

2
main/displays/menus/dynamicdebugmenu.cpp
View File

@ -101,7 +101,7 @@ class OpenPopupAction : public virtual espgui::ActionInterface
public:
void triggered() override
{
BobbyErrorHandler{}.errorOccured("Das\nist\nein sehr langer text, der nicht in eine zeile passt");
BobbyErrorHandler{}.errorOccurred("Das\nist\nein sehr langer text, der nicht in eine zeile passt");
}
};
} // namespace

24
main/displays/menus/extrabuttoncalibratemenu.cpp
View File

@ -129,84 +129,84 @@ void ExtraButtonCalibrateMenu::rawButtonPressed(uint8_t button)
case WaitingUp2:
if (auto result = configs.write_config(configs.dpadMappingUp2, button); !result)
{
BobbyErrorHandler{}.errorOccured(std::move(result).error());
BobbyErrorHandler{}.errorOccurred(std::move(result).error());
break;
}
break;
case WaitingDown2:
if (auto result = configs.write_config(configs.dpadMappingDown2, button); !result)
{
BobbyErrorHandler{}.errorOccured(std::move(result).error());
BobbyErrorHandler{}.errorOccurred(std::move(result).error());
break;
}
break;
case WaitingLeft2:
if (auto result = configs.write_config(configs.dpadMappingLeft2, button); !result)
{
BobbyErrorHandler{}.errorOccured(std::move(result).error());
BobbyErrorHandler{}.errorOccurred(std::move(result).error());
break;
}
break;
case WaitingRight2:
if (auto result = configs.write_config(configs.dpadMappingRight2, button); !result)
{
BobbyErrorHandler{}.errorOccured(std::move(result).error());
BobbyErrorHandler{}.errorOccurred(std::move(result).error());
break;
}
break;
case WaitingProfile0:
if (auto result = configs.write_config(configs.dpadMappingProfile0, button); !result)
{
BobbyErrorHandler{}.errorOccured(std::move(result).error());
BobbyErrorHandler{}.errorOccurred(std::move(result).error());
break;
}
break;
case WaitingProfile1:
if (auto result = configs.write_config(configs.dpadMappingProfile1, button); !result)
{
BobbyErrorHandler{}.errorOccured(std::move(result).error());
BobbyErrorHandler{}.errorOccurred(std::move(result).error());
break;
}
break;
case WaitingProfile2:
if (auto result = configs.write_config(configs.dpadMappingProfile2, button); !result)
{
BobbyErrorHandler{}.errorOccured(std::move(result).error());
BobbyErrorHandler{}.errorOccurred(std::move(result).error());
break;
}
break;
case WaitingProfile3:
if (auto result = configs.write_config(configs.dpadMappingProfile3, button); !result)
{
BobbyErrorHandler{}.errorOccured(std::move(result).error());
BobbyErrorHandler{}.errorOccurred(std::move(result).error());
break;
}
break;
case WaitingExtra1:
if (auto result = configs.write_config(configs.dpadMappingExtra1, button); !result)
{
BobbyErrorHandler{}.errorOccured(std::move(result).error());
BobbyErrorHandler{}.errorOccurred(std::move(result).error());
break;
}
break;
case WaitingExtra2:
if (auto result = configs.write_config(configs.dpadMappingExtra2, button); !result)
{
BobbyErrorHandler{}.errorOccured(std::move(result).error());
BobbyErrorHandler{}.errorOccurred(std::move(result).error());
break;
}
break;
case WaitingExtra3:
if (auto result = configs.write_config(configs.dpadMappingExtra3, button); !result)
{
BobbyErrorHandler{}.errorOccured(std::move(result).error());
BobbyErrorHandler{}.errorOccurred(std::move(result).error());
break;
}
break;
case WaitingExtra4:
if (auto result = configs.write_config(configs.dpadMappingExtra4, button); !result)
{
BobbyErrorHandler{}.errorOccured(std::move(result).error());
BobbyErrorHandler{}.errorOccurred(std::move(result).error());
break;
}
break;

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

@ -29,7 +29,7 @@ void exitFeatureFlagsMenu()
espgui::popScreen();
if (isDirty)
{
BobbyErrorHandler{}.errorOccured(TEXT_POPUP);
BobbyErrorHandler{}.errorOccurred(TEXT_POPUP);
}
}
@ -77,7 +77,7 @@ public:
void triggered() override
{
if (auto result = m_flag.isEnabled.write(configs.nvs_handle_user, !m_flag.isEnabled.value()); !result)
errorOccured(std::move(result).error());
errorOccurred(std::move(result).error());
else
isDirty = true;
}

2
main/displays/menus/gitmenu.cpp
View File

@ -29,7 +29,7 @@ namespace {
public:
void triggered() override
{
BobbyErrorHandler{}.errorOccured(TEXT_GIT_MESSAGE);
BobbyErrorHandler{}.errorOccurred(TEXT_GIT_MESSAGE);
}
};

12
main/displays/menus/manageprofilesmenu.cpp
View File

@ -40,7 +40,7 @@ public:
if (!settingsPersister.openProfile(m_profileIndex)) // just switch nvs namespace
{
BobbyErrorHandler{}.errorOccured(fmt::format("openProfile({}) failed", m_profileIndex));
BobbyErrorHandler{}.errorOccurred(fmt::format("openProfile({}) failed", m_profileIndex));
return;
}
saveProfileSettings();
@ -60,7 +60,9 @@ public:
}
else if (m_menu.m_firstIndex != -1 && m_menu.m_firstIndex != m_profileIndex)
{
BobbyErrorHandler{}.errorOccured(fmt::format("Press CONFIRM to COPY from Profile {} to Profile {}", m_menu.m_firstIndex, m_profileIndex));
BobbyErrorHandler{}.errorOccurred(
fmt::format("Press CONFIRM to COPY from Profile {} to Profile {}", m_menu.m_firstIndex,
m_profileIndex));
m_mode = CONFIRM_COPY;
}
}
@ -100,7 +102,9 @@ public:
}
else if (m_menu.m_firstIndex != -1 && m_menu.m_firstIndex != m_profileIndex)
{
BobbyErrorHandler{}.errorOccured(fmt::format("Press CONFIRM to SWAP Profile {} with Profile {}", m_menu.m_firstIndex, m_profileIndex));
BobbyErrorHandler{}.errorOccurred(
fmt::format("Press CONFIRM to SWAP Profile {} with Profile {}", m_menu.m_firstIndex,
m_profileIndex));
m_mode = CONFIRM_SWAP;
}
}
@ -125,7 +129,7 @@ public:
{
m_menu.lock();
m_mode = CONFIRM_CLEAR;
BobbyErrorHandler{}.errorOccured("Press CONFIRM to reset Profile or BACK to cancel.");
BobbyErrorHandler{}.errorOccurred("Press CONFIRM to reset Profile or BACK to cancel.");
}
}

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

@ -128,7 +128,7 @@ void SelectBuildserverBranchMenu::update()
check_descriptor_request();
if (!request_failed.empty())
{
BobbyErrorHandler{}.errorOccured(fmt::format("Error: {}", request_failed));
BobbyErrorHandler{}.errorOccurred(fmt::format("Error: {}", request_failed));
request_failed = {};
}
}

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

@ -111,7 +111,7 @@ void SelectBuildMenu::update()
check_descriptor_request();
if (!request_failed.empty())
{
BobbyErrorHandler{}.errorOccured(fmt::format("Error: {}", request_failed));
BobbyErrorHandler{}.errorOccurred(fmt::format("Error: {}", request_failed));
request_failed = {};
}
}

2
main/displays/menus/typesafeenumchangemenu.h
View File

@ -51,7 +51,7 @@ public:
void triggered() override
{
if (auto result = m_config->write(configs.nvs_handle_user, m_value); !result)
BobbyErrorHandler{}.errorOccured(std::move(result).error());
BobbyErrorHandler{}.errorOccurred(std::move(result).error());
}
private:
const TEnum m_value;

2
main/displays/qrimportdisplay.h
View File

@ -81,7 +81,7 @@ public:
else if (!m_result && !m_result.error().empty())
{
tft.setTextColor(TFT_RED, TFT_BLACK);
BobbyErrorHandler{}.errorOccured(fmt::format("Error: {}", m_result.error()));
BobbyErrorHandler{}.errorOccurred(fmt::format("Error: {}", m_result.error()));
m_result.error().clear();
}
else