Diff: DHT.h

Revision:

1:932d451474dc

Parent:

0:9b5b3200688f

--- a/DHT.h	Mon Jul 09 19:47:43 2012 +0000
+++ b/DHT.h	Sat Apr 19 18:05:38 2014 +0000
@@ -1,33 +1,14 @@
-/* 
- *  DHT Library for  Digital-output Humidity and Temperature sensors 
- *  
- *  Works with DHT11, DHT21, DHT22
- *             SEN11301P,  Grove - Temperature&Humidity Sensor     (Seeed Studio)
- *             SEN51035P,  Grove - Temperature&Humidity Sensor Pro (Seeed Studio)
- *             AM2302   ,  temperature-humidity sensor    
- *             RHT01,RHT02, RHT03    ,  Humidity and Temperature Sensor         (Sparkfun)
+/*
+ *  DHT Library for  Digital-output Humidity and Temperature sensors
  *
- *  Copyright (C) Wim De Roeve
- *                based on DHT22 sensor library by HO WING KIT
- *                Arduino DHT11 library
+ *  Works with DHT11, DHT22 Nucleo Board tested on F103RB
  *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documnetation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to  whom the Software is
- * furished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS OR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
+ *  Copyright (C) Wim De Roeve 
+ *                ported to work on Nucleo Board:
+ *                                                Moises Marangoni
+ *                                                Somlak Mangnimit
+ *                based on DHT22 sensor library by HO WING KIT
+ *                Arduino DHT11 library 
  */
 
 #ifndef MBED_DHT_H
@@ -37,58 +18,33 @@
 
 enum eType{
         DHT11     = 11,
-        SEN11301P = 11,
-        RHT01     = 11,
         DHT22     = 22,
-        AM2302    = 22,
-        SEN51035P = 22,
-        RHT02     = 22,
-        RHT03     = 22
     } ;
 
-enum eError {
-    ERROR_NONE = 0,
-    BUS_BUSY =1,
-    ERROR_NOT_PRESENT =2 ,
-    ERROR_ACK_TOO_LONG =3 ,
-    ERROR_SYNC_TIMEOUT = 4,
-    ERROR_DATA_TIMEOUT =5 ,
-    ERROR_CHECKSUM = 6,
-    ERROR_NO_PATIENCE =7
-} ;
-
-typedef enum {
-    CELCIUS =0 ,
-    FARENHEIT =1,
-    KELVIN=2
-} eScale;
-
-
 class DHT {
 
 public:
 
+#define DHTLIB_OK                0
+#define DHTLIB_ERROR_CHECKSUM   -1
+#define DHTLIB_ERROR_TIMEOUT    -2
+
     DHT(PinName pin,int DHTtype);
     ~DHT();
+    uint8_t bits[5];
     int readData(void);
-    float ReadHumidity(void);
-    float ReadTemperature(eScale Scale);
-    float CalcdewPoint(float celsius, float humidity);
-    float CalcdewPointFast(float celsius, float humidity);
+    int ReadHumidity(void);
+    float ReadTemperature(void);
+    int humidity;
+    float temperature;
+    Timer tmr;
 
 private:
-    time_t  _lastReadTime;
-    float _lastTemperature;
-    float _lastHumidity;
+    //time_t  _lastReadTime;
     PinName _pin;
-    bool _firsttime;
     int _DHTtype;
     int DHT_data[6];
-    float CalcTemperature();
-    float CalcHumidity();
-    float ConvertCelciustoFarenheit(float);
-    float ConvertCelciustoKelvin(float);
-
+    //DigitalInOut data_pin(_pin);
 };
 
 #endif