From 6dfc15832b825932b5a010bfb68cd3a5af19a6b7 Mon Sep 17 00:00:00 2001
From: Djuri Baars <dsbaars@users.noreply.github.com>
Date: Mon, 13 Nov 2023 17:14:11 +0100
Subject: [PATCH] Fix bitcoin halving countdown and add EUR fetch price

---
 data/src/index.html        | 18 ++++++++++++++----
 data/src/js/helpers.js     |  2 +-
 data/src/js/script.ts      | 12 +++++++++++-
 platformio.ini             |  9 +++++++--
 src/lib/config.cpp         |  8 ++++++--
 src/lib/epd.cpp            |  4 +++-
 src/lib/price_fetch.cpp    |  8 ++++----
 src/lib/screen_handler.cpp | 15 ++++++++++++---
 src/lib/webserver.cpp      | 15 ++++++++++++++-
 9 files changed, 72 insertions(+), 19 deletions(-)

diff --git a/data/src/index.html b/data/src/index.html
index 0d9e73f..0de123e 100644
--- a/data/src/index.html
+++ b/data/src/index.html
@@ -71,7 +71,7 @@
             <div>
               <p>Uptime: {{#if uptime.h }}{{ uptime.h }}h {{/if}}{{ uptime.m }}m {{ uptime.s }}s</p>
               <p>
-                Price connection:
+                WS Price connection:
                 <span>
                 {{#if connectionStatus.price}}
                 &#9989;
@@ -80,14 +80,15 @@
                 {{/if}}
                 </span>
                 - 
-                Mempool.space connection:
+                WS Mempool.space connection:
                 <span>
                   {{#if connectionStatus.blocks}}
                   &#9989;
                   {{else}}
                   &#10060;
                   {{/if}}
-                </span>
+                </span><br>
+                <small>If you use "Fetch &euro; price" the WS Price connection will show &#10060; since it uses another data source.</small>
               </p>
             </div>
           </div>
@@ -262,7 +263,16 @@
                   <label class="form-check-label" for="mdnsEnabled">mDNS (restart required)</label>
                 </div>
               </div>
-              
+            </div>
+            <div class="row">
+              <div class="col-sm-12">
+                <div class="form-check form-switch">
+                  <input class="form-check-input" type="checkbox" id="fetchEurPrice" name="fetchEurPrice" value="1">
+                  <label class="form-check-label" for="fetchEurPrice">Fetch &euro; price (restart required)</label>
+                </div>
+              </div>
+            </div>
+            <div>
               <script id="screens-template" type="text/x-handlebars-template">
               <div class="row">
                 <div class="col-sm-6">
diff --git a/data/src/js/helpers.js b/data/src/js/helpers.js
index 5a47d5b..51a66ec 100644
--- a/data/src/js/helpers.js
+++ b/data/src/js/helpers.js
@@ -5,7 +5,7 @@ Handlebars.registerHelper('splitText', function (aString) {
       var c = aString.split("/").map((el) => { return "<div class=\"flex-items\">" + el + "</div>"; }).join('');
       return "<div class=\"splitText\">" + c + "</div>";
     }
-    if (aString.length > 1) {
+    if (aString.length > 1 && !aString.startsWith("&")) {
       return "<div class=\"mediumText\">" + aString + "</div>";
     }
     if (aString.length == 0 || aString === " ") {
diff --git a/data/src/js/script.ts b/data/src/js/script.ts
index 1c9d1ff..5a27700 100644
--- a/data/src/js/script.ts
+++ b/data/src/js/script.ts
@@ -23,6 +23,13 @@ let processStatusData = (jsonData) => {
     var source = document.getElementById("entry-template").innerHTML;
     var template = Handlebars.compile(source);
 
+
+    let index = jsonData.data.findIndex(d => d === '[');
+
+    if (index !== -1) {
+        jsonData.data[index] = '&euro;';
+    }
+
     var context = {
         timerRunning: jsonData.timerRunning,
         memFreePercent: Math.round(jsonData.espFreeHeap / jsonData.espHeapSize * 100),
@@ -46,7 +53,7 @@ if (!!window.EventSource) {
     const connectEventSource = () => {
         let source = new EventSource('/events');
 
-        source.addEventListener('open', (e)  => {
+        source.addEventListener('open', (e) => {
             console.log("Status EventSource Connected");
             if (e.data) {
                 processStatusData(JSON.parse(e.data));
@@ -128,6 +135,9 @@ fetch('/api/settings', {
         if (jsonData.ledTestOnPower)
             document.getElementById('ledTestOnPower').checked = true;
 
+        if (jsonData.fetchEurPrice)
+            document.getElementById('fetchEurPrice').checked = true;
+
         // let nodeFields = ["rpcHost", "rpcPort", "rpcUser", "tzOffset"];
 
         // for (let n of nodeFields) {
diff --git a/platformio.ini b/platformio.ini
index 449e5a7..9b77d75 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -11,8 +11,8 @@
 data_dir = data/build
 
 [env]
-platform = espressif32
-framework = arduino, espidf
+platform = https://github.com/platformio/platform-espressif32.git
+framework =  arduino, espidf
 monitor_speed = 115200
 upload_speed = 921600
 monitor_filters = esp32_exception_decoder, colorize
@@ -57,3 +57,8 @@ extends = env:lolin_s3_mini
 build_flags =
     ${env:lolin_s3_mini.build_flags}
     -D USE_QR
+
+[env:lolin_s3_mini_qr_ota]
+extends = env:lolin_s3_mini_qr
+upload_protocol = espota
+upload_port = 192.168.23.30
\ No newline at end of file
diff --git a/src/lib/config.cpp b/src/lib/config.cpp
index 68e3c75..d86072c 100644
--- a/src/lib/config.cpp
+++ b/src/lib/config.cpp
@@ -167,8 +167,12 @@ void setupPreferences()
 void setupWebsocketClients(void *pvParameters)
 {
     setupBlockNotify();
-  //  setupPriceFetchTask();
-    setupPriceNotify();
+
+    if (preferences.getBool("fetchEurPrice", false)) {
+        setupPriceFetchTask();
+    } else {
+        setupPriceNotify();
+    }
 
     vTaskDelete(NULL);
 }
diff --git a/src/lib/epd.cpp b/src/lib/epd.cpp
index 7a10757..b2fe059 100644
--- a/src/lib/epd.cpp
+++ b/src/lib/epd.cpp
@@ -120,6 +120,8 @@ void setEpdContent(std::array<String, NUM_SCREENS> newEpdContent, bool forceUpda
 {
     std::lock_guard<std::mutex> lock(epdUpdateMutex);
 
+    waitUntilNoneBusy();
+
     for (uint i = 0; i < NUM_SCREENS; i++)
     {
         if (newEpdContent[i].compareTo(currentEpdContent[i]) != 0 || forceUpdate)
@@ -387,7 +389,7 @@ void waitUntilNoneBusy()
             vTaskDelay(10);
             if (count == 200)
             {
-                displays[i].init(0, false);
+                //displays[i].init(0, false);
                 vTaskDelay(100);
             }
             else if (count > 205)
diff --git a/src/lib/price_fetch.cpp b/src/lib/price_fetch.cpp
index 08a588c..c9f5b11 100644
--- a/src/lib/price_fetch.cpp
+++ b/src/lib/price_fetch.cpp
@@ -27,17 +27,17 @@ void taskPriceFetch(void *pvParameters)
             String payload = http->getString();
             StaticJsonDocument<96> doc;
             deserializeJson(doc, payload);
-            usdPrice = doc["bitcoin"]["usd"];
-            eurPrice = doc["bitcoin"]["eur"];
+//            usdPrice = doc["bitcoin"]["usd"];
+            eurPrice = doc["bitcoin"]["eur"].as<uint>();
 
-            setPrice(usdPrice);
+            setPrice(eurPrice);
             if (workQueue != nullptr && (getCurrentScreen() == SCREEN_BTC_TICKER || getCurrentScreen() == SCREEN_MSCW_TIME || getCurrentScreen() == SCREEN_MARKET_CAP))
             {
                 WorkItem priceUpdate = {TASK_PRICE_UPDATE, 0};
                 xQueueSend(workQueue, &priceUpdate, portMAX_DELAY);
             }
 
-            preferences.putUInt("lastPrice", usdPrice);
+            preferences.putUInt("lastPrice", eurPrice);
         }
         else
         {
diff --git a/src/lib/screen_handler.cpp b/src/lib/screen_handler.cpp
index 04f1ed3..7c337ad 100644
--- a/src/lib/screen_handler.cpp
+++ b/src/lib/screen_handler.cpp
@@ -48,14 +48,23 @@ void workerTask(void *pvParameters)
             {
                 firstIndex = 0;
                 uint price = getPrice();
+                char priceSymbol = '$';
                 if (getCurrentScreen() == SCREEN_BTC_TICKER)
                 {
-                    priceString = ("$" + String(price)).c_str();
+                    if (preferences.getBool("fetchEurPrice", false)) {
+                        priceSymbol = '[';
+                    }
+
+                    priceString = (priceSymbol + String(price)).c_str();
 
                     if (priceString.length() < (NUM_SCREENS))
                     {
                         priceString.insert(priceString.begin(), NUM_SCREENS - priceString.length(), ' ');
-                        taskEpdContent[0] = "BTC/USD";
+                        if (preferences.getBool("fetchEurPrice", false)) {
+                            taskEpdContent[0] = "BTC/EUR";
+                        } else {
+                            taskEpdContent[0] = "BTC/USD";
+                        }
                         firstIndex = 1;
                     }
                 }
@@ -154,7 +163,7 @@ void workerTask(void *pvParameters)
                     taskEpdContent[1] = "HALV/ING";
                     taskEpdContent[(NUM_SCREENS - 5)] = String(years) + "/YRS";
                     taskEpdContent[(NUM_SCREENS - 4)] = String(days) + "/DAYS";
-                    taskEpdContent[(NUM_SCREENS - 3)] = String(days) + "/HRS";
+                    taskEpdContent[(NUM_SCREENS - 3)] = String(hours) + "/HRS";
                     taskEpdContent[(NUM_SCREENS - 2)] = String(mins) + "/MINS";
                     taskEpdContent[(NUM_SCREENS - 1)] = "TO/GO";
                 }
diff --git a/src/lib/webserver.cpp b/src/lib/webserver.cpp
index bda8a3c..dcbbea0 100644
--- a/src/lib/webserver.cpp
+++ b/src/lib/webserver.cpp
@@ -244,7 +244,7 @@ void onApiSettingsGet(AsyncWebServerRequest *request)
     root["mcapBigChar"] = preferences.getBool("mcapBigChar", true);
     root["mdnsEnabled"] = preferences.getBool("mdnsEnabled", true);
     root["otaEnabled"] = preferences.getBool("otaEnabled", true);
-
+    root["fetchEurPrice"] = preferences.getBool("fetchEurPrice", false);
     root["hostname"] = getMyHostname();
     root["ip"] = WiFi.localIP();
 
@@ -305,6 +305,19 @@ void onApiSettingsPost(AsyncWebServerRequest *request)
 
     settingsChanged = processEpdColorSettings(request);
 
+    if (request->hasParam("fetchEurPrice", true))
+    {
+        AsyncWebParameter *fetchEurPrice = request->getParam("fetchEurPrice", true);
+
+        preferences.putBool("fetchEurPrice", fetchEurPrice->value().toInt());
+        settingsChanged = true;
+    }
+    else
+    {
+        preferences.putBool("fetchEurPrice", 0);
+        settingsChanged = true;
+    }
+
     if (request->hasParam("ledTestOnPower", true))
     {
         AsyncWebParameter *ledTestOnPower = request->getParam("ledTestOnPower", true);