Update y2020 configs with 5th pi + timestamp channels
Also, update the drivetrain_replay_test to go with it.
Change-Id: Ic88b2f79b14b260e345cfec4f3e5ce3e16a5bd2f
diff --git a/aos/events/logging/logfile_sorting.cc b/aos/events/logging/logfile_sorting.cc
index 9e406e9..e188bf2 100644
--- a/aos/events/logging/logfile_sorting.cc
+++ b/aos/events/logging/logfile_sorting.cc
@@ -80,6 +80,12 @@
closedir(directory);
}
+std::vector<std::string> FindLogs(std::string filename) {
+ std::vector<std::string> files;
+ FindLogs(&files, filename);
+ return files;
+}
+
std::vector<std::string> FindLogs(int argc, char **argv) {
std::vector<std::string> found_logfiles;
diff --git a/aos/events/logging/logfile_sorting.h b/aos/events/logging/logfile_sorting.h
index 95a6431..3b4422f 100644
--- a/aos/events/logging/logfile_sorting.h
+++ b/aos/events/logging/logfile_sorting.h
@@ -93,6 +93,10 @@
// them to the vector.
void FindLogs(std::vector<std::string> *files, std::string filename);
+// Recursively searches the file/folder for .bfbs and .bfbs.xz files and returns
+// them in a vector.
+std::vector<std::string> FindLogs(std::string filename);
+
// Recursively searches for logfiles in argv[1] and onward.
std::vector<std::string> FindLogs(int argc, char **argv);
diff --git a/aos/network/timestamp_channel.cc b/aos/network/timestamp_channel.cc
index d022b60..bc8c1d9 100644
--- a/aos/network/timestamp_channel.cc
+++ b/aos/network/timestamp_channel.cc
@@ -42,7 +42,7 @@
RemoteMessage::GetFullyQualifiedName(), name_, node_, true);
if (shared_timestamp_channel != nullptr) {
LOG(WARNING) << "Failed to find timestamp channel {\"name\": \""
- << split_timestamp_channel << "\", \"type\": \""
+ << split_timestamp_channel_name << "\", \"type\": \""
<< RemoteMessage::GetFullyQualifiedName()
<< "\"}, falling back to old version.";
return shared_timestamp_channel;