Browse Source

Merge branch 'f4exb:master' into mcp

chirpmodem-v8.0.0
srcejon 2 months ago committed by GitHub
parent
commit
2269e48cf7
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
  1. 9
      Readme.md
  2. 2
      plugins/channelrx/demodmeshtastic/meshtasticdemodsink.cpp
  3. 6
      plugins/feature/map/webserver.cpp
  4. 8
      sdrbase/pipes/objectpipesregistrations.cpp
  5. 1
      sdrgui/device/deviceuiset.cpp
  6. 4
      swagger/sdrangel/examples/randomize_colors.py

9
Readme.md

@ -2,6 +2,15 @@ @@ -2,6 +2,15 @@
**SDRangel** is an open-source Qt5 / OpenGL 3.0+ SDR and signal analyzer frontend to various hardware.
License : [![License](https://img.shields.io/github/license/f4exb/sdrangel)](https://github.com/f4exb/sdrangel/blob/master/LICENSE)
Latest Release : [![GitHub release](https://img.shields.io/github/release/f4exb/sdrangel.svg)](https://github.com/f4exb/sdrangel/releases/latest)
Source : [![Commits since last release](https://img.shields.io/github/commits-since/f4exb/sdrangel/latest)](https://github.com/f4exb/sdrangel/commits/master/) [![Size](https://img.shields.io/github/repo-size/f4exb/sdrangel)](https://github.com/f4exb/sdrangel)
Downloads : [![Github All Releases](https://img.shields.io/github/downloads/f4exb/sdrangel/total.svg)](https://github.com/f4exb/sdrangel/releases/latest)
Analysis : [![Coverity Scan Build Status](https://img.shields.io/coverity/scan/33161.svg)](https://scan.coverity.com/projects/f4exb-sdrangel)
Issues : [![open issues](https://img.shields.io/github/issues/f4exb/sdrangel.svg)](https://github.com/f4exb/sdrangel/issues)
[![closed issues](https://img.shields.io/github/issues-closed/f4exb/sdrangel.svg)](https://github.com/f4exb/sdrangel/issues?q=is%3Aissue+is%3Aclosed)
**Wiki**: Most of the information and documentation related to SDRangel can be found in the [Wiki](https://github.com/f4exb/sdrangel/wiki). Please make sure to check it in case of questions or trouble and before you post issues on GitHub. You may also seek help from other users using the discussion group below. Before running the program, make sure you read at least the [Home](https://github.com/f4exb/sdrangel/wiki) and [Quick Start](https://github.com/f4exb/sdrangel/wiki/Quick-start) pages.
**Discussion group**: You can ask other users for help or discuss subjects related to SDRangel and its ancillary projects [here](https://groups.io/g/sdrangel).

2
plugins/channelrx/demodmeshtastic/meshtasticdemodsink.cpp

@ -1234,7 +1234,7 @@ void MeshtasticDemodSink::applyChannelSettings(int channelSampleRate, int bandwi @@ -1234,7 +1234,7 @@ void MeshtasticDemodSink::applyChannelSettings(int channelSampleRate, int bandwi
const int targetFrameSyncRate = std::max(1, bandwidth * static_cast<int>(m_osFactor));
// Keep the anti-alias/channel filter narrow around the configured LoRa bandwidth.
// A too-wide cutoff destabilizes preamble bin tracking in DETECT.
m_interpolator.create(16, channelSampleRate, m_bandwidth / 1.9f);
m_interpolator.create(16, channelSampleRate, bandwidth / 1.9f);
m_interpolatorDistance = (Real) channelSampleRate / (Real) targetFrameSyncRate;
m_sampleDistanceRemain = 0;
m_osCounter = 0;

6
plugins/feature/map/webserver.cpp

@ -45,7 +45,11 @@ WebServer::WebServer(quint16 &port, QObject* parent) : @@ -45,7 +45,11 @@ WebServer::WebServer(quint16 &port, QObject* parent) :
WebServer::~WebServer()
{
qDeleteAll(m_substitutions);
for (QList<Substitution *> *list : m_substitutions)
{
qDeleteAll(*list);
delete list;
}
qDeleteAll(m_mimeTypes);
}

8
sdrbase/pipes/objectpipesregistrations.cpp

@ -25,7 +25,13 @@ ObjectPipesRegistrations::ObjectPipesRegistrations(ObjectPipeElementsStore *obje @@ -25,7 +25,13 @@ ObjectPipesRegistrations::ObjectPipesRegistrations(ObjectPipeElementsStore *obje
{}
ObjectPipesRegistrations::~ObjectPipesRegistrations()
{}
{
for (ObjectPipe *pipe : m_pipes)
{
m_objectPipeElementsStore->deleteElement(pipe->m_element);
delete pipe;
}
}
ObjectPipe *ObjectPipesRegistrations::registerProducerToConsumer(const QObject *producer, const QObject *consumer, const QString& type)
{

1
sdrgui/device/deviceuiset.cpp

@ -80,6 +80,7 @@ DeviceUISet::DeviceUISet(int deviceSetIndex, DeviceSet *deviceSet) @@ -80,6 +80,7 @@ DeviceUISet::DeviceUISet(int deviceSetIndex, DeviceSet *deviceSet)
DeviceUISet::~DeviceUISet()
{
m_spectrumVis->setGLSpectrum(nullptr);
delete m_mainSpectrumGUI;
}

4
swagger/sdrangel/examples/randomize_colors.py

@ -182,11 +182,11 @@ def main(): @@ -182,11 +182,11 @@ def main():
randomize_channels_colors(options, channels) # full randomization (identical to -Hsv)
else:
print("Error getting deviceset %d info. HTTP: %d" % (options.device_index, r.status_code))
print json.dumps(r.json(), indent=4, sort_keys=True)
print(json.dumps(r.json(), indent=4, sort_keys=True))
except Exception as ex:
tb = traceback.format_exc()
print >> sys.stderr, tb
print(tb, file=sys.stderr)
if __name__ == "__main__":

Loading…
Cancel
Save