op_cpusettings.sh: Revised settings based on cpufreq-system (removed minimum clockspe...

first-run-wizard.sh: Added one more CPU-Speed profile
cpu.conf: Disabled overclocking warning as default
Bumped recipes.

diff --git a/recipes/pandora-system/pandora-first-run-wizard.bb b/recipes/pandora-system/pandora-first-run-wizard.bb
index 2184364..abbbd30 100755 (executable)
--- a/recipes/pandora-system/pandora-first-run-wizard.bb
+++ b/recipes/pandora-system/pandora-first-run-wizard.bb
@@ -6,7 +6,7 @@ RDEPENDS = "hsetroot zenity dbus pandora-wallpaper-official tslib tslib-calibrat
 
 COMPATIBLE_MACHINE = "omap3-pandora"
 
-PR = "r40"
+PR = "r41"
 
 SRC_URI = " \
           file://first-run-wizard.sh \

diff --git a/recipes/pandora-system/pandora-first-run-wizard/first-run-wizard.sh b/recipes/pandora-system/pandora-first-run-wizard/first-run-wizard.sh
index c83993f..3ae54c3 100755 (executable)
--- a/recipes/pandora-system/pandora-first-run-wizard/first-run-wizard.sh
+++ b/recipes/pandora-system/pandora-first-run-wizard/first-run-wizard.sh
@@ -221,7 +221,7 @@ hwclock -u -w
 
 
 #Let's ask the user about clockspeed
-while ! 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 (probably unstable on 600Mhz units)" "800" "Clockspeed: 800MHz, OPP5 (should be stable on all units)" "600" "Default Speed: 600MHz, OPP3 (stable on all units, longest battery time)" --ok-label="Select CPU Profile" ); do
+while ! 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" ); do
     zenity --title="Error" --error --text="Please select your desired CPU Speed profile." --timeout=6
 done
 
@@ -253,6 +253,17 @@ case $cpusel in
   default_cpu=800
   ;;
 
+  "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
   sed -i "s/.*maxopp.*/maxopp:3/g" /etc/pandora/conf/cpu.conf

diff --git a/recipes/pandora-system/pandora-scripts.bb b/recipes/pandora-system/pandora-scripts.bb
index 0a4cac7..3e4b64b 100644 (file)
--- 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 = "r103"
+PR = "r104"
 
 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 19594ac..f0475a5 100755 (executable)
--- a/recipes/pandora-system/pandora-scripts/cpu.conf
+++ b/recipes/pandora-system/pandora-scripts/cpu.conf
@@ -1,7 +1,7 @@
 max:800
 min:125
 safe:600
-warn:yes
+warn:no
 default:600
 maxopp:5
 

diff --git a/recipes/pandora-system/pandora-scripts/op_cpusettings.sh b/recipes/pandora-system/pandora-scripts/op_cpusettings.sh
index 82e7276..ab77e38 100755 (executable)
--- a/recipes/pandora-system/pandora-scripts/op_cpusettings.sh
+++ b/recipes/pandora-system/pandora-scripts/op_cpusettings.sh
@@ -3,12 +3,12 @@
 # CPU-Settings, v1.1, written by Michael Mrozek aka EvilDragon 2011.
 # This scripts allows you to change Pandora CPU-Settings.
 
-while mainsel=$(zenity --title="CPU-Settings" --width="400" --height="380" --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
+while mainsel=$(zenity --title="CPU-Settings" --width="400" --height="380" --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 maximum allowed MHz" "warning" "Change warning settings" "defaultmhz" "Set the default maximum MHz" --ok-label="Change Setting" --cancel-label="Exit"); do
 
 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)" "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" )
+    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" )
 
     case $cpusel in
         "1100")
@@ -18,7 +18,7 @@ case $mainsel in
        sed -i "s/.*default.*/default:1100/g" /etc/pandora/conf/cpu.conf
        sed -i "s/.*safe.*/safe:1100/g" /etc/pandora/conf/cpu.conf
        /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
+       zenity --info --title="CPU Speed set" --text "The maximum CPU Speed has been set to 1,1GHz." --timeout 6
        ;;
 
        "1000")
