v.3.36.3

CHANGELOG.md

@@ -1,4 +1,8 @@
 # Versionsinformationen
+## v.3.36.3 (15.11.2023)
+**Bugfix**
+- core: Anpassung im Modul createConnected
+
 ## v.3.36.2 (21.01.2023)
 **Bugfix**
 - Standard-Template: bei Verwendung von Menu wird jetzt auch die Iconfarbe und Disabled berücksichtigt

package.json

@@ -1,6 +1,6 @@
 {
   "name": "fhemapp",
-  "version": "3.36.2", 
+  "version": "3.36.3", 
   "private": true,
   "author": "jemu75",
   "scripts": {

public/cfg/templ_shellydimmer_mqtt.json

@@ -0,0 +1,32 @@
+{
+  "name": "shellydimmer_mqtt",
+  "author": "jemu75",
+  "date": "2023-04-26",
+  "status": {
+    "bar": ["state:off:0:on","pct::%n:on"],
+    "error": ["mqtt_connected:false:100:error:keine Verbindung"]
+  },
+  "main": [
+    {
+      "leftBtn": "mdi-power-off",
+      "leftClick": ["state::off"],
+      "text": ["state:off:aus","pct:100:an","pct:1:gedimmt"],
+      "rightBtn": "mdi-power-on",
+      "rightClick": ["state::on"]
+    },
+    {
+      "leftBtn": "mdi-lightbulb-outline",
+      "leftClick": ["pct::pct 0"],
+      "slider": ["pct::pct %v:%n:0:100"],
+      "rightBtn": "mdi-lightbulb-on-outline",
+      "rightClick": ["pct::pct 100"]
+    }
+  ],
+  "info": {
+    "left1": ["state:on::mdi-lightbulb","state:::mdi-lightbulb-off"],
+    "left2": ["state:off:","pct:1:%n%"],
+    "mid1": ["temperature::%n.1°C"],
+    "right1": ["new_fw:true::mdi-cloud-download"],
+    "right2": ["mqtt_connected:true::mdi-wifi","mqtt_connected:::mdi-wifi-off"]
+  }
+}

public/cfg/templ_shellyswitch_mqtt.json

@@ -22,4 +22,4 @@
     "right1": ["new_fw:true::mdi-cloud-download"],
     "right2": ["mqtt_connected:true::mdi-wifi","mqtt_connected:::mdi-wifi-off"]
   }
-}
+}

public/cfg/templ_toggleswitch.json

@@ -0,0 +1,18 @@
+{
+  "name": "toggleswitch",
+  "author": "jemu75",
+  "date": "2023-07-03",
+  "status": {
+    "bar": ["Connected.act.Readings.state.Value:on:100:success","Connected.act.Readings.state.Value:off:0:success"]
+  },
+  "main": [
+    {
+      "text": ["Connected.act.Readings.state.Value:on:an","Connected.act.Readings.state.Value:off:aus","state::%s"],
+      "rightBtn": "mdi-power",
+      "rightClick": ["Connected.act.Readings.state.Value::set Connected.act toggle"]
+    }
+  ],
+  "info": {
+    "left1": ["Connected.act.Readings.state.Value:on::mdi-power-plug","Connected.act.Readings.state.Value:off::mdi-power-plug-off"]
+  }
+}

src/plugins/fhem.js

@@ -419,7 +419,6 @@ class Fhem extends EventEmitter {
     let idx = this.app.data.routeList.map((e) => e.route).indexOf(fltr);
 
     this.app.data.deviceList.splice(0);
-    this.app.hasConnected = [];
 
     if(idx != -1 || fltr.match('device=')) {
       let filter = idx != -1 ? this.app.data.routeList[idx].deviceList.join(',') : fltr.replace('device=','').split('&')[0];
@@ -446,6 +445,7 @@ class Fhem extends EventEmitter {
             options.setup = setup;
           }
 
+          this.app.hasConnected = [];
           item.Options = options;
           if(item.Options.connected) item.Connected = await this.createConnected(item);
           this.handleTemplate(item);

www/fhemapp/cfg/templ_shellydimmer_mqtt.json

@@ -0,0 +1,32 @@
+{
+  "name": "shellydimmer_mqtt",
+  "author": "jemu75",
+  "date": "2023-04-26",
+  "status": {
+    "bar": ["state:off:0:on","pct::%n:on"],
+    "error": ["mqtt_connected:false:100:error:keine Verbindung"]
+  },
+  "main": [
+    {
+      "leftBtn": "mdi-power-off",
+      "leftClick": ["state::off"],
+      "text": ["state:off:aus","pct:100:an","pct:1:gedimmt"],
+      "rightBtn": "mdi-power-on",
+      "rightClick": ["state::on"]
+    },
+    {
+      "leftBtn": "mdi-lightbulb-outline",
+      "leftClick": ["pct::pct 0"],
+      "slider": ["pct::pct %v:%n:0:100"],
+      "rightBtn": "mdi-lightbulb-on-outline",
+      "rightClick": ["pct::pct 100"]
+    }
+  ],
+  "info": {
+    "left1": ["state:on::mdi-lightbulb","state:::mdi-lightbulb-off"],
+    "left2": ["state:off:","pct:1:%n%"],
+    "mid1": ["temperature::%n.1°C"],
+    "right1": ["new_fw:true::mdi-cloud-download"],
+    "right2": ["mqtt_connected:true::mdi-wifi","mqtt_connected:::mdi-wifi-off"]
+  }
+}

www/fhemapp/cfg/templ_shellyswitch_mqtt.json

@@ -22,4 +22,4 @@
     "right1": ["new_fw:true::mdi-cloud-download"],
     "right2": ["mqtt_connected:true::mdi-wifi","mqtt_connected:::mdi-wifi-off"]
   }
-}
+}

www/fhemapp/cfg/templ_toggleswitch.json

@@ -0,0 +1,18 @@
+{
+  "name": "toggleswitch",
+  "author": "jemu75",
+  "date": "2023-07-03",
+  "status": {
+    "bar": ["Connected.act.Readings.state.Value:on:100:success","Connected.act.Readings.state.Value:off:0:success"]
+  },
+  "main": [
+    {
+      "text": ["Connected.act.Readings.state.Value:on:an","Connected.act.Readings.state.Value:off:aus","state::%s"],
+      "rightBtn": "mdi-power",
+      "rightClick": ["Connected.act.Readings.state.Value::set Connected.act toggle"]
+    }
+  ],
+  "info": {
+    "left1": ["Connected.act.Readings.state.Value:on::mdi-power-plug","Connected.act.Readings.state.Value:off::mdi-power-plug-off"]
+  }
+}

www/fhemapp/index.html

@@ -1 +1 @@
-<!doctype html><html lang="de"><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="viewport" content="width=device-width,initial-scale=1,maximum-scale=1,user-scalable=no"><meta name="mobile-web-app-capable" content="yes"><meta name="apple-mobile-web-app-capable" content="yes"><link rel="icon" href="favicon.png"><link rel="apple-touch-icon" href="apple-touch-icon.png"><title>fhemapp</title><script defer="defer" src="js/chunk-vendors.e75fc7f3.js"></script><script defer="defer" src="js/app.cac0b616.js"></script><link href="css/chunk-vendors.d5cb8535.css" rel="stylesheet"><link href="css/app.9b8c7eb5.css" rel="stylesheet"></head><body><noscript><strong>We're sorry but fhemapp doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id="app"></div></body></html>
+<!doctype html><html lang="de"><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="viewport" content="width=device-width,initial-scale=1,maximum-scale=1,user-scalable=no"><meta name="mobile-web-app-capable" content="yes"><meta name="apple-mobile-web-app-capable" content="yes"><link rel="icon" href="favicon.png"><link rel="apple-touch-icon" href="apple-touch-icon.png"><title>fhemapp</title><script defer="defer" src="js/chunk-vendors.d1ade8f2.js"></script><script defer="defer" src="js/app.3a10ee7e.js"></script><link href="css/chunk-vendors.d5cb8535.css" rel="stylesheet"><link href="css/app.9b8c7eb5.css" rel="stylesheet"></head><body><noscript><strong>We're sorry but fhemapp doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id="app"></div></body></html>