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

4bababf5

Commit 4bababf5 authored 13 years ago by Bernhard

Downloads
- Plain Diff

Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into Marlin_v1

parents f312216e 554cc171

Branches

Tags fess-10.0.1

Loading

Changes 14

Expand all Show whitespace changes

Inline Side-by-side

Showing

Marlin/Configuration.h 38 additions, 27 deletions

Marlin/Configuration.h
Marlin/Marlin.h 25 additions, 5 deletions

Marlin/Marlin.h
Marlin/Marlin.pde 78 additions, 46 deletions

Marlin/Marlin.pde
Marlin/cardreader.pde 1 addition, 1 deletion

Marlin/cardreader.pde
Marlin/fastio.h 2581 additions, 2558 deletions

Marlin/fastio.h
Marlin/pins.h 736 additions, 694 deletions

Marlin/pins.h
Marlin/planner.cpp 9 additions, 17 deletions

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

Marlin/planner.h
Marlin/stepper.cpp 90 additions, 37 deletions

Marlin/stepper.cpp
Marlin/stepper.h 15 additions, 0 deletions

Marlin/stepper.h
Marlin/temperature.cpp 327 additions, 220 deletions

Marlin/temperature.cpp
Marlin/temperature.h 67 additions, 51 deletions

Marlin/temperature.h
Marlin/thermistortables.h 54 additions, 93 deletions

Marlin/thermistortables.h
Marlin/ultralcd.pde 1848 additions, 1844 deletions

Marlin/ultralcd.pde

with 5869 additions and 5595 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