diff --git a/assets/ASCII.bin b/assets/ASCII.bin deleted file mode 100755 index 47bfc28..0000000 Binary files a/assets/ASCII.bin and /dev/null differ diff --git a/assets/ASCII.bmf b/assets/ASCII.bmf deleted file mode 100755 index 231e4d7..0000000 Binary files a/assets/ASCII.bmf and /dev/null differ diff --git a/assets/UTF-8.bmf b/assets/bold.bmf similarity index 100% rename from assets/UTF-8.bmf rename to assets/bold.bmf diff --git a/assets/font.bin b/assets/font.bin new file mode 100755 index 0000000..438fee6 Binary files /dev/null and b/assets/font.bin differ diff --git a/assets/thin.bmf b/assets/thin.bmf new file mode 100755 index 0000000..3c2d606 Binary files /dev/null and b/assets/thin.bmf differ diff --git a/src/kernel/keyboard.s b/src/kernel/keyboard.s index d268460..341a0e8 100755 --- a/src/kernel/keyboard.s +++ b/src/kernel/keyboard.s @@ -28,49 +28,6 @@ keyboard_scan: sta soft_system_register sta system_register - ldy #$00 ; Result Index - ldx #$00 ; Row Counter - -keyboard_scan_load: - lda #$fe ; Bit shifter - -keyboard_scan_loop: - cmp keyboard_port - beq keyboard_scan_return - iny - rol - cmp #$fe - bne keyboard_scan_loop - inx - cpx #$08 ; Checking if Counted to 7 - beq keyboard_scan_return - - - inc soft_system_register - lda soft_system_register - sta system_register - - jmp keyboard_scan_load - -keyboard_scan_return: - sty k0 - lda soft_system_register - ora #$05 - sta system_register - lda keyboard_port - tax - and #$0f - tay ; => Arrow Keys - txa - rol - rol - rol - rol - and #$07 - - tax ; => Modifier Keys - lda k0 ; => Scancode - rts keyboard_translate: ; Keyboard Translate diff --git a/src/main.s b/src/main.s index d48beee..0302233 100755 --- a/src/main.s +++ b/src/main.s @@ -1,5 +1,5 @@ ; Important To-Do! -; +; ; Get launch & tasks json working ; fix Keyboard scanning ; work on KernelRoutinesList.txt @@ -8,15 +8,15 @@ ; Does not support the Graphics module ! - .include "src/variables.s" - - + .include "src/variables.s" + + .org $c000 ; $c000 for 16k ROM .include "src/kernel.s" .org $f700 -charset: .incbin "assets/UTF-8.bin" +charset: .incbin "assets/font.bin" .org $ff00 reset: sei @@ -29,7 +29,7 @@ reset: sei lda #$E0 sta vidm - + lda #$60 sta cursor_delay lda #$06 @@ -86,7 +86,8 @@ lp: cpy #$10 bne lp -loop: +loop: + jmp loop irq_jump: jmp (irq_vector) @@ -97,4 +98,4 @@ irq_jump: jmp (irq_vector) .addr reset .addr irq_jump - .end \ No newline at end of file + .end