nkellenicki/node-poweredup
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Correct voltage and current readings

Browse Source
This commit is contained in:
Nathan Kellenicki 2019-04-25 21:48:10 -07:00
parent 7a647da798
commit e959230a22
13 changed files with 81 additions and 76 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
docs/BoostMoveHub.html
View File

@ -404,7 +404,7 @@
<td class="description last"><p>Current usage of the hub (Amps)</p></td>
<td class="description last"><p>Current usage of the hub (Milliamps)</p></td>
</tr>
@ -4755,7 +4755,7 @@
<ul class="dummy">
<li>
<a href="lpf2hub.js.html">lpf2hub.js</a>,
<a href="lpf2hub.js.html#sunlight-1-line-310">line 310</a>
<a href="lpf2hub.js.html#sunlight-1-line-313">line 313</a>
</li>
</ul>
</dd>
@ -4950,7 +4950,7 @@
<ul class="dummy">
<li>
<a href="lpf2hub.js.html">lpf2hub.js</a>,
<a href="lpf2hub.js.html#sunlight-1-line-326">line 326</a>
<a href="lpf2hub.js.html#sunlight-1-line-329">line 329</a>
</li>
</ul>
</dd>
@ -5273,7 +5273,7 @@
<ul class="dummy">
<li>
<a href="lpf2hub.js.html">lpf2hub.js</a>,
<a href="lpf2hub.js.html#sunlight-1-line-300">line 300</a>
<a href="lpf2hub.js.html#sunlight-1-line-303">line 303</a>
</li>
</ul>
</dd>
@ -5444,7 +5444,7 @@
<ul class="dummy">
<li>
<a href="lpf2hub.js.html">lpf2hub.js</a>,
<a href="lpf2hub.js.html#sunlight-1-line-355">line 355</a>
<a href="lpf2hub.js.html#sunlight-1-line-358">line 358</a>
</li>
</ul>
</dd>
@ -5639,7 +5639,7 @@
<ul class="dummy">
<li>
<a href="lpf2hub.js.html">lpf2hub.js</a>,
<a href="lpf2hub.js.html#sunlight-1-line-343">line 343</a>
<a href="lpf2hub.js.html#sunlight-1-line-346">line 346</a>
</li>
</ul>
</dd>

6
docs/DuploTrainBase.html
View File

@ -404,7 +404,7 @@
<td class="description last"><p>Current usage of the hub (Amps)</p></td>
<td class="description last"><p>Current usage of the hub (Milliamps)</p></td>
</tr>
@ -4071,7 +4071,7 @@
<ul class="dummy">
<li>
<a href="lpf2hub.js.html">lpf2hub.js</a>,
<a href="lpf2hub.js.html#sunlight-1-line-310">line 310</a>
<a href="lpf2hub.js.html#sunlight-1-line-313">line 313</a>
</li>
</ul>
</dd>
@ -4242,7 +4242,7 @@
<ul class="dummy">
<li>
<a href="lpf2hub.js.html">lpf2hub.js</a>,
<a href="lpf2hub.js.html#sunlight-1-line-403">line 403</a>
<a href="lpf2hub.js.html#sunlight-1-line-406">line 406</a>
</li>
</ul>
</dd>

2
docs/Hub.html
View File

@ -384,7 +384,7 @@
<td class="description last"><p>Current usage of the hub (Amps)</p></td>
<td class="description last"><p>Current usage of the hub (Milliamps)</p></td>
</tr>

14
docs/LPF2Hub.html
View File

