Merge 1f9e8732b1 into 8598142c27

The submodule isn't used anymore. Remove the submodule reference
completely.

.github/workflows/main.yml

@@ -79,15 +79,15 @@ jobs:
       run:  |
         sudo apt-get -y install ninja-build
 
-    - name: Install lv_font_conv
-      run:
-        npm i -g lv_font_conv@1.5.2
-
     - name: Checkout source files
       uses: actions/checkout@v3
       with:
         submodules: recursive
 
+    - name: Install npm packages
+      run:
+        npm i
+
     - name: Get InfiniSim repo
       run:  |
         git clone https://github.com/InfiniTimeOrg/InfiniSim.git --depth 1 --branch main

.gitignore

@@ -50,3 +50,6 @@ src/arm-none-eabi
 
 # clangd
 .cache/
+
+# npm
+node_modules/

.gitmodules

@@ -4,9 +4,6 @@
 [submodule "src/libs/littlefs"]
 	path = src/libs/littlefs
 	url = https://github.com/littlefs-project/littlefs.git
-[submodule "src/libs/QCBOR"]
-	path = src/libs/QCBOR
-	url = https://github.com/laurencelundblade/QCBOR.git
 [submodule "src/libs/arduinoFFT"]
 	path = src/libs/arduinoFFT
 	url = https://github.com/kosme/arduinoFFT.git

doc/buildAndProgram.md

