From d0efe8eb47756fe63738ebcf63bccac59a303b18 Mon Sep 17 00:00:00 2001 From: proddy Date: Sat, 26 Mar 2022 22:17:25 +0100 Subject: [PATCH] changes for standalone compilation --- lib_standalone/AsyncJson.h | 8 ++++++-- mock-api/server.js | 2 +- src/devices/thermostat.cpp | 2 ++ src/emsdevice.cpp | 2 +- src/test/test.cpp | 3 +-- 5 files changed, 11 insertions(+), 6 deletions(-) diff --git a/lib_standalone/AsyncJson.h b/lib_standalone/AsyncJson.h index 28377eeee..2ec4a6322 100644 --- a/lib_standalone/AsyncJson.h +++ b/lib_standalone/AsyncJson.h @@ -90,8 +90,8 @@ class PrettyAsyncJsonResponse { class MsgpackAsyncJsonResponse { protected: DynamicJsonDocument _jsonBuffer; - JsonVariant _root; - bool _isValid; + JsonVariant _root; + bool _isValid; public: MsgpackAsyncJsonResponse(bool isArray = false, size_t maxJsonBufferSize = DYNAMIC_JSON_DOCUMENT_SIZE) @@ -187,6 +187,7 @@ class AsyncCallbackJsonWebHandler : public AsyncWebHandler { ArJsonRequestHandlerFunction _onRequest; size_t _contentLength; size_t _maxContentLength; + size_t _maxJsonBufferSize; public: AsyncCallbackJsonWebHandler(const String & uri, ArJsonRequestHandlerFunction onRequest, size_t maxJsonBufferSize = DYNAMIC_JSON_DOCUMENT_SIZE) @@ -202,6 +203,9 @@ class AsyncCallbackJsonWebHandler : public AsyncWebHandler { void setMaxContentLength(int maxContentLength) { _maxContentLength = maxContentLength; } + void setMaxJsonBufferSize(int maxJsonBufferSize) { + _maxJsonBufferSize = maxJsonBufferSize; + } void onRequest(ArJsonRequestHandlerFunction fn) { _onRequest = fn; } diff --git a/mock-api/server.js b/mock-api/server.js index ca2f5a44f..e8aa0ee4d 100644 --- a/mock-api/server.js +++ b/mock-api/server.js @@ -926,7 +926,7 @@ rest_server.post(EMSESP_DEVICEENTITIES_ENDPOINT, (req, res) => { }) rest_server.post(EMSESP_EXCLUDE_ENTITIES_ENDPOINT, (req, res) => { - console.log('exclude list for productid ' + req.body.product_id + ' device_id ' + req.body.device_id + ' entities:') + console.log('exclude list for unique id ' + req.body.id + ' and entities:') console.log(req.body.entity_ids) res.sendStatus(200) }) diff --git a/src/devices/thermostat.cpp b/src/devices/thermostat.cpp index e4452581f..1e3b5744c 100644 --- a/src/devices/thermostat.cpp +++ b/src/devices/thermostat.cpp @@ -1253,7 +1253,9 @@ void Thermostat::process_RCTime(std::shared_ptr telegram) { } if (!ntp_ && tm_->tm_year > 110) { // emsesp clock not set, but thermostat clock struct timeval newnow = {.tv_sec = ttime}; +#ifndef EMSESP_STANDALONE settimeofday(&newnow, nullptr); +#endif LOG_INFO(F("ems-esp time set from thermostat")); } } diff --git a/src/emsdevice.cpp b/src/emsdevice.cpp index 47fc3f442..de9a88eb7 100644 --- a/src/emsdevice.cpp +++ b/src/emsdevice.cpp @@ -768,7 +768,7 @@ void EMSdevice::mask_entity(std::string entity_id) { std::string entity = dv.tag < DeviceValueTAG::TAG_HC1 ? read_flash_string(dv.short_name) : tag_to_string(dv.tag) + "/" + read_flash_string(dv.short_name); if (entity == entity_id.substr(2)) { #if defined(EMSESP_USE_SERIAL) - Serial.print("exclude_entity() Removing Visible for device value: "); + Serial.print("mask_entity() Removing Visible for device value: "); Serial.println(read_flash_string(dv.full_name).c_str()); #endif dv.state = (dv.state & 0x0F) | (flag << 4); // set state high bits to flag, turn off active and ha flags diff --git a/src/test/test.cpp b/src/test/test.cpp index a9ec54c4f..ee4635ee5 100644 --- a/src/test/test.cpp +++ b/src/test/test.cpp @@ -609,8 +609,7 @@ void Test::run_test(uuid::console::Shell & shell, const std::string & cmd, const // toggle mode for (const auto & emsdevice : EMSESP::emsdevices) { if (emsdevice->unique_id() == 1) { // boiler - uint8_t entity_id = 47; // wwseltemp - emsdevice->exclude_entity(entity_id); + emsdevice->mask_entity("07wwseltemp"); break; } }