1
0
mirror of https://github.com/esp8266/Arduino.git synced 2025-11-30 05:24:00 +03:00

Merge branch 'master' into optimistic_yield_recurrency

This commit is contained in:
Earle F. Philhower, III
2020-02-20 12:30:05 -08:00
committed by GitHub
29 changed files with 263 additions and 555 deletions

View File

@@ -282,6 +282,13 @@ void configTime(int timezone, int daylightOffset_sec, const char* server1,
void configTime(const char* tz, const char* server1,
const char* server2 = nullptr, const char* server3 = nullptr);
// esp32 api compatibility
inline void configTzTime(const char* tz, const char* server1,
const char* server2 = nullptr, const char* server3 = nullptr)
{
configTime(tz, server1, server2, server3);
}
#endif // __cplusplus
#include "pins_arduino.h"