From 2c1466c46615b2b8e9359b88910ee989761e2d6e Mon Sep 17 00:00:00 2001 From: kenbarbour Date: Sat, 14 Sep 2024 11:28:06 -0400 Subject: [PATCH] successful builds added a missing dependency: PubSubClient rename time.h -> ntptime.h to avoid conflicts with other libraries --- platformio.ini | 2 +- src/config.cpp | 2 +- src/main.cpp | 2 +- src/{time.h => ntptime.h} | 0 src/sensors.cpp | 4 ++-- src/time.cpp | 4 ++-- src/web.cpp | 2 +- 7 files changed, 8 insertions(+), 8 deletions(-) rename src/{time.h => ntptime.h} (100%) diff --git a/platformio.ini b/platformio.ini index 9ee3387..dc7c481 100644 --- a/platformio.ini +++ b/platformio.ini @@ -20,4 +20,4 @@ lib_deps = https://github.com/kenbarbour/HttpServer Adafruit Unified Sensor@^1.1.1 Adafruit BME280 Library@^2.0.1 - + PubSubClient@^2.8 diff --git a/src/config.cpp b/src/config.cpp index 382adc3..db16833 100644 --- a/src/config.cpp +++ b/src/config.cpp @@ -1,5 +1,5 @@ #include "config.h" -#include "time.h" +#include "ntptime.h" #include #include diff --git a/src/main.cpp b/src/main.cpp index a7a586a..c03c353 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -6,7 +6,7 @@ #include "update.h" #include "bme280.h" #include "config.h" -#include "time.h" +#include "ntptime.h" #include "mdns.h" #include "mqtt.h" diff --git a/src/time.h b/src/ntptime.h similarity index 100% rename from src/time.h rename to src/ntptime.h diff --git a/src/sensors.cpp b/src/sensors.cpp index 3911839..90b8db5 100644 --- a/src/sensors.cpp +++ b/src/sensors.cpp @@ -1,5 +1,5 @@ #include "sensors.h" -#include "time.h" +#include "ntptime.h" #include "bme280.h" #include "battery.h" @@ -25,4 +25,4 @@ int sensors_print_json(char* buffer, size_t len) { (Battery.is_charging ? "true":"false"), battery_get_percent() ); -} \ No newline at end of file +} diff --git a/src/time.cpp b/src/time.cpp index 1dbee3f..9b05965 100644 --- a/src/time.cpp +++ b/src/time.cpp @@ -1,4 +1,4 @@ -#include +#include "ntptime.h" #include #include #include @@ -119,4 +119,4 @@ unsigned long timestamp(unsigned long milliseconds) unsigned long current_timestamp() { return timestamp(millis()); -} \ No newline at end of file +} diff --git a/src/web.cpp b/src/web.cpp index 5ae294e..b86b1ed 100644 --- a/src/web.cpp +++ b/src/web.cpp @@ -6,7 +6,7 @@ #include #include "config.h" #include "version.h" -#include "time.h" +#include "ntptime.h" #include "mqtt.h" #include "sensors.h"