@@ -28,7 +28,7 @@ case $mainsel in
        sed -i "s/.*default.*/default:1000/g" /etc/pandora/conf/cpu.conf
        sed -i "s/.*safe.*/safe:1000/g" /etc/pandora/conf/cpu.conf
        /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
+       zenity --info --title="CPU Speed set" --text "The maximum CPU Speed has been set to 1GHz." --timeout 6
        ;;      
 
        "800")
@@ -38,7 +38,17 @@ case $mainsel in
        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 CPU Speed has been set to 800MHz." --timeout 6
+       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")
@@ -48,7 +58,7 @@ case $mainsel in
        sed -i "s/.*default.*/default:600/g" /etc/pandora/conf/cpu.conf
        sed -i "s/.*safe.*/safe:600/g" /etc/pandora/conf/cpu.conf
        /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
+       zenity --info --title="CPU Speed set" --text "The maxmimum CPU Speed has been set to 600Mhz." --timeout 6
        ;;
 
     esac
@@ -56,7 +66,7 @@ case $mainsel in
 
   "opp")
     opp="$(cat /etc/pandora/conf/cpu.conf | grep opp | awk -F\: '{print $2}')"
-    if zenity --question --title="OPP Setting Info" --text="WARNING!\n\nIncreasing the maximum allowed OPP will allow you to overclock to higher values.\n\nHowever, besides using more power, it ALSO DECREASES THE LIFETIME OF YOUR CPU!\n\nBe absolutely sure you know what you are doing here. \n\nThe standard OPP setting is 3, everything above is out of the specification!" --ok-label="Yes, I know what I'm doing!" --cancel-label="I'm scared!"; then
+    if zenity --question --title="OPP Setting Info" --text="WARNING!\n\nIncreasing the maximum allowed OPP will allow you to overclock to higher values.\n\nHowever, besides using more power, it ALSO DECREASES THE LIFETIME OF YOUR CPU!" --ok-label="Yes, I know what I'm doing!" --cancel-label="I'm scared!"; then
       if newopp=$(zenity --scale --text "Set the maximum allowed OPP" --min-value=3 --max-value=5 --value=$opp --step 1); then
        echo $newopp > /proc/pandora/cpu_opp_max
        sed -i "s/.*maxopp.*/maxopp:$newopp/g" /etc/pandora/conf/cpu.conf
@@ -70,20 +80,17 @@ 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\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 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 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
+           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 "Your Pandora can now set the CPU clock between $newmin and $newmax MHz." --timeout 6
+         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
        else
          zenity --info --title="No change" --text "The CPU Speed has not been changed." --timeout 6
-       fi
        else
        zenity --info --title="No change" --text "The CPU Speed has not been changed." --timeout 6
       fi
@@ -94,7 +101,7 @@ case $mainsel in
     safe="$(cat /etc/pandora/conf/cpu.conf | grep safe | awk -F\: '{print $2}')"
     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}')"
-    if zenity --question --title="Warning Setting Info" --text="The Pandora usually displays a warning if you try to overclock.\n\nYou can either select at what speed the warning should appear or disable it completely.\n\nBe absolutely sure you know what you are doing here.\n\nThe standard setting is 600MHz." --ok-label="Yes, I know what I'm doing!" --cancel-label="I'm scared!"; then
+    if zenity --question --title="Warning Setting Info" --text="The Pandora can display a warning if you try to overclock.\n\nYou can either select at what speed the warning should appear or disable it completely.\n\nBe absolutely sure you know what you are doing here.\n\nThe standard setting is 600MHz." --ok-label="Yes, I know what I'm doing!" --cancel-label="I'm scared!"; then
       if zenity --question --title="Disable Warning?" --text="Do you want to enable or disable the warning?" --ok-label="Enable it" --cancel-label="Disable it"; then
        if newsafe=$(zenity --scale --text "At what speed should the warning appear?" --min-value=$min --max-value=$max --value=$safe --step 1); then
          sed -i "s/.*warn.*/warn:yes/g" /etc/pandora/conf/cpu.conf
@@ -118,7 +125,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." --timeout 6
+       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
       else
        zenity --info --title="No change" --text "The default CPU speed has not been changed." --timeout 6
       fi