+
class ClassFlowPostProcessing :
public ClassFlow
{
@@ -38,7 +39,9 @@ protected:
void InitNUMBERS();
void handleDecimalSeparator(string _decsep, string _value);
void handleMaxRateValue(string _decsep, string _value);
- void handleDecimalExtendedResolution(string _decsep, string _value);
+ void handleDecimalExtendedResolution(string _decsep, string _value);
+ void handleMaxRateType(string _decsep, string _value);
+
diff --git a/code/main/version.cpp b/code/main/version.cpp
index 39c8a9f3..1fa4205c 100644
--- a/code/main/version.cpp
+++ b/code/main/version.cpp
@@ -1,4 +1,4 @@
-const char* GIT_REV="ac3409f";
+const char* GIT_REV="45a7198";
const char* GIT_TAG="";
const char* GIT_BRANCH="rolling";
-const char* BUILD_TIME="2022-02-08 19:19";
\ No newline at end of file
+const char* BUILD_TIME="2022-02-11 20:05";
\ No newline at end of file
diff --git a/code/version.cpp b/code/version.cpp
index 39c8a9f3..1fa4205c 100644
--- a/code/version.cpp
+++ b/code/version.cpp
@@ -1,4 +1,4 @@
-const char* GIT_REV="ac3409f";
+const char* GIT_REV="45a7198";
const char* GIT_TAG="";
const char* GIT_BRANCH="rolling";
-const char* BUILD_TIME="2022-02-08 19:19";
\ No newline at end of file
+const char* BUILD_TIME="2022-02-11 20:05";
\ No newline at end of file
diff --git a/firmware/ana-s1-q-20220129.tflite b/firmware/ana-s1-q-20220129.tflite
deleted file mode 100644
index c3e4a6ee..00000000
Binary files a/firmware/ana-s1-q-20220129.tflite and /dev/null differ
diff --git a/firmware/ana-s3-q-20220105.tflite b/firmware/ana-s3-q-20220105.tflite
new file mode 100644
index 00000000..5718b1ec
Binary files /dev/null and b/firmware/ana-s3-q-20220105.tflite differ
diff --git a/firmware/bootloader.bin b/firmware/bootloader.bin
index c90624d9..44312d4d 100644
Binary files a/firmware/bootloader.bin and b/firmware/bootloader.bin differ
diff --git a/firmware/dig-s1-q-20220206.tflite b/firmware/dig-s1-q-20220206.tflite
deleted file mode 100644
index 077e2c70..00000000
Binary files a/firmware/dig-s1-q-20220206.tflite and /dev/null differ
diff --git a/firmware/dig-s2-q-20220211.tflite b/firmware/dig-s2-q-20220211.tflite
new file mode 100644
index 00000000..26cb56eb
Binary files /dev/null and b/firmware/dig-s2-q-20220211.tflite differ
diff --git a/firmware/firmware.bin b/firmware/firmware.bin
index 57eae964..0c52f7df 100644
Binary files a/firmware/firmware.bin and b/firmware/firmware.bin differ
diff --git a/firmware/html.zip b/firmware/html.zip
index 160f9642..dac0c892 100644
Binary files a/firmware/html.zip and b/firmware/html.zip differ
diff --git a/sd-card/config/config.ini b/sd-card/config/config.ini
index 224c5988..9c3c1005 100644
--- a/sd-card/config/config.ini
+++ b/sd-card/config/config.ini
@@ -21,7 +21,7 @@ FlipImageSize = false
/config/ref1.jpg 442 142
[Digits]
-Model = /config/dig-s1-q-20220206.tflite
+Model = /config/dig-s2-q-20220211.tflite
;LogImageLocation = /log/digit
;LogfileRetentionInDays = 3
ModelInputSize = 20 32
diff --git a/sd-card/config/dig-s1-q-20220206.tflite b/sd-card/config/dig-s1-q-20220206.tflite
deleted file mode 100644
index 077e2c70..00000000
Binary files a/sd-card/config/dig-s1-q-20220206.tflite and /dev/null differ
diff --git a/sd-card/config/dig-s2-q-20220211.tflite b/sd-card/config/dig-s2-q-20220211.tflite
new file mode 100644
index 00000000..26cb56eb
Binary files /dev/null and b/sd-card/config/dig-s2-q-20220211.tflite differ
diff --git a/sd-card/html/edit_config_param.html b/sd-card/html/edit_config_param.html
index 5e50f47d..1c9a6a2b 100644
--- a/sd-card/html/edit_config_param.html
+++ b/sd-card/html/edit_config_param.html
@@ -503,7 +503,24 @@ textarea {
- Maximum change of reading per minute
+ Maximum change of a reading - if threated as absolute or relative change see next parameter.
+
+
+
+
+
+
+
+ MaxRateType
+
+
+
+ AbsoluteChange
+ RateChange
+
+
+
+ Defines if the change rate compared to the previous value is calculated as absolute change (AbsoluteChange) or as rate normalized to the intervall (RateChange = change/minute).
@@ -1697,6 +1714,7 @@ function UpdateInputIndividual()
{
ReadParameter(param, "PostProcessing", "DecimalShift", true, NUNBERSAkt)
ReadParameter(param, "PostProcessing", "MaxRateValue", true, NUNBERSAkt)
+ ReadParameter(param, "PostProcessing", "MaxRateType", true, NUNBERSAkt)
ReadParameter(param, "PostProcessing", "ExtendedResolution", true, NUNBERSAkt)
ReadParameter(param, "PostProcessing", "IgnoreLeadingNaN", true, NUNBERSAkt)
}
@@ -1705,6 +1723,7 @@ function UpdateInputIndividual()
NUNBERSAkt = sel.selectedIndex;
WriteParameter(param, category, "PostProcessing", "DecimalShift", true, NUNBERSAkt);
WriteParameter(param, category, "PostProcessing", "MaxRateValue", true, NUNBERSAkt);
+ WriteParameter(param, category, "PostProcessing", "MaxRateType", true, NUNBERSAkt);
WriteParameter(param, category, "PostProcessing", "ExtendedResolution", true, NUNBERSAkt);
WriteParameter(param, category, "PostProcessing", "IgnoreLeadingNaN", true, NUNBERSAkt);
}
diff --git a/sd-card/html/gethost.js b/sd-card/html/gethost.js
index 101660e0..751e4b11 100644
--- a/sd-card/html/gethost.js
+++ b/sd-card/html/gethost.js
@@ -13,7 +13,7 @@ function getbasepath(){
{
// host = "http://192.168.2.219"; // jomjol interner test
// host = "http://192.168.178.46"; // jomjol interner test
- host = "http://192.168.178.60"; // jomjol interner Real
+ host = "http://192.168.178.62"; // jomjol interner Real
// host = "http://192.168.43.191";
// host = "."; // jomjol interner localhost
diff --git a/sd-card/html/readconfigparam.js b/sd-card/html/readconfigparam.js
index 1b16a681..adaf490c 100644
--- a/sd-card/html/readconfigparam.js
+++ b/sd-card/html/readconfigparam.js
@@ -107,6 +107,7 @@ function ParseConfig() {
ParamAddValue(param, catname, "PreValueAgeStartup");
ParamAddValue(param, catname, "AllowNegativeRates");
ParamAddValue(param, catname, "MaxRateValue", 1, true);
+ ParamAddValue(param, catname, "MaxRateType", 1, true);
ParamAddValue(param, catname, "ExtendedResolution", 1, true);
ParamAddValue(param, catname, "IgnoreLeadingNaN", 1, true);
ParamAddValue(param, catname, "ErrorMessage");
diff --git a/sd-card/html/version.txt b/sd-card/html/version.txt
index 70045d3c..03c39bfe 100644
--- a/sd-card/html/version.txt
+++ b/sd-card/html/version.txt
@@ -1 +1 @@
-13.0.0
\ No newline at end of file
+13.1.0
\ No newline at end of file