Skip to content

Commit 891deef

Browse files
authored
Merge pull request #180 from th3dstudio/2.0.x
2.0.x
2 parents f125f47 + ceed144 commit 891deef

File tree

8 files changed

+126
-191
lines changed

8 files changed

+126
-191
lines changed

Board_Configs/TH3D_EZBoardLite/Firmware/Marlin/Configuration.h

Lines changed: 31 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -133,9 +133,9 @@
133133
// ************************* END PRINTER SECTION *************************
134134
//===========================================================================
135135

136-
//===========================================================================
137-
// EZABL Advanced Settings - EZABL_POINTS & EZABL_PROBE_EDGE are also used for other probes
138-
//===========================================================================
136+
/**
137+
* EZABL Advanced Settings - EZABL_POINTS & EZABL_PROBE_EDGE are also used for other probes
138+
*/
139139

140140
// Probing Grid Points - If you want more or less EZABL probe points change the number below, use odd numbers. Total points is # times #.
141141
#define EZABL_POINTS 3
@@ -161,12 +161,21 @@
161161
// Grid Extrapolation - This will use the mesh data to make assumptions of the bed outside the probe area. Disable if you are getting incorrect results on the edges of the bed.
162162
#define EXTRAPOLATE_BEYOND_GRID
163163

164-
//================================================================================
165-
// CUSTOM PROBE SETTINGS - FOR EZABL OR BL TOUCH
166-
// If you have a probe mount that is not pre-setup in the firmware then uncomment
167-
// the CUSTOM_PROBE line above and enter your probe offsets below
168-
//================================================================================
169-
#if ENABLED(CUSTOM_PROBE)
164+
/**
165+
* BLTouch/CRTouch
166+
*
167+
* If you want to use the BLTouch/CRTouch uncomment the BLTOUCH line below. You also need then enter in your sensor offsets below in the CUSTOM PROBE section.
168+
* If you need to change your SERVO pin you can change that with the SERVO0_PIN Line below. Most people do NOT need to change/set this.
169+
*/
170+
//#define BLTOUCH
171+
//#define SERVO0_PIN P2_04
172+
173+
/**
174+
* Custom Probe Offset - EZABL/BLTouch/CRTouch
175+
*
176+
* If you have a probe mount that is not pre-setup in the firmware then uncomment the CUSTOM_PROBE option (or BLTOUCH if using one) above and enter your probe offsets below
177+
*/
178+
#if ANY(CUSTOM_PROBE, BLTOUCH)
170179
/**
171180
* Z Probe to nozzle (X,Y) offset, relative to (0, 0).
172181
*
@@ -201,7 +210,7 @@
201210

202211

203212
//===========================================================================
204-
//******************** EXTRA FEATURES AND TWEAKS ****************************
213+
//******************** Extra Features and Tweaks ****************************
205214
//===========================================================================
206215

207216
// EXTRUDER SETTINGS -------------------------------
@@ -311,11 +320,7 @@
311320
/**
312321
* EEPROM on SD Card
313322
*
314-
* NOTE: THIS TAKES UP EXTRA SPACE ON THE CPU SO IF YOUR COMPILE FAILS DISABLE SOME OTHER OPTIONS IN THE FIRMWARE.
315-
* If your board has issues saving the EEPROM that could be due to a defective EEPROM chip. This will make an EEPROM.DAT file
316-
* You can use a SD card in the printer slot to save the EEPROM to that instead. Just uncomment the below line
317-
* and then leave an SD card in the printer at all times. If you have to take it out, power off the printer before removing
318-
* then put your GCode files on the SD card, insert the card again, and then power the printer up.
323+
* If your board has issues saving the EEPROM that could be due to a defective EEPROM chip. This will make an EEPROM.DAT file. You can use a SD card in the printer slot to save the EEPROM to that instead. Just uncomment the below line and then leave an SD card in the printer at all times. If you have to take it out, power off the printer before removing then put your GCode files on the SD card, insert the card again, and then power the printer up.
319324
*/
320325
//#define SDCARD_EEPROM_EMULATION
321326

@@ -324,8 +329,7 @@
324329
*
325330
* See here on how to use Input Shaping: https://www.th3dstudio.com/marlin-input-shaping-calculator/
326331
*
327-
* Below are the frequency and damping settings for each axis.
328-
* Damping must have f at the end of the number and the range is 0.00-1.00.
332+
* Below are the frequency and damping settings for each axis. Damping must have f at the end of the number and the range is 0.00-1.00.
329333
*/
330334
//#define INPUT_SHAPING
331335

