arduino/esp8266
1
0
Fork 0
mirror of https://github.com/esp8266/Arduino.git synced 2025-07-27 18:02:17 +03:00
Code Activity

Replace some manually managed buffers with Strings, fix code style

Browse Source
This commit is contained in:
Ivan Grokhotkov
2015-11-11 01:07:02 +03:00
parent 450718b4a4
commit 92069e657b
5 changed files with 188 additions and 167 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
cores/esp8266/Updater.cpp
View File

@ -32,7 +32,6 @@ void UpdaterClass::_reset() {
_currentAddress = 0;
_size = 0;
_command = U_FLASH;
_target_md5 = 0;
}
bool UpdaterClass::begin(size_t size, int command) {
@ -97,15 +96,14 @@ bool UpdaterClass::begin(size_t size, int command) {
_size = size;
_buffer = new uint8_t[FLASH_SECTOR_SIZE];
_command = command;
_target_md5 = new char[64];
_md5.begin();
return true;
}
void UpdaterClass::setMD5(const char * expected_md5){
if(strlen(expected_md5) != 32) return;
strcpy(_target_md5, expected_md5);
_target_md5 = expected_md5;
}
bool UpdaterClass::end(bool evenIfRemaining){
@ -131,21 +129,21 @@ bool UpdaterClass::end(bool evenIfRemaining){
}
_size = progress();
}
_md5.calculate();
if(_target_md5 && strlen(_target_md5) == 32){
if(strcmp(_target_md5, _md5.toString().c_str()) != 0){
if(_target_md5.length()) {
if(_target_md5 != _md5.toString()){
_error = UPDATE_ERROR_MD5;
#ifdef DEBUG_UPDATER
DEBUG_UPDATER.printf("MD5 Failed: expected:%s, calculated:%s\n", _target_md5, _md5.toString().c_str());
DEBUG_UPDATER.printf("MD5 Failed: expected:%s, calculated:%s\n", _target_md5.c_str(), _md5.toString().c_str());
#endif
return false;
}
#ifdef DEBUG_UPDATER
else DEBUG_UPDATER.printf("MD5 Success: %s\n", _md5.toString().c_str());
else DEBUG_UPDATER.printf("MD5 Success: %s\n", _target_md5.c_str());
#endif
}
if (_command == U_FLASH) {
eboot_command ebcmd;
ebcmd.action = ACTION_COPY_RAW;

25
cores/esp8266/Updater.h
View File

@ -15,6 +15,7 @@
#define U_FLASH 0
#define U_SPIFFS 100
#define U_AUTH 200
//#define DEBUG_UPDATER Serial
@ -26,13 +27,13 @@ class UpdaterClass {
Will return false if there is not enough space
*/
bool begin(size_t size, int = U_FLASH);
/*
Writes a buffer to the flash and increments the address
Returns the amount written
*/
size_t write(uint8_t *data, size_t len);
/*
Writes the remaining bytes from the Stream to the flash
Uses readBytes() and sets UPDATE_ERROR_STREAM on timeout
@ -41,7 +42,7 @@ class UpdaterClass {
Usable for slow streams like Serial
*/
size_t writeStream(Stream &data);
/*
If all bytes are written
this call will write the config to eboot
@ -53,27 +54,27 @@ class UpdaterClass {
evenIfRemaining is helpfull when you update without knowing the final size first
*/
bool end(bool evenIfRemaining = false);
/*
Prints the last error to an output stream
*/
void printError(Stream &out);
/*
sets the expected MD5 for the firmware (hexString)
*/
void setMD5(const char * expected_md5);
/*
returns the MD5 String of the sucessfully ended firmware
*/
String md5String(void){ return _md5.toString(); }
/*
populated the result with the md5 bytes of the sucessfully ended firmware
*/
void md5(uint8_t * result){ return _md5.getBytes(result); }
//Helpers
uint8_t getError(){ return _error; }
void clearError(){ _error = UPDATE_ERROR_OK; }
@ -83,7 +84,7 @@ class UpdaterClass {
size_t size(){ return _size; }
size_t progress(){ return _currentAddress - _startAddress; }
size_t remaining(){ return _size - (_currentAddress - _startAddress); }
/*
Template to write from objects that expose
available() and read(uint8_t*, size_t) methods
@ -125,7 +126,7 @@ class UpdaterClass {
}
return written;
}
private:
void _reset();
bool _writeBuffer();
@ -137,8 +138,8 @@ class UpdaterClass {
uint32_t _startAddress;
uint32_t _currentAddress;
uint32_t _command;
char *_target_md5;
String _target_md5;
MD5Builder _md5;
};