Make camera definitions work on 7971
Flip over to the real camera definitions and add support for 7971
Change-Id: I5ca92212cabba105952d44bc740970ad9ed5f92f
diff --git a/y2020/vision/BUILD b/y2020/vision/BUILD
index ded680d..6850a27 100644
--- a/y2020/vision/BUILD
+++ b/y2020/vision/BUILD
@@ -43,7 +43,7 @@
"//aos/events:shm_event_loop",
"//aos/network:team_number",
"//third_party:opencv",
- "//y2020/vision/sift:demo_sift",
+ "//y2020/vision/tools/python_code:sift_training_data",
"//y2020/vision/sift:sift971",
"//y2020/vision/sift:sift_fbs",
"//y2020/vision/sift:sift_training_fbs",
diff --git a/y2020/vision/camera_reader.cc b/y2020/vision/camera_reader.cc
index 25b2dae..25cf33a 100644
--- a/y2020/vision/camera_reader.cc
+++ b/y2020/vision/camera_reader.cc
@@ -7,7 +7,7 @@
#include "aos/init.h"
#include "aos/network/team_number.h"
-#include "y2020/vision/sift/demo_sift.h"
+#include "y2020/vision/tools/python_code/sift_training_data.h"
#include "y2020/vision/sift/sift971.h"
#include "y2020/vision/sift/sift_generated.h"
#include "y2020/vision/sift/sift_training_generated.h"
@@ -335,7 +335,7 @@
aos::FlatbufferDetachedBuffer<aos::Configuration> config =
aos::configuration::ReadConfig("config.json");
- const auto training_data_bfbs = DemoSiftData();
+ const auto training_data_bfbs = SiftTrainingData();
const sift::TrainingData *const training_data =
flatbuffers::GetRoot<sift::TrainingData>(training_data_bfbs.data());
{
diff --git a/y2020/vision/tools/python_code/camera_definition.py b/y2020/vision/tools/python_code/camera_definition.py
index ce25ea5..f6a3591 100644
--- a/y2020/vision/tools/python_code/camera_definition.py
+++ b/y2020/vision/tools/python_code/camera_definition.py
@@ -55,8 +55,8 @@
camera_list = []
-for team_number in (971, 8971, 9971):
- for node_name in ("pi-0", "pi-1", "pi-2", "pi-3", "pi-4"):
+for team_number in (971, 7971, 8971, 9971):
+ for node_name in ("pi0", "pi1", "pi2", "pi3", "pi4"):
camera_base = copy.deepcopy(web_cam_params)
camera_base.node_name = node_name
camera_base.team_number = team_number