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

patch_ic24 #69

Merged
marko merged 88 commits from patch_ic24 into dev 2022-07-12 17:35:25 +00:00
Conversation 4 Commits 88 Files Changed 4 +9 -9
3 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit c551f4855f - Show all commits

2
CHANGED
View File

@@ -1 +1 @@
change debug
long state

12
FHEM/74_GardenaSmartDevice.pm
View File

@@ -889,7 +889,7 @@ sub setState {
if ( AttrVal( $name, 'model', 'unknown' ) eq 'ic24' ){
my $opened_ventils = 0;
my $state_string = '';
## clac bit wise 1 - 6 dec => 1 - 63 dec ( 0011 1111 )
## calc bit wise 1 - 6 dec => 1 - 63 dec ( 11 1111 )
for (my $i = 1; $i < 7; $i++){
$activ_watering = 0;
my $zahl = ( ReadingsVal( $name, "watering-watering_timer_".$i."_duration", 0 ) =~ m{\A[1-9]([0-9]+)?\z}xms ) ? ($i -1) : 0;
@@ -907,24 +907,24 @@ sub setState {
# Log3 $name, 3, "[DEBUG] - GardenaSmartDevice ($name) - wasser timer: $activ_watering";
# ### eventuell auf binare bits und shiften
$state_string .= $activ_watering > 0
$state_string .=
# offen
?
( ReadingsVal($name, 'scheduling-schedules_paused_until_'.$activ_watering, '' ) eq '' )
# leer ( zeitplan aktiv ... )
? sprintf( (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', '')) )
? 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, '')) )
# zeitplan pausiert
:
( ReadingsVal($name, 'scheduling-schedules_paused_until_'.$activ_watering , '') eq '2038-01-18T00:00:00.000Z')
# pause bis dauerhaft
? sprintf( (RigReadingsValue($hash, 'will be irrigated %.f minutes remaining.').' '.RigReadingsValue($hash , 'schedule permanently paused')), (ReadingsVal( $name, 'watering-watering_timer_'.$activ_watering.'_duration', 0 )/60) )
? 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( RigReadingsValue($hash , 'paused until %s'), RigReadingsValue($hash, ReadingsVal($name, 'scheduling-schedules_paused_until_'.$activ_watering , '')) )
: 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', '') ) )
? 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')
;

4
controls_GardenaSmartDevice.txt
View File

@@ -1,2 +1,2 @@
UPD 2022-05-07_20:23:00 49520 FHEM/73_GardenaSmartBridge.pm
UPD 2022-05-07_20:28:37 66165 FHEM/74_GardenaSmartDevice.pm
UPD 2022-05-08_12:44:36 49520 FHEM/73_GardenaSmartBridge.pm
UPD 2022-05-14_22:59:23 66249 FHEM/74_GardenaSmartDevice.pm