Added clock

This commit is contained in:
Devine Lu Linvega 2023-03-17 20:57:08 -07:00
parent 50ae649a5c
commit 07fb65b241
3 changed files with 410 additions and 45 deletions

35
gui/clock/build.sh Executable file
View File

@ -0,0 +1,35 @@
#!/bin/sh -e
ASM="uxncli $HOME/roms/drifblim.rom"
EMU="uxnemu"
LIN="uxncli $HOME/roms/uxnlin.rom"
APP="$HOME/bin/butler push"
SRC="clock.tal"
DST="clock.rom"
CPY="$HOME/roms"
ARG=""
echo ">> Cleaning"
rm -rf bin
mkdir bin
if [[ "$*" == *"--lint"* ]]
then
echo ">> Linting $SRC"
$LIN $SRC
fi
echo ">> Assembling $SRC"
$ASM $SRC $DST
if [[ "$*" == *"--save"* ]]
then
echo ">> Saving $DST"
cp $DST $CPY
fi
echo ">> Running $DST"
$EMU $DST $ARG

331
gui/clock/clock.tal Normal file
View File

@ -0,0 +1,331 @@
( simple graphical clock )
|00 @System [ &vector $2 &pad $6 &r $2 &g $2 &b $2 ]
|10 @Console [ &vector $2 &read $1 &pad $5 &write $1 &error $1 ]
|20 @Screen [ &vector $2 &width $2 &height $2 &auto $1 &pad $1 &x $2 &y $2 &addr $2 &pixel $1 &sprite $1 ]
|c0 @DateTime [ &year $2 &month $1 &day $1 &hour $1 &minute $1 &second $1 &dotw $1 &doty $2 &isdst $1 ]
|0000
@last
&day $1 &sec $1
@center
&x $2 &y $2
@date
&x $2 &y $2
@time
&x $2 &y $2
@needles
&hx $2 &hy $2
&mx $2 &my $2
&sx $2 &sy $2
&zx $2 &zy $2
@buf
&d $3 &h $2 &s1 $1 &m $2 &s2 $1 &s $3
@line
&x2 $2 &y2 $2
|0100 ( -> )
( theme )
#0ff8 .System/r DEO2
#0f08 .System/g DEO2
#0f08 .System/b DEO2
( resize )
#00d0 .Screen/width DEO2
#0120 .Screen/height DEO2
( vectors )
;on-frame .Screen/vector DEO2
( center )
.Screen/width DEI2 #01 SFT2
DUP2 .center/x STZ2
DUP2 #0028 SUB2 .date/x STZ2
#0020 SUB2 .time/x STZ2
.Screen/height DEI2 #01 SFT2
DUP2 .center/y STZ2
DUP2 #0078 SUB2 .date/y STZ2
#006c ADD2 .time/y STZ2
draw-watchface
( time buffer )
LIT ":
DUP .buf/s1 STZ
.buf/s2 STZ
( continue )
@on-frame ( -> )
( once per second )
.DateTime/second DEI
DUP .last/sec LDZ EQU ?&same-sec
( make time )
.DateTime/hour DEI .buf/h decimal
.DateTime/minute DEI .buf/m decimal
DUP .buf/s decimal
( draw label )
.time/x LDZ2 .Screen/x DEO2
.time/y LDZ2 .Screen/y DEO2
;buf/h draw-text
( draw needles )
#00 draw-needles
make-needles
#01 draw-needles
DUP .last/sec STZ
&same-sec
POP
( once per day )
.DateTime/day DEI
DUP .last/day LDZ EQU ?&same-day
( make date )
DUP .buf/d decimal
( draw label )
.date/x LDZ2 .Screen/x DEO2
.date/y LDZ2 .Screen/y DEO2
[ #00 .DateTime/dotw DEI #20 SFT ] ;week-txt ADD2 draw-text
[ #00 .DateTime/month DEI #20 SFT ] ;month-txt ADD2 draw-text
;buf/d draw-text
DUP .last/day STZ
&same-day
POP
BRK
@draw-needles ( draw -- )
STH
.center/x LDZ2 .center/y LDZ2
OVR2 OVR2
.needles/mx LDZ2 .needles/my LDZ2 #01 STHkr MUL
draw-line
OVR2 OVR2
.needles/hx LDZ2 .needles/hy LDZ2 #01 STHkr MUL
draw-line
.needles/sx LDZ2 .needles/sy LDZ2
.needles/zx LDZ2 .needles/zy LDZ2 #02 STHr MUL
draw-line
( middle )
#0001 SUB2 .Screen/y DEO2
#0001 SUB2 .Screen/x DEO2
;middle-icn .Screen/addr DEO2
#0a .Screen/sprite DEO
JMP2r
@draw-text ( addr* -- )
( auto addr ) #15 .Screen/auto DEO
&while
LDAk
DUP is-lc ?&lc
DUP is-uc ?&uc
DUP is-num ?&num
DUP LIT "/ EQU ?&slash
DUP LIT ": EQU ?&colon
POP ;font/blank
&end
.Screen/addr DEO2
#03 .Screen/sprite DEO
INC2 LDAk ?&while
POP2
#00 .Screen/sprite DEO
( auto none ) #00 .Screen/auto DEO
JMP2r
&lc #61 SUB #00 SWP #40 SFT2 ;font/lc ADD2 !&end
&uc #41 SUB #00 SWP #40 SFT2 ;font/uc ADD2 !&end
&num #30 SUB #00 SWP #40 SFT2 ;font/num ADD2 !&end
&slash POP ;font/slash !&end
&colon POP ;font/colon !&end
@draw-line ( x1* y1* x2* y2* color -- )
( load )
,&color STR
,&y STR2
,&x STR2
.line/y2 STZ2
.line/x2 STZ2
,&x LDR2 .line/x2 LDZ2 SUB2 abs2 ,&dx STR2
#0000 ,&y LDR2 .line/y2 LDZ2 SUB2 abs2 SUB2 ,&dy STR2
#ffff #00 .line/x2 LDZ2 ,&x LDR2 lts2 DUP2 ADD2 ADD2 ,&sx STR2
#ffff #00 .line/y2 LDZ2 ,&y LDR2 lts2 DUP2 ADD2 ADD2 ,&sy STR2
[ LIT2 &dx $2 ] [ LIT2 &dy $2 ] ADD2 ,&e1 STR2
&loop
.line/x2 LDZ2 DUP2 .Screen/x DEO2 [ LIT2 &x $2 ] EQU2
.line/y2 LDZ2 DUP2 .Screen/y DEO2 [ LIT2 &y $2 ] EQU2
[ LIT2 &color $1 -Screen/pixel ] DEO
AND ?&end
[ LIT2 &e1 $2 ] DUP2 ADD2 DUP2
,&dy LDR2 lts2 ?&skipy
,&e1 LDR2 ,&dy LDR2 ADD2 ,&e1 STR2
.line/x2 LDZ2 [ LIT2 &sx $2 ] ADD2 .line/x2 STZ2
&skipy
,&dx LDR2 gts2 ?&skipx
,&e1 LDR2 ,&dx LDR2 ADD2 ,&e1 STR2
.line/y2 LDZ2 [ LIT2 &sy $2 ] ADD2 .line/y2 STZ2
&skipx
!&loop
&end
JMP2r
@draw-watchface ( -- )
#3c00
&loop
( dots )
#00 OVRk ADD2 ;table ADD2 LDA2
#0018 circle
.Screen/x DEO2 .Screen/y DEO2 #01 .Screen/pixel DEO
( markers )
DUP #05 mod ?&no-marker
#00 OVRk ADD2 ;table ADD2 LDA2
STH2k #0018 circle SWP2
STH2r #001c circle SWP2
#01 draw-line
&no-marker
INC GTHk ?&loop
POP2
JMP2r
@make-needles ( -- )
[ #00 .DateTime/second DEI #1e ADD #3c mod ] DUP2 ADD2 ;table ADD2 LDA2
#00a0 circle .needles/zx STZ2 .needles/zy STZ2
[ #00 .DateTime/second DEI ] DUP2 ADD2 ;table ADD2 LDA2
#0020 circle .needles/sx STZ2 .needles/sy STZ2
[ #00 .DateTime/minute DEI ] DUP2 ADD2 ;table ADD2 LDA2
#0022 circle .needles/mx STZ2 .needles/my STZ2
[ #00 .DateTime/hour DEI #0c mod #20 SFTk NIP ADD ]
( minute offset ) [ #00 .DateTime/minute DEI #0f DIV ADD2 ] DUP2 ADD2 ;table ADD2 LDA2
#002a circle .needles/hx STZ2 .needles/hy STZ2
JMP2r
@circle ( cx cy radius* -- y* x* )
STH2 SWP
#00 SWP #40 SFT2 STH2kr DIV2 .center/x LDZ2 ADD2 #0800 STH2kr DIV2 SUB2
STH2 SWP2r
#00 SWP #40 SFT2 STH2kr DIV2 .center/y LDZ2 ADD2 #0800 STH2kr DIV2 SUB2
POP2r STH2r
JMP2r
@decimal ( value* zp-label -- )
STH
DUP #0a DIV #30 ADD STHkr STZ
#0a mod #30 ADD STHr INC STZ
JMP2r
@mod DIVk MUL SUB JMP2r
@abs2 DUP2 #0f SFT2 EQU #05 JCN #0000 SWP2 SUB2 JMP2r
@lts2 #8000 STH2k ADD2 SWP2 STH2r ADD2 GTH2 JMP2r
@gts2 #8000 STH2k ADD2 SWP2 STH2r ADD2 LTH2 JMP2r
@is-uc DUP #40 GTH SWP #5b LTH AND JMP2r
@is-lc DUP #60 GTH SWP #7b LTH AND JMP2r
@is-num DUP #2f GTH SWP #3a LTH AND JMP2r
@week-txt
"Sun $1 "Mon $1 "Tue $1 "Wed $1 "Thu $1 "Fri $1
"Sat $1
@month-txt
"Jan $1 "Feb $1 "Mar $1 "Apr $1 "May $1 "Jun $1
"Jul $1 "Aug $1 "Sep $1 "Oct $1 "Nov $1 "Dec $1
@table ( 60 positions on a circle )
8000 8d00 9a02 a706 b40b c011 cb18 d520
df2a e734 ee40 f44b f958 fd65 ff72 ff80
ff8d fd9a f9a7 f4b4 eec0 e7cb dfd5 d5df
cbe7 c0ee b4f4 a7f9 9afd 8dff 80ff 72ff
65fd 58f9 4bf4 40ee 34e7 2adf 20d5 18cb
11c0 0bb4 06a7 029a 008d 0080 0072 0265
0658 0b4b 113f 1834 202a 2a20 3418 3f11
4b0b 5806 6502 7200
@middle-icn
40e0 4000 0000 0000
@font
&num
0018 2442 4242 4242 4242 4242 4224 1800
0008 1828 0808 0808 0808 0808 0808 1c00
0018 2442 4202 0202 0408 1020 4040 7e00
0018 2442 0202 0438 0402 0202 0204 7800
000c 0c14 1414 2424 2444 447e 0404 0e00
007e 4040 4040 5864 4202 0202 0204 7800
000c 1020 4040 5864 4242 4242 4224 1800
007e 4202 0204 0404 0808 0810 1010 1000
0018 2442 4242 2418 2442 4242 4224 1800
0018 2442 4242 4242 261a 0202 0408 3000
&uc
0010 1028 2844 4444 8282 fe82 8282 0000
00f8 4442 4242 4478 4442 4242 44f8 0000
003c 4282 8280 8080 8080 8282 423c 0000
00f8 4442 4242 4242 4242 4242 44f8 0000
00fc 4240 4040 4878 4840 4040 42fc 0000
80fe 4240 4040 447c 4440 4040 40e0 0000
003a 4682 8080 8e82 8282 8282 463a 0000
00ee 4444 4444 447c 4444 4444 44ee 0000
0038 1010 1010 1010 1010 1010 1038 0000
000e 0404 0404 0404 0404 4444 2810 0000
00ee 4448 4850 5060 5050 4848 44ee 0000
00e0 4040 4040 4040 4040 4040 42fe 0000
0082 c6c6 c6aa aaaa 9292 9282 8282 0000
00e2 4262 6262 5252 4a4a 4646 42e2 0000
0038 4482 8282 8282 8282 8282 4438 0000
00f8 4442 4242 4244 7840 4040 40f0 0000
0038 4482 8282 8282 8282 829a 643a 0000
00f8 4442 4242 4478 4844 4442 42e2 0000
0010 2844 4440 2010 0804 4444 2810 0000
00fe 9210 1010 1010 1010 1010 1038 0000
00ee 4444 4444 4444 4444 4444 4438 0000
0082 8282 8282 8244 4444 2828 1010 0000
0082 8292 9292 9292 92ba aa44 4444 0000
0042 4242 2424 1818 1824 2442 4242 0000
0082 8282 4444 2828 1010 1010 1038 0000
007e 4204 0408 0810 1020 2040 427e 0000
&lc
0000 0000 0030 0808 3848 4848 4834 0000
0060 2020 202c 3222 2222 2222 322c 0000
0000 0000 001c 2240 4040 4040 221c 0000
000c 0404 0434 4c44 4444 4444 4c36 0000
0000 0000 0018 2424 3c20 2020 2418 0000
000c 1210 1038 1010 1010 1010 1038 0000
0000 0000 0034 4a48 4830 4038 4444 4438
00c0 4040 4058 6444 4444 4444 44ee 0000
0010 0000 0030 1010 1010 1010 1038 0000
0008 0000 0018 0808 0808 0808 0808 2810
0060 2020 2022 2224 2438 2424 2272 0000
0030 1010 1010 1010 1010 1010 1038 0000
0000 0000 00a4 da92 9292 9292 9292 0000
0000 0000 00d8 6444 4444 4444 44ee 0000
0000 0000 0038 4482 8282 8282 4438 0000
0000 0000 00d8 6442 4242 4242 6458 40e0
0000 0000 0034 4c84 8484 8484 4c34 040e
0000 0000 0068 3420 2020 2020 2070 0000
0000 0000 0018 2424 1008 0424 2418 0000
0010 1010 107c 1010 1010 1010 1408 0000
0000 0000 00cc 4444 4444 4444 4c36 0000
0000 0000 00ee 4444 4428 2828 1010 0000
0000 0000 0092 9292 9292 92aa 4444 0000
0000 0000 00ee 4428 1010 1028 44ee 0000
0000 0000 00ee 4444 4448 2828 1010 2040
0000 0000 007c 4408 0810 2020 447c 0000
&colon
0000 0000 0010 1000 0000 0000 1010 0000
&slash
0202 0404 0808 1010 2020 4040 8080 0000
&blank
0000 0000 0000 0000 0000 0000 0000 0000

View File

@ -276,22 +276,20 @@ JMP2r
(
@|spritesheet )
@cursor-icn
80c0 e0f0 f8e0 1000
@fill-icn
ffff ffff ffff ffff
@bead-icn
@cursor-icn [
80c0 e0f0 f8e0 1000 ]
@fill-icn [
ffff ffff ffff ffff ]
@bead-icn [
0000 0000 030f 3f7f 0000 0000 0003 0f3f 0018 3cff ffff ffff 0000 003c ffff ffff
0000 0000 c0f0 fcfe 0000 0000 00c0 f0fc 7f3f 0f03 0000 0000 3f0f 0300 0000 0000
ffff ffff ff3c 1800 ffff ffff 3c00 0000 fefc f0c0 0000 0000 fcf0 c000 0000 0000
( special )
0000 0000 030c 3040 0000 0000 0003 0f3f 1818 3cc3 0000 0000 0000 003c ffff ffff
0000 0000 c030 0c02 0000 0000 00c0 f0fc 4030 0c03 0000 0000 3f0f 0300 0000 0000
0000 0000 c33c 1818 ffff ffff 3c00 0000 020c 30c0 0000 0000 fcf0 c000 0000 0000
0000 0000 c33c 1818 ffff ffff 3c00 0000 020c 30c0 0000 0000 fcf0 c000 0000 0000 ]
@rod-icn
@rod-icn [
&top
ffff ffff ffff 0000 ffff ffff ff00 0000 ffff ffff ffff 3c18 ffff ffff ff3c 1800
ffff ffff ffff 0000 ffff ffff ff00 0000
@ -302,18 +300,18 @@ JMP2r
00ff ffff ffff ff00 0000 ffff ffff 0000
( marker )
00ff ffff ffff ff00 0000 ffff ffff 0000 3cff ffff ffff ff3c 183c ffe7 e7ff 3c18
00ff ffff ffff ff00 0000 ffff ffff 0000
00ff ffff ffff ff00 0000 ffff ffff 0000 ]
@frame-chr
@frame-chr [
ffff ffff ffff fcfc ffff ffff fffc f8f8 fcfc fcfc fcfc fcfc f8f8 f8f8 f8f8 f8f8
fcfc fcfc fcfc fcfc f8f8 f8f8 f8f8 f8f8 fcfc fcfc fcfc fcfc f8f8 f8f8 f8f8 f8f8
fcff ffff ffff fffc f8fc ffff ffff fcf8 fcfc fcfc fcfc fcfc f8f8 f8f8 f8f8 f8f8
fcfc fcfc fcfc fcfc f8f8 f8f8 f8f8 f8f8 fcfc fcfc fcfc fcfc f8f8 f8f8 f8f8 f8f8
fcfc fcfc fcfc fcfc f8f8 f8f8 f8f8 f8f8 fcfc fcfc fcfc fcfc f8f8 f8f8 f8f8 f8f8
fcfc fcfc fcfc fcfc f8f8 f8f8 f8f8 f8f8 fcfc fcfc fcfc fcfc f8f8 f8f8 f8f8 f8f8
fcfc fcfc fcfc fcfc f8f8 f8f8 f8f8 f8f8 fcfc ffff ffff ffff f8f8 fcff ffff ffff
fcfc fcfc fcfc fcfc f8f8 f8f8 f8f8 f8f8 fcfc ffff ffff ffff f8f8 fcff ffff ffff ]
@num-icn
@num-icn [
3c66 6e76 6666 3c00
1838 1818 1818 7e00
3c66 060c 1830 7e00
@ -323,9 +321,9 @@ JMP2r
3c60 607c 6666 3c00
7e06 0c18 3030 3000
3c66 663c 6666 3c00
3c66 663e 060c 3800
3c66 663e 060c 3800 ]
@appicon
@appicon [
0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000
0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000
0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 00ff 0000 0000 0000 00ff
@ -341,4 +339,5 @@ c782 c7ef c782 ffff 3e1c 0888 0808 ffff c0c0 c0c0 c0c0 c080 0000 0000 0000 0000
0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000
0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000
0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000
0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000
0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 ]