mirror of
https://github.com/fhem/fhem-mirror.git
synced 2025-05-04 22:19:38 +00:00
74_AutomowerConnect: Cref improved, automowerconnect.js fix third party file loading, change tp repository, add file size to log entry.
git-svn-id: https://svn.fhem.de/fhem/trunk@29881 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
parent
a5fbfbfb24
commit
9372456abd
@ -1,5 +1,8 @@
|
|||||||
# Add changes at the top of the list. Keep it in ASCII, and 80-char wide.
|
# 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
|
# Do not insert empty lines here, update check depends on it
|
||||||
|
- change: 74_AutomowerConnect: Cref improved, automowerconnect.js fix third
|
||||||
|
party file loading, change tp repository, add file size to log
|
||||||
|
entry
|
||||||
- bugfix: 76_SMAInverter.pm: fix SBS LG bog
|
- bugfix: 76_SMAInverter.pm: fix SBS LG bog
|
||||||
- feature: 50_MOBILEALERTSGW: Added Internal lastGateway
|
- feature: 50_MOBILEALERTSGW: Added Internal lastGateway
|
||||||
- feature: 76_SolarForecast: Major release 1.51.0
|
- feature: 76_SolarForecast: Major release 1.51.0
|
||||||
|
@ -284,13 +284,13 @@ __END__
|
|||||||
|
|
||||||
<li><a id='AutomowerConnect-get-MowerData'>MowerData</a><br>
|
<li><a id='AutomowerConnect-get-MowerData'>MowerData</a><br>
|
||||||
<code>get <name> MowerData</code><br>
|
<code>get <name> MowerData</code><br>
|
||||||
Lists all mower data with its hash path exept positon array. The hash path can be used for generating userReadings. The trigger is e.g. <i>device_state: connected</i> or <i>mower_wsEvent: <status-event|positions-event|settings-event></i>.<br>
|
Lists all mower data with its hash path exept positon array. The hash path can be used for generating <a href="#userReadings">userReadings</a>. The trigger is e.g. <i>device_state:\sconnected</i> or <i>mower_wsEvent:\s<event name></i>.<br>
|
||||||
Example: created reading <code>serialnumber</code> with hash path <code>$hash->{helper}{mower}{attributes}{system}{serialNumber}</code><br><br>
|
Example: created reading <code>serialnumber</code> with hash path <code>$hash->{helper}{mower}{attributes}{system}{serialNumber}</code><br><br>
|
||||||
<code>attr <name> userReadings serialnumber:connected {$defs{$name}->{helper}{mower}{attributes}{system}{serialNumber}}</code></li>
|
<code>attr <name> userReadings serialnumber:device_state:\sconnected {$defs{$name}->{helper}{mower}{attributes}{system}{serialNumber}}</code></li>
|
||||||
|
|
||||||
<li><a id='AutomowerConnect-get-StatisticsData'>StatisticsData</a><br>
|
<li><a id='AutomowerConnect-get-StatisticsData'>StatisticsData</a><br>
|
||||||
<code>get <name> StatisticsData</code><br>
|
<code>get <name> StatisticsData</code><br>
|
||||||
Lists statistics data with its hash path. The hash path can be used for generating userReadings. The trigger is e.g. <i>device_state: connected</i> or <i>mower_wsEvent: <status-event|positions-event|settings-event></i>.</li>
|
Lists statistics data with its hash path. The hash path can be used for generating <a href="#userReadings">userReadings</a>. The trigger is e.g. <i>device_state:\sconnected</i> or <i>mower_wsEvent:\s<status-event|positions-event|settings-event></i>, see .</li>
|
||||||
|
|
||||||
<li><a id='AutomowerConnect-get-errorCodes'>errorCodes</a><br>
|
<li><a id='AutomowerConnect-get-errorCodes'>errorCodes</a><br>
|
||||||
<code>get <name> errorCodes</code><br>
|
<code>get <name> errorCodes</code><br>
|
||||||
@ -816,13 +816,13 @@ __END__
|
|||||||
|
|
||||||
<li><a id='AutomowerConnect-get-MowerData'>MowerData</a><br>
|
<li><a id='AutomowerConnect-get-MowerData'>MowerData</a><br>
|
||||||
<code>get <name> MowerData</code><br>
|
<code>get <name> MowerData</code><br>
|
||||||
Listet alle Daten des Mähers einschließlich Hashpfad auf, ausgenommen das Positonsarray. Der Hashpfad kann zur Erzeugung von userReadings genutzt werden, getriggert wird durch e.g. <i>device_state: connected</i> oder <i>mower_wsEvent: <status-event|positions-event|settings-event></i>.<br>
|
Listet alle Daten des Mähers einschließlich Hashpfad auf, ausgenommen das Positonsarray. Der Hashpfad kann zur Erzeugung von <a href="#userReadings">userReadings</a> genutzt werden, getriggert wird durch z.B. <i>device_state:\sconnected</i> oder <i>mower_wsEvent:\s<event name></i>.<br>
|
||||||
Beispiel: erzeugen des Reading <code>serialnumber</code> mit dem Hashpfad <code>$hash->{helper}{mower}{attributes}{system}{serialNumber}</code><br><br>
|
Beispiel: erzeugen des Reading <code>serialnumber</code> mit dem Hashpfad <code>$hash->{helper}{mower}{attributes}{system}{serialNumber}</code><br><br>
|
||||||
<code>attr <name> userReadings serialnumber:connected {$defs{$name}->{helper}{mower}{attributes}{system}{serialNumber}}</code></li>
|
<code>attr <name> userReadings serialnumber:device_state:\sconnected {$defs{$name}->{helper}{mower}{attributes}{system}{serialNumber}}</code></li>
|
||||||
|
|
||||||
<li><a id='AutomowerConnect-get-StatisticsData'>StatisticsData</a><br>
|
<li><a id='AutomowerConnect-get-StatisticsData'>StatisticsData</a><br>
|
||||||
<code>get <name> StatisticsData</code><br>
|
<code>get <name> StatisticsData</code><br>
|
||||||
Listet statistische Daten mit ihrem Hashpfad auf. Der Hashpfad kann zur Erzeugung von userReadings genutzt werden, getriggert wird z.B. durch <i>device_state: connected</i> oder <i>mower_wsEvent: <status-event|positions-event|settings-event></i></li>
|
Listet statistische Daten mit ihrem Hashpfad auf. Der Hashpfad kann zur Erzeugung von <a href="#userReadings">userReadings</a> genutzt werden, getriggert wird z.B. durch <i>device_state:\sconnected</i> oder <i>mower_wsEvent:\s<event name></i></li>
|
||||||
|
|
||||||
<li><a id='AutomowerConnect-get-errorStack'>errorStack</a><br>
|
<li><a id='AutomowerConnect-get-errorStack'>errorStack</a><br>
|
||||||
<code>get <name> errorStack</code><br>
|
<code>get <name> errorStack</code><br>
|
||||||
|
@ -3053,7 +3053,8 @@ sub listInternalData { ## no critic (ProhibitExcessComplexity [complexity core m
|
|||||||
$ret .= '<p><table class="block wide">';
|
$ret .= '<p><table class="block wide">';
|
||||||
$ret .= '<caption><b>Third Party Software</b></caption><tbody>';
|
$ret .= '<caption><b>Third Party Software</b></caption><tbody>';
|
||||||
|
|
||||||
$ret .= '<tr class="column ' . ( $cnt++ % 2 ? "odd" : "even" ) . '"><td>hull calculation (hull.js)</td><td style="word-wrap:break-word; max-width:40em"> Server: ' . $hash->{helper}{FWEXTA}{url} . '</td></tr>';
|
$ret .= '<tr class="column ' . ( $cnt++ % 2 ? "odd" : "even" ) . '"><td>hull calculation (hull.js)</td><td style="word-wrap:break-word; max-width:40em"> Server: ' . $hash->{helper}{FWEXTA}{url}
|
||||||
|
. ', filesize: ' . ( -s $FW_dir . '/' . $hash->{helper}{FWEXTA}{path} . '/' . $hash->{helper}{FWEXTA}{file} ) . ' kB, check content if not about 12kB.</td></tr>';
|
||||||
|
|
||||||
$ret .= '</tbody></table>';
|
$ret .= '</tbody></table>';
|
||||||
|
|
||||||
@ -3166,8 +3167,9 @@ sub getTpFile {
|
|||||||
|
|
||||||
print $fh $msg;
|
print $fh $msg;
|
||||||
close( $fh );
|
close( $fh );
|
||||||
readingsSingleUpdate( $hash, 'third_party_library', "$file downloaded to: $path", 1 );
|
my $fsz = -s "$path/$file";
|
||||||
Log3 $name, 1, "$name getTpFile: third party library downloaded from $url to $path";
|
readingsSingleUpdate( $hash, 'third_party_library', "${file}, (${fsz} Byte) downloaded to: $path", 1 );
|
||||||
|
Log3 $name, 1, "$name getTpFile: third party library downloaded from $url to $path/$file, filesize: $fsz. Check content if not about 12 kB.";
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
@ -826,19 +826,27 @@ function AutomowerConnectUpdateDetail (dev, type, detailfnfirst, picx, picy, sca
|
|||||||
|
|
||||||
loadScript('automowerconnect/hull.js', ()=> {
|
loadScript('automowerconnect/hull.js', ()=> {
|
||||||
|
|
||||||
const pts = [];
|
if ( typeof hull === "function" ) {
|
||||||
|
|
||||||
for ( let i = 0; i < pos.length; i+=3 ){
|
const pts = [];
|
||||||
|
|
||||||
if ( pos[i+2] == "M") pts.push( [ pos[i], pos[i+1] ] );
|
for ( let i = 0; i < pos.length; i+=3 ){
|
||||||
|
|
||||||
}
|
if ( pos[i+2] == "M") pts.push( [ pos[i], pos[i+1] ] );
|
||||||
|
|
||||||
if ( pts.length > 50 ) {
|
}
|
||||||
|
|
||||||
const res = div.getAttribute( 'data-hullResolution' );
|
if ( pts.length > 50 ) {
|
||||||
const hullpts = hull( pts, res );
|
|
||||||
AutomowerConnectHull( ctx0, div, hullpts, 'hull' );
|
const res = div.getAttribute( 'data-hullResolution' );
|
||||||
|
const hullpts = hull( pts, res );
|
||||||
|
AutomowerConnectHull( ctx0, div, hullpts, 'hull' );
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
} else {
|
||||||
|
|
||||||
|
log( 'AutomowerConnectUpdateDetail: Loading automowerconnect/hull.js failed, no function named hull, check content of hull.js' );
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user