SunRed/Marlin-Artillery-M600
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge pull request #8047 from thinkyhead/bf2_babystepping_M290

Browse source 
[2.0.x] Add M290 Babystepping (extended)
This commit is contained in:
Scott Lahteine 2017-10-26 21:02:21 -05:00 committed by GitHub
commit 3f827758d7
45 changed files with 183 additions and 61 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Marlin/Configuration.h
View file

@ -1049,7 +1049,7 @@
// //
// M100 Free Memory Watcher // M100 Free Memory Watcher
// //
//#define M100_FREE_MEMORY_WATCHER // uncomment to add the M100 Free Memory Watcher for debug purpose //#define M100_FREE_MEMORY_WATCHER // Add M100 (Free Memory Watcher) to debug memory usage
// //
// G20/G21 Inch mode support // G20/G21 Inch mode support

2
Marlin/src/config/default/Configuration.h
View file

@ -1049,7 +1049,7 @@
// //
// M100 Free Memory Watcher // M100 Free Memory Watcher
// //
//#define M100_FREE_MEMORY_WATCHER // uncomment to add the M100 Free Memory Watcher for debug purpose //#define M100_FREE_MEMORY_WATCHER // Add M100 (Free Memory Watcher) to debug memory usage
// //
// G20/G21 Inch mode support // G20/G21 Inch mode support

2
Marlin/src/config/examples/AlephObjects/TAZ4/Configuration.h
View file

@ -1069,7 +1069,7 @@
// //
// M100 Free Memory Watcher // M100 Free Memory Watcher
// //
//#define M100_FREE_MEMORY_WATCHER // uncomment to add the M100 Free Memory Watcher for debug purpose //#define M100_FREE_MEMORY_WATCHER // Add M100 (Free Memory Watcher) to debug memory usage
// //
// G20/G21 Inch mode support // G20/G21 Inch mode support

2
Marlin/src/config/examples/AliExpress/CL-260/Configuration.h
View file

@ -1049,7 +1049,7 @@
// //
// M100 Free Memory Watcher // M100 Free Memory Watcher
// //
//#define M100_FREE_MEMORY_WATCHER // uncomment to add the M100 Free Memory Watcher for debug purpose //#define M100_FREE_MEMORY_WATCHER // Add M100 (Free Memory Watcher) to debug memory usage
// //
// G20/G21 Inch mode support // G20/G21 Inch mode support

2
Marlin/src/config/examples/Anet/A6/Configuration.h
View file

@ -1206,7 +1206,7 @@
// //
// M100 Free Memory Watcher // M100 Free Memory Watcher
// //
//#define M100_FREE_MEMORY_WATCHER // uncomment to add the M100 Free Memory Watcher for debug purpose //#define M100_FREE_MEMORY_WATCHER // Add M100 (Free Memory Watcher) to debug memory usage
// //
// G20/G21 Inch mode support // G20/G21 Inch mode support

2
Marlin/src/config/examples/Anet/A8/Configuration.h
View file

@ -1055,7 +1055,7 @@
// //
// M100 Free Memory Watcher // M100 Free Memory Watcher
// //
//#define M100_FREE_MEMORY_WATCHER // uncomment to add the M100 Free Memory Watcher for debug purpose //#define M100_FREE_MEMORY_WATCHER // Add M100 (Free Memory Watcher) to debug memory usage
// //
// G20/G21 Inch mode support // G20/G21 Inch mode support

2
Marlin/src/config/examples/BQ/Hephestos/Configuration.h
View file

@ -1040,7 +1040,7 @@
// //
// M100 Free Memory Watcher // M100 Free Memory Watcher
// //
//#define M100_FREE_MEMORY_WATCHER // uncomment to add the M100 Free Memory Watcher for debug purpose //#define M100_FREE_MEMORY_WATCHER // Add M100 (Free Memory Watcher) to debug memory usage
// //
// G20/G21 Inch mode support // G20/G21 Inch mode support

2
Marlin/src/config/examples/BQ/Hephestos_2/Configuration.h
View file

@ -1050,7 +1050,7 @@
// //
// M100 Free Memory Watcher // M100 Free Memory Watcher
// //
//#define M100_FREE_MEMORY_WATCHER // uncomment to add the M100 Free Memory Watcher for debug purpose //#define M100_FREE_MEMORY_WATCHER // Add M100 (Free Memory Watcher) to debug memory usage
// //
// G20/G21 Inch mode support // G20/G21 Inch mode support

2
Marlin/src/config/examples/BQ/WITBOX/Configuration.h
View file

@ -1040,7 +1040,7 @@
// //
// M100 Free Memory Watcher // M100 Free Memory Watcher
// //
//#define M100_FREE_MEMORY_WATCHER // uncomment to add the M100 Free Memory Watcher for debug purpose //#define M100_FREE_MEMORY_WATCHER // Add M100 (Free Memory Watcher) to debug memory usage
// //
// G20/G21 Inch mode support // G20/G21 Inch mode support

2
Marlin/src/config/examples/Cartesio/Configuration.h
View file

@ -1048,7 +1048,7 @@
// //
// M100 Free Memory Watcher // M100 Free Memory Watcher
// //
//#define M100_FREE_MEMORY_WATCHER // uncomment to add the M100 Free Memory Watcher for debug purpose //#define M100_FREE_MEMORY_WATCHER // Add M100 (Free Memory Watcher) to debug memory usage
// //
// G20/G21 Inch mode support // G20/G21 Inch mode support

2
Marlin/src/config/examples/Creality/CR-10/Configuration.h
View file

@ -1059,7 +1059,7 @@
// //
// M100 Free Memory Watcher // M100 Free Memory Watcher
// //
//#define M100_FREE_MEMORY_WATCHER // uncomment to add the M100 Free Memory Watcher for debug purpose //#define M100_FREE_MEMORY_WATCHER // Add M100 (Free Memory Watcher) to debug memory usage
// //
// G20/G21 Inch mode support // G20/G21 Inch mode support

2
Marlin/src/config/examples/Felix/Configuration.h
View file

@ -1031,7 +1031,7 @@
// //
// M100 Free Memory Watcher // M100 Free Memory Watcher
// //
//#define M100_FREE_MEMORY_WATCHER // uncomment to add the M100 Free Memory Watcher for debug purpose //#define M100_FREE_MEMORY_WATCHER // Add M100 (Free Memory Watcher) to debug memory usage
// //
// G20/G21 Inch mode support // G20/G21 Inch mode support

2
Marlin/src/config/examples/Felix/DUAL/Configuration.h
View file

@ -1031,7 +1031,7 @@
// //
// M100 Free Memory Watcher // M100 Free Memory Watcher
// //
//#define M100_FREE_MEMORY_WATCHER // uncomment to add the M100 Free Memory Watcher for debug purpose //#define M100_FREE_MEMORY_WATCHER // Add M100 (Free Memory Watcher) to debug memory usage
// //
// G20/G21 Inch mode support // G20/G21 Inch mode support

2
Marlin/src/config/examples/FolgerTech/i3-2020/Configuration.h
View file

@ -1046,7 +1046,7 @@
// //
// M100 Free Memory Watcher // M100 Free Memory Watcher
// //
//#define M100_FREE_MEMORY_WATCHER // uncomment to add the M100 Free Memory Watcher for debug purpose //#define M100_FREE_MEMORY_WATCHER // Add M100 (Free Memory Watcher) to debug memory usage
// //
// G20/G21 Inch mode support // G20/G21 Inch mode support

2
Marlin/src/config/examples/Geeetech/GT2560/Configuration.h
View file

@ -1064,7 +1064,7 @@
// //
// M100 Free Memory Watcher // M100 Free Memory Watcher
// //
//#define M100_FREE_MEMORY_WATCHER // uncomment to add the M100 Free Memory Watcher for debug purpose //#define M100_FREE_MEMORY_WATCHER // Add M100 (Free Memory Watcher) to debug memory usage
// //
// G20/G21 Inch mode support // G20/G21 Inch mode support

2
Marlin/src/config/examples/Geeetech/I3_Pro_X-GT2560/Configuration.h
View file

@ -1049,7 +1049,7 @@
// //
// M100 Free Memory Watcher // M100 Free Memory Watcher
// //
//#define M100_FREE_MEMORY_WATCHER // uncomment to add the M100 Free Memory Watcher for debug purpose //#define M100_FREE_MEMORY_WATCHER // Add M100 (Free Memory Watcher) to debug memory usage
// //
// G20/G21 Inch mode support // G20/G21 Inch mode support

2
Marlin/src/config/examples/Infitary/i3-M508/Configuration.h
View file

