diff --git a/firmware/FIRMWARE.ZX2 b/firmware/FIRMWARE.ZX2 index 322757d..751c319 100644 Binary files a/firmware/FIRMWARE.ZX2 and b/firmware/FIRMWARE.ZX2 differ diff --git a/firmware/FIRMWARE.ZX3 b/firmware/FIRMWARE.ZX3 index 2282fba..d151cbc 100644 Binary files a/firmware/FIRMWARE.ZX3 and b/firmware/FIRMWARE.ZX3 differ diff --git a/firmware/FIRMWARE.ZXD b/firmware/FIRMWARE.ZXD index e1d5fe5..e1284b3 100644 Binary files a/firmware/FIRMWARE.ZXD and b/firmware/FIRMWARE.ZXD differ diff --git a/firmware/firmware.asm b/firmware/firmware.asm index 605f8ad..5498e83 100644 --- a/firmware/firmware.asm +++ b/firmware/firmware.asm @@ -4229,7 +4229,7 @@ wrfls2 call waits5 wreg flash_cs, 0 ; activamos spi, enviando un 0 IF version>1 wreg flash_spi, $12 ; envío page program - ld hl, (highb) + ld hl, (alto highb) out (c), h ELSE wreg flash_spi, 2 ; envío page program @@ -4465,10 +4465,15 @@ finav finlog incbin strings.bin.zx7b ELSE incbin bezel.rcs.zx7b +finbez IF version=1 -finbez incbin logo192x256.rcs.zx7b + incbin logo192x256.rcs.zx7b ELSE -finbez incbin logo192x256d.rcs.zx7b + IF version=2 + incbin logo192x256d.rcs.zx7b + ELSE + incbin logo192x256dp.rcs.zx7b + ENDIF ENDIF finlog incbin strings.bin.zx7b ENDIF @@ -4879,15 +4884,21 @@ sloti ld l, a ELSE and $3f ld h, d - ld l, a cp 41 jr c, slot2b sub 41 + ld l, a ld e, d ENDIF ENDIF ENDIF -slot2b add hl, de ; $00c0 y 2f80 +slot2b + IF version=2 OR version=3 + sbc a, a + inc a + ld (alto highb+1), a + ENDIF + add hl, de ; $00c0 y 2f80 add hl, hl add hl, hl slot2c add hl, hl diff --git a/firmware/strings.asm b/firmware/strings.asm index 8548c4c..9ddb651 100644 --- a/firmware/strings.asm +++ b/firmware/strings.asm @@ -4,7 +4,7 @@ cad1 defb 'http://zxuno.speccy.org', 0 ELSE cad1 defb 'http://zxdos.forofpga.es', 0 ENDIF - defb 'ZX-Uno BIOS v0.82', 0 + defb 'ZX-Uno BIOS v0.83', 0 defb 'Copyleft ', 127, ' 2020 ZX-Uno Team', 0 defb 'Processor: Z80 3.5MHz', 0 defb 'Memory: ' @@ -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.82 ', $7f, '2020 ZX-Uno Team', 0 + defb ' BIOS v0.83 ', $7f, '2020 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.82 ', $7f, '2020 ZX1 Team', 0 + defb ' BIOS v0.83 ', $7f, '2020 ZX1 Team', 0 defs $66 ENDIF cad10 defb 'Hardware tests', 0