Diff: sensorGen.h

Revision:

4:f651e59a9805

Parent:

2:10fa708a59e1

Child:

5:8ed76df0196b

--- a/sensorGen.h	Sat Dec 12 05:07:48 2020 +0000
+++ b/sensorGen.h	Thu Mar 04 11:58:41 2021 +0000
@@ -1,15 +1,15 @@
 #ifndef SENSORGEN_H
 #define SENSORGEN_H
 
-#include "mbed.h"
 #include "camera.h"
 #include "line.h"
 #include "jy901.h"
-#include "pin_config.h"
+#include "main.h"
 
-class sensor{
+class sensorgen
+{
 public :
-    sensor();
+    sensorgen();
        
     void sensorloop();
        
@@ -19,31 +19,30 @@
        
 //    float camera();
     
-    int line[6];
+    int   line[6];
     float angle;
     float angleLimit;
     float ballAngle;
     float ballRange;
-    bool ballKeep;
+    bool  ballKeep;
     float blueAngle;
     float blueRange;
     float yellowAngle;
     float yellowRange;
-    bool ballSig,blueSig,yellowSig;
+    bool  ballSig, blueSig, yellowSig;
 //private:
     Thread thread;
-    Line *_line[6];
-    Cam camera;
-    JY901 jy;
-    DigitalIn limit;
-    Timer ballTimeout;
-    Timer blueTimeout;
-    Timer yellowTimeout;
-    bool ballTimeoutState,blueTimeoutState,yellowTimeoutState;
-    int angleCount;
-    int ballx,bally,bluex,bluey,yellowx,yellowy;
-    float tempAngle,rawAngle;
-    int ballkeepcount,ballcount,yellowcount,bluecount;
+    Line   *_line[6];
+    Cam    camera;
+    JY901  jy;
+    Timer  ballTimeout;
+    Timer  blueTimeout;
+    Timer  yellowTimeout;
+    bool   ballTimeoutState,blueTimeoutState,yellowTimeoutState;
+    int    angleCount;
+    int    ballx,bally,bluex,bluey,yellowx,yellowy;
+    float  tempAngle,rawAngle;
+    int    ballkeepcount,ballcount,yellowcount,bluecount;
 };
 
 #endif
\ No newline at end of file