Dont know if Im doing this correctly

Author: tituscmd

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_sys_48
-   open_sans_light fontawesome_weathericons)
+   open_sans_light fontawesome_weathericons prime)
 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")

src/displayapp/fonts/fonts.json

@@ -73,5 +73,18 @@
       ],
       "bpp": 1,
       "size": 25
+<<<<<<< HEAD
+=======
+   },
+   "prime": {
+      "sources": [
+         {
+            "file": "Karnivore.ttf",
+            "symbols": "0123456789:"
+         }
+      ],
+      "bpp": 1,
+      "size": 85
+>>>>>>> faf39851 (correctly include new font)
    }
 }

src/libs/lv_conf.h

@@ -419,7 +419,8 @@ typedef void* lv_indev_drv_user_data_t;            /*Type of user data in the in
                                LV_FONT_DECLARE(jetbrains_mono_76) \
                                LV_FONT_DECLARE(open_sans_light) \
                                LV_FONT_DECLARE(fontawesome_weathericons) \
-                               LV_FONT_DECLARE(lv_font_sys_48)
+                               LV_FONT_DECLARE(lv_font_sys_48) \
+                               LV_FONT_DECLARE(prime)
 
 /* Enable it if you have fonts with a lot of characters.
  * The limit depends on the font size, font face and bpp