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

stepper support

Browse Source
This commit is contained in:
wolfgang
2013-01-23 13:07:12 +01:00
parent c56eb174de
commit db8b0520aa
1 changed files with 23 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
src/main.c
View File

@ -44,8 +44,6 @@ typedef struct clock_s {
uint8_t weekday; uint8_t weekday;
uint8_t month; uint8_t month;
uint8_t year; uint8_t year;
uint8_t minuteStepPosition;
uint8_t hourStepPosition;
} clock_t; } clock_t;
typedef struct opTime_s { typedef struct opTime_s {
@ -67,8 +65,6 @@ volatile uint8_t tack = 0;
volatile uint8_t step = 0; volatile uint8_t step = 0;
ISR(TIMER2_OVF_vect) { ISR(TIMER2_OVF_vect) {
cli();
clock.second++; clock.second++;
if (valid != 2) { if (valid != 2) {
@ -85,8 +81,6 @@ ISR(TIMER2_OVF_vect) {
} }
} }
sei();
opTime.second++; opTime.second++;
if (opTime.second >= 60) { if (opTime.second >= 60) {
@ -134,8 +128,6 @@ int main() {
clock.hour = 0; clock.hour = 0;
clock.minute = 0; clock.minute = 0;
clock.second = 0; clock.second = 0;
clock.minuteStepPosition = 0;
clock.hourStepPosition = 0;
opTime.hour = 0; opTime.hour = 0;
opTime.minute = 0; opTime.minute = 0;
@ -484,8 +476,6 @@ int main() {
clock.month = rd.monthDigit0 + rd.monthDigit1 * 10; clock.month = rd.monthDigit0 + rd.monthDigit1 * 10;
clock.year = rd.yearDigit0 + rd.yearDigit1 * 10; clock.year = rd.yearDigit0 + rd.yearDigit1 * 10;
clock.minuteStepPosition = clock.minute * STEPS_PER_MINUTE;
clock.hourStepPosition = clock.hour * STEPS_PER_HOUR;
valid = 2; valid = 2;
timeValidCnt++; timeValidCnt++;
@ -523,25 +513,31 @@ int main() {
printf("POS: %02d\n", positionSwitch); printf("POS: %02d\n", positionSwitch);
} }
static uint8_t currentMinutePosition = 0; if (timeValidCnt > 0) {
static uint8_t currentHourPosition = 0; if (step != 0) {
if (step != 0) { step = 0;
step = 0;
if (currentMinutePosition != clock.minuteStepPosition) { static uint8_t currentMinutePosition = 0;
printf("Minute: "); uint8_t minuteStepPosition = clock.minute * STEPS_PER_MINUTE;
if (currentMinutePosition > clock.minuteStepPosition) { if (currentMinutePosition != minuteStepPosition) {
printf("steps backward, "); printf("Minute: ");
if (currentMinutePosition > minuteStepPosition) {
printf("steps backward, ");
}
currentMinutePosition++;
printf("desired: %d, current: %d\n", minuteStepPosition, currentMinutePosition);
} }
currentMinutePosition++;
printf("desired: %d, current: %d\n", clock.minuteStepPosition, currentMinutePosition); static uint8_t currentHourPosition = 0;
} uint8_t hourStepPosition = clock.hour * STEPS_PER_HOUR;
if (currentHourPosition != clock.hourStepPosition) { if (currentHourPosition != hourStepPosition) {
printf("Hour: "); printf("Hour: ");
if (currentHourPosition > clock.hourStepPosition) { if (currentHourPosition > hourStepPosition) {
printf("steps backward, "); printf("steps backward, ");
}
currentHourPosition++;
printf("desired: %d, current: %d\n", hourStepPosition, currentHourPosition);
} }
currentHourPosition++;
printf("desired: %d, current: %d\n", clock.hourStepPosition, currentHourPosition);
} }
} }