reset fix

nihirash · Oct 31, 2022 · 6ba1bd5 · 6ba1bd5
1 parent e7af7e3
commit 6ba1bd5
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 4 deletions.
diff --git a/dezog_run.asm b/dezog_run.asm
@@ -2,7 +2,6 @@
     device zxspectrum128
     SLDOPT COMMENT WPMEM, LOGPOINT, ASSERTION
     define V 20
-    define ESXCOMPAT 1
 stack_top:
     include "modules/version.asm"
     include "modules/display.asm"

diff --git a/drivers/zxuno.asm b/drivers/zxuno.asm
@@ -10,12 +10,25 @@ init:
     ld bc, ZXUNO_REG : in A, (c)
     ld bc, ZXUNO_ADDR : ld a, UART_DATA_REG : out (c), a
     ld bc, ZXUNO_REG : in A, (c)
-    ld b, #ff
+
+    ei 
+    ld b,50
+1
+    push bc
+    call uartRead
+    pop bc
+    halt
+    djnz 1b
+
+    ld bc, #ffff
 .loop
     push bc
     call uartRead
+    call c, Display.putLogC
     pop bc
-    djnz .loop
+    dec bc 
+    ld a,b : or c
+    jr z, .loop
 
     ld hl, set_speed_cmd
 .speedCmd

diff --git a/mock/uart-log.txt b/mock/uart-log.txt
@@ -20,6 +20,8 @@ OK
 
 OK
 
+OK
+
 OK
 WIFI DISCONNECT
 

diff --git a/modules/wifi.asm b/modules/wifi.asm
@@ -37,6 +37,8 @@ init:
     EspCmdOkErr "ATE0"
     EspCmdOkErr "AT+CWMODE_DEF=1"
     jr c, .err
+    EspCmdOkErr "AT+CWAUTOCONN=1"
+    jr c, .err
     EspCmdOkErr "AT+CWQAP"
     jr c, .err
     ret
@@ -47,6 +49,7 @@ init:
 .err_msg db 13, "ESP error! Halted!", 0
 
 reset:
+    EspCmdOkErr "AT"
     EspCmd "AT+RST"
 .loop
     call Uart.read

diff --git a/version.def b/version.def
@@ -1 +1 @@
-20
+21
-Original file line number
+Diff line change
@@ Expand Up / @@ -20,6 +20,8 @@ OK @@
     OK
+    OK
     OK
     WIFI DISCONNECT
@@ Expand Down @@