successful builds
added a missing dependency: PubSubClient rename time.h -> ntptime.h to avoid conflicts with other librariesfeature/frontend-charts
parent
2f8d357cc3
commit
2c1466c466
|
@ -20,4 +20,4 @@ lib_deps =
|
||||||
https://github.com/kenbarbour/HttpServer
|
https://github.com/kenbarbour/HttpServer
|
||||||
Adafruit Unified Sensor@^1.1.1
|
Adafruit Unified Sensor@^1.1.1
|
||||||
Adafruit BME280 Library@^2.0.1
|
Adafruit BME280 Library@^2.0.1
|
||||||
|
PubSubClient@^2.8
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
#include "config.h"
|
#include "config.h"
|
||||||
#include "time.h"
|
#include "ntptime.h"
|
||||||
#include <Arduino.h>
|
#include <Arduino.h>
|
||||||
#include <EEPROM.h>
|
#include <EEPROM.h>
|
||||||
|
|
||||||
|
|
|
@ -6,7 +6,7 @@
|
||||||
#include "update.h"
|
#include "update.h"
|
||||||
#include "bme280.h"
|
#include "bme280.h"
|
||||||
#include "config.h"
|
#include "config.h"
|
||||||
#include "time.h"
|
#include "ntptime.h"
|
||||||
#include "mdns.h"
|
#include "mdns.h"
|
||||||
#include "mqtt.h"
|
#include "mqtt.h"
|
||||||
|
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
#include "sensors.h"
|
#include "sensors.h"
|
||||||
#include "time.h"
|
#include "ntptime.h"
|
||||||
#include "bme280.h"
|
#include "bme280.h"
|
||||||
#include "battery.h"
|
#include "battery.h"
|
||||||
|
|
||||||
|
@ -25,4 +25,4 @@ int sensors_print_json(char* buffer, size_t len) {
|
||||||
(Battery.is_charging ? "true":"false"),
|
(Battery.is_charging ? "true":"false"),
|
||||||
battery_get_percent()
|
battery_get_percent()
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
#include <time.h>
|
#include "ntptime.h"
|
||||||
#include <Arduino.h>
|
#include <Arduino.h>
|
||||||
#include <WiFiUdp.h>
|
#include <WiFiUdp.h>
|
||||||
#include <ESP8266WiFi.h>
|
#include <ESP8266WiFi.h>
|
||||||
|
@ -119,4 +119,4 @@ unsigned long timestamp(unsigned long milliseconds)
|
||||||
unsigned long current_timestamp()
|
unsigned long current_timestamp()
|
||||||
{
|
{
|
||||||
return timestamp(millis());
|
return timestamp(millis());
|
||||||
}
|
}
|
||||||
|
|
|
@ -6,7 +6,7 @@
|
||||||
#include <QueryString.h>
|
#include <QueryString.h>
|
||||||
#include "config.h"
|
#include "config.h"
|
||||||
#include "version.h"
|
#include "version.h"
|
||||||
#include "time.h"
|
#include "ntptime.h"
|
||||||
#include "mqtt.h"
|
#include "mqtt.h"
|
||||||
#include "sensors.h"
|
#include "sensors.h"
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue