starred/OpenEPaperLink
1
0
Fork 0
mirror of https://github.com/OpenEPaperLink/OpenEPaperLink.git synced 2026-03-21 15:06:38 +01:00
Code Issues 1.4k Packages Projects Releases 10 Wiki Activity

Download template tag json file when needed. (#298)

Browse Source
This commit is contained in:
Skip Hansen
2024-04-17 13:18:29 -07:00
committed by GitHub
parent fe8056b791
commit b8f00f4cb6
2 changed files with 16 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
ESP32_AP-Flasher/wwwroot/main.js
View File

@@ -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) {

7
ESP32_AP-Flasher/wwwroot/ota.js
View File

@@ -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();