Skip to content

Commit 27f26f7

Browse files
houseofbugshouseofbugs
authored
Merge pull request #165 from th3dstudio/2.0.x
2.0.x
2 parents 33d1732 + 47fbf34 commit 27f26f7

File tree

15 files changed

+32
-19
lines changed

15 files changed

+32
-19
lines changed

‎Board_Configs/TH3D_EZBoardLite/Firmware/Marlin/Configuration.h

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -396,6 +396,13 @@
396396
#define ENDER5
397397
#endif
398398

399+
//Set ZSteps for ENDER5_NEW_LEADSCREW
400+
#if ANY(ENDER5_NEW_LEADSCREW, ENDER5_PLUS)
401+
#define CREALITY_Z_STEPS 800
402+
#else
403+
#define CREALITY_Z_STEPS 400
404+
#endif
405+
399406
/**
400407
* Machine Configuration Settings
401408
*/
@@ -454,11 +461,11 @@
454461
#endif
455462

456463
#if ENABLED(CUSTOM_ESTEPS)
457-
#define DEFAULT_AXIS_STEPS_PER_UNIT { 80, 80, 400, CUSTOM_ESTEPS_VALUE }
464+
#define DEFAULT_AXIS_STEPS_PER_UNIT { 80, 80, CREALITY_Z_STEPS, CUSTOM_ESTEPS_VALUE }
458465
#elif ENABLED(SOVOL_SV01) || ENABLED(SOVOL_SV03)
459-
#define DEFAULT_AXIS_STEPS_PER_UNIT { 80, 80, 400, 402 }
466+
#define DEFAULT_AXIS_STEPS_PER_UNIT { 80, 80, CREALITY_Z_STEPS, 402 }
460467
#else
461-
#define DEFAULT_AXIS_STEPS_PER_UNIT { 80, 80, 400, 95 }
468+
#define DEFAULT_AXIS_STEPS_PER_UNIT { 80, 80, CREALITY_Z_STEPS, 95 }
462469
#endif
463470

464471
#define SHOW_BOOTSCREEN
@@ -581,7 +588,6 @@
581588
#if DISABLED(REVERSE_KNOB_DIRECTION)
582589
#define REVERSE_ENCODER_DIRECTION
583590
#endif
584-
#define ENDER5_NEW_LEADSCREW
585591
#define EZOUTV2_ENABLE
586592
#define DUAL_Z_MOTORS
587593
#define MOUNTED_FILAMENT_SENSOR

‎Board_Configs/TH3D_EZBoardV2/Firmware/Marlin/Configuration.h

Lines changed: 14 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -434,6 +434,13 @@
434434
#define ENDER5
435435
#endif
436436

437+
//Set ZSteps for ENDER5_NEW_LEADSCREW
438+
#if ANY(ENDER5_NEW_LEADSCREW, ENDER5_PLUS)
439+
#define CREALITY_Z_STEPS 800
440+
#else
441+
#define CREALITY_Z_STEPS 400
442+
#endif
443+
437444
/**
438445
* TH3D EZBoard V2 Config Sanity Checks
439446
*/
@@ -533,22 +540,22 @@
533540

534541
#if ENABLED(CUSTOM_ESTEPS)
535542
#if ALL(ENDER6_LDO_XY, ENDER6)
536-
#define DEFAULT_AXIS_STEPS_PER_UNIT { 160, 160, 400, CUSTOM_ESTEPS_VALUE }
543+
#define DEFAULT_AXIS_STEPS_PER_UNIT { 160, 160, CREALITY_Z_STEPS, CUSTOM_ESTEPS_VALUE }
537544
#else
538-
#define DEFAULT_AXIS_STEPS_PER_UNIT { 80, 80, 400, CUSTOM_ESTEPS_VALUE }
545+
#define DEFAULT_AXIS_STEPS_PER_UNIT { 80, 80, CREALITY_Z_STEPS, CUSTOM_ESTEPS_VALUE }
539546
#endif
540547
#elif ANY(SOVOL_SV01, SOVOL_SV03)
541-
#define DEFAULT_AXIS_STEPS_PER_UNIT { 80, 80, 400, 402 }
548+
#define DEFAULT_AXIS_STEPS_PER_UNIT { 80, 80, CREALITY_Z_STEPS, 402 }
542549
#elif ENABLED(ENDER6)
543550
#if ENABLED(ENDER6_LDO_XY)
544-
#define DEFAULT_AXIS_STEPS_PER_UNIT { 160, 160, 400, 140 }
551+
#define DEFAULT_AXIS_STEPS_PER_UNIT { 160, 160, CREALITY_Z_STEPS, 140 }
545552
#else
546-
#define DEFAULT_AXIS_STEPS_PER_UNIT { 80, 80, 400, 140 }
553+
#define DEFAULT_AXIS_STEPS_PER_UNIT { 80, 80, CREALITY_Z_STEPS, 140 }
547554
#endif
548555
#elif ENABLED(SOVOL_SV01_PRO)
549-
#define DEFAULT_AXIS_STEPS_PER_UNIT { 80, 80, 400, 415 }
556+
#define DEFAULT_AXIS_STEPS_PER_UNIT { 80, 80, CREALITY_Z_STEPS, 415 }
550557
#else
551-
#define DEFAULT_AXIS_STEPS_PER_UNIT { 80, 80, 400, 95 }
558+
#define DEFAULT_AXIS_STEPS_PER_UNIT { 80, 80, CREALITY_Z_STEPS, 95 }
552559
#endif
553560

