Diff: global.h

Revision:

15:caa5a93a31d7

Parent:

14:2d609d465f00

Child:

16:73db7ef2deb6

--- a/global.h	Sat Mar 26 17:52:34 2016 +0000
+++ b/global.h	Sat Mar 26 19:24:02 2016 +0000
@@ -7,12 +7,15 @@
 // Contains common defintions share between modes
 // ----------------------------------------------------------------
 
+
 // Preprocessor Definitions
 // ----------------------------------------------------------------
 #define SPEED_MAX 40 // rads/s
 #define MAX_BLOCKS 1
+#define X_SETPOINT 160
+#define HEIGHT_SETPOINT 90
+#define TARGET_DECIMAL 10 
 
-#define TARGET_DECIMAL 10 
 #define PWM_PERIOD 0.001
 #define MOTOR_PERIOD 0.001
 #define NAVIGATION_PERIOD 0.0167 // 60 times/sec
@@ -57,5 +60,5 @@
 extern InterruptIn bumper;  // External interrupt pin declared as Bumper
 
 // Method prototypes
-void PI(float error, float *output, float *integral, float kP, float kI, float bound);
+char flushBuffer(void);
 float QE2RadsPerSec(short counts, short time);
\ No newline at end of file