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

Moved otaServerUrl and otaServerBranch into newsettings

Browse Source
This commit is contained in:
0xFEEDC0DE64
2021-12-29 15:29:48 +01:00
parent 6138c187f4
commit 2c1aca079f
5 changed files with 12 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
main/buildserver.cpp
View File

@@ -167,10 +167,10 @@ namespace buildserver {
std::string get_descriptor_url(std::string base_url)
{
if (stringSettings.otaServerBranch.empty())
if (configs.otaServerBranch.value.empty())
return fmt::format("{}/otaDescriptor?username={}", base_url, configs.otaUsername.value);
else
return fmt::format("{}/otaDescriptor?username={}&branch={}", base_url, configs.otaUsername.value, stringSettings.otaServerBranch);
return fmt::format("{}/otaDescriptor?username={}&branch={}", base_url, configs.otaUsername.value, configs.otaServerBranch.value);
}
void parse_response_into_variables(std::string response)

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

@@ -13,6 +13,7 @@
#include "icons/back.h"
#include "icons/reboot.h"
#include "utils.h"
#include "newsettings.h"
#define ERR_MESSAGE(text) \
constructMenuItem<makeComponent<MenuItem, StaticText<text>, DefaultFont, StaticColor<TFT_RED>, DummyAction>>(); \
@@ -51,7 +52,7 @@ public:
namespace {
std::string CurrentBranch::text() const
{
return stringSettings.otaServerBranch.empty() ? "All builds" : stringSettings.otaServerBranch;
return configs.otaServerBranch.value.empty() ? "All builds" : configs.otaServerBranch.value;
}
std::string BranchMenuItem::text() const
@@ -71,16 +72,14 @@ void BranchMenuItem::setName(const std::string &name)
void BranchMenuItem::triggered()
{
stringSettings.otaServerBranch = m_name;
saveSettings();
configs.write_config(configs.otaServerBranch, m_name); // mir egal ob succeeded
}
void ClearBranchAction::triggered()
{
stringSettings.otaServerBranch = {};
saveSettings();
}
configs.write_config(configs.otaServerBranch, {}); // mir egal ob succeeded
}
} // namespace
SelectBuildserverBranchMenu::SelectBuildserverBranchMenu()
{

4
main/newsettings.h
View File

@@ -112,6 +112,8 @@ public:
ConfigWrapper<std::string> udpCloudHost {std::string{}, DoReset, {}, "udpCloudHost" };
ConfigWrapper<std::string> otaUrl {std::string{}, DoReset, StringOr<StringEmpty, StringValidUrl>, "otaUrl" };
ConfigWrapper<std::string> otaUsername {std::string{}, DoReset, {}, "otaUsername" };
ConfigWrapper<std::string> otaServerUrl {std::string{}, DoReset, StringOr<StringEmpty, StringValidUrl>, "otaServerUrl" };
ConfigWrapper<std::string> otaServerBranch {std::string{}, DoReset, {}, "otaServerBranch" };
ConfigWrapper<bool> dns_announce_enabled{true, DoReset, {}, "dnsAnnounceEnab" };
ConfigWrapper<std::string> dns_announce_key {std::string{}, DoReset, {}, "dnsAnnounceKey" };
ConfigWrapper<std::string> webserverPassword {std::string{}, DoReset, {}, "websPassword" };
@@ -255,6 +257,8 @@ public:
x(udpCloudHost) \
x(otaUrl) \
x(otaUsername) \
x(otaServerUrl) \
x(otaServerBranch) \
x(dns_announce_enabled) \
x(dns_announce_key) \
// x(webserverPassword)

4
main/presets.cpp
View File

@@ -25,10 +25,6 @@ StringSettings makeDefaultStringSettings()
// ConfiguredOtaServer { .name = {}, .url = {} },
// ConfiguredOtaServer { .name = {}, .url = {} },
},
.otaServerUrl = {},
#endif
#ifdef FEATURE_OTA
.otaServerBranch = {},
#endif
};
}

9
main/stringsettings.h
View File

@@ -22,11 +22,7 @@ struct StringSettings
std::string url;
};
std::array<ConfiguredOtaServer, 5> otaServers;
std::string otaServerUrl;
#endif
#ifdef FEATURE_OTA
std::string otaServerBranch;
std::array<ConfiguredOtaServer, 5> otaServers; std::string otaServerUrl;
#endif
};
@@ -57,9 +53,6 @@ void StringSettings::executeForEveryCommonSetting(T &&callable)
// callable("otaUrl8", otaServers[8].url);
// callable("otaName9", otaServers[9].name);
// callable("otaUrl9", otaServers[9].url);
callable("otaserver", otaServerUrl);
callable("otaBranch", otaServerBranch);
#endif
}