From 2de96cd57c3f19bfa778ccad280ad19170af0967 Mon Sep 17 00:00:00 2001
From: Nicholas Corgan <nick.corgan@ettus.com>
Date: Fri, 15 Aug 2014 12:57:10 -0700
Subject: OctoClock: bugfixes/improvements

* Fixed Ethernet initialization problem
* Improved external reference detection
* Added gratuitous ARP, sent upon power-up
* Tweaked host-side timing for initialization and firmware burning
* Fixed logic for dealing with firmware incompatibility
* Misc efficiency/reliability improvements to firmware's network code
---
 firmware/octoclock/include/octoclock.h | 21 ++++++++++++++++-----
 1 file changed, 16 insertions(+), 5 deletions(-)

(limited to 'firmware/octoclock/include/octoclock.h')

diff --git a/firmware/octoclock/include/octoclock.h b/firmware/octoclock/include/octoclock.h
index 3c6254eba..849ab7f96 100644
--- a/firmware/octoclock/include/octoclock.h
+++ b/firmware/octoclock/include/octoclock.h
@@ -27,14 +27,25 @@
 #define F_CPU 12500000UL
 
 /*
- * Working with the AVR timer
+ * Timer 0 (8-bit)
+ *  * Set prescaler to 8
+ *  * Enable overflow interrupt
+ *  * Set timer to 0
  */
-// Prescaler: 1024, Timer: 0
-#define TIMER_INIT() TCCR1B = (1 << CS12) | (1 << CS10); \
+#define TIMER0_INIT() TCCR0 = (1 << CS01); \
+                      TIMSK |= (1 << TOIE0); \
+                      TCNT0 = 0;
+/*
+ * Timer 1 (16-bit)
+ *  * Set prescaler to 1024
+ *  * Enable overflow interrupt
+ *  * Set timer to 0
+ */
+#define TIMER1_INIT() TCCR1B = (1 << CS12) | (1 << CS10); \
+        TIMSK |= (1<<TOIE1); \
         TCNT1 = 0;
 
-#define TENTH_SECOND 13
-#define FIVE_SECONDS 61035
+#define TIMER1_ONE_SECOND ((uint32_t)(12207))
 
 // Locations of OctoClock information in EEPROM
 #define OCTOCLOCK_EEPROM_MAC_ADDR   0
-- 
cgit v1.2.3