diff --git a/LCD7B-show b/LCD7B-show index 0e17561..09560dd 100755 --- a/LCD7B-show +++ b/LCD7B-show @@ -1,26 +1,39 @@ -sudo cp -rf ./boot/config-7B-800x480.txt /boot/config.txt -if [ -b /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 -rf ./usr/99-fbturbo.conf-HDMI /usr/share/X11/xorg.conf.d/99-fbturbo.conf -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 970;then -echo "reboot" -else -echo "need to update touch configuration" -sudo apt-get install xserver-xorg-input-evdev -fi -fi +#!/bin/bash + +sudo ./system_backup.sh + +sudo cp -rf ./boot/config-nomal.txt ./boot/config.txt.bak +sudo echo "hdmi_force_hotplug=1" >> ./boot/config.txt.bak +sudo echo "hdmi_force_edid_audio=1" >> ./boot/config.txt.bak +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 "display_rotate=0" >> ./boot/config.txt.bak +sudo echo "max_usb_current=1" >> ./boot/config.txt.bak +sudo echo "config_hdmi_boost=7" >> ./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_drive=1" >> ./boot/config.txt.bak +sudo echo "hdmi_cvt 800 480 60 6 0 0 0" >> ./boot/config.txt.bak +sudo cp -rf ./boot/config.txt.bak /boot/config.txt +#sudo cp -rf ./boot/config-7B-800x480.txt /boot/config.txt +sudo cp -rf ./usr/99-fbturbo.conf-HDMI /usr/share/X11/xorg.conf.d/99-fbturbo.conf + +if [ ! -d /etc/X11/xorg.conf.d ]; then sudo mkdir /etc/X11/xorg.conf.d -sudo cp ./usr/40-libinput.conf-HDMI7B /etc/X11/xorg.conf.d/40-libinput.conf +fi +sudo cp ./usr/40-libinput.conf-0 /etc/X11/xorg.conf.d/40-libinput.conf +sudo touch ./.have_installed +echo "hdmi:capacity:7B-800x480:0:800:480" > ./.have_installed +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/LCD7C-show b/LCD7C-show index ce18243..c9e1085 100755 --- a/LCD7C-show +++ b/LCD7C-show @@ -1,28 +1,39 @@ -sudo cp -rf ./boot/config-7C-1024x600.txt /boot/config.txt +#!/bin/bash -if [ -b /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 -rf ./usr/99-fbturbo.conf-HDMI /usr/share/X11/xorg.conf.d/99-fbturbo.conf +sudo ./system_backup.sh -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 970;then -echo "reboot" -else -echo "need to update touch configuration" -sudo apt-get install xserver-xorg-input-evdev -fi -fi +sudo cp -rf ./boot/config-nomal.txt ./boot/config.txt.bak +sudo echo "hdmi_force_hotplug=1" >> ./boot/config.txt.bak +sudo echo "hdmi_force_edid_audio=1" >> ./boot/config.txt.bak +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 "display_rotate=0" >> ./boot/config.txt.bak +sudo echo "max_usb_current=1" >> ./boot/config.txt.bak +sudo echo "config_hdmi_boost=7" >> ./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_drive=1" >> ./boot/config.txt.bak +sudo echo "hdmi_cvt 1024 600 60 6 0 0 0" >> ./boot/config.txt.bak +sudo cp -rf ./boot/config.txt.bak /boot/config.txt +#sudo cp -rf ./boot/config-7C-1024x600.txt /boot/config.txt +sudo cp -rf ./usr/99-fbturbo.conf-HDMI /usr/share/X11/xorg.conf.d/99-fbturbo.conf + +if [ ! -d /etc/X11/xorg.conf.d ]; then sudo mkdir /etc/X11/xorg.conf.d -sudo cp ./usr/40-libinput.conf-HDMI7C /etc/X11/xorg.conf.d/40-libinput.conf +fi +sudo cp ./usr/40-libinput.conf-0 /etc/X11/xorg.conf.d/40-libinput.conf +sudo touch ./.have_installed +echo "hdmi:capacity:7C-1024x600:0:1024:600" > ./.have_installed +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/boot/config.txt.bak b/boot/config.txt.bak deleted file mode 100755 index 58186f3..0000000 --- a/boot/config.txt.bak +++ /dev/null @@ -1,66 +0,0 @@ -# For more options and information see -# http://rpf.io/configtxt -# Some settings may impact device functionality. See link above for details - -# uncomment if you get no picture on HDMI for a default "safe" mode -#hdmi_safe=1 - -# uncomment this if your display has a black border of unused pixels visible -# and your display can output without overscan -#disable_overscan=1 - -# uncomment the following to adjust overscan. Use positive numbers if console -# goes off screen, and negative if there is too much border -#overscan_left=16 -#overscan_right=16 -#overscan_top=16 -#overscan_bottom=16 - -# uncomment to force a console size. By default it will be display's size minus -# overscan. -#framebuffer_width=1280 -#framebuffer_height=720 - -# uncomment if hdmi display is not detected and composite is being output -#hdmi_force_hotplug=1 - -# uncomment to force a specific HDMI mode (this will force VGA) -#hdmi_group=1 -#hdmi_mode=1 - -# uncomment to force a HDMI mode rather than DVI. This can make audio work in -# DMT (computer monitor) modes -#hdmi_drive=2 - -# uncomment to increase signal to HDMI, if you have interference, blanking, or -# no display -#config_hdmi_boost=4 - -# uncomment for composite PAL -#sdtv_mode=2 - -#uncomment to overclock the arm. 700 MHz is the default. -#arm_freq=800 - -# Uncomment some or all of these to enable the optional hardware interfaces -#dtparam=i2c_arm=on -#dtparam=i2s=on -#dtparam=spi=on - -# Uncomment this to enable the lirc-rpi module -#dtoverlay=lirc-rpi - -# Additional overlays and parameters are documented /boot/overlays/README - -# Enable audio (loads snd_bcm2835) -dtparam=audio=on -hdmi_force_hotplug=1 -dtparam=i2c_arm=on -dtparam=spi=on -enable_uart=1 -dtoverlay=mhs32:rotate=270 -hdmi_group=2 -hdmi_mode=1 -hdmi_mode=87 -hdmi_cvt 480 320 60 6 0 0 0 -hdmi_drive=2