|
1 | 1 | /**
|
2 | 2 | * Marlin 3D Printer Firmware
|
3 |
| - * Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin] |
| 3 | + * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin] |
4 | 4 | *
|
5 | 5 | * Based on Sprinter and grbl.
|
6 | 6 | * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
|
|
668 | 668 | */
|
669 | 669 | //#define Z_STEPPER_AUTO_ALIGN
|
670 | 670 | #if ENABLED(Z_STEPPER_AUTO_ALIGN)
|
671 |
| - // Define probe X and Y positions for Z1, Z2 [, Z3] |
672 |
| - #define Z_STEPPER_ALIGN_XY { { 10, 190 }, { 100, 10 }, { 190, 190 } } |
| 671 | + // Define probe X and Y positions for Z1, Z2 [, Z3 [, Z4]] |
| 672 | + // If not defined, probe limits will be used. |
| 673 | + // Override with 'M422 S<index> X<pos> Y<pos>' |
| 674 | + //#define Z_STEPPER_ALIGN_XY { { 10, 190 }, { 100, 10 }, { 190, 190 } } |
| 675 | + |
| 676 | + /** |
| 677 | + * Orientation for the automatically-calculated probe positions. |
| 678 | + * Override Z stepper align points with 'M422 S<index> X<pos> Y<pos>' |
| 679 | + * |
| 680 | + * 2 Steppers: (0) (1) |
| 681 | + * | | 2 | |
| 682 | + * | 1 2 | | |
| 683 | + * | | 1 | |
| 684 | + * |
| 685 | + * 3 Steppers: (0) (1) (2) (3) |
| 686 | + * | 3 | 1 | 2 1 | 2 | |
| 687 | + * | | 3 | | 3 | |
| 688 | + * | 1 2 | 2 | 3 | 1 | |
| 689 | + * |
| 690 | + * 4 Steppers: (0) (1) (2) (3) |
| 691 | + * | 4 3 | 1 4 | 2 1 | 3 2 | |
| 692 | + * | | | | | |
| 693 | + * | 1 2 | 2 3 | 3 4 | 4 1 | |
| 694 | + * |
| 695 | + */ |
| 696 | + #ifndef Z_STEPPER_ALIGN_XY |
| 697 | + //#define Z_STEPPERS_ORIENTATION 0 |
| 698 | + #endif |
673 | 699 |
|
674 | 700 | // Provide Z stepper positions for more rapid convergence in bed alignment.
|
675 |
| - // Currently requires triple stepper drivers. |
| 701 | + // Requires triple stepper drivers (i.e., set NUM_Z_STEPPER_DRIVERS to 3) |
676 | 702 | //#define Z_STEPPER_ALIGN_KNOWN_STEPPER_POSITIONS
|
677 | 703 | #if ENABLED(Z_STEPPER_ALIGN_KNOWN_STEPPER_POSITIONS)
|
678 | 704 | // Define Stepper XY positions for Z1, Z2, Z3 corresponding to
|
679 | 705 | // the Z screw positions in the bed carriage.
|
680 | 706 | // Define one position per Z stepper in stepper driver order.
|
681 | 707 | #define Z_STEPPER_ALIGN_STEPPER_XY { { 210.7, 102.5 }, { 152.6, 220.0 }, { 94.5, 102.5 } }
|
682 | 708 | #else
|
683 |
| - // Amplification factor. Used to scale the correction step up or down. |
684 |
| - // In case the stepper (spindle) position is further out than the test point. |
685 |
| - // Use a value > 1. NOTE: This may cause instability |
686 |
| - #define Z_STEPPER_ALIGN_AMP 1.0 |
| 709 | + // Amplification factor. Used to scale the correction step up or down in case |
| 710 | + // the stepper (spindle) position is farther out than the test point. |
| 711 | + #define Z_STEPPER_ALIGN_AMP 1.0 // Use a value > 1.0 NOTE: This may cause instability! |
687 | 712 | #endif
|
688 | 713 |
|
689 |
| - // Set number of iterations to align |
690 |
| - #define Z_STEPPER_ALIGN_ITERATIONS 3 |
691 |
| - |
692 |
| - // Enable to restore leveling setup after operation |
693 |
| - #define RESTORE_LEVELING_AFTER_G34 |
694 |
| - |
695 | 714 | // On a 300mm bed a 5% grade would give a misalignment of ~1.5cm
|
696 |
| - #define G34_MAX_GRADE 5 // (%) Maximum incline G34 will handle |
697 |
| - |
698 |
| - // Stop criterion. If the accuracy is better than this stop iterating early |
699 |
| - #define Z_STEPPER_ALIGN_ACC 0.02 |
| 715 | + #define G34_MAX_GRADE 5 // (%) Maximum incline that G34 will handle |
| 716 | + #define Z_STEPPER_ALIGN_ITERATIONS 5 // Number of iterations to apply during alignment |
| 717 | + #define Z_STEPPER_ALIGN_ACC 0.02 // Stop iterating early if the accuracy is better than this |
| 718 | + #define RESTORE_LEVELING_AFTER_G34 // Restore leveling after G34 is done? |
700 | 719 | #endif
|
701 | 720 |
|
702 | 721 | // @section motion
|
|
3004 | 3023 | //#define ESP3D_WIFISUPPORT // ESP3D Library WiFi management (https://github.com/luc-github/ESP3DLib)
|
3005 | 3024 |
|
3006 | 3025 | #if EITHER(WIFISUPPORT, ESP3D_WIFISUPPORT)
|
3007 |
| - #define WIFI_SSID "Wifi SSID" |
3008 |
| - #define WIFI_PWD "Wifi Password" |
3009 | 3026 | //#define WEBSUPPORT // Start a webserver (which may include auto-discovery)
|
3010 | 3027 | //#define OTASUPPORT // Support over-the-air firmware updates
|
3011 | 3028 | //#define WIFI_CUSTOM_COMMAND // Accept feature config commands (e.g., WiFi ESP3D) from the host
|
| 3029 | + |
| 3030 | + /** |
| 3031 | + * To set a default WiFi SSID / Password, create a file called Configuration_Secure.h with |
| 3032 | + * the following defines, customized for your network. This specific file is excluded via |
| 3033 | + * .gitignore to prevent it from accidentally leaking to the public. |
| 3034 | + * |
| 3035 | + * #define WIFI_SSID "WiFi SSID" |
| 3036 | + * #define WIFI_PWD "WiFi Password" |
| 3037 | + */ |
| 3038 | + //#include "Configuration_Secure.h" // External file with WiFi SSID / Password |
3012 | 3039 | #endif
|
3013 | 3040 |
|
3014 | 3041 | /**
|
|
0 commit comments