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

Removed stringSettings completely

Browse Source
This commit is contained in:
0xFEEDC0DE64
2021-12-29 16:07:59 +01:00
parent aeb89a8d96
commit 535e643c24
25 changed files with 51 additions and 355 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
main/buildserver.cpp
View File

@@ -23,8 +23,8 @@ namespace buildserver {
uint16_t count_available_buildserver()
{
uint16_t count = 0;
for (const auto &otaServer : stringSettings.otaServers) {
if (!otaServer.url.empty()) count++;
for (const auto &otaServer : configs.otaServers) {
if (!otaServer.url.value.empty()) count++;
}
return count;
}
@@ -135,12 +135,12 @@ namespace buildserver {
std::string get_ota_url_from_index(uint16_t index)
{
if (index < stringSettings.otaServers.size())
if (index < configs.otaServers.size())
{
auto otaServer = stringSettings.otaServers[index];
if (!otaServer.url.empty())
const auto &otaServer = configs.otaServers[index];
if (!otaServer.url.value.empty())
{
return otaServer.url;
return otaServer.url.value;
}
else
{
@@ -198,8 +198,8 @@ namespace buildserver {
index = 0;
url_for_latest = fmt::format("{}{}", stringSettings.otaServerUrl, doc["latest"].as<std::string>());
url_for_hashes = fmt::format("{}{}", stringSettings.otaServerUrl, doc["url"].as<std::string>());
url_for_latest = fmt::format("{}{}", configs.otaServerUrl.value, doc["latest"].as<std::string>());
url_for_hashes = fmt::format("{}{}", configs.otaServerUrl.value, doc["url"].as<std::string>());
parsing_finished = true;
}