From 40074a3db67e3c400d6588ae6a3d31199a505334 Mon Sep 17 00:00:00 2001 From: Sebastian Date: Fri, 27 May 2022 11:44:59 +0200 Subject: [PATCH 1/3] add lona readings --- CHANGED | 2 +- FHEM/74_GardenaSmartDevice.pm | 24 ++++++++++++++++++------ controls_GardenaSmartDevice.txt | 4 ++-- 3 files changed, 21 insertions(+), 9 deletions(-) diff --git a/CHANGED b/CHANGED index ebe0585..e3be7a0 100644 --- a/CHANGED +++ b/CHANGED @@ -1 +1 @@ - fix lona + Reviewed-on: https://git.cooltux.net/FHEM/mod-GardenaSmart/pulls/58 diff --git a/FHEM/74_GardenaSmartDevice.pm b/FHEM/74_GardenaSmartDevice.pm index 2ffdf20..b4ca0a3 100644 --- a/FHEM/74_GardenaSmartDevice.pm +++ b/FHEM/74_GardenaSmartDevice.pm @@ -776,13 +776,25 @@ sub WriteReadings { if ( ref( $propertie->{value} ) eq "HASH" ) { while ( my ( $r, $v ) = each %{ $propertie->{value} } ) { - readingsBulkUpdate( - $hash, - $decode_json->{abilities}[$abilities]{name} . '-' +^ if ( ref( $v ) ne "HASH" ) { + readingsBulkUpdate( + $hash, + $decode_json->{abilities}[$abilities]{name} . '-' + . $propertie->{name} . '_' + . $r, + RigReadingsValue( $hash, $v ) + ); + } else { + while ( my ( $i_r, $i_v ) = each %{ $v } ) { + readingsBulkUpdate( + $hash, + $decode_json->{abilities}[$abilities]{name} . '-' . $propertie->{name} . '_' - . $r, - RigReadingsValue( $hash, $v ) - ); + . $r . '_' . $i_r, + RigReadingsValue( $hash, $i_v ) + ); + } + } } } } diff --git a/controls_GardenaSmartDevice.txt b/controls_GardenaSmartDevice.txt index aa00f56..61935f2 100644 --- a/controls_GardenaSmartDevice.txt +++ b/controls_GardenaSmartDevice.txt @@ -1,2 +1,2 @@ -UPD 2022-05-17_20:53:29 49913 FHEM/73_GardenaSmartBridge.pm -UPD 2022-05-17_11:06:17 66211 FHEM/74_GardenaSmartDevice.pm +UPD 2022-05-27_11:41:32 49913 FHEM/73_GardenaSmartBridge.pm +UPD 2022-05-27_11:44:30 66807 FHEM/74_GardenaSmartDevice.pm -- 2.45.2 From 6b475415cc286b927a5d4cd30da74927f88604bf Mon Sep 17 00:00:00 2001 From: Sebastian Date: Fri, 27 May 2022 20:04:39 +0200 Subject: [PATCH 2/3] copy & past error --- CHANGED | 2 +- FHEM/74_GardenaSmartDevice.pm | 2 +- controls_GardenaSmartDevice.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/CHANGED b/CHANGED index e3be7a0..acd78d7 100644 --- a/CHANGED +++ b/CHANGED @@ -1 +1 @@ - Reviewed-on: https://git.cooltux.net/FHEM/mod-GardenaSmart/pulls/58 + add lona readings diff --git a/FHEM/74_GardenaSmartDevice.pm b/FHEM/74_GardenaSmartDevice.pm index b4ca0a3..c0f5a6c 100644 --- a/FHEM/74_GardenaSmartDevice.pm +++ b/FHEM/74_GardenaSmartDevice.pm @@ -776,7 +776,7 @@ sub WriteReadings { if ( ref( $propertie->{value} ) eq "HASH" ) { while ( my ( $r, $v ) = each %{ $propertie->{value} } ) { -^ if ( ref( $v ) ne "HASH" ) { + if ( ref( $v ) ne "HASH" ) { readingsBulkUpdate( $hash, $decode_json->{abilities}[$abilities]{name} . '-' diff --git a/controls_GardenaSmartDevice.txt b/controls_GardenaSmartDevice.txt index 61935f2..ca1f813 100644 --- a/controls_GardenaSmartDevice.txt +++ b/controls_GardenaSmartDevice.txt @@ -1,2 +1,2 @@ UPD 2022-05-27_11:41:32 49913 FHEM/73_GardenaSmartBridge.pm -UPD 2022-05-27_11:44:30 66807 FHEM/74_GardenaSmartDevice.pm +UPD 2022-05-27_20:04:31 66804 FHEM/74_GardenaSmartDevice.pm -- 2.45.2 From a4a75ab0162050530ab90f676151eb10eca1d245 Mon Sep 17 00:00:00 2001 From: Sebastian Date: Sat, 25 Jun 2022 12:58:59 +0200 Subject: [PATCH 3/3] patch lono. eventuell recrusive readings einbauen. waterpump rechtschreibfehler mit fixed --- CHANGED | 2 +- FHEM/74_GardenaSmartDevice.pm | 4 ++-- controls_GardenaSmartDevice.txt | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/CHANGED b/CHANGED index acd78d7..50436d5 100644 --- a/CHANGED +++ b/CHANGED @@ -1 +1 @@ - add lona readings + copy & past error diff --git a/FHEM/74_GardenaSmartDevice.pm b/FHEM/74_GardenaSmartDevice.pm index c0f5a6c..13d7e9d 100644 --- a/FHEM/74_GardenaSmartDevice.pm +++ b/FHEM/74_GardenaSmartDevice.pm @@ -568,7 +568,7 @@ sub Set { 'closeAllValves:noArg stopScheduleValve:selectnumbers,1,1,6,0,lin resumeScheduleValve:selectnumbers,1,1,6,0,lin manualDurationValve1:slider,1,1,90 manualDurationValve2:slider,1,1,90 manualDurationValve3:slider,1,1,90 manualDurationValve4:slider,1,1,90 manualDurationValve5:slider,1,1,90 manualDurationValve6:slider,1,1,90 cancelOverrideValve1:noArg cancelOverrideValve2:noArg cancelOverrideValve3:noArg cancelOverrideValve4:noArg cancelOverrideValve5:noArg cancelOverrideValve6:noArg' if ( AttrVal( $name, 'model', 'unknown' ) eq 'ic24' ); - $list .= 'manualOverride:slider,1,1,90 cancelOverride:noArg operatingMode:automatic,scheduled leakageDetection:watering,washing_machine,domestic_water_supply,off turnOnpressure:slider,2,0.2,3.0,1 resetValveErrors:noArg' + $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 .= 'refresh:temperature,humidity' @@ -835,7 +835,7 @@ sub WriteReadings { $decode_json->{settings}[$settings]{value} ); } - # save electroni presse pump settings as readings + # save electronid pressure pump settings as readings if ( $decode_json->{settings}[$settings]{name} eq 'operating_mode' || $decode_json->{settings}[$settings]{name} eq 'leakage_detection' || $decode_json->{settings}[$settings]{name} eq 'turn_on_pressure' ) { diff --git a/controls_GardenaSmartDevice.txt b/controls_GardenaSmartDevice.txt index ca1f813..8496d16 100644 --- a/controls_GardenaSmartDevice.txt +++ b/controls_GardenaSmartDevice.txt @@ -1,2 +1,2 @@ -UPD 2022-05-27_11:41:32 49913 FHEM/73_GardenaSmartBridge.pm -UPD 2022-05-27_20:04:31 66804 FHEM/74_GardenaSmartDevice.pm +UPD 2022-06-25_12:19:02 49913 FHEM/73_GardenaSmartBridge.pm +UPD 2022-06-25_12:51:45 66811 FHEM/74_GardenaSmartDevice.pm -- 2.45.2