From d58de5c4d72dd99686dde55d8693a400ff598bd6 Mon Sep 17 00:00:00 2001 From: openoms Date: Mon, 4 Feb 2019 19:30:35 +0000 Subject: [PATCH] revert LCD install befiore testing DietPi on rPI --- build.sdcard/raspbianStretchDesktop.sh | 45 +++++++++---------- dietpi/README.md | 2 +- dietpi/boot/dietpi.txt | 4 +- .../dietpi.txt.sample} | 0 .../HC1_sdcard_build_output} | 0 5 files changed, 24 insertions(+), 27 deletions(-) rename dietpi/{dietpi_sample.txt => boot/dietpi.txt.sample} (100%) rename dietpi/{build_sdcard_output => logs/HC1_sdcard_build_output} (100%) diff --git a/build.sdcard/raspbianStretchDesktop.sh b/build.sdcard/raspbianStretchDesktop.sh index 41d25eb..0ed7b5c 100644 --- a/build.sdcard/raspbianStretchDesktop.sh +++ b/build.sdcard/raspbianStretchDesktop.sh @@ -548,37 +548,34 @@ echo "IMPORTANT IF WANT TO MAKE A RELEASE IMAGE FROM THIS BUILD:" echo "login once after reboot without HDD and run 'XXprepareRelease.sh'" echo "" echo "Press ENTER to install LCD and reboot ..." -# don`t stop automatic install -# read key +read key # give Raspi a default hostname (optional) sudo raspi-config nonint do_hostname "RaspiBlitz" # *** Display selection *** -#dialog --title "Display" --yesno "Are you using the default display available from Amazon?\nSelect 'No' if you are using the Swiss version from play-zone.ch!" 6 80 -#defaultDisplay=$? +dialog --title "Display" --yesno "Are you using the default display available from Amazon?\nSelect 'No' if you are using the Swiss version from play-zone.ch!" 6 80 +defaultDisplay=$? -# choosing between LCD-s during install makes dietpi automation stop - procedd with default LCD - -#if [[ $defaultDisplay -eq 0 ]] -#then +if [[ $defaultDisplay -eq 0 ]] +then # *** RASPIBLITZ / LCD (at last - because makes a reboot) *** # based on https://www.elegoo.com/tutorial/Elegoo%203.5%20inch%20Touch%20Screen%20User%20Manual%20V1.00.2017.10.09.zip -cd /home/admin/ -sudo apt-mark hold raspberrypi-bootloader -git clone https://github.com/goodtft/LCD-show.git -sudo chmod -R 755 LCD-show -sudo chown -R admin:admin LCD-show -cd LCD-show/ -sudo ./LCD35-show -#else -# # Download and install the driver -# # based on http://www.raspberrypiwiki.com/index.php/3.5_inch_TFT_800x480@60fps -# -# cd /boot -# sudo wget http://www.raspberrypiwiki.com/download/RPI-HD-35-INCH-TFT/dt-blob-For-3B-plus.bin -# sudo mv dt-blob-For-3B-plus.bin dt-blob.bin -# cat <> config.txt + cd /home/admin/ + sudo apt-mark hold raspberrypi-bootloader + git clone https://github.com/goodtft/LCD-show.git + sudo chmod -R 755 LCD-show + sudo chown -R admin:admin LCD-show + cd LCD-show/ + sudo ./LCD35-show +else + # Download and install the driver + # based on http://www.raspberrypiwiki.com/index.php/3.5_inch_TFT_800x480@60fps + + cd /boot + sudo wget http://www.raspberrypiwiki.com/download/RPI-HD-35-INCH-TFT/dt-blob-For-3B-plus.bin + sudo mv dt-blob-For-3B-plus.bin dt-blob.bin + cat <> config.txt dtparam=spi=off dtparam=i2c_arm=off @@ -607,4 +604,4 @@ display_rotate=3 dtoverlay=i2c-gpio,i2c_gpio_scl=24,i2c_gpio_sda=23 EOF init 6 -#fi +fi \ No newline at end of file diff --git a/dietpi/README.md b/dietpi/README.md index 83716d7..65552fa 100644 --- a/dietpi/README.md +++ b/dietpi/README.md @@ -86,7 +86,7 @@ if you intend to use @openoms`s forked version: `wget https://raw.githubusercontent.com/openoms/raspiblitz/raspiblitz-dev/build.sdcard/raspbianStretchDesktop.sh && sudo bash raspbianStretchDesktop.sh raspiblitz-dev openoms` -See my example output: [sdcard_build_output](DietPi/sdcard_build_output) +See my example output on the Odorid HC1: [HC1_sdcard_build_output](logs/HC1_sdcard_build_output) `ssh admin@[IP-OF-DROIDBLITZ]` password: raspiblitz diff --git a/dietpi/boot/dietpi.txt b/dietpi/boot/dietpi.txt index db56439..36c1102 100644 --- a/dietpi/boot/dietpi.txt +++ b/dietpi/boot/dietpi.txt @@ -173,7 +173,7 @@ CONFIG_PROXY_PASSWORD= CONFIG_BOOT_WAIT_FOR_NETWORK=2 #DietPi checks for updates (allows dietpi to check for updates on a daily basis and boot using a <1kb file download.) -CONFIG_CHECK_DIETPI_UPDATES=0 +CONFIG_CHECK_DIETPI_UPDATES=1 # Optional: Automatically update DietPi when updates are available. | requires CONFIG_CHECK_DIETPI_UPDATES=1 CONFIG_AUTO_DIETPI_UPDATES=0 @@ -261,4 +261,4 @@ DEV_GITOWNER=Fourdee #------------------------------------------------------------------------------------------------------ # D I E T - P I # Settings, automatically added by dietpi-update -#------------------------------------------------------------------------------------------------------ \ No newline at end of file +#------------------------------------------------------------------------------------------------------ diff --git a/dietpi/dietpi_sample.txt b/dietpi/boot/dietpi.txt.sample similarity index 100% rename from dietpi/dietpi_sample.txt rename to dietpi/boot/dietpi.txt.sample diff --git a/dietpi/build_sdcard_output b/dietpi/logs/HC1_sdcard_build_output similarity index 100% rename from dietpi/build_sdcard_output rename to dietpi/logs/HC1_sdcard_build_output