Update 2020-11-30

This commit is contained in:
jomjol
2020-11-30 12:35:55 +01:00
parent 1b5f6b4683
commit c76a635414
21 changed files with 156 additions and 74 deletions

View File

@@ -1,7 +1,7 @@
[MakeImage]
;LogImageLocation = /log/source
;LogfileRetentionInDays = 15
WaitBeforeTakingPicture=5
WaitBeforeTakingPicture = 5
ImageQuality = 5
ImageSize = VGA
@@ -14,19 +14,19 @@ SearchFieldY = 20
[Digits]
Model=/config/dig0710s3.tflite
LogImageLocation = /log/digit
LogfileRetentionInDays = 15
ModelInputSize 20, 32
Model = /config/dig0720s1.tflite
;LogImageLocation = /log/digit
;LogfileRetentionInDays = 3
ModelInputSize = 20 32
digit1, 306, 120, 37, 67
digit2, 355, 120, 37, 67
digit3, 404, 120, 37, 67
[Analog]
Model=/config/ana0630s2.tflite
LogImageLocation = /log/analog
LogfileRetentionInDays = 15
ModelInputSize 32, 32
Model = /config/ana0630s2.tflite
;LogImageLocation = /log/analog
;LogfileRetentionInDays = 3
ModelInputSize = 32 32
analog1, 444, 225, 92, 92
analog2, 391, 329, 92, 92
analog3, 294, 369, 92, 92
@@ -39,22 +39,25 @@ PreValueAgeStartup = 720
AllowNegativeRates = False
MaxRateValue = 0.1
ErrorMessage = True
CheckDigitIncreaseConsistency = False
CheckDigitIncreaseConsistency = True
;[MQTT]
;Uri = mqtt://IP-MQTT-SERVER:1883
;Topic = watermeter/readout
[MQTT]
;Uri = mqtt://IP-ADRESS:1883
;Topic = wasserzaehler/zaehlerstand
;TopicError = wasserzaehler/error
;ClientID = wasser
;user = USERNAME
;password = PASSWORD
[AutoTimer]
AutoStart= True
AutoStart = True
Intervall = 4.85
[Debug]
Logfile = False
; Number of days before a log file is deleted. 0 = disabled. 10 is default value (if not defined)
;LogfileRetentionInDays = 10
LogfileRetentionInDays = 3
[System]
TimeZone = CET-1CEST,M3.5.0,M10.5.0/3
[Ende]

View File

@@ -0,0 +1,2 @@
2020-11-30_12-02-22
42.013401

View File

@@ -561,27 +561,10 @@ textarea {
<class id="System_TimeZone_text" style="color:black;">TimeZone</class>
</td>
<td>
<input type="number" id="System_TimeZone_value1" size="13" min="-12" max="12" step="1">
<input type="text" id="System_TimeZone_value1">
</td>
<td style="font-size: 80%;">
Adjustment of time zone relative to UTC (in hours)
</td>
</tr>
<tr>
<td width="20px" style="padding-left: 40px;">
<input type="checkbox" id="System_AutoAdjustSummertime_enabled" value="1" onclick = 'document.getElementById("System_AutoAdjustSummertime_value1").disabled = !document.getElementById("System_AutoAdjustSummertime_value1").disabled' unchecked >
</td>
<td width="200px">
<class id="System_AutoAdjustSummertime_text" style="color:black;">AutoAdjustSummertime</class>
</td>
<td>
<select id="System_AutoAdjustSummertime_value1">
<option value="0" selected>True</option>
<option value="1" >False</option>
</select>
</td>
<td style="font-size: 80%;">
Autoadjust the summertime
Time zone in POSIX syntax (Europe/Berlin = "CET-1CEST,M3.5.0,M10.5.0/3" - incl. daylight saving)
</td>
</tr>
<tr class="expert" id="ex16">
@@ -726,10 +709,7 @@ function UpdateInput() {
WriteParameter(param, "Debug", "LogfileRetentionInDays", true);
WriteParameter(param, "System", "TimeZone", true);
WriteParameter(param, "System", "AutoAdjustSummertime", true, true);
WriteParameter(param, "System", "TimeUpdateIntervall", true);
}
function WriteConfig(){
@@ -774,10 +754,7 @@ function WriteConfig(){
ReadParameter(param, "Debug", "LogfileRetentionInDays", true);
ReadParameter(param, "System", "TimeZone", true);
ReadParameter(param, "System", "AutoAdjustSummertime", true, true);
ReadParameter(param, "System", "TimeUpdateIntervall", true);
FormatDecimalValue(param, "PostProcessing", "MaxRateValue");

View File

@@ -145,7 +145,7 @@ function ParseConfigParamSystem(_aktline){
while ((akt_ref < 2) && (_aktline < config_split.length) && (config_split[_aktline][0] != "[")) {
var _input = config_split[_aktline];
let [isCom, input] = isCommented(_input);
var linesplit = ZerlegeZeile(input);
var linesplit = ZerlegeZeile(input, " =");
ParamExtractValue(param, linesplit, catname, "TimeZone", _aktline, isCom);
ParamExtractValue(param, linesplit, catname, "AutoAdjustSummertime", _aktline, isCom);
@@ -412,10 +412,10 @@ function createReader(file) {
reader.readAsDataURL(file);
}
function ZerlegeZeile(input)
function ZerlegeZeile(input, delimiter = " =,")
{
var Output = Array(0);
delimiter = " =,";
// delimiter = " =,";
input = trim(input, delimiter);
var pos = findDelimiterPos(input, delimiter);