diff --git a/arduinoIDE_esp8266_boards/boards.local.txt b/arduinoIDE_esp8266_boards/boards.local.txt index 40d8e09b219496f755af524eea8aa980a6f19236..8443d8798e3b6d1532156777d075cd00d43600c2 100644 --- a/arduinoIDE_esp8266_boards/boards.local.txt +++ b/arduinoIDE_esp8266_boards/boards.local.txt @@ -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.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.upload.speed=921600 diff --git a/neosensor/libraries/neocampus_drivers/SSD1306display.h b/neosensor/libraries/neocampus_drivers/SSD1306display.h index a66098a3a5f1281bda35b2ebc26cc8212f27c3e6..02b3d217b51e5032b14fee3768f2753055a0974e 100644 --- a/neosensor/libraries/neocampus_drivers/SSD1306display.h +++ b/neosensor/libraries/neocampus_drivers/SSD1306display.h @@ -36,6 +36,7 @@ #if 0 TO BE CONTINUED +const uint8_t SSD1306display::i2c_addrs[2] = { 0x3c, 0x3d }; /* * Class diff --git a/neosensor/neosensor.ino b/neosensor/neosensor.ino index 096791c9241988aa6c2c04c87cc2693243784b97..3fccc28d4243158337a3c798d5266aac9d770842 100644 --- a/neosensor/neosensor.ino +++ b/neosensor/neosensor.ino @@ -1,4 +1,3 @@ - /* ----------------------------------------------------------------------------- * * neOCampus operation @@ -150,9 +149,10 @@ const long gmtOffset_sec = 3600; const int daylightOffset_sec = 3600; #endif -#define NTP_DEFAULT_SERVER1 "0.fr.pool.ntp.org" // DNS location aware -//#define NTP_DEFAULT_SERVER2 "time.nist.gov" // DNS location aware -#define NTP_DEFAULT_SERVER2 "pool.ntp.org" // DNS location aware +#define NTP_DEFAULT_SERVER1 "pool.ntp.org" // DNS location aware +//#define NTP_DEFAULT_SERVER1 "time.nist.gov" // 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