Skip to content

Support for timed based events #17

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Support for timed based events #17

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 16 additions & 2 deletions power-monitor/power-monitor.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,15 +28,25 @@
</div>
<div class="form-row">
<label for="node-input-startafter"><i class="fa fa-play"></i> Start after</label>
<input type="number" min="1" id="node-input-startafter" placeholder="1">
<input type="number" min="1" id="node-input-startafter" placeholder="1" style="width: 40%;>
<label for="node-input-startperiodtype" margin-left: 10px; width: 50px;> Period</label>
<select id="node-input-startperiodtype" style="width:100px">
<option value="1">Readings</option>
<option value="2">Seconds</option>
</select>
</div>
<div class="form-row">
<label for="node-input-stopthreshold"><i class="fa fa-thumbs-o-up"></i> Stop threshold</label>
<input type="number" id="node-input-stopthreshold" placeholder="0">
</div>
<div class="form-row">
<label for="node-input-stopafter"><i class="fa fa-stop"></i> Stop after</label>
<input type="number" min="1" id="node-input-stopafter" placeholder="1">
<input type="number" min="1" id="node-input-stopafter" placeholder="1" style="width: 40%;>
<label for="node-input-stopperiodtype" margin-left: 10px; width: 50px;> Period</label>
<select id="node-input-stopperiodtype" style="width:100px">
<option value="1">Readings</option>
<option value="2">Seconds</option>
</select>
</div>
<div class="form-row">
<label for="node-input-energydecimals">Round decimals</label>
Expand Down Expand Up @@ -84,6 +94,8 @@
stopthreshold: {value: 0},
startafter: {value: 1},
stopafter: {value: 1},
startperiodtype: {value: 1},
stopperiodtype: {value: 1},
energydecimals: {value: 4},
emitidle: {value: false}
},
Expand All @@ -105,6 +117,8 @@
this.startafter = this.startafter || 1;
this.stopthreshold = this.stopthreshold || 0;
this.stopafter = this.stopafter || 1;
this.startperiodtype = this.startperiodtype || 1;
this.stopperiodtype = this.stopperiodtype || 1;
this.energydecimals = this.energydecimals || 4;
this.emitidle = this.emitidle || false;
}
Expand Down
49 changes: 42 additions & 7 deletions power-monitor/power-monitor.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,8 @@
this.stopafter = Number(config.stopafter || 1);
this.energydecimals = Number(config.energydecimals || 4);
this.emitidle = Boolean(config.emitidle || false);
this.startperiodtype = Number(config.startperiodtype || 1);
this.stopperiodtype = Number(config.stopperiodtype || 1);

// States:
// 0: idle
Expand All @@ -70,7 +72,10 @@
this.latest = 0;

// Holds the starting time (the first reading above threshold for a valid cycle)
this.start = 0;
this.starttime = 0;

// Holds the beginging of the prestop
this.stoptime = 0

// Holds the total energy for this cycle
this.energy = 0;
Expand All @@ -82,6 +87,7 @@

// Get the current power
var event_type = null;
var event_reason = null;
var forceStop = (msg.payload == "stop" || msg.payload == "STOP");
var power = Number(msg.payload || 0);
var now = new Date();
Expand All @@ -103,7 +109,7 @@
// State machine - IDLE
if (0 === node.state) {
if (power > node.startthreshold) {
node.start = time;
node.starttime = time;
node.energy = 0;
node.count = 0;
node.state = 1;
Expand All @@ -113,8 +119,21 @@
// State machine - PRE-START
if (1 === node.state) {
if (power > node.startthreshold) {
node.count = node.count + 1;
if (node.count >= node.startafter) node.state = 2;
if(this.startperiodtype == 2 ){
//time based start
if ((time - node.starttime) >= node.startafter) {
node.state = 2;
event_reason = "startafter " + node.startafter + "s less than " + (time - node.starttime);
}
}
else{
//readings count based start
node.count = node.count + 1;
if (node.count >= node.startafter) {
node.state = 2;
event_reason = "count " + node.count + " greater than " + node.startafter;
}
}
event_type = "pre_start";
} else {
node.state = 0;
Expand All @@ -132,6 +151,7 @@
event_type = "running";
} else {
node.count = 0;
node.stoptime = time;
node.state = 4;
}
}
Expand All @@ -141,8 +161,22 @@
if (power > node.stopthreshold) {
node.state = 3;
} else {
node.count = node.count + 1;
if (node.count >= node.stopafter) node.state = 5;
if(this.stopperiodtype == 2 ){
//readings based stop
if ((time - node.stoptime) >= node.stopafter) {
node.state = 5;
event_reason = "stopafter " + node.stopafter + "s less than " + (time - node.stoptime);
}
}
else{
//message count based stop
node.count = node.count + 1;
if (node.count >= node.stopafter) {
node.state = 5;
event_reason = "count " + node.count + " greater than " + node.stopafter;
}
}
event_type = "pre_stop";
}
}

Expand All @@ -159,7 +193,8 @@
"name": node.name,
"power": power, // Sends power (watts) as received in previous node to next node.
"event": event_type,
"time": Math.round(time - node.start),
"event_reason": event_reason,
"time": Math.round(time - node.starttime),
"energy": kwh(node.energy, node.energydecimals),
"energy_delta": kwh(energy, node.energydecimals),
"forced_stop": forceStop
Expand Down