zaubentrucker/muele-marlin
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Fix MKS H43 sensorless homing (#21388)

Browse source
This commit is contained in:
Sola 2021-03-23 13:58:52 +08:00 committed by GitHub
parent c44ff3eb3d
commit 2b621eb45d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -36,7 +36,7 @@
#include "../../../../marlinui.h" #include "../../../../marlinui.h"
#if ENABLED(HAS_STEALTHCHOP) #if ENABLED(HAS_STEALTHCHOP)
#include "../../../../module/stepper/trinamic.h" #include "../../../../../module/stepper/trinamic.h"
#endif #endif
#if ENABLED(DGUS_UI_MOVE_DIS_OPTION) #if ENABLED(DGUS_UI_MOVE_DIS_OPTION)
@ -746,9 +746,9 @@ const struct DGUS_VP_Variable ListOfVP[] PROGMEM = {
// SDCard File listing // SDCard File listing
VPHELPER(VP_SD_FileSelected, nullptr, ScreenHandler.DGUSLCD_SD_FileSelected, nullptr),
#if ENABLED(SDSUPPORT) #if ENABLED(SDSUPPORT)
VPHELPER(VP_SD_ScrollEvent, nullptr, ScreenHandler.DGUSLCD_SD_ScrollFilelist, nullptr), VPHELPER(VP_SD_ScrollEvent, nullptr, ScreenHandler.DGUSLCD_SD_ScrollFilelist, nullptr),
VPHELPER(VP_SD_FileSelected, nullptr, ScreenHandler.DGUSLCD_SD_FileSelected, nullptr),
VPHELPER(VP_SD_FileSelectConfirm, nullptr, ScreenHandler.DGUSLCD_SD_StartPrint, nullptr), VPHELPER(VP_SD_FileSelectConfirm, nullptr, ScreenHandler.DGUSLCD_SD_StartPrint, nullptr),
VPHELPER_STR(VP_SD_FileName0, nullptr, VP_SD_FileName_LEN, nullptr, ScreenHandler.DGUSLCD_SD_SendFilename), VPHELPER_STR(VP_SD_FileName0, nullptr, VP_SD_FileName_LEN, nullptr, ScreenHandler.DGUSLCD_SD_SendFilename),
VPHELPER_STR(VP_SD_FileName1, nullptr, VP_SD_FileName_LEN, nullptr, ScreenHandler.DGUSLCD_SD_SendFilename), VPHELPER_STR(VP_SD_FileName1, nullptr, VP_SD_FileName_LEN, nullptr, ScreenHandler.DGUSLCD_SD_SendFilename),

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

@ -1246,6 +1246,9 @@ void DGUSScreenHandler::MKS_FilamentLoad(DGUS_VP_Variable &var, void *val_ptr) {
uint16_t val_t = swap16(*(uint16_t*)val_ptr); uint16_t val_t = swap16(*(uint16_t*)val_ptr);
if (!print_job_timer.isPaused() && !queue.ring_buffer.empty())
return;
switch (val_t) { switch (val_t) {
case 0: case 0:
#if HOTENDS >= 1 #if HOTENDS >= 1
@ -1497,7 +1500,7 @@ bool DGUSScreenHandler::loop() {
static bool booted = false; static bool booted = false;
if (!booted && ELAPSED(ms, TERN(USE_MKS_GREEN_UI, 1000, BOOTSCREEN_TIMEOUT))) { if (!booted && ELAPSED(ms, TERN(USE_MKS_GREEN_UI, 1000, BOOTSCREEN_TIMEOUT))) {
booted = true; booted = true;
#if ANY_AXIS_HAS(STEALTHCHOP) #if USE_SENSORLESS
#if AXIS_HAS_STEALTHCHOP(X) #if AXIS_HAS_STEALTHCHOP(X)
tmc_x_step = stepperX.homing_threshold(); tmc_x_step = stepperX.homing_threshold();
#endif #endif