Merge Development into main for 4.3.3

App/PortMaster/update_images.sh

@@ -13,10 +13,7 @@ if [ -f /mnt/SDCARD/Persistent/portmaster/bin/python3 ] ; then
 		$PM_PYTHON_PATH -m pip install --no-index --find-links=/mnt/SDCARD/App/PortMaster/pillow_offline Pillow
 	fi
 else # Pixel2 stock portmaster
-	PM_PYTHON_PATH="/mnt/SDCARD/spruce/pixel2/bin/python"
-	if [ ! -d "/mnt/SDCARD/spruce/pixel2/lib/python3.10/site-packages/PIL/" ] ; then
-		$PM_PYTHON_PATH -m pip install --no-index --find-links=/mnt/SDCARD/App/PortMaster/pillow_offline Pillow
-	fi
+	PM_PYTHON_PATH="/usr/bin/python"
 fi
 
 

App/PyUI/launch.sh

@@ -214,7 +214,7 @@ case "$PLATFORM" in
         cd /usr/bin/
         export PYSDL2_DLL_PATH="/usr/lib"
 
-        cmd="/mnt/SDCARD/spruce/pixel2/bin/MainUI \
+        cmd="/usr/bin/MainUI \
             /mnt/SDCARD/App/PyUI/main-ui/mainui.py \
             -device GKD_PIXEL2 \
             -logDir /mnt/SDCARD/Saves/spruce \

App/PyUI/main-ui/devices/device_common.py

@@ -531,6 +531,34 @@ def sync_hw_clock(self):
         except Exception as e:
             PyUiLogger.get_logger.error(f"Failed to run hwclock: {e}")
 
+    SPRUCE_HELPER_FUNCTIONS = "/mnt/SDCARD/spruce/scripts/helperFunctions.sh"
+
+    def _apply_spruce_cpu_mode(self, shell_function):
+        """
+        Hand off to the shell's CPU mode functions, which already know each
+        platform's cores and frequencies. Devices without them fall back to
+        set_smart via platform/device.sh, so this is safe everywhere.
+        """
+        if not os.path.exists(self.SPRUCE_HELPER_FUNCTIONS):
+            return
+
+        try:
+            subprocess.run(
+                ["/bin/sh", "-c", f". {self.SPRUCE_HELPER_FUNCTIONS} && {shell_function}"],
+                check=False,
+                timeout=10
+            )
+        except Exception as e:
+            PyUiLogger.get_logger().warning(f"Could not apply CPU mode {shell_function}: {e}")
+
+    def set_cpu_low_power(self):
+        """Drop to the platform's powersave profile while the device sits idle."""
+        self._apply_spruce_cpu_mode("set_powersave")
+
+    def set_cpu_normal(self):
+        """Back to the mode the menu normally runs in."""
+        self._apply_spruce_cpu_mode("set_smart")
+
     def animation_divisor(self):
         return self.get_system_config().animation_speed(1)