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

Chiron TFT leveling refactoring.

Browse Source
This commit is contained in:
Knutwurst
2021-04-27 22:35:35 +02:00
parent cb4eafedb6
commit d73d9c8034
2 changed files with 60 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Marlin/Configuration.h
View File

@@ -88,7 +88,7 @@
* *
*/ */
#if ENABLED(KNUTWURST_CHIRON) #if ENABLED(KNUTWURST_CHIRON)
//#define KNUTWURST_TFT_LEVELING #define KNUTWURST_TFT_LEVELING
#endif #endif

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

@@ -1919,7 +1919,6 @@ void AnycubicTouchscreenClass::GetCommandFromTFT()
#if ENABLED(KNUTWURST_TFT_LEVELING) #if ENABLED(KNUTWURST_TFT_LEVELING)
case 29: // A29 bed grid read case 29: // A29 bed grid read
{ {
#ifdef AUTO_BED_LEVELING_BILINEAR
if(CodeSeen('X')) x = CodeValue(); if(CodeSeen('X')) x = CodeValue();
if(CodeSeen('Y')) y = CodeValue(); if(CodeSeen('Y')) y = CodeValue();
float Zvalue = z_values[x][y]; float Zvalue = z_values[x][y];
@@ -1953,11 +1952,9 @@ void AnycubicTouchscreenClass::GetCommandFromTFT()
HARDWARE_SERIAL_PROTOCOLPGM("A29V "); HARDWARE_SERIAL_PROTOCOLPGM("A29V ");
HARDWARE_SERIAL_PROTOCOL(ftostr32(Zvalue)); HARDWARE_SERIAL_PROTOCOL(ftostr32(Zvalue));
HARDWARE_SERIAL_ENTER(); HARDWARE_SERIAL_ENTER();
#endif
} }
break; break;
case 30: // A30 auto leveling case 30: // A30 auto leveling
#ifdef AUTO_BED_LEVELING_BILINEAR
if( (planner.movesplanned()) || (card.isPrinting()) ) { if( (planner.movesplanned()) || (card.isPrinting()) ) {
HARDWARE_SERIAL_PROTOCOLPGM("J24"); // forbid auto leveling HARDWARE_SERIAL_PROTOCOLPGM("J24"); // forbid auto leveling
HARDWARE_SERIAL_ENTER(); HARDWARE_SERIAL_ENTER();
@@ -1968,13 +1965,8 @@ void AnycubicTouchscreenClass::GetCommandFromTFT()
if(CodeSeen('S') ) { if(CodeSeen('S') ) {
queue.enqueue_now_P(PSTR("G28\nG29")); queue.enqueue_now_P(PSTR("G28\nG29"));
} }
#else
HARDWARE_SERIAL_PROTOCOLPGM("J24"); // forbid auto leveling
HARDWARE_SERIAL_ENTER();
#endif
break; break;
case 31: // A31 zoffset set get or save case 31: // A31 zoffset set get or save
#ifdef AUTO_BED_LEVELING_BILINEAR
if(CodeSeen('S')) if(CodeSeen('S'))
{ {
float value = constrain(CodeValue(),-1.0,1.0); float value = constrain(CodeValue(),-1.0,1.0);
@@ -2005,7 +1997,6 @@ void AnycubicTouchscreenClass::GetCommandFromTFT()
refresh_bed_level(); refresh_bed_level();
} }
HARDWARE_SERIAL_ENTER(); HARDWARE_SERIAL_ENTER();
#endif
break; break;
case 32: //a32 clean leveling beep flag case 32: //a32 clean leveling beep flag
break; break;
@@ -2019,7 +2010,6 @@ void AnycubicTouchscreenClass::GetCommandFromTFT()
break; break;
case 34: //a34 bed grid write case 34: //a34 bed grid write
{ {
#ifdef AUTO_BED_LEVELING_BILINEAR
if(CodeSeen('X')) x = constrain(CodeValue(),0,GRID_MAX_POINTS_X); if(CodeSeen('X')) x = constrain(CodeValue(),0,GRID_MAX_POINTS_X);
if(CodeSeen('Y')) y = constrain(CodeValue(),0,GRID_MAX_POINTS_Y); if(CodeSeen('Y')) y = constrain(CodeValue(),0,GRID_MAX_POINTS_Y);
if(CodeSeen('V')) if(CodeSeen('V'))
@@ -2043,7 +2033,6 @@ void AnycubicTouchscreenClass::GetCommandFromTFT()
set_bed_leveling_enabled(true); set_bed_leveling_enabled(true);
refresh_bed_level(); refresh_bed_level();
} }
#endif
} }
break; break;
case 35: //RESET AUTOBED DATE //M1000 case 35: //RESET AUTOBED DATE //M1000