Diff: main.cpp

Revision:

1:7972095b7aea

Parent:

0:7a527a9bedce

--- a/main.cpp	Sun Apr 21 12:39:43 2013 +0000
+++ b/main.cpp	Tue Apr 23 14:11:00 2013 +0000
@@ -1,14 +1,23 @@
 #include "mbed.h"
  
-//are these actually used ???
+//are these actually used ??? - not used sg. Was for the inital LED's you had. Then I thought of the 4 into 16 while coding
 DigitalOut ext_led[8] = {p21,p22,p23,p24,p25,p26,p27,p28};
 //DigitalOut int_led[4] = {LED1, LED2, LED3, LED4};
 
 // from handbook for BusOut:  Flexible way to write multiple DigitalOut pins as one value
 BusOut int_led(LED1, LED2, LED3, LED4);  //four built-in LEDs used to display the counter from the trigger
  
-DigitalInOut fire(p20);     //connected to the tip of 2.5mm connector (T2i)
-DigitalInOut pre_fire(p19); //connected to the mid-connection for 2.5mm connector (T2i)
+//original from Sam in Seaside
+//DigitalInOut fire(p20);     //connected to the tip of 2.5mm connector (T2i)
+//DigitalInOut pre_fire(p19); //connected to the mid-connection for 2.5mm connector (T2i)
+
+//modification to connect to the IMU carrier board
+DigitalInOut fire(p29);     //connected to the tip of 2.5mm connector (T2i)
+DigitalInOut pre_fire(p30); //connected to the mid-connection for 2.5mm connector (T2i)
+
+// using ADIS hardware
+//DigitalInOut fire(p29);     //connected to the tip of 2.5mm connector (T2i)
+//DigitalInOut pre_fire(p30); //connected to the mid-connection for 2.5mm connector (T2i)
 
 InterruptIn x(p18); 
 Serial pc(USBTX, USBRX);
@@ -28,7 +37,7 @@
     int_led = 0;
 }
 
-//xFire procedure is not used in the logic in main 
+//xFire procedure is not used in the logic in main. This was to test the accuracy of the hotshoe trigger and it was spot on sg
 void xFire()
 {
     for(int i=1; i<16; i++)