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

Merge pull request #1085 from mkbel/fix_active_filament 

Fix active filament PFW-528
This commit is contained in:
PavelSindler 2018-08-28 23:50:57 +02:00 committed by GitHub
parent 8986226904 2cd8691376
commit d290543d7d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 178 additions and 153 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Firmware/Marlin.h
View File

@ -394,7 +394,6 @@ uint8_t check_printer_version();
float temp_compensation_pinda_thermistor_offset(float temperature_pinda); float temp_compensation_pinda_thermistor_offset(float temperature_pinda);
#endif //PINDA_THERMISTOR #endif //PINDA_THERMISTOR
void wait_for_heater(long codenum);
void serialecho_temperatures(); void serialecho_temperatures();
bool check_commands(); bool check_commands();

316
Firmware/Marlin_main.cpp
View File

@ -543,8 +543,9 @@ static bool saved_extruder_relative_mode = false;
//=========================================================================== //===========================================================================
static void get_arc_coordinates(); static void get_arc_coordinates();
static bool setTargetedHotend(int code); static bool setTargetedHotend(int code, uint8_t &extruder);
static void print_time_remaining_init(); static void print_time_remaining_init();
static void wait_for_heater(long codenum, uint8_t extruder);
uint16_t gcode_in_progress = 0; uint16_t gcode_in_progress = 0;
uint16_t mcode_in_progress = 0; uint16_t mcode_in_progress = 0;
@ -5354,15 +5355,18 @@ Sigma_Exit:
break; break;
case 104: // M104 case 104: // M104
if(setTargetedHotend(104)){ {
break; uint8_t extruder;
} if(setTargetedHotend(104,extruder)){
if (code_seen('S')) break;
{ }
setTargetHotendSafe(code_value(), tmp_extruder); if (code_seen('S'))
} {
setWatch(); setTargetHotendSafe(code_value(), extruder);
break; }
setWatch();
break;
}
case 112: // M112 -Emergency Stop case 112: // M112 -Emergency Stop
kill(_n(""), 3); kill(_n(""), 3);
break; break;
@ -5370,14 +5374,16 @@ Sigma_Exit:
if (code_seen('S')) setTargetBed(code_value()); if (code_seen('S')) setTargetBed(code_value());
break; break;
case 105 : // M105 case 105 : // M105
if(setTargetedHotend(105)){ {
uint8_t extruder;
if(setTargetedHotend(105, extruder)){
break; break;
} }
#if defined(TEMP_0_PIN) && TEMP_0_PIN > -1 #if defined(TEMP_0_PIN) && TEMP_0_PIN > -1
SERIAL_PROTOCOLPGM("ok T:"); SERIAL_PROTOCOLPGM("ok T:");
SERIAL_PROTOCOL_F(degHotend(tmp_extruder),1); SERIAL_PROTOCOL_F(degHotend(extruder),1);
SERIAL_PROTOCOLPGM(" /"); SERIAL_PROTOCOLPGM(" /");
SERIAL_PROTOCOL_F(degTargetHotend(tmp_extruder),1); SERIAL_PROTOCOL_F(degTargetHotend(extruder),1);
#if defined(TEMP_BED_PIN) && TEMP_BED_PIN > -1 #if defined(TEMP_BED_PIN) && TEMP_BED_PIN > -1
SERIAL_PROTOCOLPGM(" B:"); SERIAL_PROTOCOLPGM(" B:");
SERIAL_PROTOCOL_F(degBed(),1); SERIAL_PROTOCOL_F(degBed(),1);
@ -5402,7 +5408,7 @@ Sigma_Exit:
SERIAL_PROTOCOL((EXTRUDER_WATTS * getHeaterPower(tmp_extruder))/127); SERIAL_PROTOCOL((EXTRUDER_WATTS * getHeaterPower(tmp_extruder))/127);
SERIAL_PROTOCOLPGM("W"); SERIAL_PROTOCOLPGM("W");
#else #else
SERIAL_PROTOCOL(getHeaterPower(tmp_extruder)); SERIAL_PROTOCOL(getHeaterPower(extruder));
#endif #endif
SERIAL_PROTOCOLPGM(" B@:"); SERIAL_PROTOCOLPGM(" B@:");
@ -5460,9 +5466,11 @@ Sigma_Exit:
KEEPALIVE_STATE(NOT_BUSY); KEEPALIVE_STATE(NOT_BUSY);
return; return;
break; break;
}
case 109: case 109:
{// M109 - Wait for extruder heater to reach target. {// M109 - Wait for extruder heater to reach target.
if(setTargetedHotend(109)){ uint8_t extruder;
if(setTargetedHotend(109, extruder)){
break; break;
} }
LCD_MESSAGERPGM(_T(MSG_HEATING)); LCD_MESSAGERPGM(_T(MSG_HEATING));
@ -5473,10 +5481,10 @@ Sigma_Exit:
autotemp_enabled=false; autotemp_enabled=false;
#endif #endif
if (code_seen('S')) { if (code_seen('S')) {
setTargetHotendSafe(code_value(), tmp_extruder); setTargetHotendSafe(code_value(), extruder);
CooldownNoWait = true; CooldownNoWait = true;
} else if (code_seen('R')) { } else if (code_seen('R')) {
setTargetHotendSafe(code_value(), tmp_extruder); setTargetHotendSafe(code_value(), extruder);
CooldownNoWait = false; CooldownNoWait = false;
} }
#ifdef AUTOTEMP #ifdef AUTOTEMP
@ -5493,13 +5501,13 @@ Sigma_Exit:
codenum = millis(); codenum = millis();
/* See if we are heating up or cooling down */ /* See if we are heating up or cooling down */
target_direction = isHeatingHotend(tmp_extruder); // true if heating, false if cooling target_direction = isHeatingHotend(extruder); // true if heating, false if cooling
KEEPALIVE_STATE(NOT_BUSY); KEEPALIVE_STATE(NOT_BUSY);
cancel_heatup = false; cancel_heatup = false;
wait_for_heater(codenum); //loops until target temperature is reached wait_for_heater(codenum, extruder); //loops until target temperature is reached
LCD_MESSAGERPGM(_T(MSG_HEATING_COMPLETE)); LCD_MESSAGERPGM(_T(MSG_HEATING_COMPLETE));
KEEPALIVE_STATE(IN_HANDLER); KEEPALIVE_STATE(IN_HANDLER);
@ -5820,10 +5828,10 @@ Sigma_Exit:
case 200: // M200 D<millimeters> set filament diameter and set E axis units to cubic millimeters (use S0 to set back to millimeters). case 200: // M200 D<millimeters> set filament diameter and set E axis units to cubic millimeters (use S0 to set back to millimeters).
{ {
tmp_extruder = active_extruder; uint8_t extruder = active_extruder;
if(code_seen('T')) { if(code_seen('T')) {
tmp_extruder = code_value(); extruder = code_value();
if(tmp_extruder >= EXTRUDERS) { if(extruder >= EXTRUDERS) {
SERIAL_ECHO_START; SERIAL_ECHO_START;
SERIAL_ECHO(_i("M200 Invalid extruder "));////MSG_M200_INVALID_EXTRUDER c=0 r=0 SERIAL_ECHO(_i("M200 Invalid extruder "));////MSG_M200_INVALID_EXTRUDER c=0 r=0
break; break;
@ -5837,7 +5845,7 @@ Sigma_Exit:
// for all extruders // for all extruders
volumetric_enabled = false; volumetric_enabled = false;
} else { } else {
filament_size[tmp_extruder] = (float)code_value(); filament_size[extruder] = (float)code_value();
// make sure all extruders have some sane value for the filament size // make sure all extruders have some sane value for the filament size
filament_size[0] = (filament_size[0] == 0.0 ? DEFAULT_NOMINAL_FILAMENT_DIA : filament_size[0]); filament_size[0] = (filament_size[0] == 0.0 ? DEFAULT_NOMINAL_FILAMENT_DIA : filament_size[0]);
#if EXTRUDERS > 1 #if EXTRUDERS > 1
@ -6025,25 +6033,26 @@ Sigma_Exit:
#if EXTRUDERS > 1 #if EXTRUDERS > 1
case 218: // M218 - set hotend offset (in mm), T<extruder_number> X<offset_on_X> Y<offset_on_Y> case 218: // M218 - set hotend offset (in mm), T<extruder_number> X<offset_on_X> Y<offset_on_Y>
{ {
if(setTargetedHotend(218)){ uint8_t extruder;
if(setTargetedHotend(218, extruder)){
break; break;
} }
if(code_seen('X')) if(code_seen('X'))
{ {
extruder_offset[X_AXIS][tmp_extruder] = code_value(); extruder_offset[X_AXIS][extruder] = code_value();
} }
if(code_seen('Y')) if(code_seen('Y'))
{ {
extruder_offset[Y_AXIS][tmp_extruder] = code_value(); extruder_offset[Y_AXIS][extruder] = code_value();
} }
SERIAL_ECHO_START; SERIAL_ECHO_START;
SERIAL_ECHORPGM(MSG_HOTEND_OFFSET); SERIAL_ECHORPGM(MSG_HOTEND_OFFSET);
for(tmp_extruder = 0; tmp_extruder < EXTRUDERS; tmp_extruder++) for(extruder = 0; extruder < EXTRUDERS; extruder++)
{ {
SERIAL_ECHO(" "); SERIAL_ECHO(" ");
SERIAL_ECHO(extruder_offset[X_AXIS][tmp_extruder]); SERIAL_ECHO(extruder_offset[X_AXIS][extruder]);
SERIAL_ECHO(","); SERIAL_ECHO(",");
SERIAL_ECHO(extruder_offset[Y_AXIS][tmp_extruder]); SERIAL_ECHO(extruder_offset[Y_AXIS][extruder]);
} }
SERIAL_ECHOLN(""); SERIAL_ECHOLN("");
}break; }break;
@ -6063,10 +6072,11 @@ Sigma_Exit:
int tmp_code = code_value(); int tmp_code = code_value();
if (code_seen('T')) if (code_seen('T'))
{ {
if(setTargetedHotend(221)){ uint8_t extruder;
if(setTargetedHotend(221, extruder)){
break; break;
} }
extruder_multiply[tmp_extruder] = tmp_code; extruder_multiply[extruder] = tmp_code;
} }
else else
{ {
@ -6794,132 +6804,132 @@ if((eSoundMode==e_SOUND_MODE_LOUD)||(eSoundMode==e_SOUND_MODE_ONCE))
else if(code_seen('T')) else if(code_seen('T'))
{ {
int index; int index;
st_synchronize(); st_synchronize();
for (index = 1; *(strchr_pointer + index) == ' ' || *(strchr_pointer + index) == '\t'; index++); for (index = 1; *(strchr_pointer + index) == ' ' || *(strchr_pointer + index) == '\t'; index++);
if ((*(strchr_pointer + index) < '0' || *(strchr_pointer + index) > '9') && *(strchr_pointer + index) != '?') { if ((*(strchr_pointer + index) < '0' || *(strchr_pointer + index) > '4') && *(strchr_pointer + index) != '?') {
SERIAL_ECHOLNPGM("Invalid T code."); SERIAL_ECHOLNPGM("Invalid T code.");
} }
else { else {
if (*(strchr_pointer + index) == '?') { if (*(strchr_pointer + index) == '?') {
tmp_extruder = choose_extruder_menu(); tmp_extruder = choose_extruder_menu();
} }
else { else {
tmp_extruder = code_value(); tmp_extruder = code_value();
} }
snmm_filaments_used |= (1 << tmp_extruder); //for stop print snmm_filaments_used |= (1 << tmp_extruder); //for stop print
if (mmu_enabled) if (mmu_enabled)
{ {
//printf_P(PSTR("T code: %d \n"), tmp_extruder); mmu_command(MMU_CMD_T0 + tmp_extruder);
//mmu_printf_P(PSTR("T%d\n"), tmp_extruder);
mmu_command(MMU_CMD_T0 + tmp_extruder);
manage_response(true, true); manage_response(true, true);
mmu_command(MMU_CMD_C0); mmu_command(MMU_CMD_C0);
mmu_extruder = tmp_extruder; //filament change is finished mmu_extruder = tmp_extruder; //filament change is finished
if (*(strchr_pointer + index) == '?')// for single material usage with mmu if (*(strchr_pointer + index) == '?')// for single material usage with mmu
mmu_load_to_nozzle(); {
} mmu_load_to_nozzle();
else }
{ }
else
{
#ifdef SNMM #ifdef SNMM
#ifdef LIN_ADVANCE #ifdef LIN_ADVANCE
if (mmu_extruder != tmp_extruder) if (mmu_extruder != tmp_extruder)
clear_current_adv_vars(); //Check if the selected extruder is not the active one and reset LIN_ADVANCE variables if so. clear_current_adv_vars(); //Check if the selected extruder is not the active one and reset LIN_ADVANCE variables if so.
#endif #endif
mmu_extruder = tmp_extruder; mmu_extruder = tmp_extruder;
delay(100); delay(100);
disable_e0(); disable_e0();
disable_e1(); disable_e1();
disable_e2(); disable_e2();
pinMode(E_MUX0_PIN, OUTPUT); pinMode(E_MUX0_PIN, OUTPUT);
pinMode(E_MUX1_PIN, OUTPUT); pinMode(E_MUX1_PIN, OUTPUT);
delay(100); delay(100);
SERIAL_ECHO_START; SERIAL_ECHO_START;
SERIAL_ECHO("T:"); SERIAL_ECHO("T:");
SERIAL_ECHOLN((int)tmp_extruder); SERIAL_ECHOLN((int)tmp_extruder);
switch (tmp_extruder) { switch (tmp_extruder) {
case 1: case 1:
WRITE(E_MUX0_PIN, HIGH); WRITE(E_MUX0_PIN, HIGH);
WRITE(E_MUX1_PIN, LOW); WRITE(E_MUX1_PIN, LOW);
break; break;
case 2: case 2:
WRITE(E_MUX0_PIN, LOW); WRITE(E_MUX0_PIN, LOW);
WRITE(E_MUX1_PIN, HIGH); WRITE(E_MUX1_PIN, HIGH);
break; break;
case 3: case 3:
WRITE(E_MUX0_PIN, HIGH); WRITE(E_MUX0_PIN, HIGH);
WRITE(E_MUX1_PIN, HIGH); WRITE(E_MUX1_PIN, HIGH);
break; break;
default: default:
WRITE(E_MUX0_PIN, LOW); WRITE(E_MUX0_PIN, LOW);
WRITE(E_MUX1_PIN, LOW); WRITE(E_MUX1_PIN, LOW);
break; break;
} }
delay(100); delay(100);
#else //SNMM #else //SNMM
if (tmp_extruder >= EXTRUDERS) { if (tmp_extruder >= EXTRUDERS) {
SERIAL_ECHO_START; SERIAL_ECHO_START;
SERIAL_ECHOPGM("T"); SERIAL_ECHOPGM("T");
SERIAL_PROTOCOLLN((int)tmp_extruder); SERIAL_PROTOCOLLN((int)tmp_extruder);
SERIAL_ECHOLNRPGM(_n("Invalid extruder"));////MSG_INVALID_EXTRUDER c=0 r=0 SERIAL_ECHOLNRPGM(_n("Invalid extruder"));////MSG_INVALID_EXTRUDER c=0 r=0
} }
else { else {
#if EXTRUDERS > 1 #if EXTRUDERS > 1
boolean make_move = false; boolean make_move = false;
#endif #endif
if (code_seen('F')) { if (code_seen('F')) {
#if EXTRUDERS > 1 #if EXTRUDERS > 1
make_move = true; make_move = true;
#endif #endif
next_feedrate = code_value(); next_feedrate = code_value();
if (next_feedrate > 0.0) { if (next_feedrate > 0.0) {
feedrate = next_feedrate; feedrate = next_feedrate;
} }
} }
#if EXTRUDERS > 1 #if EXTRUDERS > 1
if (tmp_extruder != active_extruder) { if (tmp_extruder != active_extruder) {
// Save current position to return to after applying extruder offset // Save current position to return to after applying extruder offset
memcpy(destination, current_position, sizeof(destination)); memcpy(destination, current_position, sizeof(destination));
// Offset extruder (only by XY) // Offset extruder (only by XY)
int i; int i;
for (i = 0; i < 2; i++) { for (i = 0; i < 2; i++) {
current_position[i] = current_position[i] - current_position[i] = current_position[i] -
extruder_offset[i][active_extruder] + extruder_offset[i][active_extruder] +
extruder_offset[i][tmp_extruder]; extruder_offset[i][tmp_extruder];
} }
// Set the new active extruder and position // Set the new active extruder and position
active_extruder = tmp_extruder; active_extruder = tmp_extruder;
plan_set_position(current_position[X_AXIS], current_position[Y_AXIS], current_position[Z_AXIS], current_position[E_AXIS]); plan_set_position(current_position[X_AXIS], current_position[Y_AXIS], current_position[Z_AXIS], current_position[E_AXIS]);
// Move to the old position if 'F' was in the parameters // Move to the old position if 'F' was in the parameters
if (make_move && Stopped == false) { if (make_move && Stopped == false) {
prepare_move(); prepare_move();
} }
} }
#endif #endif
SERIAL_ECHO_START; SERIAL_ECHO_START;
SERIAL_ECHORPGM(_n("Active Extruder: "));////MSG_ACTIVE_EXTRUDER c=0 r=0 SERIAL_ECHORPGM(_n("Active Extruder: "));////MSG_ACTIVE_EXTRUDER c=0 r=0
SERIAL_PROTOCOLLN((int)active_extruder); SERIAL_PROTOCOLLN((int)active_extruder);
} }
#endif //SNMM #endif //SNMM
} }
} }
} // end if(code_seen('T')) (end of T codes) } // end if(code_seen('T')) (end of T codes)
else if (code_seen('D')) // D codes (debug) else if (code_seen('D')) // D codes (debug)
@ -7572,11 +7582,21 @@ void setPwmFrequency(uint8_t pin, int val)
} }
#endif //FAST_PWM_FAN #endif //FAST_PWM_FAN
bool setTargetedHotend(int code){ //! @brief Get and validate extruder number
tmp_extruder = active_extruder; //!
//! If it is not specified, active_extruder is returned in parameter extruder.
//! @param [in] code M code number
//! @param [out] extruder
//! @return error
//! @retval true Invalid extruder specified in T code
//! @retval false Valid extruder specified in T code, or not specifiead
bool setTargetedHotend(int code, uint8_t &extruder)
{
extruder = active_extruder;
if(code_seen('T')) { if(code_seen('T')) {
tmp_extruder = code_value(); extruder = code_value();
if(tmp_extruder >= EXTRUDERS) { if(extruder >= EXTRUDERS) {
SERIAL_ECHO_START; SERIAL_ECHO_START;
switch(code){ switch(code){
case 104: case 104:
@ -7595,7 +7615,7 @@ bool setTargetedHotend(int code){
SERIAL_ECHO(_i("M221 Invalid extruder "));////MSG_M221_INVALID_EXTRUDER c=0 r=0 SERIAL_ECHO(_i("M221 Invalid extruder "));////MSG_M221_INVALID_EXTRUDER c=0 r=0
break; break;
} }
SERIAL_PROTOCOLLN((int)tmp_extruder); SERIAL_PROTOCOLLN((int)extruder);
return true; return true;
} }
} }
@ -7660,7 +7680,7 @@ void delay_keep_alive(unsigned int ms)
} }
} }
void wait_for_heater(long codenum) { static void wait_for_heater(long codenum, uint8_t extruder) {
#ifdef TEMP_RESIDENCY_TIME #ifdef TEMP_RESIDENCY_TIME
long residencyStart; long residencyStart;
@ -7676,9 +7696,9 @@ void wait_for_heater(long codenum) {
{ //Print Temp Reading and remaining time every 1 second while heating up/cooling down { //Print Temp Reading and remaining time every 1 second while heating up/cooling down
if (!farm_mode) { if (!farm_mode) {
SERIAL_PROTOCOLPGM("T:"); SERIAL_PROTOCOLPGM("T:");
SERIAL_PROTOCOL_F(degHotend(tmp_extruder), 1); SERIAL_PROTOCOL_F(degHotend(extruder), 1);
SERIAL_PROTOCOLPGM(" E:"); SERIAL_PROTOCOLPGM(" E:");
SERIAL_PROTOCOL((int)tmp_extruder); SERIAL_PROTOCOL((int)extruder);
#ifdef TEMP_RESIDENCY_TIME #ifdef TEMP_RESIDENCY_TIME
SERIAL_PROTOCOLPGM(" W:"); SERIAL_PROTOCOLPGM(" W:");
@ -7703,9 +7723,9 @@ void wait_for_heater(long codenum) {
#ifdef TEMP_RESIDENCY_TIME #ifdef TEMP_RESIDENCY_TIME
/* start/restart the TEMP_RESIDENCY_TIME timer whenever we reach target temp for the first time /* start/restart the TEMP_RESIDENCY_TIME timer whenever we reach target temp for the first time
or when current temp falls outside the hysteresis after target temp was reached */ or when current temp falls outside the hysteresis after target temp was reached */
if ((residencyStart == -1 && target_direction && (degHotend(tmp_extruder) >= (degTargetHotend(tmp_extruder) - TEMP_WINDOW))) || if ((residencyStart == -1 && target_direction && (degHotend(extruder) >= (degTargetHotend(extruder) - TEMP_WINDOW))) ||
(residencyStart == -1 && !target_direction && (degHotend(tmp_extruder) <= (degTargetHotend(tmp_extruder) + TEMP_WINDOW))) || (residencyStart == -1 && !target_direction && (degHotend(extruder) <= (degTargetHotend(extruder) + TEMP_WINDOW))) ||
(residencyStart > -1 && labs(degHotend(tmp_extruder) - degTargetHotend(tmp_extruder)) > TEMP_HYSTERESIS)) (residencyStart > -1 && labs(degHotend(extruder) - degTargetHotend(extruder)) > TEMP_HYSTERESIS))
{ {
residencyStart = millis(); residencyStart = millis();
} }

6
Firmware/mmu.cpp
View File

@ -380,6 +380,12 @@ void manage_response(bool move_axes, bool turn_off_nozzle)
if (lcd_update_was_enabled) lcd_update_enable(true); if (lcd_update_was_enabled) lcd_update_enable(true);
} }
//! @brief load filament to nozzle of multimaterial printer
//!
//! This function is used only only after T? (user select filament) and M600 (change filament).
//! It is not used after T0 .. T4 command (select filament), in such case, gcode is responsible for loading
//! filament to nozzle.
//!
void mmu_load_to_nozzle() void mmu_load_to_nozzle()
{ {
st_synchronize(); st_synchronize();