3pp-mirror/ahoy
1
0
Fork 0
mirror of https://github.com/lumapu/ahoy.git synced 2025-07-26 04:37:14 +02:00
Code Issues Projects Releases Packages Wiki Activity

0.8.14

Browse source 
* fixed NTP update and sunrise calculation #1240 #886
This commit is contained in:
lumapu 2023-12-07 22:01:49 +01:00
parent 14b0fbbd68
commit c771c2e5df
3 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

1
src/CHANGES.md
View file

@ -3,6 +3,7 @@
## 0.8.14 - 2023-12-07 ## 0.8.14 - 2023-12-07
* fixed decimal points for temperature (WebUI) PR #1254 * fixed decimal points for temperature (WebUI) PR #1254
* fixed inverter statemachine available state PR #1252 * fixed inverter statemachine available state PR #1252
* fixed NTPUpdate and sunrise calculation #1240 #886
## 0.8.13 - 2023-11-28 ## 0.8.13 - 2023-11-28
* merge PR #1239 symbolic layout for OLED 128x64 + motion senser functionality * merge PR #1239 symbolic layout for OLED 128x64 + motion senser functionality

3
src/app.cpp
View file

@ -201,7 +201,8 @@ void app::updateNtp(void) {
void app::tickNtpUpdate(void) { void app::tickNtpUpdate(void) {
uint32_t nxtTrig = 5; // default: check again in 5 sec uint32_t nxtTrig = 5; // default: check again in 5 sec
#if defined(ETHERNET) #if defined(ETHERNET)
bool isOK = mEth.updateNtpTime(); bool isOK = (mTimestamp != 0);
mEth.updateNtpTime();
#else #else
bool isOK = mWifi.getNtpTime(); bool isOK = mWifi.getNtpTime();
#endif #endif

6
src/eth/ahoyeth.cpp
View file

@ -57,8 +57,7 @@ bool ahoyeth::updateNtpTime(void) {
return false; return false;
DPRINTLN(DBG_DEBUG, F("updateNtpTime: checking udp \"connection\"...")); Serial.flush(); DPRINTLN(DBG_DEBUG, F("updateNtpTime: checking udp \"connection\"...")); Serial.flush();
if (!mUdp.connected()) if (!mUdp.connected()) {
{
DPRINTLN(DBG_DEBUG, F("updateNtpTime: About to (re)connect...")); Serial.flush(); DPRINTLN(DBG_DEBUG, F("updateNtpTime: About to (re)connect...")); Serial.flush();
IPAddress timeServer; IPAddress timeServer;
if (!WiFi.hostByName(mConfig->ntp.addr, timeServer)) if (!WiFi.hostByName(mConfig->ntp.addr, timeServer))
@ -68,8 +67,7 @@ bool ahoyeth::updateNtpTime(void) {
return false; return false;
DPRINTLN(DBG_DEBUG, F("updateNtpTime: Connected...")); Serial.flush(); DPRINTLN(DBG_DEBUG, F("updateNtpTime: Connected...")); Serial.flush();
mUdp.onPacket([this](AsyncUDPPacket packet) mUdp.onPacket([this](AsyncUDPPacket packet) {
{
DPRINTLN(DBG_DEBUG, F("updateNtpTime: about to handle ntp packet...")); Serial.flush(); DPRINTLN(DBG_DEBUG, F("updateNtpTime: about to handle ntp packet...")); Serial.flush();
this->handleNTPPacket(packet); this->handleNTPPacket(packet);
}); });