mirror of
https://github.com/hsoft/collapseos.git
synced 2024-11-02 08:30:55 +11:00
Compare commits
No commits in common. "b90efb0f7fba9f38666d8d50d19009a630e20e02" and "24e588019bdb198de828e175c318eeff66ef767e" have entirely different histories.
b90efb0f7f
...
24e588019b
8
blk/522
8
blk/522
@ -4,13 +4,13 @@
|
||||
2 *
|
||||
OVER J 64 * I + + C@ 'X' = IF 1+ THEN
|
||||
LOOP 32 * C, LOOP DROP ;
|
||||
: _l ( a u -- a, spit a line of u glyphs )
|
||||
: _l ( spit a line of u glyphs )
|
||||
( u ) 0 DO ( a )
|
||||
DUP I 3 * + _g
|
||||
LOOP ;
|
||||
LOOP DROP ;
|
||||
: CPFNT3x5
|
||||
0 , 0 , 0 C, ( space char )
|
||||
530 BLK@ BLK( 21 _l 192 + 21 _l 192 + 21 _l ( 63 )
|
||||
531 BLK@ BLK( 21 _l 192 + 10 _l ( 94! )
|
||||
530 LOAD BLK( 21 _l 192 + 21 _l 192 + 21 _l ( 63 )
|
||||
531 LOAD BLK( 21 _l 192 + 10 _l ( 94! )
|
||||
;
|
||||
|
||||
|
29
blk/555
29
blk/555
@ -1,15 +1,16 @@
|
||||
( Required config: TI_MEM )
|
||||
: TI_MEM+ [ TI_MEM LITN ] @ + ;
|
||||
TI_MEM : TI_MEM [ LITN ] ;
|
||||
: LCD_PORT_CMD 0x10 ; : LCD_PORT_DATA 0x11 ;
|
||||
: FNTW 3 ; : FNTH 5 ;
|
||||
( Wait until the lcd is ready to receive a command. It's a bit
|
||||
weird to implement a waiting routine in asm, but the forth
|
||||
version is a bit heavy and we don't want to wait longer than
|
||||
we have to. )
|
||||
CODE LCDWAIT
|
||||
BEGIN,
|
||||
0x10 INAn,
|
||||
RLA, ( When 7th bit is clr, we can send a new cmd )
|
||||
JRC, AGAIN,
|
||||
;CODE
|
||||
: TI_MEM+ [ TI_MEM LITN ] + ;
|
||||
: LCD_PORT_CMD 0x10 ;
|
||||
: LCD_PORT_DATA 0x11 ;
|
||||
: FNT_WIDTH 3 ;
|
||||
: FNT_HEIGHT 5 ;
|
||||
( Current Y position on the LCD, that is, where we're going to
|
||||
spit our next glyph. )
|
||||
: LCD_CURY 0 TI_MEM+ ;
|
||||
: LCD_CURX 1 TI_MEM+ ;
|
||||
( two pixel buffers that are 8 pixels wide (1b) by FNT_HEIGHT
|
||||
pixels high. This is where we compose our resulting pixels
|
||||
blocks when spitting a glyph. )
|
||||
: LCD_BUF 2 TI_MEM+ ;
|
||||
|
||||
1 2 LOADR+
|
||||
|
19
blk/556
19
blk/556
@ -1,8 +1,11 @@
|
||||
( Current Y position on the LCD, that is, where we're going to
|
||||
spit our next glyph. )
|
||||
: LCD_CURY 0 TI_MEM+ ;
|
||||
: LCD_CURX 1 TI_MEM+ ;
|
||||
( two pixel buffers that are 8 pixels wide (1b) by FNT_HEIGHT
|
||||
pixels high. This is where we compose our resulting pixels
|
||||
blocks when spitting a glyph. )
|
||||
: LCD_BUF 2 TI_MEM+ ;
|
||||
: _wait ( Wait until the lcd is ready to receive a command )
|
||||
( When 7th bit is cleared, we can send a new command )
|
||||
BEGIN LCD_PORT_CMD PC@ 0x80 AND NOT UNTIL ;
|
||||
: _cmd LCD_PORT_CMD PC! _wait ;
|
||||
: _data! LCD_PORT_DATA PC! _wait ;
|
||||
: _data@ LCD_PORT_DATA PC@ _wait ;
|
||||
: LCDOFF 0x02 ( CMD_DISABLE ) _cmd ;
|
||||
: _col! ( col -- )
|
||||
0x20 ( CMD_COL ) + _cmd ;
|
||||
: _row! ( row -- )
|
||||
0x80 ( CMD_ROW ) + _cmd ;
|
||||
|
16
blk/557
16
blk/557
@ -1,13 +1,3 @@
|
||||
: _cmd LCD_PORT_CMD PC! LCDWAIT ;
|
||||
: _data! LCD_PORT_DATA PC! LCDWAIT ;
|
||||
: _data@ LCD_PORT_DATA PC@ LCDWAIT ;
|
||||
: LCDOFF 0x02 ( CMD_DISABLE ) _cmd ;
|
||||
: LCDON 0x03 ( CMD_ENABLE ) _cmd ;
|
||||
: _col! ( col -- )
|
||||
0x20 ( CMD_COL ) + _cmd ;
|
||||
: _row! ( row -- )
|
||||
0x80 ( CMD_ROW ) + _cmd ;
|
||||
: LCD$
|
||||
H@ TI_MEM ! FNTH 2 * 2+ ALLOT
|
||||
LCDON 0x01 ( 8-bit mode ) _cmd
|
||||
;
|
||||
( Load a "glyph line" from buffer, left part being in MSB and
|
||||
right part being in LSB. )
|
||||
: _gl@
|
||||
|
17
blk/558
17
blk/558
@ -1,16 +1,5 @@
|
||||
: _glyph> ( a -- )
|
||||
LCD_CURY C@ _row! LCD_CURX C@ 8 /MOD _col! ( a coff )
|
||||
0x05 ( XINC ) _cmd _data@ DROP SWAP
|
||||
FNTH 0 DO ( coff a )
|
||||
C@+ 2 PICK 8 -^ LSHIFT
|
||||
_data@ 8 LSHIFT OR
|
||||
LCD_BUF I + 2DUP FNTH + C!
|
||||
SWAP 8 RSHIFT SWAP C!
|
||||
LOOP 2DROP
|
||||
LCD_CURY C@ _row!
|
||||
FNTH 0 DO LCD_BUF I + C@ _data! LOOP
|
||||
LCD_CURY C@ _row! LCD_CURX C@ 8 / 1+ _col!
|
||||
FNTH 0 DO LCD_BUF FNTH + I + C@ _data! LOOP
|
||||
LCD_CURX C@ FNTW + 1+
|
||||
DUP [ 96 FNTW - LITN ] > IF DROP 0 THEN
|
||||
LCD_CURX C! ;
|
||||
0x05 ( XINC ) _cmd _data@ DROP
|
||||
FNT_HEIGHT 0 DO LOOP
|
||||
|
||||
|
@ -10,7 +10,6 @@ void t6a04_init(T6A04 *lcd)
|
||||
lcd->currow = 0;
|
||||
lcd->curcol = 0;
|
||||
lcd->just_moved = true;
|
||||
lcd->has8bitmode = false;
|
||||
}
|
||||
|
||||
uint8_t t6a04_cmd_rd(T6A04 *lcd)
|
||||
|
@ -225,8 +225,11 @@ void draw_pixels()
|
||||
void event_loop()
|
||||
{
|
||||
while (1) {
|
||||
emul_steps(100);
|
||||
emul_step();
|
||||
if (lcd_changed) {
|
||||
// To avoid overdrawing, we'll let the CPU run a bit to finish its
|
||||
// drawing operation.
|
||||
emul_steps(100);
|
||||
draw_pixels();
|
||||
}
|
||||
// A low tech way of checking when the window was closed. The proper way
|
||||
|
@ -1,15 +1,15 @@
|
||||
TARGET = stage1.bin
|
||||
TARGET = os.bin
|
||||
BASEDIR = ../..
|
||||
FDIR = $(BASEDIR)/forth
|
||||
EDIR = $(BASEDIR)/emul
|
||||
STAGE2 = $(EDIR)/stage2
|
||||
ZASM = $(BASEDIR)/emul/zasm/zasm
|
||||
KERNEL = $(BASEDIR)/kernel
|
||||
APPS = $(BASEDIR)/apps
|
||||
EMUL = $(BASEDIR)/emul/hw/ti/ti84
|
||||
MKTIUPGRADE = mktiupgrade
|
||||
|
||||
.PHONY: all
|
||||
all: $(TARGET)
|
||||
$(TARGET): xcomp.fs $(STAGE2)
|
||||
cat xcomp.fs | $(STAGE2) > $@
|
||||
all: $(TARGET)
|
||||
$(TARGET): glue.asm
|
||||
$(ZASM) $(KERNEL) $(APPS) < glue.asm > $@
|
||||
|
||||
$(EMUL):
|
||||
$(MAKE) -C ${@:%/ti84=%}
|
||||
|
@ -1,25 +0,0 @@
|
||||
0x8000 CONSTANT RAMSTART
|
||||
0xb000 CONSTANT RS_ADDR
|
||||
RAMSTART 0x70 + CONSTANT TI_MEM
|
||||
212 LOAD ( z80 assembler )
|
||||
262 LOAD ( xcomp )
|
||||
522 LOAD ( font compiler )
|
||||
: CODE XCODE ;
|
||||
: IMMEDIATE XIMM ;
|
||||
: (entry) (xentry) ;
|
||||
: : [ ' X: , ] ;
|
||||
|
||||
CURRENT @ XCURRENT !
|
||||
|
||||
282 LOAD ( boot.z80 )
|
||||
555 LOAD ( ti.z80 )
|
||||
393 LOAD ( icore )
|
||||
(entry) ~FNT CPFNT3x5
|
||||
(entry) _
|
||||
( Update LATEST )
|
||||
PC ORG @ 8 + !
|
||||
422 437 XPACKR ( core )
|
||||
556 558 XPACKR ( ti )
|
||||
," 42 42 PC! LCD$ ' ~FNT 5 + _glyph> 43 43 PC! BYE "
|
||||
ORG @ 256 /MOD 2 PC! 2 PC!
|
||||
H@ 256 /MOD 2 PC! 2 PC!
|
Loading…
Reference in New Issue
Block a user