Add datetime and control methods

2 files changed, 92 insertions, 18 deletions

diff --git a/src/main.c b/src/main.c
index e91a2f2..5edf71c 100644
--- a/src/main.c
+++ b/src/main.c
@@ -1,4 +1,5 @@
 #include <string.h>
+#include <time.h>
 
 #include "common.h"
 #include "bitmap.h"
@@ -23,11 +24,11 @@ THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
 WITH REGARD TO THIS SOFTWARE.
 */
 
-static size_t drawing_cycles = 0;
-
 static Ppu ppu;
 u8 reqdraw = 0;
 static Device *devscreen;
+static Device *devctrl;
+time_t time_seconds;
 
 void
 nil_talk(Device *d, Uint8 b0, Uint8 w) {
@@ -50,21 +51,18 @@ console_talk(Device *d, u8 b0, u8 w) {
 }
 
 void
-system_talk(Device *d, Uint8 b0, Uint8 w)
-{
+system_talk(Device *d, Uint8 b0, Uint8 w) {
     if(!w) {
         d->dat[0x2] = d->u->wst.ptr;
         d->dat[0x3] = d->u->rst.ptr;
     } else {
         putcolors(&ppu, &d->dat[0x8]);
-        reqdraw = 1;
     }
     (void)b0;
 }
 
 void
 screen_talk(Device *d, Uint8 b0, Uint8 w) {
-    // profile_start();
     if(w && b0 == 0xe) {
         Uint16 x = mempeek16(d->dat, 0x8);
         Uint16 y = mempeek16(d->dat, 0xa);
@@ -80,8 +78,23 @@ screen_talk(Device *d, Uint8 b0, Uint8 w) {
         }
         reqdraw = 1;
     }
-    // int cycles = profile_stop();
-    // drawing_cycles += cycles;
+}
+
+void
+datetime_talk(Device *d, Uint8 b0, Uint8 w) {
+        struct tm *t = localtime(&time_seconds);
+        t->tm_year += 1900;
+        mempoke16(d->dat, 0x0, t->tm_year);
+        d->dat[0x2] = t->tm_mon;
+        d->dat[0x3] = t->tm_mday;
+        d->dat[0x4] = t->tm_hour;
+        d->dat[0x5] = t->tm_min;
+        d->dat[0x6] = t->tm_sec;
+        d->dat[0x7] = t->tm_wday;
+        mempoke16(d->dat, 0x08, t->tm_yday);
+        d->dat[0xa] = t->tm_isdst;
+        (void)b0;
+        (void)w;
 }
 
 void
@@ -89,6 +102,9 @@ init_uxn(Uxn *u) {
     // Initialize PPU.
     initppu(&ppu, 30, 20, 0);
 
+    // Init clock.
+    time_seconds = time(NULL);
+
     // Copy rom to VM.
     memcpy(u->ram.dat + PAGE_PROGRAM, uxn_rom, sizeof(uxn_rom));
 
@@ -101,10 +117,10 @@ init_uxn(Uxn *u) {
     portuxn(u, 0x5, "---", nil_talk);
     portuxn(u, 0x6, "---", nil_talk);
     portuxn(u, 0x7, "---", nil_talk);
-    portuxn(u, 0x8, "---", nil_talk);
+        devctrl = portuxn(u, 0x8, "controller", nil_talk);
     portuxn(u, 0x9, "---", nil_talk);
     portuxn(u, 0xa, "---", nil_talk);
-    portuxn(u, 0xb, "---", nil_talk);
+        portuxn(u, 0xb, "datetime", datetime_talk);
     portuxn(u, 0xc, "---", nil_talk);
     portuxn(u, 0xd, "---", nil_talk);
     portuxn(u, 0xe, "---", nil_talk);
@@ -113,6 +129,58 @@ init_uxn(Uxn *u) {
     mempoke16(devscreen->dat, 4, ppu.ver * 8);
 }
 
+void
+handle_input(Uxn *u) {
+    poll_keys();
+
+        // TODO: We don't need ifs if we use KEY_INPUTS directly and mayvbe just
+        // swap some things if needed.
+        Uint8 *flag = &devctrl->dat[2];
+        if (key_pressed(KEY_A) | key_hold(KEY_A)) {
+            *flag |= 0x01;
+        } else {
+            *flag &= ~0x01;
+    }
+        if (key_pressed(KEY_B) | key_hold(KEY_B)) {
+            *flag |= 0x02;
+        } else {
+            *flag &= ~0x02;
+    }
+        if (key_pressed(KEY_L) | key_hold(KEY_L)) {
+            *flag |= 0x04;
+        } else {
+            *flag &= ~0x04;
+    }
+        if (key_pressed(KEY_R) | key_hold(KEY_R)) {
+            *flag |= 0x08;
+        } else {
+            *flag &= ~0x08;
+    }
+        if (key_pressed(KEY_UP) | key_hold(KEY_UP)) {
+            *flag |= 0x10;
+        } else {
+            *flag &= ~0x10;
+    }
+        if (key_pressed(KEY_DOWN) | key_hold(KEY_DOWN)) {
+            *flag |= 0x20;
+        } else {
+            *flag &= ~0x20;
+    }
+        if (key_pressed(KEY_LEFT) | key_hold(KEY_LEFT)) {
+            *flag |= 0x40;
+        } else {
+            *flag &= ~0x40;
+    }
+        if (key_pressed(KEY_RIGHT) | key_hold(KEY_RIGHT)) {
+            *flag |= 0x80;
+        } else {
+            *flag &= ~0x80;
+    }
+
+    evaluxn(u, mempeek16(devctrl->dat, 0));
+    devctrl->dat[3] = 0;
+}
+
 int main(void) {
     // Register interrupts.
     irq_init();
@@ -131,21 +199,20 @@ int main(void) {
                 .char_height = 8,
                 .char_width = 8,
             }, &ppu.fg);
+    txt_position(0,0);
 
     // Main loop.
     int frame_counter = 0;
     evaluxn(&u, 0x0100);
+    // flipbuf(&ppu);
     while(true) {
         bios_vblank_wait();
-        poll_keys();
-        profile_start();
+        handle_input(&u);
         evaluxn(&u, mempeek16(devscreen->dat, 0));
         flipbuf(&ppu);
-        int eval_cycles = profile_stop();
         // txt_position(0,0);
-        // txt_printf("FRAME: %d              \n", frame_counter);
-        // txt_printf("EVAL:  %d              \n", eval_cycles);
-        drawing_cycles = 0;
+        // txt_printf("FRAME: %d\n", frame_counter);
+        time_seconds++;
         frame_counter++;
     }
 
diff --git a/src/uxn/devices/ppu.c b/src/uxn/devices/ppu.c
index d70afdd..e9a94a6 100644
--- a/src/uxn/devices/ppu.c
+++ b/src/uxn/devices/ppu.c
@@ -163,6 +163,9 @@ putcolors(Ppu *p, Uint8 *addr) {
 
 void
 putpixel(Ppu *p, Uint32 *layer, Uint16 x, Uint16 y, Uint8 color) {
+    if(x >= 30 * 8 || y >= 20 * 8) {
+        return;
+    }
     size_t tile_x = x / 8;
     size_t tile_y = y / 8;
     size_t start_col = x % 8;
@@ -176,6 +179,9 @@ putpixel(Ppu *p, Uint32 *layer, Uint16 x, Uint16 y, Uint8 color) {
 void
 puticn(Ppu *p, Uint32 *layer, Uint16 x, Uint16 y, Uint8 *sprite, Uint8 color,
         Uint8 flipx, Uint8 flipy) {
+    if(x >= 30 * 8 || y >= 20 * 8) {
+        return;
+    }
     size_t tile_x = x / 8;
     size_t tile_y = y / 8;
     size_t start_col = x % 8;
@@ -227,6 +233,9 @@ puticn(Ppu *p, Uint32 *layer, Uint16 x, Uint16 y, Uint8 *sprite, Uint8 color,
 void
 putchr(Ppu *p, Uint32 *layer, Uint16 x, Uint16 y, Uint8 *sprite, Uint8 color,
         Uint8 flipx, Uint8 flipy) {
+    if(x >= 30 * 8 || y >= 20 * 8) {
+        return;
+    }
     Uint16 v, h;
     for(v = 0; v < 8; v++)
         for(h = 0; h < 8; h++) {
@@ -284,8 +293,6 @@ initppu(Ppu *p, Uint8 hor, Uint8 ver, Uint8 pad) {
     backbuffer_bg1 = malloc(30 * 20 * sizeof(Tile));
 
     // Clear tile memory.
-    p->fg = &TILE_MEM[cb_fg];
-    p->bg = &TILE_MEM[cb_bg];
     p->fg = backbuffer_bg0;
     p->bg = backbuffer_bg1;
     for (size_t i = 0; i < 30 * 20 * 8; ++i) {