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

22a43980

Commit 22a43980 authored 9 years ago by Scott Lahteine

Downloads
- Plain Diff

Merge pull request #3339 from thinkyhead/rc_has_temp_hotend

Add HAS_TEMP_HOTEND, account for MAX31855 in conditionals

parents cf9a171a 877fb1f5

No related branches found

No related tags found

No related merge requests found

Changes 4

Show whitespace changes

Inline Side-by-side

Showing

Marlin/Conditionals.h 19 additions, 9 deletions

Marlin/Conditionals.h
Marlin/Marlin.h 1 addition, 1 deletion

Marlin/Marlin.h
Marlin/Marlin_main.cpp 5 additions, 5 deletions

Marlin/Marlin_main.cpp
Marlin/temperature.cpp 2 additions, 2 deletions

Marlin/temperature.cpp

with 27 additions and 17 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