fixes that got rest by a previous pull

S1ink · Jan 1, 2022 · 5596d80 · 5596d80
1 parent 4dfcb68
commit 5596d80
Show file tree

Hide file tree

Showing 5 changed files with 3 additions and 3 deletions.
diff --git a/out/include/target.inc b/out/include/target.inc
@@ -32,7 +32,7 @@ void Target<corners>::sort(const std::vector<cv::Point_<num_t> >& contour) {
 		this->points.end(), 
 		[this](const cv::Point2f& a, const cv::Point2f& b) {
 			this->a = a - this->center;
-			this->a = b - this->center;
+			this->b = b - this->center;
 			return -atan2(this->a.x, this->a.y) < -atan2(this->b.x, this->b.y);	// note that x and y are switched -> clockwise
 		}
 	);

diff --git a/out/lib3407visionserver.a b/out/lib3407visionserver.a
diff --git a/out/vision_program b/out/vision_program
diff --git a/src/api/target.inc b/src/api/target.inc
@@ -32,7 +32,7 @@ void Target<corners>::sort(const std::vector<cv::Point_<num_t> >& contour) {
 		this->points.end(), 
 		[this](const cv::Point2f& a, const cv::Point2f& b) {
 			this->a = a - this->center;
-			this->a = b - this->center;
+			this->b = b - this->center;
 			return -atan2(this->a.x, this->a.y) < -atan2(this->b.x, this->b.y);	// note that x and y are switched -> clockwise
 		}
 	);

diff --git a/src/main.cpp b/src/main.cpp
@@ -29,7 +29,7 @@ int main(int argc, char* argv[]) {
 	else { return EXIT_FAILURE; }
 
 	VisionServer server(std::move(cameras));
-	server.runVision<DefaultPipeline, BBoxDemo, TargetSolver<Test6x6, WeightedSubtraction<VThreshold::LED::BLUE> > >(25);
+	server.runVision<BBoxDemo, SquareTargetPNP, TargetSolver<Test6x6, WeightedSubtraction<VThreshold::LED::BLUE> > >(25);
 }
 
 // LIST OF THINGS