Documentation and widget changes

morphZ · Dec 10, 2017 · f2d998a · f2d998a
1 parent fa82ee5
commit f2d998a
Show file tree

Hide file tree

Showing 5 changed files with 48 additions and 17 deletions.
diff --git a/enigma2/sv_widgets/widget_enigma2.html b/enigma2/sv_widgets/widget_enigma2.html
@@ -1,3 +1,9 @@
+<?php
+define ('const_path_system', dirname(__FILE__).'/');
+define ('const_path', substr(const_path_system, 0, -4));
+require_once const_path.'version-info.php';
+?>
+
 /**
  * Enigma2 ConfigurationInfo Widget
  * 
@@ -35,6 +41,7 @@
 {% endmacro %}
 
 
+
 /**
  * Enigma2 ConfigurationInfo Widget (for standardconfiguration)
  *
@@ -161,6 +168,7 @@
 {% endmacro %}
 
 
+
 /**
  * Enigma2 Remote Widget
  * 
@@ -173,6 +181,12 @@
 	{% import "basic.html" as basic %}
 	{% set uid = uid(page, id) %}
 
+	{% if config_version == 2.9 %}
+        {% set icon_path = '' %}
+	{% else %}
+        {% set icon_path = 'widgets/sh_widgets/' %}
+	{% endif %}
+
 	<div id="{{ uid }}">
 		<table width="100%">
 			<tr>
@@ -268,13 +282,13 @@
 			<tr>
 				<td align="middle" width="70%">
 					<span data-role="controlgroup" data-type="horizontal">
-					 {{ basic.button(id~'.GREEN', gad_boxremote~'.GREEN', ' Green ', 'widgets/sh_widgets/control_centr_arrow_up_left_green_fill.png', '', gad_size) }}
+					 {{ basic.button(id~'.GREEN', gad_boxremote~'.GREEN', ' Green ', icon_path~'control_centr_arrow_up_left_green_fill.png', '', gad_size) }}
 					</span>
 					<span data-role="controlgroup" data-type="horizontal">
 					{{ basic.button(id~'.UpTV', gad_boxremote~'.UP', 'rauf', icon0~'control_centr_arrow_up.png', '', gad_size) }}
 					</span>
 					<span data-role="controlgroup" data-type="horizontal">
-					 {{ basic.button(id~'.YELLOW', gad_boxremote~'.YELLOW', ' Yellow ', 'widgets/sh_widgets/control_centr_arrow_up_right_yellow_fill.png', '', gad_size) }}
+					 {{ basic.button(id~'.YELLOW', gad_boxremote~'.YELLOW', ' Yellow ', icon_path~'control_centr_arrow_up_right_yellow_fill.png', '', gad_size) }}
 					</span>
 				</td>
 			</tr>
@@ -334,13 +348,13 @@
 			<tr>
 				<td align="middle" width="70%">
 					<span data-role="controlgroup" data-type="horizontal">
-					 {{ basic.button(id~'.RED', gad_boxremote~'.RED', 'Red', 'widgets/sh_widgets/control_centr_arrow_down_left_red_fill.png', '', gad_size) }}
+					 {{ basic.button(id~'.RED', gad_boxremote~'.RED', 'Red', icon_path~'control_centr_arrow_down_left_red_fill.png', '', gad_size) }}
 					</span>
 					<span data-role="controlgroup" data-type="horizontal">
 					{{ basic.button(id~'.DOWN', gad_boxremote~'.DOWN', 'runter', icon0~'control_centr_arrow_down.png', '', gad_size) }}
 					</span>
 					<span data-role="controlgroup" data-type="horizontal">
-					 {{ basic.button(id~'.BLUE', gad_boxremote~'.BLUE', ' Blue ', 'widgets/sh_widgets/control_centr_arrow_down_right_blue_fill.png', '', gad_size) }}
+					 {{ basic.button(id~'.BLUE', gad_boxremote~'.BLUE', ' Blue ', icon_path~'control_centr_arrow_down_right_blue_fill.png', '', gad_size) }}
 					</span>
 				</td>
 			</tr>
@@ -383,16 +397,16 @@
 			  <td align="middle" width="70%">
 				<span data-role="controlgroup" data-type="horizontal">
 					<span data-role="controlgroup" data-type="horizontal">
-					 {{ basic.button(id~'.RED', gad_boxremote~'.RED', 'Red', 'widgets/sh_widgets/circle_red.png', '', gad_size) }}
+					 {{ basic.button(id~'.RED', gad_boxremote~'.RED', 'Red', icon_path~'circle_red.png', '', gad_size) }}
 					</span>
 					<span data-role="controlgroup" data-type="horizontal">
-					 {{ basic.button(id~'.GREEN', gad_boxremote~'.GREEN', ' Green ', 'widgets/sh_widgets/circle_green2.png', '', gad_size) }}
+					 {{ basic.button(id~'.GREEN', gad_boxremote~'.GREEN', ' Green ', icon_path~'circle_green2.png', '', gad_size) }}
 					</span>
 					<span data-role="controlgroup" data-type="horizontal">
-					 {{ basic.button(id~'.YELLOW', gad_boxremote~'.YELLOW', ' Yellow ', 'widgets/sh_widgets/circle_yellow.png', '', gad_size) }}
+					 {{ basic.button(id~'.YELLOW', gad_boxremote~'.YELLOW', ' Yellow ', icon_path~'circle_yellow.png', '', gad_size) }}
 					</span>
 					<span data-role="controlgroup" data-type="horizontal">
-					 {{ basic.button(id~'.BLUE', gad_boxremote~'.BLUE', ' Blue ', 'widgets/sh_widgets/circle_blue.png', '', gad_size) }}
+					 {{ basic.button(id~'.BLUE', gad_boxremote~'.BLUE', ' Blue ', icon_path~'circle_blue.png', '', gad_size) }}
 					</span>
 				</span>
 			  </td>

diff --git a/homematic/README.md b/homematic/README.md
@@ -13,7 +13,8 @@ Homematic Hardware Gateway
     class_name = Homematic
     class_path = plugins.homematic
     host = 192.168.50.250
-    port = 2001
+    # port = 2001
+    # cycle = 60
 ```
 
 ## items.conf
@@ -25,3 +26,21 @@ Homematic Hardware Gateway
         hm_address = JEQ0017982
         hm_type = switch
 ```
+
+### hm_type
+
+Possible values
+
+- for switches:
+
+  - switch
+  - 2ch_switch
+
+- for raffstores:
+
+  - pos
+  - stop
+  - move
+
+
+
diff --git a/hue/sv_widgets/widget_hue.html b/hue/sv_widgets/widget_hue.html
@@ -34,7 +34,7 @@
 		</td>
 	</tr>
 </table>
-<table height="90%" width="90%" align="center">
+<table height="85%" width="90%" align="center">
 	<tr>
 		<td width="15%" align="left">
 		Helligkeit
@@ -117,4 +117,4 @@
 		</td>
 	</tr>
 </table>
-{% endmacro %}
+{% endmacro %}
diff --git a/mqtt/README.md b/mqtt/README.md
@@ -42,7 +42,7 @@ This plugin needs the following following software to be installed and running:
 - A MQTT broker for communication with other MQTT clients. The broker may be running on the hardware SmartHomeNG is running on, or on another hardware that can be reached via TCP/IP. The open souce broker [Mosquitto](https://mosquitto.org) is a good choice. 
 
 ### Using Mosquitto Broker on Raspberry Pi
-If want to run the broker on a Raspberry Pi you should be aware, that the broker on the raspbian repository is quite old. You should add the morquito.org repository as a trusted site to your **`apt-get`** to get a recent version of mosquitto installed.
+If want to run the broker on a Raspberry Pi you should be aware, that the broker on the raspbian repository is quite old. You should add the mosquitto.org repository as a trusted site to your **`apt-get`** to get a recent version of mosquitto installed.
 
 
 ## Configuration

diff --git a/visu_websocket/developer_doc.md b/visu_websocket/developer_doc.md
@@ -272,10 +272,9 @@ With the **`list_items `** command a client requests the list of items that are
 
 The plugin does not answer unless it has been configured with **querydef: True**.
 
-**path** defines the level for which item definitions are requested. if **path** is empty, the top level itmes are returned.
-
-The plugin answers with a dict containing the information about accessible logics. Additionally it sends the actual date time and timezone:
+**path** defines the level for which item definitions are requested. if **path** is empty, the top level items are returned.
 
+The plugin answers with a dict containing the information about accessible items.
 
 ```
 	{
@@ -301,8 +300,7 @@ The plugin does not answer unless it has been configured with **querydef: True**
 
 **enabled** is optional. As default, the request returns information for all loaded user logics. When **"enabled":1** is specified, only enabled user logics are being returned.
 
-The plugin answers with a dict containing the information about accessible logics. Additionally it sends the actual date time and timezone:
-
+The plugin answers with a dict containing the information about accessible logics. 
 
 ```
 	{