FHEM/fhem-mirror
2
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-02-25 09:55:38 +00:00
Code Issues Releases Wiki Activity

AutomowerConnect: New setter 'confirmError' for Testing

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@28406 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
Ellert 2024-01-23 10:47:27 +00:00
parent c0ca0650bf
commit c342be2bbf
3 changed files with 23 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
fhem/CHANGED
View File

@ -1,5 +1,6 @@
# Add changes at the top of the list. Keep it in ASCII, and 80-char wide.
# Do not insert empty lines here, update check depends on it.
- feature: 74_AutomowerConnect: New setter confirmError for Testing
- bugfix: 72_FRITZBOX: fehlen von Data::Dumper in einer debuf sub
behoben.
FehlerLog bei Erstanmeldung an Fritz!... behoben.

14
fhem/FHEM/74_AutomowerConnect.pm
View File

@ -167,10 +167,14 @@ __END__
<code>set &lt;name&gt; Start &lt;number of minutes&gt;</code><br>
Starts immediately for &lt;number of minutes&gt;</li>
<li><a id='AutomowerConnect-set-confirmError'>confirmError</a><br>
<code>set &lt;name&gt; confirmError</code><br>
Testing: Confirm current error on the mower. Will only work if current error is considered confirmable by the mower. Available for models 405X, 415X, 435X AWD and 535 AWD. Also available on all Ceora, EPOS and NERA models.</li>
<li><a id='AutomowerConnect-set-StartInWorkArea'>StartInWorkArea</a><br>
<code>set &lt;name&gt; StartInWorkArea &lt;workAreaId|name&gt; [&lt;number of minutes&gt;]</code><br>
Testing: Starts immediately in &lt;workAreaId|name&gt; for &lt;number of minutes&gt;<br>
Zone name must not include space.</li>
Work area name must not include space.</li>
<li><a id='AutomowerConnect-set-chargingStationPositionToAttribute'>chargingStationPositionToAttribute</a><br>
<code>set &lt;name&gt; chargingStationPositionToAttribute</code><br>
@ -345,6 +349,7 @@ __END__
<li><a id='AutomowerConnect-attr-mapZones'>mapZones</a><br>
<code>attr &lt;name&gt; mapZones &lt;valid perl condition to separate Zones&gt;</code><br>
These Zones are provided by the Modul and are not related to Husqvarnas work areas.<br>
Provide the zones with conditions as JSON-String:<br>
The waypoints are accessable by the variables $longitude und $latitude.<br>
Zones have have to be separated by conditions in alphabetical order of their names.<br>
@ -546,7 +551,7 @@ __END__
<li><a id='AutomowerConnect-set-StartInWorkArea'>StartInWorkArea</a><br>
<code>set &lt;name&gt; StartInWorkArea &lt;workAreaId|zone name&gt; [&lt;number of minutes&gt;]</code><br>
Testing: Startet sofort in &lt;workAreaId|name&gt; für &lt;number of minutes&gt;<br>
Der Name der Zone darf keine Leerzeichen beinhalten und muss mindestens einen Buchstaben enthalten.</li>
Der Name der WorkArea darf keine Leerzeichen beinhalten und muss mindestens einen Buchstaben enthalten.</li>
<li><a id='AutomowerConnect-set-chargingStationPositionToAttribute'>chargingStationPositionToAttribute</a><br>
<code>set &lt;name&gt; chargingStationPositionToAttribute</code><br>
@ -568,6 +573,10 @@ __END__
<code>set &lt;name&gt; stayOutZone_disable &lt;Id|zone name&gt;</code><br>
Testing: Disabled stayOutZone für die Id oder den Namen der Zone, er darf keine Leerzeichen beinhalten und muss mindestens einen Buchstaben enthalten.</li>
<li><a id='AutomowerConnect-set-confirmError'>confirmError</a><br>
<code>set &lt;name&gt; confirmError</code><br>
Testing: Bestätigt den letzten Fehler im Mäher, wenn der Mäher es zulässt. Verfügbar für 405X, 415X, 435X AWD and 535 AWD und alle Ceora, EPOS and NERA.</li>
<li><a id='AutomowerConnect-set-getNewAccessToken'>getNewAccessToken</a><br>
<code>set &lt;name&gt; getNewAccessToken</code><br>
Nur zur Fehlerbehebung.</li>
@ -724,6 +733,7 @@ __END__
<li><a id='AutomowerConnect-attr-mapZones'>mapZones</a><br>
<code>attr &lt;name&gt; mapZones &lt;JSON string with zone names in alpabetical order and valid perl condition to seperate the zones&gt;</code><br>
Die Zonen werden vom Modul bereit gestellt, sie stehen in keinem Zusammenhang mit Husquvarnas Work Areas<br>
Die Wegpunkte stehen über die Perlvariablen $longitude und $latitude zur Verfügung.<br>
Die Zonennamen und Bedingungen müssen als JSON-String angegeben werden.<br>
Die Zonennamen müssen in alphabetischer Reihenfolge durch Bedingungen abgegrenzt werden.<br>

