Browse Source

🎨 Move HAS_EXTRUDERS

Scott Lahteine 3 years ago
parent
commit
2de54dab84

+ 1
- 1
Marlin/src/feature/powerloss.cpp View File

197
       #endif
197
       #endif
198
     #endif
198
     #endif
199
 
199
 
200
-    #if EXTRUDERS
200
+    #if HAS_EXTRUDERS
201
       HOTEND_LOOP() info.target_temperature[e] = thermalManager.degTargetHotend(e);
201
       HOTEND_LOOP() info.target_temperature[e] = thermalManager.degTargetHotend(e);
202
     #endif
202
     #endif
203
 
203
 

+ 1
- 1
Marlin/src/gcode/config/M221.cpp View File

23
 #include "../gcode.h"
23
 #include "../gcode.h"
24
 #include "../../module/planner.h"
24
 #include "../../module/planner.h"
25
 
25
 
26
-#if EXTRUDERS
26
+#if HAS_EXTRUDERS
27
 
27
 
28
 /**
28
 /**
29
  * M221: Set extrusion percentage (M221 T0 S95)
29
  * M221: Set extrusion percentage (M221 T0 S95)

+ 6
- 4
Marlin/src/gcode/gcode.cpp View File

520
         case 100: M100(); break;                                  // M100: Free Memory Report
520
         case 100: M100(); break;                                  // M100: Free Memory Report
521
       #endif
521
       #endif
522
 
522
 
523
-      #if EXTRUDERS
523
+      #if HAS_EXTRUDERS
524
         case 104: M104(); break;                                  // M104: Set hot end temperature
524
         case 104: M104(); break;                                  // M104: Set hot end temperature
525
         case 109: M109(); break;                                  // M109: Wait for hotend temperature to reach target
525
         case 109: M109(); break;                                  // M109: Wait for hotend temperature to reach target
526
       #endif
526
       #endif
596
       #endif
596
       #endif
597
       case 81: M81(); break;                                      // M81: Turn off Power, including Power Supply, if possible
597
       case 81: M81(); break;                                      // M81: Turn off Power, including Power Supply, if possible
598
 
598
 
599
-      case 82: M82(); break;                                      // M82: Set E axis normal mode (same as other axes)
600
-      case 83: M83(); break;                                      // M83: Set E axis relative mode
599
+      #if HAS_EXTRUDERS
600
+        case 82: M82(); break;                                    // M82: Set E axis normal mode (same as other axes)
601
+        case 83: M83(); break;                                    // M83: Set E axis relative mode
602
+      #endif
601
       case 18: case 84: M18_M84(); break;                         // M18/M84: Disable Steppers / Set Timeout
603
       case 18: case 84: M18_M84(); break;                         // M18/M84: Disable Steppers / Set Timeout
602
       case 85: M85(); break;                                      // M85: Set inactivity stepper shutdown timeout
604
       case 85: M85(); break;                                      // M85: Set inactivity stepper shutdown timeout
603
       case 92: M92(); break;                                      // M92: Set the steps-per-unit for one or more axes
605
       case 92: M92(); break;                                      // M92: Set the steps-per-unit for one or more axes
674
 
676
 
675
       case 220: M220(); break;                                    // M220: Set Feedrate Percentage: S<percent> ("FR" on your LCD)
677
       case 220: M220(); break;                                    // M220: Set Feedrate Percentage: S<percent> ("FR" on your LCD)
676
 
678
 
677
-      #if EXTRUDERS
679
+      #if HAS_EXTRUDERS
678
         case 221: M221(); break;                                  // M221: Set Flow Percentage
680
         case 221: M221(); break;                                  // M221: Set Flow Percentage
679
       #endif
681
       #endif
680
 
682
 

+ 8
- 5
Marlin/src/gcode/gcode.h View File

633
   #if ENABLED(PSU_CONTROL)
633
   #if ENABLED(PSU_CONTROL)
634
     static void M80();
634
     static void M80();
635
   #endif
635
   #endif
636
-
637
   static void M81();
636
   static void M81();
638
-  static void M82();
639
-  static void M83();
637
+
638
+  #if HAS_EXTRUDERS
639
+    static void M82();
640
+    static void M83();
641
+  #endif
642
+
640
   static void M85();
643
   static void M85();
641
   static void M92();
644
   static void M92();
642
 
645
 
644
     static void M100();
647
     static void M100();
645
   #endif
648
   #endif
646
 
649
 
647
-  #if EXTRUDERS
650
+  #if HAS_EXTRUDERS
648
     static void M104();
651
     static void M104();
649
     static void M109();
652
     static void M109();
650
   #endif
653
   #endif
776
 
779
 
777
   static void M220();
780
   static void M220();
778
 
781
 
779
-  #if EXTRUDERS
782
+  #if HAS_EXTRUDERS
780
     static void M221();
783
     static void M221();
781
   #endif
784
   #endif
782
 
785
 

+ 2
- 2
Marlin/src/gcode/host/M360.cpp View File

28
 #include "../../module/motion.h"
28
 #include "../../module/motion.h"
29
 #include "../../module/planner.h"
29
 #include "../../module/planner.h"
30
 
30
 
31
-#if EXTRUDERS
31
+#if HAS_EXTRUDERS
32
   #include "../../module/temperature.h"
32
   #include "../../module/temperature.h"
33
 #endif
33
 #endif
34
 
34
 
171
   // Per-Extruder settings
171
   // Per-Extruder settings
172
   //
172
   //
173
   config_line(PSTR("NumExtruder"), EXTRUDERS);
173
   config_line(PSTR("NumExtruder"), EXTRUDERS);
174
-  #if EXTRUDERS
174
+  #if HAS_EXTRUDERS
175
     LOOP_L_N(e, EXTRUDERS) {
175
     LOOP_L_N(e, EXTRUDERS) {
176
       config_line_e(e, JERK_STR, TERN(HAS_LINEAR_E_JERK, planner.max_e_jerk[E_INDEX_N(e)], TERN(HAS_CLASSIC_JERK, planner.max_jerk.e, DEFAULT_EJERK)));
176
       config_line_e(e, JERK_STR, TERN(HAS_LINEAR_E_JERK, planner.max_e_jerk[E_INDEX_N(e)], TERN(HAS_CLASSIC_JERK, planner.max_jerk.e, DEFAULT_EJERK)));
177
       config_line_e(e, PSTR("MaxSpeed"), planner.settings.max_feedrate_mm_s[E_AXIS_N(e)]);
177
       config_line_e(e, PSTR("MaxSpeed"), planner.settings.max_feedrate_mm_s[E_AXIS_N(e)]);

+ 1
- 1
Marlin/src/gcode/temp/M104_M109.cpp View File

28
 
28
 
29
 #include "../../inc/MarlinConfigPre.h"
29
 #include "../../inc/MarlinConfigPre.h"
30
 
30
 
31
-#if EXTRUDERS
31
+#if HAS_EXTRUDERS
32
 
32
 
33
 #include "../gcode.h"
33
 #include "../gcode.h"
34
 #include "../../module/temperature.h"
34
 #include "../../module/temperature.h"

+ 6
- 0
Marlin/src/gcode/units/M82_M83.cpp View File

20
  *
20
  *
21
  */
