diff --git a/firmware/FIRMWARE.ZX1 b/firmware/FIRMWARE.ZX1 index 9081fa0..3aaea34 100644 Binary files a/firmware/FIRMWARE.ZX1 and b/firmware/FIRMWARE.ZX1 differ diff --git a/firmware/FIRMWARE.ZX2 b/firmware/FIRMWARE.ZX2 index 0fa7c03..051755d 100644 Binary files a/firmware/FIRMWARE.ZX2 and b/firmware/FIRMWARE.ZX2 differ diff --git a/firmware/FIRMWARE.ZX3 b/firmware/FIRMWARE.ZX3 index 66b83a8..643f42f 100644 Binary files a/firmware/FIRMWARE.ZX3 and b/firmware/FIRMWARE.ZX3 differ diff --git a/firmware/FIRMWARE.ZXD b/firmware/FIRMWARE.ZXD index 9aef91d..eac4294 100644 Binary files a/firmware/FIRMWARE.ZXD and b/firmware/FIRMWARE.ZXD differ diff --git a/firmware/firmware.asm b/firmware/firmware.asm index a91070c..0b79e9f 100644 --- a/firmware/firmware.asm +++ b/firmware/firmware.asm @@ -299,17 +299,18 @@ start2 ld a, (hl) jr nc, start1 dec e IF recovery=0 - ld a, 0 + ld a, 1 out ($fe), a - ld a, (quietb) - cp 1 + ld a, (quietb) + or a jr nz, start3 - out ($fe), a ld h, l ld d, $20 call window jr start8 -start3 ld hl, finlog-1 +start3 xor a + out ($fe), a + ld hl, finlog-1 ld d, $7a call dzx7b ; descomprimir call drcs @@ -438,17 +439,15 @@ star13 ld de, $cfff star14 inc b outi bit 4, h ; compruebo si la direccion es D000 (final) - jr z, star14 ; repito si no lo es -star15 ld d, 4 ; temporizador general (1-2 seg en 1X) - call chktmo ; aplicamos multiplicador -start25 pop af + jr z, star14 ; repito si no lo es +star15 ld a, (quietb) + or 1 + rlca + rlca + ld d, a + pop af jr nz, star16 - ld d, 16 ; temporizador inicial (2-3 seg en 1X) - call chktmo ; aplicamos multiplicador - ld a, d - cp 33 - jr c, star16 - ld d, 32 ; timeout inicial maximo (7-8 segundos) + ld d, 16 star16 djnz star18 dec de ld a, d @@ -1156,16 +1155,15 @@ main ld iy, quietb ld bc, $0f0b main1 call showop - defw cad120 - defw cad29 - defw cad122 - defw cad123 - defw cad124 - defw $ffff -main1b call showop defw cad28 - defw cad29 + defw cad110 + defw cad111 + defw cad112 + defw cad113 defw $ffff + ld a, iyl + rrca + jr c, main1 main2 call showop defw cad30 defw cad31 @@ -1213,30 +1211,21 @@ main4 call showop defw cad19 defw cad116 jr c, main9 - ld (menuop+1), a - cp 4 + ld (menuop+1), a + cp 4 + ld h, active >> 8 jr c, main8 ; c->tests, nc->options - ld e, a - add hl, de - jr nz, main44 - ld hl, quietb - call popupw ; Boot timeout - defw cad120 - defw cad29 - defw cad122 - defw cad123 - defw cad124 - defw $ffff - ret -main44 ld h, active >> 8 - add a, bitstr-3&$ff + add a, bitstr-3&$ff ld l, a sub keyiss&$ff jr z, main5 jr nc, main6 call popupw ; quiet or crc (enabled or disabled) defw cad28 - defw cad29 + defw cad110 + defw cad111 + defw cad112 + defw cad113 defw $ffff ret main5 call popupw ; keyboard issue @@ -3780,20 +3769,6 @@ comboa ld a, h pop de pop hl ret - -; -------------------------------------- -; Bitshift left 'D' according to timeout -; -------------------------------------- -chktmo push af - ld a, (quietb) - cp 2 - jr c, chk2 - dec a -chk1 sla d - dec a - jr nz, chk1 -chk2 pop af - ret ; ------------------------------------- ; Show a normal list only in attribute area width elements diff --git a/firmware/strings.asm b/firmware/strings.asm index f768de3..5fae148 100644 --- a/firmware/strings.asm +++ b/firmware/strings.asm @@ -85,7 +85,7 @@ cad10 defb 'Hardware tests', 0 defb ' ', 0 defb 'Options', 0 defb $11, $11, $11, $11, $11, $11, $11, $11, $11, 0 - defb 'Quiet Boot', 0 + defb 'Boot Timer', 0 defb 'Check CRC', 0 defb 'Keyboard', 0 defb 'Timing', 0 @@ -129,7 +129,7 @@ cad16 defb 'Performs a', 0 defb 'joystick test', 0, 0 cad17 defb 'Hide the whole', 0 defb 'boot screen', 0 - defb 'when enabled', 0, 0 + defb 'when disabled', 0, 0 cad18 defb 'Enable RAM and', 0 defb 'ROM on DivMMC ', 0 defb 'interface.', 0 @@ -173,10 +173,6 @@ cad33 defb 'Set Active', 0 cad34 defb 'Move Down a', 0 cad35 defb 'Rename', 0 cad36 defb 'Delete', 0 -cad120 defb 'Timeout 1X', 0 -cad122 defb 'Timeout 2X', 0 -cad123 defb 'Timeout 4X', 0 -cad124 defb 'Timeout 8X', 0 IF vertical=0 defb ' ', $12, $11, $11, $11, $11, $11, $11, $11, $11, $11, $11, $11, $11 defb ' Rename ', $11, $11, $11, $11, $11, $11, $11, $11, $11, $11, $11, $11, $11, $13, 0