From 864ed44a5dba217ce3b06240bcc17217b6549200 Mon Sep 17 00:00:00 2001
From: richonguzman <richon2001@hotmail.com>
Date: Mon, 8 Jul 2024 23:29:04 -0400
Subject: [PATCH] favicon and battery adc calibration

---
 data_embed/favicon.png | Bin 0 -> 813 bytes
 data_embed/index.html  |   2 +-
 src/battery_utils.cpp  |  10 ++++++----
 src/web_utils.cpp      |  12 ++++++++++++
 tools/compress.py      |   1 +
 5 files changed, 20 insertions(+), 5 deletions(-)
 create mode 100644 data_embed/favicon.png

diff --git a/data_embed/favicon.png b/data_embed/favicon.png
new file mode 100644
index 0000000000000000000000000000000000000000..af967cd77b09ee70077d57b0eb6ff7799ff80268
GIT binary patch
literal 813
zcmV+|1JeA7P)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm00001b5ch_0Itp)
z=>Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D0>Vi|K~!i%)tF6g
z+b|G?y^>bRwQ`<bA_p>1po{L4O;3}iKo>2_p&l)A=8+uz*is+x!HzT>z9&+$oy$G+
z>*eL^$2finpW}GN;r~OwUthne0Pz*4&#h$IFifu~JEx543MfC9(iL{`^!x|I&Y@_2
z82`>DhtjY{>dz9QcIDHJTPK7(I)uK`(R61knP5kS2$O#)j8y4tC*g<?)CdIu%*v=>
zj|@>vychBictnWuN;<Yj!O*|C?-_zk`19@U$HY5cCs?hUdxW49g)5qyj=Z-6@D<2c
z67Qd$zhmm{x-}(_ND~0`KL={eVKDtRmCY@m#JmvCcRmw5z{WbUh8kvGShWI`z_7DS
zw+5Z7$jl3@wo79!*z$=rsKLw&d5vc^@*49V!C<egIB>z<W#)x=KK3ae087JYV3Ugt
z=)uejtadf|1r6_Ew^S<dT%jChUSPG`$UiGoh;ZPVpIibnFPK_&6^nDqT>tn4?02?K
zoUCk=uM#sa<n^mCAqnX#2R-S8nV0WHtack@H9~+GBK&c6B?j{fknci3kE!CGw-Las
zf_snFw@@BZk4eOuPJre^CH#hn=96?mZE${^nHT2zdVmN5G>ztDfnmE;QS5-37g(*2
zPGA7LTx@_@ZoFsag<D-w?=x2;trBdur3Z6%xQPwzkg(^IX^^i#1Of0XtoGYrru^BN
zkX~km4Z||?Nxaz%GbBc9Vc2ojSBHU}b;=tF&8HAnV+p#a1~#^dHE!JlIq|BSVDon3
zy(cjJK4KFH$%rvpTMbpidJ33!U$t*ECypMN?mnvR*V>cB)HiEZK5dpt8|Xd1y`cSL
z#0<3A@k44aF(W?8Flcv-m?1;s#zmWB#f*8t@N<Y6q+m5L>|9DFn~&N6%FiinT7$B4
r%NRfNwy7x?zNY^i$a@^#S(nQ{T{pUfRSG{k00000NkvXXu0mjfB(!u^

literal 0
HcmV?d00001

diff --git a/data_embed/index.html b/data_embed/index.html
index 3d23b23..9bb42cc 100644
--- a/data_embed/index.html
+++ b/data_embed/index.html
@@ -16,7 +16,7 @@
             >
                 <div class="container">
                     <a class="navbar-brand" href=""
-                        >CA2RXU's LoRa</a
+                        >CA2RXU's LoRa iGate</a
                     >
                     <button class="navbar-toggler" type="button" data-bs-toggle="collapse" data-bs-target="#navbarColor01" aria-controls="navbarColor01" aria-expanded="false" aria-label="Toggle navigation">
                         <span class="navbar-toggler-icon"></span>
diff --git a/src/battery_utils.cpp b/src/battery_utils.cpp
index e2e3311..2eff7db 100644
--- a/src/battery_utils.cpp
+++ b/src/battery_utils.cpp
@@ -75,11 +75,13 @@ namespace BATTERY_Utils {
     }
 
     void setup() {
-        if (Config.battery.voltageDividerR2 != 0) voltageDividerTransformation = (Config.battery.voltageDividerR1 + Config.battery.voltageDividerR2) / Config.battery.voltageDividerR2;
-        
+        if ((Config.battery.sendExternalVoltage || Config.battery.monitorExternalVoltage) && Config.battery.voltageDividerR2 != 0) voltageDividerTransformation = (Config.battery.voltageDividerR1 + Config.battery.voltageDividerR2) / Config.battery.voltageDividerR2;
+
         #if defined(HAS_ADC_CALIBRATION)
-            adcCalibrationCheck();
-            adcCalibration();
+            if (Config.battery.sendInternalVoltage || Config.battery.monitorInternalVoltage || Config.battery.sendExternalVoltage || Config.battery.monitorExternalVoltage) {
+                adcCalibrationCheck();
+                adcCalibration();
+            }
         #endif
     }
 
diff --git a/src/web_utils.cpp b/src/web_utils.cpp
index 6f5fcdf..cff2b5c 100644
--- a/src/web_utils.cpp
+++ b/src/web_utils.cpp
@@ -29,6 +29,11 @@ extern const char web_bootstrap_js[] asm("_binary_data_embed_bootstrap_js_gz_sta
 extern const char web_bootstrap_js_end[] asm("_binary_data_embed_bootstrap_js_gz_end");
 extern const size_t web_bootstrap_js_len = web_bootstrap_js_end - web_bootstrap_js;
 
+// Declare external symbols for the embedded image data
+extern const unsigned char favicon_data[] asm("_binary_data_embed_favicon_png_gz_start");
+extern const unsigned char favicon_data_end[] asm("_binary_data_embed_favicon_png_gz_end");
+extern const size_t favicon_data_len = favicon_data_end - favicon_data;
+
 namespace WEB_Utils {
 
     AsyncWebServer server(80);
@@ -49,6 +54,12 @@ namespace WEB_Utils {
         request->send(response);
     }
 
+    void handleFavicon(AsyncWebServerRequest *request) {
+        AsyncWebServerResponse *response = request->beginResponse_P(200, "image/x-icon", (const uint8_t*)favicon_data, favicon_data_len);
+        response->addHeader("Content-Encoding", "gzip");
+        request->send(response);
+    }
+
     void handleReadConfiguration(AsyncWebServerRequest *request) {
         File file = SPIFFS.open("/igate_conf.json");
         
@@ -243,6 +254,7 @@ namespace WEB_Utils {
         server.on("/script.js", HTTP_GET, handleScript);
         server.on("/bootstrap.css", HTTP_GET, handleBootstrapStyle);
         server.on("/bootstrap.js", HTTP_GET, handleBootstrapScript);
+        server.on("/favicon.png", HTTP_GET, handleFavicon);
 
         OTA_Utils::setup(&server); // Include OTA Updater for WebServer
 
diff --git a/tools/compress.py b/tools/compress.py
index 585f5cb..3aefed3 100644
--- a/tools/compress.py
+++ b/tools/compress.py
@@ -9,6 +9,7 @@ files = [
   'data_embed/style.css',
   'data_embed/bootstrap.js',
   'data_embed/bootstrap.css',
+  'data_embed/favicon.png',
 ]
 
 for src in files: