lba.gitea/WLED
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

couple of bug fixes

Browse Source 
Fix a typo in one of the json vars
Fix an odd issue that would occur if sunrise or sunset occurs in the first hour after midnight UTC.  (The Dusk2Dawn lib would return a value greater than 1440.)
This commit is contained in:
garyd9 2020-08-09 21:58:27 -04:00
parent 38d6fbd3d3
commit 1da539ef05
1 changed files with 5 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
usermods/UserModv2_SunRiseAndSet/UserMod_SunRiseAndSet.h
View File

@ -99,30 +99,17 @@ public:
// are set. That happens when the device has just stated, and after both sunrise/sunset have already run. // are set. That happens when the device has just stated, and after both sunrise/sunset have already run.
if ((-1 == m_nUserSunrise) && (-1 == m_nUserSunset)) if ((-1 == m_nUserSunrise) && (-1 == m_nUserSunset))
{ {
m_nUserSunrise = m_pD2D->sunrise(tmNow.Year + 1970, tmNow.Month, tmNow.Day, false); m_nUserSunrise = m_pD2D->sunrise(tmNow.Year + 1970, tmNow.Month, tmNow.Day, false) % 1440;
m_nUserSunset = m_pD2D->sunset(tmNow.Year + 1970, tmNow.Month, tmNow.Day, false); m_nUserSunset = m_pD2D->sunset(tmNow.Year + 1970, tmNow.Month, tmNow.Day, false) % 1440;
if (m_nUserSunrise > numMinutes) // has sunrise already passed? if so, recompute for tomorrow if (m_nUserSunrise > numMinutes) // has sunrise already passed? if so, recompute for tomorrow
{ {
breakTime(timeUTC + (60*60*24), tmNow); breakTime(timeUTC + (60*60*24), tmNow);
m_nUserSunrise = m_pD2D->sunrise(tmNow.Year + 1970, tmNow.Month, tmNow.Day, false); m_nUserSunrise = m_pD2D->sunrise(tmNow.Year + 1970, tmNow.Month, tmNow.Day, false) % 1440;
if (m_nUserSunset > numMinutes) // if sunset has also passed, recompute that as well if (m_nUserSunset > numMinutes) // if sunset has also passed, recompute that as well
{ {
m_nUserSunset = m_pD2D->sunset(tmNow.Year + 1970, tmNow.Month, tmNow.Day, false); m_nUserSunset = m_pD2D->sunset(tmNow.Year + 1970, tmNow.Month, tmNow.Day, false) % 1440;
} }
} }
#if 0
{ // debug block..
// for debugging, convert everything to "local" time
updateLocalTime();
int offset = (localTime - timeUTC) / 60;
int srMin = m_nUserSunrise + offset;
int ssMin = m_nUserSunset + offset;
Serial.printf("NEXT SUNRISE: %d:%d\n", srMin / 60, srMin % 60);
Serial.printf("NEXT SUNSET: %d:%d\n", ssMin / 60, ssMin % 60);
} // end debug block
#endif
// offset by user provided values. becuase the offsets are signed bytes, the max offset is just over 2 hours. // offset by user provided values. becuase the offsets are signed bytes, the max offset is just over 2 hours.
m_nUserSunrise += m_sunriseOffset; m_nUserSunrise += m_sunriseOffset;
m_nUserSunset += m_sunsetOffset; m_nUserSunset += m_sunsetOffset;
@ -166,7 +153,7 @@ public:
vars["rise_mac"] = m_sunriseMacro; vars["rise_mac"] = m_sunriseMacro;
vars["set_mac"] = m_sunsetMacro; vars["set_mac"] = m_sunsetMacro;
vars["rise_off"] = m_sunriseOffset; vars["rise_off"] = m_sunriseOffset;
vars["set_off"] = m_sunsetMacro; vars["set_off"] = m_sunsetOffset;
} }
~UserMod_SunRiseAndSet(void) ~UserMod_SunRiseAndSet(void)