Merge 390855b96e into 8598142c27

Remove unused submodule QCBOR (#2138 )
The submodule isn't used anymore. Remove the submodule reference completely.
2024-10-22 15:11:51 +02:00 · 2024-10-11 07:37:03 +10:00 · 2024-10-09 20:26:08 +02:00 · 2023-05-10 12:01:18 -07:00
3 changed files with 8 additions and 4 deletions
--- a/.gitmodules
+++ b/.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
--- a/doc/buildAndProgram.md
+++ b/doc/buildAndProgram.md
@ -19,6 +19,7 @@ To build this project, you'll need:
  - see [lv_font_conv](https://github.com/lvgl/lv_font_conv#install-the-script)
  - 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`
+- To build resources, you will also need lv_img_conv: `npm install lv_img_conv typescript @swc/core`

 ## Build steps

@ -69,6 +70,13 @@ DFU files are the files you'll need to install your build of InfiniTime using OT
 cmake -DARM_NONE_EABI_TOOLCHAIN_PATH=... -DNRF5_SDK_PATH=...
 ```

+If you've extracted the NRF SDK and cross compiler into the root of the InfiniTime repo, you can run the following to build just the firmware image which can be loaded over Bluetooth:
+
+```
+PATH="$PATH:$PWD/node_modules/.bin" cmake -DBUILD_DFU=1 -DBUILD_RESOURCES=0 -DARM_NONE_EABI_TOOLCHAIN_PATH=$(realpath ../gcc-arm-none-eabi-10.3-2021.10/) -DNRF5_SDK_PATH=$(realpath ../nRF5_SDK_15.3.0_59ac345/) ..
+make pinetime-mcuboot-app
+```
+
 ### Build the project

 During the project generation, CMake created the following targets:
--- a/src/libs/QCBOR
+++ b/src/libs/QCBOR
@ -1 +0,0 @@
-Subproject commit 56b17bf9f74096774944bcac0829adcd887d391e
Author	SHA1	Message	Date
khimaros	c06f89944c	Merge `390855b96e` into `8598142c27`	2024-10-11 07:37:03 +10:00
NeroBurner	8598142c27	Remove unused submodule QCBOR (#2138 ) Some checks failed CI / build-firmware (push) Successful in 5m57s Details CI / build-simulator (push) Failing after 3s Details CI / get-base-ref-size (push) Has been skipped Details CI / Compare build size (push) Has been skipped Details The submodule isn't used anymore. Remove the submodule reference completely.	2024-10-09 20:26:08 +02:00
khimaros	390855b96e	small changes to build documentation - document lv_img_conf dep for resource building - add example command with all needed defines for firmware build	2023-05-10 12:01:18 -07:00
				`@ -1 +0,0 @@`
				`Subproject commit 56b17bf9f74096774944bcac0829adcd887d391e`