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

Documentation/GCodes.md

@@ -137,6 +137,7 @@
 *  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 - 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.

Documentation/changelog.md

 ### Version 4.2.83
 * Add Cooler and Hot Chamber
-* Add Laser Beam PWM and raster base64 ONLY ARDUINO MEGA
+* Add Laser Beam PWM and raster base64
 
 ### Version 4.2.82
 * Add DONDOLO_DUAL_MOTOR for DONDOLO bowden and dual extruder

MK/module/MK_Main.cpp

@@ -7688,7 +7688,7 @@ inline void gcode_M503() {
     if (code_seen('D') && IsRunning()) laser.diagnostics = (bool) code_value();
 
     // Wait for the rest 
-    //st_synchronize();
+    // st_synchronize();
     if (code_seen('S') && IsRunning()) {
       laser.intensity = (float) code_value();
       laser.rasterlaserpower =  laser.intensity;

MK/module/laser/laser.cpp

@@ -23,6 +23,7 @@
 /**
  * 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

MK/module/laser/laser.h

@@ -23,6 +23,7 @@
 /**
  * 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

MK/module/lcd/dogm_lcd_implementation.h

@@ -67,6 +67,10 @@
   #undef USE_BIG_EDIT_FONT
 #endif
 
+#if ENABLED(LASERBEAM)
+  #include "../laser/laserbitmaps.h"
+#endif
+
 #if ENABLED(USE_SMALL_INFOFONT)
   #include "dogm_font_data_6x9_marlin.h"
   #define FONT_STATUSMENU_NAME u8g_font_6x9
@@ -370,6 +374,25 @@ static void lcd_implementation_status_screen() {
 
   bool blink = lcd_blink();
 
+  #if ENABLED(LASERBEAM)
+    #if ENABLED(LASER_PERIPHERALS)
+      if (laser_peripherals_ok()) {
+        u8g.drawBitmapP(29,4, LASERENABLE_BYTEWIDTH, LASERENABLE_HEIGHT, laserenable_bmp);
+      }
+    #endif
+    lcd_setFont(FONT_STATUSMENU);
+    u8g.setColorIndex(1);
+    u8g.setPrintPos(3,6);
+    if (current_block->laser_status == LASER_ON) {
+      u8g.drawBitmapP(5,14, ICON_BYTEWIDTH, ICON_HEIGHT, laseron_bmp);
+      u8g.print(itostr3(current_block->laser_intensity));
+      lcd_printPGM(PSTR("%"));
+    } else {
+      u8g.drawBitmapP(5,14, ICON_BYTEWIDTH, ICON_HEIGHT, laseroff_bmp);
+      lcd_printPGM(PSTR("---%"));
+    }
+
+  #else
     // Symbols menu graphics, animated fan
     u8g.drawBitmapP(9, 1, STATUS_SCREENBYTEWIDTH, STATUS_SCREENHEIGHT,
       #if HAS(FAN)
@@ -378,6 +401,7 @@ static void lcd_implementation_status_screen() {
         status_screen0_bmp
       #endif
     );
+  #endif
 
   // Status Menu Font for SD info, Heater status, Fan, XYZ
   lcd_setFont(FONT_STATUSMENU);
@@ -434,7 +458,7 @@ static void lcd_implementation_status_screen() {
         u8g.setPrintPos(90, 47);
 
         if (end_time > 1380 || end_time == 0)
-          u8g.print('E--:--');
+          lcd_printPGM(PSTR("E--:--"));
         else if (end_time > 0) {
           u8g.print('E');
           u8g.print(itostr2(end_time/60));
@@ -450,6 +474,7 @@ static void lcd_implementation_status_screen() {
     }
   #endif
 
+  #if DISABLED(LASERBEAM)
     // Hotends
     for (int i = 0; i < HOTENDS; i++) _draw_heater_status(6 + i * 25, i);
 
@@ -457,6 +482,7 @@ static void lcd_implementation_status_screen() {
     #if HOTENDS < 4 && HAS(TEMP_BED)
       _draw_heater_status(81, -1);
     #endif
+  #endif // !LASERBEAM
 
   // Fan
   u8g.setPrintPos(104, 27);

README.md

@@ -56,7 +56,7 @@ The current MarlinKimbra dev team consists of:
  - simonepri - Simone Primarosa (https://github.com/simonepri)
 
 More features have been added by:
- -
+ - Franco (nextime) Lanza
 
 ## License