diff --git a/node-red-flows/meters.json b/node-red-flows/meters.json index a76d897..4df36b9 100644 --- a/node-red-flows/meters.json +++ b/node-red-flows/meters.json @@ -159,7 +159,7 @@ "type": "function", "z": "f96eea4d4a3a345d", "name": "Build Object", - "func": "var einspeisung_total_power = global.get(\"einspeisung_total_power\")\nvar einspeisung_total_kwh = global.get(\"einspeisung_total_kwh\")\nvar einspeisung_total_import = global.get(\"einspeisung_total_import\")\nvar einspeisung_total_export = global.get(\"einspeisung_total_export\")\n\nvar einspeisung_l1_voltage = global.get(\"einspeisung_l1_voltage\")\nvar einspeisung_l2_voltage = global.get(\"einspeisung_l2_voltage\")\nvar einspeisung_l3_voltage = global.get(\"einspeisung_l3_voltage\")\n\nvar einspeisung_l1_current = global.get(\"einspeisung_l1_current\")\nvar einspeisung_l2_current = global.get(\"einspeisung_l2_current\")\nvar einspeisung_l3_current = global.get(\"einspeisung_l3_current\")\nvar einspeisung_total_current = parseFloat(parseFloat(einspeisung_l1_current) + parseFloat(einspeisung_l2_current) + parseFloat(einspeisung_l3_current)).toFixed(1)\n\nvar einspeisung_l1_power = global.get(\"einspeisung_l1_power\")\nvar einspeisung_l2_power = global.get(\"einspeisung_l2_power\")\nvar einspeisung_l3_power = global.get(\"einspeisung_l3_power\")\n\nvar einspeisung_l1_import = global.get(\"einspeisung_l1_import\")\nvar einspeisung_l2_import = global.get(\"einspeisung_l2_import\")\nvar einspeisung_l3_import = global.get(\"einspeisung_l3_import\")\n\nvar einspeisung_l1_export = global.get(\"einspeisung_l1_export\")\nvar einspeisung_l2_export = global.get(\"einspeisung_l2_export\")\nvar einspeisung_l3_export = global.get(\"einspeisung_l3_export\")\n\nmsg.payload.einspeisung = {total_power:einspeisung_total_power, total_current:einspeisung_total_current, total_kwh:einspeisung_total_kwh, total_import:einspeisung_total_import, total_export:einspeisung_total_export, l1_voltage:einspeisung_l1_voltage, l2_voltage:einspeisung_l2_voltage, l3_voltage:einspeisung_l3_voltage, l1_current:einspeisung_l1_current, l2_current:einspeisung_l2_current, l3_current:einspeisung_l3_current, l1_power:einspeisung_l1_power, l2_power:einspeisung_l2_power, l3_power:einspeisung_l3_power, l1_import:einspeisung_l1_import, l2_import:einspeisung_l2_import, l3_import:einspeisung_l3_import, l1_export:einspeisung_l1_export, l2_export:einspeisung_l2_export, l3_export:einspeisung_l3_export};\n\nvar keller_total_kwh = global.get(\"keller_total_kwh\")\n//var keller_l1_voltage = global.get(\"keller_l1_voltage\")\nvar keller_l1_current = global.get(\"keller_l1_current\")\nvar keller_l1_power = global.get(\"keller_l1_power\")\n\nmsg.payload.keller = {total_kwh:keller_total_kwh, l1_current:keller_l1_current, l1_power:keller_l1_power};\nreturn msg;\n", + "func": "var einspeisung_total_power = parseFloat(global.get(\"einspeisung_total_power\"))\nvar einspeisung_total_kwh = parseFloat(global.get(\"einspeisung_total_kwh\"))\nvar einspeisung_total_import = parseFloat(global.get(\"einspeisung_total_import\"))\nvar einspeisung_total_export = parseFloat(global.get(\"einspeisung_total_export\"))\n\nvar einspeisung_l1_voltage = parseFloat(global.get(\"einspeisung_l1_voltage\"))\nvar einspeisung_l2_voltage = parseFloat(global.get(\"einspeisung_l2_voltage\"))\nvar einspeisung_l3_voltage = parseFloat(global.get(\"einspeisung_l3_voltage\"))\n\nvar einspeisung_l1_current = parseFloat(global.get(\"einspeisung_l1_current\"))\nvar einspeisung_l2_current = parseFloat(global.get(\"einspeisung_l2_current\"))\nvar einspeisung_l3_current = parseFloat(global.get(\"einspeisung_l3_current\"))\nvar einspeisung_total_current = einspeisung_l1_current + einspeisung_l2_current + einspeisung_l3_current\n\nvar einspeisung_l1_power = parseFloat(global.get(\"einspeisung_l1_power\"))\nvar einspeisung_l2_power = parseFloat(global.get(\"einspeisung_l2_power\"))\nvar einspeisung_l3_power = parseFloat(global.get(\"einspeisung_l3_power\"))\n\nvar einspeisung_l1_import = parseFloat(global.get(\"einspeisung_l1_import\"))\nvar einspeisung_l2_import = parseFloat(global.get(\"einspeisung_l2_import\"))\nvar einspeisung_l3_import = parseFloat(global.get(\"einspeisung_l3_import\"))\n\nvar einspeisung_l1_export = parseFloat(global.get(\"einspeisung_l1_export\"))\nvar einspeisung_l2_export = parseFloat(global.get(\"einspeisung_l2_export\"))\nvar einspeisung_l3_export = parseFloat(global.get(\"einspeisung_l3_export\"))\n\nmsg.payload.einspeisung = {total_power:einspeisung_total_power, total_current:einspeisung_total_current, total_kwh:einspeisung_total_kwh, total_import:einspeisung_total_import, total_export:einspeisung_total_export, l1_voltage:einspeisung_l1_voltage, l2_voltage:einspeisung_l2_voltage, l3_voltage:einspeisung_l3_voltage, l1_current:einspeisung_l1_current, l2_current:einspeisung_l2_current, l3_current:einspeisung_l3_current, l1_power:einspeisung_l1_power, l2_power:einspeisung_l2_power, l3_power:einspeisung_l3_power, l1_import:einspeisung_l1_import, l2_import:einspeisung_l2_import, l3_import:einspeisung_l3_import, l1_export:einspeisung_l1_export, l2_export:einspeisung_l2_export, l3_export:einspeisung_l3_export};\n\nvar keller_total_kwh = parseFloat(global.get(\"keller_total_kwh\"))\n//var keller_l1_voltage = parseFloat(global.get(\"keller_l1_voltage\"))\nvar keller_l1_current = parseFloat(global.get(\"keller_l1_current\"))\nvar keller_l1_power = parseFloat(global.get(\"keller_l1_power\"))\n\nmsg.payload.keller = {total_kwh:keller_total_kwh, l1_current:keller_l1_current, l1_power:keller_l1_power};\nreturn msg;\n", "outputs": 1, "noerr": 0, "initialize": "", diff --git a/node-red-flows/temperatures.json b/node-red-flows/temperatures.json index 8eab7ce..c9423ea 100644 --- a/node-red-flows/temperatures.json +++ b/node-red-flows/temperatures.json @@ -21,7 +21,7 @@ "useIOForPayload": false, "emptyMsgOnFail": false, "keepMsgProperties": false, - "x": 630, + "x": 610, "y": 160, "wires": [ [], @@ -187,7 +187,7 @@ "type": "function", "z": "54b453f8b1822086", "name": "Build Object", - "func": "var temp_outside = global.get(\"temp_outside\")\n\nmsg.payload = {outside:temp_outside};\nreturn msg;", + "func": "var temp_outside = parseFloat(global.get(\"temp_outside\"))\n\nmsg.payload = {outside:temp_outside};\nreturn msg;", "outputs": 1, "noerr": 0, "initialize": "",