fixed rx packet snr

HelTecAutomation · Aug 12, 2021 · 5214355 · 5214355
1 parent 2aebe43
commit 5214355
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 11 deletions.
diff --git a/src/ESP32_LoRaWAN.cpp b/src/ESP32_LoRaWAN.cpp
@@ -17,7 +17,7 @@ SSD1306  Display(0x3c, SDA_OLED, SCL_OLED, RST_OLED,GEOMETRY_64_32);
 #include "region/RegionEU433.h"
 #endif
 /*!
- * Default datarate
+ * Default datarate for No adr
  */
 #define LORAWAN_DEFAULT_DATARATE                    DR_5
 

diff --git a/src/sx1276-board.c b/src/sx1276-board.c
@@ -145,14 +145,15 @@ void SX1276SetRfTxPower( int8_t power )
 
     if( ( paConfig & RF_PACONFIG_PASELECT_PABOOST ) == RF_PACONFIG_PASELECT_PABOOST )
     {
-        if( power > 17 )
-        {
-            paDac = ( paDac & RF_PADAC_20DBM_MASK ) | RF_PADAC_20DBM_ON;
-        }
-        else
-        {
-            paDac = ( paDac & RF_PADAC_20DBM_MASK ) | RF_PADAC_20DBM_OFF;
-        }
+        paDac = ( paDac & RF_PADAC_20DBM_MASK ) | RF_PADAC_20DBM_ON;
+        //if( power > 17 )
+        //{
+        //    paDac = ( paDac & RF_PADAC_20DBM_MASK ) | RF_PADAC_20DBM_ON;
+       // }
+       // else
+       // {
+        //    paDac = ( paDac & RF_PADAC_20DBM_MASK ) | RF_PADAC_20DBM_OFF;
+        //}
         if( ( paDac & RF_PADAC_20DBM_ON ) == RF_PADAC_20DBM_ON )
         {
             if( power < 5 )

diff --git a/src/sx1276.c b/src/sx1276.c
@@ -1517,7 +1517,8 @@ void SX1276OnDio0Irq( void )
                         break;
                     }
 
-                    SX1276.Settings.LoRaPacketHandler.SnrValue = SX1276Read( REG_LR_PKTSNRVALUE );
+                    SX1276.Settings.LoRaPacketHandler.SnrValue = ( ( ( int8_t )SX1276Read( REG_LR_PKTSNRVALUE ) ) + 2 ) >> 2;
+                    /*
                     if( SX1276.Settings.LoRaPacketHandler.SnrValue & 0x80 ) // The SNR sign bit is 1
                     {
                         // Invert and divide by 4
@@ -1528,7 +1529,7 @@ void SX1276OnDio0Irq( void )
                     {
                         // Divide by 4
                         snr = ( SX1276.Settings.LoRaPacketHandler.SnrValue & 0xFF ) >> 2;
-                    }
+                    }*/
 
                     int16_t rssi = SX1276Read( REG_LR_PKTRSSIVALUE );
                     if( snr < 0 )