|
@@ -104,9 +104,36 @@ void menu_main() {
|
104
|
104
|
if (card.isFileOpen())
|
105
|
105
|
MENU_ITEM(submenu, MSG_STOP_PRINT, menu_sdcard_abort_confirm);
|
106
|
106
|
#endif
|
|
107
|
+ #if !defined(ACTION_ON_RESUME) && ENABLED(SDSUPPORT)
|
|
108
|
+ if (card.isFileOpen())
|
|
109
|
+ #endif
|
107
|
110
|
MENU_ITEM(submenu, MSG_TUNE, menu_tune);
|
108
|
111
|
}
|
109
|
112
|
else {
|
|
113
|
+ #if !HAS_ENCODER_WHEEL && ENABLED(SDSUPPORT)
|
|
114
|
+ //
|
|
115
|
+ // Autostart
|
|
116
|
+ //
|
|
117
|
+ #if ENABLED(MENU_ADDAUTOSTART)
|
|
118
|
+ if (!busy) MENU_ITEM(function, MSG_AUTOSTART, card.beginautostart);
|
|
119
|
+ #endif
|
|
120
|
+
|
|
121
|
+ if (card.isDetected()) {
|
|
122
|
+ if (!card.isFileOpen()) {
|
|
123
|
+ MENU_ITEM(submenu, MSG_CARD_MENU, menu_sdcard);
|
|
124
|
+ #if !PIN_EXISTS(SD_DETECT)
|
|
125
|
+ MENU_ITEM(gcode, MSG_CHANGE_SDCARD, PSTR("M21")); // SD-card changed by user
|
|
126
|
+ #endif
|
|
127
|
+ }
|
|
128
|
+ }
|
|
129
|
+ else {
|
|
130
|
+ #if !PIN_EXISTS(SD_DETECT)
|
|
131
|
+ MENU_ITEM(gcode, MSG_INIT_SDCARD, PSTR("M21")); // Manually init SD-card
|
|
132
|
+ #endif
|
|
133
|
+ MENU_ITEM(function, MSG_NO_CARD, NULL);
|
|
134
|
+ }
|
|
135
|
+ #endif // !HAS_ENCODER_WHEEL && SDSUPPORT
|
|
136
|
+
|
110
|
137
|
MENU_ITEM(function, MSG_RESUME_PRINT, lcd_resume);
|
111
|
138
|
|
112
|
139
|
MENU_ITEM(submenu, MSG_MOTION, menu_motion);
|
|
@@ -148,22 +175,20 @@ void menu_main() {
|
148
|
175
|
MENU_ITEM(gcode, MSG_SWITCH_PS_ON, PSTR("M80"));
|
149
|
176
|
#endif
|
150
|
177
|
|
151
|
|
- #if ENABLED(SDSUPPORT)
|
152
|
|
-
|
|
178
|
+ #if HAS_ENCODER_WHEEL && ENABLED(SDSUPPORT)
|
153
|
179
|
//
|
154
|
180
|
// Autostart
|
155
|
181
|
//
|
156
|
182
|
#if ENABLED(MENU_ADDAUTOSTART)
|
157
|
|
- if (!busy)
|
158
|
|
- MENU_ITEM(function, MSG_AUTOSTART, card.beginautostart);
|
|
183
|
+ if (!busy) MENU_ITEM(function, MSG_AUTOSTART, card.beginautostart);
|
159
|
184
|
#endif
|
160
|
185
|
|
161
|
186
|
if (card.isDetected()) {
|
162
|
|
- if(!card.isFileOpen()) {
|
163
|
|
- MENU_ITEM(submenu, MSG_CARD_MENU, menu_sdcard);
|
164
|
|
- #if !PIN_EXISTS(SD_DETECT)
|
165
|
|
- MENU_ITEM(gcode, MSG_CHANGE_SDCARD, PSTR("M21")); // SD-card changed by user
|
166
|
|
- #endif
|
|
187
|
+ if (!card.isFileOpen()) {
|
|
188
|
+ MENU_ITEM(submenu, MSG_CARD_MENU, menu_sdcard);
|
|
189
|
+ #if !PIN_EXISTS(SD_DETECT)
|
|
190
|
+ MENU_ITEM(gcode, MSG_CHANGE_SDCARD, PSTR("M21")); // SD-card changed by user
|
|
191
|
+ #endif
|
167
|
192
|
}
|
168
|
193
|
}
|
169
|
194
|
else {
|
|
@@ -172,7 +197,7 @@ void menu_main() {
|
172
|
197
|
#endif
|
173
|
198
|
MENU_ITEM(function, MSG_NO_CARD, NULL);
|
174
|
199
|
}
|
175
|
|
- #endif // SDSUPPORT
|
|
200
|
+ #endif // HAS_ENCODER_WHEEL && SDSUPPORT
|
176
|
201
|
|
177
|
202
|
END_MENU();
|
178
|
203
|
}
|