dev #66

Merged
marko merged 31 commits from dev into testing 2022-07-01 08:29:53 +00:00
3 changed files with 16 additions and 5 deletions
Showing only changes of commit 43bf81053b - Show all commits

View File

@ -1 +1 @@
erste teste
add setter

View File

@ -195,6 +195,11 @@ sub Define {
$hash->{helper}{eco_mode_id} = '';
$hash->{helper}{button_config_time_id} = '';
$hash->{helper}{winter_mode_id} = '';
# Electroni Pressure Pump
$hash->{helper}{operating_mode_id} = '';
$hash->{helper}{leakage_detection_id} = '';
$hash->{helper}{turn_on_pressure_id} = '';
$hash->{helper}{_id} = '';
@ -485,6 +490,7 @@ sub Set {
.'"device":"'
. $hash->{DEVICEID};
$abilities = 'watering_pressure_pump_settings';
$service_id = $hash->{helper}->{ 'operating_mode_id' };
}
elsif ( lc $cmd eq 'leakagedetection') {
my $leakdetection_mode = $aArg->[0];
@ -493,6 +499,7 @@ sub Set {
.'"device":"'
. $hash->{DEVICEID};
$abilities = 'watering_pressure_pump_settings';
$service_id = $hash->{helper}->{ 'leakage_detection_id' };
}
elsif ( lc $cmd eq 'turnonpressure') {
my $turnonpressure = $aArg->[0];
@ -501,6 +508,7 @@ sub Set {
.'"device":"'
. $hash->{DEVICEID};
$abilities = 'watering_pressure_pump_settings';
$service_id = $hash->{helper}->{ 'turn_on_pressure_id' };
}
### Sensors
elsif ( lc $cmd eq 'refresh' ) {
@ -554,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'
if ( AttrVal( $name, 'model', 'unknown' ) eq 'ic24' );
$list .= 'manualOverride:slider,1,1,59 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,2.8,1'
if ( AttrVal( $name, 'model', 'unknown' ) eq 'electronic_pressure_pump' );
$list .= 'refresh:temperature,humidity'
@ -789,7 +797,10 @@ sub WriteReadings {
&& ( $decode_json->{settings}[$settings]{name} =~
/schedules_paused_until_?\d?$/
|| $decode_json->{settings}[$settings]{name} eq 'eco_mode'
|| $decode_json->{settings}[$settings]{name} eq 'winter_mode' )
|| $decode_json->{settings}[$settings]{name} eq 'winter_mode'
|| $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' )
)
{
if ( $hash->{helper}

View File

@ -1,2 +1,2 @@
UPD 2022-05-03_21:47:05 49520 FHEM/73_GardenaSmartBridge.pm
UPD 2022-05-03_22:22:51 62533 FHEM/74_GardenaSmartDevice.pm
UPD 2022-05-05_11:51:08 49520 FHEM/73_GardenaSmartBridge.pm
UPD 2022-05-05_12:26:56 63165 FHEM/74_GardenaSmartDevice.pm