From 35770c38314dccc3905d79326aaa19f356731c8c Mon Sep 17 00:00:00 2001 From: John-Mark Gurney Date: Wed, 8 Jan 2020 19:55:08 -0800 Subject: [PATCH] add in highcharts, expand out to have net grid, and consumption as well --- Makefile | 9 +- root/index.html | 4 +- root/js/highcharts.js | 492 ++++++++++++++++++++++++++++++++++++ root/js/solardash.base.js | 11 +- root/js/solardash.file.jspp | 9 + 5 files changed, 519 insertions(+), 6 deletions(-) create mode 100644 root/js/highcharts.js diff --git a/Makefile b/Makefile index 8d38909..8935900 100644 --- a/Makefile +++ b/Makefile @@ -3,16 +3,21 @@ JSFILES = root/js/solardash.file.js +THIRDPARTYJS = root/js/jquery.js root/js/highcharts.js + root/js/jquery.js: wget -O $@ "https://code.jquery.com/jquery-3.4.1.min.js" +root/js/highcharts.js: + wget -O $@ "https://code.highcharts.com/8.0.0/highcharts.js" + # manual deps -root/js/solardash.file.js: root/js/jquery.js root/js/solardash.base.js +root/js/solardash.file.js: root/js/solardash.base.js $(THIRDPARTYJS) all: $(JSFILES) .jspp.js: - cpp -E $< | sed -e '/^#/d' > $@ + cpp -Wno-invalid-pp-token -E $< | sed -e '/^#/d' > $@ keepupdate: find . -name '*.js' -o -name '*.jspp' | entr make all diff --git a/root/index.html b/root/index.html index 56f107d..32c4374 100644 --- a/root/index.html +++ b/root/index.html @@ -10,7 +10,9 @@ -Production: Unknown +
Solar Production: Unknown
+
Consumption: Unknown
+
Net Energy: Unknown