Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

M

marlin-anet-a8
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Environments
- Terraform modules
- Incidents
- Service Desk

Snippets Groups Projects

4c5ca89d

Unverified Commit 4c5ca89d authored 6 years ago by Scott Lahteine Committed by GitHub 6 years ago

Downloads
- Patches
- Plain Diff

Show the appropriate pause message (#12348)

parent 8517d5f9

Branches

Tags

No related merge requests found

Changes 7

Hide whitespace changes

Inline Side-by-side

Showing

Marlin/src/core/language.h 3 additions, 0 deletions

Marlin/src/core/language.h
Marlin/src/feature/pause.cpp 27 additions, 29 deletions

Marlin/src/feature/pause.cpp
Marlin/src/feature/pause.h 6 additions, 4 deletions

Marlin/src/feature/pause.h
Marlin/src/gcode/feature/pause/M125.cpp 2 additions, 2 deletions

Marlin/src/gcode/feature/pause/M125.cpp
Marlin/src/gcode/feature/pause/M600.cpp 1 addition, 1 deletion

Marlin/src/gcode/feature/pause/M600.cpp
Marlin/src/lcd/language/language_en.h 35 additions, 28 deletions

Marlin/src/lcd/language/language_en.h
Marlin/src/lcd/menu/menu_filament.cpp 106 additions, 163 deletions

Marlin/src/lcd/menu/menu_filament.cpp

with 180 additions and 227 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment