From 68eb1cdbbab3d127957fd226c91b7c477a182179 Mon Sep 17 00:00:00 2001
From: Sebastien Bourdeauducq <sb@m-labs.hk>
Date: Sun, 6 Aug 2017 19:06:47 +0800
Subject: [PATCH] start ADC after initialization, to avoid FIFO overflows

---
 firmware/src/board.rs | 10 +++++++++-
 firmware/src/main.rs  |  5 ++---
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/firmware/src/board.rs b/firmware/src/board.rs
index 08f9fb4..416639f 100644
--- a/firmware/src/board.rs
+++ b/firmware/src/board.rs
@@ -281,8 +281,13 @@ pub fn init() {
              .pwm2en().bit(true)
              .pwm4en().bit(true)
         });
+    });
+}
+
+pub fn start_adc() {
+    cortex_m::interrupt::free(|cs| {
+        let sysctl = tm4c129x::SYSCTL.borrow(cs);
 
-        // Set up ADC
         let gpio_d = tm4c129x::GPIO_PORTD_AHB.borrow(cs);
         let gpio_e = tm4c129x::GPIO_PORTE_AHB.borrow(cs);
         gpio_d.afsel.write(|w| w.afsel().bits(FBV_ADC|AV_ADC));
@@ -318,6 +323,9 @@ pub fn init() {
         adc0.sac.write(|w| w.avg()._64x());
         adc0.ctl.write(|w| w.vref().bit(true));
         adc0.actss.write(|w| w.asen0().bit(true));
+
+        let nvic = tm4c129x::NVIC.borrow(cs);
+        nvic.enable(tm4c129x::Interrupt::ADC0SS0);
     });
 }
 
diff --git a/firmware/src/main.rs b/firmware/src/main.rs
index 193df36..6618c82 100644
--- a/firmware/src/main.rs
+++ b/firmware/src/main.rs
@@ -98,9 +98,6 @@ fn main() {
     board::init();
 
     cortex_m::interrupt::free(|cs| {
-        let nvic = tm4c129x::NVIC.borrow(cs);
-        nvic.enable(tm4c129x::Interrupt::ADC0SS0);
-
         let mut loop_anode = LOOP_ANODE.borrow(cs).borrow_mut();
         let mut loop_cathode = LOOP_CATHODE.borrow(cs).borrow_mut();
 
@@ -182,6 +179,8 @@ fn main() {
         (http::Request::new(), tcp_handle7),
     ];
 
+    board::start_adc();
+
     let mut next_blink = 0;
     let mut next_info = 0;
     let mut led_state = true;