From 7f5834938c53df3568ebd0441584b7a553059a17 Mon Sep 17 00:00:00 2001 From: Michael Mrozek Date: Wed, 27 Jun 2012 02:21:01 +0200 Subject: [PATCH] pandora-first-run-wizard: Add LCD calibration --- recipes/pandora-system/pandora-first-run-wizard.bb | 2 +- .../pandora-first-run-wizard/first-run-wizard.sh | 8 ++++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/recipes/pandora-system/pandora-first-run-wizard.bb b/recipes/pandora-system/pandora-first-run-wizard.bb index 1ff6c50..95c7f2c 100755 --- 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 = "r42" +PR = "r43" 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 77273d2..984d6a3 100755 --- a/recipes/pandora-system/pandora-first-run-wizard/first-run-wizard.sh +++ b/recipes/pandora-system/pandora-first-run-wizard/first-run-wizard.sh @@ -306,10 +306,14 @@ touch /etc/pandora/first-boot # Make the control file writeable by all to allow the user to delete to rerun the wizard on next boot. chmod 0666 /etc/pandora/first-boot +if zenity --question --title="Calibrate Touchscreen" --text="It is recommended to calibrate the touchscreen to make sure it accurately works.\n\nIf you do so, you will see a moving crosshair.\nUse the stylus to press the crosshair as accurate as possible.\n\nYou can always (re-)calibrate it from the Settings-Menu later in the OS as well." --ok-label="Calibrate Touchscreen" --cancel-label="Don't calibrate it"; then + . /etc/profile + TSLIB_CONSOLEDEVICE=none op_runfbapp ts_calibrate +fi # Let the user run optional config stuff. -while mainsel=$(zenity --title="Optional settings" --width="400" --height="300" --list --column "id" --column "Please select" --hide-column=1 --text="This concludes the mandatory part of the First Boot Wizard.\n\nYou can now either continue to boot the system or change some more settings.\n\n\nThank you for buying the OpenPandora. Enjoy using the device." "speed" "Advanced CPU-Speed and Overclocking-Settings" "startup" "Advanced Startup-Settings" "lcd" "LCD-Settings" --ok-label="Change selected Setting" --cancel-label="Continue to Boot"); do +while mainsel=$(zenity --title="Optional settings" --width="400" --height="300" --list --column "id" --column "Please select" --hide-column=1 --text="This concludes the mandatory part of the First Boot Wizard.\n\nYou can now either continue to boot the system or change some more settings.\n\n\nThank you for buying the OpenPandora. Enjoy using the device." "speed" "Advanced CPU-Speed and Overclocking-Settings" "startup" "Advanced Startup-Settings" "lcd" "LCD-Settings" --ok-label="Change selected Setting" --cancel-label="Finish Setup"); do case $mainsel in "speed") @@ -327,7 +331,7 @@ case $mainsel in esac done - +reboot # ---- -- 2.39.2