Merge branch 'dev'

Documentation/GCodes.md

@@ -8,10 +8,10 @@
 *  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)
+*  G7  - Laser raster base64
 *  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.
+*  G28 - X Y Z Home all Axis. M for bed manual setting with LCD. B return to back point
 *  G29 - Detailed Z-Probe, probes the bed at 3 points or grid.  You must be at the home position for this to work correctly.
    G29 Fyyy Lxxx Rxxx Byyy for customer grid.
 *  G30 - Single Z Probe, probes bed at current XY location. Bed Probe and Delta geometry Autocalibration G30 A
@@ -47,7 +47,8 @@
 *  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
+*  M48  - Measure Z_Probe repeatability. M48 [P # of points] [X position] [Y position] [V_erboseness #] [E_ngage Probe] [L # of legs of travel]
+*  M70  - Power consumption sensor calibration
 *  M80  - Turn on Power Supply
 *  M81  - Turn off Power, including Power Supply, if possible
 *  M82  - Set E codes absolute (default)
@@ -60,34 +61,40 @@
 *  M98  - Print Hysteresis value
 *  M99  - Set Hysteresis parameter M99 X<in mm> Y<in mm> Z<in mm> E<in mm>
 *  M100 - Watch Free Memory (For Debugging Only)
-*  M104 - Set extruder target temp
+*  M104 - Set hotend target temp
 *  M105 - Read current temp
 *  M106 - Fan on
 *  M107 - Fan off
-*  M109 - S[xxx] Wait for extruder current temp to reach target temp. Waits only when heating
-        - R[xxx] Wait for extruder current temp to reach target temp. Waits when heating and cooling
-*  M111 - Debug Dryrun Repetier
+*  M109 - S[xxx] Wait for hotend current temp to reach target temp. Waits only when heating
+        - R[xxx] Wait for hotend current temp to reach target temp. Waits when heating and cooling
+*  M110 - Set the current line number
+*  M111 - Set debug flags with S<mask>.
 *  M112 - Emergency stop
-*  M114 - Output current position to serial port, (V)erbose for user
+*  M114 - Output current position to serial port
 *  M115 - Capabilities string
-*  M117 - display message
+*  M117 - Display a message on the controller screen
 *  M119 - Output Endstop status to serial port
-*  M120 - Disable Endstop
-*  M121 - Enable Endstop
+*  M120 - Enable endstop detection
+*  M121 - Disable endstop detection
 *  M122 - S<1=true/0=false> Enable or disable check software endstop
 *  M126 - Solenoid Air Valve Open (BariCUDA support by jmil)
 *  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 or cooler target temp
+*  M140 - Set hot bed target temp
+*  M141 - Set hot chamber target temp
+*  M142 - Set 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 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.
+*  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
+*  M191 - Sxxx Wait for chamber current temp to reach target temp. Waits only when heating
+*         Rxxx Wait for chamber current temp to reach target temp. Waits when heating and cooling
+*  M192 - Sxxx Wait for cooler current temp to reach target temp. Waits only when heating
+*         Rxxx Wait for cooler current temp to reach target temp. Waits when heating and cooling
 *  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
@@ -107,7 +114,9 @@
 *  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> U<Apply result>
-*  M304 - Set bed PID parameters P I and D or Water Cooling if C parameter
+*  M304 - Set hot bed PID parameters P I and D
+*  M305 - Set hot chamber PID parameters P I and D
+*  M306 - Set cooler PID parameters P I and D
 *  M350 - Set microstepping mode.
 *  M351 - Toggle MS1 MS2 pins directly.
 *  M400 - Finish all moves
@@ -129,12 +138,11 @@
 *  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
+*  M649 - Set laser options. S<intensity> L<duration> P<ppm> B<set mode> R<raster mm per pulse> F<feedrate>
 *  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.
 *  M908 - Control digital trimpot directly.
 *  M928 - Start SD logging (M928 filename.g) - ended by M29
+*  M997 - NPR2 Color rotate
 *  M999 - Restart after being stopped by error

Documentation/changelog.md

+### Version 4.2.83
+* Add Cooler and Hot Chamber
+* Add Laser Beam PWM and raster base64
+
 ### Version 4.2.82
 * Add DONDOLO_DUAL_MOTOR for DONDOLO bowden and dual extruder
 * Add reader TAG width MFRC522

MK/Configuration_Basic.h

@@ -7,10 +7,9 @@
  * - Board type
  * - Mechanism type
  * - Extruders number
- * - Thermistor type
- * - Temperature limits
  *
  * Mechanisms-settings can be found in Configuration_Xxxxxx.h (where Xxxxxx can be: Cartesian - Delta - Core - Scara)
+ * Temperature settings can be found in Configuration_Temperature.h
  * Feature-settings can be found in Configuration_Feature.h
  * Pins-settings can be found in "Configuration_Pins.h"
  */
@@ -116,16 +115,6 @@
 //#define PS_DEFAULT_OFF
 /*************************************************************************************/
 
-/***********************************************************************
- ******************************* Cooler ********************************
- ***********************************************************************
- *                                                                     *
- * Uncomment the following line to enable COOLER support               *
- *                                                                     *
- ***********************************************************************/
-//#define COOLER
-
-
 
 /***********************************************************************
  ************************** Extruders number ***************************
@@ -137,128 +126,4 @@
 #define DRIVER_EXTRUDERS 1
 /***********************************************************************/
 
-
-/*****************************************************************************************************
- ************************************** Thermistor type **********************************************
- *****************************************************************************************************
- *                                                                                                   *
- * 4.7kohm PULLUP!                                                                                   *
- * This is a normal value, if you use a 1k pullup thermistor see below                               *
- * Please choose the one that matches your setup and set to TEMP_SENSOR_.                            *
- *                                                                                                   *
- * Temperature sensor settings (4.7kohm PULLUP):                                                     *
- *  -2 is thermocouple with MAX6675 (only for sensor 0)                                              *
- *  -1 is thermocouple with AD595 or AD597                                                           *
- *   0 is not used                                                                                   *
- *   1 is 100k thermistor - best choice for EPCOS 100k (4.7k pullup)                                 *
- *   2 is 200k thermistor - ATC Semitec 204GT-2 (4.7k pullup)                                        *
- *   3 is Mendel-parts thermistor (4.7k pullup)                                                      *
- *   4 is 10k thermistor !! do not use it for a hotend. It gives bad resolution at high temp. !!     *
- *   5 is 100K thermistor - ATC Semitec 104GT-2 (Used in ParCan & J-Head) (4.7k pullup)              *
- *   6 is 100k EPCOS - Not as accurate as table 1 (created using a fluke thermocouple) (4.7k pullup) *
- *   7 is 100k Honeywell thermistor 135-104LAG-J01 (4.7k pullup)                                     *
- *  71 is 100k Honeywell thermistor 135-104LAF-J01 (4.7k pullup)                                     *
- *   8 is 100k 0603 SMD Vishay NTCS0603E3104FXT (4.7k pullup)                                        *
- *   9 is 100k GE Sensing AL03006-58.2K-97-G1 (4.7k pullup)                                          *
- *  10 is 100k RS thermistor 198-961 (4.7k pullup)                                                   *
- *  11 is 100k beta 3950 1% thermistor (4.7k pullup)                                                 *
- *  12 is 100k 0603 SMD Vishay NTCS0603E3104FXT (4.7k pullup) (calibrated for Makibox hot bed)       *
- *  13 is 100k Hisens 3950  1% up to 300°C for hotend "Simple ONE " & "Hotend "All In ONE"          *
- *  20 is the PT100 circuit found in the Ultimainboard V2.x                                          *
- *  40 is the 10k Carel NTC015WH01 or ELIWELL SN8T6A1502 (4.7k pullup)                               *
- *  60 is 100k Maker's Tool Works Kapton Bed Thermistor beta=3950                                    *
- *                                                                                                   *
- * 1kohm PULLUP!                                                                                     *
- * This is not normal, you would have to have changed out your 4.7k for 1k                           *
- * (but gives greater accuracy and more stable PID)                                                  *
- * Please choose the one that matches your setup.                                                    *
- *                                                                                                   *
- * Temperature sensor settings (1kohm PULLUP):                                                       *
- *  51 is 100k thermistor - EPCOS (1k pullup)                                                        *
- *  52 is 200k thermistor - ATC Semitec 204GT-2 (1k pullup)                                          *
- *  55 is 100k thermistor - ATC Semitec 104GT-2 (Used in ParCan & J-Head) (1k pullup)                *
- *                                                                                                   *
- *  1047 is Pt1000 with 4k7 pullup                                                                   *
- *  1010 is Pt1000 with 1k pullup (non standard)                                                     *
- *  147 is Pt100 with 4k7 pullup                                                                     *
- *  110 is Pt100 with 1k pullup (non standard)                                                       *
- *  998 and 999 are Dummy Tables. ALWAYS read 25°C or DUMMY_THERMISTOR_998_VALUE temperature        *
- *                                                                                                   *
- *****************************************************************************************************/
-#define TEMP_SENSOR_0 1
-#define TEMP_SENSOR_1 0
-#define TEMP_SENSOR_2 0
-#define TEMP_SENSOR_3 0
-#define TEMP_SENSOR_BED 0
-#define TEMP_SENSOR_COOLER 0
-
-//These 2 defines help to calibrate the AD595 sensor in case you get wrong temperature measurements.
-//The measured temperature is defined as "actualTemp = (measuredTemp * TEMP_SENSOR_AD595_GAIN) + TEMP_SENSOR_AD595_OFFSET"
-#define TEMP_SENSOR_AD595_OFFSET 0.0
-#define TEMP_SENSOR_AD595_GAIN   1.0
-
-// Use it for Testing or Development purposes. NEVER for production machine.
-#define DUMMY_THERMISTOR_998_VALUE 25
-#define DUMMY_THERMISTOR_999_VALUE 25
-
-//Show Temperature ADC value
-//The M105 command return, besides traditional information, the ADC value read from temperature sensors.
-//#define SHOW_TEMP_ADC_VALUES
-/*****************************************************************************************************/
-
-
-/***********************************************************************
- ************************* Temperature limits ***************************
- ***********************************************************************/
-// Hotend temperature must be close to target for this long before M109 returns success
-#define TEMP_RESIDENCY_TIME 10  // (seconds)
-#define TEMP_HYSTERESIS 3       // (degC) range of +/- temperatures considered "close" to the target one
-#define TEMP_WINDOW     1       // (degC) Window around target to start the residency timer x degC early.
-
-// Bed temperature must be close to target for this long before M190 returns success
-#define TEMP_BED_RESIDENCY_TIME 0   // (seconds)
-#define TEMP_BED_HYSTERESIS 3       // (degC) range of +/- temperatures considered "close" to the target one
-#define TEMP_BED_WINDOW     1       // (degC) Window around target to start the residency timer x degC early.
-
-// Cooler temperature must be close to target for this long before M190 returns success
-#define TEMP_COOLER_RESIDENCY_TIME 0   // (seconds)
-#define TEMP_COOLER_HYSTERESIS 1          // (degC) range of +/- temperatures considered "close" to the target one
-#define TEMP_COOLER_WINDOW     1          // (degC) Window around target to start the residency timer x degC early.
-
-// When temperature exceeds max temp, your heater will be switched off.
-// When temperature exceeds max temp, your cooler cannot be activaed.
-// This feature exists to protect your hotend from overheating accidentally, but *NOT* from thermistor short/failure!
-// You should use MINTEMP for thermistor short/failure protection.
-#define HEATER_0_MAXTEMP 275 // (degC)
-#define HEATER_1_MAXTEMP 275 // (degC)
-#define HEATER_2_MAXTEMP 275 // (degC)
-#define HEATER_3_MAXTEMP 275 // (degC)
-#define BED_MAXTEMP      150 // (degC)
-#define COOLER_MAXTEMP   35  // 
-
-// The minimal temperature defines the temperature below which the heater will not be enabled It is used
-// or, in case of cooler, it will switched off.
-// to check that the wiring to the thermistor is not broken.
-// Otherwise this would lead to the heater being powered on all the time.
-#define HEATER_0_MINTEMP 5 // (degC)
-#define HEATER_1_MINTEMP 5 // (degC)
-#define HEATER_2_MINTEMP 5 // (degC)
-#define HEATER_3_MINTEMP 5 // (degC)
-#define BED_MINTEMP      5 // (degC)
-#define COOLER_MINTEMP  10 // (degC) 
-
-//Preheat Constants
-#define PLA_PREHEAT_HOTEND_TEMP 190
-#define PLA_PREHEAT_HPB_TEMP     60
-#define PLA_PREHEAT_FAN_SPEED   255   // Insert Value between 0 and 255
-
-#define ABS_PREHEAT_HOTEND_TEMP 240
-#define ABS_PREHEAT_HPB_TEMP    100
-#define ABS_PREHEAT_FAN_SPEED   255   // Insert Value between 0 and 255
-
-#define GUM_PREHEAT_HOTEND_TEMP 230
-#define GUM_PREHEAT_HPB_TEMP     60
-#define GUM_PREHEAT_FAN_SPEED   255   // Insert Value between 0 and 255
-/*****************************************************************************************************/
-
 #endif

MK/Configuration_Cartesian.h

@@ -467,4 +467,4 @@
 #define DEFAULT_ZWOBBLE         0, 0, 0     // A, W, P
 /*****************************************************************************************/
 
-#endif
+#endif
\ No newline at end of file

MK/Configuration_Laser.h

@@ -4,17 +4,14 @@
 //===========================================================================
 //============================= Laser Settings ==============================
 //===========================================================================
-//
-// Laser control is used by the Muve1 3D printer and the Buildlog.net laser cutter
-//
 
-//// The following define selects how to control the laser.  Please choose the one that matches your setup.
+// 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
-// mUVe, buildlog.net and K40 chinese machines uses 2, AMRI ablative uses 1, AMRI SLS uses 2
-#define LASER_CONTROL 2
+#define LASER_CONTROL 1
 
-/// The following define to use the new HakanBasted laser_pulse method to fire laser. It should be more efficient, but it's less tested.
+// 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
@@ -27,50 +24,32 @@
 // 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
+// #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
+// 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
+#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.
+// 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
+#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.
+// 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
+// Uncomment the following line to enable cubic bezier curve movement with the G5 code
 // #define G5_BEZIER
 
-// Uncomment these options for the mUVe 1 3D printer
-// #define CUSTOM_MENDEL_NAME "mUVe1 Printer"
-// #define LASER_WATTS 0.05
-// #define LASER_DIAMETER 0.1 // milimeters
-// #define LASER_PWM 8000 // hertz
-// #define MUVE_Z_PEEL // The mUVe 1 uses a special peel maneuver between each layer, it requires independent control of each Z motor
-
 // Uncomment these options for the Buildlog.net laser cutter, and other similar models
-#define CUSTOM_MENDEL_NAME "Laser Cutter"
 #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
-
-//Uncomment for AMRI Ablative or SLS
-//#define CUSTOM_MENDEL_NAME "Laser Cutter"
-//#define LASER_WATTS 40.0
-//#define LASER_DIAMETER 0.1 // milimeters
-//#define LASER_PWM 25000 // hertz
-//#define LASER_FOCAL_HEIGHT 74.50 // z axis position at which the laser is focused
-
-
+#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_Pins.h

@@ -64,18 +64,22 @@
 #define Z_MAX_PIN       ORIG_Z_MAX_PIN
 
 // HEATER pin
-#define HEATER_0_PIN    ORIG_HEATER_0_PIN
-#define HEATER_1_PIN    ORIG_HEATER_1_PIN
-#define HEATER_2_PIN    ORIG_HEATER_2_PIN
-#define HEATER_3_PIN    ORIG_HEATER_3_PIN
-#define HEATER_BED_PIN  ORIG_HEATER_BED_PIN
+#define HEATER_0_PIN        ORIG_HEATER_0_PIN
+#define HEATER_1_PIN        ORIG_HEATER_1_PIN
+#define HEATER_2_PIN        ORIG_HEATER_2_PIN
+#define HEATER_3_PIN        ORIG_HEATER_3_PIN
+#define HEATER_BED_PIN      ORIG_HEATER_BED_PIN
+#define HEATER_CHAMBER_PIN  -1
+#define COOLER_PIN          -1
 
 // TEMP pin
-#define TEMP_0_PIN      ORIG_TEMP_0_PIN
-#define TEMP_1_PIN      ORIG_TEMP_1_PIN
-#define TEMP_2_PIN      ORIG_TEMP_2_PIN
-#define TEMP_3_PIN      ORIG_TEMP_3_PIN
-#define TEMP_BED_PIN    ORIG_TEMP_BED_PIN
+#define TEMP_0_PIN        ORIG_TEMP_0_PIN
+#define TEMP_1_PIN        ORIG_TEMP_1_PIN
+#define TEMP_2_PIN        ORIG_TEMP_2_PIN
+#define TEMP_3_PIN        ORIG_TEMP_3_PIN
+#define TEMP_BED_PIN      ORIG_TEMP_BED_PIN
+#define TEMP_CHAMBER_PIN  -1
+#define TEMP_COOLER_PIN   -1
 
 // FAN pin
 #define FAN_PIN         ORIG_FAN_PIN
@@ -104,37 +108,14 @@
 #endif
 
 #if ENABLED(LASERBEAM)
-  #define LASER_PWR_PIN -1
-  #define LASER_TTL_PIN -1
-#endif
-
-#if ENABLED(LASER)
-   #if LASER_CONTROL == 1
-      #define LASER_FIRING_PIN    5
-      #define LASER_INTENSITY_PIN -1
-   #endif
-   #if LASER_CONTROL == 2
-      #define LASER_INTENSITY_PIN 6 // Digital pins 2, 3, 5, 6, 7, 8 are attached to timers we can use
-      #define LASER_FIRING_PIN   5
-   #endif
-   #if DISABLED(ORIG_TEMP_COOLER_PIN)
-     #define TEMP_COOLER_PIN ORIG_TEMP_0_PIN // Default to the first thermistor
-   #endif
-   #if ENABLED(LASER_POWER_DOWN)
-      #define LASER_POWER_PIN 9 // This is currently hard-coded to timer2 which services pins 9, 10
-   #endif // LASER_POWER_DOWN
-   #if ENABLED(LASER_PERIPHERALS)
-      #define LASER_PERIPHERALS_PIN       11
-      #define LASER_PERIPHERALS_STATUS_PIN      4
-   #endif // LASER_PERIPHERALS
-   #if ENABLED(COOLER)
-      #define COOLER_PIN 2 // Digital pins 2, 3, 5, 6, 7, 8 are attached to timers we can use
-   #endif // COOLER
+  #define LASER_PWR_PIN                   -1
+  #define LASER_TTL_PIN                   -1
+  #if ENABLED(LASER_PERIPHERALS)
+    #define LASER_PERIPHERALS_PIN         -1
+    #define LASER_PERIPHERALS_STATUS_PIN  -1
+  #endif
 #endif
 
-
-
-
 #if ENABLED(FILAMENT_RUNOUT_SENSOR)
   #define FILRUNOUT_PIN -1
 #endif

MK/Configuration_Store.cpp

@@ -94,7 +94,10 @@
  *
  * PIDTEMPBED:
  *  M304      PID         bedKp, bedKi, bedKd
- *  M304  L   PID         coolerKp, coolerKi, coolerKd
+ * PIDTEMPCHAMBER
+ *  M305      PID         chamberKp, chamberKi, chamberKd
+ * PIDTEMPCOOLER
+ *  M306      PID         coolerKp, coolerKi, coolerKd
  *
  * DOGLCD:
  *  M250  C               lcd_contrast
@@ -232,6 +235,12 @@ void Config_StoreSettings() {
     EEPROM_WRITE_VAR(i, bedKd);
   #endif
 
+  #if ENABLED(PIDTEMPCHAMBER)
+    EEPROM_WRITE_VAR(i, chamberKp);
+    EEPROM_WRITE_VAR(i, chamberKi);
+    EEPROM_WRITE_VAR(i, chamberKd);
+  #endif
+
   #if ENABLED(PIDTEMPCOOLER)
     EEPROM_WRITE_VAR(i, coolerKp);
     EEPROM_WRITE_VAR(i, coolerKi);
@@ -387,13 +396,18 @@ void Config_RetrieveSettings() {
       EEPROM_READ_VAR(i, bedKd);
     #endif
 
+    #if ENABLED(PIDTEMPCHAMBER)
+      EEPROM_READ_VAR(i, chamberKp);
+      EEPROM_READ_VAR(i, chamberKi);
+      EEPROM_READ_VAR(i, chamberKd);
+    #endif
+
     #if ENABLED(PIDTEMPCOOLER)
       EEPROM_READ_VAR(i, coolerKp);
       EEPROM_READ_VAR(i, coolerKi);
       EEPROM_READ_VAR(i, coolerKd);
     #endif
 
-
     #if HASNT(LCD_CONTRAST)
       int lcd_contrast;
     #endif
@@ -588,13 +602,18 @@ void Config_ResetDefault() {
     bedKd = scalePID_d(DEFAULT_bedKd);
   #endif
 
+  #if ENABLED(PIDTEMPCHAMBER)
+    chamberKp = DEFAULT_chamberKp;
+    chamberKi = scalePID_i(DEFAULT_chamberKi);
+    chamberKd = scalePID_d(DEFAULT_chamberKd);
+  #endif
+
   #if ENABLED(PIDTEMPCOOLER)
     coolerKp = DEFAULT_coolerKp;
     coolerKi = scalePID_i(DEFAULT_coolerKi);
     coolerKd = scalePID_d(DEFAULT_coolerKd);
   #endif
 
-
   #if ENABLED(FWRETRACT)
     autoretract_enabled = false;
     retract_length = RETRACT_LENGTH;
@@ -797,7 +816,7 @@ void Config_ResetDefault() {
       ECHO_EM(" (Material GUM)");
     #endif // ULTIPANEL
 
-    #if ENABLED(PIDTEMP) || ENABLED(PIDTEMPBED) || ENABLED(PIDTEMPCOOLER)
+    #if ENABLED(PIDTEMP) || ENABLED(PIDTEMPBED) || ENABLED(PIDTEMPCHAMBER) || ENABLED(PIDTEMPCOOLER)
       if (!forReplay) {
         ECHO_LM(CFG, "PID settings:");
       }
@@ -817,12 +836,17 @@ void Config_ResetDefault() {
         #endif
       #endif
       #if ENABLED(PIDTEMPBED)
-        ECHO_SMV(CFG, "  M304 P", bedKp); // for compatibility with hosts, only echos values for E0
+        ECHO_SMV(CFG, "  M304 P", bedKp);
         ECHO_MV(" I", unscalePID_i(bedKi));
         ECHO_EMV(" D", unscalePID_d(bedKd));
       #endif
+      #if ENABLED(PIDTEMPCHAMBER)
+        ECHO_SMV(CFG, "  M305 P", chamberKp);
+        ECHO_MV(" I", unscalePID_i(chamberKi));
+        ECHO_EMV(" D", unscalePID_d(chamberKd));
+      #endif
       #if ENABLED(PIDTEMPCOOLER)
-        ECHO_SMV(CFG, "  M304 C P", coolerKp); // for compatibility with hosts, only echos values for E0
+        ECHO_SMV(CFG, "  M306 P", coolerKp);
         ECHO_MV(" I", unscalePID_i(coolerKi));
         ECHO_EMV(" D", unscalePID_d(coolerKd));
       #endif

MK/Configuration_Version.h

 /**
- * Marlin 3D Printer Firmware
- * Copyright (C) 2016 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * MK & MK4due 3D Printer Firmware
  *
- * Based on Sprinter and grbl.
+ * Based on Marlin, Sprinter and grbl
  * Copyright (C) 2011 Camiel Gubbels / Erik van der Zalm
+ * Copyright (C) 2013 - 2016 Alberto Cotronei @MagoKimbra
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -12,11 +12,11 @@
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  *
  */
 
@@ -24,7 +24,7 @@
   #define CONFIGURATION_VERSION_H
 
   #define FIRMWARE_NAME "MK"
-  #define SHORT_BUILD_VERSION "4.2.82_dev"
+  #define SHORT_BUILD_VERSION "4.2.83_dev"
   #define BUILD_VERSION FIRMWARE_NAME "_" SHORT_BUILD_VERSION
   #define STRING_DISTRIBUTION_DATE __DATE__ " " __TIME__    // build date and time
   // It might also be appropriate to define a location where additional information can be found

MK/MK.ino

@@ -12,11 +12,11 @@
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
@@ -38,12 +38,12 @@
  * G1  - Coordinated Movement X Y Z E, for laser move by firing
  * G2  - CW ARC
  * G3  - CCW ARC
- * G4  - Dwell S<seconds> or P<milliseconds>
+ * 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 laser raster line
+ * G7  - Laser raster base64
  * G10 - retract filament according to settings of M207
  * G11 - retract recover filament according to settings of M208
- * G28 - Home one or more axes
+ * G28 - X Y Z Home all Axis. M for bed manual setting with LCD. B return to back point
  * G29 - Detailed Z-Probe, probes the bed at 3 or more points.  Will fail if you haven't homed yet.
  * G30 - Single Z Probe, probes bed at current XY location. - Bed Probe and Delta geometry Autocalibration
  * G31 - Dock sled (Z_PROBE_SLED only)
@@ -98,15 +98,15 @@
  * M98  - Print Hysteresis value
  * M99  - Set Hysteresis parameter M99 X<in mm> Y<in mm> Z<in mm> E<in mm>
  * M100 - Watch Free Memory (For Debugging Only)
- * M104 - Set extruder target temp
+ * M104 - Set hotend target temp
  * M105 - Read current temp
  * M106 - Fan on
  * M107 - Fan off
- * M109 - Sxxx Wait for extruder current temp to reach target temp. Waits only when heating
- *        Rxxx Wait for extruder current temp to reach target temp. Waits when heating and cooling
+ * M109 - Sxxx Wait for hotend current temp to reach target temp. Waits only when heating
+ *        Rxxx Wait for hotend current temp to reach target temp. Waits when heating and cooling
  *        IF AUTOTEMP is enabled, S<mintemp> B<maxtemp> F<factor>. Exit autotemp by any M109 without F
  * M110 - Set the current line number
- * M111 - Set debug flags with S<mask>. See flag bits defined in Marlin.h.
+ * M111 - Set debug flags with S<mask>.
  * M112 - Emergency stop
  * M114 - Output current position to serial port
  * M115 - Capabilities string
@@ -119,15 +119,20 @@
  * 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 or cooler target temp
+ * M140 - Set hot bed target temp
+ * M141 - Set hot chamber target temp
+ * M142 - Set 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 - Sxxx Wait for bed or cooler current temp to reach target temp. Waits only when heating Waits only when heating bed or cooling cooler
- *        Rxxx Wait for bed or cooler current temp to reach target temp. Waits when heating and cooling
- *        C parameter select Cooler, omitting it selec bed.
+ * M190 - Sxxx Wait for bed current temp to reach target temp. Waits only when heating
+ *        Rxxx Wait for bed current temp to reach target temp. Waits when heating and cooling
+ * M191 - Sxxx Wait for chamber current temp to reach target temp. Waits only when heating
+ *        Rxxx Wait for chamber current temp to reach target temp. Waits when heating and cooling
+ * M192 - Sxxx Wait for cooler current temp to reach target temp. Waits only when heating
+ *        Rxxx Wait for cooler current temp to reach target temp. Waits when heating and cooling
  * M200 - set filament diameter and set E axis units to cubic millimeters (use S0 to set back to millimeters).:D<millimeters>- 
  * M201 - Set max acceleration in units/s^2 for print moves (M201 X1000 Y1000)
  * M202 - Set max acceleration in units/s^2 for travel moves (M202 X1000 Y1000) Unused in Marlin!!
@@ -140,8 +145,8 @@
  * M209 - S<1=true/0=false> enable automatic retract detect if the slicer did not support G10/11: every normal extrude-only move will be classified as retract depending on the direction.
  * M218 - Set hotend offset (in mm): T<extruder_number> X<offset_on_X> Y<offset_on_Y>
  * M220 - Set speed factor override percentage: S<factor in percent>
- * M221 - Set extrude factor override percentage: S<factor in percent>
- * M222 - Set density extrusion percentage for purge: S<factor in percent>
+ * M221 - T<extruder> S<factor in percent> - set extrude factor override percentage
+ * M222 - T<extruder> S<factor in percent> - set density extrude factor percentage for purge
  * M226 - Wait until the specified pin reaches the state required: P<pin number> S<pin state>
  * M240 - Trigger a camera to take a photograph
  * M250 - Set LCD contrast C<contrast value> (value 0..63)
@@ -150,7 +155,9 @@
  * M301 - Set PID parameters P I D and C
  * M302 - Allow cold extrudes, or set the minimum extrude S<temperature>.
  * 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 cooling if C parameter
+ * M304 - Set hot bed PID parameters P I and D
+ * M305 - Set hot chamber PID parameters P I and D
+ * M306 - Set cooler PID parameters P I and D
  * M350 - Set microstepping mode.
  * M351 - Toggle MS1 MS2 pins directly.
  * M380 - Activate solenoid on active extruder
@@ -175,8 +182,6 @@
  * 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: S<mode> [ X<duplication x-offset> R<duplication 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
  * M906 - Set motor currents XYZ T0-4 E
  * M907 - Set digital trimpot motor current using axis codes.

MK/base.h

@@ -35,14 +35,14 @@
   #include "Configuration_Scara.h"
 #endif
 
+#include "Configuration_Temperature.h"
 #include "Configuration_Feature.h"
 #include "Configuration_Overall.h"
 
-
-#if ENABLED(LASER)
+#if ENABLED(LASERBEAM)
   #include "Configuration_Laser.h"
   #if ENABLED(LASER_RASTER)
-    #include "module/base64/Base64.h"
+    #include "module/laser/base64/base64.h"
   #endif
   #include "module/laser/laser.h"
 #endif
@@ -65,7 +65,7 @@
 #include "module/motion/qr_solve.h"
 #include "module/motion/cartesian_correction.h"
 #include "module/temperature/temperature.h"
-#include "module/flowmeter/flowmeter.h"
+#include "module/sensor/flowmeter.h"
 #include "module/temperature/thermistortables.h"
 #include "module/lcd/ultralcd.h"
 #include "module/lcd/buzzer.h"

MK/module/HAL/HAL.h

@@ -32,11 +32,11 @@
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  *
  *
  * Description:          *** HAL for Arduino ***
@@ -92,16 +92,16 @@
       inline void protect() {
         cli();
       }
-  
+
       inline void unprotect() {
         SREG = sreg;
       }
-  
+
       inline InterruptProtectedBlock(bool later = false) {
         sreg = SREG;
         if (!later) cli();
       }
-  
+
       inline ~InterruptProtectedBlock() {
         SREG = sreg;
       }

MK/module/HAL/HardwareSerial.h

-/*
-  HardwareSerial.h - Hardware serial library for Wiring
-  Copyright (c) 2006 Nicholas Zambetti.  All right reserved.
-
-  This library is free software; you can redistribute it and/or
-  modify it under the terms of the GNU Lesser General Public
-  License as published by the Free Software Foundation; either
-  version 2.1 of the License, or (at your option) any later version.
-
-  This library is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-  Lesser General Public License for more details.
-
-  You should have received a copy of the GNU Lesser General Public
-  License along with this library; if not, write to the Free Software
-  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-
-  Modified 28 September 2010 by Mark Sproul
-*/
+/**
+ * MK & MK4due 3D Printer Firmware
+ *
+ * Based on Marlin, Sprinter and grbl
+ * Copyright (C) 2011 Camiel Gubbels / Erik van der Zalm
+ * Copyright (C) 2013 - 2016 Alberto Cotronei @MagoKimbra
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+/**
+ * HardwareSerial.h - Hardware serial library for Wiring
+ * Copyright (c) 2006 Nicholas Zambetti.  All right reserved.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ * Modified 28 September 2010 by Mark Sproul
+ * Modified  3 March 2015 by MagoKimbra
+ */
 
 #ifndef HardwareSerial_H
   #define HardwareSerial_H

MK/module/HAL/fastio.h

@@ -12,11 +12,11 @@
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  *
  */
 

MK/module/MK_Main.h

@@ -117,8 +117,7 @@ inline void refresh_cmd_timeout() { previous_cmd_ms = millis(); }
 extern void delay_ms(millis_t ms);
 
 #if ENABLED(FAST_PWM_FAN) || ENABLED(FAST_PWM_COOLER)
-
-  void setPwmFrequency(uint8_t pin, int val);
+  void setPwmFrequency(uint8_t pin, uint8_t val);
 #endif
 
 extern float homing_feedrate[];
@@ -237,10 +236,6 @@ extern int fanSpeed;
   extern bool allow_lengthy_extrude_once; // for load/unload
 #endif
 
-#if ENABLED(LASERBEAM)
-  extern int laser_ttl_modulation;
-#endif
-
 // Print job timer
 extern PrintCounter print_job_counter;
 
@@ -262,12 +257,16 @@ extern uint8_t active_driver;
   void print_heaterstates();
 #endif
 
+#if HAS(TEMP_CHAMBER)
+  void print_chamberstate();
+#endif
+
 #if HAS(TEMP_COOLER)
-  void print_coolerstates();
+  void print_coolerstate();
 #endif
 
 #if ENABLED(FLOWMETER_SENSOR)
-  void print_flowratestates();
+  void print_flowratestate();
 #endif
 
 #if ENABLED(FIRMWARE_TEST)

MK/module/base64/Base64.h

-/*
- * Copyright (c) 2013 Adam Rudd.
- * See LICENSE for more information
- */
-#ifndef _BASE64_H
-#define _BASE64_H
-
-/* b64_alphabet:
- * 		Description: Base64 alphabet table, a mapping between integers
- * 					 and base64 digits
- * 		Notes: This is an extern here but is defined in Base64.c
- */
-extern const char b64_alphabet[];
-
-/* base64_encode:
- * 		Description:
- * 			Encode a string of characters as base64
- * 		Parameters:
- * 			output: the output buffer for the encoding, stores the encoded string
- * 			input: the input buffer for the encoding, stores the binary to be encoded
- * 			inputLen: the length of the input buffer, in bytes
- * 		Return value:
- * 			Returns the length of the encoded string
- * 		Requirements:
- * 			1. output must not be null or empty
- * 			2. input must not be null
- * 			3. inputLen must be greater than or equal to 0
- */
-int base64_encode(char *output, char *input, int inputLen);
-
-/* base64_decode:
- * 		Description:
- * 			Decode a base64 encoded string into bytes
- * 		Parameters:
- * 			output: the output buffer for the decoding,
- * 					stores the decoded binary
- * 			input: the input buffer for the decoding,
- * 				   stores the base64 string to be decoded
- * 			inputLen: the length of the input buffer, in bytes
- * 		Return value:
- * 			Returns the length of the decoded string
- * 		Requirements:
- * 			1. output must not be null or empty
- * 			2. input must not be null
- * 			3. inputLen must be greater than or equal to 0
- */
-int base64_decode(unsigned char *output, char *input, int inputLen);
-
-/* base64_enc_len:
- * 		Description:
- * 			Returns the length of a base64 encoded string whose decoded
- * 			form is inputLen bytes long
- * 		Parameters:
- * 			inputLen: the length of the decoded string
- * 		Return value:
- * 			The length of a base64 encoded string whose decoded form
- * 			is inputLen bytes long
- * 		Requirements:
- * 			None
- */
-int base64_enc_len(int inputLen);
-
-/* base64_dec_len:
- * 		Description:
- * 			Returns the length of the decoded form of a
- * 			base64 encoded string
- * 		Parameters:
- * 			input: the base64 encoded string to be measured
- * 			inputLen: the length of the base64 encoded string
- * 		Return value:
- * 			Returns the length of the decoded form of a
- * 			base64 encoded string
- * 		Requirements:
- * 			1. input must not be null
- * 			2. input must be greater than or equal to zero
- */
-int base64_dec_len(char *input, int inputLen);
-
-#endif // _BASE64_H

MK/module/boards/403.h

@@ -13,7 +13,9 @@
 #if MB(RAMPS_FD_V1)
   #define RAMPS_FD_V1
   #define INVERTED_HEATER_PINS
-  #define INVERTED_BED_PINS
+  #define INVERTED_BED_PIN
+  #define INVERTED_CHAMBER_PIN
+  #define INVERTED_COOLER_PIN
   // No EEPROM
   // Use 4k7 thermistor tables
 #else

MK/module/boards/404.h

@@ -13,7 +13,9 @@
 #if MB(RAMPS_FD_V1)
   #define RAMPS_FD_V1
   #define INVERTED_HEATER_PINS
-  #define INVERTED_BED_PINS
+  #define INVERTED_BED_PIN
+  #define INVERTED_CHAMBER_PIN
+  #define INVERTED_COOLER_PIN
   // No EEPROM
   // Use 4k7 thermistor tables
 #else

MK/module/conditionals.h

@@ -605,6 +605,16 @@
     #define BED_USES_THERMISTOR
   #endif
 
+  #if TEMP_SENSOR_CHAMBER == -1
+    #define CHAMBER_USES_AD595
+  #elif TEMP_SENSOR_CHAMBER == 0
+    #undef CHAMBER_MINTEMP
+    #undef CHAMBER_MAXTEMP
+  #elif TEMP_SENSOR_CHAMBER > 0
+    #define THERMISTORCHAMBER TEMP_SENSOR_CHAMBER
+    #define CHAMBER_USES_THERMISTOR
+  #endif
+
   #if TEMP_SENSOR_COOLER == -1
     #define COOLER_USES_AD595
   #elif TEMP_SENSOR_COOLER == 0
@@ -615,20 +625,21 @@
     #define COOLER_USES_THERMISTOR
   #endif
   
-  #if !ENABLED(COOLER)
+  #if HASNT(COOLER)
     #if ENABLED(PIDTEMPCOOLER)
       #undef PIDTEMPCOOLER
     #endif
   #endif
+
   #define HEATER_USES_AD595 (ENABLED(HEATER_0_USES_AD595) || ENABLED(HEATER_1_USES_AD595) || ENABLED(HEATER_2_USES_AD595) || ENABLED(HEATER_3_USES_AD595))
 
   /**
    * Flags for PID handling
    */
   #define HAS_PID_HEATING (ENABLED(PIDTEMP) || ENABLED(PIDTEMPBED))
-  #define HAS_PID_COOLING (ENABLED(PIDTEMPCOOLER))
   #define HAS_PID_FOR_BOTH (ENABLED(PIDTEMP) && ENABLED(PIDTEMPBED))
- 
+  #define HAS_PID_COOLING (ENABLED(PIDTEMPCOOLER))
+
   /**
    * ARRAY_BY_EXTRUDERS based on EXTRUDERS
    */
@@ -677,13 +688,15 @@
   #define HAS_TEMP_2 (PIN_EXISTS(TEMP_2) && TEMP_SENSOR_2 != 0)
   #define HAS_TEMP_3 (PIN_EXISTS(TEMP_3) && TEMP_SENSOR_3 != 0)
   #define HAS_TEMP_BED (PIN_EXISTS(TEMP_BED) && TEMP_SENSOR_BED != 0)
+  #define HAS_TEMP_CHAMBER (PIN_EXISTS(TEMP_CHAMBER) && TEMP_SENSOR_CHAMBER != 0)
   #define HAS_TEMP_COOLER (PIN_EXISTS(TEMP_COOLER) && TEMP_SENSOR_COOLER != 0)
   #define HAS_HEATER_0 (PIN_EXISTS(HEATER_0))
   #define HAS_HEATER_1 (PIN_EXISTS(HEATER_1))
   #define HAS_HEATER_2 (PIN_EXISTS(HEATER_2))
   #define HAS_HEATER_3 (PIN_EXISTS(HEATER_3))
   #define HAS_HEATER_BED (PIN_EXISTS(HEATER_BED))
-  #define HAS_COOLER_DEV (PIN_EXISTS(COOLER))
+  #define HAS_HEATER_CHAMBER (PIN_EXISTS(HEATER_CHAMBER))
+  #define HAS_COOLER     (PIN_EXISTS(COOLER))
   #define HAS_AUTO_FAN_0 (ENABLED(EXTRUDER_AUTO_FAN) && PIN_EXISTS(EXTRUDER_0_AUTO_FAN))
   #define HAS_AUTO_FAN_1 (ENABLED(EXTRUDER_AUTO_FAN) && PIN_EXISTS(EXTRUDER_1_AUTO_FAN))
   #define HAS_AUTO_FAN_2 (ENABLED(EXTRUDER_AUTO_FAN) && PIN_EXISTS(EXTRUDER_2_AUTO_FAN))
@@ -808,14 +821,21 @@
     #define WRITE_HEATER_0(v) WRITE_HEATER_0P(v)
   #endif
   #if HAS(HEATER_BED)
-    #if ENABLED(INVERTED_BED_PINS)
+    #if ENABLED(INVERTED_BED_PIN)
       #define WRITE_HEATER_BED(v) WRITE(HEATER_BED_PIN,!v)
     #else
       #define WRITE_HEATER_BED(v) WRITE(HEATER_BED_PIN,v)
     #endif
   #endif
-  #if HAS(COOLER_DEV)
-    #if ENABLED(INVERTED_COOLER_PINS)
+  #if HAS(HEATER_CHAMBER)
+    #if ENABLED(INVERTED_CHAMBER_PIN)
+      #define WRITE_HEATER_CHAMBER(v) WRITE(HEATER_CHAMBER_PIN,!v)
+    #else
+      #define WRITE_HEATER_CHAMBER(v) WRITE(HEATER_CHAMBER_PIN,v)
+    #endif
+  #endif
+  #if HAS(COOLER)
+    #if ENABLED(INVERTED_COOLER_PIN)
       #define WRITE_COOLER(v) WRITE(COOLER_PIN,!v)
     #else
       #define WRITE_COOLER(v) WRITE(COOLER_PIN,v)

MK/module/flowmeter/flowmeter.cpp

-/*
-  flowmeter.cpp - Flowmeter control library for Arduino - Version 1
-  Copyright (c) 2016 Franco (nextime) Lanza.  All right reserved.
-
-  This library is free software; you can redistribute it and/or
-  modify it under the terms of the GNU Lesser General Public
-  License as published by the Free Software Foundation; either
-  version 3 of the License, or (at your option) any later version.
-
-  This library is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-  Lesser General Public License for more details.
-
-  You should have received a copy of the GNU Lesser General Public
-  License along with this library; if not, write to the Free Software
-  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-*/
-
-#include "../../base.h"
-#include <Arduino.h>
-
-
-#if ENABLED(FLOWMETER_SENSOR)
-
-volatile int flowrate_pulsecount;  
-float flowrate;
-static millis_t flowmeter_timer = 0;
-static millis_t lastflow = 0;
-void flowrate_pulsecounter();
-
-void flow_init() {
-
-   flowrate = 0;
-   flowrate_pulsecount = 0;
-   pinMode(FLOWMETER_PIN, INPUT);
-   
-   attachInterrupt(digitalPinToInterrupt(FLOWMETER_PIN), flowrate_pulsecounter, FALLING);
-}
-
-void flowrate_manage() {
-   millis_t  now;
-   now = millis();
-   if(ELAPSED(now, flowmeter_timer)) {
-      detachInterrupt(digitalPinToInterrupt(FLOWMETER_PIN));
-      flowrate  = (float)(((1000.0 / (float)((float)now - (float)lastflow)) * (float)flowrate_pulsecount) / (float)FLOWMETER_CALIBRATION);
-      #if ENABLED(FLOWMETER_DEBUG)
-         ECHO_M(" FLOWMETER DEBUG ");
-         ECHO_MV(" flowrate:", flowrate);
-         ECHO_MV(" flowrate_pulsecount:", flowrate_pulsecount);
-         ECHO_MV(" CALIBRATION:", FLOWMETER_CALIBRATION);
-         ECHO_E;
-      #endif
-      flowmeter_timer = now + 1000UL;
-      lastflow = now;
-      flowrate_pulsecount = 0;
-      attachInterrupt(digitalPinToInterrupt(FLOWMETER_PIN), flowrate_pulsecounter, FALLING);
-
-   }
-
-}
-
-float get_flowrate() {
-   return flowrate;
-}
-
-void flowrate_pulsecounter()
-{
-  // Increment the pulse counter
-  flowrate_pulsecount++;
-}
-
-#endif // FLOWMETER_SENSOR
-

MK/module/flowmeter/flowmeter.h

-/* 
-  flowmeter.h - Flowmeter control library for Arduino - Version 1
-  Copyright (c) 2016 Franco (nextime) Lanza.  All right reserved.
-
-  This library is free software; you can redistribute it and/or
-  modify it under the terms of the GNU Lesser General Public
-  License as published by the Free Software Foundation; either
-  version 3 of the License, or (at your option) any later version.
-
-  This library is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-  Lesser General Public License for more details.
-
-  You should have received a copy of the GNU Lesser General Public
-  License along with this library; if not, write to the Free Software
-  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-*/
-#ifndef FLOWMETER_H
-#define FLOWMETER_H
-
-#define FLOWMETER_CALIBRATION (FLOWMETER_MAXFREQ/FLOWMETER_MAXFLOW)
-
-#if ENABLED(FLOWMETER_SENSOR)
-void flowrate_manage();
-void flow_init();
-float get_flowrate();
-#endif
-
-
-#endif // FLOWMETER_H

MK/module/language/language.h

@@ -198,9 +198,10 @@
 #define SERIAL_PID_DEBUG_CTERM                  " cTerm "
 #define SERIAL_INVALID_EXTRUDER_NUM             " - Invalid extruder number !"
 
-#define SERIAL_HEATER_BED                       "bed"
 #define SERIAL_STOPPED_HEATER                   ", system stopped! Heater_ID: "
-#define SERIAL_STOPPED_COOLER                   "system stopped! Cooler"
+#define SERIAL_STOPPED_BED                      ", system stopped! Bed"
+#define SERIAL_STOPPED_CHAMBER                  ", system stopped! Chamber"
+#define SERIAL_STOPPED_COOLER                   ", system stopped! Cooler"
 #define SERIAL_REDUNDANCY                       "Heater switched off. Temperature difference between temp sensors is too high !"
 #define SERIAL_T_HEATING_FAILED                 "Heating failed"
 #define SERIAL_T_THERMAL_RUNAWAY                "Thermal Runaway"

MK/module/language/language_en.h

@@ -184,6 +184,8 @@
 #define MSG_ERR_MINTEMP                     "MINTEMP ERROR"
 #define MSG_ERR_MAXTEMP_BED                 "MAXTEMP BED ERROR"
 #define MSG_ERR_MINTEMP_BED                 "MINTEMP BED ERROR"
+#define MSG_ERR_MAXTEMP_CHAMBER             "MAXTEMP CHAMBER ERROR"
+#define MSG_ERR_MINTEMP_CHAMBER             "MINTEMP CHAMBER ERROR"
 #define MSG_ERR_MAXTEMP_COOLER              "MAXTEMP COOLER ERROR"
 #define MSG_ERR_MINTEMP_COOLER              "MINTEMP COOLER ERROR"
 #define MSG_END_DAY                         "days"

MK/module/language/language_it.h

@@ -181,6 +181,8 @@
 #define MSG_ERR_MINTEMP                     "Err: TEMP MINIMA"
 #define MSG_ERR_MAXTEMP_BED                 "Err: TEMP MASSIMA PIATTO"
 #define MSG_ERR_MINTEMP_BED                 "Err: TEMP MINIMA PIATTO"
+#define MSG_ERR_MAXTEMP_CHAMBER             "MAXTEMP CHAMBER ERROR"
+#define MSG_ERR_MINTEMP_CHAMBER             "MINTEMP CHAMBER ERROR"
 #define MSG_ERR_MAXTEMP_COOLER              "MAXTEMP COOLER ERROR"
 #define MSG_ERR_MINTEMP_COOLER              "MINTEMP COOLER ERROR"
 #define MSG_END_DAY                         "giorni"
@@ -246,7 +248,6 @@
 #define MSG_COOLER_COOLING                  "Raffreddamento..."
 #define MSG_COOLER_DONE                     "Raffreddamento finito."
 
-
 // Extra
 #define MSG_LASER                           "Laser Preset"
 #define MSG_CONFIG                          "Configurazione"

MK/module/base64/Base64.cpp → MK/module/laser/base64/base64.cpp

-#include "Base64.h"
+/**
+ * MK & MK4due 3D Printer Firmware
+ *
+ * Based on Marlin, Sprinter and grbl
+ * Copyright (C) 2011 Camiel Gubbels / Erik van der Zalm
+ * Copyright (C) 2013 - 2016 Alberto Cotronei @MagoKimbra
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+#include "base64.h"
 
 const char b64_alphabet[] = "ABCDEFGHIJKLMNOPQRSTUVWXYZ"
 		"abcdefghijklmnopqrstuvwxyz"
@@ -53,7 +75,6 @@ int base64_decode(unsigned char * output, char * input, int inputLen) {
 	unsigned char a3[3];
 	unsigned char a4[4];
 
-
 	while (inputLen--) {
 		if(*input == '=') {
 			break;

MK/module/laser/base64/base64.h

+/**
+ * MK & MK4due 3D Printer Firmware
+ *
+ * Based on Marlin, Sprinter and grbl
+ * Copyright (C) 2011 Camiel Gubbels / Erik van der Zalm
+ * Copyright (C) 2013 - 2016 Alberto Cotronei @MagoKimbra
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+/**
+ * Copyright (c) 2013 Adam Rudd.
+ * See LICENSE for more information
+ */
+
+#ifndef _BASE64_H
+  #define _BASE64_H
+
+  /* b64_alphabet:
+   * 		Description: Base64 alphabet table, a mapping between integers
+   * 					 and base64 digits
+   * 		Notes: This is an extern here but is defined in Base64.c
+   */
+  extern const char b64_alphabet[];
+
+  /* base64_encode:
+   * 		Description:
+   * 			Encode a string of characters as base64
+   * 		Parameters:
+   * 			output: the output buffer for the encoding, stores the encoded string
+   * 			input: the input buffer for the encoding, stores the binary to be encoded
+   * 			inputLen: the length of the input buffer, in bytes
+   * 		Return value:
+   * 			Returns the length of the encoded string
+   * 		Requirements:
+   * 			1. output must not be null or empty
+   * 			2. input must not be null
+   * 			3. inputLen must be greater than or equal to 0
+   */
+  int base64_encode(char *output, char *input, int inputLen);
+
+  /* base64_decode:
+   * 		Description:
+   * 			Decode a base64 encoded string into bytes
+   * 		Parameters:
+   * 			output: the output buffer for the decoding,
+   * 					stores the decoded binary
+   * 			input: the input buffer for the decoding,
+   * 				   stores the base64 string to be decoded
+   * 			inputLen: the length of the input buffer, in bytes
+   * 		Return value:
+   * 			Returns the length of the decoded string
+   * 		Requirements:
+   * 			1. output must not be null or empty
+   * 			2. input must not be null
+   * 			3. inputLen must be greater than or equal to 0
+   */
+  int base64_decode(unsigned char *output, char *input, int inputLen);
+
+  /* base64_enc_len:
+   * 		Description:
+   * 			Returns the length of a base64 encoded string whose decoded
+   * 			form is inputLen bytes long
+   * 		Parameters:
+   * 			inputLen: the length of the decoded string
+   * 		Return value:
+   * 			The length of a base64 encoded string whose decoded form
+   * 			is inputLen bytes long
+   * 		Requirements:
+   * 			None
+   */
+  int base64_enc_len(int inputLen);
+
+  /* base64_dec_len:
+   * 		Description:
+   * 			Returns the length of the decoded form of a
+   * 			base64 encoded string
+   * 		Parameters:
+   * 			input: the base64 encoded string to be measured
+   * 			inputLen: the length of the base64 encoded string
+   * 		Return value:
+   * 			Returns the length of the decoded form of a
+   * 			base64 encoded string
+   * 		Requirements:
+   * 			1. input must not be null
+   * 			2. input must be greater than or equal to zero
+   */
+  int base64_dec_len(char *input, int inputLen);
+
+#endif // _BASE64_H

MK/module/laser/laser.h

-/*
-  laser.h - Laser cutter control library for Arduino using 16 bit timers- Version 1
-  Copyright (c) 2013 Timothy Schmidt.  All right reserved.
+/**
+ * MK & MK4due 3D Printer Firmware
+ *
+ * Based on Marlin, Sprinter and grbl
+ * Copyright (C) 2011 Camiel Gubbels / Erik van der Zalm
+ * Copyright (C) 2013 - 2016 Alberto Cotronei @MagoKimbra
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
 
-  This library is free software; you can redistribute it and/or
-  modify it under the terms of the GNU Lesser General Public
-  License as published by the Free Software Foundation; either
-  version 3 of the License, or (at your option) any later version.
-
-  This library is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-  Lesser General Public License for more details.
-
-  You should have received a copy of the GNU Lesser General Public
-  License along with this library; if not, write to the Free Software
-  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-*/
+/**
+ * laser.cpp - Laser control library for Arduino using 16 bit timers- Version 1
+ * Copyright (c) 2013 Timothy Schmidt.  All right reserved.
+ * Copyright (c) 2016 Franco (nextime) Lanza
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 3 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ */
 
 #ifndef LASER_H
-#define LASER_H
+  #define LASER_H
 
-#include <inttypes.h>
-#include "../../base.h"
+  #include <inttypes.h>
 
-// split into planned and status
-typedef struct {
-  int fired; // method used to ask the laser to fire - LASER_FIRE_G1, LASER_FIRE_SPINDLE, LASER_FIRE_E, etc
-  float intensity; // Laser firing instensity 0.0 - 100.0
-  float ppm; // pulses per millimeter, for pulsed firing mode
-  unsigned long duration; // laser firing duration in microseconds, for pulsed firing mode
-  unsigned long dur; // instantaneous duration
-  bool status; // LASER_ON / LASER_OFF - buffered
-  bool firing; // LASER_ON / LASER_OFF - instantaneous
-  uint8_t mode; // CONTINUOUS, PULSED, RASTER
-  unsigned long last_firing; // microseconds since last laser firing
-  bool diagnostics; // Verbose debugging output over serial
-  unsigned int time; // temporary counter to limit eeprom writes
-  unsigned int lifetime; // laser lifetime firing counter in minutes
-  #ifdef LASER_RASTER
-    unsigned char raster_data[LASER_MAX_RASTER_LINE];
-    unsigned char rasterlaserpower;
+  // split into planned and status
+  typedef struct {
+    int fired; // method used to ask the laser to fire - LASER_FIRE_G1, LASER_FIRE_SPINDLE, LASER_FIRE_E, etc
+    float intensity; // Laser firing instensity 0.0 - 100.0
+    float ppm; // pulses per millimeter, for pulsed firing mode
+    unsigned long duration; // laser firing duration in microseconds, for pulsed firing mode
+    unsigned long dur; // instantaneous duration
+    bool status; // LASER_ON / LASER_OFF - buffered
+    bool firing; // LASER_ON / LASER_OFF - instantaneous
+    uint8_t mode; // CONTINUOUS, PULSED, RASTER
+    unsigned long last_firing; // microseconds since last laser firing
+    bool diagnostics; // Verbose debugging output over serial
+    unsigned int time; // temporary counter to limit eeprom writes
+    unsigned int lifetime; // laser lifetime firing counter in minutes
+    #if ENABLED(LASER_RASTER)
+      unsigned char raster_data[LASER_MAX_RASTER_LINE];
+      unsigned char rasterlaserpower;
 
-    float raster_aspect_ratio;
-    float raster_mm_per_pulse;
-    int raster_raw_length;
-    int raster_num_pixels;
-    bool raster_direction;
-  #endif // LASER_RASTER
-  #ifdef MUVE_Z_PEEL
-    float peel_distance;
-    float peel_speed;
-    float peel_pause;
-  #endif // MUVE_Z_PEEL
-} laser_t;
+      float raster_aspect_ratio;
+      float raster_mm_per_pulse;
+      int raster_raw_length;
+      int raster_num_pixels;
+      bool raster_direction;
+    #endif // LASER_RASTER
+  } laser_t;
 
-extern laser_t laser;
+  extern laser_t laser;
 
-void laser_init();
-void laser_fire(float intensity);
-#if ENABLED(LASER_PULSE_METHOD)
-  void laser_pulse(uint32_t ulValue, unsigned long usec);
-#endif
-void laser_extinguish();
-void laser_update_lifetime();
-void laser_set_mode(int mode);
-#ifdef LASER_PERIPHERALS
-  bool laser_peripherals_ok();
-  void laser_peripherals_on();
-  void laser_peripherals_off();
-  void laser_wait_for_peripherals();
-#endif // LASER_PERIPHERALS
+  void laser_init();
+  void laser_fire(float intensity);
+  #if ENABLED(LASER_PULSE_METHOD)
+    void laser_pulse(uint32_t ulValue, unsigned long usec);
+  #endif
+  void laser_extinguish();
+  void laser_update_lifetime();
+  void laser_set_mode(int mode);
+  #if ENABLED(LASER_PERIPHERALS)
+    bool laser_peripherals_ok();
+    void laser_peripherals_on();
+    void laser_peripherals_off();
+    void laser_wait_for_peripherals();
+  #endif // LASER_PERIPHERALS
 
-#ifdef HIGH_TO_FIRE // Some cutters fire on high, some on low.
-  #define LASER_ARM HIGH
-  #define LASER_UNARM LOW
-#else
-  #define LASER_ARM LOW
-  #define LASER_UNARM HIGH
-#endif
+  #ifdef HIGH_TO_FIRE // Some cutters fire on high, some on low.
+    #define LASER_ARM HIGH
+    #define LASER_UNARM LOW
+  #else
+    #define LASER_ARM LOW
+    #define LASER_UNARM HIGH
+  #endif
 
-// Laser constants
-#define LASER_OFF 0
-#define LASER_ON 1
+  // Laser constants
+  #define LASER_OFF 0
+  #define LASER_ON 1
 
-#define CONTINUOUS 0
-#define PULSED 1
-#define RASTER 2
+  #define CONTINUOUS 0
+  #define PULSED 1
+  #define RASTER 2
 
 #endif // LASER_H

MK/module/laser/laserbitmaps.h

+/**
+ * MK & MK4due 3D Printer Firmware
+ *
+ * Based on Marlin, Sprinter and grbl
+ * Copyright (C) 2011 Camiel Gubbels / Erik van der Zalm
+ * Copyright (C) 2013 - 2016 Alberto Cotronei @MagoKimbra
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
 
 #define LASERENABLE_HEIGHT 	20
 #define LASERENABLE_WIDTH	25

MK/module/lcd/dogm_lcd_implementation.h

@@ -67,8 +67,8 @@
   #undef USE_BIG_EDIT_FONT
 #endif
 
-#if ENABLED(LASER)
-#include "../laser/laserbitmaps.h"
+#if ENABLED(LASERBEAM)
+  #include "../laser/laserbitmaps.h"
 #endif
 
 #if ENABLED(USE_SMALL_INFOFONT)
@@ -374,7 +374,7 @@ static void lcd_implementation_status_screen() {
 
   bool blink = lcd_blink();
 
-  #if ENABLED(LASER)
+  #if ENABLED(LASERBEAM)
     #if ENABLED(LASER_PERIPHERALS)
       if (laser_peripherals_ok()) {
         u8g.drawBitmapP(29,4, LASERENABLE_BYTEWIDTH, LASERENABLE_HEIGHT, laserenable_bmp);
@@ -474,16 +474,16 @@ static void lcd_implementation_status_screen() {
     }
   #endif
 
-  #if DISABLED(LASER)
-  // Hotends
+  #if DISABLED(LASERBEAM)
+    // Hotends
     for (int i = 0; i < HOTENDS; i++) _draw_heater_status(6 + i * 25, i);
 
     // Heated bed
     #if HOTENDS < 4 && HAS(TEMP_BED)
-     _draw_heater_status(81, -1);
+      _draw_heater_status(81, -1);
     #endif
+  #endif // !LASERBEAM
 
-  #endif // DISABLED LASER
   // Fan
   u8g.setPrintPos(104, 27);
   #if HAS(FAN)

MK/module/macros.h

@@ -21,61 +21,61 @@
  */
 
 #ifndef MACROS_H
-#define MACROS_H
+  #define MACROS_H
 
-// Compiler warning on unused varable.
-#define UNUSED(x) (void) (x)
+  // Compiler warning on unused varable.
+  #define UNUSED(x) (void) (x)
 
-// Macros for bit masks
-#ifndef _BV
-  #define _BV(b) (1<<(b))
-#endif
-#define TEST(n,b) (((n)&_BV(b))!=0)
-#define SBI(n,b) (n |= _BV(b))
-#define CBI(n,b) (n &= ~_BV(b))
-#define SET_BIT(n,b,value) (n) ^= ((-value)^(n)) & (_BV(b))
+  // Macros for bit masks
+  #ifndef _BV
+    #define _BV(b) (1<<(b))
+  #endif
+  #define TEST(n,b) (((n)&_BV(b))!=0)
+  #define SBI(n,b) (n |= _BV(b))
+  #define CBI(n,b) (n &= ~_BV(b))
+  #define SET_BIT(n,b,value) (n) ^= ((-value)^(n)) & (_BV(b))
 
-// Macros for maths shortcuts
-#ifndef M_PI 
-  #define M_PI 3.1415926536
-#endif
-#define RADIANS(d) ((d)*M_PI/180.0)
-#define DEGREES(r) ((r)*180.0/M_PI)
-#define SIN_60 0.8660254037844386
-#define COS_60 0.5
+  // Macros for maths shortcuts
+  #ifndef M_PI 
+    #define M_PI 3.1415926536
+  #endif
+  #define RADIANS(d) ((d)*M_PI/180.0)
+  #define DEGREES(r) ((r)*180.0/M_PI)
+  #define SIN_60 0.8660254037844386
+  #define COS_60 0.5
 
-// Macros to support option testing
-#define ENABLED defined
-#define DISABLED !defined
+  // Macros to support option testing
+  #define ENABLED defined
+  #define DISABLED !defined
 
-#define HAS(FE) (HAS_##FE)
-#define HASNT(FE) (!(HAS_##FE))
+  #define HAS(FE) (HAS_##FE)
+  #define HASNT(FE) (!(HAS_##FE))
 
-// Macros to contrain values
-#define NUMERIC(a) ((a) >= '0' && '9' >= (a))
-#define NUMERIC_SIGNED(a) (NUMERIC(a) || (a) == '-')
-#define NOLESS(v,n) do{ if (v < n) v = n; }while(0)
-#define NOMORE(v,n) do{ if (v > n) v = n; }while(0)
-#define COUNT(a) (sizeof(a)/sizeof(*a))
+  // Macros to contrain values
+  #define NUMERIC(a) ((a) >= '0' && '9' >= (a))
+  #define NUMERIC_SIGNED(a) (NUMERIC(a) || (a) == '-')
+  #define NOLESS(v,n) do{ if (v < n) v = n; }while(0)
+  #define NOMORE(v,n) do{ if (v > n) v = n; }while(0)
+  #define COUNT(a) (sizeof(a)/sizeof(*a))
 
-// Function macro
-#define  FORCE_INLINE __attribute__((always_inline)) inline
+  // Function macro
+  #define  FORCE_INLINE __attribute__((always_inline)) inline
 
-// Macro for debugging
-#define DEBUGGING(F) (mk_debug_flags & (DEBUG_## F))
+  // Macro for debugging
+  #define DEBUGGING(F) (mk_debug_flags & (DEBUG_## F))
 
-// Macro for String
-#define STRINGIFY_(n) #n
-#define STRINGIFY(n) STRINGIFY_(n)
+  // Macro for String
+  #define STRINGIFY_(n) #n
+  #define STRINGIFY(n) STRINGIFY_(n)
 
-// Macro for varie
-#define PIN_EXISTS(PN) (defined(PN##_PIN) && PN##_PIN >= 0)
+  // Macro for varie
+  #define PIN_EXISTS(PN) (defined(PN##_PIN) && PN##_PIN >= 0)
 
-#define PENDING(NOW,SOON) ((long)(NOW-(SOON))<0)
-#define ELAPSED(NOW,SOON) (!PENDING(NOW,SOON))
+  #define PENDING(NOW,SOON) ((long)(NOW-(SOON))<0)
+  #define ELAPSED(NOW,SOON) (!PENDING(NOW,SOON))
 
-#define NOOP do{}while(0)
+  #define NOOP do{}while(0)
 
-#define _AXIS(AXIS) AXIS ##_AXIS
+  #define _AXIS(AXIS) AXIS ##_AXIS
 
 #endif //__MACROS_H

MK/module/mechanics.h

@@ -21,18 +21,18 @@
  */
 
 #ifndef MECHANICS_H
-#define MECHANICS_H
+  #define MECHANICS_H
 
-// Macros for mechanics type
-#define MECH_UNKNOWN    -1
-#define MECH_CARTESIAN   0
-#define MECH_COREXY      1
-#define MECH_COREYX      2
-#define MECH_COREXZ      8
-#define MECH_COREZX      9
-#define MECH_DELTA       3
-#define MECH_SCARA       4
+  // Macros for mechanics type
+  #define MECH_UNKNOWN    -1
+  #define MECH_CARTESIAN   0
+  #define MECH_COREXY      1
+  #define MECH_COREYX      2
+  #define MECH_COREXZ      8
+  #define MECH_COREZX      9
+  #define MECH_DELTA       3
+  #define MECH_SCARA       4
 
-#define MECH(mech)  (MECHANISM == MECH_##mech)
+  #define MECH(mech)  (MECHANISM == MECH_##mech)
 
 #endif
\ No newline at end of file

MK/module/motion/planner.cpp

@@ -12,11 +12,11 @@
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  *
  */
 
@@ -33,11 +33,11 @@
  *
  * Grbl is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with Grbl.  If not, see <http://www.gnu.org/licenses/>.
+ * along with Grbl. If not, see <http://www.gnu.org/licenses/>.
  *
  *
  * The ring buffer implementation gleaned from the wiring_serial library by David A. Mellis.
@@ -417,9 +417,7 @@ void check_axes_activity() {
     unsigned char tail_valve_pressure = ValvePressure,
                   tail_e_to_p_pressure = EtoPPressure;
   #endif
-  #if ENABLED(LASERBEAM)
-    unsigned char tail_laser_ttl_modulation = laser_ttl_modulation;
-  #endif
+
   block_t* block;
 
   if (blocks_queued()) {
@@ -430,9 +428,6 @@ void check_axes_activity() {
       tail_valve_pressure = block->valve_pressure;
       tail_e_to_p_pressure = block->e_to_p_pressure;
     #endif
-    #if ENABLED(LASERBEAM)
-      tail_laser_ttl_modulation = block_buffer[block_index].laser_ttlmodulation;
-    #endif
 
     while (block_index != block_buffer_head) {
       block = &block_buffer[block_index];
@@ -493,10 +488,6 @@ void check_axes_activity() {
     #endif
   #endif
 
-  // add Laser TTL Modulation(PWM) Control
-  #if ENABLED(LASERBEAM)
-    analogWrite(LASER_TTL_PIN, tail_laser_ttl_modulation);
-  #endif
 }
 
 float junction_deviation = 0.1;
@@ -629,9 +620,9 @@ float junction_deviation = 0.1;
   block->steps[E_AXIS] /= 100;
   block->step_event_count = max(block->steps[X_AXIS], max(block->steps[Y_AXIS], max(block->steps[Z_AXIS], block->steps[E_AXIS])));
 
-  #if DISABLED(LASER)
-  // Bail if this is a zero-length block
-  if (block->step_event_count <= DROP_SEGMENTS) return;
+  #if DISABLED(LASERBEAM)
+    // Bail if this is a zero-length block
+    if (block->step_event_count <= DROP_SEGMENTS) return;
   #endif
 
   block->fan_speed = fanSpeed;
@@ -647,11 +638,6 @@ float junction_deviation = 0.1;
       block->mix_event_count[i] = block->steps[E_AXIS] * mixing_factor[i];
   #endif
 
-  // Add update block variables for LASER BEAM control 
-  #if ENABLED(LASERBEAM)
-    block->laser_ttlmodulation = laser_ttl_modulation;
-  #endif
-
   // Compute direction bits for this block 
   uint8_t dirb = 0;
   #if MECH(COREXY) || MECH(COREYX)
@@ -882,52 +868,49 @@ float junction_deviation = 0.1;
     );
   }
 
-  #if ENABLED(LASER)
-   block->laser_intensity = laser.intensity;
-   block->laser_duration = laser.duration;
-   block->laser_status = laser.status;
-   block->laser_mode = laser.mode;
+  #if ENABLED(LASERBEAM)
+    block->laser_intensity = laser.intensity;
+    block->laser_duration = laser.duration;
+    block->laser_status = laser.status;
+    block->laser_mode = laser.mode;
     // When operating in PULSED or RASTER modes, laser pulsing must operate in sync with movement.
     // Calculate steps between laser firings (steps_l) and consider that when determining largest
     // interval between steps for X, Y, Z, E, L to feed to the motion control code.
     if (laser.mode == RASTER || laser.mode == PULSED) {
-       #if ENABLED(LASER_PULSE_METHOD)
-         // Optimizing. Move calculations here rather than in stepper isr
-         static const float Factor = F_CPU/(LASER_PWM*2*100.0*255.0); 
-         block->laser_raster_intensity_factor = laser.intensity * Factor;
-       #endif
-       block->steps_l = (unsigned long)labs(block->millimeters*laser.ppm);
-       if (laser.mode == RASTER) {
-         for (int i = 0; i < LASER_MAX_RASTER_LINE; i++) {
-           #if (!ENABLED(LASER_PULSE_METHOD))
-             float OldRange, NewRange, NewValue;
-             OldRange = (255.0 - 0.0);
-             NewRange = (laser.rasterlaserpower - LASER_REMAP_INTENSITY); 
-             NewValue = (float)(((((float)laser.raster_data[i] - 0) * NewRange) / OldRange) + LASER_REMAP_INTENSITY);
-
-             //If less than 7%, turn off the laser tube.
-             if(NewValue == LASER_REMAP_INTENSITY)
-               NewValue = 0;
-
-             block->laser_raster_data[i] = NewValue;
-           #else
-             block->laser_raster_data[i] = laser.raster_data[i];
-           #endif
-         }
-       }
-    } else {
-        block->steps_l = 0;
+      #if ENABLED(LASER_PULSE_METHOD)
+        // Optimizing. Move calculations here rather than in stepper isr
+        static const float Factor = F_CPU/(LASER_PWM*2*100.0*255.0); 
+        block->laser_raster_intensity_factor = laser.intensity * Factor;
+      #endif
+      block->steps_l = (unsigned long)labs(block->millimeters*laser.ppm);
+      if (laser.mode == RASTER) {
+        for (int i = 0; i < LASER_MAX_RASTER_LINE; i++) {
+          #if (!ENABLED(LASER_PULSE_METHOD))
+            float OldRange, NewRange, NewValue;
+            OldRange = (255.0 - 0.0);
+            NewRange = (laser.rasterlaserpower - LASER_REMAP_INTENSITY); 
+            NewValue = (float)(((((float)laser.raster_data[i] - 0) * NewRange) / OldRange) + LASER_REMAP_INTENSITY);
+
+            //If less than 7%, turn off the laser tube.
+            if(NewValue == LASER_REMAP_INTENSITY)
+              NewValue = 0;
+
+            block->laser_raster_data[i] = NewValue;
+          #else
+            block->laser_raster_data[i] = laser.raster_data[i];
+          #endif
+        }
+      }
     }
-    
+    else
+      block->steps_l = 0;
+
     block->step_event_count = max(block->steps[X_AXIS], max(block->steps[Y_AXIS], max(block->steps[Z_AXIS], max(block->steps[E_AXIS], block->steps_l))));
 
-    if (laser.diagnostics) {
-      if (block->laser_status == LASER_ON) {
-         ECHO_LM(INFO, "Laser firing enabled");
-       }
-    }
-  #endif // LASER
+    if (laser.diagnostics && block->laser_status == LASER_ON)
+      ECHO_LM(INFO, "Laser firing enabled");
 
+  #endif // LASERBEAM
 
   float inverse_millimeters = 1.0 / block->millimeters;  // Inverse millimeters to remove multiple divides
 

MK/module/motion/planner.h

@@ -98,8 +98,8 @@ typedef struct {
     unsigned long valve_pressure;
     unsigned long e_to_p_pressure;
   #endif
-  
-  #if ENABLED(LASER)
+
+  #if ENABLED(LASERBEAM)
     uint8_t laser_mode; // CONTINUOUS, PULSED, RASTER
     bool laser_status; // LASER_OFF, LASER_ON
     float laser_ppm; // pulses per millimeter, for pulsed and raster firing modes
@@ -112,10 +112,6 @@ typedef struct {
     #endif
   #endif 
 
-  #if ENABLED(LASERBEAM)
-    unsigned long laser_ttlmodulation;
-  #endif
-
   volatile char busy;
 } block_t;
 

MK/module/motion/stepper.cpp

@@ -68,15 +68,12 @@ block_t* current_block;  // A pointer to the block currently being traced
 static unsigned char last_direction_bits = 0;  // The next stepping-bits to be output
 static unsigned int cleaning_buffer_counter = 0;
 
-#ifdef LASER
-static long counter_L;
-#endif // LASER
-
-#ifdef LASER_RASTER
-static int counter_raster;
-#endif // LASER_RASTER
-
-
+#if ENABLED(LASERBEAM)
+  static long counter_L;
+  #if ENABLED(LASER_RASTER)
+    static int counter_raster;
+  #endif // LASER_RASTER
+#endif // LASERBEAM
 
 #if ENABLED(Z_DUAL_ENDSTOPS)
   static bool performing_homing = false,
@@ -124,7 +121,7 @@ static unsigned short OCR1A_nominal;
 static bool check_endstops = true;
 
 volatile long count_position[NUM_AXIS] = { 0 }; // Positions of stepper motors, in step units
-volatile signed char count_direction[NUM_AXIS] = { 1 };
+volatile signed char count_direction[NUM_AXIS] = { 1, 1, 1, 1 };
 
 
 //===========================================================================
@@ -307,11 +304,11 @@ FORCE_INLINE unsigned short calc_timer(unsigned short step_rate) {
   NOMORE(step_rate, MAX_STEP_FREQUENCY);
 
   if(step_rate > (2 * DOUBLE_STEP_FREQUENCY)) { // If steprate > 2*DOUBLE_STEP_FREQUENCY >> step 4 times
-    step_rate = (step_rate >> 2);
+    step_rate >>= 2;
     step_loops = 4;
   }
   else if(step_rate > DOUBLE_STEP_FREQUENCY) { // If steprate > DOUBLE_STEP_FREQUENCY >> step 2 times
-    step_rate = (step_rate >> 1);
+    step_rate >>= 1;
     step_loops = 2;
   }
   else {
@@ -429,10 +426,12 @@ ISR(TIMER1_COMPA_vect) {
     return;
   }
 
-  #if ENABLED(LASER) && (!ENABLED(LASER_PULSE_METHOD))
+  #if ENABLED(LASERBEAM) && (!ENABLED(LASER_PULSE_METHOD))
     if (laser.dur != 0 && (laser.last_firing + laser.dur < micros())) {
-      if (laser.diagnostics) ECHO_LM(INFO,"Laser firing duration elapsed, in interrupt handler");
-     laser_extinguish();
+      if (laser.diagnostics)
+        ECHO_LM(INFO, "Laser firing duration elapsed, in interrupt handler");
+
+      laser_extinguish();
     }
   #endif
 
@@ -446,7 +445,8 @@ ISR(TIMER1_COMPA_vect) {
 
       // Initialize Bresenham counters to 1/2 the ceiling
       counter_X = counter_Y = counter_Z = counter_E = -(current_block->step_event_count >> 1);
-      #if ENABLED(LASER)
+
+      #if ENABLED(LASERBEAM)
          counter_L = counter_X;
          #if !ENABLED(LASER_PULSE_METHOD)
            laser.dur = current_block->laser_duration;
@@ -463,15 +463,12 @@ ISR(TIMER1_COMPA_vect) {
       #if ENABLED(Z_LATE_ENABLE)
         if (current_block->steps[Z_AXIS] > 0) {
           enable_z();
-          #if ENABLED(MUVE)
-            enable_e();
-          #endif
           OCR1A = 2000; // 1ms wait
           return;
         }
       #endif
 
-      #if ENABLED(LASER_RASTER)
+      #if ENABLED(LASERBEAM) && ENABLED(LASER_RASTER)
          if (current_block->laser_mode == RASTER) counter_raster = 0;
       #endif
 
@@ -494,15 +491,15 @@ ISR(TIMER1_COMPA_vect) {
     #endif
 
     // Continuous firing of the laser during a move happens here, PPM and raster happen further down
-    #if ENABLED(LASER)
-      if (current_block->laser_mode == CONTINUOUS && current_block->laser_status == LASER_ON) {
-         laser_fire(current_block->laser_intensity);
-      }
+    #if ENABLED(LASERBEAM)
+      if (current_block->laser_mode == CONTINUOUS && current_block->laser_status == LASER_ON)
+        laser_fire(current_block->laser_intensity);
+
       #if !ENABLED(LASER_PULSE_METHOD)
-      if (current_block->laser_status == LASER_OFF) {
-         if (laser.diagnostics) ECHO_LM(INFO,"Laser status set to off, in interrupt handler");
-         laser_extinguish();
-      }
+        if (current_block->laser_status == LASER_OFF) {
+          if (laser.diagnostics) ECHO_LM(INFO,"Laser status set to off, in interrupt handler");
+          laser_extinguish();
+        }
       #endif
     #endif
 
@@ -600,14 +597,14 @@ ISR(TIMER1_COMPA_vect) {
         #endif
       #endif
 
-      #if ENABLED(LASER)
+      #if ENABLED(LASERBEAM)
         counter_L += current_block->steps_l;
         if (counter_L > 0) {
           if (current_block->laser_mode == PULSED && current_block->laser_status == LASER_ON) { // Pulsed Firing Mode
             #if ENABLED(LASER_PULSE_METHOD)
               uint32_t ulValue = current_block->laser_raster_intensity_factor * 255;
               laser_pulse(ulValue, current_block->laser_duration);
-              laser.time += current_block->laser_duration/1000; 
+              laser.time += current_block->laser_duration / 1000; 
             #else
               laser_fire(current_block->laser_intensity);
             #endif
@@ -652,7 +649,7 @@ ISR(TIMER1_COMPA_vect) {
           laser_extinguish();
         }
         #endif
-      #endif // LASER
+      #endif // LASERBEAM
 
       // safe check for erroneous calculated events count
       if(current_block->step_event_count >= MAX_EVENTS_COUNT) {
@@ -767,10 +764,9 @@ ISR(TIMER1_COMPA_vect) {
     if (step_events_completed >= current_block->step_event_count) {
       current_block = NULL;
       plan_discard_current_block();
-      #if ENABLED(LASER) && ENABLED(LASER_PULSE_METHOD)
-        if (current_block->laser_mode == CONTINUOUS && current_block->laser_status == LASER_ON) {
+      #if ENABLED(LASERBEAM) && ENABLED(LASER_PULSE_METHOD)
+        if (current_block->laser_mode == CONTINUOUS && current_block->laser_status == LASER_ON)
           laser_extinguish();
-        }
       #endif
     }
   }

MK/module/pins.h

@@ -352,12 +352,12 @@
   #define COOLER_PIN -1
 #endif
 
-#ifndef LASER_FIRING_PIN
-  #define LASER_FIRING_PIN -1
+#ifndef LASER_PWR_PIN
+  #define LASER_PWR_PIN -1
 #endif
 
-#ifndef LASER_INTENSITY_PIN
-  #define LASER_INTENSITY_PIN -1
+#ifndef LASER_TTL_PIN
+  #define LASER_TTL_PIN -1
 #endif
 
 #ifndef FLOWMETER_PIN
@@ -373,7 +373,7 @@
                         _E0_PINS _E1_PINS _E2_PINS _E3_PINS _E4_PINS _E5_PINS \
                         analogInputToDigitalPin(TEMP_BED_PIN), \
                         analogInputToDigitalPin(TEMP_COOLER_PIN), \
-                        COOLER_PIN, LASER_FIRING_PIN, LASER_INTENSITY_PIN, \
+                        COOLER_PIN, LASER_PWR_PIN, LASER_TTL_PIN, \
                         FLOWMETER_PIN \
                        }
 

MK/module/printcounter/printcounter.cpp

@@ -165,6 +165,7 @@ bool PrintCounter::stop() {
     this->data.completePrints++;
     this->data.printTime += this->deltaDuration();
     this->saveStats();
+    return true;
   }
   else return false;
 }

MK/module/sensor/flowmeter.cpp

+/**
+ * MK & MK4due 3D Printer Firmware
+ *
+ * Based on Marlin, Sprinter and grbl
+ * Copyright (C) 2011 Camiel Gubbels / Erik van der Zalm
+ * Copyright (C) 2013 - 2016 Alberto Cotronei @MagoKimbra
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+/**
+ * flowmeter.h - Flowmeter control library for Arduino - Version 1
+ * Copyright (c) 2016 Franco (nextime) Lanza.  All right reserved.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 3 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ */
+
+#include "../../base.h"
+#include <Arduino.h>
+
+#if ENABLED(FLOWMETER_SENSOR)
+
+  volatile int flowrate_pulsecount;  
+  float flowrate;
+  static millis_t flowmeter_timer = 0;
+  static millis_t lastflow = 0;
+  void flowrate_pulsecounter();
+
+  void flow_init() {
+    flowrate = 0;
+    flowrate_pulsecount = 0;
+    pinMode(FLOWMETER_PIN, INPUT);
+
+    attachInterrupt(digitalPinToInterrupt(FLOWMETER_PIN), flowrate_pulsecounter, FALLING);
+  }
+
+  void flowrate_manage() {
+    millis_t  now;
+    now = millis();
+    if(ELAPSED(now, flowmeter_timer)) {
+      detachInterrupt(digitalPinToInterrupt(FLOWMETER_PIN));
+      flowrate  = (float)(((1000.0 / (float)((float)now - (float)lastflow)) * (float)flowrate_pulsecount) / (float)FLOWMETER_CALIBRATION);
+      #if ENABLED(FLOWMETER_DEBUG)
+        ECHO_M(" FLOWMETER DEBUG ");
+        ECHO_MV(" flowrate:", flowrate);
+        ECHO_MV(" flowrate_pulsecount:", flowrate_pulsecount);
+        ECHO_EMV(" CALIBRATION:", FLOWMETER_CALIBRATION);
+      #endif
+      flowmeter_timer = now + 1000UL;
+      lastflow = now;
+      flowrate_pulsecount = 0;
+      attachInterrupt(digitalPinToInterrupt(FLOWMETER_PIN), flowrate_pulsecounter, FALLING);
+    }
+  }
+
+  float get_flowrate() {
+    return flowrate;
+  }
+
+  void flowrate_pulsecounter() {
+    // Increment the pulse counter
+    flowrate_pulsecount++;
+  }
+
+#endif // FLOWMETER_SENSOR

README.md

@@ -54,6 +54,8 @@ Added total filament printed writed in SD CARD.
 Added anti extruder idle oozing system.
 Added Hysteresis and Z-Wobble correction (only cartesian printers).
 Added support reader TAG width MFRC522
+Added Cooler and Hot Chamber
+Added Laser beam and raster base64
 
 ## Credits