21
  */
22
 
22
 
23
+#include "../../inc/MarlinConfigPre.h"
24
+
25
+#if HAS_EXTRUDERS
26
+
23
 #include "../gcode.h"
27
 #include "../gcode.h"
24
 
28
 
25
 /**
29
 /**
31
  * M83: Set E codes relative while in Absolute Coordinates (G90) mode
35
  * M83: Set E codes relative while in Absolute Coordinates (G90) mode
32
  */
36
  */
33
 void GcodeSuite::M83() { set_e_relative(); }
37
 void GcodeSuite::M83() { set_e_relative(); }
38
+
39
+#endif // HAS_EXTRUDERS

+ 7
- 4
Marlin/src/inc/Conditionals_LCD.h View File

538
  *  E_MANUAL     - Number of E steppers for LCD move options
538
  *  E_MANUAL     - Number of E steppers for LCD move options
539
  */
539
  */
540
 
540
 
541
-#if EXTRUDERS == 0
541
+#if EXTRUDERS
542
+  #define HAS_EXTRUDERS 1
543
+  #if EXTRUDERS > 1
544
+    #define HAS_MULTI_EXTRUDER 1
545
+  #endif
546
+#else
542
   #undef EXTRUDERS
547
   #undef EXTRUDERS
543
   #define EXTRUDERS 0
548
   #define EXTRUDERS 0
