Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

marlin-anet-a8
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Environments
- Terraform modules
- Incidents
- Service Desk

Snippets Groups Projects

Jonas Leder
marlin-anet-a8
Commits
fcd9de72

Commit fcd9de72 authored Dec 9, 2012 by Daid

Downloads
- Plain Diff

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

parents 32d4373e b3ddbcee

Branches

Tags

No related merge requests found

Changes 7

Show whitespace changes

Inline Side-by-side

Showing

Marlin/Configuration.h 2 additions, 0 deletions

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

Marlin/Marlin.h
Marlin/MarlinSerial.cpp 2 additions, 3 deletions

Marlin/MarlinSerial.cpp
Marlin/MarlinSerial.h 2 additions, 2 deletions

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

Marlin/fastio.h
Marlin/pins.h 107 additions, 31 deletions

Marlin/pins.h
Marlin/stepper.cpp 3 additions, 3 deletions

Marlin/stepper.cpp

with 123 additions and 44 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