wn/JustAnotherClock
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix second overrun, minute direction, optime display

Browse Source
This commit is contained in:
wolfgang
2013-01-29 18:40:35 +01:00
parent d997d21ac1
commit 7fa9715d41
3 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/clock.c
View File

@ -44,7 +44,6 @@ ISR(TIMER2_OVF_vect) {
if (useLocalClock == 1) { if (useLocalClock == 1) {
if (clock.second >= 60) { if (clock.second >= 60) {
clock.second = 0;
clock.minute++; clock.minute++;
} }
if (clock.minute >= 60) { if (clock.minute >= 60) {
@ -56,6 +55,10 @@ ISR(TIMER2_OVF_vect) {
} }
} }
if (clock.second >= 60) {
clock.second = 0;
}
opTime.second++; opTime.second++;
nextSecond = 1; nextSecond = 1;

2
src/main.c
View File

@ -46,7 +46,7 @@ int main() {
if (clockNextMinute()) { if (clockNextMinute()) {
opTime_t opTime = clockGetOpTime(); 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);
} }
} }

4
src/stepper.c
View File

@ -58,11 +58,11 @@ static inline void hourMotorBackward() {
STEPPER_REG_1 |= (1 << HOUR_MOTOR_DIRECTION); STEPPER_REG_1 |= (1 << HOUR_MOTOR_DIRECTION);
} }
static inline void minuteMotorForward() { static inline void minuteMotorBackward() {
STEPPER_REG_1 &= ~(1 << MINUTE_MOTOR_DIRECTION); STEPPER_REG_1 &= ~(1 << MINUTE_MOTOR_DIRECTION);
} }
static inline void minuteMotorBackward() { static inline void minuteMotorForward() {
STEPPER_REG_1 |= (1 << MINUTE_MOTOR_DIRECTION); STEPPER_REG_1 |= (1 << MINUTE_MOTOR_DIRECTION);
} }