浏览代码

adding kiosk for resistive and capacitive screens

* minor differences but substantial enough to see changes
* mostly for bookeeping to make sure the two have some record/stay
  separate
clementinecomputing 6 年之前
父节点
当前提交
20319b40ff
共有 4 个文件被更改,包括 135 次插入69 次删除
  1. 0 69
      busunit/DIUv2/diu_kiosk
  2. 1 0
      busunit/DIUv2/diu_kiosk
  3. 65 0
      busunit/DIUv2/diu_kiosk.capacitive
  4. 69 0
      busunit/DIUv2/diu_kiosk.resistive

+ 0 - 69
busunit/DIUv2/diu_kiosk

@@ -1,69 +0,0 @@
-#!/bin/bash
-#
-# Copyright (c) 2019 Clementine Computing LLC.
-#
-# This file is part of PopuFare.
-#
-# PopuFare is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Affero General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# PopuFare is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Affero General Public License for more details.
-#
-# You should have received a copy of the GNU Affero General Public License
-# along with PopuFare.  If not, see <https://www.gnu.org/licenses/>.
-#
-
-export BASEDIR=/home/pi
-
-export DISPLAY=:0
-
-# we've inverted the display, make sure to invert touchscreen
-#
-xinput --set-prop 'ADS7846 Touchscreen' 'Coordinate Transformation Matrix' -1.000000 0.000000 1.000000 0.000000 -1.000000 1.00000 0.000000 0.000000 1.000000
-
-# turn off screensave/screen blanking
-#
-xset s noblank
-xset s off
-xset -dpms
-
-# hide mouse after 0.5 seconds of idle time
-#
-unclutter -idle 0.05 -root &
-
-# hide mouse completely
-#
-#unclutter -root &
-
-
-# clear out warning bar on chromium
-#
-tmpfn=`mktemp`
-jq '.profile.exited_cleanly = true' $BASEDIR/.config/chromium/Preferences | jq '.profile.exit_type = "Normal"' > $tmpfn
-mv $tmpfn $BASEDIR/.config/chromium/Preferences
-
-# start chromium in kiosk mode
-#
-
-#/usr/bin/chromium-browser --noerrdialogs --disable-infobars --kiosk ./html/index.html
-#
-#  --disable-application-cache \
-/usr/bin/chromium-browser \
-  --noerrdialogs \
-  --disable-infobars \
-  --aggressive-cache-discard \
-  --incognito \
-  --kiosk \
-  'http://localhost:60535'
-
-
-
-# refresh
-#
-#xdotool keydown ctrl+r; xdotool keyup ctrl+r;
-

+ 1 - 0
busunit/DIUv2/diu_kiosk

@@ -0,0 +1 @@
+diu_kiosk.capacitive

+ 65 - 0
busunit/DIUv2/diu_kiosk.capacitive

@@ -0,0 +1,65 @@
+#!/bin/bash
+#
+# Copyright (c) 2019 Clementine Computing LLC.
+#
+# This file is part of PopuFare.
+#
+# PopuFare is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# PopuFare is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Affero General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with PopuFare.  If not, see <https://www.gnu.org/licenses/>.
+#
+
+export BASEDIR=/home/pi
+
+export DISPLAY=:0
+
+# turn off screensave/screen blanking
+#
+xset s noblank
+xset s off
+xset -dpms
+
+# hide mouse after 0.5 seconds of idle time
+#
+unclutter -idle 0.05 -root &
+
+# hide mouse completely
+#
+#unclutter -root &
+
+
+# clear out warning bar on chromium
+#
+tmpfn=`mktemp`
+jq '.profile.exited_cleanly = true' $BASEDIR/.config/chromium/Preferences | jq '.profile.exit_type = "Normal"' > $tmpfn
+mv $tmpfn $BASEDIR/.config/chromium/Preferences
+
+# start chromium in kiosk mode
+#
+
+#/usr/bin/chromium-browser --noerrdialogs --disable-infobars --kiosk ./html/index.html
+#
+#  --disable-application-cache \
+/usr/bin/chromium-browser \
+  --noerrdialogs \
+  --disable-infobars \
+  --aggressive-cache-discard \
+  --incognito \
+  --kiosk \
+  'http://localhost:60535'
+
+
+
+# refresh
+#
+#xdotool keydown ctrl+r; xdotool keyup ctrl+r;
+

+ 69 - 0
busunit/DIUv2/diu_kiosk.resistive

@@ -0,0 +1,69 @@
+#!/bin/bash
+#
+# Copyright (c) 2019 Clementine Computing LLC.
+#
+# This file is part of PopuFare.
+#
+# PopuFare is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# PopuFare is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Affero General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with PopuFare.  If not, see <https://www.gnu.org/licenses/>.
+#
+
+export BASEDIR=/home/pi
+
+export DISPLAY=:0
+
+# we've inverted the display, make sure to invert touchscreen
+#
+xinput --set-prop 'ADS7846 Touchscreen' 'Coordinate Transformation Matrix' -1.000000 0.000000 1.000000 0.000000 -1.000000 1.00000 0.000000 0.000000 1.000000
+
+# turn off screensave/screen blanking
+#
+xset s noblank
+xset s off
+xset -dpms
+
+# hide mouse after 0.5 seconds of idle time
+#
+unclutter -idle 0.05 -root &
+
+# hide mouse completely
+#
+#unclutter -root &
+
+
+# clear out warning bar on chromium
+#
+tmpfn=`mktemp`
+jq '.profile.exited_cleanly = true' $BASEDIR/.config/chromium/Preferences | jq '.profile.exit_type = "Normal"' > $tmpfn
+mv $tmpfn $BASEDIR/.config/chromium/Preferences
+
+# start chromium in kiosk mode
+#
+
+#/usr/bin/chromium-browser --noerrdialogs --disable-infobars --kiosk ./html/index.html
+#
+#  --disable-application-cache \
+/usr/bin/chromium-browser \
+  --noerrdialogs \
+  --disable-infobars \
+  --aggressive-cache-discard \
+  --incognito \
+  --kiosk \
+  'http://localhost:60535'
+
+
+
+# refresh
+#
+#xdotool keydown ctrl+r; xdotool keyup ctrl+r;
+