0x90/Marlin
12
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Misc. code cleanup

Browse source
This commit is contained in:
Scott Lahteine 2021-05-07 22:39:34 -05:00
parent 1292ff76b3
commit 206d495ba4
5 changed files with 12 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Marlin/src/MarlinCore.cpp
View file

@ -390,8 +390,8 @@ void startOrResumeJob() {
} }
inline void finishSDPrinting() { inline void finishSDPrinting() {
if (queue.enqueue_one_P(PSTR("M1001"))) { if (queue.enqueue_one_P(PSTR("M1001"))) { // Keep trying until it gets queued
marlin_state = MF_RUNNING; marlin_state = MF_RUNNING; // Signal to stop trying
TERN_(PASSWORD_AFTER_SD_PRINT_END, password.lock_machine()); TERN_(PASSWORD_AFTER_SD_PRINT_END, password.lock_machine());
TERN_(DGUS_LCD_UI_MKS, ScreenHandler.SDPrintingFinished()); TERN_(DGUS_LCD_UI_MKS, ScreenHandler.SDPrintingFinished());
} }

10
Marlin/src/gcode/queue.cpp
View file

@ -501,13 +501,9 @@ void GCodeQueue::get_serial_commands() {
char* gpos = strchr(command, 'G'); char* gpos = strchr(command, 'G');
if (gpos) { if (gpos) {
switch (strtol(gpos + 1, nullptr, 10)) { switch (strtol(gpos + 1, nullptr, 10)) {
case 0: case 1: case 0 ... 1:
#if ENABLED(ARC_SUPPORT) TERN_(ARC_SUPPORT, case 2 ... 3:)
case 2: case 3: TERN_(BEZIER_CURVE_SUPPORT, case 5:)
#endif
#if ENABLED(BEZIER_CURVE_SUPPORT)
case 5:
#endif
PORT_REDIRECT(SERIAL_PORTMASK(p)); // Reply to the serial port that sent the command PORT_REDIRECT(SERIAL_PORTMASK(p)); // Reply to the serial port that sent the command
SERIAL_ECHOLNPGM(STR_ERR_STOPPED); SERIAL_ECHOLNPGM(STR_ERR_STOPPED);
LCD_MESSAGEPGM(MSG_STOPPED); LCD_MESSAGEPGM(MSG_STOPPED);

4
Marlin/src/lcd/extui/dgus/mks/DGUSScreenHandler.cpp
View file

@ -1477,7 +1477,7 @@ void DGUSScreenHandler::DGUS_ExtrudeLoadInit(void) {
void DGUSScreenHandler::DGUS_RunoutInit(void) { void DGUSScreenHandler::DGUS_RunoutInit(void) {
#if PIN_EXISTS(MT_DET_1) #if PIN_EXISTS(MT_DET_1)
pinMode(MT_DET_1_PIN, INPUT_PULLUP); SET_INPUT_PULLUP(MT_DET_1_PIN);
#endif #endif
runout_mks.de_count = 0; runout_mks.de_count = 0;
runout_mks.de_times = 10; runout_mks.de_times = 10;
@ -1496,7 +1496,7 @@ void DGUSScreenHandler::DGUS_Runout_Idle(void) {
GotoScreen(MKSLCD_SCREEN_PAUSE); GotoScreen(MKSLCD_SCREEN_PAUSE);
sendinfoscreen(PSTR("NOTICE"), nullptr, PSTR("Please change filament!"), nullptr, true, true, true, true); sendinfoscreen(PSTR("NOTICE"), nullptr, PSTR("Please change filament!"), nullptr, true, true, true, true);
// SetupConfirmAction(nullptr); //SetupConfirmAction(nullptr);
GotoScreen(DGUSLCD_SCREEN_POPUP); GotoScreen(DGUSLCD_SCREEN_POPUP);
break; break;

4
Marlin/src/lcd/extui/mks_ui/draw_ui.cpp
View file

@ -645,9 +645,7 @@ char *creat_title_text() {
gcode_preview_over = false; gcode_preview_over = false;
card.closefile(); card.closefile();
char *cur_name; char *cur_name = strrchr(list_file.file_name[sel_id], '/');
cur_name = strrchr(list_file.file_name[sel_id], '/');
SdFile file; SdFile file;
SdFile *curDir; SdFile *curDir;

12
Marlin/src/lcd/extui/mks_ui/wifi_module.cpp
View file

@ -1789,18 +1789,14 @@ void get_wifi_commands() {
char* command = wifi_line_buffer; char* command = wifi_line_buffer;
while (*command == ' ') command++; // skip any leading spaces while (*command == ' ') command++; // skip any leading spaces
// Movement commands alert when stopped // Movement commands alert when stopped
if (IsStopped()) { if (IsStopped()) {
char* gpos = strchr(command, 'G'); char* gpos = strchr(command, 'G');
if (gpos) { if (gpos) {
switch (strtol(gpos + 1, nullptr, 10)) { switch (strtol(gpos + 1, nullptr, 10)) {
case 0 ... 1: case 0 ... 1:
#if ENABLED(ARC_SUPPORT) TERN_(ARC_SUPPORT, case 2 ... 3:)
case 2 ... 3: TERN_(BEZIER_CURVE_SUPPORT, case 5:)
#endif
#if ENABLED(BEZIER_CURVE_SUPPORT)
case 5:
#endif
SERIAL_ECHOLNPGM(STR_ERR_STOPPED); SERIAL_ECHOLNPGM(STR_ERR_STOPPED);
LCD_MESSAGEPGM(MSG_STOPPED); LCD_MESSAGEPGM(MSG_STOPPED);
break; break;