Skip to content
Snippets Groups Projects
Commit b0101f92 authored by francois's avatar francois
Browse files

added IRIT ntp server; added neOClock support

parent ced27171
No related branches found
No related tags found
No related merge requests found
...@@ -53,6 +53,8 @@ neOSensor.menu.wipe.all.upload.erase_cmd=erase_flash ...@@ -53,6 +53,8 @@ neOSensor.menu.wipe.all.upload.erase_cmd=erase_flash
neOSensor.menu.ResetMethod.ck=no dtr (aka ck) neOSensor.menu.ResetMethod.ck=no dtr (aka ck)
neOSensor.menu.ResetMethod.ck.upload.resetmethod=--before no_reset --after soft_reset neOSensor.menu.ResetMethod.ck.upload.resetmethod=--before no_reset --after soft_reset
neOSensor.menu.ResetMethod.nodemcu=dtr (aka nodemcu)
neOSensor.menu.ResetMethod.nodemcu.upload.resetmethod=--before default_reset --after hard_reset
neOSensor.menu.baud.921600=921600 neOSensor.menu.baud.921600=921600
neOSensor.menu.baud.921600.upload.speed=921600 neOSensor.menu.baud.921600.upload.speed=921600
......
...@@ -36,6 +36,7 @@ ...@@ -36,6 +36,7 @@
#if 0 #if 0
TO BE CONTINUED TO BE CONTINUED
const uint8_t SSD1306display::i2c_addrs[2] = { 0x3c, 0x3d };
/* /*
* Class * Class
......
/* ----------------------------------------------------------------------------- /* -----------------------------------------------------------------------------
* *
* neOCampus operation * neOCampus operation
...@@ -150,9 +149,10 @@ ...@@ -150,9 +149,10 @@
const long gmtOffset_sec = 3600; const long gmtOffset_sec = 3600;
const int daylightOffset_sec = 3600; const int daylightOffset_sec = 3600;
#endif #endif
#define NTP_DEFAULT_SERVER1 "0.fr.pool.ntp.org" // DNS location aware #define NTP_DEFAULT_SERVER1 "pool.ntp.org" // DNS location aware
//#define NTP_DEFAULT_SERVER2 "time.nist.gov" // DNS location aware //#define NTP_DEFAULT_SERVER1 "time.nist.gov" // DNS location aware
#define NTP_DEFAULT_SERVER2 "pool.ntp.org" // DNS location aware //#define NTP_DEFAULT_SERVER2 "0.fr.pool.ntp.org" // DNS location aware
#define NTP_DEFAULT_SERVER2 "ntp.irit.fr" // UT3-IRIT specific
#define NTP_DEFAULT_SERVER3 "ntp.univ-tlse3.fr" // UT3 specific #define NTP_DEFAULT_SERVER3 "ntp.univ-tlse3.fr" // UT3 specific
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment