Merge pull request #2283 from brooksytech/dev

Fix RK3399 HDMI sense

packages/hardware/quirks/devices/Anbernic RG552/040-hdmi

@@ -1,20 +0,0 @@
-#!/bin/bash
-
-# SPDX-License-Identifier: GPL-2.0-or-later
-# Copyright (C) 2022-present - The JELOS Project (https://github.com/JustEnoughLinuxOS)
-
-. /storage/.config/profile.d/001-device_config
-
-# Set export GPIO for HDMI
-if [ ! -d "/sys/class/gpio/gpio${DEVICE_HDMI_GPIO}" ]; then
-  echo ${DEVICE_HDMI_GPIO} > /sys/class/gpio/export
-  echo in > /sys/class/gpio/gpio${DEVICE_HDMI_GPIO}/direction
-fi
-
-# Check HDMI plug state and switch to HDMI audo if true
-HDMI_VALUE=$(cat /sys/class/gpio/gpio${DEVICE_HDMI_GPIO}/value)
-  case ${HDMI_VALUE} in
-    "0")
-      sed -i 's/pcm "hw:0,0"/pcm "hw:1,0"'/ /storage/.config/asound.conf
-    ;;
-  esac

packages/hardware/quirks/devices/Anbernic RG552/sleep.d/post/001-audio

@@ -11,3 +11,20 @@ SPEAKER=$(pactl list sinks short | grep es8316 | cut -c 0-2)
 
 #Set sink to one we aren't currently using
 pactl set-default-sink ${SPEAKER}
+
+#Then check if HDMI is plugged and switch to HDMI
+
+# Set export GPIO for HDMI
+if [ ! -d "/sys/class/gpio/gpio${DEVICE_HDMI_GPIO}" ]; then
+  echo ${DEVICE_HDMI_GPIO} > /sys/class/gpio/export
+  echo in > /sys/class/gpio/gpio${DEVICE_HDMI_GPIO}/direction
+fi
+
+# Check HDMI plug state and switch to HDMI audo if true
+HDMI_VALUE=$(cat /sys/class/gpio/gpio${DEVICE_HDMI_GPIO}/value)
+  case ${HDMI_VALUE} in
+    "0")
+      sleep 11
+      pactl set-default-sink ${HDMI}
+    ;;
+  esac

packages/sysutils/system-utils/sources/devices/RK3399/video_sense

@@ -30,7 +30,7 @@ do
 		pactl set-default-sink ${SPEAKER}
         ;;
       esac
-      systemctl restart weston
+      killall emulationstation
 
       HDMI_VALUE=${HDMI_NEW_VALUE}
     fi