Diff: Global.h

Revision:

16:7e36177b4435

Parent:

13:a8e10a69df45

Child:

17:887cfe1d309f

--- a/Global.h	Mon Dec 21 17:06:25 2015 +0000
+++ b/Global.h	Tue Feb 09 13:07:29 2016 +0000
@@ -38,6 +38,7 @@
     static double cadence;
     static double ultsonic;
     static double atmpress;
+    static int    selector;
     
     static int pitchtime;
     static int pitchdegreetime;
@@ -49,12 +50,13 @@
     static int cadencetime;
     static int ultsonictime;
     static int atmpresstime;
-    
+    static int selectortime;
     
     
     
     public :
     static Queue<char, 20> initqueue;
+    static Queue<char, 20> displayqueue;
     
     static void initialize();
     static void fileread();
@@ -65,10 +67,7 @@
     
     static class Timer timer;
     static class DigitalIn initializeswitch;
-    static class DigitalOut led1;
-    static class DigitalOut led2;
-    static class DigitalOut led3;
-    static class DigitalOut led4;
+    static class DigitalOut led[4];
     static class LocalFileSystem local;
 
     
@@ -125,6 +124,7 @@
     static double getcadence();
     static double getultsonic();
     static double getatmpress();
+    static int    getselector();
 
     static int getpitchtime();
     static int getpitchdegreetime();
@@ -136,6 +136,7 @@
     static int getcadencetime();
     static int getultsonictime();
     static int getatmpresstime();
+    static int getselectortime();
 
 
     static void setpitch(double _pitch);
@@ -147,7 +148,8 @@
     static void setairspeed(double _airspeed);
     static void setcadence(double _cadence);
     static void setultsonic(double _ultsonic);
-    static void setatmpress(double _atmpress);           
+    static void setatmpress(double _atmpress);
+    static void setselector(int _selector);           
 };
 
 #endif
\ No newline at end of file