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

2fb2a0a1

Commit 2fb2a0a1 authored 11 years ago by bkubicek

Downloads
- Plain Diff

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

parents 39d88bcc 8a08cca0

Branches

Tags

No related merge requests found

Changes 11

Show whitespace changes

Inline Side-by-side

Showing

Marlin/BlinkM.cpp 29 additions, 0 deletions

Marlin/BlinkM.cpp
Marlin/BlinkM.h 14 additions, 0 deletions

Marlin/BlinkM.h
Marlin/Configuration.h 12 additions, 6 deletions

Marlin/Configuration.h
Marlin/Configuration_adv.h 19 additions, 0 deletions

Marlin/Configuration_adv.h
Marlin/Marlin.h 7 additions, 2 deletions

Marlin/Marlin.h
Marlin/Marlin_main.cpp 93 additions, 7 deletions

Marlin/Marlin_main.cpp
Marlin/pins.h 7 additions, 0 deletions

Marlin/pins.h
Marlin/stepper.cpp 32 additions, 0 deletions

Marlin/stepper.cpp
Marlin/temperature.h 14 additions, 0 deletions

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

Marlin/ultralcd.cpp
Marlin/ultralcd_implementation_hitachi_HD44780.h 761 additions, 750 deletions

Marlin/ultralcd_implementation_hitachi_HD44780.h

with 989 additions and 767 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