arduino/esp8266
1
0
Fork 0
mirror of https://github.com/esp8266/Arduino.git synced 2025-04-27 21:16:50 +03:00
Code

revert some space auto formatting

Browse Source
This commit is contained in:
Markus Sattler 2015-08-29 13:56:03 +02:00
parent 79bec479b5
commit a3bc0e924b
2 changed files with 23 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
cores/esp8266/Updater.cpp
View File

@ -12,13 +12,13 @@ extern "C" {
extern "C" uint32_t _SPIFFS_start; extern "C" uint32_t _SPIFFS_start;
UpdaterClass::UpdaterClass() UpdaterClass::UpdaterClass()
: _error(0) : _error(0)
, _buffer(0) , _buffer(0)
, _bufferLen(0) , _bufferLen(0)
, _size(0) , _size(0)
, _startAddress(0) , _startAddress(0)
, _currentAddress(0) , _currentAddress(0)
{ {
} }
@ -39,7 +39,7 @@ bool UpdaterClass::begin(size_t size){
#endif #endif
return false; return false;
} }
if(size == 0){ if(size == 0){
_error = UPDATE_ERROR_SIZE; _error = UPDATE_ERROR_SIZE;
#ifdef DEBUG_UPDATER #ifdef DEBUG_UPDATER
@ -47,10 +47,10 @@ bool UpdaterClass::begin(size_t size){
#endif #endif
return false; return false;
} }
_reset(); _reset();
_error = 0; _error = 0;
//size of current sketch rounded to a sector //size of current sketch rounded to a sector
uint32_t currentSketchSize = (ESP.getSketchSize() + FLASH_SECTOR_SIZE - 1) & (~(FLASH_SECTOR_SIZE - 1)); uint32_t currentSketchSize = (ESP.getSketchSize() + FLASH_SECTOR_SIZE - 1) & (~(FLASH_SECTOR_SIZE - 1));
//address of the end of the space available for sketch and update //address of the end of the space available for sketch and update
@ -59,7 +59,7 @@ bool UpdaterClass::begin(size_t size){
uint32_t roundedSize = (size + FLASH_SECTOR_SIZE - 1) & (~(FLASH_SECTOR_SIZE - 1)); uint32_t roundedSize = (size + FLASH_SECTOR_SIZE - 1) & (~(FLASH_SECTOR_SIZE - 1));
//address where we will start writing the update //address where we will start writing the update
uint32_t updateStartAddress = updateEndAddress - roundedSize; uint32_t updateStartAddress = updateEndAddress - roundedSize;
//make sure that the size of both sketches is less than the total space (updateEndAddress) //make sure that the size of both sketches is less than the total space (updateEndAddress)
if(updateStartAddress < currentSketchSize){ if(updateStartAddress < currentSketchSize){
_error = UPDATE_ERROR_SPACE; _error = UPDATE_ERROR_SPACE;
@ -68,13 +68,13 @@ bool UpdaterClass::begin(size_t size){
#endif #endif
return false; return false;
} }
//initialize //initialize
_startAddress = updateStartAddress; _startAddress = updateStartAddress;
_currentAddress = _startAddress; _currentAddress = _startAddress;
_size = size; _size = size;
_buffer = new uint8_t[FLASH_SECTOR_SIZE]; _buffer = new uint8_t[FLASH_SECTOR_SIZE];
return true; return true;
} }
@ -85,30 +85,30 @@ bool UpdaterClass::end(bool evenIfRemaining){
#endif #endif
return false; return false;
} }
if(hasError() || (!isFinished() && !evenIfRemaining)){ if(hasError() || (!isFinished() && !evenIfRemaining)){
#ifdef DEBUG_UPDATER #ifdef DEBUG_UPDATER
DEBUG_UPDATER.printf("premature end: res:%u, pos:%u/%u\n", getError(), progress(), _size); DEBUG_UPDATER.printf("premature end: res:%u, pos:%u/%u\n", getError(), progress(), _size);
#endif #endif
_reset(); _reset();
return false; return false;
} }
if(evenIfRemaining){ if(evenIfRemaining){
if(_bufferLen > 0){ if(_bufferLen > 0){
_writeBuffer(); _writeBuffer();
} }
_size = progress(); _size = progress();
} }
eboot_command ebcmd; eboot_command ebcmd;
ebcmd.action = ACTION_COPY_RAW; ebcmd.action = ACTION_COPY_RAW;
ebcmd.args[0] = _startAddress; ebcmd.args[0] = _startAddress;
ebcmd.args[1] = 0x00000; ebcmd.args[1] = 0x00000;
ebcmd.args[2] = _size; ebcmd.args[2] = _size;
eboot_command_write(&ebcmd); eboot_command_write(&ebcmd);
#ifdef DEBUG_UPDATER #ifdef DEBUG_UPDATER
DEBUG_UPDATER.printf("Staged: address:0x%08X, size:0x%08X\n", _startAddress, _size); DEBUG_UPDATER.printf("Staged: address:0x%08X, size:0x%08X\n", _startAddress, _size);
#endif #endif
@ -126,23 +126,23 @@ bool UpdaterClass::_writeBuffer(){
_error = UPDATE_ERROR_WRITE; _error = UPDATE_ERROR_WRITE;
_currentAddress = (_startAddress + _size); _currentAddress = (_startAddress + _size);
#ifdef DEBUG_UPDATER #ifdef DEBUG_UPDATER
printError(DEBUG_UPDATER); printError(DEBUG_UPDATER);
#endif #endif
return false; return false;
} }
_currentAddress += _bufferLen; _currentAddress += _bufferLen;
_bufferLen = 0; _bufferLen = 0;
return true; return true;
} }
size_t UpdaterClass::write(uint8_t *data, size_t len) { size_t UpdaterClass::write(uint8_t *data, size_t len) {
size_t left = len; size_t left = len;
if(hasError() || !isRunning()) if(hasError() || !isRunning())
return 0; return 0;
if(len > remaining()) if(len > remaining())
len = remaining(); len = remaining();
while((_bufferLen + left) > FLASH_SECTOR_SIZE) { while((_bufferLen + left) > FLASH_SECTOR_SIZE) {
size_t toBuff = FLASH_SECTOR_SIZE - _bufferLen; size_t toBuff = FLASH_SECTOR_SIZE - _bufferLen;
memcpy(_buffer + _bufferLen, data + (len - left), toBuff); memcpy(_buffer + _bufferLen, data + (len - left), toBuff);
@ -170,7 +170,7 @@ size_t UpdaterClass::writeStream(Stream &data) {
size_t toRead = 0; size_t toRead = 0;
if(hasError() || !isRunning()) if(hasError() || !isRunning())
return 0; return 0;
while(remaining()) { while(remaining()) {
toRead = FLASH_SECTOR_SIZE - _bufferLen; toRead = FLASH_SECTOR_SIZE - _bufferLen;
toRead = data.readBytes(_buffer + _bufferLen, toRead); toRead = data.readBytes(_buffer + _bufferLen, toRead);

2
cores/esp8266/Updater.h
View File

@ -11,7 +11,7 @@
#define UPDATE_ERROR_SIZE 4 #define UPDATE_ERROR_SIZE 4
#define UPDATE_ERROR_STREAM 5 #define UPDATE_ERROR_STREAM 5
#define DEBUG_UPDATER Serial1 //#define DEBUG_UPDATER Serial1
class UpdaterClass { class UpdaterClass {
public: public: