Rename to PrimeTime and move font to the external storage

Author: tituscmd

docker/build.sh

@@ -55,6 +55,10 @@ GetGcc() {
     echo "missing GCC path: $TOOLS_DIR/$GCC_ARM_PATH"
     return 1
   fi
+  if [ ! -d "$TOOLS_DIR/$GCC_ARM_PATH" ]; then
+    echo "missing GCC path: $TOOLS_DIR/$GCC_ARM_PATH"
+    return 1
+  fi
 }
 
 GetMcuBoot() {
@@ -64,6 +68,10 @@ GetMcuBoot() {
     echo "missing mcuboot path: $TOOLS_DIR/mcuboot"
     return 1
   fi
+  if [ ! -d "$TOOLS_DIR/mcuboot" ]; then
+    echo "missing mcuboot path: $TOOLS_DIR/mcuboot"
+    return 1
+  fi
 }
 
 GetNrfSdk() {
@@ -74,6 +82,10 @@ GetNrfSdk() {
     echo "missing NRF_SDK path: $TOOLS_DIR/$NRF_SDK_VER"
     return 1
   fi
+  if [ ! -d "$TOOLS_DIR/$NRF_SDK_VER" ]; then
+    echo "missing NRF_SDK path: $TOOLS_DIR/$NRF_SDK_VER"
+    return 1
+  fi
 }
 
 CmakeGenerate() {

src/displayapp/apps/Apps.h.in

@@ -53,11 +53,9 @@ namespace Pinetime {
       Terminal,
       Infineat,
       CasioStyleG7710,
-<<<<<<< HEAD
       PrimeTime,
 =======
-      Prime,
->>>>>>> accbd757 (include prime watchface)
+>>>>>>> 74895afb (resolve conflicts)
     };
 
     template <Apps>

src/displayapp/apps/CMakeLists.txt

@@ -28,11 +28,9 @@ else()
     set(DEFAULT_WATCHFACE_TYPES "${DEFAULT_WATCHFACE_TYPES}, WatchFace::Terminal")
     set(DEFAULT_WATCHFACE_TYPES "${DEFAULT_WATCHFACE_TYPES}, WatchFace::Infineat")
     set(DEFAULT_WATCHFACE_TYPES "${DEFAULT_WATCHFACE_TYPES}, WatchFace::CasioStyleG7710")
-<<<<<<< HEAD
     set(DEFAULT_WATCHFACE_TYPES "${DEFAULT_WATCHFACE_TYPES}, WatchFace::PrimeTime")
 =======
-    set(DEFAULT_WATCHFACE_TYPES "${DEFAULT_WATCHFACE_TYPES}, WatchFace::Prime")
->>>>>>> accbd757 (include prime watchface)
+>>>>>>> 9205a2b3 (resolve conflicts)
     set(WATCHFACE_TYPES "${DEFAULT_WATCHFACE_TYPES}" CACHE STRING "List of watch faces to build into the firmware")
 endif()
 

src/displayapp/fonts/Karnivore.ttf

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