Merge branch 'master' of https://github.com/cimryan/teslausb

GetShellWithoutMonitorOnWindows.md

@@ -1,9 +1,6 @@
 # Seting up the Pi without a monitor using Windows
-1. Download and install:
-   * [Notepad++](https://notepad-plus-plus.org/) Alternatively, any other text editor which is capable of editing files with Unix-style line endings.
-   * [Putty]( https://www.chiark.greenend.org.uk/~sgtatham/putty/latest.html) Note: You can paste into Putty by right-clicking. No matter where you right-click, the content will be inserted at the position of the cursor, as if you had typed it in.
-
-Optional: Watch [this video](https://www.youtube.com/watch?v=xj3MPmJhAPU) to get an idea of the process. The steps from the video are partially automated, below.
+1. Download and install: [Notepad++](https://notepad-plus-plus.org/) Alternatively, any other text editor which is capable of editing files with Unix-style line endings.
+1. Optional: Watch [this video](https://www.youtube.com/watch?v=xj3MPmJhAPU) to get an idea of the process. The steps from the video are partially automated, below.
 1. Remove the MicroSD card from your computer and reinsert it. Do not at any point during the setup of the USB drive allow Windows to format any partition on any drive.
 1. Note that a new drive labeled "boot" has appeared on your computer. Note the drive letter of that drive.
 1. Right-click on your Start menu icon and select "Windows PowerShell (Admin)".

README.md

@@ -62,7 +62,8 @@ Download and install:
 ### Hosting on Windows
 Set up a share on a Windows machine to host the archive. These instructions assume that you created a share named "SailfishCam" on the server "Nautilus". It is recommended that you create a new user. Grant the user you'll be using read/write access to the share. These instructions will assume that the user you've created is named "sailfish" and that the password for this user is "pa$$w0rd".
 
-Get the IP address of the archive machine. You'll need this later, so write it down, somewhere. You can do this by opening a command prompt on the archive machine and typing ipconfig. Get the IP address from the line labeled "IPv4 Address".
+Get the IP address of the archive machine. You'll need this later, so write it down, somewhere. You can do this by opening a command prompt on the archive machine and typing ipconfig. Get the IP address from the line labeled "IPv4 Address". These instructions will assume that the IP address of the archive server is 192.168.0.41.
+
 ### TODO Other hosting solutions
 
 ## Set up the Raspberry Pi
@@ -116,6 +117,15 @@ Now that you have a shell on the Pi you can turn the Pi into a smart USB drive.
     ifconfig wlan0
     ```
 1. Verify that there's an IP address on your subnet assigned. If you don't see the IP address wait for a couple of seconds and re-run the command.
+1. Try to ping your archive server from the Pi.
+    ```
+    ping nautilus
+    ```
+1. If the server can't be reached, ping its IP address:
+    ```
+    ping 192.168.0.41
+    ```
+1. If you can't ping the archive server by IP address from the Pi you should go do whatever you need to on your network to fix that. If you can't reach the archive server by name from the Pi but you can by IP address then use its IP address, below, in place of its name.
 1. Run these commands, subsituting your values:
     ```
     export archiveserver=Nautilus

windows_archive/setup-teslausb

@@ -38,6 +38,8 @@ then
   exit 1
 fi
 
+pushd ~
+
 cp /boot/cmdline.txt ~
 cat ~/cmdline.txt | sed 's/[[:space:]]\+modules-load=[^ [:space:]]\+//' | sed 's/rootwait/rootwait modules-load=dwc2/' > /boot/cmdline.txt
 rm ~/cmdline.txt
@@ -56,11 +58,14 @@ echo "password=$sharepassword" >> /root/.teslaCamArchiveCredentials
 
 mkdir /root/bin
 
+wget https://raw.githubusercontent.com/cimryan/teslausb/master/windows_archive/archiveloop
+sed s/ARCHIVE_HOST_NAME=archiveserver/ARCHIVE_HOST_NAME=$archiveserver/ ~/archiveloop > /root/bin/archiveloop
+rm ~/archiveloop
+chmod +x /root/bin/archiveloop
+
 pushd /root/bin
 wget https://raw.githubusercontent.com/cimryan/teslausb/master/windows_archive/archive-teslacam-clips
 chmod +x archive-teslacam-clips
-wget https://raw.githubusercontent.com/cimryan/teslausb/master/windows_archive/archiveloop
-chmod +x archiveloop
 popd
 
 echo "#!/bin/bash -eu" > ~/rc.local
@@ -90,4 +95,4 @@ cp /etc/hosts ~
 sed s/raspberrypi/teslausb/g ~/hosts > /etc/hosts
 
 cp /etc/hostname ~
-sed s/raspberrypi/teslausb/g ~/hostname > /etc/hostname
+sed s/raspberrypi/teslausb/g ~/hostname > /etc/hostname