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

✏️ Fix MKS enum

Browse Source
This commit is contained in:
Scott Lahteine 2022-01-25 17:19:20 -06:00
parent 2dcc3ddeed
commit 38e0e92e9d
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Marlin/src/lcd/extui/dgus/mks/DGUSDisplayDef.h
View File

@ -100,7 +100,7 @@ extern EX_FILAMENT_DEF ex_filament;
typedef enum { typedef enum {
UNRUNOUT_STATUS, UNRUNOUT_STATUS,
RUNOUT_STATUS, RUNOUT_STATUS,
RUNOUT_WAITTING_STATUS, RUNOUT_WAITING_STATUS,
RUNOUT_BEGIN_STATUS, RUNOUT_BEGIN_STATUS,
} RUNOUT_MKS_STATUS_DEF; } RUNOUT_MKS_STATUS_DEF;

6
Marlin/src/lcd/extui/dgus/mks/DGUSScreenHandler.cpp
View File

@ -195,7 +195,7 @@ void DGUSScreenHandler::DGUSLCD_SendTMCStepValue(DGUS_VP_Variable &var) {
case 0: { // Resume case 0: { // Resume
auto cs = getCurrentScreen(); auto cs = getCurrentScreen();
if (runout_mks.runout_status != RUNOUT_WAITTING_STATUS && runout_mks.runout_status != UNRUNOUT_STATUS) { if (runout_mks.runout_status != RUNOUT_WAITING_STATUS && runout_mks.runout_status != UNRUNOUT_STATUS) {
if (cs == MKSLCD_SCREEN_PRINT || cs == MKSLCD_SCREEN_PAUSE) if (cs == MKSLCD_SCREEN_PRINT || cs == MKSLCD_SCREEN_PAUSE)
GotoScreen(MKSLCD_SCREEN_PAUSE); GotoScreen(MKSLCD_SCREEN_PAUSE);
return; return;
@ -1501,10 +1501,10 @@ void DGUSScreenHandler::DGUS_Runout_Idle(void) {
case RUNOUT_BEGIN_STATUS: case RUNOUT_BEGIN_STATUS:
if (READ(MT_DET_1_PIN) != MT_DET_PIN_STATE) if (READ(MT_DET_1_PIN) != MT_DET_PIN_STATE)
runout_mks.runout_status = RUNOUT_WAITTING_STATUS; runout_mks.runout_status = RUNOUT_WAITING_STATUS;
break; break;
case RUNOUT_WAITTING_STATUS: case RUNOUT_WAITING_STATUS:
if (READ(MT_DET_1_PIN) == MT_DET_PIN_STATE) if (READ(MT_DET_1_PIN) == MT_DET_PIN_STATE)
runout_mks.runout_status = RUNOUT_BEGIN_STATUS; runout_mks.runout_status = RUNOUT_BEGIN_STATUS;
break; break;