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

push some unload fixes

This commit is contained in:
MacBookPro 2018-11-03 08:51:57 +10:00
parent b5d6642e10
commit bdfe509bc3
5 changed files with 13719 additions and 13711 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27394
Firmware/Firmware.ino.rambo.hex
View File

File diff suppressed because it is too large Load Diff

4
Firmware/Marlin_main.cpp
View File

@ -7361,11 +7361,11 @@ void manage_inactivity(bool ignore_stepper_queue/*=false*/) //default argument s
} else { } else {
if (mcode_in_progress != 600) //M600 not in progress if (mcode_in_progress != 600) //M600 not in progress
{ {
if ((lcd_commands_type != LCD_COMMAND_V2_CAL) && !wizard_active && !mmuFilamentMK3Moving) { if ((lcd_commands_type != LCD_COMMAND_V2_CAL) && !wizard_active && mmuFSensorLoading) {
fsensor_check_autoload(); fsensor_check_autoload();
} else { } else {
fsensor_autoload_check_stop(); fsensor_autoload_check_stop();
fsensor_update(); //fsensor_update();
} }
} }
} }

10
Firmware/fsensor.cpp
View File

@ -286,15 +286,11 @@ bool fsensor_check_autoload(void)
{ {
puts_P(_N("fsensor_check_autoload = true !!!\n")); puts_P(_N("fsensor_check_autoload = true !!!\n"));
if (mmu_enabled) { if (mmu_enabled) {
//mmu_puts_P(PSTR("FS\n"));
mmuFilamentMK3Moving = true; mmuFilamentMK3Moving = true;
fsensor_autoload_check_stop(); fsensor_autoload_check_stop();
} else return true; }
} else if ((fsensor_autoload_c <= -12) && (fsensor_autoload_sum < -20)) return true;
{ }
mmuFilamentMK3Moving = true;
fsensor_autoload_check_stop();
}
return false; return false;
} }

4
Firmware/fsensor.h
View File

@ -15,6 +15,8 @@ extern bool fsensor_not_responding;
extern bool fsensor_oq_meassure_enabled; extern bool fsensor_oq_meassure_enabled;
extern bool mmuFilamentMK3Moving; extern bool mmuFilamentMK3Moving;
extern bool mmuFSensorLoading;
//! @name save restore printing //! @name save restore printing
//! @{ //! @{
@ -63,4 +65,4 @@ extern void fsensor_st_block_begin(block_t* bl);
extern void fsensor_st_block_chunk(block_t* bl, int cnt); extern void fsensor_st_block_chunk(block_t* bl, int cnt);
//! @} //! @}
#endif //FSENSOR_H #endif //FSENSOR_H

18
Firmware/mmu.cpp
View File

@ -31,6 +31,7 @@ bool mmu_ready = false;
//bool mmuFilamentLoadSeen = false; //bool mmuFilamentLoadSeen = false;
bool mmuFilamentMK3Moving = false; bool mmuFilamentMK3Moving = false;
bool mmuFSensorLoading = false;
int lastLoadedFilament = 0; int lastLoadedFilament = 0;
static int8_t mmu_state = 0; static int8_t mmu_state = 0;
@ -141,7 +142,7 @@ void mmu_loop(void)
#endif //MMU_DEBUG #endif //MMU_DEBUG
mmu_puts_P(PSTR("S1\n")); //send 'read version' request mmu_puts_P(PSTR("S1\n")); //send 'read version' request
mmu_state = -2; mmu_state = -2;
}else if (mmu_rx_sensFilatBoot() > 0) } /*else if (mmu_rx_sensFilatBoot() > 0)
{ {
printf_P(PSTR("MMU => '%Sensed Filament at Boot'\n"), mmu_finda); printf_P(PSTR("MMU => '%Sensed Filament at Boot'\n"), mmu_finda);
//enquecommand_front_P(PSTR("M104 S210")); //enquecommand_front_P(PSTR("M104 S210"));
@ -149,7 +150,7 @@ void mmu_loop(void)
delay(200); delay(200);
extr_unload_at_boot(); extr_unload_at_boot();
mmu_puts_P(PSTR("FB\n")); //Advise unloaded to above bondtech for retraction mmu_puts_P(PSTR("FB\n")); //Advise unloaded to above bondtech for retraction
} }*/
else if (millis() > 30000) //30sec after reset disable mmu else if (millis() > 30000) //30sec after reset disable mmu
{ {
puts_P(PSTR("MMU not responding - DISABLED")); puts_P(PSTR("MMU not responding - DISABLED"));
@ -231,6 +232,7 @@ void mmu_loop(void)
#endif //MMU_DEBUG #endif //MMU_DEBUG
mmu_printf_P(PSTR("T%d\n"), filament); mmu_printf_P(PSTR("T%d\n"), filament);
if (lastLoadedFilament != filament) { if (lastLoadedFilament != filament) {
mmuFSensorLoading = true;
fsensor_enable(); fsensor_enable();
fsensor_autoload_enabled = true; fsensor_autoload_enabled = true;
mmuFilamentMK3Moving = false; mmuFilamentMK3Moving = false;
@ -261,8 +263,6 @@ void mmu_loop(void)
printf_P(PSTR("MMU <= 'U0'\n")); printf_P(PSTR("MMU <= 'U0'\n"));
#endif //MMU_DEBUG #endif //MMU_DEBUG
mmu_puts_P(PSTR("U0\n")); //send 'unload current filament' mmu_puts_P(PSTR("U0\n")); //send 'unload current filament'
fsensor_autoload_enabled = true;
mmuFilamentMK3Moving = false;
lastLoadedFilament = -10; lastLoadedFilament = -10;
mmu_state = 3; mmu_state = 3;
} }
@ -319,13 +319,17 @@ void mmu_loop(void)
case 3: //response to mmu commands case 3: //response to mmu commands
if (mmu_rx_ok() > 0) if (mmu_rx_ok() > 0)
{ {
if (mmuFilamentMK3Moving) { if (!mmuFSensorLoading) {
printf_P(PSTR("MMU => 'ok'\n"));
mmu_ready = true;
mmu_state = 1;
} else if (mmuFilamentMK3Moving) {
printf_P(PSTR("MMU => 'ok'\n")); printf_P(PSTR("MMU => 'ok'\n"));
mmu_ready = true; mmu_ready = true;
mmu_state = 1; mmu_state = 1;
} } else printf_P(PSTR("MMU => 'waiting for filament @ MK3 Sensor'\n"));
} else if (mmu_rx_not_ok() > 0) { } else if (mmu_rx_not_ok() > 0) {
printf_P(PSTR("MMU => 'not ok/processing'\n")); printf_P(PSTR("MMU => 'not ok'\n"));
} }
else if ((mmu_last_request + MMU_CMD_TIMEOUT) < millis()) else if ((mmu_last_request + MMU_CMD_TIMEOUT) < millis())
{ //resend request after timeout (5 min) { //resend request after timeout (5 min)