Deep Sleep: Fix suspend script crash

.github/workflows/release.yaml

@@ -60,6 +60,7 @@ jobs:
       matrix:
         toolchain:
           - tg5040
+          - tg5050
 
     steps:
       - name: Checkout
@@ -81,6 +82,7 @@ jobs:
       matrix:
         toolchain:
           - tg5040
+          - tg5050
         core: ${{ fromJson(needs.core-matrix.outputs.cores) }}
     steps:
       - name: Checkout
@@ -100,19 +102,11 @@ jobs:
 
   build:
     needs:
-      - build-core
       - prepare
+      - build-core
     runs-on: ubuntu-24.04-arm
     env:
-      PLATFORM: ${{ matrix.toolchain }}
       RELEASE_NAME: ${{ needs.prepare.outputs.release-name }}
-      RELEASE_VERSION: ${{ needs.prepare.outputs.next-tag }}
-    strategy:
-      fail-fast: true
-      matrix:
-        toolchain:
-          - tg5040
-
     steps:
       - name: Checkout
         uses: actions/[email protected]
@@ -125,34 +119,63 @@ jobs:
       - name: Setup
         run: make setup
 
-      - name: Download Cores
+      - name: Download Cores (tg5040)
         uses: actions/[email protected]
         with:
-          path: workspace/${{ env.PLATFORM }}/cores/output/
-          pattern: core-${{ matrix.toolchain }}-*
+          path: workspace/tg5040/cores/output/
+          pattern: core-tg5040-*
+          merge-multiple: true
+
+      - name: Build (tg5040)
+        run: make tg5040
+        env:
+          PLATFORM: tg5040
+
+      - name: Download Cores (tg5050)
+        uses: actions/[email protected]
+        with:
+          path: workspace/tg5050/cores/output/
+          pattern: core-tg5050-*
           merge-multiple: true
 
-      - name: Build
-        run: make ${{ matrix.toolchain }}
+      - name: Build (tg5050)
+        run: make tg5050
+        env:
+          PLATFORM: tg5050
 
       - name: Special
         run: make special
 
-      # note: when multiple platforms are built
-      # the package step will need to be revamped to
-      # merge the release files from each platform into
-      # a single release
       - name: Package
         run: make package
 
-      - name: Upload Artifacts
+      - name: Upload All
         uses: actions/[email protected]
         with:
-          name: release-${{ matrix.toolchain }}.zip
-          path: releases/
+          name: ${{ env.RELEASE_NAME }}-all.zip
+          path: releases/${{ env.RELEASE_NAME }}-all.zip
+
+      - name: Upload Base
+        uses: actions/[email protected]
+        with:
+          name: ${{ env.RELEASE_NAME }}-base.zip
+          path: releases/${{ env.RELEASE_NAME }}-base.zip
+
+      - name: Upload Extras
+        uses: actions/[email protected]
+        with:
+          name: ${{ env.RELEASE_NAME }}-extras.zip
+          path: releases/${{ env.RELEASE_NAME }}-extras.zip
+
+      - name: Skip Attest for PRs from forks
+        id: skip
+        if: github.ref != 'refs/heads/main'
+        run: |
+          echo '::warning title=Attest skipped::Attest action requires permissions and is performed only for main branch.'
 
       - name: Attest Build Provenance
         uses: actions/[email protected]
+        if: github.ref == 'refs/heads/main'
         with:
           subject-path: |
             releases/${{ env.RELEASE_NAME }}-all.zip
@@ -174,7 +197,7 @@ jobs:
         uses: actions/[email protected]
         with:
           path: releases/
-          pattern: release-*
+          pattern: NextUI-*
           merge-multiple: true
 
       - name: Create and Push Tag

.vscode/launch.json

@@ -57,6 +57,18 @@
             "preLaunchTask": "make desktop",
             "envFile": "${workspaceFolder}/.env_desktop",
         },
