op_cpusettings.sh: Removed warning about minimum CPU-Speed because of OPP.

[openpandora.oe.git] / recipes / pandora-system / pandora-scripts / op_cpusettings.sh

diff --git a/recipes/pandora-system/pandora-scripts/op_cpusettings.sh b/recipes/pandora-system/pandora-scripts/op_cpusettings.sh
index ab77e38..cf2a552 100755 (executable)
--- a/recipes/pandora-system/pandora-scripts/op_cpusettings.sh
+++ b/recipes/pandora-system/pandora-scripts/op_cpusettings.sh
@@ -8,7 +8,7 @@ while mainsel=$(zenity --title="CPU-Settings" --width="400" --height="380" --lis
 case $mainsel in
  
   "profile")
-    cpusel=$(zenity --title="Optional settings" --width="400" --height="350" --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)" "8003" "Clockspeed: 800MHz, OPP3 (Stable on 1GHz units, probably unstable on 600MHz units)" "800" "Clockspeed: 800MHz, OPP5 (600MHz units only, should be stable on all units)" "600" "Clockspeed: 600MHz, OPP3 (600 MHz units only)" --ok-label="Select CPU Profile" )
+    cpusel=$(zenity --title="Optional settings" --width="400" --height="350" --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 (600 MHz units only)" --ok-label="Select CPU Profile" )
 
     case $cpusel in
         "1100")
@@ -41,15 +41,6 @@ case $mainsel in
        zenity --info --title="CPU Speed set" --text "The maximum CPU Speed has been set to 800MHz." --timeout 6
        ;;
 
-       "8003")
-       echo 3 > /proc/pandora/cpu_opp_max
-       sed -i "s/.*maxopp.*/maxopp:3/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
-       /usr/pandora/scripts/op_cpuspeed.sh -n 800
-       zenity --info --title="CPU Speed set" --text "The maximum CPU Speed has been set to 800MHz." --timeout 6
-       ;;
 
        "600")
        echo 3 > /proc/pandora/cpu_opp_max
@@ -80,7 +71,7 @@ case $mainsel in
     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\nPlease note: The allowed minimum-CPU-Speed depends on the set OPP-Value, so it might be your system ignores maximum CPU-Speeds which are set too low.\n\nBe absolutely sure you know what you are doing here.\n\n" --ok-label="Yes, I know what I'm doing!" --cancel-label="I'm scared!"; then
+    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\n" --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
          sed -i "s/.*max:.*/max:$newmax/g" /etc/pandora/conf/cpu.conf
          if [ "$defspeed" -gt "$newmax" ]; then
@@ -88,7 +79,7 @@ case $mainsel in
            zenity --info --title="Default speed info" --text "As your default speed was set higher than your new maximum, it 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 "The maximum allowed CPU Speed of your Pandora is now $newmax MHz.\n\nPlease note that some OPP-Settings require a minimum-CPU-Speed. If your maximum set CPU Speed is below that value, it will be ignored." --timeout 6
+         zenity --info --title="MHz range set" --text "The maximum allowed CPU Speed of your Pandora is now $newmax MHz.\n\n" --timeout 6
        else
          zenity --info --title="No change" --text "The CPU Speed has not been changed." --timeout 6
        else
@@ -125,7 +116,7 @@ case $mainsel in
       if newdefault=$(zenity --scale --text "Set the default CPU speed" --min-value=$min --max-value=$max --value=$defspeed --step 1); then
        /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.\n\nPlease note that some OPP-Settings require a minimum-CPU-Speed. If your default set CPU Speed is below that value, it will be ignored." --timeout 6
+       zenity --info --title="Default speed set" --text "The default clock speed has been set to $newdefault." --timeout 6
       else
        zenity --info --title="No change" --text "The default CPU speed has not been changed." --timeout 6
       fi