Skip to content

Commit

Permalink
Revert "Implement DMR negative"
Browse files Browse the repository at this point in the history 
This reverts commit 7cb184f.
  • Loading branch information
@f4exb
f4exb committed Apr 24, 2018
1 parent 324bfa2 commit 6074546
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 96 deletions.
88 changes: 0 additions & 88 deletions dsd_decoder.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,13 +24,9 @@ namespace DSDcc

// Sync wods - Symbol mapping: 01(1):+3, 00(0):+1, 10(2):-1, 11(3):-3
const unsigned char DSDDecoder::m_syncDMRDataBS[24] = {3, 1, 3, 3, 3, 3, 1, 1, 1, 3, 3, 1, 1, 3, 1, 1, 3, 1, 3, 3, 1, 1, 3, 1}; // DF F5 7D 75 DF 5D
const unsigned char DSDDecoder::m_syncDMRDataBSInv[24] = {1, 3, 1, 1, 1, 1, 3, 3, 3, 1, 1, 3, 3, 1, 3, 3, 1, 3, 1, 1, 3, 3, 1, 3};
const unsigned char DSDDecoder::m_syncDMRVoiceBS[24] = {1, 3, 1, 1, 1, 1, 3, 3, 3, 1, 1, 3, 3, 1, 3, 3, 1, 3, 1, 1, 3, 3, 1, 3}; // 75 5F D7 DF 75 F7
const unsigned char DSDDecoder::m_syncDMRVoiceBSInv[24] = {3, 1, 3, 3, 3, 3, 1, 1, 1, 3, 3, 1, 1, 3, 1, 1, 3, 1, 3, 3, 1, 1, 3, 1};
const unsigned char DSDDecoder::m_syncDMRDataMS[24] = {3, 1, 1, 1, 3, 1, 1, 3, 3, 3, 1, 3, 1, 3, 3, 3, 3, 1, 1, 3, 1, 1, 1, 3}; // D5 D7 F7 7F D7 57
const unsigned char DSDDecoder::m_syncDMRDataMSInv[24] = {1, 3, 3, 3, 1, 3, 3, 1, 1, 1, 3, 1, 3, 1, 1, 1, 1, 3, 3, 1, 3, 3, 3, 1};
const unsigned char DSDDecoder::m_syncDMRVoiceMS[24] = {1, 3, 3, 3, 1, 3, 3, 1, 1, 1, 3, 1, 3, 1, 1, 1, 1, 3, 3, 1, 3, 3, 3, 1}; // 7F 7D 5D D5 7D FD
const unsigned char DSDDecoder::m_syncDMRVoiceMSInv[24] = {3, 1, 1, 1, 3, 1, 1, 3, 3, 3, 1, 3, 1, 3, 3, 3, 3, 1, 1, 3, 1, 1, 1, 3};
const unsigned char DSDDecoder::m_syncDPMRFS1[24] = {1, 1, 1, 3, 3, 3, 3, 3, 1, 1, 3, 3, 1, 3, 1, 1, 3, 1, 1, 1, 1, 3, 1, 3}; // 57 FF 5F 75 D5 77 - non packet data header
const unsigned char DSDDecoder::m_syncDPMRFS4[24] = {3, 3, 3, 1, 1, 1, 1, 1, 3, 3, 1, 1, 3, 1, 3, 3, 1, 3, 3, 3, 3, 1, 3, 1}; // FD 55 F5 DF 7F DD - packet data header
const unsigned char DSDDecoder::m_syncDPMRFS2[12] = {1, 1, 3, 3, 3, 3, 1, 3, 1, 3, 3, 1}; // 5F F7 7D - superframe sync (each 2 384 bit frames)
Expand Down Expand Up @@ -805,27 +801,6 @@ int DSDDecoder::getFrameSync()
return (int) DSDSyncDMRDataP; // done
}

if (memcmp(m_dsdSymbol.getSyncDibitBack(24), m_syncDMRDataBSInv, 24) == 0)
{
m_state.carrier = 1;
m_dsdSymbol.setFSK(4, true);

m_stationType = DSDBaseStation;
m_dmrBurstType = DSDDMR::DSDDMRBaseStation;

// data frame
sprintf(m_state.ftype, "-DMRd ");

if (m_opts.errorbars == 1)
{
printFrameSync(" -DMRd ", m_synctest_pos + 1);
}

m_lastSyncType = DSDSyncDMRDataN;
m_mbeRate = DSDMBERate3600x2450;
return (int) DSDSyncDMRDataN; // done
}

