Diff: main.cpp

Revision:

3:487c2fdc28f0

Parent:

2:623747e75e3c

--- a/main.cpp	Sat Oct 03 10:20:07 2015 +0000
+++ b/main.cpp	Sat Oct 03 12:22:16 2015 +0000
@@ -3,18 +3,19 @@
 // Payload uC (Tiva) -- > SPI master
 // CDMS uC (Freescale) --> SPI slave
 // packet length = 32*16 bits (32 bins --> each 2 bytes)
- 
+
+#include "pin_config.h"
 #include "mbed.h"
 //int f;
 void FUNC_MASTER_WRITE(void);
 const int addr = 0x20<<1;
 const int addr1 = (0x20<<1|0);
-Timer Siv ;
-I2C master (D14,D15);
-InterruptIn PYLD_I2C_Int(PTA13);
+Timer t;
+I2C master (PIN32,PIN31);
+InterruptIn PYLD_I2C_Int(PIN100);
 //DigitalIn test(PTA13);
-SPISlave device(PTD6, PTD7, PTD5,PTD4 ); // mosi, miso, sclk, ssel --> using SPI1
-InterruptIn PYLD_SPI_Interrupt(PTD2);
+SPISlave device(PIN16, PIN17, PIN15, PIN14 ); // mosi, miso, sclk, ssel --> using SPI1
+InterruptIn PYLD_SPI_Interrupt(PIN89);
 DigitalOut flash(LED4);
 int payloadBins = 3096;
 float Stability_delay = 0.005228 ;// 0.005228
@@ -26,7 +27,7 @@
    
     //wait(Stability_delay); // wait after interrupt for stability
     unsigned short scienceRawPacket[payloadBins];
-    
+    t.start();
     for(int i=0; i<payloadBins;i++){
        
         
@@ -35,14 +36,15 @@
         scienceRawPacket[i] = device.read();   // Read byte from master
 
     }
+    t.stop();
     // serial feedback
     pc.printf("Packet recieved\r\n");
     for(int i=0;i<payloadBins;i++){
         pc.printf("%d\t",scienceRawPacket[i]);
         scienceRawPacket[i] = 0;
     }
-    pc.printf("\r\n");
- 
+    pc.printf("\n time taken = %f\r\n",t.read());
+ t.reset();
 } 
 int dt3;
 bool f = 1;