diff --git a/NANO24-show b/NANO24-show new file mode 100644 index 0000000..7a1e353 --- /dev/null +++ b/NANO24-show @@ -0,0 +1,74 @@ +#!/bin/bash + +sudo ./system_backup.sh + +if [ -f /etc/X11/xorg.conf.d/40-libinput.conf ]; then +sudo rm -rf /etc/X11/xorg.conf.d/40-libinput.conf +fi +if [ ! -d /etc/X11/xorg.conf.d ]; then +sudo mkdir -p /etc/X11/xorg.conf.d +fi +sudo cp ./usr/tft7789-overlay.dtb /boot/overlays/ +sudo cp ./usr/tft7789-overlay.dtb /boot/overlays/tft7789.dtbo +root_dev=`grep -oPr "root=[^\s]*" /boot/cmdline.txt | awk -F= '{printf $NF}'` +if test "$root_dev" = "/dev/mmcblk0p7";then +sudo cp -rf ./boot/config-noobs-nomal.txt ./boot/config.txt.bak +else +sudo cp -rf ./boot/config-nomal.txt ./boot/config.txt.bak +sudo echo "hdmi_force_hotplug=1" >> ./boot/config.txt.bak +fi +sudo echo "dtparam=i2c_arm=on" >> ./boot/config.txt.bak +sudo echo "dtparam=spi=on" >> ./boot/config.txt.bak +sudo echo "enable_uart=1" >> ./boot/config.txt.bak +sudo echo "dtoverlay=tft7789:rotate=270" >> ./boot/config.txt.bak +sudo cp -rf ./boot/config.txt.bak /boot/config.txt + +sudo cp ./usr/ft6236.dtb /boot/overlays/ft6236.dtbo + +sudo cp -rf ./usr/99-calibration.conf-nano24-270 /etc/X11/xorg.conf.d/99-calibration.conf +sudo cp -rf ./usr/99-fbturbo.conf /usr/share/X11/xorg.conf.d/99-fbturbo.conf +#if test "$root_dev" = "/dev/mmcblk0p7";then +#sudo cp ./usr/cmdline.txt-noobs /boot/cmdline.txt +#else +#sudo cp ./usr/cmdline.txt /boot/ +#fi +sudo cp ./usr/inittab /etc/ +#sudo cp ./boot/config-32.txt /boot/config.txt +sudo touch ./.have_installed +echo "gpio:resistance:nano24:270:320:240" > ./.have_installed +#evdev install +#nodeplatform=`uname -n` +#kernel=`uname -r` +version=`uname -v` +#if test "$nodeplatform" = "raspberrypi";then +#echo "this is raspberrypi kernel" +version=${version##* } +#version=${version#*#} +echo $version +if test $version -lt 2017;then +echo "reboot" +else +echo "need to update touch configuration" +sudo dpkg -i -B ./xserver-xorg-input-evdev_1%3a2.10.6-1+b1_armhf.deb 2> error_output.txt +#sudo apt-get install xserver-xorg-input-evdev 2> error_output.txt +result=`cat ./error_output.txt` +echo -e "\033[31m$result\033[0m" +grep -q "error:" ./error_output.txt && exit +sudo cp -rf /usr/share/X11/xorg.conf.d/10-evdev.conf /usr/share/X11/xorg.conf.d/45-evdev.conf +#echo "reboot" +fi +#else +#echo "this is not raspberrypi kernel, no need to update touch configure, reboot" +#fi + +sudo sync +sudo sync +sleep 1 +if [ $# -eq 1 ]; then +sudo ./rotate.sh $1 +elif [ $# -gt 1 ]; then +echo "Too many parameters" +fi + +echo "reboot now" +sudo reboot diff --git a/usr/99-calibration.conf-nano24-0 b/usr/99-calibration.conf-nano24-0 new file mode 100755 index 0000000..c6b2e03 --- /dev/null +++ b/usr/99-calibration.conf-nano24-0 @@ -0,0 +1,9 @@ +Section "InputClass" + Identifier "calibration" + MatchProduct "Goodix Capacitive TouchScreen" + Option "Calibration" "240 0 320 0" + Option "SwapAxes" "0" + Option "EmulateThirdButton" "1" + Option "EmulateThirdButtonTimeout" "1000" + Option "EmulateThirdButtonMoveThreshold" "300" +EndSection diff --git a/usr/99-calibration.conf-nano24-180 b/usr/99-calibration.conf-nano24-180 new file mode 100755 index 0000000..67e26e4 --- /dev/null +++ b/usr/99-calibration.conf-nano24-180 @@ -0,0 +1,9 @@ +Section "InputClass" + Identifier "calibration" + MatchProduct "Goodix Capacitive TouchScreen" + Option "Calibration" "0 240 0 320" + Option "SwapAxes" "0" + Option "EmulateThirdButton" "1" + Option "EmulateThirdButtonTimeout" "1000" + Option "EmulateThirdButtonMoveThreshold" "300" +EndSection diff --git a/usr/99-calibration.conf-nano24-270 b/usr/99-calibration.conf-nano24-270 new file mode 100755 index 0000000..0d01de3 --- /dev/null +++ b/usr/99-calibration.conf-nano24-270 @@ -0,0 +1,9 @@ +Section "InputClass" + Identifier "calibration" + MatchProduct "Goodix Capacitive TouchScreen" + Option "Calibration" "240 0 0 320" + Option "SwapAxes" "1" + Option "EmulateThirdButton" "1" + Option "EmulateThirdButtonTimeout" "1000" + Option "EmulateThirdButtonMoveThreshold" "300" +EndSection diff --git a/usr/99-calibration.conf-nano24-90 b/usr/99-calibration.conf-nano24-90 new file mode 100755 index 0000000..44ffe0e --- /dev/null +++ b/usr/99-calibration.conf-nano24-90 @@ -0,0 +1,9 @@ +Section "InputClass" + Identifier "calibration" + MatchProduct "Goodix Capacitive TouchScreen" + Option "Calibration" "0 240 320 0" + Option "SwapAxes" "1" + Option "EmulateThirdButton" "1" + Option "EmulateThirdButtonTimeout" "1000" + Option "EmulateThirdButtonMoveThreshold" "300" +EndSection diff --git a/usr/ft6236.dtb b/usr/ft6236.dtb new file mode 100755 index 0000000..bd9be06 Binary files /dev/null and b/usr/ft6236.dtb differ diff --git a/usr/tft7789-overlay.dtb b/usr/tft7789-overlay.dtb new file mode 100755 index 0000000..7ae6f10 Binary files /dev/null and b/usr/tft7789-overlay.dtb differ