From 92e84d33f37ab2bf3845cd4ae8149cd9d416c402 Mon Sep 17 00:00:00 2001
From: nitram509 <maki@bitkings.de>
Date: Sat, 13 Jan 2024 23:43:50 +0100
Subject: [PATCH 1/2] add #ifdef header into the generated code

---
 tools/1bitfont.html | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/tools/1bitfont.html b/tools/1bitfont.html
index 5aa3c64..cd22491 100644
--- a/tools/1bitfont.html
+++ b/tools/1bitfont.html
@@ -94,7 +94,7 @@
                 var r = data[idx + 0];
                 var g = data[idx + 1];
                 var b = data[idx + 2];
-                if (r==g && g==b && b==0) 
+                if (r==g && g==b && b==0)
                     bytes[bi]|=1<<pshift;
                 pshift--;
                 if (pshift<0) {
@@ -132,13 +132,17 @@
             ostring+=comment+gstring+'\n';
     }
     var fontname=$('#vname').val();
-    var header="//font generated from 1BITFONT - by Sandro Maffiodo\n"+
+    var header="#ifndef __FNT_"+fontname.toUpperCase()+"__\n" +
+        "#define __FNT_"+fontname.toUpperCase()+"__\n" +
+        "\n" +
+        "//font generated from 1BITFONT - by Sandro Maffiodo\n"+
         "#define FNT_"+fontname.toUpperCase()+"_HEIGHT "+cdata.height+"\n"+
         "#define FNT_"+fontname.toUpperCase()+"_SYMBOLS_COUNT "+gcount+"\n"+
-        "#define FNT_"+fontname.toUpperCase()+"_GLYPH_WIDTH "+maxbc+"\n"+        
+        "#define FNT_"+fontname.toUpperCase()+"_GLYPH_WIDTH "+maxbc+"\n"+
         "//data size="+(gcount*cdata.height)+" bytes\n"+
         "const unsigned char ESPVGAX_ALIGN32 fnt_"+fontname+"_data[FNT_"+fontname.toUpperCase()+"_SYMBOLS_COUNT][4+FNT_"+fontname.toUpperCase()+"_HEIGHT*FNT_"+fontname.toUpperCase()+"_GLYPH_WIDTH] PROGMEM={\n";
