mirror of
https://github.com/jomjol/AI-on-the-edge-device.git
synced 2025-12-08 20: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 --------- 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>
221 lines
8.2 KiB
HTML
221 lines
8.2 KiB
HTML
<html>
|
|
<head>
|
|
<script type="text/javascript" src='plotly-basic-2.18.2.min.js?v=$COMMIT_HASH'></script>
|
|
|
|
<script type="text/javascript" src="common.js?v=$COMMIT_HASH"></script>
|
|
<script type="text/javascript" src="readconfigcommon.js?v=$COMMIT_HASH"></script>
|
|
<script type="text/javascript" src="readconfigparam.js?v=$COMMIT_HASH"></script>
|
|
<style>
|
|
body {
|
|
font-family: Arial, Helvetica, sans-serif;
|
|
}
|
|
</style>
|
|
|
|
<script>
|
|
function run() {
|
|
datefile = document.getElementById("datafiles").value;
|
|
numbername = document.getElementById("numbers").value;
|
|
showRrelativeValues = document.getElementById("showRrelativeValues").checked;
|
|
//alert("Auslesen: " + datefile + " " + numbername);
|
|
|
|
_domainname = getDomainname();
|
|
fetch(_domainname + '/fileserver/log/data/' + datefile)
|
|
.then(response => {
|
|
// handle the response
|
|
if (response.status == 404) {
|
|
firework.launch("No log data available for " + dateString, 'warning', 10000);
|
|
}
|
|
response.text()
|
|
.then( result => {
|
|
var lines = result.split("\n");
|
|
var traceValue = { x: [], y: [], type: 'scatter', line: {width: 6}, name: 'Value'};
|
|
var tracePreValue = { x: [], y: [], type: 'scatter', line: {width: 2}, name: 'Previous Value', visible: 'legendonly'};
|
|
var traceChangeRate = { x: [], y: [], type: 'bar', yaxis: 'y2', opacity: 0.2, name: 'Change Rate'};
|
|
var traceChangeAbsolute = { x: [], y: [], type: 'bar', yaxis: 'y2', opacity: 0.2, name: 'Change Absolute', visible: 'legendonly'};
|
|
|
|
var timex = 1;
|
|
for (let line of lines) {
|
|
{
|
|
//console.log(line);
|
|
if (line.split(",")[1] == numbername)
|
|
{
|
|
var value = line.split(",")[3];
|
|
var preValue = line.split(",")[4];
|
|
var changeRate = line.split(",")[5];
|
|
var changeAbsolute = line.split(",")[6];
|
|
var time = line.split(",")[0];
|
|
//console.log("> "+time+" "+value+"\n");
|
|
|
|
traceValue.x.push(time);
|
|
|
|
/* Catch empty fields */
|
|
if (value == "" || isNaN(value)) {
|
|
value = NaN;
|
|
}
|
|
|
|
if (preValue == "" || isNaN(preValue)) {
|
|
preValue = NaN;
|
|
}
|
|
|
|
if (changeRate == "" || isNaN(changeRate)) {
|
|
changeRate = NaN;
|
|
}
|
|
|
|
if (changeAbsolute == "" || isNaN(changeAbsolute)) {
|
|
changeAbsolute = NaN;
|
|
}
|
|
|
|
traceValue.y.push(value);
|
|
tracePreValue.y.push(preValue);
|
|
traceChangeRate.y.push(changeRate);
|
|
traceChangeAbsolute.y.push(changeAbsolute);
|
|
}
|
|
}
|
|
}
|
|
|
|
/* If the value trace starts with NaN, replace all those Nans with the first valid value */
|
|
var firstNonNaNIndex = 0;
|
|
for(var i = 0; i < traceValue.y.length; i++) {
|
|
firstNonNaNIndex = i;
|
|
if (! isNaN(traceValue.y[i])) {
|
|
break;
|
|
}
|
|
}
|
|
|
|
if (firstNonNaNIndex == (traceValue.y.length - 1)) {
|
|
console.log("No data available for 'value'!");
|
|
}
|
|
else if (firstNonNaNIndex > 0) { // Replace all leading NaN with the first valid value
|
|
console.log("The first leading values have all just NaN, replacing them with the value of",
|
|
traceValue.y[firstNonNaNIndex], "at", traceValue.x[firstNonNaNIndex], "(Index:", firstNonNaNIndex, ")");
|
|
for(var i = 0; i < firstNonNaNIndex; i++) {
|
|
traceValue.y[i] = traceValue.y[firstNonNaNIndex];
|
|
}
|
|
}
|
|
|
|
|
|
// Copy time to all traces
|
|
tracePreValue.x = traceValue.x;
|
|
traceChangeRate.x = traceValue.x;
|
|
traceChangeAbsolute.x = traceValue.x;
|
|
|
|
//console.log(traceValue.y);
|
|
|
|
var offsetValue = traceValue.y[0];
|
|
var offsetPreValue = tracePreValue.y[0];
|
|
|
|
traceValue.connectgaps = true;
|
|
|
|
if (showRrelativeValues) {
|
|
traceValue.y.forEach(function(part, index, arr) {
|
|
arr[index] = arr[index] - offsetValue;
|
|
});
|
|
|
|
tracePreValue.y.forEach(function(part, index, arr) {
|
|
arr[index] = arr[index] - offsetPreValue;
|
|
});
|
|
}
|
|
|
|
// console.log(traceValue.x)
|
|
|
|
var data = [traceValue, tracePreValue, traceChangeRate, traceChangeAbsolute];
|
|
|
|
var layout = {
|
|
showlegend: true,
|
|
colorway: ['green', 'black', 'blue', 'black'],
|
|
|
|
yaxis: {title: 'Value'},
|
|
yaxis2: {
|
|
title: 'Change',
|
|
overlaying: 'y',
|
|
side: 'right'
|
|
},
|
|
|
|
margin: {
|
|
l: 50,
|
|
r: 50,
|
|
b: 50,
|
|
t: 50,
|
|
pad: 4
|
|
},
|
|
|
|
legend: {
|
|
x: 0.2,
|
|
y: 0.9,
|
|
xanchor: 'right'
|
|
}
|
|
};
|
|
|
|
document.getElementById("chart").innerHTML = "";
|
|
Plotly.newPlot('chart', data, layout, {displayModeBar: true});
|
|
});
|
|
}).catch((error) => {
|
|
// handle the error
|
|
console.log(error);
|
|
});
|
|
}
|
|
</script>
|
|
<link href="firework.css?v=$COMMIT_HASH" rel="stylesheet">
|
|
<script type="text/javascript" src="jquery-3.6.0.min.js?v=$COMMIT_HASH"></script>
|
|
<script type="text/javascript" src="firework.js?v=$COMMIT_HASH"></script>
|
|
</head>
|
|
<body>
|
|
<h3>Data Graph</h3>
|
|
<div id='chart'><p>Loading...<br></p></div>
|
|
<select id="datafiles" onchange="run();"></select>
|
|
<select id="numbers" onchange="run();"></select>
|
|
<input type="checkbox" id="showRrelativeValues" onclick = 'run();' unchecked ><label for="showRrelativeValues">Show relative values</label>
|
|
<button onclick="run();">Refresh</button>
|
|
|
|
|
<button onClick="window.location.href = 'data.html?v=$COMMIT_HASH'">Show data</button>
|
|
<button onClick="window.location.href = getDomainname() + '/fileserver/log/data/'">Show data files</button>
|
|
|
|
</div>
|
|
|
|
<script>
|
|
function WriteModelFiles()
|
|
{
|
|
list_data = getDATAList();
|
|
|
|
var _indexDig = document.getElementById("datafiles");
|
|
while (_indexDig.length)
|
|
_indexDig.remove(0);
|
|
|
|
for (var i = list_data.length - 1; i >= 0; --i)
|
|
{
|
|
var optionDig = document.createElement("option");
|
|
|
|
var text = list_data[i];
|
|
optionDig.text = text;
|
|
optionDig.value = list_data[i];
|
|
_indexDig.add(optionDig);
|
|
}
|
|
}
|
|
|
|
function WriteNumbers()
|
|
{
|
|
list_data = getNUMBERSList();
|
|
|
|
var _indexDig = document.getElementById("numbers");
|
|
while (_indexDig.length)
|
|
_indexDig.remove(0);
|
|
|
|
for (var i = 0; i < list_data.length; ++i)
|
|
{
|
|
var optionDig = document.createElement("option");
|
|
|
|
var text = list_data[i];
|
|
optionDig.text = text;
|
|
optionDig.value = list_data[i];
|
|
_indexDig.add(optionDig);
|
|
}
|
|
}
|
|
|
|
WriteModelFiles();
|
|
WriteNumbers();
|
|
|
|
run();
|
|
</script>
|
|
</body>
|
|
</html>
|