From f4fdca7feee3ad55241248dcd051ca991caff103 Mon Sep 17 00:00:00 2001 From: 0xMAC8205 Date: Sun, 18 Feb 2024 22:54:51 +0100 Subject: [PATCH] Cleaned up Font Startet working on Keyboard Routines --- assets/ASCII.bin | Bin 2048 -> 0 bytes assets/ASCII.bmf | Bin 4097 -> 0 bytes assets/{UTF-8.bmf => bold.bmf} | Bin assets/font.bin | Bin 0 -> 2048 bytes assets/thin.bmf | Bin 0 -> 4097 bytes src/kernel/keyboard.s | 43 --------------------------------- src/main.s | 17 +++++++------ 7 files changed, 9 insertions(+), 51 deletions(-) delete mode 100755 assets/ASCII.bin delete mode 100755 assets/ASCII.bmf rename assets/{UTF-8.bmf => bold.bmf} (100%) create mode 100755 assets/font.bin create mode 100755 assets/thin.bmf diff --git a/assets/ASCII.bin b/assets/ASCII.bin deleted file mode 100755 index 47bfc2865ccaa83d948731b79f844940b579c851..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2048 zcmeH`A&(m|5QRt4fCU8x1q%%pEGUSo0|o{L1`7fXEI3sK1px&I4lb}x2ks{o_CFPt z_Iq|J^*=NdWhc)&e)HzpF}sHx2nq|fuEURIdF8WM$R+s^tZq|?OSQ0uho|kqVjOjI zETzQRWenh^M}@u~VCI5X zNVt_37TPTr%jGNU$?9!ilKha&6$5i^%GAzbK=Z5dWcqf$??pukfeN zgNF+GjCwuSb>RIOzBQ~YDfhaj>FAfEB3p?}Jh|mAEOUPK?USK$3E(aK_lE_r3>~cu0tyBk2pkX)aA0*>5D+lHAYeg3!0J?RV8MZc!hlg#&`&DtKOH>U z=SkOgPWJ^>W~I$I&-2E9b{xXKb_JXQQC5ihrtfuIH(mFPU#BnQmn6s62scYYcB{C3-8z^W#Fw&q41AuiJg6Oy zB7iXrObBsnlk>m()^Q=y^Cd6jaU5RQ`4^_fhdTiDIE;~+qw)ob-NpZDYre=Pr`VW( zK&%#S0EP>b;>f4*^<7@y-d|qqz`%vE)PG@w&x_gvqh2l_K|Nmb6C8|hwX>cd^8@@% zZ~o`LLFA8ylPvE)Jxw4`K3ulBj~{0VNO8W-XKzDaEaOLhLZJQ?cm2BNZ+z13J|6U< zEInW89lzLpzs2WAcCSt)`s=pALuuFz;yKwfq9-y zAK20X$|tzj2Ol#UpeWvAcqKP4t6KQGIkZFva`W@Y`G)-e*>*qw{(1i1-q79N_1ODi T{~q>vuqv?6!+jop<$3r4+42+- 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 0000000000000000000000000000000000000000..438fee6dd2707472fa789158dc865d8610a6c466 GIT binary patch literal 2048 zcmeH_p_1G%5Jac81{eeg1Q-e!7;dE&2nYxW7%Vtoa3COHLBN572CCG7d{SUO?p{lK zf8lnmXImci%(P^7LJkDMg01WDV_E+2EEaM}egv!A6yj1Xtl{>$-7LnDH^)*+oNe~Y z<>Iq#*KK@2v7y)@Y0w5!G4lz%SS;21{;0{qRSh(_BRQh8{_Xoxo4d7gxHun=N^I39 z$tH+6uk6#cYfJz63sfmFOrtst@SlxQbtcVw{QdX;<3sgY1$I>A>j7sjbj8G5d1s+L zW3gO*vYxCy_a(I-lDVMu?R_J`*aVu@w_QS3ANyUAeu4B4B@B+Qqkcs{bsanus5A2Q zUf03*H}ux9vZUDanx>;(jzZ>~LYOA^+#AcBU;R1-#TK7OWR^VFY^A(DG%vhre)k*w z=FVHm_`htr5-f@7~9VN@0-UosC#rIu(bqB_G`e7stX!Oasb1!>Wyk_@{b3cFFNj-5oa5`{0fCHb5 CEOf^J literal 0 HcmV?d00001 diff --git a/assets/thin.bmf b/assets/thin.bmf new file mode 100755 index 0000000000000000000000000000000000000000..3c2d606bdb6e7e0f3b3d1c3b8a5203229ff3382d GIT binary patch literal 4097 zcmeHHp_1G%4E5{?1QZw)1R4Yc?sOIy1Q-YeEI1IbprBwu!GVJTp3Z@OQei)?PtKjB z^c$?5*;sk9O-hokooI%RqR;ASdrn$BxPsSt=rPUG$6lJG$QkTdvaDkUPS<7$V^D_ z?30WC@^#`$r2A{x$>Z3(vx~1xgHJaD^f;V_hO6=g$=&7u;cLC9rldGnd_b<2ZUBY@ zlj5jn@crF?|M~m=ZW}UJhH3oHNS}B0GoxRw9zi``%NqiW@9>N6U&?pHo8J82d0FI- zhLf0&U*A>`C?5_xoyV`6B&0Y$x4ZYDFUVb&nKc0R*LTDGB!m$mk|NcOK(gUvRe+bOmX8ORF2~a-4 xy*~JuF#uKZ5tmnT_hnNHf1d#((S_Xo`R)FR^k-L~E6^3_3Umd!0$qVafq#svbjJVy literal 0 HcmV?d00001 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