New ML support - resized reserved space, skip optiboot durring sec_lang update process

This commit is contained in:
Robert Pelnar 2018-06-14 23:07:54 +02:00
parent f162fce7a7
commit 296f3ab23a
2 changed files with 3 additions and 1 deletions

View file

@ -29,7 +29,7 @@
//LANG - Multi-language support //LANG - Multi-language support
//#define LANG_MODE 0 // primary language only //#define LANG_MODE 0 // primary language only
#define LANG_MODE 1 // sec. language support #define LANG_MODE 1 // sec. language support
#define LANG_SIZE_RESERVED 0x2200 // reserved space for secondary language (~10kb) #define LANG_SIZE_RESERVED 0x2400 // reserved space for secondary language (~10kb)
//#define LANG_SIZE_RESERVED 0x1ef8 // reserved space for secondary language (~10kb) //#define LANG_SIZE_RESERVED 0x1ef8 // reserved space for secondary language (~10kb)

View file

@ -5,6 +5,7 @@
#include "Marlin.h" #include "Marlin.h"
#include "w25x20cl.h" #include "w25x20cl.h"
#include "stk500.h" #include "stk500.h"
#include "bootapp.h"
#define OPTIBOOT_MAJVER 6 #define OPTIBOOT_MAJVER 6
#define OPTIBOOT_CUSTOMVER 0 #define OPTIBOOT_CUSTOMVER 0
@ -98,6 +99,7 @@ extern struct block_t *block_buffer;
void optiboot_w25x20cl_enter() void optiboot_w25x20cl_enter()
{ {
if (boot_app_flags & BOOT_APP_FLG_USER0) return;
uint8_t ch; uint8_t ch;
uint8_t rampz = 0; uint8_t rampz = 0;
register uint16_t address = 0; register uint16_t address = 0;