Skip to content

Commit

Permalink
Añado logo buryak y FIRMWARE.ZXB
Browse files Browse the repository at this point in the history
  • Loading branch information
antoniovillena committed Sep 26, 2021
1 parent a7ebd9e commit 797e2e1
Show file tree
Hide file tree
Showing 4 changed files with 67 additions and 13 deletions.
Binary file added firmware/FIRMWARE.ZXB
Binary file not shown.
60 changes: 50 additions & 10 deletions firmware/firmware.asm
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
define recodire 0
define zesarux 0
define vertical 0
define buryak 0
output firmware_strings.rom
macro wreg dir, dato
rst $28
Expand Down Expand Up @@ -76,7 +77,12 @@
define layout grapmo+1
define joykey layout+1
define joydb9 joykey+1
IF version=1
define split joydb9+1
define outvid split+1
ELSE
define outvid joydb9+1
ENDIF
define scanli outvid+1
define freque scanli+1
define cpuspd freque+1
Expand Down Expand Up @@ -300,6 +306,7 @@ start2 ld a, (hl)
out ($fe), a
ld a, (quietb)
or a
ld d, $7a
jr nz, start3
ld h, l
ld d, $20
Expand All @@ -308,7 +315,6 @@ start2 ld a, (hl)
start3 xor a
out ($fe), a
ld hl, finlog-1
ld d, $7a
call dzx7b ; descomprimir
call drcs
ld bc, zxuno_port
Expand Down Expand Up @@ -469,7 +475,15 @@ 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
Expand Down Expand Up @@ -2359,7 +2373,11 @@ terror jp ferror
saba sub 'N'
jr z, sab2
IF version=3
IF buryak=1
sub 'B'-'N'
ELSE
sub 'D'-'N'
ENDIF
ELSE
IF version<3
sub $30+version-'N'
Expand Down Expand Up @@ -2457,7 +2475,11 @@ sabe pop bc
sub 'N'
jr z, sab3
IF version=3
IF buryak=1
sub 'B'-'N'
ELSE
sub 'D'-'N'
ENDIF
ELSE
IF version<3
sub $30+version-'N'
Expand Down Expand Up @@ -2817,6 +2839,12 @@ advan1 call showop ; Joy Keypad & DB9
ld a, iyl
rrca
jr nc, advan1
IF version=1
call showop ; Splitter
defw cad28
defw cad29
defw $ffff
ENDIF
ld c, $0b
call showop ; Output
defw cad96
Expand Down Expand Up @@ -2856,6 +2884,9 @@ advan1 call showop ; Joy Keypad & DB9
defb $04
defb $05
defb $06
IF version=1
defb $07
ENDIF
defb $0b
defb $0c
defb $0d
Expand All @@ -2866,6 +2897,9 @@ advan1 call showop ; Joy Keypad & DB9
defw cad84
defw cad85
defw cad86
IF version=1
defw cad865
ENDIF
defw cad87
defw cad99
defw cad100
Expand All @@ -2887,25 +2921,27 @@ advan1 call showop ; Joy Keypad & DB9
ret
advan2 ld b, a
djnz advan3
call popupw ; Joy Keypad
adva25 call popupw ; Joy Keypad & DB9
defw cad91
defw cad92
defw cad93
defw cad94
defw cad95
defw cad955
defw $ffff
ret
advan3 djnz advan4
call popupw ; Joy DB9
defw cad91
defw cad92
defw cad93
defw cad94
defw cad95
defw cad955
jr adva25
advan4
IF version=1
djnz adva45
call popupw ; Splitter
defw cad28
defw cad29
defw $ffff
ret
advan4 djnz advan5
ENDIF
adva45 djnz advan5
call popupw ; Output
defw cad96
defw cad97
Expand Down Expand Up @@ -4469,7 +4505,11 @@ finav
IF version=2
incbin logo256x192d.rcs.zx7b
ELSE
IF buryak=1
incbin logo256x192bn.rcs.zx7b
ELSE
incbin logo256x192dp.rcs.zx7b
ENDIF
ENDIF
ENDIF
finlog incbin strings.bin.zx7b
Expand Down
Binary file added firmware/logo256x192bn.rcs.zx7b
Binary file not shown.
20 changes: 17 additions & 3 deletions firmware/strings.asm
Original file line number Diff line number Diff line change
Expand Up @@ -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.84', 0
defb 'ZX-Uno BIOS v0.85', 0
defb 'Copyleft ', 127, ' 2021 ZX-Uno Team', 0
defb 'Processor: Z80 3.5MHz', 0
defb 'Memory: '
Expand Down Expand Up @@ -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.84 ', $7f, '2021 ZX-Uno Team', 0
defb ' BIOS v0.85 ', $7f, '2021 ZX-Uno Team', 0
ELSE
defb 'Press <Edit> to Setup',0
defb ' <Break> Boot Menu', 0
Expand Down Expand Up @@ -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.84 ', $7f, '2021 ZX1 Team', 0
defb ' BIOS v0.85 ', $7f, '2021 ZX1 Team', 0
defs $66
ENDIF
cad10 defb 'Hardware tests', 0
Expand Down Expand Up @@ -319,10 +319,17 @@ cad81 defb 'SD file', 0
cad82 defb 'Input machine\'s name', 0
files defb 'ESXMMC BIN'
IF version=3
IF buryak=1
defb 'FIRMWAREZXB'
defb 'FLASH ZXB'
defb 'SPECTRUMZXB'
fileco defb 'CORE ZXB'
ELSE
defb 'FIRMWAREZXD'
defb 'FLASH ZXD'
defb 'SPECTRUMZXD'
fileco defb 'CORE ZXD'
ENDIF
ELSE
IF version<3
defb 'FIRMWAREZX', $30+version
Expand All @@ -342,7 +349,11 @@ cad83 defb 'Input', 0
defb 'Keyb Layout', 0
defb 'Joy Keypad', 0
defb 'Joy DB9', 0
IF version=1
defb 'Splitter', 0
ELSE
defb ' ', 0
ENDIF
defb ' ', 0
defb 'Output', 0
defb $11, $11, $11, $11, $11, $11, $11, $11, $11, 0
Expand All @@ -360,6 +371,9 @@ cad85 defb 'Simulated', 0
defb 'configuration', 0, 0
cad86 defb 'Real joystick', 0
defb 'configuration', 0, 0
IF version=1
cad865 defb '2nd joystick', 0, 0
ENDIF
cad87 defb 'Select '
cad875 defb 'Default', 0
defb 'video output', 0, 0
Expand Down

0 comments on commit 797e2e1

Please sign in to comment.