@@ -15,10 +15,9 @@ To build this project, you'll need:
     python -m pip install -r tools/mcuboot/requirements.txt
     ```
 - A reasonably recent version of CMake (I use 3.16.5)
-- lv_font_conv, to generate the font .c files
-  - see [lv_font_conv](https://github.com/lvgl/lv_font_conv#install-the-script)
+- lv_font_conv and lv_img_conv, to generate the font .c files
   - install npm (commonly done via the package manager, ensure node's version is at least 12)
-  - install lv_font_conv: `npm install lv_font_conv`
+  - install the modules: `npm install`
 
 ## Build steps
 

docker/Dockerfile

@@ -49,7 +49,6 @@ RUN apt-get update -qq \
 RUN pip3 install adafruit-nrfutil
 RUN pip3 install -Iv cryptography==3.3
 RUN pip3 install cbor
-RUN npm i lv_font_conv@1.5.2 -g
 
 # build.sh knows how to compile
 COPY build.sh /opt/

docker/build.sh

@@ -33,6 +33,8 @@ main() {
   [ ! -d "$TOOLS_DIR/$NRF_SDK_VER" ] && GetNrfSdk
   [ ! -d "$TOOLS_DIR/mcuboot" ] && GetMcuBoot
 
+  npm i
+
   mkdir -p "$BUILD_DIR"
 
   CmakeGenerate

package-lock.json

@@ -0,0 +1,118 @@
+{
+  "name": "InfiniTime",
+  "lockfileVersion": 3,
+  "requires": true,
+  "packages": {
+    "": {
+      "dependencies": {
+        "lv_font_conv": "^1.5.2"
+      }
+    },
+    "node_modules/lv_font_conv": {
+      "version": "1.5.2",
+      "resolved": "https://registry.npmjs.org/lv_font_conv/-/lv_font_conv-1.5.2.tgz",
+      "integrity": "sha512-0UapRSTkVP/pnB8Z4r2HDHx5p2dJx/xUG1+14u/WXo59mwuC7BahR+Bnx/66jKoDrG1wFQwn9ZzoyMxRHOD9bg==",
+      "bundleDependencies": [
+        "argparse",
+        "bit-buffer",
+        "debug",
+        "make-error",
+        "mkdirp",
+        "opentype.js",
+        "pngjs"
+      ],
+      "dependencies": {
+        "argparse": "^2.0.0",
+        "bit-buffer": "^0.2.5",
+        "debug": "^4.1.1",
+        "make-error": "^1.3.5",
+        "mkdirp": "^1.0.4",
+        "opentype.js": "^1.1.0",
+        "pngjs": "^6.0.0"
+      },
+      "bin": {
+        "lv_font_conv": "lv_font_conv.js"
+      }
+    },
+    "node_modules/lv_font_conv/node_modules/argparse": {
+      "version": "2.0.1",
+      "inBundle": true,
+      "license": "Python-2.0"
+    },
+    "node_modules/lv_font_conv/node_modules/bit-buffer": {
+      "version": "0.2.5",
+      "inBundle": true,
+      "license": "MIT"
+    },
+    "node_modules/lv_font_conv/node_modules/debug": {
+      "version": "4.3.1",
+      "inBundle": true,
+      "license": "MIT",
+      "dependencies": {
+        "ms": "2.1.2"
+      },
+      "engines": {
+        "node": ">=6.0"
+      },
+      "peerDependenciesMeta": {
+        "supports-color": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/lv_font_conv/node_modules/make-error": {
+      "version": "1.3.6",
+      "inBundle": true,
+      "license": "ISC"
+    },
+    "node_modules/lv_font_conv/node_modules/mkdirp": {
+      "version": "1.0.4",
+      "inBundle": true,
+      "license": "MIT",
+      "bin": {
+        "mkdirp": "bin/cmd.js"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/lv_font_conv/node_modules/ms": {
+      "version": "2.1.2",
+      "inBundle": true,
+      "license": "MIT"
+    },
+    "node_modules/lv_font_conv/node_modules/opentype.js": {
+      "version": "1.3.3",
+      "inBundle": true,
+      "license": "MIT",
+      "dependencies": {
+        "string.prototype.codepointat": "^0.2.1",
+        "tiny-inflate": "^1.0.3"
+      },
+      "bin": {
+        "ot": "bin/ot"
+      },
+      "engines": {
+        "node": ">= 8.0.0"
+      }
+    },
+    "node_modules/lv_font_conv/node_modules/pngjs": {
+      "version": "6.0.0",
+      "inBundle": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=12.13.0"
+      }
+    },
+    "node_modules/lv_font_conv/node_modules/string.prototype.codepointat": {
+      "version": "0.2.1",
+      "inBundle": true,
+      "license": "MIT"
+    },
+    "node_modules/lv_font_conv/node_modules/tiny-inflate": {
+      "version": "1.0.3",
+      "inBundle": true,
+      "license": "MIT"
+    }
+  }
+}

package.json

@@ -0,0 +1,5 @@
+{
+  "dependencies": {
+    "lv_font_conv": "^1.5.2"
+  }
+}

src/displayapp/fonts/CMakeLists.txt

@@ -2,7 +2,8 @@ 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)
 find_program(LV_FONT_CONV "lv_font_conv" NO_CACHE REQUIRED
-   HINTS "${CMAKE_SOURCE_DIR}/node_modules/.bin")
+   HINTS "${CMAKE_SOURCE_DIR}/node_modules/.bin"
+   HINTS "${InfiniTime_DIR}/node_modules/.bin")
 message(STATUS "Using ${LV_FONT_CONV} to generate font files")
 configure_file(${CMAKE_CURRENT_LIST_DIR}/jetbrains_mono_bold_20.c_zero.patch
    ${CMAKE_CURRENT_BINARY_DIR}/jetbrains_mono_bold_20.c_zero.patch COPYONLY)

src/libs/QCBOR

@@ -1 +0,0 @@
-Subproject commit 56b17bf9f74096774944bcac0829adcd887d391e

src/resources/CMakeLists.txt

@@ -1,6 +1,7 @@
 
 find_program(LV_FONT_CONV "lv_font_conv" NO_CACHE REQUIRED
-    HINTS "${CMAKE_SOURCE_DIR}/node_modules/.bin")
+    HINTS "${CMAKE_SOURCE_DIR}/node_modules/.bin"
+    HINTS "${InfiniTime_DIR}/node_modules/.bin")
 message(STATUS "Using ${LV_FONT_CONV} to generate font files")
 
 find_program(LV_IMG_CONV "lv_img_conv.py" NO_CACHE REQUIRED