diff --git a/node_red_app.json b/node_red_app.json
index f9d1dc7..4ccfe38 100644
--- a/node_red_app.json
+++ b/node_red_app.json
@@ -32,12 +32,11 @@
"allCommands": "",
"allFormats": "",
"qos": "0",
- "x": 120,
+ "x": 160,
"y": 320,
"wires": [
[
- "173a577e881643a6",
- "d65eb96086ba96e1"
+ "173a577e881643a6"
]
]
},
@@ -56,7 +55,8 @@
"y": 360,
"wires": [
[
- "b45762f841ae061a"
+ "b45762f841ae061a",
+ "246d4f49272a1ddc"
]
]
},
@@ -70,7 +70,7 @@
"service": "cool-app-cloudant-1644397982194-95552",
"payonly": false,
"operation": "insert",
- "x": 1050,
+ "x": 1030,
"y": 360,
"wires": []
},
@@ -81,8 +81,8 @@
"name": "",
"statusCode": "",
"headers": {},
- "x": 1170,
- "y": 680,
+ "x": 2330,
+ "y": 300,
"wires": []
},
{
@@ -95,8 +95,8 @@
"format": "handlebars",
"syntax": "mustache",
"template": "\n
\n \n \n \n\n Timestamp: {{timestamp}}\n\n Sound: {{sound}}\n
\n \n Humidity: {{humi}}\n
\n \n Light: {{illu}}\n
\n \n Temperature: {{temp}}\n
\n Heater: \n
\n \n Water: {{water}}\n
\n \n
\n \n Food Times:\n
\n {{#payload.payload}}\n {{time}} \n {{/payload.payload}}\n\n
\n New time: \n\n\n \n\n\n\n",
- "x": 1030,
- "y": 680,
+ "x": 2170,
+ "y": 300,
"wires": [
[
"d7cf717c7614701a"
@@ -114,11 +114,10 @@
"initialize": "",
"finalize": "",
"libs": [],
- "x": 490,
- "y": 720,
+ "x": 1670,
+ "y": 380,
"wires": [
[
- "d935f4b8f31c5228",
"6276e757bc9de8f6"
]
]
@@ -134,11 +133,10 @@
"search": "_all_",
"design": "",
"index": "",
- "x": 290,
- "y": 720,
+ "x": 1490,
+ "y": 380,
"wires": [
[
- "0365b428b2be7228",
"2ede16ab688c964b"
]
]
@@ -152,8 +150,8 @@
"method": "get",
"upload": false,
"swaggerDoc": "",
- "x": 110,
- "y": 700,
+ "x": 1290,
+ "y": 340,
"wires": [
[
"e62fce45716c28e9",
@@ -216,8 +214,8 @@
"method": "post",
"upload": false,
"swaggerDoc": "",
- "x": 110,
- "y": 900,
+ "x": 1290,
+ "y": 540,
"wires": [
[
"081c07df56559583",
@@ -236,23 +234,6 @@
"y": 400,
"wires": []
},
- {
- "id": "0365b428b2be7228",
- "type": "debug",
- "z": "d4a9b32e324082e1",
- "name": "",
- "active": false,
- "tosidebar": true,
- "console": false,
- "tostatus": false,
- "complete": "payload[0]",
- "targetType": "msg",
- "statusVal": "",
- "statusType": "auto",
- "x": 540,
- "y": 800,
- "wires": []
- },
{
"id": "b45762f841ae061a",
"type": "change",
@@ -276,28 +257,10 @@
"y": 360,
"wires": [
[
- "cd2239f341d412e8",
- "196a8ef30b5d5dff"
+ "cd2239f341d412e8"
]
]
},
- {
- "id": "d935f4b8f31c5228",
- "type": "debug",
- "z": "d4a9b32e324082e1",
- "name": "",
- "active": false,
- "tosidebar": true,
- "console": false,
- "tostatus": false,
- "complete": "true",
- "targetType": "full",
- "statusVal": "",
- "statusType": "auto",
- "x": 770,
- "y": 800,
- "wires": []
- },
{
"id": "46b174e2a31a76e4",
"type": "ibmiot out",
@@ -313,42 +276,8 @@
"qos": "1",
"name": "IBM IoT",
"service": "registered",
- "x": 320,
- "y": 900,
- "wires": []
- },
- {
- "id": "d65eb96086ba96e1",
- "type": "debug",
- "z": "d4a9b32e324082e1",
- "name": "device data",
- "active": false,
- "tosidebar": true,
- "console": false,
- "tostatus": false,
- "complete": "payload",
- "targetType": "msg",
- "statusVal": "",
- "statusType": "auto",
- "x": 330,
- "y": 440,
- "wires": []
- },
- {
- "id": "196a8ef30b5d5dff",
- "type": "debug",
- "z": "d4a9b32e324082e1",
- "name": "device data",
- "active": false,
- "tosidebar": true,
- "console": false,
- "tostatus": false,
- "complete": "payload",
- "targetType": "msg",
- "statusVal": "",
- "statusType": "auto",
- "x": 1050,
- "y": 420,
+ "x": 1500,
+ "y": 540,
"wires": []
},
{
@@ -421,8 +350,8 @@
"checkall": "true",
"repair": false,
"outputs": 4,
- "x": 310,
- "y": 980,
+ "x": 1490,
+ "y": 620,
"wires": [
[
"f9573119ffe39fee"
@@ -449,8 +378,8 @@
"search": "_all_",
"design": "",
"index": "",
- "x": 290,
- "y": 680,
+ "x": 1490,
+ "y": 300,
"wires": [
[
"71d20d5a8aab7590"
@@ -467,8 +396,8 @@
"service": "cool-app-cloudant-1644397982194-95552",
"payonly": true,
"operation": "insert",
- "x": 480,
- "y": 980,
+ "x": 1700,
+ "y": 640,
"wires": []
},
{
@@ -481,8 +410,8 @@
"service": "cool-app-cloudant-1644397982194-95552",
"payonly": false,
"operation": "delete",
- "x": 480,
- "y": 1020,
+ "x": 1700,
+ "y": 680,
"wires": []
},
{
@@ -490,7 +419,7 @@
"type": "debug",
"z": "d4a9b32e324082e1",
"name": "",
- "active": true,
+ "active": false,
"tosidebar": true,
"console": false,
"tostatus": false,
@@ -498,8 +427,8 @@
"targetType": "full",
"statusVal": "",
"statusType": "auto",
- "x": 310,
- "y": 840,
+ "x": 1490,
+ "y": 480,
"wires": []
},
{
@@ -515,8 +444,8 @@
"targetType": "msg",
"statusVal": "",
"statusType": "auto",
- "x": 1110,
- "y": 580,
+ "x": 2170,
+ "y": 240,
"wires": []
},
{
@@ -530,12 +459,11 @@
"initialize": "",
"finalize": "",
"libs": [],
- "x": 570,
- "y": 680,
+ "x": 1750,
+ "y": 300,
"wires": [
[
- "6276e757bc9de8f6",
- "916e5be34b432d07"
+ "6276e757bc9de8f6"
]
]
},
@@ -559,8 +487,8 @@
"reduceInit": "",
"reduceInitType": "num",
"reduceFixup": "",
- "x": 870,
- "y": 680,
+ "x": 2010,
+ "y": 300,
"wires": [
[
"1b323c2b20dc1c8a",
@@ -568,23 +496,6 @@
]
]
},
- {
- "id": "916e5be34b432d07",
- "type": "debug",
- "z": "d4a9b32e324082e1",
- "name": "",
- "active": false,
- "tosidebar": true,
- "console": false,
- "tostatus": false,
- "complete": "payload",
- "targetType": "msg",
- "statusVal": "",
- "statusType": "auto",
- "x": 910,
- "y": 580,
- "wires": []
- },
{
"id": "f9573119ffe39fee",
"type": "function",
@@ -596,8 +507,8 @@
"initialize": "",
"finalize": "",
"libs": [],
- "x": 580,
- "y": 900,
+ "x": 1720,
+ "y": 560,
"wires": [
[]
]
@@ -613,8 +524,8 @@
"initialize": "",
"finalize": "",
"libs": [],
- "x": 570,
- "y": 940,
+ "x": 1740,
+ "y": 600,
"wires": [
[]
]
@@ -630,8 +541,8 @@
"initialize": "",
"finalize": "",
"libs": [],
- "x": 530,
- "y": 1140,
+ "x": 510,
+ "y": 580,
"wires": [
[
"146ffc5e96c33731",
@@ -651,11 +562,10 @@
"design": "",
"index": "",
"x": 330,
- "y": 1140,
+ "y": 580,
"wires": [
[
- "4bef76d63dce52d9",
- "eea483496a045eaa"
+ "4bef76d63dce52d9"
]
]
},
@@ -674,18 +584,18 @@
"qos": "1",
"name": "IBM IoT",
"service": "registered",
- "x": 860,
- "y": 1140,
+ "x": 720,
+ "y": 580,
"wires": []
},
{
"id": "9106f43c14eb2c33",
"type": "comment",
"z": "d4a9b32e324082e1",
- "name": "Check time every minute, if it matches the entry in DB, send a message to dispense food",
+ "name": "Check time every minute, if it matches an entry in the DB, send a message to dispense food",
"info": "",
"x": 360,
- "y": 1100,
+ "y": 540,
"wires": []
},
{
@@ -700,7 +610,7 @@
"onceDelay": 0.1,
"topic": "",
"x": 140,
- "y": 1140,
+ "y": 580,
"wires": [
[
"965a1206df52c1d5"
@@ -720,52 +630,35 @@
"targetType": "full",
"statusVal": "",
"statusType": "auto",
- "x": 850,
- "y": 1200,
+ "x": 710,
+ "y": 640,
"wires": []
},
{
- "id": "eea483496a045eaa",
+ "id": "246d4f49272a1ddc",
"type": "debug",
"z": "d4a9b32e324082e1",
- "name": "",
+ "name": "device data",
"active": false,
"tosidebar": true,
"console": false,
"tostatus": false,
- "complete": "payload[0]",
+ "complete": "payload",
"targetType": "msg",
"statusVal": "",
"statusType": "auto",
- "x": 620,
- "y": 1300,
+ "x": 710,
+ "y": 280,
"wires": []
},
{
- "id": "3ecd68a8f75981b0",
+ "id": "7b0efb3fc26b1996",
"type": "comment",
"z": "d4a9b32e324082e1",
- "name": "TODO: Conveert to JSON (stringify) and send message to dispense food",
+ "name": "Update heater_status and pump_status flow variables",
"info": "",
- "x": 780,
- "y": 1060,
- "wires": []
- },
- {
- "id": "246d4f49272a1ddc",
- "type": "debug",
- "z": "d4a9b32e324082e1",
- "name": "device data",
- "active": true,
- "tosidebar": true,
- "console": false,
- "tostatus": false,
- "complete": "payload",
- "targetType": "msg",
- "statusVal": "",
- "statusType": "auto",
- "x": 770,
- "y": 260,
+ "x": 620,
+ "y": 240,
"wires": []
},
{