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-08 04:26:58 +03:00
Code Issues Packages Projects Releases Wiki Activity

V14.1 backport to rolling (#2058)

Browse Source 
* Migrate parameters to v14.1 branch (#2023)

* Migrated parameters

* -

* .

* .

* .

* .

* .

* Remove unneeded checkboxes for true/false

* Remove ";"

* Correct MaintTopic

* Added missing parameters to UI: FlipImageSize, InitialMirror
Removed checkbox in UI for ErrorMessage
Added migration of pboolean parameters: enable them if they where disabled, set them to their default value, then enable them
Switch SetRetainFlag internally to a boolean

* .

* CamImages -> RawImages

* CamImages -> RawImages

* catch error on unknown parameter

* fix missing case insensitivity

* fix typo

* fixmissing rename

* fix migration of ExtendedResolution

* Delete ClassFlowMakeImage.cpp

* Delete ClassFlowMakeImage.h

---------

Co-authored-by: CaCO3 <caco@ruinelli.ch>
Co-authored-by: jomjol <30766535+jomjol@users.noreply.github.com>

* Update Changelog.md

---------

Co-authored-by: CaCO3 <caco@ruinelli.ch>
Co-authored-by: jomjol <30766535+jomjol@users.noreply.github.com>
This commit is contained in:
CaCO3
2023-02-21 23:18:24 +01:00
committed by GitHub
parent 3d92860c5e
commit 025f4af9f2
32 changed files with 658 additions and 394 deletions
Download Patch File Download Diff File Expand all files Collapse all files

58
sd-card/html/readconfigparam.js
View File

@@ -105,14 +105,14 @@ function ParseConfig() {
param = new Object();
category = new Object();
var catname = "MakeImage";
var catname = "TakeImage";
category[catname] = new Object();
category[catname]["enabled"] = false;
category[catname]["found"] = false;
param[catname] = new Object();
ParamAddValue(param, catname, "LogImageLocation");
ParamAddValue(param, catname, "RawImagesLocation");
ParamAddValue(param, catname, "WaitBeforeTakingPicture");
ParamAddValue(param, catname, "LogfileRetentionInDays");
ParamAddValue(param, catname, "RawImagesRetention");
ParamAddValue(param, catname, "Demo");
ParamAddValue(param, catname, "Brightness");
ParamAddValue(param, catname, "Contrast");
@@ -141,8 +141,8 @@ function ParseConfig() {
param[catname] = new Object();
ParamAddValue(param, catname, "Model");
ParamAddValue(param, catname, "CNNGoodThreshold", 1);
ParamAddValue(param, catname, "LogImageLocation");
ParamAddValue(param, catname, "LogfileRetentionInDays");
ParamAddValue(param, catname, "ROIImagesLocation");
ParamAddValue(param, catname, "ROIImagesRetention");
var catname = "Analog";
category[catname] = new Object();
@@ -150,8 +150,8 @@ function ParseConfig() {
category[catname]["found"] = false;
param[catname] = new Object();
ParamAddValue(param, catname, "Model");
ParamAddValue(param, catname, "LogImageLocation");
ParamAddValue(param, catname, "LogfileRetentionInDays");
ParamAddValue(param, catname, "ROIImagesLocation");
ParamAddValue(param, catname, "ROIImagesRetention");
var catname = "PostProcessing";
category[catname] = new Object();
@@ -181,7 +181,7 @@ function ParseConfig() {
ParamAddValue(param, catname, "ClientID");
ParamAddValue(param, catname, "user");
ParamAddValue(param, catname, "password");
ParamAddValue(param, catname, "SetRetainFlag");
ParamAddValue(param, catname, "RetainMessages");
ParamAddValue(param, catname, "HomeassistantDiscovery");
ParamAddValue(param, catname, "MeterType");
@@ -236,7 +236,7 @@ function ParseConfig() {
category[catname]["found"] = false;
param[catname] = new Object();
ParamAddValue(param, catname, "AutoStart");
ParamAddValue(param, catname, "Intervall");
ParamAddValue(param, catname, "Interval");
var catname = "DataLogging";
category[catname] = new Object();
@@ -244,15 +244,15 @@ function ParseConfig() {
category[catname]["found"] = false;
param[catname] = new Object();
ParamAddValue(param, catname, "DataLogActive");
ParamAddValue(param, catname, "DataLogRetentionInDays");
ParamAddValue(param, catname, "DataFilesRetention");
var catname = "Debug";
category[catname] = new Object();
category[catname]["enabled"] = false;
category[catname]["found"] = false;
param[catname] = new Object();
ParamAddValue(param, catname, "Logfile");
ParamAddValue(param, catname, "LogfileRetentionInDays");
ParamAddValue(param, catname, "LogLevel");
ParamAddValue(param, catname, "LogfilesRetention");
var catname = "System";
category[catname] = new Object();
@@ -261,9 +261,8 @@ function ParseConfig() {
param[catname] = new Object();
ParamAddValue(param, catname, "TimeZone");
ParamAddValue(param, catname, "TimeServer");
ParamAddValue(param, catname, "AutoAdjustSummertime");
ParamAddValue(param, catname, "Hostname");
ParamAddValue(param, catname, "RSSIThreashold");
ParamAddValue(param, catname, "RSSIThreshold");
ParamAddValue(param, catname, "SetupMode");
@@ -285,22 +284,7 @@ function ParseConfig() {
aktline++;
}
// Make the downward compatiblity with MQTT (Maintopic --> topic)
if (param["MQTT"]["Topic"]["found"] == true && param["MQTT"]["MainTopic"]["found"] == false)
{
param["MQTT"]["MainTopic"] = param["MQTT"]["Topic"]
}
delete param["MQTT"]["Topic"] // Dient nur der Downwardskompatibilität
if (param["Debug"]["Logfile"]["value1"] == "false" || param["Debug"]["Logfile"]["value1"] == "true")
{
param["Debug"]["Logfile"]["value1"] = "2";
}
// Make the downward compatiblity with MQTT (Maintopic --> topic)
// Make the downward compatiblity
if (category["DataLogging"]["found"] == false)
{
category["DataLogging"]["found"] = true;
@@ -310,9 +294,9 @@ function ParseConfig() {
param["DataLogging"]["DataLogActive"]["enabled"] = true;
param["DataLogging"]["DataLogActive"]["value1"] = "true";
param["DataLogging"]["DataLogRetentionInDays"]["found"] = true;
param["DataLogging"]["DataLogRetentionInDays"]["enabled"] = true;
param["DataLogging"]["DataLogRetentionInDays"]["value1"] = "3";
param["DataLogging"]["DataFilesRetention"]["found"] = true;
param["DataLogging"]["DataFilesRetention"]["enabled"] = true;
param["DataLogging"]["DataFilesRetention"]["value1"] = "3";
}
if (category["DataLogging"]["enabled"] == false)
@@ -325,11 +309,11 @@ function ParseConfig() {
param["DataLogging"]["DataLogActive"]["value1"] = "true";
}
if (param["DataLogging"]["DataLogRetentionInDays"]["enabled"] == false && param["DataLogging"]["DataLogRetentionInDays"]["value1"] == "")
if (param["DataLogging"]["DataFilesRetention"]["enabled"] == false && param["DataLogging"]["DataFilesRetention"]["value1"] == "")
{
param["DataLogging"]["DataLogRetentionInDays"]["found"] = true;
param["DataLogging"]["DataLogRetentionInDays"]["enabled"] = true;
param["DataLogging"]["DataLogRetentionInDays"]["value1"] = "3";
param["DataLogging"]["DataFilesRetention"]["found"] = true;
param["DataLogging"]["DataFilesRetention"]["enabled"] = true;
param["DataLogging"]["DataFilesRetention"]["value1"] = "3";
}
}