@ -1053,7 +1053,7 @@
// //
// M100 Free Memory Watcher // M100 Free Memory Watcher
// //
//#define M100_FREE_MEMORY_WATCHER // uncomment to add the M100 Free Memory Watcher for debug purpose //#define M100_FREE_MEMORY_WATCHER // Add M100 (Free Memory Watcher) to debug memory usage
// //
// G20/G21 Inch mode support // G20/G21 Inch mode support

2
Marlin/src/config/examples/Malyan/M150/Configuration.h
View file

@ -1077,7 +1077,7 @@
// //
// M100 Free Memory Watcher // M100 Free Memory Watcher
// //
//#define M100_FREE_MEMORY_WATCHER // uncomment to add the M100 Free Memory Watcher for debug purpose //#define M100_FREE_MEMORY_WATCHER // Add M100 (Free Memory Watcher) to debug memory usage
// //
// G20/G21 Inch mode support // G20/G21 Inch mode support

2
Marlin/src/config/examples/Micromake/C1/basic/Configuration.h
View file

@ -1053,7 +1053,7 @@
// //
// M100 Free Memory Watcher // M100 Free Memory Watcher
// //
//#define M100_FREE_MEMORY_WATCHER // uncomment to add the M100 Free Memory Watcher for debug purpose //#define M100_FREE_MEMORY_WATCHER // Add M100 (Free Memory Watcher) to debug memory usage
// //
// G20/G21 Inch mode support // G20/G21 Inch mode support

2
Marlin/src/config/examples/Micromake/C1/enhanced/Configuration.h
View file

@ -1053,7 +1053,7 @@
// //
// M100 Free Memory Watcher // M100 Free Memory Watcher
// //
//#define M100_FREE_MEMORY_WATCHER // uncomment to add the M100 Free Memory Watcher for debug purpose //#define M100_FREE_MEMORY_WATCHER // Add M100 (Free Memory Watcher) to debug memory usage
// //
// G20/G21 Inch mode support // G20/G21 Inch mode support

2
Marlin/src/config/examples/Mks/Sbase/Configuration.h
View file

@ -1051,7 +1051,7 @@
// //
// M100 Free Memory Watcher // M100 Free Memory Watcher
// //
//#define M100_FREE_MEMORY_WATCHER // uncomment to add the M100 Free Memory Watcher for debug purpose //#define M100_FREE_MEMORY_WATCHER // Add M100 (Free Memory Watcher) to debug memory usage
// //
// G20/G21 Inch mode support // G20/G21 Inch mode support

2
Marlin/src/config/examples/RepRapWorld/Megatronics/Configuration.h
View file

@ -1049,7 +1049,7 @@
// //
// M100 Free Memory Watcher // M100 Free Memory Watcher
// //
//#define M100_FREE_MEMORY_WATCHER // uncomment to add the M100 Free Memory Watcher for debug purpose //#define M100_FREE_MEMORY_WATCHER // Add M100 (Free Memory Watcher) to debug memory usage
// //
// G20/G21 Inch mode support // G20/G21 Inch mode support

2
Marlin/src/config/examples/RigidBot/Configuration.h
View file

@ -1047,7 +1047,7 @@
// //
// M100 Free Memory Watcher // M100 Free Memory Watcher
// //
//#define M100_FREE_MEMORY_WATCHER // uncomment to add the M100 Free Memory Watcher for debug purpose //#define M100_FREE_MEMORY_WATCHER // Add M100 (Free Memory Watcher) to debug memory usage
// //
// G20/G21 Inch mode support // G20/G21 Inch mode support

2
Marlin/src/config/examples/SCARA/Configuration.h
View file

@ -1061,7 +1061,7 @@
// //
// M100 Free Memory Watcher // M100 Free Memory Watcher
// //
//#define M100_FREE_MEMORY_WATCHER // uncomment to add the M100 Free Memory Watcher for debug purpose //#define M100_FREE_MEMORY_WATCHER // Add M100 (Free Memory Watcher) to debug memory usage
// //
// G20/G21 Inch mode support // G20/G21 Inch mode support

2
Marlin/src/config/examples/Sanguinololu/Configuration.h
View file

