From 1cfbb6cb68d20bbf44ca2c514ee4dad2f33af8d4 Mon Sep 17 00:00:00 2001 From: goodtft Date: Fri, 31 Dec 2021 08:26:26 +0000 Subject: [PATCH] update driver --- LCD24-3A+-show | 52 +++++++++++++++++++++++++++++++++++++++++++++++++- LCD24-show | 52 +++++++++++++++++++++++++++++++++++++++++++++++++- LCD28-show | 52 +++++++++++++++++++++++++++++++++++++++++++++++++- LCD32-show | 52 +++++++++++++++++++++++++++++++++++++++++++++++++- LCD35-show | 6 +++++- LCD5-show | 6 +++++- MHS32-show | 32 ++++++++++++++++++++++++++----- MHS35-show | 4 ++++ MHS35B-show | 31 ++++++++++++++++++++++++++---- MHS40-show | 31 ++++++++++++++++++++++++++---- MHS40C-show | 40 ++++++++++++++++++++++++++++++-------- MIS35-show | 31 ++++++++++++++++++++++++++---- MPI3508-show | 6 +++++- MPI4008-show | 6 +++++- MPI4009-show | 6 +++++- NANO24-show | 10 +++++++++- 16 files changed, 382 insertions(+), 35 deletions(-) diff --git a/LCD24-3A+-show b/LCD24-3A+-show index 52a9823..f3adaee 100755 --- a/LCD24-3A+-show +++ b/LCD24-3A+-show @@ -21,6 +21,11 @@ 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:rotate=90" >> ./boot/config.txt.bak +sudo echo "hdmi_group=2" >> ./boot/config.txt.bak +sudo echo "hdmi_mode=1" >> ./boot/config.txt.bak +sudo echo "hdmi_mode=87" >> ./boot/config.txt.bak +sudo echo "hdmi_cvt 320 240 60 6 0 0 0" >> ./boot/config.txt.bak +sudo echo "hdmi_drive=2" >> ./boot/config.txt.bak sudo cp -rf ./boot/config.txt.bak /boot/config.txt sudo cp -rf ./usr/99-calibration.conf-32-90 /etc/X11/xorg.conf.d/99-calibration.conf sudo cp -rf ./usr/99-fbturbo.conf /usr/share/X11/xorg.conf.d/99-fbturbo.conf @@ -33,6 +38,47 @@ sudo cp ./usr/inittab /etc/ #sudo cp ./boot/config-32.txt /boot/config.txt sudo touch ./.have_installed echo "gpio:resistance:32:90:320:240" > ./.have_installed + +#FBCP install +wget --spider -q -o /dev/null --tries=1 -T 10 https://cmake.org/ +if [ $? -eq 0 ]; then +sudo apt-get update +sudo apt-get install cmake -y 2> error_output.txt +result=`cat ./error_output.txt` +echo -e "\033[31m$result\033[0m" +grep -q "^E:" ./error_output.txt +type cmake > /dev/null 2>&1 +if [ $? -eq 0 ]; then +sudo rm -rf rpi-fbcp +wget --spider -q -o /dev/null --tries=1 -T 10 https://github.com +if [ $? -eq 0 ]; then +sudo git clone https://github.com/tasanakorn/rpi-fbcp +if [ $? -ne 0 ]; then +echo "download fbcp failed, copy native fbcp!!!" +sudo cp -r ./usr/rpi-fbcp . +fi +else +echo "bad network, copy native fbcp!!!" +sudo cp -r ./usr/rpi-fbcp . +fi +sudo mkdir ./rpi-fbcp/build +cd ./rpi-fbcp/build/ +sudo cmake .. +sudo make +sudo install fbcp /usr/local/bin/fbcp +cd - > /dev/null +type fbcp > /dev/null 2>&1 +if [ $? -eq 0 ]; then +sudo cp -rf ./usr/99-fbturbo-fbcp.conf /usr/share/X11/xorg.conf.d/99-fbturbo.conf +sudo cp -rf ./etc/rc.local /etc/rc.local +fi +else +echo "install cmake error!!!!" +fi +else +echo "bad network, can't install cmake!!!" +fi + #evdev install #nodeplatform=`uname -n` #kernel=`uname -r` @@ -46,8 +92,12 @@ if test $version -lt 2017;then echo "reboot" else echo "need to update touch configuration" +wget --spider -q -o /dev/null --tries=1 -T 10 http://mirrors.zju.edu.cn/raspbian/raspbian +if [ $? -eq 0 ]; then +sudo apt-get install xserver-xorg-input-evdev 2> error_output.txt +else 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 +fi result=`cat ./error_output.txt` echo -e "\033[31m$result\033[0m" grep -q "error:" ./error_output.txt && exit diff --git a/LCD24-show b/LCD24-show index 2b4ee70..01b1c7a 100755 --- a/LCD24-show +++ b/LCD24-show @@ -21,6 +21,11 @@ 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:rotate=270" >> ./boot/config.txt.bak +sudo echo "hdmi_group=2" >> ./boot/config.txt.bak +sudo echo "hdmi_mode=1" >> ./boot/config.txt.bak +sudo echo "hdmi_mode=87" >> ./boot/config.txt.bak +sudo echo "hdmi_cvt 320 240 60 6 0 0 0" >> ./boot/config.txt.bak +sudo echo "hdmi_drive=2" >> ./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 @@ -33,6 +38,47 @@ 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 + +#FBCP install +wget --spider -q -o /dev/null --tries=1 -T 10 https://cmake.org/ +if [ $? -eq 0 ]; then +sudo apt-get update +sudo apt-get install cmake -y 2> error_output.txt +result=`cat ./error_output.txt` +echo -e "\033[31m$result\033[0m" +grep -q "^E:" ./error_output.txt +type cmake > /dev/null 2>&1 +if [ $? -eq 0 ]; then +sudo rm -rf rpi-fbcp +wget --spider -q -o /dev/null --tries=1 -T 10 https://github.com +if [ $? -eq 0 ]; then +sudo git clone https://github.com/tasanakorn/rpi-fbcp +if [ $? -ne 0 ]; then +echo "download fbcp failed, copy native fbcp!!!" +sudo cp -r ./usr/rpi-fbcp . +fi +else +echo "bad network, copy native fbcp!!!" +sudo cp -r ./usr/rpi-fbcp . +fi +sudo mkdir ./rpi-fbcp/build +cd ./rpi-fbcp/build/ +sudo cmake .. +sudo make +sudo install fbcp /usr/local/bin/fbcp +cd - > /dev/null +type fbcp > /dev/null 2>&1 +if [ $? -eq 0 ]; then +sudo cp -rf ./usr/99-fbturbo-fbcp.conf /usr/share/X11/xorg.conf.d/99-fbturbo.conf +sudo cp -rf ./etc/rc.local /etc/rc.local +fi +else +echo "install cmake error!!!!" +fi +else +echo "bad network, can't install cmake!!!" +fi + #evdev install #nodeplatform=`uname -n` #kernel=`uname -r` @@ -46,8 +92,12 @@ if test $version -lt 2017;then echo "reboot" else echo "need to update touch configuration" +wget --spider -q -o /dev/null --tries=1 -T 10 http://mirrors.zju.edu.cn/raspbian/raspbian +if [ $? -eq 0 ]; then +sudo apt-get install xserver-xorg-input-evdev 2> error_output.txt +else 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 +fi result=`cat ./error_output.txt` echo -e "\033[31m$result\033[0m" grep -q "error:" ./error_output.txt && exit diff --git a/LCD28-show b/LCD28-show index 2b4ee70..01b1c7a 100755 --- a/LCD28-show +++ b/LCD28-show @@ -21,6 +21,11 @@ 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:rotate=270" >> ./boot/config.txt.bak +sudo echo "hdmi_group=2" >> ./boot/config.txt.bak +sudo echo "hdmi_mode=1" >> ./boot/config.txt.bak +sudo echo "hdmi_mode=87" >> ./boot/config.txt.bak +sudo echo "hdmi_cvt 320 240 60 6 0 0 0" >> ./boot/config.txt.bak +sudo echo "hdmi_drive=2" >> ./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 @@ -33,6 +38,47 @@ 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 + +#FBCP install +wget --spider -q -o /dev/null --tries=1 -T 10 https://cmake.org/ +if [ $? -eq 0 ]; then +sudo apt-get update +sudo apt-get install cmake -y 2> error_output.txt +result=`cat ./error_output.txt` +echo -e "\033[31m$result\033[0m" +grep -q "^E:" ./error_output.txt +type cmake > /dev/null 2>&1 +if [ $? -eq 0 ]; then +sudo rm -rf rpi-fbcp +wget --spider -q -o /dev/null --tries=1 -T 10 https://github.com +if [ $? -eq 0 ]; then +sudo git clone https://github.com/tasanakorn/rpi-fbcp +if [ $? -ne 0 ]; then +echo "download fbcp failed, copy native fbcp!!!" +sudo cp -r ./usr/rpi-fbcp . +fi +else +echo "bad network, copy native fbcp!!!" +sudo cp -r ./usr/rpi-fbcp . +fi +sudo mkdir ./rpi-fbcp/build +cd ./rpi-fbcp/build/ +sudo cmake .. +sudo make +sudo install fbcp /usr/local/bin/fbcp +cd - > /dev/null +type fbcp > /dev/null 2>&1 +if [ $? -eq 0 ]; then +sudo cp -rf ./usr/99-fbturbo-fbcp.conf /usr/share/X11/xorg.conf.d/99-fbturbo.conf +sudo cp -rf ./etc/rc.local /etc/rc.local +fi +else +echo "install cmake error!!!!" +fi +else +echo "bad network, can't install cmake!!!" +fi + #evdev install #nodeplatform=`uname -n` #kernel=`uname -r` @@ -46,8 +92,12 @@ if test $version -lt 2017;then echo "reboot" else echo "need to update touch configuration" +wget --spider -q -o /dev/null --tries=1 -T 10 http://mirrors.zju.edu.cn/raspbian/raspbian +if [ $? -eq 0 ]; then +sudo apt-get install xserver-xorg-input-evdev 2> error_output.txt +else 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 +fi result=`cat ./error_output.txt` echo -e "\033[31m$result\033[0m" grep -q "error:" ./error_output.txt && exit diff --git a/LCD32-show b/LCD32-show index 2b4ee70..01b1c7a 100755 --- a/LCD32-show +++ b/LCD32-show @@ -21,6 +21,11 @@ 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:rotate=270" >> ./boot/config.txt.bak +sudo echo "hdmi_group=2" >> ./boot/config.txt.bak +sudo echo "hdmi_mode=1" >> ./boot/config.txt.bak +sudo echo "hdmi_mode=87" >> ./boot/config.txt.bak +sudo echo "hdmi_cvt 320 240 60 6 0 0 0" >> ./boot/config.txt.bak +sudo echo "hdmi_drive=2" >> ./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 @@ -33,6 +38,47 @@ 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 + +#FBCP install +wget --spider -q -o /dev/null --tries=1 -T 10 https://cmake.org/ +if [ $? -eq 0 ]; then +sudo apt-get update +sudo apt-get install cmake -y 2> error_output.txt +result=`cat ./error_output.txt` +echo -e "\033[31m$result\033[0m" +grep -q "^E:" ./error_output.txt +type cmake > /dev/null 2>&1 +if [ $? -eq 0 ]; then +sudo rm -rf rpi-fbcp +wget --spider -q -o /dev/null --tries=1 -T 10 https://github.com +if [ $? -eq 0 ]; then +sudo git clone https://github.com/tasanakorn/rpi-fbcp +if [ $? -ne 0 ]; then +echo "download fbcp failed, copy native fbcp!!!" +sudo cp -r ./usr/rpi-fbcp . +fi +else +echo "bad network, copy native fbcp!!!" +sudo cp -r ./usr/rpi-fbcp . +fi +sudo mkdir ./rpi-fbcp/build +cd ./rpi-fbcp/build/ +sudo cmake .. +sudo make +sudo install fbcp /usr/local/bin/fbcp +cd - > /dev/null +type fbcp > /dev/null 2>&1 +if [ $? -eq 0 ]; then +sudo cp -rf ./usr/99-fbturbo-fbcp.conf /usr/share/X11/xorg.conf.d/99-fbturbo.conf +sudo cp -rf ./etc/rc.local /etc/rc.local +fi +else +echo "install cmake error!!!!" +fi +else +echo "bad network, can't install cmake!!!" +fi + #evdev install #nodeplatform=`uname -n` #kernel=`uname -r` @@ -46,8 +92,12 @@ if test $version -lt 2017;then echo "reboot" else echo "need to update touch configuration" +wget --spider -q -o /dev/null --tries=1 -T 10 http://mirrors.zju.edu.cn/raspbian/raspbian +if [ $? -eq 0 ]; then +sudo apt-get install xserver-xorg-input-evdev 2> error_output.txt +else 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 +fi result=`cat ./error_output.txt` echo -e "\033[31m$result\033[0m" grep -q "error:" ./error_output.txt && exit diff --git a/LCD35-show b/LCD35-show index 2118512..f5288cf 100755 --- a/LCD35-show +++ b/LCD35-show @@ -54,6 +54,10 @@ sudo rm -rf rpi-fbcp wget --spider -q -o /dev/null --tries=1 -T 10 https://github.com if [ $? -eq 0 ]; then sudo git clone https://github.com/tasanakorn/rpi-fbcp +if [ $? -ne 0 ]; then +echo "download fbcp failed, copy native fbcp!!!" +sudo cp -r ./usr/rpi-fbcp . +fi else echo "bad network, copy native fbcp!!!" sudo cp -r ./usr/rpi-fbcp . @@ -91,7 +95,7 @@ else echo "need to update touch configuration" wget --spider -q -o /dev/null --tries=1 -T 10 http://mirrors.zju.edu.cn/raspbian/raspbian if [ $? -eq 0 ]; then -sudo apt-get install xserver-xorg-input-evdev 2> error_output.txt +sudo apt-get install xserver-xorg-input-evdev 2> error_output.txt else sudo dpkg -i -B ./xserver-xorg-input-evdev_1%3a2.10.6-1+b1_armhf.deb 2> error_output.txt fi diff --git a/LCD5-show b/LCD5-show index 57adc4d..4654184 100755 --- a/LCD5-show +++ b/LCD5-show @@ -53,8 +53,12 @@ if test $version -lt 2017;then echo "reboot" else echo "need to update touch configuration" +wget --spider -q -o /dev/null --tries=1 -T 10 http://mirrors.zju.edu.cn/raspbian/raspbian +if [ $? -eq 0 ]; then +sudo apt-get install xserver-xorg-input-evdev 2> error_output.txt +else 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 +fi result=`cat ./error_output.txt` echo -e "\033[31m$result\033[0m" grep -q "error:" ./error_output.txt && exit diff --git a/MHS32-show b/MHS32-show index a23e580..8ff0809 100755 --- a/MHS32-show +++ b/MHS32-show @@ -24,7 +24,7 @@ sudo echo "dtoverlay=mhs32:rotate=270" >> ./boot/config.txt.bak sudo echo "hdmi_group=2" >> ./boot/config.txt.bak sudo echo "hdmi_mode=1" >> ./boot/config.txt.bak sudo echo "hdmi_mode=87" >> ./boot/config.txt.bak -sudo echo "hdmi_cvt 480 320 60 6 0 0 0" >> ./boot/config.txt.bak +sudo echo "hdmi_cvt 320 240 60 6 0 0 0" >> ./boot/config.txt.bak sudo echo "hdmi_drive=2" >> ./boot/config.txt.bak sudo cp -rf ./boot/config.txt.bak /boot/config.txt @@ -40,14 +40,27 @@ sudo cp ./usr/inittab /etc/ sudo touch ./.have_installed echo "gpio:resistance:mhs32:270:480:320" > ./.have_installed #FBCP install -wget --spider -q -o /dev/null --tries=1 -T 10 https://github.com +wget --spider -q -o /dev/null --tries=1 -T 10 https://cmake.org/ if [ $? -eq 0 ]; then -sudo apt-get install git cmake -y 2> error_output.txt +sudo apt-get update +sudo apt-get install cmake -y 2> error_output.txt result=`cat ./error_output.txt` echo -e "\033[31m$result\033[0m" -grep -q "^E:" ./error_output.txt && exit +grep -q "^E:" ./error_output.txt +type cmake > /dev/null 2>&1 +if [ $? -eq 0 ]; then sudo rm -rf rpi-fbcp +wget --spider -q -o /dev/null --tries=1 -T 10 https://github.com +if [ $? -eq 0 ]; then sudo git clone https://github.com/tasanakorn/rpi-fbcp +if [ $? -ne 0 ]; then +echo "download fbcp failed, copy native fbcp!!!" +sudo cp -r ./usr/rpi-fbcp . +fi +else +echo "bad network, copy native fbcp!!!" +sudo cp -r ./usr/rpi-fbcp . +fi sudo mkdir ./rpi-fbcp/build cd ./rpi-fbcp/build/ sudo cmake .. @@ -59,6 +72,11 @@ if [ $? -eq 0 ]; then sudo cp -rf ./usr/99-fbturbo-fbcp.conf /usr/share/X11/xorg.conf.d/99-fbturbo.conf sudo cp -rf ./etc/rc.local /etc/rc.local fi +else +echo "install cmake error!!!!" +fi +else +echo "bad network, can't install cmake!!!" fi #evdev install #nodeplatform=`uname -n` @@ -73,8 +91,12 @@ if test $version -lt 2017;then echo "reboot" else echo "need to update touch configuration" +wget --spider -q -o /dev/null --tries=1 -T 10 http://mirrors.zju.edu.cn/raspbian/raspbian +if [ $? -eq 0 ]; then +sudo apt-get install xserver-xorg-input-evdev 2> error_output.txt +else 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 +fi result=`cat ./error_output.txt` echo -e "\033[31m$result\033[0m" grep -q "error:" ./error_output.txt && exit diff --git a/MHS35-show b/MHS35-show index 613564a..1b3655b 100755 --- a/MHS35-show +++ b/MHS35-show @@ -55,6 +55,10 @@ sudo rm -rf rpi-fbcp wget --spider -q -o /dev/null --tries=1 -T 10 https://github.com if [ $? -eq 0 ]; then sudo git clone https://github.com/tasanakorn/rpi-fbcp +if [ $? -ne 0 ]; then +echo "download fbcp failed, copy native fbcp!!!" +sudo cp -r ./usr/rpi-fbcp . +fi else echo "bad network, copy native fbcp!!!" sudo cp -r ./usr/rpi-fbcp . diff --git a/MHS35B-show b/MHS35B-show index c5af415..a11d4f5 100755 --- a/MHS35B-show +++ b/MHS35B-show @@ -47,14 +47,27 @@ sudo touch ./.have_installed echo "gpio:resistance:mhs35b:90:480:320" > ./.have_installed #FBCP install -wget --spider -q -o /dev/null --tries=1 -T 10 https://github.com +wget --spider -q -o /dev/null --tries=1 -T 10 https://cmake.org/ if [ $? -eq 0 ]; then -sudo apt-get install git cmake -y 2> error_output.txt +sudo apt-get update +sudo apt-get install cmake -y 2> error_output.txt result=`cat ./error_output.txt` echo -e "\033[31m$result\033[0m" -grep -q "^E:" ./error_output.txt && exit +grep -q "^E:" ./error_output.txt +type cmake > /dev/null 2>&1 +if [ $? -eq 0 ]; then sudo rm -rf rpi-fbcp +wget --spider -q -o /dev/null --tries=1 -T 10 https://github.com +if [ $? -eq 0 ]; then sudo git clone https://github.com/tasanakorn/rpi-fbcp +if [ $? -ne 0 ]; then +echo "download fbcp failed, copy native fbcp!!!" +sudo cp -r ./usr/rpi-fbcp . +fi +else +echo "bad network, copy native fbcp!!!" +sudo cp -r ./usr/rpi-fbcp . +fi sudo mkdir ./rpi-fbcp/build cd ./rpi-fbcp/build/ sudo cmake .. @@ -66,7 +79,13 @@ if [ $? -eq 0 ]; then sudo cp -rf ./usr/99-fbturbo-fbcp.conf /usr/share/X11/xorg.conf.d/99-fbturbo.conf sudo cp -rf ./etc/rc.local /etc/rc.local fi +else +echo "install cmake error!!!!" fi +else +echo "bad network, can't install cmake!!!" +fi + #evdev install #nodeplatform=`uname -n` #kernel=`uname -r` @@ -80,8 +99,12 @@ if test $version -lt 2017;then echo "reboot" else echo "need to update touch configuration" +wget --spider -q -o /dev/null --tries=1 -T 10 http://mirrors.zju.edu.cn/raspbian/raspbian +if [ $? -eq 0 ]; then +sudo apt-get install xserver-xorg-input-evdev 2> error_output.txt +else 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 +fi result=`cat ./error_output.txt` echo -e "\033[31m$result\033[0m" grep -q "error:" ./error_output.txt && exit diff --git a/MHS40-show b/MHS40-show index c1b000e..9731dbf 100755 --- a/MHS40-show +++ b/MHS40-show @@ -40,14 +40,27 @@ sudo touch ./.have_installed echo "gpio:resistance:mhs395:90:480:320" > ./.have_installed #FBCP install -wget --spider -q -o /dev/null --tries=1 -T 10 https://github.com +wget --spider -q -o /dev/null --tries=1 -T 10 https://cmake.org/ if [ $? -eq 0 ]; then -sudo apt-get install git cmake -y 2> error_output.txt +sudo apt-get update +sudo apt-get install cmake -y 2> error_output.txt result=`cat ./error_output.txt` echo -e "\033[31m$result\033[0m" -grep -q "^E:" ./error_output.txt && exit +grep -q "^E:" ./error_output.txt +type cmake > /dev/null 2>&1 +if [ $? -eq 0 ]; then sudo rm -rf rpi-fbcp +wget --spider -q -o /dev/null --tries=1 -T 10 https://github.com +if [ $? -eq 0 ]; then sudo git clone https://github.com/tasanakorn/rpi-fbcp +if [ $? -ne 0 ]; then +echo "download fbcp failed, copy native fbcp!!!" +sudo cp -r ./usr/rpi-fbcp . +fi +else +echo "bad network, copy native fbcp!!!" +sudo cp -r ./usr/rpi-fbcp . +fi sudo mkdir ./rpi-fbcp/build cd ./rpi-fbcp/build/ sudo cmake .. @@ -59,7 +72,13 @@ if [ $? -eq 0 ]; then sudo cp -rf ./usr/99-fbturbo-fbcp.conf /usr/share/X11/xorg.conf.d/99-fbturbo.conf sudo cp -rf ./etc/rc.local /etc/rc.local fi +else +echo "install cmake error!!!!" fi +else +echo "bad network, can't install cmake!!!" +fi + #evdev install #nodeplatform=`uname -n` #kernel=`uname -r` @@ -73,8 +92,12 @@ if test $version -lt 2017;then echo "reboot" else echo "need to update touch configuration" +wget --spider -q -o /dev/null --tries=1 -T 10 http://mirrors.zju.edu.cn/raspbian/raspbian +if [ $? -eq 0 ]; then +sudo apt-get install xserver-xorg-input-evdev 2> error_output.txt +else 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 +fi result=`cat ./error_output.txt` echo -e "\033[31m$result\033[0m" grep -q "error:" ./error_output.txt && exit diff --git a/MHS40C-show b/MHS40C-show index 330031d..5b65455 100755 --- a/MHS40C-show +++ b/MHS40C-show @@ -46,25 +46,45 @@ sudo touch ./.have_installed echo "hdmi:resistance:mhs397:0:800:480" > ./.have_installed #FBCP install -wget --spider -q -o /dev/null --tries=1 -T 10 https://github.com +wget --spider -q -o /dev/null --tries=1 -T 10 https://cmake.org/ if [ $? -eq 0 ]; then -#sudo cp -rf ./usr/99-fbturbo-fbcp.conf /usr/share/X11/xorg.conf.d/99-fbturbo.conf -#sudo cp -rf ./etc/rc.local /etc/rc.local -sudo apt-get install git cmake -y 2> error_output.txt +sudo apt-get update +sudo apt-get install cmake -y 2> error_output.txt result=`cat ./error_output.txt` echo -e "\033[31m$result\033[0m" -grep -q "^E:" ./error_output.txt && exit +grep -q "^E:" ./error_output.txt +type cmake > /dev/null 2>&1 +if [ $? -eq 0 ]; then sudo rm -rf rpi-fbcp +wget --spider -q -o /dev/null --tries=1 -T 10 https://github.com +if [ $? -eq 0 ]; then sudo git clone https://github.com/tasanakorn/rpi-fbcp +if [ $? -ne 0 ]; then +echo "download fbcp failed, copy native fbcp!!!" +sudo cp -r ./usr/rpi-fbcp . +fi +else +echo "bad network, copy native fbcp!!!" +sudo cp -r ./usr/rpi-fbcp . +fi sudo mkdir ./rpi-fbcp/build cd ./rpi-fbcp/build/ sudo cmake .. sudo make sudo install fbcp /usr/local/bin/fbcp cd - > /dev/null -else -sudo install ./usr/fbcp /usr/local/bin/fbcp +type fbcp > /dev/null 2>&1 +if [ $? -eq 0 ]; then +sudo cp -rf ./usr/99-fbturbo-fbcp.conf /usr/share/X11/xorg.conf.d/99-fbturbo.conf +sudo cp -rf ./etc/rc.local /etc/rc.local fi +else +echo "install cmake error!!!!" +fi +else +echo "bad network, can't install cmake!!!" +fi + #evdev install #nodeplatform=`uname -n` #kernel=`uname -r` @@ -78,8 +98,12 @@ if test $version -lt 2017;then echo "reboot" else echo "need to update touch configuration" +wget --spider -q -o /dev/null --tries=1 -T 10 http://mirrors.zju.edu.cn/raspbian/raspbian +if [ $? -eq 0 ]; then +sudo apt-get install xserver-xorg-input-evdev 2> error_output.txt +else 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 +fi result=`cat ./error_output.txt` echo -e "\033[31m$result\033[0m" grep -q "error:" ./error_output.txt && exit diff --git a/MIS35-show b/MIS35-show index 05a8170..a243f70 100755 --- a/MIS35-show +++ b/MIS35-show @@ -42,14 +42,27 @@ sudo touch ./.have_installed echo "gpio:resistance:mis35:90:480:320" > ./.have_installed #FBCP install -wget --spider -q -o /dev/null --tries=1 -T 10 https://github.com +wget --spider -q -o /dev/null --tries=1 -T 10 https://cmake.org/ if [ $? -eq 0 ]; then -sudo apt-get install git cmake -y 2> error_output.txt +sudo apt-get update +sudo apt-get install cmake -y 2> error_output.txt result=`cat ./error_output.txt` echo -e "\033[31m$result\033[0m" -grep -q "^E:" ./error_output.txt && exit +grep -q "^E:" ./error_output.txt +type cmake > /dev/null 2>&1 +if [ $? -eq 0 ]; then sudo rm -rf rpi-fbcp +wget --spider -q -o /dev/null --tries=1 -T 10 https://github.com +if [ $? -eq 0 ]; then sudo git clone https://github.com/tasanakorn/rpi-fbcp +if [ $? -ne 0 ]; then +echo "download fbcp failed, copy native fbcp!!!" +sudo cp -r ./usr/rpi-fbcp . +fi +else +echo "bad network, copy native fbcp!!!" +sudo cp -r ./usr/rpi-fbcp . +fi sudo mkdir ./rpi-fbcp/build cd ./rpi-fbcp/build/ sudo cmake .. @@ -61,7 +74,13 @@ if [ $? -eq 0 ]; then sudo cp -rf ./usr/99-fbturbo-fbcp.conf /usr/share/X11/xorg.conf.d/99-fbturbo.conf sudo cp -rf ./etc/rc.local /etc/rc.local fi +else +echo "install cmake error!!!!" fi +else +echo "bad network, can't install cmake!!!" +fi + #evdev install #nodeplatform=`uname -n` #kernel=`uname -r` @@ -75,8 +94,12 @@ if test $version -lt 2017;then echo "reboot" else echo "need to update touch configuration" +wget --spider -q -o /dev/null --tries=1 -T 10 http://mirrors.zju.edu.cn/raspbian/raspbian +if [ $? -eq 0 ]; then +sudo apt-get install xserver-xorg-input-evdev 2> error_output.txt +else 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 +fi result=`cat ./error_output.txt` echo -e "\033[31m$result\033[0m" grep -q "error:" ./error_output.txt && exit diff --git a/MPI3508-show b/MPI3508-show index 726dee6..aafbe34 100755 --- a/MPI3508-show +++ b/MPI3508-show @@ -51,8 +51,12 @@ if test $version -lt 2017;then echo "reboot" else echo "need to update touch configuration" +wget --spider -q -o /dev/null --tries=1 -T 10 http://mirrors.zju.edu.cn/raspbian/raspbian +if [ $? -eq 0 ]; then +sudo apt-get install xserver-xorg-input-evdev 2> error_output.txt +else 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 +fi result=`cat ./error_output.txt` echo -e "\033[31m$result\033[0m" grep -q "error:" ./error_output.txt && exit diff --git a/MPI4008-show b/MPI4008-show index 89fe9b5..9f9aeb8 100755 --- a/MPI4008-show +++ b/MPI4008-show @@ -52,8 +52,12 @@ if test $version -lt 2017;then echo "reboot" else echo "need to update touch configuration" +wget --spider -q -o /dev/null --tries=1 -T 10 http://mirrors.zju.edu.cn/raspbian/raspbian +if [ $? -eq 0 ]; then +sudo apt-get install xserver-xorg-input-evdev 2> error_output.txt +else 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 +fi result=`cat ./error_output.txt` echo -e "\033[31m$result\033[0m" grep -q "error:" ./error_output.txt && exit diff --git a/MPI4009-show b/MPI4009-show index ca4d6f9..cdbc823 100755 --- a/MPI4009-show +++ b/MPI4009-show @@ -52,8 +52,12 @@ if test $version -lt 2017;then echo "reboot" else echo "need to update touch configuration" +wget --spider -q -o /dev/null --tries=1 -T 10 http://mirrors.zju.edu.cn/raspbian/raspbian +if [ $? -eq 0 ]; then +sudo apt-get install xserver-xorg-input-evdev 2> error_output.txt +else 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 +fi result=`cat ./error_output.txt` echo -e "\033[31m$result\033[0m" grep -q "error:" ./error_output.txt && exit diff --git a/NANO24-show b/NANO24-show index 3bc5fb2..4f22698 100755 --- a/NANO24-show +++ b/NANO24-show @@ -57,6 +57,10 @@ sudo rm -rf rpi-fbcp wget --spider -q -o /dev/null --tries=1 -T 10 https://github.com if [ $? -eq 0 ]; then sudo git clone https://github.com/tasanakorn/rpi-fbcp +if [ $? -ne 0 ]; then +echo "download fbcp failed, copy native fbcp!!!" +sudo cp -r ./usr/rpi-fbcp . +fi else echo "bad network, copy native fbcp!!!" sudo cp -r ./usr/rpi-fbcp . @@ -92,8 +96,12 @@ if test $version -lt 2017;then echo "reboot" else echo "need to update touch configuration" +wget --spider -q -o /dev/null --tries=1 -T 10 http://mirrors.zju.edu.cn/raspbian/raspbian +if [ $? -eq 0 ]; then +sudo apt-get install xserver-xorg-input-evdev 2> error_output.txt +else 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 +fi result=`cat ./error_output.txt` echo -e "\033[31m$result\033[0m" grep -q "error:" ./error_output.txt && exit