Merge branch 'develop' into csdr++

This commit is contained in:
Jakob Ketterl 2021-07-15 12:55:43 +02:00
commit 38cc900b1c
2 changed files with 2 additions and 2 deletions

View File

@ -631,7 +631,7 @@ class Dsp(DirewolfConfigSubscriber):
return float(math.pow(10, db / 10)) return float(math.pow(10, db / 10))
def isSquelchActive(self): def isSquelchActive(self):
return not self.isDigitalVoice() and not self.isPacket() and not self.isPocsag() and not self.isFreeDV() return not self.isDigitalVoice() and not self.isPacket() and not self.isPocsag() and not self.isFreeDV() and not self.isDrm()
def set_squelch_level(self, squelch_level): def set_squelch_level(self, squelch_level):
self.squelch_level = squelch_level self.squelch_level = squelch_level

View File

@ -369,7 +369,7 @@ class FeatureDetector(object):
""" """
The SoapySDR module for PlutoSDR devices is required for interfacing with PlutoSDR devices. The SoapySDR module for PlutoSDR devices is required for interfacing with PlutoSDR devices.
You can get it [here](https://github.com/photosware/SoapyPlutoSDR). You can get it [here](https://github.com/pothosware/SoapyPlutoSDR).
""" """
return self._has_soapy_driver("plutosdr") return self._has_soapy_driver("plutosdr")