8000 Signed updates by madpilot · Pull Request #3105 · esp8266/Arduino · GitHub
[go: up one dir, main page]

Skip to content

Signed updates #3105

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 15 commits into from
Closed
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Saving works a lot better when you actually hit save
  • Loading branch information
madpilot committed Jul 13, 2017
commit 84b0005cfc5becd3f58813aeca9899b81bc857f0
5 changes: 0 additions & 5 deletions cores/esp8266/Updater.h
Original file line number Diff line number Diff line change
Expand Up @@ -175,14 +175,9 @@ class UpdaterClass {
bool _async;
uint8_t _error;
uint8_t *_buffer;
<<<<<<< HEAD
size_t _bufferLen; // amount of data written into _buffer
size_t _bufferSize; // total size of _buffer
size_t _size;
=======
uint32_t _bufferLen;
uint32_t _size;
>>>>>>> 74a9b900b470a55e9ae6a330a17fda58925f9367
uint32_t _startAddress;
uint32_t _currentAddress;
uint32_t _command;
Expand Down
0