9
fhem/lib/FHEM/Devices/AMConnect/Common.pm
View File

@ -1097,6 +1097,7 @@ my $header = "Accept: application/vnd.api+json\r\nX-Api-Key: ".$client_id."\r\nA
elsif ($cmd[0] eq "cuttingHeight") { $json = '{"data": {"type":"settings","attributes":{"'.$cmd[0].'": '.$cmd[1].'}}}'; $post = 'settings' }
elsif ($cmd[0] eq "stayOutZone_enable") { $json = '{"data": {"type":"stayOutZone","id":"'.$cmd[1].'","attributes":{"enable": true}}}'; $post = 'stayOutZones/' . $cmd[1]; $method = 'PATCH' }
elsif ($cmd[0] eq "stayOutZone_disable") { $json = '{"data": {"type":"stayOutZone","id":"'.$cmd[1].'","attributes":{"enable": false}}}'; $post = 'stayOutZones/' . $cmd[1]; $method = 'PATCH' }
elsif ($cmd[0] eq "confirmError") { $json = '{}'; $post = 'errors/confirm' }
elsif ($cmd[0] eq "sendScheduleFromAttributeToMower" && AttrVal( $name, 'mowerSchedule', '')) {
my $perl = eval { decode_json (AttrVal( $name, 'mowerSchedule', '')) };
@ -1282,7 +1283,12 @@ sub Set {
APIAuth($hash);
return undef;
} elsif (ReadingsVal( $name, 'device_state', 'defined' ) !~ /defined|initialized|authentification|authenticated|update/ && $setName =~ /ParkUntilFurtherNotice|ParkUntilNextSchedule|Pause|ResumeSchedule|sendScheduleFromAttributeToMower/) {
} elsif ( ReadingsVal( $name, 'device_state', 'defined' ) !~ /defined|initialized|authentification|authenticated|update/ && $setName =~ /ParkUntilFurtherNotice|ParkUntilNextSchedule|Pause|ResumeSchedule|sendScheduleFromAttributeToMower/ ) {
CMD($hash,$setName);
return undef;
} elsif ( ReadingsVal( $name, 'device_state', 'defined' ) !~ /defined|initialized|authentification|authenticated|update/ && $setName =~ /confirmError/ && AttrVal( $name, 'testing', '' ) ) {
CMD($hash,$setName);
return undef;
@ -1320,6 +1326,7 @@ sub Set {
$ret .= "chargingStationPositionToAttribute:noArg headlight:ALWAYS_OFF,ALWAYS_ON,EVENING_ONLY,EVENING_AND_NIGHT cuttingHeight:1,2,3,4,5,6,7,8,9 mowerScheduleToAttribute:noArg ";
$ret .= "sendScheduleFromAttributeToMower:noArg defaultDesignAttributesToAttribute:noArg mapZonesTemplateToAttribute:noArg ";
$ret .= "StartInWorkArea " if ( $hash->{helper}{mower}{attributes}{capabilities}{workAreas} && AttrVal( $name, 'testing', '' ) );
$ret .= "confirmError:noArg " if ( AttrVal( $name, 'testing', '' ) );
$ret .= "stayOutZone_enable stayOutZone_disable " if ( $hash->{helper}{mower}{attributes}{capabilities}{stayOutZones} && AttrVal( $name, 'testing', '' ) );
return "Unknown argument $setName, choose one of".$ret;