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

3f20f37c

Commit 3f20f37c authored 13 years ago by daid

Downloads
- Plain Diff

Merge remote branch 'upstream/Marlin_v1' into Marlin_v1

parents b447815d fa2e1be0

Branches

Tags

Loading

Changes 7

Show whitespace changes

Inline Side-by-side

Showing

Marlin/Configuration.h 1 addition, 1 deletion

Marlin/Configuration.h
Marlin/Makefile 160 additions, 264 deletions

Marlin/Makefile
Marlin/Marlin.pde 8 additions, 9 deletions

Marlin/Marlin.pde
Marlin/cardreader.cpp 3 additions, 0 deletions

Marlin/cardreader.cpp
Marlin/pins.h 43 additions, 0 deletions

Marlin/pins.h
Marlin/speed_lookuptable.h 1 addition, 1 deletion

Marlin/speed_lookuptable.h
Marlin/temperature.cpp 5 additions, 5 deletions

Marlin/temperature.cpp

with 221 additions and 280 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