From 7fa9715d41cfb4da6097f542f2ecfc8ef347ee27 Mon Sep 17 00:00:00 2001 From: wolfgang Date: Tue, 29 Jan 2013 18:40:35 +0100 Subject: [PATCH] fix second overrun, minute direction, optime display --- src/clock.c | 5 ++++- src/main.c | 2 +- src/stepper.c | 4 ++-- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/src/clock.c b/src/clock.c index 0efca82..23eda7a 100644 --- a/src/clock.c +++ b/src/clock.c @@ -44,7 +44,6 @@ ISR(TIMER2_OVF_vect) { if (useLocalClock == 1) { if (clock.second >= 60) { - clock.second = 0; clock.minute++; } if (clock.minute >= 60) { @@ -56,6 +55,10 @@ ISR(TIMER2_OVF_vect) { } } + if (clock.second >= 60) { + clock.second = 0; + } + opTime.second++; nextSecond = 1; diff --git a/src/main.c b/src/main.c index 8e7e731..81c4bc5 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: % 4d:%02d:%02d\n", opTime.hour, opTime.minute, opTime.second); } } diff --git a/src/stepper.c b/src/stepper.c index 6e4e935..2bbf8e4 100644 --- a/src/stepper.c +++ b/src/stepper.c @@ -58,11 +58,11 @@ static inline void hourMotorBackward() { STEPPER_REG_1 |= (1 << HOUR_MOTOR_DIRECTION); } -static inline void minuteMotorForward() { +static inline void minuteMotorBackward() { STEPPER_REG_1 &= ~(1 << MINUTE_MOTOR_DIRECTION); } -static inline void minuteMotorBackward() { +static inline void minuteMotorForward() { STEPPER_REG_1 |= (1 << MINUTE_MOTOR_DIRECTION); }