From 4b998d19ab6bf373ed679771b8a65eb8f9631672 Mon Sep 17 00:00:00 2001
From: Sebastian <em@ail.tld>
Date: Tue, 2 Aug 2022 14:52:52 +0200
Subject: [PATCH] [fix] - show schedules_events_count fot non sensor devices
 [fix] - remove _valve_ in non valve devices fpr schedules

---
 CHANGED                         | 2 +-
 FHEM/74_GardenaSmartDevice.pm   | 9 ++++-----
 controls_GardenaSmartDevice.txt | 2 +-
 3 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/CHANGED b/CHANGED
index 1bd692d..bf024b8 100644
--- a/CHANGED
+++ b/CHANGED
@@ -1 +1 @@
-    add translation
+    [log] - removed valve_names log line
diff --git a/FHEM/74_GardenaSmartDevice.pm b/FHEM/74_GardenaSmartDevice.pm
index 180630c..784eeaf 100644
--- a/FHEM/74_GardenaSmartDevice.pm
+++ b/FHEM/74_GardenaSmartDevice.pm
@@ -836,7 +836,8 @@ sub WriteReadings {
     if ( 
         exists( $decode_json->{scheduled_events} )
       #  && 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',
                                         scalar( @{$decode_json->{scheduled_events} } ) );
         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 } ) {
             readingsBulkUpdateIfChanged( $hash, 'scheduling-schedules_event_'
                                               . $event_id
-                                              . '_valve_'
-                                              . $valve_id 
+                                              . ( ReadingsVal($name,'error-valve_error_1_valve_id','') ne '' ? "_valve_$valve_id" : '') 
                                               . '_'
                                               . $r,
                                               $v) if (ref($v) ne 'HASH' );
             readingsBulkUpdateIfChanged( $hash, 'scheduling-schedules_event_'
                                               . $event_id
-                                              . '_valve_'
-                                              . $valve_id 
+                                              . ( ReadingsVal($name,'error-valve_error_1_valve_id','') ne '' ? "_valve_$valve_id" : '')
                                               . '_'
                                               . $v->{type},
                                               join(',', @ { $v->{weekdays}}) ) if (ref($v) eq 'HASH' );
diff --git a/controls_GardenaSmartDevice.txt b/controls_GardenaSmartDevice.txt
index bafc0bd..626551b 100644
--- a/controls_GardenaSmartDevice.txt
+++ b/controls_GardenaSmartDevice.txt
@@ -1,2 +1,2 @@
 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