Skip to content

Commit

Permalink
Ver. 1.1.0-WIP03
Browse files Browse the repository at this point in the history 
2020-04-14 Ver. 1.1.0-WIP03
--------------------------------------------------------------------------------
- Añadidos textos indicativos al test de color del monitor.
- El programa ahora reserva 4096 bytes de memoria para variables y las
  ubica en la dirección más alta disponible ($E380)
- Añadida la opción para mostrar la información del sistema.
- Pantalla del menú reestructurada.
  • Loading branch information
@knightfox75
knightfox75 committed Apr 14, 2020
1 parent ae20d88 commit edfeee7
Show file tree
Hide file tree
Showing 29 changed files with 606 additions and 167 deletions.
11 changes: 10 additions & 1 deletion docs/changelog.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,21 @@
MSX Diagnostics Changelog
--------------------------------------------------------------------------------

2020-04-14 Ver. 1.1.0-WIP03
--------------------------------------------------------------------------------
- A�adidos textos indicativos al test de color del monitor.
- El programa ahora reserva 4096 bytes de memoria para variables y las
ubica en la direcci�n m�s alta disponible ($E380)
- A�adida la opci�n para mostrar la informaci�n del sistema.
- Pantalla del men� reestructurada.


2020-04-13 Ver. 1.1.0-WIP02
--------------------------------------------------------------------------------
- Optimizados los textos de los menus, ahorrando 420 bytes.
- A�adido el soporte para el teclado franc�s (AZERTY) en el test de teclado.
(Se realiza la deteccion autom�tica al iniciarse el programa)
- A�adido el test de color y stress del monitor
- A�adido el test de color del monitor


2020-04-12 Ver. 1.1.0-WIP01
Expand Down
2 changes: 1 addition & 1 deletion source/data/bin/misc.asm
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
;***********************************************************
;
; MSX DIAGNOSTICS
; Version 1.1.0-wip02
; Version 1.1.0-wip03
; ASM Z80 MSX
; Datos miscelaneos
; (cc) 2018-2020 Cesar Rincon "NightFox"
Expand Down
11 changes: 9 additions & 2 deletions source/data/txt/key_names.asm
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
;***********************************************************
;
; MSX DIAGNOSTICS
; Version 1.1.0-wip02
; Version 1.1.0-wip03
; ASM Z80 MSX
; Nombres de las teclas
; (cc) 2018-2020 Cesar Rincon "NightFox"
Expand Down Expand Up @@ -38,4 +38,11 @@ KEY_NAMES_BOTTOM_ROWS:
db $F0, $F0, $F0, $F0, $F0, $F0, $F0, $F0 ; ROW 7
db $F0, $F0, $F0, $F0, $F0, $F0, $F0, $F0 ; ROW 8
db "*", "+", "/", "0", "1", "2", "3", "4" ; ROW 9
db "5", "6", "7", "8", "9", "-", ",", "." ; ROW 10
db "5", "6", "7", "8", "9", "-", ",", "." ; ROW 10



;***********************************************************
; Fin del archivo
;***********************************************************
KEY_NAMES_EOF:
124 changes: 109 additions & 15 deletions source/data/txt/text.asm
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
;***********************************************************
;
; MSX DIAGNOSTICS
; Version 1.1.0-wip02
; Version 1.1.0-wip03
; ASM Z80 MSX
; Textos del programa
; (cc) 2018-2020 Cesar Rincon "NightFox"
Expand All @@ -26,7 +26,7 @@ TEXT_DASHED_LINE:
; Texto de cabecera de los menus
TEXT_MENU_HEADER:

db " MSX DIAGNOSTICS v1.1.0-WIP02", $0D, $0A, $00
db " MSX DIAGNOSTICS v1.1.0-WIP03", $0D, $0A, $00



Expand Down Expand Up @@ -55,7 +55,7 @@ TEXT_MENU_FOOTER:
TEXT_MAIN_MENU_P1_TITLE:

db $0D, $0A
db " TEST MENU [1/2]", $0D, $0A
db " PAGE 1 OF 2", $0D, $0A
db $00

TEXT_MAIN_MENU_P1_ITEMS:
Expand All @@ -68,8 +68,8 @@ TEXT_MAIN_MENU_P1_ITEMS:
db " 6. KEYBOARD", $0D, $0A
db " 7. JOYSTICK", $0D, $0A
db " 8. PSG", $0D, $0A
db " 9. NEXT PAGE >>>", $0D, $0A
db " 0. REBOOT", $0D, $0A
db " 9. SYSTEM INFO", $0D, $0A
db " 0. NEXT PAGE >>>", $0D, $0A
db $00


