Public/FHEM-Tado
1
0
Fork 0
Code Issues Pull Requests Releases 12 Activity

renamed setting "off" to "remove"

Browse Source
This commit is contained in:
Philipp Wo 2019-12-27 09:56:19 +01:00
parent 8cbcfc0aea
commit 9d668bd8d0
2 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
98_TadoAPI.pm
View File

@ -1,5 +1,5 @@
#=============================================================================== #===============================================================================
# $Id: 98_TadoAPI.pm 100 2019-12-24 15:58:26Z psycho160 $ # $Id: 98_TadoAPI.pm 101 2019-12-27 15:58:26Z psycho160 $
# #
# FILE: 98_TadoAPI.pm # FILE: 98_TadoAPI.pm
# #
@ -185,10 +185,10 @@ sub TadoAPI_Set(@) {
} elsif( $cmd eq 'setZoneOverlay' ) { } elsif( $cmd eq 'setZoneOverlay' ) {
Log3 $name, 5, "TadoAPI $name" . ": " . "processing ($cmd)"; Log3 $name, 5, "TadoAPI $name" . ": " . "processing ($cmd)";
return "Need at least two parameters (ZoneID, Setting) - Setting: off=delete overlay; 0=heating power off; 1<=desired temperature (overlay)" if(@a < 4); return "Need at least two parameters (ZoneID, Setting) - Setting: remove=delete overlay; 0=heating power off; 1<=desired temperature (overlay)" if(@a < 4);
if( $a[3] eq "off" ) { if( $a[3] eq "remove" ) {
TadoAPI_SetZoneOverlayById($hash, $value, "off"); TadoAPI_SetZoneOverlayById($hash, $value, "remove");
} elsif (defined($a[4])) { } elsif (defined($a[4])) {
TadoAPI_SetZoneOverlayById($hash, $value, $a[3], $a[4]); TadoAPI_SetZoneOverlayById($hash, $value, $a[3], $a[4]);
} elsif ($a[3] >= 0) { } elsif ($a[3] >= 0) {
@ -198,9 +198,9 @@ sub TadoAPI_Set(@) {
} elsif( $cmd eq 'setAllOverlays' ) { } elsif( $cmd eq 'setAllOverlays' ) {
Log3 $name, 5, "TadoAPI $name" . ": " . "processing ($cmd)"; Log3 $name, 5, "TadoAPI $name" . ": " . "processing ($cmd)";
return "Need at least one parameter (Setting) - Setting: off=delete overlay; 0=heating power off; 1<=desired temperature (overlay)" if(@a < 3); return "Need at least one parameter (Setting) - Setting: remove=delete overlay; 0=heating power off; 1<=desired temperature (overlay)" if(@a < 3);
if( $value eq "off" ) { if( $value eq "remove" ) {
TadoAPI_SetAllOverlays($hash, "off"); TadoAPI_SetAllOverlays($hash, "remove");
} elsif ($value >= 0) { } elsif ($value >= 0) {
TadoAPI_SetAllOverlays($hash, $value); TadoAPI_SetAllOverlays($hash, $value);
} }
@ -591,7 +591,7 @@ sub TadoAPI_SetZoneOverlayById(@){
$dt += $duration if defined($duration); $dt += $duration if defined($duration);
# remove overlay # remove overlay
if($setting eq "off"){ if($setting eq "remove"){
$method = "DELETE"; $method = "DELETE";
Log3 $name, 3, "TadoAPI $name" . ": " . "Deleting Overlay for Zone $zoneID"; Log3 $name, 3, "TadoAPI $name" . ": " . "Deleting Overlay for Zone $zoneID";
} }
@ -1502,13 +1502,13 @@ sub TadoAPI_readPassword($)
<li> <li>
<code>set &lt;name&gt; setZoneOverlay &lt;zoneID&gt; &lt;setting&gt; [&lt;duration&gt;]</code><br> <code>set &lt;name&gt; setZoneOverlay &lt;zoneID&gt; &lt;setting&gt; [&lt;duration&gt;]</code><br>
Setting: off delete overlay; 0 heating power off; &gt; 1 sets desired temperature to given value (overlay) Setting: remove = delete overlay; 0 = heating power off; &gt; 1 sets desired temperature to given value (overlay)
</li> </li>
<li> <li>
<code>set &lt;name&gt; setAllOverlays &lt;setting&gt;</code><br> <code>set &lt;name&gt; setAllOverlays &lt;setting&gt;</code><br>
Same as above, but for all zones<br> Same as above, but for all zones<br>
Setting: off delete overlay; 0 heating power off; &gt; 1 sets desired temperature to given value (overlay)</li> Setting: remove = delete overlay; 0 = heating power off; &gt; 1 sets desired temperature to given value (overlay)</li>
<br> <br>
</ul> </ul>
<br> <br>

6
README.md
View File

@ -34,14 +34,14 @@ Sämtliche externen Aufrufe sind *nonblocking* ausgeführt.
### Overlay für Zone setzen ### Overlay für Zone setzen
`set setZoneOverlay <zonenID> <Wunschtemperatur>` `set setZoneOverlay <zonenID> <Wunschtemperatur>`
**INFO:** unterstützte Werte der Wunschtemperatur: `off=delete overlay; 0=heating power off; 1<=desired temperature (overlay)` **INFO:** unterstützte Werte der Wunschtemperatur: `remove=delete overlay; 0=heating power off; 1<=desired temperature (overlay)`
<img src="https://home.wolfmajer.at/wolfgit/Public/FHEM-Tado/raw/branch/master/doc/so.PNG" width="500" /> <img src="https://home.wolfmajer.at/wolfgit/Public/FHEM-Tado/raw/branch/master/doc/so.PNG" width="500" />
### Overlay für alle Zonen setzen ### Overlay für alle Zonen setzen
`set setZoneOverlay <Wunschtemperatur>` `set setZoneOverlay <Wunschtemperatur>`
**INFO:** unterstützte Werte der Wunschtemperatur: `off=delete overlay; 0=heating power off; 1<=desired temperature (overlay)` **INFO:** unterstützte Werte der Wunschtemperatur: `remove=delete overlay; 0=heating power off; 1<=desired temperature (overlay)`
### Tado Geräte anzeigen (z.B. Battery State) ### Tado Geräte anzeigen (z.B. Battery State)
<img src="https://home.wolfmajer.at/wolfgit/Public/FHEM-Tado/raw/branch/master/doc/gzd.PNG" width="500" /> <img src="https://home.wolfmajer.at/wolfgit/Public/FHEM-Tado/raw/branch/master/doc/gzd.PNG" width="500" />
@ -68,7 +68,7 @@ if (Value("Bewohner") eq "absent" && ReadingsVal("mytd","OverlayType_<zonenName>
}elsif (Value("Bewohner") eq "home" && ReadingsVal("mytd","OverlayType_Heizung",0) eq "MANUAL") }elsif (Value("Bewohner") eq "home" && ReadingsVal("mytd","OverlayType_Heizung",0) eq "MANUAL")
{ {
# jemand zu hause # jemand zu hause
fhem("set mytd setZoneOverlay <zonenID> off; set mytd setGeo <Mobile ID> off"); fhem("set mytd setZoneOverlay <zonenID> remove; set mytd setGeo <Mobile ID> off");
Log 3, "TadoAPI: Bewohner anwesend - Overlay wird deaktiviert."; Log 3, "TadoAPI: Bewohner anwesend - Overlay wird deaktiviert.";
} }
} }