mhop/fhem
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

RESIDENTS, ROOMMATE, GUEST: Update commandref for new readings lastWakeup, lastWakeupDev, nextWakeup, nextWakeupDev

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@8298 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
loredo
2015-03-27 14:31:17 +00:00
parent 8545c95860
commit edc005cba5
3 changed files with 89 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
fhem/FHEM/10_RESIDENTS.pm
View File

@@ -1073,7 +1073,7 @@ sub RESIDENTS_UpdateReadings (@) {
</li>
</ul>
<ul>
<u>Note:</u> If you would like to retrict access to admin set-commands (-> addGuest, addRoommate, removeGuest, create) you may your FHEMWEB instance's attribute allowedCommands like 'set,set-user'.
<u>Note:</u> If you would like to restrict access to admin set-commands (-> addGuest, addRoommate, removeGuest, create) you may set your FHEMWEB instance's attribute allowedCommands like 'set,set-user'.
The string 'set-user' will ensure only non-admin set-commands can be executed when accessing FHEM using this FHEMWEB instance.
</ul>
</div><br>
@@ -1170,6 +1170,18 @@ sub RESIDENTS_UpdateReadings (@) {
<li>
<b>lastState</b> - the prior state
</li>
<li>
<b>lastWakeup</b> - time of last wake-up timer run
</li>
<li>
<b>lastWakeupDev</b> - device name of last wake-up timer
</li>
<li>
<b>nextWakeup</b> - time of next wake-up program run
</li>
<li>
<b>nextWakeupDev</b> - device name for next wake-up program run
</li>
<li>
<b>presence</b> - reflects the home presence state, depending on value of reading 'state' (can be 'present' or 'absent')
</li>
@@ -1218,6 +1230,9 @@ sub RESIDENTS_UpdateReadings (@) {
<li>
<b>state</b> - reflects the current state
</li>
<li>
<b>wakeup</b> - becomes '1' while a wake-up program of this resident group is being executed
</li>
</ul>
</div>
<br>
@@ -1415,6 +1430,18 @@ sub RESIDENTS_UpdateReadings (@) {
<li>
<b>lastState</b> - der vorherige Status
</li>
<li>
<b>lastWakeup</b> - Zeit der letzten Wake-up Timer Ausf&uuml;hring
</li>
<li>
<b>lastWakeupDev</b> - Device Name des zuletzt verwendeten Wake-up Timers
</li>
<li>
<b>nextWakeup</b> - Zeit der n&auml;chsten Wake-up Timer Ausf&uuml;hrung
</li>
<li>
<b>nextWakeupDev</b> - Device Name des als n&auml;chstes ausgef&auml;hrten Wake-up Timer
</li>
<li>
<b>presence</b> - gibt den zu Hause Status in Abhängigkeit des Readings 'state' wieder (kann 'present' oder 'absent' sein)
</li>
@@ -1463,6 +1490,9 @@ sub RESIDENTS_UpdateReadings (@) {
<li>
<b>state</b> - gibt den aktuellen Status wieder
</li>
<li>
<b>wakeup</b> - hat den Wert '1' w&auml;hrend ein Weckprogramm dieser Bewohner-Gruppe ausgef&uuml;hrt wird
</li>
</ul>
</div>
<br>

34
fhem/FHEM/20_GUEST.pm
View File

@@ -1044,7 +1044,7 @@ sub GUEST_StartInternalTimers($$) {
</li>
</ul>
<ul>
<u>Note:</u> If you would like to retrict access to admin set-commands (-> create) you may your FHEMWEB instance's attribute allowedCommands like 'set,set-user'.
<u>Note:</u> If you would like to restrict access to admin set-commands (-> create) you may set your FHEMWEB instance's attribute allowedCommands like 'set,set-user'.
The string 'set-user' will ensure only non-admin set-commands can be executed when accessing FHEM using this FHEMWEB instance.
</ul>
</div><br>
@@ -1242,14 +1242,26 @@ sub GUEST_StartInternalTimers($$) {
<li>
<b>lastState</b> - the prior state
</li>
<li>
<b>lastWakeup</b> - time of last wake-up timer run
</li>
<li>
<b>lastWakeupDev</b> - device name of last wake-up timer
</li>
<li>
<b>location</b> - the current location
</li>
<li>
<b>presence</b> - reflects the home presence state, depending on value of reading 'state' (can be 'present' or 'absent')
<b>mood</b> - the current mood
</li>
<li>
<b>mood</b> - the current mood
<b>nextWakeup</b> - time of next wake-up program run
</li>
<li>
<b>nextWakeupDev</b> - device name for next wake-up program run
</li>
<li>
<b>presence</b> - reflects the home presence state, depending on value of reading 'state' (can be 'present' or 'absent')
</li>
<li>
<b>state</b> - reflects the current state
@@ -1525,14 +1537,26 @@ sub GUEST_StartInternalTimers($$) {
<li>
<b>lastState</b> - der vorherige Status
</li>
<li>
<b>lastWakeup</b> - Zeit der letzten Wake-up Timer Ausf&uuml;hring
</li>
<li>
<b>lastWakeupDev</b> - Device Name des zuletzt verwendeten Wake-up Timers
</li>
<li>
<b>location</b> - der aktuelle Aufenthaltsort
</li>
<li>
<b>presence</b> - gibt den zu Hause Status in Abhängigkeit des Readings 'state' wieder (kann 'present' oder 'absent' sein)
<b>mood</b> - die aktuelle Stimmung
</li>
<li>
<b>mood</b> - die aktuelle Stimmung
<b>nextWakeup</b> - Zeit der n&auml;chsten Wake-up Timer Ausf&uuml;hrung
</li>
<li>
<b>nextWakeupDev</b> - Device Name des als n&auml;chstes ausgef&auml;hrten Wake-up Timer
</li>
<li>
<b>presence</b> - gibt den zu Hause Status in Abhängigkeit des Readings 'state' wieder (kann 'present' oder 'absent' sein)
</li>
<li>
<b>state</b> - gibt den aktuellen Status wieder

34
fhem/FHEM/20_ROOMMATE.pm
View File

@@ -1025,7 +1025,7 @@ sub ROOMMATE_StartInternalTimers($$) {
</li>
</ul>
<ul>
<u>Note:</u> If you would like to retrict access to admin set-commands (-> create) you may your FHEMWEB instance's attribute allowedCommands like 'set,set-user'.
<u>Note:</u> If you would like to restrict access to admin set-commands (-> create) you may set your FHEMWEB instance's attribute allowedCommands like 'set,set-user'.
The string 'set-user' will ensure only non-admin set-commands can be executed when accessing FHEM using this FHEMWEB instance.
</ul>
</div><br>
@@ -1223,14 +1223,26 @@ sub ROOMMATE_StartInternalTimers($$) {
<li>
<b>lastState</b> - the prior state
</li>
<li>
<b>lastWakeup</b> - time of last wake-up timer run
</li>
<li>
<b>lastWakeupDev</b> - device name of last wake-up timer
</li>
<li>
<b>location</b> - the current location
</li>
<li>
<b>presence</b> - reflects the home presence state, depending on value of reading 'state' (can be 'present' or 'absent')
<b>mood</b> - the current mood
</li>
<li>
<b>mood</b> - the current mood
<b>nextWakeup</b> - time of next wake-up program run
</li>
<li>
<b>nextWakeupDev</b> - device name for next wake-up program run
</li>
<li>
<b>presence</b> - reflects the home presence state, depending on value of reading 'state' (can be 'present' or 'absent')
</li>
<li>
<b>state</b> - reflects the current state
@@ -1506,14 +1518,26 @@ sub ROOMMATE_StartInternalTimers($$) {
<li>
<b>lastState</b> - der vorherige Status
</li>
<li>
<b>lastWakeup</b> - Zeit der letzten Wake-up Timer Ausf&uuml;hring
</li>
<li>
<b>lastWakeupDev</b> - Device Name des zuletzt verwendeten Wake-up Timers
</li>
<li>
<b>location</b> - der aktuelle Aufenthaltsort
</li>
<li>
<b>presence</b> - gibt den zu Hause Status in Abhängigkeit des Readings 'state' wieder (kann 'present' oder 'absent' sein)
<b>mood</b> - die aktuelle Stimmung
</li>
<li>
<b>mood</b> - die aktuelle Stimmung
<b>nextWakeup</b> - Zeit der n&auml;chsten Wake-up Timer Ausf&uuml;hrung
</li>
<li>
<b>nextWakeupDev</b> - Device Name des als n&auml;chstes ausgef&auml;hrten Wake-up Timer
</li>
<li>
<b>presence</b> - gibt den zu Hause Status in Abhängigkeit des Readings 'state' wieder (kann 'present' oder 'absent' sein)
</li>
<li>
<b>state</b> - gibt den aktuellen Status wieder