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.

Sign up for GitHub

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

G80: Fix false FINDA runout event for MK3S users #4332

Merged
merged 2 commits into from
Aug 17, 2023
Merged

G80: Fix false FINDA runout event for MK3S users #4332

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
43c530d
G80: Don't unretract unless retracting first
gudnimg Aug 16, 2023
a36740c
MMU: Disable FINDA runout during Homing and MBL
gudnimg Aug 16, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 12 additions & 3 deletions Firmware/Marlin_main.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -228,6 +228,10 @@ uint8_t newFanSpeed = 0;
float retract_recover_length_swap = RETRACT_RECOVER_LENGTH_SWAP;
#endif

#ifndef PINDA_THERMISTOR
static bool temp_compensation_retracted = false;
#endif // !PINDA_THERMISTOR

#ifdef PS_DEFAULT_OFF
bool powersupply = false;
#else
Expand Down Expand Up @@ -524,6 +528,8 @@ bool check_fsensor() {
return printJobOngoing()
&& mcode_in_progress != 600
&& !saved_printing
&& !mesh_bed_leveling_flag
&& !homing_flag
&& e_active();
}

Expand Down Expand Up @@ -3159,11 +3165,14 @@ static void gcode_G80()
// SERIAL_ECHOLNPGM("Mesh bed leveling activated");
go_home_with_z_lift();
// SERIAL_ECHOLNPGM("Go home finished");
#ifndef PINDA_THERMISTOR
//unretract (after PINDA preheat retraction)
if (((int)degHotend(active_extruder) > extrude_min_temp) && eeprom_read_byte((unsigned char *)EEPROM_TEMP_CAL_ACTIVE) && calibration_status_pinda() && (target_temperature_bed >= 50)) {
if (temp_compensation_retracted) {
temp_compensation_retracted = false;
current_position[E_AXIS] += default_retraction;
plan_buffer_line_curposXYZE(400);
}
#endif // !PINDA_THERMISTOR
KEEPALIVE_STATE(NOT_BUSY);
// Restore custom message state
lcd_setstatuspgm(MSG_WELCOME);
Expand Down Expand Up @@ -10237,11 +10246,11 @@ void bed_analysis(float x_dimension, float y_dimension, int x_points_num, int y_

#ifndef PINDA_THERMISTOR
static void temp_compensation_start() {

custom_message_type = CustomMsg::TempCompPreheat;
custom_message_state = PINDA_HEAT_T + 1;
lcd_update(2);
if ((int)degHotend(active_extruder) > extrude_min_temp) {
if (!temp_compensation_retracted && (int)degHotend(active_extruder) > extrude_min_temp) {
temp_compensation_retracted = true;
current_position[E_AXIS] -= default_retraction;
}
plan_buffer_line_curposXYZE(400);
Expand Down