Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
N
neOCampus-arduino
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
GIS-neOCampus
neOSensor
neOCampus-arduino
Commits
2407d7e2
Commit
2407d7e2
authored
2 years ago
by
thiebolt
Browse files
Options
Downloads
Patches
Plain Diff
corrected display of currently used NTP server(s)
parent
ba3614f8
No related branches found
No related tags found
1 merge request
!3
Feature SDK upgrade
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
ChangeLog.txt
+1
-3
1 addition, 3 deletions
ChangeLog.txt
neosensor/neosensor.ino
+7
-17
7 additions, 17 deletions
neosensor/neosensor.ino
with
8 additions
and
20 deletions
ChangeLog.txt
+
1
−
3
View file @
2407d7e2
...
@@ -2,16 +2,14 @@
...
@@ -2,16 +2,14 @@
# neOCampus operation
# neOCampus operation
# (c) neOCampus / F.Thiebolt Université Toulouse3, Laboratoire IRIT
# (c) neOCampus / F.Thiebolt Université Toulouse3, Laboratoire IRIT
=== upcoming feature-SDKupgrade
===
Release 220815 /
upcoming feature-SDKupgrade
Bumps to esp32 2.0.4
Bumps to esp32 2.0.4
Bumps to esp8266 3.0.2
Bumps to esp8266 3.0.2
- we're still using the deprecated SPIFFS filesystem
- we're still using the deprecated SPIFFS filesystem
- updated boards.local.txt
- updated boards.local.txt
- _http_get now makes use of newer API involving a WIFIClient variable
- _http_get now makes use of newer API involving a WIFIClient variable
- uniformized sntp includes for all ESP :)
- uniformized sntp includes for all ESP :)
TBC that NTP servers sent by the DHCP server are in use
- WIFImanager now used without mod
- WIFImanager now used without mod
TBC that options appears valid when setting up the device
- switched noise ISR from ICACHE_RAM_ATTR to newer IRAM_ATTR
- switched noise ISR from ICACHE_RAM_ATTR to newer IRAM_ATTR
[esp32]
[esp32]
- recompiled lwip for NTP server support from DHCP answer (IDF 4.4.2)
- recompiled lwip for NTP server support from DHCP answer (IDF 4.4.2)
...
...
This diff is collapsed.
Click to expand it.
neosensor/neosensor.ino
+
7
−
17
View file @
2407d7e2
...
@@ -394,25 +394,15 @@ void endLoop( void ) {
...
@@ -394,25 +394,15 @@ void endLoop( void ) {
// display NTP servers used for time sync
// display NTP servers used for time sync
if
(
_cbtime_call
)
{
if
(
_cbtime_call
)
{
_cbtime_call
=
false
;
_cbtime_call
=
false
;
//log_debug(F("\n[NTP_sync] IP_ADDR_ANY = "));log_debug(ipaddr_ntoa(&ip_addr_any));log_flush();
// list active ntp servers
// list active ntp servers
for
(
uint8_t
i
=
0
;
i
<
SNTP_MAX_SERVERS
;
i
++
)
{
for
(
uint8_t
i
=
0
;
i
<
SNTP_MAX_SERVERS
;
i
++
)
{
IPAddress
sntp
=
*
(
IPAddress
*
)
sntp_getserver
(
i
);
const
ip_addr_t
*
p_cur
=
sntp_getserver
(
i
);
const
char
*
sntp_name
=
sntp_getservername
(
i
);
if
(
ip_addr_cmp
(
p_cur
,
IP_ADDR_ANY
)
)
continue
;
// check if address is valid
log_debug
(
F
(
"
\n
[NTP_sync] IPaddr = "
));
log_debug
(
ipaddr_ntoa
(
p_cur
));
log_flush
();
#ifdef ESP8266
}
if
(
sntp
.
isSet
()
)
{
#elif defined(ESP32)
if
(
sntp
!=
IPADDR_ANY
)
{
#endif
log_debugF
(
"
\n
[NTP][%d]: "
,
i
);
if
(
sntp_name
)
{
log_debugF
(
"%s (%s) "
,
sntp_name
,
sntp
.
toString
().
c_str
());
}
else
{
log_debugF
(
"%s "
,
sntp
.
toString
().
c_str
());
}
}
}
}
}
// serial link activity marker ...
// serial link activity marker ...
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment