Преглед на файлове

Add HAS_MESH conditional

Scott Lahteine преди 7 години
родител
ревизия
b07a2aa23c
променени са 3 файла, в които са добавени 14 реда и са изтрити 11 реда
  1. 5
    2
      Marlin/Conditionals_post.h
  2. 8
    8
      Marlin/Marlin_main.cpp
  3. 1
    1
      Marlin/SanityCheck.h

+ 5
- 2
Marlin/Conditionals_post.h Целия файл

783
   #define UBL_DELTA  (ENABLED(AUTO_BED_LEVELING_UBL) && (ENABLED(DELTA) || ENABLED(UBL_GRANULAR_SEGMENTATION_FOR_CARTESIAN)))
783
   #define UBL_DELTA  (ENABLED(AUTO_BED_LEVELING_UBL) && (ENABLED(DELTA) || ENABLED(UBL_GRANULAR_SEGMENTATION_FOR_CARTESIAN)))
784
   #define ABL_PLANAR (ENABLED(AUTO_BED_LEVELING_LINEAR) || ENABLED(AUTO_BED_LEVELING_3POINT))
784
   #define ABL_PLANAR (ENABLED(AUTO_BED_LEVELING_LINEAR) || ENABLED(AUTO_BED_LEVELING_3POINT))
785
   #define ABL_GRID   (ENABLED(AUTO_BED_LEVELING_LINEAR) || ENABLED(AUTO_BED_LEVELING_BILINEAR))
785
   #define ABL_GRID   (ENABLED(AUTO_BED_LEVELING_LINEAR) || ENABLED(AUTO_BED_LEVELING_BILINEAR))
786
-  #define HAS_ABL    (ABL_PLANAR || ABL_GRID || ENABLED(AUTO_BED_LEVELING_UBL))
786
+  #define OLDSCHOOL_ABL         (ABL_PLANAR || ABL_GRID)
787
+  #define HAS_ABL               (OLDSCHOOL_ABL || ENABLED(AUTO_BED_LEVELING_UBL))
787
   #define HAS_LEVELING          (HAS_ABL || ENABLED(MESH_BED_LEVELING))
788
   #define HAS_LEVELING          (HAS_ABL || ENABLED(MESH_BED_LEVELING))
788
-  #define PLANNER_LEVELING      (ABL_PLANAR || ABL_GRID || ENABLED(MESH_BED_LEVELING) || UBL_DELTA)
789
+  #define HAS_AUTOLEVEL         (HAS_ABL && DISABLED(PROBE_MANUALLY))
790
+  #define HAS_MESH              (ENABLED(AUTO_BED_LEVELING_BILINEAR) || ENABLED(AUTO_BED_LEVELING_UBL) || ENABLED(MESH_BED_LEVELING))
791
+  #define PLANNER_LEVELING      (OLDSCHOOL_ABL || ENABLED(MESH_BED_LEVELING) || UBL_DELTA)
789
   #define HAS_PROBING_PROCEDURE (HAS_ABL || ENABLED(Z_MIN_PROBE_REPEATABILITY_TEST))
792
   #define HAS_PROBING_PROCEDURE (HAS_ABL || ENABLED(Z_MIN_PROBE_REPEATABILITY_TEST))
790
   #if HAS_PROBING_PROCEDURE
793
   #if HAS_PROBING_PROCEDURE
791
     #define PROBE_BED_WIDTH abs(RIGHT_PROBE_BED_POSITION - (LEFT_PROBE_BED_POSITION))
794
     #define PROBE_BED_WIDTH abs(RIGHT_PROBE_BED_POSITION - (LEFT_PROBE_BED_POSITION))

+ 8
- 8
Marlin/Marlin_main.cpp Целия файл

4357
     report_current_position();
4357
     report_current_position();
4358
   }
4358
   }
4359
 
4359
 
4360
-#elif HAS_ABL && DISABLED(AUTO_BED_LEVELING_UBL)
4360
+#elif OLDSCHOOL_ABL
4361
 
4361
 
4362
   #if ABL_GRID
4362
   #if ABL_GRID
4363
     #if ENABLED(PROBE_Y_FIRST)
4363
     #if ENABLED(PROBE_Y_FIRST)
5281
       SYNC_PLAN_POSITION_KINEMATIC();
5281
       SYNC_PLAN_POSITION_KINEMATIC();
5282
   }
5282
   }
5283
 
5283
 
5284
-#endif // HAS_ABL && !AUTO_BED_LEVELING_UBL
5284
+#endif // OLDSCHOOL_ABL
5285
 
5285
 
5286
 #if HAS_BED_PROBE
