Cancel Objects - As seen at ERRF2019 (#15590)

This commit is contained in:
Scott Lahteine
2019-10-24 15:35:40 -05:00
committed by GitHub
parent f6a799c7b3
commit 93f0012959
104 changed files with 1015 additions and 105 deletions

View File

@ -427,6 +427,7 @@ namespace Language_en {
PROGMEM Language_Str MSG_PAUSE_PRINT = _UxGT("Pause Print");
PROGMEM Language_Str MSG_RESUME_PRINT = _UxGT("Resume Print");
PROGMEM Language_Str MSG_STOP_PRINT = _UxGT("Stop Print");
PROGMEM Language_Str MSG_OBJECT_CANCEL = _UxGT("Cancel Object");
PROGMEM Language_Str MSG_OUTAGE_RECOVERY = _UxGT("Outage Recovery");
PROGMEM Language_Str MSG_MEDIA_MENU = _UxGT("Print from Media");
PROGMEM Language_Str MSG_NO_MEDIA = _UxGT("No Media");

View File

@ -50,6 +50,7 @@
void menu_tmc();
void menu_backlash();
void menu_cancelobject();
#if ENABLED(DAC_STEPPER_CURRENT)
@ -652,6 +653,10 @@ void menu_advanced_settings() {
SUBMENU(MSG_BACKLASH, menu_backlash);
#endif
#if ENABLED(CANCEL_OBJECTS)
SUBMENU(MSG_CANCELOBJECTS, [](){ editable.int8 = -1; goto_screen(menu_cancelobject); });
#endif
#if ENABLED(DAC_STEPPER_CURRENT)
SUBMENU(MSG_DRIVE_STRENGTH, menu_dac);
#endif

View File

@ -0,0 +1,73 @@
/**
* Marlin 3D Printer Firmware
* Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
*/
//
// Cancel Object Menu
//
#include "../../inc/MarlinConfigPre.h"
#if HAS_LCD_MENU && ENABLED(CANCEL_OBJECTS)
#include "menu.h"
#include "../../feature/cancel_object.h"
//
// TODO: Select the active object
// upon entry to the menu and present
// a confirmation screen.
//
void menu_cancelobject() {
START_MENU();
MENU_BACK(MSG_MAIN);
GCODES_ITEM(MSG_OBJECT_CANCEL, PSTR("M486 C"));
// Draw cancelable items in a loop
for (int8_t i = 0; i < cancelable.object_count; i++) {
if (!TEST(cancelable.canceled, i)) {
editable.int8 = i;
ACTION_ITEM(MSG_OBJECT_CANCEL, [](){
cancelable.cancel_object(editable.int8);
ui.quick_feedback();
});
MENU_ITEM_ADDON_START(LCD_WIDTH - 2 - (i >= 10));
lcd_put_int(i);
MENU_ITEM_ADDON_END();
}
}
/*
MENU_MULTIPLIER_ITEM_EDIT_CALLBACK(int3, MSG_OBJECT_CANCEL, &editable.int8, -1, 32, [](){
if (editable.int8 > -1) {
cancelable.cancel_object(editable.int8);
ui.quick_feedback();
editable.int8 = -1;
}
});
*/
END_MENU();
}
#endif // HAS_LCD_MENU && CANCEL_OBJECTS