Skip to content

Commit

Permalink
naming
Browse files Browse the repository at this point in the history
  • Loading branch information
rhapsodyv committed Sep 16, 2020
1 parent bae3224 commit 1ceae6d
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion Marlin/src/lcd/tft/ui_320x240.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -650,7 +650,7 @@ void menu_item(const uint8_t row, bool sel ) {
TERN_(TOUCH_SCREEN, touch.add_control(sel ? CLICK : MENU_ITEM, 0, 2 + 34 * row, 320, 32, encoderTopLine + row));
}

void MarlinUI::move_axis() {
void MarlinUI::move_axis_screen() {
}

#endif // HAS_UI_320x240
2 changes: 1 addition & 1 deletion Marlin/src/lcd/tft/ui_480x320.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -975,7 +975,7 @@ static void drawBtn(int x, int y, const char* label, int32_t data, MarlinImage i
touch.add_control(BUTTON, x, y, width, height, data);
}

void MarlinUI::move_axis() {
void MarlinUI::move_axis_screen() {
// Reset
motionAxisState.blocked = false;
touch.enable();
Expand Down
2 changes: 1 addition & 1 deletion Marlin/src/lcd/ultralcd.h
Original file line number Diff line number Diff line change
Expand Up @@ -683,7 +683,7 @@ class MarlinUI {
#endif

#if HAS_GRAPHICAL_TFT
static void move_axis();
static void move_axis_screen();
#endif

private:
Expand Down

0 comments on commit 1ceae6d

Please sign in to comment.