andrey/Marlin_FB4S
Archived
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Squashed commit of the following:

Browse Source 
commit ecb08b15be
Merge: 798d12c2af 854ce63358
Author: Sergey <sergey@terentiev.me>
Date:   Wed Dec 22 11:58:28 2021 +0300

    Merge branch '2.0.x' into vanilla_fb_2.0.x

commit 854ce63358
Author: Robby Candra <robbycandra.mail@gmail.com>
Date:   Sun Dec 19 05:33:21 2021 +0700

    🐛 Fix loud_kill heater disable (#23314)

commit 170f77fada
Author: lukrow80 <64228214+lukrow80@users.noreply.github.com>
Date:   Tue Nov 23 22:30:13 2021 +0100

    🐛 Fix homing current for extra axes (#23152)

    Followup to #19112

commit 72b99bf1ba
Author: InsanityAutomation <38436470+InsanityAutomation@users.noreply.github.com>
Date:   Sat Oct 9 19:13:19 2021 -0400

    🐛 Fix IDEX Duplication Mode Positioning (#22914)

    Fixing #22538

commit 1a8583f4fc
Author: Robby Candra <robbycandra.mail@gmail.com>
Date:   Wed Nov 24 04:19:32 2021 +0700

    🐛 Fix serial_data_available (#23160)
This commit is contained in:
Sergey
2021-12-22 12:00:30 +03:00
parent f8c2940f89
commit 1ce69f55df
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Marlin/src/module/temperature.cpp
View File

@@ -953,8 +953,8 @@ int16_t Temperature::getHeaterPower(const heater_id_t heater_id) {
inline void loud_kill(PGM_P const lcd_msg, const heater_id_t heater_id) {
marlin_state = MF_KILLED;
thermalManager.disable_all_heaters();
#if USE_BEEPER
thermalManager.disable_all_heaters();
for (uint8_t i = 20; i--;) {
WRITE(BEEPER_PIN, HIGH);
delay(25);