Browse Source

Conditionals updates from #7979

Scott Lahteine 7 years ago
parent
commit
69a7d4e0a5
1 changed files with 25 additions and 1 deletions
  1. 25
    1
      Marlin/Conditionals_post.h

+ 25
- 1
Marlin/Conditionals_post.h View File

855
   #define HEATER_IDLE_HANDLER (ENABLED(ADVANCED_PAUSE_FEATURE) || ENABLED(PROBING_HEATERS_OFF))
855
   #define HEATER_IDLE_HANDLER (ENABLED(ADVANCED_PAUSE_FEATURE) || ENABLED(PROBING_HEATERS_OFF))
856
 
856
 
857
   /**
857
   /**
858
+   * Only constrain Z on DELTA / SCARA machines
859
+   */
860
+  #if IS_KINEMATIC
861
+    #undef MIN_SOFTWARE_ENDSTOP_X
862
+    #undef MIN_SOFTWARE_ENDSTOP_Y
863
+    #undef MAX_SOFTWARE_ENDSTOP_X
864
+    #undef MAX_SOFTWARE_ENDSTOP_Y
865
+  #endif
866
+
867
+  /**
858
    * Delta radius/rod trimmers/angle trimmers
868
    * Delta radius/rod trimmers/angle trimmers
859
    */
869
    */
860
   #if ENABLED(DELTA)
870
   #if ENABLED(DELTA)
871
+    #ifndef DELTA_PROBEABLE_RADIUS
872
+      #define DELTA_PROBEABLE_RADIUS DELTA_PRINTABLE_RADIUS
873
+    #endif
861
     #ifndef DELTA_CALIBRATION_RADIUS
874
     #ifndef DELTA_CALIBRATION_RADIUS
862
       #define DELTA_CALIBRATION_RADIUS DELTA_PRINTABLE_RADIUS - 10
875
       #define DELTA_CALIBRATION_RADIUS DELTA_PRINTABLE_RADIUS - 10
863
     #endif
876
     #endif
878
   /**
891
   /**
879
    * Set granular options based on the specific type of leveling
892
    * Set granular options based on the specific type of leveling
880
    */
893
    */
881
-
882
   #define UBL_DELTA  (ENABLED(AUTO_BED_LEVELING_UBL) && (ENABLED(DELTA) || ENABLED(UBL_GRANULAR_SEGMENTATION_FOR_CARTESIAN)))
894
   #define UBL_DELTA  (ENABLED(AUTO_BED_LEVELING_UBL) && (ENABLED(DELTA) || ENABLED(UBL_GRANULAR_SEGMENTATION_FOR_CARTESIAN)))
883
   #define ABL_PLANAR (ENABLED(AUTO_BED_LEVELING_LINEAR) || ENABLED(AUTO_BED_LEVELING_3POINT))
895
   #define ABL_PLANAR (ENABLED(AUTO_BED_LEVELING_LINEAR) || ENABLED(AUTO_BED_LEVELING_3POINT))
884
   #define ABL_GRID   (ENABLED(AUTO_BED_LEVELING_LINEAR) || ENABLED(AUTO_BED_LEVELING_BILINEAR))
896
   #define ABL_GRID   (ENABLED(AUTO_BED_LEVELING_LINEAR) || ENABLED(AUTO_BED_LEVELING_BILINEAR))
978
   #endif
990
   #endif
979
 
991
 
980
   /**
992
   /**
993
+   * VIKI2, miniVIKI, and AZSMZ_12864 require DOGLCD_SCK and DOGLCD_MOSI to be defined.
994
+   */
995
+  #if ENABLED(VIKI2) || ENABLED(miniVIKI) || ENABLED(AZSMZ_12864)
996
+    #ifndef DOGLCD_SCK
997
+      #define DOGLCD_SCK  SCK_PIN
998
+    #endif
999
+    #ifndef DOGLCD_MOSI
1000
+      #define DOGLCD_MOSI MOSI_PIN
1001
+    #endif
1002
+  #endif
1003
+
1004
+  /**
981
    * Z_HOMING_HEIGHT / Z_CLEARANCE_BETWEEN_PROBES
1005
    * Z_HOMING_HEIGHT / Z_CLEARANCE_BETWEEN_PROBES
982
    */
1006
    */
983
   #ifndef Z_HOMING_HEIGHT
1007
   #ifndef Z_HOMING_HEIGHT

Loading…
Cancel
Save