Browse Source

enabled auto bed leveling with probe

Thomas B (OrangePi i3) 6 years ago
parent
commit
90f252cfa5
2 changed files with 36 additions and 32 deletions
  1. 28
    24
      Marlin/Configuration.h
  2. 8
    8
      Marlin/Configuration_adv.h

+ 28
- 24
Marlin/Configuration.h View File

476
 #define USE_ZMIN_PLUG
476
 #define USE_ZMIN_PLUG
477
 //#define USE_XMAX_PLUG
477
 //#define USE_XMAX_PLUG
478
 //#define USE_YMAX_PLUG
478
 //#define USE_YMAX_PLUG
479
-//#define USE_ZMAX_PLUG
479
+#define USE_ZMAX_PLUG
480
 
480
 
481
 // coarse Endstop Settings
481
 // coarse Endstop Settings
482
 #define ENDSTOPPULLUPS // Comment this out (using // at the start of the line) to disable the endstop pullup resistors
482
 #define ENDSTOPPULLUPS // Comment this out (using // at the start of the line) to disable the endstop pullup resistors
499
 #define X_MAX_ENDSTOP_INVERTING false // set to true to invert the logic of the endstop.
499
 #define X_MAX_ENDSTOP_INVERTING false // set to true to invert the logic of the endstop.
500
 #define Y_MAX_ENDSTOP_INVERTING false // set to true to invert the logic of the endstop.
500
 #define Y_MAX_ENDSTOP_INVERTING false // set to true to invert the logic of the endstop.
501
 #define Z_MAX_ENDSTOP_INVERTING false // set to true to invert the logic of the endstop.
501
 #define Z_MAX_ENDSTOP_INVERTING false // set to true to invert the logic of the endstop.
502
-#define Z_MIN_PROBE_ENDSTOP_INVERTING false // set to true to invert the logic of the probe.
502
+#define Z_MIN_PROBE_ENDSTOP_INVERTING true // set to true to invert the logic of the probe.
503
 
503
 
504
 // Enable this feature if all enabled endstop pins are interrupt-capable.
504
 // Enable this feature if all enabled endstop pins are interrupt-capable.
505
 // This will remove the need to poll the interrupt pins, saving many CPU cycles.
505
 // This will remove the need to poll the interrupt pins, saving many CPU cycles.
530
  * Override with M92
530
  * Override with M92
531
  *                                      X, Y, Z, E0 [, E1[, E2[, E3[, E4]]]]
531
  *                                      X, Y, Z, E0 [, E1[, E2[, E3[, E4]]]]
532
  */
532
  */
533
-#define DEFAULT_AXIS_STEPS_PER_UNIT   { 80.10, 80.10, 400, 99.0 }
533
+#define DEFAULT_AXIS_STEPS_PER_UNIT   { 80.10, 80.10, 400, 103.66 }
534
 
534
 
535
 /**
535
 /**
536
  * Default Max Feed Rate (mm/s)
536
  * Default Max Feed Rate (mm/s)
586
  *
586
  *
587
  * Enable this option for a probe connected to the Z Min endstop pin.
587
  * Enable this option for a probe connected to the Z Min endstop pin.
588
  */
588
  */
589
-#define Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN
589
+//#define Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN
590
 
590
 
591
 /**
591
 /**
592
  * Z_MIN_PROBE_ENDSTOP
592
  * Z_MIN_PROBE_ENDSTOP
607
  * disastrous consequences. Use with caution and do your homework.
607
  * disastrous consequences. Use with caution and do your homework.
608
  *
608
  *
609
  */
609
  */
610
-//#define Z_MIN_PROBE_ENDSTOP
610
+#define Z_MIN_PROBE_ENDSTOP
611
+#define Z_MIN_PROBE_PIN Z_MAX_PIN
611
 
612
 
612
 /**
613
 /**
613
  * Probe Type
614
  * Probe Type
627
  * A Fix-Mounted Probe either doesn't deploy or needs manual deployment.
628
  * A Fix-Mounted Probe either doesn't deploy or needs manual deployment.
628
  *   (e.g., an inductive probe or a nozzle-based probe-switch.)
629
  *   (e.g., an inductive probe or a nozzle-based probe-switch.)
629
  */
630
  */
630
-//#define FIX_MOUNTED_PROBE
631
+#define FIX_MOUNTED_PROBE
631
 
632
 
632
 /**
633
 /**
633
  * Z Servo Probe, such as an endstop switch on a rotating arm.
634
  * Z Servo Probe, such as an endstop switch on a rotating arm.
684
  *      O-- FRONT --+
685
  *      O-- FRONT --+
685
  *    (0,0)
686
  *    (0,0)
686
  */
687
  */