@ -1080,7 +1080,7 @@
// //
// M100 Free Memory Watcher // M100 Free Memory Watcher
// //
//#define M100_FREE_MEMORY_WATCHER // uncomment to add the M100 Free Memory Watcher for debug purpose //#define M100_FREE_MEMORY_WATCHER // Add M100 (Free Memory Watcher) to debug memory usage
// //
// G20/G21 Inch mode support // G20/G21 Inch mode support

2
Marlin/src/config/examples/TinyBoy2/Configuration.h
View file

@ -1105,7 +1105,7 @@
// //
// M100 Free Memory Watcher // M100 Free Memory Watcher
// //
//#define M100_FREE_MEMORY_WATCHER // uncomment to add the M100 Free Memory Watcher for debug purpose //#define M100_FREE_MEMORY_WATCHER // Add M100 (Free Memory Watcher) to debug memory usage
// //
// G20/G21 Inch mode support // G20/G21 Inch mode support

2
Marlin/src/config/examples/Velleman/K8200/Configuration.h
View file

@ -1079,7 +1079,7 @@
// //
// M100 Free Memory Watcher // M100 Free Memory Watcher
// //
//#define M100_FREE_MEMORY_WATCHER // uncomment to add the M100 Free Memory Watcher for debug purpose //#define M100_FREE_MEMORY_WATCHER // Add M100 (Free Memory Watcher) to debug memory usage
// //
// G20/G21 Inch mode support // G20/G21 Inch mode support

2
Marlin/src/config/examples/Velleman/K8400/Configuration.h
View file

@ -1049,7 +1049,7 @@
// //
// M100 Free Memory Watcher // M100 Free Memory Watcher
// //
//#define M100_FREE_MEMORY_WATCHER // uncomment to add the M100 Free Memory Watcher for debug purpose //#define M100_FREE_MEMORY_WATCHER // Add M100 (Free Memory Watcher) to debug memory usage
// //
// G20/G21 Inch mode support // G20/G21 Inch mode support

2
Marlin/src/config/examples/Velleman/K8400/Dual-head/Configuration.h
View file

@ -1049,7 +1049,7 @@
// //
// M100 Free Memory Watcher // M100 Free Memory Watcher
// //
//#define M100_FREE_MEMORY_WATCHER // uncomment to add the M100 Free Memory Watcher for debug purpose //#define M100_FREE_MEMORY_WATCHER // Add M100 (Free Memory Watcher) to debug memory usage
// //
// G20/G21 Inch mode support // G20/G21 Inch mode support

2
Marlin/src/config/examples/adafruit/ST7565/Configuration.h
View file

@ -1049,7 +1049,7 @@
// //
// M100 Free Memory Watcher // M100 Free Memory Watcher
// //
//#define M100_FREE_MEMORY_WATCHER // uncomment to add the M100 Free Memory Watcher for debug purpose //#define M100_FREE_MEMORY_WATCHER // Add M100 (Free Memory Watcher) to debug memory usage
// //
// G20/G21 Inch mode support // G20/G21 Inch mode support

2
Marlin/src/config/examples/delta/FLSUN/auto_calibrate/Configuration.h
View file

@ -1176,7 +1176,7 @@
// //
// M100 Free Memory Watcher // M100 Free Memory Watcher
// //
//#define M100_FREE_MEMORY_WATCHER // uncomment to add the M100 Free Memory Watcher for debug purpose //#define M100_FREE_MEMORY_WATCHER // Add M100 (Free Memory Watcher) to debug memory usage
// //
// G20/G21 Inch mode support // G20/G21 Inch mode support

2
Marlin/src/config/examples/delta/FLSUN/kossel_mini/Configuration.h
View file

@ -1170,7 +1170,7 @@
// //
// M100 Free Memory Watcher // M100 Free Memory Watcher
// //
//#define M100_FREE_MEMORY_WATCHER // uncomment to add the M100 Free Memory Watcher for debug purpose //#define M100_FREE_MEMORY_WATCHER // Add M100 (Free Memory Watcher) to debug memory usage
// //
// G20/G21 Inch mode support // G20/G21 Inch mode support

2
Marlin/src/config/examples/delta/generic/Configuration.h
View file

@ -1165,7 +1165,7 @@
// //
// M100 Free Memory Watcher // M100 Free Memory Watcher
// //
//#define M100_FREE_MEMORY_WATCHER // uncomment to add the M100 Free Memory Watcher for debug purpose //#define M100_FREE_MEMORY_WATCHER // Add M100 (Free Memory Watcher) to debug memory usage
// //
// G20/G21 Inch mode support // G20/G21 Inch mode support

