diff --git a/.gitmodules b/.gitmodules index c2b2336..92b6bcd 100644 --- a/.gitmodules +++ b/.gitmodules @@ -13,8 +13,8 @@ branch = handle-empty-date-or-time [submodule "libraries/WiFiManager"] path = libraries/WiFiManager - url = https://github.com/liebman/WiFiManager.git - branch = stdfunc + url = https://github.com/tzapu/WiFiManager.git + branch = development [submodule "libraries/esp8266-oled-ssd1306"] path = libraries/esp8266-oled-ssd1306 url = https://github.com/liebman/esp8266-oled-ssd1306.git diff --git a/ESPNTPServer/ESPNTPServer.cpp b/ESPNTPServer/ESPNTPServer.cpp index 09013ce..2620e3e 100644 --- a/ESPNTPServer/ESPNTPServer.cpp +++ b/ESPNTPServer/ESPNTPServer.cpp @@ -21,6 +21,8 @@ */ #include "ESPNTPServer.h" +#include "ESPNTPServerVersion.h" + #include "Log.h" #include "DLogPrintWriter.h" #include "DLogSyslogWriter.h" @@ -181,7 +183,7 @@ void setup() if (syslog_host != nullptr && strlen(syslog_host) > 0 && syslog_port != 0) { dlog.info(SETUP_TAG, "enabling syslog: '%s:%u'", syslog_host, syslog_port); - dlog.begin(new DLogSyslogWriter(syslog_host, syslog_port, devicename)); + dlog.begin(new DLogSyslogWriter(syslog_host, syslog_port, devicename, ESPNTP_SERVER_VERSION)); } const char* url = wifi.getOTAURL(); const char* fp = wifi.getOTAFP(); diff --git a/ESPNTPServer/ESPNTPServerVersion.h b/ESPNTPServer/ESPNTPServerVersion.h new file mode 100644 index 0000000..0726705 --- /dev/null +++ b/ESPNTPServer/ESPNTPServerVersion.h @@ -0,0 +1,14 @@ +/* + * ESPNTPServerVersion.h + * + * Created on: Jun 17, 2018 + * Author: chris.l + */ + +#ifndef ESPNTPSERVERVERSION_H_ +#define ESPNTPSERVERVERSION_H_ + +const char* ESPNTP_SERVER_VERSION = "1.0.0"; + + +#endif /* ESPNTPSERVERVERSION_H_ */ diff --git a/ESPNTPServer/LICENSE b/LICENSE similarity index 100% rename from ESPNTPServer/LICENSE rename to LICENSE diff --git a/libraries/WiFiManager b/libraries/WiFiManager index d9f3088..9411500 160000 --- a/libraries/WiFiManager +++ b/libraries/WiFiManager @@ -1 +1 @@ -Subproject commit d9f3088cea0e4927b7d307d4bda2ff32907615e9 +Subproject commit 94115006f6093695ac9ae007efa868ef31fe45d5