Merge pull request #298 from cyberman54/development

Development
This commit is contained in:
Verkehrsrot 2019-03-07 00:10:32 +01:00 committed by GitHub
commit 7d9b79fa6c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -195,7 +195,6 @@ void clock_loop(void *taskparameter) { // ClockTask
// caveat: don't use now() in this task, it will cause a race condition // caveat: don't use now() in this task, it will cause a race condition
// due to concurrent access to i2c bus for setting rtc via SyncProvider! // due to concurrent access to i2c bus for setting rtc via SyncProvider!
#define nextsec(t) (t + 1) // next second
#define nextmin(t) (t + DCF77_FRAME_SIZE + 1) // next minute #define nextmin(t) (t + DCF77_FRAME_SIZE + 1) // next minute
uint32_t printtime; uint32_t printtime;
@ -220,7 +219,7 @@ void clock_loop(void *taskparameter) { // ClockTask
#if defined HAS_IF482 #if defined HAS_IF482
IF482_Pulse(nextsec(t)); IF482_Pulse(t);
#elif defined HAS_DCF77 #elif defined HAS_DCF77