mirror of
https://github.com/jomjol/AI-on-the-edge-device.git
synced 2025-12-14 23:46:52 +03:00
* Testcase for #2145 and debug-log (#2151) * new models ana-cont-11.0.5, ana-class100-1.5.7, dig-class100-1.6.0 * Testcase for #2145 Added debug log, if allowNegativeRates is handeled * Fix timezone config parser (#2169) * make sure to parse the whole config line * fix crash on empty timezone parameter --------- Co-authored-by: CaCO3 <caco@ruinelli.ch> * Enhance ROI pages (#2161) * Check if the ROIs are equidistant. Only if not, untick the checkbox * renaming * Check if the ROIs have same y, dy and dx. If so, tick the sync checkbox * only allow editing space when box is checked * fix sync check * show inner frame on all ROIs * cleanup * Check if the ROIs have same dy and dx. If so, tick the sync checkbox * checkbox position * renaming * renaming * show inner frame and cross hairs on all ROIs * update ROIs on ticking checkboxes * show timezone hint * fix deleting last ROI * cleanup --------- Co-authored-by: CaCO3 <caco@ruinelli.ch> * restart timeout on progress, catch error (#2170) * restart timeout on progress, catch error * . --------- Co-authored-by: CaCO3 <caco@ruinelli.ch> * BugFix #2167 * Release 15.1 preparations (#2171) * Update Changelog.md * Update Changelog.md * Update Changelog.md * Update changelog * Fix links to PR * Formating * Update Changelog.md * Update Changelog.md * Update Changelog.md * Update Changelog.md * Update Changelog.md * Update Changelog.md * Update Changelog.md * Update Changelog.md * Update Changelog.md * Update Changelog.md * Update Changelog.md * Update Changelog.md --------- Co-authored-by: Slider0007 <jobbelle@gmx.net> Co-authored-by: Slider0007 <115730895+Slider0007@users.noreply.github.com> * fix typo * Replace relative documentation links with absolute ones pointing to the external documentation (#2180) Co-authored-by: CaCO3 <caco@ruinelli.ch> * Sort model files in configuration combobox (#2189) * new models ana-cont-11.0.5, ana-class100-1.5.7, dig-class100-1.6.0 * Testcase for #2145 Added debug log, if allowNegativeRates is handeled * Sort model files in combobox * reboot task - increase stack size (#2201) Avoid stack overflow * Update interface_influxdb.cpp * Update Changelog.md * Show PSRAM usage (#2206) * centralize PSRAM usage (application code only) * update logging * update logging * fix use after free * initialize buffer * free rgb_image before ussing it for new allocation * use wrapper function * switch log level to debug * . * undo adding free() calls * . * add names to all CImage instances * . * . * . * revert changes of stbi_image_free() with free_psram_heap() on the places where is is not in PSRAM * . * typos * typo * Added MQTT Outbox explanation/warning * added CONFIG_SPIRAM_USE_MEMMAP explanation --------- Co-authored-by: CaCO3 <caco@ruinelli.ch> * Disable custom MQTT Outbox. This also moves the MQTT Publishing memory usage back to the internal RAM! * log MQTT connection refused reasons (#2216) * Revert PSRAM usage as it lead to memory fragmentation. See https://github.com/jomjol/AI-on-the-edge-device/issues/2200 for details * fix missing value data * Revert PSRAM usage as it lead to memory fragmentation. (#2224) See https://github.com/jomjol/AI-on-the-edge-device/issues/2200 for details Co-authored-by: CaCO3 <caco@ruinelli.ch> * Fix missing value data in graph (#2230) * fix missing value data --------- Co-authored-by: CaCO3 <caco@ruinelli.ch> * Update Changelog.md (#2231) * Update interface_influxdb.cpp (#2233) * update copyright year * Cleanup * Set prevalue using MQTT + set prevalue to RAW value (REST+MQTT) (#2252) * Use double instead of float * Error handling + set to RAW if newvalue < 0 * REST SetPrevalue: Set to RAW if newvalue < 0 * set prevalue with MQTT * removed the stb_image files and re-add them as a submodule. (#2223) - stb_image.h: Version update 2.25 -> 2.28 - stb_resize.h: Version update 0.96 -> 0.97 - stb_write.h: Version update 1.14 -> 1.16 Co-authored-by: CaCO3 <caco@ruinelli.ch> * Remove obsolete ClassFlowWriteList (#2264) * Renaming & cleanup of some modules / functions in source code (#2265) * Rename module tag name * Rename server_tflite.cpp -> MainFlowControl.cpp * Remove redundandant MQTTMainTopic function * Update * Remove obsolete GetMQTTMainTopic * Fix last element missing in digit model drop down (#2282) * Debug influxdb (#2283) * Fix time offset issues in InfluxDB component. (#2278) Closes #2273 Closes #2150 * Update interface_influxdb.cpp * Update interface_influxdb.cpp * Improve Logging * Implement TimeSync at beginning * Update time_sntp.cpp * Update time_sntp.cpp * Set Time After WLAN Init --------- Co-authored-by: Antonin Delpeuch <antonin@delpeuch.eu> * Implement a camera livestream handler (#2286) * fix leading NaN (#2310) * analogROI: Activate save button after ROI creation (#2326) * Migration of PlatformIO 5.2.0 to 6.1.0 (resp. ESP IDF from 4.4.2 to 5.0.1) (#2305) * Migration to PlatformIO 6.1.0 * Disable RMTMEM usage as it is no longer allowed -> Smart LEDs not functional! * moved miniz into subfolder of jomjol_fileserver_ota, else it does not build anymore. * cleanup * fix leading NaN (#2310) * Migration to PlatformIO 6.1.0 * Disable RMTMEM usage as it is no longer allowed -> Smart LEDs not functional! * moved miniz into subfolder of jomjol_fileserver_ota, else it does not build anymore. * cleanup * Task watchdog has new config name * Fix return value check. It must be something else than ESP_FAIL, but it does not need to be ESP_OK! * add missing strucures to work around new RMTMEM restriction (untested) --------- Co-authored-by: CaCO3 <caco@ruinelli.ch> * Keep MainFlowTask alive to handle reboot (#2325) * Shared PSRAM memory (#2285) * enable PSRAM logging * add extra functions for psram shared memroy handling * CImageBasis objects still should used dynamic memory (eg. rawImage), haw ever tmpImage must be placed inside the shared memory * Place all STBI allocs inside the shared memory * The models are placed in the shared PSRAM reagion and must be allocated through the dedicated functions * . * renaming * fix cast warning * add flag to switch STBI PSRAM usage * improve PSRAM shared handling * reserve shared PSRAM as early as possible * init logging eralier so we can use it in PSRAM shared alloc * move Wifi_LWIP, BSS_SEG and MQTT Outbox into PSRAM to ffree internal memory * Check if model fits into reserved shared memory * Update code/components/jomjol_tfliteclass/CTfLiteClass.cpp * Update code/components/jomjol_helper/psram.cpp * Update code/components/jomjol_helper/psram.cpp * Update code/components/jomjol_flowcontroll/ClassFlowControll.cpp * Update code/components/jomjol_helper/psram.cpp * Update code/components/jomjol_helper/psram.cpp * Update code/components/jomjol_helper/psram.cpp * Update code/components/jomjol_image_proc/CImageBasis.cpp * Update code/components/jomjol_helper/psram.cpp * Update code/components/jomjol_helper/psram.cpp * Update code/components/jomjol_helper/psram.cpp * Update code/components/jomjol_helper/psram.cpp * Update code/components/jomjol_helper/psram.cpp * Update code/components/jomjol_helper/psram.cpp * Update code/components/jomjol_helper/psram.cpp * . * . * . * . * Korrektur Merge Conflict in main.cpp --------- Co-authored-by: CaCO3 <caco@ruinelli.ch> Co-authored-by: jomjol <30766535+jomjol@users.noreply.github.com> * fix PSRAM init return value check * Extend InfluxDBv1 with individual topic names (#2319) * Implement individual influx topic * Update interface_influxdb.cpp * Update interface_influxdb.cpp * Update FieldName * analogROI: Activate save button after ROI creation (#2326) * Migration of PlatformIO 5.2.0 to 6.1.0 (resp. ESP IDF from 4.4.2 to 5.0.1) (#2305) * Migration to PlatformIO 6.1.0 * Disable RMTMEM usage as it is no longer allowed -> Smart LEDs not functional! * moved miniz into subfolder of jomjol_fileserver_ota, else it does not build anymore. * cleanup * fix leading NaN (#2310) * Migration to PlatformIO 6.1.0 * Disable RMTMEM usage as it is no longer allowed -> Smart LEDs not functional! * moved miniz into subfolder of jomjol_fileserver_ota, else it does not build anymore. * cleanup * Task watchdog has new config name * Fix return value check. It must be something else than ESP_FAIL, but it does not need to be ESP_OK! * add missing strucures to work around new RMTMEM restriction (untested) --------- Co-authored-by: CaCO3 <caco@ruinelli.ch> * Keep MainFlowTask alive to handle reboot (#2325) * Shared PSRAM memory (#2285) * enable PSRAM logging * add extra functions for psram shared memroy handling * CImageBasis objects still should used dynamic memory (eg. rawImage), haw ever tmpImage must be placed inside the shared memory * Place all STBI allocs inside the shared memory * The models are placed in the shared PSRAM reagion and must be allocated through the dedicated functions * . * renaming * fix cast warning * add flag to switch STBI PSRAM usage * improve PSRAM shared handling * reserve shared PSRAM as early as possible * init logging eralier so we can use it in PSRAM shared alloc * move Wifi_LWIP, BSS_SEG and MQTT Outbox into PSRAM to ffree internal memory * Check if model fits into reserved shared memory * Update code/components/jomjol_tfliteclass/CTfLiteClass.cpp * Update code/components/jomjol_helper/psram.cpp * Update code/components/jomjol_helper/psram.cpp * Update code/components/jomjol_flowcontroll/ClassFlowControll.cpp * Update code/components/jomjol_helper/psram.cpp * Update code/components/jomjol_helper/psram.cpp * Update code/components/jomjol_helper/psram.cpp * Update code/components/jomjol_image_proc/CImageBasis.cpp * Update code/components/jomjol_helper/psram.cpp * Update code/components/jomjol_helper/psram.cpp * Update code/components/jomjol_helper/psram.cpp * Update code/components/jomjol_helper/psram.cpp * Update code/components/jomjol_helper/psram.cpp * Update code/components/jomjol_helper/psram.cpp * Update code/components/jomjol_helper/psram.cpp * . * . * . * . * Korrektur Merge Conflict in main.cpp --------- Co-authored-by: CaCO3 <caco@ruinelli.ch> Co-authored-by: jomjol <30766535+jomjol@users.noreply.github.com> * fix PSRAM init return value check * Extend incl. indiv. Measurement * Implement UX * Update ClassFlowInfluxDBv2.cpp * Implement individual influx topic * Update interface_influxdb.cpp * Update interface_influxdb.cpp * Update FieldName * Extend incl. indiv. Measurement * Implement UX * Update ClassFlowInfluxDBv2.cpp * Update main.cpp --------- Co-authored-by: Slider0007 <115730895+Slider0007@users.noreply.github.com> Co-authored-by: CaCO3 <caco3@ruinelli.ch> Co-authored-by: CaCO3 <caco@ruinelli.ch> * Update Changelog.md (#2344) * Update Changelog.md * Update Changelog.md * merge conflicts * merge conflicts * update changelog * Update Changelog.md * Fix alignment mark PSRAM issue (#2357) * Add lock for shared PSRAM memory, use it for the relevant round steps and the Alignment Mark Task * only allow taking a new image for the Alignment Mark while round got completed * show success/denial of Alignment Mark Update Request * . --------- Co-authored-by: CaCO3 <caco@ruinelli.ch> * Update Changelog.md (#2360) * Update platformio.ini (#2368) * Allow the Alignment Mark step while status is "Initializing" or "Initialization (delayed)" or while in setup mode (#2373) Co-authored-by: CaCO3 <caco@ruinelli.ch> * Improve logging if Autostart is not enabled. Renamed/splitted functions (#2376) Co-authored-by: CaCO3 <caco@ruinelli.ch> * Cleanup web UI (#2378) * fix wrong index on backup log * remove no longer used files/functions * improve logging on Alignment Mark Update --------- Co-authored-by: CaCO3 <caco@ruinelli.ch> * Update Changelog.md --------- Co-authored-by: Frank Haverland <fspapaping@googlemail.com> Co-authored-by: CaCO3 <caco@ruinelli.ch> Co-authored-by: jomjol <30766535+jomjol@users.noreply.github.com> Co-authored-by: Slider0007 <jobbelle@gmx.net> Co-authored-by: Slider0007 <115730895+Slider0007@users.noreply.github.com> Co-authored-by: Antonin Delpeuch <antonin@delpeuch.eu>
224 lines
5.9 KiB
HTML
224 lines
5.9 KiB
HTML
<!DOCTYPE html>
|
|
<html>
|
|
<head>
|
|
<link rel="icon" href="favicon.ico?v=$COMMIT_HASH" type="image/x-icon">
|
|
<title>Backup/Restore Configuration</title>
|
|
<meta charset="utf-8">
|
|
|
|
<style>
|
|
h1 {font-size: 2em;}
|
|
h2 {font-size: 1.5em;}
|
|
h3 {font-size: 1.2em;}
|
|
p {font-size: 1em;}
|
|
|
|
input[type=number] {
|
|
width: 138px;
|
|
padding: 10px 5px;
|
|
display: inline-block;
|
|
border: 1px solid #ccc;
|
|
font-size: 16px;
|
|
}
|
|
|
|
.button {
|
|
padding: 10px 20px;
|
|
width: 211px;
|
|
font-size: 16px;
|
|
}
|
|
</style>
|
|
|
|
</head>
|
|
|
|
<body style="font-family: arial; padding: 0px 10px;">
|
|
<h2>Backup Configuration</h2>
|
|
<p>With the following action the <a href="/fileserver/config/" target="_self">config</a> folder on the SD-card gets zipped and provided as a download.</p>
|
|
|
|
<button class="button" id="startBackup" type="button" onclick="startBackup()">Create Config backup</button>
|
|
<p id=progress></p>
|
|
<hr>
|
|
<h2>Restore Configuration</h2>
|
|
<p>Use the <a href="/fileserver/config/" target="_self">File Server</a> to upload individual files.</p>
|
|
</body>
|
|
|
|
|
|
<script type="text/javascript" src="common.js?v=$COMMIT_HASH"></script>
|
|
<script type="text/javascript" src="jszip.min.js?v=$COMMIT_HASH"></script>
|
|
<script type="text/javascript" src="FileSaver.min.js?v=$COMMIT_HASH"></script>
|
|
<script>
|
|
|
|
function startBackup() {
|
|
document.getElementById("progress").innerHTML = "Creating backup...<br>\n";
|
|
|
|
// Get hostname
|
|
try {
|
|
var xhttp = new XMLHttpRequest();
|
|
xhttp.open("GET", getDomainname() + "/info?type=Hostname", false);
|
|
xhttp.send();
|
|
hostname = xhttp.responseText;
|
|
}
|
|
catch(err) {
|
|
setStatus("<span style=\"color: red\">Failed to fetch hostname: " + err.message + "!</span>");
|
|
return;
|
|
}
|
|
|
|
// get date/time
|
|
var dateTime = new Date().toJSON().slice(0,10) + "_" + new Date().toJSON().slice(11,19).replaceAll(":", "-");
|
|
|
|
zipFilename = hostname + "_" + dateTime + ".zip";
|
|
console.log(zipFilename);
|
|
|
|
// Get files list
|
|
setStatus("Fetching File List...");
|
|
try {
|
|
var xhttp = new XMLHttpRequest();
|
|
xhttp.open("GET", getDomainname() + "/fileserver/config/", false);
|
|
xhttp.send();
|
|
|
|
var parser = new DOMParser();
|
|
var content = parser.parseFromString(xhttp.responseText, 'text/html'); }
|
|
catch(err) {
|
|
setStatus("Failed to fetch files list: " + err.message);
|
|
return;
|
|
}
|
|
|
|
const list = content.querySelectorAll("a");
|
|
|
|
var urls = [];
|
|
|
|
for (a of list) {
|
|
url = a.getAttribute("href");
|
|
urls.push(getDomainname() + url);
|
|
}
|
|
|
|
// Pack as zip and download
|
|
try {
|
|
backup(urls, zipFilename);
|
|
}
|
|
catch(err) {
|
|
setStatus("<span style=\"color: red\">Failed to zip files: " + err.message + "!</span>");
|
|
return;
|
|
}
|
|
}
|
|
|
|
|
|
function fetchFiles(urls, filesData, index, retry, zipFilename) {
|
|
url = urls[index];
|
|
|
|
// console.log(url + " started (" + index + "/" + urls.length + ")");
|
|
if (retry == 0) {
|
|
setStatus(" - " + getFilenameFromUrl(urls[index]) + " (" + (index+1) + "/" + urls.length + ")...");
|
|
}
|
|
else {
|
|
setStatus("<span style=\"color: gray\"> Retrying (" + retry + ")...</span>");
|
|
}
|
|
|
|
const xhr = new XMLHttpRequest();
|
|
xhr.open('GET', url, true);
|
|
xhr.responseType = "blob";
|
|
|
|
if (retry == 0) { // Short timeout on first retry
|
|
xhr.timeout = 2000; // time in milliseconds
|
|
}
|
|
else if (retry == 1) { // longer timeout
|
|
xhr.timeout = 5000; // time in milliseconds
|
|
}
|
|
else if (retry == 2) { // longer timeout
|
|
xhr.timeout = 10000; // time in milliseconds
|
|
}
|
|
else if (retry == 3) { // longer timeout
|
|
xhr.timeout = 20000; // time in milliseconds
|
|
}
|
|
else { // very long timeout
|
|
xhr.timeout = 30000; // time in milliseconds
|
|
}
|
|
|
|
xhr.onload = () => { // Request finished
|
|
//console.log(url + " done");
|
|
|
|
filesData[index] = xhr.response;
|
|
|
|
if (index == urls.length - 1) {
|
|
setStatus("Fetched all files");
|
|
generateZipFile(urls, filesData, zipFilename);
|
|
return;
|
|
}
|
|
else { // Next file
|
|
fetchFiles(urls, filesData, index+1, 0, zipFilename);
|
|
}
|
|
};
|
|
|
|
xhr.onprogress = (e) => { // XMLHttpRequest progress ... extend timeout
|
|
xhr.timeout = xhr.timeout + 500;
|
|
};
|
|
|
|
xhr.onerror = (e) => { // XMLHttpRequest error loading
|
|
console.log("Error on fetching " + url + "!");
|
|
if (retry > 5) {
|
|
setStatus("<span style=\"color: red\">Backup failed, please restart the device and try again!</span>");
|
|
}
|
|
else {
|
|
fetchFiles(urls, filesData, index, retry+1, zipFilename);
|
|
}
|
|
};
|
|
|
|
xhr.ontimeout = (e) => { // XMLHttpRequest timed out
|
|
console.log("Timeout on fetching " + url + "!");
|
|
if (retry > 5) {
|
|
setStatus("<span style=\"color: red\">Backup failed, please restart the device and try again!</span>");
|
|
}
|
|
else {
|
|
fetchFiles(urls, filesData, index, retry+1, zipFilename);
|
|
}
|
|
};
|
|
|
|
xhr.send(null);
|
|
}
|
|
|
|
|
|
function generateZipFile(urls, filesData, zipFilename) {
|
|
setStatus("Creating Zip File...");
|
|
|
|
var zip = new JSZip();
|
|
|
|
for (var i = 0; i < urls.length; i++) {
|
|
zip.file(getFilenameFromUrl(urls[i]), filesData[i]);
|
|
}
|
|
|
|
zip.generateAsync({type:"blob"})
|
|
.then(function(content) {
|
|
saveAs(content, zipFilename);
|
|
});
|
|
|
|
setStatus("Backup completed");
|
|
}
|
|
|
|
|
|
const backup = (urls, zipFilename) => {
|
|
if(!urls) return;
|
|
|
|
/* Testing */
|
|
/*len = urls.length;
|
|
for (i = 0; i < len - 3; i++) {
|
|
urls.pop();
|
|
}*/
|
|
|
|
console.log(urls);
|
|
|
|
urlIndex = 0;
|
|
setStatus("Fetching files...");
|
|
fetchFiles(urls, [], 0, 0, zipFilename);
|
|
};
|
|
|
|
|
|
function setStatus(status) {
|
|
console.log(status);
|
|
document.getElementById("progress").innerHTML += status + "<br>\n";
|
|
}
|
|
|
|
function getFilenameFromUrl(url) {
|
|
return filename = url.substring(url.lastIndexOf('/')+1);
|
|
}
|
|
|
|
</script>
|
|
|
|
</html>
|