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

Fix too cold in m600 #19332

Merged
merged 4 commits into from
Sep 10, 2020
Merged

Fix too cold in m600 #19332

merged 4 commits into from
Sep 10, 2020

Conversation

GMagician
Copy link
Contributor

Followup recent fixes to fix #19073.

This error is raised before load and unload are called, but now these functions will heat up extruder then this error is not required anymore
Since pause may fail now just because it's nestly called, no need to clear cleanup state
- Removed unused messages
- Fix no load filament (if temp is overshooting "hotEnoughToExtrude" may prevent load but since "load_filament" ensure temp is correct, such test is sensless now
@GMagician GMagician marked this pull request as ready for review September 10, 2020 18:57
@qwewer0
Copy link
Contributor

qwewer0 commented Sep 10, 2020

I get the following warnings after the latest changes:

Marlin\src\feature\pause.cpp: In function 'void resume_print(const float&, const float&, const float&, int8_t, int16_t)':
Marlin\src\feature\pause.cpp:595:3: warning: this 'if' clause does not guard... [-Wmisleading-indentation]
   if (targetTemp > thermalManager.degTargetHotend(active_extruder))
   ^~
Marlin\src\feature\pause.cpp:599:5: note: ...this statement, but the latter is misleadingly indented as if it were guarded by the 'if'
     load_filament(slow_load_length, fast_load_length, purge_length, max_beep_count, true, nozzle_timed_out, PAUSE_MODE_SAME DXC_PASS);

this 'if' clause does not guard... [-Wmisleading-indentation]

@GMagician
Copy link
Contributor Author

@qwewer0 I don't see such warning. Are you using platformIO?

@GMagician
Copy link
Contributor Author

@qwewer0 try now. Not sure about last commit

@qwewer0
Copy link
Contributor

qwewer0 commented Sep 10, 2020

No warnings now (at least not related to this), but I think I should have updated everything before opening my mouth...

@thinkyhead thinkyhead merged commit b2ba900 into MarlinFirmware:bugfix-2.0.x Sep 10, 2020
@GMagician GMagician deleted the Fix-too-cold-in-m600 branch September 11, 2020 09:22
vgadreau pushed a commit to vgadreau/Marlin that referenced this pull request Dec 9, 2020
kageurufu pushed a commit to CR30-Users/Marlin-CR30 that referenced this pull request Apr 30, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants