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

34da3a0a

Commit 34da3a0a authored 11 years ago by Guillaume Seguin

Downloads
- Plain Diff

Merge github.com:ErikZalm/Marlin into Marlin_v1

Conflicts:
	Marlin/language.h

parents 2daa8591 a105e100

Branches

Tags

Loading

Changes 14

Hide whitespace changes

Inline Side-by-side

Showing

Marlin/Configuration.h 27 additions, 6 deletions

Marlin/Configuration.h
Marlin/ConfigurationStore.cpp 12 additions, 1 deletion

Marlin/ConfigurationStore.cpp
Marlin/Configuration_adv.h 25 additions, 6 deletions

Marlin/Configuration_adv.h
Marlin/Makefile 6 additions, 0 deletions

Marlin/Makefile
Marlin/Marlin.h 5 additions, 1 deletion

Marlin/Marlin.h
Marlin/Marlin_main.cpp 148 additions, 25 deletions

Marlin/Marlin_main.cpp
Marlin/cardreader.cpp 0 additions, 1 deletion

Marlin/cardreader.cpp
Marlin/dogm_lcd_implementation.h 14 additions, 2 deletions

Marlin/dogm_lcd_implementation.h
Marlin/language.h 111 additions, 97 deletions

Marlin/language.h
Marlin/pins.h 25 additions, 2 deletions

Marlin/pins.h
Marlin/stepper.cpp 66 additions, 22 deletions

Marlin/stepper.cpp
Marlin/ultralcd.cpp 122 additions, 52 deletions

Marlin/ultralcd.cpp
Marlin/ultralcd.h 49 additions, 1 deletion

Marlin/ultralcd.h
README.md 12 additions, 10 deletions

README.md

with 622 additions and 226 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