Replace Roboto fonts with Ubuntu fonts (#57)

The Ubuntu fonts generally look better at small point sizes because they have type hinting for non-antialiased displays. They are the only openly licensed fonts that I can find with this property. Not 100% happy with the look of Ubuntu fonts, as they are very wide, which is not so good for compact displays. I am keeping the large Roboto fonts in examples, as they look much better for large point sizes.
unital · Nov 11, 2024 · 54a7688 · 54a7688
1 parent 0b2adf3
commit 54a7688
Show file tree

Hide file tree

Showing 29 changed files with 669 additions and 615 deletions.
diff --git a/docs/source/index.rst b/docs/source/index.rst
@@ -62,8 +62,8 @@ Most of the code is licensed using the MIT license:
   OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
   SOFTWARE.
 
-The bitmap fonts included with the Tempe source are derived from Roboto and
-are licensed with the Apache License 2.0: see
+The bitmap fonts included with the Tempe source are derived from Ubuntu fonts
+and are licensed with the Ubuntu Font License: see
 `github.com/unital/tempe/blob/main/src/tempe/fonts/README.rst <https://github.com/unital/tempe/blob/main/src/tempe/fonts/README.rst>`_
 for details.
 
diff --git a/docs/source/user_guide/line_plot_4.png b/docs/source/user_guide/line_plot_4.png
diff --git a/docs/source/user_guide/polar.png b/docs/source/user_guide/polar.png
diff --git a/docs/source/user_guide/polar_plot.png b/docs/source/user_guide/polar_plot.png
diff --git a/docs/source/user_guide/scatter_plot.png b/docs/source/user_guide/scatter_plot.png
diff --git a/docs/source/user_guide/shapes.png b/docs/source/user_guide/shapes.png
diff --git a/docs/source/user_guide/tutorial.rst b/docs/source/user_guide/tutorial.rst
@@ -420,16 +420,16 @@ format produced by Peter Hinch's
 `font_to_py script <https://github.com/peterhinch/micropython-font-to-py>`_,
 or AntiRez's `microfont library <https://github.com/antirez/microfont>`_,
 as well as a slightly more efficient internal variant.  Tempe provides bitmap
-versions of Google's Roboto font at 16 pt, which looks reasonably good on small
-screens.
+versions of Canconical's Ubuntu font at 16 pt, which looks reasonably good on
+small screens.
 
 These fonts are typically shipped as modules::
 
     from tempe.font import TempeFont
-    from tempe.fonts import roboto16bold
+    from tempe.fonts import ubuntu16bold
     from tempe.text import CENTER
 
-    font = TempeFont(roboto16bold)
+    font = TempeFont(ubuntu16bold)
 
     surface.text(
         "DRAWING",

diff --git a/src/tempe/fonts/LICENSE_roboto.txt → examples/example_fonts/LICENSE_roboto.txt b/src/tempe/fonts/LICENSE_roboto.txt → examples/example_fonts/LICENSE_roboto.txt
diff --git a/examples/example_fonts/LICENSE_ubuntu.txt b/examples/example_fonts/LICENSE_ubuntu.txt
diff --git a/examples/example_fonts/README.rst b/examples/example_fonts/README.rst
diff --git a/examples/hello_world.py b/examples/hello_world.py
@@ -10,7 +10,7 @@
 from tempe.shapes import Rectangles
 from tempe.display import FileDisplay
 from tempe.font import TempeFont
-from tempe.fonts import roboto16bold
+from tempe.fonts import ubuntu16bold
 
 
 # a buffer one half the size of the screen
@@ -23,7 +23,7 @@
 surface.add_shape("BACKGROUND", background)
 
 # draw some black text in the main drawing layer
-font = TempeFont(roboto16bold)
+font = TempeFont(ubuntu16bold)
 hello_tempe = Text(
     [(10, 10)], [0x0000], ["Hello Tempe!"], font=font, clip=(0, 0, 120, 60)
 )

diff --git a/examples/line_plot_example.py b/examples/line_plot_example.py
@@ -141,23 +141,23 @@ def scale_values(self, data):
 )
 
 # Plot title and additional information
-from tempe.fonts import roboto16bold, roboto16
+from tempe.fonts import ubuntu16bold, ubuntu16
 from tempe.font import TempeFont
 
 surface.text(
     "DRAWING",
     (4, 0),
     colors.grey_a,
     "Temperature (°C)",
-    font=TempeFont(roboto16bold),
+    font=TempeFont(ubuntu16bold),
 )
 surface.text(
     "DRAWING",
     (320, 0),
     colors.grey_a,
     "October 21-22, 2024",
     (RIGHT, TOP),
-    font=TempeFont(roboto16),
+    font=TempeFont(ubuntu16),
 )
 
 

diff --git a/examples/polar_plot_example.py b/examples/polar_plot_example.py
@@ -183,22 +183,22 @@ def scale_values(self, data):
 gc.collect()
 
 # Plot title and additional information
-from tempe.fonts import roboto16bold, roboto16
+from tempe.fonts import ubuntu16bold, ubuntu16
 from tempe.font import TempeFont
 
 surface.text(
     "DRAWING",
     (4, 0),
     colors.grey_a,
     "Air Quality (ppb)",
-    font=TempeFont(roboto16bold),
+    font=TempeFont(ubuntu16bold),
 )
 surface.text(
     "DRAWING",
     (4, 20),
     colors.grey_8,
     "20/8/24--\n22/8/24",
-    font=TempeFont(roboto16),
+    font=TempeFont(ubuntu16),
 )
 
 

diff --git a/examples/scatter_plot_example.py b/examples/scatter_plot_example.py
@@ -343,29 +343,29 @@ def scale_values(self, data):
 )
 
 # Plot title and additional information
