bug fixes

README.md

@@ -18,6 +18,11 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 If you would like to include this code in a project which is not licensed under the AGPL V3, please contact the author at andrewhodel@gmail.com
 
+## additional credits
+This repo is a mixture of the above repo, and work done by bryanchanrobot
+https://github.com/wgbartley/grblweb
+https://github.com/brychanrobot/grblweb
+
 ## Raspberry Pi prebuilt Image
 
 There is a prebuilt Raspberry Pi Image that is fully configured.  More information and a link to the .img can be found at http://xyzbots.com
@@ -35,6 +40,12 @@ https://github.com/grbl/grbl/wiki/Configuring-Grbl-v0.8
 http://onehossshay.wordpress.com/2011/08/21/grbl-how-it-works-and-other-thoughts/
 
 ## Installation
+node --version
+v0.10.32
+npm --version
+1.4.28
+
+I ran into errors with a base install of nodejs on ubuntu
 
 ```
 git clone https://github.com/andrewhodel/grblweb.git
@@ -58,6 +69,9 @@ node server.js
 npm install -g forever
 forever start server.js
 ```
+## Camera
+you'll presently need to install mjpg-streamer, working on something more integrated, but no promises
+https://github.com/jacksonliam/mjpg-streamer
 
 ## Access
 
@@ -72,3 +86,13 @@ Read http://www.hobbytronics.co.uk/raspberry-pi-serial-port
 Set config.usettyAMA0 to 1 in config.js
 
 This is already enabled on the prebuilt GRBLWeb Raspbian image.
+
+## Fixes
+script is looking for mjpg port again
+camera viewport readded to main screen
+minjs stuff is included again (have to check to see if that's actually "ok" or if I need to point to downloads there as well)
+USB serial port is available for selection
+
+## dev setup
+raspi V1 - raspi camera - linksprite 3 axis CNC 
+http://linksprite.com/wiki/index.php5?title=DIY_CNC_3_Axis_Engraver_Machine_PCB_Milling_Wood_Carving_Router_Kit_Arduino_Grbl

config.js

@@ -1,12 +1,57 @@
+// !!! All values that are distance measures should be entered in millimeters !!!
 
 var config = {};
 
-config.webPort = 8000;
+// Port to listen on for web site
+config.webPort = 80;
 
-config.serialBaudRate = 9600;
+// Serial baud rate to Arduino
+config.serialBaudRate = 115200;
 
+// Use /dev/ttyAMA0
 config.usettyAMA0 = 0;
 
+// Enable simple jog controls
+config.enableSimpleControls = 1;
+
+// Enable probe controls
+config.enableProbeControls = 1;
+
+// Enable jsCut
+config.enableJsCut = true;
+
+// Default step increment for jogging
+config.jogControlDefaultIncr = 0.1;
+
+// Default feed rate for jogging
+config.jogControlDefaultFeed = 1000;
+
+// X offset for probe
+config.probeControlXOffset = -0.5;
+
+// Y offset for probe
+config.probeControlYOffset = -1.5;
+
+// Z offset for probe
+config.probeControlZOffset = 3.1;
+
+// Maximum you can move Z with any 1 command
+config.maxMoveZ = 50;
+
+// Auto-read temperature
+config.enablePiTemperature = false;
+config.piTemperatureFahrenheit = true;
+config.piTemperatureFile = [
+    '/sys/class/thermal/thermal_zone0/temp',
+    '/sys/bus/w1/devices/28-000002aa87dd/w1_slave'
+];
+
+config.showUnitsBackdrop = false;
+
+// TO DO:
+// - Add probe diameters
+// - Allow configuration of gcode for probing buttons
+
 // expects a webcam stream from mjpg_streamer
 config.webcamPort = 8080;