Merge pull request #1816 from fewtarius/dev

Updates and bug fixes

packages/hardware/quirks/autostart/020-configs

@@ -5,11 +5,20 @@
 . /etc/profile
 
 (
-  if [ -d "/usr/lib/autostart/quirks/${QUIRK_DEVICE}/config" ] && \
+
-     [ ! -f ".quirkconfigs" ]
+  if [ -d "/usr/lib/autostart/quirks/platforms/${HW_DEVICE}/config" ] && \
+     [ ! -f ".quirk-platform-configs" ]
+  then
+    tocon "Applying ${HW_DEVICE} specific configuration..."
+    rsync -a --exclude={es_features.cfg,es_systems.cfg} /usr/lib/autostart/quirks/platforms/"${HW_DEVICE}"/config/* /storage/.config/ 2>/dev/null
+    touch /storage/.quirk-platform-configs
+  fi
+
+  if [ -d "/usr/lib/autostart/quirks/devices/${QUIRK_DEVICE}/config" ] && \
+     [ ! -f ".quirk-device-configs" ]
   then
     tocon "Applying ${QUIRK_DEVICE} specific configuration..."
-    rsync -a --exclude={es_features.cfg,es_systems.cfg} /usr/lib/autostart/quirks/"${QUIRK_DEVICE}"/config/* /storage/.config/ 2>/dev/null
+    rsync -a --exclude={es_features.cfg,es_systems.cfg} /usr/lib/autostart/quirks/devices/"${QUIRK_DEVICE}"/config/* /storage/.config/ 2>/dev/null
-    touch /storage/.quirkconfigs
+    touch /storage/.quirk-device-configs
   fi
 ) &

packages/hardware/quirks/devices/AOKZOE AOKZOE A1 Pro/001-hardwareinit

@@ -4,9 +4,31 @@
 
 . /etc/profile
 
+### Set the default TDP if it isn't defined.
+MYTDP=$(get_setting system.overclock)
+if [ -z "${MYTDP}" ]
+then
+  # Set default TDP
+  set_setting system.overclock 15w
+fi
+
+### Set sleep mode to mem sleep (S3)
 MYSLEEPMODE=$(get_setting system.suspendmode)
 if [ -z "${MYSLEEPMODE}" ]
 then
   /usr/bin/setsuspendmode mem
 fi
 
+### Set the default device configuration
+cat <<EOF >/storage/.config/profile.d/001-deviceconfig
+DEVICE_BASE_TDP="15w"
+DEVICE_LED_CONTROL=false
+DEVICE_VOLUMECTL=true
+DEVICE_PLAYBACK_PATH_SPK="SPK"
+DEVICE_PLAYBACK_PATH_HP="HP"
+DEVICE_FUNC_KEYA_MODIFIER="KEY_LEFTCTRL"
+DEVICE_FUNC_KEYB_MODIFIER="KEY_D"
+UI_SERVICE="weston.service"
+
+DEVICE_BRIGHTNESS="hardware"
+EOF

packages/hardware/quirks/devices/ATARI VCS 800 Onyx/001-deviceconfig

@@ -2,10 +2,32 @@
 # SPDX-License-Identifier: Apache-2.0
 # Copyright (C) 2022-present Fewtarius
 
+. /etc/profile
+
+### Set the default TDP if it isn't defined.
+MYTDP=$(get_setting system.overclock)
+if [ -z "${MYTDP}" ]
+then
+  # Set default TDP
+  set_setting system.overclock 15w
+fi
+
+### Set sleep mode to mem sleep (S3)
+MYSLEEPMODE=$(get_setting system.suspendmode)
+if [ -z "${MYSLEEPMODE}" ]
+then
+  /usr/bin/setsuspendmode mem
+fi
+
+### Set the default device configuration
 cat <<EOF >/storage/.config/profile.d/001-deviceconfig
-DEVICE_VOLUMECTL=true
+DEVICE_BASE_TDP="15w"
+DEVICE_LED_CONTROL=false
+DEVICE_VOLUMECTL=false
 DEVICE_PLAYBACK_PATH_SPK="SPK"
 DEVICE_PLAYBACK_PATH_HP="HP"
+DEVICE_FUNC_KEYA_MODIFIER="KEY_LEFTCTRL"
+DEVICE_FUNC_KEYB_MODIFIER="KEY_D"
 UI_SERVICE="weston.service"
 
 DEVICE_BRIGHTNESS="hardware"

packages/hardware/quirks/devices/ATARI VCS 800 Onyx/001-hardwareinit

@@ -1,11 +0,0 @@
-#!/bin/bash
-# SPDX-License-Identifier: Apache-2.0
-# Copyright (C) 2021-present Fewtarius (https://github.com/fewtarius)
-
-. /etc/profile
-
-MYSLEEPMODE=$(get_setting system.suspendmode)
-if [ -z "${MYSLEEPMODE}" ]
-then
-  /usr/bin/setsuspendmode mem
-fi

packages/hardware/quirks/devices/AYANEO AIR Plus/001-deviceconfig

@@ -2,7 +2,25 @@
 # SPDX-License-Identifier: Apache-2.0
 # Copyright (C) 2022-present Fewtarius
 
+. /etc/profile
+
+### Set the default TDP if it isn't defined.
+MYTDP=$(get_setting system.overclock)
+if [ -z "${MYTDP}" ]
+then
+  # Set default TDP
+  set_setting system.overclock 15w
+fi
+
+### Set sleep mode to mem sleep (S3)
+MYSLEEPMODE=$(get_setting system.suspendmode)
+if [ -z "${MYSLEEPMODE}" ]
+then
+  /usr/bin/setsuspendmode mem
+fi
+
 cat <<EOF >/storage/.config/profile.d/001-deviceconfig
+DEVICE_BASE_TDP="15w"
 DEVICE_VOLUMECTL=true
 DEVICE_PLAYBACK_PATH_SPK="SPK"
 DEVICE_PLAYBACK_PATH_HP="HP"

packages/hardware/quirks/devices/AYANEO AIR Plus/001-hardwareinit

@@ -1,12 +0,0 @@
-#!/bin/bash
-# SPDX-License-Identifier: Apache-2.0
-# Copyright (C) 2021-present Fewtarius (https://github.com/fewtarius)
-
-. /etc/profile
-
-MYSLEEPMODE=$(get_setting system.suspendmode)
-if [ -z "${MYSLEEPMODE}" ]
-then
-  /usr/bin/setsuspendmode mem
-fi
-

packages/hardware/quirks/devices/AYANEO AIR/001-deviceconfig

@@ -2,7 +2,26 @@
 # SPDX-License-Identifier: Apache-2.0
 # Copyright (C) 2022-present Fewtarius
 
+. /etc/profile
+
+### Set the default TDP if it isn't defined.
+MYTDP=$(get_setting system.overclock)
+if [ -z "${MYTDP}" ]
+then
+  # Set default TDP
+  set_setting system.overclock 15w
+fi
+
+### Set sleep mode to mem sleep (S3)
+MYSLEEPMODE=$(get_setting system.suspendmode)
+if [ -z "${MYSLEEPMODE}" ]
+then
+  /usr/bin/setsuspendmode mem
+fi
+
+### Set the default device configuration
 cat <<EOF >/storage/.config/profile.d/001-deviceconfig
+DEVICE_BASE_TDP="15w"
 DEVICE_LED_CONTROL=true
 DEVICE_VOLUMECTL=true
 DEVICE_PLAYBACK_PATH_SPK="SPK"

packages/hardware/quirks/devices/AYANEO AIR/001-hardwareinit

@@ -1,11 +0,0 @@
-#!/bin/bash
-# SPDX-License-Identifier: Apache-2.0
-# Copyright (C) 2021-present Fewtarius (https://github.com/fewtarius)
-
-. /etc/profile
-
-MYSLEEPMODE=$(get_setting system.suspendmode)
-if [ -z "${MYSLEEPMODE}" ]
-then
-  /usr/bin/setsuspendmode mem
-fi

packages/hardware/quirks/devices/GPD G1618-04/001-deviceconfig

@@ -0,0 +1,34 @@
+#!/bin/bash
+# SPDX-License-Identifier: Apache-2.0
+# Copyright (C) 2021-present Fewtarius (https://github.com/fewtarius)
+
+. /etc/profile
+
+### Set the default TDP if it isn't defined.
+MYTDP=$(get_setting system.overclock)
+if [ -z "${MYTDP}" ]
+then
+  # Set default TDP
+  set_settings system.overclock 15w
+fi
+
+### Set sleep mode to mem sleep (S3)
+MYSLEEPMODE=$(get_setting system.suspendmode)
+if [ -z "${MYSLEEPMODE}" ]
+then
+  /usr/bin/setsuspendmode mem
+fi
+
+### Set the default device configuration
+cat <<EOF >/storage/.config/profile.d/001-deviceconfig
+DEVICE_BASE_TDP="15w"
+DEVICE_LED_CONTROL=false
+DEVICE_VOLUMECTL=true
+DEVICE_PLAYBACK_PATH_SPK="SPK"
+DEVICE_PLAYBACK_PATH_HP="HP"
+DEVICE_FUNC_KEYA_MODIFIER="KEY_LEFTCTRL"
+DEVICE_FUNC_KEYB_MODIFIER="KEY_D"
+UI_SERVICE="weston.service"
+
+DEVICE_BRIGHTNESS="hardware"
+EOF

packages/hardware/quirks/devices/GPD G1618-04/001-hardwareinit

@@ -1,11 +0,0 @@
-#!/bin/bash
-# SPDX-License-Identifier: Apache-2.0
-# Copyright (C) 2021-present Fewtarius (https://github.com/fewtarius)
-
-. /etc/profile
-
-MYSLEEPMODE=$(get_setting system.suspendmode)
-if [ -z "${MYSLEEPMODE}" ]
-then
-  /usr/bin/setsuspendmode mem
-fi

packages/hardware/quirks/devices/GPD G1619-04/001-deviceconfig

@@ -2,8 +2,25 @@
 # SPDX-License-Identifier: Apache-2.0
 # Copyright (C) 2022-present Fewtarius
 
+. /etc/profile
+
+### Set the default TDP if it isn't defined.
+MYTDP=$(get_setting system.overclock)
+if [ -z "${MYTDP}" ]
+then
+  # Set default TDP
+  set_setting system.overclock 15w
+fi
+
+### Set sleep mode to mem sleep (S3)
+MYSLEEPMODE=$(get_setting system.suspendmode)
+if [ -z "${MYSLEEPMODE}" ]
+then
+  /usr/bin/setsuspendmode mem
+fi
+
 cat <<EOF >/storage/.config/profile.d/001-deviceconfig
-MANGOHUD_SUPPORT=true
+DEVICE_BASE_TDP="15w"
 DEVICE_VOLUMECTL=true
 DEVICE_PLAYBACK_PATH_SPK="SPK"
 DEVICE_PLAYBACK_PATH_HP="HP"

packages/hardware/quirks/devices/GPD G1619-04/001-hardwareinit

@@ -1,11 +0,0 @@
-#!/bin/bash
-# SPDX-License-Identifier: Apache-2.0
-# Copyright (C) 2021-present Fewtarius (https://github.com/fewtarius)
-
-. /etc/profile
-
-MYSLEEPMODE=$(get_setting system.suspendmode)
-if [ -z "${MYSLEEPMODE}" ]
-then
-  /usr/bin/setsuspendmode mem
-fi

packages/hardware/quirks/devices/Valve Jupiter/001-deviceconfig

@@ -2,7 +2,25 @@
 # SPDX-License-Identifier: Apache-2.0
 # Copyright (C) 2022-present Fewtarius
 
+. /etc/profile
+
+### Set the default TDP if it isn't defined.
+MYTDP=$(get_setting system.overclock)
+if [ -z "${MYTDP}" ]
+then
+  # Set default TDP
+  set_setting system.overclock 15w
+fi
+
+### Set sleep mode to mem sleep (S3)
+MYSLEEPMODE=$(get_setting system.suspendmode)
+if [ -z "${MYSLEEPMODE}" ]
+then
+  /usr/bin/setsuspendmode mem
+fi
+
 cat <<EOF >/storage/.config/profile.d/001-deviceconfig
+DEVICE_BASE_TDP="15w"
 DEVICE_VOLUMECTL=true
 DEVICE_PLAYBACK_PATH_SPK="SPK"
 DEVICE_PLAYBACK_PATH_HP="HP"
@@ -12,3 +30,4 @@ UI_SERVICE="weston.service"
 
 DEVICE_BRIGHTNESS="hardware"
 EOF
+

packages/hardware/quirks/devices/Valve Jupiter/001-hardwareinit

@@ -1,11 +0,0 @@
-#!/bin/bash
-# SPDX-License-Identifier: Apache-2.0
-# Copyright (C) 2021-present Fewtarius (https://github.com/fewtarius)
-
-. /etc/profile
-
-MYSLEEPMODE=$(get_setting system.suspendmode)
-if [ -z "${MYSLEEPMODE}" ]
-then
-  /usr/bin/setsuspendmode mem
-fi

packages/hardware/quirks/package.mk

@@ -14,7 +14,11 @@ PKG_AUTORECONF="no"
 PKG_TOOLCHAIN="manual"
 
 makeinstall_target() {
-  mkdir -p ${INSTALL}/usr/lib/autostart/quirks
+  mkdir -p ${INSTALL}/usr/lib/autostart/quirks/{platforms,devices}
-  cp -r ${PKG_DIR}/devices/* ${INSTALL}/usr/lib/autostart/quirks
+  cp -r ${PKG_DIR}/devices/* ${INSTALL}/usr/lib/autostart/quirks/devices
+  if [ -d "${PKG_DIR}/platforms/${DEVICE}" ]
+  then
+    cp -r ${PKG_DIR}/platforms/* ${INSTALL}/usr/lib/autostart/quirks/platforms
+  fi
   chmod -R 0755 ${INSTALL}/usr/lib/autostart/quirks
 }

packages/hardware/quirks/profile.d/999-export

@@ -11,6 +11,7 @@ export  SLOW_CORES \
 	DMC_FREQ \
 	GPU_FREQ \
 	DEVICE_AUDIO_MIXER \
+	DEVICE_BASE_TDP \
 	DEVICE_BRIGHTNESS \
 	DEVICE_BATTERY_LED_STATUS \
 	DEVICE_FAKE_JACKSENSE \

packages/jelos/autostart/001-setup

@@ -57,3 +57,6 @@ then
 else
   /usr/bin/setsuspendmode mem
 fi
+
+### Clean up settings
+sort_settings

packages/jelos/config/system/configs/system.cfg

@@ -174,7 +174,6 @@ system.cpugovernor=schedutil
 system.hostname=@DEVICENAME@
 system.language=en_US
 system.loglevel=none
-system.overclock=off
 system.power.audio=1
 system.power.cpu=1
 system.power.pcie=0

packages/jelos/profile.d/02-distribution

@@ -62,6 +62,11 @@ function del_setting() {
   fi
 }
 
+function sort_settings() {
+  cat "${J_CONF}" | grep ^[a-z0-9] | sort >"${J_CONF}.tmp"
+  mv "${J_CONF}.tmp" "${J_CONF}"
+}
+
 function set_setting() {
   if [[ "${1}" =~ ^[[:alnum:]] ]]
   then
@@ -71,6 +76,7 @@ function set_setting() {
       echo "${1}=${2}" >> "${J_CONF}"
     fi
   fi
+  sort_settings
 }
 
 function set_audio() {

packages/jelos/profile.d/99-freqfunctions

@@ -10,6 +10,7 @@ get_threads() {
     echo ${THREAD}
   done
   echo all
+  echo default
 }
 
 set_online_threads() {

packages/jelos/sources/scripts/jelos-info

@@ -12,7 +12,8 @@ fi
 export QUIRK_DEVICE="$(echo ${QUIRK_DEVICE} | sed -e "s#[/]#-#g")"
 
 info_quirks() {
-  for QUIRK in /usr/lib/autostart/quirks/"${QUIRK_DEVICE}"/info.d/${1}/*
+  for QUIRK in /usr/lib/autostart/quirks/platforms/"${HW_DEVICE}"/info.d/${1}/* \
+               /usr/lib/autostart/quirks/devices/"${QUIRK_DEVICE}"/info.d/${1}/*
   do
     "${QUIRK}" 2>/dev/null
   done

packages/jelos/sources/scripts/runemu.sh

@@ -120,14 +120,11 @@ if [ -e "/usr/bin/overclock" ]
 then
   ### Set the overclock mode
   OVERCLOCK=$(get_setting "overclock" "${PLATFORM}" "${ROMNAME##*/}")
