From 0d89e83befb3aa599f8bfdb9be8e77c37641414f Mon Sep 17 00:00:00 2001 From: antoniovillena Date: Sun, 18 Feb 2018 23:11:20 +0100 Subject: [PATCH] =?UTF-8?q?Sin=20probar.=20-Arreglo=20bug=20de=20NTSC=20-Q?= =?UTF-8?q?uito=20opci=C3=B3n=20QAOPspM=20en=20Joystick=20Keypad=20-A?= =?UTF-8?q?=C3=B1ado=20COPT=20en=20configuraci=C3=B3n?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- firmware/FIRMWARE.ZX1 | Bin 16384 -> 16384 bytes firmware/firmware.asm | 110 ++++++++++++++++++++++-------------------- firmware/strings.asm | 13 +++-- 3 files changed, 66 insertions(+), 57 deletions(-) diff --git a/firmware/FIRMWARE.ZX1 b/firmware/FIRMWARE.ZX1 index 4f14e8975d45031796abb5cf9c5b5800e5ea6c0c..b6bde277a16cdf97eec4d66ee450315bafaa9078 100644 GIT binary patch delta 5104 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 hmwV&IiMNRCBH to Setup',0 defb ' Boot Menu', 0 @@ -68,7 +68,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.70 ', $7f, '2017 ZX1 Team', 0 + defb ' BIOS v0.71 ', $7f, '2018 ZX1 Team', 0 defs $66 ENDIF cad10 defb 'Hardware tests', 0 @@ -364,7 +364,8 @@ cad83 defb 'Input', 0 defb 'Video', 0 defb 'Scanlines', 0 defb 'Frequency', 0 - defb 'CPU Speed', 0, 0 + defb 'CPU Speed', 0 + defb 'CSync', 0, 0 cad84 defb 'Select PS/2', 0 defb 'mapping to', 0 defb 'spectrum', 0, 0 @@ -383,6 +384,8 @@ cad100 defb 'Set VGA', 0 defb 'frequency', 0, 0 cad101 defb 'Set CPU', 0 defb 'speed', 0, 0 +cad10a defb 'CSync method', 0 + defb 'to use', 0, 0 cad102 defb '50', 0 cad103 defb '51', 0 cad104 defb '53.5', 0