From: Michael Mrozek Date: Tue, 24 Apr 2012 02:02:04 +0000 (+0200) Subject: op_power.sh: Suspend can now be triggered when lid is already closed. Untriggering... X-Git-Tag: sz_beta4~17 X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6806f696e6d25fd6e7a5a4d80188b083f944cd93;p=openpandora.oe.git op_power.sh: Suspend can now be triggered when lid is already closed. Untriggering suspend ALWAYS switched the LCD back on. --- diff --git a/recipes/pandora-system/pandora-scripts.bb b/recipes/pandora-system/pandora-scripts.bb index 459b4f3..de1dc97 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 = "r91" +PR = "r92" SRC_URI = " \ file://op_paths.sh \ diff --git a/recipes/pandora-system/pandora-scripts/op_power.sh b/recipes/pandora-system/pandora-scripts/op_power.sh index bdfe27c..bb5e715 100644 --- a/recipes/pandora-system/pandora-scripts/op_power.sh +++ b/recipes/pandora-system/pandora-scripts/op_power.sh @@ -186,6 +186,7 @@ Please do not remove SD cards while pandora is suspended, doing so will corrupt modprobe $restore_list fi + display_on resume_net echo 255 > /sys/class/leds/pandora\:\:power/brightness @@ -244,6 +245,9 @@ if [[ "$2" == "" ]]; then elif [[ "$powerstate" == "on" ]]; then powerstate="buttonlowpower" (debug && echo "suspend") || suspend_ + elif [[ "$powerstate" == "liddisplayoff" ]]; then + powerstate="buttonlowpower" + (debug && echo "suspend") || suspend_ fi elif [[ "$1" -ge 3 ]]; then # power button was pressed 3 sec or longer, shutdown if [[ "$powerstate" == "on" ]]; then