From 29e40433ca8563d6dd0091a2bb3e768a23112362 Mon Sep 17 00:00:00 2001 From: antoniovillena Date: Mon, 29 May 2017 12:53:44 +0200 Subject: [PATCH] =?UTF-8?q?Adelanto=20el=20seteo=20de=20layout=20de=20tecl?= =?UTF-8?q?ado=20para=20detectar=20pulsaci=C3=B3n=20en=20arranque?= 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 | 35 +++++++++++++++++++---------------- firmware/strings.asm | 2 +- 3 files changed, 20 insertions(+), 17 deletions(-) diff --git a/firmware/FIRMWARE.ZX1 b/firmware/FIRMWARE.ZX1 index 73c3176f6d89d81d69d760e20cfc4b14e4c981a7..a543ba4fdfc42d3fae2cc532e3c9be2258c200e5 100644 GIT binary patch delta 5348 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 M7+-{aF)!o40VH$4!vFvP delta 5482 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 diff --git a/firmware/firmware.asm b/firmware/firmware.asm index 01f9568..3ba50d2 100644 --- a/firmware/firmware.asm +++ b/firmware/firmware.asm @@ -368,20 +368,7 @@ star45 add hl, hl dec a jr nz, star45 ld (alto fllen), hl - IF recovery=0 - ld d, 4 - pop af - jr nz, start5 - ld d, 16 -start5 djnz start6 - dec de - ld a, d - or e - jr nz, start6 - ld hl, $0017 ; Si se acaba el temporizador borrar - ld de, $2001 ; lo de presione Break - call window -start50 wreg scan_code, $f6 ; $f6 = kb set defaults + wreg scan_code, $f6 ; $f6 = kb set defaults halt halt wreg scan_code, $ed ; $ed + 2 = kb set leds + numlock @@ -405,7 +392,23 @@ star54 inc b outi bit 7, h ; compruebo si la direccion es 0000 (final) jr nz, star54 ; repito si no lo es -star55 ld hl, (joykey) +star55 + IF recovery=0 + ld d, 4 + pop af + jr nz, start5 + ld d, 16 +start5 djnz start6 + dec de + ld a, d + or e + jr nz, start6 + ld hl, $0017 ; Si se acaba el temporizador borrar + ld de, $2001 ; lo de presione Break + push bc + call window + pop bc + ld hl, (joykey) inc h inc l ld a, h @@ -2489,7 +2492,7 @@ blst4 call combol ld (active), a jr nc, blst5 ld (bitstr), a -blst5 jp start50 +blst5 jp conti ENDIF imyesn call bloq1 diff --git a/firmware/strings.asm b/firmware/strings.asm index 3717462..ead721b 100644 --- a/firmware/strings.asm +++ b/firmware/strings.asm @@ -24,6 +24,7 @@ cad5 defm $10, ' ', $1c, ' and ', $1d, ' to move selection ', $10, defb $11, $11, $11, $11, $11, $11, $11, $11, $11 defb $11, $11, $11, $11, $11, $11, $11, $11, $11 defb $11, $11, $11, $11, $11, $11, $11, $11, $15, 0 +cad118 defm ' Please select boot machine', 0 cad6 defb 'Enter Setup', 0 cad7 defb ' Main ROMs Upgrade Boot Advanced Exit', 0 defb $12, $11, $11, $11, $11, $11, $11, $11, $11, $11, $11, $11, $11, $11 @@ -343,7 +344,6 @@ cad116 defb 'Disable for', 0 defb 'tibility with', 0 defb 'old games', 0, 0 cad117 defb ' Add new core', 0 -cad118 defm ' Please select boot machine', 0 ;cad199 defb 'af0000 bc0000 de0000 hl0000 sp0000 ix0000 iy0000', 0