FHEM/mod-GardenaSmart
1
0
Fork 0
Code Issues 2 Pull Requests Releases 3 Wiki Activity

main #55

Merged
marko merged 37 commits from main into testing 2022-04-12 17:23:55 +00:00
Conversation 0 Commits 37 Files Changed 3 +4 -30
2 changed files with 4 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 17b4182abe - Show all commits

32
FHEM/74_GardenaSmartDevice.pm
View File

@@ -849,9 +849,6 @@ sub setState {
if ( AttrVal( $name, 'model', 'unknown' ) eq 'mower' );
#online state water control
# zeit bewaesseung
# online | offline
# open | closed
# zeitplan -> dauert pausiert wenn 2038-01-18T00:00:00.000Z
# watering-watering_timer_1_state idle | scheduled | manual
@@ -863,20 +860,12 @@ sub setState {
# 1. Ventil geschlossen, Zeitplan pausiert.
# App zeigt: nichts (wenn vorher ein Zeitplan abgebrochen wurde, steht da "Unterbrochen xx:yy - zz:aa")
# - STATE=closed & watering-watering_timer_1_state=idle && scheduling-schedules_paused_unti != '' && watering-watering_timer_1_duration = 0
# 2. Ventil geschlossen, Zeitplan aktiv.
# App zeigt: "Nächste Bewässerung heute um xx:yy Uhr" (wenn vorher ein Zeitplan abgebrochen wurde, steht da vorher auch "Unterbrochen xx:yy - zz:aa")
# - STATE=closed & watering-watering_timer_1_duration = 0 && watering-watering_timer_1_state=scheduled (?) & scheduling-schedules_paused_until = ''
# 3. Ventil manuell geöffnet, späterer Zeitplan aktiv.
# 3. Ventil manuell geoeffnet, späterer Zeitplan aktiv.
# Wird bewässert xx Minuten verbleibend" und "Nächste Bewässerung heute um xx:yy Uhr"
# - STATE= watering-watering_timer_1_duration != 0 && scheduling-schedules_paused_until = '' && watering-watering_timer_1_state=manual
# 4. Ventil manuell geöffnet, Zeitpläne deaktiviert.
# 4. Ventil manuell geoeffnet, Zeitpläne deaktiviert.
# App zeigt: "Wird bewässert xx Minuten verbleibend"
# - STATE=open & watering-watering_timer_1_duration != 0 && watering-watering_timer_1_state=idle (?) & scheduling-schedules_paused_unti != ''
#RigReadingsValue
if ( AttrVal( $name, 'model', 'unknown' ) eq 'watering_computer' ){
my $state_string = ReadingsVal( $name, 'watering-watering_timer_1_duration', 0 ) =~
@@ -893,29 +882,14 @@ sub setState {
? sprintf( (RigReadingsValue($hash, 'will be irrigated %s minutes remaining.').' '.RigReadingsValue($hash , 'schedule permanently paused')), ReadingsVal( $name, 'watering-watering_timer_1_duration', 0 ))
# naechter termin
: sprintf( RigReadingsValue($hash , 'paused until %s'), RigReadingsValue($hash, ReadingsVal($name, 'scheduling-schedules_paused_until', '')) )
#RigReadingsValue( $hash, 'open' )
# zu
:
( ReadingsVal($name, 'scheduling-schedules_paused_until', '' ) eq '' )
# zeitplan aktiv
? sprintf( RigReadingsValue($hash, 'next watering: %s'), RigReadingsValue($hash, ReadingsVal($name, 'scheduling-scheduled_watering_next_start', '') ) )
? sprintf( (RigReadingsValue($hash, 'closed') .'. '.RigReadingsValue($hash, 'next watering: %s')), RigReadingsValue($hash, ReadingsVal($name, 'scheduling-scheduled_watering_next_start', '') ) )
# zeitplan pausiert
: RigReadingsValue($hash, 'closed')
;
# ( ReadingsVal( $name, 'scheduling-schedules_paused_until', '') eq '' ? # leer wenn zeitplan aktiv
# 'scheduled watering next start: '
# . (
# ReadingsVal(
# $name, 'scheduling-schedules_paused_until',
# 'no timer'
# )
# ) : 'closed' );
# state offline | override
$state_string = 'offline' if ($online_state eq 'offline');

2
controls_GardenaSmartDevice.txt
View File

@@ -1,2 +1,2 @@
UPD 2022-03-29_13:42:09 49520 FHEM/73_GardenaSmartBridge.pm
UPD 2022-04-07_19:49:15 62409 FHEM/74_GardenaSmartDevice.pm
UPD 2022-04-09_12:33:25 61263 FHEM/74_GardenaSmartDevice.pm