josh
/
Prusa-Firmware
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #3495 from wavexx/extrude_min_temp 

Replace EXTRUDE_MINTEMP with the configurable extrude_min_temp
This commit is contained in:
Alex Voinea 2022-07-05 12:02:26 +02:00 committed by GitHub
parent 9466945532 d53eb69150
commit 56bc2f1a0c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 15 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Firmware/Marlin_main.cpp
View File

@ -3376,7 +3376,7 @@ static void gcode_G80()
go_home_with_z_lift(); go_home_with_z_lift();
// SERIAL_ECHOLNPGM("Go home finished"); // SERIAL_ECHOLNPGM("Go home finished");
//unretract (after PINDA preheat retraction) //unretract (after PINDA preheat retraction)
if ((degHotend(active_extruder) > EXTRUDE_MINTEMP) && eeprom_read_byte((unsigned char *)EEPROM_TEMP_CAL_ACTIVE) && calibration_status_pinda() && (target_temperature_bed >= 50)) { if (((int)degHotend(active_extruder) > extrude_min_temp) && eeprom_read_byte((unsigned char *)EEPROM_TEMP_CAL_ACTIVE) && calibration_status_pinda() && (target_temperature_bed >= 50)) {
current_position[E_AXIS] += default_retraction; current_position[E_AXIS] += default_retraction;
plan_buffer_line_curposXYZE(400); plan_buffer_line_curposXYZE(400);
} }
@ -7729,8 +7729,8 @@ Sigma_Exit:
*/ */
case 302: case 302:
{ {
float temp = .0; int temp = 0;
if (code_seen('S')) temp=code_value(); if (code_seen('S')) temp=code_value_short();
set_extrude_min_temp(temp); set_extrude_min_temp(temp);
} }
break; break;
@ -9679,7 +9679,7 @@ static uint16_t nFSCheckCount=0;
#ifdef PAT9125 #ifdef PAT9125
fsensor_autoload_check_stop(); fsensor_autoload_check_stop();
#endif //PAT9125 #endif //PAT9125
//-// if (degHotend0() > EXTRUDE_MINTEMP) //-// if ((int)degHotend0() > extrude_min_temp)
if(0) if(0)
{ {
Sound_MakeCustom(50,1000,false); Sound_MakeCustom(50,1000,false);
@ -9695,7 +9695,7 @@ if(0)
*/ */
eFilamentAction=FilamentAction::AutoLoad; eFilamentAction=FilamentAction::AutoLoad;
bFilamentFirstRun=false; bFilamentFirstRun=false;
if(target_temperature[0]>=EXTRUDE_MINTEMP){ if(target_temperature[0] >= extrude_min_temp){
bFilamentPreheatState=true; bFilamentPreheatState=true;
// mFilamentItem(target_temperature[0],target_temperature_bed); // mFilamentItem(target_temperature[0],target_temperature_bed);
menu_submenu(mFilamentItemForce); menu_submenu(mFilamentItemForce);
@ -10620,7 +10620,7 @@ static void temp_compensation_start() {
custom_message_type = CustomMsg::TempCompPreheat; custom_message_type = CustomMsg::TempCompPreheat;
custom_message_state = PINDA_HEAT_T + 1; custom_message_state = PINDA_HEAT_T + 1;
lcd_update(2); lcd_update(2);
if (degHotend(active_extruder) > EXTRUDE_MINTEMP) { if ((int)degHotend(active_extruder) > extrude_min_temp) {
current_position[E_AXIS] -= default_retraction; current_position[E_AXIS] -= default_retraction;
} }
plan_buffer_line_curposXYZE(400, active_extruder); plan_buffer_line_curposXYZE(400, active_extruder);

8
Firmware/planner.cpp
View File

@ -122,7 +122,7 @@ static uint8_t g_cntr_planner_queue_min = 0;
//=============================private variables ============================ //=============================private variables ============================
//=========================================================================== //===========================================================================
#ifdef PREVENT_DANGEROUS_EXTRUDE #ifdef PREVENT_DANGEROUS_EXTRUDE
float extrude_min_temp=EXTRUDE_MINTEMP; int extrude_min_temp = EXTRUDE_MINTEMP;
#endif #endif
#ifdef LIN_ADVANCE #ifdef LIN_ADVANCE
@ -833,7 +833,7 @@ void plan_buffer_line(float x, float y, float z, const float &e, float feed_rate
#ifdef PREVENT_DANGEROUS_EXTRUDE #ifdef PREVENT_DANGEROUS_EXTRUDE
if(target[E_AXIS]!=position[E_AXIS]) if(target[E_AXIS]!=position[E_AXIS])
{ {
if(degHotend(active_extruder)<extrude_min_temp) if((int)degHotend(active_extruder)<extrude_min_temp)
{ {
position[E_AXIS]=target[E_AXIS]; //behave as if the move really took place, but ignore E part position[E_AXIS]=target[E_AXIS]; //behave as if the move really took place, but ignore E part
#ifdef LIN_ADVANCE #ifdef LIN_ADVANCE
@ -1434,9 +1434,9 @@ void plan_reset_next_e()
} }
#ifdef PREVENT_DANGEROUS_EXTRUDE #ifdef PREVENT_DANGEROUS_EXTRUDE
void set_extrude_min_temp(float temp) void set_extrude_min_temp(int temp)
{ {
extrude_min_temp=temp; extrude_min_temp = temp;
} }
#endif #endif

3
Firmware/planner.h
View File

@ -262,7 +262,8 @@ extern void planner_abort_hard();
extern bool waiting_inside_plan_buffer_line_print_aborted; extern bool waiting_inside_plan_buffer_line_print_aborted;
#ifdef PREVENT_DANGEROUS_EXTRUDE #ifdef PREVENT_DANGEROUS_EXTRUDE
void set_extrude_min_temp(float temp); extern int extrude_min_temp;
void set_extrude_min_temp(int temp);
#endif #endif
void reset_acceleration_rates(); void reset_acceleration_rates();

6
Firmware/ultralcd.cpp
View File

@ -2312,7 +2312,7 @@ static void lcd_menu_AutoLoadFilament()
static void preheat_or_continue() static void preheat_or_continue()
{ {
bFilamentFirstRun = false; bFilamentFirstRun = false;
if (target_temperature[0] >= EXTRUDE_MINTEMP) if (target_temperature[0] >= extrude_min_temp)
{ {
bFilamentPreheatState = true; bFilamentPreheatState = true;
mFilamentItem(target_temperature[0], target_temperature_bed); mFilamentItem(target_temperature[0], target_temperature_bed);
@ -2445,7 +2445,7 @@ static void _lcd_move(const char *name, uint8_t axis, int min, int max)
void lcd_move_e() void lcd_move_e()
{ {
if (degHotend0() > EXTRUDE_MINTEMP) if ((int)degHotend0() > extrude_min_temp)
{ {
if (lcd_encoder != 0) if (lcd_encoder != 0)
{ {
@ -5555,7 +5555,7 @@ static void mmu_cut_filament_menu()
{ {
eFilamentAction=FilamentAction::MmuCut; eFilamentAction=FilamentAction::MmuCut;
bFilamentFirstRun=false; bFilamentFirstRun=false;
if(target_temperature[0]>=EXTRUDE_MINTEMP) if(target_temperature[0] >= extrude_min_temp)
{ {
bFilamentPreheatState=true; bFilamentPreheatState=true;
mFilamentItem(target_temperature[0],target_temperature_bed); mFilamentItem(target_temperature[0],target_temperature_bed);