Browse Source

Fix "back" items in some sub-menus

Scott Lahteine 6 years ago
parent
commit
612eaa87bd

+ 2
- 2
Marlin/src/lcd/menu/menu_advanced.cpp View File

@@ -62,7 +62,7 @@ void menu_backlash();
62 62
   void menu_dac() {
63 63
     dac_driver_getValues();
64 64
     START_MENU();
65
-    MENU_BACK(MSG_CONTROL);
65
+    MENU_BACK(MSG_ADVANCED_SETTINGS);
66 66
     #define EDIT_DAC_PERCENT(N) MENU_ITEM_EDIT_CALLBACK(uint8, MSG_##N " " MSG_DAC_PERCENT, &driverPercent[_AXIS(N)], 0, 100, dac_driver_commit)
67 67
     EDIT_DAC_PERCENT(X);
68 68
     EDIT_DAC_PERCENT(Y);
@@ -80,7 +80,7 @@ void menu_backlash();
80 80
 
81 81
   void menu_pwm() {
82 82
     START_MENU();
83
-    MENU_BACK(MSG_CONTROL);
83
+    MENU_BACK(MSG_ADVANCED_SETTINGS);
84 84
     #define EDIT_CURRENT_PWM(LABEL,I) MENU_ITEM_EDIT_CALLBACK(long5, LABEL, &stepper.motor_current_setting[I], 100, 2000, stepper.refresh_motor_power)
85 85
     #if PIN_EXISTS(MOTOR_CURRENT_PWM_XY)
86 86
       EDIT_CURRENT_PWM(MSG_X MSG_Y, 0);

+ 7
- 7
Marlin/src/lcd/menu/menu_configuration.cpp View File

@@ -90,7 +90,7 @@ static void lcd_factory_settings() {
90 90
   void menu_debug() {
91 91
     START_MENU();
92 92
 
93
-    MENU_BACK(MSG_MAIN);
93
+    MENU_BACK(MSG_CONFIGURATION);
94 94
 
95 95
     #if ENABLED(LCD_PROGRESS_BAR_TEST)
96 96
       MENU_ITEM(submenu, MSG_PROGRESS_BAR_TEST, _progress_bar_test);
@@ -107,7 +107,7 @@ static void lcd_factory_settings() {
107 107
 
108 108
   void menu_tool_change() {
109 109
     START_MENU();
110
-    MENU_BACK(MSG_MAIN);
110
+    MENU_BACK(MSG_CONFIGURATION);
111 111
     #if ENABLED(TOOLCHANGE_FILAMENT_SWAP)
112 112
       MENU_ITEM_EDIT(float3, MSG_FILAMENT_SWAP_LENGTH, &toolchange_settings.swap_length, 0, 200);
113 113
       MENU_MULTIPLIER_ITEM_EDIT(int4, MSG_SINGLENOZZLE_RETRACT_SPD, &toolchange_settings.retract_speed, 10, 5400);
@@ -133,7 +133,7 @@ static void lcd_factory_settings() {
133 133
     };
134 134
 
135 135
     START_MENU();
136
-    MENU_BACK(MSG_MAIN);
136
+    MENU_BACK(MSG_CONFIGURATION);
137 137
     #if ENABLED(DUAL_X_CARRIAGE)
138 138
       MENU_MULTIPLIER_ITEM_EDIT_CALLBACK(float52, MSG_X_OFFSET, &hotend_offset[X_AXIS][1], MIN(X2_HOME_POS, X2_MAX_POS) - 25.0, MAX(X2_HOME_POS, X2_MAX_POS) + 25.0, _recalc_offsets);
139 139
     #else
@@ -152,7 +152,7 @@ static void lcd_factory_settings() {
152 152
 
153 153
   void menu_idex() {
154 154
     START_MENU();
155
-    MENU_BACK(MSG_MAIN);
155
+    MENU_BACK(MSG_CONFIGURATION);
156 156
 
157 157
     MENU_ITEM(gcode, MSG_IDEX_MODE_AUTOPARK,  PSTR("M605 S1\nG28 X\nG1 X100"));
158 158
     const bool need_g28 = !(TEST(axis_known_position, Y_AXIS) && TEST(axis_known_position, Z_AXIS));
@@ -174,7 +174,7 @@ static void lcd_factory_settings() {
174 174
 
175 175
   void menu_bltouch() {
176 176
     START_MENU();
177
-    MENU_BACK(MSG_MAIN);
177
+    MENU_BACK(MSG_CONFIGURATION);
178 178
     MENU_ITEM(function, MSG_BLTOUCH_RESET, bltouch._reset);
179 179
     MENU_ITEM(function, MSG_BLTOUCH_SELFTEST, bltouch._selftest);
180 180
     MENU_ITEM(function, MSG_BLTOUCH_DEPLOY, bltouch._deploy);
@@ -194,7 +194,7 @@ static void lcd_factory_settings() {
194 194
 
195 195
   void menu_case_light() {
196 196
     START_MENU();
197
-    MENU_BACK(MSG_MAIN);
197
+    MENU_BACK(MSG_CONFIGURATION);
198 198
     MENU_ITEM_EDIT_CALLBACK(uint8, MSG_CASE_LIGHT_BRIGHTNESS, &case_light_brightness, 0, 255, update_case_light, true);
199 199
     MENU_ITEM_EDIT_CALLBACK(bool, MSG_CASE_LIGHT, (bool*)&case_light_on, update_case_light);
200 200
     END_MENU();
@@ -208,7 +208,7 @@ static void lcd_factory_settings() {
208 208
 
209 209
   void menu_config_retract() {
210 210
     START_MENU();
211
-    MENU_BACK(MSG_CONTROL);
211
+    MENU_BACK(MSG_CONFIGURATION);
212 212
     #if ENABLED(FWRETRACT_AUTORETRACT)
213 213
       MENU_ITEM_EDIT_CALLBACK(bool, MSG_AUTORETRACT, &fwretract.autoretract_enabled, fwretract.refresh_autoretract);
214 214
     #endif

Loading…
Cancel
Save