joe/PlatformIO_OTA-Base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

just some reformatting - no code changes

Browse Source
This commit is contained in:
Joe Tretter
2022-07-05 14:18:19 -05:00
parent ce2b8a37b0
commit 8105b786a9
1 changed files with 114 additions and 104 deletions
Download Patch File Download Diff File Expand all files Collapse all files

218
src/main.cpp
View File

@@ -2,32 +2,32 @@
Source: Source:
https://randomnerdtutorials.com/esp32-over-the-air-ota-programming/ https://randomnerdtutorials.com/esp32-over-the-air-ota-programming/
To update the firmware with Platform IO, do a build and then upload in the web interface the file To update the firmware with Platform IO, do a build and then upload in the web
.pio/build/esp32doit-devkit-v1/firmware.bin interface the file .pio/build/esp32doit-devkit-v1/firmware.bin
*/ */
#include <Arduino.h> #include <Arduino.h>
/* /*
* Rui Santos * Rui Santos
* Complete Project Details http://randomnerdtutorials.com * Complete Project Details http://randomnerdtutorials.com
*/ */
#include <WiFi.h>
#include <WiFiClient.h>
#include <WebServer.h>
#include <ESPmDNS.h> #include <ESPmDNS.h>
#include <Update.h> #include <Update.h>
#include <WebServer.h>
#include <WiFi.h>
#include <WiFiClient.h>
const char* host = "esp32ota"; const char* host = "esp32ota";
const char* ssid = "JoNelsDarlings"; const char* ssid = "JoNelsDarlings";
const char* password = "Paris2016"; const char* password = "Paris2016";
//variabls to blink without delay: // variabls to blink without delay:
const int led = 2; const int led = 2;
unsigned long previousMillis = 0; // will store last time LED was updated unsigned long previousMillis = 0; // will store last time LED was updated
const long interval = 1000; // interval at which to blink (milliseconds) const long interval = 1000; // interval at which to blink (milliseconds)
int ledState = LOW; // ledState used to set the LED int ledState = LOW; // ledState used to set the LED
WebServer server(80); WebServer server(80);
@@ -35,34 +35,34 @@ WebServer server(80);
* Login page * Login page
*/ */
const char* loginIndex = const char* loginIndex =
"<form name='loginForm'>" "<form name='loginForm'>"
"<table width='20%' bgcolor='A09F9F' align='center'>" "<table width='20%' bgcolor='A09F9F' align='center'>"
"<tr>" "<tr>"
"<td colspan=2>" "<td colspan=2>"
"<center><font size=4><b>ESP32 Login Page</b></font></center>" "<center><font size=4><b>ESP32 Login Page</b></font></center>"
"<br>" "<br>"
"</td>" "</td>"
"<br>" "<br>"
"<br>" "<br>"
"</tr>" "</tr>"
"<td>Username:</td>" "<td>Username:</td>"
"<td><input type='text' size=25 name='userid'><br></td>" "<td><input type='text' size=25 name='userid'><br></td>"
"</tr>" "</tr>"
"<br>" "<br>"
"<br>" "<br>"
"<tr>" "<tr>"
"<td>Password:</td>" "<td>Password:</td>"
"<td><input type='Password' size=25 name='pwd'><br></td>" "<td><input type='Password' size=25 name='pwd'><br></td>"
"<br>" "<br>"
"<br>" "<br>"
"</tr>" "</tr>"
"<tr>" "<tr>"
"<td><input type='submit' onclick='check(this.form)' value='Login'></td>" "<td><input type='submit' onclick='check(this.form)' value='Login'></td>"
"</tr>" "</tr>"
"</table>" "</table>"
"</form>" "</form>"
"<script>" "<script>"
"function check(form)" "function check(form)"
"{" "{"
"if(form.userid.value=='admin' && form.pwd.value=='admin')" "if(form.userid.value=='admin' && form.pwd.value=='admin')"
@@ -74,73 +74,76 @@ const char* loginIndex =
" alert('Error Password or Username')/*displays error message*/" " alert('Error Password or Username')/*displays error message*/"
"}" "}"
"}" "}"
"</script>"; "</script>";
/* /*
* Server Index Page * Server Index Page
*/ */
const char* serverIndex = const char* serverIndex =
"<script src='https://ajax.googleapis.com/ajax/libs/jquery/3.2.1/jquery.min.js'></script>" "<script "
"<form method='POST' action='#' enctype='multipart/form-data' id='upload_form'>" "src='https://ajax.googleapis.com/ajax/libs/jquery/3.2.1/jquery.min.js'></"
"<input type='file' name='update'>" "script>"
"<input type='submit' value='Update'>" "<form method='POST' action='#' enctype='multipart/form-data' "
"id='upload_form'>"
"<input type='file' name='update'>"
"<input type='submit' value='Update'>"
"</form>" "</form>"
"<div id='prg'>progress: 0%</div>" "<div id='prg'>progress: 0%</div>"
"<script>" "<script>"
"$('form').submit(function(e){" "$('form').submit(function(e){"
"e.preventDefault();" "e.preventDefault();"
"var form = $('#upload_form')[0];" "var form = $('#upload_form')[0];"
"var data = new FormData(form);" "var data = new FormData(form);"
" $.ajax({" " $.ajax({"
"url: '/update'," "url: '/update',"
"type: 'POST'," "type: 'POST',"
"data: data," "data: data,"
"contentType: false," "contentType: false,"
"processData:false," "processData:false,"
"xhr: function() {" "xhr: function() {"
"var xhr = new window.XMLHttpRequest();" "var xhr = new window.XMLHttpRequest();"
"xhr.upload.addEventListener('progress', function(evt) {" "xhr.upload.addEventListener('progress', function(evt) {"
"if (evt.lengthComputable) {" "if (evt.lengthComputable) {"
"var per = evt.loaded / evt.total;" "var per = evt.loaded / evt.total;"
"$('#prg').html('progress: ' + Math.round(per*100) + '%');" "$('#prg').html('progress: ' + Math.round(per*100) + '%');"
"}" "}"
"}, false);" "}, false);"
"return xhr;" "return xhr;"
"}," "},"
"success:function(d, s) {" "success:function(d, s) {"
"console.log('success!')" "console.log('success!')"
"}," "},"
"error: function (a, b, c) {" "error: function (a, b, c) {"
"}" "}"
"});" "});"
"});" "});"
"</script>"; "</script>";
/* /*
* setup function * setup function
*/ */
void setup(void) { void setup(void) {
pinMode(led, OUTPUT); pinMode(led, OUTPUT);
Serial.begin(9600); Serial.begin(9600);
// Connect to WiFi network // Connect to WiFi network
WiFi.begin(ssid, password); WiFi.begin(ssid, password);
Serial.println(""); Serial.println("");
// Wait for connection or reboot if it doesn't connect for too long // Wait for connection or reboot if it doesn't connect for too long
uint32_t wifiConnAttements = 0; uint32_t wifiConnAttements = 0;
while (WiFi.status() != WL_CONNECTED) { while (WiFi.status() != WL_CONNECTED) {
delay(500); delay(500);
Serial.print("."); Serial.print(".");
if (wifiConnAttements++ > 120) { if (wifiConnAttements++ > 120) {
Serial.println("<Wifi not connecting after 120 attmepts (1 min.) - rebooting>"); Serial.println(
"<Wifi not connecting after 120 attmepts (1 min.) - rebooting>");
ESP.restart(); ESP.restart();
} }
} }
Serial.println(""); Serial.println("");
Serial.print("Connected to "); Serial.print("Connected to ");
Serial.println(ssid); Serial.println(ssid);
@@ -148,7 +151,7 @@ void setup(void) {
Serial.println(WiFi.localIP()); Serial.println(WiFi.localIP());
/*use mdns for host name resolution*/ /*use mdns for host name resolution*/
if (!MDNS.begin(host)) { //http://esp32ota.local if (!MDNS.begin(host)) { // http://esp32ota.local
Serial.println("Error setting up MDNS responder!"); Serial.println("Error setting up MDNS responder!");
while (1) { while (1) {
delay(1000); delay(1000);
@@ -165,30 +168,37 @@ void setup(void) {
server.send(200, "text/html", serverIndex); server.send(200, "text/html", serverIndex);
}); });
/*handling uploading firmware file */ /*handling uploading firmware file */
server.on("/update", HTTP_POST, []() { server.on(
server.sendHeader("Connection", "close"); "/update", HTTP_POST,
server.send(200, "text/plain", (Update.hasError()) ? "FAIL" : "OK"); []() {
ESP.restart(); server.sendHeader("Connection", "close");
}, []() { server.send(200, "text/plain", (Update.hasError()) ? "FAIL" : "OK");
HTTPUpload& upload = server.upload(); ESP.restart();
if (upload.status == UPLOAD_FILE_START) { },
Serial.printf("Update: %s\n", upload.filename.c_str()); []() {
if (!Update.begin(UPDATE_SIZE_UNKNOWN)) { //start with max available size HTTPUpload& upload = server.upload();
Update.printError(Serial); if (upload.status == UPLOAD_FILE_START) {
} Serial.printf("Update: %s\n", upload.filename.c_str());
} else if (upload.status == UPLOAD_FILE_WRITE) { if (!Update.begin(
/* flashing firmware to ESP*/ UPDATE_SIZE_UNKNOWN)) { // start with max available size
if (Update.write(upload.buf, upload.currentSize) != upload.currentSize) { Update.printError(Serial);
Update.printError(Serial); }
} } else if (upload.status == UPLOAD_FILE_WRITE) {
} else if (upload.status == UPLOAD_FILE_END) { /* flashing firmware to ESP*/
if (Update.end(true)) { //true to set the size to the current progress if (Update.write(upload.buf, upload.currentSize) !=
Serial.printf("Update Success: %u\nRebooting...\n", upload.totalSize); upload.currentSize) {
} else { Update.printError(Serial);
Update.printError(Serial); }
} } else if (upload.status == UPLOAD_FILE_END) {
} if (Update.end(
}); true)) { // true to set the size to the current progress
Serial.printf("Update Success: %u\nRebooting...\n",
upload.totalSize);
} else {
Update.printError(Serial);
}
}
});
server.begin(); server.begin();
} }
@@ -196,7 +206,7 @@ void loop(void) {
server.handleClient(); server.handleClient();
delay(1); delay(1);
//loop to blink without delay // loop to blink without delay
unsigned long currentMillis = millis(); unsigned long currentMillis = millis();
if (currentMillis - previousMillis >= interval) { if (currentMillis - previousMillis >= interval) {