Merge branch 'dev'

Documentation/Laser/K40_ramps_configs/K40_with_cooler_and_flowmeter/Configuration_Laser.h

+#ifndef CONFIGURATION_LASER
+#define CONFIGURATION_LASER
+
+//===========================================================================
+//============================= 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.
+// 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
+
+// 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
+
+// If your machine has laser focuser, set this to true and it will use Z axis for focus or disable it.
+#define LASER_HAS_FOCUS false
+
+
+/// 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
+
+//// In the case that the laserdriver need at least a certain level "LASER_REMAP_INTENSITY"
+// to give anything, the intensity can be remapped to start at "LASER_REMAP_INTENSITY"
+// At least some CO2-drivers need it, not sure about laserdiode drivers.
+#define LASER_REMAP_INTENSITY 7
+
+
+//// The following defines select which G codes tell the laser to fire.  It's OK to uncomment more than one.
+#define LASER_FIRE_G1 10 // fire the laser on a G1 move, extinguish when the move ends
+#define LASER_FIRE_SPINDLE 11 // fire the laser on M3, extinguish on M5
+#define LASER_FIRE_E 12 // fire the laser when the E axis moves
+
+//// Raster mode enables the laser to etch bitmap data at high speeds.  Increases command buffer size substantially.
+#define LASER_RASTER
+#define LASER_MAX_RASTER_LINE 68 // maximum number of base64 encoded pixels per raster gcode command
+#define LASER_RASTER_ASPECT_RATIO 1 // pixels aren't square on most displays, 1.33 == 4:3 aspect ratio. 
+#define LASER_RASTER_MM_PER_PULSE 0.2 //Can be overridden by providing an R value in M649 command : M649 S17 B2 D0 R0.1 F4000
+
+//// Uncomment the following if the laser cutter is equipped with a peripheral relay board
+//// to control power to an exhaust fan, cooler pump, laser power supply, etc.
+//#define LASER_PERIPHERALS
+//#define LASER_PERIPHERALS_TIMEOUT 30000  // Number of milliseconds to wait for status signal from peripheral control board
+
+//// Uncomment the following line to enable cubic bezier curve movement with the G5 code
+// #define G5_BEZIER
+
+// Uncomment these options for the 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
+
+
+
+#endif

Documentation/Laser/K40_ramps_configs/K40_with_cooler_and_flowmeter/Configuration_Pins.h

