uxn

commit 72b0458745ba0ec9166886b5d45c3a4a0f2f822a
parent 2eb18b06a2babe1d1636b88d13975b12d66ad28f
Author: neauoire <aliceffekt@gmail.com>
Date:   Sat, 24 Apr 2021 10:26:09 -0700

Removed refresh port in datetime

Diffstat:
M
build.sh
 | 
2
+-
M
projects/demos/bifurcan.usm
 | 
4
+---
M
projects/examples/blank.usm
 | 
2
+-
M
projects/examples/devices/datetime.usm
 | 
4
+---
M
projects/examples/gui/wallpaper.usm
 | 
2
+-
M
projects/software/asma.usm
 | 
2
+-
M
projects/software/neralie.usm
 | 
3
+--
M
src/uxn.c
 | 
2
+-

8 files changed, 8 insertions(+), 13 deletions(-)
diff --git a/build.sh b/build.sh
@@ -32,7 +32,7 @@ else
 fi
 
 echo "Assembling.."
-./bin/assembler projects/examples/devices/screen.usm bin/boot.rom
+./bin/assembler projects/demos/bifurcan.usm bin/boot.rom
 
 echo "Running.."
 if [ "${2}" = '--cli' ]; 
diff --git a/projects/demos/bifurcan.usm b/projects/demos/bifurcan.usm
@@ -15,7 +15,7 @@
 |00 @System     [ &vector $2 &pad      $6 &r      $2 &g     $2 &b      $2 ]
 |20 @Screen     [ &vector $2 &width    $2 &height $2 &pad   $2 &x      $2 &y      $2 &addr $2 &color $1 ]
 |60 @Mouse      [ &vector $2 &x        $2 &y      $2 &state $1 &chord $1 ]
-|a0 @DateTime   [ &year   $2 &month    $1 &day    $1 &hour  $1 &minute $1 &second $1 &dotw $1 &doty $2 &isdst $1 &refresh $1 ]
+|a0 @DateTime   [ &year   $2 &month    $1 &day    $1 &hour  $1 &minute $1 &second $1 &dotw $1 &doty $2 &isdst $1 ]
 
 ( variables )
 
@@ -51,8 +51,6 @@
 BRK
 
 @on-frame ( -> )
-	
-	#00 .DateTime/refresh DEO
 
 	( only draw once per second )
 	.DateTime/second DEI .last PEK NEQ #01 JNZ [ BRK ]
diff --git a/projects/examples/blank.usm b/projects/examples/blank.usm
@@ -9,7 +9,7 @@
 |40 @Controller [ &vector $2 &button   $1 &key    $1 ]
 |60 @Mouse      [ &vector $2 &x        $2 &y      $2 &state $1 &chord $1 ]
 |70 @File       [ &vector $2 &success  $2 &offset $2 &pad   $2 &name  $2 &length $2 &load $2 &save $2 ]
-|a0 @DateTime   [ &year   $2 &month    $1 &day    $1 &hour $1 &minute $1 &second $1 &dotw $1 &doty $2 &isdst $1 &refresh $1 ]
+|a0 @DateTime   [ &year   $2 &month    $1 &day    $1 &hour $1 &minute $1 &second $1 &dotw $1 &doty $2 &isdst $1 ]
 
 ( variables )
 
diff --git a/projects/examples/devices/datetime.usm b/projects/examples/devices/datetime.usm
@@ -11,7 +11,7 @@
 
 |00 @System     [ &vector $2 &pad      $6 &r      $2 &g     $2 &b      $2 ]
 |20 @Screen     [ &vector $2 &width    $2 &height $2 &pad   $2 &x      $2 &y      $2 &addr $2 &color $1 ]
-|a0 @DateTime   [ &year   $2 &month    $1 &day    $1 &hour  $1 &minute $1 &second $1 &dotw $1 &doty $2 &isdst $1 &refresh $1 ]
+|a0 @DateTime   [ &year   $2 &month    $1 &day    $1 &hour  $1 &minute $1 &second $1 &dotw $1 &doty $2 &isdst $1 ]
 
 ( variables )
 
@@ -36,8 +36,6 @@
 BRK
 
 @on-frame
