diff --git a/MHS35-show b/MHS35-show index 1b3655b..cc1165c 100755 --- a/MHS35-show +++ b/MHS35-show @@ -11,13 +11,16 @@ fi sudo cp ./usr/mhs35-overlay.dtb /boot/overlays/ sudo cp ./usr/mhs35-overlay.dtb /boot/overlays/mhs35.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 +#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 + +source ./system_config.sh 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 @@ -41,10 +44,10 @@ sudo cp ./usr/inittab /etc/ sudo touch ./.have_installed echo "gpio:resistance:mhs35:90:480:320" > ./.have_installed +sudo apt-get update #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" @@ -87,6 +90,7 @@ fi version=`uname -v` #if test "$nodeplatform" = "raspberrypi";then #echo "this is raspberrypi kernel" +input_result=0 version=${version##* } #version=${version#*#} echo $version @@ -95,10 +99,21 @@ 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 +if [ $? -ne 0 ]; then +input_result=1 else +sudo apt-get install xserver-xorg-input-evdev 2> error_output.txt +dpkg -l | grep xserver-xorg-input-evdev > /dev/null 2>&1 +if [ $? -ne 0 ]; then +input_result=1 +fi +fi +if [ $input_result -eq 1 ]; then +if [ $hardware_arch -eq 32 ]; then sudo dpkg -i -B ./xserver-xorg-input-evdev_1%3a2.10.6-1+b1_armhf.deb 2> error_output.txt +elif [ $hardware_arch -eq 64 ]; then +sudo dpkg -i -B ./xserver-xorg-input-evdev_1%3a2.10.6-2_arm64.deb 2> error_output.txt +fi fi result=`cat ./error_output.txt` echo -e "\033[31m$result\033[0m" diff --git a/boot/config-nomal-10.9-32.txt b/boot/config-nomal-10.9-32.txt new file mode 100755 index 0000000..f8d34e5 --- /dev/null +++ b/boot/config-nomal-10.9-32.txt @@ -0,0 +1,65 @@ +# 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 infrared communication. +#dtoverlay=gpio-ir,gpio_pin=17 +#dtoverlay=gpio-ir-tx,gpio_pin=18 + +# Additional overlays and parameters are documented /boot/overlays/README + +# Enable audio (loads snd_bcm2835) +dtparam=audio=on + +[pi4] +# Enable DRM VC4 V3D driver on top of the dispmanx display stack +#dtoverlay=vc4-fkms-v3d +max_framebuffers=2 + +[all] +#dtoverlay=vc4-fkms-v3d diff --git a/boot/config-nomal-11.4-32.txt b/boot/config-nomal-11.4-32.txt new file mode 100755 index 0000000..a7a2142 --- /dev/null +++ b/boot/config-nomal-11.4-32.txt @@ -0,0 +1,80 @@ +# 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 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 infrared communication. +#dtoverlay=gpio-ir,gpio_pin=17 +#dtoverlay=gpio-ir-tx,gpio_pin=18 + +# Additional overlays and parameters are documented /boot/overlays/README + +# Enable audio (loads snd_bcm2835) +dtparam=audio=on + +# Automatically load overlays for detected cameras +camera_auto_detect=1 + +# Automatically load overlays for detected DSI displays +display_auto_detect=1 + +# Enable DRM VC4 V3D driver +#dtoverlay=vc4-kms-v3d +max_framebuffers=2 + +# Disable compensation for displays with overscan +disable_overscan=1 + +[cm4] +# Enable host mode on the 2711 built-in XHCI USB controller. +# This line should be removed if the legacy DWC2 controller is required +# (e.g. for USB device mode) or if USB support is not required. +otg_mode=1 + +[all] + +[pi4] +# Run as fast as firmware / board allows +arm_boost=1 + +[all] diff --git a/boot/config-nomal-11.4-64.txt b/boot/config-nomal-11.4-64.txt new file mode 100755 index 0000000..11a783a --- /dev/null +++ b/boot/config-nomal-11.4-64.txt @@ -0,0 +1,83 @@ +# 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 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 infrared communication. +#dtoverlay=gpio-ir,gpio_pin=17 +#dtoverlay=gpio-ir-tx,gpio_pin=18 + +# Additional overlays and parameters are documented /boot/overlays/README + +# Enable audio (loads snd_bcm2835) +dtparam=audio=on + +# Automatically load overlays for detected cameras +camera_auto_detect=1 + +# Automatically load overlays for detected DSI displays +display_auto_detect=1 + +# Enable DRM VC4 V3D driver +#dtoverlay=vc4-kms-v3d +max_framebuffers=2 + +# Run in 64-bit mode +arm_64bit=1 + +# Disable compensation for displays with overscan +disable_overscan=1 + +[cm4] +# Enable host mode on the 2711 built-in XHCI USB controller. +# This line should be removed if the legacy DWC2 controller is required +# (e.g. for USB device mode) or if USB support is not required. +otg_mode=1 + +[all] + +[pi4] +# Run as fast as firmware / board allows +arm_boost=1 + +[all] diff --git a/system_config.sh b/system_config.sh new file mode 100755 index 0000000..c62a050 --- /dev/null +++ b/system_config.sh @@ -0,0 +1,26 @@ +#!/bin/bash + +big_version=`lsb_release -r | awk -F ' ' '{printf $NF}'` +deb_version=`cat /etc/debian_version | tr -d '\n'` + +if [ $(getconf WORD_BIT) = '32' ] && [ $(getconf LONG_BIT) = '64' ] ; then +hardware_arch=64 +else +hardware_arch=32 +fi + +if [ $hardware_arch -eq 32 ]; then +if [ $(($big_version)) -lt 10 ]; then +sudo cp -rf ./boot/config-nomal-10.9-32.txt ./boot/config.txt.bak +else +if [[ "$deb_version" < "10.9" ]] || [[ "$deb_version" = "10.9" ]]; then +sudo cp -rf ./boot/config-nomal-10.9-32.txt ./boot/config.txt.bak +else +sudo cp -rf ./boot/config-nomal-11.4-32.txt ./boot/config.txt.bak +fi +fi +elif [ $hardware_arch -eq 64 ]; then +sudo cp -rf ./boot/config-nomal-11.4-64.txt ./boot/config.txt.bak +fi + + diff --git a/xserver-xorg-input-evdev_1%3a2.10.3-1_armhf.deb b/xserver-xorg-input-evdev_1%3a2.10.3-1_armhf.deb deleted file mode 100755 index 3bae710..0000000 Binary files a/xserver-xorg-input-evdev_1%3a2.10.3-1_armhf.deb and /dev/null differ diff --git a/xserver-xorg-input-evdev_1%3a2.10.5-1_armhf.deb b/xserver-xorg-input-evdev_1%3a2.10.5-1_armhf.deb deleted file mode 100755 index 457697f..0000000 Binary files a/xserver-xorg-input-evdev_1%3a2.10.5-1_armhf.deb and /dev/null differ diff --git a/xserver-xorg-input-evdev_1%3a2.10.6-2_arm64.deb b/xserver-xorg-input-evdev_1%3a2.10.6-2_arm64.deb new file mode 100755 index 0000000..9506420 Binary files /dev/null and b/xserver-xorg-input-evdev_1%3a2.10.6-2_arm64.deb differ diff --git a/xserver-xorg-input-evdev_2.10.5-1_armhf.deb b/xserver-xorg-input-evdev_2.10.5-1_armhf.deb deleted file mode 100755 index 1cdf3f9..0000000 Binary files a/xserver-xorg-input-evdev_2.10.5-1_armhf.deb and /dev/null differ