mirror of
https://github.com/f4exb/sdrangel.git
synced 2024-11-23 08:28:36 -05:00
Merge branch 'dev' of /shared/development/sdrangel into dev
This commit is contained in:
commit
83f9705e96
@ -6,6 +6,7 @@
|
|||||||
|
|
||||||
QT += core gui multimedia opengl
|
QT += core gui multimedia opengl
|
||||||
greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
|
greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
|
||||||
|
QMAKE_CXXFLAGS += -std=c++11
|
||||||
|
|
||||||
TEMPLATE = app
|
TEMPLATE = app
|
||||||
TARGET = sdrangel
|
TARGET = sdrangel
|
||||||
|
@ -22,6 +22,10 @@
|
|||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
#include <stdlib.h>
|
#include <stdlib.h>
|
||||||
|
|
||||||
|
#undef M_PI
|
||||||
|
#define M_PI 3.14159265358979323846
|
||||||
|
#undef M_PI_2
|
||||||
|
#define M_PI_2 1.57079632679489661923
|
||||||
|
|
||||||
const Real RDSDemod::m_pllBeta = 50;
|
const Real RDSDemod::m_pllBeta = 50;
|
||||||
const Real RDSDemod::m_fsc = 1187.5;
|
const Real RDSDemod::m_fsc = 1187.5;
|
||||||
@ -77,7 +81,7 @@ bool RDSDemod::process(Real demod, bool& bit)
|
|||||||
m_parms.clock_offset = 0;
|
m_parms.clock_offset = 0;
|
||||||
}*/
|
}*/
|
||||||
|
|
||||||
m_parms.subcarr_phi += (2 * M_PI * m_fsc) / (Real) m_srate;
|
m_parms.subcarr_phi += (2 * M_PI * m_fsc) / (Real) m_srate;
|
||||||
m_parms.clock_phi = m_parms.subcarr_phi + m_parms.clock_offset;
|
m_parms.clock_phi = m_parms.subcarr_phi + m_parms.clock_offset;
|
||||||
|
|
||||||
// Clock phase recovery
|
// Clock phase recovery
|
||||||
|
Loading…
Reference in New Issue
Block a user