687
-#define X_PROBE_OFFSET_FROM_EXTRUDER 10  // X offset: -left  +right  [of the nozzle]
688
-#define Y_PROBE_OFFSET_FROM_EXTRUDER 10  // Y offset: -front +behind [the nozzle]
689
-#define Z_PROBE_OFFSET_FROM_EXTRUDER 0   // Z offset: -below +above  [the nozzle]
688
+#define X_PROBE_OFFSET_FROM_EXTRUDER -37 // X offset: -left  +right  [of the nozzle]
689
+#define Y_PROBE_OFFSET_FROM_EXTRUDER 2   // Y offset: -front +behind [the nozzle]
690
+#define Z_PROBE_OFFSET_FROM_EXTRUDER -3.04   // Z offset: -below +above  [the nozzle]
690
 
691
 
691
 // X and Y axis travel speed (mm/m) between probes
692
 // X and Y axis travel speed (mm/m) between probes
692
-#define XY_PROBE_SPEED 8000
693
+#define XY_PROBE_SPEED (100 * 60)
693
 
694
 
694
 // Speed for the first approach when double-probing (with PROBE_DOUBLE_TOUCH)
695
 // Speed for the first approach when double-probing (with PROBE_DOUBLE_TOUCH)
695
 #define Z_PROBE_SPEED_FAST HOMING_FEEDRATE_Z
696
 #define Z_PROBE_SPEED_FAST HOMING_FEEDRATE_Z
722
 #define Z_PROBE_OFFSET_RANGE_MAX 20
723
 #define Z_PROBE_OFFSET_RANGE_MAX 20
723
 
724
 
724
 // Enable the M48 repeatability test to test probe accuracy
725
 // Enable the M48 repeatability test to test probe accuracy
725
-//#define Z_MIN_PROBE_REPEATABILITY_TEST
726
+#define Z_MIN_PROBE_REPEATABILITY_TEST
726
 
727
 
727
 // For Inverting Stepper Enable Pins (Active Low) use 0, Non Inverting (Active High) use 1
728
 // For Inverting Stepper Enable Pins (Active Low) use 0, Non Inverting (Active High) use 1
728
 // :{ 0:'Low', 1:'High' }
729
 // :{ 0:'Low', 1:'High' }
779
 // @section machine
780
 // @section machine
780
 
781
 
781
 // The size of the print bed
782
 // The size of the print bed
782
-#define X_BED_SIZE 190
783
-#define Y_BED_SIZE 200
783
+#define X_BED_SIZE 195
784
+#define Y_BED_SIZE 183
784
 
785
 
785
 // Travel limits (mm) after homing, corresponding to endstop positions.
786
 // Travel limits (mm) after homing, corresponding to endstop positions.
786
-#define X_MIN_POS -5
787
+#define X_MIN_POS 0
787
 #define Y_MIN_POS -10
788
 #define Y_MIN_POS -10
788
 #define Z_MIN_POS 0
789
 #define Z_MIN_POS 0
789
 #define X_MAX_POS X_BED_SIZE
790
 #define X_MAX_POS X_BED_SIZE
790
 #define Y_MAX_POS Y_BED_SIZE
791
 #define Y_MAX_POS Y_BED_SIZE
791
-#define Z_MAX_POS 200
792
+#define Z_MAX_POS 165
792
 
793
 
793
 // If enabled, axes won't move below MIN_POS in response to movement commands.
794
 // If enabled, axes won't move below MIN_POS in response to movement commands.
794
 #define MIN_SOFTWARE_ENDSTOPS
795
 #define MIN_SOFTWARE_ENDSTOPS
855
  */
856
  */
856
 //#define AUTO_BED_LEVELING_3POINT
857
 //#define AUTO_BED_LEVELING_3POINT
857
 //#define AUTO_BED_LEVELING_LINEAR
858
 //#define AUTO_BED_LEVELING_LINEAR
858
-//#define AUTO_BED_LEVELING_BILINEAR
859
+#define AUTO_BED_LEVELING_BILINEAR
859
 //#define AUTO_BED_LEVELING_UBL
860
 //#define AUTO_BED_LEVELING_UBL
860
 //#define MESH_BED_LEVELING
861
 //#define MESH_BED_LEVELING
861
 
862
 
876
 #if ENABLED(AUTO_BED_LEVELING_LINEAR) || ENABLED(AUTO_BED_LEVELING_BILINEAR)
877
 #if ENABLED(AUTO_BED_LEVELING_LINEAR) || ENABLED(AUTO_BED_LEVELING_BILINEAR)
877
 
878
 
878
   // Set the number of grid points per dimension.
879
   // Set the number of grid points per dimension.
879
-  #define GRID_MAX_POINTS_X 3
880
+  #define GRID_MAX_POINTS_X 4
880
   #define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
