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

BOOTAPP support defined for EINSY

Browse source 
W25x20CL test before entering optiboot (in some error cases it hangs in optiboot and then message not shown)
This commit is contained in:
Robert Pelnar 2018-07-23 17:14:18 +02:00
parent 07d57de660
commit 6444573c92
2 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
Firmware/Marlin_main.cpp
View file

@ -1041,12 +1041,14 @@ void erase_eeprom_section(uint16_t offset, uint16_t bytes)
for (int i = offset; i < (offset+bytes); i++) eeprom_write_byte((uint8_t*)i, 0xFF); for (int i = offset; i < (offset+bytes); i++) eeprom_write_byte((uint8_t*)i, 0xFF);
} }
#ifdef BOOTAPP
#include "bootapp.h" //bootloader support
#endif //BOOTAPP
#if (LANG_MODE != 0) //secondary language support #if (LANG_MODE != 0) //secondary language support
#ifdef W25X20CL #ifdef W25X20CL
#include "bootapp.h" //bootloader support
// language update from external flash // language update from external flash
#define LANGBOOT_BLOCKSIZE 0x1000 #define LANGBOOT_BLOCKSIZE 0x1000
@ -1146,16 +1148,16 @@ void setup()
lcd_splash(); lcd_splash();
#ifdef W25X20CL #ifdef W25X20CL
// Enter an STK500 compatible Optiboot boot loader waiting for flashing the languages to an external flash memory. if (!w25x20cl_init())
optiboot_w25x20cl_enter(); kill(_i("External SPI flash W25X20CL not responding."));
// Enter an STK500 compatible Optiboot boot loader waiting for flashing the languages to an external flash memory.
optiboot_w25x20cl_enter();
#endif #endif
#if (LANG_MODE != 0) //secondary language support #if (LANG_MODE != 0) //secondary language support
#ifdef W25X20CL #ifdef W25X20CL
if (w25x20cl_init()) if (w25x20cl_init())
update_sec_lang_from_external_flash(); update_sec_lang_from_external_flash();
else
kill(_i("External SPI flash W25X20CL not responding."));
#endif //W25X20CL #endif //W25X20CL
#endif //(LANG_MODE != 0) #endif //(LANG_MODE != 0)

1
Firmware/pins_Einsy_1_0.h
View file

@ -16,6 +16,7 @@
#define PINDA_THERMISTOR #define PINDA_THERMISTOR
#define W25X20CL // external 256kB flash #define W25X20CL // external 256kB flash
#define BOOTAPP // bootloader support
#define SWI2C_SDA 20 //SDA on P3 #define SWI2C_SDA 20 //SDA on P3