From 9eb0b303f3c6d4ee8545d009887ccbd20644b9dc Mon Sep 17 00:00:00 2001 From: Nic Limper Date: Sun, 3 Nov 2024 02:04:04 +0100 Subject: [PATCH] breaking change for ESP32-S2 based AP's - turn off Buienradar and Google Calendar content on ESP32-S2 based AP's because the firmware doesn't fit the flash memory anymore. If you need this and you use e.g. the mini AP v2, don't update. ESP32-S3 based AP's are not affected. - On the update tab, the list of available versions now only shows the versions that are actually available for the build environment in use, so when we leave out S2-based builds in future releases, they won't show the new version. --- ESP32_AP-Flasher/data/www/ota.js.gz | Bin 5463 -> 5480 bytes ESP32_AP-Flasher/data/www/painter.js.gz | Bin 3188 -> 3137 bytes ESP32_AP-Flasher/src/contentmanager.cpp | 4 ++-- ESP32_AP-Flasher/src/main.cpp | 2 ++ ESP32_AP-Flasher/wwwroot/ota.js | 3 ++- ESP32_AP-Flasher/wwwroot/painter.js | 8 -------- 6 files changed, 6 insertions(+), 11 deletions(-) diff --git a/ESP32_AP-Flasher/data/www/ota.js.gz b/ESP32_AP-Flasher/data/www/ota.js.gz index 30ee03ce50ecd1f8ffddd53859ef585cf4080078..574678502dca0c9a5bcae85cd7a35dc60f017e4a 100644 GIT binary patch delta 3802 zcmV<04khu|D(EV(n*@Kyp#k83pj1{KGqxH78W|A08+2DZn+?z+3uwCTMBt$^xYa(8 zd#L#>er9x@o>xV>S1+1;vTg4K_WLF2{+)vB+E$g^Vu(N zVI<#umrMGWu%1;GcWp(xMW?ByMzIL2KJ9+Cn$fJ?vzjlh5~8%O8>7|T>;plc_*kZW z@i$?RJowrGT8A5 zXHf?Kp_R{!D3i1WCV$G-$ZF(8k~S~ei@L^{MYq5==#Rhzm`4I`%rs4=H-~Ocqj?@z z@QM%g9BgT?0V9NY?QJU$rKZrI)+2g>dn7!kEMIONO!$~bR`Lw`MV5V=GN;ZSAz|-3 zVy^W4nM5(Oc&reLPIslFwpQK&ogJNUS{zK^JN`x;UjM+@kAM6DSfu45$`0Mfl306n z!xJ)(iW~ORGmRcbiv`JI9)?lyX*@2~K>?ln5)=?+6WwjWYw0@>vg3&PWqoE3lgJDl@&P2mz$Aaof(5rFbEe1G(I|roLNDx4&8<+B`#|hS{K)Z9=his z=kAe#Zx1HX5q}UJ;K0A;J+95#@Lco}&!u2t*zM5eKU}+*{Yowu(KYcmkSY-XbB|uv zmS8PfcSYm)^n+R2Gn{f65{2cbL#85@Jf zCP3My(+|}ASc;FPge3U=o<3de0Z?pW)`=70sB?dh;evqF3RH3Beqq-2J!JGkBKczku5c)X^mDOo4rbI zRZ9a*0bypmSiOmTk8_h~YmI$yIAJ-(fYn*P08EIT$3K(gdPet6vsTjzIIT3HG$pT3 zokdj81oSzxj`O|qMiR1=sBM}P7RcJD(>zX)*%%*#9`$Zqe4 z!7-De2qI3@g}Q)8s)8QGcvrqA5z`ykn|0%HG6C>NJgehmF7I{g`+bO5^LjBuB={xyIPCDU30UB6Jk1 zPm`kwFfB}v_aVUZbGUrTZ_J}*WMDrYK6H4hD1K7EfbXO6Y^5tjev*-x1@4r9Da-GY z3QQb|2tOyw<#M8xCtBhrodQgocHt8VhHYGTM54cwXbK_~QmnF?PDy!HrQraw%&E7k z`Sqx(t&^V$QwnR=Mktp)G0czu| zNibByrQv`*LZI*5#~QMeunQX!zLb&F4aOCg2?yjar|;ik8GV!83mAX(7F9_{(Ku<& z?znZ}xs<(;ykzqSEv_7wC8u$U%x$^I7ro zNy9?ho$Fpn6DsLEr;*niijpBH4?|F1PY7zpa`oljkOl35wx&SkowL<~cmNo7VA$W; z#yFFC<%s%6H!X$3(BGbvR}6( zob#tCkID9ll2EK11+p~h%^!DncLOcI+A{RGd^AQ5>@XH^9rnGS-b142bga7Zi5FQ20Rzq?@%ho6-Lv zrtV431L8;v-O3eaqa>7`Rk3DI^eo9bxaTtQDZhMr=VkhjSftl@(gV?CwN*PWpXw_m z&VZJzV1vY>YyQA2bDCadQ*Z!fWxf-nD<^d*R3XUJY+s8SI(k{opyU za&8K2Id8Q}Zs}q+Rh;M^J3JB>YcIt! zJa4i8|EGV(p3(`%ltpmv9UI3Oca%g6bF|rhzxSw+$Vy7of{iPuI)Ma4l{@nqVX<;* zf~6|@g0k?3$#NBIXEvnmr(f2+#eIC9C;jKaxAcEje?)Yr&-_*vqcw2H`&wHS6c1gQ zr}KXwBC^TCtNt(%W^O4d`~;7(!sNE_3lrQBc5;rrcYal+DGvp8U0~&2i4W{H2h)WW z%0&;xz!cx^hVP}|?K%oX>)wCyL{n=~4Xb)<&z)*fY_B8G2Yc))lUT8o@ zT(dC*qa1xnhhAyU+mE?&q}{LQx{eN(->mkW?*z4pYM|`5FjP59HuwIhR}D4=S@wK(bsglW!q%(15V z63oJU$@mvJ^B76&qfNzcy$Xy$EARbZx1Cd%Q|yf`|F=ZYf{j`0-WO}x__KXvgJX<} zXB!Xf;WQj~IRo|Xwmr;ygcHy@Y5JQkgep&2Jb}b#`HLJ}9gqKw z6#332D5+SV(y9xWO)fBiRC~_yibXzKeSgNsgPrF|2G)?F`!D>31%P(Y>f*syq~3bx z!B<8f`~uTiI}g4x+}3;Wf`eOMSk}9~2BV@={LZmyEj#j3immJ7DCp47RD-+&5bnc1(EXkq zgi{#7L``5DlVb5JzC@eylp5qwK}mKKqbL={%|Rbl6vPWbSuL@m!CLhMLcP|7RTzP4 zmmiNQh;LPH_2sKY@=ylAxG`laCsrS!QE9C&Hk7@Ycg-e}+3cCElsSL6K$pHP5;0_q zE5|7Gqy>`H+jdNa-JQ0Gp0}-H$=A|`RJA}do>z@o)VYWs?3rD#OSFO`-Bz3B; z@OWvJwvQ^VZGj!btYd!}RfOn4HUzX6C?=l-_Mdw}3Vz1UCPuzL6ZbN(jd|Awtu@TF zf?@w)UG)ukur^LwnMyo=b=w%Dc&8l;bX?Qu(hc-Wo7ojR+(Q8mS4KC5gQMHX{9z~t z!o#nIYn2=K=QmsKLR~v6a;8p9u2>Bco;809n;Lu(AqEcw@%(d< z#7(Xh%xc=Q46dQU8%pMA8}OtcUT@^9{S73;TScZ(5$|Q-*sv@vnJ@5`rl5&qwgkPu zv~NP8Hd zCn6R6C&Z#3oAn(L6bz3Ey(DugylOWFBv4DZ_9D2u*?)gS+p9N`62fAAk{_&K6tN#! z%=_y2?eW>MH&{Juw(5qeRckr0oDp01rVuUcZslzs1jt&eQX%NcU=L$|u|QPGDG{ z<20I1@<~r8y~99buG+Xldj;RmfWIYkgp2AjP0AUG&m$W20EsF(%Zp}A{yR+b>m=*x zh6Lv%(Mca(7WuLy#d!>FOPWXV0F_{wIGE0Q86lYg87!8LrP6=q9Fxoe0ag_^uY~hd zKj?5Cw-8ks4O5a`(-~u1vx(Y(3zIA(#m{HIyoHf`_gyaOU&4A;S==?^?538cFB*v# zSbf_4Y_)G$yJt0DS|vnjT{lK^xKYqSpZHj&eepM8DLnYv09uC*SkMmI%+Tclq|F5Znn_X4k7`JXylNL}yV3|DpNKtQ(Wd1tx!E*2rq)MUplz z+KalznMJq2H|Qw91emJ;{>3y+rZ3dF^d052dEipVlLK zfqNuenk-*#9ZdL`M^^F-IxLnAl`?P39=c%fJ7TW%{TW<%W{OxL6rJu$M{TXV13Ei8 z;j}oIz<2zOI=udYK^cGf1F%TTMU)-7k0r78>V_v|9u+t2r)L^Hj1~)$#XLTu;M2H5 zs^3Q{&3jy%wc)ww zBc4ma!g$!B%YV3bG5eKVE~0DVZy;47GUXn3J+aeWRL`}`ML~g-%U-B?x3rBzQ40i8B%!>$d2+YeoCi-pfhfyn&xCkOJyoI`eho*ua#CTV}CK1yc z*qe3Zu`vPgNIa`!V=nJ=E;_N*u;Puvs*TZW&M290lL`qO0?x{lC%AmL2FAI@*s>{% zF^nQ~6e}E)x(P5X%v<*%z!PVC>I2uK#A)y*i)Bt&LIvG9|T)D6Z}d8_Wx6HeCh4sjCqb^#}d{(@!(Xh~V=ek$Ygi1QkY2@{WqGSll!w{6$6M~wt zTz$DWWI=nNttn7>=WMkg9sq_N81{Fzu}{A2fFZhr!JQqLG+&y3xF?#m?km`0u`rYY zAnqxNis|e_goUR50EV*4tG^zM5hs4KC$(#TOJ24r7^7!C!A7y%O=Ah0#^{8J@&4?& z3`XI3qy)aip?6Gg0iT9?ANW;=KN{OW3qjsBor%0fh1J)sX7qoEse6+1fH=}Zw{nHqC<&!!Rjk<)Jxj6v4Vyq# zEd(to?|sgmcF1Wim=O>(T(l#YCM?J;o|cxVuwUV#V1HkctEfsFqoSEx&1`ygsn>Ew z$DjG`oG@;m|8Ca!Zs+7iRR^FzKQD@C6(%M7%L@a4>I{mgv_G<>CfXJ8*vDK4UvEx} zoSOn$&ReaLTe_G{6(_pK4v)me+Dq{a&s*&O|FN8VAInk8A~^Ssjbn^EN}`21+HAky zdsIkdB_(RX#+6f@Kmwx5oq3J0SUEMpQWbqcS@^?bxr((j8`AdEFYDgoK0eQr{)5_E zdaFNwBD&LOek+U78o1+qt*r`*hpx=i`M(bl*<|5Wf0zg}x0Doqf@e%&a$ER?32q2G zImg~RzpB!dhl08;uyWzU2X@VZ=_U!~1_onbif?zr7e?@Q9R;Fw@4peEDK%vli#(Jd z=WpE}a(1k<2Q}WnsN49f`cP*>VsROT&*N-=+prV&bVpXbLvNinYNmz54Tg@sDNC#0 zo}oeB?k;*@D8C+i%ysmA7pB`NG$14HzZim1j=nuZuQccF$J_jVMhDApR(sBO zg4#qiQ1)9Gs+=X83wczl*~BsTz)2Q%vm2Bwdp^6ztF-FC+jR*E{8jic1fqHk_9_Bs5322=({Y^JDm8UG8 zK;pCfMGmg<+#YRkcGNc@Rxr4Db8u*Xj9l!uhugeNL6#+OMJOr7{_g9!=#&8lDt;=+ zWuDW|-D1U&H4e>DHV#P?Ip9}gX@l8(mxH0ih zeM<@|XNji#JW10;{MJKpD-snv;y_TKUxS_fcX;FndJOF)rHF@7Z^aQJ!g5vBA>0kKjY)U z&hsP#Ysk?37yiNmKs#u4@!%^`Z@u&2E29s7f$6NB2VWU(>pghE!L2VW>s?=iQPC-W z=h(EC9eF9mR{sNr-utU79`>lYAV9qF^>6j-*7CLaMjuQ@Cy@eWLxB!|ML_u)FwsY9 zvD3%1mz!}Ebm(WQLEZrf_hBFCeoqd#^3@`FC<9>Jm@<_UtB=sAwAL3J z%HGVoW)sP5_RLnw99*D(OWziW7&69{V-$MQ0!iv^JEp?!PFqCJ+g7pUYiUEOS|Axu zEM*}4sNPk1j<;bN3qb}8KuiXGPu+ru!Kp~uVsL^Lc;kiZ!ZH!U8Y>ovwu4#1X z2KsHv?1~-kp@4@gqnpCP(QRb@FcgDf%#;tLmKHbdi8@9o<%8mQ;n=N;tuALP* zQzs@@tOg0snuSe&4ZesFg9n0m{<%ovCf5pPHEmf2*U;b%C3Cb5cv29rH}ci~29n{e zBGagd_cCy7SQeMe7kEok(8MuYg5F=+Hz9FCpCNvS|MmE_m}2R*y|@v(a5pC)fH?@= zweWB|v*7hY@dCR`$~WV;NlAOoyJ@<`bUYFJ2ll<5rwW^YQ&z^fkZfo@u7<%lmT?!L zT6qj}_7OYHmg25ymLhqhjrGG*^Zv;Pdic<3^LHC~QohMPG7eGrv1ZdCEOYQch|GN) zIpQncGJ`jjgc7+!fu=2ex+Mm(-}G=#L@M}Ch($j(>pLPS7#P)eTjv)^cDuBew2MAzIko z%Hupf`mw3}#=vP2Ek)oIma-6r2#cY*P4v{A%%hT$VuIC#RWSv6*MxT!!uQ;x!2Dv1 zU2@St<5k_PsQbcR)?3qY+fnuu nGv5Up$uV{e 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 diff --git a/ESP32_AP-Flasher/src/main.cpp b/ESP32_AP-Flasher/src/main.cpp index e68035eb..e123f13d 100644 --- a/ESP32_AP-Flasher/src/main.cpp +++ b/ESP32_AP-Flasher/src/main.cpp @@ -26,7 +26,9 @@ #include "udp.h" #include "util.h" #include "web.h" +#ifdef HAS_BLE_WRITER #include "ble_writer.h" +#endif util::Timer intervalContentRunner(seconds(1)); util::Timer intervalSysinfo(seconds(5)); diff --git a/ESP32_AP-Flasher/wwwroot/ota.js b/ESP32_AP-Flasher/wwwroot/ota.js index 8c09245c..076db60e 100644 --- a/ESP32_AP-Flasher/wwwroot/ota.js +++ b/ESP32_AP-Flasher/wwwroot/ota.js @@ -76,7 +76,8 @@ export async function initUpdate() { const assets = release.assets; const filesJsonAsset = assets.find(asset => asset.name === 'filesystem.json'); const binariesJsonAsset = assets.find(asset => asset.name === 'binaries.json'); - if (filesJsonAsset && binariesJsonAsset) { + const containsEnv = assets.find(asset => asset.name === env + '.bin'); + if (filesJsonAsset && binariesJsonAsset && containsEnv) { return { html_url: release.html_url, tag_name: release.tag_name, diff --git a/ESP32_AP-Flasher/wwwroot/painter.js b/ESP32_AP-Flasher/wwwroot/painter.js index eef42eba..e92b714c 100644 --- a/ESP32_AP-Flasher/wwwroot/painter.js +++ b/ESP32_AP-Flasher/wwwroot/painter.js @@ -263,17 +263,11 @@ function startPainter(mac, width, height, tagtype) { input.focus(); isAddingText = true; - //cursor = 'move'; - //blackButton.innerHTML = 'aA' - //redButton.innerHTML = 'aA' const colorButtons = document.querySelectorAll('.colorbutton'); colorButtons.forEach(button => { button.innerHTML = 'aA'; }); if (color=='white') { - //whiteButton.classList.remove('active'); - //blackButton.classList.add('active'); - //color='black'; document.querySelector('.colorbutton').click(); } } @@ -293,8 +287,6 @@ function startPainter(mac, width, height, tagtype) { showCursor = false; if (apply) drawText(input.value, textX, textY); txtButton.classList.remove('active'); - //blackButton.innerHTML = '﹏🖌' - //redButton.innerHTML = '﹏🖌' const colorButtons = document.querySelectorAll('.colorbutton'); colorButtons.forEach(button => { button.innerHTML = '﹏🖌';