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

b81021f4

Commit b81021f4 authored 10 years ago by Neil Darlow

Downloads
- Plain Diff

Merge https://github.com/ErikZalm/Marlin into Marlin_v1

parents 6c5a460e 72419745

Branches

Tags

Loading

Changes 17

Hide whitespace changes

Inline Side-by-side

Showing

Marlin/Configuration.h 32 additions, 2 deletions

Marlin/Configuration.h
Marlin/ConfigurationStore.cpp 6 additions, 6 deletions

Marlin/ConfigurationStore.cpp
Marlin/Marlin.h 11 additions, 1 deletion

Marlin/Marlin.h
Marlin/MarlinSerial.cpp 1 addition, 1 deletion

Marlin/MarlinSerial.cpp
Marlin/Marlin_main.cpp 116 additions, 28 deletions

Marlin/Marlin_main.cpp
Marlin/example_configurations/delta/Configuration.h 30 additions, 21 deletions

Marlin/example_configurations/delta/Configuration.h
Marlin/language.h 14 additions, 3 deletions

Marlin/language.h
Marlin/motion_control.cpp 8 additions, 0 deletions

Marlin/motion_control.cpp
Marlin/pins.h 22 additions, 6 deletions

Marlin/pins.h
Marlin/planner.cpp 47 additions, 0 deletions

Marlin/planner.cpp
Marlin/stepper.cpp 1 addition, 1 deletion

Marlin/stepper.cpp
Marlin/temperature.cpp 117 additions, 6 deletions

Marlin/temperature.cpp
Marlin/temperature.h 8 additions, 0 deletions

Marlin/temperature.h
Marlin/thermistortables.h 69 additions, 0 deletions

Marlin/thermistortables.h
Marlin/ultralcd.cpp 27 additions, 1 deletion

Marlin/ultralcd.cpp
Marlin/ultralcd_implementation_hitachi_HD44780.h 1 addition, 1 deletion

Marlin/ultralcd_implementation_hitachi_HD44780.h
README.md 4 additions, 0 deletions

README.md

with 514 additions and 77 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