544
   #undef SINGLENOZZLE
549
   #undef SINGLENOZZLE
546
   #undef SWITCHING_NOZZLE
551
   #undef SWITCHING_NOZZLE
547
   #undef MIXING_EXTRUDER
552
   #undef MIXING_EXTRUDER
548
   #undef HOTEND_IDLE_TIMEOUT
553
   #undef HOTEND_IDLE_TIMEOUT
549
-#elif EXTRUDERS > 1
550
-  #define HAS_MULTI_EXTRUDER 1
551
 #endif
554
 #endif
552
 
555
 
553
 #if ENABLED(SWITCHING_EXTRUDER)   // One stepper for every two EXTRUDERS
556
 #if ENABLED(SWITCHING_EXTRUDER)   // One stepper for every two EXTRUDERS
663
  * All the logical axes that can be commanded directly by G-code.
666
  * All the logical axes that can be commanded directly by G-code.
664
  * Delta maps stepper-specific values to ABC steppers.
667
  * Delta maps stepper-specific values to ABC steppers.
665
  */
668
  */
666
-#if EXTRUDERS
669
+#if HAS_EXTRUDERS
667
   #define LOGICAL_AXES INCREMENT(LINEAR_AXES)
670
   #define LOGICAL_AXES INCREMENT(LINEAR_AXES)
668
 #else
671
 #else
669
   #define LOGICAL_AXES LINEAR_AXES
672
   #define LOGICAL_AXES LINEAR_AXES

+ 1
- 1
Marlin/src/inc/Conditionals_adv.h View File

75
   #define SERVO_DELAY { 50 }
75
   #define SERVO_DELAY { 50 }
76
 #endif
76
 #endif
77
 
77
 
78
-#if EXTRUDERS == 0
78
+#if !HAS_EXTRUDERS
79
   #define NO_VOLUMETRICS
79
   #define NO_VOLUMETRICS
80
   #undef TEMP_SENSOR_0
80
   #undef TEMP_SENSOR_0
81
   #undef TEMP_SENSOR_1
81
   #undef TEMP_SENSOR_1

+ 1
- 1
Marlin/src/inc/SanityCheck.h View File

1555
 #endif
1555
 #endif
1556
 
1556
 
1557
 #if ENABLED(G26_MESH_VALIDATION)
1557
 #if ENABLED(G26_MESH_VALIDATION)
1558
-  #if !EXTRUDERS
1558
+  #if !HAS_EXTRUDERS
1559
     #error "G26_MESH_VALIDATION requires at least one extruder."
1559
     #error "G26_MESH_VALIDATION requires at least one extruder."
1560
   #elif !HAS_MESH
1560
   #elif !HAS_MESH
1561
     #error "G26_MESH_VALIDATION requires MESH_BED_LEVELING, AUTO_BED_LEVELING_BILINEAR, or AUTO_BED_LEVELING_UBL."
1561
     #error "G26_MESH_VALIDATION requires MESH_BED_LEVELING, AUTO_BED_LEVELING_BILINEAR, or AUTO_BED_LEVELING_UBL."

+ 1
- 1
Marlin/src/lcd/HD44780/marlinui_HD44780.cpp View File

954
             else
954
             else
955
           #endif
955
           #endif
956
             {
956
             {
957
-              #if EXTRUDERS
957
+              #if HAS_EXTRUDERS
958
                 c = 'E';
958
                 c = 'E';
959
                 per = planner.flow_percentage[0];
959
                 per = planner.flow_percentage[0];
960
               #endif
960
               #endif

+ 1
- 1
Marlin/src/lcd/extui/dgus/DGUSScreenHandler.cpp View File

422
 }
422
 }
423
 
423
 
