Apple2 plus

.github/workflows/release.yml

@@ -86,6 +86,7 @@ jobs:
         name: Development build ${{ env.RELEASE_DATE }}
         files: |
           cpm65/images/apple2e.po
+          cpm65/images/apple2e_b.po
           cpm65/images/atari800.atr
           cpm65/images/atari800b.atr
           cpm65/images/atari800c.atr

.gitignore

@@ -1,31 +1,6 @@
 *~
 .*.swp
 .obj
-apple2e.po
-apple2e_b.po
-atari800.atr
-atari800b.atr
-atari800c.atr
-atari800d.atr
-atari800hd.atr
-atari800xlhd.atr
-bbcmicro.ssd
 bin
-c64.d64
-pet.d64
-vic20.d64
-pet4032.d64
-pet8032.d64
-pet8096.d64
-x16.zip
-oric.dsk
-kim-1-iec.zip
-kim-1-k1013.zip
-kim-1-sdcard.zip
+images/*
 __pycache__
-neo6502.zip
-sorbus.zip
-nano6502.img
-nano6502_sysonly.img
-*.os5
-*.os8

apps/scrntest.asm

@@ -15,8 +15,11 @@
 .zp style, 1
 .zp ptr1, 2
 .zp ptr2, 2
+.zp kbd_blocking, 1
+.zp spinner_pos, 1
 .label string_init
 .label string_a
+.label chars_spinner
 .label BIOS
 .label SCREEN
 .label update_cursor
@@ -54,9 +57,15 @@
 
     lda #1
     sta cur_vis
+    ldy #SCREEN_SHOWCURSOR
+    jsr SCREEN
 
     lda #0
     sta style
+    sta spinner_pos
+
+    lda #1
+    sta kbd_blocking
 
 help:
     \ Clear screen and print help
@@ -92,11 +101,59 @@ mainloop:
     sta cur_x
     stx cur_y
 
+timeout:
+    \ Show spinnig bar to test non-blocking keyboard read
+    lda #39
+    ldx #0
+    ldy #SCREEN_SETCURSOR
+    jsr SCREEN
+    ldy spinner_pos
+    iny
+    tya
+    cmp #4
+    .zif eq
+        ldy #0
+    .zendif
+    sty spinner_pos
+    ldx kbd_blocking
+    .zif ne
+        lda #'*'
+    .zendif
+    ldx kbd_blocking
+    .zif eq
+        lda chars_spinner, y
+    .zendif
+    ldy #SCREEN_PUTCHAR
+    jsr SCREEN 
+
+    lda #39
+    ldx #1
+    ldy #SCREEN_SETCURSOR
+    jsr SCREEN
+    lda #32
+    ldy #SCREEN_PUTCHAR
+    jsr SCREEN 
+
+    lda cur_x
+    ldx cur_y
+    ldy #SCREEN_SETCURSOR
+    jsr SCREEN
+
     \ Get and parse command
-    lda #10
-    ldx #00
+
+    ldy kbd_blocking
+    .zif ne
+        lda #0xff
+        ldx #0x7f
+    .zendif
+    ldy kbd_blocking
+    .zif eq
+        lda #0x10
+        ldx #0x0
+    .zendif
     ldy #SCREEN_GETCHAR
     jsr SCREEN
+    bcs timeout \ make sure we don't have consecutive key presses because of short timeouts
 
     \ Convert to uppercase
     cmp #0x61
@@ -248,6 +305,21 @@ case_done:
         jsr SCREEN
         jmp mainloop
     .zendif
+
+    \ Toggle keyboard read mode
+    cmp #'B'
+    .zif eq
+        lda kbd_blocking
+        .zif eq
+            lda #1
+            sta kbd_blocking
+            jmp mainloop
+        .zendif
+        lda #0
+        sta kbd_blocking
+        jmp mainloop
+
+    .zendif
 
     \ Clear screen and print help 
     cmp #'H'
@@ -398,6 +470,7 @@ string_init:
     .byte "J - Scroll down\r\n"
     .byte "L - Clear to End of Line\r\n"
     .byte "I - Toggle style\r\n"
+    .byte "B - Toggle blocking/non-blocking read\r\n"
     .byte "H - Clear screen and print this help\r\n"
     .byte "Q - Quit\r\n"
     .byte 0
@@ -406,3 +479,7 @@ string_a:
     .byte "String"
     .byte 0
 
+chars_spinner:
+    .byte "-\\|/"
+    .byte 0
+

config.py

@@ -44,6 +44,7 @@
     "0:life.com": "apps+life",
     "0:qe.com": "apps+qe",
     "0:scrntest.com": "apps+scrntest",
+    "0:tetris.com": "third_party/tetris",
     "0:vt52drv.com": "apps+vt52drv",
     "0:vt52test.com": "apps+vt52test",
     "0:kbdtest.com": "apps+kbdtest",

lib/screen.S

@@ -68,6 +68,15 @@ zproc screen_clear_to_eol, .text.screen_clear_to_eol
     jmp _call_screen
 zendproc
 
+zproc screen_getchar, .text.screen_getchar
+    ldy #SCREEN_GETCHAR
+    jsr _call_screen
+    zif_cs
+        lda #0 ; is this a good way to report the timeout?
+    zendif
+    rts
+zendproc
+
 zproc screen_waitchar, .text.screen_waitchar
     zrepeat
         lda #0xff