@ -393,7 +393,7 @@
<td class="description last"><p>Current usage of the hub (Amps)</p></td>
<td class="description last"><p>Current usage of the hub (Milliamps)</p></td>
</tr>
@ -3488,7 +3488,7 @@
<ul class="dummy">
<li>
<a href="lpf2hub.js.html">lpf2hub.js</a>,
<a href="lpf2hub.js.html#sunlight-1-line-310">line 310</a>
<a href="lpf2hub.js.html#sunlight-1-line-313">line 313</a>
</li>
</ul>
</dd>
@ -3674,7 +3674,7 @@
<ul class="dummy">
<li>
<a href="lpf2hub.js.html">lpf2hub.js</a>,
<a href="lpf2hub.js.html#sunlight-1-line-326">line 326</a>
<a href="lpf2hub.js.html#sunlight-1-line-329">line 329</a>
</li>
</ul>
</dd>
@ -3983,7 +3983,7 @@
<ul class="dummy">
<li>
<a href="lpf2hub.js.html">lpf2hub.js</a>,
<a href="lpf2hub.js.html#sunlight-1-line-300">line 300</a>
<a href="lpf2hub.js.html#sunlight-1-line-303">line 303</a>
</li>
</ul>
</dd>
@ -4145,7 +4145,7 @@
<ul class="dummy">
<li>
<a href="lpf2hub.js.html">lpf2hub.js</a>,
<a href="lpf2hub.js.html#sunlight-1-line-355">line 355</a>
<a href="lpf2hub.js.html#sunlight-1-line-358">line 358</a>
</li>
</ul>
</dd>
@ -4307,7 +4307,7 @@
<ul class="dummy">
<li>
<a href="lpf2hub.js.html">lpf2hub.js</a>,
<a href="lpf2hub.js.html#sunlight-1-line-403">line 403</a>
<a href="lpf2hub.js.html#sunlight-1-line-406">line 406</a>
</li>
</ul>
</dd>
@ -4493,7 +4493,7 @@
<ul class="dummy">
<li>
<a href="lpf2hub.js.html">lpf2hub.js</a>,
<a href="lpf2hub.js.html#sunlight-1-line-343">line 343</a>
<a href="lpf2hub.js.html#sunlight-1-line-346">line 346</a>
</li>
</ul>
</dd>

10
docs/PUPHub.html
View File

@ -404,7 +404,7 @@
<td class="description last"><p>Current usage of the hub (Amps)</p></td>
<td class="description last"><p>Current usage of the hub (Milliamps)</p></td>
</tr>
@ -4755,7 +4755,7 @@
<ul class="dummy">
<li>
<a href="lpf2hub.js.html">lpf2hub.js</a>,
<a href="lpf2hub.js.html#sunlight-1-line-310">line 310</a>
<a href="lpf2hub.js.html#sunlight-1-line-313">line 313</a>
</li>
</ul>
</dd>
@ -4950,7 +4950,7 @@
<ul class="dummy">
<li>
<a href="lpf2hub.js.html">lpf2hub.js</a>,
<a href="lpf2hub.js.html#sunlight-1-line-326">line 326</a>
<a href="lpf2hub.js.html#sunlight-1-line-329">line 329</a>
</li>
</ul>
</dd>
@ -5273,7 +5273,7 @@
<ul class="dummy">
<li>
<a href="lpf2hub.js.html">lpf2hub.js</a>,
<a href="lpf2hub.js.html#sunlight-1-line-300">line 300</a>
<a href="lpf2hub.js.html#sunlight-1-line-303">line 303</a>
</li>
</ul>
</dd>
@ -5468,7 +5468,7 @@
<ul class="dummy">
<li>
<a href="lpf2hub.js.html">lpf2hub.js</a>,
<a href="lpf2hub.js.html#sunlight-1-line-343">line 343</a>
<a href="lpf2hub.js.html#sunlight-1-line-346">line 346</a>
</li>
</ul>
</dd>

4
docs/PUPRemote.html
View File

@ -404,7 +404,7 @@
<td class="description last"><p>Current usage of the hub (Amps)</p></td>
<td class="description last"><p>Current usage of the hub (Milliamps)</p></td>
</tr>
@ -3463,7 +3463,7 @@
<ul class="dummy">
<li>
<a href="lpf2hub.js.html">lpf2hub.js</a>,
<a href="lpf2hub.js.html#sunlight-1-line-326">line 326</a>
<a href="lpf2hub.js.html#sunlight-1-line-329">line 329</a>
</li>
</ul>
</dd>

