Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix warnings building for Lulzbot machines #24227

Merged
merged 3 commits into from
May 22, 2022
Merged

Fix warnings building for Lulzbot machines #24227

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
eb2958c
fix upstream warnings
InsanityAutomation May 22, 2022
51c7d90
Merge 'bugfix-2.0.x' into pr/24227
thinkyhead May 22, 2022
23013df
etc.
thinkyhead May 22, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 0 additions & 4 deletions Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/tune_menu.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,6 @@ void TuneMenu::onRedraw(draw_mode_t what) {
}

#if ENABLED(TOUCH_UI_PORTRAIT)
#define GRID_COLS 2
#define GRID_ROWS 9
#define TEMPERATURE_POS BTN_POS(1,1), BTN_SIZE(2,1)
#define FIL_CHANGE_POS BTN_POS(1,2), BTN_SIZE(2,1)
#define FILAMENT_POS BTN_POS(1,3), BTN_SIZE(2,1)
Expand All @@ -54,8 +52,6 @@ void TuneMenu::onRedraw(draw_mode_t what) {
#define ADVANCED_SETTINGS_POS BTN_POS(1,9), BTN_SIZE(1,1)
#define BACK_POS BTN_POS(2,9), BTN_SIZE(1,1)
#else
#define GRID_COLS 2
#define GRID_ROWS 5
#define TEMPERATURE_POS BTN_POS(1,1), BTN_SIZE(1,1)
#define NUDGE_NOZ_POS BTN_POS(2,1), BTN_SIZE(1,1)
#define FIL_CHANGE_POS BTN_POS(1,2), BTN_SIZE(1,1)
Expand Down
2 changes: 1 addition & 1 deletion Marlin/src/pins/rambo/pins_EINSY_RETRO.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@
#endif

#define Z_MAX_PIN 7
#ifndef Z_MIN_PIN 7
#ifndef Z_MIN_PIN
#define Z_MIN_PIN 10 // Z-
#endif

Expand Down