New build parameters and shared includes

This changes many files but I've just applied some replace commands.. So
- nothing special!

2 files changed, 10 insertions, 11 deletions

diff --git a/src/resources/conv.sh b/src/resources/conv.sh
index 36a17d0..f7848f1 100755
--- a/src/resources/conv.sh
+++ b/src/resources/conv.sh
@@ -4,13 +4,13 @@
 
 printf "// Generated using the Spleen font and the bdf2c converter (modified using the conv.sh script)\n// Spleen font: (c) 2018-2019, Frederic Cambus, License: MIT\n // bdf2c: (c) 2009-2010 Lutz Sammer, License: AGPLv3\n\n" >font.c
 
-printf "#include <stdint.h>\n\nuint16_t cursor[19]={0b100000000000,0b110000000000,0b111000000000,0b111100000000,0b111110000000,0b111111000000,0b111111100000,0b111111110000,0b111111111000,0b111111111100,0b111111111110,0b111111111111,0b111111111111,0b111111110000,0b111101111000,0b111001111000,0b110000111100,0b000000111100,0b000000011000};\n" >>font.c
+printf "#include <stdint.h>\n\nu16 cursor[19]={0b100000000000,0b110000000000,0b111000000000,0b111100000000,0b111110000000,0b111111000000,0b111111100000,0b111111110000,0b111111111000,0b111111111100,0b111111111110,0b111111111111,0b111111111111,0b111111110000,0b111101111000,0b111001111000,0b110000111100,0b000000111100,0b000000011000};\n" >>font.c
 
 generate() {
 	font_url="https://raw.githubusercontent.com/fcambus/spleen/master/spleen-$1x$2.bdf"
 	character_count=758
 	font_height=$2
-	top_lines="\nuint$1_t font_$font_height\[$character_count][$font_height] = {"
+	top_lines="\nu$1 font_$font_height\[$character_count][$font_height] = {"
 
 	mkdir -p font
 	cd font || exit
@@ -30,7 +30,7 @@ generate() {
 	sed -i -z 's/\n\n/\n/g' final.h                          # Remove all double new lines
 	sed -i -z 's/\,\n/,/g' final.h                           # Aaand into single lines
 	sed -i 's/\,0x//g' final.h                               # Fix bytes
-	sed -i 's/uint12/uint16/g' final.h                       # Fix non-existent 12 bit bound
+	sed -i 's/u12/u16/g' final.h                             # Fix non-existent 12 bit bound
 
 	mv final.h "font_$2.c"
 	rm font.h
diff --git a/src/resources/font.c b/src/resources/font.c
index de5dda1..5fcc66e 100644
--- a/src/resources/font.c
+++ b/src/resources/font.c
@@ -4,13 +4,12 @@
 
 #include <stdint.h>
 
-uint16_t cursor[19] = { 0b100000000000, 0b110000000000, 0b111000000000, 0b111100000000,
-			0b111110000000, 0b111111000000, 0b111111100000, 0b111111110000,
-			0b111111111000, 0b111111111100, 0b111111111110, 0b111111111111,
-			0b111111111111, 0b111111110000, 0b111101111000, 0b111001111000,
-			0b110000111100, 0b000000111100, 0b000000011000 };
+u16 cursor[19] = { 0b100000000000, 0b110000000000, 0b111000000000, 0b111100000000, 0b111110000000,
+		   0b111111000000, 0b111111100000, 0b111111110000, 0b111111111000, 0b111111111100,
+		   0b111111111110, 0b111111111111, 0b111111111111, 0b111111110000, 0b111101111000,
+		   0b111001111000, 0b110000111100, 0b000000111100, 0b000000011000 };
 
-uint8_t font_16[758][16] = {
+u8 font_16[758][16] = {
 
 	{ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 	  0x00 },
@@ -1530,7 +1529,7 @@ uint8_t font_16[758][16] = {
 	  0x01 }
 };
 
-uint16_t font_24[758][24] = {
+u16 font_24[758][24] = {
 
 	{ 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
 	  0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
@@ -3808,7 +3807,7 @@ uint16_t font_24[758][24] = {
 	  0x0C00, 0x0600, 0x0300, 0x0180, 0x00C0, 0x0060, 0x0030, 0x0010 }
 };
 
-uint16_t font_32[758][32] = {
+u16 font_32[758][32] = {
 
 	{ 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
 	  0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,