소스 검색

Software endstop options as simple switches

Scott Lahteine 8 년 전
부모
커밋
0e410c9dfd
26개의 변경된 파일162개의 추가작업 그리고 138개의 파일을 삭제
  1. 1
    1
      Marlin/Conditionals_LCD.h
  2. 7
    6
      Marlin/Configuration.h
  3. 4
    4
      Marlin/Marlin_main.cpp
  4. 2
    0
      Marlin/SanityCheck.h
  5. 7
    6
      Marlin/example_configurations/Cartesio/Configuration.h
  6. 6
    5
      Marlin/example_configurations/Felix/Configuration.h
  7. 7
    6
      Marlin/example_configurations/Felix/DUAL/Configuration.h
  8. 7
    6
      Marlin/example_configurations/Hephestos/Configuration.h
  9. 7
    6
      Marlin/example_configurations/Hephestos_2/Configuration.h
  10. 7
    6
      Marlin/example_configurations/K8200/Configuration.h
  11. 7
    6
      Marlin/example_configurations/K8400/Configuration.h
  12. 7
    6
      Marlin/example_configurations/K8400/Dual-head/Configuration.h
  13. 7
    6
      Marlin/example_configurations/RepRapWorld/Megatronics/Configuration.h
  14. 7
    6
      Marlin/example_configurations/RigidBot/Configuration.h
  15. 7
    6
      Marlin/example_configurations/SCARA/Configuration.h
  16. 7
    6
      Marlin/example_configurations/TAZ4/Configuration.h
  17. 7
    6
      Marlin/example_configurations/WITBOX/Configuration.h
  18. 7
    6
      Marlin/example_configurations/adafruit/ST7565/Configuration.h
  19. 7
    6
      Marlin/example_configurations/delta/flsun_kossel_mini/Configuration.h
  20. 7
    6
      Marlin/example_configurations/delta/generic/Configuration.h
  21. 7
    6
      Marlin/example_configurations/delta/kossel_mini/Configuration.h
  22. 7
    6
      Marlin/example_configurations/delta/kossel_pro/Configuration.h
  23. 7
    6
      Marlin/example_configurations/delta/kossel_xl/Configuration.h
  24. 7
    6
      Marlin/example_configurations/makibox/Configuration.h
  25. 7
    6
      Marlin/example_configurations/tvrrug/Round2/Configuration.h
  26. 2
    2
      Marlin/ultralcd.cpp

+ 1
- 1
Marlin/Conditionals_LCD.h 파일 보기

369
     #undef Z_MIN_PROBE_ENDSTOP
369
     #undef Z_MIN_PROBE_ENDSTOP
370
   #endif
370
   #endif
371
 
371
 
372
-  #define HAS_SOFTWARE_ENDSTOPS (ENABLED(min_software_endstops) || ENABLED(max_software_endstops))
372
+  #define HAS_SOFTWARE_ENDSTOPS (ENABLED(MIN_SOFTWARE_ENDSTOPS) || ENABLED(MAX_SOFTWARE_ENDSTOPS))
373
 
373
 
374
 #endif //CONDITIONALS_LCD_H
374
 #endif //CONDITIONALS_LCD_H

+ 7
- 6
Marlin/Configuration.h 파일 보기

705
 //#define Z_HOMING_HEIGHT 4  // (in mm) Minimal z height before homing (G28) for Z clearance above the bed, clamps, ...
705
 //#define Z_HOMING_HEIGHT 4  // (in mm) Minimal z height before homing (G28) for Z clearance above the bed, clamps, ...
706
                              // Be sure you have this distance over your Z_MAX_POS in case.
706
                              // Be sure you have this distance over your Z_MAX_POS in case.
707
 
707
 
708
-// ENDSTOP SETTINGS:
708
+// Direction of endstops when homing; 1=MAX, -1=MIN
709
-// Sets direction of endstops when homing; 1=MAX, -1=MIN
709
+// :[-1,1]
710
-// :[-1, 1]
711
 #define X_HOME_DIR -1
710
 #define X_HOME_DIR -1
712
 #define Y_HOME_DIR -1
711
 #define Y_HOME_DIR -1
713
 #define Z_HOME_DIR -1
712
 #define Z_HOME_DIR -1
714
 
713
 
715
-#define min_software_endstops true // If true, axis won't move to coordinates less than HOME_POS.
716
-#define max_software_endstops true  // If true, axis won't move to coordinates greater than the defined lengths below.
717
-
718
 // @section machine
714
 // @section machine
719
 
715
 
720
 // Travel limits after homing (units are in mm)
716
 // Travel limits after homing (units are in mm)
725
 #define Y_MAX_POS 200
721
 #define Y_MAX_POS 200
726
 #define Z_MAX_POS 200
722
 #define Z_MAX_POS 200
727
 
723
 
724
+// If enabled, axes won't move below MIN_POS in response to movement commands.
725
+#define MIN_SOFTWARE_ENDSTOPS
726
+// If enabled, axes won't move above MAX_POS in response to movement commands.
727
+#define MAX_SOFTWARE_ENDSTOPS
728
+
728
 /**
729
 /**
729
  * Filament Runout Sensor
730
  * Filament Runout Sensor
730
  * A mechanical or opto endstop is used to check for the presence of filament.
731
  * A mechanical or opto endstop is used to check for the presence of filament.

+ 4
- 4
Marlin/Marlin_main.cpp 파일 보기

7889
               && (delayed_move_time || current_position[X_AXIS] != xhome)
7889
               && (delayed_move_time || current_position[X_AXIS] != xhome)
7890
           ) {
7890
           ) {
7891
             float raised_z = current_position[Z_AXIS] + TOOLCHANGE_PARK_ZLIFT;
7891
             float raised_z = current_position[Z_AXIS] + TOOLCHANGE_PARK_ZLIFT;
7892
-            #if ENABLED(max_software_endstops)
7892
+            #if ENABLED(MAX_SOFTWARE_ENDSTOPS)
7893
               NOMORE(raised_z, soft_endstop_max[Z_AXIS]);
7893
               NOMORE(raised_z, soft_endstop_max[Z_AXIS]);
7894
             #endif
7894
             #endif
7895
             #if ENABLED(DEBUG_LEVELING_FEATURE)
7895
             #if ENABLED(DEBUG_LEVELING_FEATURE)
7940
               // record raised toolhead position for use by unpark
7940
               // record raised toolhead position for use by unpark
7941
               COPY(raised_parked_position, current_position);
7941
               COPY(raised_parked_position, current_position);
7942
               raised_parked_position[Z_AXIS] += TOOLCHANGE_UNPARK_ZLIFT;
7942
               raised_parked_position[Z_AXIS] += TOOLCHANGE_UNPARK_ZLIFT;
7943
-              #if ENABLED(max_software_endstops)
7943
+              #if ENABLED(MAX_SOFTWARE_ENDSTOPS)
7944
                 NOMORE(raised_parked_position[Z_AXIS], soft_endstop_max[Z_AXIS]);
7944
                 NOMORE(raised_parked_position[Z_AXIS], soft_endstop_max[Z_AXIS]);
7945
               #endif
7945
               #endif
7946
               active_extruder_parked = true;
7946
               active_extruder_parked = true;
8983
    */
8983
    */
8984
   void clamp_to_software_endstops(float target[XYZ]) {
8984
   void clamp_to_software_endstops(float target[XYZ]) {
8985
     if (!soft_endstops_enabled) return;
8985
     if (!soft_endstops_enabled) return;
8986
-    #if ENABLED(min_software_endstops)
8986
+    #if ENABLED(MIN_SOFTWARE_ENDSTOPS)
8987
       NOLESS(target[X_AXIS], soft_endstop_min[X_AXIS]);
8987
       NOLESS(target[X_AXIS], soft_endstop_min[X_AXIS]);
8988
       NOLESS(target[Y_AXIS], soft_endstop_min[Y_AXIS]);
8988
       NOLESS(target[Y_AXIS], soft_endstop_min[Y_AXIS]);
8989
       NOLESS(target[Z_AXIS], soft_endstop_min[Z_AXIS]);
8989
       NOLESS(target[Z_AXIS], soft_endstop_min[Z_AXIS]);
8990
     #endif
8990
     #endif
8991
-    #if ENABLED(max_software_endstops)
8991
+    #if ENABLED(MAX_SOFTWARE_ENDSTOPS)
8992
       NOMORE(target[X_AXIS], soft_endstop_max[X_AXIS]);
8992
       NOMORE(target[X_AXIS], soft_endstop_max[X_AXIS]);
8993
       NOMORE(target[Y_AXIS], soft_endstop_max[Y_AXIS]);
8993
       NOMORE(target[Y_AXIS], soft_endstop_max[Y_AXIS]);
8994
       NOMORE(target[Z_AXIS], soft_endstop_max[Z_AXIS]);
8994
       NOMORE(target[Z_AXIS], soft_endstop_max[Z_AXIS]);

+ 2
- 0
Marlin/SanityCheck.h 파일 보기

158
   #error "LCD_PIN_RESET is now LCD_RESET_PIN. Please update your pins definitions."
158
   #error "LCD_PIN_RESET is now LCD_RESET_PIN. Please update your pins definitions."
159
 #elif defined(EXTRUDER_0_AUTO_FAN_PIN) || defined(EXTRUDER_1_AUTO_FAN_PIN) || defined(EXTRUDER_2_AUTO_FAN_PIN) || defined(EXTRUDER_3_AUTO_FAN_PIN)
159
 #elif defined(EXTRUDER_0_AUTO_FAN_PIN) || defined(EXTRUDER_1_AUTO_FAN_PIN) || defined(EXTRUDER_2_AUTO_FAN_PIN) || defined(EXTRUDER_3_AUTO_FAN_PIN)
160
   #error "EXTRUDER_[0123]_AUTO_FAN_PIN is now E[0123]_AUTO_FAN_PIN. Please update your Configuration_adv.h."
160
   #error "EXTRUDER_[0123]_AUTO_FAN_PIN is now E[0123]_AUTO_FAN_PIN. Please update your Configuration_adv.h."
161
+#elif defined(min_software_endstops) || defined(max_software_endstops)
162
+  #error "(min|max)_software_endstops are now (MIN|MAX)_SOFTWARE_ENDSTOPS. Please update your configuration."
161
 #endif
163
 #endif
162
 
164
 
163
 /**
165
 /**

+ 7
- 6
Marlin/example_configurations/Cartesio/Configuration.h 파일 보기

705
 //#define Z_HOMING_HEIGHT 4  // (in mm) Minimal z height before homing (G28) for Z clearance above the bed, clamps, ...
705
 //#define Z_HOMING_HEIGHT 4  // (in mm) Minimal z height before homing (G28) for Z clearance above the bed, clamps, ...
706
                              // Be sure you have this distance over your Z_MAX_POS in case.
706
                              // Be sure you have this distance over your Z_MAX_POS in case.
707
 
707
 
708
-// ENDSTOP SETTINGS:
708
+// Direction of endstops when homing; 1=MAX, -1=MIN
709
-// Sets direction of endstops when homing; 1=MAX, -1=MIN
709
+// :[-1,1]
710
-// :[-1, 1]
711
 #define X_HOME_DIR -1
710
 #define X_HOME_DIR -1
712
 #define Y_HOME_DIR -1
711
 #define Y_HOME_DIR -1
713
 #define Z_HOME_DIR -1
712
 #define Z_HOME_DIR -1
714
 
713
 
715
-#define min_software_endstops true // If true, axis won't move to coordinates less than HOME_POS.
716
-#define max_software_endstops true  // If true, axis won't move to coordinates greater than the defined lengths below.
717
-
718
 // @section machine
714
 // @section machine
719
 
715
 
720
 // Travel limits after homing (units are in mm)
716
 // Travel limits after homing (units are in mm)
725
 #define Y_MAX_POS 270
721
 #define Y_MAX_POS 270
726
 #define Z_MAX_POS 400
722
 #define Z_MAX_POS 400
727
 
723
 
724
+// If enabled, axes won't move below MIN_POS in response to movement commands.
725
+#define MIN_SOFTWARE_ENDSTOPS
726
+// If enabled, axes won't move above MAX_POS in response to movement commands.
727
+#define MAX_SOFTWARE_ENDSTOPS
728
+
728
 /**
729
 /**
729
  * Filament Runout Sensor
730
  * Filament Runout Sensor
730
  * A mechanical or opto endstop is used to check for the presence of filament.
731
  * A mechanical or opto endstop is used to check for the presence of filament.

+ 6
- 5
Marlin/example_configurations/Felix/Configuration.h 파일 보기

688
 //#define Z_HOMING_HEIGHT 4  // (in mm) Minimal z height before homing (G28) for Z clearance above the bed, clamps, ...
688
 //#define Z_HOMING_HEIGHT 4  // (in mm) Minimal z height before homing (G28) for Z clearance above the bed, clamps, ...
689
                              // Be sure you have this distance over your Z_MAX_POS in case.
689
                              // Be sure you have this distance over your Z_MAX_POS in case.
690
 
690
 
691
-// ENDSTOP SETTINGS:
691
+// Direction of endstops when homing; 1=MAX, -1=MIN
692
-// Sets direction of endstops when homing; 1=MAX, -1=MIN
693
 // :[-1, 1]
692
 // :[-1, 1]
694
 #define X_HOME_DIR -1
693
 #define X_HOME_DIR -1
695
 #define Y_HOME_DIR -1
694
 #define Y_HOME_DIR -1
696
 #define Z_HOME_DIR -1
695
 #define Z_HOME_DIR -1
697
 
696
 
698
-#define min_software_endstops true // If true, axis won't move to coordinates less than HOME_POS.
699
-#define max_software_endstops true  // If true, axis won't move to coordinates greater than the defined lengths below.
700
-
701
 // @section machine
697
 // @section machine
702
 
698
 
703
 // Travel limits after homing (units are in mm)
699
 // Travel limits after homing (units are in mm)
708
 #define Y_MAX_POS 205
704
 #define Y_MAX_POS 205
709
 #define Z_MAX_POS 235
705
 #define Z_MAX_POS 235
710
 
706
 
707
+// If enabled, axes won't move below MIN_POS in response to movement commands.
708
+#define MIN_SOFTWARE_ENDSTOPS
709
+// If enabled, axes won't move above MAX_POS in response to movement commands.
710
+#define MAX_SOFTWARE_ENDSTOPS
711
+
711
 /**
712
 /**
712
  * Filament Runout Sensor
713
  * Filament Runout Sensor
713
  * A mechanical or opto endstop is used to check for the presence of filament.
714
  * A mechanical or opto endstop is used to check for the presence of filament.

+ 7
- 6
Marlin/example_configurations/Felix/DUAL/Configuration.h 파일 보기

688
 //#define Z_HOMING_HEIGHT 4  // (in mm) Minimal z height before homing (G28) for Z clearance above the bed, clamps, ...
688
 //#define Z_HOMING_HEIGHT 4  // (in mm) Minimal z height before homing (G28) for Z clearance above the bed, clamps, ...
689
                              // Be sure you have this distance over your Z_MAX_POS in case.
689
                              // Be sure you have this distance over your Z_MAX_POS in case.
690
 
690
 
691
-// ENDSTOP SETTINGS:
691
+// Direction of endstops when homing; 1=MAX, -1=MIN
692
-// Sets direction of endstops when homing; 1=MAX, -1=MIN
692
+// :[-1,1]
693
-// :[-1, 1]
694
 #define X_HOME_DIR -1
693
 #define X_HOME_DIR -1
695
 #define Y_HOME_DIR -1
694
 #define Y_HOME_DIR -1
696
 #define Z_HOME_DIR -1
695
 #define Z_HOME_DIR -1
697
 
696
 
698
-#define min_software_endstops true // If true, axis won't move to coordinates less than HOME_POS.
699
-#define max_software_endstops true  // If true, axis won't move to coordinates greater than the defined lengths below.
700
-
701
 // @section machine
697
 // @section machine
702
 
698
 
703
 // Travel limits after homing (units are in mm)
699
 // Travel limits after homing (units are in mm)
708
 #define Y_MAX_POS 205
704
 #define Y_MAX_POS 205
709
 #define Z_MAX_POS 235
705
 #define Z_MAX_POS 235
710
 
706
 
707
+// If enabled, axes won't move below MIN_POS in response to movement commands.
708
+#define MIN_SOFTWARE_ENDSTOPS
709
+// If enabled, axes won't move above MAX_POS in response to movement commands.
710
+#define MAX_SOFTWARE_ENDSTOPS
711
+
711
 /**
712
 /**
712
  * Filament Runout Sensor
713
  * Filament Runout Sensor
713
  * A mechanical or opto endstop is used to check for the presence of filament.
714
  * A mechanical or opto endstop is used to check for the presence of filament.

+ 7
- 6
Marlin/example_configurations/Hephestos/Configuration.h 파일 보기

697
 //#define Z_HOMING_HEIGHT 4  // (in mm) Minimal z height before homing (G28) for Z clearance above the bed, clamps, ...
697
 //#define Z_HOMING_HEIGHT 4  // (in mm) Minimal z height before homing (G28) for Z clearance above the bed, clamps, ...
698
                              // Be sure you have this distance over your Z_MAX_POS in case.
698
                              // Be sure you have this distance over your Z_MAX_POS in case.
699
 
699
 
700
-// ENDSTOP SETTINGS:
700
+// Direction of endstops when homing; 1=MAX, -1=MIN
701
-// Sets direction of endstops when homing; 1=MAX, -1=MIN
701
+// :[-1,1]
702
-// :[-1, 1]
703
 #define X_HOME_DIR -1
702
 #define X_HOME_DIR -1
704
 #define Y_HOME_DIR -1
703
 #define Y_HOME_DIR -1
705
 #define Z_HOME_DIR -1
704
 #define Z_HOME_DIR -1
706
 
705
 
707
-#define min_software_endstops true // If true, axis won't move to coordinates less than HOME_POS.
708
-#define max_software_endstops true  // If true, axis won't move to coordinates greater than the defined lengths below.
709
-
710
 // @section machine
706
 // @section machine
711
 
707
 
712
 // Travel limits after homing (units are in mm)
708
 // Travel limits after homing (units are in mm)
717
 #define Y_MAX_POS 210
713
 #define Y_MAX_POS 210
718
 #define Z_MAX_POS 180
714
 #define Z_MAX_POS 180
719
 
715
 
716
+// If enabled, axes won't move below MIN_POS in response to movement commands.
717
+#define MIN_SOFTWARE_ENDSTOPS
718
+// If enabled, axes won't move above MAX_POS in response to movement commands.
719
+#define MAX_SOFTWARE_ENDSTOPS
720
+
720
 /**
721
 /**
721
  * Filament Runout Sensor
722
  * Filament Runout Sensor
722
  * A mechanical or opto endstop is used to check for the presence of filament.
723
  * A mechanical or opto endstop is used to check for the presence of filament.

+ 7
- 6
Marlin/example_configurations/Hephestos_2/Configuration.h 파일 보기

699
 #define Z_HOMING_HEIGHT 5    // (in mm) Minimal z height before homing (G28) for Z clearance above the bed, clamps, ...
699
 #define Z_HOMING_HEIGHT 5    // (in mm) Minimal z height before homing (G28) for Z clearance above the bed, clamps, ...
700
                              // Be sure you have this distance over your Z_MAX_POS in case.
700
                              // Be sure you have this distance over your Z_MAX_POS in case.
701
 
701
 
702
-// ENDSTOP SETTINGS:
702
+// Direction of endstops when homing; 1=MAX, -1=MIN
703
-// Sets direction of endstops when homing; 1=MAX, -1=MIN
703
+// :[-1,1]
704
-// :[-1, 1]
705
 #define X_HOME_DIR -1
704
 #define X_HOME_DIR -1
706
 #define Y_HOME_DIR -1
705
 #define Y_HOME_DIR -1
707
 #define Z_HOME_DIR -1
706
 #define Z_HOME_DIR -1
708
 
707
 
709
-#define min_software_endstops true // If true, axis won't move to coordinates less than HOME_POS.
710
-#define max_software_endstops true // If true, axis won't move to coordinates greater than the defined lengths below.
711
-
712
 // @section machine
708
 // @section machine
713
 
709
 
714
 // Travel limits after homing (units are in mm)
710
 // Travel limits after homing (units are in mm)
719
 #define Y_MAX_POS 297
715
 #define Y_MAX_POS 297
720
 #define Z_MAX_POS 210
716
 #define Z_MAX_POS 210
721
 
717
 
718
+// If enabled, axes won't move below MIN_POS in response to movement commands.
719
+#define MIN_SOFTWARE_ENDSTOPS
720
+// If enabled, axes won't move above MAX_POS in response to movement commands.
721
+#define MAX_SOFTWARE_ENDSTOPS
722
+
722
 /**
723
 /**
723
  * Filament Runout Sensor
724
  * Filament Runout Sensor
724
  * A mechanical or opto endstop is used to check for the presence of filament.
725
  * A mechanical or opto endstop is used to check for the presence of filament.

+ 7
- 6
Marlin/example_configurations/K8200/Configuration.h 파일 보기

734
 #define Z_HOMING_HEIGHT 4   // (in mm) Minimal z height before homing (G28) for Z clearance above the bed, clamps, ...
734
 #define Z_HOMING_HEIGHT 4   // (in mm) Minimal z height before homing (G28) for Z clearance above the bed, clamps, ...
735
                             // Be sure you have this distance over your Z_MAX_POS in case.
735
                             // Be sure you have this distance over your Z_MAX_POS in case.
736
 
736
 
737
-// ENDSTOP SETTINGS:
737
+// Direction of endstops when homing; 1=MAX, -1=MIN
738
-// Sets direction of endstops when homing; 1=MAX, -1=MIN
738
+// :[-1,1]
739
-// :[-1, 1]
740
 #define X_HOME_DIR -1
739
 #define X_HOME_DIR -1
741
 #define Y_HOME_DIR -1
740
 #define Y_HOME_DIR -1
742
 #define Z_HOME_DIR -1
741
 #define Z_HOME_DIR -1
743
 
742
 
744
-#define min_software_endstops true // If true, axis won't move to coordinates less than HOME_POS.
745
-#define max_software_endstops true  // If true, axis won't move to coordinates greater than the defined lengths below.
746
-
747
 // @section machine
743
 // @section machine
748
 
744
 
749
 // Travel limits after homing (units are in mm)
745
 // Travel limits after homing (units are in mm)
754
 #define Y_MAX_POS 200
750
 #define Y_MAX_POS 200
755
 #define Z_MAX_POS 200
751
 #define Z_MAX_POS 200
756
 
752
 
753
+// If enabled, axes won't move below MIN_POS in response to movement commands.
754
+#define MIN_SOFTWARE_ENDSTOPS
755
+// If enabled, axes won't move above MAX_POS in response to movement commands.
756
+#define MAX_SOFTWARE_ENDSTOPS
757
+
757
 /**
758
 /**
758
  * Filament Runout Sensor
759
  * Filament Runout Sensor
759
  * A mechanical or opto endstop is used to check for the presence of filament.
760
  * A mechanical or opto endstop is used to check for the presence of filament.

+ 7
- 6
Marlin/example_configurations/K8400/Configuration.h 파일 보기

705
 //#define Z_HOMING_HEIGHT 4  // (in mm) Minimal z height before homing (G28) for Z clearance above the bed, clamps, ...
705
 //#define Z_HOMING_HEIGHT 4  // (in mm) Minimal z height before homing (G28) for Z clearance above the bed, clamps, ...
706
                              // Be sure you have this distance over your Z_MAX_POS in case.
706
                              // Be sure you have this distance over your Z_MAX_POS in case.
707
 
707
 
708
-// ENDSTOP SETTINGS:
708
+// Direction of endstops when homing; 1=MAX, -1=MIN
709
-// Sets direction of endstops when homing; 1=MAX, -1=MIN
709
+// :[-1,1]
710
-// :[-1, 1]
711
 #define X_HOME_DIR -1
710
 #define X_HOME_DIR -1
712
 #define Y_HOME_DIR -1
711
 #define Y_HOME_DIR -1
713
 #define Z_HOME_DIR -1
712
 #define Z_HOME_DIR -1
714
 
713
 
715
-#define min_software_endstops true // If true, axis won't move to coordinates less than HOME_POS.
716
-#define max_software_endstops true  // If true, axis won't move to coordinates greater than the defined lengths below.
717
-
718
 // @section machine
714
 // @section machine
719
 
715
 
720
 // Travel limits after homing (units are in mm)
716
 // Travel limits after homing (units are in mm)
725
 #define Y_MAX_POS 200
721
 #define Y_MAX_POS 200
726
 #define Z_MAX_POS 190
722
 #define Z_MAX_POS 190
727
 
723
 
724
+// If enabled, axes won't move below MIN_POS in response to movement commands.
725
+#define MIN_SOFTWARE_ENDSTOPS
726
+// If enabled, axes won't move above MAX_POS in response to movement commands.
727
+#define MAX_SOFTWARE_ENDSTOPS
728
+
728
 /**
729
 /**
729
  * Filament Runout Sensor
730
  * Filament Runout Sensor
730
  * A mechanical or opto endstop is used to check for the presence of filament.
731
  * A mechanical or opto endstop is used to check for the presence of filament.

+ 7
- 6
Marlin/example_configurations/K8400/Dual-head/Configuration.h 파일 보기

705
 //#define Z_HOMING_HEIGHT 4  // (in mm) Minimal z height before homing (G28) for Z clearance above the bed, clamps, ...
705
 //#define Z_HOMING_HEIGHT 4  // (in mm) Minimal z height before homing (G28) for Z clearance above the bed, clamps, ...
706
                              // Be sure you have this distance over your Z_MAX_POS in case.
706
                              // Be sure you have this distance over your Z_MAX_POS in case.
707
 
707
 
708
-// ENDSTOP SETTINGS:
708
+// Direction of endstops when homing; 1=MAX, -1=MIN
709
-// Sets direction of endstops when homing; 1=MAX, -1=MIN
709
+// :[-1,1]
710
-// :[-1, 1]
711
 #define X_HOME_DIR -1
710
 #define X_HOME_DIR -1
712
 #define Y_HOME_DIR -1
711
 #define Y_HOME_DIR -1
713
 #define Z_HOME_DIR -1
712
 #define Z_HOME_DIR -1
714
 
713
 
715
-#define min_software_endstops true // If true, axis won't move to coordinates less than HOME_POS.
716
-#define max_software_endstops true  // If true, axis won't move to coordinates greater than the defined lengths below.
717
-
718
 // @section machine
714
 // @section machine
719
 
715
 
720
 // Travel limits after homing (units are in mm)
716
 // Travel limits after homing (units are in mm)
725
 #define Y_MAX_POS 200
721
 #define Y_MAX_POS 200
726
 #define Z_MAX_POS 190
722
 #define Z_MAX_POS 190
727
 
723
 
724
+// If enabled, axes won't move below MIN_POS in response to movement commands.
725
+#define MIN_SOFTWARE_ENDSTOPS
726
+// If enabled, axes won't move above MAX_POS in response to movement commands.
727
+#define MAX_SOFTWARE_ENDSTOPS
728
+
728
 /**
729
 /**
729
  * Filament Runout Sensor
730
  * Filament Runout Sensor
730
  * A mechanical or opto endstop is used to check for the presence of filament.
731
  * A mechanical or opto endstop is used to check for the presence of filament.

+ 7
- 6
Marlin/example_configurations/RepRapWorld/Megatronics/Configuration.h 파일 보기

705
 //#define Z_HOMING_HEIGHT 4  // (in mm) Minimal z height before homing (G28) for Z clearance above the bed, clamps, ...
705
 //#define Z_HOMING_HEIGHT 4  // (in mm) Minimal z height before homing (G28) for Z clearance above the bed, clamps, ...
706
                              // Be sure you have this distance over your Z_MAX_POS in case.
706
                              // Be sure you have this distance over your Z_MAX_POS in case.
707
 
707
 
708
-// ENDSTOP SETTINGS:
708
+// Direction of endstops when homing; 1=MAX, -1=MIN
709
-// Sets direction of endstops when homing; 1=MAX, -1=MIN
709
+// :[-1,1]
710
-// :[-1, 1]
711
 #define X_HOME_DIR -1
710
 #define X_HOME_DIR -1
712
 #define Y_HOME_DIR -1
711
 #define Y_HOME_DIR -1
713
 #define Z_HOME_DIR -1
712
 #define Z_HOME_DIR -1
714
 
713
 
715
-#define min_software_endstops true // If true, axis won't move to coordinates less than HOME_POS.
716
-#define max_software_endstops true  // If true, axis won't move to coordinates greater than the defined lengths below.
717
-
718
 // @section machine
714
 // @section machine
719
 
715
 
720
 // Travel limits after homing (units are in mm)
716
 // Travel limits after homing (units are in mm)
725
 #define Y_MAX_POS 200
721
 #define Y_MAX_POS 200
726
 #define Z_MAX_POS 200
722
 #define Z_MAX_POS 200
727
 
723
 
724
+// If enabled, axes won't move below MIN_POS in response to movement commands.
725
+#define MIN_SOFTWARE_ENDSTOPS
726
+// If enabled, axes won't move above MAX_POS in response to movement commands.
727
+#define MAX_SOFTWARE_ENDSTOPS
728
+
728
 /**
729
 /**
729
  * Filament Runout Sensor
730
  * Filament Runout Sensor
730
  * A mechanical or opto endstop is used to check for the presence of filament.
731
  * A mechanical or opto endstop is used to check for the presence of filament.

+ 7
- 6
Marlin/example_configurations/RigidBot/Configuration.h 파일 보기

704
 //#define Z_HOMING_HEIGHT 4  // (in mm) Minimal z height before homing (G28) for Z clearance above the bed, clamps, ...
704
 //#define Z_HOMING_HEIGHT 4  // (in mm) Minimal z height before homing (G28) for Z clearance above the bed, clamps, ...
705
                              // Be sure you have this distance over your Z_MAX_POS in case.
705
                              // Be sure you have this distance over your Z_MAX_POS in case.
706
 
706
 
707
-// ENDSTOP SETTINGS:
707
+// Direction of endstops when homing; 1=MAX, -1=MIN
708
-// Sets direction of endstops when homing; 1=MAX, -1=MIN
708
+// :[-1,1]
709
-// :[-1, 1]
710
 #define X_HOME_DIR -1
709
 #define X_HOME_DIR -1
711
 #define Y_HOME_DIR -1
710
 #define Y_HOME_DIR -1
712
 #define Z_HOME_DIR -1
711
 #define Z_HOME_DIR -1
713
 
712
 
714
-#define min_software_endstops true // If true, axis won't move to coordinates less than HOME_POS.
715
-#define max_software_endstops true  // If true, axis won't move to coordinates greater than the defined lengths below.
716
-
717
 // @section machine
713
 // @section machine
718
 
714
 
719
 // Travel limits after homing (units are in mm)
715
 // Travel limits after homing (units are in mm)
724
 #define Y_MAX_POS 248  // RigidBot regular is 248mm, RigitBot Big is 304mm
720
 #define Y_MAX_POS 248  // RigidBot regular is 248mm, RigitBot Big is 304mm
725
 #define Z_MAX_POS 254  // RigidBot regular and Big are 254mm
721
 #define Z_MAX_POS 254  // RigidBot regular and Big are 254mm
726
 
722
 
723
+// If enabled, axes won't move below MIN_POS in response to movement commands.
724
+#define MIN_SOFTWARE_ENDSTOPS
725
+// If enabled, axes won't move above MAX_POS in response to movement commands.
726
+#define MAX_SOFTWARE_ENDSTOPS
727
+
727
 /**
728
 /**
728
  * Filament Runout Sensor
729
  * Filament Runout Sensor
729
  * A mechanical or opto endstop is used to check for the presence of filament.
730
  * A mechanical or opto endstop is used to check for the presence of filament.

+ 7
- 6
Marlin/example_configurations/SCARA/Configuration.h 파일 보기

720
 //#define Z_HOMING_HEIGHT 4  // (in mm) Minimal z height before homing (G28) for Z clearance above the bed, clamps, ...
720
 //#define Z_HOMING_HEIGHT 4  // (in mm) Minimal z height before homing (G28) for Z clearance above the bed, clamps, ...
721
                              // Be sure you have this distance over your Z_MAX_POS in case.
721
                              // Be sure you have this distance over your Z_MAX_POS in case.
722
 
722
 
723
-// ENDSTOP SETTINGS:
723
+// Direction of endstops when homing; 1=MAX, -1=MIN
724
-// Sets direction of endstops when homing; 1=MAX, -1=MIN
724
+// :[-1,1]
725
-// :[-1, 1]
726
 #define X_HOME_DIR 1
725
 #define X_HOME_DIR 1
727
 #define Y_HOME_DIR 1
726
 #define Y_HOME_DIR 1
728
 #define Z_HOME_DIR -1
727
 #define Z_HOME_DIR -1
729
 
728
 
730
-#define min_software_endstops true // If true, axis won't move to coordinates less than HOME_POS.
731
-#define max_software_endstops true  // If true, axis won't move to coordinates greater than the defined lengths below.
732
-
733
 // @section machine
729
 // @section machine
734
 
730
 
735
 // Travel limits after homing (units are in mm)
731
 // Travel limits after homing (units are in mm)
740
 #define Y_MAX_POS 200
736
 #define Y_MAX_POS 200
741
 #define Z_MAX_POS 225
737
 #define Z_MAX_POS 225
742
 
738
 
739
+// If enabled, axes won't move below MIN_POS in response to movement commands.
740
+#define MIN_SOFTWARE_ENDSTOPS
741
+// If enabled, axes won't move above MAX_POS in response to movement commands.
742
+#define MAX_SOFTWARE_ENDSTOPS
743
+
743
 /**
744
 /**
744
  * Filament Runout Sensor
745
  * Filament Runout Sensor
745
  * A mechanical or opto endstop is used to check for the presence of filament.
746
  * A mechanical or opto endstop is used to check for the presence of filament.

+ 7
- 6
Marlin/example_configurations/TAZ4/Configuration.h 파일 보기

726
 //#define Z_HOMING_HEIGHT 4  // (in mm) Minimal z height before homing (G28) for Z clearance above the bed, clamps, ...
726
 //#define Z_HOMING_HEIGHT 4  // (in mm) Minimal z height before homing (G28) for Z clearance above the bed, clamps, ...
727
                              // Be sure you have this distance over your Z_MAX_POS in case.
727
                              // Be sure you have this distance over your Z_MAX_POS in case.
728
 
728
 
729
-// ENDSTOP SETTINGS:
729
+// Direction of endstops when homing; 1=MAX, -1=MIN
730
-// Sets direction of endstops when homing; 1=MAX, -1=MIN
730
+// :[-1,1]
731
-// :[-1, 1]
732
 #define X_HOME_DIR -1
731
 #define X_HOME_DIR -1
733
 #define Y_HOME_DIR -1
732
 #define Y_HOME_DIR -1
734
 #define Z_HOME_DIR -1
733
 #define Z_HOME_DIR -1
735
 
734
 
736
-#define min_software_endstops true // If true, axis won't move to coordinates less than HOME_POS.
737
-#define max_software_endstops true  // If true, axis won't move to coordinates greater than the defined lengths below.
738
-
739
 // @section machine
735
 // @section machine
740
 
736
 
741
 // Travel limits after homing (units are in mm)
737
 // Travel limits after homing (units are in mm)
746
 #define Y_MAX_POS 275
742
 #define Y_MAX_POS 275
747
 #define Z_MAX_POS 250
743
 #define Z_MAX_POS 250
748
 
744
 
745
+// If enabled, axes won't move below MIN_POS in response to movement commands.
746
+#define MIN_SOFTWARE_ENDSTOPS
747
+// If enabled, axes won't move above MAX_POS in response to movement commands.
748
+#define MAX_SOFTWARE_ENDSTOPS
749
+
749
 /**
750
 /**
750
  * Filament Runout Sensor
751
  * Filament Runout Sensor
751
  * A mechanical or opto endstop is used to check for the presence of filament.
752
  * A mechanical or opto endstop is used to check for the presence of filament.

+ 7
- 6
Marlin/example_configurations/WITBOX/Configuration.h 파일 보기

697
 //#define Z_HOMING_HEIGHT 4  // (in mm) Minimal z height before homing (G28) for Z clearance above the bed, clamps, ...
697
 //#define Z_HOMING_HEIGHT 4  // (in mm) Minimal z height before homing (G28) for Z clearance above the bed, clamps, ...
698
                              // Be sure you have this distance over your Z_MAX_POS in case.
698
                              // Be sure you have this distance over your Z_MAX_POS in case.
699
 
699
 
700
-// ENDSTOP SETTINGS:
700
+// Direction of endstops when homing; 1=MAX, -1=MIN
701
-// Sets direction of endstops when homing; 1=MAX, -1=MIN
701
+// :[-1,1]
702
-// :[-1, 1]
703
 #define X_HOME_DIR 1
702
 #define X_HOME_DIR 1
704
 #define Y_HOME_DIR 1
703
 #define Y_HOME_DIR 1
705
 #define Z_HOME_DIR -1
704
 #define Z_HOME_DIR -1
706
 
705
 
707
-#define min_software_endstops true // If true, axis won't move to coordinates less than HOME_POS.
708
-#define max_software_endstops true  // If true, axis won't move to coordinates greater than the defined lengths below.
709
-
710
 // @section machine
706
 // @section machine
711
 
707
 
712
 // Travel limits after homing (units are in mm)
708
 // Travel limits after homing (units are in mm)
717
 #define Y_MAX_POS 210
713
 #define Y_MAX_POS 210
718
 #define Z_MAX_POS 200
714
 #define Z_MAX_POS 200
719
 
715
 
716
+// If enabled, axes won't move below MIN_POS in response to movement commands.
717
+#define MIN_SOFTWARE_ENDSTOPS
718
+// If enabled, axes won't move above MAX_POS in response to movement commands.
719
+#define MAX_SOFTWARE_ENDSTOPS
720
+
720
 /**
721
 /**
721
  * Filament Runout Sensor
722
  * Filament Runout Sensor
722
  * A mechanical or opto endstop is used to check for the presence of filament.
723
  * A mechanical or opto endstop is used to check for the presence of filament.

+ 7
- 6
Marlin/example_configurations/adafruit/ST7565/Configuration.h 파일 보기

705
 //#define Z_HOMING_HEIGHT 4  // (in mm) Minimal z height before homing (G28) for Z clearance above the bed, clamps, ...
705
 //#define Z_HOMING_HEIGHT 4  // (in mm) Minimal z height before homing (G28) for Z clearance above the bed, clamps, ...
706
                              // Be sure you have this distance over your Z_MAX_POS in case.
706
                              // Be sure you have this distance over your Z_MAX_POS in case.
707
 
707
 
708
-// ENDSTOP SETTINGS:
708
+// Direction of endstops when homing; 1=MAX, -1=MIN
709
-// Sets direction of endstops when homing; 1=MAX, -1=MIN
709
+// :[-1,1]
710
-// :[-1, 1]
711
 #define X_HOME_DIR -1
710
 #define X_HOME_DIR -1
712
 #define Y_HOME_DIR -1
711
 #define Y_HOME_DIR -1
713
 #define Z_HOME_DIR -1
712
 #define Z_HOME_DIR -1
714
 
713
 
715
-#define min_software_endstops true // If true, axis won't move to coordinates less than HOME_POS.
716
-#define max_software_endstops true  // If true, axis won't move to coordinates greater than the defined lengths below.
717
-
718
 // @section machine
714
 // @section machine
719
 
715
 
720
 // Travel limits after homing (units are in mm)
716
 // Travel limits after homing (units are in mm)
725
 #define Y_MAX_POS 200
721
 #define Y_MAX_POS 200
726
 #define Z_MAX_POS 200
722
 #define Z_MAX_POS 200
727
 
723
 
724
+// If enabled, axes won't move below MIN_POS in response to movement commands.
725
+#define MIN_SOFTWARE_ENDSTOPS
726
+// If enabled, axes won't move above MAX_POS in response to movement commands.
727
+#define MAX_SOFTWARE_ENDSTOPS
728
+
728
 /**
729
 /**
729
  * Filament Runout Sensor
730
  * Filament Runout Sensor
730
  * A mechanical or opto endstop is used to check for the presence of filament.
731
  * A mechanical or opto endstop is used to check for the presence of filament.

+ 7
- 6
Marlin/example_configurations/delta/flsun_kossel_mini/Configuration.h 파일 보기

807
 #define Z_HOMING_HEIGHT 15   // (in mm) Minimal z height before homing (G28) for Z clearance above the bed, clamps, ...
807
 #define Z_HOMING_HEIGHT 15   // (in mm) Minimal z height before homing (G28) for Z clearance above the bed, clamps, ...
808
                              // Be sure you have this distance over your Z_MAX_POS in case.
808
                              // Be sure you have this distance over your Z_MAX_POS in case.
809
 
809
 
810
-// ENDSTOP SETTINGS:
810
+// Direction of endstops when homing; 1=MAX, -1=MIN
811
-// Sets direction of endstops when homing; 1=MAX, -1=MIN
811
+// :[-1,1]
812
-// :[-1, 1]
813
 #define X_HOME_DIR 1  // deltas always home to max
812
 #define X_HOME_DIR 1  // deltas always home to max
814
 #define Y_HOME_DIR 1
813
 #define Y_HOME_DIR 1
815
 #define Z_HOME_DIR 1
814
 #define Z_HOME_DIR 1
816
 
815
 
817
-#define min_software_endstops true // If true, axis won't move to coordinates less than HOME_POS.
818
-#define max_software_endstops true  // If true, axis won't move to coordinates greater than the defined lengths below.
819
-
820
 // @section machine
816
 // @section machine
821
 
817
 
822
 // Travel limits after homing (units are in mm)
818
 // Travel limits after homing (units are in mm)
827
 #define Y_MAX_POS DELTA_PRINTABLE_RADIUS
823
 #define Y_MAX_POS DELTA_PRINTABLE_RADIUS
828
 #define Z_MAX_POS MANUAL_Z_HOME_POS
824
 #define Z_MAX_POS MANUAL_Z_HOME_POS
829
 
825
 
826
+// If enabled, axes won't move below MIN_POS in response to movement commands.
827
+#define MIN_SOFTWARE_ENDSTOPS
828
+// If enabled, axes won't move above MAX_POS in response to movement commands.
829
+#define MAX_SOFTWARE_ENDSTOPS
830
+
830
 /**
831
 /**
831
  * Filament Runout Sensor
832
  * Filament Runout Sensor
832
  * A mechanical or opto endstop is used to check for the presence of filament.
833
  * A mechanical or opto endstop is used to check for the presence of filament.

+ 7
- 6
Marlin/example_configurations/delta/generic/Configuration.h 파일 보기

791
 //#define Z_HOMING_HEIGHT 4  // (in mm) Minimal z height before homing (G28) for Z clearance above the bed, clamps, ...
791
 //#define Z_HOMING_HEIGHT 4  // (in mm) Minimal z height before homing (G28) for Z clearance above the bed, clamps, ...
792
                              // Be sure you have this distance over your Z_MAX_POS in case.
792
                              // Be sure you have this distance over your Z_MAX_POS in case.
793
 
793
 
794
-// ENDSTOP SETTINGS:
794
+// Direction of endstops when homing; 1=MAX, -1=MIN
795
-// Sets direction of endstops when homing; 1=MAX, -1=MIN
795
+// :[-1,1]
796
-// :[-1, 1]
797
 #define X_HOME_DIR 1  // deltas always home to max
796
 #define X_HOME_DIR 1  // deltas always home to max
798
 #define Y_HOME_DIR 1
797
 #define Y_HOME_DIR 1
799
 #define Z_HOME_DIR 1
798
 #define Z_HOME_DIR 1
800
 
799
 
801
-#define min_software_endstops true // If true, axis won't move to coordinates less than HOME_POS.
802
-#define max_software_endstops true  // If true, axis won't move to coordinates greater than the defined lengths below.
803
-
804
 // @section machine
800
 // @section machine
805
 
801
 
806
 // Travel limits after homing (units are in mm)
802
 // Travel limits after homing (units are in mm)
811
 #define Y_MAX_POS DELTA_PRINTABLE_RADIUS
807
 #define Y_MAX_POS DELTA_PRINTABLE_RADIUS
812
 #define Z_MAX_POS MANUAL_Z_HOME_POS
808
 #define Z_MAX_POS MANUAL_Z_HOME_POS
813
 
809
 
810
+// If enabled, axes won't move below MIN_POS in response to movement commands.
811
+#define MIN_SOFTWARE_ENDSTOPS
812
+// If enabled, axes won't move above MAX_POS in response to movement commands.
813
+#define MAX_SOFTWARE_ENDSTOPS
814
+
814
 /**
815
 /**
815
  * Filament Runout Sensor
816
  * Filament Runout Sensor
816
  * A mechanical or opto endstop is used to check for the presence of filament.
817
  * A mechanical or opto endstop is used to check for the presence of filament.

+ 7
- 6
Marlin/example_configurations/delta/kossel_mini/Configuration.h 파일 보기

794
 //#define Z_HOMING_HEIGHT 15 // (in mm) Minimal z height before homing (G28) for Z clearance above the bed, clamps, ...
794
 //#define Z_HOMING_HEIGHT 15 // (in mm) Minimal z height before homing (G28) for Z clearance above the bed, clamps, ...
795
                              // Be sure you have this distance over your Z_MAX_POS in case.
795
                              // Be sure you have this distance over your Z_MAX_POS in case.
796
 
796
 
797
-// ENDSTOP SETTINGS:
797
+// Direction of endstops when homing; 1=MAX, -1=MIN
798
-// Sets direction of endstops when homing; 1=MAX, -1=MIN
798
+// :[-1,1]
799
-// :[-1, 1]
800
 #define X_HOME_DIR 1  // deltas always home to max
799
 #define X_HOME_DIR 1  // deltas always home to max
801
 #define Y_HOME_DIR 1
800
 #define Y_HOME_DIR 1
802
 #define Z_HOME_DIR 1
801
 #define Z_HOME_DIR 1
803
 
802
 
804
-#define min_software_endstops true // If true, axis won't move to coordinates less than HOME_POS.
805
-#define max_software_endstops true  // If true, axis won't move to coordinates greater than the defined lengths below.
806
-
807
 // @section machine
803
 // @section machine
808
 
804
 
809
 // Travel limits after homing (units are in mm)
805
 // Travel limits after homing (units are in mm)
814
 #define Y_MAX_POS DELTA_PRINTABLE_RADIUS
810
 #define Y_MAX_POS DELTA_PRINTABLE_RADIUS
815
 #define Z_MAX_POS MANUAL_Z_HOME_POS
811
 #define Z_MAX_POS MANUAL_Z_HOME_POS
816
 
812
 
813
+// If enabled, axes won't move below MIN_POS in response to movement commands.
814
+#define MIN_SOFTWARE_ENDSTOPS
815
+// If enabled, axes won't move above MAX_POS in response to movement commands.
816
+#define MAX_SOFTWARE_ENDSTOPS
817
+
817
 /**
818
 /**
818
  * Filament Runout Sensor
819
  * Filament Runout Sensor
819
  * A mechanical or opto endstop is used to check for the presence of filament.
820
  * A mechanical or opto endstop is used to check for the presence of filament.

+ 7
- 6
Marlin/example_configurations/delta/kossel_pro/Configuration.h 파일 보기

793
 //#define Z_HOMING_HEIGHT 4  // (in mm) Minimal z height before homing (G28) for Z clearance above the bed, clamps, ...
793
 //#define Z_HOMING_HEIGHT 4  // (in mm) Minimal z height before homing (G28) for Z clearance above the bed, clamps, ...
794
                              // Be sure you have this distance over your Z_MAX_POS in case.
794
                              // Be sure you have this distance over your Z_MAX_POS in case.
795
 
795
 
796
-// ENDSTOP SETTINGS:
796
+// Direction of endstops when homing; 1=MAX, -1=MIN
797
-// Sets direction of endstops when homing; 1=MAX, -1=MIN
797
+// :[-1,1]
798
-// :[-1, 1]
799
 #define X_HOME_DIR 1  // deltas always home to max
798
 #define X_HOME_DIR 1  // deltas always home to max
800
 #define Y_HOME_DIR 1
799
 #define Y_HOME_DIR 1
801
 #define Z_HOME_DIR 1
800
 #define Z_HOME_DIR 1
802
 
801
 
803
-#define min_software_endstops true // If true, axis won't move to coordinates less than HOME_POS.
804
-#define max_software_endstops true  // If true, axis won't move to coordinates greater than the defined lengths below.
805
-
806
 // @section machine
802
 // @section machine
807
 
803
 
808
 // Travel limits after homing (units are in mm)
804
 // Travel limits after homing (units are in mm)
813
 #define Y_MAX_POS DELTA_PRINTABLE_RADIUS
809
 #define Y_MAX_POS DELTA_PRINTABLE_RADIUS
814
 #define Z_MAX_POS MANUAL_Z_HOME_POS
810
 #define Z_MAX_POS MANUAL_Z_HOME_POS
815
 
811
 
812
+// If enabled, axes won't move below MIN_POS in response to movement commands.
813
+#define MIN_SOFTWARE_ENDSTOPS
814
+// If enabled, axes won't move above MAX_POS in response to movement commands.
815
+#define MAX_SOFTWARE_ENDSTOPS
816
+
816
 /**
817
 /**
817
  * Filament Runout Sensor
818
  * Filament Runout Sensor
818
  * A mechanical or opto endstop is used to check for the presence of filament.
819
  * A mechanical or opto endstop is used to check for the presence of filament.

+ 7
- 6
Marlin/example_configurations/delta/kossel_xl/Configuration.h 파일 보기

797
 //#define Z_HOMING_HEIGHT 4  // (in mm) Minimal z height before homing (G28) for Z clearance above the bed, clamps, ...
797
 //#define Z_HOMING_HEIGHT 4  // (in mm) Minimal z height before homing (G28) for Z clearance above the bed, clamps, ...
798
                              // Be sure you have this distance over your Z_MAX_POS in case.
798
                              // Be sure you have this distance over your Z_MAX_POS in case.
799
 
799
 
800
-// ENDSTOP SETTINGS:
800
+// Direction of endstops when homing; 1=MAX, -1=MIN
801
-// Sets direction of endstops when homing; 1=MAX, -1=MIN
801
+// :[-1,1]
802
-// :[-1, 1]
803
 #define X_HOME_DIR 1  // deltas always home to max
802
 #define X_HOME_DIR 1  // deltas always home to max
804
 #define Y_HOME_DIR 1
803
 #define Y_HOME_DIR 1
805
 #define Z_HOME_DIR 1
804
 #define Z_HOME_DIR 1
806
 
805
 
807
-#define min_software_endstops false // If true, axis won't move to coordinates less than HOME_POS.
808
-#define max_software_endstops true  // If true, axis won't move to coordinates greater than the defined lengths below.
809
-
810
 // @section machine
806
 // @section machine
811
 
807
 
812
 // Travel limits after homing (units are in mm)
808
 // Travel limits after homing (units are in mm)
817
 #define Y_MAX_POS DELTA_PRINTABLE_RADIUS
813
 #define Y_MAX_POS DELTA_PRINTABLE_RADIUS
818
 #define Z_MAX_POS MANUAL_Z_HOME_POS
814
 #define Z_MAX_POS MANUAL_Z_HOME_POS
819
 
815
 
816
+// If enabled, axes won't move below MIN_POS in response to movement commands.
817
+//#define MIN_SOFTWARE_ENDSTOPS
818
+// If enabled, axes won't move above MAX_POS in response to movement commands.
819
+#define MAX_SOFTWARE_ENDSTOPS
820
+
820
 /**
821
 /**
821
  * Filament Runout Sensor
822
  * Filament Runout Sensor
822
  * A mechanical or opto endstop is used to check for the presence of filament.
823
  * A mechanical or opto endstop is used to check for the presence of filament.

+ 7
- 6
Marlin/example_configurations/makibox/Configuration.h 파일 보기

708
 //#define Z_HOMING_HEIGHT 4  // (in mm) Minimal z height before homing (G28) for Z clearance above the bed, clamps, ...
708
 //#define Z_HOMING_HEIGHT 4  // (in mm) Minimal z height before homing (G28) for Z clearance above the bed, clamps, ...
709
                              // Be sure you have this distance over your Z_MAX_POS in case.
709
                              // Be sure you have this distance over your Z_MAX_POS in case.
710
 
710
 
711
-// ENDSTOP SETTINGS:
711
+// Direction of endstops when homing; 1=MAX, -1=MIN
712
-// Sets direction of endstops when homing; 1=MAX, -1=MIN
712
+// :[-1,1]
713
-// :[-1, 1]
714
 #define X_HOME_DIR -1
713
 #define X_HOME_DIR -1
715
 #define Y_HOME_DIR -1
714
 #define Y_HOME_DIR -1
716
 #define Z_HOME_DIR -1
715
 #define Z_HOME_DIR -1
717
 
716
 
718
-#define min_software_endstops true // If true, axis won't move to coordinates less than HOME_POS.
719
-#define max_software_endstops true  // If true, axis won't move to coordinates greater than the defined lengths below.
720
-
721
 // @section machine
717
 // @section machine
722
 
718
 
723
 // Travel limits after homing (units are in mm)
719
 // Travel limits after homing (units are in mm)
728
 #define Y_MAX_POS 150
724
 #define Y_MAX_POS 150
729
 #define Z_MAX_POS 86
725
 #define Z_MAX_POS 86
730
 
726
 
727
+// If enabled, axes won't move below MIN_POS in response to movement commands.
728
+#define MIN_SOFTWARE_ENDSTOPS
729
+// If enabled, axes won't move above MAX_POS in response to movement commands.
730
+#define MAX_SOFTWARE_ENDSTOPS
731
+
731
 /**
732
 /**
732
  * Filament Runout Sensor
733
  * Filament Runout Sensor
733
  * A mechanical or opto endstop is used to check for the presence of filament.
734
  * A mechanical or opto endstop is used to check for the presence of filament.

+ 7
- 6
Marlin/example_configurations/tvrrug/Round2/Configuration.h 파일 보기

701
 //#define Z_HOMING_HEIGHT 4  // (in mm) Minimal z height before homing (G28) for Z clearance above the bed, clamps, ...
701
 //#define Z_HOMING_HEIGHT 4  // (in mm) Minimal z height before homing (G28) for Z clearance above the bed, clamps, ...
702
                              // Be sure you have this distance over your Z_MAX_POS in case.
702
                              // Be sure you have this distance over your Z_MAX_POS in case.
703
 
703
 
704
-// ENDSTOP SETTINGS:
704
+// Direction of endstops when homing; 1=MAX, -1=MIN
705
-// Sets direction of endstops when homing; 1=MAX, -1=MIN
705
+// :[-1,1]
706
-// :[-1, 1]
707
 #define X_HOME_DIR -1
706
 #define X_HOME_DIR -1
708
 #define Y_HOME_DIR -1
707
 #define Y_HOME_DIR -1
709
 #define Z_HOME_DIR -1
708
 #define Z_HOME_DIR -1
710
 
709
 
711
-#define min_software_endstops true // If true, axis won't move to coordinates less than HOME_POS.
712
-#define max_software_endstops true  // If true, axis won't move to coordinates greater than the defined lengths below.
713
-
714
 // @section machine
710
 // @section machine
715
 
711
 
716
 // Travel limits after homing (units are in mm)
712
 // Travel limits after homing (units are in mm)
721
 #define Y_MAX_POS 205
717
 #define Y_MAX_POS 205
722
 #define Z_MAX_POS 120
718
 #define Z_MAX_POS 120
723
 
719
 
720
+// If enabled, axes won't move below MIN_POS in response to movement commands.
721
+#define MIN_SOFTWARE_ENDSTOPS
722
+// If enabled, axes won't move above MAX_POS in response to movement commands.
723
+#define MAX_SOFTWARE_ENDSTOPS
724
+
724
 /**
725
 /**
725
  * Filament Runout Sensor
726
  * Filament Runout Sensor
726
  * A mechanical or opto endstop is used to check for the presence of filament.
727
  * A mechanical or opto endstop is used to check for the presence of filament.

+ 2
- 2
Marlin/ultralcd.cpp 파일 보기

1602
       #if HAS_SOFTWARE_ENDSTOPS
1602
       #if HAS_SOFTWARE_ENDSTOPS
1603
         // Limit to software endstops, if enabled
1603
         // Limit to software endstops, if enabled
1604
         if (soft_endstops_enabled) {
1604
         if (soft_endstops_enabled) {
1605
-          #if ENABLED(min_software_endstops)
1605
+          #if ENABLED(MIN_SOFTWARE_ENDSTOPS)
1606
             min = soft_endstop_min[axis];
1606
             min = soft_endstop_min[axis];
1607
           #endif
1607
           #endif
1608
-          #if ENABLED(max_software_endstops)
1608
+          #if ENABLED(MAX_SOFTWARE_ENDSTOPS)
1609
             max = soft_endstop_max[axis];
1609
             max = soft_endstop_max[axis];
1610
           #endif
1610
           #endif
1611
         }
1611
         }

Loading…
취소
저장