Revision 57:4ae308bac609, committed 2018-10-09

Comitter:

MathieuM

Date:

Tue Oct 09 11:47:36 2018 +0000

Parent:

56:d9557c842d5d

Child:

61:1104fcf792f3

Child:

62:d902b1e77094

Commit message:

merge

Changed in this revision

--- a/main.cpp.orig	Tue Oct 09 11:40:10 2018 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,58 +0,0 @@
-#include "mbed.h"
-#include "config.h"
-#include "communication.h"
-#include "T_H_air.h"
-#include "altitude.h"
-#include "HMC5883L.h"
-
-
-Serial wisol(SERIAL_PORT);
-Serial pc(USBTX, USBRX);
-DHT sensor(PIN_NAME, DHTtype);
-I2C hp206c(HP20X_I2C_PORT);
-HMC5883L hmc5883(HMC5883_I2C_PORT);
-
-int main() {
-    while(1) {
-        float airH, tmpH, tmpT, airT;
-        char *message;
-        int16_t magXYZ[3];
-        unsigned long alt;
-        /*
-        read T&H air
-        read T sol
-        read H sol
-        read Pressure
-        read Magnetic
-        
-        m = genMessage(T_air, H_air, T_sol, H_sol, Pressure, Mag)
-        sendMessage(m)
-    
-        airH = airHumidity(sensor);
-        airT = airTemperature(sensor);
-        message = genMessage(airT, airH);
-        wisol.printf("AT$SF=%s\r\n", message);
-        */
-        
-        //collect data
-        alt = readAltitude(&hp206c);
-        hmc5883.getXYZ(magXYZ);
-        tmpH = airHumidity(sensor);
-        if( tmpH!=0){
-            airH = tmpH;
-        } 
-        wait(2);
-        tmpT = airTemperature(sensor);
-        if( tmpT!=0 ){
-            airT=tmpT;
-        }
-        
-        // Display
-        pc.printf("\n=====| Data |=====\n");
-        pc.printf("H air : %.2f \%\n", airH);
-        pc.printf("T air : %.2f °C\n", airT);
-        pc.printf("altitude : %lu m\n", alt);
-        pc.printf("Mag : X:%d ; Y:%d ; Z:%d\n", magXYZ[0], magXYZ[1], magXYZ[2]);
-        wait(5);
-    }
-}