SunRed/Marlin-Artillery-M600
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge pull request #4222 from thinkyhead/rc_allow_cold_extrude

Browse source 
M302: Add "P" parameter, status output
This commit is contained in:
Scott Lahteine 2016-07-12 20:40:14 -07:00 committed by GitHub
commit e5c7af5ddc
3 changed files with 85 additions and 59 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
Marlin/Marlin_main.cpp
View file

@ -5697,10 +5697,36 @@ inline void gcode_M226() {
#if ENABLED(PREVENT_DANGEROUS_EXTRUDE) #if ENABLED(PREVENT_DANGEROUS_EXTRUDE)
/** /**
* M302: Allow cold extrudes, or set the minimum extrude S<temperature>. * M302: Allow cold extrudes, or set the minimum extrude temperature
*
* S<temperature> sets the minimum extrude temperature
* P<bool> enables (1) or disables (0) cold extrusion
*
* Examples:
*
* M302 ; report current cold extrusion state
* M302 P0 ; enable cold extrusion checking
* M302 P1 ; disables cold extrusion checking
* M302 S0 ; always allow extrusion (disables checking)
* M302 S170 ; only allow extrusion above 170
* M302 S170 P1 ; set min extrude temp to 170 but leave disabled
*/ */
inline void gcode_M302() { inline void gcode_M302() {
thermalManager.extrude_min_temp = code_seen('S') ? code_value_temp_abs() : 0; bool seen_S = code_seen('S');
if (seen_S) {
thermalManager.extrude_min_temp = code_value_temp_abs();
thermalManager.allow_cold_extrude = (thermalManager.extrude_min_temp == 0);
}
if (code_seen('P'))
thermalManager.allow_cold_extrude = (thermalManager.extrude_min_temp == 0) || code_value_bool();
else if (!seen_S) {
// Report current state
SERIAL_ECHO_START;
SERIAL_ECHOPAIR("Cold extrudes are ", (thermalManager.allow_cold_extrude ? "en" : "dis"));
SERIAL_ECHOPAIR("abled (min temp ", int(thermalManager.extrude_min_temp + 0.5));
SERIAL_ECHOLNPGM("C)");
}
} }
#endif // PREVENT_DANGEROUS_EXTRUDE #endif // PREVENT_DANGEROUS_EXTRUDE

54
Marlin/temperature.cpp
View file

@ -50,13 +50,12 @@ Temperature thermalManager;
// public: // public:
int Temperature::current_temperature_raw[HOTENDS] = { 0 }; float Temperature::current_temperature[HOTENDS] = { 0.0 },
float Temperature::current_temperature[HOTENDS] = { 0.0 }; Temperature::current_temperature_bed = 0.0;
int Temperature::target_temperature[HOTENDS] = { 0 }; int Temperature::current_temperature_raw[HOTENDS] = { 0 },
Temperature::target_temperature[HOTENDS] = { 0 },
int Temperature::current_temperature_bed_raw = 0; Temperature::current_temperature_bed_raw = 0,
float Temperature::current_temperature_bed = 0.0; Temperature::target_temperature_bed = 0;
int Temperature::target_temperature_bed = 0;
#if ENABLED(TEMP_SENSOR_1_AS_REDUNDANT) #if ENABLED(TEMP_SENSOR_1_AS_REDUNDANT)
float Temperature::redundant_temperature = 0.0; float Temperature::redundant_temperature = 0.0;
@ -107,6 +106,7 @@ unsigned char Temperature::soft_pwm_bed;
#endif #endif
#if ENABLED(PREVENT_DANGEROUS_EXTRUDE) #if ENABLED(PREVENT_DANGEROUS_EXTRUDE)
bool Temperature::allow_cold_extrude = false;
float Temperature::extrude_min_temp = EXTRUDE_MINTEMP; float Temperature::extrude_min_temp = EXTRUDE_MINTEMP;
#endif #endif
@ -120,11 +120,11 @@ unsigned char Temperature::soft_pwm_bed;
volatile bool Temperature::temp_meas_ready = false; volatile bool Temperature::temp_meas_ready = false;
#if ENABLED(PIDTEMP) #if ENABLED(PIDTEMP)
float Temperature::temp_iState[HOTENDS] = { 0 }; float Temperature::temp_iState[HOTENDS] = { 0 },
float Temperature::temp_dState[HOTENDS] = { 0 }; Temperature::temp_dState[HOTENDS] = { 0 },
float Temperature::pTerm[HOTENDS]; Temperature::pTerm[HOTENDS],
float Temperature::iTerm[HOTENDS]; Temperature::iTerm[HOTENDS],
float Temperature::dTerm[HOTENDS]; Temperature::dTerm[HOTENDS];
#if ENABLED(PID_ADD_EXTRUSION_RATE) #if ENABLED(PID_ADD_EXTRUSION_RATE)
float Temperature::cTerm[HOTENDS]; float Temperature::cTerm[HOTENDS];
@ -133,21 +133,21 @@ volatile bool Temperature::temp_meas_ready = false;
int Temperature::lpq_ptr = 0; int Temperature::lpq_ptr = 0;
#endif #endif
float Temperature::pid_error[HOTENDS]; float Temperature::pid_error[HOTENDS],
float Temperature::temp_iState_min[HOTENDS]; Temperature::temp_iState_min[HOTENDS],
float Temperature::temp_iState_max[HOTENDS]; Temperature::temp_iState_max[HOTENDS];
bool Temperature::pid_reset[HOTENDS]; bool Temperature::pid_reset[HOTENDS];
#endif #endif
#if ENABLED(PIDTEMPBED) #if ENABLED(PIDTEMPBED)
float Temperature::temp_iState_bed = { 0 }; float Temperature::temp_iState_bed = { 0 },
float Temperature::temp_dState_bed = { 0 }; Temperature::temp_dState_bed = { 0 },
float Temperature::pTerm_bed; Temperature::pTerm_bed,
float Temperature::iTerm_bed; Temperature::iTerm_bed,
float Temperature::dTerm_bed; Temperature::dTerm_bed,
float Temperature::pid_error_bed; Temperature::pid_error_bed,
float Temperature::temp_iState_min_bed; Temperature::temp_iState_min_bed,
float Temperature::temp_iState_max_bed; Temperature::temp_iState_max_bed;
#else #else
millis_t Temperature::next_bed_check_ms; millis_t Temperature::next_bed_check_ms;
#endif #endif
@ -156,10 +156,10 @@ unsigned long Temperature::raw_temp_value[4] = { 0 };
unsigned long Temperature::raw_temp_bed_value = 0; unsigned long Temperature::raw_temp_bed_value = 0;
// Init min and max temp with extreme values to prevent false errors during startup // Init min and max temp with extreme values to prevent false errors during startup
int Temperature::minttemp_raw[HOTENDS] = ARRAY_BY_HOTENDS(HEATER_0_RAW_LO_TEMP , HEATER_1_RAW_LO_TEMP , HEATER_2_RAW_LO_TEMP, HEATER_3_RAW_LO_TEMP); int Temperature::minttemp_raw[HOTENDS] = ARRAY_BY_HOTENDS(HEATER_0_RAW_LO_TEMP , HEATER_1_RAW_LO_TEMP , HEATER_2_RAW_LO_TEMP, HEATER_3_RAW_LO_TEMP),
int Temperature::maxttemp_raw[HOTENDS] = ARRAY_BY_HOTENDS(HEATER_0_RAW_HI_TEMP , HEATER_1_RAW_HI_TEMP , HEATER_2_RAW_HI_TEMP, HEATER_3_RAW_HI_TEMP); Temperature::maxttemp_raw[HOTENDS] = ARRAY_BY_HOTENDS(HEATER_0_RAW_HI_TEMP , HEATER_1_RAW_HI_TEMP , HEATER_2_RAW_HI_TEMP, HEATER_3_RAW_HI_TEMP),
int Temperature::minttemp[HOTENDS] = { 0 }; Temperature::minttemp[HOTENDS] = { 0 },
int Temperature::maxttemp[HOTENDS] = ARRAY_BY_HOTENDS1(16383); Temperature::maxttemp[HOTENDS] = ARRAY_BY_HOTENDS1(16383);
#ifdef MAX_CONSECUTIVE_LOW_TEMPERATURE_ERROR_ALLOWED #ifdef MAX_CONSECUTIVE_LOW_TEMPERATURE_ERROR_ALLOWED
int Temperature::consecutive_low_temperature_error[HOTENDS] = { 0 }; int Temperature::consecutive_low_temperature_error[HOTENDS] = { 0 };

60
Marlin/temperature.h
View file

@ -52,13 +52,12 @@ class Temperature {
public: public:
static int current_temperature_raw[HOTENDS]; static float current_temperature[HOTENDS],
static float current_temperature[HOTENDS]; current_temperature_bed;
static int target_temperature[HOTENDS]; static int current_temperature_raw[HOTENDS],
target_temperature[HOTENDS],
static int current_temperature_bed_raw; current_temperature_bed_raw,
static float current_temperature_bed; target_temperature_bed;
static int target_temperature_bed;
#if ENABLED(TEMP_SENSOR_1_AS_REDUNDANT) #if ENABLED(TEMP_SENSOR_1_AS_REDUNDANT)
static float redundant_temperature; static float redundant_temperature;
@ -121,12 +120,13 @@ class Temperature {
#endif #endif
#if ENABLED(PREVENT_DANGEROUS_EXTRUDE) #if ENABLED(PREVENT_DANGEROUS_EXTRUDE)
static bool allow_cold_extrude;
static float extrude_min_temp; static float extrude_min_temp;
static bool tooColdToExtrude(uint8_t e) { static bool tooColdToExtrude(uint8_t e) {
#if HOTENDS == 1 #if HOTENDS == 1
UNUSED(e); UNUSED(e);
#endif #endif
return degHotend(HOTEND_INDEX) < extrude_min_temp; return allow_cold_extrude ? false : degHotend(HOTEND_INDEX) < extrude_min_temp;
} }
#else #else
static bool tooColdToExtrude(uint8_t e) { UNUSED(e); return false; } static bool tooColdToExtrude(uint8_t e) { UNUSED(e); return false; }
@ -142,11 +142,11 @@ class Temperature {
static volatile bool temp_meas_ready; static volatile bool temp_meas_ready;
#if ENABLED(PIDTEMP) #if ENABLED(PIDTEMP)
static float temp_iState[HOTENDS]; static float temp_iState[HOTENDS],
static float temp_dState[HOTENDS]; temp_dState[HOTENDS],
static float pTerm[HOTENDS]; pTerm[HOTENDS],
static float iTerm[HOTENDS]; iTerm[HOTENDS],
static float dTerm[HOTENDS]; dTerm[HOTENDS];
#if ENABLED(PID_ADD_EXTRUSION_RATE) #if ENABLED(PID_ADD_EXTRUSION_RATE)
static float cTerm[HOTENDS]; static float cTerm[HOTENDS];
@ -155,33 +155,33 @@ class Temperature {
static int lpq_ptr; static int lpq_ptr;
#endif #endif
static float pid_error[HOTENDS]; static float pid_error[HOTENDS],
static float temp_iState_min[HOTENDS]; temp_iState_min[HOTENDS],
static float temp_iState_max[HOTENDS]; temp_iState_max[HOTENDS];
static bool pid_reset[HOTENDS]; static bool pid_reset[HOTENDS];
#endif #endif
#if ENABLED(PIDTEMPBED) #if ENABLED(PIDTEMPBED)
static float temp_iState_bed; static float temp_iState_bed,
static float temp_dState_bed; temp_dState_bed,
static float pTerm_bed; pTerm_bed,
static float iTerm_bed; iTerm_bed,
static float dTerm_bed; dTerm_bed,
static float pid_error_bed; pid_error_bed,
static float temp_iState_min_bed; temp_iState_min_bed,
static float temp_iState_max_bed; temp_iState_max_bed;
#else #else
static millis_t next_bed_check_ms; static millis_t next_bed_check_ms;
#endif #endif
static unsigned long raw_temp_value[4]; static unsigned long raw_temp_value[4],
static unsigned long raw_temp_bed_value; raw_temp_bed_value;
// Init min and max temp with extreme values to prevent false errors during startup // Init min and max temp with extreme values to prevent false errors during startup
static int minttemp_raw[HOTENDS]; static int minttemp_raw[HOTENDS],
static int maxttemp_raw[HOTENDS]; maxttemp_raw[HOTENDS],
static int minttemp[HOTENDS]; minttemp[HOTENDS],
static int maxttemp[HOTENDS]; maxttemp[HOTENDS];
#ifdef MAX_CONSECUTIVE_LOW_TEMPERATURE_ERROR_ALLOWED #ifdef MAX_CONSECUTIVE_LOW_TEMPERATURE_ERROR_ALLOWED
static int consecutive_low_temperature_error[HOTENDS]; static int consecutive_low_temperature_error[HOTENDS];