Diff: globals.h

Revision:

26:bbcc25418ffa

Parent:

25:792540d69c49

Child:

27:2cb1bdb7ae3d

diff -r 792540d69c49 -r bbcc25418ffa globals.h
--- a/globals.h	Mon Nov 30 15:06:38 2015 +0000
+++ b/globals.h	Mon Nov 30 21:29:51 2015 +0000
@@ -28,11 +28,15 @@
 extern bool getBlockColourValue;
 extern float gIntegrationTime;
 extern int gToggleServoNumber;
+extern int errorMultiplier;
 
 const int kCommandBufferSize = 80;
 const int kSmallBufferSize = 5;
 const float kServoWait = 0.25;
 
+extern float currentMinError[3];
+extern float currentMaxError[3];
+
 #define FOREVER for(;;)
 
 const char CommandTypeValue [3] = {'!', '?', ':'};
@@ -40,7 +44,7 @@
 enum CommandTypeRaw { InvalidType = -1, Set = 0, Query = 1, Reply = 2 };
 
 const float kMinRedBlock[4] = {4.812, 2.286, 1.316, 1};
-const float kMaxRedBlock[4] = {4.812, 2.286, 1.316, 1};
+const float kMaxRedBlock[4] = {5.474, 3.105, 1.429, 1};
 const float kAverageRedBlock[4] = {5.25134482758621, 2.85965517241379, 1.35858620689655, 1};
 const float kMinError[3] = { 0.0836632980714298, 0.200602918123719, 0.0313459732480518};
 const float kMaxError[3] = { 0.0423996480376129, 0.0857952490051849, 0.051828726617427};
@@ -83,4 +87,6 @@
 
 void testBreakBeams(Controls state);
 
+void printColourDescription(Colour colour);
+void printBlockDescription(Block block);
 #endif