From 8fd28d237cd10c507a05861e854c5aa91f3ce80a Mon Sep 17 00:00:00 2001 From: Juan Manuel Grados Luyando Date: Thu, 2 Mar 2023 19:17:11 +0100 Subject: [PATCH] Naming some nodes, adding dashboards --- software/dashboard/grafana/grafana.db | Bin 1028096 -> 1105920 bytes software/flow/flows.json | 88 ++++---- software/flow/flows_cred.json | 2 +- .../node-red-contrib-watt2kwh/LICENSE | 201 ++++++++++++++++++ .../node-red-contrib-watt2kwh/README.md | 24 +++ .../examples/Typical usage example.json | 1 + .../node-red-contrib-watt2kwh/icons/power.png | Bin 0 -> 715 bytes .../node-red-contrib-watt2kwh/package.json | 29 +++ .../node-red-contrib-watt2kwh/watt2kwh.html | 81 +++++++ .../node-red-contrib-watt2kwh/watt2kwh.js | 62 ++++++ 10 files changed, 443 insertions(+), 45 deletions(-) mode change 100644 => 100755 software/flow/flows.json mode change 100644 => 100755 software/flow/flows_cred.json create mode 100644 software/flow/node_modules/node-red-contrib-watt2kwh/LICENSE create mode 100644 software/flow/node_modules/node-red-contrib-watt2kwh/README.md create mode 100644 software/flow/node_modules/node-red-contrib-watt2kwh/examples/Typical usage example.json create mode 100644 software/flow/node_modules/node-red-contrib-watt2kwh/icons/power.png create mode 100644 software/flow/node_modules/node-red-contrib-watt2kwh/package.json create mode 100644 software/flow/node_modules/node-red-contrib-watt2kwh/watt2kwh.html create mode 100644 software/flow/node_modules/node-red-contrib-watt2kwh/watt2kwh.js diff --git a/software/dashboard/grafana/grafana.db b/software/dashboard/grafana/grafana.db index 47bf115137a2937c2167aad3e79609a66c850a7e..b08c151fc431178027bf7618fbdd7f7a87821551 100755 GIT binary patch delta 14489 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 MQ0_Zw-2C+a1NM}Ew*UYD delta 1215 zcmYjQZA=_R7@pak+uhmQop7P0DF12-35cZSL&Vn9 zfQUvCw6^9F#vhuV*R=Jci73h#MLjhpZ7gtT(h}2p*q|j1A1yJh5ev?tA#V10XS46~ zJny@+^Y*15=$qMjtk7;p2(3u0UvHFEpPNP1Fji zA^Pky&0YJtIu0~LO(GR3!!+?j#KW<~YUF;9E_cua9WAZx`x?8un-h;l4-<>1p^@{^ zu&cZA%KPH6>i&k&22315T>KYcL#)-{H4v*uu~KW=(gEXTgqKG)xpSC|sW>2RPT`%3 zXe)uQu_!(WKT|6ntL)iP+}czu?fABb**!$+Rz_W{IU`!b9H>5Oh#PA-;Aj|@5lFYr zIoNCy8ln$*yTZHLo~zhz=4!zbf+d;#4HQS^ImroiVK6giuQD5u9F& zp1Q6$A7_Yrnk2Q1p+FkJ45Vd+PoQM0;zI>t(%972+8(R+B3>-wMq=?QufnTpLNC6v z75fmMeL*jhx&Yo~UhMhrd4!T*2 z1?>z(;B&TD=0CGV=C)p;{Fi4b`925{$>`q5+eR)A)43hH2{&LKuEG_#4AWAdhJopj zAwk7-$lQ?(QtKju_h1iOVz03(J8KWv5$mF4erYN7ln%2t$gk!H=wiWmuBcNJlV{~H&~5@Lup2s4Y;$Hd2 G=>7vWd2apy diff --git a/software/flow/flows.json b/software/flow/flows.json old mode 100644 new mode 100755 index ef912fe..ebecfbd --- a/software/flow/flows.json +++ b/software/flow/flows.json @@ -695,7 +695,7 @@ "type": "function", "z": "325e309897bf4538", "name": "parse power data", - "func": "return {\n payload: Number(msg.payload)\n}", + "func": "var power = Number(msg.payload);\n\nif (power != 0){\n return {\n payload: power\n }\n}", "outputs": 1, "noerr": 0, "initialize": "", @@ -714,7 +714,7 @@ "id": "e2da2b347453dd67", "type": "debug", "z": "325e309897bf4538", - "name": "power", + "name": "power 3dprinter", "active": false, "tosidebar": true, "console": false, @@ -723,7 +723,7 @@ "targetType": "msg", "statusVal": "", "statusType": "auto", - "x": 670, + "x": 700, "y": 420, "wires": [] }, @@ -790,7 +790,7 @@ "id": "b905735dc618a8a0", "type": "debug", "z": "325e309897bf4538", - "name": "state", + "name": "state 3dprinter", "active": false, "tosidebar": true, "console": false, @@ -799,7 +799,7 @@ "targetType": "msg", "statusVal": "", "statusType": "auto", - "x": 670, + "x": 700, "y": 620, "wires": [] }, @@ -866,7 +866,7 @@ "id": "04b4d32bae0f2348", "type": "debug", "z": "325e309897bf4538", - "name": "filename", + "name": "filename 3dprinter", "active": false, "tosidebar": true, "console": false, @@ -875,7 +875,7 @@ "targetType": "msg", "statusVal": "", "statusType": "auto", - "x": 680, + "x": 710, "y": 840, "wires": [] }, @@ -942,7 +942,7 @@ "id": "6af55efed77b7ef4", "type": "debug", "z": "325e309897bf4538", - "name": "starttime", + "name": "starttime 3dprinter", "active": false, "tosidebar": true, "console": false, @@ -951,7 +951,7 @@ "targetType": "msg", "statusVal": "", "statusType": "auto", - "x": 680, + "x": 710, "y": 1040, "wires": [] }, @@ -1018,7 +1018,7 @@ "id": "2dc5b48d55a82a7c", "type": "debug", "z": "325e309897bf4538", - "name": "endtime", + "name": "endtime 3dprinter", "active": false, "tosidebar": true, "console": false, @@ -1027,7 +1027,7 @@ "targetType": "msg", "statusVal": "", "statusType": "auto", - "x": 680, + "x": 710, "y": 1240, "wires": [] }, @@ -1173,7 +1173,7 @@ "id": "03a1941ce253b3b9", "type": "debug", "z": "325e309897bf4538", - "name": "total energy data", + "name": "total energy data 3dprinter", "active": true, "tosidebar": true, "console": false, @@ -1182,7 +1182,7 @@ "targetType": "msg", "statusVal": "", "statusType": "auto", - "x": 770, + "x": 790, "y": 1340, "wires": [] }, @@ -1482,7 +1482,7 @@ "id": "6df29c651de8a30f", "type": "debug", "z": "325e309897bf4538", - "name": "total filament data", + "name": "total filament data 3dprinter", "active": true, "tosidebar": true, "console": false, @@ -1491,7 +1491,7 @@ "targetType": "msg", "statusVal": "", "statusType": "auto", - "x": 810, + "x": 840, "y": 1600, "wires": [] }, @@ -1521,7 +1521,7 @@ "type": "function", "z": "47e5443dc1c29bcd", "name": "parse power data", - "func": "return {\n payload: Number(msg.payload)\n}", + "func": "var power = Number(msg.payload);\n\nif (power != 0) {\n return {\n payload: power\n }\n}", "outputs": 1, "noerr": 0, "initialize": "", @@ -1540,7 +1540,7 @@ "id": "bc5a407d180795d6", "type": "debug", "z": "47e5443dc1c29bcd", - "name": "power", + "name": "power lasercutter", "active": false, "tosidebar": true, "console": false, @@ -1549,7 +1549,7 @@ "targetType": "msg", "statusVal": "", "statusType": "auto", - "x": 690, + "x": 730, "y": 140, "wires": [] }, @@ -1616,7 +1616,7 @@ "id": "efd7719d7decb1ea", "type": "debug", "z": "47e5443dc1c29bcd", - "name": "state", + "name": "state lasercutter", "active": false, "tosidebar": true, "console": false, @@ -1625,7 +1625,7 @@ "targetType": "msg", "statusVal": "", "statusType": "auto", - "x": 690, + "x": 720, "y": 340, "wires": [] }, @@ -1692,7 +1692,7 @@ "id": "338d4cf095415f71", "type": "debug", "z": "47e5443dc1c29bcd", - "name": "filename", + "name": "filename lasercutter", "active": false, "tosidebar": true, "console": false, @@ -1701,7 +1701,7 @@ "targetType": "msg", "statusVal": "", "statusType": "auto", - "x": 700, + "x": 730, "y": 560, "wires": [] }, @@ -1768,7 +1768,7 @@ "id": "77a78efc551054de", "type": "debug", "z": "47e5443dc1c29bcd", - "name": "starttime", + "name": "starttime lasercutter", "active": false, "tosidebar": true, "console": false, @@ -1777,7 +1777,7 @@ "targetType": "msg", "statusVal": "", "statusType": "auto", - "x": 680, + "x": 710, "y": 760, "wires": [] }, @@ -1844,7 +1844,7 @@ "id": "b44d4302a407dd2b", "type": "debug", "z": "47e5443dc1c29bcd", - "name": "endtime", + "name": "endtime lasercutter", "active": false, "tosidebar": true, "console": false, @@ -1853,7 +1853,7 @@ "targetType": "msg", "statusVal": "", "statusType": "auto", - "x": 680, + "x": 710, "y": 960, "wires": [] }, @@ -1915,7 +1915,7 @@ "id": "17442662acc3cc61", "type": "debug", "z": "47e5443dc1c29bcd", - "name": "total energy data", + "name": "total energy data lasercutter", "active": true, "tosidebar": true, "console": false, @@ -1924,7 +1924,7 @@ "targetType": "msg", "statusVal": "", "statusType": "auto", - "x": 770, + "x": 800, "y": 1080, "wires": [] }, @@ -2132,7 +2132,7 @@ "type": "function", "z": "8ef0902d5920bef2", "name": "parse power data", - "func": "return {\n payload: Number(msg.payload)\n}", + "func": "var power = Number(msg.payload);\n\nif (power != 0) {\n return {\n payload: power\n }\n}", "outputs": 1, "noerr": 0, "initialize": "", @@ -2142,8 +2142,8 @@ "y": 100, "wires": [ [ - "c7fb8cedc139159b", - "0786982790db5744" + "0786982790db5744", + "c7fb8cedc139159b" ] ] }, @@ -2151,8 +2151,8 @@ "id": "c7fb8cedc139159b", "type": "debug", "z": "8ef0902d5920bef2", - "name": "power", - "active": false, + "name": "power cnc", + "active": true, "tosidebar": true, "console": false, "tostatus": false, @@ -2160,7 +2160,7 @@ "targetType": "msg", "statusVal": "", "statusType": "auto", - "x": 690, + "x": 710, "y": 140, "wires": [] }, @@ -2227,7 +2227,7 @@ "id": "9e773dd4015689eb", "type": "debug", "z": "8ef0902d5920bef2", - "name": "state", + "name": "state cnc", "active": false, "tosidebar": true, "console": false, @@ -2236,7 +2236,7 @@ "targetType": "msg", "statusVal": "", "statusType": "auto", - "x": 690, + "x": 700, "y": 340, "wires": [] }, @@ -2303,7 +2303,7 @@ "id": "cb4c266a29ef1440", "type": "debug", "z": "8ef0902d5920bef2", - "name": "filename", + "name": "filename cnc", "active": false, "tosidebar": true, "console": false, @@ -2312,7 +2312,7 @@ "targetType": "msg", "statusVal": "", "statusType": "auto", - "x": 700, + "x": 710, "y": 560, "wires": [] }, @@ -2379,7 +2379,7 @@ "id": "217def6e60f47b93", "type": "debug", "z": "8ef0902d5920bef2", - "name": "starttime", + "name": "starttime cnc", "active": false, "tosidebar": true, "console": false, @@ -2388,7 +2388,7 @@ "targetType": "msg", "statusVal": "", "statusType": "auto", - "x": 680, + "x": 690, "y": 760, "wires": [] }, @@ -2455,7 +2455,7 @@ "id": "25d21239196d7faa", "type": "debug", "z": "8ef0902d5920bef2", - "name": "endtime", + "name": "endtime cnc", "active": false, "tosidebar": true, "console": false, @@ -2464,7 +2464,7 @@ "targetType": "msg", "statusVal": "", "statusType": "auto", - "x": 680, + "x": 690, "y": 960, "wires": [] }, @@ -2526,7 +2526,7 @@ "id": "9eab0627c1031cf2", "type": "debug", "z": "8ef0902d5920bef2", - "name": "total energy data", + "name": "total energy data cnc", "active": true, "tosidebar": true, "console": false, @@ -2535,7 +2535,7 @@ "targetType": "msg", "statusVal": "", "statusType": "auto", - "x": 810, + "x": 820, "y": 1160, "wires": [] }, diff --git a/software/flow/flows_cred.json b/software/flow/flows_cred.json old mode 100644 new mode 100755 index a4936ca..b502733 --- a/software/flow/flows_cred.json +++ b/software/flow/flows_cred.json @@ -1,3 +1,3 @@ { - "$": "a37a380186524e7fc7a54e865dc684a0e2E4wK3H/KqslcUK7UZAxtT0CzLSTWs5u8gwjwTwS1nnK6FbtmLf3r0qfD6Mr4bFX39eXjq31IJV1Qc8RBaewSLNSVFMxhXTeAVOvXps5Mw11kyFfXS7ImEG7PbVoBePjJRUSXgVnVauM4xsSzS8KkIGABvJ8WODIU++c5kObK0NaEitlBn/SReZZdNpDSqa8MaCKJ1udu+ZvZZsWEt0OII062EjuMQGjcYtOI3f+5pG/tf0l3B9XRMZVC5EDNretc60cjskqFPYJXmrGuo9EQ==" + "$": "b479cf85067f2ad2e290fedb4b4bc60agt36msOl4fD5/AhmQT8qQ9DHu+u+xVn6bY/z55HiT2vOaDZEa6H7fAc340PGjYbC/mgaQKY1M67A378PC+UJKIhPAur/B1LEz0dsl0fDrtr7mgww/DPRWrjRjg246GWUCEnT6Ed3CjTBKdO8msEj6tZxAUOON9La5XJEwOqSCii3YfEQ8lUghZfQapL65ybCH21qasPXLyVGHivalVtbSQ1tsEcQ4mcLdDR4MCRdaA3kPyA3+68/aLYVUTPcKxX1YlDvXpKBNcQGsDjKYpUQaA==" } \ No newline at end of file diff --git a/software/flow/node_modules/node-red-contrib-watt2kwh/LICENSE b/software/flow/node_modules/node-red-contrib-watt2kwh/LICENSE new file mode 100644 index 0000000..261eeb9 --- /dev/null +++ b/software/flow/node_modules/node-red-contrib-watt2kwh/LICENSE @@ -0,0 +1,201 @@ + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright [yyyy] [name of copyright owner] + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. diff --git a/software/flow/node_modules/node-red-contrib-watt2kwh/README.md b/software/flow/node_modules/node-red-contrib-watt2kwh/README.md new file mode 100644 index 0000000..f7b0971 --- /dev/null +++ b/software/flow/node_modules/node-red-contrib-watt2kwh/README.md @@ -0,0 +1,24 @@ +## node-red-contrib-watt2kwh +A node specifically written to convert power (watts) to energy (kWh). +### Inputs +The node accepts a msg.payload input in the format of a number (example 6) or a string (example "6") provided that the string only contains numbers. +### Outputs +The msg.payload contains the energy output, which can be set in the node config to be; +* Joules +* Watt hour +* Kilowatt hour or +* Megawatt hour +### Details +As the calculation is dependent upon the relationship between the amount of power used, (or generated) **and** the interval between consecutive data points; **interval x power = energy** the very first value fed into the node will not produce an output, because the node requires a second value to be able to calculate the interval between the two values. +After subsequent feed inputs, the node will output the corresponding energy used or generated within that interval. + +The Timeout setting in the node's configuration, should be set to at least the maximum interval between successive readings. This is to avoid the situation where for example, a sensor is taken off line, develops a fault or there is a communication problem, resulting in a break of several hours between readings and the calculation - **interval x power = energy** would then be inaccurate. + +A common usage is to create a barchart, to show daily energy usage or generation. Using the watt/hour setting, the msg.payload can be fed into the database, for example influx, and then queried within Grafana to produce the barchart; `SELECT sum("energyfeed") FROM "yourdatabase" WHERE $timeFilter GROUP BY time(1d)` +``` +[{"id":"d62baedc.ded46","type":"debug","z":"31e18edc.98bdc2","name":"","active":true,"tosidebar":true,"console":false,"tostatus":false,"complete":"false","x":740,"y":440,"wires":[]},{"id":"74280b50.f704a4","type":"inject","z":"31e18edc.98bdc2","name":"1 kW feed","topic":"","payload":"1000","payloadType":"str","repeat":"60","crontab":"","once":false,"onceDelay":0.1,"x":420,"y":440,"wires":[["5eb66b22.1a4de4"]]},{"id":"5eb66b22.1a4de4","type":"watt2kwh","z":"31e18edc.98bdc2","format":"kwh","maximum":"5","maximumunit":"mins","name":"","x":580,"y":440,"wires":[["d62baedc.ded46"]]}] +``` +The other common usage is to use the data within node-RED, for use in the dashboard or sending it to other devices. In these cases, you may wish to accumulate the node output, for example to calculate how many kWh's are consumed (or generated that day. The flow below, adds each subsequent value, and saves it back to flow context. An inject node then deletes the context value at each midnight. +``` +[{"id":"74280b50.f704a4","type":"inject","z":"31e18edc.98bdc2","name":"1 kW feed","topic":"","payload":"1000","payloadType":"str","repeat":"","crontab":"*/1 0-23 * * *","once":false,"onceDelay":0.1,"x":420,"y":470,"wires":[["5eb66b22.1a4de4"]]},{"id":"5eb66b22.1a4de4","type":"watt2kwh","z":"31e18edc.98bdc2","format":"kwh","maximum":"5","maximumunit":"mins","name":"","x":586,"y":470,"wires":[["92e84adc.45c5e8"]]},{"id":"92e84adc.45c5e8","type":"function","z":"31e18edc.98bdc2","name":"Store kwh","func":"var inputVal = msg.payload;\nif (inputVal == \"reset\"){\n flow.set(\"energyVal\",0); \n } else {\nvar savedVal = flow.get('energyVal')||0;\nsavedVal += inputVal;\nflow.set(\"energyVal\",savedVal);\nmsg.payload = savedVal;\nreturn msg;\n}","outputs":1,"noerr":0,"x":740,"y":510,"wires":[["486cc458.d7051c"]]},{"id":"486cc458.d7051c","type":"debug","z":"31e18edc.98bdc2","name":"","active":true,"tosidebar":true,"console":false,"tostatus":false,"complete":"false","x":900,"y":510,"wires":[]},{"id":"6a75c8e5.1ee598","type":"inject","z":"31e18edc.98bdc2","name":"reset","topic":"","payload":"reset","payloadType":"str","repeat":"","crontab":"00 00 * * *","once":false,"onceDelay":0.1,"x":600,"y":510,"wires":[["92e84adc.45c5e8"]]}] +``` diff --git a/software/flow/node_modules/node-red-contrib-watt2kwh/examples/Typical usage example.json b/software/flow/node_modules/node-red-contrib-watt2kwh/examples/Typical usage example.json new file mode 100644 index 0000000..8d0e6a0 --- /dev/null +++ b/software/flow/node_modules/node-red-contrib-watt2kwh/examples/Typical usage example.json @@ -0,0 +1 @@ +[{"id":"8f7657bd13cc9a4b","type":"comment","z":"b3b413d1.05b1b","name":"info","info":"This flow adds each subsequent value, and saves it back to flow context. An inject node then deletes the context value at each midnight.","x":145,"y":1525,"wires":[]},{"id":"74280b50.f704a4","type":"inject","z":"b3b413d1.05b1b","name":"1 kW feed","props":[{"p":"payload"},{"p":"topic","vt":"str"}],"repeat":"10","crontab":"","once":true,"onceDelay":0.1,"topic":"","payload":"1000","payloadType":"str","x":165,"y":1565,"wires":[["5eb66b22.1a4de4"]]},{"id":"5eb66b22.1a4de4","type":"watt2kwh","z":"b3b413d1.05b1b","format":"kwh","maximum":"5","maximumunit":"mins","name":"","x":331,"y":1565,"wires":[["92e84adc.45c5e8"]]},{"id":"92e84adc.45c5e8","type":"function","z":"b3b413d1.05b1b","name":"Store kwh","func":"var inputVal = msg.payload;\nif (inputVal == \"reset\"){\n flow.set(\"energyVal\",0); \n } else {\nvar savedVal = flow.get('energyVal')||0;\nsavedVal += inputVal;\nflow.set(\"energyVal\",savedVal);\nmsg.payload = savedVal;\nreturn msg;\n}","outputs":1,"noerr":0,"initialize":"","finalize":"","libs":[],"x":485,"y":1605,"wires":[["486cc458.d7051c"]]},{"id":"486cc458.d7051c","type":"debug","z":"b3b413d1.05b1b","name":"","active":true,"tosidebar":true,"console":false,"tostatus":false,"complete":"false","x":645,"y":1605,"wires":[]},{"id":"6a75c8e5.1ee598","type":"inject","z":"b3b413d1.05b1b","name":"reset","repeat":"","crontab":"00 00 * * *","once":false,"onceDelay":0.1,"topic":"","payload":"reset","payloadType":"str","x":345,"y":1605,"wires":[["92e84adc.45c5e8"]]}] diff --git a/software/flow/node_modules/node-red-contrib-watt2kwh/icons/power.png b/software/flow/node_modules/node-red-contrib-watt2kwh/icons/power.png new file mode 100644 index 0000000000000000000000000000000000000000..2bf0641f8d23e686aec1cc061dda2e394a03f8a6 GIT binary patch literal 715 zcmV;+0yO=JP)v$}<^CjS(gv79tU@|iStCF?{1vIm4y^mUD03F=bK)9Zy>1=(S zwhEXmVeNIr5^yO1tOwl69xevlhQQ1{R!jl61K?JGi7J`15}o@)(l+0Yt(uTlVCOFS z!bv(7(^dhy1FT(AYyl5F;eG;}#ue8*;btU#@GToN8{7NDw+3%W@(FrEO~}*Q#iroi zd%*pzD}H+f+#yM`KKG&8ckG>{gJ!lC)Fi;CYyzoKt7f*NXas8)z4u(fPe-VtBO&wQ z|A_;5Mg2NkwlPjdfb*JiYyjLwNgYX3HQHL(6h1HNb2Y>LmUPMouE^dmHCubJ(zlp; z=knKPcDOWPP`igc7?M`ZY-ebUR(>cg3HM^eCEq3OseQ{?Fv#xpsJqiqc60@hmq)-| zQIi7JhQK|GwjVCA_s$TwuZ_X=LB1UVIMX!T+z_}qHLW3Vcbf(iu-_dD<+a>+-8q1# z1K|EtJ%G16ly?D@D2P?WCGH0T-0A-1yWu$3Lx*_r2F%2d@AC002ovPDHLkV1l?=KP>=2.0.0", + "nodes" : { + "simpletime": "watt2kwh.js" + } + }, + "engines": { + "node": ">=12.0.0" + }, + "author": "Paul Reed", + "bugs": { + "url": "https://github.com/Paul-Reed/node-red-contrib-watt2kwh.git/issues" + }, + "homepage": "https://github.com/Paul-Reed/node-red-contrib-watt2kwh.git" +} diff --git a/software/flow/node_modules/node-red-contrib-watt2kwh/watt2kwh.html b/software/flow/node_modules/node-red-contrib-watt2kwh/watt2kwh.html new file mode 100644 index 0000000..9726308 --- /dev/null +++ b/software/flow/node_modules/node-red-contrib-watt2kwh/watt2kwh.html @@ -0,0 +1,81 @@ + + + + + diff --git a/software/flow/node_modules/node-red-contrib-watt2kwh/watt2kwh.js b/software/flow/node_modules/node-red-contrib-watt2kwh/watt2kwh.js new file mode 100644 index 0000000..df99c18 --- /dev/null +++ b/software/flow/node_modules/node-red-contrib-watt2kwh/watt2kwh.js @@ -0,0 +1,62 @@ +/** + * Copyright 2019 Paul Reed + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + **/ + +// Many thanks to @bartbutenaers for the learning experience & support!! + +module.exports = function(RED) { + function Watt2kWhNode(config) { + RED.nodes.createNode(this,config); + this.maximum = config.maximum; + var node = this; + + //Read the selected output format + const formats = {"j":1e-3, "kj": 1, "wh": 3.6, "kwh": 3600, "mwh": (1e3*3600)}; + this.output = formats[config.format] || 0; + + //Read the selected timeout value + const units = {"secs": 1, "mins": 60, "hours": 3600}; + this.maximum *= units[config.maximumunit] || 0; + // Overule if left blank or negative values selected + if (this.maximum <= 0) { + this.maximum = 3600; + } + + node.on('input', function(msg) { + + var kwatts = (msg.payload / 1000); + var hrtime = process.hrtime(); + var secsnow = ((hrtime[0]) + (hrtime[1] / 1e9)); + var lastms = node.lastms||secsnow; + var interval = secsnow - lastms; + + // Check if input msg is a number, else warn & exit + if (isNaN (kwatts)){ + this.error("The input msg is not a number"); + return; + } + node.lastms = secsnow; + + // Calculate kilojoules from energy - if interval is OK + if ((interval < this.maximum)&&(interval !== 0)) { + msg.payload = (interval*kwatts)/this.output; + node.send(msg); + } else { + return; + } + }); + } + RED.nodes.registerType("watt2kwh",Watt2kWhNode); +}