-from tempe.fonts import roboto16bold
+from tempe.fonts import ubuntu16bold
 from tempe.font import TempeFont
 
 surface.text(
     "DRAWING",
     [[4, 0]],
     [colors.grey_a],
     ["Temperature (°C) vs. Air Quality (ppb)"],
-    font=TempeFont(roboto16bold),
+    font=TempeFont(ubuntu16bold),
 )
 surface.text(
     "DRAWING",
     [[x1 + 20, y - 20]],
     [colors.grey_a],
     ["20-22/8/24"],
-    font=TempeFont(roboto16bold),
+    font=TempeFont(ubuntu16bold),
 )
 surface.text(
     "DRAWING",
     [[x1 + 20, cy + 50]],
     [colors.grey_a],
     ["Humidity"],
-    font=TempeFont(roboto16bold),
+    font=TempeFont(ubuntu16bold),
 )
 
 

diff --git a/examples/shapes_examples.py b/examples/shapes_examples.py
@@ -30,7 +30,7 @@
 )
 from tempe.display import FileDisplay
 from tempe.font import TempeFont
-from tempe.fonts import roboto16bold
+from tempe.fonts import ubuntu16bold
 
 random.seed(0)
 
@@ -44,7 +44,7 @@
 surface.add_shape("BACKGROUND", background)
 
 # draw some black text in the main drawing layer
