From 7a0ca319e7b686f2645af2cd3812831457c4f7e9 Mon Sep 17 00:00:00 2001 From: Nic Limper Date: Sat, 7 Oct 2023 22:21:54 +0200 Subject: [PATCH] timing fix in getting version info for ota --- ESP32_AP-Flasher/data/www/ota.js.gz | Bin 4853 -> 4902 bytes ESP32_AP-Flasher/src/contentmanager.cpp | 2 +- ESP32_AP-Flasher/wwwroot/ota.js | 51 +++++++++++++----------- 3 files changed, 28 insertions(+), 25 deletions(-) diff --git a/ESP32_AP-Flasher/data/www/ota.js.gz b/ESP32_AP-Flasher/data/www/ota.js.gz index ed81cfbf1ec2554ecff9207d8e02dfc44e551a83..236010dbcc080c836d463a99481e189746ff91cf 100644 GIT binary patch delta 4839 zcmV4=A1p}zHcoGy{cpdy69Yfw35<1Slz%RYz416$#Qsf8XXV5X zv-uc%6l2GF$|rehIq)bUK|u-x^6fWamKM}{3?QN`EaxPp{y$5SuP&fhNVD9Z#A)Qp zHjj--2(|JuP2=DWBYE?|t1?a^8qbL` zYEn{~r57}yM1Ps!+i%F1MV3=5C{}4`P0KW-ah6(f8q*Jp2s*o-^%eVB@Zp5zq*%Zg z1QRTSm|9ap!zaoRrc|tSoPAT5g3x11 z^BClexPK1N9A#;;0-270;pOcQfZbF z6|pc#Ly~Mars(Y*r%9ZWok@~~w@!(u^gw{)beg@-vw6&PNNSI0u)TUI zeL5qlTkG4ADs@s!D;+98x68tMbZ9->-SygC@qe?(V-P|66fFv$7tM{Bc+aw#NoznG zS$0k$TNT&7xj{pI*!@8}w=(}PS(!^yW#RHJK~^oP({W*?8MRhmIKp5NOcG*cQ>#Q{ zgxH>49{XB+lnJ=yvcSO1gR~5iWM#ohSV;iq+zGB9*a8=n=KkM$JoX|2) zt$(lUR`<0gkGLp960_V(N6 ze$kOuu}SudYKtxpq4NF$nhy)(er)Q)NS*Fe2R?L%l?|X5{`uqy(z{B*y7^$Cw6chs z(i|B`NkLV!rUx^@?No{|>fyljf)8nrd1J>6%0TyE!HWn(&o-%ftDyutv@CdcnbpfB#G>@?H}a zmGE95H6v?CfK!{j>uV6=if29W7DXP+ts?%lK_f?swP8~~MqoH*1_-Qe69jw5_YQtL+BCY@ja%H1I-iQinh=Pv)7r>=pD!%RNso98J#CrWuEL++>}p7 z=0V`TUm+RwAo-+cP;zvLN|Y1i?{~1=ThYl4J{#zqIytybVO%1I6Ri64E;bN47$?!Cqu(-OygtHGfhT+=1L+Gy(*$ zcm#r&Fp0z4Lp!6vJc~+b;u9T%C+*Z=gfg$4k@8SlissX5M#r;{MBJ2S%SQ)eKIf5< zJsYDU!-h&(NM}xvu=b9cD`S5oLB#wWBZRy&Tp8F{E9ZdDj?OtR4#w~uf1?ereqicH z{s1hJViBZ=_A|+>y??6XIhhCfE&J){X7_`|f}|18!YKIE@s=8%fXzJt14J32yDfMv zdk0E(8nCFW&mUphSwlUre!%UyGCp!AH7cdD0_WLsJNB!TF$g(>aD70dql3VjP}*)$O=8Yt3^pMt?k)iiKIXL!1Aw&1&{D znJj`E;%=c;BL8I{y{TNZO118b1~|%kZI^Q~Pr5mcNsS-4rBsXg6oOVHMW%IxZDVuW zzvH&iK`2W=$A+M>4N$h}^aIsDmg>_mLK6Ib&zP?D04OFktJVDJ)6Lndb=Ly%+$LKR zVU8OJ+ij{f{eL_7wvlb6+LZH&W;*JDNiXTo?QKkYt(D`D>L8@vUqQ`2fD6t1Z1x4z zrQxkLZA81ZLS=r$GF$OJn1|r1Td9PmLTW3L==qhH}61Gr?3@TQL zP!7~YCi`5>4Q9z5%kX_BA#IcGwq|uZYEJW&abM#nXMdiU*pzPQBC6~5NE|x2_6h$| zC!f)KtYdB4>zT0MstlNiC)0v78a!iLi?>K<*GG@oLzjwDPa*ZLfe^FT@tx`%!0s(P zgIB9RN3O%AN%S=)DmWa!2rV}HeY3?BaOjmHosq-24I#7Ugq`lK8KL7ay1OW1V}@z6x*gr{HYA*pfmILtN~ zJi3ZuGZNl1Az{5uyTaNuPrvopY+`ZJUh}$Pw^2l>qJ*WT&>--XlGlS6AIjGxV8#PS zvtc}^B>*0YXH`zi=3}nJAhsGtyisEtbM(3)%74N5aT>kP3fdg(V>YIVGtV-$o-G18 zGhx(Y6Lo0`!=ZhX2li+aIQ+~Bon_IUWxqeWxU@%`2TZbPwP!g_f6sLvrJW0|dV`*Hjjz_18{l(tikOmHV)q{+ zGk>+mAjk`YB+<}zJy7wtAZBg!sr3!Ob<3^u=XhQ$tj5;|sgBHObCdDNWHE*aiZD{F zu*e=WJ9mYkU!sPyO@yRj7LgCKV*~r~7PFL_lImpVa)hMzP}G%Z zwnM@0Rv2nF4~Awb!w<1lY$YDs*|pyumCfC@!?t0GnSPa6lZP4O1ycmSEdwZ%5G z;diy#y2r~rrbL`PxK%7^t2Ko1bG%$Gn{|bTj7O(*(qvsYA>L*$*B)>{-x9tzaY)LJ z`szS#8Pgdso=>_KT=a(s9FLN_(fW28a$izp2~|;sAt|P1;%`8f#r8%szaCU=RpmI$ zt2ZEoulJ*rEZ@dy-&sQx-#L?>3K%iOv4lt-wiQgAROwiIzaMWARe-W&Ui zo>HR^a3^1}EOv*sdGO^NT4R78)y z@AM~{a>7>-A#W&)Z^+mtFP+ZtyaE%jOb=cA9ihuCzpW`;2E5Sr?61wrU&O@Qe^eXQ zzyU}2z~s4$wOK(CxP6oED zj0R3`MoMO)9Lz*HJ(;K(J8LiYHu=#G*lY@H-nm>Yhy#FOABJ6?ZSUhRJK&D)V2)=8 zsOD=E^(3{{eFax6C5B1>+`S+{9?sqeSdHp#z))6c_1AMT=0wl;q>b(Gf5~fGg=F;5 z<877G-8Q4JZK_T<8fTZsGAD)CmSXr4`OZUqW~Vkv5~@|t#QmD#mnBTz)vzG1k#>*D zT-<|b;Ihfb(#$>qXZUt-d7FrF-eue*2a~L%Xc4f++~(DC(4yLIW1OQpZv7lE_>%sd z6a_fd0Dnc2BwKc-sJ(!We_JUCLBC)HoCNp83MeJ>1!cJbIj&pK&E->fsL3{pf>5md z1h&*?o!{^7?s|>G)|R`+^`mxmV2d&MEW*7yCqalICiIHu<(v}=<`hQzRxPvS3kgdQ zSzHcLqh_~OqryQSJez_uHjEwki{kHB6t+TNL_-LqdxWcZrvFDAf8O(q=f#m1O_*><17(mzx+kc{=O#DpiJsLz82PM z>6^uxPAftjep9=1Ex3JayJqbD?zRm&v`6(i&hud9#|8V#&+DsW4NKq7ntK1 zeOY<6S1dBVGe5H4HVUI<$X6FdVz_GY^jOqr6wmPb!v6nn7`Z(7mWx`g@L~IaaM<;X zM(&|4`}@7uZODp`d83|zaJb&4>txE(Hs5>EfIR9hx~C~=9(r|j@S7@h?~!N# z8Sv(cO)!eV@4aYNZ}a{`-r~_7*YgI94wk=LJvZM8DnC`j+26xksVLt4w*TDBhiwknf=w(mi3 zjM4Ip@D?1BVcE+W*!Q~r?cpIlx+nE`-Ak5=3l`&(=zlVMl|fKCH)jB>9km7Y3MLmV z2Z!2h!hUccTmKCc#6eT^}x%1O0AdxBBk@Xxi$WkjS zn$!z&1pi0SEkzXf=h4XHjn=xK^+)SF231Wp2{O@{pT|iOi{H)s*op)>PdpIR=r`bL z{{oL(uX#QX(ldi@7Zgt_T-p04d<>*NwZ20aJAb;ski&g8s?%PqN5L+g|4Q;~X989# zYLc|-!ezvH8j$M9Syr-iWNYk?_;};sd7Oejq#6DbZ!iF8+=aS+{1v&k-g*3$@dv*E zIcw|jSBBeq4;nbQ^|fKWtCvfZG{o;5o7S?UEG5|M@8Ig4O{YBjQAvS^cw_UgRdZ|k z+JAD>oJ=MLkpo4|feuH&`f4y~&eRg850@v~NfZp|7pjf20}vh}J}~@&5`-iS5TZKU zj7L?`YraI=%9NVsQ9(&@6SFAQzV$U6RL+{KCFgMNgQ6YL^CYQ>8z#`@{0{+8jM1>x?=$cYpdJO3p~djB`kbNV!16er~FF;1|@U#TC9B zvQzQUTjij0jx~q!B9WzHp-W_m!_jV$v|2ZfQyQzLHN|{#gEpV_3Wu0%t{H5B$4y^( z>8e^)T+42#uFi1zmF|Elz`vz{iQF~FvVisq#rmVb{?iay#KHd;!vC5OR{M49+&~QP z3*FWJ8GD}@izsO@vAyQof!VuUxYrI*pG^4)r@!eo@`t{d3=@fbBDE5>?kC^>*q19=008+pmID9) delta 4809 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 diff --git a/ESP32_AP-Flasher/src/contentmanager.cpp b/ESP32_AP-Flasher/src/contentmanager.cpp index 4868694d..f1e79c13 100644 --- a/ESP32_AP-Flasher/src/contentmanager.cpp +++ b/ESP32_AP-Flasher/src/contentmanager.cpp @@ -692,7 +692,7 @@ const String getWeatherIcon(const uint8_t id, const bool isNight = false) { "\uf01b", "", "\uf01b", "", "\uf01b", "", "\uf076", "", "", "\uf01a", "\uf01a", "\uf01a", "", "", "\uf064", "\uf064", "", "", "", "", "", "", "", "", "\uf01e", "\uf01d", "", "", "\uf01e"}; - if (isNight && id <= 3) { + if (isNight && id <= 2) { const String nightIcons[] = {"\uf02e", "\uf083", "\uf086"}; return nightIcons[id]; } diff --git a/ESP32_AP-Flasher/wwwroot/ota.js b/ESP32_AP-Flasher/wwwroot/ota.js index 889d5338..fd7f4c7e 100644 --- a/ESP32_AP-Flasher/wwwroot/ota.js +++ b/ESP32_AP-Flasher/wwwroot/ota.js @@ -30,7 +30,7 @@ export async function initUpdate() { $('#selectRepo').style.display = 'inline-block'; $('#repoWarning').style.display = 'none'; - fetch("/sysinfo") + const sysinfoPromise = fetch("/sysinfo") .then(response => { if (response.status != 200) { print("Error fetching sysinfo: " + response.status, "red"); @@ -44,33 +44,36 @@ export async function initUpdate() { return response.json(); } }) - .then(data => { - if (data.env) { - let matchtest = ''; - if (data.buildversion != filesystemversion && filesystemversion != "custom" && data.buildversion != "custom") matchtest = " <- not matching!" - print(`env: ${data.env}`); - print(`build date: ${formatEpoch(data.buildtime)}`); - print(`esp32 version: ${data.buildversion}`); - print(`filesystem version: ${filesystemversion}` + matchtest); - print(`psram size: ${data.psramsize}`); - print(`flash size: ${data.flashsize}`); - print("--------------------------", "gray"); - env = data.env; - currentVer = data.buildversion; - currentBuildtime = data.buildtime; - if (data.rollback) $("#rollbackOption").style.display = 'block'; - if (data.env == 'ESP32_S3_16_8_YELLOW_AP') $("#c6Option").style.display = 'block'; - $('#environment').value = env; - } - }) .catch(error => { print('Error fetching sysinfo: ' + error, "red"); }); - fetch(repoUrl) + const repoPromise = fetch(repoUrl) .then(response => response.json()) - .then(data => { - const releaseDetails = data.map(release => { + + + Promise.all([sysinfoPromise, repoPromise]) + .then(([sdata, rdata]) => { + + if (sdata.env) { + let matchtest = ''; + if (sdata.buildversion != filesystemversion && filesystemversion != "custom" && sdata.buildversion != "custom") matchtest = " <- not matching!" + print(`env: ${sdata.env}`); + print(`build date: ${formatEpoch(sdata.buildtime)}`); + print(`esp32 version: ${sdata.buildversion}`); + print(`filesystem version: ${filesystemversion}` + matchtest); + print(`psram size: ${sdata.psramsize}`); + print(`flash size: ${sdata.flashsize}`); + print("--------------------------", "gray"); + env = sdata.env; + currentVer = sdata.buildversion; + currentBuildtime = sdata.buildtime; + if (sdata.rollback) $("#rollbackOption").style.display = 'block'; + if (sdata.env == 'ESP32_S3_16_8_YELLOW_AP') $("#c6Option").style.display = 'block'; + $('#environment').value = env; + } + + const releaseDetails = rdata.map(release => { const assets = release.assets; const filesJsonAsset = assets.find(asset => asset.name === 'filesystem.json'); const binariesJsonAsset = assets.find(asset => asset.name === 'binaries.json'); @@ -86,7 +89,7 @@ export async function initUpdate() { } }; }); - + const easyupdate = $('#easyupdate'); if (releaseDetails.length === 0) { easyupdate.innerHTML = ("No releases found.");