Add suffix compact mode, added extra zap notify settings, WebUI cleanup

.forgejo/workflows/push.yaml

@@ -116,7 +116,7 @@ jobs:
             0x8000 .pio/build/${{ matrix.chip.name }}_${{ matrix.epd_variant }}/partitions.bin \
             0xe000 .pio/build/${{ matrix.chip.name }}_${{ matrix.epd_variant }}/ota_data_initial.bin \
             0x10000 .pio/build/${{ matrix.chip.name }}_${{ matrix.epd_variant }}/firmware.bin \
-            0x369000 .pio/build/${{ matrix.chip.name }}_${{ matrix.epd_variant }}/littlefs.bin
+            0x370000 .pio/build/${{ matrix.chip.name }}_${{ matrix.epd_variant }}/littlefs.bin
             # Adjust the offset for littlefs or other files as needed for the original case
           fi
 

data

@@ -1 +1 @@
-Subproject commit d74e9dab60772ef11f9b033cfe982d216a9c95ee
+Subproject commit de99a221d688949da0d95e2f9df2da5ba77f5c0d

dependencies.lock

@@ -4,6 +4,6 @@ dependencies:
     source:
       type: idf
     version: 4.4.7
-manifest_hash: 841ba2a95f4b32d39636bf4fdf07c48a2052f71c9728a5b7f263083a3b430a4f
+manifest_hash: cd2f3ee15e776d949eb4ea4eddc8f39b30c2a7905050850eed01ab4928143cff
 target: esp32s3
 version: 1.0.0

lib/btclock/data_handler.cpp

@@ -67,7 +67,7 @@ char getCurrencyChar(const std::string& input)
         return CURRENCY_USD;  // Assuming USD is the default for unknown inputs
 }
 