-font = TempeFont(roboto16bold)
+font = TempeFont(ubuntu16bold)
 labels = Text(
     [
         (4, 4),

diff --git a/examples/temperature_screen.py b/examples/temperature_screen.py
@@ -24,7 +24,7 @@
 from tempe.markers import Marker
 from tempe.surface import Surface
 from tempe.component import Component, Label, LinePlot, ScatterPlot, BarPlot
-from tempe.fonts import roboto16bold, roboto32boldnumbers, roboto24boldnumbers
+from tempe.fonts import ubuntu16bold, roboto32boldnumbers, roboto24boldnumbers
 from tempe.colormaps.plasma import plasma
 from tempe.colormaps.viridis import viridis
 
@@ -343,11 +343,11 @@ async def main():
     display = await init_display()
     surface = Surface()
     background = Component(surface, (0, 0, w, h))
-    label_1 = Label(surface, (4, 4, 100, 20), "Temperature", font=roboto16bold)
-    label_2 = Label(surface, (4, 64, 152, 20), "Memory Pressure", font=roboto16bold)
-    label_3 = Label(surface, (4, 124, 152, 20), "Free Memory", font=roboto16bold)
-    label_4 = Label(surface, (4, 184, 152, 20), "Stack Use", font=roboto16bold)
-    label_5 = Label(surface, (164, 184, 152, 20), "Frequency", font=roboto16bold)
+    label_1 = Label(surface, (4, 4, 100, 20), "Temperature", font=ubuntu16bold)
+    label_2 = Label(surface, (4, 64, 152, 20), "Memory Pressure", font=ubuntu16bold)
+    label_3 = Label(surface, (4, 124, 152, 20), "Free Memory", font=ubuntu16bold)
+    label_4 = Label(surface, (4, 184, 152, 20), "Stack Use", font=ubuntu16bold)
+    label_5 = Label(surface, (164, 184, 152, 20), "Frequency", font=ubuntu16bold)
     freq_display = Label(
         surface,
         (164, 204, 76, 35),

diff --git a/examples/update_example.py b/examples/update_example.py
@@ -5,13 +5,15 @@
 """Example showing asyncio updating of a surface."""
 
 import asyncio
-from machine import ADC, RTC
+from machine import ADC, RTC, I2C, Pin
 
 from tempe import colors
 from tempe.font import TempeFont
 from tempe.surface import Surface
 from tempe.text import TOP, RIGHT
 
+from example_devices.bme280 import BME280
+
 
 # a buffer one half the size of the screen
 WORKING_BUFFER = bytearray(2 * 240 * 161)
@@ -74,6 +76,15 @@ async def update_temperature(adc, text_field):
             text_field.update(texts=[text])
         await asyncio.sleep(1)
 
+async def update_temperature_bme(bme, text_field):
+    while True:
+        temp = bme.read_compensated_data()[0] / 100
+        text = f"{temp:.2f}°C"
+        # only update when needed
+        if text != text_field.texts[0]:
+            text_field.update(texts=[text])
+        await asyncio.sleep(1)
+
 
 async def refresh_display(surface, display, working_buffer):
     import time
@@ -91,6 +102,10 @@ async def main(working_buffer):
     surface = Surface()
     temp_adc = ADC(ADC.CORE_TEMP)
     rtc = RTC()
+
+    i2c = I2C(0, scl=Pin(5), sda=Pin(4))
+    bme = BME280(i2c=i2c)
+
     display, fields = await asyncio.gather(
         init_display(),
         init_surface(surface),
@@ -101,7 +116,8 @@ async def main(working_buffer):
     await asyncio.gather(
         refresh_display(surface, display, working_buffer),
         update_time(rtc, time_field),
-        update_temperature(temp_adc, temp_field),
+        #update_temperature(temp_adc, temp_field),
+        update_temperature_bme(bme, temp_field),
     )
 
 

diff --git a/src/tempe/component.py b/src/tempe/component.py
@@ -22,9 +22,9 @@
 from .markers import Marker
 
 try:
-    from .fonts import roboto16
+    from .fonts import ubuntu16
 
-    default_font = roboto16
+    default_font = ubuntu16
 except ImportError:
     default_font = None
 

diff --git a/src/tempe/fonts/LICENSE_ubuntu.txt b/src/tempe/fonts/LICENSE_ubuntu.txt
diff --git a/src/tempe/fonts/README.rst b/src/tempe/fonts/README.rst
@@ -4,7 +4,7 @@ Fonts
 The fonts in this directory a bitmap fonts derived from various
 sources.
 
-roboto*.py
-    These are fonts derived from the Roboto fonts by Google.  They are
-    licensed under the Apache license.  See LICENSE_roboto.txt for further
+ubuntu*.py
+    These are fonts derived from the Ubuntu fonts by Canconical.  They are
+    licensed under the Ubuntu Font License.  See LICENSE_ubuntu.txt for further
     details.