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

ac82411c

Commit ac82411c authored 13 years ago by Erik van der Zalm

Downloads
- Plain Diff

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

parents 65934eee 9980ceb4

Branches

Tags

Loading

Changes 16

Show whitespace changes

Inline Side-by-side

Showing

Marlin/Configuration.h 161 additions, 107 deletions

Marlin/Configuration.h
Marlin/EEPROMwrite.h 107 additions, 59 deletions

Marlin/EEPROMwrite.h
Marlin/Marlin.h 46 additions, 5 deletions

Marlin/Marlin.h
Marlin/Marlin.pde 158 additions, 97 deletions

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

Marlin/cardreader.h
Marlin/cardreader.pde 26 additions, 21 deletions

Marlin/cardreader.pde
Marlin/pins.h 693 additions, 693 deletions

Marlin/pins.h
Marlin/planner.cpp 36 additions, 2 deletions

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

Marlin/planner.h
Marlin/stepper.cpp 56 additions, 4 deletions

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

Marlin/stepper.h
Marlin/streaming.h 0 additions, 84 deletions

Marlin/streaming.h
Marlin/temperature.cpp 19 additions, 11 deletions

Marlin/temperature.cpp
Marlin/ultralcd.h 1 addition, 0 deletions

Marlin/ultralcd.h
Marlin/ultralcd.pde 85 additions, 57 deletions

Marlin/ultralcd.pde
Marlin/watchdog.pde 4 additions, 3 deletions

Marlin/watchdog.pde

with 1434 additions and 1147 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