aboutsummaryrefslogtreecommitdiffstats
path: root/firmware
diff options
context:
space:
mode:
authorNicholas Corgan <nick.corgan@ettus.com>2015-08-17 10:21:20 -0700
committerMartin Braun <martin.braun@ettus.com>2015-09-01 13:39:49 -0700
commitdbf09cabf44c2bfff767e350b65f92a586819b34 (patch)
tree7441cad0c3a6ff3c6e6ad834731b8fb24e11e4ef /firmware
parent0d290169f26f8f174ab93f7994207bcbf223ca9a (diff)
downloaduhd-dbf09cabf44c2bfff767e350b65f92a586819b34.tar.gz
uhd-dbf09cabf44c2bfff767e350b65f92a586819b34.tar.bz2
uhd-dbf09cabf44c2bfff767e350b65f92a586819b34.zip
OctoClock: shortened bootloader's wait for burner signal
Diffstat (limited to 'firmware')
-rw-r--r--firmware/octoclock/bootloader/main.c8
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