From 662c9342585347ce5c95631800edee2de4cfe9dc Mon Sep 17 00:00:00 2001 From: Stefan Ostermann Date: Sat, 10 Apr 2021 18:54:28 +0200 Subject: [PATCH] Cleanups --- esp-receiver/src/main.cpp | 26 ++++++++++++++++---------- 1 file changed, 16 insertions(+), 10 deletions(-) diff --git a/esp-receiver/src/main.cpp b/esp-receiver/src/main.cpp index 96bff75..4503cc5 100644 --- a/esp-receiver/src/main.cpp +++ b/esp-receiver/src/main.cpp @@ -1,7 +1,12 @@ #include +#include -#define SERVER_ADDRESS 0x01 +/** + * Baud Rate for the 433 Mhz connection. + * Caution: Must be the same for sender & receiver! + **/ #define RH_SPEED 1000 + #define RH_RX_PIN 11 #define RH_BUF_LEN 5 @@ -9,8 +14,7 @@ uint8_t rh_buf[RH_BUF_LEN]; #define RH_ASK_MAX_MESSAGE_LEN RH_BUF_LEN -#include -#include + RH_ASK driver(RH_SPEED, RH_RX_PIN); @@ -18,6 +22,9 @@ float t = 0; float h = 0; long bat = 0; +/** + * Message identifier constants: + * */ #define MSG_START 0x00 #define MSG_TEMP 0x01 #define MSG_HUMID 0x02 @@ -37,32 +44,31 @@ void loop() { uint8_t len = sizeof(rh_buf); if (driver.recv(rh_buf, &len)) { - Serial.println("got message: "); switch (rh_buf[0]) { case MSG_START: // start message Serial.println("0x00 start byte"); break; case MSG_TEMP: - // DHT data - Serial.println("0x01 DHT data"); + // DHT Temperature + Serial.println("0x01 DHT Temp"); memcpy(&t, &rh_buf[1], 4); Serial.print(t); - Serial.print("°C - "); + Serial.println(" °C"); break; case MSG_HUMID: - // battery data + // DHT Humidity: Serial.println("0x02 DHT Humidity"); memcpy(&t, &rh_buf[1], 4); Serial.print(t); - Serial.print("%"); + Serial.println(" %"); break; case MSG_BAT: // battery data Serial.println("0x03 Battery"); memcpy(&bat, &rh_buf[1], 4); Serial.print(bat); - Serial.print("mV"); + Serial.println(" mV"); break; case MSG_ERR: // error