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

.

This commit is contained in:
Rob McKenzie 2018-11-07 17:41:20 +10:00
parent b9cfa89fc4
commit 726326e755
3 changed files with 13803 additions and 13798 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
.DS_Store vendored
View File

Binary file not shown.

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

File diff suppressed because it is too large Load Diff

9
Firmware/mmu.cpp
View File

@ -362,18 +362,18 @@ void mmu_loop(void)
{ {
filament = mmu_cmd - MMU_CMD_T0; filament = mmu_cmd - MMU_CMD_T0;
if (lastLoadedFilament != filament) { if (lastLoadedFilament != filament) {
fsensor_enable(); // RMM:TODO Not sure if this is the best place to ensure enabled
printf_P(PSTR("MMU <= 'T%d'\n"), filament); printf_P(PSTR("MMU <= 'T%d'\n"), filament);
mmu_puts_P(PSTR("EE\n")); // Advise MMU CMD is correct, execute mmu_puts_P(PSTR("EE\n")); // Advise MMU CMD is correct, execute
//mmu_printf_P(PSTR("T%d\n"), filament); //mmu_printf_P(PSTR("T%d\n"), filament);
mmu_state = 3; // wait for response mmu_state = 3; // wait for response
fsensor_enable(); // RMM:TODO Not sure if this is the best place to ensure enabled
fsensor_autoload_check_start(); fsensor_autoload_check_start();
mmuFSensorLoading = true; mmuFSensorLoading = true;
fsensor_autoload_enabled = true; fsensor_autoload_enabled = true;
//mmuFilamentMK3Moving = false; //mmuFilamentMK3Moving = false;
} else { } else {
mmu_state = 1; mmu_puts_P(PSTR("EE\n")); // Advise MMU CMD is correct, execute
mmu_ready = true; mmu_state = 3;
} }
lastLoadedFilament = filament; lastLoadedFilament = filament;
} }
@ -481,7 +481,8 @@ void mmu_loop(void)
ack_received = true; ack_received = true;
mmu_state = 1; // Do normal Await command completion confirmation mmu_state = 1; // Do normal Await command completion confirmation
} else if ((mmu_last_request + 1000) < millis()) { // Timeout if echo doesn't match request, resend cmd } else if ((mmu_last_request + 1000) < millis()) { // Timeout if echo doesn't match request, resend cmd
printf_P(PSTR("MMU => 'CMD RETRY'\n")); //printf_P(PSTR("MMU => 'CMD RETRY'\n"));
printf_P(PSTR("MMU => 'CMD RETRY %d'\n"), mmu_cmd);
mmu_state = 1; mmu_state = 1;
} }
return; return;