2
Marlin/src/config/examples/delta/kossel_mini/Configuration.h
View file

@ -1168,7 +1168,7 @@
// //
// M100 Free Memory Watcher // M100 Free Memory Watcher
// //
//#define M100_FREE_MEMORY_WATCHER // uncomment to add the M100 Free Memory Watcher for debug purpose //#define M100_FREE_MEMORY_WATCHER // Add M100 (Free Memory Watcher) to debug memory usage
// //
// G20/G21 Inch mode support // G20/G21 Inch mode support

2
Marlin/src/config/examples/delta/kossel_pro/Configuration.h
View file

@ -1168,7 +1168,7 @@
// //
// M100 Free Memory Watcher // M100 Free Memory Watcher
// //
//#define M100_FREE_MEMORY_WATCHER // uncomment to add the M100 Free Memory Watcher for debug purpose //#define M100_FREE_MEMORY_WATCHER // Add M100 (Free Memory Watcher) to debug memory usage
// //
// G20/G21 Inch mode support // G20/G21 Inch mode support

2
Marlin/src/config/examples/delta/kossel_xl/Configuration.h
View file

@ -1177,7 +1177,7 @@
// //
// M100 Free Memory Watcher // M100 Free Memory Watcher
// //
//#define M100_FREE_MEMORY_WATCHER // uncomment to add the M100 Free Memory Watcher for debug purpose //#define M100_FREE_MEMORY_WATCHER // Add M100 (Free Memory Watcher) to debug memory usage
// //
// G20/G21 Inch mode support // G20/G21 Inch mode support

2
Marlin/src/config/examples/gCreate/gMax1.5+/Configuration.h
View file

@ -1063,7 +1063,7 @@
// //
// M100 Free Memory Watcher // M100 Free Memory Watcher
// //
//#define M100_FREE_MEMORY_WATCHER // uncomment to add the M100 Free Memory Watcher for debug purpose //#define M100_FREE_MEMORY_WATCHER // Add M100 (Free Memory Watcher) to debug memory usage
// //
// G20/G21 Inch mode support // G20/G21 Inch mode support

2
Marlin/src/config/examples/makibox/Configuration.h
View file

@ -1052,7 +1052,7 @@
// //
// M100 Free Memory Watcher // M100 Free Memory Watcher
// //
//#define M100_FREE_MEMORY_WATCHER // uncomment to add the M100 Free Memory Watcher for debug purpose //#define M100_FREE_MEMORY_WATCHER // Add M100 (Free Memory Watcher) to debug memory usage
// //
// G20/G21 Inch mode support // G20/G21 Inch mode support

90
Marlin/src/config/examples/stm32f103ret6/Configuration.h
View file

