Skip to content

Commit

Permalink
post-merge
Browse files Browse the repository at this point in the history
  • Loading branch information
thinkyhead committed Sep 6, 2021
1 parent ee664da commit c6e6af4
Showing 1 changed file with 8 additions and 17 deletions.
25 changes: 8 additions & 17 deletions Marlin/src/lcd/extui/dgus_reloaded.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -35,9 +35,7 @@

namespace ExtUI {

void onStartup() {
dgus_screen_handler.Init();
}
void onStartup() { dgus_screen_handler.Init(); }

void onIdle() {
static bool processing = false;
Expand All @@ -55,21 +53,15 @@ namespace ExtUI {
}

void onMediaInserted() {
#if ENABLED(SDSUPPORT)
dgus_screen_handler.SDCardInserted();
#endif
TERN_(SDSUPPORT, dgus_screen_handler.SDCardInserted());
}

void onMediaError() {
#if ENABLED(SDSUPPORT)
dgus_screen_handler.SDCardError();
#endif
void onMediaError() {
TERN_(SDSUPPORT, dgus_screen_handler.SDCardError());
}

void onMediaRemoved() {
#if ENABLED(SDSUPPORT)
dgus_screen_handler.SDCardRemoved();
#endif
void onMediaRemoved() {
TERN_(SDSUPPORT, dgus_screen_handler.SDCardRemoved());
}

void onPlayTone(const uint16_t frequency, const uint16_t duration) {
Expand Down Expand Up @@ -130,15 +122,14 @@ namespace ExtUI {

#if HAS_MESH
void onMeshLevelingStart() {}

void onMeshUpdate(const int8_t xpos, const int8_t ypos, const_float_t zval) {
dgus_screen_handler.MeshUpdate(xpos, ypos);
}

void onMeshUpdate(const int8_t xpos, const int8_t ypos, const probe_state_t state) {
if (state == G29_POINT_FINISH) {
if (state == G29_POINT_FINISH)
dgus_screen_handler.MeshUpdate(xpos, ypos);
}
}
#endif

Expand Down

0 comments on commit c6e6af4

Please sign in to comment.