Diff: SX1276GenericPingPong/GenericPingPong.cpp

Revision:

21:6379a5650867

Parent:

19:992eda680d91

--- a/SX1276GenericPingPong/GenericPingPong.cpp	Sun Jun 03 19:25:37 2018 +0000
+++ b/SX1276GenericPingPong/GenericPingPong.cpp	Mon Feb 18 22:57:14 2019 +0000
@@ -19,8 +19,8 @@
 /* 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 RF_FREQUENCY            RF_FREQUENCY_868_1  // Hz
-#define TX_OUTPUT_POWER         14                  // 14 dBm
+#define RF_FREQUENCY            915010000  // Hz
+#define TX_OUTPUT_POWER         14         // 14 dBm
 
 #if USE_MODEM_LORA == 1
 
@@ -51,9 +51,8 @@
 #endif 
 
 
-#define RX_TIMEOUT_VALUE    3500	// in ms
+#define RX_TIMEOUT_VALUE    5000	// in ms
 
-//#define BUFFER_SIZE       32        // Define the payload size here
 #define BUFFER_SIZE         64        // Define the payload size here
 
 /*
@@ -89,7 +88,7 @@
 
 
 const uint8_t PingMsg[] = { 0xff, 0xff, 0x00, 0x00, 'P', 'I', 'N', 'G'};// "PING";
-const uint8_t PongMsg[] = { 0xff, 0xff, 0x00, 0x00, 'P', 'O', 'N', 'G'};// "PONG";
+const uint8_t PongMsg[] = { 0xff, 0xff, 0x00, 0x00, 'P', 'O', 'N' , 'G'};// "PONG";
 
 uint16_t BufferSize = BUFFER_SIZE;
 uint8_t *Buffer;
@@ -99,34 +98,15 @@
 
 int SX1276PingPong() 
 {
-#if( defined ( TARGET_KL25Z ) || defined ( TARGET_LPC11U6X ) )
-    DigitalOut *led = new DigitalOut(LED2);
-#elif defined(TARGET_NUCLEO_L073RZ) || defined(TARGET_DISCO_L072CZ_LRWAN1)
-    DigitalOut *led = new DigitalOut(LED4);   // RX red
-    led3 = new DigitalOut(LED3);  // TX blue
-#else
     DigitalOut *led = new DigitalOut(LED1);
     led3 = led;
-#endif
     
     Buffer = new  uint8_t[BUFFER_SIZE];
     *led3 = 1;
 
-#ifdef B_L072Z_LRWAN1_LORA
-    Radio = new SX1276Generic(NULL, MURATA_SX1276,
-    		LORA_SPI_MOSI, LORA_SPI_MISO, LORA_SPI_SCLK, LORA_CS, LORA_RESET,
-        	LORA_DIO0, LORA_DIO1, LORA_DIO2, LORA_DIO3, LORA_DIO4, LORA_DIO5,
-        	LORA_ANT_RX, LORA_ANT_TX, LORA_ANT_BOOST, LORA_TCXO);
-#elif defined(HELTEC_STM32L4)
-    Radio = new SX1276Generic(NULL, HELTEC_L4_1276,
-			LORA_SPI_MOSI, LORA_SPI_MISO, LORA_SPI_SCLK, LORA_CS, LORA_RESET,
-            LORA_DIO0, LORA_DIO1, LORA_DIO2, LORA_DIO3, LORA_DIO4, LORA_DIO5,
-            POWER_VEXT);
-#else // RFM95
     Radio = new SX1276Generic(NULL, RFM95_SX1276,
 			LORA_SPI_MOSI, LORA_SPI_MISO, LORA_SPI_SCLK, LORA_CS, LORA_RESET,
             LORA_DIO0, LORA_DIO1, LORA_DIO2, LORA_DIO3, LORA_DIO4, LORA_DIO5);
-#endif
     
     uint8_t i;
     bool isMaster = true;
@@ -155,27 +135,8 @@
     }
 
     
-    switch(Radio->DetectBoardType()) {
-        case SX1276MB1LAS:
-            if (DEBUG_MESSAGE)
-                dprintf(" > Board Type: SX1276MB1LAS <");
-            break;
-        case SX1276MB1MAS:
-            if (DEBUG_MESSAGE)
-                dprintf(" > Board Type: SX1276MB1LAS <");
-        case MURATA_SX1276:
-            if (DEBUG_MESSAGE)
-            	dprintf(" > Board Type: MURATA_SX1276_STM32L0 <");
-            break;
-        case RFM95_SX1276:
-            if (DEBUG_MESSAGE)
-                dprintf(" > HopeRF RFM95xx <");
-            break;
-        default:
-            dprintf(" > Board Type: unknown <");
-    }
-
-    Radio->SetChannel(RF_FREQUENCY ); 
+   Radio->DetectBoardType();
+   Radio->SetChannel(RF_FREQUENCY ); 
 
 #if USE_MODEM_LORA == 1
     
@@ -223,9 +184,6 @@
     
     while( 1 )
     {
-#ifdef TARGET_STM32L4
-    //     WatchDogUpdate();
-#endif
         
         switch( State )
         {