@ -176,6 +176,21 @@
//#define HOTEND_OFFSET_Z { 0.0, 0.0 } //#define HOTEND_OFFSET_Z { 0.0, 0.0 }
#endif #endif
/**
* Two separate X-carriages with extruders that connect to a moving part
* via a magnetic docking mechanism. Requires SOL1_PIN and SOL2_PIN.
*/
//#define PARKING_EXTRUDER
#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 // Delay (ms) for magnetic field. No delay if 0 or not defined.
#define PARKING_EXTRUDER_PARKING_X { -78, 184 } // X positions for parking the extruders
#define PARKING_EXTRUDER_GRAB_DISTANCE 1 // mm to move beyond the parking point to grab the extruder
#define PARKING_EXTRUDER_SECURITY_RAISE 5 // Z-raise before parking
#define HOTEND_OFFSET_Z { 0.0, 1.3 } // Z-offsets of the two hotends. The first must be 0.
#endif
/** /**
* "Mixing Extruder" * "Mixing Extruder"
* - Adds a new code, M165, to set the current mix factors. * - Adds a new code, M165, to set the current mix factors.
@ -186,7 +201,7 @@
*/ */
//#define MIXING_EXTRUDER //#define MIXING_EXTRUDER
#if ENABLED(MIXING_EXTRUDER) #if ENABLED(MIXING_EXTRUDER)
#define MIXING_STEPPERS 3 // Number of steppers in your 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 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 DIRECT_MIXING_IN_G1 // Allow ABCDHI mix factors in G1 movement commands
#endif #endif
@ -543,7 +558,7 @@
/** /**
* Default Jerk (mm/s) * Default Jerk (mm/s)
* Override with M205 X Y Z EM * Override with M205 X Y Z E
* *
* "Jerk" specifies the minimum speed change that requires acceleration. * "Jerk" specifies the minimum speed change that requires acceleration.
* When changing speed and direction, if the difference is less than the * When changing speed and direction, if the difference is less than the
@ -596,7 +611,7 @@
* Probe Type * Probe Type
* *
* Allen Key Probes, Servo Probes, Z-Sled Probes, FIX_MOUNTED_PROBE, etc. * Allen Key Probes, Servo Probes, Z-Sled Probes, FIX_MOUNTED_PROBE, etc.
* You must activate one of these to use Auto Bed Leveling below. * Activate one of these to use Auto Bed Leveling below.
*/ */
/** /**
@ -627,14 +642,15 @@
#endif #endif
/** /**
* Enable if probing seems unreliable. Heaters and/or fans - consistent with the * Enable one or more of the following if probing seems unreliable.
* options selected below - will be disabled during probing so as to minimize * Heaters and/or fans can be disabled during probing to minimize electrical
* potential EM interference by quieting/silencing the source of the 'noise' (the change * noise. A delay can also be added to allow noise and vibration to settle.
* in current flowing through the wires). This is likely most useful to users of the * These options are most useful for the BLTouch probe, but may also improve
* BLTouch probe, but may also help those with inductive or other probe types. * readings with inductive probes and piezo sensors.
*/ */
//#define PROBING_HEATERS_OFF // Turn heaters off when probing //#define PROBING_HEATERS_OFF // Turn heaters off when probing
//#define PROBING_FANS_OFF // Turn fans off when probing //#define PROBING_FANS_OFF // Turn fans off when probing
//#define DELAY_BEFORE_PROBING 200 // (ms) To prevent vibrations from triggering piezo sensors
// A probe that is deployed and stowed with a solenoid pin (SOL1_PIN) // A probe that is deployed and stowed with a solenoid pin (SOL1_PIN)
//#define SOLENOID_PROBE //#define SOLENOID_PROBE
@ -935,7 +951,7 @@
#define UBL_PROBE_PT_3_X 180 #define UBL_PROBE_PT_3_X 180
#define UBL_PROBE_PT_3_Y 20 #define UBL_PROBE_PT_3_Y 20
#define UBL_G26_MESH_VALIDATION // Enable G26 mesh validation //#define UBL_G26_MESH_VALIDATION // Enable G26 mesh validation
#define UBL_MESH_EDIT_MOVES_Z // Sophisticated users prefer no movement of nozzle #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_SAVE_ACTIVE_ON_M500 // Save the currently active mesh in the current slot on M500
@ -964,6 +980,9 @@
#define LCD_PROBE_Z_RANGE 4 // Z Range centered on Z_MIN_POS for LCD Z adjustment #define LCD_PROBE_Z_RANGE 4 // Z Range centered on Z_MIN_POS for LCD Z adjustment
#endif #endif
// Add a menu item to move between bed corners for manual bed adjustment
//#define LEVEL_BED_CORNERS
/** /**
* Commands to execute at the end of G29 probing. * Commands to execute at the end of G29 probing.
* Useful to retract or move the Z probe out of the way. * Useful to retract or move the Z probe out of the way.
@ -1033,7 +1052,7 @@
// //
// M100 Free Memory Watcher // M100 Free Memory Watcher
// //
#define M100_FREE_MEMORY_WATCHER // uncomment to add the M100 Free Memory Watcher for debug purpose //#define M100_FREE_MEMORY_WATCHER // Add M100 (Free Memory Watcher) to debug memory usage
// //
// G20/G21 Inch mode support // G20/G21 Inch mode support
@ -1204,7 +1223,7 @@
* - Click the controller to view the LCD menu * - Click the controller to view the LCD menu
* - The LCD will display Japanese, Western, or Cyrillic text * - The LCD will display Japanese, Western, or Cyrillic text
* *
* See https://github.com/MarlinFirmware/Marlin/wiki/LCD-Language * See http://marlinfw.org/docs/development/lcd_language.html
* *
* :['JAPANESE', 'WESTERN', 'CYRILLIC'] * :['JAPANESE', 'WESTERN', 'CYRILLIC']
*/ */
@ -1330,12 +1349,6 @@
// //
//#define ULTIPANEL //#define ULTIPANEL
//
// Cartesio UI
// http://mauk.cc/webshop/cartesio-shop/electronics/user-interface
//
//#define CARTESIO_UI
// //
// PanelOne from T3P3 (via RAMPS 1.4 AUX2/AUX3) // PanelOne from T3P3 (via RAMPS 1.4 AUX2/AUX3)
// http://reprap.org/wiki/PanelOne // http://reprap.org/wiki/PanelOne
@ -1418,6 +1431,12 @@
// //
//#define BQ_LCD_SMART_CONTROLLER //#define BQ_LCD_SMART_CONTROLLER
//
// Cartesio UI
// http://mauk.cc/webshop/cartesio-shop/electronics/user-interface
//
//#define CARTESIO_UI
// //
// ANET_10 Controller supported displays. // ANET_10 Controller supported displays.
// //
@ -1504,6 +1523,35 @@
// //
//#define OLED_PANEL_TINYBOY2 //#define OLED_PANEL_TINYBOY2
//
// 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
//
// 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
//
// MKS OLED 1.3" 128 × 64 FULL GRAPHICS CONTROLLER
// http://reprap.org/wiki/MKS_12864OLED
//
// Tiny, but very sharp OLED display
//
//#define MKS_12864OLED
// //
// AZSMZ 12864 LCD with SD // 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 // 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
@ -1566,14 +1614,20 @@
* Adds the M150 command to set the LED (or LED strip) color. * 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 * If pins are PWM capable (e.g., 4, 5, 6, 11) then a range of
* luminance values can be set from 0 to 255. * luminance values can be set from 0 to 255.
* For Neopixel LED an overall brightness parameter is also available.
* *
* *** CAUTION *** * *** CAUTION ***
* LED Strips require a MOFSET Chip between PWM lines and LEDs, * LED Strips require a MOFSET Chip between PWM lines and LEDs,
* as the Arduino cannot handle the current the LEDs will require. * as the Arduino cannot handle the current the LEDs will require.
* Failure to follow this precaution can destroy your Arduino! * 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 *** * *** CAUTION ***
* *
* LED Type. Enable only one of the following two options.
*
*/ */
//#define RGB_LED //#define RGB_LED
//#define RGBW_LED //#define RGBW_LED
#if ENABLED(RGB_LED) || ENABLED(RGBW_LED) #if ENABLED(RGB_LED) || ENABLED(RGBW_LED)
@ -1626,7 +1680,7 @@
// Delay (in milliseconds) before the next move will start, to give the servo time to reach its target angle. // 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. // 300ms is a good value but you can try less delay.
// If the servo can't reach the requested position, increase it. // If the servo can't reach the requested position, increase it.
#define SERVO_DELAY 300 #define SERVO_DELAY { 300 }
// Servo deactivation // Servo deactivation
// //

