diff --git a/firmware/FIRMWARE.ZX1 b/firmware/FIRMWARE.ZX1 index 8a82060..30a5f6b 100644 Binary files a/firmware/FIRMWARE.ZX1 and b/firmware/FIRMWARE.ZX1 differ diff --git a/firmware/av.zx7b b/firmware/av.zx7b index 231ca0d..e614011 100644 Binary files a/firmware/av.zx7b and b/firmware/av.zx7b differ diff --git a/firmware/es.zx7b b/firmware/es.zx7b index 9d2adc2..d6c0486 100644 Binary files a/firmware/es.zx7b and b/firmware/es.zx7b differ diff --git a/firmware/firmware.asm b/firmware/firmware.asm index 13508b9..89b2da9 100644 --- a/firmware/firmware.asm +++ b/firmware/firmware.asm @@ -475,15 +475,7 @@ star16 djnz star18 star17 ld hl, (joykey) inc h inc l - IF version=1 - ld a, (split) - rlca - rlca - rlca - or h - ELSE ld a, h - ENDIF rlca rlca rlca @@ -494,6 +486,13 @@ star17 ld hl, (joykey) out (c), d inc b out (c), a + IF version=1 + ld a, (split) + rrca + rrca + rrca + ld (alto contib+1), a + ENDIF ld a, (cpuspd) rrca rrca @@ -543,8 +542,6 @@ star20a cp $72-$1d ; 'r' jr nz, star20b out ($fe), a ld (hl), %11111101 - ld a, %00000111 - ld (contib+1), a star20b cp $17-$1d ; 'Edit' jr nz, star19 ELSE @@ -4637,16 +4634,16 @@ contia and %11111111 out (c), a dec b ld a, dev_control2 -contib or %00000000 out (c), a inc b ld a, (grapmo) srl a - jr c, contic + jr c, contib ld a, 7 ; Resv Resv Resv Resv Resv DIRADAS DITIMEX DIULAPLUS - jr z, contic + jr z, contib ld a, (ix+4) -contic out (c), a +contib or %00000000 + out (c), a rst 0 ENDIF ; ------------------------------------- diff --git a/firmware/strings.asm b/firmware/strings.asm index 46ebde0..1540cb9 100644 --- a/firmware/strings.asm +++ b/firmware/strings.asm @@ -4,8 +4,8 @@ cad1 defb 'http://zxuno.speccy.org', 0 ELSE cad1 defb 'http://zxdos.forofpga.es', 0 ENDIF - defb 'ZX-Uno BIOS v0.85', 0 - defb 'Copyleft ', 127, ' 2021 ZX-Uno Team', 0 + defb 'ZX-Uno BIOS v0.86', 0 + defb 'Copyleft ', 127, ' 2022 ZX-Uno Team', 0 defb 'Processor: Z80 3.5MHz', 0 defb 'Memory: ' cadmem defb '512K Ok', 0 @@ -41,7 +41,7 @@ cad8 defb $10, ' ', $10, ' ', $10, 0 cad9 defb $14, $11, $11, $11, $11, $11, $11, $11, $11, $11, $11, $11, $11, $11 defb $11, $11, $11, $11, $11, $11, $11, $11, $11, $11, $11, $11, $18, $11 defb $11, $11, $11, $11, $11, $11, $11, $11, $11, $11, $11, $11, $11, $15, 0 - defb ' BIOS v0.85 ', $7f, '2021 ZX-Uno Team', 0 + defb ' BIOS v0.86 ', $7f, '2022 ZX-Uno Team', 0 ELSE defb 'Press to Setup',0 defb ' Boot Menu', 0 @@ -72,7 +72,7 @@ cad8 defb $10, ' ', $10, 0 cad9 defb $14, $11, $11, $11, $11, $11, $11, $11, $11, $11, $11, $11, $11, $11 defb $11, $11, $11, $11 defb $11, $11, $11, $11, $11, $11, $11, $11, $11, $11, $11, $11, $11, $15, 0 - defb ' BIOS v0.85 ', $7f, '2021 ZX1 Team', 0 + defb ' BIOS v0.86 ', $7f, '2022 ZX1 Team', 0 defs $66 ENDIF cad10 defb 'Hardware tests', 0 diff --git a/firmware/us.zx7b b/firmware/us.zx7b index a501bff..9c54a76 100644 Binary files a/firmware/us.zx7b and b/firmware/us.zx7b differ