Merge remote-tracking branch 'origin/main' into dev-0.7.0

include/faov.h

@@ -59,5 +59,6 @@ float sol_rad_from_t(float et_rad, float cs_rad, float tmin, float tmax, bool co
 float sol_rad_island(float et_rad);
 float sunset_hour_angle(float latitude, float sol_dec);
 float wind_speed_2m(float ws, float z);
-float fao56_eto_hr(float net_rad, float t, float psy, float ws, float delta_svp, float avp, float svp, double shf = 0.0);
+float fao56_eto_hr(float net_rad, float t, float psy, float ws, float delta_svp, float avp, float svp, double g = 0.0);
+float hourly_soil_heat_flux(float net_radiation, bool isDay);
 #endif

include/weather.h

@@ -7,6 +7,9 @@
 #include "BME280I2C.h"
 #include "BH1750.h"
 #include <WiFiClientSecure.h>
+#include <TimeLib.h>
+#include "esp_deep_sleep.h"
+#include <esp_task_wdt.h>
 /**
  * Pin definitions
  */
@@ -86,7 +89,6 @@ extern DallasTemperature temperatureSensor;
 extern bool published;
 extern bool lowBattery;
 extern long initialMillis;
-extern float currentRain;
 extern struct tm timeinfo;
 extern PubSubClient mqtt;
 extern Adafruit_SI1145 uv;
@@ -135,10 +137,10 @@ boolean sendData(struct sensorData *enviroment);
 void connectAWS();
 void callback(char* topic, byte* payload, unsigned int length);
 void clearRainfall(void);
-void clearRainfallHour(int hourPtr);
 void addTipsToHour(int count);
 void printHourlyArray (void);
-int getRainByHour(int hour);
+int diffHour(int hour, int diff = 1);
+float getRainByHour(int hour);
 int last24(void);
 void readSensorsData(struct sensorData *environment);
 void readMoonPhase(struct sensorData *environment);
@@ -163,7 +165,7 @@ void readWindSpeed(struct sensorData *environment );
 void readWindDirection(struct sensorData *environment);
 void IRAM_ATTR windTick(void);
 int calculateDayOfYear(int day, int month, int year);
-
+bool isDay(time_t t);
 #endif