diff --git a/ESP32_AP-Flasher/data/www/main.js.gz b/ESP32_AP-Flasher/data/www/main.js.gz index e705c402..c13005c6 100644 Binary files a/ESP32_AP-Flasher/data/www/main.js.gz and b/ESP32_AP-Flasher/data/www/main.js.gz differ diff --git a/ESP32_AP-Flasher/data/www/ota.js.gz b/ESP32_AP-Flasher/data/www/ota.js.gz index edaa5270..18e1cb7d 100644 Binary files a/ESP32_AP-Flasher/data/www/ota.js.gz and b/ESP32_AP-Flasher/data/www/ota.js.gz differ diff --git a/ESP32_AP-Flasher/wwwroot/main.js b/ESP32_AP-Flasher/wwwroot/main.js index b5cc3a2b..b8eab990 100644 --- a/ESP32_AP-Flasher/wwwroot/main.js +++ b/ESP32_AP-Flasher/wwwroot/main.js @@ -1746,7 +1746,7 @@ function populateAPCard(msg) { function populateAPInfo(apip) { let apid = apip.replace(/\./g, "-"); - fetch('sysinfo') + fetch('http://' + apip + '/sysinfo') .then(response => { if (response.status != 200) { $('#ap' + apid + ' .apswversion').innerHTML = "Error fetching sysinfo: " + response.status; diff --git a/ESP32_AP-Flasher/wwwroot/ota.js b/ESP32_AP-Flasher/wwwroot/ota.js index dd631e91..4cb77177 100644 --- a/ESP32_AP-Flasher/wwwroot/ota.js +++ b/ESP32_AP-Flasher/wwwroot/ota.js @@ -56,14 +56,17 @@ export async function initUpdate() { .then(([sdata, rdata]) => { if (sdata.env) { - print(`env: ${sdata.env}`); + print(`current env: ${sdata.env}`); print(`build date: ${formatEpoch(sdata.buildtime)}`); print(`esp32 version: ${sdata.buildversion}`); print(`filesystem version: ${filesystemversion}`); print(`psram size: ${sdata.psramsize}`); print(`flash size: ${sdata.flashsize}`); print("--------------------------", "gray"); - env = sdata.env; + env = apConfig.env || sdata.env; + if (sdata.env != env) { + print(`Warning: you selected a build environment ${env} which is\ndifferent than the currently used ${sdata.env}.\nOnly update the firmware with a mismatched build environment if\nyou know what you're doing.`, "yellow"); + } currentVer = sdata.buildversion; currentBuildtime = sdata.buildtime; if (sdata.rollback) $("#rollbackOption").style.display = 'block';