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

stability improovements, speed reduced for load.

This commit is contained in:
MacBookPro 2018-11-03 23:50:40 +10:00
parent 1f1b72f3bb
commit 537db0ee12
3 changed files with 14228 additions and 14217 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

File diff suppressed because it is too large Load Diff

4
Firmware/fsensor.cpp
View File

@ -285,10 +285,10 @@ bool fsensor_check_autoload(void)
if ((fsensor_autoload_c >= 12) && (fsensor_autoload_sum > 20)) if ((fsensor_autoload_c >= 12) && (fsensor_autoload_sum > 20))
{ {
puts_P(_N("fsensor_check_autoload = true !!!\n")); puts_P(_N("fsensor_check_autoload = true !!!\n"));
if (mmu_enabled) { //if (mmu_enabled) {
mmuFilamentMK3Moving = true; mmuFilamentMK3Moving = true;
fsensor_autoload_check_stop(); fsensor_autoload_check_stop();
} //}
return true; return true;
} }
return false; return false;

31
Firmware/mmu.cpp
View File

@ -29,7 +29,6 @@ bool mmu_enabled = false;
bool mmu_ready = false; bool mmu_ready = false;
//bool mmuFilamentLoadSeen = false;
bool mmuFilamentMK3Moving = false; bool mmuFilamentMK3Moving = false;
bool mmuFSensorLoading = false; bool mmuFSensorLoading = false;
int lastLoadedFilament = -10; int lastLoadedFilament = -10;
@ -230,15 +229,18 @@ void mmu_loop(void)
#ifdef MMU_DEBUG #ifdef MMU_DEBUG
printf_P(PSTR("MMU <= 'T%d'\n"), filament); printf_P(PSTR("MMU <= 'T%d'\n"), filament);
#endif //MMU_DEBUG #endif //MMU_DEBUG
fsensor_enable();
delay(100);
mmu_printf_P(PSTR("T%d\n"), filament);
mmu_state = 3; // wait for response
if (lastLoadedFilament != filament) { if (lastLoadedFilament != filament) {
fsensor_autoload_check_start();
mmuFSensorLoading = true; mmuFSensorLoading = true;
fsensor_enable(); //fsensor_enable();
fsensor_autoload_enabled = true; fsensor_autoload_enabled = true;
mmuFilamentMK3Moving = false; mmuFilamentMK3Moving = false;
lastLoadedFilament = filament;
} }
mmu_printf_P(PSTR("T%d\n"), filament); lastLoadedFilament = filament;
mmu_state = 3; // wait for response
} }
else if ((mmu_cmd >= MMU_CMD_L0) && (mmu_cmd <= MMU_CMD_L4)) else if ((mmu_cmd >= MMU_CMD_L0) && (mmu_cmd <= MMU_CMD_L4))
{ {
@ -320,18 +322,21 @@ 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 (!mmuFSensorLoading) { if (mmuFSensorLoading == false) {
delay(100);
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 if (mmuFilamentMK3Moving) { } else if (mmuFilamentMK3Moving == true) {
printf_P(PSTR("MMU => 'ok'\n")); //mmu_puts_P(PSTR("FS\n"));
mmu_puts_P(PSTR("FS\n")); mmu_printf_P(PSTR("FS%d\n"), 1);
mmu_ready = true; printf_P(PSTR("MMU => 'Advised of filament seen at extruder'\n"));
mmu_state = 1; mmuFSensorLoading = false;
} else printf_P(PSTR("MMU => 'waiting for filament @ MK3 Sensor'\n")); } 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'\n")); printf_P(PSTR("MMU => 'Waiting'\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)