From 296f3ab23a95c2b92964dc0a527727c7f6700360 Mon Sep 17 00:00:00 2001 From: Robert Pelnar Date: Thu, 14 Jun 2018 23:07:54 +0200 Subject: [PATCH] New ML support - resized reserved space, skip optiboot durring sec_lang update process --- Firmware/config.h | 2 +- Firmware/optiboot_w25x20cl.cpp | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/Firmware/config.h b/Firmware/config.h index 0d70a12a..85687a4b 100644 --- a/Firmware/config.h +++ b/Firmware/config.h @@ -29,7 +29,7 @@ //LANG - Multi-language support //#define LANG_MODE 0 // primary language only #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) diff --git a/Firmware/optiboot_w25x20cl.cpp b/Firmware/optiboot_w25x20cl.cpp index ce50323f..cc6c66cd 100644 --- a/Firmware/optiboot_w25x20cl.cpp +++ b/Firmware/optiboot_w25x20cl.cpp @@ -5,6 +5,7 @@ #include "Marlin.h" #include "w25x20cl.h" #include "stk500.h" +#include "bootapp.h" #define OPTIBOOT_MAJVER 6 #define OPTIBOOT_CUSTOMVER 0 @@ -98,6 +99,7 @@ extern struct block_t *block_buffer; void optiboot_w25x20cl_enter() { + if (boot_app_flags & BOOT_APP_FLG_USER0) return; uint8_t ch; uint8_t rampz = 0; register uint16_t address = 0;