jessikitty/Marlin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add manual mesh to leveling screens

Browse Source
This commit is contained in:
InsanityAutomation
2021-06-12 08:21:17 -04:00
parent d2fc1daf50
commit eca2080a3f
2 changed files with 45 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Marlin/Configuration_adv.h
+3 -2
View File
@@ -1021,9 +1021,10 @@
// Backlash Compensation
// Adds extra movement to axes on direction-changes to account for backlash.
//
#if ANY(SKR13, SKR14, SKR14Turbo, SKRPRO11, Creality422, Creality427, MachineEnder6, MachineCR6, MachineCR6Max)
#if ANY(SKR13, SKR14, SKR14Turbo, SKRPRO11, Creality422, Creality427, MachineCR6, MachineCR6Max)
#define BACKLASH_COMPENSATION
#endifif ENABLED(BACKLASH_COMPENSATION)
#endif
#if ENABLED(BACKLASH_COMPENSATION)
// Define values for backlash distance and correction.
// If BACKLASH_GCODE is enabled these values are the defaults.
#define BACKLASH_DISTANCE_MM { 0, 0, 0 } // (mm) One value for each linear axis
Marlin/src/lcd/extui/Creality/Creality_DWIN.cpp
+42 -9
View File
@@ -751,6 +751,11 @@ void RTSSHOW::RTS_HandleData()
#endif
const uint8_t validateMesh = 12;
const uint8_t manualMeshBegin = 13;
const uint8_t manualMeshNext = 14;
const uint8_t manualMeshLower = 15;
const uint8_t manualMeshRaise = 16;
constexpr float lfrb[4] = LEVEL_CORNERS_INSET_LFRB;
SERIAL_ECHOLNPGM_P(PSTR("BeginSwitch"));
@@ -1231,15 +1236,19 @@ SERIAL_ECHOLNPGM_P(PSTR("BeginSwitch"));
}
case autoMeasure: // AutoLevel "Measuring" Button
{
waitway = 3; //only for prohibiting to receive massage
RTS_SndData(3, AutolevelIcon);
uint8_t abl_probe_index = 0;
while (abl_probe_index < 25) {
rtscheck.RTS_SndData(0, AutolevelVal + abl_probe_index * 2);
++abl_probe_index;
}
RTS_SndData(ExchangePageBase + 85, ExchangepageAddr);
injectCommands_P(PSTR(MAIN_MENU_ITEM_1_GCODE));
#if ENABLED(MESH_BED_LEVELING)
RTS_SndData(ExchangePageBase + 93, ExchangepageAddr);
#else
waitway = 3; //only for prohibiting to receive massage
RTS_SndData(3, AutolevelIcon);
uint8_t abl_probe_index = 0;
while (abl_probe_index < 25) {
rtscheck.RTS_SndData(0, AutolevelVal + abl_probe_index * 2);
++abl_probe_index;
}
RTS_SndData(ExchangePageBase + 85, ExchangepageAddr);
injectCommands_P(PSTR(MAIN_MENU_ITEM_1_GCODE));
#endif
break;
}
@@ -1306,6 +1315,30 @@ SERIAL_ECHOLNPGM_P(PSTR("BeginSwitch"));
onStatusChanged("Beginning G26.. Heating");
break;
}
case manualMeshBegin :
{
injectCommands_P(PSTR("G29S1"));
onStatusChanged("Beginning Manual Mesh");
break;
}
case manualMeshNext :
{
injectCommands_P(PSTR("G29S2"));
onStatusChanged("Moving to Next Mesh Point");
break;
}
case manualMeshLower :
{
injectCommands_P(PSTR("G91\nG1Z-0.025\nG90"));
onStatusChanged("Moved down 0.025");
break;
}
case manualMeshRaise :
{
injectCommands_P(PSTR("G91\nG1Z0.025\nG90"));
onStatusChanged("Moved up 0.025");
break;
}
default:
{
SERIAL_ECHOLNPAIR("Unsupported Option Selected", recdat.data[0]);