Diff: main.cpp

Revision:

4:b04a24076feb

Parent:

3:e2e8519a7ce7

Child:

5:926b094680d1

--- a/main.cpp	Mon Jul 30 07:31:30 2012 +0000
+++ b/main.cpp	Mon Aug 27 15:02:29 2012 +0000
@@ -193,6 +193,7 @@
             sm3 =  Major(s1, s2, s3);
             smag = Major(sm1, sm2, sm3);
             adc.interrupt_state(p20, 0);
+//            adc.interrupt_state(p19, 1);
             pass20 = 0;
             complete20 = 1;
             break;
@@ -236,6 +237,7 @@
             im3 =  Major(i1, i2, i3);
             smag = Major(im1, im2, im3);
             adc.interrupt_state(p19, 0);
+//            adc.interrupt_state(p16, 1);
             pass19 = 0;
             complete19 = 1;
             break;
@@ -292,18 +294,24 @@
 float err;
 
 void flip() {
-//        if(complete20 && complete19 && complete16) {
-    {    complete20 = complete19 = complete16 = 0;
-        int_led4 = 0;
+//    if(complete20 && complete19 && complete16) {
+  {      complete20 = complete19 = complete16 = 0;
+        int_led4 = 1;
         sprintf(str, "2=%4u %4u %4u\0",sm1, im1, am1);
         Net::poll();                //Do network stuff
         udp.sendto( str, strlen(str)+1, &multicast );
+//        LPC_ADC->ADINTEN = 0;
         adc.interrupt_state(p20, 1);
         adc.interrupt_state(p19, 1);
         adc.interrupt_state(p16, 1);
+//        LPC_ADC->ADINTEN &= ~0x100;
+//        LPC_ADC->ADINTEN |= 1 << chan;
+//        LPC_ADC->ADINTEN |= 0x32;
+        /* Enable the ADC Interrupt */
+//        NVIC_EnableIRQ(ADC_IRQn);
     } 
 //    else {
-//            int_led4 = 1;
+//            int_led4 = 0;
 //    }
 }
 /*    switch(number) {