424
 void DGUSScreenHandler::HandleFlowRateChanged(DGUS_VP_Variable &var, void *val_ptr) {
424
 void DGUSScreenHandler::HandleFlowRateChanged(DGUS_VP_Variable &var, void *val_ptr) {
425
-  #if EXTRUDERS
425
+  #if HAS_EXTRUDERS
426
     uint16_t newvalue = swap16(*(uint16_t*)val_ptr);
426
     uint16_t newvalue = swap16(*(uint16_t*)val_ptr);
427
     uint8_t target_extruder;
427
     uint8_t target_extruder;
428
     switch (var.VP) {
428
     switch (var.VP) {

+ 3
- 3
Marlin/src/lcd/menu/menu_info.cpp View File

100
 
100
 
101
   START_SCREEN();
101
   START_SCREEN();
102
 
102
 
103
-  #if EXTRUDERS
103
+  #if HAS_EXTRUDERS
104
     #define THERMISTOR_ID TEMP_SENSOR_0
104
     #define THERMISTOR_ID TEMP_SENSOR_0
105
     #include "../thermistornames.h"
105
     #include "../thermistornames.h"
106
     STATIC_ITEM_P(PSTR(LCD_STR_E0 ": " THERMISTOR_NAME), SS_INVERT);
106
     STATIC_ITEM_P(PSTR(LCD_STR_E0 ": " THERMISTOR_NAME), SS_INVERT);
171
     PSTRING_ITEM(MSG_INFO_MAX_TEMP, STRINGIFY(HEATER_7_MAXTEMP), SS_LEFT);
171
     PSTRING_ITEM(MSG_INFO_MAX_TEMP, STRINGIFY(HEATER_7_MAXTEMP), SS_LEFT);
172
   #endif
172
   #endif
173
 
173
 
174
-  #if EXTRUDERS
174
+  #if HAS_EXTRUDERS
175
     STATIC_ITEM(TERN(WATCH_HOTENDS, MSG_INFO_RUNAWAY_ON, MSG_INFO_RUNAWAY_OFF), SS_LEFT);
175
     STATIC_ITEM(TERN(WATCH_HOTENDS, MSG_INFO_RUNAWAY_ON, MSG_INFO_RUNAWAY_OFF), SS_LEFT);
176
   #endif
176
   #endif
177
 
177
 
278
   #else
278
   #else
279
     SUBMENU(MSG_INFO_PRINTER_MENU, menu_info_printer);           // Printer Info >
279
     SUBMENU(MSG_INFO_PRINTER_MENU, menu_info_printer);           // Printer Info >
280
     SUBMENU(MSG_INFO_BOARD_MENU, menu_info_board);               // Board Info >
280
     SUBMENU(MSG_INFO_BOARD_MENU, menu_info_board);               // Board Info >
281
-    #if EXTRUDERS
281
+    #if HAS_EXTRUDERS
282
       SUBMENU(MSG_INFO_THERMISTOR_MENU, menu_info_thermistors);  // Thermistors >
282
       SUBMENU(MSG_INFO_THERMISTOR_MENU, menu_info_thermistors);  // Thermistors >
283
     #endif
283
     #endif
284
   #endif
284
   #endif

+ 1
- 1
Marlin/src/lcd/menu/menu_tune.cpp View File

195
   //
195
   //
196
   // Flow:
196
   // Flow:
197
   //
197
   //
198
-  #if EXTRUDERS
198
+  #if HAS_EXTRUDERS
199
     EDIT_ITEM(int3, MSG_FLOW, &planner.flow_percentage[active_extruder], 10, 999, []{ planner.refresh_e_factor(active_extruder); });
199
     EDIT_ITEM(int3, MSG_FLOW, &planner.flow_percentage[active_extruder], 10, 999, []{ planner.refresh_e_factor(active_extruder); });
200
     // Flow En:
200
     // Flow En:
201
     #if HAS_MULTI_EXTRUDER
201
     #if HAS_MULTI_EXTRUDER

+ 3
- 3
Marlin/src/module/motion.cpp View File

374
   planner.buffer_line(current_position, fr_mm_s, active_extruder);
374
   planner.buffer_line(current_position, fr_mm_s, active_extruder);
375
 }
375
 }
376
 
376
 
377
-#if EXTRUDERS
377
+#if HAS_EXTRUDERS
378
   void unscaled_e_move(const_float_t length, const_feedRate_t fr_mm_s) {
378
   void unscaled_e_move(const_float_t length, const_feedRate_t fr_mm_s) {
379
     TERN_(HAS_FILAMENT_SENSOR, runout.reset());
379
     TERN_(HAS_FILAMENT_SENSOR, runout.reset());
380
     current_position.e += length / planner.e_factor[active_extruder];
380
     current_position.e += length / planner.e_factor[active_extruder];
421
   const uint16_t old_pct = feedrate_percentage;
421
   const uint16_t old_pct = feedrate_percentage;
422
   feedrate_percentage = 100;
422
   feedrate_percentage = 100;
423
 
423
 
424
-  #if EXTRUDERS
424
+  #if HAS_EXTRUDERS
425
     const float old_fac = planner.e_factor[active_extruder];
425
     const float old_fac = planner.e_factor[active_extruder];
426
     planner.e_factor[active_extruder] = 1.0f;
426
     planner.e_factor[active_extruder] = 1.0f;
427
   #endif
427
   #endif
433
 
433
 
434
   feedrate_mm_s = old_feedrate;
434
   feedrate_mm_s = old_feedrate;
435
   feedrate_percentage = old_pct;
435
   feedrate_percentage = old_pct;
436
-  #if EXTRUDERS
436
+  #if HAS_EXTRUDERS
437
     planner.e_factor[active_extruder] = old_fac;
437
     planner.e_factor[active_extruder] = old_fac;
438
   #endif
438
   #endif
439
 }
439
 }

+ 1
- 1
Marlin/src/module/motion.h View File

272
  */
272
  */
273
 void line_to_current_position(const_feedRate_t fr_mm_s=feedrate_mm_s);
273
 void line_to_current_position(const_feedRate_t fr_mm_s=feedrate_mm_s);
274
 
274
 
275
-#if EXTRUDERS
275
+#if HAS_EXTRUDERS
276
   void unscaled_e_move(const_float_t length, const_feedRate_t fr_mm_s);
276
   void unscaled_e_move(const_float_t length, const_feedRate_t fr_mm_s);
277
 #endif
277
 #endif
278
 
278
 

+ 9
- 9
Marlin/src/module/planner.cpp View File

164
   xyze_bool_t Planner::last_page_dir{0};
164
   xyze_bool_t Planner::last_page_dir{0};
165
 #endif
165
 #endif
166
 
166
 
167
-#if EXTRUDERS
167
+#if HAS_EXTRUDERS
168
   int16_t Planner::flow_percentage[EXTRUDERS] = ARRAY_BY_EXTRUDERS1(100); // Extrusion factor for each extruder
168
   int16_t Planner::flow_percentage[EXTRUDERS] = ARRAY_BY_EXTRUDERS1(100); // Extrusion factor for each extruder
169
   float Planner::e_factor[EXTRUDERS] = ARRAY_BY_EXTRUDERS1(1.0f); // The flow percentage and volumetric multiplier combine to scale E movement
169
   float Planner::e_factor[EXTRUDERS] = ARRAY_BY_EXTRUDERS1(1.0f); // The flow percentage and volumetric multiplier combine to scale E movement
170
 #endif
170
 #endif
1836
                 db = target.b - position.b,
1836
                 db = target.b - position.b,
1837
                 dc = target.c - position.c;
1837
                 dc = target.c - position.c;
1838
 
1838
 
1839
-  #if EXTRUDERS
1839
+  #if HAS_EXTRUDERS
1840
     int32_t de = target.e - position.e;
1840
     int32_t de = target.e - position.e;
1841
   #else
1841
   #else
1842
     constexpr int32_t de = 0;
1842
     constexpr int32_t de = 0;
1848
       " A:", target.a, " (", da, " steps)"
1848
       " A:", target.a, " (", da, " steps)"
1849
       " B:", target.b, " (", db, " steps)"
1849
       " B:", target.b, " (", db, " steps)"
1850
       " C:", target.c, " (", dc, " steps)"
1850
       " C:", target.c, " (", dc, " steps)"
1851
-      #if EXTRUDERS
1851
+      #if HAS_EXTRUDERS
1852
         " E:", target.e, " (", de, " steps)"
1852
         " E:", target.e, " (", de, " steps)"
1853
       #endif
1853
       #endif
1854
     );
1854
     );
