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

dev #74

Merged
sebastianschwarz merged 126 commits from dev into testing 2022-09-06 11:31:54 +00:00
Conversation 0 Commits 126 Files Changed 4 +6 -7
3 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 4b998d19ab - Show all commits

2
CHANGED
View File

@ -1 +1 @@
add translation [log] - removed valve_names log line

9
FHEM/74_GardenaSmartDevice.pm
View File

@ -836,7 +836,8 @@ sub WriteReadings {
if ( if (
exists( $decode_json->{scheduled_events} ) exists( $decode_json->{scheduled_events} )
# && scalar ($decode_json->{scheduled_events} ) > 0 # && scalar ($decode_json->{scheduled_events} ) > 0
&& ref ($decode_json->{scheduled_events}) eq 'ARRAY' ) { && ref ($decode_json->{scheduled_events}) eq 'ARRAY'
&& AttrVal( $name, 'model', 'unknown' ) !~ /sensor.?/ ) {
readingsBulkUpdateIfChanged( $hash, 'scheduling-schedules_events_count', readingsBulkUpdateIfChanged( $hash, 'scheduling-schedules_events_count',
scalar( @{$decode_json->{scheduled_events} } ) ); scalar( @{$decode_json->{scheduled_events} } ) );
my $valve_id =1; my $event_id = 1; # ic24 [1..6] | wc, pump [1] my $valve_id =1; my $event_id = 1; # ic24 [1..6] | wc, pump [1]
@ -848,15 +849,13 @@ sub WriteReadings {
while ( my ( $r, $v ) = each %{ $event_schedules } ) { while ( my ( $r, $v ) = each %{ $event_schedules } ) {
readingsBulkUpdateIfChanged( $hash, 'scheduling-schedules_event_' readingsBulkUpdateIfChanged( $hash, 'scheduling-schedules_event_'
. $event_id . $event_id
. '_valve_' . ( ReadingsVal($name,'error-valve_error_1_valve_id','') ne '' ? "_valve_$valve_id" : '')
. $valve_id
. '_' . '_'
. $r, . $r,
$v) if (ref($v) ne 'HASH' ); $v) if (ref($v) ne 'HASH' );
readingsBulkUpdateIfChanged( $hash, 'scheduling-schedules_event_' readingsBulkUpdateIfChanged( $hash, 'scheduling-schedules_event_'
. $event_id . $event_id
. '_valve_' . ( ReadingsVal($name,'error-valve_error_1_valve_id','') ne '' ? "_valve_$valve_id" : '')
. $valve_id
. '_' . '_'
. $v->{type}, . $v->{type},
join(',', @ { $v->{weekdays}}) ) if (ref($v) eq 'HASH' ); join(',', @ { $v->{weekdays}}) ) if (ref($v) eq 'HASH' );

2
controls_GardenaSmartDevice.txt
View File

@ -1,2 +1,2 @@
UPD 2022-07-21_19:43:48 49634 FHEM/73_GardenaSmartBridge.pm UPD 2022-07-21_19:43:48 49634 FHEM/73_GardenaSmartBridge.pm
UPD 2022-07-30_20:31:34 78966 FHEM/74_GardenaSmartDevice.pm UPD 2022-08-02_14:51:12 79067 FHEM/74_GardenaSmartDevice.pm