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

75901b61

Commit 75901b61 authored 8 years ago by Scott Lahteine Committed by GitHub 8 years ago

Downloads
- Plain Diff

Merge pull request #4287 from thinkyhead/rc_long_print_times

Allow stopwatch and printcounter to go over 18:12:15

parents 60809245 c5e51f6b

Branches

Tags

Loading

Changes 12

Hide whitespace changes

Inline Side-by-side

Showing

Marlin/Marlin_main.cpp 14 additions, 12 deletions

Marlin/Marlin_main.cpp
Marlin/cardreader.cpp 3 additions, 3 deletions

Marlin/cardreader.cpp
Marlin/dogm_lcd_implementation.h 1 addition, 1 deletion

Marlin/dogm_lcd_implementation.h
Marlin/language_cz.h 6 additions, 6 deletions

Marlin/language_cz.h
Marlin/language_de.h 10 additions, 3 deletions

Marlin/language_de.h
Marlin/language_el.h 36 additions, 27 deletions

Marlin/language_el.h
Marlin/language_en.h 13 additions, 6 deletions

Marlin/language_en.h
Marlin/printcounter.cpp 8 additions, 9 deletions

Marlin/printcounter.cpp
Marlin/printcounter.h 4 additions, 4 deletions

Marlin/printcounter.h
Marlin/stopwatch.cpp 2 additions, 2 deletions

Marlin/stopwatch.cpp
Marlin/stopwatch.h 4 additions, 4 deletions

Marlin/stopwatch.h
Marlin/ultralcd.cpp 6 additions, 6 deletions

Marlin/ultralcd.cpp

with 107 additions and 83 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