Expand All @@ -78,21 +78,21 @@ TEXT_MAIN_MENU_P1_ITEMS:
TEXT_MAIN_MENU_P2_TITLE:

db $0D, $0A
db " TEST MENU [2/2]", $0D, $0A
db " PAGE 2 OF 2", $0D, $0A
db $00

TEXT_MAIN_MENU_P2_ITEMS:
db $0D, $0A
db " 1. MONITOR COLOR & STRESS", $0D, $0A
db " 1. MONITOR COLOR", $0D, $0A
db " 2. NOT AVAILABLE", $0D, $0A
db " 3. NOT AVAILABLE", $0D, $0A
db " 4. NOT AVAILABLE", $0D, $0A
db " 5. NOT AVAILABLE", $0D, $0A
db " 6. NOT AVAILABLE", $0D, $0A
db " 7. NOT AVAILABLE", $0D, $0A
db " 8. NOT AVAILABLE", $0D, $0A
db " 9. <<< PREVIOUS PAGE", $0D, $0A
db " 0. REBOOT", $0D, $0A
db " 9. REBOOT", $0D, $0A
db " 0. <<< PREVIOUS PAGE", $0D, $0A
db $00


Expand Down Expand Up @@ -323,18 +323,112 @@ TEXT_PSG_GUI:



; Textos del menu MONITOR COLOR & STRESS
TEXT_MONITOR_COLOR_STRESS_MENU_TITLE:
; Textos de la informacion del sistema
TEXT_SYSTEM_INFO_TITLE:

db " SYSTEM INFORMATION", $0D, $0A, $00

TEXT_SYSTEM_INFO_MSX_MODEL:

db $0D, $0A, $0D, $0A, " MODEL: ", $00

TEXT_SYSTEM_INFO_MSX1:

db "MSX", $00

TEXT_SYSTEM_INFO_MSX2:

db "MSX2", $00

TEXT_SYSTEM_INFO_MSX2PLUS:

db "MSX2+", $00

TEXT_SYSTEM_INFO_MSXTR:

db "TURBO-R", $00

TEXT_SYSTEM_INFO_MODEL_UNKNOW:

db "UNKNOW", $00

TEXT_SYSTEM_INFO_KEYBOARD:

db $0D, $0A, $0D, $0A, " KEYBOARD LAYOUT: ", $00

TEXT_SYSTEM_INFO_KB_JAPAN:

db "JP", $00

TEXT_SYSTEM_INFO_KB_INTERNATIONAL:

db "INT", $00

TEXT_SYSTEM_INFO_KB_FRANCE:

db "FR", $00

TEXT_SYSTEM_INFO_KB_UK:

db "GB", $00

TEXT_SYSTEM_INFO_KB_GERMANY:

db "DE", $00

TEXT_SYSTEM_INFO_KB_USSR:

db "USSR", $00

TEXT_SYSTEM_INFO_KB_SPAIN:

db "SP", $00




; Textos del menu MONITOR COLOR
TEXT_MONITOR_COLOR_MENU_TITLE:

db $0D, $0A
db " MONITOR COLOR & STRESS TEST", $0D, $0A
db " MONITOR COLOR TEST", $0D, $0A
db $00

TEXT_MONITOR_COLOR_STRESS_MENU_INSTRUCTIONS:
TEXT_MONITOR_COLOR_MENU_INSTRUCTIONS:
db $0D, $0A
db " * PRESS LEFT/RIGHT TO CHANGE", $0D, $0A
db " THE TEST TYPE.", $0D, $0A
db " THE COLOR.", $0D, $0A
db $0D, $0A
db " * PRESS UP/DOWN TO CHANGE", $0D, $0A
db " THE SPEED (IF AVAILABLE).", $0D, $0A
db $00
db $00


; Textos de la interfaz del MONITOR COLOR
TEXT_MONITOR_COLOR_TEST:
db " TEST", $00

TEXT_MONITOR_COLOR_WHITE:
db "WHITE", $00

TEXT_MONITOR_COLOR_BLACK:
db "BLACK", $00

TEXT_MONITOR_COLOR_RED:
db "RED", $00

TEXT_MONITOR_COLOR_GREEN:
db "GREEN", $00

TEXT_MONITOR_COLOR_BLUE:
db "BLUE ", $00

TEXT_MONITOR_COLOR_LOOP:
db "LOOPING", $00



;***********************************************************
; Fin del archivo
;***********************************************************
TEXT_EOF:
25 changes: 14 additions & 11 deletions source/formats/f_binary.asm
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
;***********************************************************
;
; MSX DIAGNOSTICS
; Version 1.1.0-wip02
; Version 1.1.0-wip03
; ASM Z80 MSX
; Directivas de compilacion para BINARIO de 32kb
;
Expand All @@ -22,24 +22,27 @@

