From 5a8c09ee9faa632e17bd3ce84e3afbe6eacb724d Mon Sep 17 00:00:00 2001
From: Robert Strouse <rstrouse@truepointsolutions.com>
Date: Tue, 9 Apr 2024 14:26:51 -0700
Subject: [PATCH] Handle C3 ints

---
 GitOTA.cpp                    |   6 +++---
 SomfyController.ino.esp32.bin | Bin 1294016 -> 1294016 bytes
 WResp.cpp                     |   4 ++--
 WResp.h                       |   4 ++--
 4 files changed, 7 insertions(+), 7 deletions(-)

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 f481a75597ef11b386793bd0d5a229783411ed03..552fde269b502bc6b936720b1df8ba655fb65cf5 100644
GIT binary patch
delta 177
zcmX@`*YChzzX=-@SQ1}q^M2W?@OSswQ+X@7zwhf<eBtP`1iPIjVQczNh!#&46bxuq
zU~E@l1Yss1X5OyA$g--2Yf_VeLCMB#4^^MEU#VpQVpbq#17da{<^W<&Am##MZXo6X
zVqPHT17dz4764*FAQswwrB?W~gJSQ(&9mbrS-1SVc(-LElh@7Fa>)x`8n1e~)#>(%
Kf4gEA_5c90!BnIG

delta 177
zcmX@`*YChzzX=-@1eSDsN?aspx9v=4pLehR-!1RO3NOWOG|lI{sXs|d?A2sJ!GLB3
z#&!ip5M}~m=IsiMEURj`lpGBVN;YnLsQRM)N-YZzvjQ<25VHd@2M}`tF&7YX12GQ}
z^8zs+5c31E01yiTvC#G_wZf+z6u;g+FeQ)i=5Z^vTQk+9lVvj9UVfXpzEAi>(mvaC
Ig^2B@01y98`v3p{

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