rework of apinfo screen + variables in jsontemplate

- AP info screen content card. Can run on any tag.
- now, you can use {variables} in the 'text' entries in a json template. You can set variables via a http call. If you update a variable, all tags with a json template containing that variable get updated.
- font name in json template is more flexible. You can just use 'filename.ttf' or 'filename.vlw'. A full path is still possible.
- colors in the json template can now be set using #rrggbb color values, and using 'black', 'white' or 'red'.
- added direct output for the TFT display for the yellow esp32-s3. No file writes needed.
- added POST variable 'ttl' to json template upload and image upload, to set the next checkin time
- added /variables-demo.html to demonstrate the variables.
- json templates received from jsonupload are now saved in /current, and reused.
- known issue: 'backup db' button doesn't work due to some browser policy change. Fixing.
thanks to @steinwedel for the inspiration on the variables and some other fixes.

ESP32_AP-Flasher/data/tagtypes/00.json

@@ -33,6 +33,16 @@
 		"10": {
 			"title": [ 10, 15, "t0_14b_tf" ],
 			"pos": [ 76, 20 ]
-		}
+		},
+		"21": [
+			{ "text": [ 2, 5, "OpenEpaperLink", "bahnschrift20", 1, 0, 0 ] },
+			{ "text": [ 2, 25, "Access Point", "bahnschrift20", 1, 0, 0 ] },
+			{ "text": [ 3, 65, "IP address:", "glasstown_nbp_tf", 1, 0, 0 ] },
+			{ "text": [ 10, 80, "{ap_ip}", "t0_14b_tf", 1, 0, 0 ] },
+			{ "text": [ 3, 95, "Channel:", "glasstown_nbp_tf", 1, 0, 0 ] },
+			{ "text": [ 10, 110, "{ap_ch}", "t0_14b_tf", 1, 0, 0 ] },
+			{ "text": [ 3, 125, "Tag count:", "glasstown_nbp_tf", 1, 0, 0 ] },
+			{ "text": [ 10, 140, "{ap_tagcount}", "t0_14b_tf", 1, 0, 0 ] }
+		]
 	}
 }

ESP32_AP-Flasher/data/tagtypes/01.json

@@ -59,6 +59,15 @@
 			"items": 7,
 			"red": [0, 21, 296, 14],
 			"line": [5, 32, 15, "t0_14b_tf", 50]
-		}
+		},
+		"21": [
+			{ "text": [ 5, 5, "OpenEpaperLink AP", "bahnschrift20", 1, 0, 0 ] },
+			{ "text": [ 5, 50, "IP address:", "t0_14b_tf", 1, 0, 0 ] },
+			{ "text": [ 120, 50, "{ap_ip}", "t0_14b_tf", 1, 0, 0 ] },
+			{ "text": [ 5, 70, "Channel:", "t0_14b_tf", 1, 0, 0 ] },
+			{ "text": [ 120, 70, "{ap_ch}", "t0_14b_tf", 1, 0, 0 ] },
+			{ "text": [ 5, 90, "Tag count:", "t0_14b_tf", 1, 0, 0 ] },
+			{ "text": [ 120, 90, "{ap_tagcount}", "t0_14b_tf", 1, 0, 0 ] }
+		]
 	}
 }

ESP32_AP-Flasher/data/tagtypes/E0.json

@@ -12,6 +12,18 @@
 		"gray": [ 150, 150, 150 ]
 	},
 	"capabilities": [ ],
-	"contentids": [ 0, 1, 2, 3, 4, 8, 16, 9, 7, 19, 10, 11 ],
-	"usetemplate": 1
+	"contentids": [ 0, 1, 2, 3, 4, 8, 16, 9, 7, 19, 10, 11, 21 ],
+	"usetemplate": 1,
+	"template": {
+		"21": [
+			{ "box": [ 0, 0, 320, 170, 1 ] },
+			{ "text": [ 5, 5, "OpenEpaperLink AP", "calibrib30", 2, 0, 0, 1 ] },
+			{ "text": [ 5, 60, "IP address:", "bahnschrift20", "#888888", 0, 0, 1 ] },
+			{ "text": [ 120, 60, "{ap_ip}", "bahnschrift20", 0, 0, 0, 1 ] },
+			{ "text": [ 5, 85, "Channel:", "bahnschrift20", "#888888", 0, 0, 1 ] },
+			{ "text": [ 120, 85, "{ap_ch}", "bahnschrift20", 0, 0, 0, "1" ] },
+			{ "text": [ 5, 110, "Tag count:", "bahnschrift20", "#888888", 0, 0, 1 ] },
+			{ "text": [ 120, 110, "{ap_tagcount}", "bahnschrift20", 0, 0, 0, "1" ] }
+		]
+	}
 }

