-const char* GIT_BASE_BRANCH = "master - v8.5.0 - 2021-10-07";
+const char* GIT_BASE_BRANCH = "master - v9.0.0 - 2021-10-23";
const char* git_base_branch(void)
diff --git a/code/version.cpp b/code/version.cpp
index 925b7112..e5d0dbe7 100644
--- a/code/version.cpp
+++ b/code/version.cpp
@@ -1,4 +1,4 @@
const char* GIT_REV="d0bf12f";
const char* GIT_TAG="";
-const char* GIT_BRANCH="master";
-const char* BUILD_TIME="2021-10-07 07:17";
\ No newline at end of file
+const char* GIT_BRANCH="rolling";
+const char* BUILD_TIME="2021-10-23 16:13";
\ No newline at end of file
diff --git a/firmware/bootloader.bin b/firmware/bootloader.bin
index c5af221f..afaac12d 100644
Binary files a/firmware/bootloader.bin and b/firmware/bootloader.bin differ
diff --git a/firmware/dig1310s3q.tflite b/firmware/dig1310s3q.tflite
deleted file mode 100644
index ba637434..00000000
Binary files a/firmware/dig1310s3q.tflite and /dev/null differ
diff --git a/firmware/firmware.bin b/firmware/firmware.bin
index 32a73516..1bfca2e5 100644
Binary files a/firmware/firmware.bin and b/firmware/firmware.bin differ
diff --git a/firmware/html.zip b/firmware/html.zip
index b24c671a..36896475 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 ae39c3e7..b4873eb1 100644
--- a/sd-card/config/config.ini
+++ b/sd-card/config/config.ini
@@ -62,7 +62,10 @@ CheckDigitIncreaseConsistency = true
;IO3 = input disabled 10 false false
;IO4 = built-in-led disabled 10 false false
;IO12 = input-pullup disabled 10 false false
-;IO13 = input-pullup disabled 10 false false
+;IO13 = input-pullup disabled 10 false false
+LEDType = WS2812
+LEDNumbers = 2
+LEDColor = 50 50 50
[AutoTimer]
AutoStart = true
diff --git a/sd-card/html/edit_config_param.html b/sd-card/html/edit_config_param.html
index 6af9aeb2..4ab95d21 100644
--- a/sd-card/html/edit_config_param.html
+++ b/sd-card/html/edit_config_param.html
@@ -636,13 +636,13 @@ textarea {
GPIO Settings
- EXPERIMENTAL - Enabling GPIO handler, disable by default integrated flash light. Please enable it with GPIO4 settings.
+ - Enabling GPIO handler, disable by default integrated flash light. Please enable it with GPIO4 (internal flash LED) settings or GPIO12 (external LED).
|
-
+
|
|
@@ -656,9 +656,6 @@ textarea {
-
-
-
@@ -668,10 +665,10 @@ textarea {
Pin is used to activate flash mode and must therefore be HIGH when booting.
-
+
|
- GPIO 0 use interrupt
+ GPIO 0 use interrupt
|
@@ -689,10 +686,10 @@ textarea {
GPIO 0 enable interrupt trigger
|
-
+
|
- GPIO 0 PWM duty resolution
+ GPIO 0 PWM duty resolution
|
|
@@ -701,10 +698,10 @@ textarea {
GPIO 0 LEDC PWM duty resolution in bit
-
+
|
- GPIO 0 enable MQTT
+ GPIO 0 enable MQTT
|
|
@@ -713,10 +710,10 @@ textarea {
GPIO 0 enable MQTT publishing/subscribing
-
+
|
- GPIO 0 enable HTTP
+ GPIO 0 enable HTTP
|
|
@@ -725,10 +722,10 @@ textarea {
GPIO 0 enable HTTP write/read
-
+
|
- GPIO 0 name
+ GPIO 0 name
|
|
@@ -740,12 +737,12 @@ textarea {
-
+
|
|
- GPIO 1 state
+ GPIO 1 state
|
@@ -754,9 +751,6 @@ textarea {
-
-
-
|
@@ -764,10 +758,10 @@ textarea {
GPIO 1
Used by default for serial communication as TX pin.
Required for seriales monitor.
-
+
|
- GPIO 1 use interrupt
+ GPIO 1 use interrupt
|
@@ -785,10 +779,10 @@ textarea {
GPIO 1 enable interrupt trigger
|
-
+
|
- GPIO 1 PWM duty resolution
+ GPIO 1 PWM duty resolution
|
|
@@ -797,10 +791,10 @@ textarea {
GPIO 1 LEDC PWM duty resolution in bit
-
+
|
- GPIO 1 enable MQTT
+ GPIO 1 enable MQTT
|
|
@@ -809,10 +803,10 @@ textarea {
GPIO 1 enable MQTT publishing/subscribing
-
+
|
- GPIO 1 enable HTTP
+ GPIO 1 enable HTTP
|
|
@@ -821,10 +815,10 @@ textarea {
GPIO 1 enable HTTP write/read
-
+
|
- GPIO 1 name
+ GPIO 1 name
|
|
@@ -836,12 +830,12 @@ textarea {
-
+
|
|
- GPIO 3 state
+ GPIO 3 state
|
@@ -850,9 +844,6 @@ textarea {
-
-
-
|
@@ -860,10 +851,10 @@ textarea {
GPIO 3 Used by default for serial communication as RX pin.
-
+
|
- GPIO 3 use interrupt
+ GPIO 3 use interrupt
|
@@ -881,10 +872,10 @@ textarea {
GPIO 3 Used by default for serial communication as RX pin.
|
-
+
|
- GPIO 3 PWM duty resolution
+ GPIO 3 PWM duty resolution
|
|
@@ -893,10 +884,10 @@ textarea {
GPIO 3 LEDC PWM duty resolution in bit
-
+
|
- GPIO 3 enable MQTT
+ GPIO 3 enable MQTT
|
|
@@ -905,10 +896,10 @@ textarea {
GPIO 3 enable MQTT publishing/subscribing
-
+
|
- GPIO 3 enable HTTP
+ GPIO 3 enable HTTP
|
|
@@ -917,10 +908,10 @@ textarea {
GPIO 3 enable HTTP write/read
-
+
|
- GPIO 3 name
+ GPIO 3 name
|
|
@@ -937,7 +928,7 @@ textarea {
- GPIO 4 state
+ GPIO 4 state
|
@@ -947,9 +938,6 @@ textarea {
-
-
-
|
@@ -958,10 +946,10 @@ textarea {
Pin is used for build-in flash light.
-
+
|
- GPIO 4 use interrupt
+ GPIO 4 use interrupt
|
@@ -979,10 +967,10 @@ textarea {
GPIO 4 enable interrupt trigger
|
-
+
|
- GPIO 4 PWM duty resolution
+ GPIO 4 PWM duty resolution
|
|
@@ -991,10 +979,10 @@ textarea {
GPIO 4 LEDC PWM duty resolution in bit
-
+
|
- GPIO 4 enable MQTT
+ GPIO 4 enable MQTT
|
|
@@ -1003,10 +991,10 @@ textarea {
GPIO 4 enable MQTT publishing/subscribing
-
+
|
- GPIO 4 enable HTTP
+ GPIO 4 enable HTTP
|
|
@@ -1015,10 +1003,10 @@ textarea {
GPIO 4 enable HTTP write/read
-
+
|
- GPIO 4 name
+ GPIO 4 name
|
|
@@ -1035,7 +1023,7 @@ textarea {
- GPIO 12 state
+ GPIO 12 state
|
@@ -1044,9 +1032,7 @@ textarea {
-
-
-
+
|
@@ -1054,14 +1040,14 @@ textarea {
GPIO 12 is usable without restrictions
-
+
|
- GPIO 12 use interrupt
+ GPIO 12 use interrupt
|
-
- |
-
+
|
- GPIO 12 PWM duty resolution
+ GPIO 12 PWM duty resolution
|
|
@@ -1087,10 +1073,10 @@ textarea {
GPIO 12 LEDC PWM duty resolution in bit
-
+
|
- GPIO 12 enable MQTT
+ GPIO 12 enable MQTT
|
|
@@ -1099,10 +1085,10 @@ textarea {
GPIO 12 enable MQTT publishing/subscribing
-
+
|
- GPIO 12 enable HTTP
+ GPIO 12 enable HTTP
|
|
@@ -1111,10 +1097,10 @@ textarea {
GPIO 12 enable HTTP write/read
-
+
|
- GPIO 12 name
+ GPIO 12 name
|
|
@@ -1123,10 +1109,60 @@ textarea {
GPIO 12 MQTT topic name (empty = GPIO12). Allowed characters (a-z, A-Z, 0-9, _, -)
+
+
+ |
+ |
+
+ LED-Type
+ |
+
+
+ |
+
+ Type of WS2812x, that is connected to GPIO12
+ |
+
+
+
+ |
+ |
+
+ Numbers of LEDs
+ |
+
+
+ |
+
+ Number of LEDs on the external LED-stripe
+ |
+
+
+ |
+ |
+
+ LED Color
+ |
+
+ R
+ G
+ B
+ |
+
+ Color of LEDs in (R)ed, (G)reen (B)lue from 0...255
+ |
+
+
+
-
+
|
|
@@ -1140,9 +1176,6 @@ textarea {
-
-
-
@@ -1150,10 +1183,10 @@ textarea {
GPIO 13 is usable without restrictions
-
+
|
- GPIO 13 use interrupt
+ GPIO 13 use interrupt
|
@@ -1171,10 +1204,10 @@ textarea {
GPIO 13 enable interrupt trigger
|
-
+
|
- GPIO 13 PWM duty resolution
+ GPIO 13 PWM duty resolution
|
|
@@ -1183,10 +1216,10 @@ textarea {
GPIO 13 LEDC PWM duty resolution in bit
-
+
|
- GPIO 13 enable MQTT
+ GPIO 13 enable MQTT
|
|
@@ -1195,10 +1228,10 @@ textarea {
GPIO 13 enable MQTT publishing/subscribing
-
+
|
- GPIO 13 enable HTTP
+ GPIO 13 enable HTTP
|
|
@@ -1207,10 +1240,10 @@ textarea {
GPIO 13 enable HTTP write/read
-
+
|
- GPIO 13 name
+ GPIO 13 name
|
|
@@ -1496,6 +1529,11 @@ function InvertEnableItem(_cat, _param)
}
function setEnabled(className, enabled) {
+ _color = "color:lightgrey;";
+ if (enabled) {
+ _color = "color:black;";
+ }
+
let elements = document.getElementsByClassName(className);
for (i = 0; i < elements.length; i++) {
if (enabled) {
@@ -1509,6 +1547,7 @@ function setEnabled(className, enabled) {
if (inputs[j].id.endsWith("_enabled"))
continue;
+ inputs[j].style = _color
if (enabled) {
inputs[j].removeAttribute("disabled");
} else {
@@ -1700,6 +1739,9 @@ function UpdateInput() {
WriteParameter(param, category, "GPIO", "IO4", true);
WriteParameter(param, category, "GPIO", "IO12", true);
WriteParameter(param, category, "GPIO", "IO13", true);
+ WriteParameter(param, category, "GPIO", "LEDType", false);
+ WriteParameter(param, category, "GPIO", "LEDNumbers", false);
+ WriteParameter(param, category, "GPIO", "LEDColor", false);
WriteParameter(param, category, "AutoTimer", "AutoStart", false);
WriteParameter(param, category, "AutoTimer", "Intervall", false);
@@ -1763,6 +1805,16 @@ function ReadParameterAll()
ReadParameter(param, "GPIO", "IO4", true);
ReadParameter(param, "GPIO", "IO12", true);
ReadParameter(param, "GPIO", "IO13", true);
+ ReadParameter(param, "GPIO", "LEDType", false);
+ ReadParameter(param, "GPIO", "LEDNumbers", false);
+ ReadParameter(param, "GPIO", "LEDColor", false);
+ // Folgende Zeilen sind für Abwärtskompatibität < v9.0.0 notwendig (manchmal parameter auskommentiert)
+ param["GPIO"]["LEDType"]["enabled"] = true;
+ param["GPIO"]["LEDNumbers"]["enabled"] = true;
+ param["GPIO"]["LEDColor"]["enabled"] = true;
+ param["GPIO"]["LEDType"]["found"] = true;
+ param["GPIO"]["LEDNumbers"]["found"] = true;
+ param["GPIO"]["LEDColor"]["found"] = true;
ReadParameter(param, "AutoTimer", "AutoStart", false);
ReadParameter(param, "AutoTimer", "Intervall", false);
@@ -1799,9 +1851,13 @@ function UpdateAfterCategoryCheck() {
function UpdateExpertModus()
{
- var _style = 'display:none;';
+// var _style = 'display:none;';
+ var _style_pur = 'none';
+ var _hidden = true;
if (document.getElementById("ExpertModus_enabled").checked) {
- _style = '';
+// _style = '';
+ _style_pur = '';
+ _hidden = false;
document.getElementById("Edit_Config_Direct").style.display = "";
}
else
@@ -1811,8 +1867,22 @@ function UpdateExpertModus()
const expert = document.querySelectorAll(".expert");
for (var i = 0; i < expert.length; i++) {
- document.getElementById(expert[i].id).style = _style;
+ expert[i].style.display = _style_pur;
+// document.getElementById(expert[i].id).style = _style;
}
+
+
+ // Enable / Disable die Optionen in den Menues für die Auswahl. Falls kein Expertenmodus soll nur ein Wert (built-in-led oder externan-flash-ws281x) möglich sein
+ Array.from(document.querySelector("#GPIO_IO4_value1").options).forEach(function(option_element) {
+ if (option_element.value != "built-in-led")
+ option_element.hidden = _hidden;
+ });
+
+ Array.from(document.querySelector("#GPIO_IO12_value1").options).forEach(function(option_element) {
+ if (option_element.value != "external-flash-ws281x")
+ option_element.hidden = _hidden;
+ });
+
}
function saveTextAsFile()
diff --git a/sd-card/html/gethost.js b/sd-card/html/gethost.js
index 26a5520d..e9f056e8 100644
--- a/sd-card/html/gethost.js
+++ b/sd-card/html/gethost.js
@@ -9,7 +9,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.22"; // jomjol interner Real
+ host = "http://192.168.178.79"; // 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 20562a18..68f7c5c2 100644
--- a/sd-card/html/readconfigparam.js
+++ b/sd-card/html/readconfigparam.js
@@ -104,6 +104,12 @@ function ParseConfig() {
ParamAddValue(param, catname, "LEDType");
ParamAddValue(param, catname, "LEDNumbers");
ParamAddValue(param, catname, "LEDColor", 3);
+ // Default Values, um abwärtskompatiblität zu gewährleisten
+ param[catname]["LEDType"]["value1"] = "WS2812";
+ param[catname]["LEDNumbers"]["value1"] = "2";
+ param[catname]["LEDColor"]["value1"] = "50";
+ param[catname]["LEDColor"]["value2"] = "50";
+ param[catname]["LEDColor"]["value3"] = "50";
var catname = "AutoTimer";
diff --git a/sd-card/html/version.txt b/sd-card/html/version.txt
index fe46e0dd..4a68b557 100644
--- a/sd-card/html/version.txt
+++ b/sd-card/html/version.txt
@@ -1 +1 @@
-10.2.0
\ No newline at end of file
+11.0.0
\ No newline at end of file
@@ -47,6 +49,15 @@ In other cases you can contact the developer via email: