Improved multi-currency support, improved WebUI checks

Author: dsbaars

data

@@ -12,10 +12,10 @@ char getCurrencySymbol(char input)
         return '[';
         break;
     case CURRENCY_GBP:
-        return '\\';
+        return ']';
         break;
     case CURRENCY_JPY:
-        return ']';
+        return '^';
         break;
     case CURRENCY_AUD:
     case CURRENCY_CAD:
@@ -43,9 +43,6 @@ std::string getCurrencyCode(char input)
     case CURRENCY_AUD:
         return "AUD";
         break;
-    case CURRENCY_CHF:
-        return "CHF";
-        break;
     case CURRENCY_CAD:
         return "CAD";
         break;

lib/btclock/data_handler.cpp

@@ -7,10 +7,9 @@
 
 const char CURRENCY_USD = '$';
 const char CURRENCY_EUR = '[';
-const char CURRENCY_GBP = '\\';
-const char CURRENCY_JPY = ']';
-const char CURRENCY_AUD = '^';
-const char CURRENCY_CHF = '_';
+const char CURRENCY_GBP = ']';
+const char CURRENCY_JPY = '^';
+const char CURRENCY_AUD = '_';
 const char CURRENCY_CAD = '`';
 
 std::array<std::string, NUM_SCREENS> parsePriceData(std::uint32_t price, char currency, bool useSuffixFormat = false);

lib/btclock/data_handler.hpp

@@ -16,6 +16,9 @@
 #define DEFAULT_SUFFIX_PRICE false
 #define DEFAULT_DISABLE_LEDS false
 #define DEFAULT_OWN_DATA_SOURCE true
+#define DEFAULT_STAGING_SOURCE false
+#define DEFAULT_V2_SOURCE_CURRENCY CURRENCY_USD
+
 
 #define DEFAULT_TIME_OFFSET_SECONDS 3600
 

src/fonts/antonio-semibold90.h

@@ -252,7 +252,7 @@ void prepareDisplayUpdateTask(void *pvParameters)
 
       bool updatePartial = true;
 
-      if (strstr(epdContent[epdIndex].c_str(), "/") != NULL)
+      if (epdContent[epdIndex].length() > 1 && strstr(epdContent[epdIndex].c_str(), "/") != NULL)
       {
         String top = epdContent[epdIndex].substring(
             0, epdContent[epdIndex].indexOf("/"));

src/lib/defaults.hpp

@@ -1,6 +1,8 @@
 #include "price_notify.hpp"
 
 const char *wsOwnServerPrice = "wss://ws.btclock.dev/ws?assets=bitcoin";
+const char *wsOwnServerV2 = "wss://ws-staging.btclock.dev/api/v2/ws";
+
 const char *wsServerPrice = "wss://ws.coincap.io/prices?assets=bitcoin";
 
 // const char* coinCapWsCert = R"(-----BEGIN CERTIFICATE-----

src/lib/epd.cpp

@@ -48,20 +48,6 @@ const PROGMEM int screens[SCREEN_COUNT] = {
 const int usPerSecond = 1000000;
 const int usPerMinute = 60 * usPerSecond;
 
-struct SpiRamAllocator : ArduinoJson::Allocator {
-  void* allocate(size_t size) override {
-    return heap_caps_malloc(size, MALLOC_CAP_SPIRAM);
-  }
-
-  void deallocate(void* pointer) override {
-    heap_caps_free(pointer);
-  }
-
-  void* reallocate(void* ptr, size_t new_size) override {
-    return heap_caps_realloc(ptr, new_size, MALLOC_CAP_SPIRAM);
-  }
-};
-
 struct ScreenMapping {
     int value;
     const char* name;

src/lib/price_notify.cpp

@@ -455,7 +455,7 @@ void onApiSettingsPatch(AsyncWebServerRequest *request, JsonVariant &json)
     }
   }
 
-  String uintSettings[] = {"minSecPriceUpd", "fullRefreshMin", "ledBrightness", "flMaxBrightness", "flEffectDelay", "luxLightToggle", "wpTimeout"};
+  String uintSettings[] = {"minSecPriceUpd", "fullRefreshMin", "ledBrightness", "flMaxBrightness", "flEffectDelay", "luxLightToggle", "wpTimeout", "srcV2Currency"};
 
   for (String setting : uintSettings)
   {
@@ -478,7 +478,7 @@ void onApiSettingsPatch(AsyncWebServerRequest *request, JsonVariant &json)
   String boolSettings[] = {"fetchEurPrice", "ledTestOnPower", "ledFlashOnUpd",
                            "mdnsEnabled", "otaEnabled", "stealFocus",
                            "mcapBigChar", "useSatsSymbol", "useBlkCountdown",
-                           "suffixPrice", "disableLeds", "ownDataSource", "flAlwaysOn", "flFlashOnUpd", "mempoolSecure", "useNostr", "bitaxeEnabled", "nostrZapNotify"};
+                           "suffixPrice", "disableLeds", "ownDataSource", "flAlwaysOn", "flFlashOnUpd", "mempoolSecure", "useNostr", "bitaxeEnabled", "nostrZapNotify", "stagingSource"};
 
   for (String setting : boolSettings)
   {
@@ -597,6 +597,8 @@ void onApiSettingsGet(AsyncWebServerRequest *request)
   root["ip"] = WiFi.localIP();
   root["txPower"] = WiFi.getTxPower();
   root["ownDataSource"] = preferences.getBool("ownDataSource", DEFAULT_OWN_DATA_SOURCE);
+  root["stagingSource"] = preferences.getBool("stagingSource", DEFAULT_STAGING_SOURCE);
+  root["srcV2Currency"] = preferences.getChar("srcV2Currency", DEFAULT_V2_SOURCE_CURRENCY);
 
   root["nostrPubKey"] = preferences.getString("nostrPubKey", DEFAULT_NOSTR_NPUB);
   root["nostrRelay"] = preferences.getString("nostrRelay", DEFAULT_NOSTR_RELAY);