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

6834e368

Commit 6834e368 authored 8 years ago by Scott Lahteine Committed by GitHub 8 years ago

Downloads
- Plain Diff

Merge pull request #6567 from thinkyhead/rc_sdcard_stop

Shutdown heaters, autotemp on SD Cancel

parents 11b6a3cb 399efd66

Branches

Tags

Loading

Changes 7

Hide whitespace changes

Inline Side-by-side

Showing

.travis.yml 1 addition, 1 deletion

.travis.yml
Marlin/Marlin_main.cpp 1 addition, 8 deletions

Marlin/Marlin_main.cpp
Marlin/cardreader.cpp 1 addition, 1 deletion

Marlin/cardreader.cpp
Marlin/language_en.h 1 addition, 1 deletion

Marlin/language_en.h
Marlin/temperature.cpp 7 additions, 1 deletion

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

Marlin/temperature.h
Marlin/ultralcd.cpp 3 additions, 2 deletions

Marlin/ultralcd.cpp

with 14 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