bissen21/Marlin_Firmware
1
0
Fork 0
Code Issues Pull Requests Projects Releases 4 Wiki Activity

Confirm object cancellation (#15660)

Browse Source
This commit is contained in:
Scott Lahteine
2019-10-27 19:50:21 -05:00
committed by GitHub
parent 78899fc241
commit 9aff30da0c
5 changed files with 40 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
Marlin/src/feature/cancel_object.cpp
View File

@ -42,6 +42,13 @@ void CancelObject::set_active_object(const int8_t obj) {
}
else
skipping = false;
#if HAS_DISPLAY
if (active_object >= 0)
ui.status_printf_P(0, PSTR(S_FMT " %i"), GET_TEXT(MSG_PRINTING_OBJECT), int(active_object + 1));
else
ui.reset_status();
#endif
}
void CancelObject::cancel_object(const int8_t obj) {

1
Marlin/src/feature/cancel_object.h
View File

@ -32,6 +32,7 @@ public:
static void cancel_object(const int8_t obj);
static void uncancel_object(const int8_t obj);
static void report();
static inline bool is_canceled(const int8_t obj) { return TEST(canceled, obj); }
static inline void clear_active_object() { set_active_object(-1); }
static inline void cancel_active_object() { cancel_object(active_object); }
static inline void reset() { canceled = 0x0000; object_count = 0; clear_active_object(); }