diff --git a/esp-receiver/src/main.cpp b/esp-receiver/src/main.cpp
index e5496fb..f5fb8ad 100644
--- a/esp-receiver/src/main.cpp
+++ b/esp-receiver/src/main.cpp
@@ -13,7 +13,7 @@
* Baud Rate for the 433 Mhz connection.
* Caution: Must be the same for sender & receiver!
**/
-#define RH_SPEED 300
+#define RH_SPEED 2000
/**
* Pin for the receiver
@@ -65,7 +65,7 @@ long lastMillis = 0;
void handleRoot(); // function prototypes for HTTP handlers
void handleNotFound();
void reconnect();
-String SendHTML(float Temperaturestat, float Humiditystat);
+String SendHTML();
void publishData(float temp, float humid, float soil, long battery);
void callback(char *inTopic, byte *payload, unsigned int length);
@@ -241,7 +241,7 @@ void callback(char *inTopic, byte *payload, unsigned int length)
void handleRoot()
{
- server.send(200, "text/html", SendHTML(Temperature, Humidity));
+ server.send(200, "text/html", SendHTML());
}
void handleNotFound()
@@ -269,7 +269,7 @@ void publishData(float temp, float humid, float soil, long battery)
yield();
}
-String SendHTML(float Temperaturestat, float Humiditystat)
+String SendHTML()
{
String ptr = " \n";
ptr += "\n";
@@ -285,11 +285,17 @@ String SendHTML(float Temperaturestat, float Humiditystat)
ptr += "Wiesendamm Wetter Report
\n";
ptr += "Temperature: ";
- ptr += (float)Temperaturestat;
+ ptr += (float)Temperature;
ptr += " C
";
ptr += "Humidity: ";
- ptr += (float)Humiditystat;
+ ptr += (float)Humidity;
ptr += " %
";
+ ptr += "Soil Humidity: ";
+ ptr += (float)SoilHumidity;
+ ptr += " %
";
+ ptr += "Battery: ";
+ ptr += (float)battery;
+ ptr += " mV
";
ptr += "\n";
ptr += "\n";
diff --git a/sensor433/src/main.cpp b/sensor433/src/main.cpp
index e09c319..c98f7a9 100644
--- a/sensor433/src/main.cpp
+++ b/sensor433/src/main.cpp
@@ -23,7 +23,7 @@
#define RH_OWN_ADDR 0xca // 202
// RadioHead bitrate in bit/s
-#define RH_SPEED 300
+#define RH_SPEED 2000
/*
define when to wake up
@@ -33,7 +33,7 @@
#define WATCHDOG_WAKEUP 9
// Sleep this many again before waging up. Sleep time in s = WATCHDOG_WAKEUP s * WATCHDOG_SLEEP_FURTHER, e.g. 8*8s = 64s
-#define WATCHDOG_SLEEP_FURTHER 2
+#define WATCHDOG_SLEEP_FURTHER 8
// pins for the radio hardware
#define RH_RX_PIN 6 // not used, set to a non-existent pin