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

84d9cf73

Commit 84d9cf73 authored 13 years ago by Erik van der Zalm

Downloads
- Plain Diff

merging

parents e0172285 3320a5b3

Branches

Tags

No related merge requests found

Changes 12

Show whitespace changes

Inline Side-by-side

Showing

Marlin/Configuration.h 24 additions, 8 deletions

Marlin/Configuration.h
Marlin/Marlin.h 2 additions, 0 deletions

Marlin/Marlin.h
Marlin/Marlin.pde 103 additions, 38 deletions

Marlin/Marlin.pde
Marlin/cardreader.h 1 addition, 0 deletions

Marlin/cardreader.h
Marlin/cardreader.pde 6 additions, 2 deletions

Marlin/cardreader.pde
Marlin/planner.cpp 26 additions, 2 deletions

Marlin/planner.cpp
Marlin/planner.h 12 additions, 0 deletions

Marlin/planner.h
Marlin/stepper.cpp 12 additions, 2 deletions

Marlin/stepper.cpp
Marlin/stepper.h 1 addition, 1 deletion

Marlin/stepper.h
Marlin/temperature.cpp 16 additions, 1 deletion

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

Marlin/temperature.h
Marlin/ultralcd.pde 11 additions, 6 deletions

Marlin/ultralcd.pde

with 358 additions and 203 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