alex/GY-63_MS5611
1
0
Fork 0
mirror of https://github.com/RobTillaart/Arduino.git synced 2024-10-03 18:09:02 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

0.3.0 Temperature

Browse Source
This commit is contained in:
rob tillaart 2022-01-06 15:32:26 +01:00
parent f677248b05
commit b31c487b33
7 changed files with 77 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
libraries/Temperature/.arduino-ci.yml
View File

@ -2,10 +2,10 @@ compile:
# Choosing to run compilation tests on 2 different Arduino platforms
platforms:
- uno
- due
- zero
- leonardo
# - due
# - zero
# - leonardo
- m4
- esp32
- esp8266
- mega2560
# - esp8266
# - mega2560

5
libraries/Temperature/examples/heatindex_table/heatindex_table.ino
View File

@ -17,7 +17,9 @@ void setup()
Serial.println(__FILE__);
Serial.println();
Serial.println(" Compare to: https://www.calculator.net/heat-index-calculator.html\n");
Serial.println();
for (int t = 80; t <= 110; t += 2)
{
Serial.print("\t");
@ -50,4 +52,3 @@ void loop()
// -- END OF FILE --

2
libraries/Temperature/library.json
View File

@ -15,7 +15,7 @@
"type": "git",
"url": "https://github.com/RobTillaart/Temperature"
},
"version": "0.2.5",
"version": "0.3.0",
"license": "MIT",
"frameworks": "arduino",
"platforms": "*",

2
libraries/Temperature/library.properties
View File

@ -1,5 +1,5 @@
name=Temperature
version=0.2.5
version=0.3.0
author=Rob Tillaart <rob.tillaart@gmail.com>
maintainer=Rob Tillaart <rob.tillaart@gmail.com>
sentence=Library with weather related functions.

15
libraries/Temperature/readme.md
View File

@ -42,6 +42,21 @@ DHT22 or Sensirion, to make a weather station application.
- **float heatIndex(float Fahrenheit, float humidity)** idem.
- **float heatIndexC(float Celsius, float humidity)** idem.
**0.3.0**
The formula for the **heatIndex()** was taken from https://en.wikipedia.org/wiki/Heat_index.
Since version 0.3.0 the more elaborated version of https://www.wpc.ncep.noaa.gov/html/heatindex_equation.shtml
will be used. Note: there will be performance differences.
Indicative table
| Fahrenheit | Celsius | description | colour code |
|:----------:|:-------:|:------------|------------:|
| 70-79 | 21-26 | warm | green |
| 80-89 | 26-32 | very warm | yellow |
| 90-104 | 32-40 | hot | orange |
| 105-129 | 40-54 | very hot | red |
| > 130 | > 54 | extreme hot | purple |
### WindChill

66
libraries/Temperature/temperature.h
View File

@ -1,7 +1,7 @@
#pragma once
//
// FILE: temperature.h
// VERSION: 0.2.5
// VERSION: 0.3.0
// DATE: 2015-03-29
// PURPOSE: collection temperature functions
//
@ -16,9 +16,11 @@
// 0.2.3 2020-08-27 fix #5 order of functions, typo, fixed 1 example
// 0.2.4 2021-01-08 Arduino-CI + unit tests
// 0.2.5 2021-12-28 Arduino-CI, library.json, readme.md, license, minor edits
// 0.3.0 2022-01-05 fix #10 update HeatIndex function
// compared with https://www.calculator.net/heat-index-calculator.html
#define TEMPERATURE_VERSION (F("0.2.5"))
#define TEMPERATURE_VERSION (F("0.3.0"))
inline float Fahrenheit(float celsius)
@ -87,34 +89,59 @@ float humidex(float celsius, float dewPoint)
}
// https://en.wikipedia.org/wiki/Heat_index
// 0.3.0 => https://www.wpc.ncep.noaa.gov/html/heatindex_equation.shtml
// previous https://en.wikipedia.org/wiki/Heat_index
// TODO add valid range for TF & R
// TF = temp in Fahrenheit
// R = humidity in %
float heatIndex(float TF, float R)
// RH = relative humidity in %
float heatIndex(float TF, float RH)
{
const float c1 = -42.379;
const float c2 = 2.04901523;
const float c3 = 10.14333127;
const float c4 = -0.22475541;
const float c5 = -0.00683783;
const float c6 = -0.05481717;
const float c7 = 0.00122874;
const float c8 = 0.00085282;
const float c9 = -0.00000199;
float HI = 0;
float A = (( c5 * TF) + c2) * TF + c1;
float B = (((c7 * TF) + c4) * TF + c3) * R;
float C = (((c9 * TF) + c8) * TF + c6) * R * R;
if (TF >= 80)
{
const float c1 = -42.379;
const float c2 = 2.04901523;
const float c3 = 10.14333127;
const float c4 = -0.22475541;
const float c5 = -0.00683783;
const float c6 = -0.05481717;
const float c7 = 0.00122874;
const float c8 = 0.00085282;
const float c9 = -0.00000199;
return A + B + C;
float A = (( c5 * TF) + c2) * TF + c1;
float B = (((c7 * TF) + c4) * TF + c3) * RH;
float C = (((c9 * TF) + c8) * TF + c6) * RH * RH;
HI = A + B + C;
if ((RH < 13) && (TF <= 112))
{
HI += ((13 - RH) / 4) * sqrt((17 - abs(TF - 95.0)) / 17);
}
if ((RH > 87) && (TF < 87))
{
HI += ((RH - 85) / 10) * ((87 - TF) / 5);
}
return HI;
}
HI = 0.5 * (TF + 61.0 + ((TF - 68.0) * 1.2) + (RH * 0.094));
return HI;
}
// https://en.wikipedia.org/wiki/Heat_index
// 0.3.0 => https://www.wpc.ncep.noaa.gov/html/heatindex_equation.shtml
// previous https://en.wikipedia.org/wiki/Heat_index
// TODO add valid range for TF & R
// TODO optimize?
float heatIndexC(float celcius, float humidity)
{
float TF = celcius * (9.0 / 5.0) + 32;
float HI = (heatIndex(TF, humidity) - 32) * (5.0 / 9.0);
return HI;
/*
const float c1 = -8.78469475556;
const float c2 = 1.61139411;
const float c3 = 2.33854883889;
@ -130,6 +157,7 @@ float heatIndexC(float celcius, float humidity)
float C = (((c9 * celcius) + c8) * celcius + c6) * humidity * humidity;
return A + B + C;
*/
}

8
libraries/Temperature/test/unit_test_001.cpp
View File

@ -67,9 +67,11 @@ unittest(test_dewpoint)
unittest(test_heatIndex)
{
assertEqualFloat(206.46, heatIndex(20, 50), 0.001);
assertEqualFloat(77.3509, heatIndex(68, 50), 0.001);
assertEqualFloat(25.1949, heatIndexC(20, 50), 0.001);
// Fahrenheit
assertEqualFloat(14.050, heatIndex(20, 50), 0.001);
assertEqualFloat(66.850, heatIndex(68, 50), 0.001);
// Celsius
assertEqualFloat(19.361, heatIndexC(20, 50), 0.001);
}