Browse Source

Add comments to lcd_control_temperature_menu

Scott Lahteine 9 years ago
parent
commit
fcfd99c1ae
1 changed files with 34 additions and 13 deletions
  1. 34
    13
      Marlin/ultralcd.cpp

+ 34
- 13
Marlin/ultralcd.cpp View File

@@ -7,12 +7,11 @@
7 7
 #include "stepper.h"
8 8
 #include "configuration_store.h"
9 9
 
10
-int8_t encoderDiff; /* encoderDiff is updated from interrupt context and added to encoderPosition every LCD update */
10
+int8_t encoderDiff; // updated from interrupt context and added to encoderPosition every LCD update
11 11
 
12 12
 bool encoderRateMultiplierEnabled;
13 13
 int32_t lastEncoderMovementMillis;
14 14
 
15
-/* Configuration settings */
16 15
 int plaPreheatHotendTemp;
17 16
 int plaPreheatHPBTemp;
18 17
 int plaPreheatFanSpeed;
@@ -25,9 +24,7 @@ int absPreheatFanSpeed;
25 24
   millis_t previous_lcd_status_ms = 0;
26 25
 #endif
27 26
 
28
-/* !Configuration settings */
29
-
30
-//Function pointer to menu functions.
27
+// Function pointer to menu functions.
31 28
 typedef void (*menuFunc_t)();
32 29
 
33 30
 uint8_t lcd_status_message_level;
