From 917e46c684a590f708b12458dc5f197cc9bee0fc Mon Sep 17 00:00:00 2001
From: ITCactus <n/a>
Date: Mon, 16 May 2022 12:05:14 +0200
Subject: post rebase fixes

---
 src/displayapp/fonts/CMakeLists.txt |  2 +-
 src/displayapp/fonts/fonts.json     | 32 +++++++++++++++++++++++++++++++-
 2 files changed, 32 insertions(+), 2 deletions(-)

(limited to 'src/displayapp/fonts')

diff --git a/src/displayapp/fonts/CMakeLists.txt b/src/displayapp/fonts/CMakeLists.txt
index 84830cc0..7af899ba 100644
--- a/src/displayapp/fonts/CMakeLists.txt
+++ b/src/displayapp/fonts/CMakeLists.txt
@@ -1,6 +1,6 @@
 set(FONTS jetbrains_mono_42 jetbrains_mono_76 jetbrains_mono_bold_20
    jetbrains_mono_extrabold_compressed lv_font_navi_80 lv_font_sys_48
-   open_sans_light)
+   open_sans_light lv_font_dots_40 lv_font_7segment_40 lv_font_7segment_115)
 find_program(LV_FONT_CONV "lv_font_conv" NO_CACHE REQUIRED
    HINTS "${CMAKE_SOURCE_DIR}/node_modules/.bin")
 message(STATUS "Using ${LV_FONT_CONV} to generate font files")
diff --git a/src/displayapp/fonts/fonts.json b/src/displayapp/fonts/fonts.json
index abdb4512..b1593312 100644
--- a/src/displayapp/fonts/fonts.json
+++ b/src/displayapp/fonts/fonts.json
@@ -74,5 +74,35 @@
       "bpp": 2,
       "size": 80,
       "compress": true
+   },
+   "lv_font_dots_40": {
+      "sources": [
+         {
+            "file": "repetitionscrolling.ttf",
+            "symbols": "0123456789-MONTUEWEDTHUFRISATSUN WK"
+         }
+      ],
+      "bpp": 1,
+      "size": 40
+   },
+   "lv_font_7segment_40": {
+      "sources": [
+         {
+            "file": "7segment.woff",
+            "symbols": "0123456789: -"
+         }
+      ],
+      "bpp": 1,
+      "size": 40
+   },
+   "lv_font_7segment_115": {
+      "sources": [
+         {
+            "file": "7segment.woff",
+            "symbols": "0123456789: -"
+         }
+      ],
+      "bpp": 1,
+      "size": 115
    }
-}
+}
\ No newline at end of file
-- 
cgit v1.2.3