Browse Source

EXTUI and UBL compilation fixes (#13420)

InsanityAutomation 6 years ago
parent
commit
3fb8489ae3
58 changed files with 239 additions and 58 deletions
  1. 4
    0
      Marlin/src/feature/bedlevel/ubl/ubl.cpp
  2. 7
    2
      Marlin/src/feature/bedlevel/ubl/ubl_G29.cpp
  3. 4
    0
      Marlin/src/gcode/bedlevel/ubl/M421.cpp
  4. 8
    2
      Marlin/src/lcd/extensible_ui/ui_api.cpp
  5. 4
    1
      config/default/Configuration_adv.h
  6. 4
    1
      config/examples/3DFabXYZ/Migbot/Configuration_adv.h
  7. 4
    1
      config/examples/AlephObjects/TAZ4/Configuration_adv.h
  8. 4
    1
      config/examples/AliExpress/UM2pExt/Configuration_adv.h
  9. 4
    1
      config/examples/Anet/A2/Configuration_adv.h
  10. 4
    1
      config/examples/Anet/A2plus/Configuration_adv.h
  11. 4
    1
      config/examples/Anet/A6/Configuration_adv.h
  12. 4
    1
      config/examples/Anet/A8/Configuration_adv.h
  13. 4
    1
      config/examples/AnyCubic/i3/Configuration_adv.h
  14. 4
    1
      config/examples/ArmEd/Configuration_adv.h
  15. 4
    1
      config/examples/BIBO/TouchX/cyclops/Configuration_adv.h
  16. 4
    1
      config/examples/BIBO/TouchX/default/Configuration_adv.h
  17. 4
    1
      config/examples/Cartesio/Configuration_adv.h
  18. 4
    1
      config/examples/Creality/CR-10/Configuration_adv.h
  19. 4
    1
      config/examples/Creality/CR-10S/Configuration_adv.h
  20. 4
    1
      config/examples/Creality/CR-10_5S/Configuration_adv.h
  21. 4
    1
      config/examples/Creality/CR-10mini/Configuration_adv.h
  22. 4
    1
      config/examples/Creality/CR-8/Configuration_adv.h
  23. 4
    1
      config/examples/Creality/Ender-4/Configuration_adv.h
  24. 4
    1
      config/examples/Einstart-S/Configuration_adv.h
  25. 4
    1
      config/examples/Felix/Configuration_adv.h
  26. 4
    1
      config/examples/FolgerTech/i3-2020/Configuration_adv.h
  27. 4
    1
      config/examples/Formbot/Raptor/Configuration_adv.h
  28. 4
    1
      config/examples/Formbot/T_Rex_2+/Configuration_adv.h
  29. 4
    1
      config/examples/Formbot/T_Rex_3/Configuration_adv.h
  30. 4
    1
      config/examples/Geeetech/A10M/Configuration_adv.h
  31. 4
    1
      config/examples/Geeetech/A20M/Configuration_adv.h
  32. 4
    1
      config/examples/Geeetech/MeCreator2/Configuration_adv.h
  33. 4
    1
      config/examples/Geeetech/Prusa i3 Pro C/Configuration_adv.h
  34. 4
    1
      config/examples/Geeetech/Prusa i3 Pro W/Configuration_adv.h
  35. 4
    1
      config/examples/Infitary/i3-M508/Configuration_adv.h
  36. 4
    1
      config/examples/MakerParts/Configuration_adv.h
  37. 4
    1
      config/examples/Malyan/M150/Configuration_adv.h
  38. 4
    1
      config/examples/Malyan/M200/Configuration_adv.h
  39. 4
    1
      config/examples/Micromake/C1/enhanced/Configuration_adv.h
  40. 4
    1
      config/examples/Mks/Robin/Configuration_adv.h
  41. 4
    1
      config/examples/Mks/Sbase/Configuration_adv.h
  42. 4
    1
      config/examples/RapideLite/RL200/Configuration_adv.h
  43. 4
    1
      config/examples/RigidBot/Configuration_adv.h
  44. 4
    1
      config/examples/Sanguinololu/Configuration_adv.h
  45. 4
    1
      config/examples/TheBorg/Configuration_adv.h
  46. 4
    1
      config/examples/TinyBoy2/Configuration_adv.h
  47. 4
    1
      config/examples/Tronxy/X3A/Configuration_adv.h
  48. 4
    1
      config/examples/Tronxy/X5S-2E/Configuration_adv.h
  49. 4
    1
      config/examples/UltiMachine/Archim1/Configuration_adv.h
  50. 4
    1
      config/examples/UltiMachine/Archim2/Configuration_adv.h
  51. 4
    1
      config/examples/VORONDesign/Configuration_adv.h
  52. 4
    1
      config/examples/Velleman/K8200/Configuration_adv.h
  53. 4
    1
      config/examples/Velleman/K8400/Configuration_adv.h
  54. 4
    1
      config/examples/WASP/PowerWASP/Configuration_adv.h
  55. 4
    1
      config/examples/gCreate/gMax1.5+/Configuration_adv.h
  56. 4
    1
      config/examples/makibox/Configuration_adv.h
  57. 4
    1
      config/examples/tvrrug/Round2/Configuration_adv.h
  58. 4
    1
      config/examples/wt150/Configuration_adv.h

+ 4
- 0
Marlin/src/feature/bedlevel/ubl/ubl.cpp View File

32
   #include "../../../module/motion.h"
32
   #include "../../../module/motion.h"
33
   #include "../../bedlevel/bedlevel.h"
33
   #include "../../bedlevel/bedlevel.h"
34
 
34
 
35
+  #if ENABLED(EXTENSIBLE_UI)
36
+    #include "../../../lcd/extensible_ui/ui_api.h"
37
+  #endif
38
+  
35
   #include "math.h"
39
   #include "math.h"
36
 
40
 
37
   void unified_bed_leveling::echo_name() {
41
   void unified_bed_leveling::echo_name() {

+ 7
- 2
Marlin/src/feature/bedlevel/ubl/ubl_G29.cpp View File

49
   #define DEBUG_OUT ENABLED(DEBUG_LEVELING_FEATURE)
49
   #define DEBUG_OUT ENABLED(DEBUG_LEVELING_FEATURE)
50
   #include "../../../core/debug_out.h"
50
   #include "../../../core/debug_out.h"
51
 
51
 
52
+  #if ENABLED(EXTENSIBLE_UI)
53
+    #include "../../../lcd/extensible_ui/ui_api.h"
54
+  #endif
55
+
52
   #include <math.h>
56
   #include <math.h>
53
 
57
 
54
   #define UBL_G29_P31
58
   #define UBL_G29_P31
389
 
393
 
390
         case 2:
394
         case 2:
391
           // Allow the user to specify the height because 10mm is a little extreme in some cases.
395
           // Allow the user to specify the height because 10mm is a little extreme in some cases.
392
-          for (uint8_t x = (GRID_MAX_POINTS_X) / 3; x < 2 * (GRID_MAX_POINTS_X) / 3; x++)   // Create a rectangular raised area in
393
-            for (uint8_t y = (GRID_MAX_POINTS_Y) / 3; y < 2 * (GRID_MAX_POINTS_Y) / 3; y++) // the center of the bed
396
+          for (uint8_t x = (GRID_MAX_POINTS_X) / 3; x < 2 * (GRID_MAX_POINTS_X) / 3; x++)     // Create a rectangular raised area in
397
+            for (uint8_t y = (GRID_MAX_POINTS_Y) / 3; y < 2 * (GRID_MAX_POINTS_Y) / 3; y++) { // the center of the bed
394
               z_values[x][y] += parser.seen('C') ? g29_constant : 9.99f;
398
               z_values[x][y] += parser.seen('C') ? g29_constant : 9.99f;
395
               #if ENABLED(EXTENSIBLE_UI)
399
               #if ENABLED(EXTENSIBLE_UI)
396
                 ExtUI::onMeshUpdate(x, y, z_values[x][y]);
400
                 ExtUI::onMeshUpdate(x, y, z_values[x][y]);
397
               #endif
401
               #endif
402
+            }
398
           break;
403
           break;
399
       }
404
       }
400
     }
405
     }

+ 4
- 0
Marlin/src/gcode/bedlevel/ubl/M421.cpp View File

31
 #include "../../gcode.h"
31
 #include "../../gcode.h"
32
 #include "../../../feature/bedlevel/bedlevel.h"
32
 #include "../../../feature/bedlevel/bedlevel.h"
33
 
33
 
