Add keyboard test

Author: varmfskii

Makefile

@@ -1,6 +1,6 @@
 SYS=asm_inc/ecb.inc asm_inc/coco.inc asm_inc/coco3.inc constants.inc
 INC=hardware.asm memory.asm menu.asm util.asm printer.asm rom.asm \
-	video.asm crctab.bin joystick.asm
+	video.asm crctab.bin joystick.asm keyboard.asm
 OBJS=diag.ccc
 
 all: ${OBJS}

README.md

@@ -1,4 +1,4 @@
-# Capabilities
+# Capabilities as of v0.6
 
 - Hardware detection
 
@@ -12,30 +12,28 @@
 
 - Memory test
 
+- ROM test
+
 - Printer test
 
 - Video test
 
- - m6847
+  - m6847
 
- - GIME
+  - GIME
 
 - Joystick test
 
+- Keyboard test
+
 # TODO
 
 - Hardware
 
   - Detect other external hardware where possible
 
-- keyboard tests
-
 - audio tests
 
-- rom tests
-
-- keyboard test
-
 - cassette test
 
 - serial test

arc/kb.asm

@@ -0,0 +1,102 @@
+	org $4000
+start:
+	lbsr cls
+	ldx #message
+	ldy #$0408
+	lbsr print_string
+	ldx #$0484
+	ldy #matrix
+l0:
+	ldb #8
+l1:
+	lda ,y+
+	ora #$40
+	sta ,x
+	leax 3,x
+	decb
+	bne l1
+	leax 8,x
+	cmpx #$0584
+	blt l0
+main:	
+	lda #$fe
+	ldx #$0484
+loop0:
+	ldb #$08
+	stb temp
+	sta $ff02
+	ldb $ff00
+loop1:
+	lsrb
+	pshs b
+	bcc skip1
+	ldb ,x
+	orb #$40
+	bra cont1
+skip1:
+	ldb ,x
+	andb #$bf
+cont1:
+	stb ,x
+	puls b
+	leax 32,x
+	dec temp
+	bne loop1
+	leax -253,x
+	orcc #$01
+	rola
+	cmpa #$ff
+	bne loop0
+	lda #$7f
+	sta $ff02
+	lda $ff00
+	cmpa #$bf		; shift
+	bne main
+	lda #$fb
+	sta $ff02
+	lda $ff00
+	cmpa #$bf		; escape
+	bne main
+	rts
+temp:	rmb 1
+message:
+	fcz "SHIFT+ESC TO END"
+cmatrix:
+	fcb '@','A','B','C','D','E','F','G'
+	fcb 'H','I','J','K','L','M','N','O'
+	fcb 'P','Q','R','S','T','U','V','W'
+	fcb 'X','Y','Z','^','V','<','>',$ff
+	fcb '0','1','2','3','4','5','6','7'
+	fcb '8','9',':',';','<','-','>','/' 
+	fcb 'E','C','E','A','C','1','2','S'
+	fcb 'J','J','J','J','J','J','J','J'
+matrix:	
+dmatrix:
+	fcb '0','1','2','3','4','5','6','7'
+	fcb '8','9',':',';','<','-','>','/' 
+	fcb '@','A','B','C','D','E','F','G'
+	fcb 'H','I','J','K','L','M','N','O'
+	fcb 'P','Q','R','S','T','U','V','W'
+	fcb 'X','Y','Z','^','V','<','>',$ff
+	fcb 'E','C','E','A','C','1','2','S'
+	fcb 'J','J','J','J','J','J','J','J'
+
+cls:
+	lda #96
+	ldx #$0400
+loop@:
+	sta ,x+
+	cmpx #$0600
+	bne loop@
+	rts
+
+print_string:
+	lda ,x+
+	beq exit@
+	ora #$40
+	sta ,y+
+	bra print_string
+exit@:
+	rts
+	end start
+	

diag.asm

@@ -99,11 +99,12 @@ anykey:
 	include "printer.asm"
 	include "rom.asm"
 	include "joystick.asm"
