Diff: sx1276/sx1276.cpp

Revision:

24:8fbb352c7142

Parent:

22:7f3aab69cca9

Child:

25:712d195d97ee

--- a/sx1276/sx1276.cpp	Thu Nov 26 16:55:15 2015 +0000
+++ b/sx1276/sx1276.cpp	Thu Jul 07 06:48:35 2016 +0000
@@ -13,7 +13,7 @@
 Maintainers: Miguel Luis, Gregory Cristian and Nicolas Huguenin
 */
 #include "sx1276.h"
-
+#include "main.h"
 const FskBandwidth_t SX1276::FskBandwidths[] =
 {       
     { 2600  , 0x17 },   
@@ -393,7 +393,7 @@
     paDac = Read( REG_PADAC );
 
     paConfig = ( paConfig & RF_PACONFIG_PASELECT_MASK ) | GetPaSelect( this->settings.Channel );
-    paConfig = ( paConfig & RF_PACONFIG_MAX_POWER_MASK ) | 0x70;
+    paConfig = ( paConfig & RF_PACONFIG_MAX_POWER_MASK ) | 0x80;
 
     if( ( paConfig & RF_PACONFIG_PASELECT_PABOOST ) == RF_PACONFIG_PASELECT_PABOOST )
     {
@@ -1008,11 +1008,11 @@
     case MODEM_LORA:
         if( this->settings.Channel > RF_MID_BAND_THRESH )
         {
-            rssi = RSSI_OFFSET_HF + Read( REG_LR_RSSIVALUE );
+            rssi = RSSI_OFFSET_HF + Read( REG_LR_PKTRSSIVALUE );
         }
         else
         {
-            rssi = RSSI_OFFSET_LF + Read( REG_LR_RSSIVALUE );
+            rssi = RSSI_OFFSET_LF + Read( REG_LR_PKTRSSIVALUE );
         }
         break;
     default:
@@ -1142,12 +1142,13 @@
 void SX1276::OnDio0Irq( void )
 {
     volatile uint8_t irqFlags = 0;
-
+     pc.printf("OnDio0Irq:%d\r\n",this->settings.State);
     switch( this->settings.State )
     {                
         case RF_RX_RUNNING:
             //TimerStop( &RxTimeoutTimer );
             // RxDone interrupt
+           // pc.printf("OnDio0Irq\r\n");
             switch( this->settings.Modem )
             {
             case MODEM_FSK: