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

New config lib fixes

Browse Source
This commit is contained in:
CommanderRedYT
2022-05-21 14:16:32 +02:00
parent 83ea64a086
commit cab4dd2ca1
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
main/cloud.cpp
View File

@@ -97,7 +97,7 @@ void cloudCollect()
return; return;
} }
if (configs.cloudSettings.cloudMode.value == CloudMode::STATISTICS || configs.cloudSettings.cloudMode.value == CloudMode::STATISTICS_AND_REMOTE_DISPLAY) if (configs.cloudSettings.cloudMode.value() == CloudMode::STATISTICS || configs.cloudSettings.cloudMode.value() == CloudMode::STATISTICS_AND_REMOTE_DISPLAY)
{ {
if (cloudBuffer.empty()) if (cloudBuffer.empty())
cloudBuffer = '['; cloudBuffer = '[';
@@ -234,7 +234,7 @@ void cloudSend()
cloudBuffer.clear(); cloudBuffer.clear();
} }
else if (cloudClient && !configs.cloudSettings.cloudEnabled.value) else if (cloudClient && !configs.cloudSettings.cloudEnabled.value())
{ {
destroyCloud(); destroyCloud();
} }
@@ -254,8 +254,8 @@ std::string getLoginMessage()
void cloudSendDisplay(std::string_view data) void cloudSendDisplay(std::string_view data)
{ {
if (configs.cloudSettings.cloudEnabled.value && if (configs.cloudSettings.cloudEnabled.value() &&
!configs.cloudUrl.value.empty() && configs.cloudSettings.cloudMode.value != CloudMode::INACTIVE) !configs.cloudUrl.value().empty() && configs.cloudSettings.cloudMode.value() != CloudMode::INACTIVE)
{ {
if (!cloudClient) if (!cloudClient)
{ {
@@ -282,7 +282,7 @@ void cloudSendDisplay(std::string_view data)
if (!cloudClient.is_connected()) if (!cloudClient.is_connected())
return; return;
auto timeout = std::chrono::ceil<espcpputils::ticks>(espchrono::milliseconds32{configs.cloudSettings.cloudTransmitTimeout.value}).count(); auto timeout = std::chrono::ceil<espcpputils::ticks>(espchrono::milliseconds32{configs.cloudSettings.cloudTransmitTimeout.value()}).count();
int written; int written;
if (hasAnnouncedItself) if (hasAnnouncedItself)
@@ -301,7 +301,7 @@ void cloudSendDisplay(std::string_view data)
ESP_LOGE("BOBBY", "websocket sent size mismatch, sent=%i, expected=%i", written, data.size()); ESP_LOGE("BOBBY", "websocket sent size mismatch, sent=%i, expected=%i", written, data.size());
} }
} }
else if (cloudClient && !configs.cloudSettings.cloudEnabled.value) else if (cloudClient && !configs.cloudSettings.cloudEnabled.value())
{ {
destroyCloud(); destroyCloud();
} }
@@ -355,7 +355,7 @@ void createCloud()
if (id.empty()) if (id.empty())
return; return;
auto timeout = std::chrono::ceil<espcpputils::ticks>(espchrono::milliseconds32{configs.cloudSettings.cloudTransmitTimeout.value}).count(); auto timeout = std::chrono::ceil<espcpputils::ticks>(espchrono::milliseconds32{configs.cloudSettings.cloudTransmitTimeout.value()}).count();
const auto message = fmt::format(R"({{"type":"response","id":"{}"}})", id); const auto message = fmt::format(R"({{"type":"response","id":"{}"}})", id);
ESP_LOGI(TAG, "sending response: %s", message.c_str()); ESP_LOGI(TAG, "sending response: %s", message.c_str());
cloudClient.send_text(message, timeout); cloudClient.send_text(message, timeout);