Diff: main.cpp

Revision:

12:efcfe4c0d9f2

Parent:

11:a9f4237eaaa1

Child:

13:fbcc71fca474

--- a/main.cpp	Wed Apr 18 23:09:40 2018 +0000
+++ b/main.cpp	Fri Apr 20 14:38:27 2018 +0000
@@ -4,7 +4,7 @@
 #include "nRF24L01P.h"
 #define TRANSFER_SIZE   4 //added 5:54pm 4/18/18
 Serial pc(USBTX, USBRX); // tx, rx
- 
+
 nRF24L01P my_nrf24l01p(p5, p6, p7, p8, p9, p10);    // mosi, miso, sck, csn, ce, irq
 DigitalOut myled1(LED1);
 DigitalOut myled2(LED2);
@@ -14,20 +14,21 @@
 InterruptIn Button(p20); //changed DitialIn to InterruptIn at 5:54 4/18/18
 AnalogOut speaker(p18); //added 6:34 pm at 4/18/18
 
-    char txData[TRANSFER_SIZE], rxData[TRANSFER_SIZE]; //making these usable by other voids.
-    int txDataCnt = 0;//and this.
-    int rxDataCnt = 0;//and this. //David Rechtmann 6.24 pm 4/18/18
-    
-void startup() {
+char txData[TRANSFER_SIZE], rxData[TRANSFER_SIZE]; //making these usable by other voids.
+int txDataCnt = 0;//and this.
+int rxDataCnt = 0;//and this. //David Rechtmann 6.24 pm 4/18/18
+
+void startup()
+{
 
 // The nRF24L01+ supports transfers from 1 to 32 bytes, but Sparkfun's
 //  "Nordic Serial Interface Board" (http://www.sparkfun.com/products/9019)
 //  only handles 4 byte transfers in the ATMega code.
 //define TRANSFER_SIZE   4
 
- //   char txData[TRANSFER_SIZE], rxData[TRANSFER_SIZE]; //making these usable by other voids.
-   // int txDataCnt = 0;//and this.
-   // int rxDataCnt = 0;//and this. //David Rechtmann 6:24 pm 4/18/18
+//   char txData[TRANSFER_SIZE], rxData[TRANSFER_SIZE]; //making these usable by other voids.
+    // int txDataCnt = 0;//and this.
+    // int rxDataCnt = 0;//and this. //David Rechtmann 6:24 pm 4/18/18
 
     my_nrf24l01p.powerUp();
 
@@ -46,82 +47,78 @@
     my_nrf24l01p.enable();
 }
 
-    
-void pctransmit() {
-      // If we've received anything over the host serial link...
-        if ( pc.readable() ) {
+
+void pctransmit()
+{
+    // If we've received anything over the host serial link...
+    if ( pc.readable() ) {
 
-            // ...add it to the transmit buffer
-            txData[txDataCnt++] = pc.getc();
+        // ...add it to the transmit buffer
+        txData[txDataCnt++] = pc.getc();
+
+        // If the transmit buffer is full
+        if ( txDataCnt >= sizeof( txData ) ) {
+
+            // Send the transmitbuffer via the nRF24L01+
+            my_nrf24l01p.write( NRF24L01P_PIPE_P0, txData, txDataCnt );
 
-            // If the transmit buffer is full
-            if ( txDataCnt >= sizeof( txData ) ) {
+            txDataCnt = 0;
+        }
 
-                // Send the transmitbuffer via the nRF24L01+
-                my_nrf24l01p.write( NRF24L01P_PIPE_P0, txData, txDataCnt );
+        // Toggle LED1 (to help debug Host -> nRF24L01+ communication)
+        myled3 = !myled3;
+    }
 
-                txDataCnt = 0;
-            }
+    // If we've received anything in the nRF24L01+...
+    if ( my_nrf24l01p.readable() ) {
 
-            // Toggle LED1 (to help debug Host -> nRF24L01+ communication)
-            myled3 = !myled3;
+        // ...read the data into the receive buffer
+        rxDataCnt = my_nrf24l01p.read( NRF24L01P_PIPE_P0, rxData, sizeof( rxData ) );
+
+        // Display the receive buffer contents via the host serial link
+        for ( int i = 0; rxDataCnt > 0; rxDataCnt--, i++ ) {
+
+            pc.putc( rxData[i] );
         }
 
-        // If we've received anything in the nRF24L01+...
-        if ( my_nrf24l01p.readable() ) {
-
-            // ...read the data into the receive buffer
-            rxDataCnt = my_nrf24l01p.read( NRF24L01P_PIPE_P0, rxData, sizeof( rxData ) );
-
-            // Display the receive buffer contents via the host serial link
-            for ( int i = 0; rxDataCnt > 0; rxDataCnt--, i++ ) {
+        // Toggle LED2 (to help debug nRF24L01+ -> Host communication)
+        myled3 = !myled3;
+    }
+}
 
-                pc.putc( rxData[i] );
-            }
-
-            // Toggle LED2 (to help debug nRF24L01+ -> Host communication)
-            myled3 = !myled3;
-        }
-    }
-    //}   
-    
-void receive() { //most of this function added by david at 6:02pm 4/18/18
-   float sample;
+void receive()   //most of this function added by david at 6:02pm 4/18/18
+{
+    float sample;
     float average = 0.67/3.3;//initial DC bias level
- while (Button == 0) {
-     if (my_nrf24l01p.readable(0)) {
-         my_nrf24l01p.read(0, rxData, 1 );//replace thrid val w/ 1?
-          sample = uint8_t (rxData);
-          average =  0.9999*average + 0.0001*sample; //This is in the mPA demo but I'm not sure how it works -david
-          speaker = 0.5 +((sample - average)*33.0);
-         }
-   if ( txDataCnt >= sizeof( txData ) ) { //i'm not sure what this does??? -david
+    while (Button == 0) {
+        if (my_nrf24l01p.readable(0)) {
+            my_nrf24l01p.read(0, rxData, 1 );//replace thrid val w/ 1?
+            sample = uint8_t (rxData);
+            average =  0.9999*average + 0.0001*sample; //This is in the mPA demo but I'm not sure how it works -david
+            speaker = 0.5 +((sample - average)*33.0);
+        }
 
-                // Send the transmitbuffer via the nRF24L01+
-                my_nrf24l01p.write( NRF24L01P_PIPE_P0, txData, txDataCnt );
+    }
+}
 
-                txDataCnt = 0;
-            }      
-     
-     }
- }
- 
-void transmit() {
-  //  while   (mymycrophone.getData()) {
+void transmit()
+{
+    //  while   (mymycrophone.getData()) {
     //     txData[txDataCnt++] = mymicrophone.getData();
     //    }
-   // txData[txDataCnt++] = ;
-   my_nrf24l01P.setTransmitMode(); // for latest revision 5:52pm 4/18/1, this doesn't compile and I don't know why.
-   speaker = 0;
-   while (Button == 1) {
-    my_nrf24l01P.write(0, mymicrophone.getData(), txDataCnt);
+    // txData[txDataCnt++] = ;
+    speaker = 0;
+    while (Button == 1) {
+        my_nrf24l01P.write(0, mymicrophone.getData(), 1);
     }
-    }
-int main() {
+}
+
+int main()
+{
     Button.mode(PullUp);//added 6:23pm 4/18/18
     Button.rise(&transmit);
     Button.fall(&receive);
     while (1) {
-        
-        }
-    }
\ No newline at end of file
+
+    }
+}
\ No newline at end of file