2
docs/WeDo2SmartHub.html
View File

@ -397,7 +397,7 @@
<td class="description last"><p>Current usage of the hub (Amps)</p></td>
<td class="description last"><p>Current usage of the hub (Milliamps)</p></td>
</tr>

36
docs/classes.list.html
View File

@ -677,7 +677,7 @@
<ul class="dummy">
<li>
<a href="lpf2hub.js.html">lpf2hub.js</a>,
<a href="lpf2hub.js.html#sunlight-1-line-310">line 310</a>
<a href="lpf2hub.js.html#sunlight-1-line-313">line 313</a>
</li>
</ul>
</dd>
@ -872,7 +872,7 @@
<ul class="dummy">
<li>
<a href="lpf2hub.js.html">lpf2hub.js</a>,
<a href="lpf2hub.js.html#sunlight-1-line-326">line 326</a>
<a href="lpf2hub.js.html#sunlight-1-line-329">line 329</a>
</li>
</ul>
</dd>
@ -1195,7 +1195,7 @@
<ul class="dummy">
<li>
<a href="lpf2hub.js.html">lpf2hub.js</a>,
<a href="lpf2hub.js.html#sunlight-1-line-300">line 300</a>
<a href="lpf2hub.js.html#sunlight-1-line-303">line 303</a>
</li>
</ul>
</dd>
@ -1366,7 +1366,7 @@
<ul class="dummy">
<li>
<a href="lpf2hub.js.html">lpf2hub.js</a>,
<a href="lpf2hub.js.html#sunlight-1-line-355">line 355</a>
<a href="lpf2hub.js.html#sunlight-1-line-358">line 358</a>
</li>
</ul>
</dd>
@ -1561,7 +1561,7 @@
<ul class="dummy">
<li>
<a href="lpf2hub.js.html">lpf2hub.js</a>,
<a href="lpf2hub.js.html#sunlight-1-line-343">line 343</a>
<a href="lpf2hub.js.html#sunlight-1-line-346">line 346</a>
</li>
</ul>
</dd>
@ -1732,7 +1732,7 @@
<ul class="dummy">
<li>
<a href="lpf2hub.js.html">lpf2hub.js</a>,
<a href="lpf2hub.js.html#sunlight-1-line-310">line 310</a>
<a href="lpf2hub.js.html#sunlight-1-line-313">line 313</a>
</li>
</ul>
</dd>
@ -1903,7 +1903,7 @@
<ul class="dummy">
<li>
<a href="lpf2hub.js.html">lpf2hub.js</a>,
<a href="lpf2hub.js.html#sunlight-1-line-403">line 403</a>
<a href="lpf2hub.js.html#sunlight-1-line-406">line 406</a>
</li>
</ul>
</dd>
@ -2698,7 +2698,7 @@
<ul class="dummy">
<li>
<a href="lpf2hub.js.html">lpf2hub.js</a>,
<a href="lpf2hub.js.html#sunlight-1-line-310">line 310</a>
<a href="lpf2hub.js.html#sunlight-1-line-313">line 313</a>
</li>
</ul>
</dd>
@ -2884,7 +2884,7 @@
<ul class="dummy">
<li>
<a href="lpf2hub.js.html">lpf2hub.js</a>,
<a href="lpf2hub.js.html#sunlight-1-line-326">line 326</a>
<a href="lpf2hub.js.html#sunlight-1-line-329">line 329</a>
</li>
</ul>
</dd>
@ -3193,7 +3193,7 @@
<ul class="dummy">
<li>
<a href="lpf2hub.js.html">lpf2hub.js</a>,
<a href="lpf2hub.js.html#sunlight-1-line-300">line 300</a>
<a href="lpf2hub.js.html#sunlight-1-line-303">line 303</a>
</li>
</ul>
</dd>
@ -3355,7 +3355,7 @@
<ul class="dummy">
<li>
<a href="lpf2hub.js.html">lpf2hub.js</a>,
<a href="lpf2hub.js.html#sunlight-1-line-355">line 355</a>
<a href="lpf2hub.js.html#sunlight-1-line-358">line 358</a>
</li>
</ul>
</dd>
@ -3517,7 +3517,7 @@
<ul class="dummy">
<li>
<a href="lpf2hub.js.html">lpf2hub.js</a>,
<a href="lpf2hub.js.html#sunlight-1-line-403">line 403</a>
<a href="lpf2hub.js.html#sunlight-1-line-406">line 406</a>
</li>
</ul>
</dd>
@ -3703,7 +3703,7 @@
<ul class="dummy">
<li>
<a href="lpf2hub.js.html">lpf2hub.js</a>,
<a href="lpf2hub.js.html#sunlight-1-line-343">line 343</a>
<a href="lpf2hub.js.html#sunlight-1-line-346">line 346</a>
</li>
</ul>
</dd>
@ -4371,7 +4371,7 @@
<ul class="dummy">
<li>
<a href="lpf2hub.js.html">lpf2hub.js</a>,
<a href="lpf2hub.js.html#sunlight-1-line-310">line 310</a>
<a href="lpf2hub.js.html#sunlight-1-line-313">line 313</a>
</li>
</ul>
</dd>
@ -4566,7 +4566,7 @@
<ul class="dummy">
<li>
<a href="lpf2hub.js.html">lpf2hub.js</a>,
<a href="lpf2hub.js.html#sunlight-1-line-326">line 326</a>
<a href="lpf2hub.js.html#sunlight-1-line-329">line 329</a>
</li>
</ul>
</dd>
@ -4889,7 +4889,7 @@
<ul class="dummy">
<li>
<a href="lpf2hub.js.html">lpf2hub.js</a>,
<a href="lpf2hub.js.html#sunlight-1-line-300">line 300</a>
<a href="lpf2hub.js.html#sunlight-1-line-303">line 303</a>
</li>
</ul>
</dd>
@ -5084,7 +5084,7 @@
<ul class="dummy">
<li>
<a href="lpf2hub.js.html">lpf2hub.js</a>,
<a href="lpf2hub.js.html#sunlight-1-line-343">line 343</a>
<a href="lpf2hub.js.html#sunlight-1-line-346">line 346</a>
</li>
</ul>
</dd>
@ -5450,7 +5450,7 @@
<ul class="dummy">
<li>
<a href="lpf2hub.js.html">lpf2hub.js</a>,
<a href="lpf2hub.js.html#sunlight-1-line-326">line 326</a>
<a href="lpf2hub.js.html#sunlight-1-line-329">line 329</a>
</li>
</ul>
</dd>

