ise-senior-iot
/
iot-firmware
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

ota update

This commit is contained in:
Siwat Sirichai 2023-10-01 12:32:12 +07:00
parent dc20153722
commit c2f8c07b5a
10 changed files with 147 additions and 126 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/espmega_iot_core.cpp
View File

@ -247,12 +247,12 @@ void ota_begin()
otaserver.on("/", HTTP_GET, []()
{
otaserver.sendHeader("Connection", "close");
String otabuffer = ota_part1+HOSTNAME+ota_part2+IP.toString()+ota_part3+ESPMEGA_REV+ota_part4+MQTT_SERVER.toString()+ota_part5+String(MQTT_BASE_TOPIC)+ota_part6;
String otabuffer = ota_part1+HOSTNAME+ota_part2+IP.toString()+ota_part3+ETH.macAddress()+ota_part4+ESPMEGA_REV+ota_part5+MQTT_SERVER.toString()+ota_part6+String(MQTT_BASE_TOPIC)+ota_part7;
if(standalone)
otabuffer+=String("No");
else
otabuffer+=String("Yes");
otabuffer+=ota_part7;
otabuffer+=ota_part8;
otaserver.send(200, "text/html", otabuffer); });
otaserver.on(
"/update", HTTP_POST, []()
@ -265,9 +265,13 @@ void ota_begin()
HTTPUpload &upload = otaserver.upload();
if (upload.status == UPLOAD_FILE_START)
{
lcd_send_command("page ota");
String otafiletxt = "Downloading File : " + upload.filename;
panel.writeStr("otatxt.txt",otafiletxt);
Serial.printf("Update: %s\n", upload.filename.c_str());
if (!Update.begin(UPDATE_SIZE_UNKNOWN))
{
panel.writeStr("otatxt.txt","Update Failed, Rebooting . . .");
Update.printError(Serial);
}
}
@ -275,6 +279,7 @@ void ota_begin()
{
if (Update.write(upload.buf, upload.currentSize) != upload.currentSize)
{
panel.writeStr("otatxt.txt","Update Failed, Rebooting . . .");
Update.printError(Serial);
}
}
@ -282,10 +287,12 @@ void ota_begin()
{
if (Update.end(true))
{
panel.writeStr("otatxt.txt","Update Completed, Rebooting . . .");
Serial.printf("Update Success: %u\nRebooting...\n", upload.totalSize);
}
else
{
panel.writeStr("otatxt.txt","Update Failed, Rebooting . . .");
Update.printError(Serial);
}
}

3
src/espmega_iot_ota.cpp
View File

@ -20,4 +20,7 @@ const String ota_part6 = {
};
const String ota_part7 = {
#include "ota_html/ota-part7.html"
};
const String ota_part8 = {
#include "ota_html/ota-part8.html"
};

3
src/espmega_iot_ota.hpp
View File

@ -6,4 +6,5 @@ extern const String ota_part3;
extern const String ota_part4;
extern const String ota_part5;
extern const String ota_part6;
extern const String ota_part7;
extern const String ota_part7;
extern const String ota_part8;

2
src/ota_html/ota-part1.html
View File

@ -1,7 +1,7 @@
R"=====(<script src="https://ajax.googleapis.com/ajax/libs/jquery/3.2.1/jquery.min.js"></script>
<form method="POST" action="#" enctype="multipart/form-data" id="upload_form">
<h1>ESPMega PRO</h1>
<h3>Programming Tool</h3>
<h3>Software Management</h3>
<p style="text-align: left">
Hostname

2
src/ota_html/ota-part3.html
View File

@ -1,5 +1,5 @@
R"=====(</span>
</p>
<p style="text-align: left">
Device
MAC Address
<span style="float: right">)====="

2
src/ota_html/ota-part4.html
View File

@ -1,5 +1,5 @@
R"=====(</span>
</p>
<p style="text-align: left">
API Server
Device
<span style="float: right">)====="

2
src/ota_html/ota-part5.html
View File

@ -1,5 +1,5 @@
R"=====(</span>
</p>
<p style="text-align: left">
API Endpoint
API Server
<span style="float: right">)====="

2
src/ota_html/ota-part6.html
View File

@ -1,5 +1,5 @@
R"=====(</span>
</p>
<p style="text-align: left">
Centrally Managed
API Endpoint
<span style="float: right">)====="

121
src/ota_html/ota-part7.html
View File