OUTPUT_FORMAT = 1 ; Define el formato de salida


; ----------------------------------------------------------
; Directivas del formato
; Definicion de variables en los ultimos 4KB [$E380]
; Ultima direccion valida $F380 - $1000
; ----------------------------------------------------------

.ORG $8000 ; Selecciona la pagina 2 [$8000] (Codigo del programa)
.BASIC ; Se creara el binario en formato BASIC de hasta 32kb

; Indicale al compilador donde empieza el programa
.START PROGRAM_START_ADDRESS
; Almacena las variables los ultimos 4KB
.ORG $E380
.INCLUDE "ngn/ngn_vars.asm" ; 2284 bytes
.INCLUDE "prog/vars.asm" ; 96 bytes


; ----------------------------------------------------------
; Definicion de variables
; Directivas del formato
; ----------------------------------------------------------

; Almacena las variables
.INCLUDE "ngn/ngn_vars.asm"
.INCLUDE "prog/vars.asm"
.PAGE 2 ; Selecciona la pagina 2 [$8000] (Codigo del programa)
.BASIC ; Se creara el binario

; Indicale al compilador donde empieza el programa
.START PROGRAM_START_ADDRESS


;***********************************************************
Expand Down
27 changes: 15 additions & 12 deletions source/formats/f_cas.asm
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
;***********************************************************
;
; MSX DIAGNOSTICS
; Version 1.1.0-wip02
; Version 1.1.0-wip03
; ASM Z80 MSX
; Directivas de compilacion para BINARIO de 32kb
; Genera un archivo .CAS y .WAV
Expand All @@ -24,24 +24,27 @@
OUTPUT_FORMAT = 4 ; Define el formato de salida

; ----------------------------------------------------------
; Directivas del formato
; Definicion de variables en los ultimos 4KB [$E380]
; Ultima direccion valida $F380 - $1000
; ----------------------------------------------------------

.ORG $8000 ; Selecciona la pagina 2 [$8000] (Codigo del programa)
.BASIC ; Se creara el binario en formato BASIC de hasta 32kb
.CAS ; Genera el archivo .CAS
.WAV ; Genera el archivo .WAV
; Almacena las variables los ultimos 4KB
.ORG $E380
.INCLUDE "ngn/ngn_vars.asm" ; 2284 bytes
.INCLUDE "prog/vars.asm" ; 96 bytes

; Indicale al compilador donde empieza el programa
.START PROGRAM_START_ADDRESS

; ----------------------------------------------------------
; Definicion de variables
; Directivas del formato
; ----------------------------------------------------------

; Almacena las variables
.INCLUDE "ngn/ngn_vars.asm"
.INCLUDE "prog/vars.asm"
.PAGE 2 ; Selecciona la pagina 2 [$8000] (Codigo del programa)
.BASIC ; Se creara el binario
.CAS ; Se creara la imagen de cinta
.WAV ; Se creara el archivo de audio

; Indicale al compilador donde empieza el programa
.START PROGRAM_START_ADDRESS



Expand Down
19 changes: 11 additions & 8 deletions source/formats/f_com.asm
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
;***********************************************************
;
; MSX DIAGNOSTICS
; Version 1.1.0-wip02
; Version 1.1.0-wip03
; ASM Z80 MSX
; Directivas de compilacion para .COM de MSX-DOS
;
Expand All @@ -22,21 +22,24 @@

OUTPUT_FORMAT = 3 ; Define el formato de salida


; ----------------------------------------------------------
; Directivas del formato
; Definicion de variables en los ultimos 4KB [$E380]
; Ultima direccion valida $F380 - $1000
; ----------------------------------------------------------

.ORG $0100 ; Selecciona el punto inicial por defecto en MSX-DOS [$0100]
.MSXDOS ; Se creara el binario en formato .COM para MSX-DOS
; Almacena las variables los ultimos 4KB
.ORG $E380
.INCLUDE "ngn/ngn_vars.asm" ; 2284 bytes
.INCLUDE "prog/vars.asm" ; 96 bytes


; ----------------------------------------------------------
; Definicion de variables
; Directivas del formato
; ----------------------------------------------------------

; Almacena las variables
.INCLUDE "ngn/ngn_vars.asm"
.INCLUDE "prog/vars.asm"
.ORG $0100 ; Selecciona el punto inicial por defecto en MSX-DOS [$0100]
.MSXDOS ; Se creara el binario en formato .COM para MSX-DOS


;***********************************************************
Expand Down
Loading

0 comments on commit edfeee7

Please sign in to comment.