From b8f00f4cb6b552eeea8c2f211c333ffc9e6f9da7 Mon Sep 17 00:00:00 2001 From: Skip Hansen Date: Wed, 17 Apr 2024 13:18:29 -0700 Subject: [PATCH] Download template tag json file when needed. (#298) --- ESP32_AP-Flasher/wwwroot/main.js | 14 ++++++++++---- ESP32_AP-Flasher/wwwroot/ota.js | 7 ++++++- 2 files changed, 16 insertions(+), 5 deletions(-) diff --git a/ESP32_AP-Flasher/wwwroot/main.js b/ESP32_AP-Flasher/wwwroot/main.js index f62daa42..eb12af24 100644 --- a/ESP32_AP-Flasher/wwwroot/main.js +++ b/ESP32_AP-Flasher/wwwroot/main.js @@ -64,9 +64,9 @@ window.addEventListener("loadConfig", function () { if (data.hasBLE == 0) { $("#apcfgble").parentNode.style.display = 'none'; } - if (data.hasSubGhz == 0) { - $("#apcfgsubgigchid").parentNode.style.display = 'none'; - } + if (data.hasSubGhz == 0) { + $("#apcfgsubgigchid").parentNode.style.display = 'none'; + } if (data.savespace) { } if (data.apstate) { @@ -297,6 +297,9 @@ function processTags(tagArray) { (async () => { const localTagmac = tagmac; const data = await getTagtype(element.hwType); + if (data.usetemplate != 0) { + const template = await getTagtype(data.usetemplate); + } $('#tag' + localTagmac + ' .model').innerHTML = data.name; $('#tag' + localTagmac + ' .resolution').innerHTML = data.width + "x" + data.height; if (element.ver != 0 && element.ver != 1) { @@ -1408,6 +1411,7 @@ async function getTagtype(hwtype) { return data; } const jsonData = await response.json(); + let data = { name: jsonData.name, width: parseInt(jsonData.width), @@ -1419,11 +1423,13 @@ async function getTagtype(hwtype) { options: Object.values(jsonData.options ?? []), zlib: parseInt(jsonData.zlib_compression || "0", 16), shortlut: parseInt(jsonData.shortlut), - busy: false + busy: false, + usetemplate:parseInt(jsonData.usetemplate || "0",10) }; tagTypes[hwtype] = data; localStorage.setItem("tagTypes", JSON.stringify(tagTypes)); getTagtypeBusy = false; + return data; } catch (error) { diff --git a/ESP32_AP-Flasher/wwwroot/ota.js b/ESP32_AP-Flasher/wwwroot/ota.js index 25d25974..f643730a 100644 --- a/ESP32_AP-Flasher/wwwroot/ota.js +++ b/ESP32_AP-Flasher/wwwroot/ota.js @@ -595,9 +595,14 @@ async function fetchAndCheckTagtypes(cleanup) { const filename = file.name; print(filename, "green"); let check = true; + let hwtype = parseInt(filename, 16); if (cleanup) { - let isInUse = Array.from(gridItems).some(element => element.dataset.hwtype == parseInt(filename, 16)); + let isInUse = Array.from(gridItems).some(element => element.dataset.hwtype == hwtype); + if (!isInUse) { + + isInUse = Array.from(gridItems).some(element => element.dataset.usetemplate == hwtype); + } if (!isInUse) { print("not in use, deleting", "yellow"); const formData = new FormData();