Merge branch 'dev' into 'master'

Dev



See merge request !1

Documentation/Features.md

@@ -45,6 +45,9 @@ NEED UPGRADE
 *   Singlenozzle support
 *   NPr2 support, multiextruder by NicolaP http://www.3dmakerlab.it/extruder-npr2.html
 *   Laserbeam support
+*   Laser for RAMPS buildlog based 3d laser cutter (like modified chinese K40) with both vectorial and raster support
+    compatible with inkscape plugin at https://github.com/TurnkeyTyranny/laser-gcode-exporter-inkscape-plugin
+*   Laser pheripherals (water cooling, air assisted lasering) 
 *   Firmware test
 *   Support for a filament diameter sensor, which adjusts extrusion volume
 *   Support for a hall effect sensor for calucalte Wh. Example sensor ACS712 20A range Current Sensor Module. http://i.ebayimg.com/images/i/310506962976-0-1/s-l1000.jpg

Documentation/GCodes.md

@@ -2,11 +2,13 @@
 
 ## G Codes
 
-*  G0  -> G1
-*  G1  - Coordinated Movement X Y Z E F(feedrate) P(Purge)
+*  G0  -> G1 except for laser where G0 is "move without firing"
+*  G1  - Coordinated Movement X Y Z E F(feedrate) P(Purge), for laser move by firing
 *  G2  - CW ARC
 *  G3  - CCW ARC
 *  G4  - Dwell S[seconds] or P[milliseconds], delay in Second or Millisecond
+*  G5  - Bezier curve - from http://forums.reprap.org/read.php?147,93577
+*  G7  - execute raster (base64) line (LASER)
 *  G10 - retract filament according to settings of M207
 *  G11 - retract recover filament according to settings of M208
 *  G28 - X0 Y0 Z0 Home all Axis. G28 M for bed manual setting with LCD.
@@ -43,6 +45,7 @@
 *  M30  - Delete file from SD (M30 filename.g)
 *  M31  - Output time since last M109 or SD card start to serial
 *  M32  - Make directory
+*  M35  - Upload Firmware to Nextion from SD
 *  M42  - Change pin status via gcode Use M42 Px Sy to set pin x to value y, when omitting Px the onboard led will be used.
 *  M49  - Z probe repetability test
 *  M80  - Turn on Power Supply
@@ -76,14 +79,15 @@
 *  M127 - Solenoid Air Valve Closed (BariCUDA vent to atmospheric pressure by jmil)
 *  M128 - EtoP Open (BariCUDA EtoP = electricity to air pressure transducer by jmil)
 *  M129 - EtoP Closed (BariCUDA EtoP = electricity to air pressure transducer by jmil)
-*  M140 - Set bed target temp
+*  M140 - Set bed or cooler target temp
 *  M145 - Set the heatup state H<hotend> B<bed> F<fan speed> for S<material> (0=PLA, 1=ABS)
 *  M150 - Set BlinkM Color Output R: Red<0-255> U(!): Green<0-255> B: Blue<0-255> over i2c, G for green does not work.
 *  M163 - Set a single proportion for a mixing extruder. Requires COLOR_MIXING_EXTRUDER.
 *  M164 - Save the mix as a virtual extruder. Requires COLOR_MIXING_EXTRUDER and MIXING_VIRTUAL_TOOLS.
 *  M165 - Set the proportions for a mixing extruder. Use parameters ABCDHI to set the mixing factors. Requires COLOR_MIXING_EXTRUDER.
-*  M190 - S[xxx] Wait for bed current temp to reach target temp. Waits only when heating
-        - R[xxx] Wait for bed current temp to reach target temp. Waits when heating and cooling
+*  M190 - S[xxx] Wait for bed or cooler current temp to reach target temp. Waits only when heating bed or cooling cooler
+        - R[xxx] Wait for bed or cooler current temp to reach target temp. Waits when heating and cooling
+        - C parameter select Cooler, omitting it selec bed.
 *  M200 - D[millimeters]- set filament diameter and set E axis units to cubic millimeters (use S0 to set back to millimeters).
 *  M201 - Set max acceleration in units/s^2 for print moves (M201 X1000 Y1000 Z1000 E0 S1000 E1 S1000 E2 S1000 E3 S1000) in mm/sec^2
 *  M203 - Set maximum feedrate that your machine can sustain (M203 X200 Y200 Z300 E0 S1000 E1 S1000 E2 S1000 E3 S1000) in mm/sec
@@ -102,8 +106,8 @@
 *  M300 - Play beep sound S[frequency Hz] P[duration ms]
 *  M301 - Set PID parameters P I and D
 *  M302 - Allow cold extrudes
-*  M303 - PID relay autotune S<temperature> sets the target temperature (default target temperature = 150C). H<hotend> C<cycles>
-*  M304 - Set bed PID parameters P I and D
+*  M303 - PID relay autotune S<temperature> sets the target temperature (default target temperature = 150C). H<hotend> C<cycles> U<Apply result>
+*  M304 - Set bed PID parameters P I and D or Water Cooling if C parameter
 *  M350 - Set microstepping mode.
 *  M351 - Toggle MS1 MS2 pins directly.
 *  M400 - Finish all moves
@@ -124,6 +128,9 @@
 *  M595 - Set hotend AD595 offset and gain
 *  M600 - Pause for filament change X[pos] Y[pos] Z[relative lift] E[initial retract] L[later retract distance for removal]
 *  M605 - Set dual x-carriage movement mode: Smode [ X<duplication x-offset> Rduplication temp offset ]
+*  M649 - laser set options
+*  M650 - mUVe peel set peel distance
+*  M651 - mUVe peel run peel move
 *  M666 - Set z probe offset or Endstop and delta geometry adjustment. M666 L for list command
 *  M906 - Set motor currents XYZ T0-4 E
 *  M907 - Set digital trimpot motor current using axis codes.

Documentation/Laser/README.md

+K40 laser rasterized images sends fast and large size commands over serial,
+so, the common 64 byte buffer in arduino isn't enough.
+
+You can edit "board.txt" in arduino ide, copy the "mega 2560" board declaration, call it 
+"mega 2560 serial buffer 256" and then add a line like:
+
+```
+mega256.build.extra_flags=-DSERIAL_RX_BUFFER_SIZE=256 -DSERIAL_TX_BUFFER_SIZE=256
+```
+
+and then in the arduino ide select "mega 2560 serial buffer 256" board.
+