Diff: interface.h

Revision:

32:69cd1390bc21

Parent:

31:5e55042e025a

--- a/interface.h	Tue Nov 29 22:01:54 2016 +0000
+++ b/interface.h	Tue Dec 06 20:57:56 2016 +0000
@@ -6,6 +6,7 @@
 #include "pulse.h"
 #include "dataStruct.h"
 #include "queue.h"
+#include "rtos.h"
 
 class interface{
 
@@ -14,7 +15,7 @@
     ~interface();
     interface(Serial*);
     interface(Serial* , pulse* , genData*, chamberData* , chamberData*, hardware*);
-    void startScreen();
+    void readValues();
 
 //    void setAtrium(AnalogOut&);
 //    void setVentricle(AnalogOut&);
@@ -23,18 +24,15 @@
 
       
 private:
-    void dataScreen();
-    void genDataScreen();
-    void chamberDataScreen(chamberData*);
-    void getData(chamberData*);
-    void chngVentData();
     char* getInput();
+    char buffer[128];
+    char* value;
+    char command;
+    int* valInRange();
     char getChar();
-    void changeData(int , double); // UI tells the user to you 1 for atrium, 2 for ventricle, etc.
-    void getData(int);
-    void getEgram();
     bool isEgram;
     double myValue;
+    DigitalOut rled; 
     Serial* pc;
     pulse* interfacePulse;
     pulse* atrPulse;
@@ -43,7 +41,6 @@
     chamberData* ventData;
     dataStruct* myDataStruct;
     hardware* myHardware;
-    queue myQueue;
     unsigned char nTemp;
     static const int N = 13;
 };
\ No newline at end of file