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

Merge pull request #1319 from XPila/V3_5

Browse Source 
Fix PFW651 - cannot upload MK3 languages with slic3r (firmware compil…
This commit is contained in:
PavelSindler 2018-11-09 13:10:51 +01:00 committed by GitHub
commit 5f166374ab
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Firmware/optiboot_w25x20cl.cpp
View File

@ -130,7 +130,7 @@ void optiboot_w25x20cl_enter()
} }
// Send the initial magic string. // Send the initial magic string.
while (ptr != end) while (ptr != end)
putch(pgm_read_byte_far(ptr ++)); putch(pgm_read_byte(ptr ++));
watchdogReset(); watchdogReset();
// Wait for one second until a magic string (constant entry_magic) is received // Wait for one second until a magic string (constant entry_magic) is received
// from the serial line. // from the serial line.
@ -145,7 +145,7 @@ void optiboot_w25x20cl_enter()
return; return;
} }
ch = UDR0; ch = UDR0;
if (pgm_read_byte_far(ptr ++) != ch) if (pgm_read_byte(ptr ++) != ch)
// Magic was not received correctly, continue with the application // Magic was not received correctly, continue with the application
return; return;
watchdogReset(); watchdogReset();
@ -153,7 +153,7 @@ void optiboot_w25x20cl_enter()
// Send the cfm magic string. // Send the cfm magic string.
ptr = entry_magic_cfm; ptr = entry_magic_cfm;
while (ptr != end) while (ptr != end)
putch(pgm_read_byte_far(ptr ++)); putch(pgm_read_byte(ptr ++));
} }
spi_init(); spi_init();