2
docs/hub.js.html
View File

@ -167,7 +167,7 @@ class Hub extends events_1.EventEmitter {
}
/**
* @readonly
* @property {number} current Current usage of the hub (Amps)
* @property {number} current Current usage of the hub (Milliamps)
*/
get current() {
return this._current;

35
docs/lpf2hub.js.html
View File

@ -350,26 +350,29 @@ class LPF2Hub extends hub_1.Hub {
_parseSensorMessage(data) {
if ((data[3] === 0x3b &amp;&amp; this.type === Consts.HubType.POWERED_UP_REMOTE)) { // Voltage (PUP Remote)
data = this._padMessage(data, 6);
const voltage = data.readUInt16LE(4) / 500;
this._voltage = voltage;
const voltage = data.readUInt16LE(4);
this._voltage = 6400.0 * voltage / 3200.0 / 1000.0;
return;
}
else if (data[3] === 0x3c &amp;&amp; this.type === Consts.HubType.POWERED_UP_REMOTE) { // Current (PUP Remote)
else if ((data[3] === 0x3c &amp;&amp; this.type === Consts.HubType.POWERED_UP_HUB)) { // Voltage (PUP Hub)
data = this._padMessage(data, 6);
const voltage = data.readUInt16LE(4);
this._voltage = 9620.0 * voltage / 3893.0 / 1000.0;
return;
}
else if (data[3] === 0x3c) { // Voltage (Others)
data = this._padMessage(data, 6);
const voltage = data.readUInt16LE(4);
this._voltage = 9600.0 * voltage / 3893.0 / 1000.0;
return;
}
else if (data[3] === 0x3c &amp;&amp; this.type === Consts.HubType.POWERED_UP_REMOTE) { // RSSI (PUP Remote)
return;
}
else if (data[3] === 0x3b) { // Current (Others)
data = this._padMessage(data, 6);
const current = data.readUInt16LE(4);
this._current = current;
return;
}
else if (data[3] === 0x3c &amp;&amp; this.type !== Consts.HubType.POWERED_UP_REMOTE) { // Voltage (Non-PUP Remote)
data = this._padMessage(data, 6);
const voltage = data.readUInt16LE(4) / 400;
this._voltage = voltage;
return;
}
else if (data[3] === 0x3b &amp;&amp; this.type !== Consts.HubType.POWERED_UP_REMOTE) { // Current (Non-PUP Remote)
data = this._padMessage(data, 6);
const current = data.readUInt16LE(4) / 1000;
this._current = current;
this._current = 2444 * current / 4095.0;
return;
}
const port = this._getPortForPortNumber(data[3]);

2
docs/quicksearch.html
View File

File diff suppressed because one or more lines are too long

2
src/hub.ts
View File

@ -101,7 +101,7 @@ export class Hub extends EventEmitter {
/**
* @readonly
* @property {number} current Current usage of the hub (Amps)
* @property {number} current Current usage of the hub (Milliamps)
*/
public get current () {
return this._current;

30
src/lpf2hub.ts
View File

@ -307,23 +307,25 @@ export class LPF2Hub extends Hub {
if ((data[3] === 0x3b && this.type === Consts.HubType.POWERED_UP_REMOTE)) { // Voltage (PUP Remote)
data = this._padMessage(data, 6);
const voltage = data.readUInt16LE(4) / 500;
this._voltage = voltage;
const voltage = data.readUInt16LE(4);
this._voltage = 6400.0 * voltage / 3200.0 / 1000.0;
return;
} else if (data[3] === 0x3c && this.type === Consts.HubType.POWERED_UP_REMOTE) { // Current (PUP Remote)
} else if ((data[3] === 0x3c && this.type === Consts.HubType.POWERED_UP_HUB)) { // Voltage (PUP Hub)
data = this._padMessage(data, 6);
const voltage = data.readUInt16LE(4);
this._voltage = 9620.0 * voltage / 3893.0 / 1000.0;
return;
} else if (data[3] === 0x3c) { // Voltage (Others)
data = this._padMessage(data, 6);
const voltage = data.readUInt16LE(4);
this._voltage = 9600.0 * voltage / 3893.0 / 1000.0;
return;
} else if (data[3] === 0x3c && this.type === Consts.HubType.POWERED_UP_REMOTE) { // RSSI (PUP Remote)
return;
} else if (data[3] === 0x3b) { // Current (Others)
data = this._padMessage(data, 6);
const current = data.readUInt16LE(4);
this._current = current;
return;
} else if (data[3] === 0x3c && this.type !== Consts.HubType.POWERED_UP_REMOTE) { // Voltage (Non-PUP Remote)
data = this._padMessage(data, 6);
const voltage = data.readUInt16LE(4) / 400;
this._voltage = voltage;
return;
} else if (data[3] === 0x3b && this.type !== Consts.HubType.POWERED_UP_REMOTE) { // Current (Non-PUP Remote)
data = this._padMessage(data, 6);
const current = data.readUInt16LE(4) / 1000;
this._current = current;
this._current = 2444 * current / 4095.0;
return;
}