881
   #define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
881
 
882
 
883
+  #define BED_LEVEL_OFF_X 10
884
+  #define BED_LEVEL_OFF_Y 40
885
+
882
   // Set the boundaries for probing (where the probe can reach).
886
   // Set the boundaries for probing (where the probe can reach).
883
-  #define LEFT_PROBE_BED_POSITION 15
884
-  #define RIGHT_PROBE_BED_POSITION 170
885
-  #define FRONT_PROBE_BED_POSITION 20
886
-  #define BACK_PROBE_BED_POSITION 170
887
+  #define LEFT_PROBE_BED_POSITION (BED_LEVEL_OFF_X - X_PROBE_OFFSET_FROM_EXTRUDER)
888
+  #define RIGHT_PROBE_BED_POSITION (X_BED_SIZE + X_PROBE_OFFSET_FROM_EXTRUDER - BED_LEVEL_OFF_X)
889
+  #define FRONT_PROBE_BED_POSITION (BED_LEVEL_OFF_Y - Y_PROBE_OFFSET_FROM_EXTRUDER)
890
+  #define BACK_PROBE_BED_POSITION (Y_BED_SIZE + Y_PROBE_OFFSET_FROM_EXTRUDER - BED_LEVEL_OFF_Y)
887
 
891
 
888
   // The Z probe minimum outer margin (to validate G29 parameters).
892
   // The Z probe minimum outer margin (to validate G29 parameters).
889
   #define MIN_PROBE_EDGE 10
893
   #define MIN_PROBE_EDGE 10
895
 
899
 
896
     // Beyond the probed grid, continue the implied tilt?
900
     // Beyond the probed grid, continue the implied tilt?
897
     // Default is to maintain the height of the nearest edge.
901
     // Default is to maintain the height of the nearest edge.
898
-    //#define EXTRAPOLATE_BEYOND_GRID
902
+    #define EXTRAPOLATE_BEYOND_GRID
899
 
903
 
900
     //
904
     //
901
     // Experimental Subdivision of the grid by Catmull-Rom method.
905
     // Experimental Subdivision of the grid by Catmull-Rom method.
902
     // Synthesizes intermediate points to produce a more detailed mesh.
906
     // Synthesizes intermediate points to produce a more detailed mesh.
903
     //
907
     //
904
-    //#define ABL_BILINEAR_SUBDIVISION
908
+    #define ABL_BILINEAR_SUBDIVISION
905
     #if ENABLED(ABL_BILINEAR_SUBDIVISION)
909
     #if ENABLED(ABL_BILINEAR_SUBDIVISION)
906
       // Number of subdivisions between probe points
910
       // Number of subdivisions between probe points
907
       #define BILINEAR_SUBDIVISIONS 3
911
       #define BILINEAR_SUBDIVISIONS 3
1686
  */
1690
  */
1687
 //#define FILAMENT_WIDTH_SENSOR
1691
 //#define FILAMENT_WIDTH_SENSOR
1688
 
1692
 
1689
-#define DEFAULT_NOMINAL_FILAMENT_DIA 3.00   // (mm) Diameter of the filament generally used (3.0 or 1.75mm), also used in the slicer. Used to validate sensor reading.
1693
+#define DEFAULT_NOMINAL_FILAMENT_DIA 1.75   // (mm) Diameter of the filament generally used (3.0 or 1.75mm), also used in the slicer. Used to validate sensor reading.
1690
 
1694
 
1691
 #if ENABLED(FILAMENT_WIDTH_SENSOR)
1695
 #if ENABLED(FILAMENT_WIDTH_SENSOR)
1692
   #define FILAMENT_SENSOR_EXTRUDER_NUM 0    // Index of the extruder that has the filament sensor (0,1,2,3)
1696
   #define FILAMENT_SENSOR_EXTRUDER_NUM 0    // Index of the extruder that has the filament sensor (0,1,2,3)

+ 8
- 8
Marlin/Configuration_adv.h View File

255
 
255
 
256
 // @section extras
256
 // @section extras
257
 
257
 
258
-//#define Z_LATE_ENABLE // Enable Z the last moment. Needed if your Z driver overheats.
258
+#define Z_LATE_ENABLE // Enable Z the last moment. Needed if your Z driver overheats.
259
 
259
 
260
 // Dual X Steppers
260
 // Dual X Steppers
261
 // Uncomment this option to drive two X axis motors.
261
 // Uncomment this option to drive two X axis motors.
350
 #define Y_HOME_BUMP_MM 5
350
 #define Y_HOME_BUMP_MM 5
351
 #define Z_HOME_BUMP_MM 2
351
 #define Z_HOME_BUMP_MM 2
