Selaa lähdekoodia

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

Robert Pelnar 6 vuotta sitten
vanhempi
commit
296f3ab23a
2 muutettua tiedostoa jossa 3 lisäystä ja 1 poistoa
  1. 1 1
      Firmware/config.h
  2. 2 0
      Firmware/optiboot_w25x20cl.cpp

+ 1 - 1
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)
 
 

+ 2 - 0
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;