Merge branch 'master' of https://github.com/goodtft/LCD-show
This commit is contained in:
commit
bc1ce9f4be
@ -19,7 +19,13 @@ if test $version -lt 970;then
|
||||
echo "reboot"
|
||||
else
|
||||
echo "need to update touch configuration"
|
||||
if test $version -ge 1023;then
|
||||
echo "install xserver-xorg-input-evdev_2.10.5-1"
|
||||
sudo dpkg -i -B xserver-xorg-input-evdev_2.10.5-1_armhf.deb
|
||||
else
|
||||
echo "install xserver-xorg-input-evdev_1%3a2.10.3-1"
|
||||
sudo dpkg -i -B xserver-xorg-input-evdev_1%3a2.10.3-1_armhf.deb
|
||||
fi
|
||||
sudo cp -rf /usr/share/X11/xorg.conf.d/10-evdev.conf /usr/share/X11/xorg.conf.d/45-evdev.conf
|
||||
echo "reboot"
|
||||
fi
|
||||
|
||||
@ -19,7 +19,13 @@ if test $version -lt 970;then
|
||||
echo "reboot"
|
||||
else
|
||||
echo "need to update touch configuration"
|
||||
if test $version -ge 1023;then
|
||||
echo "install xserver-xorg-input-evdev_2.10.5-1"
|
||||
sudo dpkg -i -B xserver-xorg-input-evdev_2.10.5-1_armhf.deb
|
||||
else
|
||||
echo "install xserver-xorg-input-evdev_1%3a2.10.3-1"
|
||||
sudo dpkg -i -B xserver-xorg-input-evdev_1%3a2.10.3-1_armhf.deb
|
||||
fi
|
||||
sudo cp -rf /usr/share/X11/xorg.conf.d/10-evdev.conf /usr/share/X11/xorg.conf.d/45-evdev.conf
|
||||
echo "reboot"
|
||||
fi
|
||||
|
||||
@ -19,7 +19,13 @@ if test $version -lt 970;then
|
||||
echo "reboot"
|
||||
else
|
||||
echo "need to update touch configuration"
|
||||
if test $version -ge 1023;then
|
||||
echo "install xserver-xorg-input-evdev_2.10.5-1"
|
||||
sudo dpkg -i -B xserver-xorg-input-evdev_2.10.5-1_armhf.deb
|
||||
else
|
||||
echo "install xserver-xorg-input-evdev_1%3a2.10.3-1"
|
||||
sudo dpkg -i -B xserver-xorg-input-evdev_1%3a2.10.3-1_armhf.deb
|
||||
fi
|
||||
sudo cp -rf /usr/share/X11/xorg.conf.d/10-evdev.conf /usr/share/X11/xorg.conf.d/45-evdev.conf
|
||||
echo "reboot"
|
||||
fi
|
||||
|
||||
@ -17,7 +17,13 @@ if test $version -lt 970;then
|
||||
echo "reboot"
|
||||
else
|
||||
echo "need to update touch configuration"
|
||||
if test $version -ge 1023;then
|
||||
echo "install xserver-xorg-input-evdev_2.10.5-1"
|
||||
sudo dpkg -i -B xserver-xorg-input-evdev_2.10.5-1_armhf.deb
|
||||
else
|
||||
echo "install xserver-xorg-input-evdev_1%3a2.10.3-1"
|
||||
sudo dpkg -i -B xserver-xorg-input-evdev_1%3a2.10.3-1_armhf.deb
|
||||
fi
|
||||
sudo cp -rf /usr/share/X11/xorg.conf.d/10-evdev.conf /usr/share/X11/xorg.conf.d/45-evdev.conf
|
||||
echo "reboot"
|
||||
fi
|
||||
|
||||
@ -17,7 +17,13 @@ if test $version -lt 970;then
|
||||
echo "reboot"
|
||||
else
|
||||
echo "need to update touch configuration"
|
||||
if test $version -ge 1023;then
|
||||
echo "install xserver-xorg-input-evdev_2.10.5-1"
|
||||
sudo dpkg -i -B xserver-xorg-input-evdev_2.10.5-1_armhf.deb
|
||||
else
|
||||
echo "install xserver-xorg-input-evdev_1%3a2.10.3-1"
|
||||
sudo dpkg -i -B xserver-xorg-input-evdev_1%3a2.10.3-1_armhf.deb
|
||||
fi
|
||||
sudo cp -rf /usr/share/X11/xorg.conf.d/10-evdev.conf /usr/share/X11/xorg.conf.d/45-evdev.conf
|
||||
echo "reboot"
|
||||
fi
|
||||
|
||||
@ -17,7 +17,13 @@ if test $version -lt 970;then
|
||||
echo "reboot"
|
||||
else
|
||||
echo "need to update touch configuration"
|
||||
if test $version -ge 1023;then
|
||||
echo "install xserver-xorg-input-evdev_2.10.5-1"
|
||||
sudo dpkg -i -B xserver-xorg-input-evdev_2.10.5-1_armhf.deb
|
||||
else
|
||||
echo "install xserver-xorg-input-evdev_1%3a2.10.3-1"
|
||||
sudo dpkg -i -B xserver-xorg-input-evdev_1%3a2.10.3-1_armhf.deb
|
||||
fi
|
||||
sudo cp -rf /usr/share/X11/xorg.conf.d/10-evdev.conf /usr/share/X11/xorg.conf.d/45-evdev.conf
|
||||
echo "reboot"
|
||||
fi
|
||||
|
||||
@ -17,11 +17,17 @@ if test $version -lt 970;then
|
||||
echo "reboot"
|
||||
else
|
||||
echo "need to update touch configuration"
|
||||
if test $version -ge 1023;then
|
||||
echo "install xserver-xorg-input-evdev_2.10.5-1"
|
||||
sudo dpkg -i -B xserver-xorg-input-evdev_2.10.5-1_armhf.deb
|
||||
else
|
||||
echo "install xserver-xorg-input-evdev_1%3a2.10.3-1"
|
||||
sudo dpkg -i -B xserver-xorg-input-evdev_1%3a2.10.3-1_armhf.deb
|
||||
fi
|
||||
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 reboot
|
||||
sudo reboot
|
||||
|
||||
@ -17,7 +17,13 @@ if test $version -lt 970;then
|
||||
echo "reboot"
|
||||
else
|
||||
echo "need to update touch configuration"
|
||||
if test $version -ge 1023;then
|
||||
echo "install xserver-xorg-input-evdev_2.10.5-1"
|
||||
sudo dpkg -i -B xserver-xorg-input-evdev_2.10.5-1_armhf.deb
|
||||
else
|
||||
echo "install xserver-xorg-input-evdev_1%3a2.10.3-1"
|
||||
sudo dpkg -i -B xserver-xorg-input-evdev_1%3a2.10.3-1_armhf.deb
|
||||
fi
|
||||
sudo cp -rf /usr/share/X11/xorg.conf.d/10-evdev.conf /usr/share/X11/xorg.conf.d/45-evdev.conf
|
||||
echo "reboot"
|
||||
fi
|
||||
|
||||
@ -17,7 +17,13 @@ if test $version -lt 970;then
|
||||
echo "reboot"
|
||||
else
|
||||
echo "need to update touch configuration"
|
||||
if test $version -ge 1023;then
|
||||
echo "install xserver-xorg-input-evdev_2.10.5-1"
|
||||
sudo dpkg -i -B xserver-xorg-input-evdev_2.10.5-1_armhf.deb
|
||||
else
|
||||
echo "install xserver-xorg-input-evdev_1%3a2.10.3-1"
|
||||
sudo dpkg -i -B xserver-xorg-input-evdev_1%3a2.10.3-1_armhf.deb
|
||||
fi
|
||||
sudo cp -rf /usr/share/X11/xorg.conf.d/10-evdev.conf /usr/share/X11/xorg.conf.d/45-evdev.conf
|
||||
echo "reboot"
|
||||
fi
|
||||
|
||||
@ -17,7 +17,13 @@ if test $version -lt 970;then
|
||||
echo "reboot"
|
||||
else
|
||||
echo "need to update touch configuration"
|
||||
if test $version -ge 1023;then
|
||||
echo "install xserver-xorg-input-evdev_2.10.5-1"
|
||||
sudo dpkg -i -B xserver-xorg-input-evdev_2.10.5-1_armhf.deb
|
||||
else
|
||||
echo "install xserver-xorg-input-evdev_1%3a2.10.3-1"
|
||||
sudo dpkg -i -B xserver-xorg-input-evdev_1%3a2.10.3-1_armhf.deb
|
||||
fi
|
||||
sudo cp -rf /usr/share/X11/xorg.conf.d/10-evdev.conf /usr/share/X11/xorg.conf.d/45-evdev.conf
|
||||
echo "reboot"
|
||||
fi
|
||||
|
||||
@ -17,7 +17,13 @@ if test $version -lt 970;then
|
||||
echo "reboot"
|
||||
else
|
||||
echo "need to update touch configuration"
|
||||
if test $version -ge 1023;then
|
||||
echo "install xserver-xorg-input-evdev_2.10.5-1"
|
||||
sudo dpkg -i -B xserver-xorg-input-evdev_2.10.5-1_armhf.deb
|
||||
else
|
||||
echo "install xserver-xorg-input-evdev_1%3a2.10.3-1"
|
||||
sudo dpkg -i -B xserver-xorg-input-evdev_1%3a2.10.3-1_armhf.deb
|
||||
fi
|
||||
sudo cp -rf /usr/share/X11/xorg.conf.d/10-evdev.conf /usr/share/X11/xorg.conf.d/45-evdev.conf
|
||||
echo "reboot"
|
||||
fi
|
||||
|
||||
@ -21,7 +21,13 @@ if test $version -lt 970;then
|
||||
echo "reboot"
|
||||
else
|
||||
echo "need to update touch configuration"
|
||||
if test $version -ge 1023;then
|
||||
echo "install xserver-xorg-input-evdev_2.10.5-1"
|
||||
sudo dpkg -i -B xserver-xorg-input-evdev_2.10.5-1_armhf.deb
|
||||
else
|
||||
echo "install xserver-xorg-input-evdev_1%3a2.10.3-1"
|
||||
sudo dpkg -i -B xserver-xorg-input-evdev_1%3a2.10.3-1_armhf.deb
|
||||
fi
|
||||
sudo cp -rf /usr/share/X11/xorg.conf.d/10-evdev.conf /usr/share/X11/xorg.conf.d/45-evdev.conf
|
||||
echo "reboot"
|
||||
fi
|
||||
|
||||
19
README.md
19
README.md
@ -1,5 +1,12 @@
|
||||
LCD driver for the Raspberry PI Installation<br>
|
||||
====================================================
|
||||
2017-08-16
|
||||
Update: <br>
|
||||
v1.6-20170824<br>
|
||||
Update xserver to support Raspbian-2017-08-16<br><br>
|
||||
Update: <br>
|
||||
v1.5-20170706<br>
|
||||
Update to support Raspbian-2017-07-05,Raspbian-2017-06-21<br><br>
|
||||
Update: <br>
|
||||
v1.3-20170612<br>
|
||||
fixed to support Raspbian-2017-03-02,Raspbian-2017-04-10<br><br>
|
||||
@ -9,15 +16,19 @@ Update: <br>
|
||||
Update: <br>
|
||||
v1.1-20160815<br><br>
|
||||
|
||||
1.)Step1, Install Raspbian official mirror <br><br>
|
||||
1.)Step1, Install Raspbian official mirror <br>
|
||||
====================================================
|
||||
a)Download Raspbian official mirror:<br>
|
||||
https://www.raspberrypi.org/downloads/<br>
|
||||
b)Use“SDFormatter.exe”to Format your TF Card<br>
|
||||
c)Use“Win32DiskImager.exe” Burning mirror to TF Card<br>
|
||||
|
||||
2.) Step2, Clone my repo onto your pi<br><br>
|
||||
2.) Step2, Clone my repo onto your pi<br>
|
||||
====================================================
|
||||
Use SSH to connect the raspberry pi, <br>
|
||||
And Ensure that the raspberry pi is connected to the Internet before executing the following commands:
|
||||
-----------------------------------------------------------------------------------------------------
|
||||
|
||||
```sudo rm -rf LCD-show```<br>
|
||||
```git clone https://github.com/goodtft/LCD-show.git```<br>
|
||||
```chmod -R 755 LCD-show```<br>
|
||||
@ -57,6 +68,8 @@ In case of 7inch(C)-1024X600 RPI LCD<br>
|
||||
If you need to switch back to the traditional HDMI display<br>
|
||||
```sudo ./LCD-hdmi```<br><br>
|
||||
|
||||
Wait a few minutes,the system will restart automaticall , enjoy with your LCD.<br><br>
|
||||
Wait a few minutes,the system will restart automaticall , enjoy with your LCD.
|
||||
-------------------------------------------------------------------------------
|
||||
<br><br>
|
||||
|
||||
|
||||
|
||||
@ -55,4 +55,4 @@ enable_uart=1
|
||||
# Enable audio (loads snd_bcm2835)
|
||||
dtparam=audio=on
|
||||
dtoverlay=tft9341:rotate=90
|
||||
dtoverlay=ads7846,cs=1,penirq=17,penirq_pull=2,speed=1000000,keep_vref_on=1,swapxy=0,pmax=255,xohms=60,xmin=200,xmax=3900,ymin=200,ymax=3900
|
||||
#dtoverlay=ads7846,cs=1,penirq=17,penirq_pull=2,speed=1000000,keep_vref_on=1,swapxy=0,pmax=255,xohms=60,xmin=200,xmax=3900,ymin=200,ymax=3900
|
||||
|
||||
@ -55,4 +55,4 @@ enable_uart=1
|
||||
# Enable audio (loads snd_bcm2835)
|
||||
dtparam=audio=on
|
||||
dtoverlay=tft9341:rotate=270
|
||||
dtoverlay=ads7846,cs=1,penirq=17,penirq_pull=2,speed=1000000,keep_vref_on=1,swapxy=0,pmax=255,xohms=60,xmin=200,xmax=3900,ymin=200,ymax=3900
|
||||
#dtoverlay=ads7846,cs=1,penirq=17,penirq_pull=2,speed=1000000,keep_vref_on=1,swapxy=0,pmax=255,xohms=60,xmin=200,xmax=3900,ymin=200,ymax=3900
|
||||
|
||||
@ -55,4 +55,4 @@ enable_uart=1
|
||||
# Enable audio (loads snd_bcm2835)
|
||||
dtparam=audio=on
|
||||
dtoverlay=tft35a
|
||||
dtoverlay=ads7846,cs=1,penirq=17,penirq_pull=2,speed=1000000,keep_vref_on=1,swapxy=1,pmax=255,xohms=60,xmin=200,xmax=3900,ymin=200,ymax=3900
|
||||
#dtoverlay=ads7846,cs=1,penirq=17,penirq_pull=2,speed=1000000,keep_vref_on=1,swapxy=1,pmax=255,xohms=60,xmin=200,xmax=3900,ymin=200,ymax=3900
|
||||
|
||||
@ -58,5 +58,6 @@ max_usb_current=1
|
||||
hdmi_group=2
|
||||
hdmi_mode=1
|
||||
hdmi_mode=87
|
||||
hdmi_drive=1
|
||||
hdmi_cvt 800 480 60 6 0 0 0
|
||||
dtoverlay=ads7846,cs=1,penirq=25,penirq_pull=2,speed=50000,keep_vref_on=0,swapxy=0,pmax=255,xohms=150,xmin=200,xmax=3900,ymin=200,ymax=3900
|
||||
|
||||
@ -58,5 +58,6 @@ max_usb_current=1
|
||||
hdmi_group=2
|
||||
hdmi_mode=1
|
||||
hdmi_mode=87
|
||||
hdmi_drive=1
|
||||
hdmi_cvt 800 480 60 6 0 0 0
|
||||
dtoverlay=ads7846,cs=1,penirq=25,penirq_pull=2,speed=50000,keep_vref_on=0,swapxy=0,pmax=255,xohms=150,xmin=200,xmax=3900,ymin=200,ymax=3900
|
||||
#dtoverlay=ads7846,cs=1,penirq=25,penirq_pull=2,speed=50000,keep_vref_on=0,swapxy=0,pmax=255,xohms=150,xmin=200,xmax=3900,ymin=200,ymax=3900
|
||||
|
||||
@ -58,5 +58,6 @@ max_usb_current=1
|
||||
hdmi_group=2
|
||||
hdmi_mode=1
|
||||
hdmi_mode=87
|
||||
hdmi_drive=1
|
||||
hdmi_cvt 1024 600 60 6 0 0 0
|
||||
dtoverlay=ads7846,cs=1,penirq=25,penirq_pull=2,speed=50000,keep_vref_on=0,swapxy=0,pmax=255,xohms=150,xmin=200,xmax=3900,ymin=200,ymax=3900
|
||||
#dtoverlay=ads7846,cs=1,penirq=25,penirq_pull=2,speed=50000,keep_vref_on=0,swapxy=0,pmax=255,xohms=150,xmin=200,xmax=3900,ymin=200,ymax=3900
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
Section "InputClass"
|
||||
Identifier "calibration"
|
||||
MatchProduct "ADS7846 Touchscreen"
|
||||
Option "Calibration" "140 3951 261 3998"
|
||||
Option "Calibration" "177 3976 306 3747"
|
||||
Option "SwapAxes" "0"
|
||||
EndSection
|
||||
|
||||
BIN
xserver-xorg-input-evdev_2.10.5-1_armhf.deb
Normal file
BIN
xserver-xorg-input-evdev_2.10.5-1_armhf.deb
Normal file
Binary file not shown.
Loading…
x
Reference in New Issue
Block a user