Add LASER BEAM

MarlinKimbra/Configuration.h

@@ -48,7 +48,6 @@
 //#define COREXY
 //#define DELTA
 //#define SCARA
-//#define CNCLASER
 
 #if defined(CARTESIAN)
 #include "Configuration_Cartesian.h"
@@ -58,8 +57,6 @@
 #include "Configuration_Delta.h"
 #elif defined(SCARA)
 #include "Configuration_Scara.h"
-#elif defined(CNCLASER)
-#include "Configuration_CNC_laser.h"
 #endif
 /***********************************************************************/
 
@@ -593,6 +590,9 @@
 //define BlinkM/CyzRgb Support
 //#define BLINKM
 
+// define LASERBEAM
+//#define LASERBEAM
+
 /**********************************************************************\
  * Support for a filament diameter sensor
  * Also allows adjustment of diameter at print time (vs  at slicing)

MarlinKimbra/ConfigurationStore.cpp

@@ -44,8 +44,6 @@ void _EEPROM_readData(int &pos, uint8_t* value, uint8_t size)
 #define EEPROM_VERSION "V12"
 #elif defined(SCARA)
 #define EEPROM_VERSION "V13"
-#elif defined(CNCLASER)
-#define EEPROM_VERSION "V14"
 #endif
 
 #ifdef EEPROM_SETTINGS

MarlinKimbra/Marlin_main.cpp

@@ -940,7 +940,7 @@ static inline type array(int axis)          \
     { return pgm_read_any(&array##_P[axis]); }
 
 XYZ_CONSTS_FROM_CONFIG(float, base_min_pos,    MIN_POS);
-#if defined(CARTESIAN) || defined(COREXY) || defined(SCARA) || defined(CNCLASER)
+#if defined(CARTESIAN) || defined(COREXY) || defined(SCARA)
 	XYZ_CONSTS_FROM_CONFIG(float, base_max_pos,    MAX_POS);
 	XYZ_CONSTS_FROM_CONFIG(float, base_home_pos,   HOME_POS);
 	XYZ_CONSTS_FROM_CONFIG(float, max_length,      MAX_LENGTH);
@@ -987,7 +987,7 @@ static float duplicate_extruder_temp_offset = 0; // used in mode 2
 bool extruder_duplication_enabled = false; // used in mode 2
 #endif //DUAL_X_CARRIAGE
 
-#if defined(CARTESIAN) || defined(COREXY) || defined(SCARA) || defined(CNCLASER)
+#if defined(CARTESIAN) || defined(COREXY) || defined(SCARA)
 static void axis_is_at_home(int axis) {
 #ifdef DUAL_X_CARRIAGE
   if (axis == X_AXIS) {
@@ -2950,7 +2950,7 @@ void process_commands()
     break;
 #endif
 
-#ifdef CNCLASER
+#ifdef LASERBEAM
     case 03: // M03 S - Setting laser beam
     {
       if(code_seen('S')) {
@@ -2961,7 +2961,7 @@ void process_commands()
     case 05: // M05 - Setting laser beam off
 	digitalWrite(LASERBEAM_PIN, 0);
     break;
-#endif // CNCLASER
+#endif // LASERBEAM
 
     case 17:
         LCD_MESSAGEPGM(MSG_NO_MOVE);

MarlinKimbra/pins.h

@@ -2920,7 +2920,7 @@ DaveX plan for Teensylu/printrboard-type pinouts (ref teensylu & sprinter) for a
 #endif // END DELTA
 #endif // END NPR2
 
-#ifdef CNCLASER
+#ifdef LASERBEAM
 #define LASERBEAM_PIN      6
 #endif
 

README.md

@@ -73,7 +73,6 @@ I put in a single firmware all the firmware that I found online for the various
 * \#define COREXY
 * \#define DELTA
 * \#define SCARA
-* \#define CNCLASER
 
 Different axis step per unit for all extruder
 -----------------