1921
   #endif
1921
   #endif
1922
   if (de < 0) SBI(dm, E_AXIS);
1922
   if (de < 0) SBI(dm, E_AXIS);
1923
 
1923
 
1924
-  #if EXTRUDERS
1924
+  #if HAS_EXTRUDERS
1925
     const float esteps_float = de * e_factor[extruder];
1925
     const float esteps_float = de * e_factor[extruder];
1926
     const uint32_t esteps = ABS(esteps_float) + 0.5f;
1926
     const uint32_t esteps = ABS(esteps_float) + 0.5f;
1927
   #else
1927
   #else
2003
     steps_dist_mm.c = dc * steps_to_mm[C_AXIS];
2003
     steps_dist_mm.c = dc * steps_to_mm[C_AXIS];
2004
   #endif
2004
   #endif
2005
 
2005
 
2006
-  #if EXTRUDERS
2006
+  #if HAS_EXTRUDERS
2007
     steps_dist_mm.e = esteps_float * steps_to_mm[E_AXIS_N(extruder)];
2007
     steps_dist_mm.e = esteps_float * steps_to_mm[E_AXIS_N(extruder)];
2008
   #else
2008
   #else
2009
     steps_dist_mm.e = 0.0f;
2009
     steps_dist_mm.e = 0.0f;
