Switch to Open Sans as OBS font

Author: amandel

src/displays.h

@@ -34,22 +34,21 @@
 #include "sensor.h"
 
 
-extern const uint8_t Ubuntu_Regular_Plain_8[];
-extern const uint8_t ArialMT_Plain_10[]; // :(
-extern const uint8_t Ubuntu_Regular_Plain_10[];
-extern const uint8_t Ubuntu_Regular_Plain_22[];
-extern const uint8_t Ubuntu_Regular_Plain_34[];
-extern const uint8_t Ubuntu_Regular_Plain_54[];
+extern const uint8_t Open_Sans_Regular_Plain_8[];
+//// this font is part of OLEDDisplay::OLEDDisplay :/
+//extern const uint8_t ArialMT_Plain_10[]; // :(
+extern const uint8_t Open_Sans_Regular_Plain_10[];
+extern const uint8_t Open_Sans_Regular_Plain_20[];
+extern const uint8_t Open_Sans_Regular_Plain_34[];
+extern const uint8_t Open_Sans_Regular_Plain_50[];
 extern const uint8_t BatterieLogo1[];
 extern const uint8_t TempLogo[];
 
-#define TINY_FONT Ubuntu_Regular_Plain_8
-// this font is part of OLEDDisplay::OLEDDisplay :/
-// #define SMALL_FONT ArialMT_Plain_10
-#define SMALL_FONT Ubuntu_Regular_Plain_10
-#define MEDIUM_FONT Ubuntu_Regular_Plain_22
-#define LARGE_FONT Ubuntu_Regular_Plain_34
-#define HUGE_FONT Ubuntu_Regular_Plain_54
+#define TINY_FONT Open_Sans_Regular_Plain_8
+#define SMALL_FONT Open_Sans_Regular_Plain_10
+#define MEDIUM_FONT Open_Sans_Regular_Plain_20
+#define LARGE_FONT Open_Sans_Regular_Plain_34
+#define HUGE_FONT Open_Sans_Regular_Plain_50
 
 // Forward declare classes to build (because there is a cyclic dependency between sensor.h and displays.h)
 class HCSR04SensorInfo;

src/fonts/README.md

@@ -14,11 +14,10 @@ is currently open. (https://github.com/arcao/esp8266-oled-ssd1306-font-creator/p
 
 ## Generating
 
-1. Download via from https://fonts.google.com/specimen/Ubuntu
-1. `fontcreator -s 8 Ubuntu-Regular.ttf -c iso-8859-15 -o ubuntu8.h -a " 0123456789.%°C"`
-1. `fontcreator -s 10 Ubuntu-Regular.ttf -c iso-8859-15 -o ubuntu10.h`
-1. `fontcreator -s 22 Ubuntu-Regular.ttf -c iso-8859-15 -o ubuntu22.h -a "0123456789-cm|kVs"`
-1. `fontcreator -s 34 Ubuntu-Regular.ttf -c iso-8859-15 -o ubuntu34.h -a "0123456789-cm|kVs" -y 3`
-1. `fontcreator -s 54 Ubuntu-Regular.ttf -c iso-8859-15 -o ubuntu58.h -a "0123456789" -y 5`
-
+1. Download via from https://fonts.google.com/specimen/Open+Sans
+1. `fontcreator -s 8  -c iso-8859-15 -y 2 -o opensans8.h OpenSans-Regular.ttf`
+1. `fontcreator -s 10 -c iso-8859-15 -y 2 -o opensans10.h OpenSans-Regular.ttf`
+1. `fontcreator -s 20 -c iso-8859-15 -y 4 -o opensans20.h OpenSans-Regular.ttf`
+1. `fontcreator -s 34 -c iso-8859-15 -y 7 -o opensans34.h OpenSans-Regular.ttf`
+1. `fontcreator -s 50 -c iso-8859-15 -y 10 -o opensans50.h OpenSans-Regular.ttf -a "0123456789"`
 

src/fonts/UFL.txt

@@ -24,11 +24,11 @@
 #ifndef OPENBIKESENSORFIRMWARE_FONTS_H
 #define OPENBIKESENSORFIRMWARE_FONTS_H
 
-#include "ubuntu8.h"
-#include "ubuntu10.h"
-#include "ubuntu22.h"
-#include "ubuntu34.h"
-#include "ubuntu54.h"
+#include "opensans8.h"
+#include "opensans10.h"
+#include "opensans20.h"
+#include "opensans34.h"
+#include "opensans50.h"
 
 #include "logos.h"