Diff: main.cpp

Revision:

9:b48423a135d8

Parent:

3:84d3ef9acd17

Child:

11:35b259e70c9a

--- a/main.cpp	Tue Nov 15 00:52:39 2016 +0000
+++ b/main.cpp	Tue Nov 15 20:30:12 2016 +0000
@@ -5,22 +5,21 @@
 #include "pulse.h"
 #include "hardware.h"
 #include "interface.h"
-
-//comment testing
-//adding comments to test version control functionality
+#include "voor.h"
+#include "sense.h"
 
 int main(){
     hardware* io = new hardware();
+    genData* generalData = new genData();
     chamberData* atrium = new chamberData(io->getSerial(),'a');
     chamberData* ventricle = new chamberData(io->getSerial(), 'v');
     pulse* ventPulse = new pulse(ventricle,io);
-    interface a(io->getSerial() , ventPulse , atrium , ventricle);    
+    interface a(io->getSerial() , ventPulse , generalData, atrium , ventricle); 
+    a.startScreen();   
     delete ventricle; //code never reaches here, since we're stuck in the while loops of the pacing, user interface, etc.
     delete atrium;
     delete ventPulse;
     delete io;
     
 return 0;
-    }
-    
-//added ending comments
\ No newline at end of file
+    }
\ No newline at end of file