Parcourir la source

Constrain Tune > Nozzle/Flow menu items

Scott Lahteine il y a 9 ans
Parent
révision
558665cd90
1 fichiers modifiés avec 67 ajouts et 17 suppressions
  1. 67
    17
      Marlin/ultralcd.cpp

+ 67
- 17
Marlin/ultralcd.cpp Voir le fichier

477
 
477
 
478
 static void lcd_tune_menu() {
478
 static void lcd_tune_menu() {
479
   START_MENU();
479
   START_MENU();
480
+
481
+  //
482
+  // ^ Main
483
+  //
480
   MENU_ITEM(back, MSG_MAIN, lcd_main_menu);
484
   MENU_ITEM(back, MSG_MAIN, lcd_main_menu);
485
+
486
+  //
487
+  // Speed:
488
+  //
481
   MENU_ITEM_EDIT(int3, MSG_SPEED, &feedrate_multiplier, 10, 999);
489
   MENU_ITEM_EDIT(int3, MSG_SPEED, &feedrate_multiplier, 10, 999);
490
+
491
+  //
492
+  // Nozzle:
493
+  // Nozzle 2:
494
+  // Nozzle 3:
495
+  // Nozzle 4:
496
+  //
482
   #if TEMP_SENSOR_0 != 0
497
   #if TEMP_SENSOR_0 != 0
483
     MENU_MULTIPLIER_ITEM_EDIT(int3, MSG_NOZZLE, &target_temperature[0], 0, HEATER_0_MAXTEMP - 15);
498
     MENU_MULTIPLIER_ITEM_EDIT(int3, MSG_NOZZLE, &target_temperature[0], 0, HEATER_0_MAXTEMP - 15);
484
   #endif
499
   #endif
485
-  #if TEMP_SENSOR_1 != 0
486
-    MENU_MULTIPLIER_ITEM_EDIT(int3, MSG_NOZZLE MSG_N2, &target_temperature[1], 0, HEATER_1_MAXTEMP - 15);
487
-  #endif
488
-  #if TEMP_SENSOR_2 != 0
489
-    MENU_MULTIPLIER_ITEM_EDIT(int3, MSG_NOZZLE MSG_N3, &target_temperature[2], 0, HEATER_2_MAXTEMP - 15);
490
-  #endif
491
-  #if TEMP_SENSOR_3 != 0
492
-    MENU_MULTIPLIER_ITEM_EDIT(int3, MSG_NOZZLE MSG_N4, &target_temperature[3], 0, HEATER_3_MAXTEMP - 15);
493
-  #endif
500
+  #if EXTRUDERS > 1
501
+    #if TEMP_SENSOR_1 != 0
502
+      MENU_MULTIPLIER_ITEM_EDIT(int3, MSG_NOZZLE MSG_N2, &target_temperature[1], 0, HEATER_1_MAXTEMP - 15);
503
+    #endif
504
+    #if EXTRUDERS > 2
505
+      #if TEMP_SENSOR_2 != 0
506
+        MENU_MULTIPLIER_ITEM_EDIT(int3, MSG_NOZZLE MSG_N3, &target_temperature[2], 0, HEATER_2_MAXTEMP - 15);
507
+      #endif
508
+      #if EXTRUDERS > 3
509
+        #if TEMP_SENSOR_3 != 0
510
+          MENU_MULTIPLIER_ITEM_EDIT(int3, MSG_NOZZLE MSG_N4, &target_temperature[3], 0, HEATER_3_MAXTEMP - 15);
511
+        #endif
512
+      #endif //EXTRUDERS > 3
513
+    #endif //EXTRUDERS > 2
514
+  #endif //EXTRUDERS > 1
515
+
516
+  //
517
+  // Bed:
518
+  //
494
   #if TEMP_SENSOR_BED != 0
519
   #if TEMP_SENSOR_BED != 0
495
     MENU_MULTIPLIER_ITEM_EDIT(int3, MSG_BED, &target_temperature_bed, 0, BED_MAXTEMP - 15);
520
     MENU_MULTIPLIER_ITEM_EDIT(int3, MSG_BED, &target_temperature_bed, 0, BED_MAXTEMP - 15);
496
   #endif
521
   #endif
522
+
523
+  //
524
+  // Fan Speed:
525
+  //
497
   MENU_MULTIPLIER_ITEM_EDIT(int3, MSG_FAN_SPEED, &fanSpeed, 0, 255);
526
   MENU_MULTIPLIER_ITEM_EDIT(int3, MSG_FAN_SPEED, &fanSpeed, 0, 255);
527
+
528
+  //
529
+  // Flow:
530
+  //
498
   MENU_ITEM_EDIT(int3, MSG_FLOW, &extruder_multiplier[active_extruder], 10, 999);
531
   MENU_ITEM_EDIT(int3, MSG_FLOW, &extruder_multiplier[active_extruder], 10, 999);
532
+
533
+  //
534
+  // Flow 0:
535
+  // Flow 1:
536
+  // Flow 2:
537
+  // Flow 3:
538
+  //
499
   MENU_ITEM_EDIT(int3, MSG_FLOW MSG_N0, &extruder_multiplier[0], 10, 999);
539
   MENU_ITEM_EDIT(int3, MSG_FLOW MSG_N0, &extruder_multiplier[0], 10, 999);
500
-  #if TEMP_SENSOR_1 != 0
540
+  #if EXTRUDERS > 1
501
     MENU_ITEM_EDIT(int3, MSG_FLOW MSG_N1, &extruder_multiplier[1], 10, 999);
541
     MENU_ITEM_EDIT(int3, MSG_FLOW MSG_N1, &extruder_multiplier[1], 10, 999);
502
-  #endif
503
-  #if TEMP_SENSOR_2 != 0
504
-    MENU_ITEM_EDIT(int3, MSG_FLOW MSG_N2, &extruder_multiplier[2], 10, 999);
505
-  #endif
506
-  #if TEMP_SENSOR_3 != 0
507
-    MENU_ITEM_EDIT(int3, MSG_FLOW MSG_N3, &extruder_multiplier[3], 10, 999);
508
-  #endif
542
+    #if EXTRUDERS > 2
543
+      MENU_ITEM_EDIT(int3, MSG_FLOW MSG_N2, &extruder_multiplier[2], 10, 999);
544
+      #if EXTRUDERS > 3
545
+        MENU_ITEM_EDIT(int3, MSG_FLOW MSG_N3, &extruder_multiplier[3], 10, 999);
546
+      #endif //EXTRUDERS > 3
547
+    #endif //EXTRUDERS > 2
548
+  #endif //EXTRUDERS > 1
509
 
549
 
550
+  //
551
+  // Babystep X:
552
+  // Babystep Y:
553
+  // Babystep Z:
554
+  //
510
   #if ENABLED(BABYSTEPPING)
555
   #if ENABLED(BABYSTEPPING)
511
     #if ENABLED(BABYSTEP_XY)
556
     #if ENABLED(BABYSTEP_XY)
512
       MENU_ITEM(submenu, MSG_BABYSTEP_X, lcd_babystep_x);
557
       MENU_ITEM(submenu, MSG_BABYSTEP_X, lcd_babystep_x);
514
     #endif //BABYSTEP_XY
559
     #endif //BABYSTEP_XY
515
     MENU_ITEM(submenu, MSG_BABYSTEP_Z, lcd_babystep_z);
560
     MENU_ITEM(submenu, MSG_BABYSTEP_Z, lcd_babystep_z);
516
   #endif
561
   #endif
562
+
563
+  //
564
+  // Change filament
565
+  //
517
   #if ENABLED(FILAMENTCHANGEENABLE)
566
   #if ENABLED(FILAMENTCHANGEENABLE)
518
      MENU_ITEM(gcode, MSG_FILAMENTCHANGE, PSTR("M600"));
567
      MENU_ITEM(gcode, MSG_FILAMENTCHANGE, PSTR("M600"));
519
   #endif
568
   #endif
569
+
520
   END_MENU();
570
   END_MENU();
521
 }
571
 }
522
 
572
 

Chargement…
Annuler
Enregistrer