a

Dependencies:   mbed SX1272Lib

Revision:
15:a99503d744c3
Parent:
14:ab6eecd44b7a
--- a/main.cpp	Mon Apr 24 09:29:13 2017 +0000
+++ b/main.cpp	Fri Jan 18 10:26:20 2019 +0000
@@ -1,63 +1,67 @@
+///////////////////////////////////////////////// BIBLIOTHEQUE ///////////////////////////////////////////////////////////////////////////////////////
+
 #include "mbed.h"
 #include "main.h"
 #include "sx1272-hal.h"
 #include "debug.h"
+#include "sx1272.h"
+
+
+Serial pc(USBTX, USBRX);
+
+#define PCBAUD 9600
+
+//////////////////////////////////////////////// DEFINITION OUTIL DEBUG ///////////////////////////////////////////////////////////////////////////
 
 /* Set this flag to '1' to display debug messages on the console */
-#define DEBUG_MESSAGE   1
+
+
+#define DEBUG_MESSAGE   1                                                               //permet d'afficher des messages sur le terminal
+
+
+////////////////////////////////////////////////////////////////////// DEFINITION MODULATION /////////////////////////////////////////////////////
 
 /* Set this flag to '1' to use the LoRa modulation or to '0' to use FSK modulation */
-#define USE_MODEM_LORA  1
-#define USE_MODEM_FSK   !USE_MODEM_LORA
+
+
+#define USE_MODEM_LORA  1                                                               //On utilise LoRa
 
 #define RF_FREQUENCY                                    868000000 // Hz
-#define TX_OUTPUT_POWER                                 14        // 14 dBm
+#define TX_OUTPUT_POWER                                 14        // dBm
 
-#if USE_MODEM_LORA == 1
+#if USE_MODEM_LORA == 1                                                                 // Definition des parametres de LoRa
 
     #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,
+    #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 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."
+    #error "Please define a modem in the compiler options."                             //ERREUR si ni LoRa ni FSK n'a ete active
 #endif
 
-#define RX_TIMEOUT_VALUE                                3500      // in ms
+#define RX_TIMEOUT_VALUE                                10000      // 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
- */
+
+//////////////////////////////////////////////////// GLOBAL VARIABLES DECLARATIONS /////////////////////////////////////////////////////////////////////
+
 typedef enum
 {
     LOWPOWER = 0,
@@ -72,6 +76,7 @@
 
     CAD,
     CAD_DONE
+    
 }AppStates_t;
 
 volatile AppStates_t State = LOWPOWER;
@@ -79,28 +84,34 @@
 /*!
  * Radio events function pointer
  */
+ 
+ 
 static RadioEvents_t RadioEvents;
 
+
+
 /*
  *  Global variables declarations
  */
+ 
+ 
 SX1272MB2xAS Radio( NULL );
 
-const uint8_t PingMsg[] = "PING";
-const uint8_t PongMsg[] = "PONG";
-
-uint16_t BufferSize = BUFFER_SIZE;
+uint16_t BufferSize = BUFFER_SIZE;                                                      //Taille de la memoire tampon
 uint8_t Buffer[BUFFER_SIZE];
 
-int16_t RssiValue = 0.0;
-int8_t SnrValue = 0.0;
+int16_t RssiValue = 0.0;                                                                //Rssi = Received Signal Strentgh Indication
+int8_t SnrValue = 0.0;          
+
 
