From: Michael Mrozek Date: Tue, 26 Jun 2012 08:23:51 +0000 (+0200) Subject: op_cpusettings.sh: Updated the settings to use op_speed.sh to set the default speed. X-Git-Tag: sz_152~58 X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e3a9fa37b1772b413b37f884097776931a201ae5;p=openpandora.oe.git op_cpusettings.sh: Updated the settings to use op_speed.sh to set the default speed. --- diff --git a/recipes/pandora-system/pandora-scripts.bb b/recipes/pandora-system/pandora-scripts.bb index e269a11..0a4cac7 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 = "r102" +PR = "r103" SRC_URI = " \ file://op_paths.sh \ diff --git a/recipes/pandora-system/pandora-scripts/op_cpusettings.sh b/recipes/pandora-system/pandora-scripts/op_cpusettings.sh index 1248304..82e7276 100755 --- a/recipes/pandora-system/pandora-scripts/op_cpusettings.sh +++ b/recipes/pandora-system/pandora-scripts/op_cpusettings.sh @@ -17,7 +17,7 @@ case $mainsel in 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 + /usr/pandora/scripts/op_cpuspeed.sh -n 1100 zenity --info --title="CPU Speed set" --text "The CPU Speed has been set to 1,1GHz." --timeout 6 ;; @@ -27,7 +27,7 @@ case $mainsel in 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:1000/g" /etc/pandora/conf/cpu.conf - echo 1000 > /proc/pandora/cpu_mhz_max + /usr/pandora/scripts/op_cpuspeed.sh -n 1000 zenity --info --title="CPU Speed set" --text "The CPU Speed has been set to 1GHz." --timeout 6 ;; @@ -37,7 +37,7 @@ case $mainsel in 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 + /usr/pandora/scripts/op_cpuspeed.sh -n 800 zenity --info --title="CPU Speed set" --text "The CPU Speed has been set to 800MHz." --timeout 6 ;; @@ -47,7 +47,7 @@ case $mainsel in 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 + /usr/pandora/scripts/op_cpuspeed.sh -n 600 zenity --info --title="CPU Speed set" --text "The CPU Speed has been set to 600Mhz." --timeout 6 ;; @@ -69,11 +69,17 @@ case $mainsel in "mhz") min="$(cat /etc/pandora/conf/cpu.conf | grep min | awk -F\: '{print $2}')" max="$(cat /etc/pandora/conf/cpu.conf | grep max: | awk -F\: '{print $2}')" + defspeed="$(cat /etc/pandora/conf/cpu.conf | grep default | awk -F\: '{print $2}')" if zenity --question --title="MHz Setting Info" --text="This setting can set the allowed range apps can use on your Pandora.\n\nToo high CPU settings can render your Pandora unstable and crash it. This can lead to data loss!\n\nBe absolutely sure you know what you are doing here.\n\nThe standard maximum setting is 800MHz, the standard minimum setting 125MHz." --ok-label="Yes, I know what I'm doing!" --cancel-label="I'm scared!"; then if newmax=$(zenity --scale --text "Set the maximum allowed MHz" --min-value=500 --max-value=1300 --value=$max --step 1); then if newmin=$(zenity --scale --text "Set the minimum allowed MHz" --min-value=20 --max-value=500 --value=$min --step 1); then sed -i "s/.*max:.*/max:$newmax/g" /etc/pandora/conf/cpu.conf sed -i "s/.*min:.*/min:$newmin/g" /etc/pandora/conf/cpu.conf + if [ "$defspeed" -gt "$newmax" ]; then + sed -i "s/.*default.*/default:$newmax/g" /etc/pandora/conf/cpu.conf + zenity --info --title="Default speed info" --text "As your default speed was set higher than your new maximum,\nit has been changed to the new maximum speed." --timeout 6 + /usr/pandora/scripts/op_cpuspeed.sh -n $newmax + fi zenity --info --title="MHz range set" --text "Your Pandora can now set the CPU clock between $newmin and $newmax MHz." --timeout 6 else zenity --info --title="No change" --text "The CPU Speed has not been changed." --timeout 6 @@ -110,7 +116,7 @@ case $mainsel in max="$(cat /etc/pandora/conf/cpu.conf | grep max: | awk -F\: '{print $2}')" if zenity --question --title="Default CPU Speed" --text="WARNING!\n\nYou are about to change the default clockspeed your Pandora will be running when you start it.\nIf it is set too high, the Pandora will crash.\n\nIf that happens, the Pandora will NOT change the clockspeed on the next boot, so you can access the OS and fix the default clock speed.\n\nHowever, each crash can lead to data loss - so please be sure to absolutely know what you're doing!" --ok-label="Yes, I know what I'm doing!" --cancel-label="I'm scared!"; then if newdefault=$(zenity --scale --text "Set the default CPU speed" --min-value=$min --max-value=$max --value=$defspeed --step 1); then - echo $newdefault > /proc/pandora/cpu_mhz_max + /usr/pandora/scripts/op_cpuspeed.sh -n $newdefault sed -i "s/.*default.*/default:$newdefault/g" /etc/pandora/conf/cpu.conf zenity --info --title="Default speed set" --text "The default clock speed has been set to $newdefault." --timeout 6 else