diff --git a/POC/80x25 RAM/src/waitvid.80x25.demo.spin b/POC/80x25 RAM/src/waitvid.80x25.demo.spin index 211a317..5cac71a 100644 --- a/POC/80x25 RAM/src/waitvid.80x25.demo.spin +++ b/POC/80x25 RAM/src/waitvid.80x25.demo.spin @@ -10,7 +10,7 @@ CON _xinfreq = 5_000_000 CON - columns = driver#res_x / 9 + columns = driver#res_x / 8 rows = driver#res_y / font#height bcnt = columns * rows diff --git a/POC/80x25 RAM/src/waitvid.80x25.driver.2048.spin b/POC/80x25 RAM/src/waitvid.80x25.driver.2048.spin index 8733345..aa04ee4 100644 --- a/POC/80x25 RAM/src/waitvid.80x25.driver.2048.spin +++ b/POC/80x25 RAM/src/waitvid.80x25.driver.2048.spin @@ -106,10 +106,10 @@ pmsk long %%0000_3333 ' xor mask for underscore cursor ' | +-------------- sync ' | | +--------- back porch ' | | | -vsync mov ecnt, #13+2+(34-2) +vsync mov ecnt, #12+2+(35-2) - cmp ecnt, #34 wz - if_ne cmp ecnt, #32 wz + cmp ecnt, #35 wz + if_ne cmp ecnt, #33 wz if_e xor sync, #$0101 ' in/active call #blank @@ -171,7 +171,7 @@ vsync mov ecnt, #13+2+(34-2) jmp #vsync ' next frame -blank mov vscl, line ' 180/720 +blank mov vscl, line ' 256/640 waitvid sync, #%0000 ' latch blank line call #hsync blank_ret ret @@ -181,7 +181,7 @@ chars movd :one, #pix+0 ' | movd :two, #col+0 ' restore initial settings movs :two, #pix+0 ' | - mov vscl, hvis ' 1/9, speed up (one pixel per frame clock) + mov vscl, hvis ' 1/8, speed up (one pixel per frame clock) mov ecnt, #80 ' character count :one ror 1-1, #8 ' $0000AABB -> $BB0000AA -> $000000BB @@ -353,10 +353,10 @@ flag long 0 ' loader flag storage swap long %000010 << 26 | 16 ' ror #8 vs shr #24 sync long hv_idle ^ $0200 -wrap long 18 << 12 | 180 ' 18/180 -hvis long 1 << 12 | 9 ' 1/9 -line long 180 << 12 | 720 ' 180/720 -many long 0 << 12 | 1800 ' 256/1800 +wrap long 16 << 12 | 160 ' 16/160 +hvis long 1 << 12 | 8 ' 1/8 +line long 0 << 12 | 640 ' 256/640 +many long 0 << 12 | 1600 ' 256/1600 scrn_ long $00000000 -12 ' | font_ long $00000004 -12 ' | @@ -449,7 +449,7 @@ setup add trap, par wc ' carry set -> secondary ' Local data, used only once. pal0 long dcolour|hv_idle ' first palette entry -frqx long $16A85879 ' 28.322MHz +frqx long $1423D70A ' 25.175MHz mask long %11111111 hram long $00007FFF ' hub RAM mask @@ -504,10 +504,10 @@ CON hv_idle = $01010101 * %10 {%hv} ' h/v sync inactive dcolour = %%0010_0220_0220_0010 ' default colour - res_x = 720 ' | + res_x = 640 ' | res_y = 400 ' | res_m = 4 ' UI support alias = 0 -DAT \ No newline at end of file +DAT