Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Introduce temp watch protection for the bed #3653

Merged

Conversation

thinkyhead
Copy link
Member

Squashed commits from #3554.

scalez and others added 2 commits May 1, 2016 13:12
When setting the bed temp via M140/M190 if the thermistor does not read an increase of WATCH_BED_TEMP_INCREASE degrees by WATCH_BED_TEMP_PERIOD seconds then it will throw "Error:Heating failed, system stopped! Heater_ID: bed" and call the kill() function.

Conflicts:
	Marlin/Configuration_adv.h
@thinkyhead thinkyhead merged commit 60c6efb into MarlinFirmware:RCBugFix May 1, 2016
@thinkyhead thinkyhead deleted the rc_bed_temp_watch_merge branch May 1, 2016 20:58
@scalez
Copy link
Contributor

scalez commented May 2, 2016

@thinkyhead thanks! We're going to start doing dangerous changes like squashing to our PR branches now,.

@thinkyhead
Copy link
Member Author

@scalez Nothing dangerous as long as you're working on your own branches. And as long as you make a copy before you start messing around, you'll never lose your work.

git checkout -b backup_branch_before_rebase

@thinkyhead thinkyhead mentioned this pull request Jul 8, 2016
@jbrazio jbrazio modified the milestone: 1.1.0 Jul 18, 2016
drewmoseley pushed a commit to drewmoseley/Marlin that referenced this pull request Nov 8, 2023
cleanup: Fix more spourious missing return warnings
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants