Dc
z*6s;9XFS5O=lQW-#7azb&B6=pi$G@Z1ohc@Hc$2_9+%bXJA>O-1%fS_-VqCm#QaY-
zQ`oricnoRq5@g9g#XBy 84}oz=Mxk{XCq!CUd*HnVS~IZL1G|dv~El3kN)^ElO1unM5DW>
z?3USbHCMu)1hUX@nAgm+G>&S$^J$(i1IKipk5N7rtc0wgeEbBt$BbKZLI90Vea2>M
zR1i8gO{_rd-`76I3HyI+(GrOvP`;2Un_um>l`L$4t6pn+2sczw2WgXSuuJIg;DS
zZ>%_}WqFX-a~a{^p%Sm2-R+dZ)<;!8D`AyL+^~1ubf$}LeZru9&4BBnY{x$riu7EU
zHn7f8pTn4uQJ}3K(8>*L_0FQDgj+{U>AA3AXe@Tb$R^U5k^!&S=x@ ?o@tfK9FAxaHD0n&CnoTK!g@a?X#(v4r)bT;RI63^j
zx#d<(B4cD|(fPlS_U%#EvrVK@;OXVifM5u_2!xNkDvla@4cT^KJg`_uBrrL^vEQy0
zexqP;jyN(X)F2jeu&Ip2La|7~|7p5+7
z?Mk|B%OARzqyS~W+rFf8$^9j?$(rvS-F(o;_+M$ncQhey;^JaccI8kvXL{w>>_YX0
zZ>95_WU~i)aA?*~^-&r+_0XI1fEXciH8^CIH}*lOJbk{=A2pPpe9qIyMzPdKhDn(}7trOk5!`z!Q*`Q^r9@Q1hgq48j-)mL3nb}=KZ7tO
zZ^_QL*QX_Bow+l}=P(V|6SHMHPo6ylH8rNGaNNAd^1r*bKHt!;NU4sIoo_~fzU{?T
z?uf({|CEcesQy8Nb?a?NJsW+(;u_g7yg`x@^fGrtku|v(pP`?UsY>mv_((%#p+bmy
zI8BEfJ%8QPl|DJ(IIhDLwaXc3Y&VGYxSl#nKA2#5=lbHGuF$FIx5L2n9@{3N-85P{
zzm|4%7&(`eP~^c>_PyPqYWq0}ROT>jfIpX`>M5phaoG>`7r~2Q)Isr}vWyuxn^Jl|
z#E)?mzRPI(l-MhVzqAydR5fBiy4OhPm|@u!?{1tbE#N&uzw5$N*r%hOpQLKM;W9(b
zC1D%&^6^X9W2Gn*#+>!lCB+>xte-P%OTXvu5X#8*5Nbj47xsZP93U7BnmBsiB!zYW>KTq9RZ)@QZ>~gXBe$Sc3ELow*KQUGnEz
zE0JUjA!9m8_
Analog
diff --git a/sd-card/html/gethost.js b/sd-card/html/gethost.js
index b7cbc078a..8a9df7631 100644
--- a/sd-card/html/gethost.js
+++ b/sd-card/html/gethost.js
@@ -7,12 +7,13 @@ function gethost_Version(){
function getbasepath(){
var host = window.location.hostname;
if (((host == "127.0.0.1") || (host == "localhost") || (host == ""))
- && ((window.location.port == "80") || (window.location.port == "")))
+// && ((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
- host = "http://192.168.178.79"; // jomjol interner Real
+ host = "http://192.168.178.34"; // jomjol interner Real
// host = "http://192.168.43.191";
// host = "."; // jomjol interner localhost
@@ -20,11 +21,11 @@ function getbasepath(){
else
{
host = "http://" + host;
+ if (window.location.port != "") {
+ host = host + ":" + window.location.port;
+ }
}
- if (window.location.port != "") {
- host = host + ":" + window.location.port;
- }
return host;
}
diff --git a/sd-card/html/readconfigparam.js b/sd-card/html/readconfigparam.js
index 9c3fff5ed..6b1f725c6 100644
--- a/sd-card/html/readconfigparam.js
+++ b/sd-card/html/readconfigparam.js
@@ -86,6 +86,7 @@ function ParseConfig() {
param[catname] = new Object();
ParamAddValue(param, catname, "Uri");
ParamAddValue(param, catname, "MainTopic", 1, false);
+ ParamAddValue(param, catname, "Topic", 1, false);
ParamAddValue(param, catname, "ClientID");
ParamAddValue(param, catname, "user");
ParamAddValue(param, catname, "password");
@@ -157,6 +158,14 @@ 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
}
function ParamAddValue(param, _cat, _param, _anzParam = 1, _isNUMBER = false, _checkRegExList = null){
diff --git a/sd-card/html/version.txt b/sd-card/html/version.txt
index 86b57ebe9..1709bb98f 100644
--- a/sd-card/html/version.txt
+++ b/sd-card/html/version.txt
@@ -1 +1 @@
-11.4.0
\ No newline at end of file
+11.4.1
\ No newline at end of file