高木のpixy2

Dependents:   00_yotsuba 10_motor-test 00_yotsuba 200_yotsuba_21

Files at this revision

API Documentation at this revision

Comitter:
THtakahiro702286
Date:
Thu Mar 04 14:20:55 2021 +0000
Parent:
0:12ef615ee47f
Commit message:
out raw

Changed in this revision

camera.cpp Show annotated file Show diff for this revision Revisions of this file
camera.h Show annotated file Show diff for this revision Revisions of this file
--- a/camera.cpp	Mon Jan 27 08:54:38 2020 +0000
+++ b/camera.cpp	Thu Mar 04 14:20:55 2021 +0000
@@ -160,53 +160,53 @@
     return data[i];
 }
 
-uint16_t Cam::rawBallCenterX(){
-    return ballData[0];
-}
-
-uint16_t Cam::rawBallCenterY(){
-    return ballData[1];
-}
-
-uint16_t Cam::rawBallWidth(){
-    return ballData[2];
-}
-
-uint16_t Cam::rawBallHeight(){
-    return ballData[3];
-}
-
-uint16_t Cam::rawBlueCenterX(){
-    return blueData[0];
-}
-
-uint16_t Cam::rawBlueCenterY(){
-    return blueData[1];
-}
-
-uint16_t Cam::rawBlueWidth(){
-    return blueData[2];
-}
-
-uint16_t Cam::rawBlueHeight(){
-    return blueData[3];
-}
-
-uint16_t Cam::rawYellowCenterX(){
-    return yellowData[0];
-}
-
-uint16_t Cam::rawYellowCenterY(){
-    return yellowData[1];
-}
-
-uint16_t Cam::rawYellowWidth(){
-    return yellowData[2];
-}
-
-uint16_t Cam::rawYellowHeight(){
-    return yellowData[3];
-}
+//uint16_t Cam::rawBallCenterX(){
+//    return ballData[0];
+//}
+//
+//uint16_t Cam::rawBallCenterY(){
+//    return ballData[1];
+//}
+//
+//uint16_t Cam::rawBallWidth(){
+//    return ballData[2];
+//}
+//
+//uint16_t Cam::rawBallHeight(){
+//    return ballData[3];
+//}
+//
+//uint16_t Cam::rawBlueCenterX(){
+//    return blueData[0];
+//}
+//
+//uint16_t Cam::rawBlueCenterY(){
+//    return blueData[1];
+//}
+//
+//uint16_t Cam::rawBlueWidth(){
+//    return blueData[2];
+//}
+//
+//uint16_t Cam::rawBlueHeight(){
+//    return blueData[3];
+//}
+//
+//uint16_t Cam::rawYellowCenterX(){
+//    return yellowData[0];
+//}
+//
+//uint16_t Cam::rawYellowCenterY(){
+//    return yellowData[1];
+//}
+//
+//uint16_t Cam::rawYellowWidth(){
+//    return yellowData[2];
+//}
+//
+//uint16_t Cam::rawYellowHeight(){
+//    return yellowData[3];
+//}
 
 bool Cam::ballSignal(){
     return ballSig;
--- a/camera.h	Mon Jan 27 08:54:38 2020 +0000
+++ b/camera.h	Thu Mar 04 14:20:55 2021 +0000
@@ -26,18 +26,18 @@
     uint16_t yellowHeight();
     
     uint16_t getData(int i);
-    uint16_t rawBallCenterX();
-    uint16_t rawBallCenterY();
-    uint16_t rawBallWidth();
-    uint16_t rawBallHeight();
-    uint16_t rawBlueCenterX();
-    uint16_t rawBlueCenterY();
-    uint16_t rawBlueWidth();
-    uint16_t rawBlueHeight();
-    uint16_t rawYellowCenterX();
-    uint16_t rawYellowCenterY();
-    uint16_t rawYellowWidth();
-    uint16_t rawYellowHeight();
+//    uint16_t rawBallCenterX();
+//    uint16_t rawBallCenterY();
+//    uint16_t rawBallWidth();
+//    uint16_t rawBallHeight();
+//    uint16_t rawBlueCenterX();
+//    uint16_t rawBlueCenterY();
+//    uint16_t rawBlueWidth();
+//    uint16_t rawBlueHeight();
+//    uint16_t rawYellowCenterX();
+//    uint16_t rawYellowCenterY();
+//    uint16_t rawYellowWidth();
+//    uint16_t rawYellowHeight();
     
     bool ballSignal();
     bool blueSignal();