Merge pull request #1227 from siiky/fix/lam-1230/cc-rotate-screens

LAM-1230 fix: `calibrate-screen.sh`

deploy/codebase/lamassu-machine-manager.js

@@ -105,6 +105,7 @@ function updateSupervisor (cb) {
 
   const commands = [
     async.apply(command, `cp ${supervisorPath}/* /etc/supervisor/conf.d/`),
+    async.apply(command, `rm -f /etc/supervisor/conf.d/calibrate-screen.conf`),
     async.apply(command, `sed -i 's|^user=.*\$|user=${osuser}|;' /etc/supervisor/conf.d/lamassu-browser.conf || true`)
   ]
 

hardware/system/coincloud/jcm-ipro-rc/calibrate-screen.sh

@@ -1,9 +1,33 @@
 #!/usr/bin/env sh
-xrandr -o left # normal, inverted, left, right
-identityMat='1 0 0 0 1 0 0 0 1'
-leftRotateMat='0 -1 1 1 0 0 0 0 1'
-rightRotateMat='0 1 0 -1 0 1 0 0 1'
-xinput set-prop 'ILITEK ILITEK-TP' --type=float 'Coordinate Transformation Matrix' $leftRotateMat
-xset s off
-xset s noblank
-xset -dpms
+set -e
+
+### CHANGE CONFIGURATION AT THE END OF THE FILE ###
+
+configure_screen() {
+	local rotation="$1"
+	case "${rotation}" in
+		normal) touchRotation='1 0 0 0 1 0 0 0 1';;
+		left) touchRotation='0 -1 1 1 0 0 0 0 1';;
+		right) touchRotation='0 1 0 -1 0 1 0 0 1';;
+		*) echo "Unknown rotation '${rotation}'..."; exit 1;;
+	esac
+	screenRotation="${rotation}"
+
+	xrandr -o "${screenRotation}" \
+		&& xset s off \
+		&& xset s noblank \
+		&& xset -dpms
+}
+
+configure_touch() {
+	local screen="$1"
+	xinput set-prop "${screen}" --type=float 'Coordinate Transformation Matrix' $touchRotation
+}
+
+### CHANGE CONFIGURATION BELOW TO MATCH THE CONNECTED SCREEN ###
+
+# One of: normal, left, right
+configure_screen left
+# Find the screen name under "Virtual core pointer" of the following command:
+#   xinput list
+configure_touch 'ILITEK ILITEK-TP'

hardware/system/coincloud/mei-bnr/calibrate-screen.sh

@@ -1,9 +1,33 @@
 #!/usr/bin/env sh
-xrandr -o left # normal, inverted, left, right
-identityMat='1 0 0 0 1 0 0 0 1'
-leftRotateMat='0 -1 1 1 0 0 0 0 1'
-rightRotateMat='0 1 0 -1 0 1 0 0 1'
-xinput set-prop 'ILITEK ILITEK-TP' --type=float 'Coordinate Transformation Matrix' $leftRotateMat
-xset s off
-xset s noblank
-xset -dpms
+set -e
+
+### CHANGE CONFIGURATION AT THE END OF THE FILE ###
+
+configure_screen() {
+	local rotation="$1"
+	case "${rotation}" in
+		normal) touchRotation='1 0 0 0 1 0 0 0 1';;
+		left) touchRotation='0 -1 1 1 0 0 0 0 1';;
+		right) touchRotation='0 1 0 -1 0 1 0 0 1';;
+		*) echo "Unknown rotation '${rotation}'..."; exit 1;;
+	esac
+	screenRotation="${rotation}"
+
+	xrandr -o "${screenRotation}" \
+		&& xset s off \
+		&& xset s noblank \
+		&& xset -dpms
+}
+
+configure_touch() {
+	local screen="$1"
+	xinput set-prop "${screen}" --type=float 'Coordinate Transformation Matrix' $touchRotation
+}
+
+### CHANGE CONFIGURATION BELOW TO MATCH THE CONNECTED SCREEN ###
+
+# One of: normal, left, right
+configure_screen left
+# Find the screen name under "Virtual core pointer" of the following command:
+#   xinput list
+configure_touch 'ILITEK ILITEK-TP'

hardware/system/coincloud/mei-scr/calibrate-screen.sh

@@ -1,9 +1,33 @@
 #!/usr/bin/env sh
