Merge pull request #72 from makermelissa/master

Moved spi-bcm2835 to be first in /etc/modules
This commit is contained in:
Limor "Ladyada" Fried 2020-02-05 14:16:20 -05:00 committed by GitHub
commit 0d345d09de
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -207,9 +207,9 @@ function update_configtxt() {
# remove any old flexfb/fbtft stuff # remove any old flexfb/fbtft stuff
rm -f /etc/modprobe.d/fbtft.conf rm -f /etc/modprobe.d/fbtft.conf
sed -i 's/spi-bcm2835//g' "/etc/modules"
sed -i 's/flexfb//g' "/etc/modules" sed -i 's/flexfb//g' "/etc/modules"
sed -i 's/fbtft_device//g' "/etc/modules" sed -i 's/fbtft_device//g' "/etc/modules"
sed -i 's/spi-bcm2835//g' "/etc/modules"
if [ "${pitfttype}" == "22" ]; then if [ "${pitfttype}" == "22" ]; then
overlay="dtoverlay=pitft22,rotate=${pitftrot},speed=64000000,fps=30" overlay="dtoverlay=pitft22,rotate=${pitftrot},speed=64000000,fps=30"
@ -234,9 +234,9 @@ options fbtft_device name=flexfb gpios=dc:25,cs:8,led:26 speed=40000000 bgr=1 fp
options flexfb setaddrwin=0 width=240 height=240 init=-1,0x11,-2,120,-1,0x36,0x00,-1,0x3A,0x05,-1,0xB2,0x0C,0x0C,0x00,0x33,0x33,-1,0xB7,0x35,-1,0xBB,0x1A,-1,0xC0,0x2C,-1,0xC2,0x01,-1,0xC3,0x0B,-1,0xC4,0x20,-1,0xC6,0x0F,-1,0xD0,0xA4,0xA1,-1,0x21,-1,0xE0,0x00,0x19,0x1E,0x0A,0x09,0x15,0x3D,0x44,0x51,0x12,0x03,0x00,0x3F,0x3F,-1,0xE1,0x00,0x18,0x1E,0x0A,0x09,0x25,0x3F,0x43,0x52,0x33,0x03,0x00,0x3F,0x3F,-1,0x29,-3 options flexfb setaddrwin=0 width=240 height=240 init=-1,0x11,-2,120,-1,0x36,0x00,-1,0x3A,0x05,-1,0xB2,0x0C,0x0C,0x00,0x33,0x33,-1,0xB7,0x35,-1,0xBB,0x1A,-1,0xC0,0x2C,-1,0xC2,0x01,-1,0xC3,0x0B,-1,0xC4,0x20,-1,0xC6,0x0F,-1,0xD0,0xA4,0xA1,-1,0x21,-1,0xE0,0x00,0x19,0x1E,0x0A,0x09,0x15,0x3D,0x44,0x51,0x12,0x03,0x00,0x3F,0x3F,-1,0xE1,0x00,0x18,0x1E,0x0A,0x09,0x25,0x3F,0x43,0x52,0x33,0x03,0x00,0x3F,0x3F,-1,0x29,-3
# --- end adafruit-pitft-helper $date --- # --- end adafruit-pitft-helper $date ---
EOF EOF
echo "spi-bcm2835" >> /etc/modules
echo "flexfb" >> /etc/modules echo "flexfb" >> /etc/modules
echo "fbtft_device" >> /etc/modules echo "fbtft_device" >> /etc/modules
echo "spi-bcm2835" >> /etc/modules
overlay="" overlay=""
fi fi