From e78e12fa7c0597749f96d6dc6b0424abe4d0ef9d Mon Sep 17 00:00:00 2001 From: Jeff Epler Date: Wed, 19 Mar 2025 15:03:42 -0500 Subject: [PATCH] fix psram-required check --- .gitmodules | 3 +++ external/pico-extras | 1 + fruitjam-build.sh | 2 +- 3 files changed, 5 insertions(+), 1 deletion(-) create mode 160000 external/pico-extras diff --git a/.gitmodules b/.gitmodules index 2cfb244..31792d6 100644 --- a/.gitmodules +++ b/.gitmodules @@ -10,3 +10,6 @@ [submodule "lib/Pico-PIO-USB"] path = lib/Pico-PIO-USB url = https://github.com/tannewt/Pico-PIO-USB +[submodule "external/pico-extras"] + path = external/pico-extras + url = https://github.com/raspberrypi/pico-extras.git diff --git a/external/pico-extras b/external/pico-extras new file mode 160000 index 0000000..f05d4f7 --- /dev/null +++ b/external/pico-extras @@ -0,0 +1 @@ +Subproject commit f05d4f7371802440cadd36744789a26944d950ac diff --git a/fruitjam-build.sh b/fruitjam-build.sh index afeae76..29d0d52 100755 --- a/fruitjam-build.sh +++ b/fruitjam-build.sh @@ -40,7 +40,7 @@ while getopts "hvd:m:" o; do done TAG=fruitjam_${DISP_WIDTH}x${DISP_HEIGHT}_${MEMSIZE}k -PSRAM=$((MEMSIZE > 448 || DISP_WIDTH > 640)) +PSRAM=$((MEMSIZE > 448 || DISP_WIDTH < 640)) if [ $PSRAM -ne 0 ] ; then TAG=${TAG}_psram CMAKE_ARGS="$CMAKE_ARGS -DUSE_PSRAM=1"