aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/cpu/irq.c9
-rw-r--r--src/drivers/uart.c2
-rw-r--r--src/graphics/font.binbin0 -> 2048 bytes
-rw-r--r--src/graphics/font.h.bin178
-rw-r--r--src/graphics/font.psfbin2080 -> 0 bytes
-rw-r--r--src/graphics/font.sfnbin8283 -> 0 bytes
-rw-r--r--src/graphics/glyphs.h1301
-rw-r--r--src/graphics/glyphs.old1301
-rw-r--r--src/graphics/lfb.c29
-rw-r--r--src/sys/core.c29
-rw-r--r--src/sys/timer.c21
-rw-r--r--src/util/time.c2
12 files changed, 1529 insertions, 1343 deletions
diff --git a/src/cpu/irq.c b/src/cpu/irq.c
index 1329534..f2b326e 100644
--- a/src/cpu/irq.c
+++ b/src/cpu/irq.c
@@ -12,7 +12,6 @@ extern void disable_irq(void);
extern void enable_irq(void);
void c_irq_handler(void) {
- //disable_irq();
disableirq();
unsigned long source = load32(CORE0_IRQ_SOURCE);
if (source & (1 << 8)) {
@@ -26,7 +25,7 @@ void c_irq_handler(void) {
unsigned int x = g_Drawer.x;
unsigned int y = g_Drawer.y;
g_Drawer.x = 0;
- g_Drawer.y = 7;
+ g_Drawer.y = 5;
write_string(&g_Drawer, "TIMER: ");
if(timer_status == 0) {
cntfrq = read_cntfrq();
@@ -83,21 +82,19 @@ void c_irq_handler(void) {
cmdidx = off;
}
g_Drawer.x = 0;
- g_Drawer.y = 8;
+ g_Drawer.y = 7;
for(int i = 0; i < 128; i++)
write_char(&g_Drawer, ' ');
g_Drawer.x = 0;
- g_Drawer.y = 8;
+ g_Drawer.y = 7;
write_string(&g_Drawer, "> ");
write_string(&g_Drawer, cmd);
- //enable_irq();
enableirq();
return;
}
}
} else if (source & (1 << 3)) {
c_timer();
- //enable_irq();
enableirq();
return;
}
diff --git a/src/drivers/uart.c b/src/drivers/uart.c
index bc67ca4..64bd73a 100644
--- a/src/drivers/uart.c
+++ b/src/drivers/uart.c
@@ -1,4 +1,4 @@
-#include "uart.h"
+#include "../drivers/uart.h"
void uart_hexn(unsigned long c_val) {
uart_hex(c_val);
diff --git a/src/graphics/font.bin b/src/graphics/font.bin
new file mode 100644
index 0000000..0a859d0
--- /dev/null
+++ b/src/graphics/font.bin
Binary files differ
diff --git a/src/graphics/font.h.bin b/src/graphics/font.h.bin
new file mode 100644
index 0000000..f883cda
--- /dev/null
+++ b/src/graphics/font.h.bin
@@ -0,0 +1,178 @@
+enum {
+ GLYPH_X = 8,
+ GLYPH_Y = 16,
+};
+unsigned char glyphs[] = {
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x00, 0x08, 0x08,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x14, 0x14, 0x14, 0x14, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x48, 0x48,
+ 0x68, 0xfe, 0x24, 0x24, 0x7f, 0x14, 0x12, 0x12, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x10, 0x7c, 0x92, 0x12, 0x1c, 0x70, 0x90, 0x92, 0x7c,
+ 0x10, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x06, 0x09, 0x09, 0x46, 0x38,
+ 0x66, 0x90, 0x90, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x38,
+ 0x04, 0x04, 0x0c, 0x92, 0xb2, 0xa2, 0x46, 0xbc, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x08, 0x08, 0x08, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x30, 0x10, 0x10, 0x08, 0x08, 0x08, 0x08,
+ 0x08, 0x08, 0x10, 0x10, 0x20, 0x00, 0x00, 0x00, 0x00, 0x0c, 0x08, 0x08,
+ 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x08, 0x08, 0x0c, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x10, 0x92, 0x7c, 0x38, 0xd6, 0x10, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x08, 0x08, 0x7f,
+ 0x08, 0x08, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x18, 0x08, 0x04, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1c, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x18, 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40,
+ 0x20, 0x20, 0x10, 0x10, 0x18, 0x08, 0x08, 0x04, 0x04, 0x02, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x38, 0x44, 0x82, 0x82, 0x92, 0x82, 0x82, 0x44, 0x38,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1c, 0x10, 0x10, 0x10, 0x10,
+ 0x10, 0x10, 0x10, 0x7c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7c,
+ 0xc2, 0x80, 0x80, 0x40, 0x30, 0x18, 0x04, 0xfe, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x7c, 0x82, 0x80, 0xc0, 0x38, 0xc0, 0x80, 0xc2, 0x7c,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x50, 0x58, 0x48, 0x44,
+ 0x42, 0xfe, 0x40, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7e,
+ 0x02, 0x02, 0x3e, 0xc0, 0x80, 0x80, 0xc2, 0x3c, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x78, 0x84, 0x02, 0x7a, 0xc6, 0x82, 0x82, 0xc4, 0x78,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xfe, 0x40, 0x40, 0x20, 0x20,
+ 0x10, 0x18, 0x08, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7c,
+ 0x82, 0x82, 0x82, 0x7c, 0x82, 0x82, 0x86, 0x7c, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x3c, 0x46, 0x82, 0x82, 0xc6, 0xbc, 0x80, 0x42, 0x3c,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x18, 0x00,
+ 0x00, 0x00, 0x18, 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x18, 0x18, 0x00, 0x00, 0x00, 0x18, 0x18, 0x08, 0x04, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x70, 0x0e, 0x0e, 0x70, 0x80, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xfe, 0x00,
+ 0x00, 0xfe, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x02, 0x1c, 0xe0, 0xe0, 0x1c, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x1c, 0x22, 0x20, 0x10, 0x08, 0x08, 0x00, 0x08, 0x08,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x78, 0xcc, 0x84, 0xe2, 0x92,
+ 0x92, 0x92, 0xe2, 0x04, 0x0c, 0x78, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10,
+ 0x28, 0x28, 0x28, 0x44, 0x44, 0x7c, 0xc6, 0x82, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x7e, 0x82, 0x82, 0x82, 0x7e, 0x82, 0x82, 0x82, 0x7e,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x78, 0x84, 0x02, 0x02, 0x02,
+ 0x02, 0x02, 0x84, 0x78, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3e,
+ 0x42, 0x82, 0x82, 0x82, 0x82, 0x82, 0x42, 0x3e, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0xfe, 0x02, 0x02, 0x02, 0xfe, 0x02, 0x02, 0x02, 0xfe,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xfe, 0x02, 0x02, 0x02, 0xfe,
+ 0x02, 0x02, 0x02, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x78,
+ 0x84, 0x02, 0x02, 0xc2, 0x82, 0x82, 0x84, 0x78, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x82, 0x82, 0x82, 0x82, 0xfe, 0x82, 0x82, 0x82, 0x82,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3e, 0x08, 0x08, 0x08, 0x08,
+ 0x08, 0x08, 0x08, 0x3e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x38,
+ 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x22, 0x1c, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x42, 0x22, 0x12, 0x0a, 0x0e, 0x12, 0x22, 0x22, 0x42,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x02, 0x02, 0x02, 0x02,
+ 0x02, 0x02, 0x02, 0xfe, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc6,
+ 0xc6, 0xaa, 0xaa, 0xaa, 0x92, 0x82, 0x82, 0x82, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x86, 0x86, 0x8a, 0x8a, 0x92, 0xa2, 0xa2, 0xc2, 0xc2,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x38, 0x44, 0x82, 0x82, 0x82,
+ 0x82, 0x82, 0x44, 0x38, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7e,
+ 0xc2, 0x82, 0x82, 0xc2, 0x7e, 0x02, 0x02, 0x02, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x38, 0x44, 0x82, 0x82, 0x82, 0x82, 0x82, 0x44, 0x78,
+ 0x60, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7e, 0xc2, 0x82, 0x82, 0x7e,
+ 0x42, 0x82, 0x82, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7c,
+ 0x86, 0x02, 0x06, 0x7c, 0xc0, 0x80, 0xc2, 0x7d, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x7f, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x82, 0x82, 0x82, 0x82, 0x82,
+ 0x82, 0x82, 0x82, 0x7c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x82,
+ 0xc6, 0x44, 0x44, 0x44, 0x28, 0x28, 0x28, 0x10, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x81, 0x81, 0x81, 0x5a, 0x5a, 0x5a, 0x66, 0x66, 0x66,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc6, 0x44, 0x28, 0x38, 0x10,
+ 0x28, 0x6c, 0x44, 0x82, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x41,
+ 0x22, 0x14, 0x14, 0x08, 0x08, 0x08, 0x08, 0x08, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0xfe, 0xc0, 0x60, 0x20, 0x10, 0x08, 0x0c, 0x06, 0xfe,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x38, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08,
+ 0x08, 0x08, 0x08, 0x08, 0x38, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02,
+ 0x04, 0x04, 0x08, 0x08, 0x18, 0x10, 0x10, 0x20, 0x20, 0x40, 0x00, 0x00,
+ 0x00, 0x1c, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10,
+ 0x1c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x14, 0x22, 0x63, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7f, 0x00,
+ 0x00, 0x00, 0x08, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x38, 0x44, 0x40,
+ 0x7c, 0x42, 0x62, 0x5c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x02, 0x02,
+ 0x02, 0x3e, 0x66, 0x42, 0x42, 0x42, 0x66, 0x3e, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x38, 0x44, 0x02, 0x02, 0x02, 0x44, 0x38,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x40, 0x40, 0x40, 0x7c, 0x66, 0x42,
+ 0x42, 0x42, 0x66, 0x7c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x3c, 0x66, 0x42, 0x7e, 0x02, 0x46, 0x3c, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x30, 0x08, 0x08, 0x08, 0x3e, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7c, 0x66, 0x42,
+ 0x42, 0x42, 0x66, 0x5c, 0x40, 0x44, 0x38, 0x00, 0x00, 0x02, 0x02, 0x02,
+ 0x02, 0x3a, 0x46, 0x42, 0x42, 0x42, 0x42, 0x42, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x08, 0x00, 0x00, 0x00, 0x0e, 0x08, 0x08, 0x08, 0x08, 0x08, 0x3e,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x1c, 0x10, 0x10,
+ 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x0e, 0x00, 0x00, 0x02, 0x02, 0x02,
+ 0x02, 0x22, 0x12, 0x0a, 0x0e, 0x12, 0x22, 0x42, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x0e, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x70,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xfe, 0x92, 0x92,
+ 0x92, 0x92, 0x92, 0x92, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x3a, 0x46, 0x42, 0x42, 0x42, 0x42, 0x42, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x3c, 0x66, 0x42, 0x42, 0x42, 0x66, 0x3c,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3e, 0x66, 0x42,
+ 0x42, 0x42, 0x66, 0x3e, 0x02, 0x02, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x7c, 0x66, 0x42, 0x42, 0x42, 0x66, 0x5c, 0x40, 0x40, 0x40, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x3c, 0x4c, 0x04, 0x04, 0x04, 0x04, 0x04,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3c, 0x42, 0x02,
+ 0x3c, 0x40, 0x42, 0x3c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08,
+ 0x08, 0x7e, 0x08, 0x08, 0x08, 0x08, 0x08, 0x70, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x42, 0x42, 0x42, 0x42, 0x42, 0x62, 0x5c,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x42, 0x66, 0x24,
+ 0x24, 0x3c, 0x18, 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x81, 0x81, 0x5a, 0x5a, 0x5a, 0x24, 0x24, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x66, 0x24, 0x18, 0x18, 0x18, 0x24, 0x66,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x42, 0x44, 0x24,
+ 0x24, 0x28, 0x18, 0x10, 0x10, 0x08, 0x0c, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x7e, 0x40, 0x20, 0x18, 0x04, 0x02, 0x7e, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x38, 0x08, 0x08, 0x08, 0x08, 0x06, 0x08, 0x08, 0x08, 0x08, 0x08,
+ 0x30, 0x00, 0x00, 0x00, 0x00, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08,
+ 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x00, 0x00, 0x00, 0x0e, 0x08, 0x08,
+ 0x08, 0x08, 0x30, 0x08, 0x08, 0x08, 0x08, 0x08, 0x06, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x9c, 0x62, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+ 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff
+};
+unsigned int src_graphics_font_bin_len = 2048;
diff --git a/src/graphics/font.psf b/src/graphics/font.psf
deleted file mode 100644
index 3e67693..0000000
--- a/src/graphics/font.psf
+++ /dev/null
Binary files differ
diff --git a/src/graphics/font.sfn b/src/graphics/font.sfn
deleted file mode 100644
index 50a7633..0000000
--- a/src/graphics/font.sfn
+++ /dev/null
Binary files differ
diff --git a/src/graphics/glyphs.h b/src/graphics/glyphs.h
index 6fc8452..668508e 100644
--- a/src/graphics/glyphs.h
+++ b/src/graphics/glyphs.h
@@ -1,1304 +1,7 @@
#ifndef GRAPHICS_GLYPHS_H
#define GRAPHICS_GLYPHS_H
-const char glyphs[] = {
- 0b10000001,
- 0b00111000,
- 0b01000100,
- 0b00001000,
- 0b00010000,
- 0b00000000,
- 0b00010000,
- 0b10000001,
-
- 0b10000001,
- 0b00111000,
- 0b01000100,
- 0b00001000,
- 0b00010000,
- 0b00000000,
- 0b00010000,
- 0b10000001,
-
- 0b10000001,
- 0b00111000,
- 0b01000100,
- 0b00001000,
- 0b00010000,
- 0b00000000,
- 0b00010000,
- 0b10000001,
-
- 0b10000001,
- 0b00111000,
- 0b01000100,
- 0b00001000,
- 0b00010000,
- 0b00000000,
- 0b00010000,
- 0b10000001,
-
- 0b10000001,
- 0b00111000,
- 0b01000100,
- 0b00001000,
- 0b00010000,
- 0b00000000,
- 0b00010000,
- 0b10000001,
-
- 0b10000001,
- 0b00111000,
- 0b01000100,
- 0b00001000,
- 0b00010000,
- 0b00000000,
- 0b00010000,
- 0b10000001,
-
- 0b10000001,
- 0b00111000,
- 0b01000100,
- 0b00001000,
- 0b00010000,
- 0b00000000,
- 0b00010000,
- 0b10000001,
-
- 0b10000001,
- 0b00111000,
- 0b01000100,
- 0b00001000,
- 0b00010000,
- 0b00000000,
- 0b00010000,
- 0b10000001,
-
- 0b10000001,
- 0b00111000,
- 0b01000100,
- 0b00001000,
- 0b00010000,
- 0b00000000,
- 0b00010000,
- 0b10000001,
-
- 0b10000001,
- 0b00111000,
- 0b01000100,
- 0b00001000,
- 0b00010000,
- 0b00000000,
- 0b00010000,
- 0b10000001,
-
- 0b10000001,
- 0b00111000,
- 0b01000100,
- 0b00001000,
- 0b00010000,
- 0b00000000,
- 0b00010000,
- 0b10000001,
-
- 0b10000001,
- 0b00111000,
- 0b01000100,
- 0b00001000,
- 0b00010000,
- 0b00000000,
- 0b00010000,
- 0b10000001,
-
- 0b10000001,
- 0b00111000,
- 0b01000100,
- 0b00001000,
- 0b00010000,
- 0b00000000,
- 0b00010000,
- 0b10000001,
-
- 0b10000001,
- 0b00111000,
- 0b01000100,
- 0b00001000,
- 0b00010000,
- 0b00000000,
- 0b00010000,
- 0b10000001,
-
- 0b10000001,
- 0b00111000,
- 0b01000100,
- 0b00001000,
- 0b00010000,
- 0b00000000,
- 0b00010000,
- 0b10000001,
-
- 0b10000001,
- 0b00111000,
- 0b01000100,
- 0b00001000,
- 0b00010000,
- 0b00000000,
- 0b00010000,
- 0b10000001,
- 0b10000001,
-
- 0b00111000,
- 0b01000100,
- 0b00001000,
- 0b00010000,
- 0b00000000,
- 0b00010000,
- 0b10000001,
-
- 0b10000001,
- 0b00111000,
- 0b01000100,
- 0b00001000,
- 0b00010000,
- 0b00000000,
- 0b00010000,
- 0b10000001,
-
- 0b10000001,
- 0b00111000,
- 0b01000100,
- 0b00001000,
- 0b00010000,
- 0b00000000,
- 0b00010000,
- 0b10000001,
-
- 0b10000001,
- 0b00111000,
- 0b01000100,
- 0b00001000,
- 0b00010000,
- 0b00000000,
- 0b00010000,
- 0b10000001,
-
- 0b10000001,
- 0b00111000,
- 0b01000100,
- 0b00001000,
- 0b00010000,
- 0b00000000,
- 0b00010000,
- 0b10000001,
-
- 0b10000001,
- 0b00111000,
- 0b01000100,
- 0b00001000,
- 0b00010000,
- 0b00000000,
- 0b00010000,
- 0b10000001,
-
- 0b10000001,
- 0b00111000,
- 0b01000100,
- 0b00001000,
- 0b00010000,
- 0b00000000,
- 0b00010000,
- 0b10000001,
-
- 0b10000001,
- 0b00111000,
- 0b01000100,
- 0b00001000,
- 0b00010000,
- 0b00000000,
- 0b00010000,
- 0b10000001,
-
- 0b10000001,
- 0b00111000,
- 0b01000100,
- 0b00001000,
- 0b00010000,
- 0b00000000,
- 0b00010000,
- 0b10000001,
-
- 0b10000001,
- 0b00111000,
- 0b01000100,
- 0b00001000,
- 0b00010000,
- 0b00000000,
- 0b00010000,
- 0b10000001,
-
- 0b10000001,
- 0b00111000,
- 0b01000100,
- 0b00001000,
- 0b00010000,
- 0b00000000,
- 0b00010000,
- 0b10000001,
-
- 0b10000001,
- 0b00111000,
- 0b01000100,
- 0b00001000,
- 0b00010000,
- 0b00000000,
- 0b00010000,
- 0b10000001,
-
- 0b10000001,
- 0b00111000,
- 0b01000100,
- 0b00001000,
- 0b00010000,
- 0b00000000,
- 0b00010000,
- 0b10000001,
-
- 0b10000001,
- 0b00111000,
- 0b01000100,
- 0b00001000,
- 0b00010000,
- 0b00000000,
- 0b00010000,
- 0b10000001,
-
- 0b10000001,
- 0b00111000,
- 0b01000100,
- 0b00001000,
- 0b00010000,
- 0b00000000,
- 0b00010000,
- 0b10000001,
-
- 0b10000001,
- 0b00111000,
- 0b01000100,
- 0b00001000,
- 0b00010000,
- 0b00000000,
- 0b00010000,
- 0b10000001,
-
- 0b00000000,
- 0b00000000,
- 0b00000000,
- 0b00000000,
- 0b00000000,
- 0b00000000,
- 0b00000000,
- 0b00000000,
-
- 0b00000000,
- 0b00010000,
- 0b00010000,
- 0b00010000,
- 0b00010000,
- 0b00000000,
- 0b00010000,
- 0b00000000,
-
- 0b00000000,
- 0b00101000,
- 0b00101000,
- 0b00000000,
- 0b00000000,
- 0b00000000,
- 0b00000000,
- 0b00000000,
-
- 0b00000000,
- 0b00010010,
- 0b01111110,
- 0b00100100,
- 0b01111110,
- 0b01001000,
- 0b01001000,
- 0b00000000,
-
- 0b00010000,
- 0b01111100,
- 0b10010000,
- 0b01111100,
- 0b00010010,
- 0b01111100,
- 0b00010000,
- 0b00000000,
-
- 0b00000000,
- 0b01100010,
- 0b01100100,
- 0b00001000,
- 0b00010000,
- 0b00100110,
- 0b01000110,
- 0b00000000,
-
- 0b00000000,
- 0b00111000,
- 0b01000100,
- 0b00111000,
- 0b01010100,
- 0b01001000,
- 0b00110100,
- 0b00000000,
-
- 0b00000000,
- 0b00010000,
- 0b00010000,
- 0b00000000,
- 0b00000000,
- 0b00000000,
- 0b00000000,
- 0b00000000,
-
- 0b00000000,
- 0b00010000,
- 0b00100000,
- 0b00100000,
- 0b00100000,
- 0b00100000,
- 0b00010000,
- 0b00000000,
-
- 0b00000000,
- 0b00010000,
- 0b00001000,
- 0b00001000,
- 0b00001000,
- 0b00001000,
- 0b00010000,
- 0b00000000,
-
- 0b00000000,
- 0b00101000,
- 0b00010000,
- 0b00101000,
- 0b00000000,
- 0b00000000,
- 0b00000000,
- 0b00000000,
-
- 0b00000000,
- 0b00000000,
- 0b00010000,
- 0b00111000,
- 0b00010000,
- 0b00000000,
- 0b00000000,
- 0b00000000,
-
- 0b00000000,
- 0b00000000,
- 0b00000000,
- 0b00000000,
- 0b00000000,
- 0b00000000,
- 0b00010000,
- 0b00100000,
-
- 0b00000000,
- 0b00000000,
- 0b00000000,
- 0b00111100,
- 0b00000000,
- 0b00000000,
- 0b00000000,
- 0b00000000,
-
- 0b00000000,
- 0b00000000,
- 0b00000000,
- 0b00000000,
- 0b00000000,
- 0b00000000,
- 0b00010000,
- 0b00000000,
-
- 0b00000000,
- 0b00000010,
- 0b00000100,
- 0b00001000,
- 0b00010000,
- 0b00100000,
- 0b01000000,
- 0b00000000,
-
- 0b00000000,
- 0b00111100,
- 0b01000110,
- 0b01001010,
- 0b01010010,
- 0b01100010,
- 0b00111100,
- 0b00000000,
-
- 0b00000000,
- 0b00010000,
- 0b00110000,
- 0b00010000,
- 0b00010000,
- 0b00010000,
- 0b01111100,
- 0b00000000,
-
- 0b00000000,
- 0b00111100,
- 0b00000010,
- 0b00111100,
- 0b01000000,
- 0b01000000,
- 0b00111100,
- 0b00000000,
-
- 0b00000000,
- 0b00111110,
- 0b00000010,
- 0b00011110,
- 0b00000010,
- 0b00000010,
- 0b00111110,
- 0b00000000,
-
- 0b00000000,
- 0b01000010,
- 0b01000010,
- 0b00111110,
- 0b00000010,
- 0b00000010,
- 0b00000010,
- 0b00000000,
-
- 0b00000000,
- 0b00111100,
- 0b01000000,
- 0b00111100,
- 0b00000010,
- 0b00000010,
- 0b00111100,
- 0b00000000,
-
- 0b00000000,
- 0b00111100,
- 0b01000000,
- 0b01111100,
- 0b01000010,
- 0b01000010,
- 0b00111100,
- 0b00000000,
-
- 0b00000000,
- 0b00111110,
- 0b00000010,
- 0b00000100,
- 0b00001000,
- 0b00010000,
- 0b00100000,
- 0b00000000,
-
- 0b00000000,
- 0b00111100,
- 0b01000010,
- 0b00111100,
- 0b01000010,
- 0b01000010,
- 0b00111100,
- 0b00000000,
-
- 0b00000000,
- 0b00111100,
- 0b01000010,
- 0b00111110,
- 0b00000010,
- 0b00000010,
- 0b00111100,
- 0b00000000,
-
- 0b00000000,
- 0b00000000,
- 0b00010000,
- 0b00000000,
- 0b00010000,
- 0b00000000,
- 0b00000000,
- 0b00000000,
-
- 0b00000000,
- 0b00000000,
- 0b00001000,
- 0b00000000,
- 0b00001000,
- 0b00010000,
- 0b00000000,
- 0b00000000,
-
- 0b00000000,
- 0b00000000,
- 0b00000100,
- 0b00001000,
- 0b00010000,
- 0b00001000,
- 0b00000100,
- 0b00000000,
- 0b00000000,
- 0b00000000,
- 0b00111100,
- 0b00000000,
- 0b00111100,
- 0b00000000,
- 0b00000000,
- 0b00000000,
-
-
- 0b00000000,
- 0b00000000,
- 0b00100000,
- 0b00010000,
- 0b00001000,
- 0b00010000,
- 0b00100000,
- 0b00000000,
-
- 0b00000000,
- 0b00111000,
- 0b01000100,
- 0b00001000,
- 0b00010000,
- 0b00000000,
- 0b00010000,
- 0b00000000,
-
- 0b00000000,
- 0b00111000,
- 0b01000100,
- 0b01000100,
- 0b01011000,
- 0b01000100,
- 0b00111000,
- 0b00000000,
-
- 0b00000000,
- 0b00011000,
- 0b00100100,
- 0b01000010,
- 0b01111110,
- 0b01000010,
- 0b01000010,
- 0b00000000,
-
- 0b00000000,
- 0b01111100,
- 0b01000010,
- 0b01111100,
- 0b01000010,
- 0b01000010,
- 0b01111100,
- 0b00000000,
-
- 0b00000000,
- 0b00111110,
- 0b01000000,
- 0b01000000,
- 0b01000000,
- 0b01000000,
- 0b00111110,
- 0b00000000,
-
- 0b00000000,
- 0b01111100,
- 0b01000010,
- 0b01000010,
- 0b01000010,
- 0b01000010,
- 0b01111100,
- 0b00000000,
-
- 0b00000000,
- 0b01111110,
- 0b01000000,
- 0b01000000,
- 0b01111000,
- 0b01000000,
- 0b01111110,
- 0b00000000,
-
- 0b00000000,
- 0b01111110,
- 0b01000000,
- 0b01111000,
- 0b01000000,
- 0b01000000,
- 0b01000000,
- 0b00000000,
-
- 0b00000000,
- 0b00111100,
- 0b01000000,
- 0b01000000,
- 0b01001110,
- 0b01000100,
- 0b01111100,
- 0b00000000,
-
- 0b00000000,
- 0b01000010,
- 0b01000010,
- 0b01111110,
- 0b01000010,
- 0b01000010,
- 0b01000010,
- 0b00000000,
-
- 0b00000000,
- 0b01111100,
- 0b00010000,
- 0b00010000,
- 0b00010000,
- 0b00010000,
- 0b01111100,
- 0b00000000,
-
- 0b00000000,
- 0b01111100,
- 0b00010000,
- 0b00010000,
- 0b00010000,
- 0b00010000,
- 0b01110000,
- 0b00000000,
-
- 0b00000000,
- 0b01001000,
- 0b01010000,
- 0b01100000,
- 0b01010000,
- 0b01001000,
- 0b01000100,
- 0b00000000,
-
- 0b00000000,
- 0b01000000,
- 0b01000000,
- 0b01000000,
- 0b01000000,
- 0b01000000,
- 0b01111100,
- 0b00000000,
-
- 0b00000000,
- 0b01100110,
- 0b01100110,
- 0b01011010,
- 0b01000010,
- 0b01000010,
- 0b01000010,
- 0b00000000,
-
- 0b00000000,
- 0b01100010,
- 0b01100010,
- 0b01010010,
- 0b01001010,
- 0b01000110,
- 0b01000110,
- 0b00000000,
-
- 0b00000000,
- 0b00111100,
- 0b01000010,
- 0b01000010,
- 0b01000010,
- 0b01000010,
- 0b00111100,
- 0b00000000,
-
- 0b00000000,
- 0b01111100,
- 0b01000010,
- 0b01000010,
- 0b01111100,
- 0b01000000,
- 0b01000000,
- 0b00000000,
-
- 0b00000000,
- 0b00111100,
- 0b01000010,
- 0b01000010,
- 0b01010010,
- 0b01001010,
- 0b00111100,
- 0b00000010,
-
- 0b00000000,
- 0b01111100,
- 0b01000010,
- 0b01000010,
- 0b01111100,
- 0b01011000,
- 0b01000110,
- 0b00000000,
-
- 0b00000000,
- 0b00111100,
- 0b01000000,
- 0b01111000,
- 0b00011110,
- 0b00000010,
- 0b00111100,
- 0b00000000,
-
- 0b00000000,
- 0b01111100,
- 0b00010000,
- 0b00010000,
- 0b00010000,
- 0b00010000,
- 0b00010000,
- 0b00000000,
-
- 0b00000000,
- 0b01000010,
- 0b01000010,
- 0b01000010,
- 0b01000010,
- 0b01000010,
- 0b00111100,
- 0b00000000,
-
- 0b00000000,
- 0b01000010,
- 0b01000010,
- 0b01000010,
- 0b00100100,
- 0b00100100,
- 0b00011000,
- 0b00000000,
-
- 0b00000000,
- 0b01000100,
- 0b01000100,
- 0b01000100,
- 0b01010100,
- 0b01101100,
- 0b01000100,
- 0b00000000,
-
- 0b00000000,
- 0b00000000,
- 0b01000100,
- 0b00101000,
- 0b00010000,
- 0b00101000,
- 0b01000100,
- 0b00000000,
-
- 0b00000000,
- 0b01000100,
- 0b00101000,
- 0b00010000,
- 0b00010000,
- 0b00010000,
- 0b00010000,
- 0b00000000,
-
- 0b00000000,
- 0b01111110,
- 0b00000100,
- 0b00001000,
- 0b00010000,
- 0b00100000,
- 0b01111110,
- 0b00000000,
-
- 0b00000000,
- 0b00011100,
- 0b00010000,
- 0b00010000,
- 0b00010000,
- 0b00010000,
- 0b00011100,
- 0b00000000,
-
- 0b00000000,
- 0b01000000,
- 0b00100000,
- 0b00010000,
- 0b00001000,
- 0b00000100,
- 0b00000010,
- 0b00000000,
-
- 0b00000000,
- 0b00111000,
- 0b00001000,
- 0b00001000,
- 0b00001000,
- 0b00001000,
- 0b00111000,
- 0b00000000,
-
- 0b00000000,
- 0b00011000,
- 0b00100100,
- 0b00000000,
- 0b00000000,
- 0b00000000,
- 0b00000000,
- 0b00000000,
-
- 0b00000000,
- 0b00000000,
- 0b00000000,
- 0b00000000,
- 0b00000000,
- 0b00000000,
- 0b01111110,
- 0b00000000,
-
- 0b00000000,
- 0b00010000,
- 0b00001000,
- 0b00000000,
- 0b00000000,
- 0b00000000,
- 0b00000000,
- 0b00000000,
-
- 0b00000000,
- 0b00011000,
- 0b00100100,
- 0b01000010,
- 0b01111110,
- 0b01000010,
- 0b01000010,
- 0b00000000,
-
- 0b00000000,
- 0b01111100,
- 0b01000010,
- 0b01111100,
- 0b01000010,
- 0b01000010,
- 0b01111100,
- 0b00000000,
-
- 0b00000000,
- 0b00111110,
- 0b01000000,
- 0b01000000,
- 0b01000000,
- 0b01000000,
- 0b00111110,
- 0b00000000,
-
- 0b00000000,
- 0b01111100,
- 0b01000010,
- 0b01000010,
- 0b01000010,
- 0b01000010,
- 0b01111100,
- 0b00000000,
-
- 0b00000000,
- 0b01111110,
- 0b01000000,
- 0b01000000,
- 0b01111000,
- 0b01000000,
- 0b01111110,
- 0b00000000,
-
- 0b00000000,
- 0b01111110,
- 0b01000000,
- 0b01111000,
- 0b01000000,
- 0b01000000,
- 0b01000000,
- 0b00000000,
-
- 0b00000000,
- 0b00111100,
- 0b01000000,
- 0b01000000,
- 0b01001110,
- 0b01000100,
- 0b01111100,
- 0b00000000,
-
- 0b00000000,
- 0b01000010,
- 0b01000010,
- 0b01111110,
- 0b01000010,
- 0b01000010,
- 0b01000010,
- 0b00000000,
-
- 0b00000000,
- 0b01111100,
- 0b00010000,
- 0b00010000,
- 0b00010000,
- 0b00010000,
- 0b01111100,
- 0b00000000,
-
- 0b00000000,
- 0b01111100,
- 0b00010000,
- 0b00010000,
- 0b00010000,
- 0b00010000,
- 0b01110000,
- 0b00000000,
-
- 0b00000000,
- 0b01001000,
- 0b01010000,
- 0b01100000,
- 0b01010000,
- 0b01001000,
- 0b01000100,
- 0b00000000,
-
- 0b00000000,
- 0b01000000,
- 0b01000000,
- 0b01000000,
- 0b01000000,
- 0b01000000,
- 0b01111100,
- 0b00000000,
-
- 0b00000000,
- 0b01100110,
- 0b01100110,
- 0b01011010,
- 0b01000010,
- 0b01000010,
- 0b01000010,
- 0b00000000,
-
- 0b00000000,
- 0b01100010,
- 0b01100010,
- 0b01010010,
- 0b01001010,
- 0b01000110,
- 0b01000110,
- 0b00000000,
-
- 0b00000000,
- 0b00111100,
- 0b01000010,
- 0b01000010,
- 0b01000010,
- 0b01000010,
- 0b00111100,
- 0b00000000,
-
- 0b00000000,
- 0b01111100,
- 0b01000010,
- 0b01000010,
- 0b01111100,
- 0b01000000,
- 0b01000000,
- 0b00000000,
-
- 0b00000000,
- 0b00111100,
- 0b01000010,
- 0b01000010,
- 0b01010010,
- 0b01001010,
- 0b00111100,
- 0b00000010,
-
- 0b00000000,
- 0b01111100,
- 0b01000010,
- 0b01000010,
- 0b01111100,
- 0b01011000,
- 0b01000110,
- 0b00000000,
-
- 0b00000000,
- 0b00111100,
- 0b01000000,
- 0b01111000,
- 0b00011110,
- 0b00000010,
- 0b00111100,
- 0b00000000,
-
- 0b00000000,
- 0b01111100,
- 0b00010000,
- 0b00010000,
- 0b00010000,
- 0b00010000,
- 0b00010000,
- 0b00000000,
-
- 0b00000000,
- 0b01000010,
- 0b01000010,
- 0b01000010,
- 0b01000010,
- 0b01000010,
- 0b00111100,
- 0b00000000,
-
- 0b00000000,
- 0b01000010,
- 0b01000010,
- 0b01000010,
- 0b00100100,
- 0b00100100,
- 0b00011000,
- 0b00000000,
-
- 0b00000000,
- 0b01000100,
- 0b01000100,
- 0b01000100,
- 0b01010100,
- 0b01101100,
- 0b01000100,
- 0b00000000,
-
- 0b00000000,
- 0b00000000,
- 0b01000100,
- 0b00101000,
- 0b00010000,
- 0b00101000,
- 0b01000100,
- 0b00000000,
-
- 0b00000000,
- 0b01000100,
- 0b00101000,
- 0b00010000,
- 0b00010000,
- 0b00010000,
- 0b00010000,
- 0b00000000,
-
- 0b00000000,
- 0b01111110,
- 0b00000100,
- 0b00001000,
- 0b00010000,
- 0b00100000,
- 0b01111110,
- 0b00000000,
-
- 0b00000000,
- 0b00001100,
- 0b00010000,
- 0b00110000,
- 0b00110000,
- 0b00010000,
- 0b00001100,
- 0b00000000,
-
- 0b00000000,
- 0b00010000,
- 0b00010000,
- 0b00010000,
- 0b00010000,
- 0b00010000,
- 0b00010000,
- 0b00000000,
-
- 0b00000000,
- 0b00110000,
- 0b00001000,
- 0b00001100,
- 0b00001100,
- 0b00001000,
- 0b00110000,
- 0b00000000,
-
- 0b00000000,
- 0b00000000,
- 0b00000000,
- 0b00110010,
- 0b01001100,
- 0b00000000,
- 0b00000000,
- 0b00000000,
-
- 0b11111111,
- 0b10000001,
- 0b10111001,
- 0b10100101,
- 0b10100101,
- 0b10111001,
- 0b10000001,
- 0b11111111,
-};
-
-const char glyphs_byte[] = {
- 0b00000000,
- 0b00111100,
- 0b01000110,
- 0b01001010,
- 0b01010010,
- 0b01100010,
- 0b00111100,
- 0b00000000,
-
- 0b00000000,
- 0b00010000,
- 0b00110000,
- 0b00010000,
- 0b00010000,
- 0b00010000,
- 0b01111100,
- 0b00000000,
-
- 0b00000000,
- 0b00111100,
- 0b00000010,
- 0b00111100,
- 0b01000000,
- 0b01000000,
- 0b00111100,
- 0b00000000,
-
- 0b00000000,
- 0b00111110,
- 0b00000010,
- 0b00011110,
- 0b00000010,
- 0b00000010,
- 0b00111110,
- 0b00000000,
-
- 0b00000000,
- 0b01000010,
- 0b01000010,
- 0b00111110,
- 0b00000010,
- 0b00000010,
- 0b00000010,
- 0b00000000,
-
- 0b00000000,
- 0b00111100,
- 0b01000000,
- 0b00111100,
- 0b00000010,
- 0b00000010,
- 0b00111100,
- 0b00000000,
-
- 0b00000000,
- 0b00111100,
- 0b01000000,
- 0b01111100,
- 0b01000010,
- 0b01000010,
- 0b00111100,
- 0b00000000,
-
- 0b00000000,
- 0b00111110,
- 0b00000010,
- 0b00000100,
- 0b00001000,
- 0b00010000,
- 0b00100000,
- 0b00000000,
-
- 0b00000000,
- 0b00111100,
- 0b01000010,
- 0b00111100,
- 0b01000010,
- 0b01000010,
- 0b00111100,
- 0b00000000,
-
- 0b00000000,
- 0b00111100,
- 0b01000010,
- 0b00111110,
- 0b00000010,
- 0b00000010,
- 0b00111100,
- 0b00000000,
-
- 0b00000000,
- 0b00011000,
- 0b00100100,
- 0b01000010,
- 0b01111110,
- 0b01000010,
- 0b01000010,
- 0b00000000,
-
- 0b00000000,
- 0b01111100,
- 0b01000010,
- 0b01111100,
- 0b01000010,
- 0b01000010,
- 0b01111100,
- 0b00000000,
-
- 0b00000000,
- 0b00111110,
- 0b01000000,
- 0b01000000,
- 0b01000000,
- 0b01000000,
- 0b00111110,
- 0b00000000,
-
- 0b00000000,
- 0b01111100,
- 0b01000010,
- 0b01000010,
- 0b01000010,
- 0b01000010,
- 0b01111100,
- 0b00000000,
-
- 0b00000000,
- 0b01111110,
- 0b01000000,
- 0b01000000,
- 0b01111000,
- 0b01000000,
- 0b01111110,
- 0b00000000,
-
- 0b00000000,
- 0b01111110,
- 0b01000000,
- 0b01111000,
- 0b01000000,
- 0b01000000,
- 0b01000000,
- 0b00000000,
-};
+//extern char* glyphs;
+#include "font.h.bin"
#endif
diff --git a/src/graphics/glyphs.old b/src/graphics/glyphs.old
new file mode 100644
index 0000000..6377747
--- /dev/null
+++ b/src/graphics/glyphs.old
@@ -0,0 +1,1301 @@
+
+const char glyphs[] = {
+ 0b10000001,
+ 0b00111000,
+ 0b01000100,
+ 0b00001000,
+ 0b00010000,
+ 0b00000000,
+ 0b00010000,
+ 0b10000001,
+
+ 0b10000001,
+ 0b00111000,
+ 0b01000100,
+ 0b00001000,
+ 0b00010000,
+ 0b00000000,
+ 0b00010000,
+ 0b10000001,
+
+ 0b10000001,
+ 0b00111000,
+ 0b01000100,
+ 0b00001000,
+ 0b00010000,
+ 0b00000000,
+ 0b00010000,
+ 0b10000001,
+
+ 0b10000001,
+ 0b00111000,
+ 0b01000100,
+ 0b00001000,
+ 0b00010000,
+ 0b00000000,
+ 0b00010000,
+ 0b10000001,
+
+ 0b10000001,
+ 0b00111000,
+ 0b01000100,
+ 0b00001000,
+ 0b00010000,
+ 0b00000000,
+ 0b00010000,
+ 0b10000001,
+
+ 0b10000001,
+ 0b00111000,
+ 0b01000100,
+ 0b00001000,
+ 0b00010000,
+ 0b00000000,
+ 0b00010000,
+ 0b10000001,
+
+ 0b10000001,
+ 0b00111000,
+ 0b01000100,
+ 0b00001000,
+ 0b00010000,
+ 0b00000000,
+ 0b00010000,
+ 0b10000001,
+
+ 0b10000001,
+ 0b00111000,
+ 0b01000100,
+ 0b00001000,
+ 0b00010000,
+ 0b00000000,
+ 0b00010000,
+ 0b10000001,
+
+ 0b10000001,
+ 0b00111000,
+ 0b01000100,
+ 0b00001000,
+ 0b00010000,
+ 0b00000000,
+ 0b00010000,
+ 0b10000001,
+
+ 0b10000001,
+ 0b00111000,
+ 0b01000100,
+ 0b00001000,
+ 0b00010000,
+ 0b00000000,
+ 0b00010000,
+ 0b10000001,
+
+ 0b10000001,
+ 0b00111000,
+ 0b01000100,
+ 0b00001000,
+ 0b00010000,
+ 0b00000000,
+ 0b00010000,
+ 0b10000001,
+
+ 0b10000001,
+ 0b00111000,
+ 0b01000100,
+ 0b00001000,
+ 0b00010000,
+ 0b00000000,
+ 0b00010000,
+ 0b10000001,
+
+ 0b10000001,
+ 0b00111000,
+ 0b01000100,
+ 0b00001000,
+ 0b00010000,
+ 0b00000000,
+ 0b00010000,
+ 0b10000001,
+
+ 0b10000001,
+ 0b00111000,
+ 0b01000100,
+ 0b00001000,
+ 0b00010000,
+ 0b00000000,
+ 0b00010000,
+ 0b10000001,
+
+ 0b10000001,
+ 0b00111000,
+ 0b01000100,
+ 0b00001000,
+ 0b00010000,
+ 0b00000000,
+ 0b00010000,
+ 0b10000001,
+
+ 0b10000001,
+ 0b00111000,
+ 0b01000100,
+ 0b00001000,
+ 0b00010000,
+ 0b00000000,
+ 0b00010000,
+ 0b10000001,
+ 0b10000001,
+
+ 0b00111000,
+ 0b01000100,
+ 0b00001000,
+ 0b00010000,
+ 0b00000000,
+ 0b00010000,
+ 0b10000001,
+
+ 0b10000001,
+ 0b00111000,
+ 0b01000100,
+ 0b00001000,
+ 0b00010000,
+ 0b00000000,
+ 0b00010000,
+ 0b10000001,
+
+ 0b10000001,
+ 0b00111000,
+ 0b01000100,
+ 0b00001000,
+ 0b00010000,
+ 0b00000000,
+ 0b00010000,
+ 0b10000001,
+
+ 0b10000001,
+ 0b00111000,
+ 0b01000100,
+ 0b00001000,
+ 0b00010000,
+ 0b00000000,
+ 0b00010000,
+ 0b10000001,
+
+ 0b10000001,
+ 0b00111000,
+ 0b01000100,
+ 0b00001000,
+ 0b00010000,
+ 0b00000000,
+ 0b00010000,
+ 0b10000001,
+
+ 0b10000001,
+ 0b00111000,
+ 0b01000100,
+ 0b00001000,
+ 0b00010000,
+ 0b00000000,
+ 0b00010000,
+ 0b10000001,
+
+ 0b10000001,
+ 0b00111000,
+ 0b01000100,
+ 0b00001000,
+ 0b00010000,
+ 0b00000000,
+ 0b00010000,
+ 0b10000001,
+
+ 0b10000001,
+ 0b00111000,
+ 0b01000100,
+ 0b00001000,
+ 0b00010000,
+ 0b00000000,
+ 0b00010000,
+ 0b10000001,
+
+ 0b10000001,
+ 0b00111000,
+ 0b01000100,
+ 0b00001000,
+ 0b00010000,
+ 0b00000000,
+ 0b00010000,
+ 0b10000001,
+
+ 0b10000001,
+ 0b00111000,
+ 0b01000100,
+ 0b00001000,
+ 0b00010000,
+ 0b00000000,
+ 0b00010000,
+ 0b10000001,
+
+ 0b10000001,
+ 0b00111000,
+ 0b01000100,
+ 0b00001000,
+ 0b00010000,
+ 0b00000000,
+ 0b00010000,
+ 0b10000001,
+
+ 0b10000001,
+ 0b00111000,
+ 0b01000100,
+ 0b00001000,
+ 0b00010000,
+ 0b00000000,
+ 0b00010000,
+ 0b10000001,
+
+ 0b10000001,
+ 0b00111000,
+ 0b01000100,
+ 0b00001000,
+ 0b00010000,
+ 0b00000000,
+ 0b00010000,
+ 0b10000001,
+
+ 0b10000001,
+ 0b00111000,
+ 0b01000100,
+ 0b00001000,
+ 0b00010000,
+ 0b00000000,
+ 0b00010000,
+ 0b10000001,
+
+ 0b10000001,
+ 0b00111000,
+ 0b01000100,
+ 0b00001000,
+ 0b00010000,
+ 0b00000000,
+ 0b00010000,
+ 0b10000001,
+
+ 0b10000001,
+ 0b00111000,
+ 0b01000100,
+ 0b00001000,
+ 0b00010000,
+ 0b00000000,
+ 0b00010000,
+ 0b10000001,
+
+ 0b00000000,
+ 0b00000000,
+ 0b00000000,
+ 0b00000000,
+ 0b00000000,
+ 0b00000000,
+ 0b00000000,
+ 0b00000000,
+
+ 0b00000000,
+ 0b00010000,
+ 0b00010000,
+ 0b00010000,
+ 0b00010000,
+ 0b00000000,
+ 0b00010000,
+ 0b00000000,
+
+ 0b00000000,
+ 0b00101000,
+ 0b00101000,
+ 0b00000000,
+ 0b00000000,
+ 0b00000000,
+ 0b00000000,
+ 0b00000000,
+
+ 0b00000000,
+ 0b00010010,
+ 0b01111110,
+ 0b00100100,
+ 0b01111110,
+ 0b01001000,
+ 0b01001000,
+ 0b00000000,
+
+ 0b00010000,
+ 0b01111100,
+ 0b10010000,
+ 0b01111100,
+ 0b00010010,
+ 0b01111100,
+ 0b00010000,
+ 0b00000000,
+
+ 0b00000000,
+ 0b01100010,
+ 0b01100100,
+ 0b00001000,
+ 0b00010000,
+ 0b00100110,
+ 0b01000110,
+ 0b00000000,
+
+ 0b00000000,
+ 0b00111000,
+ 0b01000100,
+ 0b00111000,
+ 0b01010100,
+ 0b01001000,
+ 0b00110100,
+ 0b00000000,
+
+ 0b00000000,
+ 0b00010000,
+ 0b00010000,
+ 0b00000000,
+ 0b00000000,
+ 0b00000000,
+ 0b00000000,
+ 0b00000000,
+
+ 0b00000000,
+ 0b00010000,
+ 0b00100000,
+ 0b00100000,
+ 0b00100000,
+ 0b00100000,
+ 0b00010000,
+ 0b00000000,
+
+ 0b00000000,
+ 0b00010000,
+ 0b00001000,
+ 0b00001000,
+ 0b00001000,
+ 0b00001000,
+ 0b00010000,
+ 0b00000000,
+
+ 0b00000000,
+ 0b00101000,
+ 0b00010000,
+ 0b00101000,
+ 0b00000000,
+ 0b00000000,
+ 0b00000000,
+ 0b00000000,
+
+ 0b00000000,
+ 0b00000000,
+ 0b00010000,
+ 0b00111000,
+ 0b00010000,
+ 0b00000000,
+ 0b00000000,
+ 0b00000000,
+
+ 0b00000000,
+ 0b00000000,
+ 0b00000000,
+ 0b00000000,
+ 0b00000000,
+ 0b00000000,
+ 0b00010000,
+ 0b00100000,
+
+ 0b00000000,
+ 0b00000000,
+ 0b00000000,
+ 0b00111100,
+ 0b00000000,
+ 0b00000000,
+ 0b00000000,
+ 0b00000000,
+
+ 0b00000000,
+ 0b00000000,
+ 0b00000000,
+ 0b00000000,
+ 0b00000000,
+ 0b00000000,
+ 0b00010000,
+ 0b00000000,
+
+ 0b00000000,
+ 0b00000010,
+ 0b00000100,
+ 0b00001000,
+ 0b00010000,
+ 0b00100000,
+ 0b01000000,
+ 0b00000000,
+
+ 0b00000000,
+ 0b00111100,
+ 0b01000110,
+ 0b01001010,
+ 0b01010010,
+ 0b01100010,
+ 0b00111100,
+ 0b00000000,
+
+ 0b00000000,
+ 0b00010000,
+ 0b00110000,
+ 0b00010000,
+ 0b00010000,
+ 0b00010000,
+ 0b01111100,
+ 0b00000000,
+
+ 0b00000000,
+ 0b00111100,
+ 0b00000010,
+ 0b00111100,
+ 0b01000000,
+ 0b01000000,
+ 0b00111100,
+ 0b00000000,
+
+ 0b00000000,
+ 0b00111110,
+ 0b00000010,
+ 0b00011110,
+ 0b00000010,
+ 0b00000010,
+ 0b00111110,
+ 0b00000000,
+
+ 0b00000000,
+ 0b01000010,
+ 0b01000010,
+ 0b00111110,
+ 0b00000010,
+ 0b00000010,
+ 0b00000010,
+ 0b00000000,
+
+ 0b00000000,
+ 0b00111100,
+ 0b01000000,
+ 0b00111100,
+ 0b00000010,
+ 0b00000010,
+ 0b00111100,
+ 0b00000000,
+
+ 0b00000000,
+ 0b00111100,
+ 0b01000000,
+ 0b01111100,
+ 0b01000010,
+ 0b01000010,
+ 0b00111100,
+ 0b00000000,
+
+ 0b00000000,
+ 0b00111110,
+ 0b00000010,
+ 0b00000100,
+ 0b00001000,
+ 0b00010000,
+ 0b00100000,
+ 0b00000000,
+
+ 0b00000000,
+ 0b00111100,
+ 0b01000010,
+ 0b00111100,
+ 0b01000010,
+ 0b01000010,
+ 0b00111100,
+ 0b00000000,
+
+ 0b00000000,
+ 0b00111100,
+ 0b01000010,
+ 0b00111110,
+ 0b00000010,
+ 0b00000010,
+ 0b00111100,
+ 0b00000000,
+
+ 0b00000000,
+ 0b00000000,
+ 0b00010000,
+ 0b00000000,
+ 0b00010000,
+ 0b00000000,
+ 0b00000000,
+ 0b00000000,
+
+ 0b00000000,
+ 0b00000000,
+ 0b00001000,
+ 0b00000000,
+ 0b00001000,
+ 0b00010000,
+ 0b00000000,
+ 0b00000000,
+
+ 0b00000000,
+ 0b00000000,
+ 0b00000100,
+ 0b00001000,
+ 0b00010000,
+ 0b00001000,
+ 0b00000100,
+ 0b00000000,
+ 0b00000000,
+ 0b00000000,
+ 0b00111100,
+ 0b00000000,
+ 0b00111100,
+ 0b00000000,
+ 0b00000000,
+ 0b00000000,
+
+
+ 0b00000000,
+ 0b00000000,
+ 0b00100000,
+ 0b00010000,
+ 0b00001000,
+ 0b00010000,
+ 0b00100000,
+ 0b00000000,
+
+ 0b00000000,
+ 0b00111000,
+ 0b01000100,
+ 0b00001000,
+ 0b00010000,
+ 0b00000000,
+ 0b00010000,
+ 0b00000000,
+
+ 0b00000000,
+ 0b00111000,
+ 0b01000100,
+ 0b01000100,
+ 0b01011000,
+ 0b01000100,
+ 0b00111000,
+ 0b00000000,
+
+ 0b00000000,
+ 0b00011000,
+ 0b00100100,
+ 0b01000010,
+ 0b01111110,
+ 0b01000010,
+ 0b01000010,
+ 0b00000000,
+
+ 0b00000000,
+ 0b01111100,
+ 0b01000010,
+ 0b01111100,
+ 0b01000010,
+ 0b01000010,
+ 0b01111100,
+ 0b00000000,
+
+ 0b00000000,
+ 0b00111110,
+ 0b01000000,
+ 0b01000000,
+ 0b01000000,
+ 0b01000000,
+ 0b00111110,
+ 0b00000000,
+
+ 0b00000000,
+ 0b01111100,
+ 0b01000010,
+ 0b01000010,
+ 0b01000010,
+ 0b01000010,
+ 0b01111100,
+ 0b00000000,
+
+ 0b00000000,
+ 0b01111110,
+ 0b01000000,
+ 0b01000000,
+ 0b01111000,
+ 0b01000000,
+ 0b01111110,
+ 0b00000000,
+
+ 0b00000000,
+ 0b01111110,
+ 0b01000000,
+ 0b01111000,
+ 0b01000000,
+ 0b01000000,
+ 0b01000000,
+ 0b00000000,
+
+ 0b00000000,
+ 0b00111100,
+ 0b01000000,
+ 0b01000000,
+ 0b01001110,
+ 0b01000100,
+ 0b01111100,
+ 0b00000000,
+
+ 0b00000000,
+ 0b01000010,
+ 0b01000010,
+ 0b01111110,
+ 0b01000010,
+ 0b01000010,
+ 0b01000010,
+ 0b00000000,
+
+ 0b00000000,
+ 0b01111100,
+ 0b00010000,
+ 0b00010000,
+ 0b00010000,
+ 0b00010000,
+ 0b01111100,
+ 0b00000000,
+
+ 0b00000000,
+ 0b01111100,
+ 0b00010000,
+ 0b00010000,
+ 0b00010000,
+ 0b00010000,
+ 0b01110000,
+ 0b00000000,
+
+ 0b00000000,
+ 0b01001000,
+ 0b01010000,
+ 0b01100000,
+ 0b01010000,
+ 0b01001000,
+ 0b01000100,
+ 0b00000000,
+
+ 0b00000000,
+ 0b01000000,
+ 0b01000000,
+ 0b01000000,
+ 0b01000000,
+ 0b01000000,
+ 0b01111100,
+ 0b00000000,
+
+ 0b00000000,
+ 0b01100110,
+ 0b01100110,
+ 0b01011010,
+ 0b01000010,
+ 0b01000010,
+ 0b01000010,
+ 0b00000000,
+
+ 0b00000000,
+ 0b01100010,
+ 0b01100010,
+ 0b01010010,
+ 0b01001010,
+ 0b01000110,
+ 0b01000110,
+ 0b00000000,
+
+ 0b00000000,
+ 0b00111100,
+ 0b01000010,
+ 0b01000010,
+ 0b01000010,
+ 0b01000010,
+ 0b00111100,
+ 0b00000000,
+
+ 0b00000000,
+ 0b01111100,
+ 0b01000010,
+ 0b01000010,
+ 0b01111100,
+ 0b01000000,
+ 0b01000000,
+ 0b00000000,
+
+ 0b00000000,
+ 0b00111100,
+ 0b01000010,
+ 0b01000010,
+ 0b01010010,
+ 0b01001010,
+ 0b00111100,
+ 0b00000010,
+
+ 0b00000000,
+ 0b01111100,
+ 0b01000010,
+ 0b01000010,
+ 0b01111100,
+ 0b01011000,
+ 0b01000110,
+ 0b00000000,
+
+ 0b00000000,
+ 0b00111100,
+ 0b01000000,
+ 0b01111000,
+ 0b00011110,
+ 0b00000010,
+ 0b00111100,
+ 0b00000000,
+
+ 0b00000000,
+ 0b01111100,
+ 0b00010000,
+ 0b00010000,
+ 0b00010000,
+ 0b00010000,
+ 0b00010000,
+ 0b00000000,
+
+ 0b00000000,
+ 0b01000010,
+ 0b01000010,
+ 0b01000010,
+ 0b01000010,
+ 0b01000010,
+ 0b00111100,
+ 0b00000000,
+
+ 0b00000000,
+ 0b01000010,
+ 0b01000010,
+ 0b01000010,
+ 0b00100100,
+ 0b00100100,
+ 0b00011000,
+ 0b00000000,
+
+ 0b00000000,
+ 0b01000100,
+ 0b01000100,
+ 0b01000100,
+ 0b01010100,
+ 0b01101100,
+ 0b01000100,
+ 0b00000000,
+
+ 0b00000000,
+ 0b00000000,
+ 0b01000100,
+ 0b00101000,
+ 0b00010000,
+ 0b00101000,
+ 0b01000100,
+ 0b00000000,
+
+ 0b00000000,
+ 0b01000100,
+ 0b00101000,
+ 0b00010000,
+ 0b00010000,
+ 0b00010000,
+ 0b00010000,
+ 0b00000000,
+
+ 0b00000000,
+ 0b01111110,
+ 0b00000100,
+ 0b00001000,
+ 0b00010000,
+ 0b00100000,
+ 0b01111110,
+ 0b00000000,
+
+ 0b00000000,
+ 0b00011100,
+ 0b00010000,
+ 0b00010000,
+ 0b00010000,
+ 0b00010000,
+ 0b00011100,
+ 0b00000000,
+
+ 0b00000000,
+ 0b01000000,
+ 0b00100000,
+ 0b00010000,
+ 0b00001000,
+ 0b00000100,
+ 0b00000010,
+ 0b00000000,
+
+ 0b00000000,
+ 0b00111000,
+ 0b00001000,
+ 0b00001000,
+ 0b00001000,
+ 0b00001000,
+ 0b00111000,
+ 0b00000000,
+
+ 0b00000000,
+ 0b00011000,
+ 0b00100100,
+ 0b00000000,
+ 0b00000000,
+ 0b00000000,
+ 0b00000000,
+ 0b00000000,
+
+ 0b00000000,
+ 0b00000000,
+ 0b00000000,
+ 0b00000000,
+ 0b00000000,
+ 0b00000000,
+ 0b01111110,
+ 0b00000000,
+
+ 0b00000000,
+ 0b00010000,
+ 0b00001000,
+ 0b00000000,
+ 0b00000000,
+ 0b00000000,
+ 0b00000000,
+ 0b00000000,
+
+ 0b00000000,
+ 0b00011000,
+ 0b00100100,
+ 0b01000010,
+ 0b01111110,
+ 0b01000010,
+ 0b01000010,
+ 0b00000000,
+
+ 0b00000000,
+ 0b01111100,
+ 0b01000010,
+ 0b01111100,
+ 0b01000010,
+ 0b01000010,
+ 0b01111100,
+ 0b00000000,
+
+ 0b00000000,
+ 0b00111110,
+ 0b01000000,
+ 0b01000000,
+ 0b01000000,
+ 0b01000000,
+ 0b00111110,
+ 0b00000000,
+
+ 0b00000000,
+ 0b01111100,
+ 0b01000010,
+ 0b01000010,
+ 0b01000010,
+ 0b01000010,
+ 0b01111100,
+ 0b00000000,
+
+ 0b00000000,
+ 0b01111110,
+ 0b01000000,
+ 0b01000000,
+ 0b01111000,
+ 0b01000000,
+ 0b01111110,
+ 0b00000000,
+
+ 0b00000000,
+ 0b01111110,
+ 0b01000000,
+ 0b01111000,
+ 0b01000000,
+ 0b01000000,
+ 0b01000000,
+ 0b00000000,
+
+ 0b00000000,
+ 0b00111100,
+ 0b01000000,
+ 0b01000000,
+ 0b01001110,
+ 0b01000100,
+ 0b01111100,
+ 0b00000000,
+
+ 0b00000000,
+ 0b01000010,
+ 0b01000010,
+ 0b01111110,
+ 0b01000010,
+ 0b01000010,
+ 0b01000010,
+ 0b00000000,
+
+ 0b00000000,
+ 0b01111100,
+ 0b00010000,
+ 0b00010000,
+ 0b00010000,
+ 0b00010000,
+ 0b01111100,
+ 0b00000000,
+
+ 0b00000000,
+ 0b01111100,
+ 0b00010000,
+ 0b00010000,
+ 0b00010000,
+ 0b00010000,
+ 0b01110000,
+ 0b00000000,
+
+ 0b00000000,
+ 0b01001000,
+ 0b01010000,
+ 0b01100000,
+ 0b01010000,
+ 0b01001000,
+ 0b01000100,
+ 0b00000000,
+
+ 0b00000000,
+ 0b01000000,
+ 0b01000000,
+ 0b01000000,
+ 0b01000000,
+ 0b01000000,
+ 0b01111100,
+ 0b00000000,
+
+ 0b00000000,
+ 0b01100110,
+ 0b01100110,
+ 0b01011010,
+ 0b01000010,
+ 0b01000010,
+ 0b01000010,
+ 0b00000000,
+
+ 0b00000000,
+ 0b01100010,
+ 0b01100010,
+ 0b01010010,
+ 0b01001010,
+ 0b01000110,
+ 0b01000110,
+ 0b00000000,
+
+ 0b00000000,
+ 0b00111100,
+ 0b01000010,
+ 0b01000010,
+ 0b01000010,
+ 0b01000010,
+ 0b00111100,
+ 0b00000000,
+
+ 0b00000000,
+ 0b01111100,
+ 0b01000010,
+ 0b01000010,
+ 0b01111100,
+ 0b01000000,
+ 0b01000000,
+ 0b00000000,
+
+ 0b00000000,
+ 0b00111100,
+ 0b01000010,
+ 0b01000010,
+ 0b01010010,
+ 0b01001010,
+ 0b00111100,
+ 0b00000010,
+
+ 0b00000000,
+ 0b01111100,
+ 0b01000010,
+ 0b01000010,
+ 0b01111100,
+ 0b01011000,
+ 0b01000110,
+ 0b00000000,
+
+ 0b00000000,
+ 0b00111100,
+ 0b01000000,
+ 0b01111000,
+ 0b00011110,
+ 0b00000010,
+ 0b00111100,
+ 0b00000000,
+
+ 0b00000000,
+ 0b01111100,
+ 0b00010000,
+ 0b00010000,
+ 0b00010000,
+ 0b00010000,
+ 0b00010000,
+ 0b00000000,
+
+ 0b00000000,
+ 0b01000010,
+ 0b01000010,
+ 0b01000010,
+ 0b01000010,
+ 0b01000010,
+ 0b00111100,
+ 0b00000000,
+
+ 0b00000000,
+ 0b01000010,
+ 0b01000010,
+ 0b01000010,
+ 0b00100100,
+ 0b00100100,
+ 0b00011000,
+ 0b00000000,
+
+ 0b00000000,
+ 0b01000100,
+ 0b01000100,
+ 0b01000100,
+ 0b01010100,
+ 0b01101100,
+ 0b01000100,
+ 0b00000000,
+
+ 0b00000000,
+ 0b00000000,
+ 0b01000100,
+ 0b00101000,
+ 0b00010000,
+ 0b00101000,
+ 0b01000100,
+ 0b00000000,
+
+ 0b00000000,
+ 0b01000100,
+ 0b00101000,
+ 0b00010000,
+ 0b00010000,
+ 0b00010000,
+ 0b00010000,
+ 0b00000000,
+
+ 0b00000000,
+ 0b01111110,
+ 0b00000100,
+ 0b00001000,
+ 0b00010000,
+ 0b00100000,
+ 0b01111110,
+ 0b00000000,
+
+ 0b00000000,
+ 0b00001100,
+ 0b00010000,
+ 0b00110000,
+ 0b00110000,
+ 0b00010000,
+ 0b00001100,
+ 0b00000000,
+
+ 0b00000000,
+ 0b00010000,
+ 0b00010000,
+ 0b00010000,
+ 0b00010000,
+ 0b00010000,
+ 0b00010000,
+ 0b00000000,
+
+ 0b00000000,
+ 0b00110000,
+ 0b00001000,
+ 0b00001100,
+ 0b00001100,
+ 0b00001000,
+ 0b00110000,
+ 0b00000000,
+
+ 0b00000000,
+ 0b00000000,
+ 0b00000000,
+ 0b00110010,
+ 0b01001100,
+ 0b00000000,
+ 0b00000000,
+ 0b00000000,
+
+ 0b11111111,
+ 0b10000001,
+ 0b10111001,
+ 0b10100101,
+ 0b10100101,
+ 0b10111001,
+ 0b10000001,
+ 0b11111111,
+};
+
+const char glyphs_byte[] = {
+ 0b00000000,
+ 0b00111100,
+ 0b01000110,
+ 0b01001010,
+ 0b01010010,
+ 0b01100010,
+ 0b00111100,
+ 0b00000000,
+
+ 0b00000000,
+ 0b00010000,
+ 0b00110000,
+ 0b00010000,
+ 0b00010000,
+ 0b00010000,
+ 0b01111100,
+ 0b00000000,
+
+ 0b00000000,
+ 0b00111100,
+ 0b00000010,
+ 0b00111100,
+ 0b01000000,
+ 0b01000000,
+ 0b00111100,
+ 0b00000000,
+
+ 0b00000000,
+ 0b00111110,
+ 0b00000010,
+ 0b00011110,
+ 0b00000010,
+ 0b00000010,
+ 0b00111110,
+ 0b00000000,
+
+ 0b00000000,
+ 0b01000010,
+ 0b01000010,
+ 0b00111110,
+ 0b00000010,
+ 0b00000010,
+ 0b00000010,
+ 0b00000000,
+
+ 0b00000000,
+ 0b00111100,
+ 0b01000000,
+ 0b00111100,
+ 0b00000010,
+ 0b00000010,
+ 0b00111100,
+ 0b00000000,
+
+ 0b00000000,
+ 0b00111100,
+ 0b01000000,
+ 0b01111100,
+ 0b01000010,
+ 0b01000010,
+ 0b00111100,
+ 0b00000000,
+
+ 0b00000000,
+ 0b00111110,
+ 0b00000010,
+ 0b00000100,
+ 0b00001000,
+ 0b00010000,
+ 0b00100000,
+ 0b00000000,
+
+ 0b00000000,
+ 0b00111100,
+ 0b01000010,
+ 0b00111100,
+ 0b01000010,
+ 0b01000010,
+ 0b00111100,
+ 0b00000000,
+
+ 0b00000000,
+ 0b00111100,
+ 0b01000010,
+ 0b00111110,
+ 0b00000010,
+ 0b00000010,
+ 0b00111100,
+ 0b00000000,
+
+ 0b00000000,
+ 0b00011000,
+ 0b00100100,
+ 0b01000010,
+ 0b01111110,
+ 0b01000010,
+ 0b01000010,
+ 0b00000000,
+
+ 0b00000000,
+ 0b01111100,
+ 0b01000010,
+ 0b01111100,
+ 0b01000010,
+ 0b01000010,
+ 0b01111100,
+ 0b00000000,
+
+ 0b00000000,
+ 0b00111110,
+ 0b01000000,
+ 0b01000000,
+ 0b01000000,
+ 0b01000000,
+ 0b00111110,
+ 0b00000000,
+
+ 0b00000000,
+ 0b01111100,
+ 0b01000010,
+ 0b01000010,
+ 0b01000010,
+ 0b01000010,
+ 0b01111100,
+ 0b00000000,
+
+ 0b00000000,
+ 0b01111110,
+ 0b01000000,
+ 0b01000000,
+ 0b01111000,
+ 0b01000000,
+ 0b01111110,
+ 0b00000000,
+
+ 0b00000000,
+ 0b01111110,
+ 0b01000000,
+ 0b01111000,
+ 0b01000000,
+ 0b01000000,
+ 0b01000000,
+ 0b00000000,
+};
+
diff --git a/src/graphics/lfb.c b/src/graphics/lfb.c
index 5494dde..a693135 100644
--- a/src/graphics/lfb.c
+++ b/src/graphics/lfb.c
@@ -96,36 +96,39 @@ void lfb_showpicture()
void draw_cbyte(unsigned char lx, unsigned char ly, unsigned char letter, unsigned int c) {
unsigned int x, y;
unsigned char* ptr = lfb;
- ptr += (pitch*ly+lx*4)*8;
- unsigned char ltr = letter & 0x7F;
- for(y=0; y<8; y++) {
- for(x=0; x<8; x++) {
- if((1 << (7-x)) & glyphs_byte[y+8*(ltr)]) {
+ ptr += (pitch*ly*GLYPH_Y+lx*4*GLYPH_X);
+ unsigned char ltr = (letter & 0xF) + 0x30;
+ if (ltr > 0x39) {
+ ltr += 7;
+ }
+ for(y=0; y<GLYPH_Y; y++) {
+ for(x=0; x<GLYPH_X; x++) {
+ if((0x80 >> ((GLYPH_X-1)-x)) & glyphs[y+GLYPH_Y*(ltr)]) {
*((unsigned int*)ptr) = isrgb ? (unsigned int)((c&0xFF)<<16 | (c&0xFF00) | (c&0xFF0000)>>16) : c;
} else {
*((unsigned int*)ptr) = 0x000000;
}
ptr += 4;
}
- ptr += pitch - 8*4;
+ ptr += pitch - GLYPH_X*4;
}
}
void draw_cletter(unsigned char lx, unsigned char ly, unsigned char letter, unsigned int c) {
unsigned int x, y;
unsigned char* ptr = lfb;
- ptr += (pitch*ly+lx*4)*8;
+ ptr += (pitch*ly*GLYPH_Y+lx*4*GLYPH_X);
unsigned char ltr = letter & 0x7F;
- for(y=0; y<8; y++) {
- for(x=0; x<8; x++) {
- if((1 << (7-x)) & glyphs[y+8*(ltr)]) {
+ for(y=0; y<GLYPH_Y; y++) {
+ for(x=0; x<GLYPH_X; x++) {
+ if((0b10000000 >> ((GLYPH_X-1)-x)) & glyphs[y+GLYPH_Y*(ltr)]) {
*((unsigned int*)ptr) = isrgb ? (unsigned int)((c&0xFF)<<16 | (c&0xFF00) | (c&0xFF0000)>>16) : c;
} else {
*((unsigned int*)ptr) = 0x000000;
}
ptr += 4;
}
- ptr += pitch - 8*4;
+ ptr += pitch - GLYPH_X*4;
}
}
@@ -144,8 +147,8 @@ void draw_cstring(unsigned int lx, unsigned int ly, char* s, unsigned int c) {
void draw_chex32(unsigned int lx, unsigned int ly, unsigned long val, unsigned int c) {
unsigned int x = lx % GG_MAX_X, y = ly % GG_MAX_Y;
- for(unsigned int i = 0; i < 8; i++) {
- draw_cbyte(x++, y, 0xF & (val >> (7-i)*4), c);
+ for(unsigned int i = 0; i < GLYPH_X; i++) {
+ draw_cbyte(x++, y, 0xF & (val >> ((GLYPH_X-1)-i)*4), c);
if (x > GG_MAX_X) {
y += 1;
x = 0;
diff --git a/src/sys/core.c b/src/sys/core.c
index 929c7a5..ed88570 100644
--- a/src/sys/core.c
+++ b/src/sys/core.c
@@ -85,19 +85,19 @@ void output_irq_status(void) {
}
// Check TIMER IRQ
- write_string(&g_Drawer, "\nTIMER: ");
+ write_string(&g_Drawer, " TIMER: ");
if (ib_val & (1<<0)) {
write_cstring(&g_Drawer, "Enabled", 0x00FF00);
- // Output the frequency
- write_string(&g_Drawer, " @ ");
- unsigned long frq = read_cntfrq()/1000;
- write_10(&g_Drawer, frq);
- write_string(&g_Drawer, " kHz");
} else {
write_cstring(&g_Drawer, "Disabled", 0xFF0000);
}
write_string(&g_Drawer, "\nTIMER: ");
- write_cstring(&g_Drawer, "Enabled", 0x00FF00);
+ write_cstring(&g_Drawer, "Enabled ", 0x00FF00);
+ // Output the frequency
+ write_string(&g_Drawer, " @ ");
+ unsigned long frq = read_cntfrq()/1000;
+ write_10(&g_Drawer, frq);
+ write_string(&g_Drawer, " kHz");
}
void postinit() {
@@ -111,19 +111,12 @@ void postinit() {
release_mutex(&exe_cnt_m, SYS_PID);
}
// Commands
- write_string(&g_Drawer, "\nMonitor Ctrl-A m Exit: Ctrl-A x");
- write_string(&g_Drawer, "\nTimer: Ctrl-T");
+ write_string(&g_Drawer, "\nMonitor: Ctrl-A m Exit: Ctrl-A x Timer: Ctrl-T");
// GPU IRQ Statuses
write_string(&g_Drawer, "\n");
output_irq_status();
- write_string(&g_Drawer, "\n> ");
-
- unsigned int x = g_Drawer.x;
- unsigned int y = g_Drawer.y;
- g_Drawer.x = 0;
- g_Drawer.y = 12;
- write_string(&g_Drawer, "VIDEO: ");
+ write_string(&g_Drawer, "\nVIDEO: ");
write_cstring(&g_Drawer, "Enabled ", 0x00FF00);
write_10(&g_Drawer, width);
write_string(&g_Drawer, "x");
@@ -133,6 +126,6 @@ void postinit() {
} else {
write_string(&g_Drawer, " BGR");
}
- g_Drawer.x = x;
- g_Drawer.y = y;
+
+ write_string(&g_Drawer, "\n> ");
}
diff --git a/src/sys/timer.c b/src/sys/timer.c
index b82ac2c..aa50bd3 100644
--- a/src/sys/timer.c
+++ b/src/sys/timer.c
@@ -13,7 +13,7 @@ struct Mutex exe_cnt_m = {.addr = &exe_cnt, .pid = NULL_PID};
void c_timer() {
// Reset the counter
- write_cntv_tval(cntfrq);
+ write_cntv_tval(cntfrq/100);
unsigned int x = g_Drawer.x;
unsigned int y = g_Drawer.y;
@@ -31,15 +31,28 @@ void c_timer() {
release_mutex(&exe_cnt_m, SCHED_PID);
}
- g_Drawer.x = 0;
- g_Drawer.y = 10;
+ g_Drawer.x = 29;
+ g_Drawer.y = 5;
// Output the value
- write_string(&g_Drawer, "Timer Value: ");
unsigned long v = read_cntv_tval();
write_10(&g_Drawer, v);
write_string(&g_Drawer, " | ");
write_hex32(&g_Drawer, v);
+ g_Drawer.x = 0;
+ g_Drawer.y = 9;
+ for(int i = 0; i < 128; i++)
+ write_char(&g_Drawer, ' ');
+ g_Drawer.x = 0;
+ g_Drawer.y = 9;
+ write_string(&g_Drawer, "Timer Counter: ");
+ if (exe_cnt_m.pid == 0) {
+ write_cstring(&g_Drawer, "Free!", 0xFF00FF);
+ } else {
+ write_cstring(&g_Drawer, "Locked by ", 0xFF00FF);
+ write_c10(&g_Drawer, exe_cnt_m.pid, 0xFF00FF);
+ }
+
g_Drawer.x = x;
g_Drawer.y = y;
}
diff --git a/src/util/time.c b/src/util/time.c
index 72fc52b..3db2cad 100644
--- a/src/util/time.c
+++ b/src/util/time.c
@@ -4,8 +4,6 @@ void routing_core0cntv_to_core0irq(void)
{
// IRQ
store32(0x08, CORE0_TIMER_IRQCNTL);
- // FIQ
- //store32(0x80, CORE0_TIMER_IRQCNTL);
}
unsigned long read_core0timer_pending(void)
generated by cgit v1.2.1 (git 2.18.0) at 2024-12-25 18:01:58 +0000