Diff: Lora.cpp

Revision:

13:5414193da1de

Parent:

8:cd489b7c49a0

Child:

39:13e66d087ae9

--- a/Lora.cpp	Thu Aug 23 14:23:46 2018 +0000
+++ b/Lora.cpp	Mon Aug 27 16:32:50 2018 +0000
@@ -117,7 +117,7 @@
     LORA_SF             =   sf              ;   /* SF5; SF6=; SF7; SF8 ; SF9; SF10; SF11 ; SF12 */
     TX_OUTPUT_POWER     =   pwr             ;   /* Output power in dBm [-18..+13] dBm */ 
     BUFFER_SIZE_MAX     =   100             ;   /* Payload size max */
-    BUFFER_SIZE_MIN     =   8               ;   /* Payload return size */
+    BUFFER_SIZE_MIN     =   5               ;   /* Payload return size */
     TIMER               =   1000            ;   /* timer entre reemission en ms */ 
     
     
@@ -250,7 +250,7 @@
     PacketParams.Params.LoRa.PreambleLength         =   0x08                    ;
     PacketParams.Params.LoRa.HeaderType             =   LORA_PACKET_VARIABLE_LENGTH;
     PacketParams.Params.LoRa.PayloadLength          =   BUFFER_SIZE_MAX         ;
-    PacketParams.Params.LoRa.CrcMode                =   LORA_CRC_ON             ;
+    PacketParams.Params.LoRa.Crc                    =   LORA_CRC_ON             ;
     PacketParams.Params.LoRa.InvertIQ               =   LORA_IQ_INVERTED        ;
     // RADIO
     Radio.SetStandby                                ( STDBY_RC  )               ;
@@ -286,7 +286,7 @@
     PacketParams.Params.LoRa.PreambleLength         =   0x08                    ;
     PacketParams.Params.LoRa.HeaderType             =   LORA_PACKET_VARIABLE_LENGTH;
     PacketParams.Params.LoRa.PayloadLength          =   BUFFER_SIZE_MAX         ;
-    PacketParams.Params.LoRa.CrcMode                =   LORA_CRC_ON             ;
+    PacketParams.Params.LoRa.Crc                    =   LORA_CRC_ON             ;
     PacketParams.Params.LoRa.InvertIQ               =   LORA_IQ_INVERTED        ;
 
     // RADIO
@@ -310,7 +310,12 @@
 //===============================================================================================================================
     RxLed  = 0  ;
     TxLed  = 0  ;   
-     // SET MODULATION
+    
+    F_CS   = 1  ;
+    SD_CS  = 1  ;
+    ANT_SW = 1  ;
+    
+    // SET MODULATION
     modulationParams.PacketType                     =   PACKET_TYPE_LORA        ;
     modulationParams.Params.LoRa.CodingRate         =   LORA_CR_4_5             ;
     modulationParams.Params.LoRa.Bandwidth          =   LORA_BW_0200            ; 
@@ -321,7 +326,7 @@
     PacketParams.Params.LoRa.PreambleLength         =   0x08                    ;
     PacketParams.Params.LoRa.HeaderType             =   LORA_PACKET_VARIABLE_LENGTH;
     PacketParams.Params.LoRa.PayloadLength          =   BUFFER_SIZE_MIN         ;
-    PacketParams.Params.LoRa.CrcMode                =   LORA_CRC_ON             ;
+    PacketParams.Params.LoRa.Crc                    =   LORA_CRC_ON             ;
     PacketParams.Params.LoRa.InvertIQ               =   LORA_IQ_INVERTED        ;
 
     // RADIO
@@ -332,10 +337,9 @@
     Radio.SetRfFrequency                            ( RF_FREQUENCY + 440000UL)            ;
 
     Radio.SetBufferBaseAddresses                    ( 0x00, 0x00 );
-    Radio.SetTxParams                               ( TX_OUTPUT_POWER, RADIO_RAMP_20_US )       ;
     Radio.SetDioIrqParams                           ( RxIrqMask, RxIrqMask, IRQ_RADIO_NONE, IRQ_RADIO_NONE )    ;
-    Radio.SetRx                                     ( ( TickTime_t ) { RX_TIMEOUT_TICK_SIZE, RX_TIMEOUT_VALUE } )   ;
-    //AppState                    =                   APP_LOWPOWER;
+    Radio.SetRx                                     ( ( TickTime_t ) { RX_TIMEOUT_TICK_SIZE, 0x00000000 } )   ;
+//    Radio.SetRx                                     ( ( TickTime_t ) { RX_TIMEOUT_TICK_SIZE, RX_TIMEOUT_VALUE } )   ;
 }
 //===============================================================================================================================
 
@@ -375,6 +379,8 @@
     memset              ( &Buffer1 , 0x00, BUFFER_SIZE_MAX );
     Radio.GetPayload    ( Buffer1, &BufferSize, BUFFER_SIZE_MAX );
     
+    RxLed               =   0   ;  // Show the reception 
+    
     Buffer1[7] = 0 ; 
 
     printf  ( "*** LORA *** RX DONE =>  %s \r\n", Buffer1 );   wait(1) ; // flush serial