diff --git a/ampel-firmware.h b/ampel-firmware.h index 40e36b68490af6da238449c4efe40c5e19c17bd2..f542c74aae87fc567fdc0299b481f6d43976fe72 100644 --- a/ampel-firmware.h +++ b/ampel-firmware.h @@ -15,7 +15,7 @@ #ifdef AMPEL_MQTT # include "mqtt.h" #endif -#ifdef LORAWAN +#ifdef AMPEL_LORAWAN # include "lorawan.h" #endif #ifdef AMPEL_HTTP diff --git a/ampel-firmware.ino b/ampel-firmware.ino index c3f41eb4221d46f94c0bb3bcc8da894922e37383..791443558a84877bc387c93cd6193714960359f8 100644 --- a/ampel-firmware.ino +++ b/ampel-firmware.ino @@ -104,7 +104,7 @@ void setup() { csv_writer::initialize(); #endif -#if defined(LORAWAN) && defined(ESP32) +#if defined(AMPEL_LORAWAN) && defined(ESP32) lorawan::initialize(); #endif } @@ -114,7 +114,7 @@ void setup() { *****************************************************************/ void loop() { -#if defined(LORAWAN) && defined(ESP32) +#if defined(AMPEL_LORAWAN) && defined(ESP32) //LMIC Library seems to be very sensitive to timing issues, so run it first. lorawan::process(); @@ -141,7 +141,7 @@ void loop() { mqtt::publishIfTimeHasCome(sensor::timestamp, sensor::co2, sensor::temperature, sensor::humidity); #endif -#if defined(LORAWAN) && defined(ESP32) +#if defined(AMPEL_LORAWAN) && defined(ESP32) lorawan::preparePayloadIfTimeHasCome(sensor::co2, sensor::temperature, sensor::humidity); #endif } diff --git a/config.public.h b/config.public.h index 15060effb00f7425643c8050136d2f2bb5be87d6..0f3237d30bcc83578b1ac9b9536c40a28b68b30a 100644 --- a/config.public.h +++ b/config.public.h @@ -117,7 +117,7 @@ // See https://github.com/mcci-catena/arduino-lmic#configuration for more information // Should data be sent over LoRaWAN? // It has been tested with "TTGO ESP32 SX1276 LoRa 868" and will only work with an ESP32 + LoRa modem -# define LORAWAN +# define AMPEL_LORAWAN // How often should measurements be sent over LoRaWAN? # define LORAWAN_SENDING_INTERVAL 300 // [s] This value should not be too low. See https://www.thethingsnetwork.org/docs/lorawan/duty-cycle.html#maximum-duty-cycle // This EUI must be in little-endian format, so least-significant-byte first. diff --git a/web_server.cpp b/web_server.cpp index 8ab543c9a77e83f3c2b62094e1034430eff0775a..f99922fe67cbab921598c54f90fce63315172f54 100644 --- a/web_server.cpp +++ b/web_server.cpp @@ -94,7 +94,7 @@ namespace web_server { "<tr><td>Last publish</td><td>%s</td></tr>\n" "<tr><td>Timestep</td><td>%5d s</td></tr>\n" #endif -#if defined(LORAWAN) && defined(ESP32) +#if defined(AMPEL_LORAWAN) && defined(ESP32) "<tr><th colspan='2'>LoRaWAN</th></tr>\n" "<tr><td>Connected?</td><td>%s</td></tr>\n" "<tr><td>Frequency</td><td>%s MHz</td></tr>\n" @@ -220,7 +220,7 @@ namespace web_server { #ifdef AMPEL_MQTT mqtt::last_successful_publish.c_str(), config::sending_interval, #endif -#if defined(LORAWAN) && defined(ESP32) +#if defined(AMPEL_LORAWAN) && defined(ESP32) lorawan::connected ? "Yes" : "No", LMIC_FREQUENCY_PLAN, lorawan::last_transmission.c_str(), config::lorawan_sending_interval, #endif diff --git a/web_server.h b/web_server.h index 0e26f39fe0a110d0c07e1b3ca2e7dcb4e57f2cf5..71c17f0578ac1616f464d0456f25afcfa5930c72 100644 --- a/web_server.h +++ b/web_server.h @@ -15,7 +15,7 @@ #ifdef AMPEL_MQTT # include "mqtt.h" #endif -#ifdef LORAWAN +#ifdef AMPEL_LORAWAN # include "lorawan.h" #endif