From 56fb07091e1b008909b7415c566ae73d32cd3f90 Mon Sep 17 00:00:00 2001 From: Patrick McDonagh Date: Tue, 16 Jan 2018 10:19:25 -0600 Subject: [PATCH] Adds logging capabilities, lambda function, html templates --- html-templates/Nodelist.html | 11 + html-templates/Overview.html | 186 +- html-templates/Promag400.png | Bin 0 -> 3501 bytes html-templates/Trends.html | 2 +- lambda.js | 14 + promagmbs/python-driver/promagmbs.py | 75 + python-driver/config.txt | 14 +- python-driver/driverConfig.json | 14 +- python-driver/modbusMap.p | 2971 ++++++++++++++++++-------- python-driver/promagmbs.py | 28 +- 10 files changed, 2383 insertions(+), 932 deletions(-) create mode 100644 html-templates/Promag400.png create mode 100644 lambda.js create mode 100644 promagmbs/python-driver/promagmbs.py diff --git a/html-templates/Nodelist.html b/html-templates/Nodelist.html index 756a869..a638471 100644 --- a/html-templates/Nodelist.html +++ b/html-templates/Nodelist.html @@ -28,4 +28,15 @@

<%= node.vanityname %>

+ +
+

Flow Rate

+

<%= Math.round(channels['promagmbs.volume_flow'].value * 100) / 100 %>

+

<%= channels['promagmbs.volume_flow_units'].value %>

+
+
+

Totalizer 1 Today

+

<%= Math.round(channels['promagmbs.totalizer_1_today'].value * 100) / 100 %>

+

<%= channels['promagmbs.totalizer_1_units'].value %>

+
diff --git a/html-templates/Overview.html b/html-templates/Overview.html index c1dcddf..1bad538 100644 --- a/html-templates/Overview.html +++ b/html-templates/Overview.html @@ -1,36 +1,200 @@
-
-

HEADER 1

-
-

CHANNEL 1

+

Volume Flow

- +
- - <%= channels["promagmbs.channel_1"].timestamp %> + + <%= channels["promagmbs.volume_flow"].timestamp %>
+
+
+
+
+
+

Totalizer 1

+
+
+
+
+ + + +
+ + <%= channels["promagmbs.totalizer_1"].timestamp %> + +
+
+
+

Today

+
+
+
+
+ + + +
+ + <%= channels["promagmbs.totalizer_1_today"].timestamp %> + +
+

Yesterday: <%= Math.round(channels['promagmbs.totalizer_1_yesterday'].value) %> <%= channels['promagmbs.totalizer_1_units'].value %>

+
+ +
+ +
+
+

Totalizer 2

+
+
+
+
+ + + +
+ + <%= channels["promagmbs.totalizer_2"].timestamp %> + +
+
+ +
+

Today

+
+
+
+
+ + + +
+ + <%= channels["promagmbs.totalizer_2_today"].timestamp %> + +
+

Yesterday: <%= Math.round(channels['promagmbs.totalizer_2_yesterday'].value) %> <%= channels['promagmbs.totalizer_2_units'].value %>

+
+
+ +
+
+

Totalizer 3

+
+
+
+
+ + + +
+ + <%= channels["promagmbs.totalizer_3"].timestamp %> + +
+
+ +
+

Today

+
+
+
+
+ + + +
+ + <%= channels["promagmbs.totalizer_3_today"].timestamp %> + +
+

Yesterday: <%= Math.round(channels['promagmbs.totalizer_3_yesterday'].value) %> <%= channels['promagmbs.totalizer_3_units'].value %>

+
+
diff --git a/html-templates/Promag400.png b/html-templates/Promag400.png new file mode 100644 index 0000000000000000000000000000000000000000..539c206286c4d161ea98234602f487fa97346a95 GIT binary patch literal 3501 zcmY*ccRU+f`%kPGMa_m9F`{-vwPL5ls@)>As#H@uh#-oHan0JJsB2y2wl#{jYDDZ& zN>N+1R*l+Jt43e$y}$c=-}CuA=Q-y&-{<>1&-tA5$B8vJ)n{eqX9fTOtcC`t8>jyM znK3e)_TFX)JDKxk zIwEc{0cH`o&wWiiUrgwCW`V_)(Le-v6gft$a zB${pP?22!dONgbseN5|;as9WeSFbL=%aD0RCX+85G#R}Z`--1!rO(OEE;KFGaol5a za(R6Vzdm_Ikplp>06Mbp*-kX+M9?z;uIEpuJ^IMOk5C}BQBib#x_2DU>*^N3sNSrS zcjkoj@+IkCHEZwtbT3e%(8KXougF?I0InssccyG%+=lK@{o7g-++QJ|WAd`jERt|Vh2A8#{$*q44D9NebS_*=S&3R2#F z#ASu^_g}}Q85uvT0(zd4O||Fi;If$T-1V)9tSnWxHz(Vc!_kUu;+nn?#$;TV!(LJA>bRFyX z;TP;sX8_|^YnDsBo>`uH;mC+pE2rOJIUR2pblZ2S-_RUj$}4{nsqU`-xZ|So&b#Z) zi0hVAF8+j_E~!hVc^-i6P8^13wE}EyG=SUNbHU`SzTp5->cs{(zeigUb(549(ci-m zA`KRgyu6uXAo+^$MXd<{jV_@dCSFGOM8&y3cg2>KVW4RO91VBPOo9VFjc#!Z#OS9} zaw|S1F~-<|dPDZt_%wolylk*tSh_ig@fl!97D+9TA$=%u9h#mN7~unVy;0m06=%;2)E*0KSAkt37dodA@-SAa9*;H z`9u4-&H1ql2ClJvXdUn-iKfQ`M&q2Ui&~szb`bI4QQZ_*6tDEN-xB>q`f_80#X87BdDGlSLj%0?kj;=S zx%5SqQtZaFHj`IPWW%njl-4<~64Ui)JUD)%NTQ%;MdkGIeC+9<^_88RG=?ou`O5q#Wn>>imd9RM+SMHfvZA4p8{4-?_zy4HYrYisGf z(G((s2Dy71=oIP9@K)!?gPIj-5%*n(sHaXsFB9T>H@Wjq5Mu*0Dv2`lRA>g%<_|u2 z^O}q%FQo5JOE@KAYPQyUs=D2bxY(3<7_Hni^y#4S7d?tyNFhE1Z%6F3>Rp?cjYe*X z8!JpZ#nR{GOlT8UcA#jYa#dS(HyWOv_%N{b;2yB`-NJl*_~_UeJMPM-`4?^I1ehi% z*sY{y(8GJ@!wjfgethTXvo~Lz$`-vncj&5+gF)Mj7WHtiLEslxQwbRlaNPMiw<{S@ zX){3Z0m5Z_MTuRU(+0W3HxxTNo1^}s5rl5*Mz;?mK44?Ip zwH7$vU52FDraSch zwms1NommV)f0>})v^(Y@Wo?Zld~ct8NDILbiw`eHo7c*?N+S2l+NIma}FIPI*#Ie zqaLi^SOsLV&NEhH%B&A@zaOxTH4T&=wyyHqfH^NyYEn9UtJG6(67>Yni(TY2j zW4?g_Vv@J3m#LuD91>&Z!0`a+GTzapett_{47Oi?`-7|qEWaS7OX%n6b*)vW*91Q* zH67A=vUQi(!6>t>jh%QNwNk_Os?TPpi-wM8S16|W!N>Wo zBpCo|BRb|P`8?}nHZ?^q=E+Ujk~o%_DXy)_J*Y)> zNy)>|T`wB^Ut24?Z1m-yywMis42ksga1ovwA5U#)-JHqCOcZkY0m8|%cCyHERgWh8 z%yH1my1IkiljkQ!8QE={%bl0kX6IZw>3}p5V{~l$gH<=bt9X~*^)HG5v1@h}vR1E*3ZC!pf1A3D1g8y9QRVz1?Ym=ONJ_Ba8iHp*|3*A6hiM#3x%AzVPwm=l-zv^F!iLd*nwX#?e`(=PD_WOiJKtt zY^5vy-h zOr}QtM}}S$n=wOz!~Koc!2YjW9^9+bch)Zi!!=Zp^_MP;wbK@cZhr-RJ5Uw;^m#Wk zgOMn%9LH#bv0;^%&Hh>qs$!}9n&Dvn+co+NKiIT3+NKrt + data-channelnames="promagmbs.volume_flow,promagmbs.totalizer_1,promagmbs.totalizer_2,promagmbs.totalizer_3,promagmbs.totalizer_1_today,promagmbs.totalizer_2_today,promagmbs.totalizer_3_today,promagmbs.totalizer_1_yesterday,promagmbs.totalizer_2_yesterday,promagmbs.totalizer_3_yesterday">