diff --git a/GitOTA.cpp b/GitOTA.cpp index ffa7210..5fad2c2 100644 --- a/GitOTA.cpp +++ b/GitOTA.cpp @@ -427,10 +427,10 @@ void GitUpdater::emitDownloadProgress(uint8_t num, size_t total, size_t loaded, JsonSockEvent *json = sockEmit.beginEmit(evt); json->beginObject(); json->addElem("ver", this->targetRelease); - json->addElem("part", this->partition); + json->addElem("part", (int16_t)this->partition); json->addElem("file", this->currentFile); - json->addElem("total", total); - json->addElem("loaded", loaded); + json->addElem("total", (uint32_t)total); + json->addElem("loaded", (uint32_t)loaded); json->addElem("error", this->error); json->endObject(); sockEmit.endEmit(num); diff --git a/SomfyController.ino.esp32.bin b/SomfyController.ino.esp32.bin index f481a75..552fde2 100644 Binary files a/SomfyController.ino.esp32.bin and b/SomfyController.ino.esp32.bin differ diff --git a/WResp.cpp b/WResp.cpp index 3956759..97599c2 100644 --- a/WResp.cpp +++ b/WResp.cpp @@ -109,7 +109,7 @@ void JsonFormatter::addElem(int8_t nval) { sprintf(this->_numbuff, "%d", nval); void JsonFormatter::addElem(uint8_t nval) { sprintf(this->_numbuff, "%u", nval); this->_appendNumber(nullptr); } void JsonFormatter::addElem(int16_t nval) { sprintf(this->_numbuff, "%d", nval); this->_appendNumber(nullptr); } void JsonFormatter::addElem(uint16_t nval) { sprintf(this->_numbuff, "%u", nval); this->_appendNumber(nullptr); } -void JsonFormatter::addElem(int32_t nval) { sprintf(this->_numbuff, "%ld", (long)nval); this->_appendNumber(nullptr); } +void JsonFormatter::addElem(int nval) { sprintf(this->_numbuff, "%ld", (long)nval); this->_appendNumber(nullptr); } void JsonFormatter::addElem(uint32_t nval) { sprintf(this->_numbuff, "%lu", (unsigned long)nval); this->_appendNumber(nullptr); } void JsonFormatter::addElem(int64_t lval) { sprintf(this->_numbuff, "%lld", (long long)lval); this->_appendNumber(nullptr); } void JsonFormatter::addElem(uint64_t lval) { sprintf(this->_numbuff, "%llu", (unsigned long long)lval); this->_appendNumber(nullptr); } @@ -120,7 +120,7 @@ void JsonFormatter::addElem(const char *name, int8_t nval) { sprintf(this->_numb void JsonFormatter::addElem(const char *name, uint8_t nval) { sprintf(this->_numbuff, "%u", nval); this->_appendNumber(name); } void JsonFormatter::addElem(const char *name, int16_t nval) { sprintf(this->_numbuff, "%d", nval); this->_appendNumber(name); } void JsonFormatter::addElem(const char *name, uint16_t nval) { sprintf(this->_numbuff, "%u", nval); this->_appendNumber(name); } -void JsonFormatter::addElem(const char *name, int32_t nval) { sprintf(this->_numbuff, "%ld", (long)nval); this->_appendNumber(name); } +void JsonFormatter::addElem(const char *name, int nval) { sprintf(this->_numbuff, "%ld", (long)nval); this->_appendNumber(name); } void JsonFormatter::addElem(const char *name, uint32_t nval) { sprintf(this->_numbuff, "%lu", (unsigned long)nval); this->_appendNumber(name); } void JsonFormatter::addElem(const char *name, int64_t lval) { sprintf(this->_numbuff, "%lld", (long long)lval); this->_appendNumber(name); } void JsonFormatter::addElem(const char *name, uint64_t lval) { sprintf(this->_numbuff, "%llu", (unsigned long long)lval); this->_appendNumber(name); } diff --git a/WResp.h b/WResp.h index a81a34d..3987a4c 100644 --- a/WResp.h +++ b/WResp.h @@ -24,22 +24,22 @@ class JsonFormatter { void addElem(const char* val); void addElem(float fval); + void addElem(int nval); void addElem(int8_t nval); void addElem(uint8_t nval); void addElem(int16_t nval); void addElem(uint16_t nval); - void addElem(int32_t nval); void addElem(uint32_t nval); void addElem(int64_t lval); void addElem(uint64_t lval); void addElem(bool bval); void addElem(const char* name, float fval); + void addElem(const char* name, int nval); void addElem(const char* name, int8_t nval); void addElem(const char* name, uint8_t nval); void addElem(const char* name, int16_t nval); void addElem(const char* name, uint16_t nval); - void addElem(const char* name, int32_t nval); void addElem(const char* name, uint32_t nval); void addElem(const char* name, int64_t lval); void addElem(const char* name, uint64_t lval);