diff --git a/.gitignore b/.gitignore index e54e6522ce13..6e73632bdca1 100755 --- a/.gitignore +++ b/.gitignore @@ -171,3 +171,252 @@ CMakeListsPrivate.txt #CLion cmake-build-* +.circleci/desktop.ini +buildroot/bin/desktop.ini +buildroot/desktop.ini +buildroot/etc/desktop.ini +buildroot/etc/udev/desktop.ini +buildroot/etc/udev/rules.d/desktop.ini +buildroot/share/atom/desktop.ini +buildroot/share/cmake/desktop.ini +buildroot/share/desktop.ini +buildroot/share/fonts/desktop.ini +buildroot/share/git/desktop.ini +buildroot/share/pin_interrupt_test/desktop.ini +buildroot/share/pixmaps/desktop.ini +buildroot/share/pixmaps/logo/desktop.ini +buildroot/share/PlatformIO/boards/desktop.ini +buildroot/share/PlatformIO/desktop.ini +buildroot/share/PlatformIO/ldscripts/desktop.ini +buildroot/share/PlatformIO/scripts/desktop.ini +buildroot/share/scripts/desktop.ini +buildroot/share/sublime/auto_build_sublime_menu/desktop.ini +buildroot/share/sublime/desktop.ini +buildroot/share/sublime/RepRapTools/desktop.ini +buildroot/share/tests/desktop.ini +buildroot/share/vscode/AutoBuildMarlin/desktop.ini +buildroot/share/vscode/AutoBuildMarlin/media/desktop.ini +buildroot/share/vscode/AutoBuildMarlin/resources/desktop.ini +buildroot/share/vscode/desktop.ini +docs/desktop.ini +Marlin/src/config/default/desktop.ini +Marlin/src/config/desktop.ini +Marlin/src/config/examples/3DFabXYZ/desktop.ini +Marlin/src/config/examples/3DFabXYZ/Migbot/desktop.ini +Marlin/src/config/examples/adafruit/desktop.ini +Marlin/src/config/examples/adafruit/ST7565/desktop.ini +Marlin/src/config/examples/AlephObjects/desktop.ini +Marlin/src/config/examples/AlephObjects/TAZ4/desktop.ini +Marlin/src/config/examples/AliExpress/CL-260/desktop.ini +Marlin/src/config/examples/AliExpress/desktop.ini +Marlin/src/config/examples/Anet/A2/desktop.ini +Marlin/src/config/examples/Anet/A2plus/desktop.ini +Marlin/src/config/examples/Anet/A6/desktop.ini +Marlin/src/config/examples/Anet/A8/desktop.ini +Marlin/src/config/examples/Anet/desktop.ini +Marlin/src/config/examples/AnimationExample/desktop.ini +Marlin/src/config/examples/AnyCubic/desktop.ini +Marlin/src/config/examples/AnyCubic/i3/desktop.ini +Marlin/src/config/examples/ArmEd/desktop.ini +Marlin/src/config/examples/Azteeg/desktop.ini +Marlin/src/config/examples/Azteeg/X5GT/desktop.ini +Marlin/src/config/examples/BIBO/desktop.ini +Marlin/src/config/examples/BIBO/TouchX/cyclops/desktop.ini +Marlin/src/config/examples/BIBO/TouchX/default/desktop.ini +Marlin/src/config/examples/BIBO/TouchX/desktop.ini +Marlin/src/config/examples/BQ/desktop.ini +Marlin/src/config/examples/BQ/Hephestos/desktop.ini +Marlin/src/config/examples/BQ/Hephestos_2/desktop.ini +Marlin/src/config/examples/BQ/WITBOX/desktop.ini +Marlin/src/config/examples/Cartesio/desktop.ini +Marlin/src/config/examples/Creality/CR-10/desktop.ini +Marlin/src/config/examples/Creality/CR-10_5S/desktop.ini +Marlin/src/config/examples/Creality/CR-10mini/desktop.ini +Marlin/src/config/examples/Creality/CR-10S/desktop.ini +Marlin/src/config/examples/Creality/CR-8/desktop.ini +Marlin/src/config/examples/Creality/desktop.ini +Marlin/src/config/examples/Creality/Ender-2/desktop.ini +Marlin/src/config/examples/Creality/Ender-3/desktop.ini +Marlin/src/config/examples/Creality/Ender-4/desktop.ini +Marlin/src/config/examples/delta/Anycubic/desktop.ini +Marlin/src/config/examples/delta/Anycubic/Kossel/desktop.ini +Marlin/src/config/examples/delta/Anycubic/Kossel/images/desktop.ini +Marlin/src/config/examples/delta/desktop.ini +Marlin/src/config/examples/delta/FLSUN/auto_calibrate/desktop.ini +Marlin/src/config/examples/delta/FLSUN/desktop.ini +Marlin/src/config/examples/delta/FLSUN/kossel/desktop.ini +Marlin/src/config/examples/delta/FLSUN/kossel_mini/desktop.ini +Marlin/src/config/examples/delta/Geeetech/desktop.ini +Marlin/src/config/examples/delta/Geeetech/Rostock 301/desktop.ini +Marlin/src/config/examples/delta/generic/desktop.ini +Marlin/src/config/examples/delta/Hatchbox_Alpha/desktop.ini +Marlin/src/config/examples/delta/kossel_mini/desktop.ini +Marlin/src/config/examples/delta/kossel_pro/desktop.ini +Marlin/src/config/examples/delta/kossel_xl/desktop.ini +Marlin/src/config/examples/delta/MKS/desktop.ini +Marlin/src/config/examples/delta/MKS/SBASE/desktop.ini +Marlin/src/config/examples/delta/Tevo Little Monster/desktop.ini +Marlin/src/config/examples/DerAndere/desktop.ini +Marlin/src/config/examples/DerAndere/PipetBot-A8/desktop.ini +Marlin/src/config/examples/desktop.ini +Marlin/src/config/examples/Einstart-S/desktop.ini +Marlin/src/config/examples/Felix/desktop.ini +Marlin/src/config/examples/Felix/DUAL/desktop.ini +Marlin/src/config/examples/FlashForge/CreatorPro/desktop.ini +Marlin/src/config/examples/FlashForge/desktop.ini +Marlin/src/config/examples/FolgerTech/desktop.ini +Marlin/src/config/examples/FolgerTech/i3-2020/desktop.ini +Marlin/src/config/examples/Formbot/desktop.ini +Marlin/src/config/examples/Formbot/Raptor/desktop.ini +Marlin/src/config/examples/Formbot/T_Rex_2+/desktop.ini +Marlin/src/config/examples/Formbot/T_Rex_3/desktop.ini +Marlin/src/config/examples/gCreate/desktop.ini +Marlin/src/config/examples/gCreate/gMax1.5+/desktop.ini +Marlin/src/config/examples/Geeetech/A10M/desktop.ini +Marlin/src/config/examples/Geeetech/A20M/desktop.ini +Marlin/src/config/examples/Geeetech/desktop.ini +Marlin/src/config/examples/Geeetech/GT2560/desktop.ini +Marlin/src/config/examples/Geeetech/I3_Pro_X-GT2560/desktop.ini +Marlin/src/config/examples/Geeetech/MeCreator2/desktop.ini +Marlin/src/config/examples/Geeetech/Prusa i3 Pro B/bltouch/desktop.ini +Marlin/src/config/examples/Geeetech/Prusa i3 Pro B/desktop.ini +Marlin/src/config/examples/Geeetech/Prusa i3 Pro B/noprobe/desktop.ini +Marlin/src/config/examples/Geeetech/Prusa i3 Pro C/desktop.ini +Marlin/src/config/examples/Geeetech/Prusa i3 Pro W/desktop.ini +Marlin/src/config/examples/Infitary/desktop.ini +Marlin/src/config/examples/Infitary/i3-M508/desktop.ini +Marlin/src/config/examples/JGAurora/A5/desktop.ini +Marlin/src/config/examples/JGAurora/desktop.ini +Marlin/src/config/examples/MakerParts/desktop.ini +Marlin/src/config/examples/makibox/desktop.ini +Marlin/src/config/examples/Malyan/desktop.ini +Marlin/src/config/examples/Malyan/M150/desktop.ini +Marlin/src/config/examples/Malyan/M200/desktop.ini +Marlin/src/config/examples/Micromake/C1/basic/desktop.ini +Marlin/src/config/examples/Micromake/C1/desktop.ini +Marlin/src/config/examples/Micromake/C1/enhanced/desktop.ini +Marlin/src/config/examples/Micromake/desktop.ini +Marlin/src/config/examples/Mks/desktop.ini +Marlin/src/config/examples/Mks/Robin/desktop.ini +Marlin/src/config/examples/Mks/Sbase/desktop.ini +Marlin/src/config/examples/RapideLite/desktop.ini +Marlin/src/config/examples/RapideLite/RL200/desktop.ini +Marlin/src/config/examples/RepRapPro/desktop.ini +Marlin/src/config/examples/RepRapPro/Huxley/desktop.ini +Marlin/src/config/examples/RepRapWorld/desktop.ini +Marlin/src/config/examples/RepRapWorld/Megatronics/desktop.ini +Marlin/src/config/examples/RigidBot/desktop.ini +Marlin/src/config/examples/Sanguinololu/desktop.ini +Marlin/src/config/examples/SCARA/desktop.ini +Marlin/src/config/examples/STM32F10/desktop.ini +Marlin/src/config/examples/stm32f103ret6/desktop.ini +Marlin/src/config/examples/STM32F4/desktop.ini +Marlin/src/config/examples/TheBorg/desktop.ini +Marlin/src/config/examples/TinyBoy2/desktop.ini +Marlin/src/config/examples/Tronxy/desktop.ini +Marlin/src/config/examples/Tronxy/X1/desktop.ini +Marlin/src/config/examples/Tronxy/X3A/desktop.ini +Marlin/src/config/examples/Tronxy/X5S/desktop.ini +Marlin/src/config/examples/Tronxy/XY100/desktop.ini +Marlin/src/config/examples/tvrrug/desktop.ini +Marlin/src/config/examples/tvrrug/Round2/desktop.ini +Marlin/src/config/examples/UltiMachine/Archim1/desktop.ini +Marlin/src/config/examples/UltiMachine/Archim2/desktop.ini +Marlin/src/config/examples/UltiMachine/desktop.ini +Marlin/src/config/examples/Velleman/desktop.ini +Marlin/src/config/examples/Velleman/K8200/desktop.ini +Marlin/src/config/examples/Velleman/K8400/desktop.ini +Marlin/src/config/examples/Velleman/K8400/Dual-head/desktop.ini +Marlin/src/config/examples/VORONDesign/desktop.ini +Marlin/src/config/examples/Wanhao/desktop.ini +Marlin/src/config/examples/Wanhao/Duplicator 6/desktop.ini +Marlin/src/config/examples/WASP/desktop.ini +Marlin/src/config/examples/WASP/PowerWASP/desktop.ini +Marlin/src/config/examples/wt150/desktop.ini +Marlin/src/feature/bedlevel/abl/desktop.ini +Marlin/src/feature/bedlevel/desktop.ini +Marlin/src/feature/bedlevel/mbl/desktop.ini +Marlin/src/feature/bedlevel/ubl/desktop.ini +Marlin/src/feature/dac/desktop.ini +Marlin/src/feature/digipot/desktop.ini +Marlin/src/feature/leds/desktop.ini +Marlin/src/feature/prusa_MMU2/desktop.ini +Marlin/src/gcode/bedlevel/abl/desktop.ini +Marlin/src/gcode/bedlevel/desktop.ini +Marlin/src/gcode/bedlevel/mbl/desktop.ini +Marlin/src/gcode/bedlevel/ubl/desktop.ini +Marlin/src/gcode/calibrate/desktop.ini +Marlin/src/gcode/config/desktop.ini +Marlin/src/gcode/eeprom/desktop.ini +Marlin/src/gcode/feature/advance/desktop.ini +Marlin/src/gcode/feature/baricuda/desktop.ini +Marlin/src/gcode/feature/camera/desktop.ini +Marlin/src/gcode/feature/caselight/desktop.ini +Marlin/src/gcode/feature/clean/desktop.ini +Marlin/src/gcode/feature/desktop.ini +Marlin/src/gcode/feature/digipot/desktop.ini +Marlin/src/gcode/feature/filwidth/desktop.ini +Marlin/src/gcode/feature/fwretract/desktop.ini +Marlin/src/gcode/feature/i2c/desktop.ini +Marlin/src/gcode/feature/L6470/desktop.ini +Marlin/src/gcode/feature/leds/desktop.ini +Marlin/src/gcode/feature/macro/desktop.ini +Marlin/src/gcode/feature/mixing/desktop.ini +Marlin/src/gcode/feature/pause/desktop.ini +Marlin/src/gcode/feature/powerloss/desktop.ini +Marlin/src/gcode/feature/prusa_MMU2/desktop.ini +Marlin/src/gcode/feature/runout/desktop.ini +Marlin/src/gcode/feature/trinamic/desktop.ini +Marlin/src/gcode/geometry/desktop.ini +Marlin/src/gcode/host/desktop.ini +Marlin/src/gcode/lcd/desktop.ini +Marlin/src/gcode/motion/desktop.ini +Marlin/src/gcode/scara/desktop.ini +Marlin/src/gcode/sdcard/desktop.ini +Marlin/src/gcode/stats/desktop.ini +Marlin/src/gcode/temperature/desktop.ini +Marlin/src/gcode/units/desktop.ini +Marlin/src/HAL/HAL_TEENSY31_32/desktop.ini +Marlin/src/inc/desktop.ini +Marlin/src/lcd/desktop.ini +Marlin/src/lcd/dogm/desktop.ini +Marlin/src/lcd/dogm/fontdata/desktop.ini +Marlin/src/lcd/extensible_ui/desktop.ini +Marlin/src/lcd/extensible_ui/lib/desktop.ini +Marlin/src/lcd/HD44780/desktop.ini +Marlin/src/lcd/language/desktop.ini +Marlin/src/lcd/menu/desktop.ini +Marlin/src/libs/desktop.ini +Marlin/src/libs/L6470/desktop.ini +Marlin/src/module/desktop.ini +Marlin/src/module/thermistor/desktop.ini +Marlin/src/pins/desktop.ini +Marlin/src/sd/desktop.ini +Marlin/src/sd/usb_flashdrive/desktop.ini +Marlin/src/sd/usb_flashdrive/lib/desktop.ini +.github/desktop.ini +Marlin/desktop.ini +Marlin/src/core/desktop.ini +Marlin/src/desktop.ini +Marlin/src/feature/desktop.ini +Marlin/src/gcode/control/desktop.ini +Marlin/src/gcode/desktop.ini +Marlin/src/gcode/probe/desktop.ini +Marlin/src/HAL/desktop.ini +Marlin/src/HAL/HAL_AVR/desktop.ini +Marlin/src/HAL/HAL_DUE/desktop.ini +Marlin/src/HAL/HAL_DUE/usb/desktop.ini +Marlin/src/HAL/HAL_ESP32/desktop.ini +Marlin/src/HAL/HAL_LPC1768/desktop.ini +Marlin/src/HAL/HAL_LPC1768/include/desktop.ini +Marlin/src/HAL/HAL_LPC1768/u8g/desktop.ini +Marlin/src/HAL/HAL_LPC1768/win_usb_driver/desktop.ini +Marlin/src/HAL/HAL_STM32/desktop.ini +Marlin/src/HAL/HAL_STM32F1/desktop.ini +Marlin/src/HAL/HAL_STM32F4/desktop.ini +Marlin/src/HAL/HAL_STM32F4/EEPROM_Emul/desktop.ini +Marlin/src/HAL/HAL_STM32F7/desktop.ini +Marlin/src/HAL/HAL_STM32F7/EEPROM_Emul/desktop.ini +Marlin/src/HAL/HAL_TEENSY35_36/desktop.ini +Marlin/src/HAL/shared/backtrace/desktop.ini +Marlin/src/HAL/shared/desktop.ini diff --git a/.project b/.project new file mode 100644 index 000000000000..f5e0b0d204cb --- /dev/null +++ b/.project @@ -0,0 +1,11 @@ + + + Marlin + + + + + + + + diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h index 62145f2d8ce6..d4d278230937 100644 --- a/Marlin/Configuration.h +++ b/Marlin/Configuration.h @@ -68,15 +68,30 @@ // config/examples/SCARA and customize for your machine. // +//select machine model by the differences +#define MODULE_50 +//#define MODULE_20 +//#define DEV_PARAMETERS + + + +#ifdef MODULE_50 + #define VERSION "2.0.0 /50" +#endif + +#ifdef MODULE_20 + #define VERSION "2.0.0 /20" +#endif + // @section info // User-specified version info of this build to display in [Pronterface, etc] terminal window during // startup. Implementation of an idea by Prof Braino to inform user that any changes made to this // build by the user have been successfully uploaded into firmware. -#define STRING_CONFIG_H_AUTHOR "(none, default config)" // Who made the changes. +#define STRING_CONFIG_H_AUTHOR "Gabriel S. Beraldo" // Who made the changes. #define SHOW_BOOTSCREEN -#define STRING_SPLASH_LINE1 SHORT_BUILD_VERSION // will be shown during bootup in line 1 -#define STRING_SPLASH_LINE2 WEBSITE_URL // will be shown during bootup in line 2 +#define STRING_SPLASH_LINE1 "" // will be shown during bootup in line 1 +#define STRING_SPLASH_LINE2 VERSION // will be shown during bootup in line 2 /** * *** VENDORS PLEASE READ *** @@ -93,7 +108,7 @@ //#define SHOW_CUSTOM_BOOTSCREEN // Enable to show the bitmap in Marlin/_Statusscreen.h on the status screen. -//#define CUSTOM_STATUS_SCREEN_IMAGE +#define CUSTOM_STATUS_SCREEN_IMAGE // @section machine @@ -137,12 +152,17 @@ // Optional custom name for your RepStrap or other custom machine // Displayed in the LCD "Ready" message -//#define CUSTOM_MACHINE_NAME "3D Printer" +#define CUSTOM_MACHINE_NAME "" // Define this to set a unique identifier for this printer, (Used by some programs to differentiate between machines) // You can use an online service to generate a random UUID. (eg http://www.uuidgenerator.net/version4) //#define MACHINE_UUID "00000000-0000-0000-0000-000000000000" +// This defines the number of axes that are not used for extruders (axes that benefit from endstops and homing). +// This must be set to 3 also if one or more of the positioning axes are driven by multiple stepper motors. Only increase +// for robots with additional axes (tools apart from extruders that are driven by stepper motors) +#define NON_E_AXES 5 + // @section extruder // This defines the number of extruders @@ -368,7 +388,7 @@ * * :{ '0': "Not used", '1':"100k / 4.7k - EPCOS", '2':"200k / 4.7k - ATC Semitec 204GT-2", '3':"Mendel-parts / 4.7k", '4':"10k !! do not use for a hotend. Bad resolution at high temp. !!", '5':"100K / 4.7k - ATC Semitec 104GT-2 (Used in ParCan & J-Head)", '501':"100K Zonestar (Tronxy X3A)", '6':"100k / 4.7k EPCOS - Not as accurate as Table 1", '7':"100k / 4.7k Honeywell 135-104LAG-J01", '8':"100k / 4.7k 0603 SMD Vishay NTCS0603E3104FXT", '9':"100k / 4.7k GE Sensing AL03006-58.2K-97-G1", '10':"100k / 4.7k RS 198-961", '11':"100k / 4.7k beta 3950 1%", '12':"100k / 4.7k 0603 SMD Vishay NTCS0603E3104FXT (calibrated for Makibox hot bed)", '13':"100k Hisens 3950 1% up to 300°C for hotend 'Simple ONE ' & hotend 'All In ONE'", '20':"PT100 (Ultimainboard V2.x)", '51':"100k / 1k - EPCOS", '52':"200k / 1k - ATC Semitec 204GT-2", '55':"100k / 1k - ATC Semitec 104GT-2 (Used in ParCan & J-Head)", '60':"100k Maker's Tool Works Kapton Bed Thermistor beta=3950", '61':"100k Formbot / Vivedino 3950 350C thermistor 4.7k pullup", '66':"Dyze Design 4.7M High Temperature thermistor", '70':"the 100K thermistor found in the bq Hephestos 2", '71':"100k / 4.7k Honeywell 135-104LAF-J01", '147':"Pt100 / 4.7k", '1047':"Pt1000 / 4.7k", '110':"Pt100 / 1k (non-standard)", '1010':"Pt1000 / 1k (non standard)", '-4':"Thermocouple + AD8495", '-3':"Thermocouple + MAX31855 (only for sensor 0)", '-2':"Thermocouple + MAX6675 (only for sensor 0)", '-1':"Thermocouple + AD595",'998':"Dummy 1", '999':"Dummy 2" } */ -#define TEMP_SENSOR_0 1 +#define TEMP_SENSOR_0 998 #define TEMP_SENSOR_1 0 #define TEMP_SENSOR_2 0 #define TEMP_SENSOR_3 0 @@ -515,15 +535,15 @@ * * *** IT IS HIGHLY RECOMMENDED TO LEAVE THIS OPTION ENABLED! *** */ -#define PREVENT_COLD_EXTRUSION -#define EXTRUDE_MINTEMP 170 +//#define PREVENT_COLD_EXTRUSION +//#define EXTRUDE_MINTEMP 170 /** * Prevent a single extrusion longer than EXTRUDE_MAXLENGTH. * Note: For Bowden Extruders make this large enough to allow load/unload. */ -#define PREVENT_LENGTHY_EXTRUDE -#define EXTRUDE_MAXLENGTH 200 +//#define PREVENT_LENGTHY_EXTRUDE +//#define EXTRUDE_MAXLENGTH 200 //=========================================================================== //======================== Thermal Runaway Protection ======================= @@ -542,8 +562,8 @@ * details can be tuned in Configuration_adv.h */ -#define THERMAL_PROTECTION_HOTENDS // Enable thermal protection for all extruders -#define THERMAL_PROTECTION_BED // Enable thermal protection for the heated bed +//#define THERMAL_PROTECTION_HOTENDS // Enable thermal protection for all extruders +//#define THERMAL_PROTECTION_BED // Enable thermal protection for the heated bed //=========================================================================== //============================= Mechanical Settings ========================= @@ -572,9 +592,15 @@ #define USE_XMIN_PLUG #define USE_YMIN_PLUG #define USE_ZMIN_PLUG +#define USE_IMIN_PLUG +#define USE_JMIN_PLUG +//#define USE_KMIN_PLUG //#define USE_XMAX_PLUG //#define USE_YMAX_PLUG //#define USE_ZMAX_PLUG +//#define USE_IMAX_PLUG +//#define USE_JMIN_PLUG +//#define USE_KMIN_PLUG // Enable pullup for all endstops to prevent a floating state #define ENDSTOPPULLUPS @@ -583,9 +609,15 @@ //#define ENDSTOPPULLUP_XMAX //#define ENDSTOPPULLUP_YMAX //#define ENDSTOPPULLUP_ZMAX + //#define ENDSTOPPULLUP_IMAX + //#define ENDSTOPPULLUP_JMAX + //#define ENDSTOPPULLUP_KMAX //#define ENDSTOPPULLUP_XMIN //#define ENDSTOPPULLUP_YMIN //#define ENDSTOPPULLUP_ZMIN + //#define ENDSTOPPULLUP_IMIN + //#define ENDSTOPPULLUP_JMIN + //#define ENDSTOPPULLUP_KMIN //#define ENDSTOPPULLUP_ZMIN_PROBE #endif @@ -596,19 +628,31 @@ //#define ENDSTOPPULLDOWN_XMAX //#define ENDSTOPPULLDOWN_YMAX //#define ENDSTOPPULLDOWN_ZMAX + //#define ENDSTOPPULLDOWN_IMAX + //#define ENDSTOPPULLDOWN_JMAX + //#define ENDSTOPPULLDOWN_KMAX //#define ENDSTOPPULLDOWN_XMIN //#define ENDSTOPPULLDOWN_YMIN //#define ENDSTOPPULLDOWN_ZMIN + //#define ENDSTOPPULLDOWN_IMIN + //#define ENDSTOPPULLDOWN_JMIN + //#define ENDSTOPPULLDOWN_KMIN //#define ENDSTOPPULLDOWN_ZMIN_PROBE #endif // Mechanical endstop with COM to ground and NC to Signal uses "false" here (most common setup). -#define X_MIN_ENDSTOP_INVERTING false // set to true to invert the logic of the endstop. -#define Y_MIN_ENDSTOP_INVERTING false // set to true to invert the logic of the endstop. -#define Z_MIN_ENDSTOP_INVERTING false // set to true to invert the logic of the endstop. +#define X_MIN_ENDSTOP_INVERTING true // set to true to invert the logic of the endstop. +#define Y_MIN_ENDSTOP_INVERTING true // set to true to invert the logic of the endstop. +#define Z_MIN_ENDSTOP_INVERTING true // set to true to invert the logic of the endstop. +#define I_MIN_ENDSTOP_INVERTING true // set to true to invert the logic of the endstop. +#define J_MIN_ENDSTOP_INVERTING true // set to true to invert the logic of the endstop. +#define K_MIN_ENDSTOP_INVERTING false // set to true to invert the logic of the endstop. #define X_MAX_ENDSTOP_INVERTING false // set to true to invert the logic of the endstop. #define Y_MAX_ENDSTOP_INVERTING false // set to true to invert the logic of the endstop. #define Z_MAX_ENDSTOP_INVERTING false // set to true to invert the logic of the endstop. +#define I_MAX_ENDSTOP_INVERTING false // set to true to invert the logic of the endstop. +#define J_MAX_ENDSTOP_INVERTING false // set to true to invert the logic of the endstop. +#define K_MAX_ENDSTOP_INVERTING false // set to true to invert the logic of the endstop. #define Z_MIN_PROBE_ENDSTOP_INVERTING false // set to true to invert the logic of the probe. /** @@ -626,9 +670,9 @@ * TMC5160, TMC5160_STANDALONE * :['A4988', 'A5984', 'DRV8825', 'LV8729', 'L6470', 'TB6560', 'TB6600', 'TMC2100', 'TMC2130', 'TMC2130_STANDALONE', 'TMC2160', 'TMC2160_STANDALONE', 'TMC2208', 'TMC2208_STANDALONE', 'TMC26X', 'TMC26X_STANDALONE', 'TMC2660', 'TMC2660_STANDALONE', 'TMC5130', 'TMC5130_STANDALONE', 'TMC5160', 'TMC5160_STANDALONE'] */ -//#define X_DRIVER_TYPE A4988 -//#define Y_DRIVER_TYPE A4988 -//#define Z_DRIVER_TYPE A4988 +#define X_DRIVER_TYPE A4988 +#define Y_DRIVER_TYPE A4988 +#define Z_DRIVER_TYPE A4988 //#define X2_DRIVER_TYPE A4988 //#define Y2_DRIVER_TYPE A4988 //#define Z2_DRIVER_TYPE A4988 @@ -639,10 +683,12 @@ //#define E3_DRIVER_TYPE A4988 //#define E4_DRIVER_TYPE A4988 //#define E5_DRIVER_TYPE A4988 +#define I_DRIVER_TYPE A4988 +#define J_DRIVER_TYPE A4988 // Enable this feature if all enabled endstop pins are interrupt-capable. // This will remove the need to poll the interrupt pins, saving many CPU cycles. -//#define ENDSTOP_INTERRUPTS_FEATURE +#define ENDSTOP_INTERRUPTS_FEATURE /** * Endstop Noise Threshold @@ -683,22 +729,27 @@ * Override with M92 * X, Y, Z, E0 [, E1[, E2[, E3[, E4[, E5]]]]] */ -#define DEFAULT_AXIS_STEPS_PER_UNIT { 80, 80, 4000, 500 } +//default calibration for module 50 +#ifdef DEV_PARAMETERS + #define DEFAULT_AXIS_STEPS_PER_UNIT { 31.49, 31.49, 31.49, 31.49, 31.49, 1000} //e axis in ML + #define DEFAULT_MAX_FEEDRATE { 250, 250, 250, 250, 250, 250 } //X, Y, Z, [I ,[J ,[K ,]]] E0 [, E1[, E2[, E3[, E4[, E5]]]]] + #define DEFAULT_MAX_ACCELERATION { 500, 500, 500, 500, 500, 500 } -/** - * Default Max Feed Rate (mm/s) - * Override with M203 - * X, Y, Z, E0 [, E1[, E2[, E3[, E4[, E5]]]]] - */ -#define DEFAULT_MAX_FEEDRATE { 300, 300, 5, 25 } +#else +#ifdef MODULE_50 + #define DEFAULT_AXIS_STEPS_PER_UNIT { 31.49, 52.49, 52.49, 477.87, 477.87, 1000} //e axis in ML + #define DEFAULT_MAX_FEEDRATE { 250, 250, 250, 12, 12, 250 } //X, Y, Z, [I ,[J ,[K ,]]] E0 [, E1[, E2[, E3[, E4[, E5]]]]] + #define DEFAULT_MAX_ACCELERATION { 500, 500, 500, 9, 9, 500 } + +#elif MODULE_20 + #define DEFAULT_AXIS_STEPS_PER_UNIT { 31.49, 52.49, 52.49 , 912.35, 912.35, 1000} //e axis in ML + #define DEFAULT_MAX_FEEDRATE { 250, 250, 250 , 12, 12, 250 } + #define DEFAULT_MAX_ACCELERATION { 500, 500, 500, 9, 9, 500 } + + //X, Y, Z, [I ,[J ,[K ,]]] E0 [, E1[, E2[, E3[, E4[, E5]]]]] +#endif +#endif -/** - * Default Max Acceleration (change/s) change = mm/s - * (Maximum start speed for accelerated moves) - * Override with M201 - * X, Y, Z, E0 [, E1[, E2[, E3[, E4[, E5]]]]] - */ -#define DEFAULT_MAX_ACCELERATION { 3000, 3000, 100, 10000 } /** * Default Acceleration (change/s) change = mm/s @@ -708,9 +759,9 @@ * M204 R Retract Acceleration * M204 T Travel Acceleration */ -#define DEFAULT_ACCELERATION 3000 // X, Y, Z and E acceleration for printing moves -#define DEFAULT_RETRACT_ACCELERATION 3000 // E acceleration for retracts -#define DEFAULT_TRAVEL_ACCELERATION 3000 // X, Y, Z acceleration for travel (non printing) moves +#define DEFAULT_ACCELERATION 250 // X, Y, Z and E acceleration for printing moves +#define DEFAULT_RETRACT_ACCELERATION 10 // E acceleration for retracts +#define DEFAULT_TRAVEL_ACCELERATION 250 // X, Y, Z acceleration for travel (non printing) moves // // Use Junction Deviation instead of traditional Jerk Limiting @@ -729,12 +780,21 @@ * value set here, it may happen instantaneously. */ #if DISABLED(JUNCTION_DEVIATION) - #define DEFAULT_XJERK 10.0 - #define DEFAULT_YJERK 10.0 + #define DEFAULT_XJERK 2.0 + #define DEFAULT_YJERK 2.0 #define DEFAULT_ZJERK 0.3 + #if NON_E_AXES > 3 + #define DEFAULT_IJERK 0.1 + #if NON_E_AXES > 4 + #define DEFAULT_JJERK 0.1 + #if NON_E_AXES > 5 + #define DEFAULT_KJERK 0.1 + #endif + #endif + #endif #endif -#define DEFAULT_EJERK 5.0 // May be used by Linear Advance +#define DEFAULT_EJERK 1.0 // May be used by Linear Advance /** * S-Curve Acceleration @@ -744,7 +804,7 @@ * * See https://github.com/synthetos/TinyG/wiki/Jerk-Controlled-Motion-Explained */ -//#define S_CURVE_ACCELERATION +#define S_CURVE_ACCELERATION //=========================================================================== //============================= Z Probe Options ============================= @@ -895,6 +955,8 @@ #define Z_CLEARANCE_MULTI_PROBE 5 // Z Clearance between multiple probes //#define Z_AFTER_PROBING 5 // Z position after probing is done +#define Z_HOMING_HEIGHT 0 + #define Z_PROBE_LOW_POINT -2 // Farthest distance below the trigger-point to go before stopping // For M851 give a range for adjusting the Z probe offset @@ -927,6 +989,15 @@ #define X_ENABLE_ON 0 #define Y_ENABLE_ON 0 #define Z_ENABLE_ON 0 +#if NON_E_AXES > 3 + #define I_ENABLE_ON 0 + #if NON_E_AXES > 4 + #define J_ENABLE_ON 0 + #if NON_E_AXES > 5 + #define K_ENABLE_ON 0 + #endif + #endif +#endif #define E_ENABLE_ON 0 // For all extruders // Disables axis stepper immediately when it's not being used. @@ -934,7 +1005,15 @@ #define DISABLE_X false #define DISABLE_Y false #define DISABLE_Z false - +#if NON_E_AXES > 3 + #define DISABLE_I false + #if NON_E_AXES > 4 + #define DISABLE_J false + #if NON_E_AXES > 5 + #define DISABLE_K false + #endif + #endif +#endif // Warn on display about possibly reduced accuracy //#define DISABLE_REDUCED_ACCURACY_WARNING @@ -947,9 +1026,17 @@ // Invert the stepper direction. Change (or reverse the motor connector) if an axis goes the wrong way. #define INVERT_X_DIR false -#define INVERT_Y_DIR true +#define INVERT_Y_DIR false #define INVERT_Z_DIR false - +#if NON_E_AXES > 3 + #define INVERT_I_DIR false + #if NON_E_AXES > 4 + #define INVERT_J_DIR false + #if NON_E_AXES > 5 + #define INVERT_K_DIR false + #endif + #endif +#endif // @section extruder // For direct drive extruder v9 set to true, for geared extruder set to false. @@ -974,12 +1061,21 @@ #define X_HOME_DIR -1 #define Y_HOME_DIR -1 #define Z_HOME_DIR -1 +#if NON_E_AXES > 3 + #define I_HOME_DIR -1 + #if NON_E_AXES > 4 + #define J_HOME_DIR -1 + #if NON_E_AXES > 5 + #define K_HOME_DIR -1 + #endif + #endif +#endif // @section machine // The size of the print bed -#define X_BED_SIZE 200 -#define Y_BED_SIZE 200 +#define X_BED_SIZE 780 +#define Y_BED_SIZE 600 // Travel limits (mm) after homing, corresponding to endstop positions. #define X_MIN_POS 0 @@ -988,7 +1084,19 @@ #define X_MAX_POS X_BED_SIZE #define Y_MAX_POS Y_BED_SIZE #define Z_MAX_POS 200 - +#if NON_E_AXES > 3 + #define I_MIN_POS 0 + #define I_MAX_POS 100 + #if NON_E_AXES > 4 + #define J_MIN_POS 0 + #define J_MAX_POS 100 + #if NON_E_AXES > 5 + #define K_MIN_POS 0 + #define K_MAX_POS 50 + #endif + #endif +#endif + /** * Software Endstops * @@ -1004,6 +1112,9 @@ #define MIN_SOFTWARE_ENDSTOP_X #define MIN_SOFTWARE_ENDSTOP_Y #define MIN_SOFTWARE_ENDSTOP_Z + #define MIN_SOFTWARE_ENDSTOP_I + #define MIN_SOFTWARE_ENDSTOP_J + #define MIN_SOFTWARE_ENDSTOP_K #endif // Max software endstops constrain movement within maximum coordinate bounds @@ -1012,6 +1123,9 @@ #define MAX_SOFTWARE_ENDSTOP_X #define MAX_SOFTWARE_ENDSTOP_Y #define MAX_SOFTWARE_ENDSTOP_Z + #define MAX_SOFTWARE_ENDSTOP_I + #define MAX_SOFTWARE_ENDSTOP_J + #define MAX_SOFTWARE_ENDSTOP_K #endif #if ENABLED(MIN_SOFTWARE_ENDSTOPS) || ENABLED(MAX_SOFTWARE_ENDSTOPS) @@ -1105,7 +1219,7 @@ * Turn on with the command 'M111 S32'. * NOTE: Requires a lot of PROGMEM! */ -//#define DEBUG_LEVELING_FEATURE +#define DEBUG_LEVELING_FEATURE #if ENABLED(MESH_BED_LEVELING) || ENABLED(AUTO_BED_LEVELING_BILINEAR) || ENABLED(AUTO_BED_LEVELING_UBL) // Gradually reduce leveling correction until a set height is reached, @@ -1248,6 +1362,9 @@ //#define MANUAL_X_HOME_POS 0 //#define MANUAL_Y_HOME_POS 0 //#define MANUAL_Z_HOME_POS 0 +//#define MANUAL_I_HOME_POS 0 +//#define MANUAL_J_HOME_POS 0 +//#define MANUAL_K_HOME_POS 0 // Use "Z Safe Homing" to avoid homing with a Z probe outside the bed area. // @@ -1267,7 +1384,16 @@ // Homing speeds (mm/m) #define HOMING_FEEDRATE_XY (50*60) -#define HOMING_FEEDRATE_Z (4*60) +#define HOMING_FEEDRATE_Z (50*60) +#if NON_E_AXES > 3 + #define HOMING_FEEDRATE_I (2*60) + #if NON_E_AXES > 4 + #define HOMING_FEEDRATE_J (2*60) + #if NON_E_AXES > 5 + #define HOMING_FEEDRATE_K (2*60) + #endif + #endif +#endif // Validate that endstops are triggered on homing moves #define VALIDATE_HOMING_ENDSTOPS @@ -1343,7 +1469,7 @@ // M501 - reads parameters from EEPROM (if you need reset them after you changed them temporarily). // M502 - reverts to the default "factory settings". You still need to store them in EEPROM afterwards if you want to. // -//#define EEPROM_SETTINGS // Enable for M500 and M501 commands +#define EEPROM_SETTINGS // Enable for M500 and M501 commands //#define DISABLE_M503 // Saves ~2700 bytes of PROGMEM. Disable for release! #define EEPROM_CHITCHAT // Give feedback on EEPROM commands. Disable to save PROGMEM. @@ -1554,7 +1680,7 @@ * you must uncomment the following option or it won't work. * */ -//#define SDSUPPORT +#define SDSUPPORT /** * SD CARD: SPI SPEED @@ -1611,7 +1737,7 @@ // // Set this option if CLOCKWISE causes values to DECREASE // -//#define REVERSE_ENCODER_DIRECTION +#define REVERSE_ENCODER_DIRECTION // // This option reverses the encoder direction for navigating LCD menus. @@ -1626,7 +1752,7 @@ // // Add individual axis homing items (Home X, Home Y, and Home Z) to the LCD menu. // -//#define INDIVIDUAL_AXIS_HOMING_MENU +#define INDIVIDUAL_AXIS_HOMING_MENU // // SPEAKER/BUZZER @@ -1634,7 +1760,7 @@ // If you have a speaker that can produce tones, enable it here. // By default Marlin assumes you have a buzzer with a fixed frequency. // -//#define SPEAKER +#define SPEAKER // // The duration and frequency for the UI feedback sound. @@ -1797,7 +1923,7 @@ // RepRapDiscount FULL GRAPHIC Smart Controller // http://reprap.org/wiki/RepRapDiscount_Full_Graphic_Smart_Controller // -//#define REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER +#define REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER // // ReprapWorld Graphical LCD diff --git a/Marlin/Configuration_adv.h b/Marlin/Configuration_adv.h index 09309780304a..65e27a4e0436 100644 --- a/Marlin/Configuration_adv.h +++ b/Marlin/Configuration_adv.h @@ -33,6 +33,27 @@ */ #define CONFIGURATION_ADV_H_VERSION 020000 +//@section mods to run our machines + +//=========================================================================== +//============================= MODS ==================================== +//=========================================================================== + +#define INITIALIZE_SERINGE_PUMP_PATH _UxGT("ROUTINES/INITMO~1.GCO") // example for filename.gcode: PATH/FILENA~1.GCO +#define FLUSH_SERINGE_PUMP_PATH _UxGT("ROUTINES/FLUSHM~1.GCO") + +#define SHOW_X_STATUS +#define SHOW_Y_STATUS +#define SHOW_Z_STATUS +//#define SHOW_E_STATUS + +#define SHOW_X_MOVE +#define SHOW_Y_MOVE +#define SHOW_Z_MOVE +#define SHOW_E_MOVE + + + // @section temperature //=========================================================================== @@ -286,7 +307,7 @@ // If you want endstops to stay on (by default) even when not homing // enable this option. Override at any time with M120, M121. -//#define ENDSTOPS_ALWAYS_ON_DEFAULT +#define ENDSTOPS_ALWAYS_ON_DEFAULT // @section extras @@ -404,7 +425,18 @@ #define X_HOME_BUMP_MM 5 #define Y_HOME_BUMP_MM 5 #define Z_HOME_BUMP_MM 2 -#define HOMING_BUMP_DIVISOR { 2, 2, 4 } // Re-Bump Speed Divisor (Divides the Homing Feedrate) +#if NON_E_AXES > 3 + #define I_HOME_BUMP_MM 2 + #if NON_E_AXES > 4 + #define J_HOME_BUMP_MM 2 + #if NON_E_AXES > 5 + #define K_HOME_BUMP_MM 2 + #endif + #endif +#endif + +#define HOMING_BUMP_DIVISOR ARRAY_N(NON_E_AXES, 2, 2, 2, 2, 2, 2) // Re-Bump Speed Divisor (Divides the Homing Feedrate) + //#define QUICK_HOME // If homing includes X and Y, do a diagonal move initially // When G28 is called, this option will make Y home before X @@ -436,7 +468,15 @@ // @section machine -#define AXIS_RELATIVE_MODES {false, false, false, false} +#if NON_E_AXES == 3 + #define AXIS_RELATIVE_MODES {false, false, false, false} +#elif NON_E_AXES == 4 + #define AXIS_RELATIVE_MODES {false, false, false, false, false} +#elif NON_E_AXES == 5 + #define AXIS_RELATIVE_MODES {false, false, false, false, false, false} +#elif NON_E_AXES == 6 + #define AXIS_RELATIVE_MODES {false, false, false, false, false, false, false} +#endif // Allow duplication mode with a basic dual-nozzle extruder //#define DUAL_NOZZLE_DUPLICATION_MODE @@ -445,15 +485,33 @@ #define INVERT_X_STEP_PIN false #define INVERT_Y_STEP_PIN false #define INVERT_Z_STEP_PIN false +#if NON_E_AXES > 3 + #define INVERT_I_STEP_PIN false + #if NON_E_AXES > 4 + #define INVERT_J_STEP_PIN false + #if NON_E_AXES > 5 + #define INVERT_K_STEP_PIN false + #endif + #endif +#endif #define INVERT_E_STEP_PIN false // Default stepper release if idle. Set to 0 to deactivate. // Steppers will shut down DEFAULT_STEPPER_DEACTIVE_TIME seconds after the last move when DISABLE_INACTIVE_? is true. // Time can be set by M18 and M84. -#define DEFAULT_STEPPER_DEACTIVE_TIME 120 +#define DEFAULT_STEPPER_DEACTIVE_TIME 0 #define DISABLE_INACTIVE_X true #define DISABLE_INACTIVE_Y true #define DISABLE_INACTIVE_Z true // set to false if the nozzle will fall down on your printed part when print has finished. +#if NON_E_AXES > 3 + #define DISABLE_INACTIVE_I true + #if NON_E_AXES > 3 + #define DISABLE_INACTIVE_J true + #if NON_E_AXES > 3 + #define DISABLE_INACTIVE_K true + #endif + #endif +#endif #define DISABLE_INACTIVE_E true #define DEFAULT_MINIMUMFEEDRATE 0.0 // minimum feedrate @@ -464,7 +522,7 @@ // @section lcd #if ENABLED(ULTIPANEL) - #define MANUAL_FEEDRATE {50*60, 50*60, 4*60, 60} // Feedrates for manual moves along X, Y, Z, E from panel + #define MANUAL_FEEDRATE {50*60, 50*60, 4*60, 50*60, 50*60, 10*60} // Feedrates for manual moves along X, Y, Z, E from panel #define MANUAL_E_MOVES_RELATIVE // Show LCD extruder moves as relative rather than absolute positions #define ULTIPANEL_FEEDMULTIPLY // Comment to disable setting feedrate multiplier via encoder #endif @@ -713,7 +771,7 @@ // Note: This is always disabled for ULTIPANEL (except ELB_FULL_GRAPHIC_CONTROLLER). #define SD_DETECT_INVERTED - #define SD_FINISHED_STEPPERRELEASE true // Disable steppers when SD Print is finished + #define SD_FINISHED_STEPPERRELEASE false // Disable steppers when SD Print is finished #define SD_FINISHED_RELEASECOMMAND "M84 X Y Z E" // You might want to keep the Z enabled so your bed stays in place. // Reverse SD sort to show "more recent" files first, according to the card's FAT. @@ -760,7 +818,7 @@ * - SDSORT_CACHE_NAMES will retain the sorted file listing in RAM. (Expensive!) * - SDSORT_DYNAMIC_RAM only uses RAM when the SD menu is visible. (Use with caution!) */ - //#define SDCARD_SORT_ALPHA + #define SDCARD_SORT_ALPHA // SD Card Sorting options #if ENABLED(SDCARD_SORT_ALPHA) @@ -793,7 +851,7 @@ * On print completion the LCD Menu will open with the file selected. * You can just click to start the print, or navigate elsewhere. */ - //#define SD_REPRINT_LAST_SELECTED_FILE + #define SD_REPRINT_LAST_SELECTED_FILE /** * Auto-report SdCard status with M27 S @@ -1700,6 +1758,30 @@ #define Z3_CHAIN_POS 0 #endif + #if AXIS_DRIVER_TYPE_I(L6470) + #define I_MICROSTEPS 128 + #define I_OVERCURRENT 2000 + #define I_STALLCURRENT 1500 + #define I_MAX_VOLTAGE 127 + #define I_CHAIN_POS 0 + #endif + + #if AXIS_DRIVER_TYPE_J(L6470) + #define J_MICROSTEPS 128 + #define J_OVERCURRENT 2000 + #define J_STALLCURRENT 1500 + #define J_MAX_VOLTAGE 127 + #define J_CHAIN_POS 0 + #endif + + #if AXIS_DRIVER_TYPE_K(L6470) + #define K_MICROSTEPS 128 + #define K_OVERCURRENT 2000 + #define K_STALLCURRENT 1500 + #define K_MAX_VOLTAGE 127 + #define K_CHAIN_POS 0 + #endif + #if AXIS_DRIVER_TYPE_E0(L6470) #define E0_MICROSTEPS 128 #define E0_OVERCURRENT 2000 @@ -1982,7 +2064,7 @@ //#define GCODE_MOTION_MODES // Remember the motion mode (G0 G1 G2 G3 G5 G38.X) and apply for X Y Z E F, etc. // Enable and set a (default) feedrate for all G0 moves -//#define G0_FEEDRATE 3000 // (mm/m) +#define G0_FEEDRATE 3000 // (mm/m) #ifdef G0_FEEDRATE //#define VARIABLE_G0_FEEDRATE // The G0 feedrate is set by F in G0 motion mode #endif @@ -2257,4 +2339,4 @@ //#define PINS_DEBUGGING // Enable Marlin dev mode which adds some special commands -//#define MARLIN_DEV_MODE +#define MARLIN_DEV_MODE diff --git a/Marlin/_Bootscreen.h b/Marlin/_Bootscreen.h new file mode 100644 index 000000000000..45fdb622b1ed --- /dev/null +++ b/Marlin/_Bootscreen.h @@ -0,0 +1,55 @@ +/** + * Marlin 3D Printer Firmware + * Copyright (C) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin] + * + * Based on Sprinter and grbl. + * Copyright (C) 2011 Camiel Gubbels / Erik van der Zalm + * + * 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 . + * + */ + +/** + * Custom Boot Screen bitmap + * + * Place this file in the root with your configuration files + * and enable SHOW_CUSTOM_BOOTSCREEN in Configuration.h. + * + * Use the Marlin Bitmap Converter to make your own: + * http://marlinfw.org/tools/u8glib/converter.html + */ + +#define CUSTOM_BOOTSCREEN_TIMEOUT 1000 +#define CUSTOM_BOOTSCREEN_BMPWIDTH 128 + +const unsigned char custom_start_bmp[] PROGMEM = { + B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B01100000,B00000000,B00000000,B00000000,B00000000,B00000000,B11111100,B00000000,B00000000, + B00001111,B11110000,B00000000,B00000000,B00000000,B00000000,B00000111,B11100000,B00000000,B00000000,B00000000,B00000000,B00000001,B10000110,B00011111,B11000000, + B00011000,B01110000,B00000000,B00000000,B00000000,B00000000,B00000000,B01100000,B00111100,B00001100,B00000000,B00000000,B00000001,B10000011,B00001100,B01100000, + B00010000,B00110000,B00000000,B00000000,B00000000,B00000000,B00000000,B01100000,B00111100,B00001100,B00000000,B00000000,B00000001,B10000011,B00001100,B00110000, + B00110000,B00110000,B00000000,B00000000,B00000000,B00000000,B00000000,B01100000,B00000000,B00001100,B00000000,B00000000,B00000000,B00000011,B00001100,B00011000, + B00110000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B01100000,B00000000,B00111111,B00001111,B00111100,B00000000,B00000011,B00001100,B00001100, + B01100000,B00000001,B11011111,B00001111,B11100000,B11111110,B00000000,B01100000,B00011100,B00011100,B00000110,B00011000,B00000000,B00000110,B00001100,B00001100, + B01100000,B00000000,B11110011,B00011000,B00110001,B10000011,B00000000,B01100000,B00001100,B00001100,B00000011,B00011000,B00000000,B00011110,B00001100,B00001100, + B01100000,B00000000,B11100000,B00110000,B00111001,B10000011,B00000000,B01100000,B00001100,B00001100,B00000011,B00110000,B00000000,B00000011,B00001100,B00001100, + B01100000,B00000000,B11000000,B00110000,B00111000,B00001111,B00000000,B01100000,B00001100,B00001100,B00000011,B00110000,B00000000,B00000001,B10001100,B00001100, + B01100000,B00000000,B11000000,B00111111,B11111000,B11111011,B00000000,B01100000,B00001100,B00001100,B00000011,B00110000,B00000000,B00000001,B10001100,B00001100, + B01100000,B00110000,B11000000,B00110000,B00000001,B10000011,B00000000,B01100000,B00001100,B00001100,B00000001,B11110000,B00000001,B10000001,B10001100,B00001100, + B01100000,B00110000,B11000000,B00110000,B00000001,B10000011,B00000000,B01100000,B00001100,B00001100,B00000000,B11100000,B00000001,B10000001,B10001100,B00011000, + B00110000,B00110000,B11000000,B00011000,B00110001,B10000011,B00000000,B01100000,B00001100,B00001100,B01000000,B11100000,B00000001,B10000011,B10001100,B00110000, + B00011000,B01100000,B11000000,B00001100,B01100001,B10000111,B11000000,B11100000,B00011100,B00001100,B11000000,B01100000,B00000000,B11000011,B00001100,B01100000, + B00001111,B11000011,B11110000,B00000111,B11000000,B11111111,B11000111,B11111100,B01111111,B00000111,B10000001,B11000000,B00000000,B01111110,B00011111,B11000000, + B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000111,B00000000,B00000000,B00000000,B00000000,B00000000, + B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000111,B00000000,B00000000,B00000000,B00000000,B00000000 +}; diff --git a/Marlin/_Statusscreen.h b/Marlin/_Statusscreen.h new file mode 100644 index 000000000000..fba5d6afb10b --- /dev/null +++ b/Marlin/_Statusscreen.h @@ -0,0 +1,78 @@ +/** + * Marlin 3D Printer Firmware + * Copyright (C) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin] + * + * Based on Sprinter and grbl. + * Copyright (C) 2011 Camiel Gubbels / Erik van der Zalm + * + * 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 . + * + */ + +/** + * Custom Status Screen bitmap + * + * Place this file in the root with your configuration files + * and enable CUSTOM_STATUS_SCREEN_IMAGE in Configuration.h. + * + * Use the Marlin Bitmap Converter to make your own: + * http://marlinfw.org/tools/u8glib/converter.html + */ + +// +// Status Screen Logo bitmap +// +#define STATUS_LOGO_X 8 +#define STATUS_LOGO_Y 5 +#define STATUS_LOGO_WIDTH 128 + +const unsigned char status_logo_bmp[] PROGMEM = { + 0x00,0x00,0x01,0xF1,0xFF,0xFF,0xE0,0x1F,0xFF,0xFC,0x00,0x0F,0xFE,0x00,0x00,0x00, // .......................#####...####################........###################..............###########......................... + 0x00,0x00,0x07,0xF1,0xFF,0xFF,0xF8,0x3F,0xFF,0xFF,0x00,0x3F,0xFE,0x00,0x00,0x00, // .....................#######...######################.....######################..........#############......................... + 0x00,0x00,0x07,0xF1,0xFF,0xFF,0xFC,0x3F,0xFF,0xFF,0x80,0x3F,0xFE,0x00,0x00,0x00, // .....................#######...#######################....#######################.........#############......................... + 0x00,0x00,0x07,0xE1,0xFF,0xFF,0xFE,0x3F,0xFF,0xFF,0x80,0x7F,0xFE,0x00,0x00,0x00, // .....................######....########################...#######################........##############......................... + 0x00,0x00,0x07,0xC3,0xFF,0xFF,0xFE,0x7F,0xFF,0xFF,0xC0,0xFF,0xFE,0x00,0x00,0x00, // .....................#####....#########################..#########################......###############......................... + 0x00,0x00,0x00,0x00,0x00,0x03,0xFE,0x7F,0x00,0x3F,0xC0,0xFF,0xFE,0x00,0x00,0x00, // ..............................................#########..#######..........########......###############......................... + 0x00,0x00,0x0F,0xC0,0x00,0x01,0xFE,0xFE,0x00,0x1F,0x83,0xFD,0xFE,0x00,0x00,0x00, // ....................######.....................########.#######............######.....########.########......................... + 0x00,0x00,0x1F,0xC0,0x00,0x01,0xFC,0xFE,0x00,0x1F,0x83,0xF9,0xFE,0x00,0x00,0x00, // ...................#######.....................#######..#######............######.....#######..########......................... + 0x00,0x00,0x1F,0xC0,0x00,0x03,0xFC,0xFC,0x00,0xFF,0x07,0xF1,0xFF,0x00,0x00,0x00, // ...................#######....................########..######..........########.....#######...#########........................ + 0x00,0x00,0x1F,0xCF,0xFF,0xFF,0xF8,0xFC,0xFF,0xFF,0x07,0xE1,0xFF,0x80,0x00,0x00, // ...................#######..#########################...######..################.....######....##########....................... + 0x00,0x00,0x3F,0xCF,0xFF,0xFF,0xF0,0xFD,0xFF,0xFF,0x0F,0xE1,0xFF,0x80,0x00,0x00, // ..................########..########################....######.#################....#######....##########....................... + 0x00,0x00,0x3F,0x9F,0xFF,0xFF,0xE1,0xFB,0xFF,0xFC,0x1F,0xFF,0xFF,0x80,0x00,0x00, // ..................#######..########################....######.################.....######################....................... + 0x00,0x00,0x7F,0x9F,0xFF,0xFF,0xE1,0xFB,0xFF,0xF8,0x3F,0xFF,0xFF,0x80,0x00,0x00, // .................########..########################....######.###############.....#######################....................... + 0x00,0x00,0x7F,0x3F,0xFF,0xFF,0xE3,0xF7,0xFF,0xC0,0x7F,0xFF,0xFE,0x00,0x00,0x00, // .................#######..#########################...######.#############.......######################......................... + 0x00,0x00,0x7F,0x00,0x00,0x3F,0xE3,0xF7,0xE0,0x00,0xFF,0xFF,0xF0,0x00,0x00,0x00, // .................#######..................#########...######.######.............####################............................ + 0x00,0x00,0xFE,0x00,0x00,0x0F,0xE3,0xF7,0xF8,0x00,0xFF,0xFC,0x06,0x00,0x00,0x00, // ................#######.....................#######...######.########...........##############.......##......................... + 0x00,0x00,0xFE,0x00,0x00,0x0F,0xE7,0xF7,0xFC,0x07,0xF8,0x01,0xFE,0x00,0x00,0x00, // ................#######.....................#######..#######.#########.......########..........########......................... + 0x00,0x00,0xFE,0x00,0x00,0x1F,0xE7,0xF3,0xFE,0x1C,0x00,0x01,0xFE,0x00,0x00,0x00, // ................#######....................########..#######..#########....###.................########......................... + 0x00,0x00,0xFC,0x7F,0xFF,0xFF,0xCF,0xE0,0xFF,0xE3,0xF8,0x01,0xFE,0x00,0x00,0x00, // ................######...#########################..#######.....###########...#######..........########......................... + 0x00,0x00,0xFC,0x7F,0xFF,0xFF,0x8F,0xE0,0x7F,0x07,0xF0,0x01,0xFE,0x00,0x00,0x00, // ................######...########################...#######......#######.....#######...........########......................... + 0x00,0x01,0xF8,0xFF,0xFF,0xFF,0x1F,0xC0,0x1C,0x6F,0xE0,0x01,0xFE,0x00,0x00,0x00, // ...............######...########################...#######.........###...##.#######............########......................... + 0x00,0x01,0xF8,0xFF,0xFF,0xFE,0x1F,0xC0,0x0D,0xFF,0xC0,0x01,0xFE,0x00,0x00,0x00, // ...............######...#######################....#######..........##.###########.............########......................... + 0x00,0x03,0xF8,0xFF,0xFF,0xFC,0x1F,0xC0,0x0B,0xFF,0xC0,0x01,0xFE,0x00,0x00,0x00, // ..............#######...######################.....#######..........#.############.............########......................... + 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00 // ................................................................................................................................ +}; + +// +// Use default bitmaps +// +#define STATUS_HOTEND_ANIM +#define STATUS_BED_ANIM +#if HOTENDS < 2 + #define STATUS_HEATERS_X 40 + #define STATUS_BED_X 72 +#else + #define STATUS_HEATERS_X 32 + #define STATUS_BED_X 80 +#endif diff --git a/Marlin/src/HAL/HAL_AVR/endstop_interrupts.h b/Marlin/src/HAL/HAL_AVR/endstop_interrupts.h index c06670394221..437435f0081a 100644 --- a/Marlin/src/HAL/HAL_AVR/endstop_interrupts.h +++ b/Marlin/src/HAL/HAL_AVR/endstop_interrupts.h @@ -252,5 +252,64 @@ void setup_endstop_interrupts( void ) { #endif #endif + #if HAS_I_MAX + #if (digitalPinToInterrupt(I_MAX_PIN) != NOT_AN_INTERRUPT) // if pin has an external interrupt + attachInterrupt(digitalPinToInterrupt(I_MAX_PIN), endstop_ISR, CHANGE); // assign it + #else + // Not all used endstop/probe -pins can raise interrupts. Please deactivate ENDSTOP_INTERRUPTS or change the pin configuration! + static_assert(digitalPinToPCICR(I_MAX_PIN) != NULL, "I_MAX_PIN is not interrupt-capable"); // if pin has no pin change interrupt - error + pciSetup(I_MAX_PIN); // assign it + #endif + #endif + + #if HAS_I_MIN + #if (digitalPinToInterrupt(I_MIN_PIN) != NOT_AN_INTERRUPT) + attachInterrupt(digitalPinToInterrupt(I_MIN_PIN), endstop_ISR, CHANGE); + #else + // Not all used endstop/probe -pins can raise interrupts. Please deactivate ENDSTOP_INTERRUPTS or change the pin configuration! + static_assert(digitalPinToPCICR(I_MIN_PIN) != NULL, "I_MIN_PIN is not interrupt-capable"); + pciSetup(I_MIN_PIN); + #endif + #endif + + #if HAS_J_MAX + #if (digitalPinToInterrupt(J_MAX_PIN) != NOT_AN_INTERRUPT) // if pin has an external interrupt + attachInterrupt(digitalPinToInterrupt(J_MAX_PIN), endstop_ISR, CHANGE); // assign it + #else + // Not all used endstop/probe -pins can raise interrupts. Please deactivate ENDSTOP_INTERRUPTS or change the pin configuration! + static_assert(digitalPinToPCICR(J_MAX_PIN) != NULL, "J_MAX_PIN is not interrupt-capable"); // if pin has no pin change interrupt - error + pciSetup(J_MAX_PIN); // assign it + #endif + #endif + + #if HAS_J_MIN + #if (digitalPinToInterrupt(J_MIN_PIN) != NOT_AN_INTERRUPT) + attachInterrupt(digitalPinToInterrupt(J_MIN_PIN), endstop_ISR, CHANGE); + #else + // Not all used endstop/probe -pins can raise interrupts. Please deactivate ENDSTOP_INTERRUPTS or change the pin configuration! + static_assert(digitalPinToPCICR(J_MIN_PIN) != NULL, "J_MIN_PIN is not interrupt-capable"); + pciSetup(J_MIN_PIN); + #endif + #endif + + #if HAS_K_MAX + #if (digitalPinToInterrupt(K_MAX_PIN) != NOT_AN_INTERRUPT) // if pin has an external interrupt + attachInterrupt(digitalPinToInterrupt(K_MAX_PIN), endstop_ISR, CHANGE); // assign it + #else + // Not all used endstop/probe -pins can raise interrupts. Please deactivate ENDSTOP_INTERRUPTS or change the pin configuration! + static_assert(digitalPinToPCICR(K_MAX_PIN) != NULL, "K_MAX_PIN is not interrupt-capable"); // if pin has no pin change interrupt - error + pciSetup(K_MAX_PIN); // assign it + #endif + #endif + + #if HAS_K_MIN + #if (digitalPinToInterrupt(K_MIN_PIN) != NOT_AN_INTERRUPT) + attachInterrupt(digitalPinToInterrupt(K_MIN_PIN), endstop_ISR, CHANGE); + #else + // Not all used endstop/probe -pins can raise interrupts. Please deactivate ENDSTOP_INTERRUPTS or change the pin configuration! + static_assert(digitalPinToPCICR(K_MIN_PIN) != NULL, "K_MIN_PIN is not interrupt-capable"); + pciSetup(K_MIN_PIN); + #endif + #endif // If we arrive here without raising an assertion, each pin has either an EXT-interrupt or a PCI. } diff --git a/Marlin/src/Marlin.cpp b/Marlin/src/Marlin.cpp index b8aaa4cfb57a..4c57d5cc6b82 100644 --- a/Marlin/src/Marlin.cpp +++ b/Marlin/src/Marlin.cpp @@ -281,6 +281,15 @@ void enable_all_steppers() { enable_X(); enable_Y(); enable_Z(); + #if NON_E_AXES > 3 + enable_I(); + #if NON_E_AXES > 4 + enable_J(); + #if NON_E_AXES > 5 + enable_K(); + #endif + #endif + #endif enable_E0(); enable_E1(); enable_E2(); @@ -313,6 +322,15 @@ void disable_all_steppers() { disable_X(); disable_Y(); disable_Z(); + #if NON_E_AXES > 3 + disable_I(); + #if NON_E_AXES > 4 + disable_J(); + #if NON_E_AXES > 5 + disable_K(); + #endif + #endif + #endif disable_e_steppers(); } @@ -463,6 +481,21 @@ void manage_inactivity(const bool ignore_stepper_queue/*=false*/) { #if ENABLED(DISABLE_INACTIVE_Z) disable_Z(); #endif + #if NON_E_AXES > 3 + #if ENABLED(DISABLE_INACTIVE_I) + disable_I(); + #endif + #if NON_E_AXES > 4 + #if ENABLED(DISABLE_INACTIVE_J) + disable_J(); + #endif + #if NON_E_AXES > 5 + #if ENABLED(DISABLE_INACTIVE_K) + disable_K(); + #endif + #endif + #endif + #endif #if ENABLED(DISABLE_INACTIVE_E) disable_e_steppers(); #endif diff --git a/Marlin/src/Marlin.h b/Marlin/src/Marlin.h index cac22c9024da..da08d6fda33c 100644 --- a/Marlin/src/Marlin.h +++ b/Marlin/src/Marlin.h @@ -142,6 +142,56 @@ void manage_inactivity(const bool ignore_stepper_queue=false); #define enable_Z() do{ Z_enable; Z2_enable; Z3_enable; }while(0) #define disable_Z() do{ Z_disable; Z2_disable; Z3_disable; CBI(axis_known_position, Z_AXIS); }while(0) +#if NON_E_AXES > 3 +#if AXIS_DRIVER_TYPE_I(L6470) + extern L6470 stepperI; + #define I_enable NOOP + #define I_disable stepperI.free() +#elif HAS_I_ENABLE + #define I_enable I_ENABLE_WRITE( I_ENABLE_ON) + #define I_disable I_ENABLE_WRITE(!I_ENABLE_ON) +#else + #define I_enable NOOP + #define I_disable NOOP +#endif + +#define enable_I() do{ I_enable; }while(0) +#define disable_I() do{ I_disable; CBI(axis_known_position, I_AXIS); }while(0) + +#if NON_E_AXES > 4 +#if AXIS_DRIVER_TYPE_J(L6470) + extern L6470 stepperJ; + #define J_enable NOOP + #define J_disable stepperJ.free() +#elif HAS_J_ENABLE + #define J_enable J_ENABLE_WRITE( J_ENABLE_ON) + #define J_disable J_ENABLE_WRITE(!J_ENABLE_ON) +#else + #define J_enable NOOP + #define J_disable NOOP +#endif + +#define enable_J() do{ J_enable; }while(0) +#define disable_J() do{ J_disable; CBI(axis_known_position, J_AXIS); }while(0) + +#if NON_E_AXES > 5 +#if AXIS_DRIVER_TYPE_K(L6470) + extern L6470 stepperK; + #define K_enable NOOP + #define K_disable stepperF.free() +#elif HAS_K_ENABLE + #define K_enable K_ENABLE_WRITE( K_ENABLE_ON) + #define K_disable K_ENABLE_WRITE(!K_ENABLE_ON) +#else + #define K_enable NOOP + #define K_disable NOOP +#endif + +#define enable_J() do{ J_enable; }while(0) +#define disable_J() do{ J_disable; CBI(axis_known_position, J_AXIS); }while(0) +#endif // NON_E_AXES > 5 +#endif // NON_E_AXES > 4 +#endif // NON_E_AXES > 3 // end X, Y, Z Stepper enable / disable // diff --git a/Marlin/src/config/examples/DerAndere/PipetBot-A8/Configuration.h b/Marlin/src/config/examples/DerAndere/PipetBot-A8/Configuration.h new file mode 100644 index 000000000000..3bde71ec3f28 --- /dev/null +++ b/Marlin/src/config/examples/DerAndere/PipetBot-A8/Configuration.h @@ -0,0 +1,2205 @@ +/** + * Marlin 3D Printer Firmware + * Copyright (C) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin] + * + * Based on Sprinter and grbl. + * Copyright (C) 2011 Camiel Gubbels / Erik van der Zalm + * + * 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 . + * + */ +#pragma once + +/** + * Configuration.h + * + * Basic settings such as: + * + * - Type of electronics + * - Type of temperature sensor + * - Printer geometry + * - Endstop configuration + * - LCD controller + * - Extra features + * + * Advanced settings can be found in Configuration_adv.h + * + */ +#define CONFIGURATION_H_VERSION 020000 + +//=========================================================================== +//============================= Getting Started ============================= +//=========================================================================== + +/** + * Here are some standard links for getting your machine calibrated: + * + * http://reprap.org/wiki/Calibration + * http://youtu.be/wAL9d7FgInk + * http://calculator.josefprusa.cz + * http://reprap.org/wiki/Triffid_Hunter%27s_Calibration_Guide + * http://www.thingiverse.com/thing:5573 + * https://sites.google.com/site/repraplogphase/calibration-of-your-reprap + * http://www.thingiverse.com/thing:298812 + */ + +//=========================================================================== +//============================= DELTA Printer =============================== +//=========================================================================== +// For a Delta printer start with one of the configuration files in the +// config/examples/delta directory and customize for your machine. +// + +//=========================================================================== +//============================= SCARA Printer =============================== +//=========================================================================== +// For a SCARA printer start with the configuration files in +// config/examples/SCARA and customize for your machine. +// + +// @section info + +// User-specified version info of this build to display in [Pronterface, etc] terminal window during +// startup. Implementation of an idea by Prof Braino to inform user that any changes made to this +// build by the user have been successfully uploaded into firmware. +#define STRING_CONFIG_H_AUTHOR "(DerAndere, PipetBot-A8 config. Based on Anet config by Bob Kuhn)" // Who made the changes. +#define SHOW_BOOTSCREEN +#define STRING_SPLASH_LINE1 SHORT_BUILD_VERSION // will be shown during bootup in line 1 +#define STRING_SPLASH_LINE2 WEBSITE_URL // will be shown during bootup in line 2 + +/** + * *** VENDORS PLEASE READ *** + * + * Marlin allows you to add a custom boot image for Graphical LCDs. + * With this option Marlin will first show your custom screen followed + * by the standard Marlin logo with version number and web URL. + * + * We encourage you to take advantage of this new feature and we also + * respectfully request that you retain the unmodified Marlin boot screen. + */ + +// Enable to show the bitmap in Marlin/_Bootscreen.h on startup. +//#define SHOW_CUSTOM_BOOTSCREEN + +// Enable to show the bitmap in Marlin/_Statusscreen.h on the status screen. +//#define CUSTOM_STATUS_SCREEN_IMAGE + +// @section machine + +/** + * Select the serial port on the board to use for communication with the host. + * This allows the connection of wireless adapters (for instance) to non-default port pins. + * Note: The first serial port (-1 or 0) will always be used by the Arduino bootloader. + * + * :[-1, 0, 1, 2, 3, 4, 5, 6, 7] + */ +#define SERIAL_PORT 0 + +/** + * Select a secondary serial port on the board to use for communication with the host. + * This allows the connection of wireless adapters (for instance) to non-default port pins. + * Serial port -1 is the USB emulated serial port, if available. + * + * :[-1, 0, 1, 2, 3, 4, 5, 6, 7] + */ +//#define SERIAL_PORT_2 -1 + +/** + * This setting determines the communication speed of the printer. + * + * 250000 works in most cases, but you might try a lower speed if + * you commonly experience drop-outs during host printing. + * You may try up to 1000000 to speed up SD file transfer. + * + * :[2400, 9600, 19200, 38400, 57600, 115200, 250000, 500000, 1000000] + */ +#define BAUDRATE 115200 + +// Enable the Bluetooth serial interface on AT90USB devices +//#define BLUETOOTH + +// The following define selects which electronics board you have. +// Please choose the name from boards.h that matches your setup +#ifndef MOTHERBOARD + #define MOTHERBOARD BOARD_DERANDERE_PB_1 +#endif + +// Optional custom name for your RepStrap or other custom machine +// Displayed in the LCD "Ready" message +//#define CUSTOM_MACHINE_NAME "3D Printer" + +// Define this to set a unique identifier for this printer, (Used by some programs to differentiate between machines) +// You can use an online service to generate a random UUID. (eg http://www.uuidgenerator.net/version4) +//#define MACHINE_UUID "00000000-0000-0000-0000-000000000000" + +// This defines the number of axes that are not used for extruders (axes that benefit from endstops and homing). +// This must be set to 3 also if one or more of the positioning axes are driven by multiple stepper motors. Only increase +// for robots with additional axes (tools apart from extruders that are driven by stepper motors) +#define NON_E_AXES 4 + +// @section extruder + +// This defines the number of extruders +// :[1, 2, 3, 4, 5, 6] +#define EXTRUDERS 1 + +// Generally expected filament diameter (1.75, 2.85, 3.0, ...). Used for Volumetric, Filament Width Sensor, etc. +// The Anet A8 original extruder is designed for 1.75mm +#define DEFAULT_NOMINAL_FILAMENT_DIA 1.0 + +// For Cyclops or any "multi-extruder" that shares a single nozzle. +//#define SINGLENOZZLE + +/** + * Průša MK2 Single Nozzle Multi-Material Multiplexer, and variants. + * + * This device allows one stepper driver on a control board to drive + * two to eight stepper motors, one at a time, in a manner suitable + * for extruders. + * + * This option only allows the multiplexer to switch on tool-change. + * Additional options to configure custom E moves are pending. + */ +//#define MK2_MULTIPLEXER +#if ENABLED(MK2_MULTIPLEXER) + // Override the default DIO selector pins here, if needed. + // Some pins files may provide defaults for these pins. + //#define E_MUX0_PIN 40 // Always Required + //#define E_MUX1_PIN 42 // Needed for 3 to 8 inputs + //#define E_MUX2_PIN 44 // Needed for 5 to 8 inputs +#endif + +/** + * Prusa Multi-Material Unit v2 + * + * Requires NOZZLE_PARK_FEATURE to park print head in case MMU unit fails. + * Requires EXTRUDERS = 5 + * + * For additional configuration see Configuration_adv.h + */ +//#define PRUSA_MMU2 + +// A dual extruder that uses a single stepper motor +//#define SWITCHING_EXTRUDER +#if ENABLED(SWITCHING_EXTRUDER) + #define SWITCHING_EXTRUDER_SERVO_NR 0 + #define SWITCHING_EXTRUDER_SERVO_ANGLES { 0, 90 } // Angles for E0, E1[, E2, E3] + #if EXTRUDERS > 3 + #define SWITCHING_EXTRUDER_E23_SERVO_NR 1 + #endif +#endif + +// A dual-nozzle that uses a servomotor to raise/lower one (or both) of the nozzles +//#define SWITCHING_NOZZLE +#if ENABLED(SWITCHING_NOZZLE) + #define SWITCHING_NOZZLE_SERVO_NR 0 + //#define SWITCHING_NOZZLE_E1_SERVO_NR 1 // If two servos are used, the index of the second + #define SWITCHING_NOZZLE_SERVO_ANGLES { 0, 90 } // Angles for E0, E1 (single servo) or lowered/raised (dual servo) +#endif + +/** + * Two separate X-carriages with extruders that connect to a moving part + * via a solenoid docking mechanism. Requires SOL1_PIN and SOL2_PIN. + */ +//#define PARKING_EXTRUDER + +/** + * Two separate X-carriages with extruders that connect to a moving part + * via a magnetic docking mechanism using movements and no solenoid + * + * project : https://www.thingiverse.com/thing:3080893 + * movements : https://youtu.be/0xCEiG9VS3k + * https://youtu.be/Bqbcs0CU2FE + */ +//#define MAGNETIC_PARKING_EXTRUDER + +#if ENABLED(PARKING_EXTRUDER) || ENABLED(MAGNETIC_PARKING_EXTRUDER) + + #define PARKING_EXTRUDER_PARKING_X { -78, 184 } // X positions for parking the extruders + #define PARKING_EXTRUDER_GRAB_DISTANCE 1 // (mm) Distance to move beyond the parking point to grab the extruder + //#define MANUAL_SOLENOID_CONTROL // Manual control of docking solenoids with M380 S / M381 + + #if ENABLED(PARKING_EXTRUDER) + + #define PARKING_EXTRUDER_SOLENOIDS_INVERT // If enabled, the solenoid is NOT magnetized with applied voltage + #define PARKING_EXTRUDER_SOLENOIDS_PINS_ACTIVE LOW // LOW or HIGH pin signal energizes the coil + #define PARKING_EXTRUDER_SOLENOIDS_DELAY 250 // (ms) Delay for magnetic field. No delay if 0 or not defined. + //#define MANUAL_SOLENOID_CONTROL // Manual control of docking solenoids with M380 S / M381 + + #elif ENABLED(MAGNETIC_PARKING_EXTRUDER) + + #define MPE_FAST_SPEED 9000 // (mm/m) Speed for travel before last distance point + #define MPE_SLOW_SPEED 4500 // (mm/m) Speed for last distance travel to park and couple + #define MPE_TRAVEL_DISTANCE 10 // (mm) Last distance point + #define MPE_COMPENSATION 0 // Offset Compensation -1 , 0 , 1 (multiplier) only for coupling + + #endif + +#endif + +/** + * Switching Toolhead + * + * Support for swappable and dockable toolheads, such as + * the E3D Tool Changer. Toolheads are locked with a servo. + */ +//#define SWITCHING_TOOLHEAD +#if ENABLED(SWITCHING_TOOLHEAD) + #define SWITCHING_TOOLHEAD_SERVO_NR 2 // Index of the servo connector + #define SWITCHING_TOOLHEAD_SERVO_ANGLES { 0, 180 } // (degrees) Angles for Lock, Unlock + #define SWITCHING_TOOLHEAD_Y_POS 235 // (mm) Y position of the toolhead dock + #define SWITCHING_TOOLHEAD_Y_SECURITY 10 // (mm) Security distance Y axis + #define SWITCHING_TOOLHEAD_Y_CLEAR 60 // (mm) Minimum distance from dock for unobstructed X axis + #define SWITCHING_TOOLHEAD_X_POS { 215, 0 } // (mm) X positions for parking the extruders +#endif + +/** + * "Mixing Extruder" + * - Adds G-codes M163 and M164 to set and "commit" the current mix factors. + * - Extends the stepping routines to move multiple steppers in proportion to the mix. + * - Optional support for Repetier Firmware's 'M164 S' supporting virtual tools. + * - This implementation supports up to two mixing extruders. + * - Enable DIRECT_MIXING_IN_G1 for M165 and mixing in G1 (from Pia Taubert's reference implementation). + */ +//#define MIXING_EXTRUDER +#if ENABLED(MIXING_EXTRUDER) + #define MIXING_STEPPERS 2 // Number of steppers in your mixing extruder + #define MIXING_VIRTUAL_TOOLS 16 // Use the Virtual Tool method with M163 and M164 + //#define DIRECT_MIXING_IN_G1 // Allow ABCDHI mix factors in G1 movement commands + //#define GRADIENT_MIX // Support for gradient mixing with M166 and LCD + #if ENABLED(GRADIENT_MIX) + //#define GRADIENT_VTOOL // Add M166 T to use a V-tool index as a Gradient alias + #endif +#endif + +// Offset of the extruders (uncomment if using more than one and relying on firmware to position when changing). +// The offset has to be X=0, Y=0 for the extruder 0 hotend (default extruder). +// For the other hotends it is their distance from the extruder 0 hotend. +//#define HOTEND_OFFSET_X {0.0, 20.00} // (mm) relative X-offset for each nozzle +//#define HOTEND_OFFSET_Y {0.0, 5.00} // (mm) relative Y-offset for each nozzle +//#define HOTEND_OFFSET_Z {0.0, 0.00} // (mm) relative Z-offset for each nozzle + +// @section machine + +/** + * Select your power supply here. Use 0 if you haven't connected the PS_ON_PIN + * + * 0 = No Power Switch + * 1 = ATX + * 2 = X-Box 360 203Watts (the blue wire connected to PS_ON and the red wire to VCC) + * + * :{ 0:'No power switch', 1:'ATX', 2:'X-Box 360' } + */ +#define POWER_SUPPLY 0 + +#if POWER_SUPPLY > 0 + // Enable this option to leave the PSU off at startup. + // Power to steppers and heaters will need to be turned on with M80. + //#define PS_DEFAULT_OFF + + //#define AUTO_POWER_CONTROL // Enable automatic control of the PS_ON pin + #if ENABLED(AUTO_POWER_CONTROL) + #define AUTO_POWER_FANS // Turn on PSU if fans need power + #define AUTO_POWER_E_FANS + #define AUTO_POWER_CONTROLLERFAN + #define POWER_TIMEOUT 30 + #endif + +#endif + +// @section temperature + +//=========================================================================== +//============================= Thermal Settings ============================ +//=========================================================================== + +/** + * --NORMAL IS 4.7kohm PULLUP!-- 1kohm pullup can be used on hotend sensor, using correct resistor and table + * + * Temperature sensors available: + * + * -4 : thermocouple with AD8495 + * -3 : thermocouple with MAX31855 (only for sensor 0) + * -2 : thermocouple with MAX6675 (only for sensor 0) + * -1 : thermocouple with AD595 + * 0 : not used + * 1 : 100k thermistor - best choice for EPCOS 100k (4.7k pullup) + * 2 : 200k thermistor - ATC Semitec 204GT-2 (4.7k pullup) + * 3 : Mendel-parts thermistor (4.7k pullup) + * 4 : 10k thermistor !! do not use it for a hotend. It gives bad resolution at high temp. !! + * 5 : 100K thermistor - ATC Semitec 104GT-2/104NT-4-R025H42G (Used in ParCan & J-Head) (4.7k pullup) + * 501 : 100K Zonestar (Tronxy X3A) Thermistor + * 6 : 100k EPCOS - Not as accurate as table 1 (created using a fluke thermocouple) (4.7k pullup) + * 7 : 100k Honeywell thermistor 135-104LAG-J01 (4.7k pullup) + * 71 : 100k Honeywell thermistor 135-104LAF-J01 (4.7k pullup) + * 8 : 100k 0603 SMD Vishay NTCS0603E3104FXT (4.7k pullup) + * 9 : 100k GE Sensing AL03006-58.2K-97-G1 (4.7k pullup) + * 10 : 100k RS thermistor 198-961 (4.7k pullup) + * 11 : 100k beta 3950 1% thermistor (4.7k pullup) + * 12 : 100k 0603 SMD Vishay NTCS0603E3104FXT (4.7k pullup) (calibrated for Makibox hot bed) + * 13 : 100k Hisens 3950 1% up to 300°C for hotend "Simple ONE " & "Hotend "All In ONE" + * 15 : 100k thermistor calibration for JGAurora A5 hotend + * 20 : the PT100 circuit found in the Ultimainboard V2.x + * 60 : 100k Maker's Tool Works Kapton Bed Thermistor beta=3950 + * 61 : 100k Formbot / Vivedino 3950 350C thermistor 4.7k pullup + * 66 : 4.7M High Temperature thermistor from Dyze Design + * 70 : the 100K thermistor found in the bq Hephestos 2 + * 75 : 100k Generic Silicon Heat Pad with NTC 100K MGB18-104F39050L32 thermistor + * + * 1k ohm pullup tables - This is atypical, and requires changing out the 4.7k pullup for 1k. + * (but gives greater accuracy and more stable PID) + * 51 : 100k thermistor - EPCOS (1k pullup) + * 52 : 200k thermistor - ATC Semitec 204GT-2 (1k pullup) + * 55 : 100k thermistor - ATC Semitec 104GT-2 (Used in ParCan & J-Head) (1k pullup) + * + * 1047 : Pt1000 with 4k7 pullup + * 1010 : Pt1000 with 1k pullup (non standard) + * 147 : Pt100 with 4k7 pullup + * 110 : Pt100 with 1k pullup (non standard) + * + * Use these for Testing or Development purposes. NEVER for production machine. + * 998 : Dummy Table that ALWAYS reads 25°C or the temperature defined below. + * 999 : Dummy Table that ALWAYS reads 100°C or the temperature defined below. + * + * :{ '0': "Not used", '1':"100k / 4.7k - EPCOS", '2':"200k / 4.7k - ATC Semitec 204GT-2", '3':"Mendel-parts / 4.7k", '4':"10k !! do not use for a hotend. Bad resolution at high temp. !!", '5':"100K / 4.7k - ATC Semitec 104GT-2 (Used in ParCan & J-Head)", '501':"100K Zonestar (Tronxy X3A)", '6':"100k / 4.7k EPCOS - Not as accurate as Table 1", '7':"100k / 4.7k Honeywell 135-104LAG-J01", '8':"100k / 4.7k 0603 SMD Vishay NTCS0603E3104FXT", '9':"100k / 4.7k GE Sensing AL03006-58.2K-97-G1", '10':"100k / 4.7k RS 198-961", '11':"100k / 4.7k beta 3950 1%", '12':"100k / 4.7k 0603 SMD Vishay NTCS0603E3104FXT (calibrated for Makibox hot bed)", '13':"100k Hisens 3950 1% up to 300°C for hotend 'Simple ONE ' & hotend 'All In ONE'", '20':"PT100 (Ultimainboard V2.x)", '51':"100k / 1k - EPCOS", '52':"200k / 1k - ATC Semitec 204GT-2", '55':"100k / 1k - ATC Semitec 104GT-2 (Used in ParCan & J-Head)", '60':"100k Maker's Tool Works Kapton Bed Thermistor beta=3950", '61':"100k Formbot / Vivedino 3950 350C thermistor 4.7k pullup", '66':"Dyze Design 4.7M High Temperature thermistor", '70':"the 100K thermistor found in the bq Hephestos 2", '71':"100k / 4.7k Honeywell 135-104LAF-J01", '147':"Pt100 / 4.7k", '1047':"Pt1000 / 4.7k", '110':"Pt100 / 1k (non-standard)", '1010':"Pt1000 / 1k (non standard)", '-4':"Thermocouple + AD8495", '-3':"Thermocouple + MAX31855 (only for sensor 0)", '-2':"Thermocouple + MAX6675 (only for sensor 0)", '-1':"Thermocouple + AD595",'998':"Dummy 1", '999':"Dummy 2" } + */ +#define TEMP_SENSOR_0 998 +#define TEMP_SENSOR_1 0 +#define TEMP_SENSOR_2 0 +#define TEMP_SENSOR_3 0 +#define TEMP_SENSOR_4 0 +#define TEMP_SENSOR_5 0 +#define TEMP_SENSOR_BED 0 +#define TEMP_SENSOR_CHAMBER 0 + +// Dummy thermistor constant temperature readings, for use with 998 and 999 +#define DUMMY_THERMISTOR_998_VALUE 25 +#define DUMMY_THERMISTOR_999_VALUE 100 + +// Use temp sensor 1 as a redundant sensor with sensor 0. If the readings +// from the two sensors differ too much the print will be aborted. +//#define TEMP_SENSOR_1_AS_REDUNDANT +#define MAX_REDUNDANT_TEMP_SENSOR_DIFF 10 + +// Extruder temperature must be close to target for this long before M109 returns success +#define TEMP_RESIDENCY_TIME 6 // (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 6 // (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. + +// The minimal temperature defines the temperature below which the heater will not be enabled It is used +// 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 +#define HEATER_1_MINTEMP 5 +#define HEATER_2_MINTEMP 5 +#define HEATER_3_MINTEMP 5 +#define HEATER_4_MINTEMP 5 +#define HEATER_5_MINTEMP 5 +#define BED_MINTEMP 5 + +// When temperature exceeds max temp, your heater will be switched off. +// 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 140 +#define HEATER_1_MAXTEMP 140 +#define HEATER_2_MAXTEMP 140 +#define HEATER_3_MAXTEMP 140 +#define HEATER_4_MAXTEMP 140 +#define HEATER_5_MAXTEMP 140 +#define BED_MAXTEMP 140 + +//=========================================================================== +//============================= PID Settings ================================ +//=========================================================================== +// PID Tuning Guide here: http://reprap.org/wiki/PID_Tuning + +// Comment the following line to disable PID and enable bang-bang. +#define PIDTEMP +#define BANG_MAX 255 // Limits current to nozzle while in bang-bang mode; 255=full current +#define PID_MAX BANG_MAX // Limits current to nozzle while PID is active (see PID_FUNCTIONAL_RANGE below); 255=full current +#define PID_K1 0.95 // Smoothing factor within any PID loop +#if ENABLED(PIDTEMP) + //#define PID_EDIT_MENU // Add PID editing to the "Advanced Settings" menu. (~700 bytes of PROGMEM) + //#define PID_AUTOTUNE_MENU // Add PID auto-tuning to the "Advanced Settings" menu. (~250 bytes of PROGMEM) + //#define PID_DEBUG // Sends debug data to the serial port. + //#define PID_OPENLOOP 1 // Puts PID in open loop. M104/M140 sets the output power from 0 to PID_MAX + //#define SLOW_PWM_HEATERS // PWM with very low frequency (roughly 0.125Hz=8s) and minimum state time of approximately 1s useful for heaters driven by a relay + //#define PID_PARAMS_PER_HOTEND // Uses separate PID parameters for each extruder (useful for mismatched extruders) + // Set/get with gcode: M301 E[extruder number, 0-2] + #define PID_FUNCTIONAL_RANGE 15 // If the temperature difference between the target temperature and the actual temperature + // is more than PID_FUNCTIONAL_RANGE then the PID will be shut off and the heater will be set to min/max. + + // If you are using a pre-configured hotend then you can use one of the value sets by uncommenting it + + // Ultimaker + //#define DEFAULT_Kp 21.0 + //#define DEFAULT_Ki 1.25 + //#define DEFAULT_Kd 86.0 + + // MakerGear + //#define DEFAULT_Kp 7.0 + //#define DEFAULT_Ki 0.1 + //#define DEFAULT_Kd 12 + + // Mendel Parts V9 on 12V + //#define DEFAULT_Kp 63.0 + //#define DEFAULT_Ki 2.25 + //#define DEFAULT_Kd 440 + + // ANET A8 Standard Extruder at 210 Degree Celsius and 100% Fan + //(measured after M106 S255 with M303 E0 S210 C8) + #define DEFAULT_Kp 21.0 + #define DEFAULT_Ki 1.25 + #define DEFAULT_Kd 86.0 + +#endif // PIDTEMP + +//=========================================================================== +//============================= PID > Bed Temperature Control =============== +//=========================================================================== + +/** + * PID Bed Heating + * + * If this option is enabled set PID constants below. + * If this option is disabled, bang-bang will be used and BED_LIMIT_SWITCHING will enable hysteresis. + * + * The PID frequency will be the same as the extruder PWM. + * If PID_dT is the default, and correct for the hardware/configuration, that means 7.689Hz, + * which is fine for driving a square wave into a resistive load and does not significantly + * impact FET heating. This also works fine on a Fotek SSR-10DA Solid State Relay into a 250W + * heater. If your configuration is significantly different than this and you don't understand + * the issues involved, don't use bed PID until someone else verifies that your hardware works. + */ +//#define PIDTEMPBED + +#define BED_LIMIT_SWITCHING + +/** + * Max Bed Power + * Applies to all forms of bed control (PID, bang-bang, and bang-bang with hysteresis). + * When set to any value below 255, enables a form of PWM to the bed that acts like a divider + * so don't use it unless you are OK with PWM on your bed. (See the comment on enabling PIDTEMPBED) + */ +#define MAX_BED_POWER 255 // limits duty cycle to bed; 255=full current + +#if ENABLED(PIDTEMPBED) + + //#define PID_BED_DEBUG // Sends debug data to the serial port. + + //120V 250W silicone heater into 4mm borosilicate (MendelMax 1.5+) + //from FOPDT model - kp=.39 Tp=405 Tdead=66, Tc set to 79.2, aggressive factor of .15 (vs .1, 1, 10) + #define DEFAULT_bedKp 10.00 + #define DEFAULT_bedKi .023 + #define DEFAULT_bedKd 305.4 + + //120V 250W silicone heater into 4mm borosilicate (MendelMax 1.5+) + //from pidautotune + //#define DEFAULT_bedKp 97.1 + //#define DEFAULT_bedKi 1.41 + //#define DEFAULT_bedKd 1675.16 + + // FIND YOUR OWN: "M303 E-1 C8 S90" to run autotune on the bed at 90 degreesC for 8 cycles. +#endif // PIDTEMPBED + +// @section extruder + +/** + * Prevent extrusion if the temperature is below EXTRUDE_MINTEMP. + * Add M302 to set the minimum extrusion temperature and/or turn + * cold extrusion prevention on and off. + * + * *** IT IS HIGHLY RECOMMENDED TO LEAVE THIS OPTION ENABLED! *** + */ +//#define PREVENT_COLD_EXTRUSION +#define EXTRUDE_MINTEMP 5 // 160 guards against false tripping when the extruder fan kicks on. + +/** + * Prevent a single extrusion longer than EXTRUDE_MAXLENGTH. + * Note: For Bowden Extruders make this large enough to allow load/unload. + */ +//#define PREVENT_LENGTHY_EXTRUDE +//#define EXTRUDE_MAXLENGTH 200 + +//=========================================================================== +//======================== Thermal Runaway Protection ======================= +//=========================================================================== + +/** + * Thermal Protection provides additional protection to your printer from damage + * and fire. Marlin always includes safe min and max temperature ranges which + * protect against a broken or disconnected thermistor wire. + * + * The issue: If a thermistor falls out, it will report the much lower + * temperature of the air in the room, and the the firmware will keep + * the heater on. + * + * If you get "Thermal Runaway" or "Heating failed" errors the + * details can be tuned in Configuration_adv.h + */ + +//#define THERMAL_PROTECTION_HOTENDS // Enable thermal protection for all extruders +//#define THERMAL_PROTECTION_BED // Enable thermal protection for the heated bed + +//=========================================================================== +//============================= Mechanical Settings ========================= +//=========================================================================== + +// @section machine + +// Uncomment one of these options to enable CoreXY, CoreXZ, or CoreYZ kinematics +// either in the usual order or reversed +//#define COREXY +//#define COREXZ +//#define COREYZ +//#define COREYX +//#define COREZX +//#define COREZY + +//=========================================================================== +//============================== Endstop Settings =========================== +//=========================================================================== + +// @section homing + +// Specify here all the endstop connectors that are connected to any endstop or probe. +// Almost all printers will be using one per axis. Probes will use one or more of the +// extra connectors. Leave undefined any used for non-endstop and non-probe purposes. +#define USE_XMIN_PLUG +#define USE_YMIN_PLUG +#define USE_ZMIN_PLUG +#define USE_IMIN_PLUG +//#define USE_JMIN_PLUG +//#define USE_KMIN_PLUG +//#define USE_XMAX_PLUG +//#define USE_YMAX_PLUG +//#define USE_ZMAX_PLUG +//#define USE_IMAX_PLUG +//#define USE_JMIN_PLUG +//#define USE_KMIN_PLUG + +// Enable pullup for all endstops to prevent a floating state +#define ENDSTOPPULLUPS +#if DISABLED(ENDSTOPPULLUPS) + // Disable ENDSTOPPULLUPS to set pullups individually + //#define ENDSTOPPULLUP_XMAX + //#define ENDSTOPPULLUP_YMAX + //#define ENDSTOPPULLUP_ZMAX + //#define ENDSTOPPULLUP_IMAX + //#define ENDSTOPPULLUP_JMAX + //#define ENDSTOPPULLUP_KMAX + //#define ENDSTOPPULLUP_XMIN + //#define ENDSTOPPULLUP_YMIN + //#define ENDSTOPPULLUP_ZMIN + //#define ENDSTOPPULLUP_IMIN + //#define ENDSTOPPULLUP_JMIN + //#define ENDSTOPPULLUP_KMIN + //#define ENDSTOPPULLUP_ZMIN_PROBE +#endif + +// Enable pulldown for all endstops to prevent a floating state +//#define ENDSTOPPULLDOWNS +#if DISABLED(ENDSTOPPULLDOWNS) + // Disable ENDSTOPPULLDOWNS to set pulldowns individually + //#define ENDSTOPPULLDOWN_XMAX + //#define ENDSTOPPULLDOWN_YMAX + //#define ENDSTOPPULLDOWN_ZMAX + //#define ENDSTOPPULLDOWN_IMAX + //#define ENDSTOPPULLDOWN_JMAX + //#define ENDSTOPPULLDOWN_KMAX + //#define ENDSTOPPULLDOWN_XMIN + //#define ENDSTOPPULLDOWN_YMIN + //#define ENDSTOPPULLDOWN_ZMIN + //#define ENDSTOPPULLDOWN_IMIN + //#define ENDSTOPPULLDOWN_JMIN + //#define ENDSTOPPULLDOWN_KMIN + //#define ENDSTOPPULLDOWN_ZMIN_PROBE +#endif + +// Mechanical endstop with COM to ground and NC to Signal uses "false" here (most common setup). +#define X_MIN_ENDSTOP_INVERTING true // set to true to invert the logic of the endstop. +#define Y_MIN_ENDSTOP_INVERTING true // set to true to invert the logic of the endstop. +#define Z_MIN_ENDSTOP_INVERTING true // set to true to invert the logic of the endstop. +#define I_MIN_ENDSTOP_INVERTING true // set to true to invert the logic of the endstop. +#define J_MIN_ENDSTOP_INVERTING true // set to true to invert the logic of the endstop. +#define K_MIN_ENDSTOP_INVERTING true // set to true to invert the logic of the endstop. +#define X_MAX_ENDSTOP_INVERTING true // set to true to invert the logic of the endstop. +#define Y_MAX_ENDSTOP_INVERTING true // set to true to invert the logic of the endstop. +#define Z_MAX_ENDSTOP_INVERTING true // set to true to invert the logic of the endstop. +#define I_MAX_ENDSTOP_INVERTING true // set to true to invert the logic of the endstop. +#define J_MAX_ENDSTOP_INVERTING true // set to true to invert the logic of the endstop. +#define K_MAX_ENDSTOP_INVERTING true // set to true to invert the logic of the endstop. +#define Z_MIN_PROBE_ENDSTOP_INVERTING true // set to true to invert the logic of the probe. + +/** + * Stepper Drivers + * + * These settings allow Marlin to tune stepper driver timing and enable advanced options for + * stepper drivers that support them. You may also override timing options in Configuration_adv.h. + * + * A4988 is assumed for unspecified drivers. + * + * Options: A4988, A5984, DRV8825, LV8729, L6470, TB6560, TB6600, TMC2100, + * TMC2130, TMC2130_STANDALONE, TMC2208, TMC2208_STANDALONE, + * TMC26X, TMC26X_STANDALONE, TMC2660, TMC2660_STANDALONE, + * TMC2160, TMC2160_STANDALONE, TMC5130, TMC5130_STANDALONE, + * TMC5160, TMC5160_STANDALONE + * :['A4988', 'A5984', 'DRV8825', 'LV8729', 'L6470', 'TB6560', 'TB6600', 'TMC2100', 'TMC2130', 'TMC2130_STANDALONE', 'TMC2160', 'TMC2160_STANDALONE', 'TMC2208', 'TMC2208_STANDALONE', 'TMC26X', 'TMC26X_STANDALONE', 'TMC2660', 'TMC2660_STANDALONE', 'TMC5130', 'TMC5130_STANDALONE', 'TMC5160', 'TMC5160_STANDALONE'] + */ +//#define X_DRIVER_TYPE A4988 +//#define Y_DRIVER_TYPE A4988 +//#define Z_DRIVER_TYPE A4988 +//#define X2_DRIVER_TYPE A4988 +//#define Y2_DRIVER_TYPE A4988 +//#define Z2_DRIVER_TYPE A4988 +//#define Z3_DRIVER_TYPE A4988 +//#define E0_DRIVER_TYPE A4988 +//#define E1_DRIVER_TYPE A4988 +//#define E2_DRIVER_TYPE A4988 +//#define E3_DRIVER_TYPE A4988 +//#define E4_DRIVER_TYPE A4988 +//#define E5_DRIVER_TYPE A4988 + +// Enable this feature if all enabled endstop pins are interrupt-capable. +// This will remove the need to poll the interrupt pins, saving many CPU cycles. +#define ENDSTOP_INTERRUPTS_FEATURE + +/** + * Endstop Noise Threshold + * + * Enable if your probe or endstops falsely trigger due to noise. + * + * - Higher values may affect repeatability or accuracy of some bed probes. + * - To fix noise install a 100nF ceramic capacitor inline with the switch. + * - This feature is not required for common micro-switches mounted on PCBs + * based on the Makerbot design, which already have the 100nF capacitor. + * + * :[2,3,4,5,6,7] + */ +//#define ENDSTOP_NOISE_THRESHOLD 2 + +//============================================================================= +//============================== Movement Settings ============================ +//============================================================================= +// @section motion + +/** + * Default Settings + * + * These settings can be reset by M502 + * + * Note that if EEPROM is enabled, saved values will override these. + */ + +/** + * With this option each E stepper can have its own factors for the + * following movement settings. If fewer factors are given than the + * total number of extruders, the last value applies to the rest. + */ +//#define DISTINCT_E_FACTORS + +/** + * Default Axis Steps Per Unit (steps/mm) + * Override with M92 + * X, Y, Z, E0 [, E1[, E2[, E3[, E4[, E5]]]]] + */ +#define DEFAULT_AXIS_STEPS_PER_UNIT { 100, 100, 400, 400, 400 } + +/** + * Default Max Feed Rate (mm/s) + * Override with M203 + * X, Y, Z, [I ,[J ,[K ,]]] E0 [, E1[, E2[, E3[, E4[, E5]]]]] + */ +#define DEFAULT_MAX_FEEDRATE { 320, 320, 20, 50, 50 } + +/** + * Default Max Acceleration (change/s) change = mm/s + * (Maximum start speed for accelerated moves) + * Override with M201 + * X, Y, Z, [I ,[J ,[K ,]]] E0 [, E1[, E2[, E3[, E4[, E5]]]]] + */ +#define DEFAULT_MAX_ACCELERATION { 2000, 2000, 200, 200, 200 } + +/** + * Default Acceleration (change/s) change = mm/s + * Override with M204 + * + * M204 P Acceleration + * M204 R Retract Acceleration + * M204 T Travel Acceleration + */ +#define DEFAULT_ACCELERATION 400 // X, Y, Z and E acceleration for printing moves +#define DEFAULT_RETRACT_ACCELERATION 400 // E acceleration for retracts +#define DEFAULT_TRAVEL_ACCELERATION 1000 // X, Y, Z acceleration for travel (non printing) moves + +// +// Use Junction Deviation instead of traditional Jerk Limiting +// +//#define JUNCTION_DEVIATION +#if ENABLED(JUNCTION_DEVIATION) + #define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge +#endif + +/** + * Default Jerk (mm/s) + * Override with M205 X Y Z E + * + * "Jerk" specifies the minimum speed change that requires acceleration. + * When changing speed and direction, if the difference is less than the + * value set here, it may happen instantaneously. + */ +#if DISABLED(JUNCTION_DEVIATION) + #define DEFAULT_XJERK 10.0 + #define DEFAULT_YJERK 10.0 + #define DEFAULT_ZJERK 0.3 + #if NON_E_AXES > 3 + #define DEFAULT_IJERK 0.3 + #if NON_E_AXES > 4 + #define DEFAULT_JJERK 0.3 + #if NON_E_AXES > 5 + #define DEFAULT_KJERK 0.3 + #endif + #endif + #endif +#endif + +#define DEFAULT_EJERK 0.3 // May be used by Linear Advance + + +/** + * S-Curve Acceleration + * + * This option eliminates vibration during printing by fitting a Bézier + * curve to move acceleration, producing much smoother direction changes. + * + * See https://github.com/synthetos/TinyG/wiki/Jerk-Controlled-Motion-Explained + */ +//#define S_CURVE_ACCELERATION + +//=========================================================================== +//============================= Z Probe Options ============================= +//=========================================================================== +// @section probes + +// +// See http://marlinfw.org/docs/configuration/probes.html +// + +/** + * Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN + * + * Enable this option for a probe connected to the Z Min endstop pin. + */ +#define Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN + +/** + * Z_MIN_PROBE_ENDSTOP + * + * Enable this option for a probe connected to any pin except Z-Min. + * (By default Marlin assumes the Z-Max endstop pin.) + * To use a custom Z Probe pin, set Z_MIN_PROBE_PIN below. + * + * - The simplest option is to use a free endstop connector. + * - Use 5V for powered (usually inductive) sensors. + * + * - RAMPS 1.3/1.4 boards may use the 5V, GND, and Aux4->D32 pin: + * - For simple switches connect... + * - normally-closed switches to GND and D32. + * - normally-open switches to 5V and D32. + * + * WARNING: Setting the wrong pin may have unexpected and potentially + * disastrous consequences. Use with caution and do your homework. + * + */ +//#define Z_MIN_PROBE_ENDSTOP + +/** + * Probe Type + * + * Allen Key Probes, Servo Probes, Z-Sled Probes, FIX_MOUNTED_PROBE, etc. + * Activate one of these to use Auto Bed Leveling below. + */ + +/** + * The "Manual Probe" provides a means to do "Auto" Bed Leveling without a probe. + * Use G29 repeatedly, adjusting the Z height at each point with movement commands + * or (with LCD_BED_LEVELING) the LCD controller. + */ +//#define PROBE_MANUALLY +//#define MANUAL_PROBE_START_Z 0.2 + +/** + * A Fix-Mounted Probe either doesn't deploy or needs manual deployment. + * (e.g., an inductive probe or a nozzle-based probe-switch.) + */ +//#define FIX_MOUNTED_PROBE + +/** + * Z Servo Probe, such as an endstop switch on a rotating arm. + */ +//#define Z_PROBE_SERVO_NR 0 // Defaults to SERVO 0 connector. +//#define Z_SERVO_ANGLES {70,0} // Z Servo Deploy and Stow angles + +/** + * The BLTouch probe uses a Hall effect sensor and emulates a servo. + */ +//#define BLTOUCH +#if ENABLED(BLTOUCH) + //#define BLTOUCH_DELAY 375 // (ms) Enable and increase if needed +#endif + +// A probe that is deployed and stowed with a solenoid pin (SOL1_PIN) +//#define SOLENOID_PROBE + +// A sled-mounted probe like those designed by Charles Bell. +//#define Z_PROBE_SLED +//#define SLED_DOCKING_OFFSET 5 // The extra distance the X axis must travel to pickup the sled. 0 should be fine but you can push it further if you'd like. + +// A probe deployed by moving the x-axis, such as the Wilson II's rack-and-pinion probe designed by Marty Rice. +//#define RACK_AND_PINION_PROBE +#if ENABLED(RACK_AND_PINION_PROBE) + #define Z_PROBE_DEPLOY_X X_MIN_POS + #define Z_PROBE_RETRACT_X X_MAX_POS +#endif + +// +// For Z_PROBE_ALLEN_KEY see the Delta example configurations. +// + +/** + * Z Probe to nozzle (X,Y) offset, relative to (0, 0). + * X and Y offsets must be integers. + * + * In the following example the X and Y offsets are both positive: + * #define X_PROBE_OFFSET_FROM_EXTRUDER 10 + * #define Y_PROBE_OFFSET_FROM_EXTRUDER 10 + * + * +-- BACK ---+ + * | | + * L | (+) P | R <-- probe (20,20) + * E | | I + * F | (-) N (+) | G <-- nozzle (10,10) + * T | | H + * | (-) | T + * | | + * O-- FRONT --+ + * (0,0) + */ +#define X_PROBE_OFFSET_FROM_EXTRUDER 0 // X offset: -left +right [of the nozzle] +#define Y_PROBE_OFFSET_FROM_EXTRUDER 0 // Y offset: -front +behind [the nozzle] +#define Z_PROBE_OFFSET_FROM_EXTRUDER 0 // Z offset: -below +above [the nozzle] + +// Certain types of probes need to stay away from edges +#define MIN_PROBE_EDGE 10 + +// X and Y axis travel speed (mm/m) between probes +#define XY_PROBE_SPEED 6000 + +// Feedrate (mm/m) for the first approach when double-probing (MULTIPLE_PROBING == 2) +#define Z_PROBE_SPEED_FAST HOMING_FEEDRATE_Z + +// Feedrate (mm/m) for the "accurate" probe of each point +#define Z_PROBE_SPEED_SLOW (Z_PROBE_SPEED_FAST / 2) + +// The number of probes to perform at each point. +// Set to 2 for a fast/slow probe, using the second probe result. +// Set to 3 or more for slow probes, averaging the results. +//#define MULTIPLE_PROBING 2 + +/** + * Z probes require clearance when deploying, stowing, and moving between + * probe points to avoid hitting the bed and other hardware. + * Servo-mounted probes require extra space for the arm to rotate. + * Inductive probes need space to keep from triggering early. + * + * Use these settings to specify the distance (mm) to raise the probe (or + * lower the bed). The values set here apply over and above any (negative) + * probe Z Offset set with Z_PROBE_OFFSET_FROM_EXTRUDER, M851, or the LCD. + * Only integer values >= 1 are valid here. + * + * Example: `M851 Z-5` with a CLEARANCE of 4 => 9mm from bed to nozzle. + * But: `M851 Z+1` with a CLEARANCE of 2 => 2mm from bed to nozzle. + */ +#define Z_CLEARANCE_DEPLOY_PROBE 10 // Z Clearance for Deploy/Stow +#define Z_CLEARANCE_BETWEEN_PROBES 5 // Z Clearance between probe points +#define Z_CLEARANCE_MULTI_PROBE 5 // Z Clearance between multiple probes +//#define Z_AFTER_PROBING 5 // Z position after probing is done + +#define Z_PROBE_LOW_POINT -2 // Farthest distance below the trigger-point to go before stopping + +// For M851 give a range for adjusting the Z probe offset +#define Z_PROBE_OFFSET_RANGE_MIN -20 +#define Z_PROBE_OFFSET_RANGE_MAX 20 + +// Enable the M48 repeatability test to test probe accuracy +//#define Z_MIN_PROBE_REPEATABILITY_TEST + +// Before deploy/stow pause for user confirmation +//#define PAUSE_BEFORE_DEPLOY_STOW + +/** + * Enable one or more of the following if probing seems unreliable. + * Heaters and/or fans can be disabled during probing to minimize electrical + * noise. A delay can also be added to allow noise and vibration to settle. + * These options are most useful for the BLTouch probe, but may also improve + * readings with inductive probes and piezo sensors. + */ +//#define PROBING_HEATERS_OFF // Turn heaters off when probing +#if ENABLED(PROBING_HEATERS_OFF) + //#define WAIT_FOR_BED_HEATER // Wait for bed to heat back up between probes (to improve accuracy) +#endif +//#define PROBING_FANS_OFF // Turn fans off when probing +//#define PROBING_STEPPERS_OFF // Turn steppers off (unless needed to hold position) when probing +//#define DELAY_BEFORE_PROBING 200 // (ms) To prevent vibrations from triggering piezo sensors + +// For Inverting Stepper Enable Pins (Active Low) use 0, Non Inverting (Active High) use 1 +// :{ 0:'Low', 1:'High' } +#define X_ENABLE_ON 0 +#define Y_ENABLE_ON 0 +#define Z_ENABLE_ON 0 +#if NON_E_AXES > 3 + #define I_ENABLE_ON 0 + #if NON_E_AXES > 4 + #define J_ENABLE_ON 0 + #if NON_E_AXES > 5 + #define K_ENABLE_ON 0 + #endif + #endif +#endif +#define E_ENABLE_ON 0 // For all extruders + +// Disables axis stepper immediately when it's not being used. +// WARNING: When motors turn off there is a chance of losing position accuracy! +#define DISABLE_X false +#define DISABLE_Y false +#define DISABLE_Z false +#if NON_E_AXES > 3 + #define DISABLE_I false + #if NON_E_AXES > 4 + #define DISABLE_J false + #if NON_E_AXES > 5 + #define DISABLE_K false + #endif + #endif +#endif +// Warn on display about possibly reduced accuracy +//#define DISABLE_REDUCED_ACCURACY_WARNING + +// @section extruder + +#define DISABLE_E false // For all extruders +#define DISABLE_INACTIVE_EXTRUDER // Keep only the active extruder enabled + +// @section machine + +// Invert the stepper direction. Change (or reverse the motor connector) if an axis goes the wrong way. +#define INVERT_X_DIR false +#define INVERT_Y_DIR false +#define INVERT_Z_DIR true +#if NON_E_AXES > 3 + #define INVERT_I_DIR false + #if NON_E_AXES > 4 + #define INVERT_J_DIR false + #if NON_E_AXES > 5 + #define INVERT_K_DIR false + #endif + #endif +#endif +// @section extruder + +// For direct drive extruder v9 set to true, for geared extruder set to false. +#define INVERT_E0_DIR false +#define INVERT_E1_DIR false +#define INVERT_E2_DIR false +#define INVERT_E3_DIR false +#define INVERT_E4_DIR false +#define INVERT_E5_DIR false + +// @section homing + +//#define NO_MOTION_BEFORE_HOMING // Inhibit movement until all axes have been homed + +//#define UNKNOWN_Z_NO_RAISE // Don't raise Z (lower the bed) if Z is "unknown." For beds that fall when Z is powered off. + +//#define Z_HOMING_HEIGHT 4 // (mm) Minimal Z height before homing (G28) for Z clearance above the bed, clamps, ... + // Be sure you have this distance over your Z_MAX_POS in case. + +// Direction of endstops when homing; 1=MAX, -1=MIN +// :[-1,1] +#define X_HOME_DIR -1 +#define Y_HOME_DIR -1 +#define Z_HOME_DIR -1 +#if NON_E_AXES > 3 + #define I_HOME_DIR -1 + #if NON_E_AXES > 4 + #define J_HOME_DIR -1 + #if NON_E_AXES > 5 + #define K_HOME_DIR -1 + #endif + #endif +#endif + +// @section machine + +// The size of the print bed +#define X_BED_SIZE 220 +#define Y_BED_SIZE 220 + +// Travel limits (mm) after homing, corresponding to endstop positions. +#define X_MIN_POS -33 +#define Y_MIN_POS -10 +#define Z_MIN_POS 0 +#define X_MAX_POS X_BED_SIZE +#define Y_MAX_POS Y_BED_SIZE +#define Z_MAX_POS 240 +#if NON_E_AXES > 3 + #define I_MIN_POS 0 + #define I_MAX_POS 100 + #if NON_E_AXES > 4 + #define J_MIN_POS 0 + #define J_MAX_POS 100 + #if NON_E_AXES > 5 + #define K_MIN_POS 0 + #define K_MAX_POS 100 + #endif + #endif +#endif + +/** + * Software Endstops + * + * - Prevent moves outside the set machine bounds. + * - Individual axes can be disabled, if desired. + * - X and Y only apply to Cartesian robots. + * - Use 'M211' to set software endstops on/off or report current state + */ + +// Min software endstops constrain movement within minimum coordinate bounds +#define MIN_SOFTWARE_ENDSTOPS +#if ENABLED(MIN_SOFTWARE_ENDSTOPS) + #define MIN_SOFTWARE_ENDSTOP_X + #define MIN_SOFTWARE_ENDSTOP_Y + #define MIN_SOFTWARE_ENDSTOP_Z + #define MIN_SOFTWARE_ENDSTOP_I + #define MIN_SOFTWARE_ENDSTOP_J + #define MIN_SOFTWARE_ENDSTOP_K +#endif + +// Max software endstops constrain movement within maximum coordinate bounds +#define MAX_SOFTWARE_ENDSTOPS +#if ENABLED(MAX_SOFTWARE_ENDSTOPS) + #define MAX_SOFTWARE_ENDSTOP_X + #define MAX_SOFTWARE_ENDSTOP_Y + #define MAX_SOFTWARE_ENDSTOP_Z + #define MAX_SOFTWARE_ENDSTOP_I + #define MAX_SOFTWARE_ENDSTOP_J + #define MAX_SOFTWARE_ENDSTOP_K +#endif + +#if ENABLED(MIN_SOFTWARE_ENDSTOPS) || ENABLED(MAX_SOFTWARE_ENDSTOPS) + //#define SOFT_ENDSTOPS_MENU_ITEM // Enable/Disable software endstops from the LCD +#endif + +/** + * Filament Runout Sensors + * Mechanical or opto endstops are used to check for the presence of filament. + * + * RAMPS-based boards use SERVO3_PIN for the first runout sensor. + * For other boards you may need to define FIL_RUNOUT_PIN, FIL_RUNOUT2_PIN, etc. + * By default the firmware assumes HIGH=FILAMENT PRESENT. + */ +//#define FILAMENT_RUNOUT_SENSOR +#if ENABLED(FILAMENT_RUNOUT_SENSOR) + #define NUM_RUNOUT_SENSORS 1 // Number of sensors, up to one per extruder. Define a FIL_RUNOUT#_PIN for each. + #define FIL_RUNOUT_INVERTING false // set to true to invert the logic of the sensor. + #define FIL_RUNOUT_PULLUP // Use internal pullup for filament runout pins. + //#define FIL_RUNOUT_PULLDOWN // Use internal pulldown for filament runout pins. + + // Set one or more commands to execute on filament runout. + // (After 'M412 H' Marlin will ask the host to handle the process.) + #define FILAMENT_RUNOUT_SCRIPT "M600" + + // After a runout is detected, continue printing this length of filament + // before executing the runout script. Useful for a sensor at the end of + // a feed tube. Requires 4 bytes SRAM per sensor, plus 4 bytes overhead. + //#define FILAMENT_RUNOUT_DISTANCE_MM 25 + + #ifdef FILAMENT_RUNOUT_DISTANCE_MM + // Enable this option to use an encoder disc that toggles the runout pin + // as the filament moves. (Be sure to set FILAMENT_RUNOUT_DISTANCE_MM + // large enough to avoid false positives.) + //#define FILAMENT_MOTION_SENSOR + #endif +#endif + +//=========================================================================== +//=============================== Bed Leveling ============================== +//=========================================================================== +// @section calibrate + +/** + * Choose one of the options below to enable G29 Bed Leveling. The parameters + * and behavior of G29 will change depending on your selection. + * + * If using a Probe for Z Homing, enable Z_SAFE_HOMING also! + * + * - AUTO_BED_LEVELING_3POINT + * Probe 3 arbitrary points on the bed (that aren't collinear) + * You specify the XY coordinates of all 3 points. + * The result is a single tilted plane. Best for a flat bed. + * + * - AUTO_BED_LEVELING_LINEAR + * Probe several points in a grid. + * You specify the rectangle and the density of sample points. + * The result is a single tilted plane. Best for a flat bed. + * + * - AUTO_BED_LEVELING_BILINEAR + * Probe several points in a grid. + * You specify the rectangle and the density of sample points. + * The result is a mesh, best for large or uneven beds. + * + * - AUTO_BED_LEVELING_UBL (Unified Bed Leveling) + * A comprehensive bed leveling system combining the features and benefits + * of other systems. UBL also includes integrated Mesh Generation, Mesh + * Validation and Mesh Editing systems. + * + * - MESH_BED_LEVELING + * Probe a grid manually + * The result is a mesh, suitable for large or uneven beds. (See BILINEAR.) + * For machines without a probe, Mesh Bed Leveling provides a method to perform + * leveling in steps so you can manually adjust the Z height at each grid-point. + * With an LCD controller the process is guided step-by-step. + */ +//#define AUTO_BED_LEVELING_3POINT +//#define AUTO_BED_LEVELING_LINEAR +//#define AUTO_BED_LEVELING_BILINEAR +//#define AUTO_BED_LEVELING_UBL +//#define MESH_BED_LEVELING + +/** + * Normally G28 leaves leveling disabled on completion. Enable + * this option to have G28 restore the prior leveling state. + */ +//#define RESTORE_LEVELING_AFTER_G28 + +/** + * Enable detailed logging of G28, G29, M48, etc. + * Turn on with the command 'M111 S32'. + * NOTE: Requires a lot of PROGMEM! + */ +#define DEBUG_LEVELING_FEATURE + +#if ENABLED(MESH_BED_LEVELING) || ENABLED(AUTO_BED_LEVELING_BILINEAR) || ENABLED(AUTO_BED_LEVELING_UBL) + // Gradually reduce leveling correction until a set height is reached, + // at which point movement will be level to the machine's XY plane. + // The height can be set with M420 Z + #define ENABLE_LEVELING_FADE_HEIGHT + + // For Cartesian machines, instead of dividing moves on mesh boundaries, + // split up moves into short segments like a Delta. This follows the + // contours of the bed more closely than edge-to-edge straight moves. + #define SEGMENT_LEVELED_MOVES + #define LEVELED_SEGMENT_LENGTH 5.0 // (mm) Length of all segments (except the last one) + + /** + * Enable the G26 Mesh Validation Pattern tool. + */ + //#define G26_MESH_VALIDATION + #if ENABLED(G26_MESH_VALIDATION) + #define MESH_TEST_NOZZLE_SIZE 0.4 // (mm) Diameter of primary nozzle. + #define MESH_TEST_LAYER_HEIGHT 0.2 // (mm) Default layer height for the G26 Mesh Validation Tool. + #define MESH_TEST_HOTEND_TEMP 205.0 // (°C) Default nozzle temperature for the G26 Mesh Validation Tool. + #define MESH_TEST_BED_TEMP 60.0 // (°C) Default bed temperature for the G26 Mesh Validation Tool. + #endif + +#endif + +#if ENABLED(AUTO_BED_LEVELING_LINEAR) || ENABLED(AUTO_BED_LEVELING_BILINEAR) + + // Set the number of grid points per dimension. + #define GRID_MAX_POINTS_X 3 + #define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X + + // Set the boundaries for probing (where the probe can reach). + //#define LEFT_PROBE_BED_POSITION MIN_PROBE_EDGE + //#define RIGHT_PROBE_BED_POSITION (X_BED_SIZE - (MIN_PROBE_EDGE)) + //#define FRONT_PROBE_BED_POSITION MIN_PROBE_EDGE + //#define BACK_PROBE_BED_POSITION (Y_BED_SIZE - (MIN_PROBE_EDGE)) + + // Probe along the Y axis, advancing X after each column + //#define PROBE_Y_FIRST + + #if ENABLED(AUTO_BED_LEVELING_BILINEAR) + + // Beyond the probed grid, continue the implied tilt? + // Default is to maintain the height of the nearest edge. + //#define EXTRAPOLATE_BEYOND_GRID + + // + // Experimental Subdivision of the grid by Catmull-Rom method. + // Synthesizes intermediate points to produce a more detailed mesh. + // + //#define ABL_BILINEAR_SUBDIVISION + #if ENABLED(ABL_BILINEAR_SUBDIVISION) + // Number of subdivisions between probe points + #define BILINEAR_SUBDIVISIONS 3 + #endif + + #endif + +#elif ENABLED(AUTO_BED_LEVELING_UBL) + + //=========================================================================== + //========================= Unified Bed Leveling ============================ + //=========================================================================== + + //#define MESH_EDIT_GFX_OVERLAY // Display a graphics overlay while editing the mesh + + #define MESH_INSET 1 // Set Mesh bounds as an inset region of the bed + #define GRID_MAX_POINTS_X 10 // Don't use more than 15 points per axis, implementation limited. + #define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X + + #define UBL_MESH_EDIT_MOVES_Z // Sophisticated users prefer no movement of nozzle + #define UBL_SAVE_ACTIVE_ON_M500 // Save the currently active mesh in the current slot on M500 + + //#define UBL_Z_RAISE_WHEN_OFF_MESH 2.5 // When the nozzle is off the mesh, this value is used + // as the Z-Height correction value. + +#elif ENABLED(MESH_BED_LEVELING) + + //=========================================================================== + //=================================== Mesh ================================== + //=========================================================================== + + #define MESH_INSET 10 // Set Mesh bounds as an inset region of the bed + #define GRID_MAX_POINTS_X 3 // Don't use more than 7 points per axis, implementation limited. + #define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X + + //#define MESH_G28_REST_ORIGIN // After homing all axes ('G28' or 'G28 XYZ') rest Z at Z_MIN_POS + +#endif // BED_LEVELING + +/** + * Points to probe for all 3-point Leveling procedures. + * Override if the automatically selected points are inadequate. + */ +#if ENABLED(AUTO_BED_LEVELING_3POINT) || ENABLED(AUTO_BED_LEVELING_UBL) + #define PROBE_PT_1_X 20 + #define PROBE_PT_1_Y 160 + #define PROBE_PT_2_X 20 + #define PROBE_PT_2_Y 10 + #define PROBE_PT_3_X 180 + #define PROBE_PT_3_Y 10 +#endif + +/** + * Add a bed leveling sub-menu for ABL or MBL. + * Include a guided procedure if manual probing is enabled. + */ +//#define LCD_BED_LEVELING + +#if ENABLED(LCD_BED_LEVELING) + #define MESH_EDIT_Z_STEP 0.025 // (mm) Step size while manually probing Z axis. + #define LCD_PROBE_Z_RANGE 4 // (mm) Z Range centered on Z_MIN_POS for LCD Z adjustment + //#define MESH_EDIT_MENU // Add a menu to edit mesh points +#endif + +// Add a menu item to move between bed corners for manual bed adjustment +//#define LEVEL_BED_CORNERS + +#if ENABLED(LEVEL_BED_CORNERS) + #define LEVEL_CORNERS_INSET 30 // (mm) An inset for corner leveling + #define LEVEL_CORNERS_Z_HOP 4.0 // (mm) Move nozzle up before moving between corners + //#define LEVEL_CENTER_TOO // Move to the center after the last corner +#endif + +/** + * Commands to execute at the end of G29 probing. + * Useful to retract or move the Z probe out of the way. + */ +//#define Z_PROBE_END_SCRIPT "G1 Z10 F12000\nG1 X15 Y330\nG1 Z0.5\nG1 Z10" + + +// @section homing + +// The center of the bed is at (X=0, Y=0) +//#define BED_CENTER_AT_0_0 + +// Manually set the home position. Leave these undefined for automatic settings. +// For DELTA this is the top-center of the Cartesian print volume. +//#define MANUAL_X_HOME_POS 0 +//#define MANUAL_Y_HOME_POS 0 +//#define MANUAL_Z_HOME_POS 0 +//#define MANUAL_I_HOME_POS 0 +//#define MANUAL_J_HOME_POS 0 +//#define MANUAL_K_HOME_POS 0 + +// Use "Z Safe Homing" to avoid homing with a Z probe outside the bed area. +// +// With this feature enabled: +// +// - Allow Z homing only after X and Y homing AND stepper drivers still enabled. +// - If stepper drivers time out, it will need X and Y homing again before Z homing. +// - Move the Z probe (or nozzle) to a defined XY point before Z Homing when homing all axes (G28). +// - Prevent Z homing when the Z probe is outside bed area. +// +//#define Z_SAFE_HOMING + +#if ENABLED(Z_SAFE_HOMING) + #define Z_SAFE_HOMING_X_POINT ((X_BED_SIZE) / 2) // X point for Z homing when homing all axes (G28). + #define Z_SAFE_HOMING_Y_POINT ((Y_BED_SIZE) / 2) // Y point for Z homing when homing all axes (G28). +#endif + +// Homing speeds (mm/m) +#define HOMING_FEEDRATE_XY (50*60) +#define HOMING_FEEDRATE_Z (8*60) +#if NON_E_AXES > 3 + #define HOMING_FEEDRATE_I (8*60) + #if NON_E_AXES > 4 + #define HOMING_FEEDRATE_J (8*60) + #if NON_E_AXES > 5 + #define HOMING_FEEDRATE_K (8*60) + #endif + #endif +#endif +// Validate that endstops are triggered on homing moves +#define VALIDATE_HOMING_ENDSTOPS + +// @section calibrate + +/** + * Bed Skew Compensation + * + * This feature corrects for misalignment in the XYZ axes. + * + * Take the following steps to get the bed skew in the XY plane: + * 1. Print a test square (e.g., https://www.thingiverse.com/thing:2563185) + * 2. For XY_DIAG_AC measure the diagonal A to C + * 3. For XY_DIAG_BD measure the diagonal B to D + * 4. For XY_SIDE_AD measure the edge A to D + * + * Marlin automatically computes skew factors from these measurements. + * Skew factors may also be computed and set manually: + * + * - Compute AB : SQRT(2*AC*AC+2*BD*BD-4*AD*AD)/2 + * - XY_SKEW_FACTOR : TAN(PI/2-ACOS((AC*AC-AB*AB-AD*AD)/(2*AB*AD))) + * + * If desired, follow the same procedure for XZ and YZ. + * Use these diagrams for reference: + * + * Y Z Z + * ^ B-------C ^ B-------C ^ B-------C + * | / / | / / | / / + * | / / | / / | / / + * | A-------D | A-------D | A-------D + * +-------------->X +-------------->X +-------------->Y + * XY_SKEW_FACTOR XZ_SKEW_FACTOR YZ_SKEW_FACTOR + */ +//#define SKEW_CORRECTION + +#if ENABLED(SKEW_CORRECTION) + // Input all length measurements here: + #define XY_DIAG_AC 282.8427124746 + #define XY_DIAG_BD 282.8427124746 + #define XY_SIDE_AD 200 + + // Or, set the default skew factors directly here + // to override the above measurements: + #define XY_SKEW_FACTOR 0.0 + + //#define SKEW_CORRECTION_FOR_Z + #if ENABLED(SKEW_CORRECTION_FOR_Z) + #define XZ_DIAG_AC 282.8427124746 + #define XZ_DIAG_BD 282.8427124746 + #define YZ_DIAG_AC 282.8427124746 + #define YZ_DIAG_BD 282.8427124746 + #define YZ_SIDE_AD 200 + #define XZ_SKEW_FACTOR 0.0 + #define YZ_SKEW_FACTOR 0.0 + #endif + + // Enable this option for M852 to set skew at runtime + //#define SKEW_CORRECTION_GCODE +#endif + +//============================================================================= +//============================= Additional Features =========================== +//============================================================================= + +// @section extras + +// +// EEPROM +// +// The microcontroller can store settings in the EEPROM, e.g. max velocity... +// M500 - stores parameters in EEPROM +// M501 - reads parameters from EEPROM (if you need reset them after you changed them temporarily). +// M502 - reverts to the default "factory settings". You still need to store them in EEPROM afterwards if you want to. +// +//#define EEPROM_SETTINGS // Enable for M500 and M501 commands +//#define DISABLE_M503 // Saves ~2700 bytes of PROGMEM. Disable for release! +//#define EEPROM_CHITCHAT // Give feedback on EEPROM commands. Disable to save PROGMEM. + +// +// Host Keepalive +// +// When enabled Marlin will send a busy status message to the host +// every couple of seconds when it can't accept commands. +// +//#define HOST_KEEPALIVE_FEATURE // Disable this if your host doesn't like keepalive messages +//#define DEFAULT_KEEPALIVE_INTERVAL 2 // Number of seconds between "busy" messages. Set with M113. +#define BUSY_WHILE_HEATING // Some hosts require "busy" messages even during heating + +// +// M100 Free Memory Watcher +// +//#define M100_FREE_MEMORY_WATCHER // Add M100 (Free Memory Watcher) to debug memory usage + +// +// G20/G21 Inch mode support +// +//#define INCH_MODE_SUPPORT + +// +// M149 Set temperature units support +// +//#define TEMPERATURE_UNITS_SUPPORT + +// @section temperature + +// Preheat Constants +#define PREHEAT_1_LABEL "PLA" +#define PREHEAT_1_TEMP_HOTEND 190 +#define PREHEAT_1_TEMP_BED 60 +#define PREHEAT_1_FAN_SPEED 0 // Value from 0 to 255 + +#define PREHEAT_2_LABEL "ABS" +#define PREHEAT_2_TEMP_HOTEND 240 +#define PREHEAT_2_TEMP_BED 90 +#define PREHEAT_2_FAN_SPEED 0 // Value from 0 to 255 + +/** + * Nozzle Park + * + * Park the nozzle at the given XYZ position on idle or G27. + * + * The "P" parameter controls the action applied to the Z axis: + * + * P0 (Default) If Z is below park Z raise the nozzle. + * P1 Raise the nozzle always to Z-park height. + * P2 Raise the nozzle by Z-park amount, limited to Z_MAX_POS. + */ +//#define NOZZLE_PARK_FEATURE + +#if ENABLED(NOZZLE_PARK_FEATURE) + // Specify a park position as { X, Y, Z } + #define NOZZLE_PARK_POINT { (X_MIN_POS + 10), (Y_MAX_POS - 10), 20 } + #define NOZZLE_PARK_XY_FEEDRATE 100 // X and Y axes feedrate in mm/s (also used for delta printers Z axis) + #define NOZZLE_PARK_Z_FEEDRATE 5 // Z axis feedrate in mm/s (not used for delta printers) +#endif + +/** + * Clean Nozzle Feature -- EXPERIMENTAL + * + * Adds the G12 command to perform a nozzle cleaning process. + * + * Parameters: + * P Pattern + * S Strokes / Repetitions + * T Triangles (P1 only) + * + * Patterns: + * P0 Straight line (default). This process requires a sponge type material + * at a fixed bed location. "S" specifies strokes (i.e. back-forth motions) + * between the start / end points. + * + * P1 Zig-zag pattern between (X0, Y0) and (X1, Y1), "T" specifies the + * number of zig-zag triangles to do. "S" defines the number of strokes. + * Zig-zags are done in whichever is the narrower dimension. + * For example, "G12 P1 S1 T3" will execute: + * + * -- + * | (X0, Y1) | /\ /\ /\ | (X1, Y1) + * | | / \ / \ / \ | + * A | | / \ / \ / \ | + * | | / \ / \ / \ | + * | (X0, Y0) | / \/ \/ \ | (X1, Y0) + * -- +--------------------------------+ + * |________|_________|_________| + * T1 T2 T3 + * + * P2 Circular pattern with middle at NOZZLE_CLEAN_CIRCLE_MIDDLE. + * "R" specifies the radius. "S" specifies the stroke count. + * Before starting, the nozzle moves to NOZZLE_CLEAN_START_POINT. + * + * Caveats: The ending Z should be the same as starting Z. + * Attention: EXPERIMENTAL. G-code arguments may change. + * + */ +//#define NOZZLE_CLEAN_FEATURE + +#if ENABLED(NOZZLE_CLEAN_FEATURE) + // Default number of pattern repetitions + #define NOZZLE_CLEAN_STROKES 12 + + // Default number of triangles + #define NOZZLE_CLEAN_TRIANGLES 3 + + // Specify positions as { X, Y, Z } + #define NOZZLE_CLEAN_START_POINT { 30, 30, (Z_MIN_POS + 1)} + #define NOZZLE_CLEAN_END_POINT {100, 60, (Z_MIN_POS + 1)} + + // Circular pattern radius + #define NOZZLE_CLEAN_CIRCLE_RADIUS 6.5 + // Circular pattern circle fragments number + #define NOZZLE_CLEAN_CIRCLE_FN 10 + // Middle point of circle + #define NOZZLE_CLEAN_CIRCLE_MIDDLE NOZZLE_CLEAN_START_POINT + + // Moves the nozzle to the initial position + #define NOZZLE_CLEAN_GOBACK +#endif + +/** + * Print Job Timer + * + * Automatically start and stop the print job timer on M104/M109/M190. + * + * M104 (hotend, no wait) - high temp = none, low temp = stop timer + * M109 (hotend, wait) - high temp = start timer, low temp = stop timer + * M190 (bed, wait) - high temp = start timer, low temp = none + * + * The timer can also be controlled with the following commands: + * + * M75 - Start the print job timer + * M76 - Pause the print job timer + * M77 - Stop the print job timer + */ +#define PRINTJOB_TIMER_AUTOSTART + +/** + * Print Counter + * + * Track statistical data such as: + * + * - Total print jobs + * - Total successful print jobs + * - Total failed print jobs + * - Total time printing + * + * View the current statistics with M78. + */ +//#define PRINTCOUNTER + +//============================================================================= +//============================= LCD and SD support ============================ +//============================================================================= + +// @section lcd + +/** + * LCD LANGUAGE + * + * Select the language to display on the LCD. These languages are available: + * + * en, an, bg, ca, cz, da, de, el, el-gr, es, eu, fi, fr, gl, hr, it, + * jp-kana, ko_KR, nl, pl, pt, pt-br, ru, sk, tr, uk, zh_CN, zh_TW, test + * + * :{ 'en':'English', 'an':'Aragonese', 'bg':'Bulgarian', 'ca':'Catalan', 'cz':'Czech', 'da':'Danish', 'de':'German', 'el':'Greek', 'el-gr':'Greek (Greece)', 'es':'Spanish', 'eu':'Basque-Euskera', 'fi':'Finnish', 'fr':'French', 'gl':'Galician', 'hr':'Croatian', 'it':'Italian', 'jp-kana':'Japanese', 'ko_KR':'Korean (South Korea)', 'nl':'Dutch', 'pl':'Polish', 'pt':'Portuguese', 'pt-br':'Portuguese (Brazilian)', 'ru':'Russian', 'sk':'Slovak', 'tr':'Turkish', 'uk':'Ukrainian', 'zh_CN':'Chinese (Simplified)', 'zh_TW':'Chinese (Traditional)', 'test':'TEST' } + */ +//#define LCD_LANGUAGE en + +/** + * LCD Character Set + * + * Note: This option is NOT applicable to Graphical Displays. + * + * All character-based LCDs provide ASCII plus one of these + * language extensions: + * + * - JAPANESE ... the most common + * - WESTERN ... with more accented characters + * - CYRILLIC ... for the Russian language + * + * To determine the language extension installed on your controller: + * + * - Compile and upload with LCD_LANGUAGE set to 'test' + * - Click the controller to view the LCD menu + * - The LCD will display Japanese, Western, or Cyrillic text + * + * See http://marlinfw.org/docs/development/lcd_language.html + * + * :['JAPANESE', 'WESTERN', 'CYRILLIC'] + */ +//#define DISPLAY_CHARSET_HD44780 JAPANESE + +/** + * Info Screen Style (0:Classic, 1:Prusa) + * + * :[0:'Classic', 1:'Prusa'] + */ +//#define LCD_INFO_SCREEN_STYLE 0 + +/** + * SD CARD + * + * SD Card support is disabled by default. If your controller has an SD slot, + * you must uncomment the following option or it won't work. + * + */ +//#define SDSUPPORT + +/** + * SD CARD: SPI SPEED + * + * Enable one of the following items for a slower SPI transfer speed. + * This may be required to resolve "volume init" errors. + */ +//#define SPI_SPEED SPI_HALF_SPEED +//#define SPI_SPEED SPI_QUARTER_SPEED +//#define SPI_SPEED SPI_EIGHTH_SPEED + +/** + * SD CARD: ENABLE CRC + * + * Use CRC checks and retries on the SD communication. + */ +//#define SD_CHECK_AND_RETRY + +/** + * LCD Menu Items + * + * Disable all menus and only display the Status Screen, or + * just remove some extraneous menu items to recover space. + */ +//#define NO_LCD_MENUS +//#define SLIM_LCD_MENUS + +// +// ENCODER SETTINGS +// +// This option overrides the default number of encoder pulses needed to +// produce one step. Should be increased for high-resolution encoders. +// +//#define ENCODER_PULSES_PER_STEP 4 + +// +// Use this option to override the number of step signals required to +// move between next/prev menu items. +// +//#define ENCODER_STEPS_PER_MENU_ITEM 1 + +/** + * Encoder Direction Options + * + * Test your encoder's behavior first with both options disabled. + * + * Reversed Value Edit and Menu Nav? Enable REVERSE_ENCODER_DIRECTION. + * Reversed Menu Navigation only? Enable REVERSE_MENU_DIRECTION. + * Reversed Value Editing only? Enable BOTH options. + */ + +// +// This option reverses the encoder direction everywhere. +// +// Set this option if CLOCKWISE causes values to DECREASE +// +//#define REVERSE_ENCODER_DIRECTION + +// +// This option reverses the encoder direction for navigating LCD menus. +// +// If CLOCKWISE normally moves DOWN this makes it go UP. +// If CLOCKWISE normally moves UP this makes it go DOWN. +// +//#define REVERSE_MENU_DIRECTION + +// +// Individual Axis Homing +// +// Add individual axis homing items (Home X, Home Y, and Home Z) to the LCD menu. +// +//#define INDIVIDUAL_AXIS_HOMING_MENU + +// +// SPEAKER/BUZZER +// +// If you have a speaker that can produce tones, enable it here. +// By default Marlin assumes you have a buzzer with a fixed frequency. +// +//#define SPEAKER + +// +// The duration and frequency for the UI feedback sound. +// Set these to 0 to disable audio feedback in the LCD menus. +// +// Note: Test audio output with the G-Code: +// M300 S P +// +//#define LCD_FEEDBACK_FREQUENCY_DURATION_MS 2 +//#define LCD_FEEDBACK_FREQUENCY_HZ 5000 + +//============================================================================= +//======================== LCD / Controller Selection ========================= +//======================== (Character-based LCDs) ========================= +//============================================================================= + +// +// RepRapDiscount Smart Controller. +// http://reprap.org/wiki/RepRapDiscount_Smart_Controller +// +// Note: Usually sold with a white PCB. +// +//#define REPRAP_DISCOUNT_SMART_CONTROLLER + +// +// Original RADDS LCD Display+Encoder+SDCardReader +// http://doku.radds.org/dokumentation/lcd-display/ +// +//#define RADDS_DISPLAY + +// +// ULTIMAKER Controller. +// +//#define ULTIMAKERCONTROLLER + +// +// ULTIPANEL as seen on Thingiverse. +// +//#define ULTIPANEL + +// +// PanelOne from T3P3 (via RAMPS 1.4 AUX2/AUX3) +// http://reprap.org/wiki/PanelOne +// +//#define PANEL_ONE + +// +// GADGETS3D G3D LCD/SD Controller +// http://reprap.org/wiki/RAMPS_1.3/1.4_GADGETS3D_Shield_with_Panel +// +// Note: Usually sold with a blue PCB. +// +//#define G3D_PANEL + +// +// RigidBot Panel V1.0 +// http://www.inventapart.com/ +// +//#define RIGIDBOT_PANEL + +// +// Makeboard 3D Printer Parts 3D Printer Mini Display 1602 Mini Controller +// https://www.aliexpress.com/item/Micromake-Makeboard-3D-Printer-Parts-3D-Printer-Mini-Display-1602-Mini-Controller-Compatible-with-Ramps-1/32765887917.html +// +//#define MAKEBOARD_MINI_2_LINE_DISPLAY_1602 + +// +// ANET and Tronxy 20x4 Controller +// +//#define ZONESTAR_LCD // Requires ADC_KEYPAD_PIN to be assigned to an analog pin. + // This LCD is known to be susceptible to electrical interference + // which scrambles the display. Pressing any button clears it up. + // This is a LCD2004 display with 5 analog buttons. + +// +// Generic 16x2, 16x4, 20x2, or 20x4 character-based LCD. +// +//#define ULTRA_LCD + +//============================================================================= +//======================== LCD / Controller Selection ========================= +//===================== (I2C and Shift-Register LCDs) ===================== +//============================================================================= + +// +// CONTROLLER TYPE: I2C +// +// Note: These controllers require the installation of Arduino's LiquidCrystal_I2C +// library. For more info: https://github.com/kiyoshigawa/LiquidCrystal_I2C +// + +// +// Elefu RA Board Control Panel +// http://www.elefu.com/index.php?route=product/product&product_id=53 +// +//#define RA_CONTROL_PANEL + +// +// Sainsmart (YwRobot) LCD Displays +// +// These require F.Malpartida's LiquidCrystal_I2C library +// https://bitbucket.org/fmalpartida/new-liquidcrystal/wiki/Home +// +//#define LCD_SAINSMART_I2C_1602 +//#define LCD_SAINSMART_I2C_2004 + +// +// Generic LCM1602 LCD adapter +// +//#define LCM1602 + +// +// PANELOLU2 LCD with status LEDs, +// separate encoder and click inputs. +// +// Note: This controller requires Arduino's LiquidTWI2 library v1.2.3 or later. +// For more info: https://github.com/lincomatic/LiquidTWI2 +// +// Note: The PANELOLU2 encoder click input can either be directly connected to +// a pin (if BTN_ENC defined to != -1) or read through I2C (when BTN_ENC == -1). +// +//#define LCD_I2C_PANELOLU2 + +// +// Panucatt VIKI LCD with status LEDs, +// integrated click & L/R/U/D buttons, separate encoder inputs. +// +//#define LCD_I2C_VIKI + +// +// CONTROLLER TYPE: Shift register panels +// + +// +// 2-wire Non-latching LCD SR from https://goo.gl/aJJ4sH +// LCD configuration: http://reprap.org/wiki/SAV_3D_LCD +// +//#define SAV_3DLCD + +// +// 3-wire SR LCD with strobe using 74HC4094 +// https://github.com/mikeshub/SailfishLCD +// Uses the code directly from Sailfish +// +//#define FF_INTERFACEBOARD + +//============================================================================= +//======================= LCD / Controller Selection ======================= +//========================= (Graphical LCDs) ======================== +//============================================================================= + +// +// CONTROLLER TYPE: Graphical 128x64 (DOGM) +// +// IMPORTANT: The U8glib library is required for Graphical Display! +// https://github.com/olikraus/U8glib_Arduino +// + +// +// RepRapDiscount FULL GRAPHIC Smart Controller +// http://reprap.org/wiki/RepRapDiscount_Full_Graphic_Smart_Controller +// +// Note: Details on connecting to the Anet V1.0 controller are in the file pins_ANET_10.h +// +//#define REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER + +// +// ReprapWorld Graphical LCD +// https://reprapworld.com/?products_details&products_id/1218 +// +//#define REPRAPWORLD_GRAPHICAL_LCD + +// +// Activate one of these if you have a Panucatt Devices +// Viki 2.0 or mini Viki with Graphic LCD +// http://panucatt.com +// +//#define VIKI2 +//#define miniVIKI + +// +// MakerLab Mini Panel with graphic +// controller and SD support - http://reprap.org/wiki/Mini_panel +// +//#define MINIPANEL + +// +// MaKr3d Makr-Panel with graphic controller and SD support. +// http://reprap.org/wiki/MaKr3d_MaKrPanel +// +//#define MAKRPANEL + +// +// Adafruit ST7565 Full Graphic Controller. +// https://github.com/eboston/Adafruit-ST7565-Full-Graphic-Controller/ +// +//#define ELB_FULL_GRAPHIC_CONTROLLER + +// +// BQ LCD Smart Controller shipped by +// default with the BQ Hephestos 2 and Witbox 2. +// +//#define BQ_LCD_SMART_CONTROLLER + +// +// Cartesio UI +// http://mauk.cc/webshop/cartesio-shop/electronics/user-interface +// +//#define CARTESIO_UI + +// +// LCD for Melzi Card with Graphical LCD +// +//#define LCD_FOR_MELZI + +// +// SSD1306 OLED full graphics generic display +// +//#define U8GLIB_SSD1306 + +// +// SAV OLEd LCD module support using either SSD1306 or SH1106 based LCD modules +// +//#define SAV_3DGLCD +#if ENABLED(SAV_3DGLCD) + //#define U8GLIB_SSD1306 + #define U8GLIB_SH1106 +#endif + +// +// Original Ulticontroller from Ultimaker 2 printer with SSD1309 I2C display and encoder +// https://github.com/Ultimaker/Ultimaker2/tree/master/1249_Ulticontroller_Board_(x1) +// +//#define ULTI_CONTROLLER + +// +// TinyBoy2 128x64 OLED / Encoder Panel +// +//#define OLED_PANEL_TINYBOY2 + +// +// MKS MINI12864 with graphic controller and SD support +// http://reprap.org/wiki/MKS_MINI_12864 +// +//#define MKS_MINI_12864 + +// +// Factory display for Creality CR-10 +// https://www.aliexpress.com/item/Universal-LCD-12864-3D-Printer-Display-Screen-With-Encoder-For-CR-10-CR-7-Model/32833148327.html +// +// This is RAMPS-compatible using a single 10-pin connector. +// (For CR-10 owners who want to replace the Melzi Creality board but retain the display) +// +//#define CR10_STOCKDISPLAY + +// +// ANET and Tronxy Graphical Controller +// +// Anet 128x64 full graphics lcd with rotary encoder as used on Anet A6 +// A clone of the RepRapDiscount full graphics display but with +// different pins/wiring (see pins_ANET_10.h). +// +//#define ANET_FULL_GRAPHICS_LCD + +// +// MKS OLED 1.3" 128 × 64 FULL GRAPHICS CONTROLLER +// http://reprap.org/wiki/MKS_12864OLED +// +// Tiny, but very sharp OLED display +// +//#define MKS_12864OLED // Uses the SH1106 controller (default) +//#define MKS_12864OLED_SSD1306 // Uses the SSD1306 controller + +// +// AZSMZ 12864 LCD with SD +// https://www.aliexpress.com/store/product/3D-printer-smart-controller-SMART-RAMPS-OR-RAMPS-1-4-LCD-12864-LCD-control-panel-green/2179173_32213636460.html +// +//#define AZSMZ_12864 + +// +// Silvergate GLCD controller +// http://github.com/android444/Silvergate +// +//#define SILVER_GATE_GLCD_CONTROLLER + +// +// Extensible UI +// +// Enable third-party or vendor customized user interfaces that aren't +// packaged with Marlin. Source code for the user interface will need to +// be placed in "src/lcd/extensible_ui/lib" +// +//#define EXTENSIBLE_UI + +//============================================================================= +//=============================== Graphical TFTs ============================== +//============================================================================= + +// +// MKS Robin 320x240 color display +// +//#define MKS_ROBIN_TFT + +//============================================================================= +//============================ Other Controllers ============================ +//============================================================================= + +// +// CONTROLLER TYPE: Standalone / Serial +// + +// +// LCD for Malyan M200 printers. +// +//#define MALYAN_LCD + +// +// CONTROLLER TYPE: Keypad / Add-on +// + +// +// RepRapWorld REPRAPWORLD_KEYPAD v1.1 +// http://reprapworld.com/?products_details&products_id=202&cPath=1591_1626 +// +// REPRAPWORLD_KEYPAD_MOVE_STEP sets how much should the robot move when a key +// is pressed, a value of 10.0 means 10mm per click. +// +//#define REPRAPWORLD_KEYPAD +//#define REPRAPWORLD_KEYPAD_MOVE_STEP 10.0 + +//============================================================================= +//=============================== Extra Features ============================== +//============================================================================= + +// @section extras + +// Increase the FAN PWM frequency. Removes the PWM noise but increases heating in the FET/Arduino +//#define FAST_PWM_FAN + +// Use software PWM to drive the fan, as for the heaters. This uses a very low frequency +// which is not as annoying as with the hardware PWM. On the other hand, if this frequency +// is too low, you should also increment SOFT_PWM_SCALE. +//#define FAN_SOFT_PWM + +// Incrementing this by 1 will double the software PWM frequency, +// affecting heaters, and the fan if FAN_SOFT_PWM is enabled. +// However, control resolution will be halved for each increment; +// at zero value, there are 128 effective control positions. +#define SOFT_PWM_SCALE 0 + +// If SOFT_PWM_SCALE is set to a value higher than 0, dithering can +// be used to mitigate the associated resolution loss. If enabled, +// some of the PWM cycles are stretched so on average the desired +// duty cycle is attained. +//#define SOFT_PWM_DITHER + +// Temperature status LEDs that display the hotend and bed temperature. +// If all hotends, bed temperature, and target temperature are under 54C +// then the BLUE led is on. Otherwise the RED led is on. (1C hysteresis) +//#define TEMP_STAT_LEDS + +// SkeinForge sends the wrong arc g-codes when using Arc Point as fillet procedure +//#define SF_ARC_FIX + +// Support for the BariCUDA Paste Extruder +//#define BARICUDA + +// Support for BlinkM/CyzRgb +//#define BLINKM + +// Support for PCA9632 PWM LED driver +//#define PCA9632 + +// Support for PCA9533 PWM LED driver +// https://github.com/mikeshub/SailfishRGB_LED +//#define PCA9533 + +/** + * RGB LED / LED Strip Control + * + * Enable support for an RGB LED connected to 5V digital pins, or + * an RGB Strip connected to MOSFETs controlled by digital pins. + * + * Adds the M150 command to set the LED (or LED strip) color. + * If pins are PWM capable (e.g., 4, 5, 6, 11) then a range of + * luminance values can be set from 0 to 255. + * For Neopixel LED an overall brightness parameter is also available. + * + * *** CAUTION *** + * LED Strips require a MOSFET Chip between PWM lines and LEDs, + * as the Arduino cannot handle the current the LEDs will require. + * Failure to follow this precaution can destroy your Arduino! + * NOTE: A separate 5V power supply is required! The Neopixel LED needs + * more current than the Arduino 5V linear regulator can produce. + * *** CAUTION *** + * + * LED Type. Enable only one of the following two options. + * + */ +//#define RGB_LED +//#define RGBW_LED + +#if ENABLED(RGB_LED) || ENABLED(RGBW_LED) + #define RGB_LED_R_PIN 34 + #define RGB_LED_G_PIN 43 + #define RGB_LED_B_PIN 35 + #define RGB_LED_W_PIN -1 +#endif + +// Support for Adafruit Neopixel LED driver +//#define NEOPIXEL_LED +#if ENABLED(NEOPIXEL_LED) + #define NEOPIXEL_TYPE NEO_GRBW // NEO_GRBW / NEO_GRB - four/three channel driver type (defined in Adafruit_NeoPixel.h) + #define NEOPIXEL_PIN 4 // LED driving pin on motherboard 4 => D4 (EXP2-5 on Printrboard) / 30 => PC7 (EXP3-13 on Rumba) + #define NEOPIXEL_PIXELS 30 // Number of LEDs in the strip + #define NEOPIXEL_IS_SEQUENTIAL // Sequential display for temperature change - LED by LED. Disable to change all LEDs at once. + #define NEOPIXEL_BRIGHTNESS 127 // Initial brightness (0-255) + //#define NEOPIXEL_STARTUP_TEST // Cycle through colors at startup +#endif + +/** + * Printer Event LEDs + * + * During printing, the LEDs will reflect the printer status: + * + * - Gradually change from blue to violet as the heated bed gets to target temp + * - Gradually change from violet to red as the hotend gets to temperature + * - Change to white to illuminate work surface + * - Change to green once print has finished + * - Turn off after the print has finished and the user has pushed a button + */ +#if ENABLED(BLINKM) || ENABLED(RGB_LED) || ENABLED(RGBW_LED) || ENABLED(PCA9632) || ENABLED(PCA9533)|| ENABLED(NEOPIXEL_LED) + #define PRINTER_EVENT_LEDS +#endif + +/** + * R/C SERVO support + * Sponsored by TrinityLabs, Reworked by codexmas + */ + +/** + * Number of servos + * + * For some servo-related options NUM_SERVOS will be set automatically. + * Set this manually if there are extra servos needing manual control. + * Leave undefined or set to 0 to entirely disable the servo subsystem. + */ +#define NUM_SERVOS 4 // Servo index starts with 0 for M280 command + +// Delay (in milliseconds) before the next move will start, to give the servo time to reach its target angle. +// 300ms is a good value but you can try less delay. +// If the servo can't reach the requested position, increase it. +#define SERVO_DELAY { 300, 300, 300, 300 } + +// Only power servos during movement, otherwise leave off to prevent jitter +//#define DEACTIVATE_SERVOS_AFTER_MOVE + +// Allow servo angle to be edited and saved to EEPROM +//#define EDITABLE_SERVO_ANGLES diff --git a/Marlin/src/config/examples/DerAndere/PipetBot-A8/Configuration_adv.h b/Marlin/src/config/examples/DerAndere/PipetBot-A8/Configuration_adv.h new file mode 100644 index 000000000000..4a902a7a210d --- /dev/null +++ b/Marlin/src/config/examples/DerAndere/PipetBot-A8/Configuration_adv.h @@ -0,0 +1,2313 @@ +/** + * Marlin 3D Printer Firmware + * Copyright (C) 2016 MarlinFirmware [https://github.com/MarlinFirmware/Marlin] + * + * Based on Sprinter and grbl. + * Copyright (C) 2011 Camiel Gubbels / Erik van der Zalm + * + * 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 . + * + */ +#pragma once + +/** + * Configuration_adv.h + * + * Advanced settings. + * Only change these if you know exactly what you're doing. + * Some of these settings can damage your printer if improperly set! + * + * Basic settings can be found in Configuration.h + * + */ +#define CONFIGURATION_ADV_H_VERSION 020000 + +// @section temperature + +//=========================================================================== +//=============================Thermal Settings ============================ +//=========================================================================== + +// +// Hephestos 2 24V heated bed upgrade kit. +// https://store.bq.com/en/heated-bed-kit-hephestos2 +// +//#define HEPHESTOS2_HEATED_BED_KIT +#if ENABLED(HEPHESTOS2_HEATED_BED_KIT) + #undef TEMP_SENSOR_BED + #define TEMP_SENSOR_BED 70 + #define HEATER_BED_INVERTING true +#endif + +#if DISABLED(PIDTEMPBED) + #define BED_CHECK_INTERVAL 5000 // ms between checks in bang-bang control + #if ENABLED(BED_LIMIT_SWITCHING) + #define BED_HYSTERESIS 2 // Only disable heating if T>target+BED_HYSTERESIS and enable heating if T>target-BED_HYSTERESIS + #endif +#endif + +/** + * Thermal Protection provides additional protection to your printer from damage + * and fire. Marlin always includes safe min and max temperature ranges which + * protect against a broken or disconnected thermistor wire. + * + * The issue: If a thermistor falls out, it will report the much lower + * temperature of the air in the room, and the the firmware will keep + * the heater on. + * + * The solution: Once the temperature reaches the target, start observing. + * If the temperature stays too far below the target (hysteresis) for too + * long (period), the firmware will halt the machine as a safety precaution. + * + * If you get false positives for "Thermal Runaway", increase + * THERMAL_PROTECTION_HYSTERESIS and/or THERMAL_PROTECTION_PERIOD + */ +#if ENABLED(THERMAL_PROTECTION_HOTENDS) + #define THERMAL_PROTECTION_PERIOD 60 // Seconds + #define THERMAL_PROTECTION_HYSTERESIS 10 // Degrees Celsius + + //#define ADAPTIVE_FAN_SLOWING // Slow part cooling fan if temperature drops + #if ENABLED(ADAPTIVE_FAN_SLOWING) && ENABLED(PIDTEMP) + //#define NO_FAN_SLOWING_IN_PID_TUNING // Don't slow fan speed during M303 + #endif + + /** + * Whenever an M104, M109, or M303 increases the target temperature, the + * firmware will wait for the WATCH_TEMP_PERIOD to expire. If the temperature + * hasn't increased by WATCH_TEMP_INCREASE degrees, the machine is halted and + * requires a hard reset. This test restarts with any M104/M109/M303, but only + * if the current temperature is far enough below the target for a reliable + * test. + * + * If you get false positives for "Heating failed", increase WATCH_TEMP_PERIOD + * and/or decrease WATCH_TEMP_INCREASE. WATCH_TEMP_INCREASE should not be set + * below 2. + */ + #define WATCH_TEMP_PERIOD 20 // Seconds + #define WATCH_TEMP_INCREASE 2 // Degrees Celsius +#endif + +/** + * Thermal Protection parameters for the bed are just as above for hotends. + */ +#if ENABLED(THERMAL_PROTECTION_BED) + #define THERMAL_PROTECTION_BED_PERIOD 60 // Seconds + #define THERMAL_PROTECTION_BED_HYSTERESIS 5 // Degrees Celsius + + /** + * As described above, except for the bed (M140/M190/M303). + */ + #define WATCH_BED_TEMP_PERIOD 180 // Seconds + #define WATCH_BED_TEMP_INCREASE 2 // Degrees Celsius +#endif + +#if ENABLED(PIDTEMP) + // this adds an experimental additional term to the heating power, proportional to the extrusion speed. + // if Kc is chosen well, the additional required power due to increased melting should be compensated. + //#define PID_EXTRUSION_SCALING + #if ENABLED(PID_EXTRUSION_SCALING) + #define DEFAULT_Kc (100) //heating power=Kc*(e_speed) + #define LPQ_MAX_LEN 50 + #endif +#endif + +/** + * Automatic Temperature: + * The hotend target temperature is calculated by all the buffered lines of gcode. + * The maximum buffered steps/sec of the extruder motor is called "se". + * Start autotemp mode with M109 S B F + * The target temperature is set to mintemp+factor*se[steps/sec] and is limited by + * mintemp and maxtemp. Turn this off by executing M109 without F* + * Also, if the temperature is set to a value below mintemp, it will not be changed by autotemp. + * On an Ultimaker, some initial testing worked with M109 S215 B260 F1 in the start.gcode + */ +//#define AUTOTEMP +#if ENABLED(AUTOTEMP) + #define AUTOTEMP_OLDWEIGHT 0.98 +#endif + +// Show extra position information in M114 +//#define M114_DETAIL + +// Show Temperature ADC value +// Enable for M105 to include ADC values read from temperature sensors. +//#define SHOW_TEMP_ADC_VALUES + +/** + * High Temperature Thermistor Support + * + * Thermistors able to support high temperature tend to have a hard time getting + * good readings at room and lower temperatures. This means HEATER_X_RAW_LO_TEMP + * will probably be caught when the heating element first turns on during the + * preheating process, which will trigger a min_temp_error as a safety measure + * and force stop everything. + * To circumvent this limitation, we allow for a preheat time (during which, + * min_temp_error won't be triggered) and add a min_temp buffer to handle + * aberrant readings. + * + * If you want to enable this feature for your hotend thermistor(s) + * uncomment and set values > 0 in the constants below + */ + +// The number of consecutive low temperature errors that can occur +// before a min_temp_error is triggered. (Shouldn't be more than 10.) +//#define MAX_CONSECUTIVE_LOW_TEMPERATURE_ERROR_ALLOWED 0 + +// The number of milliseconds a hotend will preheat before starting to check +// the temperature. This value should NOT be set to the time it takes the +// hot end to reach the target temperature, but the time it takes to reach +// the minimum temperature your thermistor can read. The lower the better/safer. +// This shouldn't need to be more than 30 seconds (30000) +//#define MILLISECONDS_PREHEAT_TIME 0 + +// @section extruder + +// Extruder runout prevention. +// If the machine is idle and the temperature over MINTEMP +// then extrude some filament every couple of SECONDS. +//#define EXTRUDER_RUNOUT_PREVENT +#if ENABLED(EXTRUDER_RUNOUT_PREVENT) + #define EXTRUDER_RUNOUT_MINTEMP 190 + #define EXTRUDER_RUNOUT_SECONDS 30 + #define EXTRUDER_RUNOUT_SPEED 1500 // (mm/m) + #define EXTRUDER_RUNOUT_EXTRUDE 5 // (mm) +#endif + +// @section temperature + +// Calibration for AD595 / AD8495 sensor to adjust temperature measurements. +// The final temperature is calculated as (measuredTemp * GAIN) + OFFSET. +#define TEMP_SENSOR_AD595_OFFSET 0.0 +#define TEMP_SENSOR_AD595_GAIN 1.0 +#define TEMP_SENSOR_AD8495_OFFSET 0.0 +#define TEMP_SENSOR_AD8495_GAIN 1.0 + +/** + * Controller Fan + * To cool down the stepper drivers and MOSFETs. + * + * The fan will turn on automatically whenever any stepper is enabled + * and turn off after a set period after all steppers are turned off. + */ +//#define USE_CONTROLLER_FAN +#if ENABLED(USE_CONTROLLER_FAN) + //#define CONTROLLER_FAN_PIN -1 // Set a custom pin for the controller fan + #define CONTROLLERFAN_SECS 60 // Duration in seconds for the fan to run after all motors are disabled + #define CONTROLLERFAN_SPEED 255 // 255 == full speed +#endif + +// When first starting the main fan, run it at full speed for the +// given number of milliseconds. This gets the fan spinning reliably +// before setting a PWM value. (Does not work with software PWM for fan on Sanguinololu) +//#define FAN_KICKSTART_TIME 100 + +/** + * PWM Fan Scaling + * + * Define the min/max speeds for PWM fans (as set with M106). + * + * With these options the M106 0-255 value range is scaled to a subset + * to ensure that the fan has enough power to spin, or to run lower + * current fans with higher current. (e.g., 5V/12V fans with 12V/24V) + * Value 0 always turns off the fan. + * + * Define one or both of these to override the default 0-255 range. + */ +//#define FAN_MIN_PWM 50 +//#define FAN_MAX_PWM 128 + +// @section extruder + +/** + * Extruder cooling fans + * + * Extruder auto fans automatically turn on when their extruders' + * temperatures go above EXTRUDER_AUTO_FAN_TEMPERATURE. + * + * Your board's pins file specifies the recommended pins. Override those here + * or set to -1 to disable completely. + * + * Multiple extruders can be assigned to the same pin in which case + * the fan will turn on when any selected extruder is above the threshold. + */ +#define E0_AUTO_FAN_PIN -1 +#define E1_AUTO_FAN_PIN -1 +#define E2_AUTO_FAN_PIN -1 +#define E3_AUTO_FAN_PIN -1 +#define E4_AUTO_FAN_PIN -1 +#define E5_AUTO_FAN_PIN -1 +#define CHAMBER_AUTO_FAN_PIN -1 +#define EXTRUDER_AUTO_FAN_TEMPERATURE 50 +#define EXTRUDER_AUTO_FAN_SPEED 255 // 255 == full speed + +/** + * Part-Cooling Fan Multiplexer + * + * This feature allows you to digitally multiplex the fan output. + * The multiplexer is automatically switched at tool-change. + * Set FANMUX[012]_PINs below for up to 2, 4, or 8 multiplexed fans. + */ +#define FANMUX0_PIN -1 +#define FANMUX1_PIN -1 +#define FANMUX2_PIN -1 + +/** + * M355 Case Light on-off / brightness + */ +//#define CASE_LIGHT_ENABLE +#if ENABLED(CASE_LIGHT_ENABLE) + //#define CASE_LIGHT_PIN 4 // Override the default pin if needed + #define INVERT_CASE_LIGHT false // Set true if Case Light is ON when pin is LOW + #define CASE_LIGHT_DEFAULT_ON true // Set default power-up state on + #define CASE_LIGHT_DEFAULT_BRIGHTNESS 105 // Set default power-up brightness (0-255, requires PWM pin) + //#define MENU_ITEM_CASE_LIGHT // Add a Case Light option to the LCD main menu + //#define CASE_LIGHT_USE_NEOPIXEL // Use Neopixel LED as case light, requires NEOPIXEL_LED. + #if ENABLED(CASE_LIGHT_USE_NEOPIXEL) + #define CASE_LIGHT_NEOPIXEL_COLOR { 255, 255, 255, 255 } // { Red, Green, Blue, White } + #endif +#endif + +//=========================================================================== +//============================ Mechanical Settings ========================== +//=========================================================================== + +// @section homing + +// If you want endstops to stay on (by default) even when not homing +// enable this option. Override at any time with M120, M121. +//#define ENDSTOPS_ALWAYS_ON_DEFAULT + +// @section extras + +//#define Z_LATE_ENABLE // Enable Z the last moment. Needed if your Z driver overheats. + +// Employ an external closed loop controller. Override pins here if needed. +//#define EXTERNAL_CLOSED_LOOP_CONTROLLER +#if ENABLED(EXTERNAL_CLOSED_LOOP_CONTROLLER) + //#define CLOSED_LOOP_ENABLE_PIN -1 + //#define CLOSED_LOOP_MOVE_COMPLETE_PIN -1 +#endif + +/** + * Dual Steppers / Dual Endstops + * + * This section will allow you to use extra E drivers to drive a second motor for X, Y, or Z axes. + * + * For example, set X_DUAL_STEPPER_DRIVERS setting to use a second motor. If the motors need to + * spin in opposite directions set INVERT_X2_VS_X_DIR. If the second motor needs its own endstop + * set X_DUAL_ENDSTOPS. This can adjust for "racking." Use X2_USE_ENDSTOP to set the endstop plug + * that should be used for the second endstop. Extra endstops will appear in the output of 'M119'. + * + * Use X_DUAL_ENDSTOP_ADJUSTMENT to adjust for mechanical imperfection. After homing both motors + * this offset is applied to the X2 motor. To find the offset home the X axis, and measure the error + * in X2. Dual endstop offsets can be set at runtime with 'M666 X Y Z'. + */ + +//#define X_DUAL_STEPPER_DRIVERS +#if ENABLED(X_DUAL_STEPPER_DRIVERS) + #define INVERT_X2_VS_X_DIR true // Set 'true' if X motors should rotate in opposite directions + //#define X_DUAL_ENDSTOPS + #if ENABLED(X_DUAL_ENDSTOPS) + #define X2_USE_ENDSTOP _XMAX_ + #define X_DUAL_ENDSTOPS_ADJUSTMENT 0 + #endif +#endif + +//#define Y_DUAL_STEPPER_DRIVERS +#if ENABLED(Y_DUAL_STEPPER_DRIVERS) + #define INVERT_Y2_VS_Y_DIR true // Set 'true' if Y motors should rotate in opposite directions + //#define Y_DUAL_ENDSTOPS + #if ENABLED(Y_DUAL_ENDSTOPS) + #define Y2_USE_ENDSTOP _YMAX_ + #define Y_DUAL_ENDSTOPS_ADJUSTMENT 0 + #endif +#endif + +//#define Z_DUAL_STEPPER_DRIVERS +#if ENABLED(Z_DUAL_STEPPER_DRIVERS) + //#define Z_DUAL_ENDSTOPS + #if ENABLED(Z_DUAL_ENDSTOPS) + #define Z2_USE_ENDSTOP _XMAX_ + #define Z_DUAL_ENDSTOPS_ADJUSTMENT 0 + #endif +#endif + +//#define Z_TRIPLE_STEPPER_DRIVERS +#if ENABLED(Z_TRIPLE_STEPPER_DRIVERS) + //#define Z_TRIPLE_ENDSTOPS + #if ENABLED(Z_TRIPLE_ENDSTOPS) + #define Z2_USE_ENDSTOP _XMAX_ + #define Z3_USE_ENDSTOP _YMAX_ + #define Z_TRIPLE_ENDSTOPS_ADJUSTMENT2 0 + #define Z_TRIPLE_ENDSTOPS_ADJUSTMENT3 0 + #endif +#endif + +/** + * Dual X Carriage + * + * This setup has two X carriages that can move independently, each with its own hotend. + * The carriages can be used to print an object with two colors or materials, or in + * "duplication mode" it can print two identical or X-mirrored objects simultaneously. + * The inactive carriage is parked automatically to prevent oozing. + * X1 is the left carriage, X2 the right. They park and home at opposite ends of the X axis. + * By default the X2 stepper is assigned to the first unused E plug on the board. + */ +//#define DUAL_X_CARRIAGE +#if ENABLED(DUAL_X_CARRIAGE) + #define X1_MIN_POS X_MIN_POS // set minimum to ensure first x-carriage doesn't hit the parked second X-carriage + #define X1_MAX_POS X_BED_SIZE // set maximum to ensure first x-carriage doesn't hit the parked second X-carriage + #define X2_MIN_POS 80 // set minimum to ensure second x-carriage doesn't hit the parked first X-carriage + #define X2_MAX_POS 353 // set maximum to the distance between toolheads when both heads are homed + #define X2_HOME_DIR 1 // the second X-carriage always homes to the maximum endstop position + #define X2_HOME_POS X2_MAX_POS // default home position is the maximum carriage position + // However: In this mode the HOTEND_OFFSET_X value for the second extruder provides a software + // override for X2_HOME_POS. This also allow recalibration of the distance between the two endstops + // without modifying the firmware (through the "M218 T1 X???" command). + // Remember: you should set the second extruder x-offset to 0 in your slicer. + + // There are a few selectable movement modes for dual x-carriages using M605 S + // Mode 0 (DXC_FULL_CONTROL_MODE): Full control. The slicer has full control over both x-carriages and can achieve optimal travel results + // as long as it supports dual x-carriages. (M605 S0) + // Mode 1 (DXC_AUTO_PARK_MODE) : Auto-park mode. The firmware will automatically park and unpark the x-carriages on tool changes so + // that additional slicer support is not required. (M605 S1) + // Mode 2 (DXC_DUPLICATION_MODE) : Duplication mode. The firmware will transparently make the second x-carriage and extruder copy all + // actions of the first x-carriage. This allows the printer to print 2 arbitrary items at + // once. (2nd extruder x offset and temp offset are set using: M605 S2 [Xnnn] [Rmmm]) + + // This is the default power-up mode which can be later using M605. + #define DEFAULT_DUAL_X_CARRIAGE_MODE DXC_FULL_CONTROL_MODE + + // Default x offset in duplication mode (typically set to half print bed width) + #define DEFAULT_DUPLICATION_X_OFFSET 100 + +#endif // DUAL_X_CARRIAGE + +// Activate a solenoid on the active extruder with M380. Disable all with M381. +// Define SOL0_PIN, SOL1_PIN, etc., for each extruder that has a solenoid. +//#define EXT_SOLENOID + +// @section homing + +// Homing hits each endstop, retracts by these distances, then does a slower bump. +#define X_HOME_BUMP_MM 5 +#define Y_HOME_BUMP_MM 5 +#define Z_HOME_BUMP_MM 2 +#if NON_E_AXES > 3 + #define I_HOME_BUMP_MM 2 + #if NON_E_AXES > 4 + #define J_HOME_BUMP_MM 2 + #if NON_E_AXES > 5 + #define K_HOME_BUMP_MM 2 + #endif + #endif +#endif + +#define HOMING_BUMP_DIVISOR ARRAY_N(NON_E_AXES, 2, 2, 4, 4, 4, 4) // Re-Bump Speed Divisor (Divides the Homing Feedrate) + +//#define QUICK_HOME // If homing includes X and Y, do a diagonal move initially + +// When G28 is called, this option will make Y home before X +//#define HOME_Y_BEFORE_X + +// Enable this if X or Y can't home without homing the other axis first. +//#define CODEPENDENT_XY_HOMING + +/** + * Z Steppers Auto-Alignment + * Add the G34 command to align multiple Z steppers using a bed probe. + */ +//#define Z_STEPPER_AUTO_ALIGN +#if ENABLED(Z_STEPPER_AUTO_ALIGN) + // Define probe X and Y positions for Z1, Z2 [, Z3] + #define Z_STEPPER_ALIGN_X { 10, 150, 290 } + #define Z_STEPPER_ALIGN_Y { 290, 10, 290 } + // Set number of iterations to align + #define Z_STEPPER_ALIGN_ITERATIONS 3 + // Enable to restore leveling setup after operation + #define RESTORE_LEVELING_AFTER_G34 + // Use the amplification factor to de-/increase correction step. + // In case the stepper (spindle) position is further out than the test point + // Use a value > 1. NOTE: This may cause instability + #define Z_STEPPER_ALIGN_AMP 1.0 + // Stop criterion. If the accuracy is better than this stop iterating early + #define Z_STEPPER_ALIGN_ACC 0.02 +#endif + +// @section machine + +#if NON_E_AXES == 3 + #define AXIS_RELATIVE_MODES {false, false, false, false} +#elif NON_E_AXES == 4 + #define AXIS_RELATIVE_MODES {false, false, false, false, false} +#elif NON_E_AXES == 5 + #define AXIS_RELATIVE_MODES {false, false, false, false, false, false} +#elif NON_E_AXES == 6 + #define AXIS_RELATIVE_MODES {false, false, false, false, false, false, false} +#endif + +// Allow duplication mode with a basic dual-nozzle extruder +//#define DUAL_NOZZLE_DUPLICATION_MODE + +// By default pololu step drivers require an active high signal. However, some high power drivers require an active low signal as step. +#define INVERT_X_STEP_PIN false +#define INVERT_Y_STEP_PIN false +#define INVERT_Z_STEP_PIN false +#if NON_E_AXES > 3 + #define INVERT_I_STEP_PIN false + #if NON_E_AXES > 4 + #define INVERT_K_STEP_PIN false + #if NON_E_AXES > 5 + #define INVERT_K_STEP_PIN false + #endif + #endif +#endif +#define INVERT_E_STEP_PIN false + +// Default stepper release if idle. Set to 0 to deactivate. +// Steppers will shut down DEFAULT_STEPPER_DEACTIVE_TIME seconds after the last move when DISABLE_INACTIVE_? is true. +// Time can be set by M18 and M84. +#define DEFAULT_STEPPER_DEACTIVE_TIME 120 +#define DISABLE_INACTIVE_X true +#define DISABLE_INACTIVE_Y true +#define DISABLE_INACTIVE_Z true // set to false if the nozzle will fall down on your printed part when print has finished. +#if NON_E_AXES > 3 + #define DISABLE_INACTIVE_I true + #if NON_E_AXES > 3 + #define DISABLE_INACTIVE_J true + #if NON_E_AXES > 3 + #define DISABLE_INACTIVE_K true + #endif + #endif +#endif +#define DISABLE_INACTIVE_E true + +#define DEFAULT_MINIMUMFEEDRATE 0.0 // minimum feedrate +#define DEFAULT_MINTRAVELFEEDRATE 0.0 + +//#define HOME_AFTER_DEACTIVATE // Require rehoming after steppers are deactivated + +// @section lcd + +#if ENABLED(ULTIPANEL) + #define MANUAL_FEEDRATE {50*60, 50*60, 4*60, 4*60} // Feedrates for manual moves along X, Y, Z, E from panel + #define MANUAL_E_MOVES_RELATIVE // Show LCD extruder moves as relative rather than absolute positions + #define ULTIPANEL_FEEDMULTIPLY // Comment to disable setting feedrate multiplier via encoder +#endif + +// @section extras + +// minimum time in microseconds that a movement needs to take if the buffer is emptied. +#define DEFAULT_MINSEGMENTTIME 20000 + +// If defined the movements slow down when the look ahead buffer is only half full +#define SLOWDOWN + +// Frequency limit +// See nophead's blog for more info +// Not working O +//#define XY_FREQUENCY_LIMIT 15 + +// Minimum planner junction speed. Sets the default minimum speed the planner plans for at the end +// of the buffer and all stops. This should not be much greater than zero and should only be changed +// if unwanted behavior is observed on a user's machine when running at very slow speeds. +#define MINIMUM_PLANNER_SPEED 0.05 // (mm/s) + +// +// Backlash Compensation +// Adds extra movement to axes on direction-changes to account for backlash. +// +//#define BACKLASH_COMPENSATION +#if ENABLED(BACKLASH_COMPENSATION) + // Define values for backlash distance and correction. + // If BACKLASH_GCODE is enabled these values are the defaults. + #define BACKLASH_DISTANCE_MM { 0, 0, 0 } // (mm) + #define BACKLASH_CORRECTION 0.0 // 0.0 = no correction; 1.0 = full correction + + // Set BACKLASH_SMOOTHING_MM to spread backlash correction over multiple segments + // to reduce print artifacts. (Enabling this is costly in memory and computation!) + //#define BACKLASH_SMOOTHING_MM 3 // (mm) + + // Add runtime configuration and tuning of backlash values (M425) + //#define BACKLASH_GCODE + + #if ENABLED(BACKLASH_GCODE) + // Measure the Z backlash when probing (G29) and set with "M425 Z" + #define MEASURE_BACKLASH_WHEN_PROBING + + #if ENABLED(MEASURE_BACKLASH_WHEN_PROBING) + // When measuring, the probe will move up to BACKLASH_MEASUREMENT_LIMIT + // mm away from point of contact in BACKLASH_MEASUREMENT_RESOLUTION + // increments while checking for the contact to be broken. + #define BACKLASH_MEASUREMENT_LIMIT 0.5 // (mm) + #define BACKLASH_MEASUREMENT_RESOLUTION 0.005 // (mm) + #define BACKLASH_MEASUREMENT_FEEDRATE Z_PROBE_SPEED_SLOW // (mm/m) + #endif + #endif +#endif + +/** + * Automatic backlash, position and hotend offset calibration + * + * Enable G425 to run automatic calibration using an electrically- + * conductive cube, bolt, or washer mounted on the bed. + * + * G425 uses the probe to touch the top and sides of the calibration object + * on the bed and measures and/or correct positional offsets, axis backlash + * and hotend offsets. + * + * Note: HOTEND_OFFSET and CALIBRATION_OBJECT_CENTER must be set to within + * ±5mm of true values for G425 to succeed. + */ +//#define CALIBRATION_GCODE +#if ENABLED(CALIBRATION_GCODE) + + #define CALIBRATION_MEASUREMENT_RESOLUTION 0.01 // mm + + #define CALIBRATION_FEEDRATE_SLOW 60 // mm/m + #define CALIBRATION_FEEDRATE_FAST 1200 // mm/m + #define CALIBRATION_FEEDRATE_TRAVEL 3000 // mm/m + + // The following parameters refer to the conical section of the nozzle tip. + #define CALIBRATION_NOZZLE_TIP_HEIGHT 1.0 // mm + #define CALIBRATION_NOZZLE_OUTER_DIAMETER 2.0 // mm + + // Uncomment to enable reporting (required for "G425 V", but consumes PROGMEM). + //#define CALIBRATION_REPORTING + + // The true location and dimension the cube/bolt/washer on the bed. + #define CALIBRATION_OBJECT_CENTER { 264.0, -22.0, -2.0} // mm + #define CALIBRATION_OBJECT_DIMENSIONS { 10.0, 10.0, 10.0} // mm + + // Comment out any sides which are unreachable by the probe. For best + // auto-calibration results, all sides must be reachable. + #define CALIBRATION_MEASURE_RIGHT + #define CALIBRATION_MEASURE_FRONT + #define CALIBRATION_MEASURE_LEFT + #define CALIBRATION_MEASURE_BACK + + // Probing at the exact top center only works if the center is flat. If + // probing on a screwhead or hollow washer, probe near the edges. + //#define CALIBRATION_MEASURE_AT_TOP_EDGES + + // Define pin which is read during calibration + #ifndef CALIBRATION_PIN + #define CALIBRATION_PIN -1 // Override in pins.h or set to -1 to use your Z endstop + #define CALIBRATION_PIN_INVERTING false // set to true to invert the pin + //#define CALIBRATION_PIN_PULLDOWN + #define CALIBRATION_PIN_PULLUP + #endif +#endif + +/** + * Adaptive Step Smoothing increases the resolution of multi-axis moves, particularly at step frequencies + * below 1kHz (for AVR) or 10kHz (for ARM), where aliasing between axes in multi-axis moves causes audible + * vibration and surface artifacts. The algorithm adapts to provide the best possible step smoothing at the + * lowest stepping frequencies. + */ +//#define ADAPTIVE_STEP_SMOOTHING + +/** + * Custom Microstepping + * Override as-needed for your setup. Up to 3 MS pins are supported. + */ +//#define MICROSTEP1 LOW,LOW,LOW +//#define MICROSTEP2 HIGH,LOW,LOW +//#define MICROSTEP4 LOW,HIGH,LOW +//#define MICROSTEP8 HIGH,HIGH,LOW +//#define MICROSTEP16 LOW,LOW,HIGH +//#define MICROSTEP32 HIGH,LOW,HIGH + +// Microstep setting (Only functional when stepper driver microstep pins are connected to MCU. +#define MICROSTEP_MODES { 16, 16, 16, 16, 16, 16 } // [1,2,4,8,16] + +/** + * @section stepper motor current + * + * Some boards have a means of setting the stepper motor current via firmware. + * + * The power on motor currents are set by: + * PWM_MOTOR_CURRENT - used by MINIRAMBO & ULTIMAIN_2 + * known compatible chips: A4982 + * DIGIPOT_MOTOR_CURRENT - used by BQ_ZUM_MEGA_3D, RAMBO & SCOOVO_X9H + * known compatible chips: AD5206 + * DAC_MOTOR_CURRENT_DEFAULT - used by PRINTRBOARD_REVF & RIGIDBOARD_V2 + * known compatible chips: MCP4728 + * DIGIPOT_I2C_MOTOR_CURRENTS - used by 5DPRINT, AZTEEG_X3_PRO, AZTEEG_X5_MINI_WIFI, MIGHTYBOARD_REVE + * known compatible chips: MCP4451, MCP4018 + * + * Motor currents can also be set by M907 - M910 and by the LCD. + * M907 - applies to all. + * M908 - BQ_ZUM_MEGA_3D, RAMBO, PRINTRBOARD_REVF, RIGIDBOARD_V2 & SCOOVO_X9H + * M909, M910 & LCD - only PRINTRBOARD_REVF & RIGIDBOARD_V2 + */ +//#define PWM_MOTOR_CURRENT { 1300, 1300, 1250 } // Values in milliamps +//#define DIGIPOT_MOTOR_CURRENT { 135,135,135,135,135 } // Values 0-255 (RAMBO 135 = ~0.75A, 185 = ~1A) +//#define DAC_MOTOR_CURRENT_DEFAULT { 70, 80, 90, 80 } // Default drive percent - X, Y, Z, E axis + +// Use an I2C based DIGIPOT (e.g., Azteeg X3 Pro) +//#define DIGIPOT_I2C +#if ENABLED(DIGIPOT_I2C) && !defined(DIGIPOT_I2C_ADDRESS_A) + /** + * Common slave addresses: + * + * A (A shifted) B (B shifted) IC + * Smoothie 0x2C (0x58) 0x2D (0x5A) MCP4451 + * AZTEEG_X3_PRO 0x2C (0x58) 0x2E (0x5C) MCP4451 + * AZTEEG_X5_MINI_WIFI 0x58 0x5C MCP4451 + * MIGHTYBOARD_REVE 0x2F (0x5E) MCP4018 + */ + #define DIGIPOT_I2C_ADDRESS_A 0x2C // unshifted slave address for first DIGIPOT + #define DIGIPOT_I2C_ADDRESS_B 0x2D // unshifted slave address for second DIGIPOT +#endif + +//#define DIGIPOT_MCP4018 // Requires library from https://github.com/stawel/SlowSoftI2CMaster +#define DIGIPOT_I2C_NUM_CHANNELS 8 // 5DPRINT: 4 AZTEEG_X3_PRO: 8 MKS SBASE: 5 +// Actual motor currents in Amps. The number of entries must match DIGIPOT_I2C_NUM_CHANNELS. +// These correspond to the physical drivers, so be mindful if the order is changed. +#define DIGIPOT_I2C_MOTOR_CURRENTS { 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0 } // AZTEEG_X3_PRO + +//=========================================================================== +//=============================Additional Features=========================== +//=========================================================================== + +// @section lcd + +// Change values more rapidly when the encoder is rotated faster +#define ENCODER_RATE_MULTIPLIER +#if ENABLED(ENCODER_RATE_MULTIPLIER) + #define ENCODER_10X_STEPS_PER_SEC 30 // (steps/s) Encoder rate for 10x speed + #define ENCODER_100X_STEPS_PER_SEC 80 // (steps/s) Encoder rate for 100x speed +#endif + +// Play a beep when the feedrate is changed from the Status Screen +//#define BEEP_ON_FEEDRATE_CHANGE +#if ENABLED(BEEP_ON_FEEDRATE_CHANGE) + #define FEEDRATE_CHANGE_BEEP_DURATION 10 + #define FEEDRATE_CHANGE_BEEP_FREQUENCY 440 +#endif + +// Include a page of printer information in the LCD Main Menu +//#define LCD_INFO_MENU + +// Scroll a longer status message into view +//#define STATUS_MESSAGE_SCROLLING + +// On the Info Screen, display XY with one decimal place when possible +//#define LCD_DECIMAL_SMALL_XY + +// The timeout (in ms) to return to the status screen from sub-menus +//#define LCD_TIMEOUT_TO_STATUS 15000 + +// Add an 'M73' G-code to set the current percentage +//#define LCD_SET_PROGRESS_MANUALLY + +#if HAS_CHARACTER_LCD && HAS_PRINT_PROGRESS + //#define LCD_PROGRESS_BAR // Show a progress bar on HD44780 LCDs for SD printing + #if ENABLED(LCD_PROGRESS_BAR) + #define PROGRESS_BAR_BAR_TIME 2000 // (ms) Amount of time to show the bar + #define PROGRESS_BAR_MSG_TIME 3000 // (ms) Amount of time to show the status message + #define PROGRESS_MSG_EXPIRE 0 // (ms) Amount of time to retain the status message (0=forever) + //#define PROGRESS_MSG_ONCE // Show the message for MSG_TIME then clear it + //#define LCD_PROGRESS_BAR_TEST // Add a menu item to test the progress bar + #endif +#endif + +/** + * LED Control Menu + * Enable this feature to add LED Control to the LCD menu + */ +//#define LED_CONTROL_MENU +#if ENABLED(LED_CONTROL_MENU) + #define LED_COLOR_PRESETS // Enable the Preset Color menu option + #if ENABLED(LED_COLOR_PRESETS) + #define LED_USER_PRESET_RED 255 // User defined RED value + #define LED_USER_PRESET_GREEN 128 // User defined GREEN value + #define LED_USER_PRESET_BLUE 0 // User defined BLUE value + #define LED_USER_PRESET_WHITE 255 // User defined WHITE value + #define LED_USER_PRESET_BRIGHTNESS 255 // User defined intensity + //#define LED_USER_PRESET_STARTUP // Have the printer display the user preset color on startup + #endif +#endif // LED_CONTROL_MENU + +#if ENABLED(SDSUPPORT) + + // Some RAMPS and other boards don't detect when an SD card is inserted. You can work + // around this by connecting a push button or single throw switch to the pin defined + // as SD_DETECT_PIN in your board's pins definitions. + // This setting should be disabled unless you are using a push button, pulling the pin to ground. + // Note: This is always disabled for ULTIPANEL (except ELB_FULL_GRAPHIC_CONTROLLER). + //#define SD_DETECT_INVERTED + + #define SD_FINISHED_STEPPERRELEASE true // Disable steppers when SD Print is finished + #define SD_FINISHED_RELEASECOMMAND "M84 X Y Z E" // You might want to keep the Z enabled so your bed stays in place. + + // Reverse SD sort to show "more recent" files first, according to the card's FAT. + // Since the FAT gets out of order with usage, SDCARD_SORT_ALPHA is recommended. + #define SDCARD_RATHERRECENTFIRST + + // Add an option in the menu to run all auto#.g files + //#define MENU_ADDAUTOSTART + + /** + * Continue after Power-Loss (Creality3D) + * + * Store the current state to the SD Card at the start of each layer + * during SD printing. If the recovery file is found at boot time, present + * an option on the LCD screen to continue the print from the last-known + * point in the file. + */ + //#define POWER_LOSS_RECOVERY + #if ENABLED(POWER_LOSS_RECOVERY) + //#define POWER_LOSS_PIN 44 // Pin to detect power loss + //#define POWER_LOSS_STATE HIGH // State of pin indicating power loss + #endif + + /** + * Sort SD file listings in alphabetical order. + * + * With this option enabled, items on SD cards will be sorted + * by name for easier navigation. + * + * By default... + * + * - Use the slowest -but safest- method for sorting. + * - Folders are sorted to the top. + * - The sort key is statically allocated. + * - No added G-code (M34) support. + * - 40 item sorting limit. (Items after the first 40 are unsorted.) + * + * SD sorting uses static allocation (as set by SDSORT_LIMIT), allowing the + * compiler to calculate the worst-case usage and throw an error if the SRAM + * limit is exceeded. + * + * - SDSORT_USES_RAM provides faster sorting via a static directory buffer. + * - SDSORT_USES_STACK does the same, but uses a local stack-based buffer. + * - SDSORT_CACHE_NAMES will retain the sorted file listing in RAM. (Expensive!) + * - SDSORT_DYNAMIC_RAM only uses RAM when the SD menu is visible. (Use with caution!) + */ + //#define SDCARD_SORT_ALPHA + + // SD Card Sorting options + #if ENABLED(SDCARD_SORT_ALPHA) + #define SDSORT_LIMIT 40 // Maximum number of sorted items (10-256). Costs 27 bytes each. + #define FOLDER_SORTING -1 // -1=above 0=none 1=below + #define SDSORT_GCODE false // Allow turning sorting on/off with LCD and M34 g-code. + #define SDSORT_USES_RAM false // Pre-allocate a static array for faster pre-sorting. + #define SDSORT_USES_STACK false // Prefer the stack for pre-sorting to give back some SRAM. (Negated by next 2 options.) + #define SDSORT_CACHE_NAMES false // Keep sorted items in RAM longer for speedy performance. Most expensive option. + #define SDSORT_DYNAMIC_RAM false // Use dynamic allocation (within SD menus). Least expensive option. Set SDSORT_LIMIT before use! + #define SDSORT_CACHE_VFATS 2 // Maximum number of 13-byte VFAT entries to use for sorting. + // Note: Only affects SCROLL_LONG_FILENAMES with SDSORT_CACHE_NAMES but not SDSORT_DYNAMIC_RAM. + #endif + + // This allows hosts to request long names for files and folders with M33 + //#define LONG_FILENAME_HOST_SUPPORT + + // Enable this option to scroll long filenames in the SD card menu + //#define SCROLL_LONG_FILENAMES + + /** + * This option allows you to abort SD printing when any endstop is triggered. + * This feature must be enabled with "M540 S1" or from the LCD menu. + * To have any effect, endstops must be enabled during SD printing. + */ + //#define ABORT_ON_ENDSTOP_HIT_FEATURE_ENABLED + + /** + * This option makes it easier to print the same SD Card file again. + * On print completion the LCD Menu will open with the file selected. + * You can just click to start the print, or navigate elsewhere. + */ + //#define SD_REPRINT_LAST_SELECTED_FILE + + /** + * Auto-report SdCard status with M27 S + */ + //#define AUTO_REPORT_SD_STATUS + + /** + * Support for USB thumb drives using an Arduino USB Host Shield or + * equivalent MAX3421E breakout board. The USB thumb drive will appear + * to Marlin as an SD card. + * + * The MAX3421E must be assigned the same pins as the SD card reader, with + * the following pin mapping: + * + * SCLK, MOSI, MISO --> SCLK, MOSI, MISO + * INT --> SD_DETECT_PIN + * SS --> SDSS + */ + //#define USB_FLASH_DRIVE_SUPPORT + #if ENABLED(USB_FLASH_DRIVE_SUPPORT) + #define USB_CS_PIN SDSS + #define USB_INTR_PIN SD_DETECT_PIN + #endif + + /** + * When using a bootloader that supports SD-Firmware-Flashing, + * add a menu item to activate SD-FW-Update on the next reboot. + * + * Requires ATMEGA2560 (Arduino Mega) + * + * Tested with this bootloader: + * https://github.com/FleetProbe/MicroBridge-Arduino-ATMega2560 + */ + //#define SD_FIRMWARE_UPDATE + #if ENABLED(SD_FIRMWARE_UPDATE) + #define SD_FIRMWARE_UPDATE_EEPROM_ADDR 0x1FF + #define SD_FIRMWARE_UPDATE_ACTIVE_VALUE 0xF0 + #define SD_FIRMWARE_UPDATE_INACTIVE_VALUE 0xFF + #endif + + // Add an optimized binary file transfer mode, initiated with 'M28 B1' + //#define FAST_FILE_TRANSFER + +#endif // SDSUPPORT + +/** + * Additional options for Graphical Displays + * + * Use the optimizations here to improve printing performance, + * which can be adversely affected by graphical display drawing, + * especially when doing several short moves, and when printing + * on DELTA and SCARA machines. + * + * Some of these options may result in the display lagging behind + * controller events, as there is a trade-off between reliable + * printing performance versus fast display updates. + */ +#if HAS_GRAPHICAL_LCD + // Show SD percentage next to the progress bar + //#define DOGM_SD_PERCENT + + // Enable to save many cycles by drawing a hollow frame on the Info Screen + #define XYZ_HOLLOW_FRAME + + // Enable to save many cycles by drawing a hollow frame on Menu Screens + #define MENU_HOLLOW_FRAME + + // A bigger font is available for edit items. Costs 3120 bytes of PROGMEM. + // Western only. Not available for Cyrillic, Kana, Turkish, Greek, or Chinese. + //#define USE_BIG_EDIT_FONT + + // A smaller font may be used on the Info Screen. Costs 2300 bytes of PROGMEM. + // Western only. Not available for Cyrillic, Kana, Turkish, Greek, or Chinese. + //#define USE_SMALL_INFOFONT + + // Enable this option and reduce the value to optimize screen updates. + // The normal delay is 10µs. Use the lowest value that still gives a reliable display. + //#define DOGM_SPI_DELAY_US 5 + + // Swap the CW/CCW indicators in the graphics overlay + //#define OVERLAY_GFX_REVERSE + + /** + * ST7920-based LCDs can emulate a 16 x 4 character display using + * the ST7920 character-generator for very fast screen updates. + * Enable LIGHTWEIGHT_UI to use this special display mode. + * + * Since LIGHTWEIGHT_UI has limited space, the position and status + * message occupy the same line. Set STATUS_EXPIRE_SECONDS to the + * length of time to display the status message before clearing. + * + * Set STATUS_EXPIRE_SECONDS to zero to never clear the status. + * This will prevent position updates from being displayed. + */ + #if ENABLED(U8GLIB_ST7920) + //#define LIGHTWEIGHT_UI + #if ENABLED(LIGHTWEIGHT_UI) + #define STATUS_EXPIRE_SECONDS 20 + #endif + #endif + + /** + * Status (Info) Screen customizations + * These options may affect code size and screen render time. + * Custom status screens can forcibly override these settings. + */ + //#define STATUS_COMBINE_HEATERS // Use combined heater images instead of separate ones + //#define STATUS_HOTEND_NUMBERLESS // Use plain hotend icons instead of numbered ones (with 2+ hotends) + #define STATUS_HOTEND_INVERTED // Show solid nozzle bitmaps when heating (Requires STATUS_HOTEND_ANIM) + #define STATUS_HOTEND_ANIM // Use a second bitmap to indicate hotend heating + #define STATUS_BED_ANIM // Use a second bitmap to indicate bed heating + //#define STATUS_ALT_BED_BITMAP // Use the alternative bed bitmap + //#define STATUS_ALT_FAN_BITMAP // Use the alternative fan bitmap + //#define STATUS_FAN_FRAMES 3 // :[0,1,2,3,4] Number of fan animation frames + //#define STATUS_HEAT_PERCENT // Show heating in a progress bar + +#endif // HAS_GRAPHICAL_LCD + +// @section safety + +// The hardware watchdog should reset the microcontroller disabling all outputs, +// in case the firmware gets stuck and doesn't do temperature regulation. +#define USE_WATCHDOG + +#if ENABLED(USE_WATCHDOG) + // If you have a watchdog reboot in an ArduinoMega2560 then the device will hang forever, as a watchdog reset will leave the watchdog on. + // The "WATCHDOG_RESET_MANUAL" goes around this by not using the hardware reset. + // However, THIS FEATURE IS UNSAFE!, as it will only work if interrupts are disabled. And the code could hang in an interrupt routine with interrupts disabled. + //#define WATCHDOG_RESET_MANUAL +#endif + +// @section lcd + +/** + * Babystepping enables movement of the axes by tiny increments without changing + * the current position values. This feature is used primarily to adjust the Z + * axis in the first layer of a print in real-time. + * + * Warning: Does not respect endstops! + */ +#define BABYSTEPPING +#if ENABLED(BABYSTEPPING) + //#define BABYSTEP_XY // Also enable X/Y Babystepping. Not supported on DELTA! + #define BABYSTEP_INVERT_Z false // Change if Z babysteps should go the other way + #define BABYSTEP_MULTIPLICATOR 1 // Babysteps are very small. Increase for faster motion. + + //#define DOUBLECLICK_FOR_Z_BABYSTEPPING // Double-click on the Status Screen for Z Babystepping. + #if ENABLED(DOUBLECLICK_FOR_Z_BABYSTEPPING) + #define DOUBLECLICK_MAX_INTERVAL 1250 // Maximum interval between clicks, in milliseconds. + // Note: Extra time may be added to mitigate controller latency. + #endif + + //#define MOVE_Z_WHEN_IDLE // Jump to the move Z menu on doubleclick when printer is idle. + #if ENABLED(MOVE_Z_WHEN_IDLE) + #define MOVE_Z_IDLE_MULTIPLICATOR 1 // Multiply 1mm by this factor for the move step size. + #endif + + //#define BABYSTEP_ZPROBE_OFFSET // Combine M851 Z and Babystepping + #if ENABLED(BABYSTEP_ZPROBE_OFFSET) + //#define BABYSTEP_HOTEND_Z_OFFSET // For multiple hotends, babystep relative Z offsets + //#define BABYSTEP_ZPROBE_GFX_OVERLAY // Enable graphical overlay on Z-offset editor + #endif +#endif + +// @section extruder + +/** + * Linear Pressure Control v1.5 + * + * Assumption: advance [steps] = k * (delta velocity [steps/s]) + * K=0 means advance disabled. + * + * NOTE: K values for LIN_ADVANCE 1.5 differ from earlier versions! + * + * Set K around 0.22 for 3mm PLA Direct Drive with ~6.5cm between the drive gear and heatbreak. + * Larger K values will be needed for flexible filament and greater distances. + * If this algorithm produces a higher speed offset than the extruder can handle (compared to E jerk) + * print acceleration will be reduced during the affected moves to keep within the limit. + * + * See http://marlinfw.org/docs/features/lin_advance.html for full instructions. + * Mention @Sebastianv650 on GitHub to alert the author of any issues. + */ +//#define LIN_ADVANCE +#if ENABLED(LIN_ADVANCE) + #define LIN_ADVANCE_K 0.22 // Unit: mm compression per 1mm/s extruder speed + //#define LA_DEBUG // If enabled, this will generate debug information output over USB. +#endif + +// @section leveling + +#if ENABLED(MESH_BED_LEVELING) || ENABLED(AUTO_BED_LEVELING_UBL) + // Override the mesh area if the automatic (max) area is too large + //#define MESH_MIN_X MESH_INSET + //#define MESH_MIN_Y MESH_INSET + //#define MESH_MAX_X X_BED_SIZE - (MESH_INSET) + //#define MESH_MAX_Y Y_BED_SIZE - (MESH_INSET) +#endif + +/** + * Repeatedly attempt G29 leveling until it succeeds. + * Stop after G29_MAX_RETRIES attempts. + */ +//#define G29_RETRY_AND_RECOVER +#if ENABLED(G29_RETRY_AND_RECOVER) + #define G29_MAX_RETRIES 3 + #define G29_HALT_ON_FAILURE + /** + * Specify the GCODE commands that will be executed when leveling succeeds, + * between attempts, and after the maximum number of retries have been tried. + */ + #define G29_SUCCESS_COMMANDS "M117 Bed leveling done." + #define G29_RECOVER_COMMANDS "M117 Probe failed. Rewiping.\nG28\nG12 P0 S12 T0" + #define G29_FAILURE_COMMANDS "M117 Bed leveling failed.\nG0 Z10\nM300 P25 S880\nM300 P50 S0\nM300 P25 S880\nM300 P50 S0\nM300 P25 S880\nM300 P50 S0\nG4 S1" + /** + * Specify an action command to send to the host on a recovery attempt or failure. + * Will be sent in the form '//action:ACTION_ON_G29_FAILURE', e.g. '//action:probe_failed'. + * The host must be configured to handle the action command. + */ + #define G29_ACTION_ON_RECOVER "probe_rewipe" + #define G29_ACTION_ON_FAILURE "probe_failed" +#endif + +// @section extras + +// +// G2/G3 Arc Support +// +//#define ARC_SUPPORT // Disable this feature to save ~3226 bytes +#if ENABLED(ARC_SUPPORT) + #define MM_PER_ARC_SEGMENT 1 // Length of each arc segment + #define N_ARC_CORRECTION 25 // Number of intertpolated segments between corrections + //#define ARC_P_CIRCLES // Enable the 'P' parameter to specify complete circles + //#define CNC_WORKSPACE_PLANES // Allow G2/G3 to operate in XY, ZX, or YZ planes +#endif + +// Support for G5 with XYZE destination and IJPQ offsets. Requires ~2666 bytes. +//#define BEZIER_CURVE_SUPPORT + +// G38.2 and G38.3 Probe Target +// Set MULTIPLE_PROBING if you want G38 to double touch +//#define G38_PROBE_TARGET +#if ENABLED(G38_PROBE_TARGET) + #define G38_MINIMUM_MOVE 0.0275 // minimum distance in mm that will produce a move (determined using the print statement in check_move) +#endif + +// Moves (or segments) with fewer steps than this will be joined with the next move +#define MIN_STEPS_PER_SEGMENT 6 + +/** + * Minimum delay after setting the stepper DIR (in ns) + * 0 : No delay (Expect at least 10µS since one Stepper ISR must transpire) + * 20 : Minimum for TMC2xxx drivers + * 200 : Minimum for A4988 drivers + * 400 : Minimum for A5984 drivers + * 500 : Minimum for LV8729 drivers (guess, no info in datasheet) + * 650 : Minimum for DRV8825 drivers + * 1500 : Minimum for TB6600 drivers (guess, no info in datasheet) + * 15000 : Minimum for TB6560 drivers (guess, no info in datasheet) + * + * Override the default value based on the driver type set in Configuration.h. + */ +//#define MINIMUM_STEPPER_DIR_DELAY 650 + +/** + * Minimum stepper driver pulse width (in µs) + * 0 : Smallest possible width the MCU can produce, compatible with TMC2xxx drivers + * 1 : Minimum for A4988, A5984, and LV8729 stepper drivers + * 2 : Minimum for DRV8825 stepper drivers + * 3 : Minimum for TB6600 stepper drivers + * 30 : Minimum for TB6560 stepper drivers + * + * Override the default value based on the driver type set in Configuration.h. + */ +//#define MINIMUM_STEPPER_PULSE 2 + +/** + * Maximum stepping rate (in Hz) the stepper driver allows + * If undefined, defaults to 1MHz / (2 * MINIMUM_STEPPER_PULSE) + * 500000 : Maximum for A4988 stepper driver + * 400000 : Maximum for TMC2xxx stepper drivers + * 250000 : Maximum for DRV8825 stepper driver + * 150000 : Maximum for TB6600 stepper driver + * 130000 : Maximum for LV8729 stepper driver + * 15000 : Maximum for TB6560 stepper driver + * + * Override the default value based on the driver type set in Configuration.h. + */ +//#define MAXIMUM_STEPPER_RATE 250000 + +// @section temperature + +// Control heater 0 and heater 1 in parallel. +//#define HEATERS_PARALLEL + +//=========================================================================== +//================================= Buffers ================================= +//=========================================================================== + +// @section hidden + +// The number of linear motions that can be in the plan at any give time. +// THE BLOCK_BUFFER_SIZE NEEDS TO BE A POWER OF 2 (e.g. 8, 16, 32) because shifts and ors are used to do the ring-buffering. +#if ENABLED(SDSUPPORT) + #define BLOCK_BUFFER_SIZE 16 // SD,LCD,Buttons take more memory, block buffer needs to be smaller +#else + #define BLOCK_BUFFER_SIZE 16 // maximize block buffer +#endif + +// @section serial + +// The ASCII buffer for serial input +#define MAX_CMD_SIZE 96 +#define BUFSIZE 4 + +// Transmission to Host Buffer Size +// To save 386 bytes of PROGMEM (and TX_BUFFER_SIZE+3 bytes of RAM) set to 0. +// To buffer a simple "ok" you need 4 bytes. +// For ADVANCED_OK (M105) you need 32 bytes. +// For debug-echo: 128 bytes for the optimal speed. +// Other output doesn't need to be that speedy. +// :[0, 2, 4, 8, 16, 32, 64, 128, 256] +#define TX_BUFFER_SIZE 0 + +// Host Receive Buffer Size +// Without XON/XOFF flow control (see SERIAL_XON_XOFF below) 32 bytes should be enough. +// To use flow control, set this buffer size to at least 1024 bytes. +// :[0, 2, 4, 8, 16, 32, 64, 128, 256, 512, 1024, 2048] +//#define RX_BUFFER_SIZE 1024 + +#if RX_BUFFER_SIZE >= 1024 + // Enable to have the controller send XON/XOFF control characters to + // the host to signal the RX buffer is becoming full. + //#define SERIAL_XON_XOFF +#endif + +#if ENABLED(SDSUPPORT) + // Enable this option to collect and display the maximum + // RX queue usage after transferring a file to SD. + //#define SERIAL_STATS_MAX_RX_QUEUED + + // Enable this option to collect and display the number + // of dropped bytes after a file transfer to SD. + //#define SERIAL_STATS_DROPPED_RX +#endif + +// Enable an emergency-command parser to intercept certain commands as they +// enter the serial receive buffer, so they cannot be blocked. +// Currently handles M108, M112, M410 +// Does not work on boards using AT90USB (USBCON) processors! +//#define EMERGENCY_PARSER + +// Bad Serial-connections can miss a received command by sending an 'ok' +// Therefore some clients abort after 30 seconds in a timeout. +// Some other clients start sending commands while receiving a 'wait'. +// This "wait" is only sent when the buffer is empty. 1 second is a good value here. +//#define NO_TIMEOUTS 1000 // Milliseconds + +// Some clients will have this feature soon. This could make the NO_TIMEOUTS unnecessary. +//#define ADVANCED_OK + +// Printrun may have trouble receiving long strings all at once. +// This option inserts short delays between lines of serial output. +//#define SERIAL_OVERRUN_PROTECTION + +// @section extras + +/** + * Extra Fan Speed + * Adds a secondary fan speed for each print-cooling fan. + * 'M106 P T3-255' : Set a secondary speed for + * 'M106 P T2' : Use the set secondary speed + * 'M106 P T1' : Restore the previous fan speed + */ +//#define EXTRA_FAN_SPEED + +/** + * Firmware-based and LCD-controlled retract + * + * Add G10 / G11 commands for automatic firmware-based retract / recover. + * Use M207 and M208 to define parameters for retract / recover. + * + * Use M209 to enable or disable auto-retract. + * With auto-retract enabled, all G1 E moves within the set range + * will be converted to firmware-based retract/recover moves. + * + * Be sure to turn off auto-retract during filament change. + * + * Note that M207 / M208 / M209 settings are saved to EEPROM. + * + */ +//#define FWRETRACT +#if ENABLED(FWRETRACT) + #define FWRETRACT_AUTORETRACT // costs ~500 bytes of PROGMEM + #if ENABLED(FWRETRACT_AUTORETRACT) + #define MIN_AUTORETRACT 0.1 // When auto-retract is on, convert E moves of this length and over + #define MAX_AUTORETRACT 10.0 // Upper limit for auto-retract conversion + #endif + #define RETRACT_LENGTH 3 // Default retract length (positive mm) + #define RETRACT_LENGTH_SWAP 13 // Default swap retract length (positive mm), for extruder change + #define RETRACT_FEEDRATE 45 // Default feedrate for retracting (mm/s) + #define RETRACT_ZRAISE 0 // Default retract Z-raise (mm) + #define RETRACT_RECOVER_LENGTH 0 // Default additional recover length (mm, added to retract length when recovering) + #define RETRACT_RECOVER_LENGTH_SWAP 0 // Default additional swap recover length (mm, added to retract length when recovering from extruder change) + #define RETRACT_RECOVER_FEEDRATE 8 // Default feedrate for recovering from retraction (mm/s) + #define RETRACT_RECOVER_FEEDRATE_SWAP 8 // Default feedrate for recovering from swap retraction (mm/s) + #if ENABLED(MIXING_EXTRUDER) + //#define RETRACT_SYNC_MIXING // Retract and restore all mixing steppers simultaneously + #endif +#endif + +/** + * Universal tool change settings. + * Applies to all types of extruders except where explicitly noted. + */ +#if EXTRUDERS > 1 + // Z raise distance for tool-change, as needed for some extruders + #define TOOLCHANGE_ZRAISE 2 // (mm) + + // Retract and prime filament on tool-change + //#define TOOLCHANGE_FILAMENT_SWAP + #if ENABLED(TOOLCHANGE_FILAMENT_SWAP) + #define TOOLCHANGE_FIL_SWAP_LENGTH 12 // (mm) + #define TOOLCHANGE_FIL_EXTRA_PRIME 2 // (mm) + #define TOOLCHANGE_FIL_SWAP_RETRACT_SPEED 3600 // (mm/m) + #define TOOLCHANGE_FIL_SWAP_PRIME_SPEED 3600 // (mm/m) + #endif + + /** + * Position to park head during tool change. + * Doesn't apply to SWITCHING_TOOLHEAD, DUAL_X_CARRIAGE, or PARKING_EXTRUDER + */ + //#define TOOLCHANGE_PARK + #if ENABLED(TOOLCHANGE_PARK) + #define TOOLCHANGE_PARK_XY { X_MIN_POS + 10, Y_MIN_POS + 10 } + #define TOOLCHANGE_PARK_XY_FEEDRATE 6000 // (mm/m) + #endif +#endif + +/** + * Advanced Pause + * Experimental feature for filament change support and for parking the nozzle when paused. + * Adds the GCode M600 for initiating filament change. + * If PARK_HEAD_ON_PAUSE enabled, adds the GCode M125 to pause printing and park the nozzle. + * + * Requires an LCD display. + * Requires NOZZLE_PARK_FEATURE. + * This feature is required for the default FILAMENT_RUNOUT_SCRIPT. + */ +//#define ADVANCED_PAUSE_FEATURE +#if ENABLED(ADVANCED_PAUSE_FEATURE) + #define PAUSE_PARK_RETRACT_FEEDRATE 60 // (mm/s) Initial retract feedrate. + #define PAUSE_PARK_RETRACT_LENGTH 2 // (mm) Initial retract. + // This short retract is done immediately, before parking the nozzle. + #define FILAMENT_CHANGE_UNLOAD_FEEDRATE 10 // (mm/s) Unload filament feedrate. This can be pretty fast. + #define FILAMENT_CHANGE_UNLOAD_ACCEL 25 // (mm/s^2) Lower acceleration may allow a faster feedrate. + #define FILAMENT_CHANGE_UNLOAD_LENGTH 100 // (mm) The length of filament for a complete unload. + // For Bowden, the full length of the tube and nozzle. + // For direct drive, the full length of the nozzle. + // Set to 0 for manual unloading. + #define FILAMENT_CHANGE_SLOW_LOAD_FEEDRATE 6 // (mm/s) Slow move when starting load. + #define FILAMENT_CHANGE_SLOW_LOAD_LENGTH 0 // (mm) Slow length, to allow time to insert material. + // 0 to disable start loading and skip to fast load only + #define FILAMENT_CHANGE_FAST_LOAD_FEEDRATE 6 // (mm/s) Load filament feedrate. This can be pretty fast. + #define FILAMENT_CHANGE_FAST_LOAD_ACCEL 25 // (mm/s^2) Lower acceleration may allow a faster feedrate. + #define FILAMENT_CHANGE_FAST_LOAD_LENGTH 0 // (mm) Load length of filament, from extruder gear to nozzle. + // For Bowden, the full length of the tube and nozzle. + // For direct drive, the full length of the nozzle. + //#define ADVANCED_PAUSE_CONTINUOUS_PURGE // Purge continuously up to the purge length until interrupted. + #define ADVANCED_PAUSE_PURGE_FEEDRATE 3 // (mm/s) Extrude feedrate (after loading). Should be slower than load feedrate. + #define ADVANCED_PAUSE_PURGE_LENGTH 50 // (mm) Length to extrude after loading. + // Set to 0 for manual extrusion. + // Filament can be extruded repeatedly from the Filament Change menu + // until extrusion is consistent, and to purge old filament. + #define ADVANCED_PAUSE_RESUME_PRIME 0 // (mm) Extra distance to prime nozzle after returning from park. + + // Filament Unload does a Retract, Delay, and Purge first: + #define FILAMENT_UNLOAD_RETRACT_LENGTH 13 // (mm) Unload initial retract length. + #define FILAMENT_UNLOAD_DELAY 5000 // (ms) Delay for the filament to cool after retract. + #define FILAMENT_UNLOAD_PURGE_LENGTH 8 // (mm) An unretract is done, then this length is purged. + + #define PAUSE_PARK_NOZZLE_TIMEOUT 45 // (seconds) Time limit before the nozzle is turned off for safety. + #define FILAMENT_CHANGE_ALERT_BEEPS 10 // Number of alert beeps to play when a response is needed. + #define PAUSE_PARK_NO_STEPPER_TIMEOUT // Enable for XYZ steppers to stay powered on during filament change. + + //#define PARK_HEAD_ON_PAUSE // Park the nozzle during pause and filament change. + //#define HOME_BEFORE_FILAMENT_CHANGE // Ensure homing has been completed prior to parking for filament change + + //#define FILAMENT_LOAD_UNLOAD_GCODES // Add M701/M702 Load/Unload G-codes, plus Load/Unload in the LCD Prepare menu. + //#define FILAMENT_UNLOAD_ALL_EXTRUDERS // Allow M702 to unload all extruders above a minimum target temp (as set by M302) +#endif + +// @section tmc + +/** + * TMC26X Stepper Driver options + * + * The TMC26XStepper library is required for this stepper driver. + * https://github.com/trinamic/TMC26XStepper + */ +#if HAS_DRIVER(TMC26X) + + #if AXIS_DRIVER_TYPE_X(TMC26X) + #define X_MAX_CURRENT 1000 // (mA) + #define X_SENSE_RESISTOR 91 // (mOhms) + #define X_MICROSTEPS 16 // Number of microsteps + #endif + + #if AXIS_DRIVER_TYPE_X2(TMC26X) + #define X2_MAX_CURRENT 1000 + #define X2_SENSE_RESISTOR 91 + #define X2_MICROSTEPS 16 + #endif + + #if AXIS_DRIVER_TYPE_Y(TMC26X) + #define Y_MAX_CURRENT 1000 + #define Y_SENSE_RESISTOR 91 + #define Y_MICROSTEPS 16 + #endif + + #if AXIS_DRIVER_TYPE_Y2(TMC26X) + #define Y2_MAX_CURRENT 1000 + #define Y2_SENSE_RESISTOR 91 + #define Y2_MICROSTEPS 16 + #endif + + #if AXIS_DRIVER_TYPE_Z(TMC26X) + #define Z_MAX_CURRENT 1000 + #define Z_SENSE_RESISTOR 91 + #define Z_MICROSTEPS 16 + #endif + + #if AXIS_DRIVER_TYPE_Z2(TMC26X) + #define Z2_MAX_CURRENT 1000 + #define Z2_SENSE_RESISTOR 91 + #define Z2_MICROSTEPS 16 + #endif + + #if AXIS_DRIVER_TYPE_Z3(TMC26X) + #define Z3_MAX_CURRENT 1000 + #define Z3_SENSE_RESISTOR 91 + #define Z3_MICROSTEPS 16 + #endif + + #if AXIS_DRIVER_TYPE_E0(TMC26X) + #define E0_MAX_CURRENT 1000 + #define E0_SENSE_RESISTOR 91 + #define E0_MICROSTEPS 16 + #endif + + #if AXIS_DRIVER_TYPE_E1(TMC26X) + #define E1_MAX_CURRENT 1000 + #define E1_SENSE_RESISTOR 91 + #define E1_MICROSTEPS 16 + #endif + + #if AXIS_DRIVER_TYPE_E2(TMC26X) + #define E2_MAX_CURRENT 1000 + #define E2_SENSE_RESISTOR 91 + #define E2_MICROSTEPS 16 + #endif + + #if AXIS_DRIVER_TYPE_E3(TMC26X) + #define E3_MAX_CURRENT 1000 + #define E3_SENSE_RESISTOR 91 + #define E3_MICROSTEPS 16 + #endif + + #if AXIS_DRIVER_TYPE_E4(TMC26X) + #define E4_MAX_CURRENT 1000 + #define E4_SENSE_RESISTOR 91 + #define E4_MICROSTEPS 16 + #endif + + #if AXIS_DRIVER_TYPE_E5(TMC26X) + #define E5_MAX_CURRENT 1000 + #define E5_SENSE_RESISTOR 91 + #define E5_MICROSTEPS 16 + #endif + +#endif // TMC26X + +// @section tmc_smart + +/** + * To use TMC2130, TMC2160, TMC2660, TMC5130, TMC5160 stepper drivers in SPI mode + * connect your SPI pins to the hardware SPI interface on your board and define + * the required CS pins in your `pins_MYBOARD.h` file. (e.g., RAMPS 1.4 uses AUX3 + * pins `X_CS_PIN 53`, `Y_CS_PIN 49`, etc.). + * You may also use software SPI if you wish to use general purpose IO pins. + * + * To use TMC2208 stepper UART-configurable stepper drivers connect #_SERIAL_TX_PIN + * to the driver side PDN_UART pin with a 1K resistor. + * To use the reading capabilities, also connect #_SERIAL_RX_PIN to PDN_UART without + * a resistor. + * The drivers can also be used with hardware serial. + * + * TMCStepper library is required to use TMC stepper drivers. + * https://github.com/teemuatlut/TMCStepper + */ +#if HAS_TRINAMIC + + #define HOLD_MULTIPLIER 0.5 // Scales down the holding current from run current + #define INTERPOLATE true // Interpolate X/Y/Z_MICROSTEPS to 256 + + #if AXIS_IS_TMC(X) + #define X_CURRENT 800 // (mA) RMS current. Multiply by 1.414 for peak current. + #define X_MICROSTEPS 16 // 0..256 + #define X_RSENSE 0.11 + #endif + + #if AXIS_IS_TMC(X2) + #define X2_CURRENT 800 + #define X2_MICROSTEPS 16 + #define X2_RSENSE 0.11 + #endif + + #if AXIS_IS_TMC(Y) + #define Y_CURRENT 800 + #define Y_MICROSTEPS 16 + #define Y_RSENSE 0.11 + #endif + + #if AXIS_IS_TMC(Y2) + #define Y2_CURRENT 800 + #define Y2_MICROSTEPS 16 + #define Y2_RSENSE 0.11 + #endif + + #if AXIS_IS_TMC(Z) + #define Z_CURRENT 800 + #define Z_MICROSTEPS 16 + #define Z_RSENSE 0.11 + #endif + + #if AXIS_IS_TMC(Z2) + #define Z2_CURRENT 800 + #define Z2_MICROSTEPS 16 + #define Z2_RSENSE 0.11 + #endif + + #if AXIS_IS_TMC(Z3) + #define Z3_CURRENT 800 + #define Z3_MICROSTEPS 16 + #define Z3_RSENSE 0.11 + #endif + + #if AXIS_IS_TMC(E0) + #define E0_CURRENT 800 + #define E0_MICROSTEPS 16 + #define E0_RSENSE 0.11 + #endif + + #if AXIS_IS_TMC(E1) + #define E1_CURRENT 800 + #define E1_MICROSTEPS 16 + #define E1_RSENSE 0.11 + #endif + + #if AXIS_IS_TMC(E2) + #define E2_CURRENT 800 + #define E2_MICROSTEPS 16 + #define E2_RSENSE 0.11 + #endif + + #if AXIS_IS_TMC(E3) + #define E3_CURRENT 800 + #define E3_MICROSTEPS 16 + #define E3_RSENSE 0.11 + #endif + + #if AXIS_IS_TMC(E4) + #define E4_CURRENT 800 + #define E4_MICROSTEPS 16 + #define E4_RSENSE 0.11 + #endif + + #if AXIS_IS_TMC(E5) + #define E5_CURRENT 800 + #define E5_MICROSTEPS 16 + #define E5_RSENSE 0.11 + #endif + + /** + * Override default SPI pins for TMC2130, TMC2160, TMC2660, TMC5130 and TMC5160 drivers here. + * The default pins can be found in your board's pins file. + */ + //#define X_CS_PIN -1 + //#define Y_CS_PIN -1 + //#define Z_CS_PIN -1 + //#define X2_CS_PIN -1 + //#define Y2_CS_PIN -1 + //#define Z2_CS_PIN -1 + //#define Z3_CS_PIN -1 + //#define E0_CS_PIN -1 + //#define E1_CS_PIN -1 + //#define E2_CS_PIN -1 + //#define E3_CS_PIN -1 + //#define E4_CS_PIN -1 + //#define E5_CS_PIN -1 + + /** + * Use software SPI for TMC2130. + * Software option for SPI driven drivers (TMC2130, TMC2160, TMC2660, TMC5130 and TMC5160). + * The default SW SPI pins are defined the respective pins files, + * but you can override or define them here. + */ + //#define TMC_USE_SW_SPI + //#define TMC_SW_MOSI -1 + //#define TMC_SW_MISO -1 + //#define TMC_SW_SCK -1 + + /** + * Software enable + * + * Use for drivers that do not use a dedicated enable pin, but rather handle the same + * function through a communication line such as SPI or UART. + */ + //#define SOFTWARE_DRIVER_ENABLE + + /** + * TMC2130, TMC2160, TMC2208, TMC5130 and TMC5160 only + * Use Trinamic's ultra quiet stepping mode. + * When disabled, Marlin will use spreadCycle stepping mode. + */ + #define STEALTHCHOP_XY + #define STEALTHCHOP_Z + #define STEALTHCHOP_E + + /** + * Optimize spreadCycle chopper parameters by using predefined parameter sets + * or with the help of an example included in the library. + * Provided parameter sets are + * CHOPPER_DEFAULT_12V + * CHOPPER_DEFAULT_19V + * CHOPPER_DEFAULT_24V + * CHOPPER_DEFAULT_36V + * CHOPPER_PRUSAMK3_24V // Imported parameters from the official Prusa firmware for MK3 (24V) + * CHOPPER_MARLIN_119 // Old defaults from Marlin v1.1.9 + * + * Define you own with + * { , , hysteresis_start[1..8] } + */ + #define CHOPPER_TIMING CHOPPER_DEFAULT_12V + + /** + * Monitor Trinamic drivers for error conditions, + * like overtemperature and short to ground. TMC2208 requires hardware serial. + * In the case of overtemperature Marlin can decrease the driver current until error condition clears. + * Other detected conditions can be used to stop the current print. + * Relevant g-codes: + * M906 - Set or get motor current in milliamps using axis codes X, Y, Z, E. Report values if no axis codes given. + * M911 - Report stepper driver overtemperature pre-warn condition. + * M912 - Clear stepper driver overtemperature pre-warn condition flag. + * M122 S0/1 - Report driver parameters (Requires TMC_DEBUG) + */ + //#define MONITOR_DRIVER_STATUS + + #if ENABLED(MONITOR_DRIVER_STATUS) + #define CURRENT_STEP_DOWN 50 // [mA] + #define REPORT_CURRENT_CHANGE + #define STOP_ON_ERROR + #endif + + /** + * TMC2130, TMC2160, TMC2208, TMC5130 and TMC5160 only + * The driver will switch to spreadCycle when stepper speed is over HYBRID_THRESHOLD. + * This mode allows for faster movements at the expense of higher noise levels. + * STEALTHCHOP_(XY|Z|E) must be enabled to use HYBRID_THRESHOLD. + * M913 X/Y/Z/E to live tune the setting + */ + //#define HYBRID_THRESHOLD + + #define X_HYBRID_THRESHOLD 100 // [mm/s] + #define X2_HYBRID_THRESHOLD 100 + #define Y_HYBRID_THRESHOLD 100 + #define Y2_HYBRID_THRESHOLD 100 + #define Z_HYBRID_THRESHOLD 3 + #define Z2_HYBRID_THRESHOLD 3 + #define Z3_HYBRID_THRESHOLD 3 + #define E0_HYBRID_THRESHOLD 30 + #define E1_HYBRID_THRESHOLD 30 + #define E2_HYBRID_THRESHOLD 30 + #define E3_HYBRID_THRESHOLD 30 + #define E4_HYBRID_THRESHOLD 30 + #define E5_HYBRID_THRESHOLD 30 + + /** + * TMC2130, TMC2160, TMC2660, TMC5130, and TMC5160 only + * Use StallGuard2 to sense an obstacle and trigger an endstop. + * Connect the stepper driver's DIAG1 pin to the X/Y endstop pin. + * X, Y, and Z homing will always be done in spreadCycle mode. + * + * X/Y/Z_STALL_SENSITIVITY is used for tuning the trigger sensitivity. + * Higher values make the system LESS sensitive. + * Lower value make the system MORE sensitive. + * Too low values can lead to false positives, while too high values will collide the axis without triggering. + * It is advised to set X/Y/Z_HOME_BUMP_MM to 0. + * M914 X/Y/Z to live tune the setting + */ + //#define SENSORLESS_HOMING // TMC2130 only + + /** + * Use StallGuard2 to probe the bed with the nozzle. + * + * CAUTION: This could cause damage to machines that use a lead screw or threaded rod + * to move the Z axis. Take extreme care when attempting to enable this feature. + */ + //#define SENSORLESS_PROBING // TMC2130 only + + #if ENABLED(SENSORLESS_HOMING) || ENABLED(SENSORLESS_PROBING) + #define X_STALL_SENSITIVITY 8 + #define Y_STALL_SENSITIVITY 8 + //#define Z_STALL_SENSITIVITY 8 + #endif + + /** + * Enable M122 debugging command for TMC stepper drivers. + * M122 S0/1 will enable continous reporting. + */ + //#define TMC_DEBUG + + /** + * You can set your own advanced settings by filling in predefined functions. + * A list of available functions can be found on the library github page + * https://github.com/teemuatlut/TMC2130Stepper + * https://github.com/teemuatlut/TMC2208Stepper + * + * Example: + * #define TMC_ADV() { \ + * stepperX.diag0_temp_prewarn(1); \ + * stepperY.interpolate(0); \ + * } + */ + #define TMC_ADV() { } + +#endif // HAS_TRINAMIC + +// @section L6470 + +/** + * L6470 Stepper Driver options + * + * Arduino-L6470 library (0.7.0 or higher) is required for this stepper driver. + * https://github.com/ameyer/Arduino-L6470 + * + * Requires the following to be defined in your pins_YOUR_BOARD file + * L6470_CHAIN_SCK_PIN + * L6470_CHAIN_MISO_PIN + * L6470_CHAIN_MOSI_PIN + * L6470_CHAIN_SS_PIN + * L6470_RESET_CHAIN_PIN (optional) + */ +#if HAS_DRIVER(L6470) + + //#define L6470_CHITCHAT // Display additional status info + + #if AXIS_DRIVER_TYPE_X(L6470) + #define X_MICROSTEPS 128 // Number of microsteps (VALID: 1, 2, 4, 8, 16, 32, 128) + #define X_OVERCURRENT 2000 // (mA) Current where the driver detects an over current (VALID: 375 x (1 - 16) - 6A max - rounds down) + #define X_STALLCURRENT 1500 // (mA) Current where the driver detects a stall (VALID: 31.25 * (1-128) - 4A max - rounds down) + #define X_MAX_VOLTAGE 127 // 0-255, Maximum effective voltage seen by stepper + #define X_CHAIN_POS 0 // Position in SPI chain, 0=Not in chain, 1=Nearest MOSI + #endif + + #if AXIS_DRIVER_TYPE_X2(L6470) + #define X2_MICROSTEPS 128 + #define X2_OVERCURRENT 2000 + #define X2_STALLCURRENT 1500 + #define X2_MAX_VOLTAGE 127 + #define X2_CHAIN_POS 0 + #endif + + #if AXIS_DRIVER_TYPE_Y(L6470) + #define Y_MICROSTEPS 128 + #define Y_OVERCURRENT 2000 + #define Y_STALLCURRENT 1500 + #define Y_MAX_VOLTAGE 127 + #define Y_CHAIN_POS 0 + #endif + + #if AXIS_DRIVER_TYPE_Y2(L6470) + #define Y2_MICROSTEPS 128 + #define Y2_OVERCURRENT 2000 + #define Y2_STALLCURRENT 1500 + #define Y2_MAX_VOLTAGE 127 + #define Y2_CHAIN_POS 0 + #endif + + #if AXIS_DRIVER_TYPE_Z(L6470) + #define Z_MICROSTEPS 128 + #define Z_OVERCURRENT 2000 + #define Z_STALLCURRENT 1500 + #define Z_MAX_VOLTAGE 127 + #define Z_CHAIN_POS 0 + #endif + + #if AXIS_DRIVER_TYPE_Z2(L6470) + #define Z2_MICROSTEPS 128 + #define Z2_OVERCURRENT 2000 + #define Z2_STALLCURRENT 1500 + #define Z2_MAX_VOLTAGE 127 + #define Z2_CHAIN_POS 0 + #endif + + #if AXIS_DRIVER_TYPE_Z3(L6470) + #define Z3_MICROSTEPS 128 + #define Z3_OVERCURRENT 2000 + #define Z3_STALLCURRENT 1500 + #define Z3_MAX_VOLTAGE 127 + #define Z3_CHAIN_POS 0 + #endif + + #if AXIS_DRIVER_TYPE_I(L6470) + #define I_MICROSTEPS 128 + #define I_OVERCURRENT 2000 + #define I_STALLCURRENT 1500 + #define I_MAX_VOLTAGE 127 + #define I_CHAIN_POS 0 + #endif + + #if AXIS_DRIVER_TYPE_J(L6470) + #define J_MICROSTEPS 128 + #define J_OVERCURRENT 2000 + #define J_STALLCURRENT 1500 + #define J_MAX_VOLTAGE 127 + #define J_CHAIN_POS 0 + #endif + + #if AXIS_DRIVER_TYPE_K(L6470) + #define K_MICROSTEPS 128 + #define K_OVERCURRENT 2000 + #define K_STALLCURRENT 1500 + #define K_MAX_VOLTAGE 127 + #define K_CHAIN_POS 0 + #endif + + #if AXIS_DRIVER_TYPE_E0(L6470) + #define E0_MICROSTEPS 128 + #define E0_OVERCURRENT 2000 + #define E0_STALLCURRENT 1500 + #define E0_MAX_VOLTAGE 127 + #define E0_CHAIN_POS 0 + #endif + + #if AXIS_DRIVER_TYPE_E1(L6470) + #define E1_MICROSTEPS 128 + #define E1_OVERCURRENT 2000 + #define E1_STALLCURRENT 1500 + #define E1_MAX_VOLTAGE 127 + #define E1_CHAIN_POS 0 + #endif + + #if AXIS_DRIVER_TYPE_E2(L6470) + #define E2_MICROSTEPS 128 + #define E2_OVERCURRENT 2000 + #define E2_STALLCURRENT 1500 + #define E2_MAX_VOLTAGE 127 + #define E2_CHAIN_POS 0 + #endif + + #if AXIS_DRIVER_TYPE_E3(L6470) + #define E3_MICROSTEPS 128 + #define E3_OVERCURRENT 2000 + #define E3_STALLCURRENT 1500 + #define E3_MAX_VOLTAGE 127 + #define E3_CHAIN_POS 0 + #endif + + #if AXIS_DRIVER_TYPE_E4(L6470) + #define E4_MICROSTEPS 128 + #define E4_OVERCURRENT 2000 + #define E4_STALLCURRENT 1500 + #define E4_MAX_VOLTAGE 127 + #define E4_CHAIN_POS 0 + #endif + + #if AXIS_DRIVER_TYPE_E5(L6470) + #define E5_MICROSTEPS 128 + #define E5_OVERCURRENT 2000 + #define E5_STALLCURRENT 1500 + #define E5_MAX_VOLTAGE 127 + #define E5_CHAIN_POS 0 + #endif + + /** + * Monitor L6470 drivers for error conditions like over temperature and over current. + * In the case of over temperature Marlin can decrease the drive until the error condition clears. + * Other detected conditions can be used to stop the current print. + * Relevant g-codes: + * M906 - I1/2/3/4/5 Set or get motor drive level using axis codes X, Y, Z, E. Report values if no axis codes given. + * I not present or I0 or I1 - X, Y, Z or E0 + * I2 - X2, Y2, Z2 or E1 + * I3 - Z3 or E3 + * I4 - E4 + * I5 - E5 + * M916 - Increase drive level until get thermal warning + * M917 - Find minimum current thresholds + * M918 - Increase speed until max or error + * M122 S0/1 - Report driver parameters + */ + //#define MONITOR_L6470_DRIVER_STATUS + + #if ENABLED(MONITOR_L6470_DRIVER_STATUS) + #define KVAL_HOLD_STEP_DOWN 1 + //#define L6470_STOP_ON_ERROR + #endif + +#endif // L6470 + +/** + * TWI/I2C BUS + * + * This feature is an EXPERIMENTAL feature so it shall not be used on production + * machines. Enabling this will allow you to send and receive I2C data from slave + * devices on the bus. + * + * ; Example #1 + * ; This macro send the string "Marlin" to the slave device with address 0x63 (99) + * ; It uses multiple M260 commands with one B arg + * M260 A99 ; Target slave address + * M260 B77 ; M + * M260 B97 ; a + * M260 B114 ; r + * M260 B108 ; l + * M260 B105 ; i + * M260 B110 ; n + * M260 S1 ; Send the current buffer + * + * ; Example #2 + * ; Request 6 bytes from slave device with address 0x63 (99) + * M261 A99 B5 + * + * ; Example #3 + * ; Example serial output of a M261 request + * echo:i2c-reply: from:99 bytes:5 data:hello + */ + +// @section i2cbus + +#define EXPERIMENTAL_I2CBUS +#define I2C_SLAVE_ADDRESS 0 // Set a value from 8 to 127 to act as a slave + +// @section extras + +/** + * Photo G-code + * Add the M240 G-code to take a photo. + * The photo can be triggered by a digital pin or a physical movement. + */ +//#define PHOTO_GCODE +#if ENABLED(PHOTO_GCODE) + // A position to move to (and raise Z) before taking the photo + //#define PHOTO_POSITION { X_MAX_POS - 5, Y_MAX_POS, 0 } // { xpos, ypos, zraise } (M240 X Y Z) + //#define PHOTO_DELAY_MS 100 // (ms) Duration to pause before moving back (M240 P) + //#define PHOTO_RETRACT_MM 6.5 // (mm) E retract/recover for the photo move (M240 R S) + + // Canon RC-1 or homebrew digital camera trigger + // Data from: http://www.doc-diy.net/photo/rc-1_hacked/ + //#define PHOTOGRAPH_PIN 23 + + // Canon Hack Development Kit + // http://captain-slow.dk/2014/03/09/3d-printing-timelapses/ + //#define CHDK_PIN 4 + + // Optional second move with delay to trigger the camera shutter + //#define PHOTO_SWITCH_POSITION { X_MAX_POS, Y_MAX_POS } // { xpos, ypos } (M240 I J) + + // Duration to hold the switch or keep CHDK_PIN high + //#define PHOTO_SWITCH_MS 50 // (ms) (M240 D) +#endif + +/** + * Spindle & Laser control + * + * Add the M3, M4, and M5 commands to turn the spindle/laser on and off, and + * to set spindle speed, spindle direction, and laser power. + * + * SuperPid is a router/spindle speed controller used in the CNC milling community. + * Marlin can be used to turn the spindle on and off. It can also be used to set + * the spindle speed from 5,000 to 30,000 RPM. + * + * You'll need to select a pin for the ON/OFF function and optionally choose a 0-5V + * hardware PWM pin for the speed control and a pin for the rotation direction. + * + * See http://marlinfw.org/docs/configuration/laser_spindle.html for more config details. + */ +//#define SPINDLE_LASER_ENABLE +#if ENABLED(SPINDLE_LASER_ENABLE) + + #define SPINDLE_LASER_ENABLE_INVERT false // set to "true" if the on/off function is reversed + #define SPINDLE_LASER_PWM true // set to true if your controller supports setting the speed/power + #define SPINDLE_LASER_PWM_INVERT true // set to "true" if the speed/power goes up when you want it to go slower + #define SPINDLE_LASER_POWERUP_DELAY 5000 // delay in milliseconds to allow the spindle/laser to come up to speed/power + #define SPINDLE_LASER_POWERDOWN_DELAY 5000 // delay in milliseconds to allow the spindle to stop + #define SPINDLE_DIR_CHANGE true // set to true if your spindle controller supports changing spindle direction + #define SPINDLE_INVERT_DIR false + #define SPINDLE_STOP_ON_DIR_CHANGE true // set to true if Marlin should stop the spindle before changing rotation direction + + /** + * The M3 & M4 commands use the following equation to convert PWM duty cycle to speed/power + * + * SPEED/POWER = PWM duty cycle * SPEED_POWER_SLOPE + SPEED_POWER_INTERCEPT + * where PWM duty cycle varies from 0 to 255 + * + * set the following for your controller (ALL MUST BE SET) + */ + + #define SPEED_POWER_SLOPE 118.4 + #define SPEED_POWER_INTERCEPT 0 + #define SPEED_POWER_MIN 5000 + #define SPEED_POWER_MAX 30000 // SuperPID router controller 0 - 30,000 RPM + + //#define SPEED_POWER_SLOPE 0.3922 + //#define SPEED_POWER_INTERCEPT 0 + //#define SPEED_POWER_MIN 10 + //#define SPEED_POWER_MAX 100 // 0-100% +#endif + +/** + * Filament Width Sensor + * + * Measures the filament width in real-time and adjusts + * flow rate to compensate for any irregularities. + * + * Also allows the measured filament diameter to set the + * extrusion rate, so the slicer only has to specify the + * volume. + * + * Only a single extruder is supported at this time. + * + * 34 RAMPS_14 : Analog input 5 on the AUX2 connector + * 81 PRINTRBOARD : Analog input 2 on the Exp1 connector (version B,C,D,E) + * 301 RAMBO : Analog input 3 + * + * Note: May require analog pins to be defined for other boards. + */ +//#define FILAMENT_WIDTH_SENSOR + +#if ENABLED(FILAMENT_WIDTH_SENSOR) + #define FILAMENT_SENSOR_EXTRUDER_NUM 0 // Index of the extruder that has the filament sensor. :[0,1,2,3,4] + #define MEASUREMENT_DELAY_CM 14 // (cm) The distance from the filament sensor to the melting chamber + + #define FILWIDTH_ERROR_MARGIN 1.0 // (mm) If a measurement differs too much from nominal width ignore it + #define MAX_MEASUREMENT_DELAY 20 // (bytes) Buffer size for stored measurements (1 byte per cm). Must be larger than MEASUREMENT_DELAY_CM. + + #define DEFAULT_MEASURED_FILAMENT_DIA DEFAULT_NOMINAL_FILAMENT_DIA // Set measured to nominal initially + + // Display filament width on the LCD status line. Status messages will expire after 5 seconds. + //#define FILAMENT_LCD_DISPLAY +#endif + +/** + * CNC Coordinate Systems + * + * Enables G53 and G54-G59.3 commands to select coordinate systems + * and G92.1 to reset the workspace to native machine space. + */ +//#define CNC_COORDINATE_SYSTEMS + +/** + * Auto-report temperatures with M155 S + */ +//#define AUTO_REPORT_TEMPERATURES + +/** + * Include capabilities in M115 output + */ +#define EXTENDED_CAPABILITIES_REPORT + +/** + * Disable all Volumetric extrusion options + */ +//#define NO_VOLUMETRICS + +#if DISABLED(NO_VOLUMETRICS) + /** + * Volumetric extrusion default state + * Activate to make volumetric extrusion the default method, + * with DEFAULT_NOMINAL_FILAMENT_DIA as the default diameter. + * + * M200 D0 to disable, M200 Dn to set a new diameter. + */ + //#define VOLUMETRIC_DEFAULT_ON +#endif + +/** + * Enable this option for a leaner build of Marlin that removes all + * workspace offsets, simplifying coordinate transformations, leveling, etc. + * + * - M206 and M428 are disabled. + * - G92 will revert to its behavior from Marlin 1.0. + */ +//#define NO_WORKSPACE_OFFSETS + +/** + * Set the number of proportional font spaces required to fill up a typical character space. + * This can help to better align the output of commands like `G29 O` Mesh Output. + * + * For clients that use a fixed-width font (like OctoPrint), leave this set to 1.0. + * Otherwise, adjust according to your client and font. + */ +#define PROPORTIONAL_FONT_RATIO 1.0 + +/** + * Spend 28 bytes of SRAM to optimize the GCode parser + */ +#define FASTER_GCODE_PARSER + +/** + * CNC G-code options + * Support CNC-style G-code dialects used by laser cutters, drawing machine cams, etc. + * Note that G0 feedrates should be used with care for 3D printing (if used at all). + * High feedrates may cause ringing and harm print quality. + */ +//#define PAREN_COMMENTS // Support for parentheses-delimited comments +//#define GCODE_MOTION_MODES // Remember the motion mode (G0 G1 G2 G3 G5 G38.X) and apply for X Y Z E F, etc. + +// Enable and set a (default) feedrate for all G0 moves +//#define G0_FEEDRATE 3000 // (mm/m) +#ifdef G0_FEEDRATE + //#define VARIABLE_G0_FEEDRATE // The G0 feedrate is set by F in G0 motion mode +#endif + +/** + * G-code Macros + * + * Add G-codes M810-M819 to define and run G-code macros. + * Macros are not saved to EEPROM. + */ +//#define GCODE_MACROS +#if ENABLED(GCODE_MACROS) + #define GCODE_MACROS_SLOTS 5 // Up to 10 may be used + #define GCODE_MACROS_SLOT_SIZE 50 // Maximum length of a single macro +#endif + +/** + * User-defined menu items that execute custom GCode + */ +//#define CUSTOM_USER_MENUS +#if ENABLED(CUSTOM_USER_MENUS) + //#define CUSTOM_USER_MENU_TITLE "Custom Commands" + #define USER_SCRIPT_DONE "M117 User Script Done" + #define USER_SCRIPT_AUDIBLE_FEEDBACK + //#define USER_SCRIPT_RETURN // Return to status screen after a script + + #define USER_DESC_1 "Home & UBL Info" + #define USER_GCODE_1 "G28\nG29 W" + + #define USER_DESC_2 "Preheat for " PREHEAT_1_LABEL + #define USER_GCODE_2 "M140 S" STRINGIFY(PREHEAT_1_TEMP_BED) "\nM104 S" STRINGIFY(PREHEAT_1_TEMP_HOTEND) + + #define USER_DESC_3 "Preheat for " PREHEAT_2_LABEL + #define USER_GCODE_3 "M140 S" STRINGIFY(PREHEAT_2_TEMP_BED) "\nM104 S" STRINGIFY(PREHEAT_2_TEMP_HOTEND) + + #define USER_DESC_4 "Heat Bed/Home/Level" + #define USER_GCODE_4 "M140 S" STRINGIFY(PREHEAT_2_TEMP_BED) "\nG28\nG29" + + #define USER_DESC_5 "Home & Info" + #define USER_GCODE_5 "G28\nM503" +#endif + +/** + * Host Action Commands + * + * Define host streamer action commands in compliance with the standard. + * + * See https://reprap.org/wiki/G-code#Action_commands + * Common commands ........ poweroff, pause, paused, resume, resumed, cancel + * G29_RETRY_AND_RECOVER .. probe_rewipe, probe_failed + * + * Some features add reason codes to extend these commands. + * + * Host Prompt Support enables Marlin to use the host for user prompts so + * filament runout and other processes can be managed from the host side. + */ +//#define HOST_ACTION_COMMANDS +#if ENABLED(HOST_ACTION_COMMANDS) + //#define HOST_PROMPT_SUPPORT +#endif + +//=========================================================================== +//====================== I2C Position Encoder Settings ====================== +//=========================================================================== + +/** + * I2C position encoders for closed loop control. + * Developed by Chris Barr at Aus3D. + * + * Wiki: http://wiki.aus3d.com.au/Magnetic_Encoder + * Github: https://github.com/Aus3D/MagneticEncoder + * + * Supplier: http://aus3d.com.au/magnetic-encoder-module + * Alternative Supplier: http://reliabuild3d.com/ + * + * Reliabuild encoders have been modified to improve reliability. + */ + +//#define I2C_POSITION_ENCODERS +#if ENABLED(I2C_POSITION_ENCODERS) + + #define I2CPE_ENCODER_CNT 1 // The number of encoders installed; max of 5 + // encoders supported currently. + + #define I2CPE_ENC_1_ADDR I2CPE_PRESET_ADDR_X // I2C address of the encoder. 30-200. + #define I2CPE_ENC_1_AXIS X_AXIS // Axis the encoder module is installed on. _AXIS. + #define I2CPE_ENC_1_TYPE I2CPE_ENC_TYPE_LINEAR // Type of encoder: I2CPE_ENC_TYPE_LINEAR -or- + // I2CPE_ENC_TYPE_ROTARY. + #define I2CPE_ENC_1_TICKS_UNIT 2048 // 1024 for magnetic strips with 2mm poles; 2048 for + // 1mm poles. For linear encoders this is ticks / mm, + // for rotary encoders this is ticks / revolution. + //#define I2CPE_ENC_1_TICKS_REV (16 * 200) // Only needed for rotary encoders; number of stepper + // steps per full revolution (motor steps/rev * microstepping) + //#define I2CPE_ENC_1_INVERT // Invert the direction of axis travel. + #define I2CPE_ENC_1_EC_METHOD I2CPE_ECM_MICROSTEP // Type of error error correction. + #define I2CPE_ENC_1_EC_THRESH 0.10 // Threshold size for error (in mm) above which the + // printer will attempt to correct the error; errors + // smaller than this are ignored to minimize effects of + // measurement noise / latency (filter). + + #define I2CPE_ENC_2_ADDR I2CPE_PRESET_ADDR_Y // Same as above, but for encoder 2. + #define I2CPE_ENC_2_AXIS Y_AXIS + #define I2CPE_ENC_2_TYPE I2CPE_ENC_TYPE_LINEAR + #define I2CPE_ENC_2_TICKS_UNIT 2048 + //#define I2CPE_ENC_2_TICKS_REV (16 * 200) + //#define I2CPE_ENC_2_INVERT + #define I2CPE_ENC_2_EC_METHOD I2CPE_ECM_MICROSTEP + #define I2CPE_ENC_2_EC_THRESH 0.10 + + #define I2CPE_ENC_3_ADDR I2CPE_PRESET_ADDR_Z // Encoder 3. Add additional configuration options + #define I2CPE_ENC_3_AXIS Z_AXIS // as above, or use defaults below. + + #define I2CPE_ENC_4_ADDR I2CPE_PRESET_ADDR_E // Encoder 4. + #define I2CPE_ENC_4_AXIS E_AXIS + + #define I2CPE_ENC_5_ADDR 34 // Encoder 5. + #define I2CPE_ENC_5_AXIS E_AXIS + + // Default settings for encoders which are enabled, but without settings configured above. + #define I2CPE_DEF_TYPE I2CPE_ENC_TYPE_LINEAR + #define I2CPE_DEF_ENC_TICKS_UNIT 2048 + #define I2CPE_DEF_TICKS_REV (16 * 200) + #define I2CPE_DEF_EC_METHOD I2CPE_ECM_NONE + #define I2CPE_DEF_EC_THRESH 0.1 + + //#define I2CPE_ERR_THRESH_ABORT 100.0 // Threshold size for error (in mm) error on any given + // axis after which the printer will abort. Comment out to + // disable abort behaviour. + + #define I2CPE_TIME_TRUSTED 10000 // After an encoder fault, there must be no further fault + // for this amount of time (in ms) before the encoder + // is trusted again. + + /** + * Position is checked every time a new command is executed from the buffer but during long moves, + * this setting determines the minimum update time between checks. A value of 100 works well with + * error rolling average when attempting to correct only for skips and not for vibration. + */ + #define I2CPE_MIN_UPD_TIME_MS 4 // (ms) Minimum time between encoder checks. + + // Use a rolling average to identify persistant errors that indicate skips, as opposed to vibration and noise. + #define I2CPE_ERR_ROLLING_AVERAGE + +#endif // I2C_POSITION_ENCODERS + +/** + * MAX7219 Debug Matrix + * + * Add support for a low-cost 8x8 LED Matrix based on the Max7219 chip as a realtime status display. + * Requires 3 signal wires. Some useful debug options are included to demonstrate its usage. + */ +//#define MAX7219_DEBUG +#if ENABLED(MAX7219_DEBUG) + #define MAX7219_CLK_PIN 64 + #define MAX7219_DIN_PIN 57 + #define MAX7219_LOAD_PIN 44 + + //#define MAX7219_GCODE // Add the M7219 G-code to control the LED matrix + #define MAX7219_INIT_TEST 2 // Do a test pattern at initialization (Set to 2 for spiral) + #define MAX7219_NUMBER_UNITS 1 // Number of Max7219 units in chain. + #define MAX7219_ROTATE 0 // Rotate the display clockwise (in multiples of +/- 90°) + // connector at: right=0 bottom=-90 top=90 left=180 + //#define MAX7219_REVERSE_ORDER // The individual LED matrix units may be in reversed order + + /** + * Sample debug features + * If you add more debug displays, be careful to avoid conflicts! + */ + #define MAX7219_DEBUG_PRINTER_ALIVE // Blink corner LED of 8x8 matrix to show that the firmware is functioning + #define MAX7219_DEBUG_PLANNER_HEAD 3 // Show the planner queue head position on this and the next LED matrix row + #define MAX7219_DEBUG_PLANNER_TAIL 5 // Show the planner queue tail position on this and the next LED matrix row + + #define MAX7219_DEBUG_PLANNER_QUEUE 0 // Show the current planner queue depth on this and the next LED matrix row + // If you experience stuttering, reboots, etc. this option can reveal how + // tweaks made to the configuration are affecting the printer in real-time. +#endif + +/** + * NanoDLP Sync support + * + * Add support for Synchronized Z moves when using with NanoDLP. G0/G1 axis moves will output "Z_move_comp" + * string to enable synchronization with DLP projector exposure. This change will allow to use + * [[WaitForDoneMessage]] instead of populating your gcode with M400 commands + */ +//#define NANODLP_Z_SYNC +#if ENABLED(NANODLP_Z_SYNC) + //#define NANODLP_ALL_AXIS // Enables "Z_move_comp" output on any axis move. + // Default behaviour is limited to Z axis only. +#endif + +/** + * WiFi Support (Espressif ESP32 WiFi) + */ +//#define WIFISUPPORT +#if ENABLED(WIFISUPPORT) + #define WIFI_SSID "Wifi SSID" + #define WIFI_PWD "Wifi Password" +#endif + +/** + * Prusa Multi-Material Unit v2 + * Enable in Configuration.h + */ +#if ENABLED(PRUSA_MMU2) + + // Serial port used for communication with MMU2. + // For AVR enable the UART port used for the MMU. (e.g., internalSerial) + // For 32-bit boards check your HAL for available serial ports. (e.g., Serial2) + #define INTERNAL_SERIAL_PORT 2 + #define MMU2_SERIAL internalSerial + + // Use hardware reset for MMU if a pin is defined for it + //#define MMU2_RST_PIN 23 + + // Enable if the MMU2 has 12V stepper motors (MMU2 Firmware 1.0.2 and up) + //#define MMU2_MODE_12V + + // G-code to execute when MMU2 F.I.N.D.A. probe detects filament runout + #define MMU2_FILAMENT_RUNOUT_SCRIPT "M600" + + // Add an LCD menu for MMU2 + //#define MMU2_MENUS + #if ENABLED(MMU2_MENUS) + // Settings for filament load / unload from the LCD menu. + // This is for Prusa MK3-style extruders. Customize for your hardware. + #define MMU2_FILAMENTCHANGE_EJECT_FEED 80.0 + #define MMU2_LOAD_TO_NOZZLE_SEQUENCE \ + { 7.2, 562 }, \ + { 14.4, 871 }, \ + { 36.0, 1393 }, \ + { 14.4, 871 }, \ + { 50.0, 198 } + + #define MMU2_RAMMING_SEQUENCE \ + { 1.0, 1000 }, \ + { 1.0, 1500 }, \ + { 2.0, 2000 }, \ + { 1.5, 3000 }, \ + { 2.5, 4000 }, \ + { -15.0, 5000 }, \ + { -14.0, 1200 }, \ + { -6.0, 600 }, \ + { 10.0, 700 }, \ + { -10.0, 400 }, \ + { -50.0, 2000 } + + #endif + + //#define MMU2_DEBUG // Write debug info to serial output + +#endif // PRUSA_MMU2 + +// @section develop + +/** + * M43 - display pin status, watch pins for changes, watch endstops & toggle LED, Z servo probe test, toggle pins + */ +#define PINS_DEBUGGING + +// Enable Marlin dev mode which adds some special commands +//#define MARLIN_DEV_MODE diff --git a/Marlin/src/core/boards.h b/Marlin/src/core/boards.h index 6c1389ef1e15..6e056600bba0 100644 --- a/Marlin/src/core/boards.h +++ b/Marlin/src/core/boards.h @@ -141,6 +141,7 @@ #define BOARD_STB_11 64 // STB V1.1 #define BOARD_AZTEEG_X1 65 // Azteeg X1 #define BOARD_ANET_10 69 // Anet 1.0 (Melzi clone) +#define BOARD_DERANDERE_PB_1 691 // Repurposed Anet 1.0 (Melzi clone) // // Other ATmega644P, ATmega644, ATmega1284P diff --git a/Marlin/src/core/drivers.h b/Marlin/src/core/drivers.h index 25fe2245f6e5..4b70516ce74a 100644 --- a/Marlin/src/core/drivers.h +++ b/Marlin/src/core/drivers.h @@ -56,6 +56,15 @@ #define AXIS_DRIVER_TYPE_Y2(T) (ENABLED(Y_DUAL_STEPPER_DRIVERS) && _AXIS_DRIVER_TYPE(Y2,T)) #define AXIS_DRIVER_TYPE_Z2(T) (Z_MULTI_STEPPER_DRIVERS && _AXIS_DRIVER_TYPE(Z2,T)) #define AXIS_DRIVER_TYPE_Z3(T) (ENABLED(Z_TRIPLE_STEPPER_DRIVERS) && _AXIS_DRIVER_TYPE(Z3,T)) +#if NON_E_AXES > 3 + #define AXIS_DRIVER_TYPE_I(T) _AXIS_DRIVER_TYPE(I,T) + #if NON_E_AXES > 4 + #define AXIS_DRIVER_TYPE_J(T) _AXIS_DRIVER_TYPE(J,T) + #if NON_E_AXES > 5 + #define AXIS_DRIVER_TYPE_K(T) _AXIS_DRIVER_TYPE(K,T) + #endif + #endif +#endif #define AXIS_DRIVER_TYPE_E0(T) (E_STEPPERS > 0 && _AXIS_DRIVER_TYPE(E0,T)) #define AXIS_DRIVER_TYPE_E1(T) (E_STEPPERS > 1 && _AXIS_DRIVER_TYPE(E1,T)) #define AXIS_DRIVER_TYPE_E2(T) (E_STEPPERS > 2 && _AXIS_DRIVER_TYPE(E2,T)) @@ -65,12 +74,38 @@ #define AXIS_DRIVER_TYPE(A,T) AXIS_DRIVER_TYPE_##A(T) +#if NON_E_AXES == 4 #define HAS_DRIVER(T) (AXIS_DRIVER_TYPE_X(T) || AXIS_DRIVER_TYPE_X2(T) || \ AXIS_DRIVER_TYPE_Y(T) || AXIS_DRIVER_TYPE_Y2(T) || \ AXIS_DRIVER_TYPE_Z(T) || AXIS_DRIVER_TYPE_Z2(T) || AXIS_DRIVER_TYPE_Z3(T) || \ + AXIS_DRIVER_TYPE_I(T) || \ AXIS_DRIVER_TYPE_E0(T) || AXIS_DRIVER_TYPE_E1(T) || \ AXIS_DRIVER_TYPE_E2(T) || AXIS_DRIVER_TYPE_E3(T) || \ AXIS_DRIVER_TYPE_E4(T) || AXIS_DRIVER_TYPE_E5(T) ) +#elif NON_E_AXES == 5 +#define HAS_DRIVER(T) (AXIS_DRIVER_TYPE_X(T) || AXIS_DRIVER_TYPE_X2(T) || \ + AXIS_DRIVER_TYPE_Y(T) || AXIS_DRIVER_TYPE_Y2(T) || \ + AXIS_DRIVER_TYPE_Z(T) || AXIS_DRIVER_TYPE_Z2(T) || AXIS_DRIVER_TYPE_Z3(T) || \ + AXIS_DRIVER_TYPE_I(T) || AXIS_DRIVER_TYPE_J(T) || \ + AXIS_DRIVER_TYPE_E0(T) || AXIS_DRIVER_TYPE_E1(T) || \ + AXIS_DRIVER_TYPE_E2(T) || AXIS_DRIVER_TYPE_E3(T) || \ + AXIS_DRIVER_TYPE_E4(T) || AXIS_DRIVER_TYPE_E5(T) ) +#elif NON_E_AXES == 6 +#define HAS_DRIVER(T) (AXIS_DRIVER_TYPE_X(T) || AXIS_DRIVER_TYPE_X2(T) || \ + AXIS_DRIVER_TYPE_Y(T) || AXIS_DRIVER_TYPE_Y2(T) || \ + AXIS_DRIVER_TYPE_Z(T) || AXIS_DRIVER_TYPE_Z2(T) || AXIS_DRIVER_TYPE_Z3(T) || \ + AXIS_DRIVER_TYPE_I(T) || AXIS_DRIVER_TYPE_J(T) || AXIS_DRIVER_TYPE_K(T) || \ + AXIS_DRIVER_TYPE_E0(T) || AXIS_DRIVER_TYPE_E1(T) || \ + AXIS_DRIVER_TYPE_E2(T) || AXIS_DRIVER_TYPE_E3(T) || \ + AXIS_DRIVER_TYPE_E4(T) || AXIS_DRIVER_TYPE_E5(T) ) +#else +#define HAS_DRIVER(T) (AXIS_DRIVER_TYPE_X(T) || AXIS_DRIVER_TYPE_X2(T) || \ + AXIS_DRIVER_TYPE_Y(T) || AXIS_DRIVER_TYPE_Y2(T) || \ + AXIS_DRIVER_TYPE_Z(T) || AXIS_DRIVER_TYPE_Z2(T) || AXIS_DRIVER_TYPE_Z3(T) || \ + AXIS_DRIVER_TYPE_E0(T) || AXIS_DRIVER_TYPE_E1(T) || \ + AXIS_DRIVER_TYPE_E2(T) || AXIS_DRIVER_TYPE_E3(T) || \ + AXIS_DRIVER_TYPE_E4(T) || AXIS_DRIVER_TYPE_E5(T) ) +#endif // Test for supported TMC drivers that require advanced configuration // Does not match standalone configurations diff --git a/Marlin/src/core/enum.h b/Marlin/src/core/enum.h index d3d7d948da66..eee183d4ec7a 100644 --- a/Marlin/src/core/enum.h +++ b/Marlin/src/core/enum.h @@ -35,10 +35,33 @@ enum AxisEnum : unsigned char { B_AXIS = 1, Z_AXIS = 2, C_AXIS = 2, +#if NON_E_AXES > 5 + I_AXIS = 3, + J_AXIS = 4, + K_AXIS = 5, + E_AXIS = 6, + X_HEAD = 7, + Y_HEAD = 8, + Z_HEAD = 9, +#elif NON_E_AXES > 4 + I_AXIS = 3, + J_AXIS = 4, + E_AXIS = 5, + X_HEAD = 6, + Y_HEAD = 7, + Z_HEAD = 8, +#elif NON_E_AXES > 3 + I_AXIS = 3, + E_AXIS = 4, + X_HEAD = 5, + Y_HEAD = 6, + Z_HEAD = 7, +#else E_AXIS = 3, X_HEAD = 4, Y_HEAD = 5, Z_HEAD = 6, +#endif ALL_AXES = 0xFE, NO_AXIS = 0xFF }; @@ -59,6 +82,11 @@ enum AxisEnum : unsigned char { #define LOOP_ABC(VAR) LOOP_S_LE_N(VAR, A_AXIS, C_AXIS) #define LOOP_ABCE(VAR) LOOP_S_LE_N(VAR, A_AXIS, E_AXIS) #define LOOP_ABCE_N(VAR) LOOP_S_L_N(VAR, A_AXIS, XYZE_N) +#define LOOP_MOV_AXIS(VAR) LOOP_S_L_N(VAR, A_AXIS, MOV_AXIS) +#define LOOP_NUM_AXIS(VAR) LOOP_S_L_N(VAR, A_AXIS, NUM_AXIS) +#define LOOP_NUM_AXIS_N(VAR) LOOP_S_L_N(VAR, A_AXIS, NUM_AXIS_N) +#define LOOP_NON_E(VAR) LOOP_S_L_N(VAR, A_AXIS, NON_E_AXES) + typedef enum { LINEARUNIT_MM, diff --git a/Marlin/src/core/language.h b/Marlin/src/core/language.h index 149a7d3a0b64..3b432a182689 100644 --- a/Marlin/src/core/language.h +++ b/Marlin/src/core/language.h @@ -158,7 +158,7 @@ #define MSG_ERR_LINE_NO "Line Number is not Last Line Number+1, Last Line: " #define MSG_ERR_CHECKSUM_MISMATCH "checksum mismatch, Last Line: " #define MSG_ERR_NO_CHECKSUM "No Checksum with line number, Last Line: " -#define MSG_FILE_PRINTED "Done printing file" +#define MSG_FILE_PRINTED "Done running file" #define MSG_BEGIN_FILE_LIST "Begin file list" #define MSG_END_FILE_LIST "End file list" #define MSG_INVALID_EXTRUDER "Invalid extruder" @@ -168,8 +168,8 @@ #define MSG_COUNT_X " Count X:" #define MSG_COUNT_A " Count A:" #define MSG_WATCHDOG_FIRED "Watchdog timeout. Reset required." -#define MSG_ERR_KILLED "Printer halted. kill() called!" -#define MSG_ERR_STOPPED "Printer stopped due to errors. Fix the error and use M999 to restart. (Temperature is reset. Set it after restarting)" +#define MSG_ERR_KILLED "Machine halted. kill() called!" +#define MSG_ERR_STOPPED "Machine stopped due to errors. Fix the error and use M999 to restart. (Temperature is reset. Set it after restarting)" #define MSG_BUSY_PROCESSING "busy: processing" #define MSG_BUSY_PAUSED_FOR_USER "busy: paused for user" #define MSG_BUSY_PAUSED_FOR_INPUT "busy: paused for input" @@ -191,6 +191,12 @@ #define MSG_Z2_MAX "z2_max" #define MSG_Z3_MIN "z3_min" #define MSG_Z3_MAX "z3_max" +#define MSG_I_MIN "i_min" +#define MSG_I_MAX "i_max" +#define MSG_J_MIN "j_min" +#define MSG_J_MAX "j_max" +#define MSG_K_MIN "k_min" +#define MSG_K_MAX "k_max" #define MSG_Z_PROBE "z_probe" #define MSG_FILAMENT_RUNOUT_SENSOR "filament" #define MSG_PROBE_Z_OFFSET "Probe Z Offset" @@ -317,6 +323,10 @@ #define MSG_Y "Y" #define MSG_Z "Z" #define MSG_E "E" +#define MSG_I "I" +#define MSG_J "J" +#define MSG_K "K" + #if IS_KINEMATIC #define MSG_A "A" #define MSG_B "B" diff --git a/Marlin/src/core/macros.h b/Marlin/src/core/macros.h index b438db920132..af23732909c5 100644 --- a/Marlin/src/core/macros.h +++ b/Marlin/src/core/macros.h @@ -23,9 +23,17 @@ #include "minmax.h" -#define NUM_AXIS 4 +#define MOV_AXIS 3 +#define NUM_AXIS NON_E_AXES + 1 #define ABCE 4 #define XYZE 4 +#define XYZIE 5 +#define XYZIJE 6 +#define XYZIJKE 7 +#define ABCDE 5 +#define ABCIE 5 +#define ABCIJE 6 +#define ABCIJKE 7 #define ABC 3 #define XYZ 3 @@ -34,9 +42,17 @@ #define _XMIN_ 100 #define _YMIN_ 200 #define _ZMIN_ 300 +#define _DMIN_ 400 +#define _IMIN_ 400 +#define _JMIN_ 500 +#define _KMIN_ 600 #define _XMAX_ 101 #define _YMAX_ 201 #define _ZMAX_ 301 +#define _DMAX_ 401 +#define _IMAX_ 401 +#define _JMAX_ 501 +#define _KMAX_ 601 #define _FORCE_INLINE_ __attribute__((__always_inline__)) __inline__ #define FORCE_INLINE __attribute__((always_inline)) inline @@ -158,6 +174,7 @@ }while(0) // Macros for initializing arrays +#define ARRAY_7(v1, v2, v3, v4, v5, v6, v7, ...) { v1, v2, v3, v4, v5, v6, v7 } #define ARRAY_6(v1, v2, v3, v4, v5, v6, ...) { v1, v2, v3, v4, v5, v6 } #define ARRAY_5(v1, v2, v3, v4, v5, ...) { v1, v2, v3, v4, v5 } #define ARRAY_4(v1, v2, v3, v4, ...) { v1, v2, v3, v4 } diff --git a/Marlin/src/core/serial.cpp b/Marlin/src/core/serial.cpp index 317a026b7762..f4dcc4be9e02 100644 --- a/Marlin/src/core/serial.cpp +++ b/Marlin/src/core/serial.cpp @@ -23,7 +23,9 @@ #include "serial.h" #include "language.h" -uint8_t marlin_debug_flags = MARLIN_DEBUG_NONE; +//uint8_t marlin_debug_flags = MARLIN_DEBUG_NONE; +uint8_t marlin_debug_flags = MARLIN_DEBUG_LEVELING; + static const char errormagic[] PROGMEM = "Error:"; static const char echomagic[] PROGMEM = "echo:"; @@ -74,18 +76,47 @@ void serialprintln_onoff(const bool onoff) { serialprint_onoff(onoff); SERIAL_EO #include "enum.h" - void print_xyz(PGM_P const prefix, PGM_P const suffix, const float x, const float y, const float z) { + void print_xyz(PGM_P const prefix, PGM_P const suffix, const float x, const float y, const float z + #if NON_E_AXES > 3 + , const float i + #if NON_E_AXES > 4 + , const float j + #if NON_E_AXES > 5 + , const float k + #endif + #endif + #endif + ) { serialprintPGM(prefix); SERIAL_CHAR('('); SERIAL_ECHO(x); SERIAL_ECHOPAIR(", ", y); SERIAL_ECHOPAIR(", ", z); + #if NON_E_AXES > 3 + SERIAL_ECHOPAIR(", ", i); + #if NON_E_AXES > 4 + SERIAL_ECHOPAIR(", ", j); + #if NON_E_AXES > 5 + SERIAL_ECHOPAIR(", ", k); + #endif + #endif + #endif SERIAL_CHAR(')'); if (suffix) serialprintPGM(suffix); else SERIAL_EOL(); } void print_xyz(PGM_P const prefix, PGM_P const suffix, const float xyz[]) { - print_xyz(prefix, suffix, xyz[X_AXIS], xyz[Y_AXIS], xyz[Z_AXIS]); + print_xyz(prefix, suffix, xyz[X_AXIS], xyz[Y_AXIS], xyz[Z_AXIS] + #if NON_E_AXES > 3 + , xyz[I_AXIS] + #if NON_E_AXES > 4 + , xyz[J_AXIS] + #if NON_E_AXES > 5 + , xyz[K_AXIS] + #endif + #endif + #endif + ); } #endif diff --git a/Marlin/src/core/serial.h b/Marlin/src/core/serial.h index 4ee2bfd009eb..803c7942132e 100644 --- a/Marlin/src/core/serial.h +++ b/Marlin/src/core/serial.h @@ -208,7 +208,17 @@ void serialprint_onoff(const bool onoff); void serialprintln_onoff(const bool onoff); #if ENABLED(DEBUG_LEVELING_FEATURE) - void print_xyz(PGM_P const prefix, PGM_P const suffix, const float x, const float y, const float z); + void print_xyz(PGM_P const prefix, PGM_P const suffix, const float x, const float y, const float z + #if NON_E_AXES > 3 + , const float i + #if NON_E_AXES > 4 + , const float j + #if NON_E_AXES > 5 + , const float k + #endif + #endif + #endif + ); void print_xyz(PGM_P const prefix, PGM_P const suffix, const float xyz[]); #define DEBUG_POS(SUFFIX,VAR) do { print_xyz(PSTR(" " STRINGIFY(VAR) "="), PSTR(" : " SUFFIX "\n"), VAR); } while(0) #endif diff --git a/Marlin/src/core/utility.h b/Marlin/src/core/utility.h index 15c9264cf4f6..ed20b01018ee 100644 --- a/Marlin/src/core/utility.h +++ b/Marlin/src/core/utility.h @@ -23,7 +23,17 @@ #include "../inc/MarlinConfigPre.h" -constexpr char axis_codes[XYZE] = { 'X', 'Y', 'Z', 'E' }; +constexpr char axis_codes[NUM_AXIS] = { 'X', 'Y', 'Z' + #if NON_E_AXES > 3 + , 'I' + #if NON_E_AXES > 4 + , 'J' + #if NON_E_AXES > 5 + , 'K' + #endif + #endif + #endif + , 'E' }; // Delay that ensures heaters and watchdog are kept alive void safe_delay(millis_t ms); diff --git a/Marlin/src/gcode/calibrate/G28.cpp b/Marlin/src/gcode/calibrate/G28.cpp index 205ff7b091e8..70c663c6b1a0 100644 --- a/Marlin/src/gcode/calibrate/G28.cpp +++ b/Marlin/src/gcode/calibrate/G28.cpp @@ -196,7 +196,7 @@ void GcodeSuite::G28(const bool always_home_all) { #if ENABLED(MARLIN_DEV_MODE) if (parser.seen('S')) { - LOOP_XYZ(a) set_axis_is_at_home((AxisEnum)a); + LOOP_NON_E(a) set_axis_is_at_home((AxisEnum)a); sync_plan_position(); SERIAL_ECHOLNPGM("Simulated Homing"); report_current_position(); @@ -278,7 +278,36 @@ void GcodeSuite::G28(const bool always_home_all) { const bool homeX = always_home_all || parser.seen('X'), homeY = always_home_all || parser.seen('Y'), homeZ = always_home_all || parser.seen('Z'), - home_all = (!homeX && !homeY && !homeZ) || (homeX && homeY && homeZ); + #if NON_E_AXES > 3 + homeI = always_home_all || parser.seen('I'), + #if NON_E_AXES > 4 + homeJ = always_home_all || parser.seen('J'), + #if NON_E_AXES > 5 + homeK = always_home_all || parser.seen('K'), + #endif + #endif + #endif + home_all = (!homeX && !homeY && !homeZ + #if NON_E_AXES > 3 + && !homeI + #if NON_E_AXES > 4 + && !homeJ + #if NON_E_AXES > 5 + && !homeK + #endif + #endif + #endif + ) || (homeX && homeY && homeZ + #if NON_E_AXES > 3 + && homeI + #if NON_E_AXES > 4 + && homeJ + #if NON_E_AXES > 5 + && homeK + #endif + #endif + #endif + ); set_destination_from_current(); @@ -295,7 +324,17 @@ void GcodeSuite::G28(const bool always_home_all) { (parser.seenval('R') ? parser.value_linear_units() : Z_HOMING_HEIGHT) ); - if (z_homing_height && (home_all || homeX || homeY)) { + if (z_homing_height && (home_all || homeX || homeY + #if NON_E_AXES > 3 + || homeI + #if NON_E_AXES > 4 + || homeJ + #if NON_E_AXES > 5 + || homeK + #endif + #endif + #endif + )) { // Raise Z before homing any other axes and z is not already high enough (never lower z) destination[Z_AXIS] = z_homing_height; if (destination[Z_AXIS] > current_position[Z_AXIS]) { @@ -379,6 +418,22 @@ void GcodeSuite::G28(const bool always_home_all) { } // home_all || homeZ #endif // Z_HOME_DIR < 0 + #if NON_E_AXES > 3 + if (home_all || homeI) { + homeaxis(I_AXIS); + } + #if NON_E_AXES > 4 + if (home_all || homeJ) { + homeaxis(J_AXIS); + } + #if NON_E_AXES > 5 + if (home_all || homeK) { + homeaxis(K_AXIS); + } + #endif + #endif + #endif + sync_plan_position(); #endif // !DELTA (G28) diff --git a/Marlin/src/gcode/config/M200-M205.cpp b/Marlin/src/gcode/config/M200-M205.cpp index 511ab6cdc61e..514d7ba882db 100644 --- a/Marlin/src/gcode/config/M200-M205.cpp +++ b/Marlin/src/gcode/config/M200-M205.cpp @@ -59,7 +59,7 @@ void GcodeSuite::M201() { const int8_t target_extruder = get_target_extruder_from_command(); if (target_extruder < 0) return; - LOOP_XYZE(i) { + LOOP_NUM_AXIS(i) { if (parser.seen(axis_codes[i])) { const uint8_t a = (i == E_AXIS ? E_AXIS_N(target_extruder) : i); planner.settings.max_acceleration_mm_per_s2[a] = parser.value_axis_units((AxisEnum)a); @@ -79,7 +79,7 @@ void GcodeSuite::M203() { const int8_t target_extruder = get_target_extruder_from_command(); if (target_extruder < 0) return; - LOOP_XYZE(i) + LOOP_NUM_AXIS(i) if (parser.seen(axis_codes[i])) { const uint8_t a = (i == E_AXIS ? E_AXIS_N(target_extruder) : i); planner.settings.max_feedrate_mm_s[a] = parser.value_axis_units((AxisEnum)a); @@ -128,7 +128,7 @@ void GcodeSuite::M205() { #define J_PARAM #endif #if HAS_CLASSIC_JERK - #define XYZE_PARAM "XYZE" + #define XYZE_PARAM "XYZIJE" #else #define XYZE_PARAM #endif @@ -161,6 +161,15 @@ void GcodeSuite::M205() { SERIAL_ECHOLNPGM("WARNING! Low Z Jerk may lead to unwanted pauses."); #endif } + #if NON_E_AXES > 3 + if (parser.seen('I')) planner.max_jerk[I_AXIS] = parser.value_linear_units(); + #if NON_E_AXES > 4 + if (parser.seen('J')) planner.max_jerk[J_AXIS] = parser.value_linear_units(); + #if NON_E_AXES > 5 + if (parser.seen('K')) planner.max_jerk[K_AXIS] = parser.value_linear_units(); + #endif + #endif + #endif #if DISABLED(JUNCTION_DEVIATION) || DISABLED(LIN_ADVANCE) if (parser.seen('E')) planner.max_jerk[E_AXIS] = parser.value_linear_units(); #endif diff --git a/Marlin/src/gcode/config/M92.cpp b/Marlin/src/gcode/config/M92.cpp index e86b7a17aa97..47aebcb1a3da 100644 --- a/Marlin/src/gcode/config/M92.cpp +++ b/Marlin/src/gcode/config/M92.cpp @@ -33,6 +33,8 @@ void report_M92( SERIAL_ECHOPAIR_P(port, " M92 X", LINEAR_UNIT(planner.settings.axis_steps_per_mm[X_AXIS])); SERIAL_ECHOPAIR_P(port, " Y", LINEAR_UNIT(planner.settings.axis_steps_per_mm[Y_AXIS])); SERIAL_ECHOPAIR_P(port, " Z", LINEAR_UNIT(planner.settings.axis_steps_per_mm[Z_AXIS])); + SERIAL_ECHOPAIR_P(port, " I", LINEAR_UNIT(planner.settings.axis_steps_per_mm[I_AXIS])); + SERIAL_ECHOPAIR_P(port, " J", LINEAR_UNIT(planner.settings.axis_steps_per_mm[J_AXIS])); #if DISABLED(DISTINCT_E_FACTORS) SERIAL_ECHOPAIR_P(port, " E", VOLUMETRIC_UNIT(planner.settings.axis_steps_per_mm[E_AXIS])); #endif @@ -67,7 +69,7 @@ void GcodeSuite::M92() { if (target_extruder < 0) return; // No arguments? Show M92 report. - if (!parser.seen("XYZE" + if (!parser.seen("XYZIJE" #if ENABLED(MAGIC_NUMBERS_GCODE) "HL" #endif @@ -78,7 +80,7 @@ void GcodeSuite::M92() { true, target_extruder ); - LOOP_XYZE(i) { + LOOP_NUM_AXIS_N(i) { if (parser.seenval(axis_codes[i])) { if (i == E_AXIS) { const float value = parser.value_per_axis_units((AxisEnum)(E_AXIS_N(target_extruder))); diff --git a/Marlin/src/gcode/gcode.cpp b/Marlin/src/gcode/gcode.cpp index 4b0a859943b9..3b1f774eccf2 100644 --- a/Marlin/src/gcode/gcode.cpp +++ b/Marlin/src/gcode/gcode.cpp @@ -86,7 +86,7 @@ int8_t GcodeSuite::get_target_extruder_from_command() { * - Set the feedrate, if included */ void GcodeSuite::get_destination_from_command() { - LOOP_XYZE(i) { + LOOP_NUM_AXIS(i) { if (parser.seen(axis_codes[i])) { const float v = parser.value_axis_units((AxisEnum)i); destination[i] = (axis_relative_modes[i] || relative_mode) diff --git a/Marlin/src/gcode/geometry/G92.cpp b/Marlin/src/gcode/geometry/G92.cpp index b01daf348d76..e167af715bb0 100644 --- a/Marlin/src/gcode/geometry/G92.cpp +++ b/Marlin/src/gcode/geometry/G92.cpp @@ -63,7 +63,7 @@ void GcodeSuite::G92() { constexpr bool didXYZ = false; #endif - if (IS_G92_0) LOOP_XYZE(i) { + if (IS_G92_0) LOOP_NUM_AXIS(i) { if (parser.seenval(axis_codes[i])) { const float l = parser.value_axis_units((AxisEnum)i), v = i == E_AXIS ? l : LOGICAL_TO_NATIVE(l, i), diff --git a/Marlin/src/gcode/geometry/M206_M428.cpp b/Marlin/src/gcode/geometry/M206_M428.cpp index 8ef9eb057d3e..a9c4e30228b0 100644 --- a/Marlin/src/gcode/geometry/M206_M428.cpp +++ b/Marlin/src/gcode/geometry/M206_M428.cpp @@ -37,7 +37,7 @@ * *** In the 2.0 release, it will simply be disabled by default. */ void GcodeSuite::M206() { - LOOP_XYZ(i) + LOOP_NON_E(i) if (parser.seen(axis_codes[i])) set_home_offset((AxisEnum)i, parser.value_linear_units()); @@ -63,8 +63,8 @@ void GcodeSuite::M206() { void GcodeSuite::M428() { if (axis_unhomed_error()) return; - float diff[XYZ]; - LOOP_XYZ(i) { + float diff[NON_E_AXES]; + LOOP_NON_E(i) { diff[i] = base_home_pos((AxisEnum)i) - current_position[i]; if (!WITHIN(diff[i], -20, 20) && home_dir((AxisEnum)i) > 0) diff[i] = -current_position[i]; @@ -76,7 +76,7 @@ void GcodeSuite::M428() { } } - LOOP_XYZ(i) set_home_offset((AxisEnum)i, diff[i]); + LOOP_NON_E(i) set_home_offset((AxisEnum)i, diff[i]); report_current_position(); LCD_MESSAGEPGM(MSG_HOME_OFFSETS_APPLIED); BUZZ(100, 659); diff --git a/Marlin/src/gcode/motion/G0_G1.cpp b/Marlin/src/gcode/motion/G0_G1.cpp index cbec67b27694..610bc149debd 100644 --- a/Marlin/src/gcode/motion/G0_G1.cpp +++ b/Marlin/src/gcode/motion/G0_G1.cpp @@ -35,7 +35,7 @@ #include "../../module/stepper.h" #endif -extern float destination[XYZE]; +extern float destination[NUM_AXIS]; #if ENABLED(VARIABLE_G0_FEEDRATE) float saved_g0_feedrate_mm_s = MMM_TO_MMS(G0_FEEDRATE); diff --git a/Marlin/src/gcode/motion/G2_G3.cpp b/Marlin/src/gcode/motion/G2_G3.cpp index 9193d25599d9..7f1686d946f5 100644 --- a/Marlin/src/gcode/motion/G2_G3.cpp +++ b/Marlin/src/gcode/motion/G2_G3.cpp @@ -50,7 +50,7 @@ * options for G2/G3 arc generation. In future these options may be GCode tunable. */ void plan_arc( - const float (&cart)[XYZE], // Destination position + const float (&cart)[NUM_AXIS], // Destination position const float (&offset)[2], // Center of rotation relative to current_position const uint8_t clockwise // Clockwise? ) { @@ -123,7 +123,7 @@ void plan_arc( * This is important when there are successive arc motions. */ // Vector rotation matrix values - float raw[XYZE]; + float raw[NUM_AXIS]; const float theta_per_segment = angular_travel / segments, linear_per_segment = linear_travel / segments, extruder_per_segment = extruder_travel / segments, diff --git a/Marlin/src/gcode/parser.cpp b/Marlin/src/gcode/parser.cpp index d85d25786f03..f2237ed1b092 100644 --- a/Marlin/src/gcode/parser.cpp +++ b/Marlin/src/gcode/parser.cpp @@ -203,7 +203,17 @@ void GCodeParser::parse(char *p) { #endif case 'P': case 'Q': if (motion_mode_codenum != 5) return; - case 'X': case 'Y': case 'Z': case 'E': case 'F': + case 'X': case 'Y': case 'Z': case 'E': + #if NON_E_AXES > 3 + case 'I': + #if NON_E_AXES > 4 + case 'J': + #if NON_E_AXES > 5 + case 'K': + #endif + #endif + #endif + case 'F': if (motion_mode_codenum < 0) return; command_letter = 'G'; codenum = motion_mode_codenum; diff --git a/Marlin/src/gcode/parser.h b/Marlin/src/gcode/parser.h index 73adfafccb60..6ec77803d6f9 100644 --- a/Marlin/src/gcode/parser.h +++ b/Marlin/src/gcode/parser.h @@ -198,7 +198,17 @@ class GCodeParser { // Seen any axis parameter static inline bool seen_axis() { - return SEEN_TEST('X') || SEEN_TEST('Y') || SEEN_TEST('Z') || SEEN_TEST('E'); + return SEEN_TEST('X') || SEEN_TEST('Y') || SEEN_TEST('Z') + #if NON_E_AXES > 3 + || SEEN_TEST('I') + #if NON_E_AXES > 4 + || SEEN_TEST('J') + #if NON_E_AXES > 5 + || SEEN_TEST('K') + #endif + #endif + #endif + || SEEN_TEST('E'); } // Populate all fields by parsing a single line of GCode diff --git a/Marlin/src/inc/Conditionals_LCD.h b/Marlin/src/inc/Conditionals_LCD.h index fdfecadbab5f..43cf44bd5ab5 100644 --- a/Marlin/src/inc/Conditionals_LCD.h +++ b/Marlin/src/inc/Conditionals_LCD.h @@ -435,13 +435,14 @@ * DISTINCT_E_FACTORS affects how some E factors are accessed */ #if ENABLED(DISTINCT_E_FACTORS) && E_STEPPERS > 1 - #define XYZE_N (XYZ + E_STEPPERS) + #define XYZE_N (NON_E_AXES + E_STEPPERS) #define E_AXIS_N(E) (E_AXIS + E) #else #undef DISTINCT_E_FACTORS #define XYZE_N XYZE #define E_AXIS_N(E) E_AXIS #endif +#define NUM_AXIS_N NON_E_AXES + E_STEPPERS /** * The BLTouch Probe emulates a servo probe diff --git a/Marlin/src/inc/Conditionals_post.h b/Marlin/src/inc/Conditionals_post.h index 666d3e7db179..77ef820f1152 100644 --- a/Marlin/src/inc/Conditionals_post.h +++ b/Marlin/src/inc/Conditionals_post.h @@ -51,7 +51,15 @@ #define X_MAX_LENGTH (X_MAX_POS - (X_MIN_POS)) #define Y_MAX_LENGTH (Y_MAX_POS - (Y_MIN_POS)) #define Z_MAX_LENGTH (Z_MAX_POS - (Z_MIN_POS)) - +#if NON_E_AXES > 3 + #define I_MAX_LENGTH (I_MAX_POS - (I_MIN_POS)) + #if NON_E_AXES > 4 + #define J_MAX_LENGTH (J_MAX_POS - (J_MIN_POS)) + #if NON_E_AXES > 5 + #define K_MAX_LENGTH (K_MAX_POS - (K_MIN_POS)) + #endif + #endif +#endif // Defined only if the sanity-check is bypassed #ifndef X_BED_SIZE #define X_BED_SIZE X_MAX_LENGTH @@ -74,7 +82,15 @@ #define Y_CENTER ((Y_BED_SIZE) / 2) #endif #define Z_CENTER ((Z_MIN_POS + Z_MAX_POS) / 2) - +#if NON_E_AXES > 3 + #define I_CENTER ((I_MIN_POS + I_MAX_POS) / 2) + #if NON_E_AXES > 4 + #define J_CENTER ((J_MIN_POS + J_MAX_POS) / 2) + #if NON_E_AXES > 5 + #define K_CENTER ((K_MIN_POS + K_MAX_POS) / 2) + #endif + #endif +#endif // Get the linear boundaries of the bed #define X_MIN_BED (X_CENTER - (X_BED_SIZE) / 2) #define X_MAX_BED (X_CENTER + (X_BED_SIZE) / 2) @@ -177,6 +193,15 @@ #define Z_HOME_POS (Z_HOME_DIR < 0 ? Z_MIN_POS : Z_MAX_POS) #endif +#if NON_E_AXES > 3 + #define I_HOME_POS (I_HOME_DIR < 0 ? I_MIN_POS : I_MAX_POS) + #if NON_E_AXES > 4 + #define J_HOME_POS (J_HOME_DIR < 0 ? J_MIN_POS : J_MAX_POS) + #if NON_E_AXES > 5 + #define K_HOME_POS (K_HOME_DIR < 0 ? K_MIN_POS : K_MAX_POS) + #endif + #endif +#endif /** * If DELTA_HEIGHT isn't defined use the old setting */ @@ -249,6 +274,22 @@ #ifndef DISABLE_INACTIVE_Z #define DISABLE_INACTIVE_Z DISABLE_Z #endif +#if NON_E_AXES > 3 + #ifndef DISABLE_INACTIVE_I + #define DISABLE_INACTIVE_I DISABLE_I + #endif + #if NON_E_AXES > 4 + #ifndef DISABLE_INACTIVE_J + #define DISABLE_INACTIVE_I DISABLE_J + #endif + #if NON_E_AXES > 5 + #ifndef DISABLE_INACTIVE_K + #define DISABLE_INACTIVE_I DISABLE_K + #endif + #endif + #endif +#endif + #ifndef DISABLE_INACTIVE_E #define DISABLE_INACTIVE_E DISABLE_E #endif @@ -739,6 +780,15 @@ #if ENABLED(USE_ZMAX_PLUG) #define ENDSTOPPULLUP_ZMAX #endif + #if ENABLED(USE_IMAX_PLUG) + #define ENDSTOPPULLUP_IMAX + #endif + #if ENABLED(USE_JMAX_PLUG) + #define ENDSTOPPULLUP_JMAX + #endif + #if ENABLED(USE_KMAX_PLUG) + #define ENDSTOPPULLUP_KMAX + #endif #if ENABLED(USE_XMIN_PLUG) #define ENDSTOPPULLUP_XMIN #endif @@ -748,6 +798,15 @@ #if ENABLED(USE_ZMIN_PLUG) #define ENDSTOPPULLUP_ZMIN #endif + #if ENABLED(USE_IMIN_PLUG) + #define ENDSTOPPULLUP_IMIN + #endif + #if ENABLED(USE_JMIN_PLUG) + #define ENDSTOPPULLUP_JMIN + #endif + #if ENABLED(USE_KMIN_PLUG) + #define ENDSTOPPULLUP_KMIN + #endif #endif /** @@ -814,6 +873,27 @@ #define HAS_Z3_STEP (PIN_EXISTS(Z3_STEP)) #define HAS_Z3_MICROSTEPS (PIN_EXISTS(Z3_MS1)) +#if NON_E_AXES > 3 + #define HAS_I_ENABLE (PIN_EXISTS(I_ENABLE) || (ENABLED(SOFTWARE_DRIVER_ENABLE) && AXIS_IS_TMC(X))) + #define HAS_I_DIR (PIN_EXISTS(I_DIR)) + #define HAS_I_STEP (PIN_EXISTS(I_STEP)) + #define HAS_I_MICROSTEPS (PIN_EXISTS(I_MS1)) + + #if NON_E_AXES > 4 + #define HAS_J_ENABLE (PIN_EXISTS(J_ENABLE) || (ENABLED(SOFTWARE_DRIVER_ENABLE) && AXIS_IS_TMC(J))) + #define HAS_J_DIR (PIN_EXISTS(J_DIR)) + #define HAS_J_STEP (PIN_EXISTS(J_STEP)) + #define HAS_J_MICROSTEPS (PIN_EXISTS(J_MS1)) + + #if NON_E_AXES > 5 + #define HAS_K_ENABLE (PIN_EXISTS(K_ENABLE) || (ENABLED(SOFTWARE_DRIVER_ENABLE) && AXIS_IS_TMC(K))) + #define HAS_K_DIR (PIN_EXISTS(K_DIR)) + #define HAS_K_STEP (PIN_EXISTS(K_STEP)) + #define HAS_K_MICROSTEPS (PIN_EXISTS(K_MS1)) + #endif // NON_E_AXES > 5 + #endif // NON_E_AXES > 4 +#endif // NON_E_AXES > 3 + // Extruder steppers and solenoids #define HAS_E0_ENABLE (PIN_EXISTS(E0_ENABLE) || (ENABLED(SOFTWARE_DRIVER_ENABLE) && AXIS_IS_TMC(E0))) #define HAS_E0_DIR (PIN_EXISTS(E0_DIR)) @@ -888,6 +968,12 @@ #define HAS_Z2_MAX (PIN_EXISTS(Z2_MAX)) #define HAS_Z3_MIN (PIN_EXISTS(Z3_MIN)) #define HAS_Z3_MAX (PIN_EXISTS(Z3_MAX)) +#define HAS_I_MIN HAS_STOP_TEST(I,MIN) +#define HAS_I_MAX HAS_STOP_TEST(I,MAX) +#define HAS_J_MIN HAS_STOP_TEST(J,MIN) +#define HAS_J_MAX HAS_STOP_TEST(J,MAX) +#define HAS_K_MIN HAS_STOP_TEST(K,MIN) +#define HAS_K_MAX HAS_STOP_TEST(K,MAX) #define HAS_Z_MIN_PROBE_PIN (PIN_EXISTS(Z_MIN_PROBE)) #define HAS_CALIBRATION_PIN (PIN_EXISTS(CALIBRATION)) diff --git a/Marlin/src/inc/SanityCheck.h b/Marlin/src/inc/SanityCheck.h index df6c8df1c6cc..1cdbfa1ebbbf 100644 --- a/Marlin/src/inc/SanityCheck.h +++ b/Marlin/src/inc/SanityCheck.h @@ -447,6 +447,24 @@ static_assert(Y_MAX_LENGTH >= Y_BED_SIZE, "Movement bounds (Y_MIN_POS, Y_MAX_POS #endif #endif +/** + * NON_E_AXES > 3 + */ +#if NON_E_AXES > 3 + #if !IS_CARTESIAN || HAS_EXTRA_ENDSTOPS || ENABLED(DUAL_X_CARRIAGE) || ENABLED(DUAL_Y_CARRIAGE) || ENABLED(X_DUAL_STEPPER_DRIVERS) || ENABLED(Y_DUAL_STEPPER_DRIVERS) || ENABLED(Z_DUAL_STEPPER_DRIVERS) || ENABLED(Z_TRIPLE_STEPPER_DRIVERS) + #error "NON_E_AXES > 3 currently requires a Cartesian with 1 endstop per axis. Untested for multiple carriages or multiple stepper drivers per axis." + #elif ENABLED(SENSORLESS_HOMING) + #error "NON_E_AXES > 3 is not currently compatible with SENSORLESS_HOMING (untested)." + #endif + + /** + * Require pin options and pins to be defined + */ + #if (!HAS_I_MIN && !HAS_I_MAX) + #error "NON_E_AXES > 3 requires I_STOP_PIN [, J_STOP_PIN[, K_STOP_PIN]] to be defined > 0)." + #endif +#endif + #if !defined(TARGET_LPC1768) && ( \ ENABLED(ENDSTOPPULLDOWNS) \ || ENABLED(ENDSTOPPULLDOWN_XMAX) \ @@ -1192,7 +1210,19 @@ static_assert(Y_MAX_LENGTH >= Y_BED_SIZE, "Movement bounds (Y_MIN_POS, Y_MAX_POS #if X_HOME_BUMP_MM < 0 || Y_HOME_BUMP_MM < 0 || Z_HOME_BUMP_MM < 0 #error "[XYZ]_HOME_BUMP_MM must be greater than or equal to 0." #endif - +#if NON_E_AXES > 3 + #if I_HOME_BUMP_MM < 0 + #error "I_HOME_BUMP_MM must be greater than or equal to 0." + #elif NON_E_AXES > 4 + #if J_HOME_BUMP_MM < 0 + #error "J_HOME_BUMP_MM must be greater than or equal to 0." + #elif NON_E_AXES > 5 + #if K_HOME_BUMP_MM < 0 + #error "K_HOME_BUMP_MM must be greater than or equal to 0." + #endif + #endif + #endif +#endif #if ENABLED(CODEPENDENT_XY_HOMING) #if ENABLED(QUICK_HOME) #error "QUICK_HOME is incompatible with CODEPENDENT_XY_HOMING." @@ -1222,6 +1252,11 @@ static_assert(Y_MAX_LENGTH >= Y_BED_SIZE, "Movement bounds (Y_MIN_POS, Y_MAX_POS #error "DISABLE_[XYZ] is not compatible with HOME_AFTER_DEACTIVATE or Z_SAFE_HOMING." #endif #endif +#if NON_E_AXES > 3 + #if ENABLED(DISABLE_I) || ENABLED(DISABLE_J) || ENABLED(DISABLE_K) + #error "DISABLE_[IJK] is not compatible with HOME_AFTER_DEACTIVATE or Z_SAVE_HOMING." + #endif +#endif /** * Filament Width Sensor @@ -1511,6 +1546,15 @@ static_assert(Y_MAX_LENGTH >= Y_BED_SIZE, "Movement bounds (Y_MIN_POS, Y_MAX_POS #if _AXIS_PLUG_UNUSED_TEST(Z) #error "You must enable USE_ZMIN_PLUG or USE_ZMAX_PLUG." #endif +#if NON_E_AXES > 3 && _AXIS_PLUG_UNUSED_TEST(I) + #error "You must enable USE_IMIN_PLUG or USE_IMAX_PLUG." + #if NON_E_AXES > 4 && _AXIS_PLUG_UNUSED_TEST(J) + #error "You must enable USE_JMIN_PLUG or USE_JMAX_PLUG." + #if NON_E_AXES > 5 && _AXIS_PLUG_UNUSED_TEST(K) + #error "You must enable USE_KMIN_PLUG or USE_KMAX_PLUG." + #endif + #endif +#endif // Delta and Cartesian use 3 homing endstops #if !IS_SCARA @@ -1523,7 +1567,26 @@ static_assert(Y_MAX_LENGTH >= Y_BED_SIZE, "Movement bounds (Y_MIN_POS, Y_MAX_POS #elif Y_HOME_DIR > 0 && DISABLED(USE_YMAX_PLUG) #error "Enable USE_YMAX_PLUG when homing Y to MAX." #endif -#endif + #if NON_E_AXES > 3 + #if I_HOME_DIR < 0 && DISABLED(USE_IMIN_PLUG) + #error "Enable USE_IMIN_PLUG when homing I to MIN." + #elif I_HOME_DIR > 0 && DISABLED(USE_IMAX_PLUG) + #error "Enable USE_IMAX_PLUG when homing I to MAX." + #elif NON_E_AXES > 4 + #if J_HOME_DIR < 0 && DISABLED(USE_JMIN_PLUG) + #error "Enable USE_JMIN_PLUG when homing J to MIN." + #elif J_HOME_DIR > 0 && DISABLED(USE_JMAX_PLUG) + #error "Enable USE_JMAX_PLUG when homing J to MAX." + #elif NON_E_AXES > 5 + #if K_HOME_DIR < 0 && DISABLED(USE_KMIN_PLUG) + #error "Enable USE_KMIN_PLUG when homing K to MIN." + #elif K_HOME_DIR > 0 && DISABLED(USE_KMAX_PLUG) + #error "Enable USE_KMAX_PLUG when homing K to MAX." + #endif + #endif // NON_E_AXES > 5 + #endif // NON_E_AXES > 4 + #endif // NON_E_AXES > 3 +#endif // !IS_SCARA #if Z_HOME_DIR < 0 && DISABLED(USE_ZMIN_PLUG) #error "Enable USE_ZMIN_PLUG when homing Z to MIN." #elif Z_HOME_DIR > 0 && DISABLED(USE_ZMAX_PLUG) @@ -1790,6 +1853,18 @@ static_assert(Y_MAX_LENGTH >= Y_BED_SIZE, "Movement bounds (Y_MIN_POS, Y_MAX_POS #error "TMC2130 on Z2 requires Z2_CS_PIN." #elif INVALID_TMC2130(Z3) #error "TMC2130 on Z3 requires Z3_CS_PIN." +#elif NON_E_AXES > 3 + #if INVALID_TMC2130(I) + #error "TMC2130 on I requires I_CS_PIN." + #elif NON_E_AXES > 4 + #if INVALID_TMC2130(J) + #error "TMC2130 on J requires J_CS_PIN." + #elif NON_E_AXES > 5 + #if INVALID_TMC2130(K) + #error "TMC2130 on K requires K_CS_PIN." + #endif + #endif + #endif #elif INVALID_TMC2130(E0) #error "TMC2130 on E0 requires E0_CS_PIN." #elif INVALID_TMC2130(E1) @@ -1951,28 +2026,28 @@ constexpr float sanity_arr_1[] = DEFAULT_AXIS_STEPS_PER_UNIT, sanity_arr_2[] = DEFAULT_MAX_FEEDRATE, sanity_arr_3[] = DEFAULT_MAX_ACCELERATION; -static_assert(COUNT(sanity_arr_1) >= XYZE, "DEFAULT_AXIS_STEPS_PER_UNIT requires 4 (or more) elements."); -static_assert(COUNT(sanity_arr_1) <= XYZE_N, "DEFAULT_AXIS_STEPS_PER_UNIT has too many elements. (Did you forget to enable DISTINCT_E_FACTORS?)"); +static_assert(COUNT(sanity_arr_1) >= NUM_AXIS, "DEFAULT_AXIS_STEPS_PER_UNIT requires 4 (or more) elements."); +static_assert(COUNT(sanity_arr_1) <= NUM_AXIS_N, "DEFAULT_AXIS_STEPS_PER_UNIT has too many elements. (Did you forget to enable DISTINCT_E_FACTORS?)"); static_assert(sanity_arr_1[0] > 0 && sanity_arr_1[1] > 0 && sanity_arr_1[2] > 0 - && (XYZE_N <= 3 || sanity_arr_1[3] > 0) && (XYZE_N <= 4 || sanity_arr_1[4] > 0) - && (XYZE_N <= 5 || sanity_arr_1[5] > 0) && (XYZE_N <= 6 || sanity_arr_1[6] > 0) - && (XYZE_N <= 7 || sanity_arr_1[7] > 0) && (XYZE_N <= 8 || sanity_arr_1[8] > 0), + && (NUM_AXIS_N <= 3 || sanity_arr_1[3] > 0) && (NUM_AXIS_N <= 4 || sanity_arr_1[4] > 0) + && (NUM_AXIS_N <= 5 || sanity_arr_1[5] > 0) && (NUM_AXIS_N <= 6 || sanity_arr_1[6] > 0) + && (NUM_AXIS_N <= 7 || sanity_arr_1[7] > 0) && (NUM_AXIS_N <= 8 || sanity_arr_1[8] > 0), "DEFAULT_AXIS_STEPS_PER_UNIT values must be positive."); -static_assert(COUNT(sanity_arr_2) >= XYZE, "DEFAULT_MAX_FEEDRATE requires 4 (or more) elements."); -static_assert(COUNT(sanity_arr_2) <= XYZE_N, "DEFAULT_MAX_FEEDRATE has too many elements. (Did you forget to enable DISTINCT_E_FACTORS?)"); +static_assert(COUNT(sanity_arr_2) >= NUM_AXIS, "DEFAULT_MAX_FEEDRATE requires 4 (or more) elements."); +static_assert(COUNT(sanity_arr_2) <= NUM_AXIS_N, "DEFAULT_MAX_FEEDRATE has too many elements. (Did you forget to enable DISTINCT_E_FACTORS?)"); static_assert(sanity_arr_2[0] > 0 && sanity_arr_2[1] > 0 && sanity_arr_2[2] > 0 - && (XYZE_N <= 3 || sanity_arr_2[3] > 0) && (XYZE_N <= 4 || sanity_arr_2[4] > 0) - && (XYZE_N <= 5 || sanity_arr_2[5] > 0) && (XYZE_N <= 6 || sanity_arr_2[6] > 0) - && (XYZE_N <= 7 || sanity_arr_2[7] > 0) && (XYZE_N <= 8 || sanity_arr_2[8] > 0), + && (NUM_AXIS_N <= 3 || sanity_arr_2[3] > 0) && (NUM_AXIS_N <= 4 || sanity_arr_2[4] > 0) + && (NUM_AXIS_N <= 5 || sanity_arr_2[5] > 0) && (NUM_AXIS_N <= 6 || sanity_arr_2[6] > 0) + && (NUM_AXIS_N <= 7 || sanity_arr_2[7] > 0) && (NUM_AXIS_N <= 8 || sanity_arr_2[8] > 0), "DEFAULT_MAX_FEEDRATE values must be positive."); -static_assert(COUNT(sanity_arr_3) >= XYZE, "DEFAULT_MAX_ACCELERATION requires 4 (or more) elements."); -static_assert(COUNT(sanity_arr_3) <= XYZE_N, "DEFAULT_MAX_ACCELERATION has too many elements. (Did you forget to enable DISTINCT_E_FACTORS?)"); +static_assert(COUNT(sanity_arr_3) >= NUM_AXIS, "DEFAULT_MAX_ACCELERATION requires 4 (or more) elements."); +static_assert(COUNT(sanity_arr_3) <= NUM_AXIS_N, "DEFAULT_MAX_ACCELERATION has too many elements. (Did you forget to enable DISTINCT_E_FACTORS?)"); static_assert(sanity_arr_3[0] > 0 && sanity_arr_3[1] > 0 && sanity_arr_3[2] > 0 - && (XYZE_N <= 3 || sanity_arr_3[3] > 0) && (XYZE_N <= 4 || sanity_arr_3[4] > 0) - && (XYZE_N <= 5 || sanity_arr_3[5] > 0) && (XYZE_N <= 6 || sanity_arr_3[6] > 0) - && (XYZE_N <= 7 || sanity_arr_3[7] > 0) && (XYZE_N <= 8 || sanity_arr_3[8] > 0), + && (NUM_AXIS_N <= 3 || sanity_arr_3[3] > 0) && (NUM_AXIS_N <= 4 || sanity_arr_3[4] > 0) + && (NUM_AXIS_N <= 5 || sanity_arr_3[5] > 0) && (NUM_AXIS_N <= 6 || sanity_arr_3[6] > 0) + && (NUM_AXIS_N <= 7 || sanity_arr_3[7] > 0) && (NUM_AXIS_N <= 8 || sanity_arr_3[8] > 0), "DEFAULT_MAX_ACCELERATION values must be positive."); #if ENABLED(CNC_COORDINATE_SYSTEMS) && ENABLED(NO_WORKSPACE_OFFSETS) diff --git a/Marlin/src/lcd/dogm/dogm_Statusscreen.h b/Marlin/src/lcd/dogm/dogm_Statusscreen.h index f93395f88423..b55bbb85fd4a 100644 --- a/Marlin/src/lcd/dogm/dogm_Statusscreen.h +++ b/Marlin/src/lcd/dogm/dogm_Statusscreen.h @@ -1,9 +1,9 @@ /** * Marlin 3D Printer Firmware - * Copyright (C) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin] + * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin] * * Based on Sprinter and grbl. - * Copyright (C) 2011 Camiel Gubbels / Erik van der Zalm + * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm * * 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 @@ -27,8 +27,6 @@ * http://marlinfw.org/tools/u8glib/converter.html */ -#include - #include "../../inc/MarlinConfig.h" #define BW(N) ((N + 7) / 8) @@ -46,7 +44,7 @@ #include "../../../_Statusscreen.h" #ifdef STATUS_SCREENWIDTH - #error "Your custom _Statusscreen.h needs to be converted for Marlin 2.0." + //#error "Your custom _Statusscreen.h needs to be converted for Marlin 2.0." #endif #endif @@ -661,6 +659,63 @@ #endif // !STATUS_BED_WIDTH && !STATUS_COMBINE_HEATERS && HAS_HEATED_BED && HOTENDS < 4 +#if HAS_HEATED_CHAMBER + + #define STATUS_CHAMBER_WIDTH 16 + + #ifdef STATUS_CHAMBER_ANIM + + const unsigned char status_chamber_bmp[] PROGMEM = { + B11111111,B11111111, + B10000000,B00000001, + B10000000,B00000001, + B10000000,B00000001, + B10000000,B00000001, + B10000000,B00000001, + B10000000,B00000001, + B10000000,B00000001, + B10000000,B00000001, + B10000000,B00000001, + B11111111,B11111111, + B11111111,B11111111 + }; + + const unsigned char status_chamber_on_bmp[] PROGMEM = { + B11111111,B11111111, + B10000000,B00000001, + B10000100,B00100001, + B10000010,B00010001, + B10000010,B00010001, + B10000100,B00100001, + B10001000,B01000001, + B10001000,B01000001, + B10000100,B00100001, + B10000000,B00000001, + B11111111,B11111111, + B11111111,B11111111 + }; + + #else + + const unsigned char status_chamber_bmp[] PROGMEM = { + B11111111,B11111111, + B10000000,B00000001, + B10000100,B00100001, + B10000010,B00010001, + B10000010,B00010001, + B10000100,B00100001, + B10001000,B01000001, + B10001000,B01000001, + B10000100,B00100001, + B10000000,B00000001, + B11111111,B11111111, + B11111111,B11111111 + }; + + #endif + +#endif // HAS_HEATED_CHAMBER + // Can also be overridden in Configuration.h // If you can afford it, try the 3-frame fan animation! // Don't compile in the fan animation with no fan @@ -1304,6 +1359,50 @@ #endif +// +// Chamber Bitmap Properties +// +#ifndef STATUS_CHAMBER_WIDTH + #define STATUS_CHAMBER_WIDTH 0 +#endif +#ifndef STATUS_CHAMBER_BYTEWIDTH + #define STATUS_CHAMBER_BYTEWIDTH BW(STATUS_CHAMBER_WIDTH) +#endif +#if STATUS_CHAMBER_WIDTH && !STATUS_HEATERS_WIDTH + + #ifndef STATUS_CHAMBER_X + #define STATUS_CHAMBER_X (128 - (STATUS_FAN_BYTEWIDTH + STATUS_CHAMBER_BYTEWIDTH) * 8) + #endif + + #ifndef STATUS_CHAMBER_HEIGHT + #ifdef STATUS_CHAMBER_ANIM + #define STATUS_CHAMBER_HEIGHT(S) ((S) ? sizeof(status_chamber_on_bmp) / (STATUS_CHAMBER_BYTEWIDTH) : sizeof(status_chamber_bmp) / (STATUS_CHAMBER_BYTEWIDTH)) + #else + #define STATUS_CHAMBER_HEIGHT(S) (sizeof(status_chamber_bmp) / (STATUS_CHAMBER_BYTEWIDTH)) + #endif + #endif + + #ifndef STATUS_CHAMBER_Y + #define STATUS_CHAMBER_Y(S) (20 - STATUS_CHAMBER_HEIGHT(S)) + #endif + + #ifndef STATUS_CHAMBER_TEXT_X + #define STATUS_CHAMBER_TEXT_X (STATUS_CHAMBER_X + 7) + #endif + + static_assert( + sizeof(status_chamber_bmp) == (STATUS_CHAMBER_BYTEWIDTH) * (STATUS_CHAMBER_HEIGHT(0)), + "Status chamber bitmap (status_chamber_bmp) dimensions don't match data." + ); + #ifdef STATUS_CHAMBER_ANIM + static_assert( + sizeof(status_chamber_on_bmp) == (STATUS_CHAMBER_BYTEWIDTH) * (STATUS_CHAMBER_HEIGHT(1)), + "Status chamber bitmap (status_chamber_on_bmp) dimensions don't match data." + ); + #endif + +#endif + // // Bed Bitmap Properties // @@ -1316,7 +1415,7 @@ #if STATUS_BED_WIDTH && !STATUS_HEATERS_WIDTH #ifndef STATUS_BED_X - #define STATUS_BED_X (128 - (STATUS_FAN_BYTEWIDTH + STATUS_BED_BYTEWIDTH) * 8) + #define STATUS_BED_X (128 - (STATUS_CHAMBER_BYTEWIDTH + STATUS_FAN_BYTEWIDTH + STATUS_BED_BYTEWIDTH) * 8) #endif #ifndef STATUS_BED_HEIGHT @@ -1384,4 +1483,4 @@ #endif #endif #endif -#endif +#endif \ No newline at end of file diff --git a/Marlin/src/lcd/language/language_en.h b/Marlin/src/lcd/language/language_en.h index 97f04028d978..2b5949d55037 100644 --- a/Marlin/src/lcd/language/language_en.h +++ b/Marlin/src/lcd/language/language_en.h @@ -49,6 +49,13 @@ #define CHARSIZE 1 #endif +#define MSG_INIT_PUMP _UxGT("Initialize Pump") + +#define MSG_FLUSH_PUMP _UxGT("Flush Pump") + +#define MSG_PUMP_MENU _UxGT("Pump") + + #ifndef WELCOME_MSG #define WELCOME_MSG MACHINE_NAME _UxGT(" Ready.") #endif @@ -100,6 +107,15 @@ #ifndef MSG_AUTO_HOME_Z #define MSG_AUTO_HOME_Z _UxGT("Home Z") #endif +#ifndef MSG_AUTO_HOME_I + #define MSG_AUTO_HOME_I _UxGT("Home I") +#endif +#ifndef MSG_AUTO_HOME_J + #define MSG_AUTO_HOME_J _UxGT("Home J") +#endif +#ifndef MSG_AUTO_HOME_K + #define MSG_AUTO_HOME_K _UxGT("Home K") +#endif #ifndef MSG_AUTO_Z_ALIGN #define MSG_AUTO_Z_ALIGN _UxGT("Auto Z-Align") #endif @@ -374,7 +390,7 @@ #define MSG_UBL_OUTPUT_MAP_CSV _UxGT("Output for CSV") #endif #ifndef MSG_UBL_OUTPUT_MAP_BACKUP - #define MSG_UBL_OUTPUT_MAP_BACKUP _UxGT("Off Printer Backup") + #define MSG_UBL_OUTPUT_MAP_BACKUP _UxGT("Off machine Backup") #endif #ifndef MSG_UBL_INFO_UBL #define MSG_UBL_INFO_UBL _UxGT("Output UBL Info") @@ -502,28 +518,40 @@ #define MSG_FREE_XY _UxGT("Free XY") #endif #ifndef MSG_MOVE_X - #define MSG_MOVE_X _UxGT("Move X") + #define MSG_MOVE_X _UxGT("Move X mm") #endif #ifndef MSG_MOVE_Y - #define MSG_MOVE_Y _UxGT("Move Y") + #define MSG_MOVE_Y _UxGT("Move Y mm") #endif #ifndef MSG_MOVE_Z - #define MSG_MOVE_Z _UxGT("Move Z") + #define MSG_MOVE_Z _UxGT("Move Z mm") +#endif + +#ifndef MSG_MOVE_I + #define MSG_MOVE_I _UxGT("Move I Ml") +#endif +#ifndef MSG_MOVE_J + #define MSG_MOVE_J _UxGT("Move J Ml") #endif +#ifndef MSG_MOVE_K + #define MSG_MOVE_K _UxGT("Move K Ml") +#endif + #ifndef MSG_MOVE_E #define MSG_MOVE_E _UxGT("Extruder") #endif + #ifndef MSG_HOTEND_TOO_COLD #define MSG_HOTEND_TOO_COLD _UxGT("Hotend too cold") #endif #ifndef MSG_MOVE_01MM - #define MSG_MOVE_01MM _UxGT("Move 0.1mm") + #define MSG_MOVE_01MM _UxGT("Move 0.1 unit") #endif #ifndef MSG_MOVE_1MM - #define MSG_MOVE_1MM _UxGT("Move 1mm") + #define MSG_MOVE_1MM _UxGT("Move 1 unit") #endif #ifndef MSG_MOVE_10MM - #define MSG_MOVE_10MM _UxGT("Move 10mm") + #define MSG_MOVE_10MM _UxGT("Move 10 units") #endif #ifndef MSG_SPEED #define MSG_SPEED _UxGT("Speed") @@ -608,6 +636,15 @@ #ifndef MSG_VC_JERK #define MSG_VC_JERK _UxGT("Vz-jerk") #endif + #ifndef MSG_VI_JERK + #define MSG_VI_JERK _UxGT("Vi-jerk") + #endif + #ifndef MSG_VJ_JERK + #define MSG_VJ_JERK _UxGT("Vj-jerk") + #endif + #ifndef MSG_VK_JERK + #define MSG_VK_JERK _UxGT("Vk-jerk") + #endif #endif #ifndef MSG_VE_JERK #define MSG_VE_JERK _UxGT("Ve-jerk") @@ -640,7 +677,7 @@ #define MSG_A_TRAVEL _UxGT("A-travel") #endif #ifndef MSG_STEPS_PER_MM - #define MSG_STEPS_PER_MM _UxGT("Steps/mm") + #define MSG_STEPS_PER_MM _UxGT("Steps/units") #endif #if IS_KINEMATIC #ifndef MSG_ASTEPS @@ -662,6 +699,15 @@ #ifndef MSG_CSTEPS #define MSG_CSTEPS _UxGT("Zsteps/mm") #endif + #ifndef MSG_ISTEPS + #define MSG_ISTEPS _UxGT("Isteps/mm") + #endif + #ifndef MSG_JSTEPS + #define MSG_JSTEPS _UxGT("Jsteps/mm") + #endif + #ifndef MSG_KSTEPS + #define MSG_KSTEPS _UxGT("Ksteps/mm") + #endif #endif #ifndef MSG_ESTEPS #define MSG_ESTEPS _UxGT("Esteps/mm") @@ -742,19 +788,19 @@ #define MSG_TUNE _UxGT("Tune") #endif #ifndef MSG_PAUSE_PRINT - #define MSG_PAUSE_PRINT _UxGT("Pause print") + #define MSG_PAUSE_PRINT _UxGT("Pause Process") #endif #ifndef MSG_RESUME_PRINT - #define MSG_RESUME_PRINT _UxGT("Resume print") + #define MSG_RESUME_PRINT _UxGT("Resume Process") #endif #ifndef MSG_STOP_PRINT - #define MSG_STOP_PRINT _UxGT("Stop print") + #define MSG_STOP_PRINT _UxGT("Stop Process") #endif #ifndef MSG_OUTAGE_RECOVERY #define MSG_OUTAGE_RECOVERY _UxGT("Outage Recovery") #endif #ifndef MSG_CARD_MENU - #define MSG_CARD_MENU _UxGT("Print from SD") + #define MSG_CARD_MENU _UxGT("Select Program") #endif #ifndef MSG_NO_CARD #define MSG_NO_CARD _UxGT("No SD card") @@ -766,13 +812,13 @@ #define MSG_USERWAIT _UxGT("Click to resume...") #endif #ifndef MSG_PRINT_PAUSED - #define MSG_PRINT_PAUSED _UxGT("Print paused") + #define MSG_PRINT_PAUSED _UxGT("Process paused") #endif #ifndef MSG_PRINTING - #define MSG_PRINTING _UxGT("Printing...") + #define MSG_PRINTING _UxGT("Running...") #endif #ifndef MSG_PRINT_ABORTED - #define MSG_PRINT_ABORTED _UxGT("Print aborted") + #define MSG_PRINT_ABORTED _UxGT("Process aborted") #endif #ifndef MSG_NO_MOVE #define MSG_NO_MOVE _UxGT("No move.") @@ -925,7 +971,7 @@ #define MSG_ERR_Z_HOMING MSG_HOME _UxGT(" ") MSG_X MSG_Y _UxGT(" ") MSG_FIRST #endif #ifndef MSG_HALTED - #define MSG_HALTED _UxGT("PRINTER HALTED") + #define MSG_HALTED _UxGT("MACHINE HALTED") #endif #ifndef MSG_PLEASE_RESET #define MSG_PLEASE_RESET _UxGT("Please reset") @@ -988,10 +1034,10 @@ #define MSG_DELTA_RADIUS _UxGT("Radius") #endif #ifndef MSG_INFO_MENU - #define MSG_INFO_MENU _UxGT("About Printer") + #define MSG_INFO_MENU _UxGT("About Machine") #endif #ifndef MSG_INFO_PRINTER_MENU - #define MSG_INFO_PRINTER_MENU _UxGT("Printer Info") + #define MSG_INFO_PRINTER_MENU _UxGT("Machine Info") #endif #ifndef MSG_3POINT_LEVELING #define MSG_3POINT_LEVELING _UxGT("3-Point Leveling") @@ -1009,7 +1055,7 @@ #define MSG_MESH_LEVELING _UxGT("Mesh Leveling") #endif #ifndef MSG_INFO_STATS_MENU - #define MSG_INFO_STATS_MENU _UxGT("Printer Stats") + #define MSG_INFO_STATS_MENU _UxGT("Machine Stats") #endif #ifndef MSG_INFO_BOARD_MENU #define MSG_INFO_BOARD_MENU _UxGT("Board Info") @@ -1034,13 +1080,13 @@ #endif #if LCD_WIDTH >= 20 #ifndef MSG_INFO_PRINT_COUNT - #define MSG_INFO_PRINT_COUNT _UxGT("Print Count") + #define MSG_INFO_PRINT_COUNT _UxGT("Job Count") #endif #ifndef MSG_INFO_COMPLETED_PRINTS #define MSG_INFO_COMPLETED_PRINTS _UxGT("Completed") #endif #ifndef MSG_INFO_PRINT_TIME - #define MSG_INFO_PRINT_TIME _UxGT("Total print time") + #define MSG_INFO_PRINT_TIME _UxGT("Total job time") #endif #ifndef MSG_INFO_PRINT_LONGEST #define MSG_INFO_PRINT_LONGEST _UxGT("Longest job time") @@ -1050,7 +1096,7 @@ #endif #else #ifndef MSG_INFO_PRINT_COUNT - #define MSG_INFO_PRINT_COUNT _UxGT("Prints") + #define MSG_INFO_PRINT_COUNT _UxGT("Jobs") #endif #ifndef MSG_INFO_COMPLETED_PRINTS #define MSG_INFO_COMPLETED_PRINTS _UxGT("Completed") @@ -1084,7 +1130,7 @@ #define MSG_DAC_EEPROM_WRITE _UxGT("DAC EEPROM Write") #endif #ifndef MSG_FILAMENT_CHANGE_HEADER_PAUSE - #define MSG_FILAMENT_CHANGE_HEADER_PAUSE _UxGT("PRINT PAUSED") + #define MSG_FILAMENT_CHANGE_HEADER_PAUSE _UxGT("PROCESS PAUSED") #endif #ifndef MSG_FILAMENT_CHANGE_HEADER_LOAD #define MSG_FILAMENT_CHANGE_HEADER_LOAD _UxGT("LOAD FILAMENT") @@ -1267,7 +1313,7 @@ #if LCD_HEIGHT >= 4 #ifndef MSG_ADVANCED_PAUSE_WAITING_1 #define MSG_ADVANCED_PAUSE_WAITING_1 _UxGT("Press button") - #define MSG_ADVANCED_PAUSE_WAITING_2 _UxGT("to resume print") + #define MSG_ADVANCED_PAUSE_WAITING_2 _UxGT("to resume job") #endif #ifndef MSG_FILAMENT_CHANGE_INIT_1 #define MSG_FILAMENT_CHANGE_INIT_1 _UxGT("Wait for") diff --git a/Marlin/src/lcd/menu/menu_advanced.cpp b/Marlin/src/lcd/menu/menu_advanced.cpp index 5d0a86aafb62..64960cf09cee 100644 --- a/Marlin/src/lcd/menu/menu_advanced.cpp +++ b/Marlin/src/lcd/menu/menu_advanced.cpp @@ -458,6 +458,16 @@ DEFINE_PIDTEMP_FUNCS(0); EDIT_VMAX(B); EDIT_VMAX(C); + #if NON_E_AXES > 3 + EDIT_VMAX(I); + #if NON_E_AXES > 4 + EDIT_VMAX(J); + #if NON_E_AXES > 5 + EDIT_VMAX(K); + #endif + #endif + #endif + #if ENABLED(DISTINCT_E_FACTORS) #define EDIT_VMAX_E(N) MENU_MULTIPLIER_ITEM_EDIT(float3, MSG_VMAX MSG_E##N, &planner.settings.max_feedrate_mm_s[E_AXIS_N(N-1)], 1, 999) MENU_MULTIPLIER_ITEM_EDIT(float3, MSG_VMAX MSG_E, &planner.settings.max_feedrate_mm_s[E_AXIS_N(active_extruder)], 1, 999); @@ -508,6 +518,18 @@ DEFINE_PIDTEMP_FUNCS(0); EDIT_AMAX(B,100); EDIT_AMAX(C, 10); + #if NON_E_AXES > 3 + EDIT_AMAX(I, 10); + #if NON_E_AXES > 4 + EDIT_AMAX(J, 10); + #if NON_E_AXES > 5 + EDIT_AMAX(K, 10); + #endif + #endif + #endif + + + #if ENABLED(DISTINCT_E_FACTORS) #define EDIT_AMAX_E(N,E) MENU_MULTIPLIER_ITEM_EDIT_CALLBACK(long5, MSG_AMAX MSG_E##N, &planner.settings.max_acceleration_mm_per_s2[E_AXIS_N(E)], 100, 99000, _reset_e##E##_acceleration_rate) MENU_MULTIPLIER_ITEM_EDIT_CALLBACK(long5, MSG_AMAX MSG_E, &planner.settings.max_acceleration_mm_per_s2[E_AXIS_N(active_extruder)], 100, 99000, _reset_acceleration_rates); @@ -553,6 +575,17 @@ DEFINE_PIDTEMP_FUNCS(0); #else MENU_MULTIPLIER_ITEM_EDIT(float52sign, MSG_VC_JERK, &planner.max_jerk[C_AXIS], 0.1f, 990); #endif + + #if NON_E_AXES > 3 + EDIT_JERK(I); + #if NON_E_AXES > 4 + EDIT_JERK(J); + #if NON_E_AXES > 5 + EDIT_JERK(K); + #endif + #endif + #endif + #if DISABLED(JUNCTION_DEVIATION) || DISABLED(LIN_ADVANCE) EDIT_JERK(E); #endif @@ -571,6 +604,16 @@ DEFINE_PIDTEMP_FUNCS(0); EDIT_QSTEPS(B); EDIT_QSTEPS(C); + #if NON_E_AXES > 3 + EDIT_QSTEPS(I); + #if NON_E_AXES > 4 + EDIT_QSTEPS(J); + #if NON_E_AXES > 5 + EDIT_QSTEPS(K); + #endif + #endif + #endif + #if ENABLED(DISTINCT_E_FACTORS) #define EDIT_ESTEPS(N,E) MENU_MULTIPLIER_ITEM_EDIT_CALLBACK(float62, MSG_E##N##STEPS, &planner.settings.axis_steps_per_mm[E_AXIS_N(E)], 5, 9999, _planner_refresh_e##E##_positioning) MENU_MULTIPLIER_ITEM_EDIT_CALLBACK(float62, MSG_ESTEPS, &planner.settings.axis_steps_per_mm[E_AXIS_N(active_extruder)], 5, 9999, _planner_refresh_positioning); diff --git a/Marlin/src/lcd/menu/menu_motion.cpp b/Marlin/src/lcd/menu/menu_motion.cpp index 58edf0dd33b9..0fb3219689b7 100644 --- a/Marlin/src/lcd/menu/menu_motion.cpp +++ b/Marlin/src/lcd/menu/menu_motion.cpp @@ -152,6 +152,17 @@ static void _lcd_move_xyz(PGM_P name, AxisEnum axis) { void lcd_move_x() { _lcd_move_xyz(PSTR(MSG_MOVE_X), X_AXIS); } void lcd_move_y() { _lcd_move_xyz(PSTR(MSG_MOVE_Y), Y_AXIS); } void lcd_move_z() { _lcd_move_xyz(PSTR(MSG_MOVE_Z), Z_AXIS); } + +#if NON_E_AXES > 3 + void lcd_move_i() { _lcd_move_xyz(PSTR(MSG_MOVE_I), I_AXIS); } + #if NON_E_AXES > 4 + void lcd_move_j() { _lcd_move_xyz(PSTR(MSG_MOVE_J), J_AXIS); } + #if NON_E_AXES > 5 + void lcd_move_k() { _lcd_move_xyz(PSTR(MSG_MOVE_K), K_AXIS); } + #endif + #endif + #endif + static void _lcd_move_e( #if E_MANUAL > 1 const int8_t eindex=-1 @@ -275,6 +286,17 @@ void _menu_move_distance(const AxisEnum axis, const screenFunc_t func, const int void lcd_move_get_x_amount() { _menu_move_distance(X_AXIS, lcd_move_x); } void lcd_move_get_y_amount() { _menu_move_distance(Y_AXIS, lcd_move_y); } void lcd_move_get_z_amount() { _menu_move_distance(Z_AXIS, lcd_move_z); } + +#if NON_E_AXES > 3 + void lcd_move_get_i_amount() { _menu_move_distance(I_AXIS, lcd_move_i); } + #if NON_E_AXES > 4 + void lcd_move_get_j_amount() { _menu_move_distance(J_AXIS, lcd_move_j); } + #if NON_E_AXES > 5 + void lcd_move_get_k_amount() { _menu_move_distance(K_AXIS, lcd_move_k); } + #endif + #endif + #endif + void lcd_move_get_e_amount() { _menu_move_distance(E_AXIS, lcd_move_e, -1); } #if E_MANUAL > 1 void lcd_move_get_e0_amount() { _menu_move_distance(E_AXIS, lcd_move_e0, 0); } @@ -331,6 +353,20 @@ void menu_move() { #endif MENU_ITEM(submenu, MSG_MOVE_Z, lcd_move_get_z_amount); + + #if NON_E_AXES > 3 + MENU_ITEM(submenu, MSG_MOVE_I, lcd_move_get_i_amount); + + #if NON_E_AXES > 4 + MENU_ITEM(submenu, MSG_MOVE_J, lcd_move_get_j_amount); + + #if NON_E_AXES > 5 + MENU_ITEM(submenu, MSG_MOVE_K, lcd_move_get_k_amount); + + #endif + #endif + #endif + } else MENU_ITEM(gcode, MSG_AUTO_HOME, PSTR("G28")); @@ -440,7 +476,16 @@ void menu_motion() { MENU_ITEM(gcode, MSG_AUTO_HOME_X, PSTR("G28 X")); MENU_ITEM(gcode, MSG_AUTO_HOME_Y, PSTR("G28 Y")); MENU_ITEM(gcode, MSG_AUTO_HOME_Z, PSTR("G28 Z")); - #endif + #if NON_E_AXES > 3 + MENU_ITEM(gcode, MSG_AUTO_HOME_I, PSTR("G28 I")); + #if NON_E_AXES > 4 + MENU_ITEM(gcode, MSG_AUTO_HOME_J, PSTR("G28 J")); + #if NON_E_AXES > 5 + MENU_ITEM(gcode, MSG_AUTO_HOME_K, PSTR("G28 K")); + #endif + #endif + #endif + #endif // // Auto Z-Align diff --git a/Marlin/src/lcd/ultralcd.h b/Marlin/src/lcd/ultralcd.h index b50272ae9e2c..34fa2743cd40 100644 --- a/Marlin/src/lcd/ultralcd.h +++ b/Marlin/src/lcd/ultralcd.h @@ -74,7 +74,7 @@ typedef void (*menuAction_t)(); // Manual Movement - constexpr float manual_feedrate_mm_m[XYZE] = MANUAL_FEEDRATE; + constexpr float manual_feedrate_mm_m[NUM_AXIS] = MANUAL_FEEDRATE; extern float move_menu_scale; #if ENABLED(ADVANCED_PAUSE_FEATURE) diff --git a/Marlin/src/module/configuration_store.cpp b/Marlin/src/module/configuration_store.cpp index 9270b3a747ca..f2b6f1ad03b6 100644 --- a/Marlin/src/module/configuration_store.cpp +++ b/Marlin/src/module/configuration_store.cpp @@ -42,7 +42,7 @@ // Check the integrity of data offsets. // Can be disabled for production build. -//#define DEBUG_EEPROM_READWRITE +#define DEBUG_EEPROM_READWRITE #include "configuration_store.h" @@ -138,10 +138,10 @@ typedef struct SettingsDataStruct { planner_settings_t planner_settings; - float planner_max_jerk[XYZE], // M205 XYZE planner.max_jerk[XYZE] + float planner_max_jerk[NUM_AXIS], // M205 XYZE planner.max_jerk[XYZE] planner_junction_deviation_mm; // M205 J planner.junction_deviation_mm - float home_offset[XYZ]; // M206 XYZ / M665 TPZ + float home_offset[NON_E_AXES]; // M206 XYZ / M665 TPZ #if HAS_HOTEND_OFFSET float hotend_offset[XYZ][HOTENDS - 1]; // M218 XYZ @@ -333,7 +333,7 @@ void MarlinSettings::postprocess() { #endif // Software endstops depend on home_offset - LOOP_XYZ(i) { + LOOP_NON_E(i) { update_workspace_offset((AxisEnum)i); update_software_endstops((AxisEnum)i); } @@ -478,7 +478,7 @@ void MarlinSettings::postprocess() { _FIELD_TEST(esteppers); - const uint8_t esteppers = COUNT(planner.settings.axis_steps_per_mm) - XYZ; + const uint8_t esteppers = COUNT(planner.settings.axis_steps_per_mm) - NON_E_AXES; EEPROM_WRITE(esteppers); // @@ -1190,15 +1190,15 @@ void MarlinSettings::postprocess() { const uint32_t def1[] = DEFAULT_MAX_ACCELERATION; const float def2[] = DEFAULT_AXIS_STEPS_PER_UNIT, def3[] = DEFAULT_MAX_FEEDRATE; - uint32_t tmp1[XYZ + esteppers]; + uint32_t tmp1[NON_E_AXES + esteppers]; EEPROM_READ(tmp1); // max_acceleration_mm_per_s2 EEPROM_READ(planner.settings.min_segment_time_us); - float tmp2[XYZ + esteppers], tmp3[XYZ + esteppers]; + float tmp2[NON_E_AXES + esteppers], tmp3[NON_E_AXES + esteppers]; EEPROM_READ(tmp2); // axis_steps_per_mm EEPROM_READ(tmp3); // max_feedrate_mm_s - if (!validating) LOOP_XYZE_N(i) { - const bool in = (i < esteppers + XYZ); + if (!validating) LOOP_NUM_AXIS_N(i) { + const bool in = (i < esteppers + NON_E_AXES); planner.settings.max_acceleration_mm_per_s2[i] = in ? tmp1[i] : def1[ALIM(i, def1)]; planner.settings.axis_steps_per_mm[i] = in ? tmp2[i] : def2[ALIM(i, def2)]; planner.settings.max_feedrate_mm_s[i] = in ? tmp3[i] : def3[ALIM(i, def3)]; @@ -2022,7 +2022,7 @@ void MarlinSettings::postprocess() { void MarlinSettings::reset(PORTARG_SOLO) { static const float tmp1[] PROGMEM = DEFAULT_AXIS_STEPS_PER_UNIT, tmp2[] PROGMEM = DEFAULT_MAX_FEEDRATE; static const uint32_t tmp3[] PROGMEM = DEFAULT_MAX_ACCELERATION; - LOOP_XYZE_N(i) { + LOOP_NUM_AXIS_N(i) { planner.settings.axis_steps_per_mm[i] = pgm_read_float(&tmp1[ALIM(i, tmp1)]); planner.settings.max_feedrate_mm_s[i] = pgm_read_float(&tmp2[ALIM(i, tmp2)]); planner.settings.max_acceleration_mm_per_s2[i] = pgm_read_dword(&tmp3[ALIM(i, tmp3)]); @@ -2048,7 +2048,10 @@ void MarlinSettings::reset(PORTARG_SOLO) { planner.max_jerk[X_AXIS] = DEFAULT_XJERK; planner.max_jerk[Y_AXIS] = DEFAULT_YJERK; planner.max_jerk[Z_AXIS] = DEFAULT_ZJERK; + #if DISABLED(JUNCTION_DEVIATION) || DISABLED(LIN_ADVANCE) + planner.max_jerk[I_AXIS] = DEFAULT_IJERK; + planner.max_jerk[J_AXIS] = DEFAULT_JJERK; planner.max_jerk[E_AXIS] = DEFAULT_EJERK; #endif #endif @@ -2490,6 +2493,8 @@ void MarlinSettings::reset(PORTARG_SOLO) { SERIAL_ECHOPAIR_P(port, " M203 X", LINEAR_UNIT(planner.settings.max_feedrate_mm_s[X_AXIS])); SERIAL_ECHOPAIR_P(port, " Y", LINEAR_UNIT(planner.settings.max_feedrate_mm_s[Y_AXIS])); SERIAL_ECHOPAIR_P(port, " Z", LINEAR_UNIT(planner.settings.max_feedrate_mm_s[Z_AXIS])); + SERIAL_ECHOPAIR_P(port, " I", LINEAR_UNIT(planner.settings.max_feedrate_mm_s[I_AXIS])); + SERIAL_ECHOPAIR_P(port, " J", LINEAR_UNIT(planner.settings.max_feedrate_mm_s[J_AXIS])); #if DISABLED(DISTINCT_E_FACTORS) SERIAL_ECHOPAIR_P(port, " E", VOLUMETRIC_UNIT(planner.settings.max_feedrate_mm_s[E_AXIS])); #endif @@ -2507,6 +2512,8 @@ void MarlinSettings::reset(PORTARG_SOLO) { SERIAL_ECHOPAIR_P(port, " M201 X", LINEAR_UNIT(planner.settings.max_acceleration_mm_per_s2[X_AXIS])); SERIAL_ECHOPAIR_P(port, " Y", LINEAR_UNIT(planner.settings.max_acceleration_mm_per_s2[Y_AXIS])); SERIAL_ECHOPAIR_P(port, " Z", LINEAR_UNIT(planner.settings.max_acceleration_mm_per_s2[Z_AXIS])); + SERIAL_ECHOPAIR_P(port, " I", LINEAR_UNIT(planner.settings.max_acceleration_mm_per_s2[I_AXIS])); + SERIAL_ECHOPAIR_P(port, " J", LINEAR_UNIT(planner.settings.max_acceleration_mm_per_s2[J_AXIS])); #if DISABLED(DISTINCT_E_FACTORS) SERIAL_ECHOPAIR_P(port, " E", VOLUMETRIC_UNIT(planner.settings.max_acceleration_mm_per_s2[E_AXIS])); #endif @@ -2551,6 +2558,8 @@ void MarlinSettings::reset(PORTARG_SOLO) { SERIAL_ECHOPAIR_P(port, " X", LINEAR_UNIT(planner.max_jerk[X_AXIS])); SERIAL_ECHOPAIR_P(port, " Y", LINEAR_UNIT(planner.max_jerk[Y_AXIS])); SERIAL_ECHOPAIR_P(port, " Z", LINEAR_UNIT(planner.max_jerk[Z_AXIS])); + SERIAL_ECHOPAIR_P(port, " I", LINEAR_UNIT(planner.max_jerk[I_AXIS])); + SERIAL_ECHOPAIR_P(port, " J", LINEAR_UNIT(planner.max_jerk[J_AXIS])); #if DISABLED(JUNCTION_DEVIATION) || DISABLED(LIN_ADVANCE) SERIAL_ECHOPAIR_P(port, " E", LINEAR_UNIT(planner.max_jerk[E_AXIS])); #endif diff --git a/Marlin/src/module/endstops.cpp b/Marlin/src/module/endstops.cpp index addc6699afc1..0d995469eba3 100644 --- a/Marlin/src/module/endstops.cpp +++ b/Marlin/src/module/endstops.cpp @@ -32,6 +32,7 @@ #include "temperature.h" #include "../lcd/ultralcd.h" + #if ENABLED(ENDSTOP_INTERRUPTS_FEATURE) #include HAL_PATH(../HAL, endstop_interrupts.h) #endif @@ -45,7 +46,7 @@ Endstops endstops; // private: bool Endstops::enabled, Endstops::enabled_globally; // Initialized by settings.load() -volatile uint8_t Endstops::hit_state; +volatile Endstops::hitstate_t Endstops::hit_state; Endstops::esbits_t Endstops::live_state = 0; @@ -238,6 +239,66 @@ void Endstops::init() { #endif #endif + #if HAS_I_MIN + #if ENABLED(ENDSTOPPULLUP_IMIN) + SET_INPUT_PULLUP(I_MIN_PIN); + #elif ENABLED(ENDSTOPPULLDOWN_IMIN) + SET_INPUT_PULLDOWN(I_MIN_PIN); + #else + SET_INPUT(I_MIN_PIN); + #endif + #endif + + #if HAS_I_MAX + #if ENABLED(ENDSTOPPULLUP_IMAX) + SET_INPUT_PULLUP(I_MAX_PIN); + #elif ENABLED(ENDSTOPPULLDOWN_IMAX) + SET_INPUT_PULLDOWN(I_MAX_PIN); + #else + SET_INPUT(I_MAX_PIN); + #endif + #endif + + #if HAS_J_MIN + #if ENABLED(ENDSTOPPULLUP_JMIN) + SET_INPUT_PULLUP(J_MIN_PIN); + #elif ENABLED(ENDSTOPPULLDOWN_IMIN) + SET_INPUT_PULLDOWN(J_MIN_PIN); + #else + SET_INPUT(J_MIN_PIN); + #endif + #endif + + #if HAS_J_MAX + #if ENABLED(ENDSTOPPULLUP_JMAX) + SET_INPUT_PULLUP(J_MAX_PIN); + #elif ENABLED(ENDSTOPPULLDOWN_JMAX) + SET_INPUT_PULLDOWN(J_MAX_PIN); + #else + SET_INPUT(J_MAX_PIN); + #endif + #endif + + #if HAS_K_MIN + #if ENABLED(ENDSTOPPULLUP_KMIN) + SET_INPUT_PULLUP(K_MIN_PIN); + #elif ENABLED(ENDSTOPPULLDOWN_KMIN) + SET_INPUT_PULLDOWN(K_MIN_PIN); + #else + SET_INPUT(K_MIN_PIN); + #endif + #endif + + #if HAS_K_MAX + #if ENABLED(ENDSTOPPULLUP_KMAX) + SET_INPUT_PULLUP(K_MAX_PIN); + #elif ENABLED(ENDSTOPPULLDOWN_KMIN) + SET_INPUT_PULLDOWN(K_MAX_PIN); + #else + SET_INPUT(K_MAX_PIN); + #endif + #endif + #if ENABLED(ENDSTOP_INTERRUPTS_FEATURE) setup_endstop_interrupts(); #endif @@ -324,10 +385,20 @@ void Endstops::resync() { #endif void Endstops::event_handler() { - static uint8_t prev_hit_state; // = 0 + static hitstate_t prev_hit_state; // = 0 if (hit_state && hit_state != prev_hit_state) { #if ENABLED(ULTRA_LCD) - char chrX = ' ', chrY = ' ', chrZ = ' ', chrP = ' '; + char chrX = ' ', chrY = ' ', chrZ = ' ', chrP = ' ' + #if NON_E_AXES > 3 + , chrI = ' ' + #if NON_E_AXES > 4 + , chrJ = ' ' + #if NON_E_AXES > 5 + , chrK = ' ' + #endif + #endif + #endif + ; #define _SET_STOP_CHAR(A,C) (chr## A = C) #else #define _SET_STOP_CHAR(A,C) ; @@ -344,13 +415,31 @@ void Endstops::event_handler() { #define ENDSTOP_HIT_TEST_X() _ENDSTOP_HIT_TEST(X,'X') #define ENDSTOP_HIT_TEST_Y() _ENDSTOP_HIT_TEST(Y,'Y') #define ENDSTOP_HIT_TEST_Z() _ENDSTOP_HIT_TEST(Z,'Z') - + #if NON_E_AXES > 3 + #define ENDSTOP_HIT_TEST_I() _ENDSTOP_HIT_TEST(I,'I') + #if NON_E_AXES > 4 + #define ENDSTOP_HIT_TEST_J() _ENDSTOP_HIT_TEST(J,'J') + #if NON_E_AXES > 5 + #define ENDSTOP_HIT_TEST_K() _ENDSTOP_HIT_TEST(K,'K') + #endif + #endif + #endif + SERIAL_ECHO_START(); SERIAL_ECHOPGM(MSG_ENDSTOPS_HIT); ENDSTOP_HIT_TEST_X(); ENDSTOP_HIT_TEST_Y(); ENDSTOP_HIT_TEST_Z(); - + #if NON_E_AXES > 3 + ENDSTOP_HIT_TEST_I(); + #if NON_E_AXES > 4 + ENDSTOP_HIT_TEST_J(); + #if NON_E_AXES > 5 + ENDSTOP_HIT_TEST_K(); + #endif + #endif + #endif + #if ENABLED(Z_MIN_PROBE_ENDSTOP) #define P_AXIS Z_AXIS if (TEST(hit_state, Z_MIN_PROBE)) _ENDSTOP_HIT_ECHO(P, 'P'); @@ -358,8 +447,35 @@ void Endstops::event_handler() { SERIAL_EOL(); #if ENABLED(ULTRA_LCD) - ui.status_printf_P(0, PSTR(MSG_LCD_ENDSTOPS " %c %c %c %c"), chrX, chrY, chrZ, chrP); + + ui.status_printf_P(0, PSTR(MSG_LCD_ENDSTOPS " %c %c %c %c %c %c"), chrX, chrY, chrZ, chrI, chrJ, chrP); + /* + ui.status_printf_P(0, PSTR(MSG_LCD_ENDSTOPS " %c %c %c %c +#if NON_E_AXES > 3 + %c +#if NON_E_AXES > 4 + %c +#if NON_E_AXES > 5 + %c +#endif +#endif +#endif +"), chrX, chrY, chrZ + #if NON_E_AXES > 3 + , chrI + #if NON_E_AXES > 4 + , chrJ + #if NON_E_AXES > 5 + , chrK + #endif + #endif + #endif + , chrP); #endif +*/ + + #endif + #if ENABLED(ABORT_ON_ENDSTOP_HIT_FEATURE_ENABLED) && ENABLED(SDSUPPORT) if (planner.abort_on_endstop_hit) { @@ -425,6 +541,25 @@ void _O2 Endstops::M119() { #if HAS_Z3_MAX ES_REPORT(Z3_MAX); #endif + #if HAS_I_MIN + ES_REPORT(I_MIN); + #endif + #if HAS_I_MAX + ES_REPORT(I_MAX); + #endif + #if HAS_J_MIN + ES_REPORT(J_MIN); + #endif + #if HAS_J_MAX + ES_REPORT(J_MAX); + #endif + #if HAS_K_MIN + ES_REPORT(K_MIN); + #endif + #if HAS_K_MAX + ES_REPORT(K_MAX); + #endif + #if ENABLED(Z_MIN_PROBE_ENDSTOP) print_es_state(READ(Z_MIN_PROBE_PIN) != Z_MIN_PROBE_ENDSTOP_INVERTING, PSTR(MSG_Z_PROBE)); #endif @@ -508,6 +643,15 @@ void Endstops::update() { #define Z_AXIS_HEAD Z_AXIS #endif +#if NON_E_AXES > 3 + #define I_AXIS_HEAD I_AXIS + #if NON_E_AXES > 4 + #define J_AXIS_HEAD J_AXIS + #if NON_E_AXES > 5 + #define K_AXIS_HEAD K_AXIS + #endif + #endif +#endif /** * Check and update endstops */ @@ -612,6 +756,84 @@ void Endstops::update() { #endif #endif + #if HAS_I_MIN + #if ENABLED(I_DUAL_ENDSTOPS) + UPDATE_ENDSTOP_BIT(I, MIN); + #if HAS_I2_MIN + UPDATE_ENDSTOP_BIT(I2, MAX); + #else + COPY_LIVE_STATE(I_MIN, I2_MIN); + #endif + #else + UPDATE_ENDSTOP_BIT(I, MIN); + #endif + #endif + + #if HAS_I_MAX + #if ENABLED(I_DUAL_ENDSTOPS) + UPDATE_ENDSTOP_BIT(I, MAX); + #if HAS_I2_MAX + UPDATE_ENDSTOP_BIT(I2, MAX); + #else + COPY_LIVE_STATE(I_MAX, I2_MAX); + #endif + #else + UPDATE_ENDSTOP_BIT(I, MAX); + #endif + #endif + + #if HAS_J_MIN + #if ENABLED(J_DUAL_ENDSTOPS) + UPDATE_ENDSTOP_BIT(J, MIN); + #if HAS_J2_MIN + UPDATE_ENDSTOP_BIT(J2, MIN); + #else + COPY_LIVE_STATE(J_MIN, J2_MIN); + #endif + #else + UPDATE_ENDSTOP_BIT(J, MIN); + #endif + #endif + + #if HAS_J_MAX + #if ENABLED(J_DUAL_ENDSTOPS) + UPDATE_ENDSTOP_BIT(J, MAX); + #if HAS_J2_MAX + UPDATE_ENDSTOP_BIT(J2, MAX); + #else + COPY_LIVE_STATE(J_MAX, J2_MAX); + #endif + #else + UPDATE_ENDSTOP_BIT(J, MAX); + #endif + #endif + + #if HAS_K_MIN + #if ENABLED(K_DUAL_ENDSTOPS) + UPDATE_ENDSTOP_BIT(K, MIN); + #if HAS_K2_MIN + UPDATE_ENDSTOP_BIT(K2, MIN); + #else + COPY_LIVE_STATE(K_MIN, K2_MIN); + #endif + #else + UPDATE_ENDSTOP_BIT(K, MIN); + #endif + #endif + + #if HAS_K_MAX + #if ENABLED(K_DUAL_ENDSTOPS) + UPDATE_ENDSTOP_BIT(K, MAX); + #if HAS_K2_MAX + UPDATE_ENDSTOP_BIT(K2, MAX); + #else + COPY_LIVE_STATE(K_MAX, K2_MAX); + #endif + #else + UPDATE_ENDSTOP_BIT(K, MAX); + #endif + #endif + #if ENDSTOP_NOISE_THRESHOLD /** @@ -763,6 +985,51 @@ void Endstops::update() { #endif } } + + #if NON_E_AXES > 3 + if (stepper.axis_is_moving(I_AXIS)) { + if (stepper.motor_direction(I_AXIS_HEAD)) { // -direction + #if HAS_I_MIN + PROCESS_ENDSTOP(I, MIN); + #endif + } + else { // +direction + #if HAS_I_MAX + PROCESS_ENDSTOP(I, MAX); + #endif + } + } + + #if NON_E_AXES > 4 + if (stepper.axis_is_moving(J_AXIS)) { + if (stepper.motor_direction(J_AXIS_HEAD)) { // -direction + #if HAS_J_MIN + PROCESS_ENDSTOP(J, MIN); + #endif + } + else { // +direction + #if HAS_J_MAX + PROCESS_ENDSTOP(J, MAX); + #endif + } + } + + #if NON_E_AXES > 5 + if (stepper.axis_is_moving(K_AXIS)) { + if (stepper.motor_direction(K_AXIS_HEAD)) { // -direction + #if HAS_K_MIN + PROCESS_ENDSTOP(K, MIN); + #endif + } + else { // +direction + #if HAS_K_MAX + PROCESS_ENDSTOP(K, MAX); + #endif + } + } + #endif // NON_E_AXES > 5 + #endif // NON_E_AXES > 4 + #endif // NON_E_AXES > 3 } // Endstops::update() #if ENABLED(PINS_DEBUGGING) @@ -832,6 +1099,24 @@ void Endstops::update() { #if HAS_Z3_MAX ES_GET_STATE(Z3_MAX); #endif + #if HAS_I_MAX + ES_GET_STATE(I_MAX); + #endif + #if HAS_I_MIN + ES_GET_STATE(I_MIN); + #endif + #if HAS_J_MAX + ES_GET_STATE(J_MAX); + #endif + #if HAS_J_MIN + ES_GET_STATE(J_MIN); + #endif + #if HAS_K_MAX + ES_GET_STATE(K_MAX); + #endif + #if HAS_K_MIN + ES_GET_STATE(K_MIN); + #endif uint16_t endstop_change = live_state_local ^ old_live_state_local; #define ES_REPORT_CHANGE(S) if (TEST(endstop_change, S)) SERIAL_ECHOPAIR(" " STRINGIFY(S) ":", TEST(live_state_local, S)) @@ -882,6 +1167,25 @@ void Endstops::update() { #if HAS_Z3_MAX ES_REPORT_CHANGE(Z3_MAX); #endif + #if HAS_I_MIN + ES_REPORT_CHANGE(I_MIN); + #endif + #if HAS_I_MAX + ES_REPORT_CHANGE(I_MAX); + #endif + #if HAS_J_MIN + ES_REPORT_CHANGE(J_MIN); + #endif + #if HAS_J_MAX + ES_REPORT_CHANGE(J_MAX); + #endif + #if HAS_K_MIN + ES_REPORT_CHANGE(K_MIN); + #endif + #if HAS_K_MAX + ES_REPORT_CHANGE(K_MAX); + #endif + SERIAL_ECHOLNPGM("\n"); analogWrite(LED_PIN, local_LED_status); local_LED_status ^= 255; diff --git a/Marlin/src/module/endstops.h b/Marlin/src/module/endstops.h index 79be7df2994a..c280dd57c57d 100644 --- a/Marlin/src/module/endstops.h +++ b/Marlin/src/module/endstops.h @@ -33,9 +33,9 @@ enum EndstopEnum : char { Y_MIN, Z_MIN, Z_MIN_PROBE, - X_MAX, - Y_MAX, - Z_MAX, + K_MIN, + J_MIN, + I_MIN, X2_MIN, X2_MAX, Y2_MIN, @@ -43,14 +43,20 @@ enum EndstopEnum : char { Z2_MIN, Z2_MAX, Z3_MIN, - Z3_MAX + Z3_MAX, + Z_MAX, + I_MAX, + Y_MAX, + J_MAX, + X_MAX, + K_MAX }; class Endstops { public: - #if HAS_EXTRA_ENDSTOPS + #if NON_E_AXES > 3 || HAS_EXTRA_ENDSTOPS typedef uint16_t esbits_t; #if ENABLED(X_DUAL_ENDSTOPS) static float x2_endstop_adj; @@ -67,11 +73,12 @@ class Endstops { #else typedef uint8_t esbits_t; #endif - + typedef esbits_t hitstate_t; + private: static bool enabled, enabled_globally; static esbits_t live_state; - static volatile uint8_t hit_state; // Use X_MIN, Y_MIN, Z_MIN and Z_MIN_PROBE as BIT index + static volatile hitstate_t hit_state; // Use X_MIN, Y_MIN, Z_MIN and Z_MIN_PROBE as BIT index #if ENDSTOP_NOISE_THRESHOLD static esbits_t validated_live_state; @@ -97,7 +104,9 @@ class Endstops { ); } - static inline bool global_enabled() { return enabled_globally; } + FORCE_INLINE static bool global_enabled() { + return enabled_globally; + } /** * Periodic call to poll endstops if required. Called from temperature ISR @@ -114,7 +123,7 @@ class Endstops { /** * Get Endstop hit state. */ - FORCE_INLINE static uint8_t trigger_state() { return hit_state; } + FORCE_INLINE static hitstate_t trigger_state() { return hit_state; } /** * Get current endstops state diff --git a/Marlin/src/module/motion.cpp b/Marlin/src/module/motion.cpp index 3f727b815f85..db24e556eb73 100644 --- a/Marlin/src/module/motion.cpp +++ b/Marlin/src/module/motion.cpp @@ -59,8 +59,8 @@ #include "../feature/fwretract.h" #endif -#define XYZ_CONSTS(type, array, CONFIG) const PROGMEM type array##_P[XYZ] = { X_##CONFIG, Y_##CONFIG, Z_##CONFIG } - +#define XYZ_CONSTS(type, array, CONFIG) const PROGMEM type array##_P[NON_E_AXES] = \ + ARRAY_N(NON_E_AXES, X_##CONFIG, Y_##CONFIG, Z_##CONFIG, I_##CONFIG, J_##CONFIG, K_##CONFIG) XYZ_CONSTS(float, base_min_pos, MIN_POS); XYZ_CONSTS(float, base_max_pos, MAX_POS); XYZ_CONSTS(float, base_home_pos, HOME_POS); @@ -88,7 +88,7 @@ bool relative_mode; // = false; * Used by 'buffer_line_to_current_position' to do a move after changing it. * Used by 'sync_plan_position' to update 'planner.position'. */ -float current_position[XYZE] = { 0 }; +float current_position[NUM_AXIS] = { 0 }; /** * Cartesian Destination @@ -96,7 +96,7 @@ float current_position[XYZE] = { 0 }; * and expected by functions like 'prepare_move_to_destination'. * Set with 'get_destination_from_command' or 'set_destination_from_current'. */ -float destination[XYZE] = { 0 }; +float destination[NUM_AXIS] = { 0 }; // The active extruder (tool). Set with T command. #if EXTRUDERS > 1 @@ -117,13 +117,22 @@ float feedrate_mm_s = MMM_TO_MMS(1500.0f); int16_t feedrate_percentage = 100; // Homing feedrate is const progmem - compare to constexpr in the header -const float homing_feedrate_mm_s[XYZ] PROGMEM = { +const float homing_feedrate_mm_s[NON_E_AXES] PROGMEM = { #if ENABLED(DELTA) - MMM_TO_MMS(HOMING_FEEDRATE_Z), MMM_TO_MMS(HOMING_FEEDRATE_Z), + MMM_TO_MMS(HOMING_FEEDRATE_Z), MMM_TO_MMS(HOMING_FEEDRATE_Z) #else - MMM_TO_MMS(HOMING_FEEDRATE_XY), MMM_TO_MMS(HOMING_FEEDRATE_XY), + MMM_TO_MMS(HOMING_FEEDRATE_XY), MMM_TO_MMS(HOMING_FEEDRATE_XY) + #endif + , MMM_TO_MMS(HOMING_FEEDRATE_Z) + #if NON_E_AXES > 3 + , MMM_TO_MMS(HOMING_FEEDRATE_I) + #if NON_E_AXES > 4 + , MMM_TO_MMS(HOMING_FEEDRATE_J) + #if NON_E_AXES > 5 + , MMM_TO_MMS(HOMING_FEEDRATE_K) + #endif + #endif #endif - MMM_TO_MMS(HOMING_FEEDRATE_Z) }; // Cartesian conversion result goes here: @@ -143,16 +152,16 @@ float cartes[XYZ]; */ #if HAS_POSITION_SHIFT // The distance that XYZ has been offset by G92. Reset by G28. - float position_shift[XYZ] = { 0 }; + float position_shift[NON_E_AXES] = { 0 }; #endif #if HAS_HOME_OFFSET // This offset is added to the configured home position. // Set by M206, M428, or menu item. Saved to EEPROM. - float home_offset[XYZ] = { 0 }; + float home_offset[NON_E_AXES] = { 0 }; #endif #if HAS_HOME_OFFSET && HAS_POSITION_SHIFT // The above two are combined to save on computes - float workspace_offset[XYZ] = { 0 }; + float workspace_offset[NON_E_AXES] = { 0 }; #endif #if OLDSCHOOL_ABL @@ -166,7 +175,15 @@ void report_current_position() { SERIAL_ECHOPAIR("X:", LOGICAL_X_POSITION(current_position[X_AXIS])); SERIAL_ECHOPAIR(" Y:", LOGICAL_Y_POSITION(current_position[Y_AXIS])); SERIAL_ECHOPAIR(" Z:", LOGICAL_Z_POSITION(current_position[Z_AXIS])); - SERIAL_ECHOPAIR(" E:", current_position[E_AXIS]); + #if NON_E_AXES > 3 + SERIAL_ECHOPAIR(" I:", current_position[I_AXIS]); + #if NON_E_AXES > 4 + SERIAL_ECHOPAIR(" J:", current_position[J_AXIS]); + #if NON_E_AXES > 5 + SERIAL_ECHOPAIR(" K:", current_position[K_AXIS]); + #endif + #endif + #endif stepper.report_positions(); @@ -185,7 +202,17 @@ void sync_plan_position() { #if ENABLED(DEBUG_LEVELING_FEATURE) if (DEBUGGING(LEVELING)) DEBUG_POS("sync_plan_position", current_position); #endif - planner.set_position_mm(current_position[X_AXIS], current_position[Y_AXIS], current_position[Z_AXIS], current_position[E_AXIS]); + planner.set_position_mm(current_position[X_AXIS], current_position[Y_AXIS], current_position[Z_AXIS], + #if NON_E_AXES > 3 + current_position[I_AXIS], + #if NON_E_AXES > 4 + current_position[J_AXIS], + #if NON_E_AXES > 5 + current_position[K_AXIS], + #endif + #endif + #endif + current_position[E_AXIS]); } void sync_plan_position_e() { planner.set_e_position_mm(current_position[E_AXIS]); } @@ -215,6 +242,7 @@ void get_cartesian_from_steppers() { #else cartes[X_AXIS] = planner.get_axis_position_mm(X_AXIS); cartes[Y_AXIS] = planner.get_axis_position_mm(Y_AXIS); + #endif cartes[Z_AXIS] = planner.get_axis_position_mm(Z_AXIS); #endif @@ -235,13 +263,23 @@ void set_current_from_steppers_for_axis(const AxisEnum axis) { get_cartesian_from_steppers(); #if HAS_POSITION_MODIFIERS - float pos[XYZE] = { cartes[X_AXIS], cartes[Y_AXIS], cartes[Z_AXIS], current_position[E_AXIS] }; + float pos[NUM_AXIS] = { cartes[X_AXIS], cartes[Y_AXIS], cartes[Z_AXIS], + #if NON_E_AXES > 3 + current_position[I_AXIS], + #if NON_E_AXES > 4 + current_position[J_AXIS], + #if NON_E_AXES > 5 + current_position[K_AXIS], + #endif + #endif + #endif + current_position[E_AXIS] }; planner.unapply_modifiers(pos #if HAS_LEVELING , true #endif ); - const float (&cartes)[XYZE] = pos; + const float (&cartes)[NUM_AXIS] = pos; #endif if (axis == ALL_AXES) COPY(current_position, cartes); @@ -254,7 +292,17 @@ void set_current_from_steppers_for_axis(const AxisEnum axis) { * (or from wherever it has been told it is located). */ void line_to_current_position() { - planner.buffer_line(current_position[X_AXIS], current_position[Y_AXIS], current_position[Z_AXIS], current_position[E_AXIS], feedrate_mm_s, active_extruder); + planner.buffer_line(current_position[X_AXIS], current_position[Y_AXIS], current_position[Z_AXIS] + #if NON_E_AXES > 3 + , current_position[I_AXIS] + #if NON_E_AXES > 4 + , current_position[J_AXIS] + #if NON_E_AXES > 5 + , current_position[K_AXIS] + #endif + #endif + #endif + , current_position[E_AXIS], feedrate_mm_s, active_extruder); } /** @@ -262,7 +310,17 @@ void line_to_current_position() { * used by G0/G1/G2/G3/G5 and many other functions to set a destination. */ void buffer_line_to_destination(const float fr_mm_s) { - planner.buffer_line(destination[X_AXIS], destination[Y_AXIS], destination[Z_AXIS], destination[E_AXIS], fr_mm_s, active_extruder); + planner.buffer_line(destination[X_AXIS], destination[Y_AXIS], destination[Z_AXIS] + #if NON_E_AXES > 3 + , destination[I_AXIS] + #if NON_E_AXES > 4 + , destination[J_AXIS] + #if NON_E_AXES > 5 + , destination[K_AXIS] + #endif + #endif + #endif + , destination[E_AXIS], fr_mm_s, active_extruder); } #if IS_KINEMATIC @@ -300,7 +358,17 @@ void do_blocking_move_to(const float rx, const float ry, const float rz, const f const float old_feedrate_mm_s = feedrate_mm_s; #if ENABLED(DEBUG_LEVELING_FEATURE) - if (DEBUGGING(LEVELING)) print_xyz(PSTR(">>> do_blocking_move_to"), NULL, rx, ry, rz); + if (DEBUGGING(LEVELING)) print_xyz(PSTR(">>> do_blocking_move_to"), NULL, rx, ry, rz + #if NON_E_AXES > 3 + , 0 + #if NON_E_AXES > 4 + , 0 + #if NON_E_AXES > 5 + , 0 + #endif + #endif + #endif + ); #endif const float z_feedrate = fr_mm_s ? fr_mm_s : homing_feedrate(Z_AXIS); @@ -454,8 +522,8 @@ void clean_up_after_endstop_or_probe_move() { bracket_probe_move(false); } bool soft_endstops_enabled = true; // Software Endstops are based on the configured limits. - float soft_endstop_min[XYZ] = { X_MIN_BED, Y_MIN_BED, Z_MIN_POS }, - soft_endstop_max[XYZ] = { X_MAX_BED, Y_MAX_BED, Z_MAX_POS }; + float soft_endstop_min[NON_E_AXES] = ARRAY_N(NON_E_AXES, X_MIN_BED, Y_MIN_BED, Z_MIN_POS, I_MIN_POS, J_MIN_POS, K_MIN_POS), + soft_endstop_max[NON_E_AXES] = ARRAY_N(NON_E_AXES, X_MAX_BED, Y_MAX_BED, Z_MAX_POS, I_MAX_POS, J_MAX_POS, K_MAX_POS); #if IS_KINEMATIC float soft_endstop_radius, soft_endstop_radius_2; @@ -467,7 +535,7 @@ void clean_up_after_endstop_or_probe_move() { bracket_probe_move(false); } * For DELTA/SCARA the XY constraint is based on the smallest * radius within the set software endstops. */ - void clamp_to_software_endstops(float target[XYZ]) { + void clamp_to_software_endstops(float target[NON_E_AXES]) { if (!soft_endstops_enabled) return; #if IS_KINEMATIC const float dist_2 = HYPOT2(target[X_AXIS], target[Y_AXIS]); @@ -496,6 +564,30 @@ void clean_up_after_endstop_or_probe_move() { bracket_probe_move(false); } #if ENABLED(MAX_SOFTWARE_ENDSTOP_Z) NOMORE(target[Z_AXIS], soft_endstop_max[Z_AXIS]); #endif + #if NON_E_AXES > 3 + #if ENABLED(MIN_SOFTWARE_ENDSTOP_I) + NOLESS(target[I_AXIS], soft_endstop_min[I_AXIS]); + #endif + #if ENABLED(MAX_SOFTWARE_ENDSTOP_I) + NOMORE(target[I_AXIS], soft_endstop_max[I_AXIS]); + #endif + #if NON_E_AXES > 4 + #if ENABLED(MIN_SOFTWARE_ENDSTOP_J) + NOLESS(target[J_AXIS], soft_endstop_min[J_AXIS]); + #endif + #if ENABLED(MAX_SOFTWARE_ENDSTOP_J) + NOMORE(target[J_AXIS], soft_endstop_max[J_AXIS]); + #endif + #if NON_E_AXES > 5 + #if ENABLED(MIN_SOFTWARE_ENDSTOP_K) + NOLESS(target[K_AXIS], soft_endstop_min[K_AXIS]); + #endif + #if ENABLED(MAX_SOFTWARE_ENDSTOP_K) + NOMORE(target[K_AXIS], soft_endstop_max[K_AXIS]); + #endif + #endif // NON_E_AXES > 5 + #endif // NON_E_AXES > 4 + #endif // NON_E_AXES > 3 } /** @@ -673,7 +765,7 @@ void clean_up_after_endstop_or_probe_move() { bracket_probe_move(false); } //*/ // Get the current position as starting point - float raw[XYZE]; + float raw[NUM_AXIS]; COPY(raw, current_position); // Calculate and execute the segments @@ -686,7 +778,7 @@ void clean_up_after_endstop_or_probe_move() { bracket_probe_move(false); } idle(); } - LOOP_XYZE(i) raw[i] += segment_distance[i]; + LOOP_NUM_AXIS(i) raw[i] += segment_distance[i]; if (!planner.buffer_line(raw, _feedrate_mm_s, active_extruder, cartesian_segment_mm #if ENABLED(SCARA_FEEDRATE_SCALING) @@ -730,7 +822,16 @@ void clean_up_after_endstop_or_probe_move() { bracket_probe_move(false); } // Remaining cartesian distances const float zdiff = destination[Z_AXIS] - current_position[Z_AXIS], - ediff = destination[E_AXIS] - current_position[E_AXIS]; + #if NON_E_AXES > 3 + idiff = destination[I_AXIS] - current_position[I_AXIS]; + #if NON_E_AXES > 4 + jdiff = destination[J_AXIS] - current_position[J_AXIS]; + #if NON_E_AXES > 5 + kdiff = destination[K_AXIS] - current_position[K_AXIS]; + #endif + #endif + #endif + ediff = destination[E_AXIS] - current_position[E_AXIS]; // Get the linear distance in XYZ // If the move is very short, check the E move distance @@ -747,10 +848,19 @@ void clean_up_after_endstop_or_probe_move() { bracket_probe_move(false); } // The approximate length of each segment const float inv_segments = 1.0f / float(segments), cartesian_segment_mm = cartesian_mm * inv_segments, - segment_distance[XYZE] = { + segment_distance[NUM_AXIS] = { xdiff * inv_segments, ydiff * inv_segments, zdiff * inv_segments, + #if NON_E_AXES > 3 + idiff * inv_segments, + #if NON_E_AXES > 4 + jdiff * inv_segments, + #if NON_E_AXES > 5 + kdiff * inv_segments, + #endif + #endif + #endif ediff * inv_segments }; @@ -763,7 +873,7 @@ void clean_up_after_endstop_or_probe_move() { bracket_probe_move(false); } // SERIAL_ECHOLNPAIR(" segment_mm=", cartesian_segment_mm); // Get the raw current position as starting point - float raw[XYZE]; + float raw[NUM_AXIS]; COPY(raw, current_position); // Calculate and execute the segments @@ -774,7 +884,7 @@ void clean_up_after_endstop_or_probe_move() { bracket_probe_move(false); } next_idle_ms = millis() + 200UL; idle(); } - LOOP_XYZE(i) raw[i] += segment_distance[i]; + LOOP_NUM_AXIS(i) raw[i] += segment_distance[i]; if (!planner.buffer_line(raw, fr_mm_s, active_extruder, cartesian_segment_mm #if ENABLED(SCARA_FEEDRATE_SCALING) , inv_duration @@ -1001,26 +1111,98 @@ void prepare_move_to_destination() { #if HAS_AXIS_UNHOMED_ERR - bool axis_unhomed_error(const bool x/*=true*/, const bool y/*=true*/, const bool z/*=true*/) { + bool axis_unhomed_error(const bool x/*=true*/, const bool y/*=true*/, const bool z/*=true*/ + #if NON_E_AXES > 3 + , const bool i/*true*/ + #if NON_E_AXES > 4 + , const bool j/*true*/ + #if NON_E_AXES > 5 + , const bool k/*true*/ + #endif + #endif + #endif + ) { #if ENABLED(HOME_AFTER_DEACTIVATE) const bool xx = x && !TEST(axis_known_position, X_AXIS), yy = y && !TEST(axis_known_position, Y_AXIS), zz = z && !TEST(axis_known_position, Z_AXIS); + #if NON_E_AXES > 3 + const bool ii = i && !TEST(axis_known_position, I_AXIS); + #if NON_E_AXES > 4 + const bool jj = j && !TEST(axis_known_position, J_AXIS); + #if NON_E_AXES > 5 + const bool kk = k && !TEST(axis_known_position, K_AXIS); + #endif + #endif + #endif #else const bool xx = x && !TEST(axis_homed, X_AXIS), yy = y && !TEST(axis_homed, Y_AXIS), zz = z && !TEST(axis_homed, Z_AXIS); + #if NON_E_AXES > 3 + const bool ii = i && !TEST(axis_homed, I_AXIS); + #if NON_E_AXES > 4 + const bool jj = j && !TEST(axis_homed, J_AXIS); + #if NON_E_AXES > 5 + const bool kk = k && !TEST(axis_homed, K_AXIS); + #endif + #endif + #endif #endif - if (xx || yy || zz) { + if (xx || yy || zz + #if NON_E_AXES > 3 + || ii + #if NON_E_AXES > 4 + || jj + #if NON_E_AXES > 5 + || kk + #endif + #endif + #endif + ) { SERIAL_ECHO_START(); SERIAL_ECHOPGM(MSG_HOME " "); if (xx) SERIAL_ECHOPGM(MSG_X); if (yy) SERIAL_ECHOPGM(MSG_Y); if (zz) SERIAL_ECHOPGM(MSG_Z); + #if NON_E_AXES > 3 + if (ii) SERIAL_ECHOPGM(MSG_I); + #if NON_E_AXES > 4 + if (jj) SERIAL_ECHOPGM(MSG_J); + #if NON_E_AXES > 5 + if (kk) SERIAL_ECHOPGM(MSG_K); + #endif + #endif + #endif SERIAL_ECHOLNPGM(" " MSG_FIRST); #if ENABLED(ULTRA_LCD) || ENABLED(EXTENSIBLE_UI) - ui.status_printf_P(0, PSTR(MSG_HOME " %s%s%s " MSG_FIRST), xx ? MSG_X : "", yy ? MSG_Y : "", zz ? MSG_Z : ""); + + ui.status_printf_P(0, PSTR(MSG_HOME " %s%s%s%s%s" MSG_FIRST), xx ? MSG_X : "", yy ? MSG_Y : "", zz ? MSG_Z : "", ii ? MSG_I : "", jj ? MSG_J : ""); + + /* ui.status_printf_P(0, PSTR(MSG_HOME " %s%s%s +#if NON_E_AXES > 3 +%s +#if NON_E_AXES > 4 +%s +#if NON_E_AXES > 5 +%s +#endif +#endif +#endif + " MSG_FIRST), xx ? MSG_X : "", yy ? MSG_Y : "", zz ? MSG_Z : "" + #if NON_E_AXES > 3 + , ii ? MSG_I : "" + #if NON_E_AXES > 4 + , jj ? MSG_J : "" + #if NON_E_AXES > 5 + , kk ? MSG_K : "" + #endif + #endif + #endif + );*/ + + #endif return true; } @@ -1211,13 +1393,23 @@ void do_homing_move(const AxisEnum axis, const float distance, const float fr_mm current_position[axis] = distance; planner.buffer_line(current_position, fr_mm_s ? fr_mm_s : homing_feedrate(axis), active_extruder); #else - float target[ABCE] = { planner.get_axis_position_mm(A_AXIS), planner.get_axis_position_mm(B_AXIS), planner.get_axis_position_mm(C_AXIS), planner.get_axis_position_mm(E_AXIS) }; + float target[NUM_AXIS] = { planner.get_axis_position_mm(A_AXIS), planner.get_axis_position_mm(B_AXIS), planner.get_axis_position_mm(C_AXIS) + #if NON_E_AXES > 3 + , planner.get_axis_position_mm(I_AXIS) + #if NON_E_AXES > 4 + , planner.get_axis_position_mm(J_AXIS) + #if NON_E_AXES > 5 + , planner.get_axis_position_mm(K_AXIS) + #endif + #endif + #endif + , planner.get_axis_position_mm(E_AXIS) }; target[axis] = 0; planner.set_machine_position_mm(target); target[axis] = distance; #if IS_KINEMATIC && ENABLED(JUNCTION_DEVIATION) - const float delta_mm_cart[XYZE] = {0, 0, 0, 0}; + const float delta_mm_cart[NUM_AXIS] = ARRAY_N(NUM_AXIS, 0, 0, 0, 0, 0, 0, 0}; #endif // Set delta/cartesian axes directly @@ -1397,7 +1589,17 @@ void homeaxis(const AxisEnum axis) { #else #define CAN_HOME(A) \ (axis == _AXIS(A) && ((A##_MIN_PIN > -1 && A##_HOME_DIR < 0) || (A##_MAX_PIN > -1 && A##_HOME_DIR > 0))) - if (!CAN_HOME(X) && !CAN_HOME(Y) && !CAN_HOME(Z)) return; + if (!CAN_HOME(X) && !CAN_HOME(Y) && !CAN_HOME(Z) + #if NON_E_AXES > 3 + && !CAN_HOME(I) + #if NON_E_AXES > 4 + && !CAN_HOME(J) + #if NON_E_AXES > 5 + && !CAN_HOME(K) + #endif + #endif + #endif + ) return; #endif #if ENABLED(DEBUG_LEVELING_FEATURE) diff --git a/Marlin/src/module/motion.h b/Marlin/src/module/motion.h index 5aea339a1e50..e9832d5f0b5d 100644 --- a/Marlin/src/module/motion.h +++ b/Marlin/src/module/motion.h @@ -36,7 +36,17 @@ // Axis homed and known-position states extern uint8_t axis_homed, axis_known_position; -constexpr uint8_t xyz_bits = _BV(X_AXIS) | _BV(Y_AXIS) | _BV(Z_AXIS); +constexpr uint8_t xyz_bits = (_BV(X_AXIS) | _BV(Y_AXIS) | _BV(Z_AXIS) + #if NON_E_AXES > 3 + | _BV(I_AXIS) + #if NON_E_AXES > 4 + | _BV(J_AXIS) + #if NON_E_AXES > 5 + | _BV(K_AXIS) + #endif + #endif + #endif +); FORCE_INLINE bool all_axes_homed() { return (axis_homed & xyz_bits) == xyz_bits; } FORCE_INLINE bool all_axes_known() { return (axis_known_position & xyz_bits) == xyz_bits; } FORCE_INLINE void set_all_unhomed() { axis_homed = 0; } @@ -47,8 +57,8 @@ constexpr float slop = 0.0001; extern bool relative_mode; -extern float current_position[XYZE], // High-level current tool position - destination[XYZE]; // Destination for a move +extern float current_position[NUM_AXIS], // High-level current tool position + destination[NUM_AXIS]; // Destination for a move // Scratch space for a cartesian result extern float cartes[XYZ]; @@ -71,7 +81,7 @@ extern float cartes[XYZ]; * Feed rates are often configured with mm/m * but the planner and stepper like mm/s units. */ -extern const float homing_feedrate_mm_s[XYZ]; +extern const float homing_feedrate_mm_s[NON_E_AXES]; FORCE_INLINE float homing_feedrate(const AxisEnum a) { return pgm_read_float(&homing_feedrate_mm_s[a]); } float get_homing_bump_feedrate(const AxisEnum axis); @@ -98,7 +108,7 @@ FORCE_INLINE float pgm_read_any(const float *p) { return pgm_read_float(p); } FORCE_INLINE signed char pgm_read_any(const signed char *p) { return pgm_read_byte(p); } #define XYZ_DEFS(type, array, CONFIG) \ - extern const type array##_P[XYZ]; \ + extern const type array##_P[NON_E_AXES]; \ FORCE_INLINE type array(AxisEnum axis) { return pgm_read_any(&array##_P[axis]); } \ typedef void __void_##CONFIG##__ @@ -117,13 +127,14 @@ XYZ_DEFS(signed char, home_dir, HOME_DIR); #if HAS_SOFTWARE_ENDSTOPS extern bool soft_endstops_enabled; - extern float soft_endstop_min[XYZ], soft_endstop_max[XYZ]; - void clamp_to_software_endstops(float target[XYZ]); + extern float soft_endstop_min[NON_E_AXES], soft_endstop_max[NON_E_AXES]; + void clamp_to_software_endstops(float target[NON_E_AXES]); void update_software_endstops(const AxisEnum axis); #else constexpr bool soft_endstops_enabled = false; - constexpr float soft_endstop_min[XYZ] = { X_MIN_BED, Y_MIN_BED, Z_MIN_POS }, - soft_endstop_max[XYZ] = { X_MAX_BED, Y_MAX_BED, Z_MAX_POS }; + constexpr float soft_endstop_min[NON_E_AXES] = ARRAY_N(NON_E_AXES, X_MIN_BED, Y_MIN_BED, Z_MIN_POS, I_MIN_POS, J_MIN_POS, K_MIN_POS), + soft_endstop_max[NON_E_AXES] = ARRAY_N(NON_E_AXES, X_MAX_BED, Y_MAX_BED, Z_MAX_POS, I_MAX_POS, J_MAX_POS, K_MAX_POS); + #define clamp_to_software_endstops(x) NOOP #define update_software_endstops(x) NOOP #endif @@ -202,7 +213,17 @@ void clean_up_after_endstop_or_probe_move(); ) || ENABLED(NO_MOTION_BEFORE_HOMING) #if HAS_AXIS_UNHOMED_ERR - bool axis_unhomed_error(const bool x=true, const bool y=true, const bool z=true); + bool axis_unhomed_error(const bool x=true, const bool y=true, const bool z=true + #if NON_E_AXES > 3 + , const bool i=true + #if NON_E_AXES > 4 + , const bool j=true + #if NON_E_AXES > 5 + , const bool k=true + #endif + #endif + #endif + ); #endif #if ENABLED(NO_MOTION_BEFORE_HOMING) @@ -222,13 +243,13 @@ void homeaxis(const AxisEnum axis); */ #if HAS_HOME_OFFSET || HAS_POSITION_SHIFT #if HAS_HOME_OFFSET - extern float home_offset[XYZ]; + extern float home_offset[NON_E_AXES]; #endif #if HAS_POSITION_SHIFT - extern float position_shift[XYZ]; + extern float position_shift[NON_E_AXES]; #endif #if HAS_HOME_OFFSET && HAS_POSITION_SHIFT - extern float workspace_offset[XYZ]; + extern float workspace_offset[NON_E_AXES]; #define WORKSPACE_OFFSET(AXIS) workspace_offset[AXIS] #elif HAS_HOME_OFFSET #define WORKSPACE_OFFSET(AXIS) home_offset[AXIS] @@ -248,6 +269,18 @@ void homeaxis(const AxisEnum axis); #define RAW_Y_POSITION(POS) LOGICAL_TO_NATIVE(POS, Y_AXIS) #define RAW_Z_POSITION(POS) LOGICAL_TO_NATIVE(POS, Z_AXIS) +#if NON_E_AXES > 3 + #define LOGICAL_I_POSITION(POS) NATIVE_TO_LOGICAL(POS, I_AXIS) + #define RAW_I_POSITION(POS) LOGICAL_TO_NATIVE(POS, I_AXIS) + #if NON_E_AXES > 4 + #define LOGICAL_J_POSITION(POS) NATIVE_TO_LOGICAL(POS, J_AXIS) + #define RAW_J_POSITION(POS) LOGICAL_TO_NATIVE(POS, J_AXIS) + #if NON_E_AXES > 5 + #define LOGICAL_K_POSITION(POS) NATIVE_TO_LOGICAL(POS, K_AXIS) + #define RAW_K_POSITION(POS) LOGICAL_TO_NATIVE(POS, K_AXIS) + #endif + #endif +#endif /** * position_is_reachable family of functions */ diff --git a/Marlin/src/module/planner.cpp b/Marlin/src/module/planner.cpp index f6d581a6b943..7e9d6b285d43 100644 --- a/Marlin/src/module/planner.cpp +++ b/Marlin/src/module/planner.cpp @@ -113,9 +113,9 @@ uint8_t Planner::delay_before_delivering; // This counter delays delivery planner_settings_t Planner::settings; // Initialized by settings.load() -uint32_t Planner::max_acceleration_steps_per_s2[XYZE_N]; // (steps/s^2) Derived from mm_per_s2 +uint32_t Planner::max_acceleration_steps_per_s2[NUM_AXIS_N]; // (steps/s^2) Derived from mm_per_s2 -float Planner::steps_to_mm[XYZE_N]; // (mm) Millimeters per step +float Planner::steps_to_mm[NUM_AXIS_N]; // (mm) Millimeters per step #if ENABLED(JUNCTION_DEVIATION) float Planner::junction_deviation_mm; // (mm) M205 J @@ -131,7 +131,7 @@ float Planner::steps_to_mm[XYZE_N]; // (mm) Millimeters per step #if ENABLED(JUNCTION_DEVIATION) && ENABLED(LIN_ADVANCE) float Planner::max_jerk[XYZ]; // (mm/s^2) M205 XYZ - The largest speed change requiring no acceleration. #else - float Planner::max_jerk[XYZE]; // (mm/s^2) M205 XYZE - The largest speed change requiring no acceleration. + float Planner::max_jerk[NUM_AXIS]; // (mm/s^2) M205 XYZE - The largest speed change requiring no acceleration. #endif #endif @@ -201,11 +201,11 @@ float Planner::previous_speed[NUM_AXIS], #endif #if HAS_POSITION_FLOAT - float Planner::position_float[XYZE]; // Needed for accurate maths. Steps cannot be used! + float Planner::position_float[NUM_AXIS]; // Needed for accurate maths. Steps cannot be used! #endif #if IS_KINEMATIC - float Planner::position_cart[XYZE]; + float Planner::position_cart[NUM_AXIS]; #endif #if ENABLED(ULTRA_LCD) @@ -1165,9 +1165,12 @@ void Planner::recalculate() { * Maintain fans, paste extruder pressure, */ void Planner::check_axes_activity() { - uint8_t axis_active[NUM_AXIS] = { 0 }, - tail_fan_speed[FAN_COUNT]; - + uint8_t axis_active[NUM_AXIS] = { 0 }; + + #if FAN_COUNT > 0 + uint8_t tail_fan_speed[FAN_COUNT]; + #endif + #if ENABLED(BARICUDA) #if HAS_HEATER_1 uint8_t tail_valve_pressure; @@ -1197,7 +1200,7 @@ void Planner::check_axes_activity() { for (uint8_t b = block_buffer_tail; b != block_buffer_head; b = next_block_index(b)) { block = &block_buffer[b]; - LOOP_XYZE(i) if (block->steps[i]) axis_active[i]++; + LOOP_NUM_AXIS(i) if (block->steps[i]) axis_active[i]++; } } else { @@ -1225,6 +1228,16 @@ void Planner::check_axes_activity() { #if ENABLED(DISABLE_Z) if (!axis_active[Z_AXIS]) disable_Z(); #endif + #if ENABLED(DISABLE_I) + if (!axis_active[I_AXIS]) disable_I(); + #endif + #if ENABLED(DISABLE_J) + if (!axis_active[J_AXIS]) disable_J(); + #endif + #if ENABLED(DISABLE_K) + if (!axis_active[K_AXIS]) disable_K(); + #endif + #if ENABLED(DISABLE_E) if (!axis_active[E_AXIS]) disable_e_steppers(); #endif @@ -1643,12 +1656,12 @@ void Planner::synchronize() { * * Returns true if movement was properly queued, false otherwise */ -bool Planner::_buffer_steps(const int32_t (&target)[XYZE] +bool Planner::_buffer_steps(const int32_t (&target)[NUM_AXIS] #if HAS_POSITION_FLOAT - , const float (&target_float)[ABCE] + , const float (&target_float)[NUM_AXIS] #endif #if IS_KINEMATIC && ENABLED(JUNCTION_DEVIATION) - , const float (&delta_mm_cart)[XYZE] + , const float (&delta_mm_cart)[NUM_AXIS] #endif , float fr_mm_s, const uint8_t extruder, const float &millimeters ) { @@ -1707,12 +1720,12 @@ bool Planner::_buffer_steps(const int32_t (&target)[XYZE] * Returns true is movement is acceptable, false otherwise */ bool Planner::_populate_block(block_t * const block, bool split_move, - const int32_t (&target)[ABCE] + const int32_t (&target)[NUM_AXIS] #if HAS_POSITION_FLOAT - , const float (&target_float)[ABCE] + , const float (&target_float)[NUM_AXIS] #endif #if IS_KINEMATIC && ENABLED(JUNCTION_DEVIATION) - , const float (&delta_mm_cart)[XYZE] + , const float (&delta_mm_cart)[NUM_AXIS] #endif , float fr_mm_s, const uint8_t extruder, const float &millimeters/*=0.0*/ ) { @@ -1720,6 +1733,15 @@ bool Planner::_populate_block(block_t * const block, bool split_move, const int32_t da = target[A_AXIS] - position[A_AXIS], db = target[B_AXIS] - position[B_AXIS], dc = target[C_AXIS] - position[C_AXIS]; + #if NON_E_AXES > 3 + const int32_t di = target[I_AXIS] - position[I_AXIS]; + #if NON_E_AXES > 4 + const int32_t dj = target[J_AXIS] - position[J_AXIS]; + #if NON_E_AXES > 5 + const int32_t dk = target[K_AXIS] - position[K_AXIS]; + #endif + #endif + #endif int32_t de = target[E_AXIS] - position[E_AXIS]; @@ -1785,6 +1807,15 @@ bool Planner::_populate_block(block_t * const block, bool split_move, if (da < 0) SBI(dm, X_AXIS); if (db < 0) SBI(dm, Y_AXIS); if (dc < 0) SBI(dm, Z_AXIS); + #if NON_E_AXES > 3 + if (di < 0) SBI(dm, I_AXIS); + #if NON_E_AXES > 4 + if (dj < 0) SBI(dm, J_AXIS); + #if NON_E_AXES > 5 + if (dk < 0) SBI(dm, K_AXIS); + #endif + #endif + #endif #endif if (de < 0) SBI(dm, E_AXIS); @@ -1820,6 +1851,16 @@ bool Planner::_populate_block(block_t * const block, bool split_move, block->steps[A_AXIS] = ABS(da); block->steps[B_AXIS] = ABS(db); block->steps[C_AXIS] = ABS(dc); + #if NON_E_AXES > 3 + block->steps[I_AXIS] = ABS(di); + #if NON_E_AXES > 4 + block->steps[J_AXIS] = ABS(dj); + #if NON_E_AXES > 5 + block->steps[K_AXIS] = ABS(dk); + #endif + #endif + #endif + #endif /** @@ -1851,16 +1892,40 @@ bool Planner::_populate_block(block_t * const block, bool split_move, delta_mm[B_AXIS] = (db + dc) * steps_to_mm[B_AXIS]; delta_mm[C_AXIS] = CORESIGN(db - dc) * steps_to_mm[C_AXIS]; #endif - #else - float delta_mm[ABCE]; + #else // !IS_CORE + float delta_mm[NUM_AXIS]; delta_mm[A_AXIS] = da * steps_to_mm[A_AXIS]; delta_mm[B_AXIS] = db * steps_to_mm[B_AXIS]; delta_mm[C_AXIS] = dc * steps_to_mm[C_AXIS]; + #if NON_E_AXES > 3 + delta_mm[I_AXIS] = di * steps_to_mm[I_AXIS]; + #if NON_E_AXES > 4 + delta_mm[J_AXIS] = dj * steps_to_mm[J_AXIS]; + #if NON_E_AXES > 5 + delta_mm[K_AXIS] = dk * steps_to_mm[K_AXIS]; + #endif + #endif + #endif #endif delta_mm[E_AXIS] = esteps_float * steps_to_mm[E_AXIS_N(extruder)]; if (block->steps[A_AXIS] < MIN_STEPS_PER_SEGMENT && block->steps[B_AXIS] < MIN_STEPS_PER_SEGMENT && block->steps[C_AXIS] < MIN_STEPS_PER_SEGMENT) { + block->millimeters = ABS(delta_mm[E_AXIS]); + + #if NON_E_AXES > 3 + if(ABS(delta_mm[I_AXIS]) > block->millimeters ) block->millimeters = ABS(delta_mm[I_AXIS]); + + #if NON_E_AXES > 4 + if(ABS(delta_mm[J_AXIS]) > block->millimeters ) block->millimeters = ABS(delta_mm[J_AXIS]); + + #if NON_E_AXES > 5 + if(ABS(delta_mm[K_AXIS]) > block->millimeters ) block->millimeters = ABS(delta_mm[K_AXIS]); + + #endif + #endif + #endif + } else { if (millimeters) @@ -1869,12 +1934,16 @@ bool Planner::_populate_block(block_t * const block, bool split_move, block->millimeters = SQRT( #if CORE_IS_XY sq(delta_mm[X_HEAD]) + sq(delta_mm[Y_HEAD]) + sq(delta_mm[Z_AXIS]) + #elif CORE_IS_XZ sq(delta_mm[X_HEAD]) + sq(delta_mm[Y_AXIS]) + sq(delta_mm[Z_HEAD]) + #elif CORE_IS_YZ sq(delta_mm[X_AXIS]) + sq(delta_mm[Y_HEAD]) + sq(delta_mm[Z_HEAD]) + #else - sq(delta_mm[X_AXIS]) + sq(delta_mm[Y_AXIS]) + sq(delta_mm[Z_AXIS]) + sq(delta_mm[X_AXIS]) + sq(delta_mm[Y_AXIS]) + sq(delta_mm[Z_AXIS]) + #endif ); @@ -1893,7 +1962,17 @@ bool Planner::_populate_block(block_t * const block, bool split_move, } block->steps[E_AXIS] = esteps; - block->step_event_count = MAX(block->steps[A_AXIS], block->steps[B_AXIS], block->steps[C_AXIS], esteps); + block->step_event_count = MAX(block->steps[A_AXIS], block->steps[B_AXIS], block->steps[C_AXIS] + #if NON_E_AXES > 3 + , block->steps[I_AXIS] + #if NON_E_AXES > 4 + , block->steps[J_AXIS] + #if NON_E_AXES > 5 + , block->steps[K_AXIS] + #endif + #endif + #endif + , esteps); // Bail if this is a zero-length block if (block->step_event_count < MIN_STEPS_PER_SEGMENT) return false; @@ -1916,7 +1995,16 @@ bool Planner::_populate_block(block_t * const block, bool split_move, #endif #if ENABLED(AUTO_POWER_CONTROL) - if (block->steps[X_AXIS] || block->steps[Y_AXIS] || block->steps[Z_AXIS]) + if (block->steps[X_AXIS] || block->steps[Y_AXIS] || block->steps[Z_AXIS] + #if NON_E_AXES > 3 + || block->steps[I_AXIS] + #if NON_E_AXES > 4 + || block->steps[J_AXIS] + #if NON_E_AXES > 5 + || block->steps[K_AXIS] + #endif + #endif + #endif powerManager.power_on(); #endif @@ -1944,6 +2032,15 @@ bool Planner::_populate_block(block_t * const block, bool split_move, #else if (block->steps[X_AXIS]) enable_X(); if (block->steps[Y_AXIS]) enable_Y(); + #if NON_E_AXES > 3 + if (block->steps[I_AXIS]) enable_I(); + #if NON_E_AXES > 4 + if (block->steps[J_AXIS]) enable_J(); + #if NON_E_AXES > 5 + if (block->steps[K_AXIS]) enable_K(); + #endif + #endif + #endif #if DISABLED(Z_LATE_ENABLE) if (block->steps[Z_AXIS]) enable_Z(); #endif @@ -2156,7 +2253,7 @@ bool Planner::_populate_block(block_t * const block, bool split_move, // Calculate and limit speed in mm/sec for each axis float current_speed[NUM_AXIS], speed_factor = 1.0f; // factor <1 decreases speed - LOOP_XYZE(i) { + LOOP_NUM_AXIS(i) { #if ENABLED(MIXING_EXTRUDER) && ENABLED(RETRACT_SYNC_MIXING) // In worst case, only one extruder running, no change is needed. // In best case, all extruders run the same amount, we can divide by MIXING_STEPPERS @@ -2173,6 +2270,17 @@ bool Planner::_populate_block(block_t * const block, bool split_move, if (i == E_AXIS) i += extruder; #endif if (cs > settings.max_feedrate_mm_s[i]) NOMORE(speed_factor, settings.max_feedrate_mm_s[i] / cs); + + + /* + SERIAL_ECHOPAIR("delta_mm: ",delta_mm_i); + SERIAL_ECHOPAIR(" cs: ",cs); + SERIAL_ECHOPAIR(" inverse_secs: ",inverse_secs); + SERIAL_ECHOPAIR(" inverse_millimeters*10^3: ", inverse_millimeters*1000); + SERIAL_ECHOPAIR(" fr_mm_s: ", fr_mm_s); + SERIAL_ECHOPAIR(" block->millimeters: ", block->millimeters); + SERIAL_EOL(); + */ } // Max segment time in µs. @@ -2215,7 +2323,7 @@ bool Planner::_populate_block(block_t * const block, bool split_move, // Correct the speed if (speed_factor < 1.0f) { - LOOP_XYZE(i) current_speed[i] *= speed_factor; + LOOP_NUM_AXIS(i) current_speed[i] *= speed_factor; block->nominal_rate *= speed_factor; block->nominal_speed_sqr = block->nominal_speed_sqr * sq(speed_factor); } @@ -2223,7 +2331,17 @@ bool Planner::_populate_block(block_t * const block, bool split_move, // Compute and limit the acceleration rate for the trapezoid generator. const float steps_per_mm = block->step_event_count * inverse_millimeters; uint32_t accel; - if (!block->steps[A_AXIS] && !block->steps[B_AXIS] && !block->steps[C_AXIS]) { + if (!block->steps[A_AXIS] && !block->steps[B_AXIS] && !block->steps[C_AXIS] + #if NON_E_AXES > 3 + && !block->steps[I_AXIS] + #if NON_E_AXES > 4 + && !block->steps[J_AXIS] + #if NON_E_AXES > 5 + && !block->steps[K_AXIS] + #endif + #endif + #endif + ) { // convert to: acceleration steps/sec^2 accel = CEIL(settings.retract_acceleration * steps_per_mm); #if ENABLED(LIN_ADVANCE) @@ -2310,12 +2428,30 @@ bool Planner::_populate_block(block_t * const block, bool split_move, LIMIT_ACCEL_LONG(A_AXIS, 0); LIMIT_ACCEL_LONG(B_AXIS, 0); LIMIT_ACCEL_LONG(C_AXIS, 0); + #if NON_E_AXES > 3 + LIMIT_ACCEL_LONG(I_AXIS, 0); + #if NON_E_AXES > 4 + LIMIT_ACCEL_LONG(J_AXIS, 0); + #if NON_E_AXES > 5 + LIMIT_ACCEL_LONG(K_AXIS, 0); + #endif + #endif + #endif LIMIT_ACCEL_LONG(E_AXIS, ACCEL_IDX); } else { LIMIT_ACCEL_FLOAT(A_AXIS, 0); LIMIT_ACCEL_FLOAT(B_AXIS, 0); LIMIT_ACCEL_FLOAT(C_AXIS, 0); + #if NON_E_AXES > 3 + LIMIT_ACCEL_FLOAT(I_AXIS, 0); + #if NON_E_AXES > 4 + LIMIT_ACCEL_FLOAT(J_AXIS, 0); + #if NON_E_AXES > 5 + LIMIT_ACCEL_FLOAT(K_AXIS, 0); + #endif + #endif + #endif LIMIT_ACCEL_FLOAT(E_AXIS, ACCEL_IDX); } } @@ -2374,20 +2510,29 @@ bool Planner::_populate_block(block_t * const block, bool split_move, already calculated in a different place. */ // Unit vector of previous path line segment - static float previous_unit_vec[XYZE]; + static float previous_unit_vec[NUM_AXIS]; #if IS_KINEMATIC && ENABLED(JUNCTION_DEVIATION) float unit_vec[] = { delta_mm_cart[X_AXIS] * inverse_millimeters, delta_mm_cart[Y_AXIS] * inverse_millimeters, delta_mm_cart[Z_AXIS] * inverse_millimeters, - delta_mm_cart[E_AXIS] * inverse_millimeters + delta_mm_cart[E_AXIS] * inverse_millimeters }; #else float unit_vec[] = { delta_mm[X_AXIS] * inverse_millimeters, delta_mm[Y_AXIS] * inverse_millimeters, delta_mm[Z_AXIS] * inverse_millimeters, + #if NON_E_AXES > 3 + delta_mm_cart[I_AXIS] * inverse_millimeters, + #if NON_E_AXES > 4 + delta_mm_cart[J_AXIS] * inverse_millimeters, + #if NON_E_AXES > 5 + delta_mm_cart[K_AXIS] * inverse_millimeters, + #endif + #endif + #endif delta_mm[E_AXIS] * inverse_millimeters }; #endif @@ -2408,6 +2553,15 @@ bool Planner::_populate_block(block_t * const block, bool split_move, float junction_cos_theta = -previous_unit_vec[X_AXIS] * unit_vec[X_AXIS] -previous_unit_vec[Y_AXIS] * unit_vec[Y_AXIS] -previous_unit_vec[Z_AXIS] * unit_vec[Z_AXIS] + #if NON_E_AXES > 3 + -previous_unit_vec[I_AXIS] * unit_vec[I_AXIS] + #if NON_E_AXES > 4 + -previous_unit_vec[J_AXIS] * unit_vec[J_AXIS] + #if NON_E_AXES > 5 + -previous_unit_vec[K_AXIS] * unit_vec[K_AXIS] + #endif + #endif + #endif -previous_unit_vec[E_AXIS] * unit_vec[E_AXIS] ; @@ -2424,6 +2578,15 @@ bool Planner::_populate_block(block_t * const block, bool split_move, unit_vec[X_AXIS] - previous_unit_vec[X_AXIS], unit_vec[Y_AXIS] - previous_unit_vec[Y_AXIS], unit_vec[Z_AXIS] - previous_unit_vec[Z_AXIS], + #if NON_E_AXES > 3 + unit_vec[I_AXIS] - previous_unit_vec[I_AXIS], + #if NON_E_AXES > 4 + unit_vec[J_AXIS] - previous_unit_vec[J_AXIS], + #if NON_E_AXES > 5 + unit_vec[K_AXIS] - previous_unit_vec[K_AXIS], + #endif + #endif + #endif unit_vec[E_AXIS] - previous_unit_vec[E_AXIS] }; normalize_junction_vector(junction_unit_vec); @@ -2473,7 +2636,7 @@ bool Planner::_populate_block(block_t * const block, bool split_move, #if ENABLED(JUNCTION_DEVIATION) && ENABLED(LIN_ADVANCE) LOOP_XYZ(i) #else - LOOP_XYZE(i) + LOOP_NUM_AXIS(i) #endif { const float jerk = ABS(current_speed[i]), // cs : Starting from zero, change in speed for this axis @@ -2510,7 +2673,7 @@ bool Planner::_populate_block(block_t * const block, bool split_move, #if ENABLED(JUNCTION_DEVIATION) && ENABLED(LIN_ADVANCE) LOOP_XYZ(axis) #else - LOOP_XYZE(axis) + LOOP_NUM_AXIS(axis) #endif { // Limit an axis. We have to differentiate: coasting, reversal of an axis, full stop. @@ -2609,6 +2772,15 @@ void Planner::buffer_sync_block() { block->position[A_AXIS] = position[A_AXIS]; block->position[B_AXIS] = position[B_AXIS]; block->position[C_AXIS] = position[C_AXIS]; + #if NON_E_AXES > 3 + block->position[I_AXIS] = position[I_AXIS]; + #if NON_E_AXES > 4 + block->position[J_AXIS] = position[J_AXIS]; + #if NON_E_AXES > 5 + block->position[K_AXIS] = position[K_AXIS]; + #endif + #endif + #endif block->position[E_AXIS] = position[E_AXIS]; // If this is the first added movement, reload the delay, otherwise, cancel it. @@ -2638,9 +2810,19 @@ void Planner::buffer_sync_block() { * extruder - target extruder * millimeters - the length of the movement, if known */ -bool Planner::buffer_segment(const float &a, const float &b, const float &c, const float &e +bool Planner::buffer_segment(const float &a, const float &b, const float &c + #if NON_E_AXES > 3 + , const float &i + #if NON_E_AXES > 4 + , const float &j + #if NON_E_AXES > 5 + , const float &k + #endif + #endif + #endif + , const float &e #if IS_KINEMATIC && ENABLED(JUNCTION_DEVIATION) - , const float (&delta_mm_cart)[XYZE] + , const float (&delta_mm_cart)[NUM_AXIS] #endif , const float &fr_mm_s, const uint8_t extruder, const float &millimeters/*=0.0*/ ) { @@ -2658,15 +2840,34 @@ bool Planner::buffer_segment(const float &a, const float &b, const float &c, con // The target position of the tool in absolute steps // Calculate target position in absolute steps - const int32_t target[ABCE] = { + const int32_t target[NUM_AXIS] = { LROUND(a * settings.axis_steps_per_mm[A_AXIS]), LROUND(b * settings.axis_steps_per_mm[B_AXIS]), LROUND(c * settings.axis_steps_per_mm[C_AXIS]), + #if NON_E_AXES > 3 + LROUND(i * settings.axis_steps_per_mm[I_AXIS]), + #if NON_E_AXES > 4 + LROUND(j * settings.axis_steps_per_mm[J_AXIS]), + #if NON_E_AXES > 5 + LROUND(k * settings.axis_steps_per_mm[K_AXIS]), + #endif + #endif + #endif LROUND(e * settings.axis_steps_per_mm[E_AXIS_N(extruder)]) }; #if HAS_POSITION_FLOAT - const float target_float[XYZE] = { a, b, c, e }; + const float target_float[NUM_AXIS] = { a, b, c + #if NON_E_AXES > 3 + , i + #if NON_E_AXES > 4 + , j + #if NON_E_AXES > 5 + , k + #endif + #endif + #endif + e }; #endif // DRYRUN prevents E moves from taking place @@ -2734,12 +2935,32 @@ bool Planner::buffer_segment(const float &a, const float &b, const float &c, con * millimeters - the length of the movement, if known * inv_duration - the reciprocal if the duration of the movement, if known (kinematic only if feeedrate scaling is enabled) */ -bool Planner::buffer_line(const float &rx, const float &ry, const float &rz, const float &e, const float &fr_mm_s, const uint8_t extruder, const float millimeters +bool Planner::buffer_line(const float &rx, const float &ry, const float &rz + #if NON_E_AXES > 3 + , const float &ri + #if NON_E_AXES > 4 + , const float &rj + #if NON_E_AXES > 5 + , const float &rk + #endif + #endif + #endif + , const float &e, const float &fr_mm_s, const uint8_t extruder, const float millimeters #if ENABLED(SCARA_FEEDRATE_SCALING) , const float &inv_duration #endif ) { - float raw[XYZE] = { rx, ry, rz, e }; + float raw[NUM_AXIS] = { rx, ry, rz + #if NON_E_AXES > 3 + , ri + #if NON_E_AXES > 4 + , rj + #if NON_E_AXES > 5 + , rk + #endif + #endif + #endif + , e }; #if HAS_POSITION_MODIFIERS apply_modifiers(raw); #endif @@ -2794,18 +3015,46 @@ bool Planner::buffer_line(const float &rx, const float &ry, const float &rz, con * The provided ABC position is in machine units. */ -void Planner::set_machine_position_mm(const float &a, const float &b, const float &c, const float &e) { +void Planner::set_machine_position_mm(const float &a, const float &b, const float &c + #if NON_E_AXES > 3 + , const float &i + #if NON_E_AXES > 4 + , const float &j + #if NON_E_AXES > 5 + , const float &k + #endif + #endif + #endif + , const float &e) { #if ENABLED(DISTINCT_E_FACTORS) last_extruder = active_extruder; #endif position[A_AXIS] = LROUND(a * settings.axis_steps_per_mm[A_AXIS]); position[B_AXIS] = LROUND(b * settings.axis_steps_per_mm[B_AXIS]); position[C_AXIS] = LROUND(c * settings.axis_steps_per_mm[C_AXIS]); + #if NON_E_AXES > 3 + position[I_AXIS] = LROUND(i * settings.axis_steps_per_mm[I_AXIS]); + #if NON_E_AXES > 4 + position[J_AXIS] = LROUND(j * settings.axis_steps_per_mm[J_AXIS]); + #if NON_E_AXES > 5 + position[K_AXIS] = LROUND(k * settings.axis_steps_per_mm[K_AXIS]); + #endif + #endif + #endif position[E_AXIS] = LROUND(e * settings.axis_steps_per_mm[E_AXIS_N(active_extruder)]); #if HAS_POSITION_FLOAT position_float[A_AXIS] = a; position_float[B_AXIS] = b; position_float[C_AXIS] = c; + #if NON_E_AXES > 3 + position_float[I_AXIS] = i; + #if NON_E_AXES > 4 + position_float[J_AXIS] = j; + #if NON_E_AXES > 5 + position_float[K_AXIS] = k; + #endif + #endif + #endif position_float[E_AXIS] = e; #endif if (has_blocks_queued()) { @@ -2814,11 +3063,41 @@ void Planner::set_machine_position_mm(const float &a, const float &b, const floa buffer_sync_block(); } else - stepper.set_position(position[A_AXIS], position[B_AXIS], position[C_AXIS], position[E_AXIS]); + stepper.set_position(position[A_AXIS], position[B_AXIS], position[C_AXIS] + #if NON_E_AXES > 3 + , position[I_AXIS] + #if NON_E_AXES > 4 + , position[J_AXIS] + #if NON_E_AXES > 5 + , position[K_AXIS] + #endif + #endif + #endif + , position[E_AXIS]); } -void Planner::set_position_mm(const float &rx, const float &ry, const float &rz, const float &e) { - float raw[XYZE] = { rx, ry, rz, e }; +void Planner::set_position_mm(const float &rx, const float &ry, const float &rz + #if NON_E_AXES > 3 + , const float &ri + #if NON_E_AXES > 4 + , const float &rj + #if NON_E_AXES > 5 + , const float &rk + #endif + #endif + #endif + , const float &e) { + float raw[NUM_AXIS] = { rx, ry, rz + #if NON_E_AXES > 3 + , ri + #if NON_E_AXES > 4 + , rj + #if NON_E_AXES > 5 + , rk + #endif + #endif + #endif + , e }; #if HAS_POSITION_MODIFIERS apply_modifiers(raw #if HAS_LEVELING @@ -2835,7 +3114,17 @@ void Planner::set_position_mm(const float &rx, const float &ry, const float &rz, inverse_kinematics(raw); set_machine_position_mm(delta[A_AXIS], delta[B_AXIS], delta[C_AXIS], raw[E_AXIS]); #else - set_machine_position_mm(raw[X_AXIS], raw[Y_AXIS], raw[Z_AXIS], raw[E_AXIS]); + set_machine_position_mm(raw[X_AXIS], raw[Y_AXIS], raw[Z_AXIS] + #if NON_E_AXES > 3 + , raw[I_AXIS] + #if NON_E_AXES > 4 + , raw[J_AXIS] + #if NON_E_AXES > 5 + , raw[K_AXIS] + #endif + #endif + #endif + , raw[E_AXIS]); #endif } @@ -2873,7 +3162,7 @@ void Planner::reset_acceleration_rates() { #define AXIS_CONDITION true #endif uint32_t highest_rate = 1; - LOOP_XYZE_N(i) { + LOOP_NUM_AXIS_N(i) { max_acceleration_steps_per_s2[i] = settings.max_acceleration_mm_per_s2[i] * settings.axis_steps_per_mm[i]; if (AXIS_CONDITION) NOLESS(highest_rate, max_acceleration_steps_per_s2[i]); } @@ -2885,7 +3174,7 @@ void Planner::reset_acceleration_rates() { // Recalculate position, steps_to_mm if settings.axis_steps_per_mm changes! void Planner::refresh_positioning() { - LOOP_XYZE_N(i) steps_to_mm[i] = 1.0f / settings.axis_steps_per_mm[i]; + LOOP_NUM_AXIS_N(i) steps_to_mm[i] = 1.0f / settings.axis_steps_per_mm[i]; set_position_mm(current_position); reset_acceleration_rates(); } diff --git a/Marlin/src/module/planner.h b/Marlin/src/module/planner.h index 44be1413cca2..017b138171ca 100644 --- a/Marlin/src/module/planner.h +++ b/Marlin/src/module/planner.h @@ -164,10 +164,10 @@ typedef struct block_t { #define BLOCK_MOD(n) ((n)&(BLOCK_BUFFER_SIZE-1)) typedef struct { - uint32_t max_acceleration_mm_per_s2[XYZE_N], // (mm/s^2) M201 XYZE + uint32_t max_acceleration_mm_per_s2[NUM_AXIS_N], // (mm/s^2) M201 XYZE min_segment_time_us; // (µs) M205 B - float axis_steps_per_mm[XYZE_N], // (steps) M92 XYZE - Steps per millimeter - max_feedrate_mm_s[XYZE_N], // (mm/s) M203 XYZE - Max speeds + float axis_steps_per_mm[NUM_AXIS_N], // (steps) M92 XYZE - Steps per millimeter + max_feedrate_mm_s[NUM_AXIS_N], // (mm/s) M203 XYZE - Max speeds acceleration, // (mm/s^2) M204 S - Normal acceleration. DEFAULT ACCELERATION for all printing moves. retract_acceleration, // (mm/s^2) M204 R - Retract acceleration. Filament pull-back and push-forward while standing still in the other axes travel_acceleration, // (mm/s^2) M204 T - Travel acceleration. DEFAULT ACCELERATION for all NON printing moves. @@ -237,8 +237,8 @@ class Planner { static planner_settings_t settings; - static uint32_t max_acceleration_steps_per_s2[XYZE_N]; // (steps/s^2) Derived from mm_per_s2 - static float steps_to_mm[XYZE_N]; // Millimeters per step + static uint32_t max_acceleration_steps_per_s2[NUM_AXIS_N]; // (steps/s^2) Derived from mm_per_s2 + static float steps_to_mm[NUM_AXIS_N]; // Millimeters per step #if ENABLED(JUNCTION_DEVIATION) static float junction_deviation_mm; // (mm) M205 J @@ -256,7 +256,7 @@ class Planner { #if ENABLED(JUNCTION_DEVIATION) && ENABLED(LIN_ADVANCE) XYZ // (mm/s^2) M205 XYZ - The largest speed change requiring no acceleration. #else - XYZE // (mm/s^2) M205 XYZE - The largest speed change requiring no acceleration. + NUM_AXIS // (mm/s^2) M205 XYZE - The largest speed change requiring no acceleration. #endif ]; #endif @@ -278,11 +278,11 @@ class Planner { #endif #if HAS_POSITION_FLOAT - static float position_float[XYZE]; + static float position_float[NUM_AXIS]; #endif #if IS_KINEMATIC - static float position_cart[XYZE]; + static float position_cart[NUM_AXIS]; #endif static skew_factor_t skew_factor; @@ -468,20 +468,20 @@ class Planner { */ static void apply_leveling(float &rx, float &ry, float &rz); FORCE_INLINE static void apply_leveling(float (&raw)[XYZ]) { apply_leveling(raw[X_AXIS], raw[Y_AXIS], raw[Z_AXIS]); } - FORCE_INLINE static void apply_leveling(float (&raw)[XYZE]) { apply_leveling(raw[X_AXIS], raw[Y_AXIS], raw[Z_AXIS]); } + FORCE_INLINE static void apply_leveling(float (&raw)[NUM_AXIS]) { apply_leveling(raw[X_AXIS], raw[Y_AXIS], raw[Z_AXIS]); } static void unapply_leveling(float raw[XYZ]); #endif #if ENABLED(FWRETRACT) static void apply_retract(float &rz, float &e); - FORCE_INLINE static void apply_retract(float (&raw)[XYZE]) { apply_retract(raw[Z_AXIS], raw[E_AXIS]); } + FORCE_INLINE static void apply_retract(float (&raw)[NUM_AXIS]) { apply_retract(raw[Z_AXIS], raw[E_AXIS]); } static void unapply_retract(float &rz, float &e); - FORCE_INLINE static void unapply_retract(float (&raw)[XYZE]) { unapply_retract(raw[Z_AXIS], raw[E_AXIS]); } + FORCE_INLINE static void unapply_retract(float (&raw)[NUM_AXIS]) { unapply_retract(raw[Z_AXIS], raw[E_AXIS]); } #endif #if HAS_POSITION_MODIFIERS - FORCE_INLINE static void apply_modifiers(float (&pos)[XYZE] + FORCE_INLINE static void apply_modifiers(float (&pos)[NUM_AXIS] #if HAS_LEVELING , bool leveling = #if PLANNER_LEVELING @@ -503,7 +503,7 @@ class Planner { #endif } - FORCE_INLINE static void unapply_modifiers(float (&pos)[XYZE] + FORCE_INLINE static void unapply_modifiers(float (&pos)[NUM_AXIS] #if HAS_LEVELING , bool leveling = #if PLANNER_LEVELING @@ -570,12 +570,12 @@ class Planner { * * Returns true if movement was buffered, false otherwise */ - static bool _buffer_steps(const int32_t (&target)[XYZE] + static bool _buffer_steps(const int32_t (&target)[NUM_AXIS] #if HAS_POSITION_FLOAT - , const float (&target_float)[ABCE] + , const float (&target_float)[NUM_AXIS] #endif #if IS_KINEMATIC && ENABLED(JUNCTION_DEVIATION) - , const float (&delta_mm_cart)[XYZE] + , const float (&delta_mm_cart)[NUM_AXIS] #endif , float fr_mm_s, const uint8_t extruder, const float &millimeters=0.0 ); @@ -593,12 +593,12 @@ class Planner { * Returns true is movement is acceptable, false otherwise */ static bool _populate_block(block_t * const block, bool split_move, - const int32_t (&target)[XYZE] + const int32_t (&target)[NUM_AXIS] #if HAS_POSITION_FLOAT - , const float (&target_float)[XYZE] + , const float (&target_float)[NUM_AXIS] #endif #if IS_KINEMATIC && ENABLED(JUNCTION_DEVIATION) - , const float (&delta_mm_cart)[XYZE] + , const float (&delta_mm_cart)[NUM_AXIS] #endif , float fr_mm_s, const uint8_t extruder, const float &millimeters=0.0 ); @@ -628,20 +628,40 @@ class Planner { * extruder - target extruder * millimeters - the length of the movement, if known */ - static bool buffer_segment(const float &a, const float &b, const float &c, const float &e + static bool buffer_segment(const float &a, const float &b, const float &c + #if NON_E_AXES > 3 + , const float &i + #if NON_E_AXES > 4 + , const float &j + #if NON_E_AXES > 5 + , const float &k + #endif + #endif + #endif + , const float &e #if IS_KINEMATIC && ENABLED(JUNCTION_DEVIATION) - , const float (&delta_mm_cart)[XYZE] + , const float (&delta_mm_cart)[NUM_AXIS] #endif , const float &fr_mm_s, const uint8_t extruder, const float &millimeters=0.0 ); - FORCE_INLINE static bool buffer_segment(const float (&abce)[ABCE] + FORCE_INLINE static bool buffer_segment(const float (&axes)[NUM_AXIS] #if IS_KINEMATIC && ENABLED(JUNCTION_DEVIATION) - , const float (&delta_mm_cart)[XYZE] + , const float (&delta_mm_cart)[NUM_AXIS] #endif , const float &fr_mm_s, const uint8_t extruder, const float &millimeters=0.0 ) { - return buffer_segment(abce[A_AXIS], abce[B_AXIS], abce[C_AXIS], abce[E_AXIS] + return buffer_segment(axes[A_AXIS], axes[B_AXIS], axes[C_AXIS] + #if NON_E_AXES > 3 + , axes[I_AXIS] + #if NON_E_AXES > 4 + , axes[J_AXIS] + #if NON_E_AXES > 5 + , axes[K_AXIS] + #endif + #endif + #endif + , axes[E_AXIS] #if IS_KINEMATIC && ENABLED(JUNCTION_DEVIATION) , delta_mm_cart #endif @@ -662,18 +682,38 @@ class Planner { * millimeters - the length of the movement, if known * inv_duration - the reciprocal if the duration of the movement, if known (kinematic only if feeedrate scaling is enabled) */ - static bool buffer_line(const float &rx, const float &ry, const float &rz, const float &e, const float &fr_mm_s, const uint8_t extruder, const float millimeters=0.0 + static bool buffer_line(const float &rx, const float &ry, const float &rz + #if NON_E_AXES > 3 + , const float &ri + #if NON_E_AXES > 4 + , const float &rj + #if NON_E_AXES > 5 + , &rk + #endif + #endif + #endif + , const float &e, const float &fr_mm_s, const uint8_t extruder, const float millimeters=0.0 #if ENABLED(SCARA_FEEDRATE_SCALING) , const float &inv_duration=0.0 #endif ); - FORCE_INLINE static bool buffer_line(const float (&cart)[XYZE], const float &fr_mm_s, const uint8_t extruder, const float millimeters=0.0 + FORCE_INLINE static bool buffer_line(const float (&cart)[NUM_AXIS], const float &fr_mm_s, const uint8_t extruder, const float millimeters=0.0 #if ENABLED(SCARA_FEEDRATE_SCALING) , const float &inv_duration=0.0 #endif ) { - return buffer_line(cart[X_AXIS], cart[Y_AXIS], cart[Z_AXIS], cart[E_AXIS], fr_mm_s, extruder, millimeters + return buffer_line(cart[X_AXIS], cart[Y_AXIS], cart[Z_AXIS] + #if NON_E_AXES > 3 + , cart[I_AXIS] + #if NON_E_AXES > 4 + , cart[J_AXIS] + #if NON_E_AXES > 5 + , cart[K_AXIS] + #endif + #endif + #endif + , cart[E_AXIS], fr_mm_s, extruder, millimeters #if ENABLED(SCARA_FEEDRATE_SCALING) , inv_duration #endif @@ -693,8 +733,28 @@ class Planner { * * Clears previous speed values. */ - static void set_position_mm(const float &rx, const float &ry, const float &rz, const float &e); - FORCE_INLINE static void set_position_mm(const float (&cart)[XYZE]) { set_position_mm(cart[X_AXIS], cart[Y_AXIS], cart[Z_AXIS], cart[E_AXIS]); } + static void set_position_mm(const float &rx, const float &ry, const float &rz + #if NON_E_AXES > 3 + , const float &ri + #if NON_E_AXES > 4 + , const float &rj + #if NON_E_AXES > 5 + , const float &rk + #endif + #endif + #endif + , const float &e); + FORCE_INLINE static void set_position_mm(const float (&cart)[NUM_AXIS]) { set_position_mm(cart[X_AXIS], cart[Y_AXIS], cart[Z_AXIS] + #if NON_E_AXES > 3 + , cart[I_AXIS] + #if NON_E_AXES > 4 + , cart[J_AXIS] + #if NON_E_AXES > 5 + , cart[K_AXIS] + #endif + #endif + #endif + , cart[E_AXIS]); } static void set_e_position_mm(const float &e); /** @@ -703,8 +763,28 @@ class Planner { * The supplied position is in machine space, and no additional * conversions are applied. */ - static void set_machine_position_mm(const float &a, const float &b, const float &c, const float &e); - FORCE_INLINE static void set_machine_position_mm(const float (&abce)[ABCE]) { set_machine_position_mm(abce[A_AXIS], abce[B_AXIS], abce[C_AXIS], abce[E_AXIS]); } + static void set_machine_position_mm(const float &a, const float &b, const float &c + #if NON_E_AXES > 3 + , const float &i + #if NON_E_AXES > 4 + , const float &j + #if NON_E_AXES > 5 + , const float &k + #endif + #endif + #endif + , const float &e); + FORCE_INLINE static void set_machine_position_mm(const float (&axes)[NUM_AXIS]) { set_machine_position_mm(axes[A_AXIS], axes[B_AXIS], axes[C_AXIS] + #if NON_E_AXES > 3 + , axes[I_AXIS] + #if NON_E_AXES > 4 + , axes[J_AXIS] + #if NON_E_AXES > 5 + , axes[K_AXIS] + #endif + #endif + #endif + , axes[E_AXIS]); } /** * Get an axis position according to stepper position(s) @@ -935,16 +1015,16 @@ class Planner { #if ENABLED(JUNCTION_DEVIATION) - FORCE_INLINE static void normalize_junction_vector(float (&vector)[XYZE]) { + FORCE_INLINE static void normalize_junction_vector(float (&vector)[NUM_AXIS]) { float magnitude_sq = 0; - LOOP_XYZE(idx) if (vector[idx]) magnitude_sq += sq(vector[idx]); + LOOP_NUM_AXIS(idx) if (vector[idx]) magnitude_sq += sq(vector[idx]); const float inv_magnitude = RSQRT(magnitude_sq); - LOOP_XYZE(idx) vector[idx] *= inv_magnitude; + LOOP_NUM_AXIS(idx) vector[idx] *= inv_magnitude; } - FORCE_INLINE static float limit_value_by_axis_maximum(const float &max_value, float (&unit_vec)[XYZE]) { + FORCE_INLINE static float limit_value_by_axis_maximum(const float &max_value, float (&unit_vec)[NUM_AXIS]) { float limit_value = max_value; - LOOP_XYZE(idx) if (unit_vec[idx]) // Avoid divide by zero + LOOP_NUM_AXIS(idx) if (unit_vec[idx]) // Avoid divide by zero NOMORE(limit_value, ABS(settings.max_acceleration_mm_per_s2[idx] / unit_vec[idx])); return limit_value; } diff --git a/Marlin/src/module/stepper.cpp b/Marlin/src/module/stepper.cpp index 57e8e4195c0a..e32247641342 100644 --- a/Marlin/src/module/stepper.cpp +++ b/Marlin/src/module/stepper.cpp @@ -85,10 +85,12 @@ Stepper stepper; // Singleton #include "speed_lookuptable.h" #endif + #include "endstops.h" #include "planner.h" #include "motion.h" +#include "../core/macros.h" #include "temperature.h" #include "../lcd/ultralcd.h" #include "../core/language.h" @@ -161,9 +163,9 @@ uint8_t Stepper::steps_per_isr; #endif uint8_t Stepper::oversampling_factor; -int32_t Stepper::delta_error[XYZE] = { 0 }; +int32_t Stepper::delta_error[NUM_AXIS] = { 0 }; -uint32_t Stepper::advance_dividend[XYZE] = { 0 }, +uint32_t Stepper::advance_dividend[NUM_AXIS] = { 0 }, Stepper::advance_divisor = 0, Stepper::step_events_completed = 0, // The number of step events executed in the current block Stepper::accelerate_until, // The point from where we need to stop acceleration @@ -210,10 +212,10 @@ int32_t Stepper::ticks_nominal = -1; uint32_t Stepper::acc_step_rate; // needed for deceleration start point #endif -volatile int32_t Stepper::endstops_trigsteps[XYZ]; +volatile int32_t Stepper::endstops_trigsteps[NON_E_AXES]; volatile int32_t Stepper::count_position[NUM_AXIS] = { 0 }; -int8_t Stepper::count_direction[NUM_AXIS] = { 0, 0, 0, 0 }; +int8_t Stepper::count_direction[NUM_AXIS] = { 0 }; #define DUAL_ENDSTOP_APPLY_STEP(A,V) \ if (separate_multi_axis) { \ @@ -336,6 +338,20 @@ int8_t Stepper::count_direction[NUM_AXIS] = { 0, 0, 0, 0 }; #define Z_APPLY_STEP(v,Q) Z_STEP_WRITE(v) #endif +#if NON_E_AXES > 3 + #define I_APPLY_DIR(v,Q) I_DIR_WRITE(v) + #define I_APPLY_STEP(v,Q) I_STEP_WRITE(v) + #if NON_E_AXES > 4 + #define J_APPLY_DIR(v,Q) J_DIR_WRITE(v) + #define J_APPLY_STEP(v,Q) J_STEP_WRITE(v) + #if NON_E_AXES > 5 + #define K_APPLY_DIR(v,Q) K_DIR_WRITE(v) + #define K_APPLY_STEP(v,Q) K_STEP_WRITE(v) + #endif + #endif +#endif + + #if DISABLED(MIXING_EXTRUDER) #define E_APPLY_STEP(v,Q) E_STEP_WRITE(stepper_extruder, v) #endif @@ -380,6 +396,19 @@ void Stepper::set_directions() { SET_STEP_DIR(Z); // C #endif +#if HAS_I_DIR + SET_STEP_DIR(I); // I +#endif + +#if HAS_J_DIR + SET_STEP_DIR(J); // J +#endif + +#if HAS_K_DIR + SET_STEP_DIR(K); // K +#endif + + #if DISABLED(LIN_ADVANCE) #if ENABLED(MIXING_EXTRUDER) // Because this is valid for the whole block we don't know @@ -1451,6 +1480,17 @@ void Stepper::stepper_pulse_phase_isr() { #if HAS_Z_STEP PULSE_START(Z); #endif + #if HAS_I_STEP + PULSE_START(I); + #endif + #if HAS_J_STEP + PULSE_START(J); + #endif + #if HAS_K_STEP + PULSE_START(K); + #endif + + // Pulse Extruders // Tick the E axis, correct error term and update position @@ -1497,6 +1537,15 @@ void Stepper::stepper_pulse_phase_isr() { #if HAS_Z_STEP PULSE_STOP(Z); #endif + #if HAS_I_STEP + PULSE_STOP(I); + #endif + #if HAS_J_STEP + PULSE_STOP(J); + #endif + #if HAS_K_STEP + PULSE_STOP(K); + #endif #if DISABLED(LIN_ADVANCE) #if ENABLED(MIXING_EXTRUDER) @@ -1658,7 +1707,17 @@ uint32_t Stepper::stepper_block_phase_isr() { while (TEST(current_block->flag, BLOCK_BIT_SYNC_POSITION)) { _set_position( current_block->position[A_AXIS], current_block->position[B_AXIS], - current_block->position[C_AXIS], current_block->position[E_AXIS] + current_block->position[C_AXIS], + #if NON_E_AXES > 3 + current_block->position[I_AXIS], + #if NON_E_AXES > 4 + current_block->position[J_AXIS], + #if NON_E_AXES > 5 + current_block->position[K_AXIS], + #endif + #endif + #endif + current_block->position[E_AXIS] ); planner.discard_current_block(); @@ -1729,10 +1788,77 @@ uint32_t Stepper::stepper_block_phase_isr() { #define Z_MOVE_TEST !!current_block->steps[C_AXIS] #endif + #if NON_E_AXES > 3 + #if CORE_IS_XY || CORE_IS_YZ + /** + * Head direction in -Y axis for CoreXY / CoreYZ bots. + * + * If steps differ, both axes are moving + * If DeltaA == DeltaB, the movement is only in the 1st axis (X or Y) + * If DeltaA == -DeltaB, the movement is only in the 2nd axis (Y or Z) + */ + #if ENABLED(COREYX) || ENABLED(COREYZ) + #define I_CMP == + #else + #define I_CMP != + #endif + #define I_MOVE_TEST ( S_(1) != S_(2) || (S_(1) > 0 && D_(1) I_CMP D_(2)) ) + #else + #define I_MOVE_TEST !!current_block->steps[I_AXIS] + #endif + #if NON_E_AXES > 4 + #if CORE_IS_XY || CORE_IS_YZ + /** + * Head direction in -Y axis for CoreXY / CoreYZ bots. + * + * If steps differ, both axes are moving + * If DeltaA == DeltaB, the movement is only in the 1st axis (X or Y) + * If DeltaA == -DeltaB, the movement is only in the 2nd axis (Y or Z) + */ + #if ENABLED(COREYX) || ENABLED(COREYZ) + #define J_CMP == + #else + #define J_CMP != + #endif + #define J_MOVE_TEST ( S_(1) != S_(2) || (S_(1) > 0 && D_(1) J_CMP D_(2)) ) + #else + #define J_MOVE_TEST !!current_block->steps[J_AXIS] + #endif + #if NON_E_AXES > 5 + #if CORE_IS_XY || CORE_IS_YZ + /** + * Head direction in -Y axis for CoreXY / CoreYZ bots. + * + * If steps differ, both axes are moving + * If DeltaA == DeltaB, the movement is only in the 1st axis (X or Y) + * If DeltaA == -DeltaB, the movement is only in the 2nd axis (Y or Z) + */ + #if ENABLED(COREYX) || ENABLED(COREYZ) + #define K_CMP == + #else + #define K_CMP != + #endif + #define K_MOVE_TEST ( S_(1) != S_(2) || (S_(1) > 0 && D_(1) K_CMP D_(2)) ) + #else + #define K_MOVE_TEST !!current_block->steps[K_AXIS] + #endif + #endif // NON_E_AXES > 5 + #endif // NON_E_AXES > 4 + #endif // NON_E_AXES > 3 + uint8_t axis_bits = 0; if (X_MOVE_TEST) SBI(axis_bits, A_AXIS); if (Y_MOVE_TEST) SBI(axis_bits, B_AXIS); if (Z_MOVE_TEST) SBI(axis_bits, C_AXIS); + #if NON_E_AXES > 3 + if (I_MOVE_TEST) SBI(axis_bits, I_AXIS); + #if NON_E_AXES > 4 + if (J_MOVE_TEST) SBI(axis_bits, J_AXIS); + #if NON_E_AXES > 5 + if (K_MOVE_TEST) SBI(axis_bits, K_AXIS); + #endif + #endif + #endif //if (!!current_block->steps[E_AXIS]) SBI(axis_bits, E_AXIS); //if (!!current_block->steps[A_AXIS]) SBI(axis_bits, X_HEAD); //if (!!current_block->steps[B_AXIS]) SBI(axis_bits, Y_HEAD); @@ -1759,12 +1885,31 @@ uint32_t Stepper::stepper_block_phase_isr() { step_event_count = current_block->step_event_count << oversampling; // Initialize Bresenham delta errors to 1/2 - delta_error[X_AXIS] = delta_error[Y_AXIS] = delta_error[Z_AXIS] = delta_error[E_AXIS] = -int32_t(step_event_count); + delta_error[X_AXIS] = delta_error[Y_AXIS] = delta_error[Z_AXIS] = delta_error[E_AXIS] + #if NON_E_AXES > 3 + = delta_error[I_AXIS] + #if NON_E_AXES > 4 + = delta_error[J_AXIS] + #if NON_E_AXES > 5 + = delta_error[K_AXIS] + #endif + #endif + #endif + = -int32_t(step_event_count); // Calculate Bresenham dividends advance_dividend[X_AXIS] = current_block->steps[X_AXIS] << 1; advance_dividend[Y_AXIS] = current_block->steps[Y_AXIS] << 1; advance_dividend[Z_AXIS] = current_block->steps[Z_AXIS] << 1; + #if NON_E_AXES > 3 + advance_dividend[I_AXIS] = current_block->steps[I_AXIS] << 1; + #if NON_E_AXES > 4 + advance_dividend[J_AXIS] = current_block->steps[J_AXIS] << 1; + #if NON_E_AXES > 5 + advance_dividend[K_AXIS] = current_block->steps[K_AXIS] << 1; + #endif + #endif + #endif advance_dividend[E_AXIS] = current_block->steps[E_AXIS] << 1; // Calculate Bresenham divisor @@ -2016,6 +2161,15 @@ void Stepper::init() { Z3_DIR_INIT; #endif #endif + #if HAS_I_DIR + I_DIR_INIT; + #endif + #if HAS_J_DIR + J_DIR_INIT; + #endif + #if HAS_K_DIR + K_DIR_INIT; + #endif #if HAS_E0_DIR E0_DIR_INIT; #endif @@ -2064,6 +2218,19 @@ void Stepper::init() { if (!Z_ENABLE_ON) Z3_ENABLE_WRITE(HIGH); #endif #endif + #if HAS_I_ENABLE + I_ENABLE_INIT; + if (!I_ENABLE_ON) I_ENABLE_WRITE(HIGH); + #endif + #if HAS_J_ENABLE + J_ENABLE_INIT; + if (!J_ENABLE_ON) J_ENABLE_WRITE(HIGH); + #endif + #if HAS_K_ENABLE + K_ENABLE_INIT; + if (!K_ENABLE_ON) K_ENABLE_WRITE(HIGH); + #endif + #if HAS_E0_ENABLE E0_ENABLE_INIT; if (!E_ENABLE_ON) E0_ENABLE_WRITE(HIGH); @@ -2128,7 +2295,15 @@ void Stepper::init() { #endif AXIS_INIT(Z, Z); #endif - + #if HAS_I_STEP + AXIS_INIT(I, I); + #endif + #if HAS_J_STEP + AXIS_INIT(J, J); + #endif + #if HAS_K_STEP + AXIS_INIT(K, K); + #endif #if E_STEPPERS > 0 && HAS_E0_STEP E_AXIS_INIT(0); #endif @@ -2158,7 +2333,17 @@ void Stepper::init() { last_direction_bits = 0 | (INVERT_X_DIR ? _BV(X_AXIS) : 0) | (INVERT_Y_DIR ? _BV(Y_AXIS) : 0) - | (INVERT_Z_DIR ? _BV(Z_AXIS) : 0); + | (INVERT_Z_DIR ? _BV(Z_AXIS) : 0) + #if NON_E_AXES > 3 + | (INVERT_I_DIR ? _BV(I_AXIS) : 0) + #if NON_E_AXES > 4 + | (INVERT_J_DIR ? _BV(J_AXIS) : 0) + #if NON_E_AXES > 5 + | (INVERT_K_DIR ? _BV(K_AXIS) : 0) + #endif + #endif + #endif + ; set_directions(); } @@ -2172,7 +2357,17 @@ void Stepper::init() { * This allows get_axis_position_mm to correctly * derive the current XYZ position later on. */ -void Stepper::_set_position(const int32_t &a, const int32_t &b, const int32_t &c, const int32_t &e) { +void Stepper::_set_position(const int32_t &a, const int32_t &b, const int32_t &c + #if NON_E_AXES > 3 + , const int32_t &i + #if NON_E_AXES > 4 + , const int32_t &j + #if NON_E_AXES > 5 + , const int32_t &k + #endif + #endif + #endif + , const int32_t &e) { #if CORE_IS_XY // corexy positioning // these equations follow the form of the dA and dB equations on http://www.corexy.com/theory.html @@ -2194,6 +2389,15 @@ void Stepper::_set_position(const int32_t &a, const int32_t &b, const int32_t &c count_position[X_AXIS] = a; count_position[Y_AXIS] = b; count_position[Z_AXIS] = c; + #if NON_E_AXES > 3 + count_position[I_AXIS] = i; + #if NON_E_AXES > 4 + count_position[J_AXIS] = j; + #if NON_E_AXES > 5 + count_position[K_AXIS] = k; + #endif + #endif + #endif #endif count_position[E_AXIS] = e; } @@ -2274,8 +2478,18 @@ void Stepper::report_positions() { const int32_t xpos = count_position[X_AXIS], ypos = count_position[Y_AXIS], - zpos = count_position[Z_AXIS]; - + zpos = count_position[Z_AXIS] + #if NON_E_AXES > 3 + , ipos = count_position[I_AXIS] + #if NON_E_AXES > 4 + , jpos = count_position[J_AXIS]; + #if NON_E_AXES > 5 + , kpos = count_position[K_AXIS]; + #endif + #endif + #endif + ; + if (was_enabled) ENABLE_STEPPER_DRIVER_INTERRUPT(); #if CORE_IS_XY || CORE_IS_XZ || ENABLED(DELTA) || IS_SCARA @@ -2299,6 +2513,19 @@ void Stepper::report_positions() { #endif SERIAL_ECHO(zpos); + #if NON_E_AXES > 3 + SERIAL_ECHOPGM(" I:"); + SERIAL_ECHO(ipos); + #if NON_E_AXES > 4 + SERIAL_ECHOPGM(" J:"); + SERIAL_ECHO(jpos); + #if NON_E_AXES > 5 + SERIAL_ECHOPGM(" K:"); + SERIAL_ECHO(kpos); + #endif + #endif + #endif + SERIAL_EOL(); } @@ -2405,15 +2632,39 @@ void Stepper::report_positions() { enable_X(); enable_Y(); enable_Z(); - + #if NON_E_AXES > 3 + enable_I(); + #if NON_E_AXES > 4 + enable_J(); + #if NON_E_AXES > 5 + enable_K(); + #endif + #endif + #endif const uint8_t old_x_dir_pin = X_DIR_READ, old_y_dir_pin = Y_DIR_READ, old_z_dir_pin = Z_DIR_READ; - + #if NON_E_AXES > 3 + const uint8_t old_i_dir_pin = I_DIR_READ; + #if NON_E_AXES > 3 + const uint8_t old_j_dir_pin = J_DIR_READ; + #if NON_E_AXES > 3 + const uint8_t old_k_dir_pin = K_DIR_READ; + #endif + #endif + #endif X_DIR_WRITE(INVERT_X_DIR ^ z_direction); Y_DIR_WRITE(INVERT_Y_DIR ^ z_direction); Z_DIR_WRITE(INVERT_Z_DIR ^ z_direction); - + #if NON_E_AXES > 3 + I_DIR_WRITE(INVERT_I_DIR ^ z_direction); + #if NON_E_AXES > 3 + J_DIR_WRITE(INVERT_J_DIR ^ z_direction); + #if NON_E_AXES > 3 + K_DIR_WRITE(INVERT_K_DIR ^ z_direction); + #endif + #endif + #endif #if MINIMUM_STEPPER_DIR_DELAY > 0 DELAY_NS(MINIMUM_STEPPER_DIR_DELAY); #endif @@ -2423,22 +2674,63 @@ void Stepper::report_positions() { X_STEP_WRITE(!INVERT_X_STEP_PIN); Y_STEP_WRITE(!INVERT_Y_STEP_PIN); Z_STEP_WRITE(!INVERT_Z_STEP_PIN); - + #if NON_E_AXES > 3 + I_STEP_WRITE(!INVERT_I_STEP_PIN); + #if NON_E_AXES > 4 + J_STEP_WRITE(!INVERT_J_STEP_PIN); + #if NON_E_AXES > 5 + K_STEP_WRITE(!INVERT_K_STEP_PIN); + #endif + #endif + #endif _PULSE_WAIT; X_STEP_WRITE(INVERT_X_STEP_PIN); Y_STEP_WRITE(INVERT_Y_STEP_PIN); Z_STEP_WRITE(INVERT_Z_STEP_PIN); + #if NON_E_AXES > 3 + I_STEP_WRITE(INVERT_I_STEP_PIN); + #if NON_E_AXES > 4 + J_STEP_WRITE(INVERT_J_STEP_PIN); + #if NON_E_AXES > 5 + K_STEP_WRITE(INVERT_K_STEP_PIN); + #endif + #endif + #endif // Restore direction bits X_DIR_WRITE(old_x_dir_pin); Y_DIR_WRITE(old_y_dir_pin); Z_DIR_WRITE(old_z_dir_pin); - + #if NON_E_AXES > 3 + I_DIR_WRITE(old_i_dir_pin); + #if NON_E_AXES > 4 + J_DIR_WRITE(old_j_dir_pin); + #if NON_E_AXES > 5 + K_DIR_WRITE(old_k_dir_pin); + #endif + #endif + #endif #endif } break; + #if NON_E_AXES > 3 + case I_AXIS: + BABYSTEP_AXIS(I, false, direction); + break; + #if NON_E_AXES > 4 + case J_AXIS: + BABYSTEP_AXIS(J, false, direction); + break; + #if NON_E_AXES > 5 + case K_AXIS: + BABYSTEP_AXIS(K, false, direction); + break; + #endif // NON_E_AXES > 5 + #endif // NON_E_AXES > 4 + #endif // NON_E_AXES > 3 + default: break; } sei(); @@ -2637,6 +2929,27 @@ void Stepper::report_positions() { SET_OUTPUT(Z3_MS3_PIN); #endif #endif + #if HAS_I_MICROSTEPS + SET_OUTPUT(I_MS1_PIN); + SET_OUTPUT(I_MS2_PIN); + #if PIN_EXISTS(I_MS3) + SET_OUTPUT(I_MS3_PIN); + #endif + #endif + #if HAS_J_MICROSTEPS + SET_OUTPUT(J_MS1_PIN); + SET_OUTPUT(J_MS2_PIN); + #if PIN_EXISTS(J_MS3) + SET_OUTPUT(J_MS3_PIN); + #endif + #endif + #if HAS_K_MICROSTEPS + SET_OUTPUT(K_MS1_PIN); + SET_OUTPUT(K_MS2_PIN); + #if PIN_EXISTS(K_MS3) + SET_OUTPUT(K_MS3_PIN); + #endif + #endif #if HAS_E0_MICROSTEPS SET_OUTPUT(E0_MS1_PIN); SET_OUTPUT(E0_MS2_PIN); @@ -2738,6 +3051,15 @@ void Stepper::report_positions() { #if HAS_E5_MICROSTEPS case 8: WRITE(E5_MS1_PIN, ms1); break; #endif + #if HAS_I_MICROSTEPS + case 9: WRITE(I_MS1_PIN, ms1); break + #endif + #if HAS_J_MICROSTEPS + case 10: WRITE(J_MS1_PIN, ms1); break + #endif + #if HAS_K_MICROSTEPS + case 11: WRITE(K_MS1_PIN, ms1); break + #endif } if (ms2 >= 0) switch (driver) { #if HAS_X_MICROSTEPS || HAS_X2_MICROSTEPS @@ -2791,6 +3113,15 @@ void Stepper::report_positions() { #if HAS_E5_MICROSTEPS case 8: WRITE(E5_MS2_PIN, ms2); break; #endif + #if HAS_I_MICROSTEPS + case 9: WRITE(I_MS2_PIN, ms2); break + #endif + #if HAS_J_MICROSTEPS + case 10: WRITE(J_MS2_PIN, ms2); break + #endif + #if HAS_K_MICROSTEPS + case 11: WRITE(K_MS2_PIN, ms2); break + #endif } if (ms3 >= 0) switch (driver) { #if HAS_X_MICROSTEPS || HAS_X2_MICROSTEPS @@ -2844,6 +3175,15 @@ void Stepper::report_positions() { #if HAS_E5_MICROSTEPS && PIN_EXISTS(E5_MS3) case 8: WRITE(E5_MS3_PIN, ms3); break; #endif + #if HAS_I_MICROSTEPS + case 9: WRITE(I_MS3_PIN, ms3); break + #endif + #if HAS_J_MICROSTEPS + case 10: WRITE(J_MS3_PIN, ms3); break + #endif + #if HAS_K_MICROSTEPS + case 11: WRITE(K_MS3_PIN, ms3); break + #endif } } @@ -2903,6 +3243,30 @@ void Stepper::report_positions() { SERIAL_ECHOLN((int)READ(Z_MS3_PIN)); #endif #endif + #if HAS_I_MICROSTEPS + SERIAL_ECHOPGM("I: "); + SERIAL_CHAR('0' + READ(I_MS1_PIN)); + SERIAL_CHAR('0' + READ(I_MS2_PIN)); + #if PIN_EXISTS(I_MS3) + SERIAL_ECHOLN((int)READ(I_MS3_PIN)); + #endif + #endif + #if HAS_J_MICROSTEPS + SERIAL_ECHOPGM("J: "); + SERIAL_CHAR('0' + READ(J_MS1_PIN)); + SERIAL_CHAR('0' + READ(J_MS2_PIN)); + #if PIN_EXISTS(J_MS3) + SERIAL_ECHOLN((int)READ(J_MS3_PIN)); + #endif + #endif + #if HAS_K_MICROSTEPS + SERIAL_ECHOPGM("K: "); + SERIAL_CHAR('0' + READ(K_MS1_PIN)); + SERIAL_CHAR('0' + READ(K_MS2_PIN)); + #if PIN_EXISTS(K_MS3) + SERIAL_ECHOLN((int)READ(K_MS3_PIN)); + #endif + #endif #if HAS_E0_MICROSTEPS SERIAL_ECHOPGM("E0: "); SERIAL_CHAR('0' + READ(E0_MS1_PIN)); diff --git a/Marlin/src/module/stepper.h b/Marlin/src/module/stepper.h index a3d2bfcd9aff..42fa1fda461e 100644 --- a/Marlin/src/module/stepper.h +++ b/Marlin/src/module/stepper.h @@ -130,6 +130,33 @@ #define ISR_START_Z_STEPPER_CYCLES 0UL #define ISR_Z_STEPPER_CYCLES 0UL #endif +//#if NON_E_AXES > 3 + #ifdef HAS_I_STEP + #define ISR_START_I_STEPPER_CYCLES ISR_START_STEPPER_CYCLES + #define ISR_I_STEPPER_CYCLES ISR_STEPPER_CYCLES + #else + #define ISR_START_I_STEPPER_CYCLES 0UL + #define ISR_I_STEPPER_CYCLES 0UL + #endif +// #if NON_E_AXES > 4 + #ifdef HAS_J_STEP + #define ISR_START_J_STEPPER_CYCLES ISR_START_STEPPER_CYCLES + #define ISR_J_STEPPER_CYCLES ISR_STEPPER_CYCLES + #else + #define ISR_START_J_STEPPER_CYCLES 0UL + #define ISR_J_STEPPER_CYCLES 0UL + #endif +// #if NON_E_AXES > 5 + #ifdef HAS_K_STEP + #define ISR_START_K_STEPPER_CYCLES ISR_START_STEPPER_CYCLES + #define ISR_K_STEPPER_CYCLES ISR_STEPPER_CYCLES + #else + #define ISR_START_K_STEPPER_CYCLES 0UL + #define ISR_K_STEPPER_CYCLES 0UL + #endif +// #endif +// #endif +//#endif // E is always interpolated, even for mixing extruders #define ISR_START_E_STEPPER_CYCLES ISR_START_STEPPER_CYCLES @@ -150,11 +177,34 @@ #endif // Calculate the minimum time to start all stepper pulses in the ISR loop -#define MIN_ISR_START_LOOP_CYCLES (ISR_START_X_STEPPER_CYCLES + ISR_START_Y_STEPPER_CYCLES + ISR_START_Z_STEPPER_CYCLES + ISR_START_E_STEPPER_CYCLES + ISR_START_MIXING_STEPPER_CYCLES) + #if NON_E_AXES > 3 + #if NON_E_AXES > 4 + #if NON_E_AXES > 5 + #define MIN_ISR_START_LOOP_CYCLES (ISR_START_X_STEPPER_CYCLES + ISR_START_Y_STEPPER_CYCLES + ISR_START_Z_STEPPER_CYCLES + ISR_START_I_STEPPER_CYCLES + ISR_START_J_STEPPER_CYCLES + ISR_START_K_STEPPER_CYCLES + ISR_START_E_STEPPER_CYCLES + ISR_START_MIXING_STEPPER_CYCLES) + #else + #define MIN_ISR_START_LOOP_CYCLES (ISR_START_X_STEPPER_CYCLES + ISR_START_Y_STEPPER_CYCLES + ISR_START_Z_STEPPER_CYCLES + ISR_START_I_STEPPER_CYCLES + ISR_START_J_STEPPER_CYCLES + ISR_START_E_STEPPER_CYCLES + ISR_START_MIXING_STEPPER_CYCLES) + #endif + #else + #define MIN_ISR_START_LOOP_CYCLES (ISR_START_X_STEPPER_CYCLES + ISR_START_Y_STEPPER_CYCLES + ISR_START_Z_STEPPER_CYCLES + ISR_START_I_STEPPER_CYCLES + ISR_START_E_STEPPER_CYCLES + ISR_START_MIXING_STEPPER_CYCLES) + #endif + #else + #define MIN_ISR_START_LOOP_CYCLES (ISR_START_X_STEPPER_CYCLES + ISR_START_Y_STEPPER_CYCLES + ISR_START_Z_STEPPER_CYCLES + ISR_START_E_STEPPER_CYCLES + ISR_START_MIXING_STEPPER_CYCLES) + #endif // And the total minimum loop time, not including the base -#define MIN_ISR_LOOP_CYCLES (ISR_X_STEPPER_CYCLES + ISR_Y_STEPPER_CYCLES + ISR_Z_STEPPER_CYCLES + ISR_E_STEPPER_CYCLES + ISR_MIXING_STEPPER_CYCLES) - + #if NON_E_AXES > 3 + #if NON_E_AXES > 4 + #if NON_E_AXES > 5 + #define MIN_ISR_LOOP_CYCLES (ISR_X_STEPPER_CYCLES + ISR_Y_STEPPER_CYCLES + ISR_Z_STEPPER_CYCLES + ISR_I_STEPPER_CYCLES + ISR_J_STEPPER_CYCLES + ISR_K_STEPPER_CYCLES + ISR_E_STEPPER_CYCLES + ISR_MIXING_STEPPER_CYCLES) + #else + #define MIN_ISR_LOOP_CYCLES (ISR_X_STEPPER_CYCLES + ISR_Y_STEPPER_CYCLES + ISR_Z_STEPPER_CYCLES + ISR_I_STEPPER_CYCLES + ISR_J_STEPPER_CYCLES + ISR_E_STEPPER_CYCLES + ISR_MIXING_STEPPER_CYCLES) + #endif + #else + #define MIN_ISR_LOOP_CYCLES (ISR_X_STEPPER_CYCLES + ISR_Y_STEPPER_CYCLES + ISR_Z_STEPPER_CYCLES + ISR_I_STEPPER_CYCLES + ISR_E_STEPPER_CYCLES + ISR_MIXING_STEPPER_CYCLES) + #endif + #else + #define MIN_ISR_LOOP_CYCLES (ISR_X_STEPPER_CYCLES + ISR_Y_STEPPER_CYCLES + ISR_Z_STEPPER_CYCLES + ISR_E_STEPPER_CYCLES + ISR_MIXING_STEPPER_CYCLES) + #endif // Calculate the minimum MPU cycles needed per pulse to enforce, limited to the max stepper rate #define _MIN_STEPPER_PULSE_CYCLES(N) MAX((unsigned long)((F_CPU) / (MAXIMUM_STEPPER_RATE)), ((F_CPU) / 500000UL) * (N)) #if MINIMUM_STEPPER_PULSE @@ -280,8 +330,8 @@ class Stepper { #endif // Delta error variables for the Bresenham line tracer - static int32_t delta_error[XYZE]; - static uint32_t advance_dividend[XYZE], + static int32_t delta_error[NUM_AXIS]; + static uint32_t advance_dividend[NUM_AXIS], advance_divisor, step_events_completed, // The number of step events executed in the current block accelerate_until, // The point from where we need to stop acceleration @@ -319,7 +369,7 @@ class Stepper { static uint32_t acc_step_rate; // needed for deceleration start point #endif - static volatile int32_t endstops_trigsteps[XYZ]; + static volatile int32_t endstops_trigsteps[NON_E_AXES]; // // Positions of stepper motors, in step units @@ -435,11 +485,31 @@ class Stepper { #endif // Set the current position in steps - static inline void set_position(const int32_t &a, const int32_t &b, const int32_t &c, const int32_t &e) { + static inline void set_position(const int32_t &a, const int32_t &b, const int32_t &c + #if NON_E_AXES > 3 + , const int32_t &i + #if NON_E_AXES > 4 + , const int32_t &j + #if NON_E_AXES > 5 + , const int32_t &k + #endif + #endif + #endif + , const int32_t &e) { planner.synchronize(); const bool was_enabled = STEPPER_ISR_ENABLED(); if (was_enabled) DISABLE_STEPPER_DRIVER_INTERRUPT(); - _set_position(a, b, c, e); + _set_position(a, b, c + #if NON_E_AXES > 3 + , i + #if NON_E_AXES > 4 + , j + #if NON_E_AXES > 5 + , k + #endif + #endif + #endif + , e); if (was_enabled) ENABLE_STEPPER_DRIVER_INTERRUPT(); } @@ -467,7 +537,17 @@ class Stepper { private: // Set the current position in steps - static void _set_position(const int32_t &a, const int32_t &b, const int32_t &c, const int32_t &e); + static void _set_position(const int32_t &a, const int32_t &b, const int32_t &c + #if NON_E_AXES > 3 + , const int32_t &i + #if NON_E_AXES > 4 + , const int32_t &j + #if NON_E_AXES > 5 + , const int32_t &k + #endif + #endif + #endif + , const int32_t &e); FORCE_INLINE static uint32_t calc_timer_interval(uint32_t step_rate, uint8_t scale, uint8_t* loops) { uint32_t timer; diff --git a/Marlin/src/module/stepper_indirection.h b/Marlin/src/module/stepper_indirection.h index f0039f145475..a38d76b5841b 100644 --- a/Marlin/src/module/stepper_indirection.h +++ b/Marlin/src/module/stepper_indirection.h @@ -349,6 +349,40 @@ void reset_stepper_drivers(); // Called by settings.load / settings.reset #define Z3_DIR_WRITE(STATE) NOOP #endif +#if NON_E_AXES > 3 + #define I_ENABLE_INIT SET_OUTPUT(I_ENABLE_PIN) + #define I_ENABLE_WRITE(STATE) WRITE(I_ENABLE_PIN,STATE) + #define I_ENABLE_READ READ(I_ENABLE_PIN) + #define I_DIR_INIT SET_OUTPUT(I_DIR_PIN) + #define I_DIR_WRITE(STATE) WRITE(I_DIR_PIN,STATE) + #define I_DIR_READ READ(I_DIR_PIN) + #define I_STEP_INIT SET_OUTPUT(I_STEP_PIN) + #define I_STEP_WRITE(STATE) WRITE(I_STEP_PIN,STATE) + #define I_STEP_READ READ(I_STEP_PIN) + #if NON_E_AXES > 4 + #define J_ENABLE_INIT SET_OUTPUT(J_ENABLE_PIN) + #define J_ENABLE_WRITE(STATE) WRITE(J_ENABLE_PIN,STATE) + #define J_ENABLE_READ READ(J_ENABLE_PIN) + #define J_DIR_INIT SET_OUTPUT(J_DIR_PIN) + #define J_DIR_WRITE(STATE) WRITE(J_DIR_PIN,STATE) + #define J_DIR_READ READ(J_DIR_PIN) + #define J_STEP_INIT SET_OUTPUT(J_STEP_PIN) + #define J_STEP_WRITE(STATE) WRITE(J_STEP_PIN,STATE) + #define J_STEP_READ READ(J_STEP_PIN) + #if NON_E_AXES > 5 + #define K_ENABLE_INIT SET_OUTPUT(K_ENABLE_PIN) + #define K_ENABLE_WRITE(STATE) WRITE(K_ENABLE_PIN,STATE) + #define K_ENABLE_READ READ(K_ENABLE_PIN) + #define K_DIR_INIT SET_OUTPUT(K_DIR_PIN) + #define K_DIR_WRITE(STATE) WRITE(K_DIR_PIN,STATE) + #define K_DIR_READ READ(K_DIR_PIN) + #define K_STEP_INIT SET_OUTPUT(K_STEP_PIN) + #define K_STEP_WRITE(STATE) WRITE(K_STEP_PIN,STATE) + #define K_STEP_READ READ(K_STEP_PIN) + #endif + #endif +#endif + // E0 Stepper #if AXIS_DRIVER_TYPE_E0(L6470) extern L6470 stepperE0; diff --git a/Marlin/src/pins/pins.h b/Marlin/src/pins/pins.h index 5df075a69c10..9d24bd8b291a 100644 --- a/Marlin/src/pins/pins.h +++ b/Marlin/src/pins/pins.h @@ -274,6 +274,8 @@ #include "pins_OMCA.h" // ATmega644P, ATmega644 env:sanguino_atmega644p #elif MB(ANET_10) #include "pins_ANET_10.h" // ATmega1284P env:sanguino_atmega1284p +#elif MB(DERANDERE_PB_1) + #include "pins_DERANDERE_PB_1.h" // ATmega1284P env:sanguino_atmega1284p #elif MB(SETHI) #include "pins_SETHI.h" // ATmega644P, ATmega644, ATmega1284P env:sanguino_atmega644p env:sanguino_atmega1284p @@ -798,6 +800,48 @@ #endif #endif +//E_AXIS_HOMING feature: Copyright (C) 2019 DerAndere. See https://github.com/DerAndere1/Marlin/tree/Marlin2ForPipetBot +#if NON_E_AXES > 3 + #ifdef I_STOP_PIN + #if I_HOME_DIR < 0 + #define I_MIN_PIN I_STOP_PIN + #define I_MAX_PIN -1 + #else + #define I_MIN_PIN -1 + #define I_MAX_PIN I_STOP_PIN + #endif + #endif + #if NON_E_AXES > 4 + #ifdef J_STOP_PIN + #if J_HOME_DIR < 0 + #define J_MIN_PIN J_STOP_PIN + #define J_MAX_PIN -1 + #else + #define J_MIN_PIN -1 + #define J_MAX_PIN J_STOP_PIN + #endif + #endif + #if NON_E_AXES > 5 + #ifdef K_STOP_PIN + #if K_HOME_DIR < 0 + #define K_MIN_PIN K_STOP_PIN + #define K_MAX_PIN -1 + #else + #define K_MIN_PIN -1 + #define K_MAX_PIN K_STOP_PIN + #endif + #endif + #endif // NON_E_AXES > 5 + #endif // NON_E_AXES > 4 +#else // !NON_E_AXES > 3 + #undef I_MIN_PIN + #undef I_MAX_PIN + #undef J_MIN_PIN + #undef J_MAX_PIN + #undef K_MIN_PIN + #undef K_MAX_PIN +#endif // NON_E_AXES > 3 + // // Disable unused endstop / probe pins // @@ -821,6 +865,21 @@ #define Z_MAX_PIN -1 #endif +#if DISABLED(USE_IMAX_PLUG) + #undef I_MAX_PIN + #define I_MAX_PIN -1 +#endif + +#if DISABLED(USE_JMAX_PLUG) + #undef J_MAX_PIN + #define J_MAX_PIN -1 +#endif + +#if DISABLED(USE_KMAX_PLUG) + #undef K_MAX_PIN + #define K_MAX_PIN -1 +#endif + #if DISABLED(USE_XMIN_PLUG) #undef X_MIN_PIN #define X_MIN_PIN -1 @@ -836,6 +895,21 @@ #define Z_MIN_PIN -1 #endif +#if DISABLED(USE_IMIN_PLUG) + #undef I_MIN_PIN + #define I_MIN_PIN -1 +#endif + +#if DISABLED(USE_JMIN_PLUG) + #undef J_MIN_PIN + #define J_MIN_PIN -1 +#endif + +#if DISABLED(USE_KMIN_PLUG) + #undef K_MIN_PIN + #define K_MIN_PIN -1 +#endif + #ifndef LCD_PINS_D4 #define LCD_PINS_D4 -1 #endif diff --git a/Marlin/src/pins/pinsDebug_list.h b/Marlin/src/pins/pinsDebug_list.h index ac3855a53971..f93b457734ea 100644 --- a/Marlin/src/pins/pinsDebug_list.h +++ b/Marlin/src/pins/pinsDebug_list.h @@ -1055,6 +1055,105 @@ #if PIN_EXISTS(Z3_STEP) REPORT_NAME_DIGITAL(__LINE__, Z3_STEP_PIN) #endif +#if PIN_EXISTS(I_ATT) + REPORT_NAME_DIGITAL(__LINE__, I_ATT_PIN) +#endif +#if PIN_EXISTS(I_CS) + REPORT_NAME_DIGITAL(__LINE__, I_CS_PIN) +#endif +#if PIN_EXISTS(I_DIR) + REPORT_NAME_DIGITAL(__LINE__, I_DIR_PIN) +#endif +#if PIN_EXISTS(I_ENABLE) + REPORT_NAME_DIGITAL(__LINE__, I_ENABLE_PIN) +#endif +#if PIN_EXISTS(I_MAX) + REPORT_NAME_DIGITAL(__LINE__, I_MAX_PIN) +#endif +#if PIN_EXISTS(I_MIN) + REPORT_NAME_DIGITAL(__LINE__, I_MIN_PIN) +#endif +#if PIN_EXISTS(I_MS1) + REPORT_NAME_DIGITAL(__LINE__, I_MS1_PIN) +#endif +#if PIN_EXISTS(I_MS2) + REPORT_NAME_DIGITAL(__LINE__, I_MS2_PIN) +#endif +#if PIN_EXISTS(I_MS3) + REPORT_NAME_DIGITAL(__LINE__, I_MS3_PIN) +#endif +#if PIN_EXISTS(I_STEP) + REPORT_NAME_DIGITAL(__LINE__, I_STEP_PIN) +#endif +#if PIN_EXISTS(I_STOP) + REPORT_NAME_DIGITAL(__LINE__, I_STOP_PIN) +#endif +#if PIN_EXISTS(J_ATT) + REPORT_NAME_DIGITAL(__LINE__, J_ATT_PIN) +#endif +#if PIN_EXISTS(J_CS) + REPORT_NAME_DIGITAL(__LINE__, J_CS_PIN) +#endif +#if PIN_EXISTS(J_DIR) + REPORT_NAME_DIGITAL(__LINE__, J_DIR_PIN) +#endif +#if PIN_EXISTS(J_ENABLE) + REPORT_NAME_DIGITAL(__LINE__, J_ENABLE_PIN) +#endif +#if PIN_EXISTS(J_MAX) + REPORT_NAME_DIGITAL(__LINE__, J_MAX_PIN) +#endif +#if PIN_EXISTS(J_MIN) + REPORT_NAME_DIGITAL(__LINE__, J_MIN_PIN) +#endif +#if PIN_EXISTS(J_MS1) + REPORT_NAME_DIGITAL(__LINE__, J_MS1_PIN) +#endif +#if PIN_EXISTS(J_MS2) + REPORT_NAME_DIGITAL(__LINE__, J_MS2_PIN) +#endif +#if PIN_EXISTS(J_MS3) + REPORT_NAME_DIGITAL(__LINE__, J_MS3_PIN) +#endif +#if PIN_EXISTS(J_STEP) + REPORT_NAME_DIGITAL(__LINE__, J_STEP_PIN) +#endif +#if PIN_EXISTS(J_STOP) + REPORT_NAME_DIGITAL(__LINE__, J_STOP_PIN) +#endif +#if PIN_EXISTS(K_ATT) + REPORT_NAME_DIGITAL(__LINE__, K_ATT_PIN) +#endif +#if PIN_EXISTS(K_CS) + REPORT_NAME_DIGITAL(__LINE__, K_CS_PIN) +#endif +#if PIN_EXISTS(K_DIR) + REPORT_NAME_DIGITAL(__LINE__, K_DIR_PIN) +#endif +#if PIN_EXISTS(K_ENABLE) + REPORT_NAME_DIGITAL(__LINE__, K_ENABLE_PIN) +#endif +#if PIN_EXISTS(K_MAX) + REPORT_NAME_DIGITAL(__LINE__, K_MAX_PIN) +#endif +#if PIN_EXISTS(K_MIN) + REPORT_NAME_DIGITAL(__LINE__, K_MIN_PIN) +#endif +#if PIN_EXISTS(K_MS1) + REPORT_NAME_DIGITAL(__LINE__, K_MS1_PIN) +#endif +#if PIN_EXISTS(K_MS2) + REPORT_NAME_DIGITAL(__LINE__, K_MS2_PIN) +#endif +#if PIN_EXISTS(K_MS3) + REPORT_NAME_DIGITAL(__LINE__, K_MS3_PIN) +#endif +#if PIN_EXISTS(K_STEP) + REPORT_NAME_DIGITAL(__LINE__, K_STEP_PIN) +#endif +#if PIN_EXISTS(K_STOP) + REPORT_NAME_DIGITAL(__LINE__, K_STOP_PIN) +#endif #if PIN_EXISTS(ZRIB_V20_D6) REPORT_NAME_DIGITAL(__LINE__, ZRIB_V20_D6_PIN) #endif diff --git a/Marlin/src/pins/pins_DERANDERE_PB_1.h b/Marlin/src/pins/pins_DERANDERE_PB_1.h new file mode 100644 index 000000000000..92a84bbfdb72 --- /dev/null +++ b/Marlin/src/pins/pins_DERANDERE_PB_1.h @@ -0,0 +1,301 @@ +/** + * Marlin 3D Printer Firmware + * Copyright (C) 2017 MarlinFirmware [https://github.com/MarlinFirmware/Marlin] + * + * Based on Sprinter and grbl. + * Copyright (C) 2011 Camiel Gubbels / Erik van der Zalm + * + * 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 . + * + */ + +/** + * controller board pin assignments for PipetBot-A8 by DerAndere, based on: + */ + +/** + * Anet V1.0 board pin assignments + */ + +/** + * Rev B 16 JUN 2017 + * + * 1) no longer uses Sanguino files to define some of the pins + * 2) added pointers to useable Arduino IDE extensions + * + */ + +/** + * The standard Arduino IDE extension (board manager) for this board + * is located at https://github.com/SkyNet3D/anet-board. + * + * Installation instructions are on that page. + * + * After copying the files to the appropriate location, restart Arduino and + * you'll see "Anet V1.0" and "Anet V1.0 (Optiboot)" in the boards list. + * + * "Anet V1.0" uses the bootloader that was installed on the board when + * it shipped from the factory. + * + * "Anet V1.0 (Optiboot)" frees up another 3K of FLASH. You'll need to burn + * a new bootloader to the board to be able to automatically download a + * compiled image. + * + */ + +/** + * Another usable Arduino IDE extension (board manager) can be found at + * https://github.com/Lauszus/Sanguino + * + * This extension has been tested on Arduino 1.6.12 & 1.8.0 + * + * Here's the JSON path: + * https://raw.githubusercontent.com/Lauszus/Sanguino/master/package_lauszus_sanguino_index.json + * + * When installing select 1.0.2 + * + * Installation instructions can be found at https://learn.sparkfun.com/pages/CustomBoardsArduino + * Just use the above JSON URL instead of Sparkfun's JSON. + * + * Once installed select the Sanguino board and then select the CPU. + * + */ + +/** + * To burn a new bootloader: + * + * 1. Connect your programmer to the board. + * 2. In the Arduino IDE select the board and then select the programmer. + * 3. In the Arduino IDE click on "burn bootloader". Don't worry about the "verify failed at 1F000" error message. + * 4. The programmer is no longer needed. Remove it. + */ + +/** + * Additional info: + * + * Anet Schematics - https://github.com/ralf-e/ANET-3D-Board-V1.0 + * Wiring RRDFG Smart Controller - http://www.thingiverse.com/thing:2103748 + * SkyNet3D Anet software development - https://github.com/SkyNet3D/Marlin/ + * Anet Users / Skynet SW on Facebook - https://www.facebook.com/skynet3ddevelopment/ + * + * Many thanks to Hans Raaf (@oderwat) for developing the Anet-specific software and supporting the Anet community. + */ + +#ifndef __AVR_ATmega1284P__ + #error "Oops! Make sure you have 'Anet V1.0', 'Anet V1.0 (Optiboot)' or 'Sanguino' selected in the 'Tools -> Boards' menu and ATmega1284P selected in 'Tools -> Processor' menu." +#endif + +#ifndef BOARD_NAME + #define BOARD_NAME "Anet" +#endif + +// +// Limit Switches +// E Limit Switch is defined below +// +#define X_STOP_PIN 18 +#define Y_STOP_PIN 19 +#define Z_STOP_PIN 20 + + +// +// Steppers +// +#define X_STEP_PIN 15 +#define X_DIR_PIN 21 +#define X_ENABLE_PIN 14 + +#define Y_STEP_PIN 22 +#define Y_DIR_PIN 23 +#define Y_ENABLE_PIN 14 + +#define Z_STEP_PIN 3 +#define Z_DIR_PIN 2 +#define Z_ENABLE_PIN 26 + +#define I_STEP_PIN 1 +#define I_DIR_PIN 0 +#define I_ENABLE_PIN 14 + +#define E0_STEP_PIN 10 +#define E0_DIR_PIN 10 +#define E0_ENABLE_PIN 10 + +// +// Temperature Sensors +// +#define TEMP_0_PIN 7 // Analog Input (pin 33 extruder) +#define TEMP_BED_PIN 6 // Analog Input (pin 34 bed) + +// +// Heaters / Fans +// +#define HEATER_0_PIN 13 // (extruder) +#define HEATER_BED_PIN 12 // (bed) + +#ifndef FAN_PIN + #define FAN_PIN 4 +#endif + +// +// Misc. Functions +// +#define SDSS 31 +#define LED_PIN -1 + +/** + * LCD / Controller + * + * Only the following displays are supported: + * ZONESTAR_LCD + * ANET_FULL_GRAPHICS_LCD + * REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER + */ + +#if ENABLED(ULTRA_LCD) + #define LCD_SDSS 28 + #if ENABLED(ADC_KEYPAD) + #define SERVO0_PIN 27 // free for BLTouch/3D-Touch + #define LCD_PINS_RS 28 + #define LCD_PINS_ENABLE 29 + #define LCD_PINS_D4 10 + #define LCD_PINS_D5 11 + #define LCD_PINS_D6 16 + #define LCD_PINS_D7 17 + #define BTN_EN1 -1 + #define BTN_EN2 -1 + #define BTN_ENC -1 + #define ADC_KEYPAD_PIN 1 + #elif ENABLED(REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER) || ENABLED(ANET_FULL_GRAPHICS_LCD) + // Pin definitions for the Anet A6 Full Graphics display and the RepRapDiscount Full Graphics + // display using an adapter board // https://go.aisler.net/benlye/anet-lcd-adapter/pcb + // See below for alternative pin definitions for use with https://www.thingiverse.com/thing:2103748 + #define SERVO0_PIN 29 // free for BLTouch/3D-Touch + #define BEEPER_PIN 17 + #define LCD_PINS_RS 27 + #define LCD_PINS_ENABLE 28 + #define LCD_PINS_D4 30 + #define BTN_EN1 11 + #define BTN_EN2 10 + #define BTN_ENC 16 + #ifndef ST7920_DELAY_1 + #define ST7920_DELAY_1 DELAY_NS(0) + #endif + #ifndef ST7920_DELAY_2 + #define ST7920_DELAY_2 DELAY_NS(63) + #endif + #ifndef ST7920_DELAY_3 + #define ST7920_DELAY_3 DELAY_NS(125) + #endif + #define STD_ENCODER_PULSES_PER_STEP 4 + #define STD_ENCODER_STEPS_PER_MENU_ITEM 1 + #endif +#elif NON_E_AXES > 3 + #define I_STOP_PIN 11 + #define SERVO0_PIN 27 + #define SERVO1_PIN 28 + #define SERVO2_PIN 29 + #define SERVO3_PIN 30 +#endif + + + + +/** + * auxiliary microcontroller can be connected via I2C at logical pins 16 + * (Atmega1284P pin PC0 = Anet-LCD.8 = SCL) and 17 + * (Atmega1284P pin PC1 = Anet-LCD.10 = SDA) + */ + +/** + * ==================================================================== + * =============== Alternative RepRapDiscount Wiring ================== + * ==================================================================== + * + * An alternative wiring scheme for the RepRapDiscount Full Graphics Display is + * published by oderwat on Thingiverse at https://www.thingiverse.com/thing:2103748. + * + * Using that adapter requires changing the pin definition as follows: + * #define SERVO0_PIN 27 // free for BLTouch/3D-Touch + * #define BEEPER_PIN 28 + * #define LCD_PINS_RS 30 + * #define LCD_PINS_ENABLE 29 + * #define LCD_PINS_D4 17 + * + * The BLTouch pin becomes LCD:3 + */ + +/** + * ==================================================================== + * ===================== LCD PINOUTS ================================== + * ==================================================================== + * + * Anet V1.0 controller | ZONESTAR_LCD | ANET_FULL_ | RepRapDiscount Full | Thingiverse RepRap wiring + * physical logical alt | | GRAPHICS_LCD | Graphics Display Wiring | http://www.thingiverse + * pin pin functions | | | | .com/thing:2103748 + *------------------------------------------------------------------------------------------------------------------------ + * ANET-J3.1 8 *** | N/A | J3_TX *** | | + * ANET-J3.2 9 *** | N/A | J3_RX *** | | + * ANET-J3.3 6 MISO | N/A | MISO *** | EXP2.1 MISO | EXP2.1 MISO + * ANET-J3.4 +5V | N/A | +5V | | + * ANET-J3.5 7 SCK | N/A | SCK *** | EXP2.2 SCK | EXP2.2 SCK + * ANET-J3.6 5 MOSI | N/A | MOSI *** | EXP2.6 MOSI | EXP2.6 MOSI + * ANET-J3.7 !RESET | N/A | button | EXP2.8 panel button | EXP2.8 panel button + * ANET-J3.8 GND | N/A | GND | EXP2.9 GND | EXP2.9 GND + * ANET-J3.9 4 Don't use | N/A | N/C | | + * ANET-J3.10 +3.3V | N/A | +3.3V *** | | + * | | | | + * | | | | + * ANET-LCD.1 GND | GND | GND | EXP1.9 GND | EXP1.9 GND + * ANET-LCD.2 +5V | +5V | +5V | EXP1.10 +5V | EXP1.10 +5V + * ANET-LCD.3 27 A4 | N/C * | LCD_PINS_RS | EXP1.4 LCD_PINS_RS | EXP2.4 SDSS or N/C * + * ANET-LCD.4 10 | LCD_PINS_D4 | BTN_EN2 | EXP2.3 BTN_EN2 | EXP2.3 BTN_EN2 + * ANET-LCD.5 28 A3 | LCD_PINS_RS | LCD_PINS_ENABLE | EXP1.3 LCD_PINS_ENABLE | EXP1.1 BEEPER_PIN + * ANET-LCD.6 11 | LCD_PINS_D5 | BTN_EN1 | EXP2.5 BTN_EN1 | EXP2.5 BTN_EN1 + * ANET-LCD.7 29 A2 | LCD_PINS_ENABLE | N/C * | EXP2.4 SDSS or N/C * | EXP1.3 LCD_PINS_ENABLE + * ANET-LCD.8 16 SCL | LCD_PINS_D6 | BTN_ENC | EXP1.2 BTN_ENC | EXP1.2 BTN_ENC + * ANET-LCD.9 30 A1 | ADC_KEYPAD_PIN ** | LCD_PINS_D4 | EXP1.5 LCD_PINS_D4 | EXP1.4 LCD_PINS_RS + * ANET-LCD.10 17 SDA | LCD_PINS_D7 | BEEPER_PIN | EXP1.1 BEEPER_PIN | EXP1.5 LCD_PINS_D4 + * + * N/C * - if not connected to the LCD can be used for BLTouch servo input + * ** - analog pin -WITHOUT a pullup + * *** - only connected to something if the Bluetooth module is populated + */ + +/** + * REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER + * physical pin function + * EXP1.1 BEEPER + * EXP1.2 BTN_ENC + * EXP1.3 LCD_PINS_ENABLE + * EXP1.4 LCD_PINS_RS + * EXP1.5 LCD_PINS_D4 + * EXP1.6 LCD_PINS_D5 (not used) + * EXP1.7 LCD_PINS_D6 (not used) + * EXP1.8 LCD_PINS_D7 (not used) + * EXP1.9 GND + * EXP1.10 VCC + * + * + * EXP2.1 MISO + * EXP2.2 SCK + * EXP2.3 BTN_EN2 + * EXP2.4 SDSS + * EXP2.5 BTN_EN1 + * EXP2.6 MOSI + * EXP2.7 SD_DETECT_PIN + * EXP2.8 button + * EXP2.9 GND + * EXP2.10 NC + */ diff --git a/Marlin/src/pins/pins_RAMPS.h b/Marlin/src/pins/pins_RAMPS.h index d3009a23744d..df369b962a58 100644 --- a/Marlin/src/pins/pins_RAMPS.h +++ b/Marlin/src/pins/pins_RAMPS.h @@ -79,12 +79,21 @@ // #define X_MIN_PIN 3 #ifndef X_MAX_PIN - #define X_MAX_PIN 2 + #define X_MAX_PIN -1 #endif #define Y_MIN_PIN 14 -#define Y_MAX_PIN 15 +#define Y_MAX_PIN -1 #define Z_MIN_PIN 18 -#define Z_MAX_PIN 19 +#define Z_MAX_PIN -1 + +#define I_MIN_PIN 19 +#define I_MAX_PIN -1 + +#define J_MIN_PIN 15 +#define J_MAX_PIN -1 + +#define K_MIN_PIN 2 +#define K_MAX_PIN -1 // // Z Probe (when not Z_MIN_PIN) @@ -117,18 +126,34 @@ #define Z_CS_PIN 40 #endif -#define E0_STEP_PIN 26 -#define E0_DIR_PIN 28 -#define E0_ENABLE_PIN 24 +#define I_STEP_PIN 26 +#define I_DIR_PIN 28 +#define I_ENABLE_PIN 24 +#ifndef I_CS_PIN + #define I_CS_PIN 42 +#endif + +#define J_STEP_PIN 36 +#define J_DIR_PIN 34 +#define J_ENABLE_PIN 30 +#ifndef J_CS_PIN + #define J_CS_PIN 44 +#endif + +//EXTRUERS////////////// + +#define E0_STEP_PIN 13 +#define E0_DIR_PIN 13 +#define E0_ENABLE_PIN 13 #ifndef E0_CS_PIN - #define E0_CS_PIN 42 + #define E0_CS_PIN 13 #endif -#define E1_STEP_PIN 36 -#define E1_DIR_PIN 34 -#define E1_ENABLE_PIN 30 +#define E1_STEP_PIN -1 +#define E1_DIR_PIN -1 +#define E1_ENABLE_PIN -1 #ifndef E1_CS_PIN - #define E1_CS_PIN 44 + #define E1_CS_PIN -1 #endif // @@ -200,7 +225,7 @@ #ifndef FAN_PIN #if ENABLED(IS_RAMPS_EFB) || ENABLED(IS_RAMPS_EFF) // Hotend, Fan, Bed or Hotend, Fan, Fan - #define FAN_PIN RAMPS_D9_PIN + #define FAN_PIN -1//RAMPS_D9_PIN #elif ENABLED(IS_RAMPS_EEF) || ENABLED(IS_RAMPS_SF) // Hotend, Hotend, Fan or Spindle, Fan #define FAN_PIN RAMPS_D8_PIN #elif ENABLED(IS_RAMPS_EEB) // Hotend, Hotend, Bed diff --git a/Marlin/src/pins/sensitive_pins.h b/Marlin/src/pins/sensitive_pins.h index a912cf5f5c40..e6d47efae7f0 100644 --- a/Marlin/src/pins/sensitive_pins.h +++ b/Marlin/src/pins/sensitive_pins.h @@ -124,6 +124,105 @@ #define _Z_PINS Z_STEP_PIN, Z_DIR_PIN, Z_ENABLE_PIN, _Z_MIN _Z_MAX _Z_MS1 _Z_MS2 _Z_MS3 _Z_CS +#if PIN_EXISTS(I_MIN) + #define _I_MIN I_MIN_PIN, +#else + #define _I_MIN +#endif +#if PIN_EXISTS(I_MAX) + #define _I_MAX I_MAX_PIN, +#else + #define _I_MAX +#endif +#if PIN_EXISTS(I_CS) + #define _I_CS I_CS_PIN, +#else + #define _I_CS +#endif +#if PIN_EXISTS(I_MS1) + #define _I_MS1 I_MS1_PIN, +#else + #define _I_MS1 +#endif +#if PIN_EXISTS(I_MS2) + #define _I_MS2 I_MS2_PIN, +#else + #define _I_MS2 +#endif +#if PIN_EXISTS(I_MS3) + #define _I_MS3 I_MS3_PIN, +#else + #define _I_MS3 +#endif + +#define _I_PINS I_STEP_PIN, I_DIR_PIN, I_ENABLE_PIN, _I_MIN _I_MAX _I_MS1 _I_MS2 _I_MS3 _I_CS + +#if PIN_EXISTS(J_MIN) + #define _J_MIN J_MIN_PIN, +#else + #define _J_MIN +#endif +#if PIN_EXISTS(J_MAX) + #define _J_MAX J_MAX_PIN, +#else + #define _J_MAX +#endif +#if PIN_EXISTS(J_CS) + #define _J_CS J_CS_PIN, +#else + #define _J_CS +#endif +#if PIN_EXISTS(J_MS1) + #define _J_MS1 J_MS1_PIN, +#else + #define _J_MS1 +#endif +#if PIN_EXISTS(J_MS2) + #define _J_MS2 J_MS2_PIN, +#else + #define _J_MS2 +#endif +#if PIN_EXISTS(J_MS3) + #define _J_MS3 J_MS3_PIN, +#else + #define _J_MS3 +#endif + +#define _J_PINS J_STEP_PIN, J_DIR_PIN, J_ENABLE_PIN, _J_MIN _J_MAX _J_MS1 _J_MS2 _J_MS3 _J_CS + +#if PIN_EXISTS(K_MIN) + #define _K_MIN K_MIN_PIN, +#else + #define _K_MIN +#endif +#if PIN_EXISTS(K_MAX) + #define _K_MAX K_MAX_PIN, +#else + #define _K_MAX +#endif +#if PIN_EXISTS(K_CS) + #define _K_CS K_CS_PIN, +#else + #define _K_CS +#endif +#if PIN_EXISTS(K_MS1) + #define _K_MS1 K_MS1_PIN, +#else + #define _K_MS1 +#endif +#if PIN_EXISTS(K_MS2) + #define _K_MS2 K_MS2_PIN, +#else + #define _K_MS2 +#endif +#if PIN_EXISTS(K_MS3) + #define _K_MS3 K_MS3_PIN, +#else + #define _K_MS3 +#endif + +#define _K_PINS K_STEP_PIN, K_DIR_PIN, K_ENABLE_PIN, _K_MIN _K_MAX _K_MS1 _K_MS2 _K_MS3 _K_CS + // // Extruder Chip Select, Digital Micro-steps // @@ -507,10 +606,39 @@ #define HAL_SENSITIVE_PINS #endif +#if NON_E_AXES > 5 +#define SENSITIVE_PINS { \ + _X_PINS _Y_PINS _Z_PINS _X2_PINS _Y2_PINS _Z2_PINS _Z3_PINS _Z_PROBE \ + _I_PINS _J_PINS _K_PINS \ + _E0_PINS _E1_PINS _E2_PINS _E3_PINS _E4_PINS _E5_PINS _BED_PINS \ + _H0_PINS _H1_PINS _H2_PINS _H3_PINS _H4_PINS _H5_PINS \ + _PS_ON _HEATER_BED _FAN0 _FAN1 _FAN2 _FANC \ + HAL_SENSITIVE_PINS \ +} +#elif NON_E_AXES > 4 #define SENSITIVE_PINS { \ _X_PINS _Y_PINS _Z_PINS _X2_PINS _Y2_PINS _Z2_PINS _Z3_PINS _Z_PROBE \ + _I_PINS _J_PINS \ _E0_PINS _E1_PINS _E2_PINS _E3_PINS _E4_PINS _E5_PINS _BED_PINS \ _H0_PINS _H1_PINS _H2_PINS _H3_PINS _H4_PINS _H5_PINS \ _PS_ON _HEATER_BED _FAN0 _FAN1 _FAN2 _FANC \ HAL_SENSITIVE_PINS \ } +#elif NON_E_AXES > 3 +#define SENSITIVE_PINS { \ + _X_PINS _Y_PINS _Z_PINS _X2_PINS _Y2_PINS _Z2_PINS _Z3_PINS _Z_PROBE \ + _I_PINS \ + _E0_PINS _E1_PINS _E2_PINS _E3_PINS _E4_PINS _E5_PINS _BED_PINS \ + _H0_PINS _H1_PINS _H2_PINS _H3_PINS _H4_PINS _H5_PINS \ + _PS_ON _HEATER_BED _FAN0 _FAN1 _FAN2 _FANC \ + HAL_SENSITIVE_PINS \ +} +#else +#define SENSITIVE_PINS { \ + _X_PINS _Y_PINS _Z_PINS _X2_PINS _Y2_PINS _Z2_PINS _Z3_PINS _Z_PROBE \ + _E0_PINS _E1_PINS _E2_PINS _E3_PINS _E4_PINS _E5_PINS _BED_PINS \ + _H0_PINS _H1_PINS _H2_PINS _H3_PINS _H4_PINS _H5_PINS \ + _PS_ON _HEATER_BED _FAN0 _FAN1 _FAN2 _FANC \ + HAL_SENSITIVE_PINS \ +} +#endif