Merge branch 'develop' into feat-fst280

This commit is contained in:
Bill Somerville
2020-10-06 19:25:06 +01:00
62 changed files with 8861 additions and 7263 deletions
-2
View File
@@ -149,8 +149,6 @@ void Modulator::close ()
qint64 Modulator::readData (char * data, qint64 maxSize)
{
// qDebug () << "readData: maxSize:" << maxSize;
double toneFrequency=1500.0;
if(m_nsps==6) {
toneFrequency=1000.0;