Merge branch 'InfiniTimeOrg:main' into feature/custom-font

mzrinsky · web-flow · commit 460e00fb98de · 2025-03-21T22:41:27.000-05:00
diff --git a/.gitconfig b/.gitconfig
diff --git a/doc/buildAndProgram.md b/doc/buildAndProgram.md
@@ -66,7 +66,7 @@ DFU files are the files you'll need to install your build of InfiniTime using OT
 #### CMake command 
 
 ```
-cmake -DARM_NONE_EABI_TOOLCHAIN_PATH=... -DNRF5_SDK_PATH=...
+cmake -DARM_NONE_EABI_TOOLCHAIN_PATH=... -DNRF5_SDK_PATH=... -S ..
 ```
 
 ### Build the project
diff --git a/doc/code/Apps.md b/doc/code/Apps.md
@@ -124,7 +124,7 @@ MyApp.h:
 ```cpp
 #pragma once
 
-#include "displayapp/Apps.h"
+#include "displayapp/apps/Apps.h"
 #include "displayapp/screens/Screen.h"
 #include "displayapp/Controllers.h"
 #include "Symbols.h"
