Skip to content
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.

Sign up for GitHub

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

Jump to bottom

HTTP update server can handle flash and spiffs files (spiffs size lim… #2701

Closed
wants to merge 14 commits into from
Closed

HTTP update server can handle flash and spiffs files (spiffs size lim… #2701

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
cb64829
HTTP update server can handle flash and spiffs files (spiffs size lim…
PA4WD Nov 21, 2016
277f755
Resolved merge conflict
PA4WD Feb 28, 2018
f679d06
Merge branch 'master' into master
PA4WD Feb 28, 2018
68bf630
Merge branch 'master' into master
PA4WD Mar 2, 2018
785b795
Merge branch 'master' into master
PA4WD Mar 8, 2018
888182a
Merge branch 'master' into master
PA4WD Mar 13, 2018
890247d
Merge branch 'master' into master
PA4WD Apr 4, 2018
8651493
Merge branch 'master' into master
PA4WD Apr 26, 2018
3e355dc
Merge branch 'master' into master
PA4WD Jul 3, 2018
3310ba1
Merge branch 'master' into master
PA4WD Aug 2, 2018
6cd2fe7
Merge branch 'master' into master
PA4WD Aug 7, 2018
69da03c
Merge branch 'master' into master
PA4WD Aug 28, 2018
7f44674
Merge branch 'master' into master
PA4WD Oct 9, 2018
d2dff29
Merge branch 'master' into master
d-a-v May 12, 2019
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
18 changes: 13 additions & 5 deletions libraries/ESP8266HTTPUpdateServer/src/ESP8266HTTPUpdateServer.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,15 @@


static const char serverIndex[] PROGMEM =
R"(<html><body><form method='POST' action='' enctype='multipart/form-data'>
R"(<html><body><form method='POST' action='?cmd=0' enctype='multipart/form-data'>
<input type='hidden' name='cmd' value='0'>
<input type='file' name='update'>
<input type='submit' value='Update'>
<input type='submit' value='Update Flash'>
</form>
<form method='POST' action='?cmd=100' enctype='multipart/form-data'>
<input type='hidden' name='cmd' value='100'>
<input type='file' name='update'>
<input type='submit' value='Update Spiffs'>
</form>
</body></html>)";
static const char successResponse[] PROGMEM =
Expand Down Expand Up @@ -44,7 +50,8 @@ void ESP8266HTTPUpdateServer::setup(ESP8266WebServer *server, const String& path
return _server->requestAuthentication();
if (Update.hasError()) {
_server->send(200, F("text/html"), String(F("Update error: ")) + _updaterError);
} else {
} else {
_command = _server->arg("cmd").toInt();
_server->client().setNoDelay(true);
_server->send_P(200, PSTR("text/html"), successResponse);
delay(100);
Expand All @@ -71,8 +78,9 @@ void ESP8266HTTPUpdateServer::setup(ESP8266WebServer *server, const String& path
WiFiUDP::stopAll();
if (_serial_output)
Serial.printf("Update: %s\n", upload.filename.c_str());
uint32_t maxSketchSpace = (ESP.getFreeSketchSpace() - 0x1000) & 0xFFFFF000;
if(!Update.begin(maxSketchSpace)){//start with max available size
uint32_t maxSketchSpace = (ESP.getFreeSketchSpace() - 0x1000) & 0xFFFFF000;
_command = _server->arg("cmd").toInt();
if(!Update.begin(maxSketchSpace, _command)){//start with max available size
_setUpdaterError();
}
} else if(_authenticated && upload.status == UPLOAD_FILE_WRITE && !_updaterError.length()){
Expand Down
1 change: 1 addition & 0 deletions libraries/ESP8266HTTPUpdateServer/src/ESP8266HTTPUpdateServer.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ class ESP8266HTTPUpdateServer
String _password;
bool _authenticated;
String _updaterError;
int _command;
};


Expand Down