소스 검색

Merge pull request #4257 from esenapaj/Follow-up-the-PR-#4253-etc

Follow-up the PR #4253 (Runout Sensor without SD Card, Print Timer support in M104), etc
Scott Lahteine 9 년 전
부모
커밋
5b87deebb6
3개의 변경된 파일18개의 추가작업 그리고 12개의 파일을 삭제
  1. 10
    10
      Marlin/Conditionals.h
  2. 4
    1
      Marlin/example_configurations/Felix/DUAL/Configuration.h
  3. 4
    1
      Marlin/example_configurations/K8400/Dual Heads/Configuration.h

+ 10
- 10
Marlin/Conditionals.h 파일 보기

@@ -846,16 +846,16 @@
846 846
   /**
847 847
    * MIN_Z_HEIGHT_FOR_HOMING / Z_RAISE_BETWEEN_PROBINGS
848 848
    */
849
-   #ifndef MIN_Z_HEIGHT_FOR_HOMING
850
-     #ifndef Z_RAISE_BETWEEN_PROBINGS
851
-       #define MIN_Z_HEIGHT_FOR_HOMING 0
852
-     #else
853
-       #define MIN_Z_HEIGHT_FOR_HOMING Z_RAISE_BETWEEN_PROBINGS
854
-     #endif
855
-   #endif
856
-   #ifndef Z_RAISE_BETWEEN_PROBINGS
857
-     #define Z_RAISE_BETWEEN_PROBING MIN_Z_HEIGHT_FOR_HOMING
858
-   #endif
849
+  #ifndef MIN_Z_HEIGHT_FOR_HOMING
850
+    #ifndef Z_RAISE_BETWEEN_PROBINGS
851
+      #define MIN_Z_HEIGHT_FOR_HOMING 0
852
+    #else
853
+      #define MIN_Z_HEIGHT_FOR_HOMING Z_RAISE_BETWEEN_PROBINGS
854
+    #endif
855
+  #endif
856
+  #ifndef Z_RAISE_BETWEEN_PROBINGS
857
+    #define Z_RAISE_BETWEEN_PROBING MIN_Z_HEIGHT_FOR_HOMING
858
+  #endif
859 859
 
860 860
 #endif //CONFIGURATION_LCD
861 861
 #endif //CONDITIONALS_H

+ 4
- 1
Marlin/example_configurations/Felix/DUAL/Configuration.h 파일 보기

@@ -771,7 +771,10 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l
771 771
 // Print job timer
772 772
 //
773 773
 // Enable this option to automatically start and stop the
774
-// print job timer when M104 and M109 commands are received.
774
+// print job timer when M104/M109/M190 commands are received.
775
+// M104 (extruder without wait) - high temp = none, low temp = stop timer
776
+// M109 (extruder with wait) - high temp = start timer, low temp = stop timer
777
+// M190 (bed with wait) - high temp = start timer, low temp = none
775 778
 //
776 779
 // In all cases the timer can be started and stopped using
777 780
 // the following commands:

+ 4
- 1
Marlin/example_configurations/K8400/Dual Heads/Configuration.h 파일 보기

@@ -790,7 +790,10 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = true; // set to true to invert the lo
790 790
 // Print job timer
791 791
 //
792 792
 // Enable this option to automatically start and stop the
793
-// print job timer when M104 and M109 commands are received.
793
+// print job timer when M104/M109/M190 commands are received.
794
+// M104 (extruder without wait) - high temp = none, low temp = stop timer
795
+// M109 (extruder with wait) - high temp = start timer, low temp = stop timer
796
+// M190 (bed with wait) - high temp = start timer, low temp = none
794 797
 //
795 798
 // In all cases the timer can be started and stopped using
796 799
 // the following commands:

Loading…
취소
저장