-  if [ ! "${OVERCLOCK}" = "system" ]
+  if [ ! -z "${OVERCLOCK}" ]
-  then
-    if [ ! -z "${OVERCLOCK}" ] && [ -e "/usr/bin/overclock" ]
   then
     /usr/bin/overclock ${OVERCLOCK}
   fi
 fi
-fi
 
 GPUPERF=$(get_setting "gpuperf" "${PLATFORM}" "${ROMNAME##*/}")
 if [ ! -z ${GPUPERF} ]

packages/jelos/sources/scripts/setsettings.sh

@@ -195,6 +195,10 @@ declare -a LANG_CODES=( ["false"]="0"
 ###
 
 LOGGING=$(get_setting system.loglevel)
+if [ -z "${LOGGING}" ]
+then
+  LOGGING="none"
+fi
 
 ###
 ### Set up

packages/sysutils/autostart/sources/autostart

@@ -13,11 +13,27 @@ log() {
 
 performance 2>/dev/null
 
-if [ -d "/usr/lib/autostart/quirks/${QUIRK_DEVICE}" ]
+### Load platform specific quirks
+if [ -d "/usr/lib/autostart/quirks/platforms/${HW_DEVICE}" ]
+then
+  log "Run ${HW_DEVICE} quirks."
+  tocon "Applying ${HW_DEVICE} quirks..."
+  for script in "/usr/lib/autostart/quirks/platforms/${HW_DEVICE}"/*
+  do
+    log "Run ${script}"
+    if [ -f "${script}" ]
+    then
+      "${script}" 2>&1 >>${BOOTLOG}
+    fi
+  done
+fi
+
+### Load device specific quirks
+if [ -d "/usr/lib/autostart/quirks/devices/${QUIRK_DEVICE}" ]
 then
   log "Run ${QUIRK_DEVICE} quirks."
   tocon "Applying ${QUIRK_DEVICE} quirks..."
-  for script in "/usr/lib/autostart/quirks/${QUIRK_DEVICE}"/*
+  for script in "/usr/lib/autostart/quirks/devices/${QUIRK_DEVICE}"/*
   do
     log "Run ${script}"
     if [ -f "${script}" ]
@@ -62,8 +78,6 @@ wait
 tocon "Starting user interface..."
 log "Startup complete..."
 
-clear >/dev/console
-
 ### Re-source the profile so we fetch the correct UI_SERVICE variable.
 . /etc/profile
 

packages/sysutils/sleep/sources/sleep.sh

@@ -94,7 +94,8 @@ modules() {
 }
 
 quirks() {
-  for QUIRK in /usr/lib/autostart/quirks/"${QUIRK_DEVICE}"/sleep.d/${1}/*
+  for QUIRK in /usr/lib/autostart/quirks/platforms/"${HW_DEVICE}"/sleep.d/${1}/*
+               /usr/lib/autostart/quirks/devices/"${QUIRK_DEVICE}"/sleep.d/${1}/*
   do
     "${QUIRK}" >/dev/null 2>&1
   done

packages/sysutils/system-utils/sources/devices/AMD64/overclock

@@ -4,37 +4,58 @@
 
 . /etc/profile
 
+###
+### On startup the device will run at the maximum TDP that
+### the CPU is capable of.  This is not desired behavior.
+###
+### 1. Check if we have a TDP setting, and set it.
+### 2. Check if we have a device default TDP, and set it.
+### 3. Use a common TDP down value used across multiple AMD CPUs.
+###
 if [ $# -eq 0 ] || [ "$1" == "boot" ]
 then
   PROFILE=$(get_setting system.overclock)
+  if [ -z "${PROFILE}" ] && \
+     [ -n "${DEVICE_BASE_TDP}" ]
+  then
+    PROFILE="${DEVICE_BASE_TDP}"
   else
+    PROFILE="15w"
+  fi
+else
+  ### When run from ES or a shell, and the value of "off"
+  ### is passed, go back to the default TDP.  If not available
+  ### use our default of 15w.
   PROFILE=$1
+  if [ "${PROFILE}" = "off" ]
+  then
+    if [ -n "${DEVICE_BASE_TDP}" ]
+    then
+      PROFILE="${DEVICE_BASE_TDP}"
+    else
+      PROFILE="15w"
+    fi
+  fi
 fi
 
-### Default clocks when not using OC.
-WATTS="12000"
-
 case ${PROFILE} in
-  2w)
+  2.5w)
-    WATTS="2000"
+    WATTS="2500"
   ;;
-  4w)
+  4.5w)
-    WATTS="4000"
+    WATTS="4500"
   ;;
   6w)
     WATTS="6000"
   ;;
-  8w)
+  9w)
-    WATTS="8000"
+    WATTS="9000"
-  ;;
-  10w)
-    WATTS="10000"
   ;;
   12w)
     WATTS="12000"
   ;;
-  14w)
+  15w)
-    WATTS="14000"
+    WATTS="15000"
   ;;
   16w)
     WATTS="16000"
@@ -42,21 +63,18 @@ case ${PROFILE} in
   18w)
     WATTS="18000"
   ;;
-  20w)
-    WATTS="20000"
-  ;;
   22w)
     WATTS="22000"
   ;;
   24w)
     WATTS="24000"
   ;;
-  26w)
-    WATTS="26000"
-  ;;
   28w)
     WATTS="28000"
   ;;
+  *)
+    exit 0
+  ;;
 esac
 
 ryzenadj --tctl-temp=97 --stapm-limit=${WATTS} --fast-limit=${WATTS} --stapm-time=500 --slow-limit=${WATTS} --slow-time=30 --vrmmax-current=70000

packages/sysutils/systemd/scripts/userconfig-setup

@@ -12,9 +12,14 @@ then
   # Copy config files, but don't overwrite.  Only run if /storage is fresh
   rsync -a --ignore-existing --exclude={es_features.cfg,es_systems.cfg} /usr/config/* /storage/.config/ >/var/log/configure.log 2>&1
 
-  if [ -d "/usr/lib/autostart/quirks/${QUIRK_DEVICE}/config" ]
+  if [ -d "/usr/lib/autostart/quirks/platforms/${HW_DEVICE}/config" ]
   then
-    rsync -a --exclude={es_features.cfg,es_systems.cfg} /usr/lib/autostart/quirks/"${QUIRK_DEVICE}"/config/* /storage/.config/ >>/var/log/configure.log 2>&1
+    rsync -a --exclude={es_features.cfg,es_systems.cfg} /usr/lib/autostart/quirks/platforms/"${HW_DEVICE}"/config/* /storage/.config/ >>/var/log/configure.log 2>&1
+  fi
+
+  if [ -d "/usr/lib/autostart/quirks/devices/${QUIRK_DEVICE}/config" ]
+  then
+    rsync -a --exclude={es_features.cfg,es_systems.cfg} /usr/lib/autostart/quirks/devices/"${QUIRK_DEVICE}"/config/* /storage/.config/ >>/var/log/configure.log 2>&1
   fi
 
   if [ -e "/usr/bin/emulationstation" ]

packages/ui/emulationstation/package.mk

@@ -3,7 +3,7 @@
 # Copyright (C) 2020-present Fewtarius
 
 PKG_NAME="emulationstation"
-PKG_VERSION="1d085bc"
+PKG_VERSION="9e42208"
 PKG_GIT_CLONE_BRANCH="main"
 PKG_REV="1"
 PKG_ARCH="any"