Merge remote-tracking branch 'refs/remotes/origin/dev'

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,12 @@
 
 ## 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  - Laser raster base64
 *  G10 - retract filament according to settings of M207
 *  G11 - retract recover filament according to settings of M208

Documentation/Laser/K40_ramps_configs/K40_no_cooler_no_flowmeter/Configuration_Laser.h

+#ifndef CONFIGURATION_LASER
+#define CONFIGURATION_LASER
+
+//===========================================================================
+//============================= Laser Settings ==============================
+//===========================================================================
+
+// The following define selects how to control the laser.
+// Please choose the one that matches your setup.
+// 1 = Single pin control - LOW when off, HIGH when on, PWM to adjust intensity
+// 2 = Two pin control - A firing pin for which LOW = off, HIGH = on, and a seperate intensity pin which carries a constant PWM signal and adjusts duty cycle to control intensity
+#define LASER_CONTROL 2
+
+// The following define to use the new HakanBasted laser_pulse method to fire laser. It should be more efficient, but it's less tested.
+// Thanks for it to HakanBastedt that has implemented it for Marlin at https://github.com/HakanBastedt/Marlin
+// Uncomment to enable it *USE AT YOUR OWN RISK*, it should work but it's *NOT WELL TESTED YET*
+//#define LASER_PULSE_METHOD
+
+// If your machine has laser focuser, set this to true and it will use Z axis for focus or disable it.
+#define LASER_HAS_FOCUS false
+
+//// In the case that the laserdriver need at least a certain level "LASER_REMAP_INTENSITY"
+// to give anything, the intensity can be remapped to start at "LASER_REMAP_INTENSITY"
+// At least some CO2-drivers need it, not sure about laserdiode drivers.
+#define LASER_REMAP_INTENSITY 7
+
+// Uncomment the following if your laser firing pin (not the PWM pin) for two pin control requires a HIGH signal to fire rather than a low (eg Red Sail M300 RS 3040)
+// #define HIGH_TO_FIRE
+
+// The following defines select which G codes tell the laser to fire. It's OK to uncomment more than one.
+#define LASER_FIRE_G1 10      // fire the laser on a G1 move, extinguish when the move ends
+#define LASER_FIRE_SPINDLE 11 // fire the laser on M3, extinguish on M5
+#define LASER_FIRE_E 12       // fire the laser when the E axis moves
+
+// Raster mode enables the laser to etch bitmap data at high speeds. Increases command buffer size substantially.
+#define LASER_RASTER
+#define LASER_MAX_RASTER_LINE 68      // Maximum number of base64 encoded pixels per raster gcode command
+#define LASER_RASTER_ASPECT_RATIO 1   // pixels aren't square on most displays, 1.33 == 4:3 aspect ratio. 
+#define LASER_RASTER_MM_PER_PULSE 0.2 // Can be overridden by providing an R value in M649 command : M649 S17 B2 D0 R0.1 F4000
+
+// Uncomment the following if the laser cutter is equipped with a peripheral relay board
+// to control power to an exhaust fan, cooler pump, laser power supply, etc.
+//#define LASER_PERIPHERALS
+//#define LASER_PERIPHERALS_TIMEOUT 30000  // Number of milliseconds to wait for status signal from peripheral control board
+
+// Uncomment the following line to enable cubic bezier curve movement with the G5 code
+// #define G5_BEZIER
+
+// Uncomment these options for the Buildlog.net laser cutter, and other similar models
+#define LASER_WATTS 40.0
+#define LASER_DIAMETER 0.1        // milimeters
+#define LASER_PWM 50000           // hertz
+#define LASER_FOCAL_HEIGHT 74.50  // z axis position at which the laser is focused
+
+#endif

MK/Configuration_Store.cpp

@@ -35,7 +35,6 @@
  *       either sets a Sane Default, or results in No Change to the existing value.
  *
  */
-
 #include "base.h"
 
 #define EEPROM_VERSION "MKV428"