Fixed initial setup bug and captive portal

This commit is contained in:
EivindH06
2025-10-09 12:44:19 +02:00
parent e43cec5e9c
commit 7f17eef11c
5 changed files with 50 additions and 31 deletions

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@@ -80,7 +80,11 @@
})();
if (sysinfo.vndcfg === false) {
if (currentPath !== "vendor") navigate(basepath + "vendor");
if (currentPath === "setup") {
navigate(basepath + "vendor");
} else if (currentPath !== "welcome" && currentPath !== "vendor") {
navigate(basepath + "welcome");
}
} else if (sysinfo.usrcfg === false) {
if (currentPath !== "welcome" && currentPath !== "setup") {
navigate(basepath + "welcome");

View File

@@ -238,6 +238,21 @@
</p>
</div>
{/if}
<div class="flex flex-col items-start gap-2 rounded-md border border-slate-200 bg-slate-50 p-4 text-sm text-slate-700 dark:border-slate-700 dark:bg-slate-900 dark:text-slate-200">
<p class="font-medium text-slate-800 dark:text-slate-100">3. Start selve oppsettet</p>
<a
class="btn-pri inline-block"
href={setupUrl}
target="_blank"
rel="noreferrer"
>
Åpne oppsettet i nettleseren
</a>
<p class="text-xs text-slate-500 dark:text-slate-400">
Lenken åpnes i standardnettleseren din. Du kan også lime inn adressen manuelt hvis du foretrekker det.
</p>
</div>
</div>
</div>
</section>

View File

@@ -144,26 +144,26 @@ lib_ignore = ${common.lib_ignore}
extra_scripts = ${common.extra_scripts}
; [env:esp32s2dev]
; platform = espressif32
; board = esp32-s2-kaluga-1
; framework = arduino
; upload_port = /dev/cu.usbmodem01
; monitor_port = /dev/cu.usbmodem01
; upload_speed = 921600
; monitor_speed = 115200
; board_build.flash_mode = dio
; board_build.flash_size = 4MB
; build_flags =
; ${common.build_flags}
; -D AMS_REMOTE_DEBUG=1
; -D AMS_CLOUD=1
; -D AMS_KMP=1
; -D ZMART_CHARGE=1
; -L precompiled/esp32s2
; -lKmpTalker
; lib_ldf_mode = off
; lib_compat_mode = off
; lib_deps = ${esp32.lib_deps}
; lib_ignore = ${common.lib_ignore}
; extra_scripts = ${common.extra_scripts}
[env:esp32s2dev]
platform = espressif32
board = esp32-s2-kaluga-1
framework = arduino
upload_port = /dev/cu.usbmodem01
monitor_port = /dev/cu.usbmodem01
upload_speed = 921600
monitor_speed = 115200
board_build.flash_mode = dio
board_build.flash_size = 4MB
build_flags =
${common.build_flags}
-D AMS_REMOTE_DEBUG=1
-D AMS_CLOUD=1
-D AMS_KMP=1
-D ZMART_CHARGE=1
-L precompiled/esp32s2
-lKmpTalker
lib_ldf_mode = off
lib_compat_mode = off
lib_deps = ${esp32.lib_deps}
lib_ignore = ${common.lib_ignore}
extra_scripts = ${common.extra_scripts}