From: Michael Mrozek Date: Fri, 22 Jun 2012 00:14:38 +0000 (+0200) Subject: op_cpusettings.sh: Added Profile selections. X-Git-Tag: sz_152~70 X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?p=openpandora.oe.git;a=commitdiff_plain;h=b5bf92bf072f73d447d8800d07ad9e7c91506fd6 op_cpusettings.sh: Added Profile selections. cpu.conf: Changed standard OPP from 3 to 5 pandora-scripts.bb: Bumped recipe --- diff --git a/recipes/pandora-system/pandora-scripts.bb b/recipes/pandora-system/pandora-scripts.bb index eac1f7c..e2c66ad 100644 --- a/recipes/pandora-system/pandora-scripts.bb +++ b/recipes/pandora-system/pandora-scripts.bb @@ -6,7 +6,7 @@ COMPATIBLE_MACHINE = "omap3-pandora" DEPENDS = "zenity dbus" RDEPENDS = "zenity dbus" -PR = "r98" +PR = "r99" SRC_URI = " \ file://op_paths.sh \ diff --git a/recipes/pandora-system/pandora-scripts/cpu.conf b/recipes/pandora-system/pandora-scripts/cpu.conf index f5e47c9..19594ac 100755 --- a/recipes/pandora-system/pandora-scripts/cpu.conf +++ b/recipes/pandora-system/pandora-scripts/cpu.conf @@ -3,5 +3,5 @@ min:125 safe:600 warn:yes default:600 -maxopp:3 +maxopp:5 diff --git a/recipes/pandora-system/pandora-scripts/op_cpusettings.sh b/recipes/pandora-system/pandora-scripts/op_cpusettings.sh index aa627a8..3ef5973 100755 --- a/recipes/pandora-system/pandora-scripts/op_cpusettings.sh +++ b/recipes/pandora-system/pandora-scripts/op_cpusettings.sh @@ -3,14 +3,56 @@ # CPU-Settings, v1.1, written by Michael Mrozek aka EvilDragon 2011. # This scripts allows you to change Pandora CPU-Settings. -if [ ! -e /proc/pandora/cpu_mhz_max ]; then - zenity --info --title="CPU-Settings not supported" --text "Sorry, the experimental kernel does not support overclocking (yet).\n\nTherefore, you cannot configure the CPU-Settings." - exit 1 -fi - -while mainsel=$(zenity --title="CPU-Settings" --width="400" --height="350" --list --column "id" --column "Please select" --hide-column=1 --text="Welcome to the CPU-Settings.\nHere, you can configure the behaviour of your CPU \nThis can make your Pandora run faster but also more unstable.\n\nDon't worry though, you cannot permanently damage your unit.\n\nWhat do you want to do?\n" "opp" "Set the max allowed OPP level" "mhz" "Set the minimum / maximum allowed MHz" "warning" "Change warning settings" "defaultmhz" "Set the default MHz" --ok-label="Change Setting" --cancel-label="Exit"); do +while mainsel=$(zenity --title="CPU-Settings" --width="400" --height="350" --list --column "id" --column "Please select" --hide-column=1 --text="Welcome to the CPU-Settings.\nHere, you can configure the behaviour of your CPU \nThis can make your Pandora run faster but also more unstable.\n\nDon't worry though, you cannot permanently damage your unit.\n\nWhat do you want to do?\n" "profile" "Quick-Setup: Select from different profiles" "opp" "Set the max allowed OPP level" "mhz" "Set the minimum / maximum allowed MHz" "warning" "Change warning settings" "defaultmhz" "Set the default MHz" --ok-label="Change Setting" --cancel-label="Exit"); do case $mainsel in + + "profile") + cpusel=$(zenity --title="Optional settings" --width="400" --height="300" --list --column "id" --column "Please select" --hide-column=1 --text="The CPU of the Pandora supports different speed settings.\nHigher speeds might make some units unstable and decrease the lifetime of your CPU.\n\nBelow are some quick profiles which will help you to configure your system the way you like it.\n" "1100" "Clockspeed: 1,1Ghz, OPP5 (should be stable on 1GHz units)" "1000" "Clockspeed: 1GHz, OPP5 (most probably unstable on 600Mhz units)" "800" "Clockspeed: 800MHz, OPP5 (should be stable on all units)" "600" "Clockspeed: 600MHz, OPP3 (stable on all units, longest battery time)" --ok-label="Select CPU Profile" ) + + case $cpusel in + "1100") + echo 5 > /proc/pandora/cpu_opp_max + sed -i "s/.*maxopp.*/maxopp:5/g" /etc/pandora/conf/cpu.conf + sed -i "s/.*max:.*/max:1200/g" /etc/pandora/conf/cpu.conf + sed -i "s/.*default.*/default:1100/g" /etc/pandora/conf/cpu.conf + sed -i "s/.*safe.*/safe:1100/g" /etc/pandora/conf/cpu.conf + echo 1100 > /proc/pandora/cpu_mhz_max + zenity --info --title="CPU Speed set" --text "The CPU Speed has been set to 1,1GHz." --timeout 6 + ;; + + "1000") + echo 5 > /proc/pandora/cpu_opp_max + sed -i "s/.*maxopp.*/maxopp:5/g" /etc/pandora/conf/cpu.conf + sed -i "s/.*max:.*/max:1100/g" /etc/pandora/conf/cpu.conf + sed -i "s/.*default.*/default:1000/g" /etc/pandora/conf/cpu.conf + sed -i "s/.*safe.*/safe:1100/g" /etc/pandora/conf/cpu.conf + echo 1000 > /proc/pandora/cpu_mhz_max + zenity --info --title="CPU Speed set" --text "The CPU Speed has been set to 1GHz." --timeout 6 + ;; + + "800") + echo 5 > /proc/pandora/cpu_opp_max + sed -i "s/.*maxopp.*/maxopp:5/g" /etc/pandora/conf/cpu.conf + sed -i "s/.*max:.*/max:900/g" /etc/pandora/conf/cpu.conf + sed -i "s/.*default.*/default:800/g" /etc/pandora/conf/cpu.conf + sed -i "s/.*safe.*/safe:800/g" /etc/pandora/conf/cpu.conf + echo 800 > /proc/pandora/cpu_mhz_max + zenity --info --title="CPU Speed set" --text "The CPU Speed has been set to 800MHz." --timeout 6 + ;; + + "600") + echo 3 > /proc/pandora/cpu_opp_max + sed -i "s/.*maxopp.*/maxopp:3/g" /etc/pandora/conf/cpu.conf + sed -i "s/.*max:.*/max:700/g" /etc/pandora/conf/cpu.conf + sed -i "s/.*default.*/default:600/g" /etc/pandora/conf/cpu.conf + sed -i "s/.*safe.*/safe:600/g" /etc/pandora/conf/cpu.conf + echo 600 > /proc/pandora/cpu_mhz_max + zenity --info --title="CPU Speed set" --text "The CPU Speed has been set to 600Mhz." --timeout 6 + ;; + + esac + ;; "opp") opp="$(cat /etc/pandora/conf/cpu.conf | grep opp | awk -F\: '{print $2}')"