Explicitly set the touchscreen device for ts_calibrate

Newer versions of ts_calibrate cannot autodectect the am335x touchscreen anymore but need to have the device specified via the TSLIB_TSDEVICE environment variable. Fixes #120
ftCommunity · Jun 2, 2018 · 63af3b3 · 63af3b3
1 parent 936b4cb
commit 63af3b3
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/board/fischertechnik/TXT/rootfs/etc/sudoers.d/display-settings b/board/fischertechnik/TXT/rootfs/etc/sudoers.d/display-settings
@@ -1,4 +1,5 @@
 ## Permissions for ftc access to programs required
 ## for changing display settings
 
+Defaults!/usr/bin/ts_calibrate env_keep=TSLIB_TSDEVICE
 ftc     ALL = NOPASSWD: /usr/bin/ts_calibrate, /etc/init.d/S90launcher restart
diff --git a/board/fischertechnik/TXT/rootfs/opt/ftc/apps/system/display/display.py b/board/fischertechnik/TXT/rootfs/opt/ftc/apps/system/display/display.py
@@ -49,7 +49,7 @@ def on_calibrate_touchscreen(self):
         self.mainWindow = TouchBaseWidget()
         self.mainWindow.show()
         old_window.close()
-        subprocess.run(["sudo", "/usr/bin/ts_calibrate"])
+        subprocess.run(["sudo", "TSLIB_TSDEVICE=/dev/input/event0", "/usr/bin/ts_calibrate"])
         self.restart_launcher(QCoreApplication.translate("main", "Activating new touchscreen calibration..."))
 
     def on_change_orientation(self, index):