From 07febefc74be310bbf686c7aac690c77e972f83a Mon Sep 17 00:00:00 2001 From: wolfgang Date: Thu, 31 Jan 2013 18:12:19 +0100 Subject: [PATCH] long --- src/clock.c | 2 ++ src/clock.h | 3 ++- src/dcf77.c | 6 +++--- src/main.c | 2 +- 4 files changed, 8 insertions(+), 5 deletions(-) diff --git a/src/clock.c b/src/clock.c index 23eda7a..fe11cc4 100644 --- a/src/clock.c +++ b/src/clock.c @@ -23,6 +23,7 @@ void clockInit() { clock.minute = 0; clock.second = 0; + opTime.day = 0; opTime.hour = 0; opTime.minute = 0; opTime.second = 0; @@ -74,6 +75,7 @@ ISR(TIMER2_OVF_vect) { } if (opTime.hour >= 24) { opTime.hour = 0; + opTime.day++; } } diff --git a/src/clock.h b/src/clock.h index a81355b..77b7ccb 100644 --- a/src/clock.h +++ b/src/clock.h @@ -21,7 +21,8 @@ typedef struct clock_s { typedef struct opTime_s { uint8_t second; uint8_t minute; - uint16_t hour; + uint8_t hour; + uint16_t day; } opTime_t; diff --git a/src/dcf77.c b/src/dcf77.c index c989214..0785287 100644 --- a/src/dcf77.c +++ b/src/dcf77.c @@ -32,8 +32,8 @@ volatile uint8_t tick; volatile uint16_t captValue = 0; volatile uint16_t gapValue = 0; volatile uint8_t valid = 0; -uint16_t validCnt = 0; -uint16_t timeValidCnt = 0; +uint32_t validCnt = 0; +uint32_t timeValidCnt = 0; @@ -391,7 +391,7 @@ void dcf77Engine() { state++; } - printf("DCF77: %d %02d %d %d %d %d %d\n", + printf("DCF77: %d %02d %d %d %d %ld %ld\n", valid, showState, bit, pulse, gap, validCnt, timeValidCnt); } diff --git a/src/main.c b/src/main.c index 81c4bc5..7008e86 100644 --- a/src/main.c +++ b/src/main.c @@ -46,7 +46,7 @@ int main() { if (clockNextMinute()) { opTime_t opTime = clockGetOpTime(); - printf("**** OpTime: % 4d:%02d:%02d\n", opTime.hour, opTime.minute, opTime.second); + printf("**** OpTime: %d %02d:%02d:%02d\n", opTime.day, opTime.hour, opTime.minute, opTime.second); } }