Commit: 0204ed22a6c2d1087beadaaf39f3f6d710fb7043 - xinput_calibrator (git)

A generic touchscreen calibration program for X.Org

Commit MetaInfo

• Revision: 0204ed22a6c2d1087beadaaf39f3f6d710fb7043 (tree)
• Time: 2012-03-08 18:24:47
• Author: Tias Guns <tias@ulys...>
• Commiter: Tias Guns

Log Message

Merge pull request #33 from koenkooi/master

Fixes needed to make the calibration script work on a Beagleboard running Angstrom

Change Summary

• modified: scripts/xinput_calibrator_pointercal.sh

Incremental Difference

--- a/scripts/xinput_calibrator_pointercal.sh
+++ b/scripts/xinput_calibrator_pointercal.sh
@@ -6,18 +6,26 @@
 #
 # original script: Martin Jansa <[e-mail]>, 2010-01-31
 # updated by Tias Guns <[e-mail]>, 2010-02-15
+# updated by Koen Kooi <[e-mail]>, 2012-02-28
+
+PATH="/usr/bin:$PATH"
 
 BINARY="xinput_calibrator"
 CALFILE="/etc/pointercal.xinput"
 LOGFILE="/var/log/xinput_calibrator.pointercal.log"
 
 if [ -e $CALFILE ] ; then
-  echo "Using calibration data stored in $CALFILE"
-  . $CALFILE
-else
-  CALDATA=`$BINARY -v | tee $LOGFILE | grep '    xinput set' | sed 's/^    //g; s/$/;/g'`
-  if [ ! -z "$CALDATA" ] ; then
-    echo $CALDATA > $CALFILE
-    echo "Calibration data stored in $CALFILE (log in $LOGFILE)"
+  if grep replace $CALFILE ; then
+    echo "Empty calibration file found, removing it"
+    rm $CALFILE
+  else
+    echo "Using calibration data stored in $CALFILE"
+    . $CALFILE && exit 0
   fi
 fi
+
+CALDATA=`$BINARY --output-type xinput -v | tee $LOGFILE | grep '    xinput set' | sed 's/^    //g; s/$/;/g'`
+if [ ! -z "$CALDATA" ] ; then
+  echo $CALDATA > $CALFILE
+  echo "Calibration data stored in $CALFILE (log in $LOGFILE)"
+fi