-xrandr -o left # normal, inverted, left, right
-identityMat='1 0 0 0 1 0 0 0 1'
-leftRotateMat='0 -1 1 1 0 0 0 0 1'
-rightRotateMat='0 1 0 -1 0 1 0 0 1'
-xinput set-prop 'ILITEK ILITEK-TP' --type=float 'Coordinate Transformation Matrix' $leftRotateMat
-xset s off
-xset s noblank
-xset -dpms
+set -e
+
+### CHANGE CONFIGURATION AT THE END OF THE FILE ###
+
+configure_screen() {
+	local rotation="$1"
+	case "${rotation}" in
+		normal) touchRotation='1 0 0 0 1 0 0 0 1';;
+		left) touchRotation='0 -1 1 1 0 0 0 0 1';;
+		right) touchRotation='0 1 0 -1 0 1 0 0 1';;
+		*) echo "Unknown rotation '${rotation}'..."; exit 1;;
+	esac
+	screenRotation="${rotation}"
+
+	xrandr -o "${screenRotation}" \
+		&& xset s off \
+		&& xset s noblank \
+		&& xset -dpms
+}
+
+configure_touch() {
+	local screen="$1"
+	xinput set-prop "${screen}" --type=float 'Coordinate Transformation Matrix' $touchRotation
+}
+
+### CHANGE CONFIGURATION BELOW TO MATCH THE CONNECTED SCREEN ###
+
+# One of: normal, left, right
+configure_screen left
+# Find the screen name under "Virtual core pointer" of the following command:
+#   xinput list
+configure_touch 'ILITEK ILITEK-TP'

hardware/system/generalbytes/batm3/calibrate-screen.sh

@@ -1,9 +1,33 @@
 #!/usr/bin/env sh
-xrandr -o normal # normal, inverted, left, right
-identityMat='1 0 0 0 1 0 0 0 1'
-leftRotateMat='0 -1 1 1 0 0 0 0 1'
-rightRotateMat='0 1 0 -1 0 1 0 0 1'
-xinput set-prop 'Virtual core pointer' --type=float 'Coordinate Transformation Matrix' $identityMat
-xset s off
-xset s noblank
-xset -dpms
+set -e
+
+### CHANGE CONFIGURATION AT THE END OF THE FILE ###
+
+configure_screen() {
+	local rotation="$1"
+	case "${rotation}" in
+		normal) touchRotation='1 0 0 0 1 0 0 0 1';;
+		left) touchRotation='0 -1 1 1 0 0 0 0 1';;
+		right) touchRotation='0 1 0 -1 0 1 0 0 1';;
+		*) echo "Unknown rotation '${rotation}'..."; exit 1;;
+	esac
+	screenRotation="${rotation}"
+
+	xrandr -o "${screenRotation}" \
+		&& xset s off \
+		&& xset s noblank \
+		&& xset -dpms
+}
+
+configure_touch() {
+	local screen="$1"
+	xinput set-prop "${screen}" --type=float 'Coordinate Transformation Matrix' $touchRotation
+}
+
+### CHANGE CONFIGURATION BELOW TO MATCH THE CONNECTED SCREEN ###
+
+# One of: normal, left, right
+configure_screen normal
+# Find the screen name under "Virtual core pointer" of the following command:
+#   xinput list
+configure_touch 'Virtual core pointer'

hardware/system/generalbytes/batm7in/calibrate-screen.sh

@@ -1,9 +1,33 @@
 #!/usr/bin/env sh
-xrandr -o normal # normal, inverted, left, right
-identityMat='1 0 0 0 1 0 0 0 1'
-leftRotateMat='0 -1 1 1 0 0 0 0 1'
-rightRotateMat='0 1 0 -1 0 1 0 0 1'
-xinput set-prop 'ILITEK ILITEK-TP' --type=float 'Coordinate Transformation Matrix' $identityMat
-xset s off
-xset s noblank
-xset -dpms
+set -e
+
+### CHANGE CONFIGURATION AT THE END OF THE FILE ###
+
+configure_screen() {
+	local rotation="$1"
+	case "${rotation}" in
+		normal) touchRotation='1 0 0 0 1 0 0 0 1';;
+		left) touchRotation='0 -1 1 1 0 0 0 0 1';;
+		right) touchRotation='0 1 0 -1 0 1 0 0 1';;
+		*) echo "Unknown rotation '${rotation}'..."; exit 1;;
+	esac
+	screenRotation="${rotation}"
+
+	xrandr -o "${screenRotation}" \
+		&& xset s off \
+		&& xset s noblank \
+		&& xset -dpms
+}
+
+configure_touch() {
+	local screen="$1"
+	xinput set-prop "${screen}" --type=float 'Coordinate Transformation Matrix' $touchRotation
+}
+
+### CHANGE CONFIGURATION BELOW TO MATCH THE CONNECTED SCREEN ###
+
+# One of: normal, left, right
+configure_screen normal
+# Find the screen name under "Virtual core pointer" of the following command:
+#   xinput list
+configure_touch 'ILITEK ILITEK-TP'