-    var footer="};\n";
+    var footer="};\n" +
+        "#endif\n";
     $('#out').text(header+ostring+footer);
 }
 function boot() {
@@ -165,13 +169,13 @@ <h2><b>1BITFONT</b></h2>
         <h3>WHAT IS:</h3>
         1BITFONT is a simple web tool to generate bit fonts for ESPVGAX library. <br>
         <br>
-        1BITFONT read an image where all the fonts glyphs are layouted in a single 
+        1BITFONT read an image where all the fonts glyphs are layouted in a single
         line. Each glyph must be separated from the next with a single white line.
         The tool will autodetect the glyph boundaries and generate a byte table
         where each byte is 8 horizontal pixels of the glyph. All glyphs will
         have the same height but different widths. The first byte of the glyph,
         inside the generated table, is the glyph width (in pixels, where 1pixel=1bit).
-        
+
         <h3>RULES:</h3>
         <ul>
             <li>source image must have all glyphs on a single line. black is foreground color, white is background</li>
@@ -180,7 +184,7 @@ <h3>RULES:</h3>
             <li>source image must use a single pixel to delimitate all glyphs (white line separator). <br> When a white line is part of the glyph (for example the glyph ") you can use a red pixel to join the two separated pixels</li>
             <li>the maximum width of a single glyph must be less or equal 8</li>
         </ul>
-        
+
         <h3>INPUT:</h3>
         source image: <input id="f" type="file" /><br>
         <div id='previewbox' style='display: none'>
@@ -194,7 +198,7 @@ <h3>INPUT:</h3>
         <BR>
         output variable name:
         <input value="varname" type='text' id='vname'/>
-        
+
         <h3>OUTPUT:</h3>
         <button onclick='generate()'>GENERATE</button>
         <pre id='out'></pre>

From 56f552f7d62c563f8535ab29ce2783554669b033 Mon Sep 17 00:00:00 2001
From: nitram509 <maki@bitkings.de>
Date: Sat, 13 Jan 2024 23:44:56 +0100
Subject: [PATCH 2/2] Add nitram-micro font

---
 README.md       |   1 +
 fonts/nitram5.h | 106 ++++++++++++++++++++++++++++++++++++++++++++++++
 gfx/nitram5.png | Bin 0 -> 647 bytes
 3 files changed, 107 insertions(+)
 create mode 100644 fonts/nitram5.h
 create mode 100644 gfx/nitram5.png

diff --git a/README.md b/README.md
index fbd7bf9..e090b63 100644
--- a/README.md
+++ b/README.md
@@ -170,6 +170,7 @@ These fonts are released with ESPVGAX, inside the /fonts/ folder:
 - **Monospaced DOS 12** <br>![mdos12](gfx/mdos.png)
 - **Monospaced DOS 8** <br>![mdos8](gfx/mdosH8.png)
 - **MS Sans 10** <br>![mssans10](gfx/mssans10.png)
+- **Nitram-Micro-Font 5 (by Nitram509)** <br>![nitram5](gfx/nitram5.png)
 - **Ocra 9** <br>![ocra9](gfx/ocra9.png)
 - **PT Monospaced 9** <br>![ptmono9](gfx/ptmono9.png)
 - **Tahoma 11** <br>![tahoma11](gfx/tahoma11.png)
diff --git a/fonts/nitram5.h b/fonts/nitram5.h
new file mode 100644
index 0000000..5fedf37
--- /dev/null
+++ b/fonts/nitram5.h
@@ -0,0 +1,106 @@
+#ifndef __FNT_NITRAM5__
+#define __FNT_NITRAM5__
+
+//font generated from 1BITFONT - by Sandro Maffiodo
+#define FNT_NITRAM5_HEIGHT 5
+#define FNT_NITRAM5_SYMBOLS_COUNT 95
+#define FNT_NITRAM5_GLYPH_WIDTH 1
+//data size=475 bytes
+const unsigned char ESPVGAX_ALIGN32 fnt_NITRAM5_data[FNT_NITRAM5_SYMBOLS_COUNT][4+FNT_NITRAM5_HEIGHT*FNT_NITRAM5_GLYPH_WIDTH] PROGMEM={
+{ 1,0,0,0, 0x80, 0x80, 0x80, 0x00, 0x80, },	//glyph '!' code=0
+{ 3,0,0,0, 0xa0, 0xa0, 0x00, 0x00, 0x00, },	//glyph '"' code=1
+{ 5,0,0,0, 0x50, 0xf8, 0x50, 0xf8, 0x50, },	//glyph '#' code=2
+{ 5,0,0,0, 0xf8, 0xa0, 0xf8, 0x28, 0xf8, },	//glyph '$' code=3
+{ 5,0,0,0, 0x88, 0x10, 0x20, 0x40, 0x88, },	//glyph '%' code=4
+{ 5,0,0,0, 0x60, 0x90, 0x68, 0x90, 0x68, },	//glyph '&' code=5
+{ 2,0,0,0, 0x40, 0x80, 0x00, 0x00, 0x00, },	//glyph ''' code=6
+{ 2,0,0,0, 0x40, 0x80, 0x80, 0x80, 0x40, },	//glyph '(' code=7
+{ 2,0,0,0, 0x80, 0x40, 0x40, 0x40, 0x80, },	//glyph ')' code=8
+{ 5,0,0,0, 0xa8, 0x70, 0xf8, 0x70, 0xa8, },	//glyph '*' code=9
+{ 3,0,0,0, 0x00, 0x40, 0xe0, 0x40, 0x00, },	//glyph '+' code=10
+{ 2,0,0,0, 0x00, 0x00, 0x00, 0x40, 0x80, },	//glyph ',' code=11
+{ 3,0,0,0, 0x00, 0x00, 0xe0, 0x00, 0x00, },	//glyph '-' code=12
+{ 1,0,0,0, 0x00, 0x00, 0x00, 0x00, 0x80, },	//glyph '.' code=13
+{ 3,0,0,0, 0x20, 0x40, 0x40, 0x40, 0x80, },	//glyph '/' code=14
+{ 5,0,0,0, 0x70, 0x98, 0xa8, 0xc8, 0x70, },	//glyph '0' code=15
+{ 3,0,0,0, 0x40, 0xc0, 0x40, 0x40, 0xe0, },	//glyph '1' code=16
+{ 3,0,0,0, 0xe0, 0x20, 0xe0, 0x80, 0xe0, },	//glyph '2' code=17
+{ 3,0,0,0, 0xe0, 0x20, 0x60, 0x20, 0xe0, },	//glyph '3' code=18
+{ 3,0,0,0, 0x80, 0x80, 0xa0, 0xe0, 0x20, },	//glyph '4' code=19
+{ 3,0,0,0, 0xe0, 0x80, 0xe0, 0x20, 0xe0, },	//glyph '5' code=20
+{ 3,0,0,0, 0xc0, 0x80, 0xe0, 0xa0, 0xe0, },	//glyph '6' code=21
+{ 3,0,0,0, 0xe0, 0x20, 0x60, 0x20, 0x20, },	//glyph '7' code=22
+{ 3,0,0,0, 0xe0, 0xa0, 0xe0, 0xa0, 0xe0, },	//glyph '8' code=23
+{ 3,0,0,0, 0xe0, 0xa0, 0xe0, 0x20, 0xe0, },	//glyph '9' code=24
+{ 1,0,0,0, 0x00, 0x80, 0x00, 0x80, 0x00, },	//glyph ':' code=25
+{ 2,0,0,0, 0x00, 0x40, 0x00, 0x40, 0x80, },	//glyph ';' code=26
+{ 3,0,0,0, 0x20, 0x40, 0x80, 0x40, 0x20, },	//glyph '<' code=27
+{ 3,0,0,0, 0x00, 0xe0, 0x00, 0xe0, 0x00, },	//glyph '=' code=28
+{ 3,0,0,0, 0x80, 0x40, 0x20, 0x40, 0x80, },	//glyph '>' code=29
+{ 5,0,0,0, 0x70, 0x88, 0x30, 0x00, 0x20, },	//glyph '?' code=30
+{ 4,0,0,0, 0x70, 0x90, 0xa0, 0x80, 0x70, },	//glyph '@' code=31
+{ 5,0,0,0, 0x60, 0x90, 0x88, 0xf8, 0x88, },	//glyph 'A' code=32
+{ 5,0,0,0, 0xe0, 0x90, 0xf0, 0x88, 0xf0, },	//glyph 'B' code=33
+{ 5,0,0,0, 0x70, 0x88, 0x80, 0x88, 0x70, },	//glyph 'C' code=34
+{ 5,0,0,0, 0xf0, 0x98, 0x88, 0x88, 0xf0, },	//glyph 'D' code=35
+{ 5,0,0,0, 0xf8, 0x80, 0xf0, 0x80, 0xf8, },	//glyph 'E' code=36
+{ 5,0,0,0, 0xf8, 0x80, 0xf0, 0x80, 0x80, },	//glyph 'F' code=37
+{ 5,0,0,0, 0x70, 0x80, 0x98, 0x88, 0x70, },	//glyph 'G' code=38
+{ 5,0,0,0, 0x90, 0x88, 0xf8, 0x88, 0x88, },	//glyph 'H' code=39
+{ 3,0,0,0, 0xe0, 0x40, 0x40, 0x40, 0xe0, },	//glyph 'I' code=40
+{ 3,0,0,0, 0x60, 0x20, 0x20, 0xa0, 0xe0, },	//glyph 'J' code=41
+{ 4,0,0,0, 0x90, 0xa0, 0xc0, 0xa0, 0x90, },	//glyph 'K' code=42
+{ 4,0,0,0, 0x80, 0x80, 0x80, 0x80, 0xf0, },	//glyph 'L' code=43
+{ 5,0,0,0, 0x88, 0xd8, 0xa8, 0x88, 0x88, },	//glyph 'M' code=44
+{ 5,0,0,0, 0x88, 0xc8, 0xa8, 0x98, 0x88, },	//glyph 'N' code=45
+{ 5,0,0,0, 0x70, 0x98, 0x88, 0x88, 0x70, },	//glyph 'O' code=46
+{ 4,0,0,0, 0xe0, 0x90, 0xe0, 0x80, 0x80, },	//glyph 'P' code=47
+{ 5,0,0,0, 0x70, 0x88, 0x88, 0x98, 0x78, },	//glyph 'Q' code=48
+{ 4,0,0,0, 0xe0, 0x90, 0xe0, 0xa0, 0x90, },	//glyph 'R' code=49
+{ 5,0,0,0, 0x78, 0x80, 0x70, 0x08, 0xf0, },	//glyph 'S' code=50
+{ 5,0,0,0, 0xf8, 0x20, 0x20, 0x20, 0x20, },	//glyph 'T' code=51
+{ 5,0,0,0, 0x90, 0x88, 0x88, 0x88, 0x70, },	//glyph 'U' code=52
+{ 3,0,0,0, 0xa0, 0xa0, 0xa0, 0xa0, 0x40, },	//glyph 'V' code=53
+{ 5,0,0,0, 0x90, 0x88, 0xa8, 0xa8, 0x50, },	//glyph 'W' code=54
+{ 5,0,0,0, 0x88, 0x50, 0x20, 0x50, 0x88, },	//glyph 'X' code=55
+{ 5,0,0,0, 0x88, 0x50, 0x20, 0x20, 0x20, },	//glyph 'Y' code=56
+{ 5,0,0,0, 0xf8, 0x10, 0x20, 0x40, 0xf8, },	//glyph 'Z' code=57
+{ 2,0,0,0, 0xc0, 0x80, 0x80, 0x80, 0xc0, },	//glyph '[' code=58
+{ 3,0,0,0, 0x80, 0x40, 0x40, 0x40, 0x20, },	//glyph '\' code=59
+{ 2,0,0,0, 0xc0, 0x40, 0x40, 0x40, 0xc0, },	//glyph ']' code=60
+{ 3,0,0,0, 0x40, 0xa0, 0x00, 0x00, 0x00, },	//glyph '^' code=61
+{ 3,0,0,0, 0x00, 0x00, 0x00, 0x00, 0xe0, },	//glyph '_' code=62
+{ 2,0,0,0, 0x80, 0x40, 0x00, 0x00, 0x00, },	//glyph '`' code=63
+{ 5,0,0,0, 0x60, 0x90, 0x88, 0xf8, 0x88, },	//glyph 'a' code=64
+{ 5,0,0,0, 0xe0, 0x90, 0xf0, 0x88, 0xf0, },	//glyph 'b' code=65
+{ 5,0,0,0, 0x70, 0x88, 0x80, 0x88, 0x70, },	//glyph 'c' code=66
+{ 5,0,0,0, 0xf0, 0x98, 0x88, 0x88, 0xf0, },	//glyph 'd' code=67
+{ 5,0,0,0, 0xf8, 0x80, 0xf0, 0x80, 0xf8, },	//glyph 'e' code=68
+{ 5,0,0,0, 0xf8, 0x80, 0xf0, 0x80, 0x80, },	//glyph 'f' code=69
+{ 5,0,0,0, 0x70, 0x80, 0x98, 0x88, 0x70, },	//glyph 'g' code=70
+{ 5,0,0,0, 0x90, 0x88, 0xf8, 0x88, 0x88, },	//glyph 'h' code=71
+{ 3,0,0,0, 0xe0, 0x40, 0x40, 0x40, 0xe0, },	//glyph 'i' code=72
+{ 3,0,0,0, 0x60, 0x20, 0x20, 0xa0, 0xe0, },	//glyph 'j' code=73
+{ 4,0,0,0, 0x90, 0xa0, 0xc0, 0xa0, 0x90, },	//glyph 'k' code=74
+{ 4,0,0,0, 0x80, 0x80, 0x80, 0x80, 0xf0, },	//glyph 'l' code=75
+{ 5,0,0,0, 0x88, 0xd8, 0xa8, 0x88, 0x88, },	//glyph 'm' code=76
+{ 5,0,0,0, 0x88, 0xc8, 0xa8, 0x98, 0x88, },	//glyph 'n' code=77
+{ 5,0,0,0, 0x70, 0x98, 0x88, 0x88, 0x70, },	//glyph 'o' code=78
+{ 4,0,0,0, 0xe0, 0x90, 0xe0, 0x80, 0x80, },	//glyph 'p' code=79
+{ 5,0,0,0, 0x70, 0x88, 0x88, 0x98, 0x78, },	//glyph 'q' code=80
+{ 4,0,0,0, 0xe0, 0x90, 0xe0, 0xa0, 0x90, },	//glyph 'r' code=81
+{ 5,0,0,0, 0x78, 0x80, 0x70, 0x08, 0xf0, },	//glyph 's' code=82
+{ 5,0,0,0, 0xf8, 0x20, 0x20, 0x20, 0x20, },	//glyph 't' code=83
+{ 5,0,0,0, 0x90, 0x88, 0x88, 0x88, 0x70, },	//glyph 'u' code=84
+{ 3,0,0,0, 0xa0, 0xa0, 0xa0, 0xa0, 0x40, },	//glyph 'v' code=85
+{ 5,0,0,0, 0x90, 0x88, 0xa8, 0xa8, 0x50, },	//glyph 'w' code=86
+{ 5,0,0,0, 0x88, 0x50, 0x20, 0x50, 0x88, },	//glyph 'x' code=87
+{ 5,0,0,0, 0x88, 0x50, 0x20, 0x20, 0x20, },	//glyph 'y' code=88
+{ 5,0,0,0, 0xf8, 0x10, 0x20, 0x40, 0xf8, },	//glyph 'z' code=89
+{ 3,0,0,0, 0x60, 0x40, 0x80, 0x40, 0x60, },	//glyph '{' code=90
+{ 1,0,0,0, 0x80, 0x80, 0x80, 0x80, 0x80, },	//glyph '|' code=91
+{ 3,0,0,0, 0xc0, 0x40, 0x20, 0x40, 0xc0, },	//glyph '}' code=92
+{ 4,0,0,0, 0x50, 0xa0, 0x00, 0x00, 0x00, },	//glyph '~' code=93
+{ 5,0,0,0, 0x30, 0x48, 0xe0, 0x40, 0xf8, },	//glyph '£' code=94
+};
+#endif
diff --git a/gfx/nitram5.png b/gfx/nitram5.png
new file mode 100644
index 0000000000000000000000000000000000000000..b061217ec5acee115e1d2b33873edd1de0c5dc2e
GIT binary patch
literal 647
zcmV;20(kw2P)<h;3K|Lk000e1NJLTq00Hy>000FD1^@s6vu_@P0006`Nkl<ZXx{Bw
z+it@k3?<Y4|CiZA70L6?4O(@50I6z2AmP}@_(HES#+-AG>$=7qV_c7pF~)fG-S<jg
zZ+%RiTj$jKXbgH+?d$K@X$*^7d&TK+qwy=xLu+zaT))EF`;orXy3{jVKf<l%bZ#U%
zt#};gm<-w2^xZ3RS7V*Llw6oCvEK=9r%z=g?43>zhnt6+&v28;opCGS@Tat|hW5{b
z`*#H~=lu0sIqEK8rYN)-D8qinnb-9roE;;&Mh(qT^VM~i8N+gakWp2vNTx`4$RLy+
z(LE&J+RtR$=b^F6fgqWu!4Pr=T@HwQj88~ziOkqoW_t(=+td;Vtn9M)vwZ-~RU4*T
z+u`Qn=Bv1wT)TiF#qci<y@O`oolJ;Oov`;f76m!dCP79WgVvR1xk#z0(Xct_I>E_|
zAFUZ}KqwPRB7SCciCo!p5*<0+F}bc9Ra)s`8Im((hBxIr+N^ePrm|SYz3YUOtkm4Y
z&BM)Ca#P`T0a*7vAD5x4QWpcjj8Hj?osv0=pp>9p#Jp=f&gt)F;4XtlfdJdgSO)K^
z3+blDB6nwmOrC6g%Gg%Mua;3$C$RGjXJ^joyfY(kS@Wx$`R>{dHxD<T;iltA5?p?o
zBfs0X%g)ppx^f_>ERjT4>Dfveaj~*VjV{sI3i}U$JAZT8yE7d1e6)UKkZGjKN})-~
zKP{)a{v<nF{a*popNi;L-r>rDtC*barLuB5McI`)vrK|;btI?Wm)L>}J`Xn!H+Q+o
hd{$aD*wM*5+7Gl;;#gMQnc)Bc002ovPDHLkV1mN-K}!Gt

literal 0
HcmV?d00001