5286
 #if HAS_BED_PROBE
5287
 
5287
 
5869
 
5869
 
5870
 #endif // G38_PROBE_TARGET
5870
 #endif // G38_PROBE_TARGET
5871
 
5871
 
5872
-#if ENABLED(AUTO_BED_LEVELING_BILINEAR) || ENABLED(AUTO_BED_LEVELING_UBL) || ENABLED(MESH_BED_LEVELING)
5872
+#if HAS_MESH
5873
 
5873
 
5874
   /**
5874
   /**
5875
    * G42: Move X & Y axes to mesh coordinates (I & J)
5875
    * G42: Move X & Y axes to mesh coordinates (I & J)
5921
     }
5921
     }
5922
   }
5922
   }
5923
 
5923
 
5924
-#endif // AUTO_BED_LEVELING_UBL
5924
+#endif // HAS_MESH
5925
 
5925
 
5926
 /**
5926
 /**
5927
  * G92: Set current position to given X Y Z E
5927
  * G92: Set current position to given X Y Z E
10989
         gcode_G92();
10989
         gcode_G92();
10990
         break;
10990
         break;
10991
 
10991
 
10992
-      #if ENABLED(AUTO_BED_LEVELING_BILINEAR) || ENABLED(AUTO_BED_LEVELING_UBL) || ENABLED(MESH_BED_LEVELING)
10992
+      #if HAS_MESH
10993
         case 42:
10993
         case 42:
10994
           gcode_G42();
10994
           gcode_G42();
10995
           break;
10995
           break;
11474
           break;
11474
           break;
11475
       #endif
11475
       #endif
11476
 
11476
 
11477
-      #if ENABLED(MESH_BED_LEVELING) || ENABLED(AUTO_BED_LEVELING_UBL) || ENABLED(AUTO_BED_LEVELING_BILINEAR)
11477
+      #if HAS_MESH
11478
         case 421: // M421: Set a Mesh Bed Leveling Z coordinate
11478
         case 421: // M421: Set a Mesh Bed Leveling Z coordinate
11479
           gcode_M421();
11479
           gcode_M421();
11480
           break;
11480
           break;
12377
   inline bool prepare_move_to_destination_cartesian() {
12377
   inline bool prepare_move_to_destination_cartesian() {
12378
     if (current_position[X_AXIS] != destination[X_AXIS] || current_position[Y_AXIS] != destination[Y_AXIS]) {
12378
     if (current_position[X_AXIS] != destination[X_AXIS] || current_position[Y_AXIS] != destination[Y_AXIS]) {
12379
       const float fr_scaled = MMS_SCALED(feedrate_mm_s);
12379
       const float fr_scaled = MMS_SCALED(feedrate_mm_s);
12380
-      #if HAS_LEVELING
12380
+      #if HAS_MESH
12381
         if (planner.leveling_active) {
12381
         if (planner.leveling_active) {
12382
           #if ENABLED(AUTO_BED_LEVELING_UBL)
12382
           #if ENABLED(AUTO_BED_LEVELING_UBL)
12383
             ubl.line_to_destination_cartesian(fr_scaled, active_extruder);
12383
             ubl.line_to_destination_cartesian(fr_scaled, active_extruder);
12388
           #endif
12388
           #endif
12389
           return true;
12389
           return true;
12390
         }
12390
         }
12391
-      #endif // HAS_LEVELING
12391
+      #endif // HAS_MESH
12392
       line_to_destination(fr_scaled);
12392
       line_to_destination(fr_scaled);
12393
     }
12393
     }
12394
     else
12394
     else

+ 1
- 1
Marlin/SanityCheck.h Целия файл

651
   /**
651
   /**
652
    * Require some kind of probe for bed leveling and probe testing
652
    * Require some kind of probe for bed leveling and probe testing
653
    */
653
    */
654
-  #if HAS_ABL && DISABLED(AUTO_BED_LEVELING_UBL)
654
+  #if OLDSCHOOL_ABL
655
     #error "Auto Bed Leveling requires one of these: PROBE_MANUALLY, FIX_MOUNTED_PROBE, BLTOUCH, SOLENOID_PROBE, Z_PROBE_ALLEN_KEY, Z_PROBE_SLED, or a Z Servo."
655
     #error "Auto Bed Leveling requires one of these: PROBE_MANUALLY, FIX_MOUNTED_PROBE, BLTOUCH, SOLENOID_PROBE, Z_PROBE_ALLEN_KEY, Z_PROBE_SLED, or a Z Servo."
656
   #endif
656
   #endif
657
 
657
 

Loading…
Отказ
Запис