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

readd lost setter webinterface #72

Merged
sebastianschwarz merged 1 commits from patch-dev_merge_failed_electronic_pressure_pump into dev 2022-07-13 19:18:55 +00:00
Conversation 1 Commits 1 Files Changed 3 +39 -35
3 changed files with 39 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 6aba15caca - Show all commits

2
CHANGED
View File

@ -1 +1 @@
[add] - cancleValve for conencted valvs only [Ticket: no]

68
FHEM/74_GardenaSmartDevice.pm
View File

@ -565,6 +565,10 @@ sub Set {
'manualOverride:slider,1,1,59 cancelOverride:noArg resumeSchedule:noArg stopSchedule manualButtonTime:slider,0,2,100' 'manualOverride:slider,1,1,59 cancelOverride:noArg resumeSchedule:noArg stopSchedule manualButtonTime:slider,0,2,100'
if ( AttrVal( $name, 'model', 'unknown' ) eq 'watering_computer' ); if ( AttrVal( $name, 'model', 'unknown' ) eq 'watering_computer' );
$list .= 'manualOverride:slider,1,1,90 cancelOverride:noArg operating_mode:automatic,scheduled leakage_detection:watering,washing_machine,domestic_water_supply,off turn_on_pressure:slider,2,0.2,3.0,1 resetValveErrors:noArg'
if ( AttrVal( $name, 'model', 'unknown' ) eq 'electronic_pressure_pump' );
$list .= $list .=
'closeAllValves:noArg stopScheduleValve:select,'.ReadingsVal( $name, 'ic24-valves_connected', '1' ).' resumeScheduleValve:select,'.ReadingsVal( $name, 'ic24-valves_connected', '1' ) 'closeAllValves:noArg stopScheduleValve:select,'.ReadingsVal( $name, 'ic24-valves_connected', '1' ).' resumeScheduleValve:select,'.ReadingsVal( $name, 'ic24-valves_connected', '1' )
if ( AttrVal( $name, 'model', 'unknown' ) eq 'ic24' ); if ( AttrVal( $name, 'model', 'unknown' ) eq 'ic24' );
@ -1237,39 +1241,39 @@ sub setState {
ReadingsVal( $name, 'power-power_timer', 'no info from power-timer' ) ) ReadingsVal( $name, 'power-power_timer', 'no info from power-timer' ) )
if ( AttrVal( $name, 'model', 'unknown' ) eq 'power' ); if ( AttrVal( $name, 'model', 'unknown' ) eq 'power' );
#electronic water pump # #electronic water pump
if ( AttrVal( $name, 'model', 'unknown' ) eq 'electronic_pressure_pump' ) { # | ok | pump_not_filled (Pumpe nicht gefüllt) # if ( AttrVal( $name, 'model', 'unknown' ) eq 'electronic_pressure_pump' ) { # | ok | pump_not_filled (Pumpe nicht gefüllt)
my $state_string = ReadingsVal( $name, 'watering-watering_timer_1_duration', 0 ) =~ # my $state_string = ReadingsVal( $name, 'watering-watering_timer_1_duration', 0 ) =~
m{\A[1-9]([0-9]+)?\z}xms # m{\A[1-9]([0-9]+)?\z}xms
# offen # # offen
? # ?
( ReadingsVal($name, 'scheduling-schedules_paused_until', '' ) eq '' ) # ( ReadingsVal($name, 'scheduling-schedules_paused_until', '' ) eq '' )
# leer ( zeitplan aktiv ... ) # # leer ( zeitplan aktiv ... )
? sprintf( (RigReadingsValue($hash, 'will be irrigated %.f minutes remaining.').' '.RigReadingsValue($hash, 'next watering: %s')), (ReadingsVal( $name, 'watering-watering_timer_1_duration', 0 )/60), RigReadingsValue($hash, ReadingsVal($name, 'scheduling-scheduled_watering_next_start', '')) ) # ? sprintf( (RigReadingsValue($hash, 'will be irrigated %.f minutes remaining.').' '.RigReadingsValue($hash, 'next watering: %s')), (ReadingsVal( $name, 'watering-watering_timer_1_duration', 0 )/60), RigReadingsValue($hash, ReadingsVal($name, 'scheduling-scheduled_watering_next_start', '')) )
# zeitplan pausiert # # zeitplan pausiert
: # :
( ReadingsVal($name, 'scheduling-schedules_paused_until', '') eq '2038-01-18T00:00:00.000Z') # ( ReadingsVal($name, 'scheduling-schedules_paused_until', '') eq '2038-01-18T00:00:00.000Z')
# pause bis dauerhaft # # pause bis dauerhaft
? sprintf( (RigReadingsValue($hash, 'will be irrigated %.f minutes remaining.').' '.RigReadingsValue($hash , 'schedule permanently paused')), (ReadingsVal( $name, 'watering-watering_timer_1_duration', 0 )/60) ) # ? sprintf( (RigReadingsValue($hash, 'will be irrigated %.f minutes remaining.').' '.RigReadingsValue($hash , 'schedule permanently paused')), (ReadingsVal( $name, 'watering-watering_timer_1_duration', 0 )/60) )
# naechter termin # # naechter termin
: sprintf( RigReadingsValue($hash , 'paused until %s'), RigReadingsValue($hash, ReadingsVal($name, 'scheduling-schedules_paused_until', '')) ) # : sprintf( RigReadingsValue($hash , 'paused until %s'), RigReadingsValue($hash, ReadingsVal($name, 'scheduling-schedules_paused_until', '')) )
# zu # # zu
: # :
( ReadingsVal($name, 'scheduling-schedules_paused_until', '' ) eq '' ) # ( ReadingsVal($name, 'scheduling-schedules_paused_until', '' ) eq '' )
# zeitplan aktiv # # zeitplan aktiv
? sprintf( (RigReadingsValue($hash, 'closed') .'. '.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 # # zeitplan pausiert
: RigReadingsValue($hash, 'closed') # : RigReadingsValue($hash, 'closed')
; # ;
# state offline | override # # state offline | override
$state_string = 'offline' if ($online_state eq 'offline'); # $state_string = 'offline' if ($online_state eq 'offline');
# check valv error, override state # # check valv error, override state
my $error_type = ReadingsVal( $name, 'error-valve_error_1_type', 'ok' ); # my $error_type = ReadingsVal( $name, 'error-valve_error_1_type', 'ok' );
$state_string = ( $error_type ne 'ok' ) ? $error_type : $state_string; # $state_string = ( $error_type ne 'ok' ) ? $error_type : $state_string;
readingsBulkUpdate( # readingsBulkUpdate(
$hash, 'state', RigReadingsValue( $hash, $state_string ) ); # $hash, 'state', RigReadingsValue( $hash, $state_string ) );
} # }
return; return;
} }

4
controls_GardenaSmartDevice.txt
View File

@ -1,2 +1,2 @@
UPD 2022-07-13_07:48:46 49634 FHEM/73_GardenaSmartBridge.pm UPD 2022-07-12_20:03:00 49634 FHEM/73_GardenaSmartBridge.pm
UPD 2022-07-13_07:58:25 81604 FHEM/74_GardenaSmartDevice.pm UPD 2022-07-13_20:56:14 81987 FHEM/74_GardenaSmartDevice.pm