Ping Ping entre un Master et un slave LORA

Dependencies:   SX1272Lib mbed

Fork of SX1272PingPong by Semtech

Revision:
15:063aa5212203
Parent:
14:ab6eecd44b7a
Child:
16:ef85c3a61509
--- a/main.cpp	Mon Apr 24 09:29:13 2017 +0000
+++ b/main.cpp	Mon Mar 05 21:09:52 2018 +0000
@@ -3,7 +3,6 @@
 #include "sx1272-hal.h"
 #include "debug.h"
 
-/* Set this flag to '1' to display debug messages on the console */
 #define DEBUG_MESSAGE   1
 
 /* Set this flag to '1' to use the LoRa modulation or to '0' to use FSK modulation */
@@ -11,49 +10,26 @@
 #define USE_MODEM_FSK   !USE_MODEM_LORA
 
 #define RF_FREQUENCY                                    868000000 // Hz
-#define TX_OUTPUT_POWER                                 14        // 14 dBm
-
-#if USE_MODEM_LORA == 1
-
-    #define LORA_BANDWIDTH                              2         // [0: 125 kHz,
-                                                                  //  1: 250 kHz,
-                                                                  //  2: 500 kHz,
-                                                                  //  3: Reserved]
-    #define LORA_SPREADING_FACTOR                       7         // [SF7..SF12]
-    #define LORA_CODINGRATE                             1         // [1: 4/5,
-                                                                  //  2: 4/6,
-                                                                  //  3: 4/7,
-                                                                  //  4: 4/8]
-    #define LORA_PREAMBLE_LENGTH                        8         // Same for Tx and Rx
-    #define LORA_SYMBOL_TIMEOUT                         5         // Symbols
-    #define LORA_FIX_LENGTH_PAYLOAD_ON                  false
-    #define LORA_FHSS_ENABLED                           false  
-    #define LORA_NB_SYMB_HOP                            4     
-    #define LORA_IQ_INVERSION_ON                        false
-    #define LORA_CRC_ENABLED                            true
+#define TX_OUTPUT_POWER                                 14    // 14 dBm
+/**** LORA_BANDWIDTH 0:125khz / 1:250khz / 2:500khz ****/
+#define LORA_BANDWIDTH                                  2 
+#define LORA_SPREADING_FACTOR                       8         // [SF7..SF12]
+/**** LORA_CODINGRATE 1:4/5  /  2:4/6  / 3:4/7  /  4:4/8 ****/ 
+#define LORA_CODINGRATE                             1         // [1: 4/5,
+#define LORA_PREAMBLE_LENGTH                        8         // Same for Tx and Rx
+#define LORA_SYMBOL_TIMEOUT                         5         // Symbols
+#define LORA_FIX_LENGTH_PAYLOAD_ON                  false
+#define LORA_FHSS_ENABLED                           false  
+#define LORA_NB_SYMB_HOP                            4     
+#define LORA_IQ_INVERSION_ON                        false
+#define LORA_CRC_ENABLED                            true
 
-#elif USE_MODEM_FSK == 1
 
-    #define FSK_FDEV                                    25000     // Hz
-    #define FSK_DATARATE                                19200     // bps
-    #define FSK_BANDWIDTH                               50000     // Hz
-    #define FSK_AFC_BANDWIDTH                           83333     // Hz
-    #define FSK_PREAMBLE_LENGTH                         5         // Same for Tx and Rx
-    #define FSK_FIX_LENGTH_PAYLOAD_ON                   false
-    #define FSK_CRC_ENABLED                             true
 
-#else
-    #error "Please define a modem in the compiler options."
-#endif
+#define RX_TIMEOUT_VALUE                            3500      // in ms
+#define BUFFER_SIZE                                 32        // Define the payload size here
 
-#define RX_TIMEOUT_VALUE                                3500      // in ms
-#define BUFFER_SIZE                                     32        // Define the payload size here
-
-#if( defined ( TARGET_KL25Z ) || defined ( TARGET_LPC11U6X ) )
-DigitalOut led( LED2 );
-#else
 DigitalOut led( LED1 );
