Diff: main.cpp

Revision:

12:03589f1d5c30

Parent:

11:b538e73841ae

Child:

13:41c394fa932c

--- a/main.cpp	Mon Jan 08 15:12:23 2018 +0000
+++ b/main.cpp	Tue Jan 09 08:57:57 2018 +0000
@@ -5,27 +5,35 @@
 #include "LCD.h"
 #include "SDCard.h"
 #include "SDBlockDevice.h"
-#include "FATFileSystem.h"
+
 
 
+//Hardware setup
+BMP280 sensor(D14, D15);
+AnalogIn LDRSensor(A0);
+DigitalOut SamplingLED(PB_10);
+
+Serial PC(USBTX, USBRX);
 //SD Card Object
-SDBlockDevice sd(D11, D12, D13, D10); // mosi, miso, sclk, cs
+
 //LCD Object
 ENVDISPLAY lcd(D9, D8, D7, D6, D4, D2,PE_12, PE_14);
 //File pointer for the SD card
-FILE* fp;
+//FILE* fp;
 
 int main()
 {
     //Initialise devices
 ////WebUISetup();
-    
-    
+       
     //Hardware Self Test
     
     //Initialise interrupts and times
     SerialStart();
     lcd.Start();
+    SDCardInit();
+
+    
     ConfigThreadsAndIR();
     firstSample = true; //Set only at start of program