34
+#if ENABLED(EXTENSIBLE_UI)
35
+  #include "../../../lcd/extensible_ui/ui_api.h"
36
+#endif
37
+
34
 /**
38
 /**
35
  * M421: Set a single Mesh Bed Leveling Z coordinate
39
  * M421: Set a single Mesh Bed Leveling Z coordinate
36
  *
40
  *

+ 8
- 2
Marlin/src/lcd/extensible_ui/ui_api.cpp View File

87
   #endif
87
   #endif
88
 #endif
88
 #endif
89
 
89
 
90
+#if HAS_LEVELING
91
+  #include "../../feature/bedlevel.h"
92
+#endif
93
+
90
 #if HAS_FILAMENT_SENSOR
94
 #if HAS_FILAMENT_SENSOR
91
   #include "../../feature/runout.h"
95
   #include "../../feature/runout.h"
92
 #endif
96
 #endif
417
 
421
 
418
     void setJunctionDeviation_mm(const float value) {
422
     void setJunctionDeviation_mm(const float value) {
419
       planner.junction_deviation_mm = clamp(value, 0.01, 0.3);
423
       planner.junction_deviation_mm = clamp(value, 0.01, 0.3);
420
-      planner.recalculate_max_e_jerk();
424
+      #if ENABLED(LIN_ADVANCE)
425
+        planner.recalculate_max_e_jerk();
426
+      #endif
421
     }
427
     }
422
 
428
 
423
   #else
429
   #else
579
 
585
 
580
   #if HAS_LEVELING
586
   #if HAS_LEVELING
581
     bool getLevelingActive() { return planner.leveling_active; }
587
     bool getLevelingActive() { return planner.leveling_active; }
582
-    void setLevelingActive(const bool state) { set_bed_leveling_enabled(state) }
588
+    void setLevelingActive(const bool state) { set_bed_leveling_enabled(state); }
583
     #if HAS_MESH
589
     #if HAS_MESH
584
       bool getMeshValid() { return leveling_is_valid(); }
590
       bool getMeshValid() { return leveling_is_valid(); }
585
       bed_mesh_t getMeshArray() { return Z_VALUES; }
591
       bed_mesh_t getMeshArray() { return Z_VALUES; }

+ 4
- 1
config/default/Configuration_adv.h View File

513
 
513
 
514
 // @section lcd
514
 // @section lcd
515
 
515
 
516
-#if ENABLED(ULTIPANEL)
516
+#if EITHER(ULTIPANEL, EXTENSIBLE_UI)
517
   #define MANUAL_FEEDRATE {50*60, 50*60, 4*60, 60} // Feedrates for manual moves along X, Y, Z, E from panel
517
   #define MANUAL_FEEDRATE {50*60, 50*60, 4*60, 60} // Feedrates for manual moves along X, Y, Z, E from panel
518
+#endif
519
+
520
+#if ENABLED(ULTIPANEL)
518
   #define MANUAL_E_MOVES_RELATIVE // Show LCD extruder moves as relative rather than absolute positions
521
   #define MANUAL_E_MOVES_RELATIVE // Show LCD extruder moves as relative rather than absolute positions
519
   #define ULTIPANEL_FEEDMULTIPLY  // Comment to disable setting feedrate multiplier via encoder
522
   #define ULTIPANEL_FEEDMULTIPLY  // Comment to disable setting feedrate multiplier via encoder
520
 #endif
523
 #endif

+ 4
- 1
config/examples/3DFabXYZ/Migbot/Configuration_adv.h View File

513
 
513
 
514
 // @section lcd
514
 // @section lcd
515
 
515
 
516
-#if ENABLED(ULTIPANEL)
516
+#if EITHER(ULTIPANEL, EXTENSIBLE_UI)
517
   #define MANUAL_FEEDRATE {50*60, 50*60, 4*60, 60} // Feedrates for manual moves along X, Y, Z, E from panel
517
   #define MANUAL_FEEDRATE {50*60, 50*60, 4*60, 60} // Feedrates for manual moves along X, Y, Z, E from panel
518
+#endif
519
+
520
+#if ENABLED(ULTIPANEL)
518
   #define MANUAL_E_MOVES_RELATIVE // Show LCD extruder moves as relative rather than absolute positions
521
   #define MANUAL_E_MOVES_RELATIVE // Show LCD extruder moves as relative rather than absolute positions
519
   #define ULTIPANEL_FEEDMULTIPLY  // Comment to disable setting feedrate multiplier via encoder
522
   #define ULTIPANEL_FEEDMULTIPLY  // Comment to disable setting feedrate multiplier via encoder
520
 #endif
523
 #endif

+ 4
- 1
config/examples/AlephObjects/TAZ4/Configuration_adv.h View File

513
 
513
 
514
 // @section lcd
514
 // @section lcd
515
 
515
 
516
-#if ENABLED(ULTIPANEL)
516
+#if EITHER(ULTIPANEL, EXTENSIBLE_UI)
517
   #define MANUAL_FEEDRATE {50*60, 50*60, 4*60, 60} // Feedrates for manual moves along X, Y, Z, E from panel
517
   #define MANUAL_FEEDRATE {50*60, 50*60, 4*60, 60} // Feedrates for manual moves along X, Y, Z, E from panel
518
+#endif
519
+
520
+#if ENABLED(ULTIPANEL)
518
   #define MANUAL_E_MOVES_RELATIVE // Show LCD extruder moves as relative rather than absolute positions
521
   #define MANUAL_E_MOVES_RELATIVE // Show LCD extruder moves as relative rather than absolute positions
519
   #define ULTIPANEL_FEEDMULTIPLY  // Comment to disable setting feedrate multiplier via encoder
522
   #define ULTIPANEL_FEEDMULTIPLY  // Comment to disable setting feedrate multiplier via encoder
520
 #endif
523
 #endif

+ 4
- 1
config/examples/AliExpress/UM2pExt/Configuration_adv.h View File

513
 
513
 
514
 // @section lcd
514
 // @section lcd
515
 
515
 
516
-#if ENABLED(ULTIPANEL)
516
+#if EITHER(ULTIPANEL, EXTENSIBLE_UI)
517
   #define MANUAL_FEEDRATE {50*60, 50*60, 4*60, 60} // Feedrates for manual moves along X, Y, Z, E from panel
517
   #define MANUAL_FEEDRATE {50*60, 50*60, 4*60, 60} // Feedrates for manual moves along X, Y, Z, E from panel
518
+#endif
519
+
520
+#if ENABLED(ULTIPANEL)
518
   #define MANUAL_E_MOVES_RELATIVE // Show LCD extruder moves as relative rather than absolute positions
521
   #define MANUAL_E_MOVES_RELATIVE // Show LCD extruder moves as relative rather than absolute positions
519
   #define ULTIPANEL_FEEDMULTIPLY  // Comment to disable setting feedrate multiplier via encoder
522
   #define ULTIPANEL_FEEDMULTIPLY  // Comment to disable setting feedrate multiplier via encoder
520
 #endif
523
 #endif

+ 4
- 1
config/examples/Anet/A2/Configuration_adv.h View File

513
 
513
 
514
 // @section lcd
514
 // @section lcd
515
 
515
 
516
-#if ENABLED(ULTIPANEL)
516
+#if EITHER(ULTIPANEL, EXTENSIBLE_UI)
517
   #define MANUAL_FEEDRATE {50*60, 50*60, 4*60, 60} // Feedrates for manual moves along X, Y, Z, E from panel
517
   #define MANUAL_FEEDRATE {50*60, 50*60, 4*60, 60} // Feedrates for manual moves along X, Y, Z, E from panel
518
+#endif
519
+
520
+#if ENABLED(ULTIPANEL)
518
   #define MANUAL_E_MOVES_RELATIVE // Show LCD extruder moves as relative rather than absolute positions
521
   #define MANUAL_E_MOVES_RELATIVE // Show LCD extruder moves as relative rather than absolute positions
519
   #define ULTIPANEL_FEEDMULTIPLY  // Comment to disable setting feedrate multiplier via encoder
522
   #define ULTIPANEL_FEEDMULTIPLY  // Comment to disable setting feedrate multiplier via encoder
520
 #endif
523
 #endif

+ 4
- 1
config/examples/Anet/A2plus/Configuration_adv.h View File

513
 
513
 
514
 // @section lcd
514
 // @section lcd
515
 
515
 
516
-#if ENABLED(ULTIPANEL)
516
+#if EITHER(ULTIPANEL, EXTENSIBLE_UI)
517
   #define MANUAL_FEEDRATE {50*60, 50*60, 4*60, 60} // Feedrates for manual moves along X, Y, Z, E from panel
517
   #define MANUAL_FEEDRATE {50*60, 50*60, 4*60, 60} // Feedrates for manual moves along X, Y, Z, E from panel
518
+#endif
519
+
520
+#if ENABLED(ULTIPANEL)
518
   #define MANUAL_E_MOVES_RELATIVE // Show LCD extruder moves as relative rather than absolute positions
521
   #define MANUAL_E_MOVES_RELATIVE // Show LCD extruder moves as relative rather than absolute positions
519
   #define ULTIPANEL_FEEDMULTIPLY  // Comment to disable setting feedrate multiplier via encoder
522
   #define ULTIPANEL_FEEDMULTIPLY  // Comment to disable setting feedrate multiplier via encoder
520
 #endif
523
 #endif

+ 4
- 1
config/examples/Anet/A6/Configuration_adv.h View File

513
 
513
 
514
 // @section lcd
514
 // @section lcd
515
 
515
 
516
-#if ENABLED(ULTIPANEL)
516
+#if EITHER(ULTIPANEL, EXTENSIBLE_UI)
517
   #define MANUAL_FEEDRATE {50*60, 50*60, 4*60, 60} // Feedrates for manual moves along X, Y, Z, E from panel
517
   #define MANUAL_FEEDRATE {50*60, 50*60, 4*60, 60} // Feedrates for manual moves along X, Y, Z, E from panel
518
+#endif
519
+
520
+#if ENABLED(ULTIPANEL)
518
   #define MANUAL_E_MOVES_RELATIVE // Show LCD extruder moves as relative rather than absolute positions
521
   #define MANUAL_E_MOVES_RELATIVE // Show LCD extruder moves as relative rather than absolute positions
519
   #define ULTIPANEL_FEEDMULTIPLY  // Comment to disable setting feedrate multiplier via encoder
522
   #define ULTIPANEL_FEEDMULTIPLY  // Comment to disable setting feedrate multiplier via encoder
520
 #endif
523
 #endif

+ 4
- 1
config/examples/Anet/A8/Configuration_adv.h View File

513
 
513
 
514
 // @section lcd
514
 // @section lcd
515
 
515
 
516
-#if ENABLED(ULTIPANEL)
516
+#if EITHER(ULTIPANEL, EXTENSIBLE_UI)
517
   #define MANUAL_FEEDRATE {50*60, 50*60, 4*60, 60} // Feedrates for manual moves along X, Y, Z, E from panel
517
   #define MANUAL_FEEDRATE {50*60, 50*60, 4*60, 60} // Feedrates for manual moves along X, Y, Z, E from panel
518
+#endif
519
+
520
+#if ENABLED(ULTIPANEL)
518
   #define MANUAL_E_MOVES_RELATIVE // Show LCD extruder moves as relative rather than absolute positions
521
   #define MANUAL_E_MOVES_RELATIVE // Show LCD extruder moves as relative rather than absolute positions
519
   #define ULTIPANEL_FEEDMULTIPLY  // Comment to disable setting feedrate multiplier via encoder
522
   #define ULTIPANEL_FEEDMULTIPLY  // Comment to disable setting feedrate multiplier via encoder
520
 #endif
523
 #endif

+ 4
- 1
config/examples/AnyCubic/i3/Configuration_adv.h View File

513
 
513
 
514
 // @section lcd
514
 // @section lcd
515
 
515
 
516
-#if ENABLED(ULTIPANEL)
516
+#if EITHER(ULTIPANEL, EXTENSIBLE_UI)
517
   #define MANUAL_FEEDRATE {50*60, 50*60, 4*60, 60} // Feedrates for manual moves along X, Y, Z, E from panel
517
   #define MANUAL_FEEDRATE {50*60, 50*60, 4*60, 60} // Feedrates for manual moves along X, Y, Z, E from panel
518
+#endif
519
+
520
+#if ENABLED(ULTIPANEL)
518
   #define MANUAL_E_MOVES_RELATIVE // Show LCD extruder moves as relative rather than absolute positions
521
   #define MANUAL_E_MOVES_RELATIVE // Show LCD extruder moves as relative rather than absolute positions
519
   #define ULTIPANEL_FEEDMULTIPLY  // Comment to disable setting feedrate multiplier via encoder
522
   #define ULTIPANEL_FEEDMULTIPLY  // Comment to disable setting feedrate multiplier via encoder
520
 #endif
523
 #endif

+ 4
- 1
config/examples/ArmEd/Configuration_adv.h View File

517
 
517
 
518
 // @section lcd
518
 // @section lcd
519
 
519
 
520
-#if ENABLED(ULTIPANEL)
520
+#if EITHER(ULTIPANEL, EXTENSIBLE_UI)
521
   #define MANUAL_FEEDRATE {50*60, 50*60, 4*60, 60} // Feedrates for manual moves along X, Y, Z, E from panel
521
   #define MANUAL_FEEDRATE {50*60, 50*60, 4*60, 60} // Feedrates for manual moves along X, Y, Z, E from panel
522
+#endif
523
+
524
+#if ENABLED(ULTIPANEL)
522
   #define MANUAL_E_MOVES_RELATIVE // Show LCD extruder moves as relative rather than absolute positions
525
   #define MANUAL_E_MOVES_RELATIVE // Show LCD extruder moves as relative rather than absolute positions
523
   #define ULTIPANEL_FEEDMULTIPLY  // Comment to disable setting feedrate multiplier via encoder
526
   #define ULTIPANEL_FEEDMULTIPLY  // Comment to disable setting feedrate multiplier via encoder
524
 #endif
527
 #endif

+ 4
- 1
config/examples/BIBO/TouchX/cyclops/Configuration_adv.h View File

513
 
513
 
514
 // @section lcd
514
 // @section lcd
515
 
515
 
516
-#if ENABLED(ULTIPANEL)
516
+#if EITHER(ULTIPANEL, EXTENSIBLE_UI)
517
   #define MANUAL_FEEDRATE {50*60, 50*60, 4*60, 60} // Feedrates for manual moves along X, Y, Z, E from panel
517
   #define MANUAL_FEEDRATE {50*60, 50*60, 4*60, 60} // Feedrates for manual moves along X, Y, Z, E from panel
518
+#endif
519
+
520
+#if ENABLED(ULTIPANEL)
518
   #define MANUAL_E_MOVES_RELATIVE // Show LCD extruder moves as relative rather than absolute positions
521
   #define MANUAL_E_MOVES_RELATIVE // Show LCD extruder moves as relative rather than absolute positions
519
   #define ULTIPANEL_FEEDMULTIPLY  // Comment to disable setting feedrate multiplier via encoder
522
   #define ULTIPANEL_FEEDMULTIPLY  // Comment to disable setting feedrate multiplier via encoder
520
 #endif
523
 #endif

+ 4
- 1
config/examples/BIBO/TouchX/default/Configuration_adv.h View File

513
 
513
 
514
 // @section lcd
514
 // @section lcd
515
 
515
 
516
-#if ENABLED(ULTIPANEL)
516
+#if EITHER(ULTIPANEL, EXTENSIBLE_UI)
517
   #define MANUAL_FEEDRATE {50*60, 50*60, 4*60, 60} // Feedrates for manual moves along X, Y, Z, E from panel
517
   #define MANUAL_FEEDRATE {50*60, 50*60, 4*60, 60} // Feedrates for manual moves along X, Y, Z, E from panel
518
+#endif
519
+
520
+#if ENABLED(ULTIPANEL)
518
   #define MANUAL_E_MOVES_RELATIVE // Show LCD extruder moves as relative rather than absolute positions
521
   #define MANUAL_E_MOVES_RELATIVE // Show LCD extruder moves as relative rather than absolute positions
519
   #define ULTIPANEL_FEEDMULTIPLY  // Comment to disable setting feedrate multiplier via encoder
522
   #define ULTIPANEL_FEEDMULTIPLY  // Comment to disable setting feedrate multiplier via encoder
520
 #endif
523
 #endif

+ 4
- 1
config/examples/Cartesio/Configuration_adv.h View File

513
 
513
 
514
 // @section lcd
514
 // @section lcd
515
 
515
 
516
-#if ENABLED(ULTIPANEL)
516
+#if EITHER(ULTIPANEL, EXTENSIBLE_UI)
517
   #define MANUAL_FEEDRATE {50*60, 50*60, 4*60, 60} // Feedrates for manual moves along X, Y, Z, E from panel
517
   #define MANUAL_FEEDRATE {50*60, 50*60, 4*60, 60} // Feedrates for manual moves along X, Y, Z, E from panel
518
+#endif
519
+
520
+#if ENABLED(ULTIPANEL)
518
   #define MANUAL_E_MOVES_RELATIVE // Show LCD extruder moves as relative rather than absolute positions
521
   #define MANUAL_E_MOVES_RELATIVE // Show LCD extruder moves as relative rather than absolute positions
519
   #define ULTIPANEL_FEEDMULTIPLY  // Comment to disable setting feedrate multiplier via encoder
522
   #define ULTIPANEL_FEEDMULTIPLY  // Comment to disable setting feedrate multiplier via encoder
520
 #endif
523
 #endif

+ 4
- 1
config/examples/Creality/CR-10/Configuration_adv.h View File

513
 
513
 
514
 // @section lcd
514
 // @section lcd
515
 
515
 
516
-#if ENABLED(ULTIPANEL)
516
+#if EITHER(ULTIPANEL, EXTENSIBLE_UI)
517
   #define MANUAL_FEEDRATE {50*60, 50*60, 4*60, 60} // Feedrates for manual moves along X, Y, Z, E from panel
517
   #define MANUAL_FEEDRATE {50*60, 50*60, 4*60, 60} // Feedrates for manual moves along X, Y, Z, E from panel
518
+#endif
519
+
520
+#if ENABLED(ULTIPANEL)
518
   #define MANUAL_E_MOVES_RELATIVE // Show LCD extruder moves as relative rather than absolute positions
521
   #define MANUAL_E_MOVES_RELATIVE // Show LCD extruder moves as relative rather than absolute positions
519
   #define ULTIPANEL_FEEDMULTIPLY  // Comment to disable setting feedrate multiplier via encoder
522
   #define ULTIPANEL_FEEDMULTIPLY  // Comment to disable setting feedrate multiplier via encoder
520
 #endif
523
 #endif

+ 4
- 1
config/examples/Creality/CR-10S/Configuration_adv.h View File

513
 
513
 
514
 // @section lcd
514
 // @section lcd
515
 
515
 
516
-#if ENABLED(ULTIPANEL)
516
+#if EITHER(ULTIPANEL, EXTENSIBLE_UI)
517
   #define MANUAL_FEEDRATE {50*60, 50*60, 4*60, 60} // Feedrates for manual moves along X, Y, Z, E from panel
517
   #define MANUAL_FEEDRATE {50*60, 50*60, 4*60, 60} // Feedrates for manual moves along X, Y, Z, E from panel
518
+#endif
519
+
520
+#if ENABLED(ULTIPANEL)
518
   #define MANUAL_E_MOVES_RELATIVE // Show LCD extruder moves as relative rather than absolute positions
521
   #define MANUAL_E_MOVES_RELATIVE // Show LCD extruder moves as relative rather than absolute positions
519
   #define ULTIPANEL_FEEDMULTIPLY  // Comment to disable setting feedrate multiplier via encoder
522
   #define ULTIPANEL_FEEDMULTIPLY  // Comment to disable setting feedrate multiplier via encoder
520
 #endif
523
 #endif

+ 4
- 1
config/examples/Creality/CR-10_5S/Configuration_adv.h View File

513
 
513
 
514
 // @section lcd
514
 // @section lcd
515
 
515
 
516
-#if ENABLED(ULTIPANEL)
516
+#if EITHER(ULTIPANEL, EXTENSIBLE_UI)
517
   #define MANUAL_FEEDRATE {50*60, 50*60, 4*60, 60} // Feedrates for manual moves along X, Y, Z, E from panel
517
   #define MANUAL_FEEDRATE {50*60, 50*60, 4*60, 60} // Feedrates for manual moves along X, Y, Z, E from panel
518
+#endif
519
+
520
+#if ENABLED(ULTIPANEL)
518
   #define MANUAL_E_MOVES_RELATIVE // Show LCD extruder moves as relative rather than absolute positions
521
   #define MANUAL_E_MOVES_RELATIVE // Show LCD extruder moves as relative rather than absolute positions
519
   #define ULTIPANEL_FEEDMULTIPLY  // Comment to disable setting feedrate multiplier via encoder
522
   #define ULTIPANEL_FEEDMULTIPLY  // Comment to disable setting feedrate multiplier via encoder
520
 #endif
523
 #endif

+ 4
- 1
config/examples/Creality/CR-10mini/Configuration_adv.h View File

513
 
513
 
514
 // @section lcd
514
 // @section lcd
515
 
515
 
516
-#if ENABLED(ULTIPANEL)
516
+#if EITHER(ULTIPANEL, EXTENSIBLE_UI)
517
   #define MANUAL_FEEDRATE {50*60, 50*60, 4*60, 60} // Feedrates for manual moves along X, Y, Z, E from panel
517
   #define MANUAL_FEEDRATE {50*60, 50*60, 4*60, 60} // Feedrates for manual moves along X, Y, Z, E from panel
518
+#endif
519
+
520
+#if ENABLED(ULTIPANEL)
518
   #define MANUAL_E_MOVES_RELATIVE // Show LCD extruder moves as relative rather than absolute positions
521
   #define MANUAL_E_MOVES_RELATIVE // Show LCD extruder moves as relative rather than absolute positions
519
   #define ULTIPANEL_FEEDMULTIPLY  // Comment to disable setting feedrate multiplier via encoder
522
   #define ULTIPANEL_FEEDMULTIPLY  // Comment to disable setting feedrate multiplier via encoder
520
 #endif
523
 #endif

+ 4
- 1
config/examples/Creality/CR-8/Configuration_adv.h View File

513
 
513
 
514
 // @section lcd
514
 // @section lcd
515
 
515
 
516
-#if ENABLED(ULTIPANEL)
516
+#if EITHER(ULTIPANEL, EXTENSIBLE_UI)
517
   #define MANUAL_FEEDRATE {50*60, 50*60, 4*60, 60} // Feedrates for manual moves along X, Y, Z, E from panel
517
   #define MANUAL_FEEDRATE {50*60, 50*60, 4*60, 60} // Feedrates for manual moves along X, Y, Z, E from panel
518
+#endif
519
+
520
+#if ENABLED(ULTIPANEL)
518
   #define MANUAL_E_MOVES_RELATIVE // Show LCD extruder moves as relative rather than absolute positions
521
   #define MANUAL_E_MOVES_RELATIVE // Show LCD extruder moves as relative rather than absolute positions
519
   #define ULTIPANEL_FEEDMULTIPLY  // Comment to disable setting feedrate multiplier via encoder
522
   #define ULTIPANEL_FEEDMULTIPLY  // Comment to disable setting feedrate multiplier via encoder
520
 #endif
523
 #endif

+ 4
- 1
config/examples/Creality/Ender-4/Configuration_adv.h View File

513
 
513
 
514
 // @section lcd
514
 // @section lcd
515
 
515
 
516
-#if ENABLED(ULTIPANEL)
516
+#if EITHER(ULTIPANEL, EXTENSIBLE_UI)
517
   #define MANUAL_FEEDRATE {50*60, 50*60, 4*60, 60} // Feedrates for manual moves along X, Y, Z, E from panel
517
   #define MANUAL_FEEDRATE {50*60, 50*60, 4*60, 60} // Feedrates for manual moves along X, Y, Z, E from panel
518
+#endif
519
+
520
+#if ENABLED(ULTIPANEL)
518
   #define MANUAL_E_MOVES_RELATIVE // Show LCD extruder moves as relative rather than absolute positions
521
   #define MANUAL_E_MOVES_RELATIVE // Show LCD extruder moves as relative rather than absolute positions
519
   #define ULTIPANEL_FEEDMULTIPLY  // Comment to disable setting feedrate multiplier via encoder
522
   #define ULTIPANEL_FEEDMULTIPLY  // Comment to disable setting feedrate multiplier via encoder
520
 #endif
523
 #endif

+ 4
- 1
config/examples/Einstart-S/Configuration_adv.h View File

513
 
513
 
514
 // @section lcd
514
 // @section lcd
515
 
515
 
516
-#if ENABLED(ULTIPANEL)
516
+#if EITHER(ULTIPANEL, EXTENSIBLE_UI)
517
   #define MANUAL_FEEDRATE {50*60, 50*60, 4*60, 60} // Feedrates for manual moves along X, Y, Z, E from panel
517
   #define MANUAL_FEEDRATE {50*60, 50*60, 4*60, 60} // Feedrates for manual moves along X, Y, Z, E from panel
518
+#endif
519
+
520
+#if ENABLED(ULTIPANEL)
518
   #define MANUAL_E_MOVES_RELATIVE // Show LCD extruder moves as relative rather than absolute positions
521
   #define MANUAL_E_MOVES_RELATIVE // Show LCD extruder moves as relative rather than absolute positions
519
   #define ULTIPANEL_FEEDMULTIPLY  // Comment to disable setting feedrate multiplier via encoder
522
   #define ULTIPANEL_FEEDMULTIPLY  // Comment to disable setting feedrate multiplier via encoder
520
 #endif
523
 #endif

+ 4
- 1
config/examples/Felix/Configuration_adv.h View File

513
 
513
 
514
 // @section lcd
514
 // @section lcd
515
 
515
 
516
-#if ENABLED(ULTIPANEL)
516
+#if EITHER(ULTIPANEL, EXTENSIBLE_UI)
517
   #define MANUAL_FEEDRATE {50*60, 50*60, 4*60, 60} // Feedrates for manual moves along X, Y, Z, E from panel
517
   #define MANUAL_FEEDRATE {50*60, 50*60, 4*60, 60} // Feedrates for manual moves along X, Y, Z, E from panel
518
+#endif
519
+
520
+#if ENABLED(ULTIPANEL)
518
   #define MANUAL_E_MOVES_RELATIVE // Show LCD extruder moves as relative rather than absolute positions
521
   #define MANUAL_E_MOVES_RELATIVE // Show LCD extruder moves as relative rather than absolute positions
519
   #define ULTIPANEL_FEEDMULTIPLY  // Comment to disable setting feedrate multiplier via encoder
522
   #define ULTIPANEL_FEEDMULTIPLY  // Comment to disable setting feedrate multiplier via encoder
520
 #endif
523
 #endif

+ 4
- 1
config/examples/FolgerTech/i3-2020/Configuration_adv.h View File

513
 
513
 
514
 // @section lcd
514
 // @section lcd
515
 
515
 
516
-#if ENABLED(ULTIPANEL)
516
+#if EITHER(ULTIPANEL, EXTENSIBLE_UI)
517
   #define MANUAL_FEEDRATE {50*60, 50*60, 4*60, 60} // Feedrates for manual moves along X, Y, Z, E from panel
517
   #define MANUAL_FEEDRATE {50*60, 50*60, 4*60, 60} // Feedrates for manual moves along X, Y, Z, E from panel
518
+#endif
519
+
520
+#if ENABLED(ULTIPANEL)
518
   #define MANUAL_E_MOVES_RELATIVE // Show LCD extruder moves as relative rather than absolute positions
521
   #define MANUAL_E_MOVES_RELATIVE // Show LCD extruder moves as relative rather than absolute positions
519
   #define ULTIPANEL_FEEDMULTIPLY  // Comment to disable setting feedrate multiplier via encoder
522
   #define ULTIPANEL_FEEDMULTIPLY  // Comment to disable setting feedrate multiplier via encoder
520
 #endif
523
 #endif

+ 4
- 1
config/examples/Formbot/Raptor/Configuration_adv.h View File

513
 
513
 
514
 // @section lcd
514
 // @section lcd
515
 
515
 
516
-#if ENABLED(ULTIPANEL)
516
+#if EITHER(ULTIPANEL, EXTENSIBLE_UI)
517
   #define MANUAL_FEEDRATE {50*60, 50*60, 4*60, 60} // Feedrates for manual moves along X, Y, Z, E from panel
517
   #define MANUAL_FEEDRATE {50*60, 50*60, 4*60, 60} // Feedrates for manual moves along X, Y, Z, E from panel
518
+#endif
519
+
520
+#if ENABLED(ULTIPANEL)
518
   #define MANUAL_E_MOVES_RELATIVE // Show LCD extruder moves as relative rather than absolute positions
521
   #define MANUAL_E_MOVES_RELATIVE // Show LCD extruder moves as relative rather than absolute positions
519
   #define ULTIPANEL_FEEDMULTIPLY  // Comment to disable setting feedrate multiplier via encoder
522
   #define ULTIPANEL_FEEDMULTIPLY  // Comment to disable setting feedrate multiplier via encoder
520
 #endif
523
 #endif

+ 4
- 1
config/examples/Formbot/T_Rex_2+/Configuration_adv.h View File

517
 
517
 
518
 // @section lcd
518
 // @section lcd
519
 
519
 
520
-#if ENABLED(ULTIPANEL)
520
+#if EITHER(ULTIPANEL, EXTENSIBLE_UI)
521
   #define MANUAL_FEEDRATE {50*60, 50*60, 4*60, 60} // Feedrates for manual moves along X, Y, Z, E from panel
521
   #define MANUAL_FEEDRATE {50*60, 50*60, 4*60, 60} // Feedrates for manual moves along X, Y, Z, E from panel
522
+#endif
523
+
524
+#if ENABLED(ULTIPANEL)
522
   #define MANUAL_E_MOVES_RELATIVE // Show LCD extruder moves as relative rather than absolute positions
525
   #define MANUAL_E_MOVES_RELATIVE // Show LCD extruder moves as relative rather than absolute positions
523
   #define ULTIPANEL_FEEDMULTIPLY  // Comment to disable setting feedrate multiplier via encoder
526
   #define ULTIPANEL_FEEDMULTIPLY  // Comment to disable setting feedrate multiplier via encoder
524
 #endif
527
 #endif

+ 4
- 1
config/examples/Formbot/T_Rex_3/Configuration_adv.h View File

517
 
517
 
518
 // @section lcd
518
 // @section lcd
519
 
519
 
520
-#if ENABLED(ULTIPANEL)
520
+#if EITHER(ULTIPANEL, EXTENSIBLE_UI)
521
   #define MANUAL_FEEDRATE {50*60, 50*60, 4*60, 60} // Feedrates for manual moves along X, Y, Z, E from panel
521
   #define MANUAL_FEEDRATE {50*60, 50*60, 4*60, 60} // Feedrates for manual moves along X, Y, Z, E from panel
522
+#endif
523
+
524
+#if ENABLED(ULTIPANEL)
522
   #define MANUAL_E_MOVES_RELATIVE // Show LCD extruder moves as relative rather than absolute positions
525
   #define MANUAL_E_MOVES_RELATIVE // Show LCD extruder moves as relative rather than absolute positions
523
   #define ULTIPANEL_FEEDMULTIPLY  // Comment to disable setting feedrate multiplier via encoder
526
   #define ULTIPANEL_FEEDMULTIPLY  // Comment to disable setting feedrate multiplier via encoder
524
 #endif
527
 #endif

+ 4
- 1
config/examples/Geeetech/A10M/Configuration_adv.h View File

513
 
513
 
514
 // @section lcd
514
 // @section lcd
515
 
515
 
516
-#if ENABLED(ULTIPANEL)
516
+#if EITHER(ULTIPANEL, EXTENSIBLE_UI)
517
   #define MANUAL_FEEDRATE {50*60, 50*60, 4*60, 60} // Feedrates for manual moves along X, Y, Z, E from panel
517
   #define MANUAL_FEEDRATE {50*60, 50*60, 4*60, 60} // Feedrates for manual moves along X, Y, Z, E from panel
518
+#endif
519
+
520
+#if ENABLED(ULTIPANEL)
518
   #define MANUAL_E_MOVES_RELATIVE // Show LCD extruder moves as relative rather than absolute positions
521
   #define MANUAL_E_MOVES_RELATIVE // Show LCD extruder moves as relative rather than absolute positions
519
   #define ULTIPANEL_FEEDMULTIPLY  // Comment to disable setting feedrate multiplier via encoder
522
   #define ULTIPANEL_FEEDMULTIPLY  // Comment to disable setting feedrate multiplier via encoder
520
 #endif
523
 #endif

+ 4
- 1
config/examples/Geeetech/A20M/Configuration_adv.h View File

513
 
513
 
514
 // @section lcd
514
 // @section lcd
515
 
515
 
516
-#if ENABLED(ULTIPANEL)
516
+#if EITHER(ULTIPANEL, EXTENSIBLE_UI)
517
   #define MANUAL_FEEDRATE {50*60, 50*60, 4*60, 60} // Feedrates for manual moves along X, Y, Z, E from panel
517
   #define MANUAL_FEEDRATE {50*60, 50*60, 4*60, 60} // Feedrates for manual moves along X, Y, Z, E from panel
518
+#endif
519
+
520
+#if ENABLED(ULTIPANEL)
518
   #define MANUAL_E_MOVES_RELATIVE // Show LCD extruder moves as relative rather than absolute positions
521
   #define MANUAL_E_MOVES_RELATIVE // Show LCD extruder moves as relative rather than absolute positions
519
   #define ULTIPANEL_FEEDMULTIPLY  // Comment to disable setting feedrate multiplier via encoder
522
   #define ULTIPANEL_FEEDMULTIPLY  // Comment to disable setting feedrate multiplier via encoder
520
 #endif
523
 #endif

+ 4
- 1
config/examples/Geeetech/MeCreator2/Configuration_adv.h View File

513
 
513
 
514
 // @section lcd
514
 // @section lcd
515
 
515
 
516
-#if ENABLED(ULTIPANEL)
516
+#if EITHER(ULTIPANEL, EXTENSIBLE_UI)
517
   #define MANUAL_FEEDRATE {50*60, 50*60, 4*60, 60} // Feedrates for manual moves along X, Y, Z, E from panel
517
   #define MANUAL_FEEDRATE {50*60, 50*60, 4*60, 60} // Feedrates for manual moves along X, Y, Z, E from panel
518
+#endif
519
+
520
+#if ENABLED(ULTIPANEL)
518
   #define MANUAL_E_MOVES_RELATIVE // Show LCD extruder moves as relative rather than absolute positions
521
   #define MANUAL_E_MOVES_RELATIVE // Show LCD extruder moves as relative rather than absolute positions
519
   #define ULTIPANEL_FEEDMULTIPLY  // Comment to disable setting feedrate multiplier via encoder
522
   #define ULTIPANEL_FEEDMULTIPLY  // Comment to disable setting feedrate multiplier via encoder
520
 #endif
523
 #endif

+ 4
- 1
config/examples/Geeetech/Prusa i3 Pro C/Configuration_adv.h View File

513
 
513
 
514
 // @section lcd
514
 // @section lcd
515
 
515
 
516
-#if ENABLED(ULTIPANEL)
516
+#if EITHER(ULTIPANEL, EXTENSIBLE_UI)
517
   #define MANUAL_FEEDRATE {50*60, 50*60, 4*60, 60} // Feedrates for manual moves along X, Y, Z, E from panel
517
   #define MANUAL_FEEDRATE {50*60, 50*60, 4*60, 60} // Feedrates for manual moves along X, Y, Z, E from panel
518
+#endif
519
+
520
+#if ENABLED(ULTIPANEL)
518
   #define MANUAL_E_MOVES_RELATIVE // Show LCD extruder moves as relative rather than absolute positions
521
   #define MANUAL_E_MOVES_RELATIVE // Show LCD extruder moves as relative rather than absolute positions
519
   #define ULTIPANEL_FEEDMULTIPLY  // Comment to disable setting feedrate multiplier via encoder
522
   #define ULTIPANEL_FEEDMULTIPLY  // Comment to disable setting feedrate multiplier via encoder
520
 #endif
523
 #endif

+ 4
- 1
config/examples/Geeetech/Prusa i3 Pro W/Configuration_adv.h View File

513
 
513
 
514
 // @section lcd
514
 // @section lcd
515
 
515
 
516
-#if ENABLED(ULTIPANEL)
516
+#if EITHER(ULTIPANEL, EXTENSIBLE_UI)
517
   #define MANUAL_FEEDRATE {50*60, 50*60, 4*60, 60} // Feedrates for manual moves along X, Y, Z, E from panel
517
   #define MANUAL_FEEDRATE {50*60, 50*60, 4*60, 60} // Feedrates for manual moves along X, Y, Z, E from panel
518
+#endif
519
+
520
+#if ENABLED(ULTIPANEL)
518
   #define MANUAL_E_MOVES_RELATIVE // Show LCD extruder moves as relative rather than absolute positions
521
   #define MANUAL_E_MOVES_RELATIVE // Show LCD extruder moves as relative rather than absolute positions
519
   #define ULTIPANEL_FEEDMULTIPLY  // Comment to disable setting feedrate multiplier via encoder
522
   #define ULTIPANEL_FEEDMULTIPLY  // Comment to disable setting feedrate multiplier via encoder
520
 #endif
523
 #endif

+ 4
- 1
config/examples/Infitary/i3-M508/Configuration_adv.h View File

513
 
513
 
514
 // @section lcd
514
 // @section lcd
515
 
515
 
516
-#if ENABLED(ULTIPANEL)
516
+#if EITHER(ULTIPANEL, EXTENSIBLE_UI)
517
   #define MANUAL_FEEDRATE {50*60, 50*60, 4*60, 60} // Feedrates for manual moves along X, Y, Z, E from panel
517
   #define MANUAL_FEEDRATE {50*60, 50*60, 4*60, 60} // Feedrates for manual moves along X, Y, Z, E from panel
518
+#endif
519
+
520
+#if ENABLED(ULTIPANEL)
518
   #define MANUAL_E_MOVES_RELATIVE // Show LCD extruder moves as relative rather than absolute positions
521
   #define MANUAL_E_MOVES_RELATIVE // Show LCD extruder moves as relative rather than absolute positions
519
   #define ULTIPANEL_FEEDMULTIPLY  // Comment to disable setting feedrate multiplier via encoder
522
   #define ULTIPANEL_FEEDMULTIPLY  // Comment to disable setting feedrate multiplier via encoder
520
 #endif
523
 #endif

+ 4
- 1
config/examples/MakerParts/Configuration_adv.h View File

513
 
513
 
514
 // @section lcd
514
 // @section lcd
515
 
515
 
516
-#if ENABLED(ULTIPANEL)
516
+#if EITHER(ULTIPANEL, EXTENSIBLE_UI)
517
   #define MANUAL_FEEDRATE {50*60, 50*60, 4*60, 60} // Feedrates for manual moves along X, Y, Z, E from panel
517
   #define MANUAL_FEEDRATE {50*60, 50*60, 4*60, 60} // Feedrates for manual moves along X, Y, Z, E from panel
518
+#endif
519
+
520
+#if ENABLED(ULTIPANEL)
518
   #define MANUAL_E_MOVES_RELATIVE // Show LCD extruder moves as relative rather than absolute positions
521
   #define MANUAL_E_MOVES_RELATIVE // Show LCD extruder moves as relative rather than absolute positions
519
   #define ULTIPANEL_FEEDMULTIPLY  // Comment to disable setting feedrate multiplier via encoder
522
   #define ULTIPANEL_FEEDMULTIPLY  // Comment to disable setting feedrate multiplier via encoder
520
 #endif
523
 #endif

+ 4
- 1
config/examples/Malyan/M150/Configuration_adv.h View File

513
 
513
 
514
 // @section lcd
514
 // @section lcd
515
 
515
 
516
-#if ENABLED(ULTIPANEL)
516
+#if EITHER(ULTIPANEL, EXTENSIBLE_UI)
517
   #define MANUAL_FEEDRATE {50*60, 50*60, 4*60, 60} // Feedrates for manual moves along X, Y, Z, E from panel
517
   #define MANUAL_FEEDRATE {50*60, 50*60, 4*60, 60} // Feedrates for manual moves along X, Y, Z, E from panel
518
+#endif
519
+
520
+#if ENABLED(ULTIPANEL)
518
   #define MANUAL_E_MOVES_RELATIVE // Show LCD extruder moves as relative rather than absolute positions
521
   #define MANUAL_E_MOVES_RELATIVE // Show LCD extruder moves as relative rather than absolute positions
519
   #define ULTIPANEL_FEEDMULTIPLY  // Comment to disable setting feedrate multiplier via encoder
522
   #define ULTIPANEL_FEEDMULTIPLY  // Comment to disable setting feedrate multiplier via encoder
520
 #endif
523
 #endif

+ 4
- 1
config/examples/Malyan/M200/Configuration_adv.h View File

513
 
513
 
514
 // @section lcd
514
 // @section lcd
515
 
515
 
516
-#if ENABLED(ULTIPANEL)
516
+#if EITHER(ULTIPANEL, EXTENSIBLE_UI)
517
   #define MANUAL_FEEDRATE {50*60, 50*60, 4*60, 60} // Feedrates for manual moves along X, Y, Z, E from panel
517
   #define MANUAL_FEEDRATE {50*60, 50*60, 4*60, 60} // Feedrates for manual moves along X, Y, Z, E from panel
518
+#endif
519
+
520
+#if ENABLED(ULTIPANEL)
518
   #define MANUAL_E_MOVES_RELATIVE // Show LCD extruder moves as relative rather than absolute positions
521
   #define MANUAL_E_MOVES_RELATIVE // Show LCD extruder moves as relative rather than absolute positions
519
   #define ULTIPANEL_FEEDMULTIPLY  // Comment to disable setting feedrate multiplier via encoder
522
   #define ULTIPANEL_FEEDMULTIPLY  // Comment to disable setting feedrate multiplier via encoder
520
 #endif
523
 #endif

+ 4
- 1
config/examples/Micromake/C1/enhanced/Configuration_adv.h View File

513
 
513
 
514
 // @section lcd
514
 // @section lcd
515
 
515
 
516
-#if ENABLED(ULTIPANEL)
516
+#if EITHER(ULTIPANEL, EXTENSIBLE_UI)
517
   #define MANUAL_FEEDRATE {50*60, 50*60, 4*60, 60} // Feedrates for manual moves along X, Y, Z, E from panel
517
   #define MANUAL_FEEDRATE {50*60, 50*60, 4*60, 60} // Feedrates for manual moves along X, Y, Z, E from panel
518
+#endif
519
+
520
+#if ENABLED(ULTIPANEL)
518
   #define MANUAL_E_MOVES_RELATIVE // Show LCD extruder moves as relative rather than absolute positions
521
   #define MANUAL_E_MOVES_RELATIVE // Show LCD extruder moves as relative rather than absolute positions
519
   #define ULTIPANEL_FEEDMULTIPLY  // Comment to disable setting feedrate multiplier via encoder
522
   #define ULTIPANEL_FEEDMULTIPLY  // Comment to disable setting feedrate multiplier via encoder
520
 #endif
523
 #endif

+ 4
- 1
config/examples/Mks/Robin/Configuration_adv.h View File

513
 
513
 
514
 // @section lcd
514
 // @section lcd
515
 
515
 
516
-#if ENABLED(ULTIPANEL)
516
+#if EITHER(ULTIPANEL, EXTENSIBLE_UI)
517
   #define MANUAL_FEEDRATE {50*60, 50*60, 4*60, 60} // Feedrates for manual moves along X, Y, Z, E from panel
517
   #define MANUAL_FEEDRATE {50*60, 50*60, 4*60, 60} // Feedrates for manual moves along X, Y, Z, E from panel
518
+#endif
519
+
520
+#if ENABLED(ULTIPANEL)
518
   #define MANUAL_E_MOVES_RELATIVE // Show LCD extruder moves as relative rather than absolute positions
521
   #define MANUAL_E_MOVES_RELATIVE // Show LCD extruder moves as relative rather than absolute positions
519
   #define ULTIPANEL_FEEDMULTIPLY  // Comment to disable setting feedrate multiplier via encoder
522
   #define ULTIPANEL_FEEDMULTIPLY  // Comment to disable setting feedrate multiplier via encoder
520
 #endif
523
 #endif

+ 4
- 1
config/examples/Mks/Sbase/Configuration_adv.h View File

513
 
513
 
514
 // @section lcd
514
 // @section lcd
515
 
515
 
516
-#if ENABLED(ULTIPANEL)
516
+#if EITHER(ULTIPANEL, EXTENSIBLE_UI)
517
   #define MANUAL_FEEDRATE {50*60, 50*60, 4*60, 60} // Feedrates for manual moves along X, Y, Z, E from panel
517
   #define MANUAL_FEEDRATE {50*60, 50*60, 4*60, 60} // Feedrates for manual moves along X, Y, Z, E from panel
518
+#endif
519
+
520
+#if ENABLED(ULTIPANEL)
518
   #define MANUAL_E_MOVES_RELATIVE // Show LCD extruder moves as relative rather than absolute positions
521
   #define MANUAL_E_MOVES_RELATIVE // Show LCD extruder moves as relative rather than absolute positions
519
   #define ULTIPANEL_FEEDMULTIPLY  // Comment to disable setting feedrate multiplier via encoder
522
   #define ULTIPANEL_FEEDMULTIPLY  // Comment to disable setting feedrate multiplier via encoder
520
 #endif
523
 #endif

+ 4
- 1
config/examples/RapideLite/RL200/Configuration_adv.h View File

513
 
513
 
514
 // @section lcd
514
 // @section lcd
515
 
515
 
516
-#if ENABLED(ULTIPANEL)
516
+#if EITHER(ULTIPANEL, EXTENSIBLE_UI)
517
   #define MANUAL_FEEDRATE {50*60, 50*60, 4*60, 60} // Feedrates for manual moves along X, Y, Z, E from panel
517
   #define MANUAL_FEEDRATE {50*60, 50*60, 4*60, 60} // Feedrates for manual moves along X, Y, Z, E from panel
518
+#endif
519
+
520
+#if ENABLED(ULTIPANEL)
518
   #define MANUAL_E_MOVES_RELATIVE // Show LCD extruder moves as relative rather than absolute positions
521
   #define MANUAL_E_MOVES_RELATIVE // Show LCD extruder moves as relative rather than absolute positions
519
   #define ULTIPANEL_FEEDMULTIPLY  // Comment to disable setting feedrate multiplier via encoder
522
   #define ULTIPANEL_FEEDMULTIPLY  // Comment to disable setting feedrate multiplier via encoder
520
 #endif
523
 #endif

+ 4
- 1
config/examples/RigidBot/Configuration_adv.h View File

513
 
513
 
514
 // @section lcd
514
 // @section lcd
515
 
515
 
516
-#if ENABLED(ULTIPANEL)
516
+#if EITHER(ULTIPANEL, EXTENSIBLE_UI)
517
   #define MANUAL_FEEDRATE {50*60, 50*60, 4*60, 60} // Feedrates for manual moves along X, Y, Z, E from panel
517
   #define MANUAL_FEEDRATE {50*60, 50*60, 4*60, 60} // Feedrates for manual moves along X, Y, Z, E from panel
518
+#endif
519
+
520
+#if ENABLED(ULTIPANEL)
518
   #define MANUAL_E_MOVES_RELATIVE // Show LCD extruder moves as relative rather than absolute positions
521
   #define MANUAL_E_MOVES_RELATIVE // Show LCD extruder moves as relative rather than absolute positions
519
   #define ULTIPANEL_FEEDMULTIPLY  // Comment to disable setting feedrate multiplier via encoder
522
   #define ULTIPANEL_FEEDMULTIPLY  // Comment to disable setting feedrate multiplier via encoder
520
 #endif
523
 #endif

+ 4
- 1
config/examples/Sanguinololu/Configuration_adv.h View File

513
 
513
 
514
 // @section lcd
514
 // @section lcd
515
 
515
 
516
-#if ENABLED(ULTIPANEL)
516
+#if EITHER(ULTIPANEL, EXTENSIBLE_UI)
517
   #define MANUAL_FEEDRATE {50*60, 50*60, 4*60, 60} // Feedrates for manual moves along X, Y, Z, E from panel
517
   #define MANUAL_FEEDRATE {50*60, 50*60, 4*60, 60} // Feedrates for manual moves along X, Y, Z, E from panel
518
+#endif
519
+
520
+#if ENABLED(ULTIPANEL)
518
   #define MANUAL_E_MOVES_RELATIVE // Show LCD extruder moves as relative rather than absolute positions
521
   #define MANUAL_E_MOVES_RELATIVE // Show LCD extruder moves as relative rather than absolute positions
519
   #define ULTIPANEL_FEEDMULTIPLY  // Comment to disable setting feedrate multiplier via encoder
522
   #define ULTIPANEL_FEEDMULTIPLY  // Comment to disable setting feedrate multiplier via encoder
520
 #endif
523
 #endif

+ 4
- 1
config/examples/TheBorg/Configuration_adv.h View File

513
 
513
 
514
 // @section lcd
514
 // @section lcd
515
 
515
 
516
-#if ENABLED(ULTIPANEL)
516
+#if EITHER(ULTIPANEL, EXTENSIBLE_UI)
517
   #define MANUAL_FEEDRATE {50*60, 50*60, 4*60, 60} // Feedrates for manual moves along X, Y, Z, E from panel
517
   #define MANUAL_FEEDRATE {50*60, 50*60, 4*60, 60} // Feedrates for manual moves along X, Y, Z, E from panel
518
+#endif
519
+
520
+#if ENABLED(ULTIPANEL)
518
   #define MANUAL_E_MOVES_RELATIVE // Show LCD extruder moves as relative rather than absolute positions
521
   #define MANUAL_E_MOVES_RELATIVE // Show LCD extruder moves as relative rather than absolute positions
519
   #define ULTIPANEL_FEEDMULTIPLY  // Comment to disable setting feedrate multiplier via encoder
522
   #define ULTIPANEL_FEEDMULTIPLY  // Comment to disable setting feedrate multiplier via encoder
520
 #endif
523
 #endif

+ 4
- 1
config/examples/TinyBoy2/Configuration_adv.h View File

513
 
513
 
514
 // @section lcd
514
 // @section lcd
515
 
515
 
516
-#if ENABLED(ULTIPANEL)
516
+#if EITHER(ULTIPANEL, EXTENSIBLE_UI)
517
   #define MANUAL_FEEDRATE {50*60, 50*60, 4*60, 60} // Feedrates for manual moves along X, Y, Z, E from panel
517
   #define MANUAL_FEEDRATE {50*60, 50*60, 4*60, 60} // Feedrates for manual moves along X, Y, Z, E from panel
518
+#endif
519
+
520
+#if ENABLED(ULTIPANEL)
518
   #define MANUAL_E_MOVES_RELATIVE // Show LCD extruder moves as relative rather than absolute positions
521
   #define MANUAL_E_MOVES_RELATIVE // Show LCD extruder moves as relative rather than absolute positions
519
   #define ULTIPANEL_FEEDMULTIPLY  // Comment to disable setting feedrate multiplier via encoder
522
   #define ULTIPANEL_FEEDMULTIPLY  // Comment to disable setting feedrate multiplier via encoder
520
 #endif
523
 #endif

+ 4
- 1
config/examples/Tronxy/X3A/Configuration_adv.h View File

513
 
513
 
514
 // @section lcd
514
 // @section lcd
515
 
515
 
516
-#if ENABLED(ULTIPANEL)
516
+#if EITHER(ULTIPANEL, EXTENSIBLE_UI)
517
   #define MANUAL_FEEDRATE {50*60, 50*60, 4*60, 60} // Feedrates for manual moves along X, Y, Z, E from panel
517
   #define MANUAL_FEEDRATE {50*60, 50*60, 4*60, 60} // Feedrates for manual moves along X, Y, Z, E from panel
518
+#endif
519
+
520
+#if ENABLED(ULTIPANEL)
518
   #define MANUAL_E_MOVES_RELATIVE // Show LCD extruder moves as relative rather than absolute positions
521
   #define MANUAL_E_MOVES_RELATIVE // Show LCD extruder moves as relative rather than absolute positions
519
   #define ULTIPANEL_FEEDMULTIPLY  // Comment to disable setting feedrate multiplier via encoder
522
   #define ULTIPANEL_FEEDMULTIPLY  // Comment to disable setting feedrate multiplier via encoder
520
 #endif
523
 #endif

+ 4
- 1
config/examples/Tronxy/X5S-2E/Configuration_adv.h View File

513
 
513
 
514
 // @section lcd
514
 // @section lcd
515
 
515
 
516
-#if ENABLED(ULTIPANEL)
516
+#if EITHER(ULTIPANEL, EXTENSIBLE_UI)
517
   #define MANUAL_FEEDRATE {50*60, 50*60, 4*60, 60} // Feedrates for manual moves along X, Y, Z, E from panel
517
   #define MANUAL_FEEDRATE {50*60, 50*60, 4*60, 60} // Feedrates for manual moves along X, Y, Z, E from panel
518
+#endif
519
+
520
+#if ENABLED(ULTIPANEL)
518
   #define MANUAL_E_MOVES_RELATIVE // Show LCD extruder moves as relative rather than absolute positions
521
   #define MANUAL_E_MOVES_RELATIVE // Show LCD extruder moves as relative rather than absolute positions
519
   #define ULTIPANEL_FEEDMULTIPLY  // Comment to disable setting feedrate multiplier via encoder
522
   #define ULTIPANEL_FEEDMULTIPLY  // Comment to disable setting feedrate multiplier via encoder
520
 #endif
523
 #endif

+ 4
- 1
config/examples/UltiMachine/Archim1/Configuration_adv.h View File

513
 
513
 
514
 // @section lcd
514
 // @section lcd
515
 
515
 
516
-#if ENABLED(ULTIPANEL)
516
+#if EITHER(ULTIPANEL, EXTENSIBLE_UI)
517
   #define MANUAL_FEEDRATE {50*60, 50*60, 4*60, 60} // Feedrates for manual moves along X, Y, Z, E from panel
517
   #define MANUAL_FEEDRATE {50*60, 50*60, 4*60, 60} // Feedrates for manual moves along X, Y, Z, E from panel
518
+#endif
519
+
520
+#if ENABLED(ULTIPANEL)
518
   #define MANUAL_E_MOVES_RELATIVE // Show LCD extruder moves as relative rather than absolute positions
521
   #define MANUAL_E_MOVES_RELATIVE // Show LCD extruder moves as relative rather than absolute positions
519
   #define ULTIPANEL_FEEDMULTIPLY  // Comment to disable setting feedrate multiplier via encoder
522
   #define ULTIPANEL_FEEDMULTIPLY  // Comment to disable setting feedrate multiplier via encoder
520
 #endif
523
 #endif

+ 4
- 1
config/examples/UltiMachine/Archim2/Configuration_adv.h View File

513
 
513
 
514
 // @section lcd
514
 // @section lcd
515
 
515
 
516
-#if ENABLED(ULTIPANEL)
516
+#if EITHER(ULTIPANEL, EXTENSIBLE_UI)
517
   #define MANUAL_FEEDRATE {50*60, 50*60, 4*60, 60} // Feedrates for manual moves along X, Y, Z, E from panel
517
   #define MANUAL_FEEDRATE {50*60, 50*60, 4*60, 60} // Feedrates for manual moves along X, Y, Z, E from panel
518
+#endif
519
+
520
+#if ENABLED(ULTIPANEL)
518
   #define MANUAL_E_MOVES_RELATIVE // Show LCD extruder moves as relative rather than absolute positions
521
   #define MANUAL_E_MOVES_RELATIVE // Show LCD extruder moves as relative rather than absolute positions
519
   #define ULTIPANEL_FEEDMULTIPLY  // Comment to disable setting feedrate multiplier via encoder
522
   #define ULTIPANEL_FEEDMULTIPLY  // Comment to disable setting feedrate multiplier via encoder
520
 #endif
523
 #endif

+ 4
- 1
config/examples/VORONDesign/Configuration_adv.h View File

513
 
513
 
514
 // @section lcd
514
 // @section lcd
515
 
515
 
516
-#if ENABLED(ULTIPANEL)
516
+#if EITHER(ULTIPANEL, EXTENSIBLE_UI)
517
   #define MANUAL_FEEDRATE {50*60, 50*60, 4*60, 60} // Feedrates for manual moves along X, Y, Z, E from panel
517
   #define MANUAL_FEEDRATE {50*60, 50*60, 4*60, 60} // Feedrates for manual moves along X, Y, Z, E from panel
518
+#endif
519
+
520
+#if ENABLED(ULTIPANEL)
518
   #define MANUAL_E_MOVES_RELATIVE // Show LCD extruder moves as relative rather than absolute positions
521
   #define MANUAL_E_MOVES_RELATIVE // Show LCD extruder moves as relative rather than absolute positions
519
   #define ULTIPANEL_FEEDMULTIPLY  // Comment to disable setting feedrate multiplier via encoder
522
   #define ULTIPANEL_FEEDMULTIPLY  // Comment to disable setting feedrate multiplier via encoder
520
 #endif
523
 #endif

+ 4
- 1
config/examples/Velleman/K8200/Configuration_adv.h View File

526
 
526
 
527
 // @section lcd
527
 // @section lcd
528
 
528
 
529
-#if ENABLED(ULTIPANEL)
529
+#if EITHER(ULTIPANEL, EXTENSIBLE_UI)
530
   #define MANUAL_FEEDRATE {50*60, 50*60, 4*60, 60} // Feedrates for manual moves along X, Y, Z, E from panel
530
   #define MANUAL_FEEDRATE {50*60, 50*60, 4*60, 60} // Feedrates for manual moves along X, Y, Z, E from panel
531
+#endif
532
+
533
+#if ENABLED(ULTIPANEL)
531
   #define MANUAL_E_MOVES_RELATIVE // Show LCD extruder moves as relative rather than absolute positions
534
   #define MANUAL_E_MOVES_RELATIVE // Show LCD extruder moves as relative rather than absolute positions
532
   #define ULTIPANEL_FEEDMULTIPLY  // Comment to disable setting feedrate multiplier via encoder
535
   #define ULTIPANEL_FEEDMULTIPLY  // Comment to disable setting feedrate multiplier via encoder
533
 #endif
536
 #endif

+ 4
- 1
config/examples/Velleman/K8400/Configuration_adv.h View File

513
 
513
 
514
 // @section lcd
514
 // @section lcd
515
 
515
 
516
-#if ENABLED(ULTIPANEL)
516
+#if EITHER(ULTIPANEL, EXTENSIBLE_UI)
517
   #define MANUAL_FEEDRATE {50*60, 50*60, 4*60, 60} // Feedrates for manual moves along X, Y, Z, E from panel
517
   #define MANUAL_FEEDRATE {50*60, 50*60, 4*60, 60} // Feedrates for manual moves along X, Y, Z, E from panel
518
+#endif
519
+
520
+#if ENABLED(ULTIPANEL)
518
   #define MANUAL_E_MOVES_RELATIVE // Show LCD extruder moves as relative rather than absolute positions
521
   #define MANUAL_E_MOVES_RELATIVE // Show LCD extruder moves as relative rather than absolute positions
519
   #define ULTIPANEL_FEEDMULTIPLY  // Comment to disable setting feedrate multiplier via encoder
522
   #define ULTIPANEL_FEEDMULTIPLY  // Comment to disable setting feedrate multiplier via encoder
520
 #endif
523
 #endif

+ 4
- 1
config/examples/WASP/PowerWASP/Configuration_adv.h View File

513
 
513
 
514
 // @section lcd
514
 // @section lcd
515
 
515
 
516
-#if ENABLED(ULTIPANEL)
516
+#if EITHER(ULTIPANEL, EXTENSIBLE_UI)
517
   #define MANUAL_FEEDRATE {50*60, 50*60, 4*60, 60} // Feedrates for manual moves along X, Y, Z, E from panel
517
   #define MANUAL_FEEDRATE {50*60, 50*60, 4*60, 60} // Feedrates for manual moves along X, Y, Z, E from panel
518
+#endif
519
+
520
+#if ENABLED(ULTIPANEL)
518
   #define MANUAL_E_MOVES_RELATIVE // Show LCD extruder moves as relative rather than absolute positions
521
   #define MANUAL_E_MOVES_RELATIVE // Show LCD extruder moves as relative rather than absolute positions
519
   #define ULTIPANEL_FEEDMULTIPLY  // Comment to disable setting feedrate multiplier via encoder
522
   #define ULTIPANEL_FEEDMULTIPLY  // Comment to disable setting feedrate multiplier via encoder
520
 #endif
523
 #endif

+ 4
- 1
config/examples/gCreate/gMax1.5+/Configuration_adv.h View File

513
 
513
 
514
 // @section lcd
514
 // @section lcd
515
 
515
 
516
-#if ENABLED(ULTIPANEL)
516
+#if EITHER(ULTIPANEL, EXTENSIBLE_UI)
517
   #define MANUAL_FEEDRATE {50*60, 50*60, 4*60, 60} // Feedrates for manual moves along X, Y, Z, E from panel
517
   #define MANUAL_FEEDRATE {50*60, 50*60, 4*60, 60} // Feedrates for manual moves along X, Y, Z, E from panel
518
+#endif
519
+
520
+#if ENABLED(ULTIPANEL)
518
   #define MANUAL_E_MOVES_RELATIVE // Show LCD extruder moves as relative rather than absolute positions
521
   #define MANUAL_E_MOVES_RELATIVE // Show LCD extruder moves as relative rather than absolute positions
519
   #define ULTIPANEL_FEEDMULTIPLY  // Comment to disable setting feedrate multiplier via encoder
522
   #define ULTIPANEL_FEEDMULTIPLY  // Comment to disable setting feedrate multiplier via encoder
520
 #endif
523
 #endif

+ 4
- 1
config/examples/makibox/Configuration_adv.h View File

513
 
513
 
514
 // @section lcd
514
 // @section lcd
515
 
515
 
516
-#if ENABLED(ULTIPANEL)
516
+#if EITHER(ULTIPANEL, EXTENSIBLE_UI)
517
   #define MANUAL_FEEDRATE {50*60, 50*60, 4*60, 60} // Feedrates for manual moves along X, Y, Z, E from panel
517
   #define MANUAL_FEEDRATE {50*60, 50*60, 4*60, 60} // Feedrates for manual moves along X, Y, Z, E from panel
518
+#endif
519
+
520
+#if ENABLED(ULTIPANEL)
518
   #define MANUAL_E_MOVES_RELATIVE // Show LCD extruder moves as relative rather than absolute positions
521
   #define MANUAL_E_MOVES_RELATIVE // Show LCD extruder moves as relative rather than absolute positions
519
   #define ULTIPANEL_FEEDMULTIPLY  // Comment to disable setting feedrate multiplier via encoder
522
   #define ULTIPANEL_FEEDMULTIPLY  // Comment to disable setting feedrate multiplier via encoder
520
 #endif
523
 #endif

+ 4
- 1
config/examples/tvrrug/Round2/Configuration_adv.h View File

513
 
513
 
514
 // @section lcd
514
 // @section lcd
515
 
515
 
516
-#if ENABLED(ULTIPANEL)
516
+#if EITHER(ULTIPANEL, EXTENSIBLE_UI)
517
   #define MANUAL_FEEDRATE {50*60, 50*60, 4*60, 60} // Feedrates for manual moves along X, Y, Z, E from panel
517
   #define MANUAL_FEEDRATE {50*60, 50*60, 4*60, 60} // Feedrates for manual moves along X, Y, Z, E from panel
518
+#endif
519
+
520
+#if ENABLED(ULTIPANEL)
518
   #define MANUAL_E_MOVES_RELATIVE // Show LCD extruder moves as relative rather than absolute positions
521
   #define MANUAL_E_MOVES_RELATIVE // Show LCD extruder moves as relative rather than absolute positions
519
   #define ULTIPANEL_FEEDMULTIPLY  // Comment to disable setting feedrate multiplier via encoder
522
   #define ULTIPANEL_FEEDMULTIPLY  // Comment to disable setting feedrate multiplier via encoder
520
 #endif
523
 #endif

+ 4
- 1
config/examples/wt150/Configuration_adv.h View File

513
 
513
 
514
 // @section lcd
514
 // @section lcd
515
 
515
 
516
-#if ENABLED(ULTIPANEL)
516
+#if EITHER(ULTIPANEL, EXTENSIBLE_UI)
517
   #define MANUAL_FEEDRATE {50*60, 50*60, 4*60, 60} // Feedrates for manual moves along X, Y, Z, E from panel
517
   #define MANUAL_FEEDRATE {50*60, 50*60, 4*60, 60} // Feedrates for manual moves along X, Y, Z, E from panel
518
+#endif
519
+
520
+#if ENABLED(ULTIPANEL)
518
   #define MANUAL_E_MOVES_RELATIVE // Show LCD extruder moves as relative rather than absolute positions
521
   #define MANUAL_E_MOVES_RELATIVE // Show LCD extruder moves as relative rather than absolute positions
519
   #define ULTIPANEL_FEEDMULTIPLY  // Comment to disable setting feedrate multiplier via encoder
522
   #define ULTIPANEL_FEEDMULTIPLY  // Comment to disable setting feedrate multiplier via encoder
520
 #endif
523
 #endif

Loading…
Cancel
Save