-#endif
 
 /*
  *  Global variables declarations
@@ -100,7 +76,7 @@
     uint8_t i;
     bool isMaster = true;
 
-    debug( "\n\n\r     SX1272 Ping Pong Demo Application \n\n\r" );
+    debug( "\n\r > SX1272 Ping Pong Demo Application " );
 
     // Initialize Radio driver
     RadioEvents.TxDone = OnTxDone;
@@ -117,48 +93,21 @@
         wait( 1 );
     }
 
-    debug_if( ( DEBUG_MESSAGE & ( Radio.DetectBoardType( ) == SX1272MB2XAS ) ), "\n\r > Board Type: SX1272MB2xAS < \n\r" );
-
     Radio.SetChannel( RF_FREQUENCY ); 
-
-#if USE_MODEM_LORA == 1
-
-    debug_if( LORA_FHSS_ENABLED, "\n\n\r             > LORA FHSS Mode < \n\n\r" );
-    debug_if( !LORA_FHSS_ENABLED, "\n\n\r             > LORA Mode < \n\n\r" );
-
     Radio.SetTxConfig( MODEM_LORA, TX_OUTPUT_POWER, 0, LORA_BANDWIDTH,
                          LORA_SPREADING_FACTOR, LORA_CODINGRATE,
                          LORA_PREAMBLE_LENGTH, LORA_FIX_LENGTH_PAYLOAD_ON,
                          LORA_CRC_ENABLED, LORA_FHSS_ENABLED, LORA_NB_SYMB_HOP,
                          LORA_IQ_INVERSION_ON, 2000 );
-
     Radio.SetRxConfig( MODEM_LORA, LORA_BANDWIDTH, LORA_SPREADING_FACTOR,
                          LORA_CODINGRATE, 0, LORA_PREAMBLE_LENGTH,
                          LORA_SYMBOL_TIMEOUT, LORA_FIX_LENGTH_PAYLOAD_ON, 0,
                          LORA_CRC_ENABLED, LORA_FHSS_ENABLED, LORA_NB_SYMB_HOP,
                          LORA_IQ_INVERSION_ON, true );
 
-#elif USE_MODEM_FSK == 1
 
-    debug("\n\n\r              > FSK Mode < \n\n\r" );
-    Radio.SetTxConfig( MODEM_FSK, TX_OUTPUT_POWER, FSK_FDEV, 0,
-                         FSK_DATARATE, 0,
-                         FSK_PREAMBLE_LENGTH, FSK_FIX_LENGTH_PAYLOAD_ON,
-                         FSK_CRC_ENABLED, 0, 0, 0, 2000 );
-
-    Radio.SetRxConfig( MODEM_FSK, FSK_BANDWIDTH, FSK_DATARATE,
-                         0, FSK_AFC_BANDWIDTH, FSK_PREAMBLE_LENGTH,
-                         0, FSK_FIX_LENGTH_PAYLOAD_ON, 0, FSK_CRC_ENABLED,
-                         0, 0, false, true );
-
-#else
-
-#error "Please define a modem in the compiler options."
-
-#endif
-
-    debug_if( DEBUG_MESSAGE, "Starting Ping-Pong loop\r\n" );
-
+    debug( "Starting Ping-Pong loop\r\n\n" );
+    debug( "Start as Master : Envoi de Ping \r\n" );
     led = 0;
 
     Radio.Rx( RX_TIMEOUT_VALUE );
@@ -168,6 +117,7 @@
         switch( State )
         {
         case RX:
+            debug( "\r\n" );
             if( isMaster == true )
             {
                 if( BufferSize > 0 )
@@ -175,7 +125,7 @@
                     if( strncmp( ( const char* )Buffer, ( const char* )PongMsg, 4 ) == 0 )
                     {
                         led = !led;
-                        debug( "...Pong\r\n" );
+                        debug( "Master : Pong recu !!!\r\n" );
                         // Send the next PING frame
                         strcpy( ( char* )Buffer, ( char* )PingMsg );
                         // We fill the buffer with numbers for the payload
@@ -183,12 +133,14 @@
                         {
                             Buffer[i] = i - 4;
                         }
-                        wait_ms( 10 );
+                        wait_ms( 1000 );
+                        debug( "Master : Envoi de Ping\r\n" );
                         Radio.Send( Buffer, BufferSize );
                     }
                     else if( strncmp( ( const char* )Buffer, ( const char* )PingMsg, 4 ) == 0 )
                     { // A master already exists then become a slave
-                        debug( "...Ping\r\n" );
+                        debug( "Master : Ping recu !!!\r\n" );
+                        debug( "A master already exists then become a slave\r\n" );
                         led = !led;
                         isMaster = false;
                         // Send the next PONG frame
@@ -198,12 +150,14 @@
                         {
                             Buffer[i] = i - 4;
                         }
-                        wait_ms( 10 );
+                        wait_ms( 1000 );
+                         debug( "Master : Envoi de Pong\r\n" );
                         Radio.Send( Buffer, BufferSize );
                     }
                     else // valid reception but neither a PING or a PONG message
                     {    // Set device as master ans start again
                         isMaster = true;
+                        debug( "Master : Reception valide, Ni Ping, Ni Pong\r\n" );
                         Radio.Rx( RX_TIMEOUT_VALUE );
                     }
                 }
@@ -215,7 +169,7 @@
                     if( strncmp( ( const char* )Buffer, ( const char* )PingMsg, 4 ) == 0 )
                     {
                         led = !led;
-                        debug( "...Ping\r\n" );
+                        debug( "Slave : Ping recu\r\n" );
                         // Send the reply to the PING string
                         strcpy( ( char* )Buffer, ( char* )PongMsg );
                         // We fill the buffer with numbers for the payload
@@ -223,12 +177,14 @@
                         {
                             Buffer[i] = i - 4;
                         }
-                        wait_ms( 10 );
+                        wait_ms( 1000 );
+                        debug( "Slave : Envoi de Pong\r\n" );
                         Radio.Send( Buffer, BufferSize );
                     }
                     else // valid reception but not a PING as expected
                     {    // Set device as master and start again
                         isMaster = true;
+                         debug( "Slave : Reception valide, mais pas un Ping, on repasse Master\r\n" );
                         Radio.Rx( RX_TIMEOUT_VALUE );
                     }
                 }
@@ -239,11 +195,11 @@
             led = !led;
             if( isMaster == true )  
             {
-                debug( "Ping...\r\n" );
+                //debug( "Ping...\r\n" );
             }
             else
             {
-                debug( "Pong...\r\n" );
+                //debug( "Pong...\r\n" );
             }
             Radio.Rx( RX_TIMEOUT_VALUE );
             State = LOWPOWER;
@@ -257,7 +213,7 @@
                 {
                     Buffer[i] = i - 4;
                 }
-                wait_ms( 10 );
+                wait_ms( 1000 );
                 Radio.Send( Buffer, BufferSize );
             }
             else
@@ -276,7 +232,7 @@
                 {
                     Buffer[i] = i - 4;
                 }
-                wait_ms( 10 );
+                wait_ms( 1000 );
                 Radio.Send( Buffer, BufferSize );
             }
             else
@@ -287,7 +243,7 @@
                 {
                     Buffer[i] = i - 4;
                 }
-                wait_ms( 10 );
+                wait_ms( 1000 );
                 Radio.Send( Buffer, BufferSize );
             }
             State = LOWPOWER;
@@ -320,7 +276,7 @@
     RssiValue = rssi;
     SnrValue = snr;
     State = RX;
-    debug_if( DEBUG_MESSAGE, "> OnRxDone\n\r" );
+    debug_if( DEBUG_MESSAGE, "> OnRxDone : RSSI %d dBm : SNR %d dB \n\r",RssiValue, SnrValue );
 }
 
 void OnTxTimeout( void )