Merge 45b7b7452d4ce8c79eeae20bd322758ad11afee6 into 1cd5ea1b5357d30ca40c80df6a9d11b9172f2e0a

LCD32-B-Rev1-show

@@ -0,0 +1,71 @@
+#!/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/tft9341-overlay-b-rev1.dtb /boot/overlays/
+sudo cp ./usr/tft9341-overlay-b-rev1.dtb /boot/overlays/tft9341-b-rev1.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=tft9341-b-rev1:rotate=270" >> ./boot/config.txt.bak
+sudo cp -rf ./boot/config.txt.bak /boot/config.txt
+sudo cp -rf ./usr/99-calibration.conf-32-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:32: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

README.md

@@ -89,7 +89,9 @@ EN: http://www.lcdwiki.com/2.8inch_RPi_Display
   
 # 3.2” RPi Display (MPI3201):
 ### Driver install:
-sudo ./LCD32-show   
+sudo ./LCD32-show
+### For RPi Model B Rev1:
+sudo ./LCD32-B-Rev1-show
 ### WIKI:
 CN: http://www.lcdwiki.com/zh/3.2inch_RPi_Display  <br>
 EN: http://www.lcdwiki.com/3.2inch_RPi_Display