arduino/esp8266
1
0
Fork 0
mirror of https://github.com/esp8266/Arduino.git synced 2025-05-09 16:41:02 +03:00
Code

Updater: check boot mode before starting update

Browse Source 
ref. https://github.com/esp8266/Arduino/issues/1017
This commit is contained in:
Ivan Grokhotkov 2017-05-09 17:32:39 +08:00 committed by Ivan Grokhotkov
parent 22c7d792f0
commit 9b0ad39e94
2 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
cores/esp8266/Updater.cpp
View File

@ -2,6 +2,7 @@
#include "Arduino.h" #include "Arduino.h"
#include "eboot_command.h" #include "eboot_command.h"
#include "interrupts.h" #include "interrupts.h"
#include "esp8266_peri.h"
//#define DEBUG_UPDATER Serial //#define DEBUG_UPDATER Serial
@ -44,6 +45,20 @@ bool UpdaterClass::begin(size_t size, int command) {
return false; return false;
} }
/* Check boot mode; if boot mode is 1 (UART download mode),
we will not be able to reset into normal mode once update is done.
Fail early to avoid frustration.
https://github.com/esp8266/Arduino/issues/1017#issuecomment-200605576
*/
int boot_mode = (GPI >> 16) & 0xf;
if (boot_mode == 1) {
_error = UPDATE_ERROR_BOOTSTRAP;
#ifdef DEBUG_UPDATER
printError(DEBUG_UPDATER);
#endif
return false;
}
#ifdef DEBUG_UPDATER #ifdef DEBUG_UPDATER
if (command == U_SPIFFS) { if (command == U_SPIFFS) {
DEBUG_UPDATER.println(F("[begin] Update SPIFFS.")); DEBUG_UPDATER.println(F("[begin] Update SPIFFS."));

2
cores/esp8266/Updater.h
View File

@ -16,7 +16,7 @@
#define UPDATE_ERROR_FLASH_CONFIG (8) #define UPDATE_ERROR_FLASH_CONFIG (8)
#define UPDATE_ERROR_NEW_FLASH_CONFIG (9) #define UPDATE_ERROR_NEW_FLASH_CONFIG (9)
#define UPDATE_ERROR_MAGIC_BYTE (10) #define UPDATE_ERROR_MAGIC_BYTE (10)
#define UPDATE_ERROR_BOOTSTRAP (11)
#define U_FLASH 0 #define U_FLASH 0
#define U_SPIFFS 100 #define U_SPIFFS 100