@ -1,120 +1,5 @@
R"=====(</span>
</p>
<input
type="file"
name="update"
id="file"
onchange="sub(this)"
style="display: none"
/>
<label id="file-input" for="file">Choose file...</label>
<input type="submit" class="btn" value="Program" /><br /><br />
<div id="prg"></div>
<br />
<div id="prgbar">
<div id="bar"></div>
</div>
<br />
<b>SIWAT SYSTEM 2023</b>
</form>
<script>
function sub(obj) {
var fileName = obj.value.split("\\");
document.getElementById("file-input").innerHTML =
" " + fileName[fileName.length - 1];
}
$("form").submit(function (e) {
e.preventDefault();
var form = $("#upload_form")[0];
var data = new FormData(form);
$.ajax({
url: "/update",
type: "POST",
data: data,
contentType: false,
processData: false,
xhr: function () {
var xhr = new window.XMLHttpRequest();
xhr.upload.addEventListener(
"progress",
function (evt) {
if (evt.lengthComputable) {
var per = evt.loaded / evt.total;
$("#prg").html("progress: " + Math.round(per * 100) + "%");
$("#bar").css("width", Math.round(per * 100) + "%");
}
},
false
);
return xhr;
},
success: function (d, s) {
console.log("success!");
},
error: function (a, b, c) {},
});
});
</script>
<style>
#file-input,
input {
width: 100%;
height: 44px;
border-radius: 4px;
margin: 10px auto;
font-size: 15px;
}
input {
background: #f1f1f1;
border: 0;
padding: 0 15px;
}
body {
background-image: url("https://siwatinc.com/wp-content/uploads/2023/07/lockscreen.jpg");
background-size: cover;
font-family: sans-serif;
font-size: 14px;
color: #777;
}
#file-input {
background-color: #CCCCCC;
color: #5E5E5E;
padding: 0;
border: 1px solid #ddd;
line-height: 44px;
text-align: center;
display: block;
cursor: pointer;
}
#bar,
#prgbar {
background-color: #D9D9D9;
border-radius: 10px;
}
#bar {
background-color: #29CD1F;
width: 0%;
height: 10px;
}
form {
background: rgba(255,255,255,0.95);
max-width: 258px;
margin: 75px auto;
padding: 30px;
border-radius: 15px;
text-align: center;
}
.btn {
background: #CA3D3D;
color: #fff;
cursor: pointer;
}
</style>)====="
<p style="text-align: left">
Centrally Managed
<span style="float: right">)====="

125
src/ota_html/ota-part8.html Normal file
View File

@ -0,0 +1,125 @@
R"=====(</span>
</p>
<input
type="file"
name="update"
id="file"
onchange="sub(this)"
style="display: none"
/>
<label id="file-input" for="file">Choose file...</label>
<input type="submit" class="btn" value="Program" /><br /><br />
<div id="prg"></div>
<br />
<div id="prgbar">
<div id="bar"></div>
</div>
<br />
<b>SIWAT SYSTEM 2023</b>
</form>
<script>
function sub(obj) {
var fileName = obj.value.split("\\");
document.getElementById("file-input").innerHTML =
" " + fileName[fileName.length - 1];
}
$("form").submit(function (e) {
e.preventDefault();
var form = $("#upload_form")[0];
var data = new FormData(form);
$.ajax({
url: "/update",
type: "POST",
data: data,
contentType: false,
processData: false,
xhr: function () {
var xhr = new window.XMLHttpRequest();
xhr.upload.addEventListener(
"progress",
function (evt) {
if (evt.lengthComputable) {
var per = evt.loaded / evt.total;
if(Math.round(per*100)<100) {
$("#prg").html("Updating . . . (" + Math.round(per * 100) + "%)");
}
else {
$("#prg").html("Update Completed, Rebooting . . .");
}
$("#bar").css("width", Math.round(per * 100) + "%");
}
},
false
);
return xhr;
},
success: function (d, s) {
console.log("success!");
},
error: function (a, b, c) {},
});
});
</script>
<style>
#file-input,
input {
width: 100%;
height: 44px;
border-radius: 4px;
margin: 10px auto;
font-size: 15px;
}
input {
background: #f1f1f1;
border: 0;
padding: 0 15px;
}
body {
background-image: url("https://fs.siwatsystem.com/arona_bg.png");
background-size: cover;
font-family: sans-serif;
font-size: 14px;
color: #777;
}
#file-input {
background-color: #CCCCCC;
color: #5E5E5E;
padding: 0;
border: 1px solid #ddd;
line-height: 44px;
text-align: center;
display: block;
cursor: pointer;
}
#bar,
#prgbar {
background-color: #D9D9D9;
border-radius: 10px;
}
#bar {
background-color: #29CD1F;
width: 0%;
height: 10px;
}
form {
background: rgba(255,255,255,0.95);
max-width: 258px;
margin: 75px auto;
padding: 30px;
border-radius: 15px;
text-align: center;
}
.btn {
background: #CA3D3D;
color: #fff;
cursor: pointer;
}
</style>)====="