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

cdaaad3d

"git@jonasled.dev:jonasled/marlin-anet-a8.git" did not exist on "02de8e6f180aa20b683ccc9ed4bbe718e20617b6"

Commit cdaaad3d authored 11 years ago by Erik van der Zalm

Downloads
- Plain Diff

Merge branch 'Marlin_v1' of https://github.com/makr3d/Marlin into makr3d-Marlin_v1

parents e3bdefd8 e509cdbe

Loading

Changes 9

Hide whitespace changes

Inline Side-by-side

Showing

Marlin/Configuration.h 23 additions, 4 deletions

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

Marlin/ConfigurationStore.cpp
Marlin/Makefile 6 additions, 0 deletions

Marlin/Makefile
Marlin/Marlin_main.cpp 14 additions, 0 deletions

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

Marlin/dogm_lcd_implementation.h
Marlin/language.h 9 additions, 2 deletions

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

Marlin/pins.h
Marlin/ultralcd.cpp 40 additions, 0 deletions

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

Marlin/ultralcd.h

with 149 additions and 12 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