first step state
This commit is contained in:
Sebastian
parent
3b28a20b33
commit
c76fd125ec
@ -166,6 +166,7 @@ sub Initialize {
|
|||||||
$hash->{AttrList} =
|
$hash->{AttrList} =
|
||||||
"readingValueLanguage:de,en "
|
"readingValueLanguage:de,en "
|
||||||
. "model:watering_computer,sensor,sensor2,mower,ic24,power,electronic_pressure_pump "
|
. "model:watering_computer,sensor,sensor2,mower,ic24,power,electronic_pressure_pump "
|
||||||
|
. "extendedState "
|
||||||
. "IODev "
|
. "IODev "
|
||||||
. $readingFnAttributes;
|
. $readingFnAttributes;
|
||||||
$hash->{parseParams} = 1;
|
$hash->{parseParams} = 1;
|
||||||
@ -879,59 +880,81 @@ sub setState {
|
|||||||
)
|
)
|
||||||
) if ( AttrVal( $name, 'model', 'unknown' ) eq 'ic24' );
|
) if ( AttrVal( $name, 'model', 'unknown' ) eq 'ic24' );
|
||||||
|
|
||||||
|
# override state 4 extendedstates
|
||||||
|
if ( AttrVal( $name, "extendedState", 0 ) == 1) {
|
||||||
|
### ic24
|
||||||
|
if ( AttrVal( $name, 'model', 'unknown' ) eq 'ic24' ){
|
||||||
|
my @ic24opened_ventils;
|
||||||
|
my $opened_ventils = 0; # bit maker
|
||||||
|
my $state_string = ''; my $nearst_irrigation = '2999-12-12 24:00';
|
||||||
|
my $has_scheduling = false;
|
||||||
|
my @valves_connected = split(',', ReadingsVal( $name, 'ic24-valves_connected', ''));
|
||||||
|
for (@valves_connected){
|
||||||
|
## calc bit wise 1 - 6 dec => 1 - 63 dec ( 11 1111 )
|
||||||
|
$opened_ventils=$opened_ventils+(2**$zahl) if ( $zahl > 0 );
|
||||||
|
## add to opened ventils, if watering active
|
||||||
|
push @ic24opened_ventils, $_ if ( ( ( ReadingsVal( $name, "watering-watering_timer_".$_."_duration", 0 ) =~ m{\A[1-9]([0-9]+)?\z}xms ) ? $_ : 0 ) > 0 );
|
||||||
|
## find nearst timestamp
|
||||||
|
$has_scheduling = true if ( ReadingsVal($name, 'scheduling-schedules_paused_until_'.$_ , '') ne '2038-01-18T00:00:00.000Z');
|
||||||
|
|
||||||
# ... Bewässerung aktiv. Zeitpläne aktiv (oder hier immerhin: Nächster Zeitplan: ...)
|
if ( ReadingsVal($name, 'scheduling-scheduled_watering_next_start_'.$_, '') ne '') {
|
||||||
# ... Bewässerung aktiv. Zeitpläne dauerhaft pausiert.
|
$nearst_irrigation = ReadingsVal($name, 'scheduling-scheduled_watering_next_start_'.$_, '') if ( Time::Piece->strptime( ReadingsVal($name, 'scheduling-scheduled_watering_next_start_'.$_, ''), "%Y-%m-%d %H:%M") < Time::Piece->strptime( $nearst_irrigation, "%Y-%m-%d %H:%M"))
|
||||||
# ... geschlossen. Zeitpläne aktiv (bzw. s.o.)
|
} # fi
|
||||||
# ... geschlossen. Zeitpläne dauerhaft pausiert.
|
}
|
||||||
# ... offlinen
|
if (scalar(@ic24opened_ventils) > 0){
|
||||||
my $activ_watering = 0;
|
$state_string .= sprintf(RigReadingsValue($hash,'valve').' '.$_.' '.(RigReadingsValue($hash, 'will be irrigated %.f minutes remaining.')), (ReadingsVal( $name, 'watering-watering_timer_'.$_.'_duration', 0 )/60));
|
||||||
if ( AttrVal( $name, 'model', 'unknown' ) eq 'ic24' ){
|
} else {
|
||||||
my $opened_ventils = 0;
|
$state_string .= RigReadingsValue($hash, 'closed');
|
||||||
my $state_string = '';
|
}
|
||||||
## calc bit wise 1 - 6 dec => 1 - 63 dec ( 11 1111 )
|
$state_string .= ($has_scheduling) ? sprintf( RigReadingsValue($hash, 'next watering: %s'), RigReadingsValue($hash, ReadingsVal($name, 'scheduling-scheduled_watering_next_start', ''))) : sprintf( RigReadingsValue($hash, 'paused until %s') , $nearst_irrigation);
|
||||||
my @valves_connected = split(',', ReadingsVal( $name, 'ic24-valves_connected', ''));
|
|
||||||
|
|
||||||
|
|
||||||
for (@valves_connected){
|
#TODO: Write state format for ventil 1-@valces_connected -> map ?
|
||||||
$activ_watering = 0;
|
|
||||||
my $zahl = ( ReadingsVal( $name, "watering-watering_timer_".$_."_duration", 0 ) =~ m{\A[1-9]([0-9]+)?\z}xms ) ? $_ : 0;
|
|
||||||
$activ_watering = $_ if ( $zahl > 0 );
|
|
||||||
$opened_ventils=$opened_ventils+(2**$zahl) if ( $zahl > 0 );
|
|
||||||
Log3 $name, 3, "[DEBUG] - GardenaSmartDevice ($name) / watering-watering_timer_".$_."_duration - wasser timer($_) =-1 ( $zahl ) : $opened_ventils";
|
|
||||||
|
|
||||||
# ### eventuell auf binare bits und shiften
|
|
||||||
$state_string .= $activ_watering > 0
|
## check ob ws offen ist
|
||||||
# offen
|
# ja -> dann zeig alle offene an ( durch api max. 2 )
|
||||||
?
|
##
|
||||||
( ReadingsVal($name, 'scheduling-schedules_paused_until_'.$activ_watering, '' ) eq '' )
|
# nein -> dann nur closed
|
||||||
# leer ( zeitplan aktiv ... )
|
#
|
||||||
? sprintf('V'.$activ_watering.' '.(RigReadingsValue($hash, 'will be irrigated %.f minutes remaining.').' '.RigReadingsValue($hash, 'next watering: %s')), (ReadingsVal( $name, 'watering-watering_timer_'.$activ_watering.'_duration', 0 )/60), RigReadingsValue($hash, ReadingsVal($name, 'scheduling-scheduled_watering_next_start_'.$activ_watering, '')) )
|
## check ob ein zeitplan aktiv
|
||||||
# zeitplan pausiert
|
# ja -> zeig nur den nächsten an
|
||||||
:
|
##
|
||||||
( ReadingsVal($name, 'scheduling-schedules_paused_until_'.$activ_watering , '') eq '2038-01-18T00:00:00.000Z')
|
# nein -> permanent geschlosen
|
||||||
# pause bis dauerhaft
|
####
|
||||||
? sprintf('V'.$activ_watering.' '. (RigReadingsValue($hash, 'will be irrigated %.f minutes remaining.').' '.RigReadingsValue($hash , 'schedule permanently paused')), (ReadingsVal( $name, 'watering-watering_timer_'.$activ_watering.'_duration', 0 )/60) )
|
# ### eventuell auf binare bits und shiften
|
||||||
# naechter termin
|
# $state_string .= $activ_watering > 0
|
||||||
: sprintf('V'.$activ_watering.' '. RigReadingsValue($hash , 'paused until %s'), RigReadingsValue($hash, ReadingsVal($name, 'scheduling-schedules_paused_until_'.$activ_watering , '')) )
|
# # offen
|
||||||
# zu
|
# ?
|
||||||
:
|
# ( ReadingsVal($name, 'scheduling-schedules_paused_until_'.$activ_watering, '' ) eq '' )
|
||||||
( ReadingsVal($name, 'scheduling-schedules_paused_until_'.$activ_watering , '' ) eq '' )
|
# # leer ( zeitplan aktiv ... )
|
||||||
# zeitplan aktiv
|
# ? sprintf('V'.$activ_watering.' '.(RigReadingsValue($hash, 'will be irrigated %.f minutes remaining.').' '.RigReadingsValue($hash, 'next watering: %s')), (ReadingsVal( $name, 'watering-watering_timer_'.$activ_watering.'_duration', 0 )/60), RigReadingsValue($hash, ReadingsVal($name, 'scheduling-scheduled_watering_next_start_'.$activ_watering, '')) )
|
||||||
? sprintf( (RigReadingsValue($hash, 'closed') .'. '.RigReadingsValue($hash, 'next watering: %s')), RigReadingsValue($hash, ReadingsVal($name, 'scheduling-scheduled_watering_next_start_'.$activ_watering, '') ) )
|
# # zeitplan pausiert
|
||||||
# zeitplan pausiert
|
# :
|
||||||
: RigReadingsValue($hash, 'closed')
|
# ( ReadingsVal($name, 'scheduling-schedules_paused_until_'.$activ_watering , '') eq '2038-01-18T00:00:00.000Z')
|
||||||
;
|
# # pause bis dauerhaft
|
||||||
|
# ? sprintf('V'.$activ_watering.' '. (RigReadingsValue($hash, 'will be irrigated %.f minutes remaining.').' '.RigReadingsValue($hash , 'schedule permanently paused')), (ReadingsVal( $name, 'watering-watering_timer_'.$activ_watering.'_duration', 0 )/60) )
|
||||||
|
# # naechter termin
|
||||||
|
# : sprintf('V'.$activ_watering.' '. RigReadingsValue($hash , 'paused until %s'), RigReadingsValue($hash, ReadingsVal($name, 'scheduling-schedules_paused_until_'.$activ_watering , '')) )
|
||||||
|
# # zu
|
||||||
|
# :
|
||||||
|
# ( ReadingsVal($name, 'scheduling-schedules_paused_until_'.$activ_watering , '' ) eq '' )
|
||||||
|
# # zeitplan aktiv
|
||||||
|
# ? sprintf( (RigReadingsValue($hash, 'closed') .'. '.RigReadingsValue($hash, 'next watering: %s')), RigReadingsValue($hash, ReadingsVal($name, 'scheduling-scheduled_watering_next_start_'.$activ_watering, '') ) )
|
||||||
|
# # zeitplan pausiert
|
||||||
|
# : RigReadingsValue($hash, 'closed')
|
||||||
|
# ;
|
||||||
|
|
||||||
|
#} FOR valvces_connected
|
||||||
|
# if ($activ_watering > 0)
|
||||||
|
# {
|
||||||
|
# # ein ventil offen
|
||||||
|
# my $state_string = "ein ventil offen"
|
||||||
|
|
||||||
|
# }
|
||||||
|
readingsBulkUpdate(
|
||||||
|
$hash, 'state', RigReadingsValue( $hash, $state_string ) );
|
||||||
}
|
}
|
||||||
# if ($activ_watering > 0)
|
|
||||||
# {
|
|
||||||
# # ein ventil offen
|
|
||||||
# my $state_string = "ein ventil offen"
|
|
||||||
|
|
||||||
# }
|
|
||||||
readingsBulkUpdate(
|
|
||||||
$hash, 'state', RigReadingsValue( $hash, $state_string ) );
|
|
||||||
}
|
}
|
||||||
#online state water control
|
#online state water control
|
||||||
# zeitplan -> dauert pausiert wenn 2038-01-18T00:00:00.000Z
|
# zeitplan -> dauert pausiert wenn 2038-01-18T00:00:00.000Z
|
||||||
|
|||||||
@ -1,2 +1,2 @@
|
|||||||
UPD 2022-05-28_13:13:38 49520 FHEM/73_GardenaSmartBridge.pm
|
UPD 2022-05-28_13:13:38 49520 FHEM/73_GardenaSmartBridge.pm
|
||||||
UPD 2022-05-31_19:47:33 65578 FHEM/74_GardenaSmartDevice.pm
|
UPD 2022-06-10_20:21:02 67143 FHEM/74_GardenaSmartDevice.pm
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user