Fix merge conflicts, make compute heat index default to Fahrenheit to not break old code that assumes default is Fahrenheit.

This commit is contained in:
Tony DiCola committed 2015-06-26 15:56:04 -07:00
commit ef9590ad96
3 files changed
+37 -18

No files matched your search

+1 -1
View File
@@ -42,7 +42,7 @@ class DHT {
float readTemperature(bool S=false);
float convertCtoF(float);
float convertFtoC(float);
float computeHeatIndex(float tempFahrenheit, float percentHumidity);
float computeHeatIndex(float temperature, float percentHumidity, bool isFahrenheit=true);
float readHumidity(void);
boolean read(void);