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

dev #66

Merged
marko merged 31 commits from dev into testing 2022-07-01 08:29:53 +00:00
Conversation 0 Commits 31 Files Changed 4 +38 -11
3 changed files with 38 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 0beab4ec1d - Show all commits

2
CHANGED
View File

@@ -1 +1 @@
Reviewed-on: https://git.cooltux.net/FHEM/mod-GardenaSmart/pulls/53 initial

43
FHEM/74_GardenaSmartDevice.pm
View File

@@ -165,7 +165,7 @@ sub Initialize {
$hash->{AttrFn} = \&Attr; $hash->{AttrFn} = \&Attr;
$hash->{AttrList} = $hash->{AttrList} =
"readingValueLanguage:de,en " "readingValueLanguage:de,en "
. "model:watering_computer,sensor,sensor2,mower,ic24,power,electronic_pressure_pump " . "model:watering_computer,sensor,sensor2,mower,ic24,power,electronic_pressure_pump"
. "IODev " . "IODev "
. $readingFnAttributes; . $readingFnAttributes;
$hash->{parseParams} = 1; $hash->{parseParams} = 1;
@@ -294,7 +294,7 @@ sub Set {
|| AttrVal( $name, 'model', 'unknown' ) eq 'watering_computer' ); || AttrVal( $name, 'model', 'unknown' ) eq 'watering_computer' );
$abilities = 'power' $abilities = 'power'
if ( AttrVal( $name, 'model', 'unknown' ) eq 'power' ); if ( AttrVal( $name, 'model', 'unknown' ) eq 'power' );
$abilities = 'manual_watering' $abilities = 'watering'
if ( AttrVal( $name, 'model', 'unknown' ) eq 'electronic_pressure_pump' ); if ( AttrVal( $name, 'model', 'unknown' ) eq 'electronic_pressure_pump' );
### mower ### mower
@@ -355,11 +355,11 @@ sub Set {
#$abilities['service_id'] = $hash->{helper}{SCHEDULESID} if ( $mainboard_version > 10.30 ); #$abilities['service_id'] = $hash->{helper}{SCHEDULESID} if ( $mainboard_version > 10.30 );
} }
### electronic_pressure_pump ### electronic_pressure_pump
elsif ( lc $cmd eq 'pumptimer' ) { # elsif ( lc $cmd eq 'pumptimer' ) {
$payload = # $payload =
'"name":"pump_manual_watering_timer","parameters":{"duration":' # '"name":"pump_manual_watering_timer","parameters":{"duration":'
. $aArg->[0] . '}'; # . $aArg->[0] . '}';
} # }
### watering_computer & electronic pump ### watering_computer & electronic pump
elsif ( lc $cmd eq 'manualoverride' ) { elsif ( lc $cmd eq 'manualoverride' ) {
$payload = $payload =
@@ -477,7 +477,32 @@ sub Set {
. '","device":"' . '","device":"'
. $hash->{DEVICEID} . '"}'; . $hash->{DEVICEID} . '"}';
} }
### Sensors ### Watering_pressure_pump
elsif ( lc $cmd eq 'operatingmode') {
my $op_mode = $aArg->[0];
$payload = '"name":"operating_mode"'
.'"value":"'.$op_mode.'"'
.'"device":"'
. $hash->{DEVICEID};
$abilities = 'watering_pressure_pump_settings';
}
elsif ( lc $cmd eq 'leakagedetection') {
my $leakdetection_mode = $aArg->[0];
$payload = '"name":"leakage_detection"'
.'"value":"'.$leakdetection_mode.'"'
.'"device":"'
. $hash->{DEVICEID};
$abilities = 'watering_pressure_pump_settings';
}
elsif ( lc $cmd eq 'turnonpressure') {
my $turnonpressure = $aArg->[0];
$payload = '"name":"turn_on_pressure"'
.'"value":"'.$turnonpressure.'"'
.'"device":"'
. $hash->{DEVICEID};
$abilities = 'watering_pressure_pump_settings';
}
### Sensors
elsif ( lc $cmd eq 'refresh' ) { elsif ( lc $cmd eq 'refresh' ) {
my $sensname = $aArg->[0]; my $sensname = $aArg->[0];
@@ -529,6 +554,8 @@ 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,59 cancelOverride:noArg operatingMode:automatic,scheduled leakageDetection:watering,washing_machine,domestic_water_supply,off turnOnpressure:slider,2,0.2,2.8,1'
$list .= 'refresh:temperature,humidity' $list .= 'refresh:temperature,humidity'
if ( AttrVal( $name, 'model', 'unknown' ) =~ /sensor.?/ ); if ( AttrVal( $name, 'model', 'unknown' ) =~ /sensor.?/ );

4
controls_GardenaSmartDevice.txt
View File

@@ -1,2 +1,2 @@
UPD 2022-05-01_09:58:36 49520 FHEM/73_GardenaSmartBridge.pm UPD 2022-05-03_21:47:05 49520 FHEM/73_GardenaSmartBridge.pm
UPD 2022-05-01_09:58:54 61296 FHEM/74_GardenaSmartDevice.pm UPD 2022-05-03_22:18:24 62448 FHEM/74_GardenaSmartDevice.pm