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

c0ca26cd

Commit c0ca26cd authored 10 years ago by Scott Lahteine

Downloads
- Plain Diff

Merge branch 'Development' into fixup_probing

Latest upstream commits

parents 92119d0f 5c1f08a3

Loading

Changes 11

Hide whitespace changes

Inline Side-by-side

Showing

.gitignore 9 additions, 0 deletions

.gitignore
ArduinoAddons/Arduino_1.5.x/hardware/marlin/avr/platform.local.txt 1 addition, 0 deletions

...dons/Arduino_1.5.x/hardware/marlin/avr/platform.local.txt
Marlin/Conditionals.h 3 additions, 0 deletions

Marlin/Conditionals.h
Marlin/Configuration.h 21 additions, 0 deletions

Marlin/Configuration.h
Marlin/Marlin_main.cpp 25 additions, 6 deletions

Marlin/Marlin_main.cpp
Marlin/SanityCheck.h 30 additions, 4 deletions

Marlin/SanityCheck.h
Marlin/boards.h 1 addition, 0 deletions

Marlin/boards.h
Marlin/language.h 29 additions, 5 deletions

Marlin/language.h
Marlin/pins.h 5 additions, 1 deletion

Marlin/pins.h
Marlin/pins_RAMPS_13.h 6 additions, 0 deletions

Marlin/pins_RAMPS_13.h
Marlin/stepper.cpp 46 additions, 3 deletions

Marlin/stepper.cpp

with 176 additions and 19 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