diff options
| author | Martin Braun <martin.braun@ettus.com> | 2015-09-01 15:20:42 -0700 |
|---|---|---|
| committer | Martin Braun <martin.braun@ettus.com> | 2015-09-01 15:20:42 -0700 |
| commit | 6464a000150858b5d65a53490f0593d5ba1e4ca6 (patch) | |
| tree | a199c3773d683d9e37fa300900291c3628cff6e4 /firmware/octoclock | |
| parent | d697bff4547b6a7fb95e127ec12e2989fc6fc2e5 (diff) | |
| parent | 8adefb1d80f08a53856fef45b80ed5a07f0a9a26 (diff) | |
| download | uhd-6464a000150858b5d65a53490f0593d5ba1e4ca6.tar.gz uhd-6464a000150858b5d65a53490f0593d5ba1e4ca6.tar.bz2 uhd-6464a000150858b5d65a53490f0593d5ba1e4ca6.zip | |
Merge branch 'maint'
Diffstat (limited to 'firmware/octoclock')
| -rw-r--r-- | firmware/octoclock/bootloader/main.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/firmware/octoclock/bootloader/main.c b/firmware/octoclock/bootloader/main.c index 09f740d31..15e4f893c 100644 --- a/firmware/octoclock/bootloader/main.c +++ b/firmware/octoclock/bootloader/main.c @@ -1,5 +1,5 @@ /* - * Copyright 2014 Ettus Research LLC + * Copyright 2014-2015 Ettus Research LLC * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -34,11 +34,7 @@ #include "octoclock/common.h" -/* - * The number for 5 seconds is close enough to 65535 that the - * timer may have overflowed before the main loop queries it. - */ -#define TIME_PASSED (TCNT1 > (TIMER1_ONE_SECOND*5) || (TIFR & _BV(TOV1))) +#define TIME_PASSED (TCNT1 > TIMER1_ONE_SECOND) /* * States |