From 57f087731c8ab4fe78f77685f7c21ea31c090e8a Mon Sep 17 00:00:00 2001 From: lcdwiki Date: Thu, 4 Jul 2019 14:25:04 +0100 Subject: [PATCH] modify PI4 bug --- LCD35-show | 2 ++ LCD5-show | 2 ++ MHS35-show | 2 ++ MPI3508-show | 2 ++ 4 files changed, 8 insertions(+) diff --git a/LCD35-show b/LCD35-show index e91b98b..814e116 100755 --- a/LCD35-show +++ b/LCD35-show @@ -10,6 +10,7 @@ sudo mkdir -p /etc/X11/xorg.conf.d fi sudo cp ./usr/tft35a-overlay.dtb /boot/overlays/ sudo cp ./usr/tft35a-overlay.dtb /boot/overlays/tft35a.dtbo +hw_version=`tr -d '\0' < /proc/device-tree/model` 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 @@ -17,6 +18,7 @@ else sudo cp -rf ./boot/config-nomal.txt ./boot/config.txt.bak sudo echo "hdmi_force_hotplug=1" >> ./boot/config.txt.bak fi +[[ $hw_version =~ "Raspberry Pi 4 Model" ]] || (sed -i 's/^dtoverlay=/#&/g' ./boot/config.txt.bak;sed -i 's/^max_framebuffers=/#&/g' ./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 diff --git a/LCD5-show b/LCD5-show index 99aa565..d967258 100755 --- a/LCD5-show +++ b/LCD5-show @@ -2,6 +2,7 @@ sudo ./system_backup.sh +hw_version=`tr -d '\0' < /proc/device-tree/model` 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 @@ -9,6 +10,7 @@ else sudo cp -rf ./boot/config-nomal.txt ./boot/config.txt.bak sudo echo "hdmi_force_hotplug=1" >> ./boot/config.txt.bak fi +[[ $hw_version =~ "Raspberry Pi 4 Model" ]] || (sed -i 's/^dtoverlay=/#&/g' ./boot/config.txt.bak;sed -i 's/^max_framebuffers=/#&/g' ./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 diff --git a/MHS35-show b/MHS35-show index ad387bb..10a2623 100755 --- a/MHS35-show +++ b/MHS35-show @@ -11,6 +11,7 @@ fi sudo cp ./usr/mhs35-overlay.dtb /boot/overlays/ sudo cp ./usr/mhs35-overlay.dtb /boot/overlays/mhs35.dtbo +hw_version=`tr -d '\0' < /proc/device-tree/model` 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 @@ -18,6 +19,7 @@ else sudo cp -rf ./boot/config-nomal.txt ./boot/config.txt.bak sudo echo "hdmi_force_hotplug=1" >> ./boot/config.txt.bak fi +[[ $hw_version =~ "Raspberry Pi 4 Model" ]] || (sed -i 's/^dtoverlay=/#&/g' ./boot/config.txt.bak;sed -i 's/^max_framebuffers=/#&/g' ./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 diff --git a/MPI3508-show b/MPI3508-show index b292393..56c305a 100755 --- a/MPI3508-show +++ b/MPI3508-show @@ -1,6 +1,7 @@ #!/bin/bash sudo ./system_backup.sh +hw_version=`tr -d '\0' < /proc/device-tree/model` 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 @@ -8,6 +9,7 @@ else sudo cp -rf ./boot/config-nomal.txt ./boot/config.txt.bak sudo echo "hdmi_force_hotplug=1" >> ./boot/config.txt.bak fi +[[ $hw_version =~ "Raspberry Pi 4 Model" ]] || (sed -i 's/^dtoverlay=/#&/g' ./boot/config.txt.bak;sed -i 's/^max_framebuffers=/#&/g' ./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