partial merge of upstream/main

* leaving out DotStarHspi5MhzMethod, as we are still on NPB 2.6.9 for eth boards
* leaving out the index.css/index.css changes, as I'm not sure how to merge this.

@ewoudwijma we need to merge the JS and CSS parts when you are back; I'll stay with our MM version for now.
This commit is contained in:
Frank
2023-04-14 19:53:04 +02:00
parent ee23827fdb
commit cc9a19bc1d
9 changed files with 16 additions and 16 deletions

View File

@@ -670,7 +670,7 @@ function populateInfo(i)
//WLEDMM: add total heap and total PSRAM, and build number, add bin name
if (i.ver.includes("0.14.1")) vcn = "Sitting Ducks"; // easter egg
if (i.ver.includes("0.14.0")) vcn = "Lupo"; // check for MM versioning scheme
if (i.ver.includes("0.14.0-b2.2")) vcn = "Sitting Ducks"; // early easter egg
if (i.ver.includes("0.14.0-b15.2")) vcn = "Sitting Ducks"; // late easter egg
if (i.ver.includes("0.14.0-b15.22")) vcn = "Lupo";
cn += `v${i.ver} &nbsp;<i>"${vcn}"</i><p>(WLEDMM_${i.ver} ${i.rel}.bin)</p><p><em>build ${i.vid}</em></p><table>
${urows}