Skip to content

Commit

Permalink
fix conflict when using exensibleUI without HOST_KEEPALIVE_FEATURE
Browse files Browse the repository at this point in the history
  • Loading branch information
atsju committed Mar 13, 2022
1 parent a58d35d commit 850ca16
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 3 deletions.
5 changes: 4 additions & 1 deletion Marlin/src/lcd/extui/ui_api.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -389,7 +389,10 @@ namespace ExtUI {
return !thermalManager.tooColdToExtrude(extruder - E0);
}

GcodeSuite::MarlinBusyState getHostKeepaliveState() { return TERN0(HOST_KEEPALIVE_FEATURE, gcode.busy_state); }
#if ENABLED(HOST_KEEPALIVE_FEATURE)
GcodeSuite::MarlinBusyState getHostKeepaliveState() { return TERN0(HOST_KEEPALIVE_FEATURE, gcode.busy_state); }
#endif

bool getHostKeepaliveIsPaused() { return TERN0(HOST_KEEPALIVE_FEATURE, gcode.host_keepalive_is_paused()); }

#if HAS_SOFTWARE_ENDSTOPS
Expand Down
7 changes: 5 additions & 2 deletions Marlin/src/lcd/extui/ui_api.h
Original file line number Diff line number Diff line change
Expand Up @@ -82,8 +82,11 @@ namespace ExtUI {
inline void injectCommands(FSTR_P const fstr) { injectCommands_P(FTOP(fstr)); }
void injectCommands(char * const);
bool commandsInQueue();

GcodeSuite::MarlinBusyState getHostKeepaliveState();

#if ENABLED(HOST_KEEPALIVE_FEATURE)
GcodeSuite::MarlinBusyState getHostKeepaliveState();
#endif

bool getHostKeepaliveIsPaused();

bool isHeaterIdle(const heater_t);
Expand Down

0 comments on commit 850ca16

Please sign in to comment.