ESP32_AP-Flasher/include/contentmanager.h

@@ -16,25 +16,26 @@ struct contentTypes {
 };
 
 void contentRunner();
+void checkVars();
 void drawNew(uint8_t mac[8], bool buttonPressed, tagRecord *&taginfo);
 bool updateTagImage(String &filename, uint8_t *dst, uint16_t nextCheckin, tagRecord *&taginfo, imgParam &imageParams);
-void drawString(TFT_eSprite &spr, String content, int16_t posx, int16_t posy, String font, byte align = 0, uint16_t color = TFT_BLACK, uint16_t size = 0);
+void drawString(TFT_eSprite &spr, String content, int16_t posx, int16_t posy, String font, byte align = 0, uint16_t color = TFT_BLACK, uint16_t size = 30, uint16_t bgcolor = TFT_WHITE);
 void initSprite(TFT_eSprite &spr, int w, int h, imgParam &imageParams);
 void drawDate(String &filename, tagRecord *&taginfo, imgParam &imageParams);
 void drawNumber(String &filename, int32_t count, int32_t thresholdred, tagRecord *&taginfo, imgParam &imageParams);
 void drawWeather(String &filename, JsonObject &cfgobj, tagRecord *&taginfo, imgParam &imageParams);
 void drawForecast(String &filename, JsonObject &cfgobj, tagRecord *&taginfo, imgParam &imageParams);
-void drawIdentify(String &filename, tagRecord *&taginfo, imgParam &imageParams);
 int getImgURL(String &filename, String URL, time_t fetched, imgParam &imageParams, String MAC);
 bool getRssFeed(String &filename, String URL, String title, tagRecord *&taginfo, imgParam &imageParams);
 bool getCalFeed(String &filename, String URL, String title, tagRecord *&taginfo, imgParam &imageParams);
 void drawQR(String &filename, String qrcontent, String title, tagRecord *&taginfo, imgParam &imageParams);
 uint8_t drawBuienradar(String &filename, JsonObject &cfgobj, tagRecord *&taginfo, imgParam &imageParams);
+void drawAPinfo(String &filename, JsonObject &cfgobj, tagRecord *&taginfo, imgParam &imageParams);
 int getJsonTemplateFile(String &filename, String jsonfile, tagRecord *&taginfo, imgParam &imageParams);
 int getJsonTemplateUrl(String &filename, String URL, time_t fetched, String MAC, tagRecord *&taginfo, imgParam &imageParams);
 void drawJsonStream(Stream &stream, String &filename, tagRecord *&taginfo, imgParam &imageParams);
 void drawElement(const JsonObject &element, TFT_eSprite &spr);
-uint16_t getColor(uint8_t color);
+uint16_t getColor(String color);
 char *formatHttpDate(time_t t);
 String urlEncode(const char *msg);
 int windSpeedToBeaufort(float windSpeed);
@@ -45,4 +46,3 @@ void prepareLUTreq(uint8_t *dst, String input);
 void prepareConfigFile(uint8_t *dst, JsonObject config);
 void getTemplate(JsonDocument &json, uint8_t id, uint8_t hwtype);
 void setU8G2Font(const String &title, U8g2_for_TFT_eSPI &u8f);
-void showIpAddress(String dst);

ESP32_AP-Flasher/include/makeimage.h

@@ -3,6 +3,8 @@
 
 #pragma once
 
+extern TFT_eSPI tft;
+
 struct imgParam {
     bool hasRed;
     uint8_t dataType;

ESP32_AP-Flasher/include/tag_db.h

@@ -76,10 +76,16 @@ struct HwType {
     uint8_t bpp;
 };
 
+struct varStruct {
+    String value;
+    bool changed;
+};
+
 // extern SemaphoreHandle_t tagDBOwner;
 extern Config config;
 extern std::vector<tagRecord*> tagDB;
 extern std::unordered_map<int, HwType> hwtype;
+extern std::unordered_map<std::string, varStruct> varDB;
 extern DynamicJsonDocument APconfig;
 String tagDBtoJson(uint8_t mac[8] = nullptr, uint8_t startPos = 0);
 bool deleteRecord(uint8_t mac[8]);
@@ -88,11 +94,13 @@ void saveDB(String filename);
 void loadDB(String filename);
 void destroyDB();
 uint32_t getTagCount();
+uint32_t getTagCount(uint32_t& timeoutcount);
 void mac2hex(uint8_t* mac, char* hexBuffer);
 bool hex2mac(const String& hexString, uint8_t* mac);
 void clearPending(tagRecord* taginfo);
 void initAPconfig();
 void saveAPconfig();
 HwType getHwType(uint8_t id);
+bool setVarDB(const std::string& key, const String& value);
 
-#pragma pack(pop)
+#pragma pack(pop)