diff --git a/src/modules/SX126x/SX126x.cpp b/src/modules/SX126x/SX126x.cpp
index 8e3c2343..ea0a1048 100644
--- a/src/modules/SX126x/SX126x.cpp
+++ b/src/modules/SX126x/SX126x.cpp
@@ -1222,11 +1222,18 @@ float SX126x::getDataRate() const {
   return(_dataRate);
 }
 
-float SX126x::getRSSI() {
-  // get last packet RSSI from packet status
-  uint32_t packetStatus = getPacketStatus();
-  uint8_t rssiPkt = packetStatus & 0xFF;
-  return(-1.0 * rssiPkt/2.0);
+float SX126x::getRSSI(bool packet) {
+  if(packet) { 
+    // get last packet RSSI from packet status
+    uint32_t packetStatus = getPacketStatus();
+    uint8_t rssiPkt = packetStatus & 0xFF;
+    return(-1.0 * rssiPkt/2.0);
+  } else {
+    // get instantaneous RSSI value
+    uint8_t data[3] = {0, 0, 0};  // RssiInst, Status, RFU
+    _mod->SPIreadStream(RADIOLIB_SX126X_CMD_GET_RSSI_INST, data, 3);
+    return((float)data[0] / (-2.0));
+  }
 }
 
 float SX126x::getSNR() {
@@ -1328,13 +1335,6 @@ uint32_t SX126x::getTimeOnAir(size_t len) {
   }
 }
 
-float SX126x::getRSSIInst() {
-  uint8_t data[3] = {0, 0, 0};  // RssiInst, Status, RFU
-  _mod->SPIreadStream(RADIOLIB_SX126X_CMD_GET_RSSI_INST, data, 3);
-
-  return (float)data[0] / (-2.0);
-}
-
 int16_t SX126x::implicitHeader(size_t len) {
   return(setHeaderType(RADIOLIB_SX126X_LORA_HEADER_IMPLICIT, len));
 }
diff --git a/src/modules/SX126x/SX126x.h b/src/modules/SX126x/SX126x.h
index 4c04483b..2fb142bd 100644
--- a/src/modules/SX126x/SX126x.h
+++ b/src/modules/SX126x/SX126x.h
@@ -917,11 +917,13 @@ class SX126x: public PhysicalLayer {
     float getDataRate() const;
 
     /*!
-      \brief Gets RSSI (Recorded Signal Strength Indicator) of the last received packet.
+      \brief GetsRSSI (Recorded Signal Strength Indicator).
 
-      \returns RSSI of the last received packet in dBm.
+      \param packet Whether to read last packet RSSI, or the current value.
+
+      \returns RSSI value in dBm.
     */
-    float getRSSI();
+    float getRSSI(bool packet = true);
 
     /*!
       \brief Gets SNR (Signal to Noise Ratio) of the last received packet. Only available for LoRa modem.
@@ -975,13 +977,6 @@ class SX126x: public PhysicalLayer {
     */
     uint32_t getTimeOnAir(size_t len);
 
-    /*!
-      \brief Get instantaneous RSSI value during recption of the packet. Should switch to FSK receive mode for LBT implementation.
-
-      \returns Instantaneous RSSI value in dBm, in steps of 0.5dBm
-    */
-    float getRSSIInst();
-
     /*!
       \brief Set implicit header mode for future reception/transmission.
 
diff --git a/src/modules/SX127x/SX1272.cpp b/src/modules/SX127x/SX1272.cpp
index 771555ca..5c8722e4 100644
--- a/src/modules/SX127x/SX1272.cpp
+++ b/src/modules/SX127x/SX1272.cpp
@@ -352,37 +352,8 @@ int16_t SX1272::setDataShapingOOK(uint8_t sh) {
   return(state);
 }
 
-float SX1272::getRSSI(bool skipReceive) {
-  if(getActiveModem() == RADIOLIB_SX127X_LORA) {
-    // RSSI calculation uses different constant for low-frequency and high-frequency ports
-    float lastPacketRSSI = -139 + _mod->SPIgetRegValue(RADIOLIB_SX127X_REG_PKT_RSSI_VALUE);
-
-    // spread-spectrum modulation signal can be received below noise floor
-    // check last packet SNR and if it's less than 0, add it to reported RSSI to get the correct value
-    float lastPacketSNR = SX127x::getSNR();
-    if(lastPacketSNR < 0.0) {
-      lastPacketRSSI += lastPacketSNR;
-    }
-
-    return(lastPacketRSSI);
-
-  } else {
-    // enable listen mode
-    if(!skipReceive) {
-      startReceive();
-    }
-
-    // read the value for FSK
-    float rssi = (float)_mod->SPIgetRegValue(RADIOLIB_SX127X_REG_RSSI_VALUE_FSK) / -2.0;
-
-    // set mode back to standby
-    if(!skipReceive) {
-      standby();
-    }
-
-    // return the value
-    return(rssi);
-  }
+float SX1272::getRSSI(bool packet, bool skipReceive) {
+  return(SX127x::getRSSI(packet, skipReceive, -139));
 }
 
 int16_t SX1272::setCRC(bool enable, bool mode) {
diff --git a/src/modules/SX127x/SX1272.h b/src/modules/SX127x/SX1272.h
index 8ef723f7..3c74c6da 100644
--- a/src/modules/SX127x/SX1272.h
+++ b/src/modules/SX127x/SX1272.h
@@ -240,13 +240,15 @@ class SX1272: public SX127x {
     int16_t setDataShapingOOK(uint8_t sh);
 
     /*!
-      \brief Gets recorded signal strength indicator of the latest received packet for LoRa modem, or current RSSI level for FSK modem.
+      \brief Gets recorded signal strength indicator.
 
-      \param skipReceive Set to true to skip putting radio in receive mode for the RSSI measurement in FKS/OOK mode.
+      \param packet Whether to read last packet RSSI, or the current value. LoRa mode only, ignored for FSK.
 
-      \returns Last packet RSSI for LoRa modem, or current RSSI level for FSK modem.
+      \param skipReceive Set to true to skip putting radio in receive mode for the RSSI measurement in FSK/OOK mode.
+
+      \returns RSSI value in dBm.
     */
-    float getRSSI(bool skipReceive = false);
+    float getRSSI(bool packet = true, bool skipReceive = false);
 
     /*!
       \brief Enables/disables CRC check of received packets.
diff --git a/src/modules/SX127x/SX1278.cpp b/src/modules/SX127x/SX1278.cpp
index fda1b3c2..0feb05fc 100644
--- a/src/modules/SX127x/SX1278.cpp
+++ b/src/modules/SX127x/SX1278.cpp
@@ -381,44 +381,12 @@ int16_t SX1278::setDataShapingOOK(uint8_t sh) {
   return(state);
 }
 
-float SX1278::getRSSI(bool skipReceive) {
-  if(getActiveModem() == RADIOLIB_SX127X_LORA) {
-    // for LoRa, get RSSI of the last packet
-    float lastPacketRSSI;
-
-    // RSSI calculation uses different constant for low-frequency and high-frequency ports
-    if(_freq < 868.0) {
-      lastPacketRSSI = -164 + _mod->SPIgetRegValue(RADIOLIB_SX127X_REG_PKT_RSSI_VALUE);
-    } else {
-      lastPacketRSSI = -157 + _mod->SPIgetRegValue(RADIOLIB_SX127X_REG_PKT_RSSI_VALUE);
-    }
-
-    // spread-spectrum modulation signal can be received below noise floor
-    // check last packet SNR and if it's less than 0, add it to reported RSSI to get the correct value
-    float lastPacketSNR = SX127x::getSNR();
-    if(lastPacketSNR < 0.0) {
-      lastPacketRSSI += lastPacketSNR;
-    }
-
-    return(lastPacketRSSI);
-
-  } else {
-    // enable listen mode
-    if(!skipReceive) {
-      startReceive();
-    }
-
-    // read the value for FSK
-    float rssi = (float)_mod->SPIgetRegValue(RADIOLIB_SX127X_REG_RSSI_VALUE_FSK) / -2.0;
-
-    // set mode back to standby
-    if(!skipReceive) {
-      standby();
-    }
-
-    // return the value
-    return(rssi);
+float SX1278::getRSSI(bool packet, bool skipReceive) {
+  int16_t offset = -157;
+  if(_freq < 868.0) {
+    offset = -164;
   }
+  return(SX127x::getRSSI(packet, skipReceive, offset));
 }
 
 int16_t SX1278::setCRC(bool enable, bool mode) {
diff --git a/src/modules/SX127x/SX1278.h b/src/modules/SX127x/SX1278.h
index fd274572..6db1b516 100644
--- a/src/modules/SX127x/SX1278.h
+++ b/src/modules/SX127x/SX1278.h
@@ -249,13 +249,15 @@ class SX1278: public SX127x {
     int16_t setDataShapingOOK(uint8_t sh);
 
     /*!
-      \brief Gets recorded signal strength indicator of the latest received packet for LoRa modem, or current RSSI level for FSK modem.
+      \brief Gets recorded signal strength indicator.
 
-      \param skipReceive Set to true to skip putting radio in receive mode for the RSSI measurement in FKS/OOK mode.
+      \param packet Whether to read last packet RSSI, or the current value. LoRa mode only, ignored for FSK.
 
-      \returns Last packet RSSI for LoRa modem, or current RSSI level for FSK modem.
+      \param skipReceive Set to true to skip putting radio in receive mode for the RSSI measurement in FSK/OOK mode.
+
+      \returns RSSI value in dBm.
     */
-    float getRSSI(bool skipReceive = false);
+    float getRSSI(bool packet = true, bool skipReceive = false);
 
     /*!
       \brief Enables/disables CRC check of received packets.
diff --git a/src/modules/SX127x/SX127x.cpp b/src/modules/SX127x/SX127x.cpp
index 29193484..e80aeb20 100644
--- a/src/modules/SX127x/SX127x.cpp
+++ b/src/modules/SX127x/SX127x.cpp
@@ -1558,4 +1558,45 @@ int16_t SX127x::setDIOPreambleDetect(bool usePreambleDetect) {
   return _mod->SPIsetRegValue(RADIOLIB_SX127X_REG_DIO_MAPPING_2, (usePreambleDetect) ? RADIOLIB_SX127X_DIO_MAP_PREAMBLE_DETECT : RADIOLIB_SX127X_DIO_MAP_RSSI, 0, 0);
 }
 
+float SX127x::getRSSI(bool packet, bool skipReceive, int16_t offset) {
+  if(getActiveModem() == RADIOLIB_SX127X_LORA) {
+    if(packet) {
+      // LoRa packet mode, get RSSI of the last packet
+      float lastPacketRSSI = offset + _mod->SPIgetRegValue(RADIOLIB_SX127X_REG_PKT_RSSI_VALUE);
+
+      // spread-spectrum modulation signal can be received below noise floor
+      // check last packet SNR and if it's less than 0, add it to reported RSSI to get the correct value
+      float lastPacketSNR = SX127x::getSNR();
+      if(lastPacketSNR < 0.0) {
+        lastPacketRSSI += lastPacketSNR;
+      }
+      return(lastPacketRSSI);
+
+    } else {
+      // LoRa instant, get current RSSI
+      float currentRSSI = offset + _mod->SPIgetRegValue(RADIOLIB_SX127X_REG_RSSI_VALUE);
+      return(currentRSSI);
+    }
+  
+  } else {
+    // for FSK, there is no packet RSSI
+
+    // enable listen mode
+    if(!skipReceive) {
+      startReceive();
+    }
+
+    // read the value for FSK
+    float rssi = (float)_mod->SPIgetRegValue(RADIOLIB_SX127X_REG_RSSI_VALUE_FSK) / -2.0;
+
+    // set mode back to standby
+    if(!skipReceive) {
+      standby();
+    }
+
+    // return the value
+    return(rssi);
+  }
+}
+
 #endif
diff --git a/src/modules/SX127x/SX127x.h b/src/modules/SX127x/SX127x.h
index 1b81e698..2f16874e 100644
--- a/src/modules/SX127x/SX127x.h
+++ b/src/modules/SX127x/SX127x.h
@@ -1258,6 +1258,17 @@ class SX127x: public PhysicalLayer {
     */
     int16_t setDIOPreambleDetect(bool usePreambleDetect);
 
+    /*!
+      \brief Gets recorded signal strength indicator.
+
+      \param packet Whether to read last packet RSSI, or the current value. LoRa mode only, ignored for FSK.
+
+      \param skipReceive Set to true to skip putting radio in receive mode for the RSSI measurement in FSK/OOK mode.
+
+      \returns RSSI value in dBm.
+    */
+    float getRSSI(bool packet, bool skipReceive, int16_t offset);
+
     /*!
       \brief Sets the RSSI value above which the RSSI interrupt is signaled