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

4f6120f7

Commit 4f6120f7 authored 8 years ago by Scott Lahteine

Downloads
- Plain Diff

Merge pull request #3643 from thinkyhead/rc_singletons_plus_temperature

Temperature singleton

parents a5a6b868 084f6b5b

Branches

Tags

No related merge requests found

Changes 12

Expand all Hide whitespace changes

Inline Side-by-side

Showing

Marlin/Conditionals.h 2 additions, 0 deletions

Marlin/Conditionals.h
Marlin/Marlin.h 0 additions, 4 deletions

Marlin/Marlin.h
Marlin/Marlin_main.cpp 60 additions, 66 deletions

Marlin/Marlin_main.cpp
Marlin/cardreader.cpp 1 addition, 1 deletion

Marlin/cardreader.cpp
Marlin/configuration_store.cpp 28 additions, 30 deletions

Marlin/configuration_store.cpp
Marlin/dogm_lcd_implementation.h 3 additions, 3 deletions

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

Marlin/endstops.cpp
Marlin/planner.cpp 10 additions, 9 deletions

Marlin/planner.cpp
Marlin/temperature.cpp 94 additions, 288 deletions

Marlin/temperature.cpp
Marlin/temperature.h 292 additions, 143 deletions

Marlin/temperature.h
Marlin/ultralcd.cpp 39 additions, 31 deletions

Marlin/ultralcd.cpp
Marlin/ultralcd_implementation_hitachi_HD44780.h 10 additions, 10 deletions

Marlin/ultralcd_implementation_hitachi_HD44780.h

with 540 additions and 586 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