From d74553fc0552ef5e7a5a5a5036007e3912b4dcfd Mon Sep 17 00:00:00 2001 From: Michael Mrozek Date: Thu, 16 Feb 2012 02:22:59 +0100 Subject: [PATCH] op_bluetooth.sh, op_cpusettings.sh, op_cpuspeed.sh: Added notice that these won't work with experimental kernel --- .../pandora-system/pandora-scripts/op_bluetooth.sh | 9 +++++++-- .../pandora-system/pandora-scripts/op_cpusettings.sh | 11 +++++++++-- recipes/pandora-system/pandora-scripts/op_cpuspeed.sh | 8 ++++++++ 3 files changed, 24 insertions(+), 4 deletions(-) diff --git a/recipes/pandora-system/pandora-scripts/op_bluetooth.sh b/recipes/pandora-system/pandora-scripts/op_bluetooth.sh index 93615ff..2d5b79a 100644 --- a/recipes/pandora-system/pandora-scripts/op_bluetooth.sh +++ b/recipes/pandora-system/pandora-scripts/op_bluetooth.sh @@ -9,8 +9,7 @@ cd "$HOME" if [ "$1" = "startup" ]; then [ -f "$LOCK" ] && sudo /usr/sbin/hciconfig "$INTERFACE" up pscan 1>/dev/null && sudo /usr/sbin/bluetoothd || echo "Bluetooth: User has not enabled Bluetooth." -else - +else # Figure out if Bluetooth is running or not if hciconfig "$INTERFACE" | grep UP &>/dev/null @@ -19,6 +18,11 @@ else sudo /usr/sbin/hciconfig ${INTERFACE} down 1>/dev/null rm -f "$LOCK" else + kernel_major=`uname -r | cut -c 1` + if [ "$kernel_major" = "3" ]; then + zenity --info --title="Bluetooth not supported" --text "Sorry, the experimental kernel does not support Bluetooth (yet).\n\nIt could not be enabled." + exit 1 + else pgrep bluetoothd echo $INTERFACE if [ $? -ne 1 ]; then @@ -30,4 +34,5 @@ else fi fi + fi fi diff --git a/recipes/pandora-system/pandora-scripts/op_cpusettings.sh b/recipes/pandora-system/pandora-scripts/op_cpusettings.sh index 4faf6a2..b8fc541 100755 --- a/recipes/pandora-system/pandora-scripts/op_cpusettings.sh +++ b/recipes/pandora-system/pandora-scripts/op_cpusettings.sh @@ -3,7 +3,13 @@ # 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="250" --list --column "id" --column "Please select" --hide-column=1 --text="What do you want to do?" "opp" "Set the max allowed OPP level" "mhz" "Set the minimum / maximum allowed MHz" "warning" "Change warning settings" "defaultmhz" "Set the default MHz"); do +kernel_major=`uname -r | cut -c 1` +if [ "$kernel_major" = "3" ]; 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 +else + +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 case $mainsel in @@ -73,4 +79,5 @@ case $mainsel in esac -done \ No newline at end of file +done +fi \ No newline at end of file diff --git a/recipes/pandora-system/pandora-scripts/op_cpuspeed.sh b/recipes/pandora-system/pandora-scripts/op_cpuspeed.sh index 379493d..2aae2d2 100755 --- a/recipes/pandora-system/pandora-scripts/op_cpuspeed.sh +++ b/recipes/pandora-system/pandora-scripts/op_cpuspeed.sh @@ -7,6 +7,13 @@ warn="$(cat /etc/pandora/conf/cpu.conf | grep 'warn:' | awk -F\: '{print $2}')" curmhz="$(cat /proc/pandora/cpu_mhz_max)" newmhz="$(cat /proc/pandora/cpu_mhz_max)" device=/proc/pandora/cpu_mhz_max +kernel_major=`uname -r | cut -c 1` + +if [ "$kernel_major" = "3" ]; then + zenity --info --title="CPU-Settings not supported" --text "Sorry, the experimental kernel does not support setting the clockspeed (yet)." + exit 1 +else + if [ ! $1 ]; then if [ $DISPLAY ]; then newmhz=$(zenity --scale --text "Set CPU clockspeed" --min-value=$minmhz --max-value=$maxmhz --value=$curmhz --step 1) @@ -36,3 +43,4 @@ if [ $newmhz ]; then echo $newmhz > $device echo cpu_mhz_max set to $(cat /proc/pandora/cpu_mhz_max) fi +fi \ No newline at end of file -- 2.39.5