-int main( void ) 
+////////////////////////////////////////////////////////////////////// MAIN /////////////////////////////////////////////////////////
+
+
+int main( void )
 {
-    uint8_t i;
-    bool isMaster = true;
-
-    debug( "\n\n\r     SX1272 Ping Pong Demo Application \n\n\r" );
+    pc.baud(PCBAUD);
+    
+    debug( "\n\n\r     SX1272 X Y Z Demo Application \n\n\r" );
 
     // Initialize Radio driver
     RadioEvents.TxDone = OnTxDone;
@@ -109,14 +120,14 @@
     RadioEvents.TxTimeout = OnTxTimeout;
     RadioEvents.RxTimeout = OnRxTimeout;
     Radio.Init( &RadioEvents );
-
-    // verify the connection with the board
+    
+     // verify the connection with the board
     while( Radio.Read( REG_VERSION ) == 0x00  )
     {
         debug( "Radio could not be detected!\n\r", NULL );
         wait( 1 );
     }
-
+    
     debug_if( ( DEBUG_MESSAGE & ( Radio.DetectBoardType( ) == SX1272MB2XAS ) ), "\n\r > Board Type: SX1272MB2xAS < \n\r" );
 
     Radio.SetChannel( RF_FREQUENCY ); 
@@ -138,18 +149,6 @@
                          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
 
@@ -157,154 +156,43 @@
 
 #endif
 
-    debug_if( DEBUG_MESSAGE, "Starting Ping-Pong loop\r\n" );
-
-    led = 0;
-
-    Radio.Rx( RX_TIMEOUT_VALUE );
-
-    while( 1 )
+    Radio.Rx( 3500 );
+    State = RX;
+    pc.printf("\n\r ++++++++++++++++++++++++++++++++       \n\r");
+    
+    while(1)
     {
-        switch( State )
-        {
-        case RX:
-            if( isMaster == true )
-            {
+
                 if( BufferSize > 0 )
-                {
-                    if( strncmp( ( const char* )Buffer, ( const char* )PongMsg, 4 ) == 0 )
-                    {
-                        led = !led;
-                        debug( "...Pong\r\n" );
-                        // Send the next PING frame
-                        strcpy( ( char* )Buffer, ( char* )PingMsg );
-                        // We fill the buffer with numbers for the payload
-                        for( i = 4; i < BufferSize; i++ )
                         {
-                            Buffer[i] = i - 4;
-                        }
-                        wait_ms( 10 );
-                        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" );
-                        led = !led;
-                        isMaster = false;
-                        // Send the next PONG frame
-                        strcpy( ( char* )Buffer, ( char* )PongMsg );
-                        // We fill the buffer with numbers for the payload
-                        for( i = 4; i < BufferSize; i++ )
-                        {
-                            Buffer[i] = i - 4;
-                        }
-                        wait_ms( 10 );
-                        Radio.Send( Buffer, BufferSize );
-                    }
-                    else // valid reception but neither a PING or a PONG message
-                    {    // Set device as master ans start again
-                        isMaster = true;
-                        Radio.Rx( RX_TIMEOUT_VALUE );
-                    }
-                }
-            }
-            else
-            {
-                if( BufferSize > 0 )
-                {
-                    if( strncmp( ( const char* )Buffer, ( const char* )PingMsg, 4 ) == 0 )
-                    {
-                        led = !led;
-                        debug( "...Ping\r\n" );
-                        // Send the reply to the PING string
-                        strcpy( ( char* )Buffer, ( char* )PongMsg );
-                        // We fill the buffer with numbers for the payload
-                        for( i = 4; i < BufferSize; i++ )
-                        {
-                            Buffer[i] = i - 4;
+                            if( strncmp( (const char *)Buffer, "B", 1)==0)
+                            {
+                    
+                                pc.printf("%s,\n", Buffer);
+                                pc.printf("\n\r");
+                        
+                    
+                            }
+                        
+                        BufferSize = 0;
+                        Radio.Rx( 3500 );
                         }
-                        wait_ms( 10 );
-                        Radio.Send( Buffer, BufferSize );
-                    }
-                    else // valid reception but not a PING as expected
-                    {    // Set device as master and start again
-                        isMaster = true;
-                        Radio.Rx( RX_TIMEOUT_VALUE );
-                    }
-                }
-            }
-            State = LOWPOWER;
-            break;
-        case TX:
-            led = !led;
-            if( isMaster == true )  
-            {
-                debug( "Ping...\r\n" );
-            }
-            else
-            {
-                debug( "Pong...\r\n" );
-            }
-            Radio.Rx( RX_TIMEOUT_VALUE );
-            State = LOWPOWER;
-            break;
-        case RX_TIMEOUT:
-            if( isMaster == true )
-            {
-                // Send the next PING frame
-                strcpy( ( char* )Buffer, ( char* )PingMsg );
-                for( i = 4; i < BufferSize; i++ )
-                {
-                    Buffer[i] = i - 4;
-                }
-                wait_ms( 10 );
-                Radio.Send( Buffer, BufferSize );
-            }
-            else
-            {
-                Radio.Rx( RX_TIMEOUT_VALUE );
-            }
-            State = LOWPOWER;
-            break;
-        case RX_ERROR:
-            // We have received a Packet with a CRC error, send reply as if packet was correct
-            if( isMaster == true )
-            {
-                // Send the next PING frame
-                strcpy( ( char* )Buffer, ( char* )PingMsg );
-                for( i = 4; i < BufferSize; i++ )
-                {
-                    Buffer[i] = i - 4;
-                }
-                wait_ms( 10 );
-                Radio.Send( Buffer, BufferSize );
-            }
-            else
-            {
-                // Send the next PONG frame
-                strcpy( ( char* )Buffer, ( char* )PongMsg );
-                for( i = 4; i < BufferSize; i++ )
-                {
-                    Buffer[i] = i - 4;
-                }
-                wait_ms( 10 );
-                Radio.Send( Buffer, BufferSize );
-            }
-            State = LOWPOWER;
-            break;
-        case TX_TIMEOUT:
-            Radio.Rx( RX_TIMEOUT_VALUE );
-            State = LOWPOWER;
-            break;
-        case LOWPOWER:
-            break;
-        default:
-            State = LOWPOWER;
-            break;
-        }
+                
+                        
+           
+        
     }
 }
 
+
+
+
+
+
+
+
+///////////////////////////////////////// DECLARATION DES FONCTIONS/////////////////////////////////////////////////////
+
 void OnTxDone( void )
 {
     Radio.Sleep( );
@@ -332,7 +220,7 @@
 
 void OnRxTimeout( void )
 {
-    Radio.Sleep( );
+    //Radio.Sleep( );
     Buffer[BufferSize] = 0;
     State = RX_TIMEOUT;
     debug_if( DEBUG_MESSAGE, "> OnRxTimeout\n\r" );
@@ -340,7 +228,6 @@
 
 void OnRxError( void )
 {
-    Radio.Sleep( );
     State = RX_ERROR;
     debug_if( DEBUG_MESSAGE, "> OnRxError\n\r" );
-}
+}
\ No newline at end of file