wp/Marlin-2-0-x-Anycubic-i3-MEGA-S
1
0
Fork 0
Code Issues 28 Pull Requests 2 Actions Packages Projects Releases 30 Wiki Activity

Fully working Z offset adjustment

Browse Source
This commit is contained in:
Knutwurst
2021-09-04 13:04:54 +02:00
parent 1a8d83556a
commit e2c1dd0b3c
2 changed files with 25 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
Marlin/src/lcd/anycubic_touchscreen.cpp
View File

@@ -198,11 +198,6 @@ void AnycubicTouchscreenClass::Setup()
{ {
HardwareSerial.begin(115200); HardwareSerial.begin(115200);
#if ENABLED(KNUTWURST_TFT_LEVELING)
setupMyZoffset();
delay(10);
#endif
HARDWARE_SERIAL_ENTER(); HARDWARE_SERIAL_ENTER();
HARDWARE_SERIAL_PROTOCOLPGM("J17"); // J17 Main board reset HARDWARE_SERIAL_PROTOCOLPGM("J17"); // J17 Main board reset
HARDWARE_SERIAL_ENTER(); HARDWARE_SERIAL_ENTER();
@@ -210,6 +205,18 @@ void AnycubicTouchscreenClass::Setup()
HARDWARE_SERIAL_PROTOCOLPGM("J12"); // J12 Ready HARDWARE_SERIAL_PROTOCOLPGM("J12"); // J12 Ready
HARDWARE_SERIAL_ENTER(); HARDWARE_SERIAL_ENTER();
currentTouchscreenSelection[0] = 0;
currentFileOrDirectory[0] = '\0';
SpecialMenu = false;
MMLMenu = false;
FlowMenu = false;
BLTouchMenu = false;
LevelMenu = false;
FilamentSensorEnabled = true;
MyFileNrCnt = 0;
currentFlowRate = 100;
flowRateBuffer = SM_FLOW_DISP_L;
#if ENABLED(SDSUPPORT) && PIN_EXISTS(SD_DETECT) #if ENABLED(SDSUPPORT) && PIN_EXISTS(SD_DETECT)
pinMode(SD_DETECT_PIN, INPUT); pinMode(SD_DETECT_PIN, INPUT);
WRITE(SD_DETECT_PIN, HIGH); WRITE(SD_DETECT_PIN, HIGH);
@@ -231,18 +238,10 @@ void AnycubicTouchscreenClass::Setup()
} }
#endif #endif
currentTouchscreenSelection[0] = 0; #if ENABLED(KNUTWURST_TFT_LEVELING)
currentFileOrDirectory[0] = '\0'; setupMyZoffset();
SpecialMenu = false; delay(10);
MMLMenu = false; #endif
FlowMenu = false;
BLTouchMenu = false;
LevelMenu = false;
FilamentSensorEnabled = true;
MyFileNrCnt = 0;
currentFlowRate = 100;
currentZOffset = 0.0;
flowRateBuffer = SM_FLOW_DISP_L;
#ifdef STARTUP_CHIME #ifdef STARTUP_CHIME
buzzer.tone(100, 554); buzzer.tone(100, 554);
@@ -841,23 +840,21 @@ void AnycubicTouchscreenClass::HandleSpecialMenu()
|| (strcasestr_P(currentTouchscreenSelection, PSTR(SM_BLTZ_UP_S)) != NULL)) || (strcasestr_P(currentTouchscreenSelection, PSTR(SM_BLTZ_UP_S)) != NULL))
{ {
SERIAL_ECHOLNPGM("Special Menu: Offset UP"); SERIAL_ECHOLNPGM("Special Menu: Offset UP");
currentZOffset = currentZOffset + 0.01F; probe.offset.z += 0.01F;
char value[30]; //char value[30];
sprintf_P(value, PSTR("M851 Z%i"), currentZOffset); //sprintf_P(value, PSTR("M851 Z%i"), float(probe.offset.z));
//queue.enqueue_one_now(value); //queue.enqueue_one_now(value);
queue.inject_P(value);
} }
else if ((strcasestr_P(currentTouchscreenSelection, PSTR(SM_BLTZ_DN_L)) != NULL) else if ((strcasestr_P(currentTouchscreenSelection, PSTR(SM_BLTZ_DN_L)) != NULL)
|| (strcasestr_P(currentTouchscreenSelection, PSTR(SM_BLTZ_DN_S)) != NULL)) || (strcasestr_P(currentTouchscreenSelection, PSTR(SM_BLTZ_DN_S)) != NULL))
{ {
SERIAL_ECHOLNPGM("Special Menu: Offset Down"); SERIAL_ECHOLNPGM("Special Menu: Offset Down");
currentZOffset = currentZOffset - 0.01F; probe.offset.z -= 0.01F;
char value[30]; //char value[30];
sprintf_P(value, PSTR("M851 Z%i"), currentZOffset); //sprintf_P(value, PSTR("M851 Z%i"), float(probe.offset.z));
//queue.enqueue_one_now(value); //queue.enqueue_one_now(value);
queue.inject_P(value);
} }
else if ((strcasestr_P(currentTouchscreenSelection, PSTR(SM_BLTZ_EXIT_L)) != NULL) else if ((strcasestr_P(currentTouchscreenSelection, PSTR(SM_BLTZ_EXIT_L)) != NULL)
|| (strcasestr_P(currentTouchscreenSelection, PSTR(SM_BLTZ_EXIT_S)) != NULL)) || (strcasestr_P(currentTouchscreenSelection, PSTR(SM_BLTZ_EXIT_S)) != NULL))
@@ -1005,14 +1002,13 @@ void AnycubicTouchscreenClass::PrintList()
else if(BLTouchMenu) else if(BLTouchMenu)
{ {
zOffsetBuffer = SM_BLTZ_DISP_L; zOffsetBuffer = SM_BLTZ_DISP_L;
currentZOffset = float(probe.offset.z);
#ifdef ANYCUBIC_TFT_DEBUG #ifdef ANYCUBIC_TFT_DEBUG
SERIAL_ECHOPAIR(" DEBUG: Current probe.offset.z: ", currentZOffset); SERIAL_ECHOPAIR(" DEBUG: Current probe.offset.z: ", float(probe.offset.z));
SERIAL_EOL(); SERIAL_EOL();
#endif #endif
zOffsetBuffer.replace("XXXXX", String(currentZOffset)); zOffsetBuffer.replace("XXXXX", String(float(probe.offset.z)));
switch (filenumber) switch (filenumber)
{ {

1
Marlin/src/lcd/anycubic_touchscreen.h
View File

@@ -289,7 +289,6 @@ private:
uint16_t HeaterCheckCount = 0; uint16_t HeaterCheckCount = 0;
bool IsParked = false; bool IsParked = false;
int currentFlowRate = 0; int currentFlowRate = 0;
float currentZOffset = 0.0;
#if defined(POWER_OUTAGE_TEST) #if defined(POWER_OUTAGE_TEST)
struct OutageDataStruct struct OutageDataStruct