2
Marlin/src/config/examples/tvrrug/Round2/Configuration.h
View file

@ -1044,7 +1044,7 @@
// //
// M100 Free Memory Watcher // M100 Free Memory Watcher
// //
//#define M100_FREE_MEMORY_WATCHER // uncomment to add the M100 Free Memory Watcher for debug purpose //#define M100_FREE_MEMORY_WATCHER // Add M100 (Free Memory Watcher) to debug memory usage
// //
// G20/G21 Inch mode support // G20/G21 Inch mode support

2
Marlin/src/config/examples/wt150/Configuration.h
View file

@ -1054,7 +1054,7 @@
// //
// M100 Free Memory Watcher // M100 Free Memory Watcher
// //
//#define M100_FREE_MEMORY_WATCHER // uncomment to add the M100 Free Memory Watcher for debug purpose //#define M100_FREE_MEMORY_WATCHER // Add M100 (Free Memory Watcher) to debug memory usage
// //
// G20/G21 Inch mode support // G20/G21 Inch mode support

4
Marlin/src/gcode/gcode.cpp
View file

@ -525,6 +525,10 @@ void GcodeSuite::process_next_command() {
case 280: M280(); break; // M280: Set servo position absolute case 280: M280(); break; // M280: Set servo position absolute
#endif #endif
#if ENABLED(BABYSTEPPING)
case 290: M290(); break; // M290: Babystepping
#endif
#if HAS_BUZZER #if HAS_BUZZER
case 300: M300(); break; // M300: Play beep tone case 300: M300(); break; // M300: Play beep tone
#endif #endif

5
Marlin/src/gcode/gcode.h
View file

@ -169,6 +169,7 @@
* M260 - i2c Send Data (Requires EXPERIMENTAL_I2CBUS) * M260 - i2c Send Data (Requires EXPERIMENTAL_I2CBUS)
* M261 - i2c Request Data (Requires EXPERIMENTAL_I2CBUS) * M261 - i2c Request Data (Requires EXPERIMENTAL_I2CBUS)
* M280 - Set servo position absolute: "M280 P<index> S<angle|µs>". (Requires servos) * M280 - Set servo position absolute: "M280 P<index> S<angle|µs>". (Requires servos)
* M290 - Babystepping (Requires BABYSTEPPING)
* M300 - Play beep sound S<frequency Hz> P<duration ms> * M300 - Play beep sound S<frequency Hz> P<duration ms>
* M301 - Set PID parameters P I and D. (Requires PIDTEMP) * M301 - Set PID parameters P I and D. (Requires PIDTEMP)
* M302 - Allow cold extrudes, or set the minimum extrude S<temperature>. (Requires PREVENT_COLD_EXTRUSION) * M302 - Allow cold extrudes, or set the minimum extrude S<temperature>. (Requires PREVENT_COLD_EXTRUSION)
@ -585,6 +586,10 @@ private:
static void M280(); static void M280();
#endif #endif
#if ENABLED(BABYSTEPPING)
static void M290();
#endif
#if HAS_BUZZER #if HAS_BUZZER
static void M300(); static void M300();
#endif #endif

61
Marlin/src/gcode/motion/M290.cpp Normal file
View file

@ -0,0 +1,61 @@
/**
* 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 <http://www.gnu.org/licenses/>.
*
*/
#include "../../inc/MarlinConfig.h"
#if ENABLED(BABYSTEPPING)
#include "../gcode.h"
#include "../../module/probe.h"
#include "../../module/temperature.h"
#include "../../module/planner.h"
/**
* M290: Babystepping
*/
void GcodeSuite::M290() {
#if ENABLED(BABYSTEP_XY)
for (uint8_t a = X_AXIS; a <= Z_AXIS; a++)
if (parser.seenval(axis_codes[a]) || (a == Z_AXIS && parser.seenval('S'))) {
float offs = constrain(parser.value_axis_units(a), -2, 2);
#if ENABLED(BABYSTEP_ZPROBE_OFFSET)
if (a == Z_AXIS) {
zprobe_zoffset += offs;
refresh_zprobe_zoffset(true); // 'true' to not babystep
}
#endif
thermalManager.babystep_axis(a, offs * planner.axis_steps_per_mm[a]);
}
#else
if (parser.seenval('Z') || parser.seenval('S')) {
float offs = constrain(parser.value_axis_units(Z_AXIS), -2, 2);
#if ENABLED(BABYSTEP_ZPROBE_OFFSET)
zprobe_zoffset += offs;
refresh_zprobe_zoffset(); // This will babystep the axis
#else
thermalManager.babystep_axis(Z_AXIS, offs * planner.axis_steps_per_mm[Z_AXIS]);
#endif
}
#endif
}
#endif // BABYSTEPPING

4
Marlin/src/inc/SanityCheck.h
View file

@ -353,9 +353,7 @@ static_assert(X_MAX_LENGTH >= X_BED_SIZE && Y_MAX_LENGTH >= Y_BED_SIZE,
* Babystepping * Babystepping
*/ */
#if ENABLED(BABYSTEPPING) #if ENABLED(BABYSTEPPING)
#if DISABLED(ULTRA_LCD) && DISABLED(I2C_POSITION_ENCODERS) #if ENABLED(SCARA)
#error "BABYSTEPPING requires an LCD controller."
#elif ENABLED(SCARA)
#error "BABYSTEPPING is not implemented for SCARA yet." #error "BABYSTEPPING is not implemented for SCARA yet."
#elif ENABLED(DELTA) && ENABLED(BABYSTEP_XY) #elif ENABLED(DELTA) && ENABLED(BABYSTEP_XY)
#error "BABYSTEPPING only implemented for Z axis on deltabots." #error "BABYSTEPPING only implemented for Z axis on deltabots."