@@ -875,10 +872,17 @@ static void lcd_control_menu() {
875 872
  * "Control" > "Temperature" submenu
876 873
  *
877 874
  */
878
-
879 875
 static void lcd_control_temperature_menu() {
880 876
   START_MENU();
877
+
878
+  //
879
+  // ^ Control
880
+  //
881 881
   MENU_ITEM(back, MSG_CONTROL, lcd_control_menu);
882
+
883
+  //
884
+  // Nozzle, Nozzle 2, Nozzle 3, Nozzle 4
885
+  //
882 886
   #if TEMP_SENSOR_0 != 0
883 887
     MENU_MULTIPLIER_ITEM_EDIT(int3, MSG_NOZZLE, &target_temperature[0], 0, HEATER_0_MAXTEMP - 15);
884 888
   #endif
@@ -897,16 +901,32 @@ static void lcd_control_temperature_menu() {
897 901
       #endif // EXTRUDERS > 3
898 902
     #endif // EXTRUDERS > 2
899 903
   #endif // EXTRUDERS > 1
904
+
905
+  //
906
+  // Bed
907
+  //
900 908
   #if TEMP_SENSOR_BED != 0
901 909
     MENU_MULTIPLIER_ITEM_EDIT(int3, MSG_BED, &target_temperature_bed, 0, BED_MAXTEMP - 15);
902 910
   #endif
911
+
912
+  //
913
+  // Fan Speed
914
+  //
903 915
   MENU_MULTIPLIER_ITEM_EDIT(int3, MSG_FAN_SPEED, &fanSpeed, 0, 255);
916
+
917
+  //
918
+  // Autotemp, Min, Max, Fact
919
+  //
904 920
   #if defined(AUTOTEMP) && (TEMP_SENSOR_0 != 0)
905 921
     MENU_ITEM_EDIT(bool, MSG_AUTOTEMP, &autotemp_enabled);
906 922
     MENU_ITEM_EDIT(float3, MSG_MIN, &autotemp_min, 0, HEATER_0_MAXTEMP - 15);
907 923
     MENU_ITEM_EDIT(float3, MSG_MAX, &autotemp_max, 0, HEATER_0_MAXTEMP - 15);
908 924
     MENU_ITEM_EDIT(float32, MSG_FACTOR, &autotemp_factor, 0.0, 1.0);
909 925
   #endif
926
+
927
+  //
928
+  // PID-P, PID-I, PID-D, PID-C
929
+  //
910 930
   #ifdef PIDTEMP
911 931
     // set up temp variables - undo the default scaling
912 932
     raw_Ki = unscalePID_i(PID_PARAM(Ki,0));
@@ -959,7 +979,15 @@ static void lcd_control_temperature_menu() {
959 979
       #endif//EXTRUDERS > 1
960 980
     #endif //PID_PARAMS_PER_EXTRUDER
961 981
   #endif//PIDTEMP
982
+
983
+  //
984
+  // Preheat PLA conf
985
+  //
962 986
   MENU_ITEM(submenu, MSG_PREHEAT_PLA_SETTINGS, lcd_control_temperature_preheat_pla_settings_menu);
987
+
988
+  //
989
+  // Preheat ABS conf
990
+  //
963 991
   MENU_ITEM(submenu, MSG_PREHEAT_ABS_SETTINGS, lcd_control_temperature_preheat_abs_settings_menu);
964 992
   END_MENU();
965 993
 }
@@ -969,7 +997,6 @@ static void lcd_control_temperature_menu() {
969 997
  * "Temperature" > "Preheat PLA conf" submenu
970 998
  *
971 999
  */
972
-
973 1000
 static void lcd_control_temperature_preheat_pla_settings_menu() {
974 1001
   START_MENU();
975 1002
   MENU_ITEM(back, MSG_TEMPERATURE, lcd_control_temperature_menu);
@@ -991,7 +1018,6 @@ static void lcd_control_temperature_preheat_pla_settings_menu() {
991 1018
  * "Temperature" > "Preheat ABS conf" submenu
992 1019
  *
993 1020
  */
994
-
995 1021
 static void lcd_control_temperature_preheat_abs_settings_menu() {
996 1022
   START_MENU();
997 1023
   MENU_ITEM(back, MSG_TEMPERATURE, lcd_control_temperature_menu);
@@ -1013,7 +1039,6 @@ static void lcd_control_temperature_preheat_abs_settings_menu() {
1013 1039
  * "Control" > "Motion" submenu
1014 1040
  *
1015 1041
  */
1016
-
1017 1042
 static void lcd_control_motion_menu() {
1018 1043
   START_MENU();
1019 1044
   MENU_ITEM(back, MSG_CONTROL, lcd_control_menu);
@@ -1055,7 +1080,6 @@ static void lcd_control_motion_menu() {
1055 1080
  * "Control" > "Filament" submenu
1056 1081
  *
1057 1082
  */
1058
-
1059 1083
 static void lcd_control_volumetric_menu() {
1060 1084
   START_MENU();
1061 1085
   MENU_ITEM(back, MSG_CONTROL, lcd_control_menu);
@@ -1083,7 +1107,6 @@ static void lcd_control_volumetric_menu() {
1083 1107
  * "Control" > "Contrast" submenu
1084 1108
  *
1085 1109
  */
1086
-
1087 1110
 #ifdef HAS_LCD_CONTRAST
1088 1111
   static void lcd_set_contrast() {
1089 1112
     if (encoderPosition != 0) {
@@ -1103,7 +1126,6 @@ static void lcd_control_volumetric_menu() {
1103 1126
  * "Control" > "Retract" submenu
1104 1127
  *
1105 1128
  */
1106
-
1107 1129
 #ifdef FWRETRACT
1108 1130
   static void lcd_control_retract_menu() {
1109 1131
     START_MENU();
@@ -1141,7 +1163,6 @@ static void lcd_sd_updir() {
1141 1163
  * "Print from SD" submenu
1142 1164
  *
1143 1165
  */
1144
-
1145 1166
 void lcd_sdcard_menu() {
1146 1167
   if (lcdDrawUpdate == 0 && LCD_CLICKED == 0) return;	// nothing to do (so don't thrash the SD card)
1147 1168
   uint16_t fileCnt = card.getnrfilenames();

Loading…
Cancel
Save