2013
 
2013
 
2014
   if (block->steps.a < MIN_STEPS_PER_SEGMENT && block->steps.b < MIN_STEPS_PER_SEGMENT && block->steps.c < MIN_STEPS_PER_SEGMENT) {
2014
   if (block->steps.a < MIN_STEPS_PER_SEGMENT && block->steps.b < MIN_STEPS_PER_SEGMENT && block->steps.c < MIN_STEPS_PER_SEGMENT) {
2015
     block->millimeters = (0
2015
     block->millimeters = (0
2016
-      #if EXTRUDERS
2016
+      #if HAS_EXTRUDERS
2017
         + ABS(steps_dist_mm.e)
2017
         + ABS(steps_dist_mm.e)
2018
       #endif
2018
       #endif
2019
     );
2019
     );
2046
     TERN_(BACKLASH_COMPENSATION, backlash.add_correction_steps(da, db, dc, dm, block));
2046
     TERN_(BACKLASH_COMPENSATION, backlash.add_correction_steps(da, db, dc, dm, block));
2047
   }
2047
   }
2048
 
2048
 
2049
-  #if EXTRUDERS
2049
+  #if HAS_EXTRUDERS
2050
     block->steps.e = esteps;
2050
     block->steps.e = esteps;
2051
   #endif
2051
   #endif
2052
 
2052
 
2107
   #endif
2107
   #endif
2108
 
2108
 
2109
   // Enable extruder(s)
2109
   // Enable extruder(s)
2110
-  #if EXTRUDERS
2110
+  #if HAS_EXTRUDERS
2111
     if (esteps) {
2111
     if (esteps) {
2112
       TERN_(AUTO_POWER_CONTROL, powerManager.power_on());
2112
       TERN_(AUTO_POWER_CONTROL, powerManager.power_on());
2113
 
2113
 
2209
   }
2209
   }
2210
 
2210
 
2211
   // Limit speed on extruders, if any
2211
   // Limit speed on extruders, if any
2212
-  #if EXTRUDERS
2212
+  #if HAS_EXTRUDERS
2213
     {
2213
     {
2214
       current_speed.e = steps_dist_mm.e * inverse_secs;
2214
       current_speed.e = steps_dist_mm.e * inverse_secs;
2215
       #if HAS_MIXER_SYNC_CHANNEL
2215
       #if HAS_MIXER_SYNC_CHANNEL

+ 2
- 2
Marlin/src/module/planner.h View File

337
       static xyze_bool_t last_page_dir;             // Last page direction given
337
       static xyze_bool_t last_page_dir;             // Last page direction given
338
     #endif
338
     #endif
339
 
339
 
340
-    #if EXTRUDERS
340
+    #if HAS_EXTRUDERS
341
       static int16_t flow_percentage[EXTRUDERS];    // Extrusion factor for each extruder
341
       static int16_t flow_percentage[EXTRUDERS];    // Extrusion factor for each extruder
342
       static float e_factor[EXTRUDERS];             // The flow percentage and volumetric multiplier combine to scale E movement
342
       static float e_factor[EXTRUDERS];             // The flow percentage and volumetric multiplier combine to scale E movement
343
     #endif
343
     #endif
494
       static inline void set_max_jerk(const AxisEnum, const_float_t ) {}
494
       static inline void set_max_jerk(const AxisEnum, const_float_t ) {}
495
     #endif
495
     #endif
496
 
496
 
497
-    #if EXTRUDERS
497
+    #if HAS_EXTRUDERS
498
       FORCE_INLINE static void refresh_e_factor(const uint8_t e) {
498
       FORCE_INLINE static void refresh_e_factor(const uint8_t e) {
499
         e_factor[e] = flow_percentage[e] * 0.01f * TERN(NO_VOLUMETRICS, 1.0f, volumetric_multiplier[e]);
499
         e_factor[e] = flow_percentage[e] * 0.01f * TERN(NO_VOLUMETRICS, 1.0f, volumetric_multiplier[e]);
500
       }
500
       }

+ 3
- 3
Marlin/src/module/settings.cpp View File

402
   //
402
   //
403
   // ADVANCED_PAUSE_FEATURE
403
   // ADVANCED_PAUSE_FEATURE
404
   //
404
   //
405
-  #if EXTRUDERS
405
+  #if HAS_EXTRUDERS
406
     fil_change_settings_t fc_settings[EXTRUDERS];       // M603 T U L
406
     fil_change_settings_t fc_settings[EXTRUDERS];       // M603 T U L
407
   #endif
407
   #endif
408
 
408
 
1321
     //
1321
     //
1322
     // Advanced Pause filament load & unload lengths
1322
     // Advanced Pause filament load & unload lengths
1323
     //
1323
     //
1324
-    #if EXTRUDERS
1324
+    #if HAS_EXTRUDERS
1325
     {
1325
     {
1326
       #if DISABLED(ADVANCED_PAUSE_FEATURE)
1326
       #if DISABLED(ADVANCED_PAUSE_FEATURE)
1327
         const fil_change_settings_t fc_settings[EXTRUDERS] = { 0, 0 };
1327
         const fil_change_settings_t fc_settings[EXTRUDERS] = { 0, 0 };
2235
       //
2235
       //
2236
       // Advanced Pause filament load & unload lengths
2236
       // Advanced Pause filament load & unload lengths
2237
       //
2237
       //
2238
-      #if EXTRUDERS
2238
+      #if HAS_EXTRUDERS
2239
       {
2239
       {
2240
         #if DISABLED(ADVANCED_PAUSE_FEATURE)
2240
         #if DISABLED(ADVANCED_PAUSE_FEATURE)
2241
           fil_change_settings_t fc_settings[EXTRUDERS];
2241
           fil_change_settings_t fc_settings[EXTRUDERS];

+ 1
- 1
Marlin/src/module/tool_change.cpp View File

822
 
822
 
823
 #endif // ELECTROMAGNETIC_SWITCHING_TOOLHEAD
823
 #endif // ELECTROMAGNETIC_SWITCHING_TOOLHEAD
824
 
824
 
825
-#if EXTRUDERS
825
+#if HAS_EXTRUDERS
826
   inline void invalid_extruder_error(const uint8_t e) {
826
   inline void invalid_extruder_error(const uint8_t e) {
827
     SERIAL_ECHO_START();
827
     SERIAL_ECHO_START();
828
     SERIAL_CHAR('T'); SERIAL_ECHO(e);
828
     SERIAL_CHAR('T'); SERIAL_ECHO(e);

+ 1
- 1
Marlin/src/pins/ramps/pins_3DRAG.h View File

144
 #undef SPINDLE_DIR_PIN
144
 #undef SPINDLE_DIR_PIN
145
 
145
 
146
 #if HAS_CUTTER
146
 #if HAS_CUTTER
147
-  #if !EXTRUDERS
147
+  #if !HAS_EXTRUDERS
148
     #undef E0_DIR_PIN
148
     #undef E0_DIR_PIN
149
     #undef E0_ENABLE_PIN
149
     #undef E0_ENABLE_PIN
150
     #undef E0_STEP_PIN
150
     #undef E0_STEP_PIN

+ 1
- 1
Marlin/src/pins/sensitive_pins.h View File

353
 #define _E6_PINS
353
 #define _E6_PINS
354
 #define _E7_PINS
354
 #define _E7_PINS
355
 
355
 
356
-#if EXTRUDERS
356
+#if HAS_EXTRUDERS
357
   #undef _E0_PINS
357
   #undef _E0_PINS
358
   #define _E0_PINS E0_STEP_PIN, E0_DIR_PIN, E0_ENABLE_PIN, _E0_CS _E0_MS1 _E0_MS2 _E0_MS3
358
   #define _E0_PINS E0_STEP_PIN, E0_DIR_PIN, E0_ENABLE_PIN, _E0_CS _E0_MS1 _E0_MS2 _E0_MS3
359
 #endif
359
 #endif

+ 0
- 4
buildroot/share/PlatformIO/scripts/common-dependencies.h View File

49
   #define HAS_GCODE_M876
49
   #define HAS_GCODE_M876
50
 #endif
50
 #endif
51
 
51
 
52
-#if EXTRUDERS
53
-  #define HAS_EXTRUDERS
54
-#endif
55
-
56
 #if ENABLED(DUET_SMART_EFFECTOR) && PIN_EXISTS(SMART_EFFECTOR_MOD)
52
 #if ENABLED(DUET_SMART_EFFECTOR) && PIN_EXISTS(SMART_EFFECTOR_MOD)
57
   #define HAS_SMART_EFF_MOD
53
   #define HAS_SMART_EFF_MOD
58
 #endif
54
 #endif

+ 1
- 1
ini/features.ini View File

198
 SDSUPPORT                              = src_filter=+<src/sd/cardreader.cpp> +<src/sd/Sd2Card.cpp> +<src/sd/SdBaseFile.cpp> +<src/sd/SdFatUtil.cpp> +<src/sd/SdFile.cpp> +<src/sd/SdVolume.cpp> +<src/gcode/sd>
198
 SDSUPPORT                              = src_filter=+<src/sd/cardreader.cpp> +<src/sd/Sd2Card.cpp> +<src/sd/SdBaseFile.cpp> +<src/sd/SdFatUtil.cpp> +<src/sd/SdFile.cpp> +<src/sd/SdVolume.cpp> +<src/gcode/sd>
199
 HAS_MEDIA_SUBCALLS                     = src_filter=+<src/gcode/sd/M32.cpp>
199
 HAS_MEDIA_SUBCALLS                     = src_filter=+<src/gcode/sd/M32.cpp>
200
 GCODE_REPEAT_MARKERS                   = src_filter=+<src/feature/repeat.cpp> +<src/gcode/sd/M808.cpp>
200
 GCODE_REPEAT_MARKERS                   = src_filter=+<src/feature/repeat.cpp> +<src/gcode/sd/M808.cpp>
201
-HAS_EXTRUDERS                          = src_filter=+<src/gcode/temp/M104_M109.cpp> +<src/gcode/config/M221.cpp>
201
+HAS_EXTRUDERS                          = src_filter=+<src/gcode/units/M82_M83.cpp> +<src/gcode/temp/M104_M109.cpp> +<src/gcode/config/M221.cpp>
202
 HAS_COOLER                             = src_filter=+<src/feature/cooler.cpp> +<src/gcode/temp/M143_M193.cpp>
202
 HAS_COOLER                             = src_filter=+<src/feature/cooler.cpp> +<src/gcode/temp/M143_M193.cpp>
203
 AUTO_REPORT_TEMPERATURES               = src_filter=+<src/gcode/temp/M155.cpp>
203
 AUTO_REPORT_TEMPERATURES               = src_filter=+<src/gcode/temp/M155.cpp>
204
 INCH_MODE_SUPPORT                      = src_filter=+<src/gcode/units/G20_G21.cpp>
204
 INCH_MODE_SUPPORT                      = src_filter=+<src/gcode/units/G20_G21.cpp>

+ 1
- 0
platformio.ini View File

222
   -<src/gcode/temp/M104_M109.cpp>
222
   -<src/gcode/temp/M104_M109.cpp>
223
   -<src/gcode/temp/M155.cpp>
223
   -<src/gcode/temp/M155.cpp>
224
   -<src/gcode/units/G20_G21.cpp>
224
   -<src/gcode/units/G20_G21.cpp>
225
+  -<src/gcode/units/M82_M83.cpp>
225
   -<src/gcode/units/M149.cpp>
226
   -<src/gcode/units/M149.cpp>
226
   -<src/libs/BL24CXX.cpp> -<src/libs/W25Qxx.cpp>
227
   -<src/libs/BL24CXX.cpp> -<src/libs/W25Qxx.cpp>
227
   -<src/libs/L64XX> -<src/module/stepper/L64xx.cpp> -<src/HAL/shared/HAL_spi_L6470.cpp>
228
   -<src/libs/L64XX> -<src/module/stepper/L64xx.cpp> -<src/HAL/shared/HAL_spi_L6470.cpp>

Loading…
Cancel
Save