3d_print_resources/Marlin
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Cancel Objects followup

Browse source
This commit is contained in:
Scott Lahteine 2019-10-25 19:49:48 -05:00
parent e690471739
commit 600429a067
8 changed files with 43 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

9
Marlin/src/lcd/menu/menu_cancelobject.cpp
View file

@ -29,6 +29,7 @@
#if HAS_LCD_MENU && ENABLED(CANCEL_OBJECTS)
#include "menu.h"
#include "menu_addon.h"
#include "../../feature/cancel_object.h"
@ -39,15 +40,15 @@
//
void menu_cancelobject() {
START_MENU();
MENU_BACK(MSG_MAIN);
BACK_ITEM(MSG_MAIN);
GCODES_ITEM(MSG_OBJECT_CANCEL, PSTR("M486 C"));
GCODES_ITEM(MSG_CANCEL_OBJECT, 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, [](){
ACTION_ITEM(MSG_CANCEL_OBJECT, [](){
cancelable.cancel_object(editable.int8);
ui.quick_feedback();
});
@ -58,7 +59,7 @@ void menu_cancelobject() {
}
/*
MENU_MULTIPLIER_ITEM_EDIT_CALLBACK(int3, MSG_OBJECT_CANCEL, &editable.int8, -1, 32, [](){
MENU_MULTIPLIER_ITEM_EDIT_CALLBACK(int3, MSG_CANCEL_OBJECT, &editable.int8, -1, 32, [](){
if (editable.int8 > -1) {
cancelable.cancel_object(editable.int8);
ui.quick_feedback();