-	
-	#00 .DateTime/refresh DEO
 
 	( only draw once per second )
 	.DateTime/second DEI .current PEK NEQ #01 JNZ [ BRK ]
diff --git a/projects/examples/gui/wallpaper.usm b/projects/examples/gui/wallpaper.usm
@@ -7,7 +7,7 @@
 |40 @Controller [ &vector $2 &button $1 &key $1 ]
 |60 @Mouse [ &vector $2 &x $2 &y $2 &state $1 &chord $1 ]
 |70 @File [ &vector $2 &success $2 &offset $2 &pad $2 &name $2 &length $2 &load $2 &save $2 ]
-|a0 @DateTime [ &year $2 &month $1 &day $1 &hour $1 &minute $1 &second $1 &dotw $1 &doty $2 &isdst $1 &refresh $1 ]
+|a0 @DateTime [ &year $2 &month $1 &day $1 &hour $1 &minute $1 &second $1 &dotw $1 &doty $2 &isdst $1 ]
 
 ( variables )
 
diff --git a/projects/software/asma.usm b/projects/software/asma.usm
@@ -13,7 +13,7 @@
 |40 @Controller [ &vector $2 &button $1 &key $1 ]
 |60 @Mouse [ &vector $2 &x $2 &y $2 &state $1 &chord $1 ]
 |70 @File [ &vector $2 &success $2 &offset $2 &pad $2 &name $2 &length $2 &load $2 &save $2 ]
-|a0 @DateTime [ &year $2 &month $1 &day $1 &hour $1 &minute $1 &second $1 &dotw $1 &doty $2 &isdst $1 &refresh $1 ]
+|a0 @DateTime [ &year $2 &month $1 &day $1 &hour $1 &minute $1 &second $1 &dotw $1 &doty $2 &isdst $1 ]
 
 ( variables )
 
diff --git a/projects/software/neralie.usm b/projects/software/neralie.usm
@@ -14,7 +14,7 @@
 |00 @System [ &vector $2 &pad $6 &r $2 &g $2 &b $2 ]
 |10 @Console [ &vector $2 &pad $6 &char $1 &byte $1 &short $2 &string $2 ]
 |20 @Screen [ &vector $2 &width $2 &height $2 &pad $2 &x $2 &y $2 &addr $2 &color $1 ]
-|a0 @DateTime [ &year $2 &month $1 &day $1 &hour $1 &minute $1 &second $1 &dotw $1 &doty $2 &isdst $1 &refresh $1 ]
+|a0 @DateTime [ &year $2 &month $1 &day $1 &hour $1 &minute $1 &second $1 &dotw $1 &doty $2 &isdst $1 ]
 
 ( variables )
 
@@ -194,7 +194,6 @@
 	,&loop JMP
 
 @update-fps ( -- )
-	#00 .DateTime/refresh DEO
 	.fps/next PEK #01 ADD .fps/next POK
 	s .fps/second PEK NEQ JMP JMP2r
 	s .fps/second POK
diff --git a/src/uxn.c b/src/uxn.c
@@ -22,7 +22,7 @@ Uint8  peek8(Stack *s, Uint8 a) { if (s->ptr < a + 1) s->error = 1; return s->da
 void   mempoke8(Uint8 *m, Uint16 a, Uint8 b) { m[a] = b; }
 Uint8  mempeek8(Uint8 *m, Uint16 a) { return m[a]; }
 void   devpoke8(Device *d, Uint8 a, Uint8 b) { d->dat[a & 0xf] = b; d->talk(d, a & 0x0f, 1); }
-Uint8  devpeek8(Device *d, Uint8 a) { return d->dat[a & 0xf]; d->talk(d, a & 0x0f, 0); }
+Uint8  devpeek8(Device *d, Uint8 a) { d->talk(d, a & 0x0f, 0); return d->dat[a & 0xf];  }
 void   push16(Stack *s, Uint16 a) { push8(s, a >> 8); push8(s, a); }
 Uint16 pop16(Stack *s) { return pop8(s) + (pop8(s) << 8); }
 Uint16 peek16(Stack *s, Uint8 a) { return peek8(s, a * 2) + (peek8(s, a * 2 + 1) << 8); }