Skip to content

Commit

Permalink
v2.8.1 Removed SO timeout in test. Added retrieval of Water logs (BE …
Browse files Browse the repository at this point in the history
…only). Documentation update BE electricity meter.
  • Loading branch information
gruijter committed Nov 28, 2023
1 parent 1ff7f15 commit 3f0fbdd
Show file tree
Hide file tree
Showing 10 changed files with 664 additions and 74 deletions.
50 changes: 2 additions & 48 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,50 +1,4 @@
ssdp.js
crc16*.*
zzz*
.vscode/

# Windows image file caches
Thumbs.db
ehthumbs.db

# Folder config file
Desktop.ini

# Recycle Bin used on file shares
$RECYCLE.BIN/

# Windows Installer files
*.cab
*.msi
*.msm
*.msp

# Windows shortcuts
*.lnk

# =========================
# Operating System Files
# =========================

# OSX
# =========================

.DS_Store
.AppleDouble
.LSOverride

# Thumbnails
._*

# Files that might appear in the root of a volume
.DocumentRevisions-V100
.fseventsd
.Spotlight-V100
.TemporaryItems
.Trashes
.VolumeIcon.icns

# Directories potentially created on remote AFP share
.AppleDB
.AppleDesktop
Network Trash Folder
Temporary Items
.apdisk
4 changes: 2 additions & 2 deletions .npmignore
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
docs/
.vscode/
ssdp.js
crc16*.*
zzz*

9 changes: 6 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,15 @@
* device information, including firmware version
* live energy readings of analogue and digital meters
* live energy and gas readings of P1 smart meters (LS120 only)
* live water readings of P1 smart meters (LS120 with Belgium meters only)
* live readings of the S0 input (LS120 only)
* live readings of the optical sensor
* live P1 tariff, power, voltage, current readings per phase (LS120 only)
* raw P1 data (Experimental and unstable!)
* historic logs of power
* historic log of gas (LS120 only)
* historic log of S0 (LS120 only)
* historic logs of gas (LS120 only)
* historic logs of S0 (LS120 only)
* historic logs of water (LS120 only)


#### set:
Expand All @@ -21,6 +23,7 @@
* power counter value
* S0 pulses per KwH value (LS120 only)
* S0 counter value (LS120 only)
* S0 counter timeout (LS120 only)
* optical sensor luminance


Expand All @@ -32,7 +35,7 @@


### Note:
This package has been developed and tested with the Enelogic (-EL) firmware and PVOutput (-PO) firmware ^1.4.4.
This package has been developed and tested with the Enelogic (-EL) firmware and PVOutput (-PO) firmware ^1.6.0.
Other firmware versions (-EO, and -PO below 1.4.4) might not be fully supported, especially for the function getAdvancedStatus().

### Install:
Expand Down
1 change: 1 addition & 0 deletions changelog.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
2.8.1 - 28-11-2023 Removed SO timeout in test. Added retrieval of Water logs (BE only). Documentation update BE electricity meter.
2.8.0 - 27-11-2023 Added S0 timeout setting (LS120 fw ^1.6.0). Documentation update BE water meter. (LS120 fw ^1.6.0)
2.7.1 - 31-05-2023 Fix for P1 data LS120 fw ^1.6.0
2.7.0 - 23-06-2022 Added P1Status method (3 phase P1 information, only for LS120 fw ^1.5.0)
Expand Down
214 changes: 212 additions & 2 deletions docs/Youless.html
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@

<nav>

<h2><a href="index.html">Home</a></h2><h3>Classes</h3><ul><li><a href="Youless.html">Youless</a><ul class='methods'><li data-type='method'><a href="Youless.html#discover">discover</a></li><li data-type='method'><a href="Youless.html#getAdvancedStatus">getAdvancedStatus</a></li><li data-type='method'><a href="Youless.html#getBasicStatus">getBasicStatus</a></li><li data-type='method'><a href="Youless.html#getGaslog">getGaslog</a></li><li data-type='method'><a href="Youless.html#getInfo">getInfo</a></li><li data-type='method'><a href="Youless.html#getP1Status">getP1Status</a></li><li data-type='method'><a href="Youless.html#getPowerlog">getPowerlog</a></li><li data-type='method'><a href="Youless.html#getRawP1Status">getRawP1Status</a></li><li data-type='method'><a href="Youless.html#getS0log">getS0log</a></li><li data-type='method'><a href="Youless.html#login">login</a></li><li data-type='method'><a href="Youless.html#reboot">reboot</a></li><li data-type='method'><a href="Youless.html#setLuminace">setLuminace</a></li><li data-type='method'><a href="Youless.html#setMeterType">setMeterType</a></li><li data-type='method'><a href="Youless.html#setPowerCounter">setPowerCounter</a></li><li data-type='method'><a href="Youless.html#setPowerPulses">setPowerPulses</a></li><li data-type='method'><a href="Youless.html#setS0Counter">setS0Counter</a></li><li data-type='method'><a href="Youless.html#setS0Pulses">setS0Pulses</a></li><li data-type='method'><a href="Youless.html#setS0Timeout">setS0Timeout</a></li><li data-type='method'><a href="Youless.html#syncTime">syncTime</a></li></ul></li></ul><h3><a href="global.html">Global</a></h3>
<h2><a href="index.html">Home</a></h2><h3>Classes</h3><ul><li><a href="Youless.html">Youless</a><ul class='methods'><li data-type='method'><a href="Youless.html#discover">discover</a></li><li data-type='method'><a href="Youless.html#getAdvancedStatus">getAdvancedStatus</a></li><li data-type='method'><a href="Youless.html#getBasicStatus">getBasicStatus</a></li><li data-type='method'><a href="Youless.html#getGaslog">getGaslog</a></li><li data-type='method'><a href="Youless.html#getInfo">getInfo</a></li><li data-type='method'><a href="Youless.html#getP1Status">getP1Status</a></li><li data-type='method'><a href="Youless.html#getPowerlog">getPowerlog</a></li><li data-type='method'><a href="Youless.html#getRawP1Status">getRawP1Status</a></li><li data-type='method'><a href="Youless.html#getS0log">getS0log</a></li><li data-type='method'><a href="Youless.html#getWaterlog">getWaterlog</a></li><li data-type='method'><a href="Youless.html#login">login</a></li><li data-type='method'><a href="Youless.html#reboot">reboot</a></li><li data-type='method'><a href="Youless.html#setLuminace">setLuminace</a></li><li data-type='method'><a href="Youless.html#setMeterType">setMeterType</a></li><li data-type='method'><a href="Youless.html#setPowerCounter">setPowerCounter</a></li><li data-type='method'><a href="Youless.html#setPowerPulses">setPowerPulses</a></li><li data-type='method'><a href="Youless.html#setS0Counter">setS0Counter</a></li><li data-type='method'><a href="Youless.html#setS0Pulses">setS0Pulses</a></li><li data-type='method'><a href="Youless.html#setS0Timeout">setS0Timeout</a></li><li data-type='method'><a href="Youless.html#syncTime">syncTime</a></li></ul></li></ul><h3><a href="global.html">Global</a></h3>
</nav>

<div id="main">
Expand Down Expand Up @@ -1663,6 +1663,216 @@ <h5>Returns:</h5>



<h4 class="name" id="getWaterlog"><span class="type-signature">(async) </span>getWaterlog<span class="signature">(resolution<span class="signature-attributes">opt</span>, period<span class="signature-attributes">opt</span>)</span><span class="type-signature"> &rarr; {Promise.&lt;<a href="global.html#waterLog">waterLog</a>>}</span></h4>






<dl class="details">
































</dl>





<div class="description">
<p>Get historic water usage data. Note: Only available for LS120 and with Belgian meters.</p>
</div>











<h5>Parameters:</h5>


<table class="params">
<thead>
<tr>

<th>Name</th>


<th>Type</th>


<th>Attributes</th>



<th>Default</th>


<th class="last">Description</th>
</tr>
</thead>

<tbody>


<tr>

<td class="name"><code>resolution</code></td>


<td class="type">


<span class="param-type">string</span>



</td>


<td class="attributes">

&lt;optional><br>





</td>



<td class="default">

<code>'Days'</code>

</td>


<td class="description last"><p>The interval of logdata in: T(enminutes), H(ours) or D(ays)</p></td>
</tr>



<tr>

<td class="name"><code>period</code></td>


<td class="type">


<span class="param-type">number</span>



</td>


<td class="attributes">

&lt;optional><br>





</td>



<td class="default">

<code>this month</code>

</td>


<td class="description last"><p>The period that can be selected for historic data depends on the selected resolution:</p>
<ul>
<li>Tenminutes: period 1 (this day) - 30 (30 days ago)</li>
<li>Hours: period 1 (this day) - 70 (70 days ago)</li>
<li>Days: period 1 (January) - 12 (December)</li>
</ul></td>
</tr>


</tbody>
</table>














<h5>Returns:</h5>




<dl class="param-type">
<dt>
Type
</dt>
<dd>

<span class="param-type">Promise.&lt;<a href="global.html#waterLog">waterLog</a>></span>


</dd>
</dl>









<h4 class="name" id="login"><span class="type-signature">(async) </span>login<span class="signature">(options<span class="signature-attributes">opt</span>)</span><span class="type-signature"> &rarr; {Promise.&lt;Youless.loggedIn>}</span></h4>


Expand Down Expand Up @@ -3059,7 +3269,7 @@ <h5>Returns:</h5>
<br class="clear">

<footer>
Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.6.6</a> on Mon Nov 27 2023 19:02:12 GMT+0100 (Midden-Europese standaardtijd) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.6.6</a> on Tue Nov 28 2023 16:37:16 GMT+0100 (Midden-Europese standaardtijd) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
</footer>

<script>prettyPrint();</script>
Expand Down
Loading

0 comments on commit 3f0fbdd

Please sign in to comment.