Add pi4 and laptop
Pi's on 3 sides + 1 on the turret. laptop will be the logger node at
some point in the future.
To do this, we need to edit the log file header again for the test
data...
Change-Id: I7a39d6644882e4c96dca1d689183295534d3aab4
diff --git a/aos/events/event_loop.cc b/aos/events/event_loop.cc
index 2ffad3b..c03425e 100644
--- a/aos/events/event_loop.cc
+++ b/aos/events/event_loop.cc
@@ -399,6 +399,9 @@
const Channel *channel = configuration::GetChannel(
configuration(), "/aos", timing::Report::GetFullyQualifiedName(),
name(), node());
+ CHECK(channel != nullptr) << ": Failed to look up {\"name\": \"/aos\", "
+ "\"type\": \"aos.timing.Report\"} on node "
+ << FlatbufferToJson(node());
// Since we are using a RawSender, validity isn't checked. So check it
// ourselves.
diff --git a/aos/events/logging/multinode_pingpong.json b/aos/events/logging/multinode_pingpong.json
index f1bcc54..1b1424e 100644
--- a/aos/events/logging/multinode_pingpong.json
+++ b/aos/events/logging/multinode_pingpong.json
@@ -1,7 +1,7 @@
{
"channels": [
{
- "name": "/aos/pi1",
+ "name": "/pi1/aos",
"type": "aos.logging.LogMessageFbs",
"source_node": "pi1",
"frequency": 200,
@@ -9,7 +9,7 @@
"max_size": 2048
},
{
- "name": "/aos/pi2",
+ "name": "/pi2/aos",
"type": "aos.logging.LogMessageFbs",
"source_node": "pi2",
"frequency": 200,
@@ -18,7 +18,7 @@
},
/* Logged on pi1 locally */
{
- "name": "/aos/pi1",
+ "name": "/pi1/aos",
"type": "aos.timing.Report",
"source_node": "pi1",
"frequency": 50,
@@ -26,7 +26,7 @@
"max_size": 2048
},
{
- "name": "/aos/pi2",
+ "name": "/pi2/aos",
"type": "aos.timing.Report",
"source_node": "pi2",
"frequency": 50,
@@ -73,42 +73,20 @@
"maps": [
{
"match": {
- "name": "/aos",
- "type": "aos.logging.LogMessageFbs",
+ "name": "/aos*",
"source_node": "pi1"
},
"rename": {
- "name": "/aos/pi1"
+ "name": "/pi1/aos"
}
},
{
"match": {
- "name": "/aos",
- "type": "aos.logging.LogMessageFbs",
+ "name": "/aos*",
"source_node": "pi2"
},
"rename": {
- "name": "/aos/pi2"
- }
- },
- {
- "match": {
- "name": "/aos",
- "type": "aos.timing.Report",
- "source_node": "pi1"
- },
- "rename": {
- "name": "/aos/pi1"
- }
- },
- {
- "match": {
- "name": "/aos",
- "type": "aos.timing.Report",
- "source_node": "pi2"
- },
- "rename": {
- "name": "/aos/pi2"
+ "name": "/pi2/aos"
}
}
],
diff --git a/aos/events/multinode_pingpong.json b/aos/events/multinode_pingpong.json
index 54cc658..e56d331 100644
--- a/aos/events/multinode_pingpong.json
+++ b/aos/events/multinode_pingpong.json
@@ -1,7 +1,7 @@
{
"channels": [
{
- "name": "/aos/pi1",
+ "name": "/pi1/aos",
"type": "aos.logging.LogMessageFbs",
"source_node": "pi1",
"frequency": 200,
@@ -9,7 +9,7 @@
"max_size": 2048
},
{
- "name": "/aos/pi2",
+ "name": "/pi2/aos",
"type": "aos.logging.LogMessageFbs",
"source_node": "pi2",
"frequency": 200,
@@ -17,7 +17,7 @@
"max_size": 2048
},
{
- "name": "/aos/pi3",
+ "name": "/pi3/aos",
"type": "aos.logging.LogMessageFbs",
"source_node": "pi3",
"frequency": 200,
@@ -25,7 +25,7 @@
"max_size": 2048
},
{
- "name": "/aos/pi1",
+ "name": "/pi1/aos",
"type": "aos.message_bridge.Timestamp",
"source_node": "pi1",
"frequency": 10,
@@ -45,7 +45,7 @@
]
},
{
- "name": "/aos/pi2",
+ "name": "/pi2/aos",
"type": "aos.message_bridge.Timestamp",
"source_node": "pi2",
"frequency": 10,
@@ -60,7 +60,7 @@
]
},
{
- "name": "/aos/pi3",
+ "name": "/pi3/aos",
"type": "aos.message_bridge.Timestamp",
"source_node": "pi3",
"frequency": 10,
@@ -75,43 +75,43 @@
]
},
{
- "name": "/aos/pi1",
+ "name": "/pi1/aos",
"type": "aos.message_bridge.ServerStatistics",
"source_node": "pi1",
"frequency": 2
},
{
- "name": "/aos/pi2",
+ "name": "/pi2/aos",
"type": "aos.message_bridge.ServerStatistics",
"source_node": "pi2",
"frequency": 2
},
{
- "name": "/aos/pi3",
+ "name": "/pi3/aos",
"type": "aos.message_bridge.ServerStatistics",
"source_node": "pi3",
"frequency": 2
},
{
- "name": "/aos/pi1",
+ "name": "/pi1/aos",
"type": "aos.message_bridge.ClientStatistics",
"source_node": "pi1",
"frequency": 2
},
{
- "name": "/aos/pi2",
+ "name": "/pi2/aos",
"type": "aos.message_bridge.ClientStatistics",
"source_node": "pi2",
"frequency": 2
},
{
- "name": "/aos/pi3",
+ "name": "/pi3/aos",
"type": "aos.message_bridge.ClientStatistics",
"source_node": "pi3",
"frequency": 2
},
{
- "name": "/aos/pi1",
+ "name": "/pi1/aos",
"type": "aos.timing.Report",
"source_node": "pi1",
"frequency": 50,
@@ -119,7 +119,7 @@
"max_size": 2048
},
{
- "name": "/aos/pi2",
+ "name": "/pi2/aos",
"type": "aos.timing.Report",
"source_node": "pi2",
"frequency": 50,
@@ -127,7 +127,7 @@
"max_size": 2048
},
{
- "name": "/aos/pi3",
+ "name": "/pi3/aos",
"type": "aos.timing.Report",
"source_node": "pi3",
"frequency": 50,
@@ -190,29 +190,29 @@
"maps": [
{
"match": {
- "name": "/aos",
+ "name": "/aos*",
"source_node": "pi1"
},
"rename": {
- "name": "/aos/pi1"
+ "name": "/pi1/aos"
}
},
{
"match": {
- "name": "/aos",
+ "name": "/aos*",
"source_node": "pi2"
},
"rename": {
- "name": "/aos/pi2"
+ "name": "/pi2/aos"
}
},
{
"match": {
- "name": "/aos",
+ "name": "/aos*",
"source_node": "pi3"
},
"rename": {
- "name": "/aos/pi3"
+ "name": "/pi3/aos"
}
}
],