Merge branch 'sheffieldnick-ipaddress' - Manually resolving merge conflicts.
This commit is contained in:
commit
ff9775d082
8
NTPClient.cpp
Normal file → Executable file
8
NTPClient.cpp
Normal file → Executable file
@ -35,7 +35,13 @@ NTPClient::NTPClient(UDP& udp, const char* poolServerName) {
|
|||||||
this->_poolServerName = poolServerName;
|
this->_poolServerName = poolServerName;
|
||||||
}
|
}
|
||||||
|
|
||||||
NTPClient::NTPClient(UDP& udp, const char* poolServerName, long timeOffset) {
|
NTPClient::NTPClient(UDP& udp, IPAddress poolServerIP) {
|
||||||
|
this->_udp = &udp;
|
||||||
|
this->_poolServerIP = poolServerIP;
|
||||||
|
this->_poolServerName = NULL;
|
||||||
|
}
|
||||||
|
|
||||||
|
NTPClient::NTPClient(UDP& udp, const char* poolServerName, int timeOffset) {
|
||||||
this->_udp = &udp;
|
this->_udp = &udp;
|
||||||
this->_timeOffset = timeOffset;
|
this->_timeOffset = timeOffset;
|
||||||
this->_poolServerName = poolServerName;
|
this->_poolServerName = poolServerName;
|
||||||
|
1
NTPClient.h
Normal file → Executable file
1
NTPClient.h
Normal file → Executable file
@ -30,6 +30,7 @@ class NTPClient {
|
|||||||
NTPClient(UDP& udp);
|
NTPClient(UDP& udp);
|
||||||
NTPClient(UDP& udp, long timeOffset);
|
NTPClient(UDP& udp, long timeOffset);
|
||||||
NTPClient(UDP& udp, const char* poolServerName);
|
NTPClient(UDP& udp, const char* poolServerName);
|
||||||
|
NTPClient(UDP& udp, IPAddress poolServerIP);
|
||||||
NTPClient(UDP& udp, const char* poolServerName, long timeOffset);
|
NTPClient(UDP& udp, const char* poolServerName, long timeOffset);
|
||||||
NTPClient(UDP& udp, const char* poolServerName, long timeOffset, unsigned long updateInterval);
|
NTPClient(UDP& udp, const char* poolServerName, long timeOffset, unsigned long updateInterval);
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user