554561
#define SHOW_BOOTSCREEN
@@ -671,7 +678,6 @@
671678
#if DISABLED(REVERSE_KNOB_DIRECTION)
672679
#define REVERSE_ENCODER_DIRECTION
673680
#endif
674-
#define ENDER5_NEW_LEADSCREW
675681
#define EZOUTV2_ENABLE
676682
#define DUAL_Z_MOTORS
677683
#define MOUNTED_FILAMENT_SENSOR

‎Board_Configs/TH3D_EZBoardV2_DIY/Firmware/Marlin/Configuration.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -638,7 +638,7 @@
638638
#if ENABLED(NEOPIXEL_LED)
639639
#define NEOPIXEL_TYPE NEO_GRB // NEO_GRBW / NEO_GRB - four/three channel driver type (defined in Adafruit_NeoPixel.h)
640640
#ifndef NEOPIXEL_PIN
641-
#define NEOPIXEL_PIN P0_03 // LED driving pin
641+
#define NEOPIXEL_PIN PA8 // LED driving pin
642642
#endif
643643
//#define NEOPIXEL2_TYPE NEOPIXEL_TYPE
644644
//#define NEOPIXEL2_PIN 5

‎Firmware/Marlin/Configuration_adv.h

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3030,11 +3030,7 @@
30303030

30313031
#define Z_CURRENT_HOME Z_CURRENT
30323032

3033-
#if ENABLED(ENDER5_NEW_LEADSCREW) && (ENABLED(EZBOARD) || ENABLED(EZBOARD_V2))
3034-
#define Z_MICROSTEPS 8
3035-
#else
3036-
#define Z_MICROSTEPS 16
3037-
#endif
3033+
#define Z_MICROSTEPS 16
30383034

30393035
#if ENABLED(SOVOL_SV06)
30403036
#define Z_RSENSE 0.15

‎Firmware/Marlin/Configuration_backend.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
//======================= DO NOT MODIFY THIS FILE ===========================
77
//===========================================================================
88

9-
#define UNIFIED_VERSION "TH3D UFW 2.75a"
9+
#define UNIFIED_VERSION "TH3D UFW 2.75b"
1010

1111
/**
1212
* ABL Probe Settings

‎Firmware/Marlin/src/module/thermistor/thermistor_1.h

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,10 @@
2323

2424
// R25 = 100 kOhm, beta25 = 4092 K, 4.7 kOhm pull-up, bed thermistor
2525
constexpr temp_entry_t temptable_1[] PROGMEM = {
26+
{ OV( 18), 320 },
27+
{ OV( 19), 315 },
28+
{ OV( 20), 310 },
29+
{ OV( 22), 305 },
2630
{ OV( 23), 300 },
2731
{ OV( 25), 295 },
2832
{ OV( 27), 290 },

‎STL Files/EZABL Cases/EZABL NG Case STL Files/EZABL NG Case Base V1.0.stl

124 KB
Binary file not shown.

‎STL Files/EZABL Cases/EZABL NG Case STL Files/EZABL NG Case Lid V1.0.stl

381 KB
Binary file not shown.

‎STL Files/EZABL Cases/EZABL_Pro_Case_STL_Files/LICENSE.txt renamed to ‎STL Files/EZABL Cases/EZABL NG Case STL Files/LICENSE.txt

File renamed without changes.

‎STL Files/EZABL Cases/V1_V2_V3_EZABL_Case_STL_Files/LICENSE.txt renamed to ‎STL Files/EZABL Cases/EZABL Pro Case STL Files/LICENSE.txt

File renamed without changes.

‎STL Files/EZABL Cases/EZABL_Pro_Case_STL_Files/procase.stl renamed to ‎STL Files/EZABL Cases/EZABL Pro Case STL Files/procase.stl

File renamed without changes.

‎STL Files/EZABL Cases/EZABL_Pro_Case_STL_Files/prolid.stl renamed to ‎STL Files/EZABL Cases/EZABL Pro Case STL Files/prolid.stl

File renamed without changes.

‎STL Files/EZABL Cases/V1_V2_V3_EZABL_Case_STL_Files/Case.stl renamed to ‎STL Files/EZABL Cases/V1 V2 V3 EZABL Case STL Files/Case.stl

File renamed without changes.

‎STL Files/EZABL Cases/V1 V2 V3 EZABL Case STL Files/LICENSE.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
EZABL CASE STL FILES ARE FOR PERSONAL USE ONLY. NOT TO BE RE-SHARED.

‎STL Files/EZABL Cases/V1_V2_V3_EZABL_Case_STL_Files/Lid.stl renamed to ‎STL Files/EZABL Cases/V1 V2 V3 EZABL Case STL Files/Lid.stl

File renamed without changes.

0 commit comments

Comments
 (0)