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

95a0b28a

Commit 95a0b28a authored 13 years ago by Erik van der Zalm

Downloads
- Plain Diff

Merge branch 'Marlin_v1', remote-tracking branch 'origin/Marlin_v1' into Marlin_v1

parents af22e9cd 7714b98d

Branches

Tags

Loading

Changes 14

Expand all Hide whitespace changes

Inline Side-by-side

Showing

Marlin/Configuration.h 1 addition, 0 deletions

Marlin/Configuration.h
Marlin/Marlin.h 15 additions, 6 deletions

Marlin/Marlin.h
Marlin/Marlin.pde 5 additions, 2 deletions

Marlin/Marlin.pde
Marlin/MarlinSerial.cpp 1 addition, 0 deletions

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

Marlin/MarlinSerial.h
Marlin/cardreader.h 1 addition, 1 deletion

Marlin/cardreader.h
Marlin/cardreader.pde 2 additions, 1 deletion

Marlin/cardreader.pde
Marlin/planner.cpp 14 additions, 11 deletions

Marlin/planner.cpp
Marlin/stepper.cpp 4 additions, 3 deletions

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

Marlin/stepper.h
Marlin/temperature.cpp 14 additions, 5 deletions

Marlin/temperature.cpp
Marlin/temperature.h 15 additions, 3 deletions

Marlin/temperature.h
Marlin/ultralcd.h 2 additions, 3 deletions

Marlin/ultralcd.h
Marlin/ultralcd.pde 439 additions, 412 deletions

Marlin/ultralcd.pde

with 515 additions and 449 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