Diff: main.cpp

Revision:

5:41a15c0653e8

Parent:

4:de41ec16d765

Child:

6:d25c6da3f0b6

--- a/main.cpp	Wed Aug 27 17:35:24 2014 +0000
+++ b/main.cpp	Wed Dec 17 23:56:26 2014 +0000
@@ -1,5 +1,6 @@
 #include "mbed.h"
 #include "ADXL345_I2C.h"
+#include "DHT.h"
 
 
 //#define LED                 // Grove LED
@@ -7,7 +8,8 @@
 //#define LIGHT_SENSOR        // Grove Light Sensor using GL5528 photoresistor 
 //#define WATER_SENSOR        // Grove Water Sensor
 //#define GAS_SENSOR          // SEN90512P Grove - Gas Sensor(MQ2)
-#define TEMP_SENSOR           // Grove Temperature Sensor using TTC03 Thermistor 
+//#define TEMP_SENSOR         // Grove Temperature Sensor using TTC03 Thermistor 
+#define TEMP_HUMID_SENSOR   // Grove Temp/Humidity Sensor (DHT11)
 
  
 AnalogIn temp_sensor(A0);     
@@ -16,8 +18,8 @@
 AnalogIn gas_sensor(A3);
 DigitalOut my_led(D7);
 ADXL345_I2C accelerometer(D14, D15);
+DHT temp_humid_sensor(A0, DHT11);  // See DHT.h for other supported sensor types
 
-        
 int main() {
     
     float vol;
@@ -31,6 +33,8 @@
     float resistance; 
     float temperature;
     float temperature_f;  
+    float humidity;
+    float dewpoint;
     char amb_temp[6];
     int a;
     
@@ -124,6 +128,21 @@
         printf("Current Temperature: %f C  %f F \n\r", temperature, temperature_f); 
         wait(1); // 1s          
 #endif      
-              
+
+#ifdef TEMP_HUMID_SENSOR
+        temp_humid_sensor.readData();
+        
+        temperature = temp_humid_sensor.ReadTemperature(CELCIUS);
+        temperature_f = temp_humid_sensor.ReadTemperature(FARENHEIT);
+        humidity = temp_humid_sensor.ReadHumidity();
+        dewpoint = temp_humid_sensor.CalcdewPointFast(temperature, humidity);
+        
+        printf("\r\n");
+        printf("Temperature: %f C / %f F\r\n", temperature, temperature_f);
+        printf("Humidity: %f%%\r\n", humidity);
+        printf("Dewpoint: %f C / %f F\r\n", dewpoint, (dewpoint * 1.8f) + 32);
+        wait(1);
+#endif
+
     }
 }