if (memcmp(m_dsdSymbol.getSyncDibitBack(24), m_syncDMRDataMS, 24) == 0)
{
m_state.carrier = 1;
Expand All @@ -847,27 +822,6 @@ int DSDDecoder::getFrameSync()
return (int) DSDSyncDMRDataMS; // done
}

if (memcmp(m_dsdSymbol.getSyncDibitBack(24), m_syncDMRDataMSInv, 24) == 0)
{
m_state.carrier = 1;
m_dsdSymbol.setFSK(4, true);

m_stationType = DSDMobileStation;
m_dmrBurstType = DSDDMR::DSDDMRMobileStation;

// data frame
sprintf(m_state.ftype, "-DMRd ");

if (m_opts.errorbars == 1)
{
printFrameSync(" -DMRd ", m_synctest_pos + 1);
}

m_lastSyncType = DSDSyncDMRDataMSN;
m_mbeRate = DSDMBERate3600x2450;
return (int) DSDSyncDMRDataMSN; // done
}

if (memcmp(m_dsdSymbol.getSyncDibitBack(24), m_syncDMRVoiceBS, 24) == 0)
{
m_state.carrier = 1;
Expand All @@ -889,27 +843,6 @@ int DSDDecoder::getFrameSync()
return (int) DSDSyncDMRVoiceP; // done
}

if (memcmp(m_dsdSymbol.getSyncDibitBack(24), m_syncDMRVoiceBSInv, 24) == 0)
{
m_state.carrier = 1;
m_dsdSymbol.setFSK(4, true);

m_stationType = DSDBaseStation;
m_dmrBurstType = DSDDMR::DSDDMRBaseStation;

// voice frame
sprintf(m_state.ftype, "-DMRv ");

if (m_opts.errorbars == 1)
{
printFrameSync(" -DMRv ", m_synctest_pos + 1);
}

m_lastSyncType = DSDSyncDMRVoiceN;
m_mbeRate = DSDMBERate3600x2450;
return (int) DSDSyncDMRVoiceN; // done
}

if (memcmp(m_dsdSymbol.getSyncDibitBack(24), m_syncDMRVoiceMS, 24) == 0)
{
m_state.carrier = 1;
Expand All @@ -930,27 +863,6 @@ int DSDDecoder::getFrameSync()
m_mbeRate = DSDMBERate3600x2450;
return (int) DSDSyncDMRVoiceMS; // done
}

if (memcmp(m_dsdSymbol.getSyncDibitBack(24), m_syncDMRVoiceMSInv, 24) == 0)
{
m_state.carrier = 1;
m_dsdSymbol.setFSK(4, true);

m_stationType = DSDMobileStation;
m_dmrBurstType = DSDDMR::DSDDMRMobileStation;

// voice frame
sprintf(m_state.ftype, "-DMRv ");

if (m_opts.errorbars == 1)
{
printFrameSync(" -DMRv ", m_synctest_pos + 1);
}

m_lastSyncType = DSDSyncDMRVoiceMSN;
m_mbeRate = DSDMBERate3600x2450;
return (int) DSDSyncDMRVoiceMSN; // done
}
}
if (m_opts.frame_provoice == 1)
{
Expand Down
8 changes: 0 additions & 8 deletions dsd_decoder.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -126,10 +126,6 @@ class DSDDecoder
DSDSyncDPMRPayload, // 22
DSDSyncDPMREnd, // 23
DSDSyncYSF, // 24
DSDSyncDMRDataN, // 25
DSDSyncDMRDataMSN, // 26
DSDSyncDMRVoiceN, // 27
DSDSyncDMRVoiceMSN, // 28
DSDSyncNone
} DSDSyncType;

Expand Down Expand Up @@ -277,13 +273,9 @@ class DSDDecoder
* Frame sync patterns
*/
static const unsigned char m_syncDMRDataBS[24];
static const unsigned char m_syncDMRDataBSInv[24];
static const unsigned char m_syncDMRVoiceBS[24];
static const unsigned char m_syncDMRVoiceBSInv[24];
static const unsigned char m_syncDMRDataMS[24];
static const unsigned char m_syncDMRDataMSInv[24];
static const unsigned char m_syncDMRVoiceMS[24];
static const unsigned char m_syncDMRVoiceMSInv[24];
static const unsigned char m_syncDPMRFS1[24];
static const unsigned char m_syncDPMRFS4[24];
static const unsigned char m_syncDPMRFS2[12];
Expand Down

0 comments on commit 6074546

Please sign in to comment.