Merge branch 'boxcar_dstar_correlator' into boxcar_dstar_correlator_48k

This commit is contained in:
Jonathan Naylor
2018-01-08 18:24:46 +00:00
11 changed files with 337 additions and 15 deletions
+4
View File
@@ -50,6 +50,8 @@ enum MMDVM_STATE {
STATE_P25 = 4,
// Dummy states start at 90
STATE_P25CAL1K = 93,
STATE_DMRCAL1K = 94,
STATE_LFCAL = 95,
STATE_RSSICAL = 96,
STATE_CWID = 97,
@@ -72,6 +74,7 @@ enum MMDVM_STATE {
#include "CalDStarRX.h"
#include "CalDStarTX.h"
#include "CalDMR.h"
#include "CalP25.h"
#include "CalRSSI.h"
#include "CWIdTX.h"
#include "Debug.h"
@@ -120,6 +123,7 @@ extern CP25TX p25TX;
extern CCalDStarRX calDStarRX;
extern CCalDStarTX calDStarTX;
extern CCalDMR calDMR;
extern CCalP25 calP25;
extern CCalRSSI calRSSI;
extern CCWIdTX cwIdTX;