Add new custom-tweaked 30px font, Make findFont work with Bangle.js 1

Author: gfwilliams

boards/BANGLEJS2.py

@@ -69,9 +69,10 @@
      'DEFINES += -DESPR_NO_LINE_NUMBERS=1', # we execute mainly from flash, so line numbers can be worked out
      'INCLUDE += -I$(ROOT)/libs/banglejs -I$(ROOT)/libs/misc',
      'WRAPPERSOURCES += libs/banglejs/jswrap_bangle.c',
-     'WRAPPERSOURCES += libs/banglejs/jswrap_font_15.c',
-     'WRAPPERSOURCES += libs/banglejs/jswrap_font_19.c',
-     'WRAPPERSOURCES += libs/banglejs/jswrap_font_22.c',
+     'WRAPPERSOURCES += libs/graphics/jswrap_font_15.c',
+     'WRAPPERSOURCES += libs/graphics/jswrap_font_19.c',
+     'WRAPPERSOURCES += libs/graphics/jswrap_font_22.c',
+     'WRAPPERSOURCES += libs/graphics/jswrap_font_30.c',
      'WRAPPERSOURCES += libs/graphics/jswrap_font_6x15.c',
      'WRAPPERSOURCES += libs/graphics/jswrap_font_12x20.c',
      'SOURCES += libs/misc/nmea.c',

libs/graphics/font/README.md

@@ -3,9 +3,50 @@ Fonts
 
 
 This directory contains font maps of various fonts, as well
-as a tool to interpret them (`scripts/create_custom_font.js`)
+as tools to interpret them
 
-Currently this is only used for testing purposes.
+## Tools
+
+These are now (mainly) stored in https://github.com/espruino/EspruinoWebTools
+
+## 4x6 and 6x8
+
+These are fixed-width fonts, created from:
+
+* font4x6.png
+* font6x8.png
+
+```
+node ~/workspace/EspruinoWebTools/cli/fontconverter.js font4x6.png --height 6 --debug --oh bitmap_font_4x6.h
+node ~/workspace/EspruinoWebTools/cli/fontconverter.js font6x8.png --height 8 --debug --oh bitmap_font_6x8.h
+```
+
+This doesn't generate the exact file, as the code to decode it (`graphicsDrawChar4x6`/etc) is usually on the end.
+
+## Vector Fonts
+
+The vector font is stored in `fontmap_13x19.svg` and is decoded with `build_vector_font.js`
+
+## renaissance Fonts
+
+These fonts are used by Bangle.js 2. These are turned into Espruino files (embedded `pbf` fonts) with the following commands:
+
+```
+node ~/workspace/EspruinoWebTools/cli/fontconverter.js renaissance_28.pbff --range All --height 22 --shiftUp 10 --nudge --debug --spaceWidth 4 --opbfc 22
+node ~/workspace/EspruinoWebTools/cli/fontconverter.js renaissance_24_bold.pbff --range All --height 19 --shiftUp 8 --nudge --debug --spaceWidth 3 --opbfc 19
+node ~/workspace/EspruinoWebTools/cli/fontconverter.js renaissance_18_bold.pbff --range All --height 15 --shiftUp 7 --nudge --debug --spaceWidth 3 --opbfc 15
+node ~/workspace/EspruinoWebTools/cli/fontconverter.js renaissance_18_doubled.pbff --range All --height 30 --spaceWidth 6 --opbfc 30
+```
+
+`renaissance_18_doubled.pbff` was originally created with:
+
+```
+node ~/workspace/EspruinoWebTools/cli/fontconverter.js renaissance_18.pbff --range All --height 15 --shiftUp 7 --nudge --doubleSize --opbff renaissance_18_doubled.pbff
+```
+
+And then patched up by hand to attempt to smooth it out. Some glyphs are still not complete.
+
+## Testing
 
 You can dump a font map from Espruino using something like this:
 
@@ -14,8 +55,8 @@ var W=4,H=6,FONT="4x6";
 //var W=6,H=8,FONT="6x8";
 var b = Graphics.createArrayBuffer(W*16,H*16,1,{msb:true});
 b.clear(1).setFont(FONT);
-for (var y=0;y<16;y++) { 
-  for (var x=0;x<16;x++) { 
+for (var y=0;y<16;y++) {
+  for (var x=0;x<16;x++) {
     if (x || y) b.drawString(String.fromCharCode(x+(y*16)),x*W,y*H)
   }
 }