Update submodule, use new config system

StarGate01 · May 25, 2022 · 3cdae58 · 3cdae58
1 parent 8d53a02
commit 3cdae58
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/InfiniTime b/InfiniTime
diff --git a/scripts/build_infinitime.sh b/scripts/build_infinitime.sh
@@ -12,9 +12,9 @@ COMMON_OPTIONS="-DCMAKE_BUILD_TYPE=Release -DARM_NONE_EABI_TOOLCHAIN_PATH=/usr -
 if [ "$TARGET" = "pinetime" ]; then
     cmake -DDRIVER_TOUCH=DYNAMIC -DTARGET_DEVICE=PINETIME -DLF_CLK=XTAL -DDRIVER_ACC=BMA421 $COMMON_OPTIONS ..
 elif [ "$TARGET" = "p8" ] || [ "$TARGET" = "p8b" ]; then
-    cmake -DDRIVER_TOUCH=REPORT -DTARGET_DEVICE=P8 -DLF_CLK=RC -DDRIVER_ACC=SC7A20 $COMMON_OPTIONS ..
+    cmake -DTARGET_DEVICE=P8B $COMMON_OPTIONS ..
 elif [ "$TARGET" = "p8a" ]; then
-    cmake -DDRIVER_TOUCH=GESTURE -DTARGET_DEVICE=P8 -DLF_CLK=XTAL -DDRIVER_ACC=BMA421 $COMMON_OPTIONS ..
+    cmake -DTARGET_DEVICE=P8A $COMMON_OPTIONS ..
 fi
 
 make -j$(nproc) pinetime-mcuboot-app pinetime-mcuboot-recovery-loader
diff --git a/scripts/build_infinitime_dev.sh b/scripts/build_infinitime_dev.sh
@@ -10,11 +10,11 @@ cd build
 
 COMMON_OPTIONS="-DCMAKE_BUILD_TYPE=Release -DARM_NONE_EABI_TOOLCHAIN_PATH=/usr -DNRF5_SDK_PATH=/opt/nrf5-sdk -DUSE_JLINK=1 -DNRFJPROG=/usr/bin/nrfjprog -DBUILD_DFU=1"
 if [ "$TARGET" = "pinetime" ]; then
-    cmake -DDRIVER_TOUCH=DYNAMIC -DTARGET_DEVICE=PINETIME -DLF_CLK=XTAL -DDRIVER_ACC=BMA421 $COMMON_OPTIONS ..
+    cmake -DTARGET_DEVICE=PINETIME $COMMON_OPTIONS ..
 elif [ "$TARGET" = "p8" ] || [ "$TARGET" = "p8b" ]; then
-    cmake -DDRIVER_TOUCH=REPORT -DTARGET_DEVICE=P8 -DLF_CLK=RC -DDRIVER_ACC=SC7A20 $COMMON_OPTIONS ..
+    cmake -DTARGET_DEVICE=P8B $COMMON_OPTIONS ..
 elif [ "$TARGET" = "p8a" ]; then
-    cmake -DDRIVER_TOUCH=GESTURE -DTARGET_DEVICE=P8 -DLF_CLK=XTAL -DDRIVER_ACC=BMA421 $COMMON_OPTIONS ..
+    cmake -DTARGET_DEVICE=P8A $COMMON_OPTIONS ..
 fi
 
 make -j$(nproc) pinetime-app
+5 −1		.github/workflows/format.yml
+6 −2		.github/workflows/lv_sim.yml
+4 −0		.github/workflows/main.yml
+3 −19		CMakeLists.txt
+5 −4		doc/buildAndProgram.md
+10 −4		docker/Dockerfile
+31 −28		src/CMakeLists.txt
+0 −1		src/displayapp/DummyLittleVgl.h
+35 −0		src/displayapp/fonts/CMakeLists.txt
+ −		src/displayapp/fonts/FontAwesome5-Solid+Brands+Regular.woff
+9 −76		src/displayapp/fonts/README.md
+78 −0		src/displayapp/fonts/fonts.json
+75 −0		src/displayapp/fonts/generate.py
+0 −258		src/displayapp/fonts/jetbrains_mono_42.c
+0 −554		src/displayapp/fonts/jetbrains_mono_76.c
+0 −1,334		src/displayapp/fonts/jetbrains_mono_bold_20.c
+6 −0		src/displayapp/fonts/jetbrains_mono_bold_20.c_zero.patch
+0 −523		src/displayapp/fonts/jetbrains_mono_extrabold_compressed.c
+0 −2,636		src/displayapp/fonts/lv_font_navi_80.c
+0 −324		src/displayapp/fonts/lv_font_sys_48.c
+0 −1,261		src/displayapp/fonts/open_sans_light.c
+1 −1		src/drivers/Bma421.cpp
+2 −3		src/drivers/PinMap.h
+6 −34		src/drivers/SC7A20.cpp
+0 −7		src/drivers/SC7A20.h
+3 −9		src/main.cpp
+0 −6		src/systemtask/SystemTask.cpp
+7 −4		tests/test-format.sh