bissen21/Marlin_Firmware
1
0
Fork 0
Code Issues Pull Requests Projects Releases 4 Wiki Activity

Misc. code cleanup

Browse Source
This commit is contained in:
Scott Lahteine
2021-05-07 22:39:34 -05:00
parent 45d3866f97
commit cca5844ba9
5 changed files with 12 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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) {
#if PIN_EXISTS(MT_DET_1)
pinMode(MT_DET_1_PIN, INPUT_PULLUP);
SET_INPUT_PULLUP(MT_DET_1_PIN);
#endif
runout_mks.de_count = 0;
runout_mks.de_times = 10;
@ -1496,7 +1496,7 @@ void DGUSScreenHandler::DGUS_Runout_Idle(void) {
GotoScreen(MKSLCD_SCREEN_PAUSE);
sendinfoscreen(PSTR("NOTICE"), nullptr, PSTR("Please change filament!"), nullptr, true, true, true, true);
// SetupConfirmAction(nullptr);
//SetupConfirmAction(nullptr);
GotoScreen(DGUSLCD_SCREEN_POPUP);
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;
card.closefile();
char *cur_name;
cur_name = strrchr(list_file.file_name[sel_id], '/');
char *cur_name = strrchr(list_file.file_name[sel_id], '/');
SdFile file;
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;
while (*command == ' ') command++; // skip any leading spaces
// Movement commands alert when stopped
if (IsStopped()) {
// Movement commands alert when stopped
if (IsStopped()) {
char* gpos = strchr(command, 'G');
if (gpos) {
switch (strtol(gpos + 1, nullptr, 10)) {
case 0 ... 1:
#if ENABLED(ARC_SUPPORT)
case 2 ... 3:
#endif
#if ENABLED(BEZIER_CURVE_SUPPORT)
case 5:
#endif
TERN_(ARC_SUPPORT, case 2 ... 3:)
TERN_(BEZIER_CURVE_SUPPORT, case 5:)
SERIAL_ECHOLNPGM(STR_ERR_STOPPED);
LCD_MESSAGEPGM(MSG_STOPPED);
break;