wp
/
Marlin-Ai3M
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Update SpecialMenue to ABL

This commit is contained in:
Marco Nieddu 2019-02-11 09:02:50 +01:00 committed by GitHub
parent 634b76b52c
commit e4fd34a0cd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 22 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

71
Marlin/AnycubicTFT.cpp
View File

@ -216,24 +216,9 @@ void AnycubicTFTClass::HandleSpecialMenu()
} else if (strcmp(SelectedDirectory, "<preheat bed>")==0) {
SERIAL_PROTOCOLLNPGM("Special Menu: Preheat Bed");
enqueue_and_echo_commands_P(PSTR("M140 S60"));
} else if (strcmp(SelectedDirectory, "<start mesh leveling>")==0) {
SERIAL_PROTOCOLLNPGM("Special Menu: Start Mesh Leveling");
enqueue_and_echo_commands_P(PSTR("G29 S1"));
} else if (strcmp(SelectedDirectory, "<next mesh point>")==0) {
SERIAL_PROTOCOLLNPGM("Special Menu: Next Mesh Point");
enqueue_and_echo_commands_P(PSTR("G29 S2"));
} else if (strcmp(SelectedDirectory, "<z up 0.1>")==0) {
SERIAL_PROTOCOLLNPGM("Special Menu: Z Up 0.1");
enqueue_and_echo_commands_P(PSTR("G91\nG1 Z+0.1\nG90"));
} else if (strcmp(SelectedDirectory, "<z up 0.02>")==0) {
SERIAL_PROTOCOLLNPGM("Special Menu: Z Up 0.02");
enqueue_and_echo_commands_P(PSTR("G91\nG1 Z+0.02\nG90"));
} else if (strcmp(SelectedDirectory, "<z down 0.02>")==0) {
SERIAL_PROTOCOLLNPGM("Special Menu: Z Down 0.02");
enqueue_and_echo_commands_P(PSTR("G91\nG1 Z-0.02\nG90"));
} else if (strcmp(SelectedDirectory, "<z down 0.1>")==0) {
SERIAL_PROTOCOLLNPGM("Special Menu: Z Down 0.1");
enqueue_and_echo_commands_P(PSTR("G91\nG1 Z-0.1\nG90"));
} else if (strcmp(SelectedDirectory, "<auto bed leveling>")==0) {
SERIAL_PROTOCOLLNPGM("Special Menu: Auto Bed Leveling");
enqueue_and_echo_commands_P(PSTR("G28\nG29"));
} else if (strcmp(SelectedDirectory, "<m600 pause>")==0) {
SERIAL_PROTOCOLLNPGM("Special Menu: M600 Pause");
enqueue_and_echo_commands_P(PSTR("M600"));
@ -249,42 +234,30 @@ void AnycubicTFTClass::Ls()
{
if (SpecialMenu) {
switch (filenumber) {
case 0: // First Page
ANYCUBIC_SERIAL_PROTOCOLLNPGM("<Z Up 0.1>");
ANYCUBIC_SERIAL_PROTOCOLLNPGM("<Z Up 0.1>");
ANYCUBIC_SERIAL_PROTOCOLLNPGM("<Z Up 0.02>");
ANYCUBIC_SERIAL_PROTOCOLLNPGM("<Z Up 0.02>");
ANYCUBIC_SERIAL_PROTOCOLLNPGM("<Z Down 0.02>");
ANYCUBIC_SERIAL_PROTOCOLLNPGM("<Z Down 0.02>");
ANYCUBIC_SERIAL_PROTOCOLLNPGM("<Z Down 0.1>");
ANYCUBIC_SERIAL_PROTOCOLLNPGM("<Z Down 0.1>");
ANYCUBIC_SERIAL_PROTOCOLLNPGM("<Preheat bed>");
ANYCUBIC_SERIAL_PROTOCOLLNPGM("<Preheat bed>");
ANYCUBIC_SERIAL_PROTOCOLLNPGM("<Start Auto Bed Leveling>");
ANYCUBIC_SERIAL_PROTOCOLLNPGM("<Start Auto Bed Leveling>");
ANYCUBIC_SERIAL_PROTOCOLLNPGM("<Save EEPROM>");
ANYCUBIC_SERIAL_PROTOCOLLNPGM("<Save EEPROM>");
ANYCUBIC_SERIAL_PROTOCOLLNPGM("<Exit>");
ANYCUBIC_SERIAL_PROTOCOLLNPGM("<Exit>");
break;
case 4: // Second Page
ANYCUBIC_SERIAL_PROTOCOLLNPGM("<Preheat bed>");
ANYCUBIC_SERIAL_PROTOCOLLNPGM("<Preheat bed>");
ANYCUBIC_SERIAL_PROTOCOLLNPGM("<Start Mesh Leveling>");
ANYCUBIC_SERIAL_PROTOCOLLNPGM("<Start Mesh Leveling>");
ANYCUBIC_SERIAL_PROTOCOLLNPGM("<Next Mesh Point>");
ANYCUBIC_SERIAL_PROTOCOLLNPGM("<Next Mesh Point>");
ANYCUBIC_SERIAL_PROTOCOLLNPGM("<Save EEPROM>");
ANYCUBIC_SERIAL_PROTOCOLLNPGM("<Save EEPROM>");
ANYCUBIC_SERIAL_PROTOCOLLNPGM("<Auto Tune Hotend PID>");
ANYCUBIC_SERIAL_PROTOCOLLNPGM("<Auto Tune Hotend PID>");
ANYCUBIC_SERIAL_PROTOCOLLNPGM("<Auto Tune Hotbed PID>");
ANYCUBIC_SERIAL_PROTOCOLLNPGM("<Auto Tune Hotbed PID>");
ANYCUBIC_SERIAL_PROTOCOLLNPGM("<Load FW Defaults>");
ANYCUBIC_SERIAL_PROTOCOLLNPGM("<Load FW Defaults>");
ANYCUBIC_SERIAL_PROTOCOLLNPGM("<M600 Pause>");
ANYCUBIC_SERIAL_PROTOCOLLNPGM("<M600 Pause>");
break;
case 8: // Third Page
ANYCUBIC_SERIAL_PROTOCOLLNPGM("<Exit>");
ANYCUBIC_SERIAL_PROTOCOLLNPGM("<Exit>");
ANYCUBIC_SERIAL_PROTOCOLLNPGM("<Auto Tune Hotend PID>");
ANYCUBIC_SERIAL_PROTOCOLLNPGM("<Auto Tune Hotend PID>");
ANYCUBIC_SERIAL_PROTOCOLLNPGM("<Auto Tune Hotbed PID>");
ANYCUBIC_SERIAL_PROTOCOLLNPGM("<Auto Tune Hotbed PID>");
ANYCUBIC_SERIAL_PROTOCOLLNPGM("<Load FW Defaults>");
ANYCUBIC_SERIAL_PROTOCOLLNPGM("<Load FW Defaults>");
break;
case 12: // Fourth Page
ANYCUBIC_SERIAL_PROTOCOLLNPGM("<M600 Pause>");
ANYCUBIC_SERIAL_PROTOCOLLNPGM("<M600 Pause>");
ANYCUBIC_SERIAL_PROTOCOLLNPGM("<M108 Resume>");
ANYCUBIC_SERIAL_PROTOCOLLNPGM("<M108 Resume>");
break;
@ -905,8 +878,8 @@ void AnycubicTFTClass::GetCommandFromTFT()
if((!planner.movesplanned())&& (TFTstate!=ANYCUBIC_TFT_STATE_SDPAUSE) && (TFTstate!=ANYCUBIC_TFT_STATE_SDOUTAGE))
{
if((current_position[Z_AXIS]<10)) enqueue_and_echo_commands_P(PSTR("G1 Z10")); // RAISE Z AXIS
thermalManager.setTargetBed(50);
thermalManager.setTargetHotend(200, 0);
thermalManager.setTargetBed(55);
thermalManager.setTargetHotend(195, 0);
ANYCUBIC_SERIAL_SUCC_START;
ANYCUBIC_SERIAL_ENTER();
}