From e6401f6840d193868cdc0b1116bfeb809c8eb3a8 Mon Sep 17 00:00:00 2001 From: Nic Limper Date: Sun, 3 Nov 2024 21:10:49 +0100 Subject: [PATCH] cosmetic issue on update page --- ESP32_AP-Flasher/data/www/ota.js.gz | Bin 5480 -> 5514 bytes ESP32_AP-Flasher/wwwroot/ota.js | 6 +++--- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ESP32_AP-Flasher/data/www/ota.js.gz b/ESP32_AP-Flasher/data/www/ota.js.gz index 574678502dca0c9a5bcae85cd7a35dc60f017e4a..7ef651e2b7da72ca731889595e5fdab2e9df4742 100644 GIT binary patch literal 5514 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 M1qHdcx_4v%0D1_O;s5{u literal 5480 zcmV-u6_@HCiwFn+00002|8I0*E^2cC?L2F9+c=Wnr)vHK&CP}6#il%&Nj~_M%EQ^o zZYD|D&Q9%RQ#LKa7S|N1BS9;gjQ;y}<3R!>KvMQ>u4?O4l~^KyMx)W)=ofGs6;44G zxpU}5ibeE;1v&r0e%01$CLt>z@7;r~{oSe-(v zDb0)UGRb0Jz6)5Nlu)OrvMkB2q2E=MmSmqlB}I`JB|O}f53*at&f9jTRZ#$hzmYDm8)#(TvgeWCVA#0SwcT9Vrc9K&R1;b zz=uz)AmswSAed+wCDgehbUO3hTT+zJH>6*vi<810IPz7Jl5$m2G8ZlCjuKKx$rtL& zKFO8iZ*@8aMmTPj-DLSPb4A|=zV|0w6)y;HqqIUC@#nri1EAoG{0qFp=I|pa@(h>4 zQ&HfJo`p2JeitDr4}r#~$8V2co_UNWj`(nxNw%oyaY_)5y7JS402Rdx-($_{aoAW& z$B?cTh_i`JxjVuNf;+3 z%xZ;5WqC$a#HLX;CFy2;%HGyVmL?h5xlHrvjn|sXuTga0L-Oru3~ znGz?zaw=3si0%8c=b;fFWdN?X9MCWGD6670T{*B2P8tFEQ7PI1z}n%6FPN$~DF9!(i(t#ZaRLZ)FmgMlwN9X#7Y18y%31Itk|0I9CU!cwC z8g@W!$JAKVYGZU~x^9cO)J)9genn`Mq-Y;Atq{(mg)d$iRAbXUD#2u7-FV}WKiIdm zXDs*^P-f4u9h$JLeRzeoe8is}@rPkn+lvk3GDYYGR`}o(L`8CkA!Ns)0pNe2R8}4{ zwi*K(84$c1bXPo^4bUPBXu9r1;Gr_O)jp7WsQE2^W^|sOS4Fy4FPeO^ZSMs3`#Daj z=_H@@bkaKvH0BzV>&;j2{S3rN@?f~AF4Lr(k@!5KK@X6qqO-hc#^k@lG`~)=o^D8g zP7-}3!pkCGmZUh3!8=OxC?22^tQrT?Sw15qGa!Ru)G>(KjARmRAi%2PR-EwB>IWT0 z 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 exDhqo>WB>qER-nNE diff --git a/ESP32_AP-Flasher/wwwroot/ota.js b/ESP32_AP-Flasher/wwwroot/ota.js index 076db60e..7e577469 100644 --- a/ESP32_AP-Flasher/wwwroot/ota.js +++ b/ESP32_AP-Flasher/wwwroot/ota.js @@ -57,7 +57,7 @@ export async function initUpdate() { if (sdata.env) { let matchtest = ''; - if (sdata.buildversion != filesystemversion && filesystemversion != "custom" && sdata.buildversion != "custom") matchtest = " <- not matching!" + if (parseInt(sdata.buildversion) != parseInt(filesystemversion) && filesystemversion != "custom" && sdata.buildversion != "custom") matchtest = " <- not matching!" print(`env: ${sdata.env}`); print(`build date: ${formatEpoch(sdata.buildtime)}`); print(`esp32 version: ${sdata.buildversion}`); @@ -96,9 +96,9 @@ export async function initUpdate() { } else { const release = releaseDetails[0]; if (release?.tag_name) { - if (release.tag_name == currentVer) { + if (parseInt(release.tag_name) == parseInt(currentVer)) { easyupdate.innerHTML = `Version ${currentVer}. You are up to date`; - } else if (release.date < formatEpoch(currentBuildtime)) { + } else if (release.date < formatEpoch(currentBuildtime - 30 * 60)) { easyupdate.innerHTML = `Your version is newer than the latest release date.
Are you the developer? :-)`; } else { easyupdate.innerHTML = `An update from version ${currentVer} to version ${release.tag_name} is available.`;