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

Fix xflash flashing

This commit is contained in:
Alex Voinea 2022-08-06 19:42:20 +03:00 committed by D.R.racer
parent 53e2d68183
commit bc85a41059
2 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Firmware/Marlin_main.cpp
View File

@ -1059,12 +1059,6 @@ void setup()
fdev_setup_stream(uartout, uart_putchar, NULL, _FDEV_SETUP_WRITE); //setup uart out stream fdev_setup_stream(uartout, uart_putchar, NULL, _FDEV_SETUP_WRITE); //setup uart out stream
stdout = uartout; stdout = uartout;
if (eeprom_read_byte((uint8_t *)EEPROM_MMU_ENABLED))
{
MMU2::mmu2.Start();
}
#ifdef XFLASH #ifdef XFLASH
bool xflash_success = xflash_init(); bool xflash_success = xflash_init();
uint8_t optiboot_status = 1; uint8_t optiboot_status = 1;
@ -1122,6 +1116,10 @@ void setup()
SERIAL_ECHO_START; SERIAL_ECHO_START;
puts_P(PSTR(" " FW_VERSION_FULL)); puts_P(PSTR(" " FW_VERSION_FULL));
if (eeprom_read_byte((uint8_t *)EEPROM_MMU_ENABLED)) {
MMU2::mmu2.Start();
}
//SERIAL_ECHOPAIR("Active sheet before:", static_cast<unsigned long int>(eeprom_read_byte(&(EEPROM_Sheets_base->active_sheet)))); //SERIAL_ECHOPAIR("Active sheet before:", static_cast<unsigned long int>(eeprom_read_byte(&(EEPROM_Sheets_base->active_sheet))));
#ifdef DEBUG_SEC_LANG #ifdef DEBUG_SEC_LANG

6
Firmware/mmu2.cpp
View File

@ -113,9 +113,7 @@ MMU2::MMU2()
, unloadFilamentStarted(false) , unloadFilamentStarted(false)
, loadingToNozzle(false) , loadingToNozzle(false)
, inAutoRetry(false) , inAutoRetry(false)
{ {}
ResetRetryAttempts();
}
void MMU2::Start() { void MMU2::Start() {
#ifdef MMU_HWRESET #ifdef MMU_HWRESET
@ -135,6 +133,8 @@ void MMU2::Start() {
// start the communication // start the communication
logic.Start(); logic.Start();
ResetRetryAttempts();
} }
void MMU2::Stop() { void MMU2::Stop() {