mirror of
https://github.com/jomjol/AI-on-the-edge-device.git
synced 2025-12-07 03:56:57 +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) --------- 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>
301 lines
9.2 KiB
JavaScript
301 lines
9.2 KiB
JavaScript
function SaveConfigToServer(_domainname){
|
|
// leere Zeilen am Ende löschen
|
|
var zw = config_split.length - 1;
|
|
while (config_split[zw] == "") {
|
|
config_split.pop();
|
|
}
|
|
|
|
var config_gesamt = "";
|
|
for (var i = 0; i < config_split.length; ++i)
|
|
{
|
|
config_gesamt = config_gesamt + config_split[i] + "\n";
|
|
}
|
|
|
|
FileDeleteOnServer("/config/config.ini", _domainname);
|
|
|
|
FileSendContent(config_gesamt, "/config/config.ini", _domainname);
|
|
}
|
|
|
|
function UpdateConfig(zw, _index, _enhance, _domainname){
|
|
var namezw = zw["name"];
|
|
FileCopyOnServer("/img_tmp/ref_zw.jpg", namezw, _domainname);
|
|
var namezw = zw["name"].replace(".jpg", "_org.jpg");
|
|
FileCopyOnServer("/img_tmp/ref_zw_org.jpg", namezw, _domainname);
|
|
}
|
|
|
|
|
|
function createReader(file) {
|
|
var image = new Image();
|
|
reader.onload = function(evt) {
|
|
var image = new Image();
|
|
image.onload = function(evt) {
|
|
var width = this.width;
|
|
var height = this.height;
|
|
//alert (width); // will produce something like 198
|
|
};
|
|
image.src = evt.target.result;
|
|
};
|
|
reader.readAsDataURL(file);
|
|
}
|
|
|
|
|
|
|
|
function ZerlegeZeile(input, delimiter = " =\t\r")
|
|
{
|
|
var Output = Array(0);
|
|
// delimiter = " =,\t";
|
|
|
|
|
|
/* The input can have multiple formats:
|
|
* - key = value
|
|
* - key = value1 value2 value3 ...
|
|
* - key value1 value2 value3 ...
|
|
*
|
|
* Examples:
|
|
* - ImageSize = VGA
|
|
* - IO0 = input disabled 10 false false
|
|
* - main.dig1 28 144 55 100 false
|
|
*
|
|
* This causes issues eg. if a password key has a whitespace or equal sign in its value.
|
|
* As a workaround and to not break any legacy usage, we enforce to only use the
|
|
* equal sign, if the key is "password"
|
|
*/
|
|
if (input.includes("password") || input.includes("Token")) { // Line contains a password, use the equal sign as the only delimiter and only split on first occurrence
|
|
var pos = input.indexOf("=");
|
|
delimiter = " \t\r"
|
|
Output.push(trim(input.substr(0, pos), delimiter));
|
|
Output.push(trim(input.substr(pos +1, input.length), delimiter));
|
|
}
|
|
else { // Legacy Mode
|
|
input = trim(input, delimiter);
|
|
var pos = findDelimiterPos(input, delimiter);
|
|
var token;
|
|
while (pos > -1) {
|
|
token = input.substr(0, pos);
|
|
token = trim(token, delimiter);
|
|
Output.push(token);
|
|
input = input.substr(pos+1, input.length);
|
|
input = trim(input, delimiter);
|
|
pos = findDelimiterPos(input, delimiter);
|
|
}
|
|
Output.push(input);
|
|
}
|
|
|
|
return Output;
|
|
|
|
}
|
|
|
|
function findDelimiterPos(input, delimiter)
|
|
{
|
|
var pos = -1;
|
|
var zw;
|
|
var akt_del;
|
|
|
|
for (var anz = 0; anz < delimiter.length; ++anz)
|
|
{
|
|
akt_del = delimiter[anz];
|
|
zw = input.indexOf(akt_del);
|
|
if (zw > -1)
|
|
{
|
|
if (pos > -1)
|
|
{
|
|
if (zw < pos)
|
|
pos = zw;
|
|
}
|
|
else
|
|
pos = zw;
|
|
}
|
|
}
|
|
return pos;
|
|
}
|
|
|
|
|
|
|
|
function trim(istring, adddelimiter)
|
|
{
|
|
while ((istring.length > 0) && (adddelimiter.indexOf(istring[0]) >= 0)){
|
|
istring = istring.substr(1, istring.length-1);
|
|
}
|
|
|
|
while ((istring.length > 0) && (adddelimiter.indexOf(istring[istring.length-1]) >= 0)){
|
|
istring = istring.substr(0, istring.length-1);
|
|
}
|
|
|
|
return istring;
|
|
}
|
|
|
|
|
|
function getConfig()
|
|
{
|
|
return config_gesamt;
|
|
}
|
|
|
|
|
|
function loadConfig(_domainname) {
|
|
var xhttp = new XMLHttpRequest();
|
|
try {
|
|
url = _domainname + '/fileserver/config/config.ini';
|
|
xhttp.open("GET", url, false);
|
|
xhttp.send();
|
|
config_gesamt = xhttp.responseText;
|
|
config_gesamt = config_gesamt.replace("InitalRotate", "InitialRotate"); // Korrigiere Schreibfehler in config.ini !!!!!
|
|
}
|
|
catch (error)
|
|
{
|
|
// firework.launch('Deleting Config.ini failed!', 'danger', 30000);
|
|
}
|
|
return true;
|
|
}
|
|
|
|
|
|
|
|
|
|
function dataURLtoBlob(dataurl) {
|
|
var arr = dataurl.split(','), mime = arr[0].match(/:(.*?);/)[1],
|
|
bstr = atob(arr[1]), n = bstr.length, u8arr = new Uint8Array(n);
|
|
while(n--){
|
|
u8arr[n] = bstr.charCodeAt(n);
|
|
}
|
|
return new Blob([u8arr], {type:mime});
|
|
}
|
|
|
|
function FileCopyOnServer(_source, _target, _domainname = ""){
|
|
url = _domainname + "/editflow?task=copy&in=" + _source + "&out=" + _target;
|
|
var xhttp = new XMLHttpRequest();
|
|
try {
|
|
xhttp.open("GET", url, false);
|
|
xhttp.send(); }
|
|
catch (error)
|
|
{
|
|
// firework.launch('Deleting Config.ini failed!', 'danger', 30000);
|
|
}
|
|
}
|
|
|
|
function FileDeleteOnServer(_filename, _domainname = ""){
|
|
var xhttp = new XMLHttpRequest();
|
|
var okay = false;
|
|
|
|
xhttp.onreadystatechange = function() {
|
|
if (xhttp.readyState == 4) {
|
|
if (xhttp.status == 200) {
|
|
okay = true;
|
|
} else if (xhttp.status == 0) {
|
|
// firework.launch('Server closed the connection abruptly!', 'danger', 30000);
|
|
// location.reload()
|
|
} else {
|
|
// firework.launch('An error occured: ' + xhttp.responseText, 'danger', 30000);
|
|
// location.reload()
|
|
}
|
|
}
|
|
};
|
|
try {
|
|
var url = _domainname + "/delete" + _filename;
|
|
xhttp.open("POST", url, false);
|
|
xhttp.send();
|
|
}
|
|
catch (error)
|
|
{
|
|
// firework.launch('Deleting Config.ini failed!', 'danger', 30000);
|
|
}
|
|
|
|
return okay;
|
|
}
|
|
|
|
function FileSendContent(_content, _filename, _domainname = ""){
|
|
var xhttp = new XMLHttpRequest();
|
|
var okay = false;
|
|
|
|
xhttp.onreadystatechange = function() {
|
|
if (xhttp.readyState == 4) {
|
|
if (xhttp.status == 200) {
|
|
okay = true;
|
|
} else if (xhttp.status == 0) {
|
|
firework.launch('Server closed the connection abruptly!', 'danger', 30000);
|
|
} else {
|
|
firework.launch('An error occured: ' + xhttp.responseText, 'danger', 30000);
|
|
}
|
|
}
|
|
};
|
|
|
|
try {
|
|
upload_path = _domainname + "/upload" + _filename;
|
|
xhttp.open("POST", upload_path, false);
|
|
xhttp.send(_content);
|
|
}
|
|
catch (error)
|
|
{
|
|
// firework.launch('Deleting Config.ini failed!', 'danger', 30000);
|
|
}
|
|
return okay;
|
|
}
|
|
|
|
|
|
function SaveCanvasToImage(_canvas, _filename, _delete = true, _domainname = ""){
|
|
var JPEG_QUALITY=0.8;
|
|
var dataUrl = _canvas.toDataURL('image/jpeg', JPEG_QUALITY);
|
|
var rtn = dataURLtoBlob(dataUrl);
|
|
|
|
if (_delete) {
|
|
FileDeleteOnServer(_filename, _domainname);
|
|
}
|
|
|
|
FileSendContent(rtn, _filename, _domainname);
|
|
}
|
|
|
|
function MakeContrastImageZW(zw, _enhance, _domainname){
|
|
_filename = zw["name"].replace("/config/", "/img_tmp/");
|
|
url = _domainname + "/editflow?task=cutref&in=/config/reference.jpg&out=" + _filename + "&x=" + zw["x"] + "&y=" + zw["y"] + "&dx=" + zw["dx"] + "&dy=" + zw["dy"];
|
|
if (_enhance == true){
|
|
url = url + "&enhance=true";
|
|
}
|
|
|
|
var xhttp = new XMLHttpRequest();
|
|
try {
|
|
xhttp.open("GET", url, false);
|
|
xhttp.send();
|
|
}
|
|
catch (error)
|
|
{
|
|
// firework.launch('Deleting Config.ini failed!', 'danger', 30000);
|
|
}
|
|
|
|
if (xhttp.responseText == "CutImage Done") {
|
|
firework.launch('Reference Image Contrast got enhanced.', 'success', 5000);
|
|
return true;
|
|
}
|
|
else {
|
|
firework.launch("Device is busy, please try again when the round got completed!", 'warning', 10000);
|
|
return false;
|
|
}
|
|
}
|
|
|
|
|
|
|
|
function MakeRefZW(zw, _domainname){
|
|
_filetarget = zw["name"].replace("/config/", "/img_tmp/");
|
|
_filetarget = _filetarget.replace(".jpg", "_org.jpg");
|
|
url = _domainname + "/editflow?task=cutref&in=/config/reference.jpg&out="+_filetarget+"&x=" + zw["x"] + "&y=" + zw["y"] + "&dx=" + zw["dx"] + "&dy=" + zw["dy"];
|
|
var xhttp = new XMLHttpRequest();
|
|
try {
|
|
xhttp.open("GET", url, false);
|
|
xhttp.send();
|
|
}
|
|
catch (error)
|
|
{
|
|
// firework.launch('Deleting Config.ini failed!', 'danger', 30000);
|
|
}
|
|
|
|
if (xhttp.responseText == "CutImage Done") {
|
|
_filetarget2 = zw["name"].replace("/config/", "/img_tmp/");
|
|
// _filetarget2 = _filetarget2.replace(".jpg", "_org.jpg");
|
|
FileCopyOnServer(_filetarget, _filetarget2, _domainname);
|
|
firework.launch('Reference Image got updated.', 'success', 5000);
|
|
return true;
|
|
}
|
|
else {
|
|
firework.launch("Device is busy, please try again when the round got completed!", 'warning', 10000);
|
|
return false;
|
|
}
|
|
}
|
|
|