This commit is contained in:
wolfgang
2013-01-31 18:12:19 +01:00
parent d33d8ffe4a
commit 07febefc74
4 changed files with 8 additions and 5 deletions

View File

@ -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++;
}
}

View File

@ -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;

View File

@ -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);
}

View File

@ -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);
}
}