Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master'
Browse files Browse the repository at this point in the history
  • Loading branch information
@jonnor
jonnor committed Jan 10, 2015
2 parents 6d117e9 + 6cbcde5 commit 50853a2
Show file tree
Hide file tree
Showing 2 changed files with 38 additions and 230 deletions.
2 changes: 1 addition & 1 deletion graphs/FetchDat.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -543,7 +543,7 @@
}
},
{
"data": 7000,
"data": 10000,
"tgt": {
"process": "core/RunInterval_a6amz",
"port": "interval"
Expand Down
266 changes: 37 additions & 229 deletions graphs/bgt9b.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -62,14 +62,7 @@
},
{
"name": "Web Version",
"nodes": [
"PrepareMessage",
"core/Drop_z1l5r",
"strings/Jsonify_urxeq",
"webserver/Server_uovn0",
"websocket/ListenConnections_9f5av",
"websocket/SendMessage_9oy1f"
],
"nodes": [],
"metadata": {
"description": ""
}
Expand Down Expand Up @@ -140,56 +133,6 @@
"height": 72
}
},
"webserver/Server_uovn0": {
"component": "webserver/Server",
"metadata": {
"label": "HTTPServer",
"x": 1188,
"y": 540,
"width": 72,
"height": 72
}
},
"websocket/ListenConnections_9f5av": {
"component": "websocket/ListenConnections",
"metadata": {
"label": "WebSocketConnection",
"x": 1296,
"y": 576,
"width": 72,
"height": 72
}
},
"websocket/SendMessage_9oy1f": {
"component": "websocket/SendMessage",
"metadata": {
"label": "SendToTable",
"x": 1440,
"y": 684,
"width": 72,
"height": 72
}
},
"strings/Jsonify_urxeq": {
"component": "strings/Jsonify",
"metadata": {
"label": "Stringify",
"x": 1296,
"y": 684,
"width": 72,
"height": 72
}
},
"core/Drop_z1l5r": {
"component": "core/Drop",
"metadata": {
"label": "IgnoreHTTP",
"x": 1440,
"y": 540,
"width": 72,
"height": 72
}
},
"ingress-table/CalculateState_xkyq7": {
"component": "ingress-table/CalculateState",
"metadata": {
Expand Down Expand Up @@ -220,16 +163,6 @@
"height": 72
}
},
"PrepareMessage": {
"component": "ingress-table/PrepareMessage",
"metadata": {
"label": "PrepareMessage",
"x": 1008,
"y": 540,
"width": 72,
"height": 72
}
},
"ingress-table/DetermineWinner_z8u0g": {
"component": "ingress-table/DetermineWinner",
"metadata": {
Expand Down Expand Up @@ -314,20 +247,20 @@
"component": "runtime/StreetLights",
"metadata": {
"label": "TableLights",
"x": 1404,
"y": 1008,
"x": 1440,
"y": 972,
"device": "/dev/ttyACM1",
"baudrate": 115200,
"width": 72,
"height": 144
"height": 132
}
},
"PortalLights": {
"component": "runtime/PortalLights",
"metadata": {
"label": "PortalLights",
"x": 1404,
"y": 864,
"x": 1440,
"y": 360,
"device": "/dev/ttyACM0",
"width": 72,
"height": 72
Expand Down Expand Up @@ -378,45 +311,6 @@
"route": 2
}
},
{
"src": {
"process": "webserver/Server_uovn0",
"port": "request"
},
"tgt": {
"process": "core/Drop_z1l5r",
"port": "in"
},
"metadata": {
"route": 1
}
},
{
"src": {
"process": "webserver/Server_uovn0",
"port": "server"
},
"tgt": {
"process": "websocket/ListenConnections_9f5av",
"port": "server"
},
"metadata": {
"route": 7
}
},
{
"src": {
"process": "websocket/ListenConnections_9f5av",
"port": "connection"
},
"tgt": {
"process": "websocket/SendMessage_9oy1f",
"port": "connection"
},
"metadata": {
"route": 7
}
},
{
"src": {
"process": "ingress-table/FetchDat_7edo2",
Expand Down Expand Up @@ -456,45 +350,6 @@
"route": 4
}
},
{
"src": {
"process": "strings/Jsonify_urxeq",
"port": "out"
},
"tgt": {
"process": "websocket/SendMessage_9oy1f",
"port": "string"
},
"metadata": {
"route": 7
}
},
{
"src": {
"process": "ingress-table/StateToColor_ifaav",
"port": "colors"
},
"tgt": {
"process": "PrepareMessage",
"port": "portals"
},
"metadata": {
"route": 4
}
},
{
"src": {
"process": "PrepareMessage",
"port": "message"
},
"tgt": {
"process": "strings/Jsonify_urxeq",
"port": "in"
},
"metadata": {
"route": 7
}
},
{
"src": {
"process": "ingress-table/StateToColor_ifaav",
Expand All @@ -508,19 +363,6 @@
"route": 5
}
},
{
"src": {
"process": "ingress-table/DetermineWinner_z8u0g",
"port": "colors"
},
"tgt": {
"process": "PrepareMessage",
"port": "bottomstripes"
},
"metadata": {
"route": 5
}
},
{
"src": {
"process": "strings/ParseJson_l8zh",
Expand All @@ -534,19 +376,6 @@
"route": null
}
},
{
"src": {
"process": "ingress-table/Pulsate_qo650",
"port": "colors"
},
"tgt": {
"process": "PrepareMessage",
"port": "innerstripes"
},
"metadata": {
"route": 3
}
},
{
"src": {
"process": "core/RunInterval_5f3rf",
Expand Down Expand Up @@ -681,19 +510,6 @@
"port": "colors"
}
},
{
"src": {
"process": "ingress-table/Pulsate_qo650",
"port": "colors"
},
"tgt": {
"process": "ingress-table/ConvertStreetLight_luj6x",
"port": "colors"
},
"metadata": {
"route": 3
}
},
{
"src": {
"process": "core/Repeat_x0tsf",
Expand Down Expand Up @@ -949,17 +765,16 @@
}
},
{
"data": "ingress",
"tgt": {
"process": "websocket/ListenConnections_9f5av",
"port": "protocol"
}
},
{
"data": "1000",
"src": {
"process": "ingress-table/Pulsate_qo650",
"port": "colors"
},
"tgt": {
"process": "ingress-table/StateToColor_ifaav",
"port": "blink"
"process": "ingress-table/ConvertStreetLight_luj6x",
"port": "colors"
},
"metadata": {
"route": 3
}
},
{
Expand All @@ -976,13 +791,6 @@
"port": "in"
}
},
{
"data": "8001",
"tgt": {
"process": "webserver/Server_uovn0",
"port": "listen"
}
},
{
"data": "portals.json",
"tgt": {
Expand All @@ -997,34 +805,13 @@
"port": "interval"
}
},
{
"data": "10000",
"tgt": {
"process": "ingress-table/StabilizePortal_sg4x0",
"port": "wait"
}
},
{
"data": 500,
"tgt": {
"process": "core/RunInterval_82o32",
"port": "interval"
}
},
{
"data": "NOFLO_PROJECT_ROOT",
"tgt": {
"process": "ConfigPaths",
"port": "envvar"
}
},
{
"data": false,
"tgt": {
"process": "websocket/SendMessage_9oy1f",
"port": "buffer"
}
},
{
"data": "cookie.txt",
"tgt": {
Expand Down Expand Up @@ -1052,6 +839,27 @@
"process": "PortalToCbeam",
"port": "qos"
}
},
{
"data": "1000",
"tgt": {
"process": "core/RunInterval_82o32",
"port": "interval"
}
},
{
"data": "2000",
"tgt": {
"process": "ingress-table/StateToColor_ifaav",
"port": "blink"
}
},
{
"data": "20000",
"tgt": {
"process": "ingress-table/StabilizePortal_sg4x0",
"port": "wait"
}
}
]
}
}

0 comments on commit 50853a2

Please sign in to comment.