Merge pull request #1124 from chrisj951/development-chrisj951

Minor bug Fix / SmartProS OSD/Screen fixes

Author: chrisj951

App/PyUI/main-ui/devices/miyoo/flip/miyoo_flip.py

@@ -299,35 +299,6 @@ def _set_hue_to_config(self):
         ProcessRunner.run(["modetest", "-M", "rockchip", "-a", "-w", 
                                      "179:hue:"+str(self.system_config.hue * 5)])
 
-
-    #This was from ChatGPT and might be able to be modified to get the current display
-    #but currently its capturing an old one which just says Loading...
-    def capture_kmsdrm_png(self, output_path="/tmp/screenshot.png", fb_path="/dev/fb0"):
-        logger = PyUiLogger.get_logger()
-
-        # Read width/height/stride from sysfs if possible
-        try:
-            with open("/sys/class/graphics/fb0/virtual_size", "r") as f:
-                width_str, height_str = f.read().strip().split(",")
-                width, height = int(width_str), int(height_str)
-            with open("/sys/class/graphics/fb0/stride", "r") as f:
-                stride = int(f.read().strip())
-        except Exception as e:
-            logger.warning(f"Failed to read fb0 sysfs info: {e}, using defaults")
-            width, height, stride = 640, 480, 2560
-
-        # Open framebuffer for reading
-        frame_bytes = bytearray()
-        with open(fb_path, "rb") as fb:
-            for _ in range(height):
-                row = fb.read(stride)
-                frame_bytes.extend(row[:width*4])  # slice only visible pixels
-
-        # Convert BGRA to RGBA
-        img = Image.frombytes("RGBA", (width, height), bytes(frame_bytes), "raw", "BGRA")
-        img.save(output_path)
-        logger.info(f"Framebuffer saved to {output_path} ({width}x{height})")
-        return output_path
 
     def _take_snapshot(self, path):
         ProcessRunner.run(["/mnt/sdcard/spruce/flip/screenshot.sh", path])

App/PyUI/main-ui/devices/trimui/trim_ui_smart_pro_s.py

@@ -3,6 +3,7 @@
 import os
 from pathlib import Path
 import threading
+import time
 from audio.audio_player_delegate_sdl2 import AudioPlayerDelegateSdl2
 from controller.controller_inputs import ControllerInput
 from controller.key_state import KeyState
@@ -270,3 +271,23 @@ def enable_bluetooth(self):
                             stdout=subprocess.DEVNULL,
                             stderr=subprocess.DEVNULL)
         self.system_config.set_bluetooth(1)
+
+    def _signal_osd_quit(self):
+        os.makedirs("/tmp/trimui_osd", exist_ok=True)
+        open("/tmp/trimui_osd/osdd_quit", "a").close()
+        time.sleep(1)
+
+    def power_off(self):
+        Display.display_message("Powering off...")
+        self._signal_osd_quit()
+        self.run_cmd([self.power_off_cmd()])
+        # So we dont update the display while shutting down
+        time.sleep(10)
+
+
+    def reboot(self):
+        Display.display_message("Rebooting...")
+        self._signal_osd_quit()
+        self.run_cmd([self.reboot_cmd()])
+        # So we dont update the display while rebooting
+        time.sleep(10)

App/PyUI/main-ui/views/carousel_view.py

@@ -383,12 +383,14 @@ def get_selection(self, select_controller_inputs = [ControllerInput.A]):
                 self.adjust_selected(1, skip_by_letter=False)
             elif Controller.last_input() == ControllerInput.L1:
                 if(Theme.skip_main_menu()):
+                    Display.restore_bg()
                     return Selection(self.get_selected_option(),Controller.last_input(), self.selected)
                 else:
                     self.skip_next_animation = True
                     self.adjust_selected(-1* self.cols, skip_by_letter=False)
             elif Controller.last_input() == ControllerInput.R1:
                 if(Theme.skip_main_menu()):
+                    Display.restore_bg()
                     return Selection(self.get_selected_option(),Controller.last_input(), self.selected)
                 else:
                     self.skip_next_animation = True

spruce/scripts/platform/device.sh

@@ -290,4 +290,8 @@ save_volume_to_config_file() {
 
     # Update MainUI Config file
     sed -i "s/\"vol\":\s*\([0-9]*\)/\"vol\": $VOLUME_LV/" "$SYSTEM_JSON"
+}
+
+device_prepare_for_poweroff() {
+    log_message "Missing device_prepare_for_poweroff function" -v
 }

spruce/scripts/platform/device_functions/SmartProS.sh

@@ -88,11 +88,17 @@ set_volume() {
     amixer set DAC "$scaled"
 
     if [ "$SAVE_TO_CONFIG" = true ]; then
-        save_volume_to_config_file "$new_vol"
-        sed -i "s/\"vol\":[[:space:]]*[0-9]\+/\"vol\": $new_vol/" /mnt/UDISK/system.json
+        current_volume=$(jq -r '.vol' "$SYSTEM_JSON")
+
+        if [ "$current_volume" -ne "$new_vol" ]; then
+            save_volume_to_config_file "$new_vol"
+            sed -i "s/\"vol\":[[:space:]]*[0-9]\+/\"vol\": $new_vol/" /mnt/UDISK/system.json
+            if ! pgrep MainUI >/dev/null; then
+                /usr/trimui/osd/show_volume_msg.sh "$new_vol" &
+            fi
+        fi
     fi
 
-    /usr/trimui/osd/show_volume_msg.sh "$new_vol" &
 }
 
 
@@ -440,4 +446,8 @@ device_run_tsps_blobs() {
     if [ "$custom_thermal_watchdog" != "Custom" ]; then
         run_trimui_blobs "thermald"
     fi
+}
+
+device_prepare_for_poweroff() {
+    touch /tmp/trimui_osd/osdd_quit
 }

spruce/scripts/save_poweroff.sh

@@ -7,6 +7,8 @@
 killall -q -15 runtime.sh
 killall -q -15 principal.sh
 
+device_prepare_for_poweroff
+
 # Ensure PyUI message writer can run
 killall -q -9 MainUI
 sleep 0.5