rebase with org repo

README.md

@@ -31,7 +31,7 @@ Fastest and cheapest way to get your own Lightning Node running - on a Raspberry
 **Total Price: 124,11 EUR** (thats under 150 USD)
 
 Amazon shopping lists for different countries:
-[ [USA](shoppinglist_usa.md) ] [ [UK](shoppinglist_uk.md) ] [ [France](shoppinglist_fr.md) ] [ [China](shoppinglist_cn.md) ] [ [Australia](shoppinglist_au.md) ] [ [Czech](shoppinglist_cz.md) ]
+[ [USA](shoppinglist_usa.md) ] [ [UK](shoppinglist_uk.md) ] [ [France](shoppinglist_fr.md) ] [ [China](shoppinglist_cn.md) ] [ [Australia](shoppinglist_au.md) ] [ [Czech](shoppinglist_cz.md) ] [ [Switzerland](shoppinglist_ch.md) ]
 
 You can even pay your RaspiBlitz Amazon Shopping with Bitcoin & Lightning thru [Bitrefill](https://blog.bitrefill.com/its-here-buy-amazon-vouchers-with-bitcoin-on-bitrefill-bb2a4449724a).
 
@@ -68,8 +68,8 @@ If you are at an event, ask for a ready-2-go set or if you have your own hardwar
 You got all the hardware of the shopping list above and you have no further assistance. Then you need to prepare your SD-Card yourself .. this scenario is still experimental, feedback needed and can take some time.
 
 1. Download SD-Card image:
-https://wiki.fulmo.org/downloads/raspiblitz-0.98-2018-12-20.img.gz
-SHA-256: 746ee516d37d1a2e25a65eff87c7907597ac2a386ed2c1580e8b993fc33819cc
+https://wiki.fulmo.org/downloads/raspiblitz-0.99-2018-12-24.img.gz
+SHA-256: 9c9ee0dea2e892a0e665befc86f6bd2f5a11f4d290bda46ba9203bf9e5d0a3df
 or [build your own SD card image](#build-the-sd-card-image)
 
 2. Write the SD-Card image to your SD Card - if you need details, see here:
@@ -171,7 +171,7 @@ You can simply use the HDD of another RaspiBlitz or you prepare a HDD yourself b
 
 * format second HDD with exFAT (availbale on Windows and Mac)
 * copy an indexed Blockchain into the root folder "bitcoin"
-* when youre HDD is ready the content of your folder bitcoin should look like this:
+* when your HDD is ready the content of your folder bitcoin should look like this:
 
 ![BitcoinFolderData](pictures/seedhdd.png)
 

build.sdcard/raspbianStretchDesktop.sh

@@ -23,7 +23,7 @@ if [ ${#wantedBranch} -eq 0 ]; then
 fi
 echo "will use code from branch --> '${wantedBranch}'"
 
-# 2nd optional parameter is the GITHUG-USERNAME to get code from when
+# 2nd optional parameter is the GITHUB-USERNAME to get code from when
 # provisioning sd card with raspiblitz assets/scripts later on
 # if 2nd paramter is used - 1st is mandatory
 echo "*** CHECK INPUT PARAMETERS ***"
@@ -212,8 +212,8 @@ fi
 # check binary is was not manipulated (checksum test)
 binaryChecksum=$(sha256sum ${binaryName} | cut -d " " -f1)
 if [ "${binaryChecksum}" != "${bitcoinSHA256}" ]; then
-    echo "!!! FAIL !!! Downloaded BITCOIN BINARY not matching SHA256 checksum: ${bitcoinSHA256}"
-    exit 1
+  echo "!!! FAIL !!! Downloaded BITCOIN BINARY not matching SHA256 checksum: ${bitcoinSHA256}"
+  exit 1
 fi
 
 
@@ -221,8 +221,8 @@ fi
 sudo -u admin wget https://bitcoin.org/laanwj-releases.asc
 if [ ! -f "./laanwj-releases.asc" ]
 then
-    echo "!!! FAIL !!! Download laanwj-releases.asc not success."
-    exit 1
+  echo "!!! FAIL !!! Download laanwj-releases.asc not success."
+  exit 1
 fi
 fingerprint=$(gpg ./laanwj-releases.asc 2>/dev/null | grep "${laanwjPGP}" -c)
 if [ ${fingerprint} -lt 1 ]; then
@@ -275,8 +275,8 @@ sudo -u admin wget https://download.litecoin.org/litecoin-${litecoinVersion}/lin
 # check download
 binaryChecksum=$(sha256sum ${binaryName} | cut -d " " -f1)
 if [ "${binaryChecksum}" != "${litecoinSHA256}" ]; then
-    echo "!!! FAIL !!! Downloaded LITECOIN BINARY not matching SHA256 checksum: ${litecoinSHA256}"
-    exit 1
+  echo "!!! FAIL !!! Downloaded LITECOIN BINARY not matching SHA256 checksum: ${litecoinSHA256}"
+  exit 1
 fi
 
 # install
@@ -308,8 +308,8 @@ sudo -u admin wget https://keybase.io/roasbeef/pgp_keys.asc
 # check binary is was not manipulated (checksum test)
 binaryChecksum=$(sha256sum ${binaryName} | cut -d " " -f1)
 if [ "${binaryChecksum}" != "${lndSHA256}" ]; then
-    echo "!!! FAIL !!! Downloaded LND BINARY not matching SHA256 checksum: ${lndSHA256}"
-    exit 1
+  echo "!!! FAIL !!! Downloaded LND BINARY not matching SHA256 checksum: ${lndSHA256}"
+  exit 1
 fi
 
 # check gpg finger print
@@ -329,7 +329,7 @@ echo "correctKey(${correctKey})"
 if [ ${correctKey} -lt 1 ] || [ ${goodSignature} -lt 1 ]; then
   echo ""
   echo "!!! BUILD FAILED --> LND PGP Verify not OK / signatute(${goodSignature}) verify(${correctKey})"
-    exit 1
+  exit 1
 fi
 
 # install
@@ -515,12 +515,55 @@ read key
 # give Raspi a default hostname (optional)
 sudo raspi-config nonint do_hostname "RaspiBlitz"
 
-# *** 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
+# *** 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=$?
+
+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 <<EOF >> config.txt
+
+dtparam=spi=off
+dtparam=i2c_arm=off
+
+# Set screen size and any overscan required
+overscan_left=0
+overscan_right=0
+overscan_top=0
+overscan_bottom=0
+framebuffer_width=800
+framebuffer_height=480
+
+
+enable_dpi_lcd=1
+display_default_lcd=1
+dpi_group=2
+dpi_mode=87
+dpi_output_format=0x6f015
+
+# set up the size to 800x480
+hdmi_timings=480 0 16 16 24 800 0 4 2 2 0 0 0 60 0 32000000 6
+
+#rotate screen
+display_rotate=3
+
+dtoverlay=i2c-gpio,i2c_gpio_scl=24,i2c_gpio_sda=23
+EOF
+  init 6
+fi

case.3dprint/standard/readme.md

@@ -0,0 +1,9 @@
+# Raspiblitz Case: Standard
+
+This is a raspiblitz case prototype. The standard file (Raspiblitz_standard.stl) should be modified to fit your HDD. 
+
+#### To Do
+
+* Update the HDD container to fit the standard HDD model from the raspiblitz amazon buylist. (Toshiba HDTB420EK3AA 2TB Canvio Basics 2.5-Inch USB 3.0 Portable External Hard Drive - Black)
+
+* Add a cool lightning bolt to improve the design.

shoppinglist_ch.md

@@ -0,0 +1,13 @@
+The RaspiBlitz software is built and tested for the following hardware set that you can buy on [PLAY-ZONE](https://www.play-zone.ch/) and [BRACK](https://www.brack.ch/):
+
+* Raspberry Pi3 Model B+ (CHF 57.90): https://www.play-zone.ch/de/raspberry-pi3-model-b-1-4ghz-gigabit-lan-wlan-bluetooth-64bit-inkl-16-gb-noobs-sd-karte.html
+  * Includes a Micro SD card with 16GB capacity
+* 3.5'' TFT Display (CHF 69.90): https://www.play-zone.ch/de/3-5-tft-display-800x480-pixel-60fps-mit-acryl-gehause-fur-den-raspberry-pi.html
+  * Includes an acryl glass case
+* Power supply 3A (CHF 29.90): https://www.play-zone.ch/de/netzteil-ac-dc-adapter-5v-dc-3000ma-microusb.html
+* 1TB Hard Drive (CHF 51.00): https://www.brack.ch/maxtor-externe-festplatte-421628
+
+Total: CHF 208.70
+
+**Warning**: This display is different from the one available at Amazon and needs a specific driver!
+Be sure to select "No" when asked by the install script if you have the default display!