@@ -352,8 +356,7 @@
352356
* If you need to adjust your XY home offsets from defaults then you can uncomment the HOME_ADJUST line below and enter your
353357
* custom XY offsets. This is provided for convenience and is unsupported with included product support.
354358
*
355-
* How to use - measure (home XY then jog using the LCD 1mm at a time) the X and Y distance the nozzle is off
356-
* the build plate and then put those as NEGATIVE values below on the X_HOME_LOCATION and Y_HOME_LOCATION values
359+
* How to use - measure (home XY then jog using the LCD 1mm at a time) the X and Y distance the nozzle is off the build plate and then put those as NEGATIVE values below on the X_HOME_LOCATION and Y_HOME_LOCATION values
357360
* Positive values will NOT work (move your endstops to fix a positive offset or change your bed size above).
358361
*/
359362
//#define HOME_ADJUST
@@ -385,26 +388,12 @@
385388
//#define LINEAR_ADVANCE
386389
#define LINEAR_ADVANCE_K 0
387390

388-
/**
389-
* BLTouch/CRTouch
390-
*
391-
* If you want to use the BLTouch/CRTouch uncomment the BLTOUCH line below.
392-
* You also need to uncomment #define CUSTOM_PROBE above and then enter in your offsets above in the CUSTOM PROBE section.
393-
*
394-
* If you need to change your SERVO pin you can change that with the SERVO0_PIN Line below. Most people do NOT need to change/set this.
395-
*/
396-
//#define BLTOUCH
397-
//#define SERVO0_PIN P2_04
398-
399391
/**
400392
* Manual Mesh Leveling
401393
*
402-
* If you want to use manual mesh leveling you can enable the below option.
403-
* This is for generating a MANUAL mesh WITHOUT a probe. To change the mesh inset value change the EZABL_PROBE_EDGE setting above.
404-
*
405-
* Mesh Bed Leveling Documentation: http://marlinfw.org/docs/gcode/G029-mbl.html
394+
* If you want to use manual mesh leveling you can enable the below option. This is for generating a MANUAL mesh WITHOUT a probe. To change the mesh inset value change the EZABL_PROBE_EDGE setting above.
406395
*
407-
* NOTE: If you want to automate the leveling process our EZABL kits do this for you. Check them out here: http://EZABL.TH3DStudio.com
396+
* Mesh Bed Leveling Documentation: http://marlinfw.org/docs/gcode/G029-mbl.html NOTE: If you want to automate the leveling process our EZABL kits do this for you. Check them out here: http://EZABL.TH3DStudio.com
408397
*/
409398
//#define MANUAL_MESH_LEVELING
410399

@@ -444,20 +433,13 @@
444433
#define XY_DIAG_BD 282.8427124746
445434
#define XY_SIDE_AD 200
446435

447-
// Or, set the XY skew factor directly:
448-
//#define XY_SKEW_FACTOR 0.0
449-
450436
//#define SKEW_CORRECTION_FOR_Z
451437
#if ENABLED(SKEW_CORRECTION_FOR_Z)
452438
#define XZ_DIAG_AC 282.8427124746
453439
#define XZ_DIAG_BD 282.8427124746
454440
#define YZ_DIAG_AC 282.8427124746
455441
#define YZ_DIAG_BD 282.8427124746
456442
#define YZ_SIDE_AD 200
457-
458-
// Or, set the Z skew factors directly:
459-
//#define XZ_SKEW_FACTOR 0.0
460-
//#define YZ_SKEW_FACTOR 0.0
461443
#endif
462444

463445
// Enable this option for M852 to set skew at runtime
@@ -500,7 +482,12 @@
500482
* ****************************DO NOT TOUCH ANYTHING BELOW THIS COMMENT**************************
501483
* Core machine settings are below. Do NOT modify these unless you understand what you are doing.
502484
*/
503-
485+
486+
//BLTouch/CRTouch ABL Updates
487+
#if ENABLED(BLTOUCH) && DISABLED(CUSTOM_PROBE)
488+
#define CUSTOM_PROBE
489+
#endif
490+
504491
//Set Ender 3 Pro Machine Setting
505492
#if ENABLED(ENDER3_PRO)
506493
#define ENDER3
@@ -623,7 +610,7 @@
623610
#define Z_MAX_POS 220
624611
#define PRINTER_VOLTAGE_12
625612
#endif
626-
613+
627614
#if ENABLED(ENDER2_PRO)
628615
#define X_BED_SIZE 165
629616
#define Y_BED_SIZE 168

