diff --git a/InfiniTime b/InfiniTime index 48dc842..f564b04 160000 --- a/InfiniTime +++ b/InfiniTime @@ -1 +1 @@ -Subproject commit 48dc842a5ff20530d7cef1804fbc0b5aa20961b4 +Subproject commit f564b040376af854f8bf3879aa4ea345d553da09 diff --git a/scripts/build_infinitime.sh b/scripts/build_infinitime.sh index 06c093d..f9309d2 100755 --- 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 \ No newline at end of file diff --git a/scripts/build_infinitime_dev.sh b/scripts/build_infinitime_dev.sh index a60d602..00f56c1 100755 --- 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 \ No newline at end of file