From f0982f2f17667ada48c62c251298171ba0a2db89 Mon Sep 17 00:00:00 2001
From: Peter Johnson <johnson.peter@gmail.com>
Date: Fri, 11 Jan 2019 13:21:20 -0800
Subject: [PATCH] Update example README.txt files (#57)

* C++ libraries are now included in the downloaded zip

* It's no longer necessary to override CXX
---
 .../examples/cpp-multiCameraServer/README.txt | 29 ++++++++----
 .../java-multiCameraServer/README.txt         | 47 ++++++++++---------
 .../python-multiCameraServer/README.txt       | 32 ++++++++-----
 3 files changed, 65 insertions(+), 43 deletions(-)

diff --git a/deps/examples/cpp-multiCameraServer/README.txt b/deps/examples/cpp-multiCameraServer/README.txt
index 5d72e19..346010f 100644
--- a/deps/examples/cpp-multiCameraServer/README.txt
+++ b/deps/examples/cpp-multiCameraServer/README.txt
@@ -12,22 +12,33 @@ Building locally on rPi
 Building on desktop
 ===================
 
+--------------
 One time setup
 --------------
 
-Install the Raspbian compiler [1] as well as GNU make.
+Install the Raspbian compiler [1] as well as GNU make [2].
 
 [1]: https://github.com/wpilibsuite/raspbian-toolchain/releases
+[2]: (windows) http://gnuwin32.sourceforge.net/packages/make.htm
 
-The lib and include directories from the Pi /usr/local/frc/ directory must
-be copied to the desktop machine.  Edit the Makefile to change
-/usr/local/frc/lib and /usr/local/frc/include to the local desktop locations.
-
+--------
 Building
 --------
 
-1) Run "make CXX=arm-raspbian9-linux-gnueabihf-g++"
-2) Copy multiCameraServerExample and runCamera to /home/pi on the Pi
-3) On the Pi, run "./runInteractive" in /home/pi or
-   "sudo svc -t /service/camera" to restart service.
+Run "make"
 
+---------
+Deploying
+---------
+
+On the rPi web dashboard:
+
+1) Make the rPi writable by selecting the "Writable" tab
+2) In the rPi web dashboard Application tab, select the
+   "Uploaded C++ executable" option for Application
+3) Click "Browse..." and select the "multiCameraServerExample" executable in
+   your desktop project directory
+4) Click Save
+
+The application will be automatically started.  Console output can be seen by
+enabling console output in the Vision Status tab.
diff --git a/deps/examples/java-multiCameraServer/README.txt b/deps/examples/java-multiCameraServer/README.txt
index c452fe8..851125a 100644
--- a/deps/examples/java-multiCameraServer/README.txt
+++ b/deps/examples/java-multiCameraServer/README.txt
@@ -1,3 +1,29 @@
+===================
+Building on desktop
+===================
+
+--------
+Building
+--------
+
+1) Run "./gradlew build"
+
+---------
+Deploying
+---------
+
+On the rPi web dashboard:
+
+1) Make the rPi writable by selecting the "Writable" tab
+2) In the rPi web dashboard Application tab, select the "Uploaded Java jar"
+   option for Application
+3) Click "Browse..." and select the "java-multiCameraServer-all.jar" file in
+   your desktop project directory in the build/libs subdirectory
+4) Click Save
+
+The application will be automatically started.  Console output can be seen by
+enabling console output in the Vision Status tab.
+
 =======================
 Building locally on rPi
 =======================
@@ -6,24 +32,3 @@ Building locally on rPi
 2) Run "./install.sh" (replaces /home/pi/runCamera)
 3) Run "./runInteractive" in /home/pi or "sudo svc -t /service/camera" to
    restart service.
-
-
-===================
-Building on desktop
-===================
-
-One time setup
---------------
-
-Copy the .jar files from /home/pi/javalibs on the Pi to the source directory.
-
-Building
---------
-
-1) Run "./gradlew build"
-2) Copy build/libs/java-multiCameraServer-all.jar and runCamera to /home/pi on
-   the Pi.  Note: the .jar filename may be different; if it is, either rename
-   when copying to the Pi or edit runCamera to reflect the new jar name.
-3) On the Pi, run "./runInteractive" in /home/pi or
-   "sudo svc -t /service/camera" to restart service.
-
diff --git a/deps/examples/python-multiCameraServer/README.txt b/deps/examples/python-multiCameraServer/README.txt
index 734e6c3..b1c460a 100644
--- a/deps/examples/python-multiCameraServer/README.txt
+++ b/deps/examples/python-multiCameraServer/README.txt
@@ -1,17 +1,23 @@
-=======================
-Building locally on rPi
-=======================
+======================
+Deploying from desktop
+======================
+
+On the rPi web dashboard:
+
+1) Make the rPi writable by selecting the "Writable" tab
+2) In the rPi web dashboard Application tab, select the "Uploaded Python file"
+   option for Application
+3) Click "Browse..." and select the "multiCameraServer.py" file in
+   your desktop project directory
+4) Click Save
+
+The application will be automatically started.  Console output can be seen by
+enabling console output in the Vision Status tab.
+
+========================
+Deploying locally on rPi
+========================
 
 1) Copy multiCameraServer.py and runCamera to /home/pi
 2) Run "./runInteractive" in /home/pi or "sudo svc -t /service/camera" to
    restart service.
-
-
-===================
-Building on desktop
-===================
-
-1) Copy multiCameraServer.py and runCamera to /home/pi on the Pi
-2) On the Pi, run "./runInteractive" in /home/pi or
-   "sudo svc -t /service/camera" to restart service.
-