|
@@ -33,41 +33,45 @@
|
33
|
33
|
|
34
|
34
|
#include "../../feature/cancel_object.h"
|
35
|
35
|
|
36
|
|
-//
|
37
|
|
-// TODO: Select the active object
|
38
|
|
-// upon entry to the menu and present
|
39
|
|
-// a confirmation screen.
|
40
|
|
-//
|
|
36
|
+static void lcd_cancel_object_confirm() {
|
|
37
|
+ const int8_t v = editable.int8;
|
|
38
|
+ const char item_num[] = {
|
|
39
|
+ ' ',
|
|
40
|
+ char((v > 9) ? '0' + (v / 10) : ' '),
|
|
41
|
+ char('0' + (v % 10)),
|
|
42
|
+ '\0'
|
|
43
|
+ };
|
|
44
|
+ do_select_screen_yn(
|
|
45
|
+ []{
|
|
46
|
+ cancelable.cancel_object(editable.int8 - 1);
|
|
47
|
+ #if HAS_BUZZER
|
|
48
|
+ ui.completion_feedback();
|
|
49
|
+ #endif
|
|
50
|
+ },
|
|
51
|
+ ui.goto_previous_screen,
|
|
52
|
+ GET_TEXT(MSG_CANCEL_OBJECT), item_num, PSTR("?")
|
|
53
|
+ );
|
|
54
|
+}
|
|
55
|
+
|
41
|
56
|
void menu_cancelobject() {
|
42
|
57
|
START_MENU();
|
43
|
58
|
BACK_ITEM(MSG_MAIN);
|
44
|
59
|
|
45
|
|
- GCODES_ITEM(MSG_CANCEL_OBJECT, PSTR("M486 C"));
|
46
|
|
-
|
47
|
60
|
// Draw cancelable items in a loop
|
48
|
|
- for (int8_t i = 0; i < cancelable.object_count; i++) {
|
49
|
|
- if (!TEST(cancelable.canceled, i)) {
|
50
|
|
- editable.int8 = i;
|
51
|
|
- ACTION_ITEM(MSG_CANCEL_OBJECT, [](){
|
52
|
|
- cancelable.cancel_object(editable.int8);
|
53
|
|
- ui.quick_feedback();
|
54
|
|
- });
|
55
|
|
- MENU_ITEM_ADDON_START(LCD_WIDTH - 2 - (i >= 10));
|
56
|
|
- lcd_put_int(i);
|
|
61
|
+ int8_t a = cancelable.active_object;
|
|
62
|
+ for (int8_t i = -1; i < cancelable.object_count; i++) {
|
|
63
|
+ if (i == a) continue;
|
|
64
|
+ int8_t j = i < 0 ? a : i;
|
|
65
|
+ if (!cancelable.is_canceled(j)) {
|
|
66
|
+ editable.int8 = j + 1;
|
|
67
|
+ SUBMENU(MSG_CANCEL_OBJECT, lcd_cancel_object_confirm);
|
|
68
|
+ MENU_ITEM_ADDON_START(LCD_WIDTH - 2 - (j >= 9));
|
|
69
|
+ lcd_put_int(editable.int8);
|
57
|
70
|
MENU_ITEM_ADDON_END();
|
58
|
71
|
}
|
|
72
|
+ if (i < 0) SKIP_ITEM();
|
59
|
73
|
}
|
60
|
74
|
|
61
|
|
- /*
|
62
|
|
- MENU_MULTIPLIER_ITEM_EDIT_CALLBACK(int3, MSG_CANCEL_OBJECT, &editable.int8, -1, 32, [](){
|
63
|
|
- if (editable.int8 > -1) {
|
64
|
|
- cancelable.cancel_object(editable.int8);
|
65
|
|
- ui.quick_feedback();
|
66
|
|
- editable.int8 = -1;
|
67
|
|
- }
|
68
|
|
- });
|
69
|
|
- */
|
70
|
|
-
|
71
|
75
|
END_MENU();
|
72
|
76
|
}
|
73
|
77
|
|