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

a375d648

Commit a375d648 authored 10 years ago by chrono

Downloads
- Plain Diff

Merge remote-tracking branch 'upstream/Development' into Development

parents 558c6313 715104e4

Loading

Changes 14

Expand all Show whitespace changes

Inline Side-by-side

Showing

Marlin/BlinkM.cpp 1 addition, 8 deletions

Marlin/BlinkM.cpp
Marlin/BlinkM.h 3 additions, 4 deletions

Marlin/BlinkM.h
Marlin/ConfigurationStore.h 3 additions, 3 deletions

Marlin/ConfigurationStore.h
Marlin/Marlin.h 2 additions, 2 deletions

Marlin/Marlin.h
Marlin/Marlin_main.cpp 10 additions, 10 deletions

Marlin/Marlin_main.cpp
Marlin/cardreader.cpp 252 additions, 378 deletions

Marlin/cardreader.cpp
Marlin/cardreader.h 30 additions, 34 deletions

Marlin/cardreader.h
Marlin/digipot_mcp4451.cpp 38 additions, 39 deletions

Marlin/digipot_mcp4451.cpp
Marlin/language.h 37 additions, 0 deletions

Marlin/language.h
Marlin/language_en.h 34 additions, 16 deletions

Marlin/language_en.h
Marlin/pins_RUMBA.h 4 additions, 0 deletions

Marlin/pins_RUMBA.h
Marlin/stepper.cpp 71 additions, 76 deletions

Marlin/stepper.cpp
Marlin/temperature.cpp 912 additions, 1266 deletions

Marlin/temperature.cpp
Marlin/temperature.h 39 additions, 72 deletions

Marlin/temperature.h

with 1436 additions and 1908 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