mirror of
https://github.com/lwvmobile/dsd-fme.git
synced 2026-11-21 21:25:40 -05:00
@@ -1013,7 +1013,9 @@ void dmr_sbrc (dsd_opts * opts, dsd_state * state, uint8_t power);
|
|||||||
bool Hamming17123(uint8_t* d);
|
bool Hamming17123(uint8_t* d);
|
||||||
uint8_t crc8(uint8_t bits[], unsigned int len);
|
uint8_t crc8(uint8_t bits[], unsigned int len);
|
||||||
bool crc8_ok(uint8_t bits[], unsigned int len);
|
bool crc8_ok(uint8_t bits[], unsigned int len);
|
||||||
|
//modified CRC functions for SB/RC
|
||||||
uint8_t crc7(uint8_t bits[], unsigned int len);
|
uint8_t crc7(uint8_t bits[], unsigned int len);
|
||||||
|
uint8_t crc3(uint8_t bits[], unsigned int len);
|
||||||
|
|
||||||
//LFSR and LFSRP code courtesy of https://github.com/mattames/LFSR/
|
//LFSR and LFSRP code courtesy of https://github.com/mattames/LFSR/
|
||||||
void LFSR(dsd_state * state);
|
void LFSR(dsd_state * state);
|
||||||
|
|||||||
@@ -96,6 +96,10 @@ void dmrBS (dsd_opts * opts, dsd_state * state)
|
|||||||
//Run Loop while the getting is good
|
//Run Loop while the getting is good
|
||||||
while (loop == 1) {
|
while (loop == 1) {
|
||||||
|
|
||||||
|
memset (ambe_fr, 0, sizeof(ambe_fr));
|
||||||
|
memset (ambe_fr2, 0, sizeof(ambe_fr2));
|
||||||
|
memset (ambe_fr3, 0, sizeof(ambe_fr3));
|
||||||
|
|
||||||
internalslot = -1; //reset here so we know if this value is being set properly
|
internalslot = -1; //reset here so we know if this value is being set properly
|
||||||
for(i = 0; i < 12; i++)
|
for(i = 0; i < 12; i++)
|
||||||
{
|
{
|
||||||
@@ -494,6 +498,10 @@ void dmrBSBootstrap (dsd_opts * opts, dsd_state * state)
|
|||||||
char ambe_fr2[4][24];
|
char ambe_fr2[4][24];
|
||||||
char ambe_fr3[4][24];
|
char ambe_fr3[4][24];
|
||||||
|
|
||||||
|
memset (ambe_fr, 0, sizeof(ambe_fr));
|
||||||
|
memset (ambe_fr2, 0, sizeof(ambe_fr2));
|
||||||
|
memset (ambe_fr3, 0, sizeof(ambe_fr3));
|
||||||
|
|
||||||
//memcpy of ambe_fr for late entry
|
//memcpy of ambe_fr for late entry
|
||||||
char m1[4][24];
|
char m1[4][24];
|
||||||
char m2[4][24];
|
char m2[4][24];
|
||||||
|
|||||||
@@ -45,6 +45,13 @@ void dmr_data_burst_handler(dsd_opts * opts, dsd_state * state, uint8_t info[196
|
|||||||
uint8_t LC_DataBytes[10];
|
uint8_t LC_DataBytes[10];
|
||||||
int Burst = -1;
|
int Burst = -1;
|
||||||
|
|
||||||
|
memset (BPTCDeInteleavedData, 0, sizeof(BPTCDeInteleavedData));
|
||||||
|
memset (BPTCDmrDataBit, 0, sizeof(BPTCDmrDataBit));
|
||||||
|
memset (BPTCDmrDataByte, 0, sizeof(BPTCDmrDataByte));
|
||||||
|
memset (BptcDataMatrix, 0, sizeof(BptcDataMatrix));
|
||||||
|
memset (LC_DataBit, 0, sizeof(LC_DataBit));
|
||||||
|
memset (LC_DataBytes, 0, sizeof(LC_DataBytes));
|
||||||
|
|
||||||
//PDU Bytes and Bits
|
//PDU Bytes and Bits
|
||||||
uint8_t DMR_PDU[25];
|
uint8_t DMR_PDU[25];
|
||||||
uint8_t DMR_PDU_bits[196];
|
uint8_t DMR_PDU_bits[196];
|
||||||
|
|||||||
@@ -433,6 +433,8 @@ void dmr_flco (dsd_opts * opts, dsd_state * state, uint8_t lc_bits[], uint32_t C
|
|||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
//Observation: If RS3 is set, or just the bit at location 0001 0000,
|
||||||
|
//then the NEXT VC6 will be pre-empted for TXI
|
||||||
//REMUS! Uncomment Line Below if desired
|
//REMUS! Uncomment Line Below if desired
|
||||||
// strcat (state->call_string[slot], " RES");
|
// strcat (state->call_string[slot], " RES");
|
||||||
fprintf(stderr, "RS%d ", (so & 0x30) >> 4);
|
fprintf(stderr, "RS%d ", (so & 0x30) >> 4);
|
||||||
@@ -512,14 +514,35 @@ void dmr_flco (dsd_opts * opts, dsd_state * state, uint8_t lc_bits[], uint32_t C
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (state->K != 0 && fid == 0x10 && so & 0x40)
|
//BUGFIX: Include slot and algid so we don't accidentally print more than one loaded key
|
||||||
|
//this can happen on Missing PI header and LE when the keyloader has loaded a TG/Hash key and an RC4 key simultandeously
|
||||||
|
//subsequennt EMB would print two key values until call cleared out
|
||||||
|
|
||||||
|
if (state->K != 0 && fid == 0x10 && so & 0x40 && slot == 0 && state->payload_algid == 0)
|
||||||
{
|
{
|
||||||
fprintf (stderr, "%s", KYEL);
|
fprintf (stderr, "%s", KYEL);
|
||||||
fprintf (stderr, "Key %lld ", state->K);
|
fprintf (stderr, "Key %lld ", state->K);
|
||||||
fprintf (stderr, "%s ", KNRM);
|
fprintf (stderr, "%s ", KNRM);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (state->K1 != 0 && fid == 0x68 && so & 0x40)
|
if (state->K != 0 && fid == 0x10 && so & 0x40 && slot == 1 && state->payload_algidR == 0)
|
||||||
|
{
|
||||||
|
fprintf (stderr, "%s", KYEL);
|
||||||
|
fprintf (stderr, "Key %lld ", state->K);
|
||||||
|
fprintf (stderr, "%s ", KNRM);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (state->K1 != 0 && fid == 0x68 && so & 0x40 && slot == 0 && state->payload_algid == 0)
|
||||||
|
{
|
||||||
|
if (state->K2 != 0) fprintf (stderr, "\n ");
|
||||||
|
fprintf (stderr, "%s", KYEL);
|
||||||
|
fprintf (stderr, "Key %010llX ", state->K1);
|
||||||
|
if (state->K2 != 0) fprintf (stderr, "%016llX ", state->K2);
|
||||||
|
if (state->K4 != 0) fprintf (stderr, "%016llX %016llX", state->K3, state->K4);
|
||||||
|
fprintf (stderr, "%s ", KNRM);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (state->K1 != 0 && fid == 0x68 && so & 0x40 && slot == 1 && state->payload_algidR == 0)
|
||||||
{
|
{
|
||||||
if (state->K2 != 0) fprintf (stderr, "\n ");
|
if (state->K2 != 0) fprintf (stderr, "\n ");
|
||||||
fprintf (stderr, "%s", KYEL);
|
fprintf (stderr, "%s", KYEL);
|
||||||
|
|||||||
134
src/dmr_le.c
134
src/dmr_le.c
@@ -178,13 +178,24 @@ void dmr_sbrc (dsd_opts * opts, dsd_state * state, uint8_t power)
|
|||||||
uint8_t slot = state->currentslot;
|
uint8_t slot = state->currentslot;
|
||||||
uint8_t sbrc_interleaved[32];
|
uint8_t sbrc_interleaved[32];
|
||||||
uint8_t sbrc_return[32];
|
uint8_t sbrc_return[32];
|
||||||
|
uint8_t sbrc_retcrc[32]; //crc significant bits of the return for SB
|
||||||
memset (sbrc_interleaved, 0, sizeof(sbrc_interleaved));
|
memset (sbrc_interleaved, 0, sizeof(sbrc_interleaved));
|
||||||
memset (sbrc_return, 0, sizeof(sbrc_return));
|
memset (sbrc_return, 0, sizeof(sbrc_return));
|
||||||
|
memset (sbrc_retcrc, 0, sizeof(sbrc_retcrc));
|
||||||
uint32_t irr_err = 0;
|
uint32_t irr_err = 0;
|
||||||
uint32_t sbrc_hex = 0;
|
uint32_t sbrc_hex = 0;
|
||||||
uint16_t crc_extracted = 7777;
|
uint16_t crc_extracted = 7777;
|
||||||
uint16_t crc_computed = 9999;
|
uint16_t crc_computed = 9999;
|
||||||
uint8_t crc_okay = 0;
|
uint8_t crc7_okay = 0; //RC
|
||||||
|
uint8_t crc3_okay = 0; //TXI
|
||||||
|
uint8_t txi = 0; //SEE: https://patents.google.com/patent/US8271009B2
|
||||||
|
|
||||||
|
//NOTE: Any previous mentions to Cap+ in this area may have been in error,
|
||||||
|
//The signalling observed here was actually TXI information, not Cap+ Specifically
|
||||||
|
|
||||||
|
//check to see if this a TXI system
|
||||||
|
if (slot == 0 && state->dmr_so & 0x20) txi = 1;
|
||||||
|
if (slot == 1 && state->dmr_soR & 0x20) txi = 1;
|
||||||
|
|
||||||
// 9.3.2 Pre-emption and power control Indicator (PI)
|
// 9.3.2 Pre-emption and power control Indicator (PI)
|
||||||
// 0 - The embedded signalling carries information associated to the same logical channel or the Null embedded message
|
// 0 - The embedded signalling carries information associated to the same logical channel or the Null embedded message
|
||||||
@@ -198,8 +209,11 @@ void dmr_sbrc (dsd_opts * opts, dsd_state * state, uint8_t power)
|
|||||||
//bad emb burst, never set a valid power indicator value (probably 9)
|
//bad emb burst, never set a valid power indicator value (probably 9)
|
||||||
if (power > 1) goto SBRC_END;
|
if (power > 1) goto SBRC_END;
|
||||||
|
|
||||||
|
//arrange the return for proper order for the crc3 check
|
||||||
|
for (i = 0; i < 8; i++) sbrc_retcrc[i] = sbrc_return[i+3];
|
||||||
|
|
||||||
//RC Channel CRC 7 Mask = 0x7A; CRC bits are used as privacy indicators on
|
//RC Channel CRC 7 Mask = 0x7A; CRC bits are used as privacy indicators on
|
||||||
//Single Voice Burst F (see below), other moto values seem to exist there as well
|
//Single Voice Burst F (see below), other moto values seem to exist there as well -- See TXI patent
|
||||||
if (power == 1) //RC
|
if (power == 1) //RC
|
||||||
{
|
{
|
||||||
crc_extracted = 0;
|
crc_extracted = 0;
|
||||||
@@ -209,15 +223,27 @@ void dmr_sbrc (dsd_opts * opts, dsd_state * state, uint8_t power)
|
|||||||
crc_extracted = crc_extracted | sbrc_return[i+4];
|
crc_extracted = crc_extracted | sbrc_return[i+4];
|
||||||
}
|
}
|
||||||
crc_extracted = crc_extracted ^ 0x7A;
|
crc_extracted = crc_extracted ^ 0x7A;
|
||||||
crc_computed = crc7((uint8_t *) sbrc_return, 11);
|
crc_computed = crc7((uint8_t *) sbrc_return, 7);
|
||||||
if (crc_extracted == crc_computed) crc_okay = 1;
|
if (crc_extracted == crc_computed) crc7_okay = 1;
|
||||||
}
|
}
|
||||||
else crc_okay = 1; //SB
|
else //if (txi == 1) //if TXI -- but TXI systems also carry the non-crc protected ENC identifiers
|
||||||
|
{
|
||||||
|
crc_extracted = 0;
|
||||||
|
for (i = 0; i < 3; i++)
|
||||||
|
{
|
||||||
|
crc_extracted = crc_extracted << 1;
|
||||||
|
crc_extracted = crc_extracted | sbrc_return[i]; //first 3 most significant bits
|
||||||
|
}
|
||||||
|
crc_computed = crc3((uint8_t *) sbrc_retcrc, 8); //working now seems consistent as well
|
||||||
|
if (crc_extracted == crc_computed) crc3_okay = 1;
|
||||||
|
// fprintf (stderr, " CRC EXT %02X, CRC CMP %02X", crc_extracted, crc_computed);
|
||||||
|
}
|
||||||
|
// else //crc_okay = 0; //CRC invalid / not available when is ENC Identifiers (I really hate that)
|
||||||
|
|
||||||
for(i = 0; i < 11; i++)
|
for(i = 0; i < 11; i++)
|
||||||
{
|
{
|
||||||
sbrc_hex = sbrc_hex << 1;
|
sbrc_hex = sbrc_hex << 1;
|
||||||
sbrc_hex |= sbrc_return[i] & 1; //sbrc_return
|
sbrc_hex |= sbrc_return[i] & 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (opts->payload == 1) //hide the sb/rc behind the payload printer, won't be useful to most people
|
if (opts->payload == 1) //hide the sb/rc behind the payload printer, won't be useful to most people
|
||||||
@@ -227,48 +253,76 @@ void dmr_sbrc (dsd_opts * opts, dsd_state * state, uint8_t power)
|
|||||||
if (power == 1) fprintf (stderr, " RC: ");
|
if (power == 1) fprintf (stderr, " RC: ");
|
||||||
for(i = 0; i < 11; i++)
|
for(i = 0; i < 11; i++)
|
||||||
fprintf (stderr, "%d", sbrc_return[i]);
|
fprintf (stderr, "%d", sbrc_return[i]);
|
||||||
fprintf (stderr, " - %03X", sbrc_hex);
|
fprintf (stderr, " - %03X; ", sbrc_hex);
|
||||||
fprintf (stderr, "\n");
|
|
||||||
fprintf (stderr, "%s", KNRM);
|
fprintf (stderr, "%s", KNRM);
|
||||||
|
|
||||||
if (crc_okay == 0)
|
// if (crc_okay == 0) //forego this since the crc can vary or not be used at all
|
||||||
{
|
// {
|
||||||
fprintf (stderr, "%s", KRED);
|
// fprintf (stderr, "%s", KRED);
|
||||||
fprintf (stderr, " (CRC ERR)");
|
// fprintf (stderr, " (CRC ERR)");
|
||||||
fprintf (stderr, "%s", KNRM);
|
// fprintf (stderr, "%s", KNRM);
|
||||||
fprintf (stderr, " CRC EXT %02X, CRC CMP %02X", crc_extracted, crc_computed);
|
// fprintf (stderr, " CRC EXT %02X, CRC CMP %02X", crc_extracted, crc_computed);
|
||||||
}
|
// }
|
||||||
|
|
||||||
|
fprintf (stderr, "\n");
|
||||||
}
|
}
|
||||||
|
|
||||||
uint8_t sbrc_opcode = sbrc_hex;
|
uint8_t sbrc_opcode = sbrc_hex & 0x7; //opcode and alg the same bits, but the alg is present when CRC is bad (I know they are limited on bits, but I hate that idea)
|
||||||
uint8_t alg = sbrc_hex & 0x7;
|
uint8_t alg = sbrc_hex & 0x7;
|
||||||
uint8_t key = (sbrc_hex >> 3) & 0xFF;
|
uint8_t key = (sbrc_hex >> 3) & 0xFF;
|
||||||
uint8_t cap_site = (sbrc_hex >> 4) & 0x7; //signalling on Cap+ when voice errors (non voice VC6 is present)
|
uint8_t txi_delay = (sbrc_hex >> 3) & 0x1F; //middle five are the 'delay' value on a TXI system
|
||||||
|
|
||||||
if (opts->dmr_le == 1) //this will now require a user to switch it on or off until more testing/figuring can be done
|
if (opts->dmr_le == 1) //this will now require a user to switch it on or off until more testing/figuring can be done
|
||||||
{
|
{
|
||||||
if (irr_err != 0) ; //fprintf (stderr, "\n %s SLOT %d SB/RC (FEC ERR) %d %s \n", KRED, slot, irr_err, KNRM);
|
if (irr_err != 0) fprintf (stderr, "\n %s SLOT %d SB/RC (FEC ERR) %d %s \n", KRED, slot, irr_err, KNRM);
|
||||||
if (irr_err == 0)
|
if (irr_err == 0)
|
||||||
{
|
{
|
||||||
if (sbrc_hex == 0) ; //NULL
|
if (sbrc_hex == 0) ; //NULL, do nothing
|
||||||
|
|
||||||
//else if (placeholder for future conditions)
|
//else if (placeholder for future conditions)
|
||||||
// {
|
// {
|
||||||
// placeholder for future conditions
|
// placeholder for future conditions
|
||||||
// }
|
// }
|
||||||
else //Finally have a consistent set-up for this -- spoke too soon, sadly
|
|
||||||
|
else if (crc7_okay == 1)
|
||||||
{
|
{
|
||||||
//the signalling here is always presents on good voice frames, if errs are [3][2] then its not a VC6 voice frame, but some other 'hidden' frame
|
//do something with the reverse channel information
|
||||||
if (slot == 0 && state->errs < 3)
|
}
|
||||||
|
|
||||||
|
//if the call is interruptable (TXI) and the crc3 is okay
|
||||||
|
else if (crc3_okay == 1)
|
||||||
|
{
|
||||||
|
//opcodes -- 0 (NULL), BR Delay (3)
|
||||||
|
fprintf (stderr, "\n");
|
||||||
|
fprintf (stderr, " TXI Op: %X - ", sbrc_opcode);
|
||||||
|
if (sbrc_opcode == 0) fprintf (stderr, " Null; ");
|
||||||
|
else if (sbrc_opcode == 3)
|
||||||
|
{
|
||||||
|
if (txi_delay != 0)
|
||||||
|
fprintf (stderr, " BR Delay: %d - %d ms; ", txi_delay, txi_delay * 30); //could also indicate number of superframes until next VC6 pre-emption
|
||||||
|
else fprintf (stderr, "BR Delay: Irrelevant / Send at any time;");
|
||||||
|
}
|
||||||
|
else fprintf (stderr, " Unk; ");
|
||||||
|
|
||||||
|
if (opts->payload == 1) fprintf (stderr, "\n"); //only during payload
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
else //all that should be left in this field is the potential ENC identifiers
|
||||||
|
{
|
||||||
|
|
||||||
|
if (slot == 0) //may not need the state->errs anymore //&& state->errs < 3
|
||||||
{
|
{
|
||||||
if (state->dmr_so & 0x40 && key != 0 && state->payload_keyid == 0)
|
if (state->dmr_so & 0x40 && key != 0 && state->payload_keyid == 0)
|
||||||
{
|
{
|
||||||
//if we aren't forcing a particular alg or privacy key set
|
//if we aren't forcing a particular alg or privacy key set
|
||||||
if (state->M == 0)
|
if (state->M == 0)
|
||||||
{
|
{
|
||||||
|
fprintf (stderr, "\n");
|
||||||
fprintf (stderr, "%s ", KYEL);
|
fprintf (stderr, "%s ", KYEL);
|
||||||
fprintf (stderr, " Slot 1");
|
fprintf (stderr, " Slot 1");
|
||||||
fprintf (stderr, " DMR LE SB ALG ID: %X KEY ID: %0X", alg + 0x20, key);
|
fprintf (stderr, " DMR LE SB ALG ID: %X KEY ID: %0X", alg + 0x20, key);
|
||||||
fprintf (stderr, "\n");
|
// fprintf (stderr, "\n");
|
||||||
fprintf (stderr, "%s ", KNRM);
|
fprintf (stderr, "%s ", KNRM);
|
||||||
|
|
||||||
state->payload_keyid = key;
|
state->payload_keyid = key;
|
||||||
@@ -278,18 +332,18 @@ void dmr_sbrc (dsd_opts * opts, dsd_state * state, uint8_t power)
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
//the signalling here is always presents on good voice frames, if errs are [3][2] then its not a VC6 voice frame, but some other 'hidden' frame
|
if (slot == 1) //may not need the state->errs anymore //&& state->errsR < 3
|
||||||
if (slot == 1 && state->errsR < 3)
|
|
||||||
{
|
{
|
||||||
if (state->dmr_soR & 0x40 && key != 0 && state->payload_keyidR == 0)
|
if (state->dmr_soR & 0x40 && key != 0 && state->payload_keyidR == 0)
|
||||||
{
|
{
|
||||||
//if we aren't forcing a particular alg or privacy key set
|
//if we aren't forcing a particular alg or privacy key set
|
||||||
if (state->M == 0)
|
if (state->M == 0)
|
||||||
{
|
{
|
||||||
fprintf (stderr, "%s ", KYEL);
|
|
||||||
fprintf (stderr, " Slot 1");
|
|
||||||
fprintf (stderr, " DMR LE SB ALG ID: %X KEY ID: %0X", alg + 0x20, key);
|
|
||||||
fprintf (stderr, "\n");
|
fprintf (stderr, "\n");
|
||||||
|
fprintf (stderr, "%s ", KYEL);
|
||||||
|
fprintf (stderr, " Slot 2");
|
||||||
|
fprintf (stderr, " DMR LE SB ALG ID: %X KEY ID: %0X", alg + 0x20, key);
|
||||||
|
// fprintf (stderr, "\n");
|
||||||
fprintf (stderr, "%s ", KNRM);
|
fprintf (stderr, "%s ", KNRM);
|
||||||
|
|
||||||
state->payload_keyidR = key;
|
state->payload_keyidR = key;
|
||||||
@@ -324,3 +378,27 @@ void dmr_sbrc (dsd_opts * opts, dsd_state * state, uint8_t power)
|
|||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
uint8_t crc3(uint8_t bits[], unsigned int len)
|
||||||
|
{
|
||||||
|
uint8_t crc=0;
|
||||||
|
unsigned int K = 3;
|
||||||
|
//x^3+x+1
|
||||||
|
uint8_t poly[4] = {1,1,0,1};
|
||||||
|
uint8_t buf[256];
|
||||||
|
if (len+K > sizeof(buf)) {
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
memset (buf, 0, sizeof(buf));
|
||||||
|
for (unsigned int i=0; i<len; i++){
|
||||||
|
buf[i] = bits[i];
|
||||||
|
}
|
||||||
|
for (unsigned int i=0; i<len; i++)
|
||||||
|
if (buf[i])
|
||||||
|
for (unsigned int j=0; j<K+1; j++)
|
||||||
|
buf[i+j] ^= poly[j];
|
||||||
|
for (unsigned int i=0; i<K; i++){
|
||||||
|
crc = (crc << 1) + buf[len + i];
|
||||||
|
}
|
||||||
|
return crc;
|
||||||
|
}
|
||||||
|
|
||||||
|
|||||||
10
src/dmr_ms.c
10
src/dmr_ms.c
@@ -89,6 +89,10 @@ void dmrMS (dsd_opts * opts, dsd_state * state)
|
|||||||
for (j = 0; j < 6; j++) {
|
for (j = 0; j < 6; j++) {
|
||||||
state->dmrburstL = 16;
|
state->dmrburstL = 16;
|
||||||
|
|
||||||
|
memset (ambe_fr, 0, sizeof(ambe_fr));
|
||||||
|
memset (ambe_fr2, 0, sizeof(ambe_fr2));
|
||||||
|
memset (ambe_fr3, 0, sizeof(ambe_fr3));
|
||||||
|
|
||||||
for(i = 0; i < 12; i++)
|
for(i = 0; i < 12; i++)
|
||||||
{
|
{
|
||||||
dibit = getDibit(opts, state);
|
dibit = getDibit(opts, state);
|
||||||
@@ -370,7 +374,11 @@ void dmrMSBootstrap (dsd_opts * opts, dsd_state * state)
|
|||||||
char ambe_fr[4][24];
|
char ambe_fr[4][24];
|
||||||
char ambe_fr2[4][24];
|
char ambe_fr2[4][24];
|
||||||
char ambe_fr3[4][24];
|
char ambe_fr3[4][24];
|
||||||
char ambe_fr4[4][24]; //shim for crappy tdma direct, need more samples to see if this is really a necessary shim or not
|
char ambe_fr4[4][24];
|
||||||
|
|
||||||
|
memset (ambe_fr, 0, sizeof(ambe_fr));
|
||||||
|
memset (ambe_fr2, 0, sizeof(ambe_fr2));
|
||||||
|
memset (ambe_fr3, 0, sizeof(ambe_fr3));
|
||||||
|
|
||||||
//memcpy of ambe_fr for late entry
|
//memcpy of ambe_fr for late entry
|
||||||
char m1[4][24];
|
char m1[4][24];
|
||||||
|
|||||||
@@ -1606,7 +1606,7 @@ getFrameSync (dsd_opts * opts, dsd_state * state)
|
|||||||
if ((opts->errorbars == 1) && (opts->verbose > 1) && (state->carrier == 1))
|
if ((opts->errorbars == 1) && (opts->verbose > 1) && (state->carrier == 1))
|
||||||
{
|
{
|
||||||
fprintf (stderr,"Sync: no sync\n");
|
fprintf (stderr,"Sync: no sync\n");
|
||||||
fprintf (stderr,"Press CTRL + C to close.\n");
|
// fprintf (stderr,"Press CTRL + C to close.\n");
|
||||||
|
|
||||||
}
|
}
|
||||||
noCarrier (opts, state);
|
noCarrier (opts, state);
|
||||||
|
|||||||
@@ -628,7 +628,7 @@ initOpts (dsd_opts * opts)
|
|||||||
opts->dmr_dmrla_n = 0;
|
opts->dmr_dmrla_n = 0;
|
||||||
|
|
||||||
//DMR Late Entry
|
//DMR Late Entry
|
||||||
opts->dmr_le = 0; //off by default until worked out some more
|
opts->dmr_le = 1; //re-enabled again
|
||||||
|
|
||||||
//Trunking - Use Group List as Allow List
|
//Trunking - Use Group List as Allow List
|
||||||
opts->trunk_use_allow_list = 0; //disabled by default
|
opts->trunk_use_allow_list = 0; //disabled by default
|
||||||
@@ -1157,9 +1157,11 @@ usage ()
|
|||||||
printf (" \n");
|
printf (" \n");
|
||||||
printf (" -0 Force RC4 Key over Missing PI header/LE Encryption Identifiers (DMR) \n");
|
printf (" -0 Force RC4 Key over Missing PI header/LE Encryption Identifiers (DMR) \n");
|
||||||
printf (" \n");
|
printf (" \n");
|
||||||
printf (" -3 Enable DMR Late Entry Encryption Identifiers (VC6 Single Burst) \n");
|
printf (" -3 Disable DMR Late Entry Encryption Identifiers (VC6 Single Burst) \n");
|
||||||
printf (" Note: This is experimental and may produce false positives depending on system type, notably Cap+. \n");
|
printf (" Note: Disable this if false positives on Voice ENC occur. \n");
|
||||||
printf (" Use -0 or -4 options above instead if needed. \n");
|
// printf (" -3 Enable DMR Late Entry Encryption Identifiers (VC6 Single Burst) \n");
|
||||||
|
// printf (" Note: This is experimental and may produce false positives depending on system type, notably TXI. \n");
|
||||||
|
// printf (" Use -0 or -4 options above instead if needed. \n");
|
||||||
printf ("\n");
|
printf ("\n");
|
||||||
printf (" Trunking Options:\n");
|
printf (" Trunking Options:\n");
|
||||||
printf (" -C <file> Import Channel to Frequency Map (channum, freq) from csv file. (Capital C) \n");
|
printf (" -C <file> Import Channel to Frequency Map (channum, freq) from csv file. (Capital C) \n");
|
||||||
@@ -1372,7 +1374,7 @@ main (int argc, char **argv)
|
|||||||
}
|
}
|
||||||
|
|
||||||
#ifdef AERO_BUILD
|
#ifdef AERO_BUILD
|
||||||
fprintf (stderr, "Build Version: v2.1 Beta 2\n");
|
fprintf (stderr, "Build Version: v2.1 Beta 3\n");
|
||||||
#else
|
#else
|
||||||
fprintf (stderr, "Build Version: %s \n", GIT_TAG);
|
fprintf (stderr, "Build Version: %s \n", GIT_TAG);
|
||||||
#endif
|
#endif
|
||||||
@@ -1424,7 +1426,7 @@ main (int argc, char **argv)
|
|||||||
|
|
||||||
case '3':
|
case '3':
|
||||||
opts.dmr_le = 1;
|
opts.dmr_le = 1;
|
||||||
fprintf (stderr,"DMR Late Entry Encryption Identifiers Enabled (VC6 Single Burst)\n");
|
fprintf (stderr,"DMR Late Entry Encryption Identifiers Disabled (VC6 Single Burst)\n");
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case 'Y': //conventional scanner mode
|
case 'Y': //conventional scanner mode
|
||||||
|
|||||||
1550
src/dsd_mbe.c
1550
src/dsd_mbe.c
File diff suppressed because it is too large
Load Diff
@@ -2158,7 +2158,7 @@ ncursesPrinter (dsd_opts * opts, dsd_state * state)
|
|||||||
if (opts->ncurses_compact == 1)
|
if (opts->ncurses_compact == 1)
|
||||||
{
|
{
|
||||||
printw ("------------------------------------------------------------------------------\n");
|
printw ("------------------------------------------------------------------------------\n");
|
||||||
printw ("| Digital Speech Decoder: Florida Man Edition - Aero %s \n", "v2.1 Beta 2");
|
printw ("| Digital Speech Decoder: Florida Man Edition - Aero %s \n", "v2.1 Beta 3");
|
||||||
printw ("------------------------------------------------------------------------------\n");
|
printw ("------------------------------------------------------------------------------\n");
|
||||||
}
|
}
|
||||||
#elif LIMAZULUTWEAKS
|
#elif LIMAZULUTWEAKS
|
||||||
@@ -2194,7 +2194,7 @@ ncursesPrinter (dsd_opts * opts, dsd_state * state)
|
|||||||
if (i == 4) printw (" MBElib %s", versionstr);
|
if (i == 4) printw (" MBElib %s", versionstr);
|
||||||
#ifdef AERO_BUILD
|
#ifdef AERO_BUILD
|
||||||
if (i == 5) printw (" %s ", "Aero Build");
|
if (i == 5) printw (" %s ", "Aero Build");
|
||||||
if (i == 6) printw (" v2.1 Beta 2\n");
|
if (i == 6) printw (" v2.1 Beta 3\n");
|
||||||
#elif ZDEV_BUILD
|
#elif ZDEV_BUILD
|
||||||
if (i == 5) printw (" %s ", "zDEV Build");
|
if (i == 5) printw (" %s ", "zDEV Build");
|
||||||
if (i == 6) printw (" %s \n", GIT_TAG);
|
if (i == 6) printw (" %s \n", GIT_TAG);
|
||||||
|
|||||||
Reference in New Issue
Block a user