Board_Configs/TH3D_EZBoardLite_DIY/Firmware/Marlin/Configuration.h

Lines changed: 28 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -231,9 +231,9 @@
231231
// ************************* END PRINTER SECTION *************************
232232
//===========================================================================
233233

234-
//===========================================================================
235-
// EZABL Advanced Settings - EZABL_POINTS & EZABL_PROBE_EDGE are also used for other probes
236-
//===========================================================================
234+
/**
235+
* EZABL Advanced Settings - EZABL_POINTS & EZABL_PROBE_EDGE are also used for other probes
236+
*/
237237

238238
// Probing Grid Points - If you want more or less EZABL probe points change the number below, use odd numbers. Total points is # times #.
239239
#define EZABL_POINTS 3
@@ -259,12 +259,24 @@
259259
// Grid Extrapolation - This will use the mesh data to make assumptions of the bed outside the probe area. Disable if you are getting incorrect results on the edges of the bed.
260260
#define EXTRAPOLATE_BEYOND_GRID
261261

262-
//================================================================================
263-
// CUSTOM PROBE SETTINGS - FOR EZABL OR BL TOUCH
264-
// If you have a probe mount that is not pre-setup in the firmware then uncomment
265-
// the CUSTOM_PROBE line above and enter your probe offsets below
266-
//================================================================================
267-
#if ENABLED(CUSTOM_PROBE)
262+
/**
263+
* BLTouch/CRTouch
264+
*
265+
* If you want to use the BLTouch/CRTouch uncomment the BLTOUCH line below.
266+
* You also need then enter in your sensor offsets below in the CUSTOM PROBE section.
267+
*
268+
* If you need to change your SERVO pin you can change that with the SERVO0_PIN Line below. Most people do NOT need to change/set this.
269+
*/
270+
//#define BLTOUCH
271+
//#define SERVO0_PIN P2_04
272+
273+
/**
274+
* Custom Probe Offset - EZABL/BLTouch/CRTouch
275+
*
276+
* If you have a probe mount that is not pre-setup in the firmware then uncomment
277+
* the CUSTOM_PROBE option (or BLTOUCH if using one) above and enter your probe offsets below
278+
*/
279+
#if ANY(CUSTOM_PROBE, BLTOUCH)
268280
/**
269281
* Z Probe to nozzle (X,Y) offset, relative to (0, 0).
270282
*
@@ -285,7 +297,7 @@
285297
*
286298
* Specify a Probe position as { X, Y, Z }
287299
* Do NOT enter an number for the Z position in here. Store your offset in EEPROM.
288-
*
300+
*
289301
* When is the offset POSITIVE?
290302
* If the probe is right of the nozzle the offset on X is POSITIVE
291303
* If the probe is behind of the nozzle the offset on Y is POSITIVE
@@ -297,9 +309,8 @@
297309
#define NOZZLE_TO_PROBE_OFFSET { 10, 10, 0 }
298310
#endif
299311

300-
301312
//===========================================================================
302-
//******************** EXTRA FEATURES AND TWEAKS ****************************
313+
//******************** Extra Features and Tweaks ****************************
303314
//===========================================================================
304315

305316
// FILAMENT SENSOR UNLOAD SETTINGS -----------------
@@ -397,17 +408,6 @@
397408
//#define LINEAR_ADVANCE
398409
#define LINEAR_ADVANCE_K 0
399410

400-
/**
401-
* BLTouch/CRTouch
402-
*
403-
* If you want to use the BLTouch/CRTouch uncomment the BLTOUCH line below.
404-
* You also need to uncomment #define CUSTOM_PROBE above and then enter in your offsets above in the CUSTOM PROBE section.
405-
*
406-
* If you need to change your SERVO pin you can change that with the SERVO0_PIN Line below. Most people do NOT need to change/set this.
407-
*/
408-
//#define BLTOUCH
409-
//#define SERVO0_PIN P2_04
410-
411411
/**
412412
* Manual Mesh Leveling
413413
*
@@ -513,6 +513,11 @@
513513
* Core machine settings are below. Do NOT modify these unless you understand what you are doing.
514514
*/
515515

516+
//BLTouch/CRTouch ABL Updates
517+
#if ENABLED(BLTOUCH) && DISABLED(CUSTOM_PROBE)
518+
#define CUSTOM_PROBE
519+
#endif
520+
516521
/**
517522
* Machine Configuration Settings
518523
*/

0 commit comments

Comments
 (0)