+        {
+            "name": "App: Clock",
+            "request": "launch",
+            "type": "cppdbg",
+            "osx": {
+              "MIMode": "lldb"
+            },
+            "cwd": "${workspaceFolder}/workspace/all/clock/build/desktop",
+            "program": "${workspaceFolder}/workspace/all/clock/build/desktop/clock.elf",
+            "preLaunchTask": "make desktop",
+            "envFile": "${workspaceFolder}/.env_desktop",
+        },
         {
             "name": "App: Gametimectl",
             "request": "launch",

makefile

@@ -38,7 +38,7 @@ RELEASE_NAME ?= $(RELEASE_BASE)-$(RELEASE_DOT)
 VENDOR_DEST := ./build/VENDOR/Tools
 PACKAGE_URL_MAPPINGS := \
 	"https://github.com/UncleJunVIP/nextui-pak-store/releases/latest/download/Pak.Store.pakz nextui.pak_store.pakz" \
-	"https://github.com/LanderN/nextui-updater-pak/releases/latest/download/nextui-updater-pak.zip nextui.updater.pakz"
+	"https://github.com/frysee/nextui-updater-pak/releases/latest/download/nextui.updater.pakz nextui.updater.pakz"
 	# add more URLs as needed
 
 ###########################################################
@@ -100,6 +100,7 @@ endif
 	cp ./workspace/all/nextui/build/$(PLATFORM)/nextui.elf ./build/SYSTEM/$(PLATFORM)/bin/
 	cp ./workspace/all/minarch/build/$(PLATFORM)/minarch.elf ./build/SYSTEM/$(PLATFORM)/bin/
 	cp ./workspace/all/nextval/build/$(PLATFORM)/nextval.elf ./build/SYSTEM/$(PLATFORM)/bin/
+	cp ./workspace/all/clock/build/$(PLATFORM)/clock.elf ./build/EXTRAS/Tools/$(PLATFORM)/Clock.pak/
 	cp ./workspace/all/minput/build/$(PLATFORM)/minput.elf ./build/EXTRAS/Tools/$(PLATFORM)/Input.pak/
 	cp ./workspace/all/settings/build/$(PLATFORM)/settings.elf ./build/EXTRAS/Tools/$(PLATFORM)/Settings.pak/
 ifeq ($(PLATFORM), tg5040)

skeleton/SYSTEM/tg5040/bin/suspend

@@ -1,5 +1,6 @@
 #!/bin/sh
-set -euo pipefail
+set -uo pipefail
+set +e
 exec 0<&-
 
 #logfile="/mnt/SDCARD/.userdata/tg5040/logs/suspend_$(date +%Y%m%d_%H%M%S).log"
@@ -8,6 +9,8 @@ exec 0<&-
 wifid_running=
 bluetoothd_running=
 
+sleep_retval=
+
 asound_state_dir=/tmp/asound-suspend
 
 before() {
@@ -28,6 +31,7 @@ before() {
 		>&2 echo "Stopping wpa_supplicant..."
 		/etc/wifi/wifi_init.sh stop || true
 	fi
+
 }
 
 after() {
@@ -48,10 +52,45 @@ after() {
 	# alsactl --file "$asound_state_dir/asound.state.pre" restore || true
 }
 
+
 before
 
+
 >&2 echo "Suspending..."
-echo mem >/sys/power/state
+sleep_max_tries=5
+for i in $(seq 1 $sleep_max_tries); do
+	>&2 echo "Deep sleep attempt $i of $sleep_max_tries"
+
+	sleep_time=$(date +%s)
+
+	echo mem >/sys/power/state
+	sleep_retval=$?
+
+	>&2 echo "Deep sleep: kernel returned $sleep_retval"
+	if [ $sleep_retval -eq 0 ]; then
+		break
+	fi
+
+	# Really hard to debug this edge case where the system sleeps successfully
+	# but still returns nonzero
+	wake_time=$(date +%s)
+
+	time_asleep=$(($wake_time-$sleep_time))
+
+	# This device has a nasty habit of returning false negatives
+	# once in a blue moon; if device was asleep for more than
+	# x seconds, wake up regardless of return value.
+	if [ $time_asleep -gt 5 ]; then
+		>&2 echo "Deep sleep: false negative caught - (sleep for $time_asleep secs)"
+		sleep_retval=0
+		break
+	fi
+
+
+	>&2 echo "Deep sleep failed: retrying in 3 seconds"
+	sleep 3
+done
 
 # Resume services in background to reduce UI latency
 after &
+exit $sleep_retval

skeleton/SYSTEM/tg5040/etc/bluetooth/bt_init.sh

@@ -56,21 +56,21 @@ start_bt() {
 		# bluealsa -p a2dp-source --keep-alive=-1 &
 		bluealsa -p a2dp-source &
 		sleep 1
+		# Power on adapter
+		bluetoothctl power on 2>/dev/null
+
+		# Set discoverable and pairable
+		bluetoothctl discoverable on 2>/dev/null
+		bluetoothctl pairable on 2>/dev/null
+
+		# Set default agent for automatic pairing (no input/output)
+		bluetoothctl agent NoInputNoOutput 2>/dev/null
+		bluetoothctl default-agent 2>/dev/null
+
+		# Set adapter name
+		bluetoothctl system-alias "$DEVICE_NAME" 2>/dev/null
     }
 
-	# Power on adapter
-	bluetoothctl power on 2>/dev/null
-
-	# Set discoverable and pairable
-	bluetoothctl discoverable on 2>/dev/null
-	bluetoothctl pairable on 2>/dev/null
-
-	# Set default agent for automatic pairing (no input/output)
-	bluetoothctl agent NoInputNoOutput 2>/dev/null
-	bluetoothctl default-agent 2>/dev/null
-
-	# Set adapter name
-	bluetoothctl system-alias "$DEVICE_NAME" 2>/dev/null
 }
 
 ble_start() {
@@ -104,16 +104,15 @@ stop_bt() {
 	# stop bluealsa
 	killall bluealsa 2>/dev/null
 
-	# stop bluetoothctl
-	bluetoothctl power off 2>/dev/null
-	#bluetoothctl discoverable off 2>/dev/null
-	bluetoothctl pairable off 2>/dev/null
-	#bluetoothctl remove $(bluetoothctl devices | awk '{print $2}') 2>/dev/null
-	killall bluetoothctl 2>/dev/null
-
 	# Stop bluetooth service
 	d=`ps | grep bluetoothd | grep -v grep`
 	[ -n "$d" ] && {
+		# stop bluetoothctl
+		bluetoothctl power off 2>/dev/null
+		#bluetoothctl discoverable off 2>/dev/null
+		bluetoothctl pairable off 2>/dev/null
+		#bluetoothctl remove $(bluetoothctl devices | awk '{print $2}') 2>/dev/null
+		killall bluetoothctl 2>/dev/null
 		killall bluetoothd
 		sleep 1
 	}

skeleton/SYSTEM/tg5040/etc/wifi/wifi_init.sh

@@ -1,7 +1,7 @@
 #!/bin/sh
 
 WIFI_INTERFACE="wlan0"
-WPA_SUPPLICANT_CONF="/etc/wifi/wpa_supplicant/wpa_supplicant.conf"
+WPA_SUPPLICANT_CONF="/etc/wifi/wpa_supplicant.conf"
 
 start() {
 	# Unblock wifi via rfkill
@@ -11,7 +11,7 @@ start() {
 	if [ ! -f "$WPA_SUPPLICANT_CONF" ]; then
 		mkdir -p "$(dirname "$WPA_SUPPLICANT_CONF")"
 		cat > "$WPA_SUPPLICANT_CONF" << 'EOF'
-# cat /etc/wifi/wpa_supplicant/wpa_supplicant.conf
+# cat /etc/wifi/wpa_supplicant.conf
 ctrl_interface=/etc/wifi/sockets
 disable_scan_offload=1
 update_config=1

skeleton/SYSTEM/tg5040/paks/MinUI.pak/launch.sh

@@ -66,6 +66,9 @@ if [ -f "/etc/init.d/lcservice" ]; then
 	rm /etc/init.d/lcservice
 fi
 
+# clear shadercache unconditionally, until it properly invalidates itself
+rm -rf $SDCARD_PATH/.shadercache
+
 #PD11 pull high for VCC-5v
 echo 107 > /sys/class/gpio/export
 echo -n out > /sys/class/gpio/gpio107/direction

skeleton/SYSTEM/tg5050/bin/suspend

@@ -1,5 +1,6 @@
 #!/bin/sh
-set -euo pipefail
+set -uo pipefail
+set -e
 exec 0<&-
 
 #logfile="/mnt/SDCARD/.userdata/tg5040/logs/suspend_$(date +%Y%m%d_%H%M%S).log"
@@ -8,6 +9,8 @@ exec 0<&-
 wifid_running=
 bluetoothd_running=
 
+sleep_retval=
+
 asound_state_dir=/tmp/asound-suspend
 
 before() {
@@ -51,7 +54,24 @@ after() {
 before
 
 >&2 echo "Suspending..."
-echo mem >/sys/power/state
+sleep_max_tries=10
+for i in $(seq 1 $sleep_max_tries); do
+  >&2 echo "Deep sleep attempt $i of $sleep_max_tries"
+
+  # Can't use | true here, it would crash out on non-zero return.
+  echo mem >/sys/power/state
+  sleep_retval=$?
+
+  >&2 echo "Deep sleep: kernel returned $sleep_retval"
+  if [ $sleep_retval -eq 0 ]; then
+     break
+  fi
+
+  >&2 echo "Deep sleep failed: retrying in 2 seconds"
+  sleep 2
+done
 
 # Resume services in background to reduce UI latency
 after &
+
+exit $sleep_retval