Skip to content

Instantaneous power cost #155

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 4 commits into
base: master
Choose a base branch
from
Open

Instantaneous power cost #155

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e3316b9
Remove commented-out code.
bwduncan Feb 22, 2021
0793660
Instantaneous cost display
bwduncan Feb 22, 2021
b2e2244
Remove more unused code.
bwduncan Feb 26, 2021
9adf208
Move getdataremote calls out of updater
bwduncan Feb 26, 2021
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
95 changes: 38 additions & 57 deletions apps/OpenEnergyMonitor/octopus/octopus.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,6 @@

<div class="block-bound">
<div class="bluenav config-open"><i class="icon-wrench icon-white"></i></div>
<!--<div class="bluenav viewcostenergy">VIEW COST</div>-->
<div class="bluenav cost">Cost</div>
<div class="bluenav energy bluenav-active">Energy</div>
<div id="app-title" class="block-title">OCTOPUS AGILE</div>
Expand Down Expand Up @@ -114,18 +113,6 @@
<span class="bluenav" id="fastleft" >&lt;&lt;</span>
<span class="bluenav" id="right" >&gt;</span>
<span class="bluenav" id="left" >&lt;</span>
<!--<span class="bluenav" id="zoomout" >-</span>-->
<!--<span class="bluenav" id="zoomin" >+</span>
<span class="bluenav time" time='1440' title='Previous 60 days'>60d</span>
<span class="bluenav time" time='720' title='Previous 30 days'>30d</span>
<span class="bluenav time" time='168' title='Previous 7 days'>7d</span>
<span class="bluenav time" time='24' title='Previous 24 hours'>1d</span>
<span class="bluenav time" time='12' title='Previous 12 hours'>12h</span>
<span class="bluenav time" time='M' title='Since midnight 1st of month'>Month</span>
<span class="bluenav time" time='W' title='Since midnight Sunday'>Week</span>
<span class="bluenav time" time='Y' title='Yesterday'>Yesterday</span>
<span class="bluenav time" time='T' title='Today since midnight'>Today</span>-->

<select class="time-select">
<option value='1440'>Previous 60 days</option>
<option value='720'>Previous 30 days</option>
Expand Down Expand Up @@ -239,6 +226,7 @@
// ----------------------------------------------------------------------
config.app = {
"title":{"type":"value", "default":"OCTOPUS AGILE", "name": "Title", "description":"Optional title for app"},
"currency":{"type":"value", "default":"£", "name": "Currency", "description":"Currency symbol (£, $, ...)"},
"import":{"optional":true, "type":"feed", "autoname":"import", "engine":"5"},
"import_kwh":{"type":"feed", "autoname":"import_kwh", "engine":5},
"use_kwh":{"optional":true, "type":"feed", "autoname":"use_kwh", "engine":5},
Expand Down Expand Up @@ -296,8 +284,6 @@
var data = {};
var graph_series = [];
var previousPoint = false;
var viewmode = "graph";
var viewcostenergy = "energy";
var panning = false;
var period_text = "month";
var period_average = 0;
Expand Down Expand Up @@ -426,17 +412,8 @@ function updater()
if (config.app[key].value) feeds[key] = result[config.app[key].value];
}

if (feeds["import"]!=undefined) {
if (viewcostenergy=="energy") {
if (feeds["import"].value<10000) {
$("#power_now").html(Math.round(feeds["import"].value)+"<span class='units'>W</span>");
} else {
$("#power_now").html((feeds["import"].value*0.001).toFixed(1)+"<span class='units'>kW</span>");
}
} else {
$("#power_now").html(config.app.currency.value+(feeds["import"].value*1*config.app.unitcost.value*0.001).toFixed(3)+"<span class='units'>/hr</span>");
}
}
graph_reload()
graph_draw()
});
}

Expand Down Expand Up @@ -473,17 +450,6 @@ function updater()
}
});

$("#advanced-toggle").click(function () {
var mode = $(this).html();
if (mode=="SHOW DETAIL") {
$("#advanced-block").show();
$(this).html("HIDE DETAIL");
} else {
$("#advanced-block").hide();
$(this).html("SHOW DETAIL");
}
});

$('#placeholder').bind("plothover", function (event, pos, item) {
if (item) {
var z = item.dataIndex;
Expand Down Expand Up @@ -547,17 +513,6 @@ function updater()
setTimeout(function() { panning = false; }, 100);
});

$(".viewcostenergy").click(function(){
var view = $(this).html();
if (view=="VIEW COST") {
$(this).html("VIEW ENERGY");
viewcostenergy = "cost";
} else {
$(this).html("VIEW COST");
viewcostenergy = "energy";
}
});

$(".energy").click(function() {
view_mode = "energy";
graph_draw()
Expand Down Expand Up @@ -669,15 +624,6 @@ function graph_load()
$("#use_meter_kwh_hh_bound").show();
}

var import_kwh = feed.getdata(feeds["import_kwh"].id,view.start,view.end,interval,0,0);

var use_kwh = [];
if (solarpv_mode) use_kwh = feed.getdata(feeds["use_kwh"].id,view.start,view.end,interval,0,0);
var solar_kwh = [];
if (solarpv_mode) solar_kwh = feed.getdata(feeds["solar_kwh"].id,view.start,view.end,interval,0,0);
var meter_kwh_hh = []
if (smart_meter_data) meter_kwh_hh = feed.getdata(feeds["meter_kwh_hh"].id,view.start,view.end,interval,0,0);

data = {};

data["agile"] = []
Expand Down Expand Up @@ -710,7 +656,18 @@ function graph_load()
// Invert export tariff
for (var z in data["outgoing"]) data["outgoing"][z][1] *= -1;

graph_reload()
}
function graph_reload() {
var interval = 1800;
var import_kwh = feed.getdata(feeds["import_kwh"].id,view.start,view.end,interval,0,0);

var use_kwh = [];
if (solarpv_mode) use_kwh = feed.getdata(feeds["use_kwh"].id,view.start,view.end,interval,0,0);
var solar_kwh = [];
if (solarpv_mode) solar_kwh = feed.getdata(feeds["solar_kwh"].id,view.start,view.end,interval,0,0);
var meter_kwh_hh = []
if (smart_meter_data) meter_kwh_hh = feed.getdata(feeds["meter_kwh_hh"].id,view.start,view.end,interval,0,0);
data["use"] = [];
data["import"] = [];
data["import_cost"] = [];
Expand Down Expand Up @@ -974,8 +931,32 @@ function graph_draw()
let unit_price = data["agile"][2*this_halfhour_index][1]*1.05;
$("#unit_price").html(unit_price.toFixed(2)+"<span class='units'>p</span>");

if (feeds["import"]!=undefined) {
if (view_mode=="energy") {
if (feeds["import"].value<10000) {
$("#power_now").html(Math.round(feeds["import"].value)+"<span class='units'>W</span>");
} else {
$("#power_now").html((feeds["import"].value*0.001).toFixed(1)+"<span class='units'>kW</span>");
}
} else {
$("#power_now").html(config.app.currency.value+(unit_price*feeds["import"].value*1e-5).toFixed(3)+"<span class='units'>/hr</span>");
}
$("#power_now").show();
}

$(".last_halfhour_stats").show();
} else {
if (feeds["import"]!=undefined && view_mode=="energy") {
if (feeds["import"].value<10000) {
$("#power_now").html(Math.round(feeds["import"].value)+"<span class='units'>W</span>");
} else {
$("#power_now").html((feeds["import"].value*0.001).toFixed(1)+"<span class='units'>kW</span>");
}
$("#power_now").show();
} else {
$("#power_now").hide();
}

$(".last_halfhour_stats").hide();
}

Expand Down