aaribaud/ESPSomfy-RTS
0
0
Fork 0
mirror of https://github.com/rstrouse/ESPSomfy-RTS.git synced 2025-12-13 02:52:11 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Handle C3 ints

Browse source
This commit is contained in:
Robert Strouse 2024-04-09 14:26:51 -07:00
parent 026f9315b1
commit 5a8c09ee9f
4 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

6
GitOTA.cpp
View file

@ -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);

BIN
SomfyController.ino.esp32.bin
View file

Binary file not shown.

4
WResp.cpp
View file

@ -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); }

4
WResp.h
View file

@ -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);