Merge pull request #167 from kng/master

Libdeps updated to avoid conflict with time.h
This commit is contained in:
Gunnar Skjold 2021-12-18 14:29:58 +01:00 committed by GitHub
commit 73b20a0766
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions

View File

@ -2,7 +2,7 @@
extra_configs = platformio-user.ini
[common]
lib_deps = file://lib/Timezone, 256dpi/MQTT@2.5.0, OneWireNg@0.10.0, DallasTemperature@3.9.1, EspSoftwareSerial@6.14.1, https://github.com/gskjold/RemoteDebug.git, Time@1.6.0
lib_deps = https://github.com/JChristensen/Timezone.git@1.2.4, 256dpi/MQTT@2.5.0, OneWireNg@0.10.0, DallasTemperature@3.9.1, EspSoftwareSerial@6.14.1, https://github.com/gskjold/RemoteDebug.git, https://github.com/PaulStoffregen/Time.git@1.6.1
lib_ignore = OneWire
[env:esp8266]

View File

@ -1,4 +1,4 @@
#include "hexutils.h";
#include "hexutils.h"
String toHex(uint8_t* in) {
return toHex(in, sizeof(in)*2);