Add fancy font and fuzzy logic

zyphlar · Jan 10, 2024 · 7b3c48a · 7b3c48a
1 parent d8c3624
commit 7b3c48a
Show file tree

Hide file tree

Showing 15 changed files with 64 additions and 1,422 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -3,7 +3,7 @@ name: CI
 # Run this workflow whenever the build may be affected
 on:
   push:
-    branches: [ main, wb/fuzzy, wb/fuzzy-norm, wb/fuzzy-analog ]
+    branches: [ main, wb/fuzzy, wb/fuzzy-norm, wb/fuzzy-analog, wb/fuzzy-everything-wolf ]
     paths-ignore:
       - 'doc/**'
       - '**.md'

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -425,10 +425,10 @@ list(APPEND SOURCE_FILES
         ## Watch faces
         displayapp/screens/WatchFaceAnalog.cpp
         displayapp/screens/WatchFaceDigital.cpp
-        displayapp/screens/WatchFaceInfineat.cpp
-        displayapp/screens/WatchFaceTerminal.cpp
+        #displayapp/screens/WatchFaceInfineat.cpp
+        #displayapp/screens/WatchFaceTerminal.cpp
         displayapp/screens/WatchFacePineTimeStyle.cpp
-        displayapp/screens/WatchFaceCasioStyleG7710.cpp
+        #displayapp/screens/WatchFaceCasioStyleG7710.cpp
 
         ##
 

diff --git a/src/displayapp/UserApps.h b/src/displayapp/UserApps.h
@@ -9,10 +9,10 @@
 #include "displayapp/screens/ApplicationList.h"
 #include "displayapp/screens/WatchFaceDigital.h"
 #include "displayapp/screens/WatchFaceAnalog.h"
-#include "displayapp/screens/WatchFaceCasioStyleG7710.h"
-#include "displayapp/screens/WatchFaceInfineat.h"
+// #include "displayapp/screens/WatchFaceCasioStyleG7710.h"
+// #include "displayapp/screens/WatchFaceInfineat.h"
 #include "displayapp/screens/WatchFacePineTimeStyle.h"
-#include "displayapp/screens/WatchFaceTerminal.h"
+// #include "displayapp/screens/WatchFaceTerminal.h"
 
 namespace Pinetime {
   namespace Applications {

diff --git a/src/displayapp/apps/Apps.h.in b/src/displayapp/apps/Apps.h.in
@@ -49,9 +49,6 @@ namespace Pinetime {
       Digital,
       Analog,
       PineTimeStyle,
-      Terminal,
-      Infineat,
-      CasioStyleG7710,
     };
 
     template <Apps>
@@ -74,10 +71,7 @@ namespace Pinetime {
 
     using UserWatchFaceTypes = WatchFaceTypeList<WatchFace::Digital,
                                                  WatchFace::Analog,
-                                                 WatchFace::PineTimeStyle,
-                                                 WatchFace::Terminal,
-                                                 WatchFace::Infineat,
-                                                 WatchFace::CasioStyleG7710>;
+                                                 WatchFace::PineTimeStyle>;
 
     static_assert(UserWatchFaceTypes::Count >= 1);
   }

diff --git a/src/displayapp/apps/CMakeLists.txt b/src/displayapp/apps/CMakeLists.txt
@@ -1,10 +1,8 @@
 if(DEFINED ENABLE_USERAPPS)
     set(USERAPP_TYPES ${ENABLE_USERAPPS} CACHE STRING "List of user apps to build into the firmware")
 else ()
-    set(USERAPP_TYPES "Apps::Navigation, Apps::StopWatch, Apps::Alarm, Apps::Timer, Apps::Steps, Apps::HeartRate, Apps::Music, Apps::Twos" CACHE STRING "List of user apps to build into the firmware")
-    #Apps::Paint,
-    #Apps::Metronome,
-    #Apps::Paddle,
+    set(USERAPP_TYPES "Apps::Navigation, Apps::Alarm, Apps::Steps, Apps::HeartRate, Apps::Music, Apps::Twos" CACHE STRING "List of user apps to build into the firmware")
+    #Apps::Paint, Apps::Metronome, Apps::Paddle, Apps::StopWatch, Apps::Timer, 
 endif ()
 
 add_library(infinitime_apps INTERFACE)

diff --git a/src/displayapp/fonts/fonts.json b/src/displayapp/fonts/fonts.json
@@ -17,12 +17,13 @@
    "jetbrains_mono_42": {
       "sources": [
          {
-            "file": "JetBrainsMono-Regular.ttf",
+            "disabledfile": "JetBrainsMono-Regular.ttf",
+            "file": "Vulf Mono Light Italic.ttf",
             "range": "0x20, 0x25, 0x27, 0x2b, 0x2d, 0x30-0x3a, 0x4b-0x4d, 0x61-0x7a"
          }
       ],
       "bpp": 1,
-      "size": 42
+      "size": 30
    },
    "jetbrains_mono_76": {
       "sources": [