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

1db02c28

Commit 1db02c28 authored 10 years ago by Scott Lahteine

Downloads
- Plain Diff

Merge branch 'Development' into fixup_temperature

Merge upstream changes

parents 1a7b0d9a a99470fb

Branches

Tags

No related merge requests found

Changes 11

Hide whitespace changes

Inline Side-by-side

Showing

Marlin/Configuration.h 12 additions, 1 deletion

Marlin/Configuration.h
Marlin/Marlin_main.cpp 28 additions, 14 deletions

Marlin/Marlin_main.cpp
Marlin/example_configurations/Hephestos/Configuration.h 8 additions, 0 deletions

Marlin/example_configurations/Hephestos/Configuration.h
Marlin/example_configurations/K8200/Configuration.h 8 additions, 0 deletions

Marlin/example_configurations/K8200/Configuration.h
Marlin/example_configurations/SCARA/Configuration.h 8 additions, 0 deletions

Marlin/example_configurations/SCARA/Configuration.h
Marlin/example_configurations/WITBOX/Configuration.h 8 additions, 0 deletions

Marlin/example_configurations/WITBOX/Configuration.h
Marlin/example_configurations/delta/Configuration.h 8 additions, 0 deletions

Marlin/example_configurations/delta/Configuration.h
Marlin/example_configurations/makibox/Configuration.h 8 additions, 0 deletions

Marlin/example_configurations/makibox/Configuration.h
Marlin/example_configurations/tvrrug/Round2/Configuration.h 8 additions, 0 deletions

Marlin/example_configurations/tvrrug/Round2/Configuration.h
Marlin/pins_RAMPS_13.h 16 additions, 6 deletions

Marlin/pins_RAMPS_13.h
Marlin/thermistortables.h 17 additions, 4 deletions

Marlin/thermistortables.h

with 129 additions and 25 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