-std::array<std::string, NUM_SCREENS> parsePriceData(std::uint32_t price, char currencySymbol, bool useSuffixFormat, bool mowMode)
+std::array<std::string, NUM_SCREENS> parsePriceData(std::uint32_t price, char currencySymbol, bool useSuffixFormat, bool mowMode, bool shareDot)
 {
     std::array<std::string, NUM_SCREENS> ret;
     std::string priceString;
@@ -80,7 +80,7 @@ std::array<std::string, NUM_SCREENS> parsePriceData(std::uint32_t price, char cu
         priceString = getCurrencySymbol(currencySymbol) + std::to_string(price);
     }
     std::uint32_t firstIndex = 0;
-    if (priceString.length() < (NUM_SCREENS))
+    if ((shareDot && priceString.length() <= (NUM_SCREENS)) || priceString.length() < (NUM_SCREENS))
     {
         priceString.insert(priceString.begin(), NUM_SCREENS - priceString.length(), ' ');
 
@@ -90,10 +90,40 @@ std::array<std::string, NUM_SCREENS> parsePriceData(std::uint32_t price, char cu
         firstIndex = 1;
     }
     
+    if (shareDot)
+    {
+        std::vector<std::string> tempArray;
+        size_t dotPosition = priceString.find('.');
+        if (dotPosition != std::string::npos && dotPosition > 0)
+        {
+            for (size_t i = 0; i < priceString.length(); ++i)
+            {
+                if (i == dotPosition - 1)
+                {
+                    tempArray.push_back(std::string(1, priceString[i]) + ".");
+                    ++i; // Skip the dot in the next iteration
+                }
+                else
+                {
+                    tempArray.push_back(std::string(1, priceString[i]));
+                }
+            }
+
+            // Copy from tempArray to ret
+            for (std::uint32_t i = firstIndex; i < NUM_SCREENS && i - firstIndex < tempArray.size(); ++i)
+            {
+                ret[i] = tempArray[i - firstIndex];
+            }
+        }
+    }
+    else
+    {
         for (std::uint32_t i = firstIndex; i < NUM_SCREENS; i++)
         {
-        ret[i] = priceString[i];
+            ret[i] = std::string(1, priceString[i]);
         }
+    }
+
 
     return ret;
 }

lib/btclock/data_handler.hpp

@@ -2,6 +2,7 @@
 #include <string>
 #include <cmath>
 #include <cstdint>
+#include <vector>
 
 #include "utils.hpp"
 
@@ -19,7 +20,7 @@ const std::string CURRENCY_CODE_JPY = "JPY";
 const std::string CURRENCY_CODE_AUD = "AUD";
 const std::string CURRENCY_CODE_CAD = "CAD";
 
-std::array<std::string, NUM_SCREENS> parsePriceData(std::uint32_t price, char currency, bool useSuffixFormat = false, bool mowMode = false);
+std::array<std::string, NUM_SCREENS> parsePriceData(std::uint32_t price, char currency, bool useSuffixFormat = false, bool mowMode = false, bool shareDot = false);
 std::array<std::string, NUM_SCREENS> parseSatsPerCurrency(std::uint32_t price, char currencySymbol, bool withSatsSymbol);
 std::array<std::string, NUM_SCREENS> parseBlockHeight(std::uint32_t blockHeight);
 std::array<std::string, NUM_SCREENS> parseHalvingCountdown(std::uint32_t blockHeight, bool asBlocks);

partition.csv

@@ -1,7 +1,7 @@
 # Name,   Type, SubType, Offset,  Size, Flags
 nvs,      data, nvs,     36K,     20K,
 otadata,  data, ota,     56K,     8K,
-app0,     app,  ota_0,   64K,     1740K,
+app0,     app,  ota_0,   64K,     1760K,
-app1,     app,  ota_1,   ,        1740K,
+app1,     app,  ota_1,   ,        1760K,
-spiffs,   data, spiffs,  ,        400K,
+spiffs,   data, spiffs,  ,        410K,
 coredump, data, coredump,,        64K,

platformio.ini

@@ -33,9 +33,9 @@ build_unflags =
   -fno-exceptions
 lib_deps = 
     https://github.com/joltwallet/esp_littlefs.git
-    bblanchon/ArduinoJson@^7.2.0
+    bblanchon/ArduinoJson@^7.2.1
     mathieucarbou/ESPAsyncWebServer @ 3.3.23
-    adafruit/Adafruit BusIO@^1.16.1
+    adafruit/Adafruit BusIO@^1.16.2
     adafruit/Adafruit MCP23017 Arduino Library@^2.3.2
     adafruit/Adafruit NeoPixel@^1.12.3
     https://github.com/dsbaars/universal_pin

src/lib/defaults.hpp

@@ -19,6 +19,7 @@
 #define DEFAULT_OWN_DATA_SOURCE true
 #define DEFAULT_STAGING_SOURCE false
 #define DEFAULT_MOW_MODE false
+#define DEFAULT_SUFFIX_SHARE_DOT false
 
 #define DEFAULT_V2_SOURCE_CURRENCY CURRENCY_USD
 
@@ -57,6 +58,8 @@
 
 #define DEFAULT_ZAP_NOTIFY_ENABLED false
 #define DEFAULT_ZAP_NOTIFY_PUBKEY "b5127a08cf33616274800a4387881a9f98e04b9c37116e92de5250498635c422"
+#define DEFAULT_LED_FLASH_ON_ZAP true
+#define DEFAULT_FL_FLASH_ON_ZAP true
 
 #define DEFAULT_HTTP_AUTH_ENABLED false
 #define DEFAULT_HTTP_AUTH_USERNAME "btclock"

src/lib/epd.cpp

@@ -534,7 +534,7 @@ void showChars(const uint dispNum, const String &chars, bool partial,
       int16_t dotDescent = dotGlyph->yOffset;
       
       // Draw the dot with adjusted y-position
-      displays[dispNum].setCursor(x, y + dotDescent + dotGlyph->height);
+      displays[dispNum].setCursor(x, y + dotDescent + dotGlyph->height + 8);
       displays[dispNum].print(c);
     } else {
       // For other characters, use the original y-position

src/lib/led_handler.cpp

@@ -285,7 +285,7 @@ void ledTask(void *parameter)
 #ifdef HAS_FRONTLIGHT
           bool frontlightWasOn = false;
 
-          if (preferences.getBool("flFlashOnUpd", DEFAULT_FL_FLASH_ON_UPDATE))
+          if (preferences.getBool("flFlashOnZap", DEFAULT_FL_FLASH_ON_ZAP))
           {
             if (frontlightOn)
             {
@@ -307,7 +307,7 @@ void ledTask(void *parameter)
           //   blinkDelayTwoColor(250, 3, pixels.Color(142, 48, 235),
           //                    pixels.Color(169, 21, 255));
 #ifdef HAS_FRONTLIGHT
-          if (preferences.getBool("flFlashOnUpd", DEFAULT_FL_FLASH_ON_UPDATE))
+          if (preferences.getBool("flFlashOnZap", DEFAULT_FL_FLASH_ON_ZAP))
           {
             vTaskDelay(pdMS_TO_TICKS(10));
             if (frontlightWasOn)

src/lib/nostr_notify.cpp

@@ -252,7 +252,10 @@ void handleNostrZapCallback(const String &subId, nostr::SignedNostrEvent *event)
 
                 setEpdContent(textEpdContent);
                 vTaskDelay(pdMS_TO_TICKS(315 * NUM_SCREENS) + pdMS_TO_TICKS(250));
+                if (preferences.getBool("ledFlashOnZap", DEFAULT_LED_FLASH_ON_ZAP))
+                {
                     queueLedEffect(LED_EFFECT_NOSTR_ZAP);
+                }
                 if (timerPeriod > 0)
                 {
                     esp_timer_start_periodic(screenRotateTimer,

src/lib/screen_handler.cpp

@@ -41,7 +41,10 @@ void workerTask(void *pvParameters) {
           uint price = getPrice(currency);
 
           if (getCurrentScreen() == SCREEN_BTC_TICKER) {
-            taskEpdContent = parsePriceData(price, currency, preferences.getBool("suffixPrice", DEFAULT_SUFFIX_PRICE), preferences.getBool("mowMode", DEFAULT_MOW_MODE));
+            taskEpdContent = parsePriceData(price, currency, preferences.getBool("suffixPrice", DEFAULT_SUFFIX_PRICE), 
+              preferences.getBool("mowMode", DEFAULT_MOW_MODE),
+              preferences.getBool("suffixShareDot", DEFAULT_SUFFIX_SHARE_DOT)
+            );
           } else if (getCurrentScreen() == SCREEN_SATS_PER_CURRENCY) {
             taskEpdContent = parseSatsPerCurrency(price, currency, preferences.getBool("useSatsSymbol", DEFAULT_USE_SATS_SYMBOL));
           } else {

src/lib/webserver.cpp

@@ -546,7 +546,7 @@ void onApiSettingsPatch(AsyncWebServerRequest *request, JsonVariant &json)
                            "mdnsEnabled", "otaEnabled", "stealFocus",
                            "mcapBigChar", "useSatsSymbol", "useBlkCountdown",
                            "suffixPrice", "disableLeds", "ownDataSource",
-                           "mowMode",
+                           "mowMode", "suffixShareDot",
                            "flAlwaysOn", "flDisable", "flFlashOnUpd",
                            "mempoolSecure", "useNostr", "bitaxeEnabled",
                            "nostrZapNotify", "stagingSource", "httpAuthEnabled"};
@@ -689,6 +689,7 @@ void onApiSettingsGet(AsyncWebServerRequest *request)
   root["suffixPrice"] = preferences.getBool("suffixPrice", DEFAULT_SUFFIX_PRICE);
   root["disableLeds"] = preferences.getBool("disableLeds", DEFAULT_DISABLE_LEDS);
   root["mowMode"] = preferences.getBool("mowMode", DEFAULT_MOW_MODE);
+  root["suffixShareDot"] = preferences.getBool("suffixShareDot", DEFAULT_SUFFIX_SHARE_DOT);
 
   root["hostnamePrefix"] = preferences.getString("hostnamePrefix", DEFAULT_HOSTNAME_PREFIX);
   root["hostname"] = getMyHostname();
@@ -703,6 +704,8 @@ void onApiSettingsGet(AsyncWebServerRequest *request)
 
   root["nostrZapNotify"] = preferences.getBool("nostrZapNotify", DEFAULT_ZAP_NOTIFY_ENABLED);
   root["nostrZapPubkey"] = preferences.getString("nostrZapPubkey", DEFAULT_ZAP_NOTIFY_PUBKEY);
+  root["ledFlashOnZap"] = preferences.getBool("ledFlashOnZap", DEFAULT_LED_FLASH_ON_ZAP);
+
   root["gitReleaseUrl"] = preferences.getString("gitReleaseUrl", DEFAULT_GIT_RELEASE_URL);
 
   root["bitaxeEnabled"] = preferences.getBool("bitaxeEnabled", DEFAULT_BITAXE_ENABLED);
@@ -719,6 +722,8 @@ void onApiSettingsGet(AsyncWebServerRequest *request)
   root["flAlwaysOn"] = preferences.getBool("flAlwaysOn", DEFAULT_FL_ALWAYS_ON);
   root["flEffectDelay"] = preferences.getUInt("flEffectDelay", DEFAULT_FL_EFFECT_DELAY);
   root["flFlashOnUpd"] = preferences.getBool("flFlashOnUpd", DEFAULT_FL_FLASH_ON_UPDATE);
+  root["flFlashOnZap"] = preferences.getBool("flFlashOnZap", DEFAULT_FL_FLASH_ON_ZAP);
+
   root["hasLightLevel"] = hasLightLevel();
   root["luxLightToggle"] = preferences.getUInt("luxLightToggle", DEFAULT_LUX_LIGHT_TOGGLE);
 #else

test/test_datahandler/test_main.cpp

@@ -113,6 +113,21 @@ void test_PriceSuffixModeMow(void)
     TEST_ASSERT_EQUAL_STRING_MESSAGE("M", output[NUM_SCREENS - 1].c_str(), joined.c_str());
 }
 
+void test_PriceSuffixModeMowCompact(void)
+{
+    std::array<std::string, NUM_SCREENS> output = parsePriceData(93000, '$', true, true, true);
+
+    std::string joined = joinArrayWithBrackets(output);
+
+    TEST_ASSERT_EQUAL_STRING("BTC/USD", output[0].c_str());
+    TEST_ASSERT_EQUAL_STRING_MESSAGE("$", output[NUM_SCREENS - 6].c_str(), joined.c_str());
+    TEST_ASSERT_EQUAL_STRING_MESSAGE("0.", output[NUM_SCREENS - 5].c_str(), joined.c_str());
+    TEST_ASSERT_EQUAL_STRING_MESSAGE("0", output[NUM_SCREENS - 4].c_str(), joined.c_str());
+    TEST_ASSERT_EQUAL_STRING_MESSAGE("9", output[NUM_SCREENS - 3].c_str(), joined.c_str());
+    TEST_ASSERT_EQUAL_STRING_MESSAGE("3", output[NUM_SCREENS - 2].c_str(), joined.c_str());
+    TEST_ASSERT_EQUAL_STRING_MESSAGE("M", output[NUM_SCREENS - 1].c_str(), joined.c_str());
+}
+
 void test_McapLowerUsd(void)
 {
     std::array<std::string, NUM_SCREENS> output = parseMarketCap(810000, 26000, '$', true);
@@ -232,6 +247,7 @@ int runUnityTests(void)
     RUN_TEST(test_Mcap1TrillionJpySmallChars);
     RUN_TEST(test_PriceSuffixMode);
     RUN_TEST(test_PriceSuffixModeMow);
+    RUN_TEST(test_PriceSuffixModeMowCompact);
 
     return UNITY_END();
 }