+	include "keyboard.asm"
 
 title:	fcz "COLOR COMPUTER"
 	fcz "DIAGNOSTICS CART"
 version:
-	fcz "VERSION  0.5"
+	fcz "VERSION  0.6"
 	fcz "(C) 2025 ZIA COMPUTING"
 page0:	fcz "PAGE 0 ERROR"
 page1:	fcz "PAGE 1 ERROR"

joystick.asm

@@ -59,11 +59,10 @@ s2@:
 	com $0f0c
 	com $0f2c
 s3@:
-	coma
-	anda #$0f
-	bne joy@
 	jsr [POLCAT]
 	beq joy@
+	cmpa #3			; escape
+	bne joy@
 	ldd #$0200
 	lbra setgfx
 

keyboard.asm

@@ -3,5 +3,90 @@ keyboard_test:
 	fdb start@
 	fcz "KEYBOARD TEST"
 start@:
+	lbsr cls
+	ldx #kb_title
+	ldy #$0208
+	lbsr print_string
+	ldx #$0284
+	lda hwflag
+	anda #dragon_f
+	bne dragon@
+	ldy #cmatrix
+	bra l0@
+dragon@:
+	ldy #dmatrix
+l0@:
+	ldb #8
+l1@:
+	lda ,y+
+	ora #$40
+	sta ,x
+	leax 3,x
+	decb
+	bne l1@
+	leax 8,x
+	cmpx #$0384
+	blt l0@
+	
+main@:	
+	lda #$fe
+	ldx #$0284
+l0@:
+	ldb #$08
+	stb TEMP
+	sta KB_COL
+	ldb KB_ROW
+l1@:
+	lsrb
+	stb TEMP+1
+	bcc skip@
+	ldb ,x
+	orb #$40
+	bra cont@
+skip@:
+	ldb ,x
+	andb #$bf
+cont@:
+	stb ,x
+	ldb TEMP+1
+	leax 32,x
+	dec TEMP
+	bne l1@
+	leax -253,x
+	orcc #$01
+	rola
+	cmpa #$ff
+	bne l0@
+	lda #$7f
+	sta KB_COL
+	lda KB_ROW
+	cmpa #$bf		; shift
+	bne main@
+	lda #$fb
+	sta KB_COL
+	lda KB_ROW
+	cmpa #$bf		; escape
+	bne main@
 	rts
 
+kb_title:
+	fcz "SHIFT+ESC TO END"
+cmatrix:
+	fcb '@','A','B','C','D','E','F','G'
+	fcb 'H','I','J','K','L','M','N','O'
+	fcb 'P','Q','R','S','T','U','V','W'
+	fcb 'X','Y','Z','^','V','<','>',$ff
+	fcb '0','1','2','3','4','5','6','7'
+	fcb '8','9',':',';','<','-','>','/' 
+	fcb 'E','C','E','A','C','1','2','S'
+	fcb 'J','J','J','J','J','J','J','J'
+dmatrix:
+	fcb '0','1','2','3','4','5','6','7'
+	fcb '8','9',':',';','<','-','>','/' 
+	fcb '@','A','B','C','D','E','F','G'
+	fcb 'H','I','J','K','L','M','N','O'
+	fcb 'P','Q','R','S','T','U','V','W'
+	fcb 'X','Y','Z','^','V','<','>',$ff
+	fcb 'E','C','E','A','C','1','2','S'
+	fcb 'J','J','J','J','J','J','J','J'
+

menu.asm

@@ -40,7 +40,7 @@ menu@:
 poll@:
 	jsr [POLCAT]
 	beq poll@
-	cmpa #'F'
+	cmpa #'G'
 	bgt poll@
 	suba #'A'
 	blt poll@
@@ -52,7 +52,8 @@ poll@:
 
 
 entries:
-	fdb showhw,memtest,print_test,romtest,video_test,joystick_test,0
+	fdb showhw,memtest,print_test,romtest
+	fdb video_test,joystick_test,keyboard_test,0
 
 test:
 	clra