352
 #define HOMING_BUMP_DIVISOR {2, 2, 4}  // Re-Bump Speed Divisor (Divides the Homing Feedrate)
352
 #define HOMING_BUMP_DIVISOR {2, 2, 4}  // Re-Bump Speed Divisor (Divides the Homing Feedrate)
353
-//#define QUICK_HOME  //if this is defined, if both x and y are to be homed, a diagonal move will be performed initially.
353
+#define QUICK_HOME  //if this is defined, if both x and y are to be homed, a diagonal move will be performed initially.
354
 
354
 
355
 // When G28 is called, this option will make Y home before X
355
 // When G28 is called, this option will make Y home before X
356
 //#define HOME_Y_BEFORE_X
356
 //#define HOME_Y_BEFORE_X
455
 // @section lcd
455
 // @section lcd
456
 
456
 
457
 // Include a page of printer information in the LCD Main Menu
457
 // Include a page of printer information in the LCD Main Menu
458
-//#define LCD_INFO_MENU
458
+#define LCD_INFO_MENU
459
 
459
 
460
 // Scroll a longer status message into view
460
 // Scroll a longer status message into view
461
-//#define STATUS_MESSAGE_SCROLLING
461
+#define STATUS_MESSAGE_SCROLLING
462
 
462
 
463
 // On the Info Screen, display XY with one decimal place when possible
463
 // On the Info Screen, display XY with one decimal place when possible
464
 //#define LCD_DECIMAL_SMALL_XY
464
 //#define LCD_DECIMAL_SMALL_XY
465
 
465
 
466
 // The timeout (in ms) to return to the status screen from sub-menus
466
 // The timeout (in ms) to return to the status screen from sub-menus
467
-//#define LCD_TIMEOUT_TO_STATUS 15000
467
+#define LCD_TIMEOUT_TO_STATUS 60000
468
 
468
 
469
 #if ENABLED(SDSUPPORT)
469
 #if ENABLED(SDSUPPORT)
470
 
470
 
520
   #endif
520
   #endif
521
 
521
 
522
   // Show a progress bar on HD44780 LCDs for SD printing
522
   // Show a progress bar on HD44780 LCDs for SD printing
523
-  //#define LCD_PROGRESS_BAR
523
+  #define LCD_PROGRESS_BAR
524
 
524
 
525
   #if ENABLED(LCD_PROGRESS_BAR)
525
   #if ENABLED(LCD_PROGRESS_BAR)
526
     // Amount of time (ms) to show the bar
526
     // Amount of time (ms) to show the bar
603
 #if ENABLED(BABYSTEPPING)
603
 #if ENABLED(BABYSTEPPING)
604
   #define BABYSTEP_XY              // Also enable X/Y Babystepping. Not supported on DELTA!
604
   #define BABYSTEP_XY              // Also enable X/Y Babystepping. Not supported on DELTA!
605
   #define BABYSTEP_INVERT_Z false    // Change if Z babysteps should go the other way
605
   #define BABYSTEP_INVERT_Z false    // Change if Z babysteps should go the other way
606
-  #define BABYSTEP_MULTIPLICATOR 100 // Babysteps are very small. Increase for faster motion.
606
+  #define BABYSTEP_MULTIPLICATOR 25 // Babysteps are very small. Increase for faster motion.
607
   //#define BABYSTEP_ZPROBE_OFFSET   // Enable to combine M851 and Babystepping
607
   //#define BABYSTEP_ZPROBE_OFFSET   // Enable to combine M851 and Babystepping
608
   #define DOUBLECLICK_FOR_Z_BABYSTEPPING // Double-click on the Status Screen for Z Babystepping.
608
   #define DOUBLECLICK_FOR_Z_BABYSTEPPING // Double-click on the Status Screen for Z Babystepping.
609
   #define DOUBLECLICK_MAX_INTERVAL 1250 // Maximum interval between clicks, in milliseconds.
609
   #define DOUBLECLICK_MAX_INTERVAL 1250 // Maximum interval between clicks, in milliseconds.
610
                                         // Note: Extra time may be added to mitigate controller latency.
610
                                         // Note: Extra time may be added to mitigate controller latency.
611
-  #define BABYSTEP_ZPROBE_GFX_OVERLAY // Enable graphical overlay on Z-offset editor
611
+  //#define BABYSTEP_ZPROBE_GFX_OVERLAY // Enable graphical overlay on Z-offset editor
612
   //#define BABYSTEP_ZPROBE_GFX_REVERSE // Reverses the direction of the CW/CCW indicators
612
   //#define BABYSTEP_ZPROBE_GFX_REVERSE // Reverses the direction of the CW/CCW indicators
613
 #endif
613
 #endif
614
 
614
 

Loading…
Cancel
Save