From 3ccf0f931dd218410bd8a5cf522d17128ae50e3d Mon Sep 17 00:00:00 2001
From: Nic Limper <nic@xs4all.nl>
Date: Thu, 27 Jul 2023 17:40:18 +0200
Subject: [PATCH] small bugfixes

- don't display '01-01' in google calendar when start=0
- bigger buffer for json template
- hold generating new content if free space in file system is too low
- tiny bug on failing to color lines red in google calendar for current appointments
---
 ESP32_AP-Flasher/src/contentmanager.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/ESP32_AP-Flasher/src/contentmanager.cpp b/ESP32_AP-Flasher/src/contentmanager.cpp
index 6854713a..9ff8b058 100644
--- a/ESP32_AP-Flasher/src/contentmanager.cpp
+++ b/ESP32_AP-Flasher/src/contentmanager.cpp
@@ -85,7 +85,7 @@ void contentRunner() {
         tagRecord *taginfo = nullptr;
         taginfo = tagDB.at(c);
 
-        if (taginfo->RSSI && (now >= taginfo->nextupdate || taginfo->wakeupReason == WAKEUP_REASON_GPIO || taginfo->wakeupReason == WAKEUP_REASON_NFC) && config.runStatus == RUNSTATUS_RUN) {
+        if (taginfo->RSSI && (now >= taginfo->nextupdate || taginfo->wakeupReason == WAKEUP_REASON_GPIO || taginfo->wakeupReason == WAKEUP_REASON_NFC) && config.runStatus == RUNSTATUS_RUN && Storage.freeSpace() > 31000) {
             drawNew(taginfo->mac, (taginfo->wakeupReason == WAKEUP_REASON_GPIO), taginfo);
             taginfo->wakeupReason = 0;
         }
@@ -310,7 +310,7 @@ void drawNew(uint8_t mac[8], bool buttonPressed, tagRecord *&taginfo) {
 
         case 19:  // json template
         {
-            DynamicJsonDocument doc(2000);
+            DynamicJsonDocument doc(5000);
             if (cfgobj["filename"]) {
                 File file = contentFS->open("/" + String(hexmac) + ".json", "r");
                 if (file) {
@@ -819,7 +819,7 @@ bool getCalFeed(String &filename, String URL, String title, tagRecord *&taginfo,
         time_t starttime = obj["start"];
         time_t endtime = obj["end"];
         setU8G2Font(loc["line"][3], u8f);
-        if (starttime < now && endtime > now) {
+        if (starttime <= now && endtime > now) {
             u8f.setForegroundColor(PAL_WHITE);
             u8f.setBackgroundColor(PAL_RED);
             spr.fillRect(loc["red"][0], loc["red"][1].as<int>() + i * loc["line"][2].as<int>(), loc["red"][2], loc["red"][3], PAL_RED);
@@ -828,7 +828,7 @@ bool getCalFeed(String &filename, String URL, String title, tagRecord *&taginfo,
             u8f.setBackgroundColor(PAL_WHITE);
         }
         u8f.setCursor(loc["line"][0], loc["line"][1].as<int>() + i * loc["line"][2].as<int>());
-        u8f.print(epoch_to_display(obj["start"]));
+        if (starttime > 0) u8f.print(epoch_to_display(obj["start"]));
         u8f.setCursor(loc["line"][4], loc["line"][1].as<int>() + i * loc["line"][2].as<int>());
         u8f.print(eventtitle);
     }