Mirror/AI-on-the-edge-device
1
0
Fork 0
mirror of https://github.com/jomjol/AI-on-the-edge-device.git synced 2025-12-09 13:06:54 +03:00
Code Issues Packages Projects Releases Wiki Activity

consolidated reboot and save buttons (#3581)

Browse Source 
* config page: consolidated reboot and save button

* various pages: consolidated reboot and save button

---------

Co-authored-by: CaCO3 <caco@ruinelli.ch>
This commit is contained in:
CaCO3
2025-02-24 23:05:32 +01:00
committed by GitHub
parent 8f5bf209d9
commit 8ddbda16bf
8 changed files with 170 additions and 154 deletions
Download Patch File Download Diff File Expand all files Collapse all files

97
sd-card/html/edit_alignment.html
View File

@@ -79,6 +79,18 @@
transform: translate(-50%,-50%); transform: translate(-50%,-50%);
-ms-transform: translate(-50%,-50%); -ms-transform: translate(-50%,-50%);
} }
#reboot_button {
float: none;
background-color: #f44336;
color: white;
padding: 5px;
border-radius:
5px; font-weight: bold;
text-align: center;
text-decoration: none;
display: inline-block;
}
</style> </style>
<link href="firework.css?v=$COMMIT_HASH" rel="stylesheet"> <link href="firework.css?v=$COMMIT_HASH" rel="stylesheet">
@@ -188,13 +200,11 @@
param; param;
function doReboot() { function doReboot() {
if (confirm("Are you sure you want to reboot? Did you save your changes?")) { var stringota = domainname + "/reboot";
var stringota = domainname + "/reboot"; window.location = stringota;
window.location = stringota; window.location.href = stringota;
window.location.href = stringota; window.location.assign(stringota);
window.location.assign(stringota); window.location.replace(stringota);
window.location.replace(stringota);
}
} }
function ChangeSelection(){ function ChangeSelection(){
@@ -215,50 +225,45 @@
document.getElementById("overlay").style.display = "block"; document.getElementById("overlay").style.display = "block";
document.getElementById("overlaytext").innerHTML = "Save Alignment Marker..."; document.getElementById("overlaytext").innerHTML = "Save Alignment Marker...";
if (confirm("Are you sure you want to save the new alignment marker configuration?")) { function sleep(ms) {
function sleep(ms) { return new Promise(resolve => setTimeout(resolve, ms));
return new Promise(resolve => setTimeout(resolve, ms)); }
}
async function task() { async function task() {
while (true) { while (true) {
WriteConfigININew(); WriteConfigININew();
if (neueref1 == 1 && neueref2 == 1) { if (neueref1 == 1 && neueref2 == 1) {
UpdateConfigReferences(domainname); UpdateConfigReferences(domainname);
} }
else if (neueref1 == 1) { else if (neueref1 == 1) {
var anzneueref = 1; var anzneueref = 1;
UpdateConfigReference(anzneueref, domainname); UpdateConfigReference(anzneueref, domainname);
} }
else if (neueref2 == 1) { else if (neueref2 == 1) {
var anzneueref = 2; var anzneueref = 2;
UpdateConfigReference(anzneueref, domainname); UpdateConfigReference(anzneueref, domainname);
}
SaveConfigToServer(domainname);
document.getElementById("updatemarker").disabled = false;
// document.getElementById("savemarker").disabled = true;
// document.getElementById("enhancecontrast").disabled = true;
EnDisableItem(false, "savemarker", true);
EnDisableItem(false, "enhancecontrast", true);
document.getElementById("overlay").style.display = "none";
firework.launch('Alignment marker saved. They will get applied after next reboot', 'success', 5000);
return;
} }
}
setTimeout(function () { SaveConfigToServer(domainname);
// Delay so the overlay gets shown
task(); document.getElementById("updatemarker").disabled = false;
}, 1); // document.getElementById("savemarker").disabled = true;
} // document.getElementById("enhancecontrast").disabled = true;
else {
document.getElementById("overlay").style.display = "none"; EnDisableItem(false, "savemarker", true);
EnDisableItem(false, "enhancecontrast", true);
document.getElementById("overlay").style.display = "none";
firework.launch('Alignment marker saved. They will get applied after the next reboot!<br><br>\n<a id="reboot_button" onclick="doReboot()">reboot now</a>', 'success', 5000);
return;
}
} }
setTimeout(function () {
// Delay so the overlay gets shown
task();
}, 1);
} }
function EnhanceContrast() { function EnhanceContrast() {

42
sd-card/html/edit_analog.html
View File

@@ -5,6 +5,20 @@
<meta charset="UTF-8" /> <meta charset="UTF-8" />
<title>Analog ROI</title> <title>Analog ROI</title>
<style>
#reboot_button {
float: none;
background-color: #f44336;
color: white;
padding: 5px;
border-radius:
5px; font-weight: bold;
text-align: center;
text-decoration: none;
display: inline-block;
}
</style>
<link href="edit_style.css" rel="stylesheet"> <link href="edit_style.css" rel="stylesheet">
<link href="firework.css?v=$COMMIT_HASH" rel="stylesheet"> <link href="firework.css?v=$COMMIT_HASH" rel="stylesheet">
@@ -185,13 +199,11 @@ The following settings are only used for easier setup, they are <b>not</b> persi
domainname = getDomainname(); domainname = getDomainname();
function doReboot() { function doReboot() {
if (confirm("Are you sure you want to reboot? Did you save your changes?")) { var stringota = getDomainname() + "/reboot";
var stringota = getDomainname() + "/reboot"; window.location = stringota;
window.location = stringota; window.location.href = stringota;
window.location.href = stringota; window.location.assign(stringota);
window.location.assign(stringota); window.location.replace(stringota);
window.location.replace(stringota);
}
} }
function EnDisableAnalog() { function EnDisableAnalog() {
@@ -331,16 +343,14 @@ The following settings are only used for easier setup, they are <b>not</b> persi
} }
function SaveToConfig() { function SaveToConfig() {
if (confirm("Are you sure you want to save the new analog ROI configuration?")) { //_zwcat = getConfigCategory();
//_zwcat = getConfigCategory(); cofcat["Analog"]["enabled"] = document.getElementById("Category_Analog_enabled").checked;
cofcat["Analog"]["enabled"] = document.getElementById("Category_Analog_enabled").checked; WriteConfigININew();
WriteConfigININew(); SaveConfigToServer(domainname);
SaveConfigToServer(domainname); UpdateROIs();
UpdateROIs(); document.getElementById("saveroi").disabled = true;
document.getElementById("saveroi").disabled = true;
firework.launch('Configuration saved. It will get applied after next reboot', 'success', 5000); firework.launch('Configuration saved. It will get applied after the next reboot!<br><br>\n<a id="reboot_button" onclick="doReboot()">reboot now</a>', 'success', 5000);
}
} }
function ShowMultiplier() { function ShowMultiplier() {

45
sd-card/html/edit_config_raw.html
View File

@@ -20,6 +20,18 @@
textarea { textarea {
font-size: 15px; font-size: 15px;
} }
#reboot_button {
float: none;
background-color: #f44336;
color: white;
padding: 5px;
border-radius:
5px; font-weight: bold;
text-align: center;
text-decoration: none;
display: inline-block;
}
</style> </style>
<link href="firework.css?v=$COMMIT_HASH" rel="stylesheet"> <link href="firework.css?v=$COMMIT_HASH" rel="stylesheet">
@@ -38,15 +50,8 @@
</td> </td>
</table> </table>
<table> <hr>
<td> <button class="button" onclick="saveTextAsFile()">Save Config</button>
<button class="button" onclick="saveTextAsFile()">Save Config</button>
</td>
<td>
<button class="button" id="reboot" type="button" onclick="doReboot()">Reboot to activate changes</button>
</td>
</table>
<script type="text/javascript" src="readconfigparam.js?v=$COMMIT_HASH"></script> <script type="text/javascript" src="readconfigparam.js?v=$COMMIT_HASH"></script>
<script type="text/javascript" src="readconfigcommon.js?v=$COMMIT_HASH"></script> <script type="text/javascript" src="readconfigcommon.js?v=$COMMIT_HASH"></script>
@@ -64,23 +69,19 @@
function saveTextAsFile() function saveTextAsFile()
{ {
if (confirm("Are you sure you want to save the configuration?")) { FileDeleteOnServer("/config/config.ini", domainname);
FileDeleteOnServer("/config/config.ini", domainname); var textToSave = document.getElementById("inputTextToSave").value;
var textToSave = document.getElementById("inputTextToSave").value; FileSendContent(textToSave, "/config/config.ini", domainname);
FileSendContent(textToSave, "/config/config.ini", domainname);
firework.launch('Configuration saved. It will get applied after next reboot', 'success', 5000); firework.launch('Configuration saved. It will get applied after the next reboot!<br><br>\n<a id="reboot_button" onclick="doReboot()">reboot now</a>', 'success', 5000);
}
} }
function doReboot() { function doReboot() {
if (confirm("Are you sure you want to reboot?")) { var stringota = "/reboot";
var stringota = "/reboot"; window.location = stringota;
window.location = stringota; window.location.href = stringota;
window.location.href = stringota; window.location.assign(stringota);
window.location.assign(stringota); window.location.replace(stringota);
window.location.replace(stringota);
}
} }
LoadConfigNeu(); LoadConfigNeu();

55
sd-card/html/edit_config_template.html
View File

@@ -184,6 +184,18 @@
transform: translate(-50%,-50%); transform: translate(-50%,-50%);
-ms-transform: translate(-50%,-50%); -ms-transform: translate(-50%,-50%);
} }
#reboot_button {
float: none;
background-color: #f44336;
color: white;
padding: 5px;
border-radius:
5px; font-weight: bold;
text-align: center;
text-decoration: none;
display: inline-block;
}
</style> </style>
<link rel="stylesheet" href="mkdocs_theme.css?v=$COMMIT_HASH" /> <link rel="stylesheet" href="mkdocs_theme.css?v=$COMMIT_HASH" />
@@ -2110,14 +2122,9 @@
</tr> </tr>
</table> </table>
<table style="padding-top:10px"> <hr>
<td> <button class="button" onclick="saveTextAsFile()">Save Config</button>
<button class="button" onclick="saveTextAsFile()">Save Config</button>
</td>
<td>
<button class="button" id="reboot" type="button" onclick="doReboot()">Reboot to activate changes</button>
</td>
</table>
</div> </div>
@@ -2673,18 +2680,16 @@ function saveTextAsFile() {
return; return;
} }
if (confirm("Are you sure you want to save the configuration?")) { ReadParameterAll();
ReadParameterAll(); WriteConfigININew();
WriteConfigININew(); SaveConfigToServer(domainname);
SaveConfigToServer(domainname);
firework.launch('Configuration saved. It will get applied after the next reboot!', 'success', 5000); firework.launch('Configuration saved. It will get applied after the next reboot!<br><br>\n<a id="reboot_button" onclick="doReboot()">reboot now</a>', 'success', 5000);
if (changeCamValue == 1) { if (changeCamValue == 1) {
camSettingsSet(); camSettingsSet();
firework.launch('You have changed the camera settings, so creating a new reference image and updating the alignment marks is mandatory!', 'success', 10000); firework.launch('You have changed the camera settings, creating a new reference image and updating the alignment marks is mandatory!', 'success', 5000);
} }
}
} }
function camSettingsSet(){ function camSettingsSet(){
@@ -2875,7 +2880,7 @@ function camSettingsSet(){
if (xhttp.responseText == "CamSettingsSet") { if (xhttp.responseText == "CamSettingsSet") {
document.getElementById("overlay").style.display = "none"; document.getElementById("overlay").style.display = "none";
firework.launch('Cam Settings saved', 'success', 2000); firework.launch('Cam Settings saved', 'success', 5000);
return; return;
} }
else { else {
@@ -2903,13 +2908,11 @@ function camSettingsSet(){
} }
function doReboot() { function doReboot() {
if (confirm("Are you sure you want to reboot?")) { var stringota = domainname + "/reboot";
var stringota = domainname + "/reboot"; window.location = stringota;
window.location = stringota; window.location.href = stringota;
window.location.href = stringota; window.location.assign(stringota);
window.location.assign(stringota); window.location.replace(stringota);
window.location.replace(stringota);
}
} }
function FormatDecimalValue(_param, _cat, _name) { function FormatDecimalValue(_param, _cat, _name) {

41
sd-card/html/edit_digits.html
View File

@@ -4,6 +4,19 @@
<head> <head>
<meta charset="UTF-8" /> <meta charset="UTF-8" />
<title>Digit ROI</title> <title>Digit ROI</title>
<style>
#reboot_button {
float: none;
background-color: #f44336;
color: white;
padding: 5px;
border-radius:
5px; font-weight: bold;
text-align: center;
text-decoration: none;
display: inline-block;
}
</style>
<link href="edit_style.css" rel="stylesheet"> <link href="edit_style.css" rel="stylesheet">
<link href="firework.css?v=$COMMIT_HASH" rel="stylesheet"> <link href="firework.css?v=$COMMIT_HASH" rel="stylesheet">
@@ -204,13 +217,11 @@
domainname = getDomainname(); domainname = getDomainname();
function doReboot() { function doReboot() {
if (confirm("Are you sure you want to reboot? Did you save your changes?")) { var stringota = getDomainname() + "/reboot";
var stringota = getDomainname() + "/reboot"; window.location = stringota;
window.location = stringota; window.location.href = stringota;
window.location.href = stringota; window.location.assign(stringota);
window.location.assign(stringota); window.location.replace(stringota);
window.location.replace(stringota);
}
} }
function EnDisableDigits() { function EnDisableDigits() {
@@ -359,16 +370,14 @@
} }
function SaveToConfig() { function SaveToConfig() {
if (confirm("Are you sure you want to save the new digit ROI configuration?")) { // _zwcat = getConfigCategory();
// _zwcat = getConfigCategory(); cofcat["Digits"]["enabled"] = document.getElementById("Category_Digits_enabled").checked;
cofcat["Digits"]["enabled"] = document.getElementById("Category_Digits_enabled").checked; WriteConfigININew();
WriteConfigININew(); SaveConfigToServer(domainname);
SaveConfigToServer(domainname); UpdateROIs();
UpdateROIs(); document.getElementById("saveroi").disabled = true;
document.getElementById("saveroi").disabled = true;
firework.launch('Configuration saved. It will get applied after next reboot', 'success', 5000); firework.launch('Configuration saved. It will get applied after the next reboot!<br><br>\n<a id="reboot_button" onclick="doReboot()">reboot now</a>', 'success', 5000);
}
} }
function ShowMultiplier() { function ShowMultiplier() {

24
sd-card/html/edit_reference.html
View File

@@ -395,22 +395,12 @@
<script type="text/javascript"> <script type="text/javascript">
var canvas = document.getElementById('canvas'), var canvas = document.getElementById('canvas'),
domainname = getDomainname(), domainname = getDomainname(),
context = canvas.getContext('2d'), context = canvas.getContext('2d'),
imageObj = new Image(), imageObj = new Image(),
isActReference = false, isActReference = false,
param, param,
category; category;
function doReboot() {
if (confirm("Are you sure you want to reboot? Did you save the config?")) {
var stringota = domainname + "/reboot";
window.location = stringota;
window.location.href = stringota;
window.location.assign(stringota);
window.location.replace(stringota);
}
}
function cameraParameterChanged() { function cameraParameterChanged() {
document.getElementById("savereferenceimage").disabled = true; document.getElementById("savereferenceimage").disabled = true;
@@ -738,7 +728,7 @@
if (xhttp.responseText == "CamSettingsSet") { if (xhttp.responseText == "CamSettingsSet") {
document.getElementById("overlay").style.display = "none"; document.getElementById("overlay").style.display = "none";
firework.launch('Cam Settings saved', 'success', 2000); firework.launch('Cam Settings saved', 'success', 5000);
return; return;
} }
else { else {

12
sd-card/html/reboot_page.html
View File

@@ -34,13 +34,11 @@ p {font-size: 1em;}
<script> <script>
function doReboot() { function doReboot() {
// if (confirm("Are you sure you want to reboot the ESP32?")) { var stringota = getDomainname() + "/reboot";
var stringota = getDomainname() + "/reboot"; window.location = stringota;
window.location = stringota; window.location.href = stringota;
window.location.href = stringota; window.location.assign(stringota);
window.location.assign(stringota); window.location.replace(stringota);
window.location.replace(stringota);
// }
} }
</script> </script>

4
sd-card/html/wlan_config.html
View File

@@ -29,7 +29,7 @@
// var xhttp = new XMLHttpRequest(); // var xhttp = new XMLHttpRequest();
// xhttp.onreadystatechange = function() {if (xhttp.readyState == 4) {if (xhttp.status == 200) {document.reload();}}}; // xhttp.onreadystatechange = function() {if (xhttp.readyState == 4) {if (xhttp.status == 200) {document.reload();}}};
if (!file.name.includes("remote-setup")){ if (!file.name.includes("remote-setup")){
if (!confirm("The zip file name should contain \"...remote-setup...\". Are you sure that you have downloaded the correct file?")) if (!confirm("The zip file name should contain \"...remote-setup...\". Are you sure you have downloaded the correct file?"))
return; return;
} }
@@ -41,7 +41,7 @@ if (!file.name.includes("remote-setup")){
var file = document.getElementById("newfile").files[0]; var file = document.getElementById("newfile").files[0];
if (!file.name.includes("remote-setup")) if (!file.name.includes("remote-setup"))
{ {
if (!confirm("The zip file name should contain \"...remote-setup...\". Are you sure that you have downloaded the correct file?")) if (!confirm("The zip file name should contain \"...remote-setup...\". Are you sure you have downloaded the correct file?"))
return; return;
} }