+#ifndef CONFIGURATION_PINS_H
+#define CONFIGURATION_PINS_H
+
+//=================================== BASIC ==================================
+
+// X axis pins
+#define X_STEP_PIN      ORIG_X_STEP_PIN
+#define X_DIR_PIN       ORIG_X_DIR_PIN
+#define X_ENABLE_PIN    ORIG_X_ENABLE_PIN
+
+// Y axis pins
+#define Y_STEP_PIN      ORIG_Y_STEP_PIN
+#define Y_DIR_PIN       ORIG_Y_DIR_PIN
+#define Y_ENABLE_PIN    ORIG_Y_ENABLE_PIN
+
+// Z axis pins
+#define Z_STEP_PIN      ORIG_Z_STEP_PIN
+#define Z_DIR_PIN       ORIG_Z_DIR_PIN
+#define Z_ENABLE_PIN    ORIG_Z_ENABLE_PIN
+
+// E axis pins
+#if DRIVER_EXTRUDERS > 0
+  #define E0_STEP_PIN   ORIG_E0_STEP_PIN
+  #define E0_DIR_PIN    ORIG_E0_DIR_PIN
+  #define E0_ENABLE_PIN ORIG_E0_ENABLE_PIN
+#endif
+
+#if DRIVER_EXTRUDERS > 1
+  #define E1_STEP_PIN   ORIG_E1_STEP_PIN
+  #define E1_DIR_PIN    ORIG_E1_DIR_PIN
+  #define E1_ENABLE_PIN ORIG_E1_ENABLE_PIN
+#endif
+
+#if DRIVER_EXTRUDERS > 2
+  #define E2_STEP_PIN   ORIG_E2_STEP_PIN
+  #define E2_DIR_PIN    ORIG_E2_DIR_PIN
+  #define E2_ENABLE_PIN ORIG_E2_ENABLE_PIN
+#endif
+
+#if DRIVER_EXTRUDERS > 3
+  #define E3_STEP_PIN   ORIG_E3_STEP_PIN
+  #define E3_DIR_PIN    ORIG_E3_DIR_PIN
+  #define E3_ENABLE_PIN ORIG_E3_ENABLE_PIN
+#endif
+
+#if DRIVER_EXTRUDERS > 4
+  #define E4_STEP_PIN   ORIG_E4_STEP_PIN
+  #define E4_DIR_PIN    ORIG_E4_DIR_PIN
+  #define E4_ENABLE_PIN ORIG_E4_ENABLE_PIN
+#endif
+
+#if DRIVER_EXTRUDERS > 5
+  #define E5_STEP_PIN   ORIG_E5_STEP_PIN
+  #define E5_DIR_PIN    ORIG_E5_DIR_PIN
+  #define E5_ENABLE_PIN ORIG_E5_ENABLE_PIN
+#endif
+
+// ENDSTOP pin
+#define X_MIN_PIN       ORIG_X_MIN_PIN
+#define X_MAX_PIN       ORIG_X_MAX_PIN
+#define Y_MIN_PIN       ORIG_Y_MIN_PIN
+#define Y_MAX_PIN       ORIG_Y_MAX_PIN
+#define Z_MIN_PIN       ORIG_Z_MIN_PIN
+#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
+
+// 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
+
+// FAN pin
+#define FAN_PIN         ORIG_FAN_PIN
+
+// PS ON pin
+#define PS_ON_PIN       ORIG_PS_ON_PIN
+
+// BEEPER pin
+#define BEEPER_PIN      ORIG_BEEPER_PIN
+
+//============================================================================
+
+//================================= FEATURE ==================================
+
+#if ENABLED(MKR4)
+  #define E0E1_CHOICE_PIN -1
+  #define E0E2_CHOICE_PIN -1
+  #define E0E3_CHOICE_PIN -1
+  #define E1E3_CHOICE_PIN -1
+#endif
+
+#if ENABLED(NPR2)
+  #define E_MIN_PIN -1
+#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
+#endif
+
+
+
+#if ENABLED(FILAMENT_RUNOUT_SENSOR)
+  #define FILRUNOUT_PIN -1
+#endif
+
+#if ENABLED(FILAMENT_SENSOR)
+  #define FILWIDTH_PIN -1
+#endif
+
+#if ENABLED(FLOWMETER_SENSOR)
+  #define FLOWMETER_PIN 21
+#endif
+
+#if ENABLED(POWER_CONSUMPTION)
+  #define POWER_CONSUMPTION_PIN -1
+#endif
+
+#if ENABLED(PHOTOGRAPH)
+  #define PHOTOGRAPH_PIN -1
+#endif
+
+#if ENABLED(CHDK)
+  #define CHDK_PIN -1
+#endif
+
+#if ENABLED(CONTROLLERFAN)
+  #define CONTROLLERFAN_PIN -1
+#endif
+
+#if ENABLED(EXTRUDER_AUTO_FAN)
+  #define EXTRUDER_0_AUTO_FAN_PIN -1
+  #define EXTRUDER_1_AUTO_FAN_PIN -1
+  #define EXTRUDER_2_AUTO_FAN_PIN -1
+  #define EXTRUDER_3_AUTO_FAN_PIN -1
+#endif
+
+#if ENABLED(X2_IS_TMC)
+  #define X2_ENABLE_PIN -1
+  #define X2_STEP_PIN   -1
+  #define X2_DIR_PIN    -1
+#endif
+
+#if ENABLED(Z_PROBE_SLED)
+  #define SLED_PIN -1
+#endif
+
+#if ENABLED(Z_PROBE_ENDSTOP)
+  #define Z_PROBE_PIN -1
+#endif
+
+//============================================================================
+
+#endif

Documentation/Laser/README.md

@@ -10,3 +10,52 @@ mega256.build.extra_flags=-DSERIAL_RX_BUFFER_SIZE=256 -DSERIAL_TX_BUFFER_SIZE=25
 
 and then in the arduino ide select "mega 2560 serial buffer 256" board.
 
+
+In my boards.txt mega256 appears as this:
+
+```
+##############################################################
+mega256.name=Arduino/Genuino Mega or Mega 2560 256 serialbuf
+
+mega256.vid.0=0x2341
+mega256.pid.0=0x0010
+mega256.vid.1=0x2341
+mega256.pid.1=0x0042
+mega256.vid.2=0x2A03
+mega256.pid.2=0x0010
+mega256.vid.3=0x2A03
+mega256.pid.3=0x0042
+mega256.vid.4=0x2341
+mega256.pid.4=0x0210
+mega256.vid.5=0x2341
+mega256.pid.5=0x0242
+
+mega256.upload.tool=avrdude
+mega256.upload.maximum_data_size=8192
+
+mega256.bootloader.tool=avrdude
+mega256.bootloader.low_fuses=0xFF
+mega256.bootloader.unlock_bits=0x3F
+mega256.bootloader.lock_bits=0x0F
+
+mega256.build.f_cpu=16000000L
+mega256.build.core=arduino_256
+mega256.build.variant=mega
+# default board may be overridden by the cpu menu
+mega256.build.board=AVR_MEGA2560
+
+## Arduino/Genuino Mega w/ ATmega2560
+## -------------------------
+mega256.menu.cpu.atmega2560=ATmega2560 (Mega 2560)
+
+mega256.menu.cpu.atmega2560.upload.protocol=wiring
+mega256.menu.cpu.atmega2560.upload.maximum_size=253952
+mega256.menu.cpu.atmega2560.upload.speed=115200
+
+mega256.menu.cpu.atmega2560.bootloader.high_fuses=0xD8
+mega256.menu.cpu.atmega2560.bootloader.extended_fuses=0xFD
+mega256.menu.cpu.atmega2560.bootloader.file=stk500v2/stk500boot_v2_mega2560.hex
+
+mega256.menu.cpu.atmega2560.build.mcu=atmega2560
+mega256.menu.cpu.atmega2560.build.board=AVR_MEGA2560
+```