Merge branch 'jomjol:master' into master

This commit is contained in:
Stefan
2021-12-12 10:36:53 +01:00
committed by GitHub
31 changed files with 168 additions and 844 deletions

Binary file not shown.

View File

@@ -20,7 +20,7 @@ FlipImageSize = false
/config/ref1.jpg 442 142
[Digits]
Model = /config/dig1310s3q.tflite
Model = /config/dig1330s1q.tflite
;LogImageLocation = /log/digit
;LogfileRetentionInDays = 3
ModelInputSize = 20 32
@@ -29,7 +29,7 @@ main.dig2 343 126 30 54
main.dig3 391 126 30 54
[Analog]
Model = /config/ana0700s1lq.tflite
Model = /config/ana0910s3_longq.tflite
;LogImageLocation = /log/analog
;LogfileRetentionInDays = 3
ModelInputSize = 32 32
@@ -46,7 +46,7 @@ PreValueAgeStartup = 720
AllowNegativeRates = false
main.MaxRateValue = 0.1
ErrorMessage = true
CheckDigitIncreaseConsistency = true
CheckDigitIncreaseConsistency = false
;[MQTT]
;Uri = mqtt://IP-ADRESS:1883

Binary file not shown.

Binary file not shown.

Binary file not shown.

View File

@@ -1040,7 +1040,7 @@ textarea {
GPIO 12 is usable without restrictions
</td>
</tr>
<tr class=expert class="GPIO_IO12 GPIO_item">
<tr class="expert" class="GPIO_IO12 GPIO_item">
<td width="20px" style="padding-left: 40px;"></td>
<td>
<span class="GPIO_IO12 GPIO_item">GPIO 12 use interrupt</span>

View File

@@ -3,9 +3,12 @@ function gethost_Version(){
return "1.0.0 - 20200910";
}
function getbasepath(){
var host = window.location.hostname;
if ((host == "127.0.0.1") || (host == "localhost") || (host == ""))
if (((host == "127.0.0.1") || (host == "localhost") || (host == ""))
&& ((window.location.port == "80") || (window.location.port == "")))
{
// host = "http://192.168.2.219"; // jomjol interner test
// host = "http://192.168.178.46"; // jomjol interner test
@@ -18,6 +21,10 @@ function getbasepath(){
{
host = "http://" + host;
}
if (window.location.port != "") {
host = host + ":" + window.location.port;
}
return host;
}

View File

@@ -2,9 +2,9 @@ function readconfig_Version(){
return "1.0.0 - 20200910";
}
var config_gesamt;
var config_split;
var param;
var config_gesamt = "";
var config_split = [];
var param = [];
var category;
var ref = new Array(2);
var NUMBERS = new Array(0);

View File

@@ -1 +1 @@
11.0.0
11.1.0