Diff: main.cpp

Revision:

5:9b4844128e09

Parent:

3:a88838ff33e7

Child:

6:f0601ebd2423

--- a/main.cpp	Thu Dec 07 15:43:01 2017 +0000
+++ b/main.cpp	Fri Jan 05 14:13:43 2018 +0000
@@ -1,81 +1,40 @@
-#include "sample_hardware.hpp"
-#include "Networkbits.hpp"
-
+#include "components.hpp"
+#include "SDBlockDevice.h"
+#include "FATFileSystem.h"
+//#include "Networkbits.hpp"
+#include "mbed.h"
+#include "lglcd.h"
+#include "stdio.h"
 // This is a very short demo that demonstrates all the hardware used in the coursework.
 // You will need a network connection set up (covered elsewhere). The host PC should have the address 10.0.0.1
 
 //Threads
 Thread nwrkThread;
- 
-
-int main() {
-    //Greeting
-    printf("Testing\n\n");    
-    
-    //Power on self test
-    post();
-    
-    //Initialise the SD card (this needs to move)
-    if ( sd.init() != 0) {
-        printf("Init failed \n");
-        lcd.cls();
-        lcd.printf("CANNOT INIT SD");        
-        errorCode(FATAL);
-    } 
-    
-    //Create a filing system for SD Card
-    FATFileSystem fs("sd", &sd);     
-
-    //Open to WRITE
-    FILE* fp = fopen("/sd/test.csv","a");
-    if (fp == NULL) {
-        error("Could not open file for write\n");
-        lcd.cls();
-        lcd.printf("CANNOT OPEN FILE\n\n");
-        errorCode(FATAL);
+int main(){
+lglcd mylcd(D7,D6,D5,D4,D3,D2);
+mylcd.clear();
+while(true){        
+double temp = sensor.getTemperature();
+double pressure = sensor.getPressure(); 
+char TEM[6];
+char PRE[5];  
+sprintf(TEM,"%.2f", temp);
+sprintf(PRE,"%.2f", pressure);
+printf(TEM);
+printf(PRE);
+mylcd.clear();
+mylcd.write("Pre:    ");
+mylcd.write(PRE);
+wait(0.5);
+mylcd.clear();
+mylcd.write("Temp:     ");
+mylcd.write(TEM);
+wait(0.5);
+      
     }
     
-    //Last message before sampling begins
-    lcd.cls();
-    lcd.printf("READY\n\n");
-        
-        
-    //Press either switch to unmount
-    while ((SW1 == 0) && (SW2 == 0)) {
-        
-        //Base loop delay
-        wait(1.0);
-        
-        //Read environmental sensors
-        double temp = sensor.getTemperature();
-        double pressure = sensor.getPressure();
-        
-        //Write new data to LCD (not fast!)
-        lcd.cls();
-        lcd.printf("Temp   Pressure\n"); 
-        lcd.printf("%6.1f ",temp);
-        lcd.printf("%.2f\n",pressure);
-        
-        //Write to SD (potentially slow)
-        fprintf(fp, "%6.1f,%.2f\n\r", temp, pressure);
-    }
-    
-    //Close File
-    fclose(fp);
-    
-    //Close down
-    sd.deinit();
-    printf("Unmounted...\n");
-    lcd.cls();
-    lcd.printf("Unmounted...\n\n");
-    
     //Flash to indicate goodness
-    while(true) {
-        greenLED = 1;
-        wait(0.5);
-        greenLED = 0;
-        wait(0.1);    
-    }
+  
 }