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

testing #67

Merged
marko merged 33 commits from testing into main 2022-07-01 08:41:17 +00:00
Conversation 0 Commits 33 Files Changed 4 +15 -7
3 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit b7adf6af6d - Show all commits

2
CHANGED
View File

@ -1 +1 @@
operatingmode, leakagedetection and turnonpressure fix - ins blaue gerate more debug

16
FHEM/74_GardenaSmartDevice.pm
View File

@ -488,7 +488,7 @@ sub Set {
$payload = '"name":"operating_mode"' $payload = '"name":"operating_mode"'
.'"value":"'.$op_mode.'"' .'"value":"'.$op_mode.'"'
.'"device":"' .'"device":"'
. $hash->{DEVICEID}; . $hash->{DEVICEID}.'"';
$abilities = 'watering_pressure_pump_settings'; $abilities = 'watering_pressure_pump_settings';
$service_id = $hash->{helper}->{ 'operating_mode_id' }; $service_id = $hash->{helper}->{ 'operating_mode_id' };
} }
@ -497,7 +497,7 @@ sub Set {
$payload = '"name":"leakage_detection"' $payload = '"name":"leakage_detection"'
.'"value":"'.$leakdetection_mode.'"' .'"value":"'.$leakdetection_mode.'"'
.'"device":"' .'"device":"'
. $hash->{DEVICEID}; . $hash->{DEVICEID}.'"';
$abilities = 'watering_pressure_pump_settings'; $abilities = 'watering_pressure_pump_settings';
$service_id = $hash->{helper}->{ 'leakage_detection_id' }; $service_id = $hash->{helper}->{ 'leakage_detection_id' };
} }
@ -506,7 +506,7 @@ sub Set {
$payload = '"name":"turn_on_pressure"' $payload = '"name":"turn_on_pressure"'
.'"value":"'.$turnonpressure.'"' .'"value":"'.$turnonpressure.'"'
.'"device":"' .'"device":"'
. $hash->{DEVICEID}; . $hash->{DEVICEID}.'"';
$abilities = 'watering_pressure_pump_settings'; $abilities = 'watering_pressure_pump_settings';
$service_id = $hash->{helper}->{ 'turn_on_pressure_id' }; $service_id = $hash->{helper}->{ 'turn_on_pressure_id' };
} }
@ -562,7 +562,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' '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' ); 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,2.8,1' $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'
if ( AttrVal( $name, 'model', 'unknown' ) eq 'electronic_pressure_pump' ); if ( AttrVal( $name, 'model', 'unknown' ) eq 'electronic_pressure_pump' );
$list .= 'refresh:temperature,humidity' $list .= 'refresh:temperature,humidity'
@ -817,6 +817,14 @@ sub WriteReadings {
$decode_json->{settings}[$settings]{value} ); $decode_json->{settings}[$settings]{value} );
} }
# save electroni presse 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' ) {
readingsBulkUpdateIfChanged( $hash, $decode_json->{settings}[$settings]{name},
$decode_json->{settings}[$settings]{value} );
}
# save winter mode as reading # save winter mode as reading
if ( $decode_json->{settings}[$settings]{name} eq 'winter_mode' ) { if ( $decode_json->{settings}[$settings]{name} eq 'winter_mode' ) {

4
controls_GardenaSmartDevice.txt
View File

@ -1,2 +1,2 @@
UPD 2022-05-06_18:56:40 49518 FHEM/73_GardenaSmartBridge.pm UPD 2022-05-07_12:43:24 49518 FHEM/73_GardenaSmartBridge.pm
UPD 2022-05-06_18:53:25 63165 FHEM/74_GardenaSmartDevice.pm UPD 2022-05-07_12:57:29 63667 FHEM/74_GardenaSmartDevice.pm