Diff: main.cpp

Revision:

3:1da946d6339d

Parent:

2:b57a1cf4d5a7

--- a/main.cpp	Fri Dec 04 07:35:46 2020 +0000
+++ b/main.cpp	Fri Jan 08 08:49:45 2021 +0000
@@ -1,19 +1,21 @@
+#include "main.h"
 #include "mbed.h"
 #include "nRF24L01P.h"
+#include "protocol.h"
+
 
 Serial pc(USBTX, USBRX); // tx, rx
 
-nRF24L01P my_nrf24l01p(PD_4, PD_3, PD_1, D9, D8, D1);    // mosi, miso, sck, csn, ce, irq
+nRF24L01P my_nrf24l01p(SPI2_MOSI, SPI2_MISO, SPI2_SCLK, CSN, CE, IRQ);    // mosi, miso, sck, csn, ce, irq
 
 DigitalOut myled1(LED1);
 DigitalOut myled2(LED2);
 
-int main() {
-
+int main() 
+{
 // 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];
     int txDataCnt = 0;
@@ -22,30 +24,51 @@
     my_nrf24l01p.powerUp();
 
     // Display the (default) setup of the nRF24L01+ chip
+    pc.printf("Default setup : \r\n");
+    pc.printf( "nRF24L01+ Frequency    : %d MHz\r\n",  my_nrf24l01p.getRfFrequency() );
+    pc.printf( "nRF24L01+ Output power : %d dBm\r\n",  my_nrf24l01p.getRfOutputPower() );
+    pc.printf( "nRF24L01+ Data Rate    : %d kbps\r\n", my_nrf24l01p.getAirDataRate() );
+    pc.printf( "nRF24L01+ TX Address   : 0x%010llX\r\n", my_nrf24l01p.getTxAddress() );
+    pc.printf( "nRF24L01+ RX Address   : 0x%010llX\r\n", my_nrf24l01p.getRxAddress() );
+    pc.printf("\r\n\r\n");
+
+    my_nrf24l01p.setRfFrequency(NRF24L01P_MIN_RF_FREQUENCY);
+    my_nrf24l01p.setAirDataRate(NRF24L01P_DATARATE_2_MBPS);
+    my_nrf24l01p.setTxAddress(0xFFA);
+    my_nrf24l01p.setRxAddress(0xFFE);
+    
+    pc.printf("Custom setup : \r\n");
     pc.printf( "nRF24L01+ Frequency    : %d MHz\r\n",  my_nrf24l01p.getRfFrequency() );
     pc.printf( "nRF24L01+ Output power : %d dBm\r\n",  my_nrf24l01p.getRfOutputPower() );
     pc.printf( "nRF24L01+ Data Rate    : %d kbps\r\n", my_nrf24l01p.getAirDataRate() );
     pc.printf( "nRF24L01+ TX Address   : 0x%010llX\r\n", my_nrf24l01p.getTxAddress() );
     pc.printf( "nRF24L01+ RX Address   : 0x%010llX\r\n", my_nrf24l01p.getRxAddress() );
-
-    pc.printf( "Type keys to test transfers:\r\n  (transfers are grouped into %d characters)\r\n", TRANSFER_SIZE );
+    pc.printf("\r\n\r\n");
 
     my_nrf24l01p.setTransferSize( TRANSFER_SIZE );
 
-    my_nrf24l01p.setReceiveMode();
+    my_nrf24l01p.setTransmitMode();
     my_nrf24l01p.enable();
-
-    while (1) {
-
+    
+    //Test Protocol + envoie Trame
+    char message[] = "Bonjour";
+    int taille = 8;
+    char trame[taille + 6];
+    encodeMessage(COMMAND_ID_TEXT, taille, message, trame);
+    
+    
+    //Infinite Loop
+    while (1) 
+    {
         // If we've received anything over the host serial link...
-        if ( pc.readable() ) {
-
+        if ( pc.readable() ) 
+        {
             // ...add it to the transmit buffer
             txData[txDataCnt++] = pc.getc();
 
             // If the transmit buffer is full
-            if ( txDataCnt >= sizeof( txData ) ) {
-
+            if ( txDataCnt >= sizeof( txData ) ) 
+            {
                 // Send the transmitbuffer via the nRF24L01+
                 my_nrf24l01p.write( NRF24L01P_PIPE_P0, txData, txDataCnt );
 
@@ -57,16 +80,14 @@
         }
 
         // If we've received anything in the nRF24L01+...
-        if ( my_nrf24l01p.readable() ) {
-
+        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++ ) {
-
+            for ( int i = 0; rxDataCnt > 0; rxDataCnt--, i++ ) 
                 pc.putc( rxData[i] );
-            }
 
             // Toggle LED2 (to help debug nRF24L01+ -> Host communication)
             myled2 = !myled2;