hardware/system/genmega/gemini/calibrate-screen.sh

@@ -1,9 +1,33 @@
 #!/usr/bin/env sh
-xrandr -o left # normal, inverted, left, right
-identityMat='1 0 0 0 1 0 0 0 1'
-leftRotateMat='0 -1 1 1 0 0 0 0 1'
-rightRotateMat='0 1 0 -1 0 1 0 0 1'
-xinput set-prop 'ILITEK ILITEK-TP' --type=float 'Coordinate Transformation Matrix' $leftRotateMat
-xset s off
-xset s noblank
-xset -dpms
+set -e
+
+### CHANGE CONFIGURATION AT THE END OF THE FILE ###
+
+configure_screen() {
+	local rotation="$1"
+	case "${rotation}" in
+		normal) touchRotation='1 0 0 0 1 0 0 0 1';;
+		left) touchRotation='0 -1 1 1 0 0 0 0 1';;
+		right) touchRotation='0 1 0 -1 0 1 0 0 1';;
+		*) echo "Unknown rotation '${rotation}'..."; exit 1;;
+	esac
+	screenRotation="${rotation}"
+
+	xrandr -o "${screenRotation}" \
+		&& xset s off \
+		&& xset s noblank \
+		&& xset -dpms
+}
+
+configure_touch() {
+	local screen="$1"
+	xinput set-prop "${screen}" --type=float 'Coordinate Transformation Matrix' $touchRotation
+}
+
+### CHANGE CONFIGURATION BELOW TO MATCH THE CONNECTED SCREEN ###
+
+# One of: normal, left, right
+configure_screen left
+# Find the screen name under "Virtual core pointer" of the following command:
+#   xinput list
+configure_touch 'ILITEK ILITEK-TP'

hardware/system/genmega/gmuk1/calibrate-screen.sh

@@ -1,10 +1,34 @@
 #!/usr/bin/env sh
-xrandr -o left # normal, inverted, left, right
-identityMat='1 0 0 0 1 0 0 0 1'
-leftRotateMat='0 -1 1 1 0 0 0 0 1'
-rightRotateMat='0 1 0 -1 0 1 0 0 1'
-xinput set-prop 'Silicon Works Multi-touch Device' --type=float 'Coordinate Transformation Matrix' $leftRotateMat
-xinput set-prop 'Silicon Works Multi-touch SW4101C' --type=float 'Coordinate Transformation Matrix' $leftRotateMat
-xset s off
-xset s noblank
-xset -dpms
+set -e
+
+### CHANGE CONFIGURATION AT THE END OF THE FILE ###
+
+configure_screen() {
+	local rotation="$1"
+	case "${rotation}" in
+		normal) touchRotation='1 0 0 0 1 0 0 0 1';;
+		left) touchRotation='0 -1 1 1 0 0 0 0 1';;
+		right) touchRotation='0 1 0 -1 0 1 0 0 1';;
+		*) echo "Unknown rotation '${rotation}'..."; exit 1;;
+	esac
+	screenRotation="${rotation}"
+
+	xrandr -o "${screenRotation}" \
+		&& xset s off \
+		&& xset s noblank \
+		&& xset -dpms
+}
+
+configure_touch() {
+	local screen="$1"
+	xinput set-prop "${screen}" --type=float 'Coordinate Transformation Matrix' $touchRotation
+}
+
+### CHANGE CONFIGURATION BELOW TO MATCH THE CONNECTED SCREEN ###
+
+# One of: normal, left, right
+configure_screen left
+# Find the screen name under "Virtual core pointer" of the following command:
+#   xinput list
+configure_touch 'Silicon Works Multi-touch Device'
+configure_touch 'Silicon Works Multi-touch SW4101C'