adafruit-mirror/Raspberry-Pi-Installer-Scripts
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #130 from makermelissa/master

Browse source 
Roll back driver + couple small script fixes
This commit is contained in:
Limor "Ladyada" Fried 2020-11-25 13:25:16 -05:00 committed by GitHub
commit 715a6bda9e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 56 additions and 63 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
adafruit-pitft.py
View file

@ -237,7 +237,7 @@ def update_configtxt(rotation_override=None):
if not shell.run_command("sudo apt-get update", True): if not shell.run_command("sudo apt-get update", True):
warn_exit("Apt failed to update itself!") warn_exit("Apt failed to update itself!")
print("Upgrading packages...") print("Upgrading packages...")
if not shell.run_command("sudo apt-get upgrade", False): if not shell.run_command("sudo apt-get -y upgrade", False):
warn_exit("Apt failed to install software!") warn_exit("Apt failed to install software!")
print("Installing Kernel Headers...") print("Installing Kernel Headers...")
if not shell.run_command("apt-get install -y raspberrypi-kernel-headers", True): if not shell.run_command("apt-get install -y raspberrypi-kernel-headers", True):
@ -381,7 +381,7 @@ def install_fbcp():
shell.reconfig("/boot/config.txt", "^.*hdmi_force_hotplug.*$", "hdmi_force_hotplug=1") shell.reconfig("/boot/config.txt", "^.*hdmi_force_hotplug.*$", "hdmi_force_hotplug=1")
shell.reconfig("/boot/config.txt", "^.*hdmi_group.*$", "hdmi_group=2") shell.reconfig("/boot/config.txt", "^.*hdmi_group.*$", "hdmi_group=2")
shell.reconfig("/boot/config.txt", "^.*hdmi_mode.*$", "hdmi_mode=87") shell.reconfig("/boot/config.txt", "^.*hdmi_mode.*$", "hdmi_mode=87")
shell.reconfig("/boot/config.txt", "^[^#]*dtoverlay=vc4-fkms-v3d.*$", "#dtoverlay=vc4-fkms-v3d") shell.pattern_replace("/boot/config.txt", "^[^#]*dtoverlay=vc4-fkms-v3d.*$", "#dtoverlay=vc4-fkms-v3d")
# if there's X11 installed... # if there's X11 installed...
scale = 1 scale = 1
@ -431,7 +431,7 @@ def uninstall_fbcp():
shell.run_command("raspi-config nonint do_overscan 0") shell.run_command("raspi-config nonint do_overscan 0")
print("Configuring boot/config.txt for default HDMI") print("Configuring boot/config.txt for default HDMI")
shell.reconfig("/boot/config.txt", "^.*hdmi_force_hotplug.*$", "hdmi_force_hotplug=0") shell.reconfig("/boot/config.txt", "^.*hdmi_force_hotplug.*$", "hdmi_force_hotplug=0")
shell.reconfig("/boot/config.txt", "^.*#.*dtoverlay=vc4-fkms-v3d.*$", "dtoverlay=vc4-fkms-v3d") shell.pattern_replace("/boot/config.txt", "^.*#.*dtoverlay=vc4-fkms-v3d.*$", "dtoverlay=vc4-fkms-v3d")
shell.pattern_replace("/boot/config.txt", '^hdmi_group=2.*$') shell.pattern_replace("/boot/config.txt", '^hdmi_group=2.*$')
shell.pattern_replace("/boot/config.txt", '^hdmi_mode=87.*$') shell.pattern_replace("/boot/config.txt", '^hdmi_mode=87.*$')
shell.pattern_replace("/boot/config.txt", '^hdmi_cvt=.*$') shell.pattern_replace("/boot/config.txt", '^hdmi_cvt=.*$')

113
overlays/minipitft13-overlay.dts
View file

@ -7,72 +7,65 @@
/plugin/; /plugin/;
/ { / {
compatible = "brcm,bcm2835", "brcm,bcm2708", "brcm,bcm2709"; compatible = "brcm,bcm2835", "brcm,bcm2708", "brcm,bcm2709";
fragment@0 { fragment@0 {
target = <&spi0>; target = <&spi0>;
__overlay__ { __overlay__ {
status = "okay"; status = "okay";
spidev@0{ spidev@0{
status = "disabled"; status = "disabled";
}; };
}; spidev@1{
}; status = "disabled";
};
};
};
fragment@1 { fragment@1 {
target = <&gpio>; target = <&gpio>;
__overlay__ { __overlay__ {
pitft_pins: pitft_pins { pitft_pins: pitft_pins {
brcm,pins = <25>; /* dc pin */ brcm,pins = <25>;
brcm,function = <1>; /* out */ brcm,function = <1>; /* out */
brcm,pull = <0>; /* no pull */ brcm,pull = <0>; /* none */
}; };
}; };
}; };
fragment@2 { fragment@2 {
target = <&spi0>; target = <&spi0>;
__overlay__ { __overlay__ {
/* needed to avoid dtc warning */ /* needed to avoid dtc warning */
#address-cells = <1>; #address-cells = <1>;
#size-cells = <0>; #size-cells = <0>;
pitft: pitft@0{ pitft: pitft@0{
compatible = "multi-inno,mi0283qt"; compatible = "sitronix,st7789v";
reg = <0>; reg = <0>;
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&pitft_pins>; pinctrl-0 = <&pitft_pins>;
spi-max-frequency = <32000000>;
rotate = <0>;
width = <240>;
height = <240>;
buswidth = <8>;
dc-gpios = <&gpio 25 0>;
led-gpios = <&gpio 26 0>;
debug = <0>;
};
};
};
spi-max-frequency = <32000000>;
rotation = <0>;
width = <240>;
height = <240>;
col_offset = <0>;
row_offset = <0>;
dc-gpios = <&gpio 25 0>;
backlight = <&backlight>;
};
};
};
fragment@3 { __overrides__ {
target-path = "/soc"; speed = <&pitft>,"spi-max-frequency:0";
__overlay__ { rotate = <&pitft>,"rotate:0";
backlight: backlight { width = <&pitft>,"width:0";
compatible = "gpio-backlight"; height = <&pitft>,"height:0";
gpios = <&gpio 26 0>; fps = <&pitft>,"fps:0";
}; debug = <&pitft>,"debug:0";
}; };
};
__overrides__ {
speed = <&pitft>,"spi-max-frequency:0";
rotation = <&pitft>,"rotation:0";
width = <&pitft>,"width:0";
height = <&pitft>,"height:0";
col_offset = <&pitft>,"col_offset:0";
row_offset = <&pitft>,"row_offset:0";
};
}; };