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

Clean up / redundant mistake? #25929

Merged
merged 6 commits into from
Jun 4, 2023
Merged

Clean up / redundant mistake? #25929

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
7d25d8b
relocate call for dwin.h
classicrocker883 May 19, 2023
9669ead
USE_UBL_VIEWER enabled for bedlevel_tools.h
classicrocker883 May 19, 2023
3f5bcf4
Merge branch 'bugfix-2.1.x' of https://github.com/MarlinFirmware/Marl…
classicrocker883 Jun 4, 2023
436c510
Clean up
classicrocker883 Jun 4, 2023
0413abc
Cleanup
classicrocker883 Jun 4, 2023
c05b6c3
also
thinkyhead Jun 4, 2023
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
2 changes: 1 addition & 1 deletion Marlin/src/gcode/parser.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -229,7 +229,7 @@ void GCodeParser::parse(char *p) {
}
#endif

} break;
} break;

#if ENABLED(GCODE_MOTION_MODES)

Expand Down
6 changes: 3 additions & 3 deletions Marlin/src/inc/Conditionals_post.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -473,9 +473,9 @@
#define _LCD_CONTRAST_MIN 120
#define _LCD_CONTRAST_INIT 195
#elif ENABLED(FYSETC_MINI_12864_2_1)
#define _LCD_CONTRAST_MIN 230
#define _LCD_CONTRAST_MIN 255
#define _LCD_CONTRAST_INIT 255
#define _LCD_CONTRAST_MIN 127
thinkyhead marked this conversation as resolved.
Show resolved Hide resolved
#define _LCD_CONTRAST_INIT 230
thinkyhead marked this conversation as resolved.
Show resolved Hide resolved
#define _LCD_CONTRAST_MAX 255 // not sure what these should be defined, but it's close enough
thinkyhead marked this conversation as resolved.
Show resolved Hide resolved
#elif ENABLED(FYSETC_MINI_12864)
#define _LCD_CONTRAST_MIN 180
#define _LCD_CONTRAST_INIT 220
Expand Down
2 changes: 1 addition & 1 deletion Marlin/src/module/stepper/indirection.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -717,7 +717,7 @@ void reset_stepper_drivers(); // Called by settings.load / settings.reset
#elif E_STEPPERS == 1
#define E_STEP_WRITE(E,V) E0_STEP_WRITE(V)
#define FWD_E_DIR(E) E0_DIR_WRITE(HIGH)
#define REV_E_DIR(E) E0_DIR_WRITE(LOW )
#define REV_E_DIR(E) E0_DIR_WRITE(LOW)

#else
#define E_STEP_WRITE(E,V) NOOP
Expand Down