ua1zbe
/
dsd-fme_20_06_2023
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

NCurses Updates 

Update NCurses to work with DMR BS TDMA Stereo, DMR MS, dPMR, D-STAR
--reorganize the code and clean up the mess
Minor Tweaks and Code Cleanup
This commit is contained in:
lwvmobile 2022-05-03 06:54:08 -04:00 committed by GitHub
parent 3cd1eefad8
commit ab873d3821
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
16 changed files with 879 additions and 516 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
include/dsd.h
View File

@ -374,6 +374,7 @@ typedef struct
// //
int frame_ysf; int frame_ysf;
int inverted_ysf; //not sure if ysf comes in inverted or not, but signal could if IQ flipped int inverted_ysf; //not sure if ysf comes in inverted or not, but signal could if IQ flipped
short int aggressive_framesync; //set to 1 for more aggressive framesync, 0 for less aggressive
} dsd_opts; } dsd_opts;
@ -432,7 +433,9 @@ typedef struct
char tg[25][16]; char tg[25][16];
int tgcount; int tgcount;
int lasttg; int lasttg;
int lasttgR;
int lastsrc; int lastsrc;
int lastsrcR;
int nac; int nac;
int errs; int errs;
int errs2; int errs2;
@ -466,9 +469,13 @@ typedef struct
mbe_parms *prev_mp_enhanced2; mbe_parms *prev_mp_enhanced2;
int p25kid; int p25kid;
int payload_algid; int payload_algid;
int payload_algidR;
int payload_keyid; int payload_keyid;
int payload_keyidR;
int payload_mfid; int payload_mfid;
int payload_mfidR;
int payload_mi; int payload_mi;
int payload_miR;
unsigned long long int K; unsigned long long int K;
unsigned int debug_audio_errors; unsigned int debug_audio_errors;
@ -488,17 +495,6 @@ typedef struct
//input sample buffer for monitoring Input //input sample buffer for monitoring Input
short input_sample_buffer; //HERE HERE short input_sample_buffer; //HERE HERE
short pulse_raw_out_buffer; //HERE HERE short pulse_raw_out_buffer; //HERE HERE
//float *input_sample_buffer; //HERE HERE
short dibit_to_hex_buf;
// state->sr_0 shift registers
short hexbuf;
unsigned long long sr_0; //64-bit shift registers for pushing decoded binary or dibit data
unsigned long long sr_1; //384
unsigned long long sr_2; //
unsigned long long sr_3; //
unsigned long long sr_4; //
unsigned long long sr_5; //
unsigned long long sr_6; //
unsigned int dmr_color_code; unsigned int dmr_color_code;
unsigned int nxdn_last_ran; unsigned int nxdn_last_ran;
@ -507,8 +503,8 @@ typedef struct
unsigned int nxdn_cipher_type; unsigned int nxdn_cipher_type;
unsigned int nxdn_key; unsigned int nxdn_key;
char nxdn_call_type[1024]; char nxdn_call_type[1024];
char dmr_callsign[6][99]; //plenty of room in case of overflow; char dmr_callsign[2][6][99]; //plenty of room in case of overflow;
char dmr_lrrp[6][9999]; char dmr_lrrp[2][6][9999];
NxdnSacchRawPart_t NxdnSacchRawPart[4]; NxdnSacchRawPart_t NxdnSacchRawPart[4];
NxdnFacch1RawPart_t NxdnFacch1RawPart[2]; NxdnFacch1RawPart_t NxdnFacch1RawPart[2];
@ -531,6 +527,9 @@ typedef struct
unsigned int dmr_fid; unsigned int dmr_fid;
unsigned int dmr_so; unsigned int dmr_so;
unsigned int dmr_fidR;
unsigned int dmr_soR;
char slot1light[8]; char slot1light[8];
char slot2light[8]; char slot2light[8];
int directmode; int directmode;
@ -540,8 +539,6 @@ typedef struct
char dmr_branding[25]; char dmr_branding[25];
uint8_t dmr_12_rate_sf[2][60]; //going five frames deep by 12 bytes //[slot][value] uint8_t dmr_12_rate_sf[2][60]; //going five frames deep by 12 bytes //[slot][value]
uint8_t dmr_34_rate_sf[2][64]; //going four frames deep by 16 bytes //[slot][value] uint8_t dmr_34_rate_sf[2][64]; //going four frames deep by 16 bytes //[slot][value]
//char dmr_stereo_payload[144]; //load up 144 dibit buffer for every single DMR TDMA frame
//char dmr_msmode_payload[144];
int dmr_stereo_payload[144]; //load up 144 dibit buffer for every single DMR TDMA frame int dmr_stereo_payload[144]; //load up 144 dibit buffer for every single DMR TDMA frame
@ -572,6 +569,11 @@ typedef struct
short int dmr_stereo; //need state variable for upsample function short int dmr_stereo; //need state variable for upsample function
short int dmr_ms_rc; short int dmr_ms_rc;
short int dmr_ms_mode; short int dmr_ms_mode;
unsigned int dmrburstL;
unsigned int dmrburstR;
//dstar header for ncurses
unsigned char dstarradioheader[41];
#ifdef TRACE_DSD #ifdef TRACE_DSD
char debug_prefix; char debug_prefix;
@ -857,6 +859,7 @@ bool QR_16_7_6_decode(unsigned char *rxBits);
void InitAllFecFunction(void); void InitAllFecFunction(void);
void resetState (dsd_state * state); void resetState (dsd_state * state);
void dstar_header_decode(dsd_state * state, int radioheaderbuffer[660]);
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {

4
include/dstar_header.h
View File

@ -2,5 +2,5 @@
#ifndef _DSTAR_HEADER_H #ifndef _DSTAR_HEADER_H
#define _DSTAR_HEADER_H #define _DSTAR_HEADER_H
void dstar_header_decode(int radioheaderbuffer[660]); //void dstar_header_decode(int radioheaderbuffer[660]);
#endif /* _DSTAR_HEADER_H */ #endif /* _DSTAR_HEADER_H */

8
src/dmr_bs.c
View File

@ -293,7 +293,7 @@ void dmrBS (dsd_opts * opts, dsd_state * state)
skipcount++; //after 6 data frames, drop back to getFrameSync and process subsequent data with processDMRdata skipcount++; //after 6 data frames, drop back to getFrameSync and process subsequent data with processDMRdata
goto SKIP; goto SKIP;
} }
if( (strcmp (sync, DMR_BS_DATA_SYNC) != 0) ) //only play voice no data sync // || (strcmp (sync, DMR_MS_DATA_SYNC) != 0) if( (strcmp (sync, DMR_BS_DATA_SYNC) != 0) ) //only play voice no data sync // || (strcmp (sync, DMR_MS_DATA_SYNC) != 0)
{ {
if (EmbeddedSignallingOk == 0) if (EmbeddedSignallingOk == 0)
@ -304,11 +304,13 @@ void dmrBS (dsd_opts * opts, dsd_state * state)
fprintf (stderr,"%s ", getTime()); fprintf (stderr,"%s ", getTime());
if (internalslot == 0) if (internalslot == 0)
{ {
state->dmrburstL = 16; //use 16 for Voice?
fprintf (stderr,"Sync: +DMR [slot1] slot2 | Color Code=%02d | DMRSTEREO | VC%d \n", state->color_code, vc1); fprintf (stderr,"Sync: +DMR [slot1] slot2 | Color Code=%02d | DMRSTEREO | VC%d \n", state->color_code, vc1);
} }
if (internalslot == 1) if (internalslot == 1)
{ {
state->dmrburstR = 16; //use 16 for Voice?
fprintf (stderr,"Sync: +DMR slot1 [slot2] | Color Code=%02d | DMRSTEREO | VC%d \n", state->color_code, vc2); fprintf (stderr,"Sync: +DMR slot1 [slot2] | Color Code=%02d | DMRSTEREO | VC%d \n", state->color_code, vc2);
} }
if (internalslot == 0 && vc1 == 6) //presumably when full (and no sync issues) if (internalslot == 0 && vc1 == 6) //presumably when full (and no sync issues)
@ -354,8 +356,8 @@ void dmrBS (dsd_opts * opts, dsd_state * state)
} }
//using these conditions may cause excessive resyncs IF bad signal, //using these conditions may cause excessive resyncs IF bad signal,
//but still better than getting stuck in a wonk wonk loop for too long. //but still better than getting stuck in a wonk wonk loop for too long.
//maybe consider making a opt variable for loose or aggressive resyncing for this sort of thing? //set for more aggressive or less aggressive resync during accumulated playback errs
if (1 == 1) //set for more aggressive or less aggressive resync during accumulated playback errs if (opts->aggressive_framesync == 1)
{ {
//errors caused due to playing MBE files out of sync, break loop //errors caused due to playing MBE files out of sync, break loop
if (state->errs > 2 || state->errsR > 2) if (state->errs > 2 || state->errsR > 2)

12
src/dmr_data.c
View File

@ -51,7 +51,7 @@ processDMRdata (dsd_opts * opts, dsd_state * state)
dibit_p = state->dibit_buf_p - 90; dibit_p = state->dibit_buf_p - 90;
//using the estimate_symbol method for the dmr_payload_p buffer causes sync //using the estimate_symbol method for the dmr_payload_p buffer causes sync
//issues with P25, so only do it when frame_p25p1 == 0, or -fr option //issues with P25, so only do it when frame_p25p1 == 0, or -fr option
if (opts->frame_p25p1 != 1) if (opts->frame_p25p1 == 0) //opts->frame_p25p1 == 0
{ {
dibit_p = state->dmr_payload_p - 90; dibit_p = state->dmr_payload_p - 90;
} }
@ -312,7 +312,17 @@ processDMRdata (dsd_opts * opts, dsd_state * state)
//fprintf(stderr, "| Color Code=%02d ", (int)state->color_code); //fprintf(stderr, "| Color Code=%02d ", (int)state->color_code);
/* Reconstitute the burst type */ /* Reconstitute the burst type */
//consider assigning thsi only when slottypeok or similar check passes, eliminate bad burst types from decoding randomly
burst = (unsigned int)((SlotType[4] << 3) + (SlotType[5] << 2) + (SlotType[6] << 1) + SlotType[7]); burst = (unsigned int)((SlotType[4] << 3) + (SlotType[5] << 2) + (SlotType[6] << 1) + SlotType[7]);
if (state->currentslot == 0)
{
state->dmrburstL = burst;
}
if (state->currentslot == 1)
{
state->dmrburstR = burst;
}
/* Reconstitute the burst type */ /* Reconstitute the burst type */
bursttype[0] = SlotType[4] + '0'; bursttype[0] = SlotType[4] + '0';

4
src/dmr_ms.c
View File

@ -66,7 +66,7 @@ void dmrMS (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) {
state->dmrburstL = 16; //Use 16 for Voice?
// No CACH in MS Mode? // No CACH in MS Mode?
for(i = 0; i < 12; i++) for(i = 0; i < 12; i++)
{ {
@ -464,7 +464,7 @@ void dmrMSBootstrap (dsd_opts * opts, dsd_state * state)
return curr; return curr;
} }
state->dmrburstL = 16; //Use 16 for Voice?
dibit_p = state->dmr_payload_p - 90; dibit_p = state->dmr_payload_p - 90;
//payload buffer tests //payload buffer tests
//CACH + First Half Payload + Sync = 12 + 54 + 24 //CACH + First Half Payload + Sync = 12 + 54 + 24

2
src/dmr_process_voice.c
View File

@ -94,7 +94,7 @@ if (state->currentslot == 0 && state->K > 0 && state->dmr_so & 0x40 && state->pa
} }
} }
if (state->currentslot == 1 && state->K > 0 && state->dmr_so & 0x40 && state->payload_keyid == 0) if (state->currentslot == 1 && state->K > 0 && state->dmr_soR & 0x40 && state->payload_keyidR == 0)
{ {
fprintf (stderr, "%s", KYEL); fprintf (stderr, "%s", KYEL);
fprintf(stderr, " BPK %lld", state->K); fprintf(stderr, " BPK %lld", state->K);

245
src/dmr_sync.c
View File

@ -219,13 +219,17 @@ void Process34Data(dsd_opts * opts, dsd_state * state, unsigned char tdibits[98]
fprintf (stderr, " - Port %05d", (state->dmr_34_rate_sf[10] << 8) + state->dmr_34_rate_sf[11]); fprintf (stderr, " - Port %05d", (state->dmr_34_rate_sf[10] << 8) + state->dmr_34_rate_sf[11]);
} }
*/ */
//temp hide behind payload until working better
if (opts->payload == 1)
{
//LRRP //LRRP
if ( (state->dmr_34_rate_sf[slot][0] & 0x7F) == 0x45) //Start LRRP now if ( (state->dmr_34_rate_sf[slot][0] & 0x7F) == 0x45) //Start LRRP now
{ {
sprintf ( state->dmr_lrrp[state->currentslot][0], "LRRP - ");
fprintf (stderr, "%s ", KMAG); fprintf (stderr, "%s ", KMAG);
//fprintf (stderr, "\n IP4 Header"); //Not sure this is accurate info IP4 Header? //fprintf (stderr, "\n IP4 Header"); //Not sure this is accurate info IP4 Header?
//fprintf (stderr, "\n Data Blocks [%d]", state->dmr_34_rate_sf[5]); //fprintf (stderr, "\n Data Blocks [%d]", state->dmr_34_rate_sf[5]);
for (short i = 1; i < 64; i++) //find way to get padding so we only go as deep as we need to! for (short i = 1; i < 60; i++) //find way to get padding so we only go as deep as we need to! changed from 64 to 60 to skip the CRC Bytes for confirmed data
{ {
if ( state->dmr_34_rate_sf[slot][i] == 0x0C) //Source and Destination info if ( state->dmr_34_rate_sf[slot][i] == 0x0C) //Source and Destination info
{ {
@ -269,9 +273,13 @@ void Process34Data(dsd_opts * opts, dsd_state * state, unsigned char tdibits[98]
//fprintf (stderr, "-"); //fprintf (stderr, "-");
} }
fprintf (stderr, "%.5lf", (lrrplon * lon_unit) ); fprintf (stderr, "%.5lf", (lrrplon * lon_unit) );
sprintf ( state->dmr_lrrp[3], "Lat: %.5lf Lon: %.5lf", ((double)lrrplat) * lat_unit , (lrrplon * lon_unit) ); if (state->dmr_34_rate_sf[slot][i+1] & 0x80) //first bit indicates a sign, or hemisphere?
{
sprintf ( state->dmr_lrrp[state->currentslot][3], "Lat: -%.5lf Lon: %.5lf ", ((double)lrrplat) * lat_unit , (lrrplon * lon_unit) );
}
else sprintf ( state->dmr_lrrp[state->currentslot][3], "Lat: %.5lf Lon: %.5lf ", ((double)lrrplat) * lat_unit , (lrrplon * lon_unit) );
//print for easy copy/paste into browser? //print for easy copy/paste into browser?
fprintf (stderr, " ("); //fprintf (stderr, " (");
if (state->dmr_34_rate_sf[slot][i+1] & 0x80) //first bit indicates a sign, or hemisphere? if (state->dmr_34_rate_sf[slot][i+1] & 0x80) //first bit indicates a sign, or hemisphere?
{ {
fprintf (stderr, "-"); fprintf (stderr, "-");
@ -287,16 +295,17 @@ void Process34Data(dsd_opts * opts, dsd_state * state, unsigned char tdibits[98]
double velocity = ( ((double)( (state->dmr_34_rate_sf[slot][i+1] ) + state->dmr_34_rate_sf[slot][i+2] )) / ( (double)128)); double velocity = ( ((double)( (state->dmr_34_rate_sf[slot][i+1] ) + state->dmr_34_rate_sf[slot][i+2] )) / ( (double)128));
//fprintf (stderr, "\n LRRP - %.4lf Meters Per Second", velocity); //fprintf (stderr, "\n LRRP - %.4lf Meters Per Second", velocity);
fprintf (stderr, "\n LRRP - %.4lf m/s %.4lf km/h %.4lf mph", velocity, (3.6 * velocity), (2.2369 * velocity) ); fprintf (stderr, "\n LRRP - %.4lf m/s %.4lf km/h %.4lf mph", velocity, (3.6 * velocity), (2.2369 * velocity) );
sprintf ( state->dmr_lrrp[1], "Vel: %.4lf kph", (3.6 * velocity)); sprintf ( state->dmr_lrrp[state->currentslot][4], "Vel: %.4lf kph ", (3.6 * velocity));
} }
if ( state->dmr_34_rate_sf[slot][i] == 0x56 ) if ( state->dmr_34_rate_sf[slot][i] == 0x56 )
{ {
//check for appropriate terminology here - Heading, bearing, course, or track? //check for appropriate terminology here - Heading, bearing, course, or track?
fprintf (stderr, "\n LRRP - Direction %d Degrees", state->dmr_34_rate_sf[slot][i+1] * 2); fprintf (stderr, "\n LRRP - Direction %d Degrees", state->dmr_34_rate_sf[slot][i+1] * 2);
sprintf ( state->dmr_lrrp[2], "Dir: %d Deg", state->dmr_34_rate_sf[slot][i+1] * 2); sprintf ( state->dmr_lrrp[state->currentslot][5], "Dir: %d Deg ", state->dmr_34_rate_sf[slot][i+1] * 2);
} }
} }
} }
}//end payload
fprintf (stderr, "%s ", KNRM); fprintf (stderr, "%s ", KNRM);
//Full //Full
if (opts->payload == 2) if (opts->payload == 2)
@ -1080,7 +1089,8 @@ void Process12Data(dsd_opts * opts, dsd_state * state, uint8_t info[196], uint8_
DmrDataBit[j + 7] = (DmrDataByte[i] >> 0) & 0x01; DmrDataBit[j + 7] = (DmrDataByte[i] >> 0) & 0x01;
} }
//Headers Source Destination //Headers Source Destination
if ( (state->dmr_12_rate_sf[slot][36] & 0x7F) == 0x45) //Start Source Destination early in case not enough 1/2 data frames //Start Source Destination early in case not enough 1/2 data frames
if ( (state->dmr_12_rate_sf[slot][36] & 0x7F) == 0x45 )
{ {
fprintf (stderr, "%s ", KMAG); fprintf (stderr, "%s ", KMAG);
//fprintf (stderr, "\n IP4 Header"); //Not sure this is accurate info IP4 Header? //fprintf (stderr, "\n IP4 Header"); //Not sure this is accurate info IP4 Header?
@ -1101,13 +1111,73 @@ void Process12Data(dsd_opts * opts, dsd_state * state, uint8_t info[196], uint8_
} }
fprintf (stderr, "%s ", KNRM); fprintf (stderr, "%s ", KNRM);
} }
/*
//Jurek lrrp, 0x41 is probably a different header type or something, or I need to look at the data header packet PDU first.
if ( (state->dmr_12_rate_sf[slot][36] & 0x7F) == 0x41) //Start LRRP now
{
sprintf ( state->dmr_lrrp[state->currentslot][0], "LRRP - ");
fprintf (stderr, "%s ", KMAG);
for (short i = 36; i < 60; i++) //find way to get padding so we only go as deep as we need to!
{
if ( state->dmr_12_rate_sf[slot][i] == 0x51 ) //lattitude and longitude
{
fprintf (stderr, "\n LRRP -");
fprintf (stderr, " Lat: ");
if (state->dmr_12_rate_sf[slot][i+1] & 0x80) //first bit indicates a sign, or hemisphere?
{
fprintf (stderr, "-");
}
long int lrrplat;
long int lrrplon;
double lat_unit = (double)180/(double)4294967295;
double lon_unit = (double)360/(double)4294967295;
lrrplat = ( ( ((state->dmr_12_rate_sf[slot][i+1] & 0x7F ) << 24 ) + (state->dmr_12_rate_sf[slot][i+2] << 16) + (state->dmr_12_rate_sf[slot][i+3] << 8) + state->dmr_12_rate_sf[slot][i+4]) * 1 );
lrrplon = ( ( (state->dmr_12_rate_sf[slot][i+5] << 24 ) + (state->dmr_12_rate_sf[slot][i+6] << 16) + (state->dmr_12_rate_sf[slot][i+7] << 8) + state->dmr_12_rate_sf[slot][i+8]) * 1 );
fprintf (stderr, "%.5lf ", ((double)lrrplat) * lat_unit);
fprintf (stderr, " Lon: ");
if (state->dmr_12_rate_sf[slot][i+5] & 0x80) //first bit indicates a sign, or hemisphere?
{
//fprintf (stderr, "-");
}
fprintf (stderr, "%.5lf", (lrrplon * lon_unit) );
sprintf ( state->dmr_lrrp[state->currentslot][3], "Lat: %.5lf Lon: %.5lf ", ((double)lrrplat) * lat_unit , (lrrplon * lon_unit) );
//print for easy copy/paste into browser?
//fprintf (stderr, " (");
if (state->dmr_12_rate_sf[slot][i+1] & 0x80) //first bit indicates a sign, or hemisphere?
{
fprintf (stderr, "-");
}
fprintf (stderr, "%.5lf, %.5lf)", ((double)lrrplat) * lat_unit , (lrrplon * lon_unit) );
}
if ( state->dmr_12_rate_sf[slot][i] == 0x6C )
{
//either Plus is wrong, or I'm wrong on higher velocities exceeding 0xFF.
//fprintf (stderr, "\n LRRP - Vi %02X Vf %02X Velocity Units (hex)", state->dmr_34_rate_sf[i+1], state->dmr_34_rate_sf[i+2]);
double velocity = ( ((double)( (state->dmr_12_rate_sf[slot][i+1] ) + state->dmr_12_rate_sf[slot][i+2] )) / ( (double)128));
//fprintf (stderr, "\n LRRP - %.4lf Meters Per Second", velocity);
fprintf (stderr, "\n LRRP - %.4lf m/s %.4lf km/h %.4lf mph", velocity, (3.6 * velocity), (2.2369 * velocity) );
sprintf ( state->dmr_lrrp[state->currentslot][4], "Vel: %.4lf kph ", (3.6 * velocity));
}
if ( state->dmr_12_rate_sf[slot][i] == 0x56 )
{
//check for appropriate terminology here - Heading, bearing, course, or track?
fprintf (stderr, "\n LRRP - Direction %d Degrees", state->dmr_12_rate_sf[slot][i+1] * 2);
sprintf ( state->dmr_lrrp[state->currentslot][5], "Dir: %d Deg ", state->dmr_12_rate_sf[slot][i+1] * 2);
}
}
}
//end Jurek lrrp
*/
//LRRP //LRRP
if ( (state->dmr_12_rate_sf[slot][0] & 0x7F) == 0x45) //Start LRRP now if ( (state->dmr_12_rate_sf[slot][0] & 0x7F) == 0x45) //Start LRRP now
{ {
sprintf ( state->dmr_lrrp[state->currentslot][0], "LRRP - ");
fprintf (stderr, "%s ", KMAG); fprintf (stderr, "%s ", KMAG);
//fprintf (stderr, "\n IP4 Header"); //Not sure this is accurate info IP4 Header? //fprintf (stderr, "\n IP4 Header"); //Not sure this is accurate info IP4 Header?
//fprintf (stderr, "\n Data Blocks [%d]", state->dmr_34_rate_sf[5]); //fprintf (stderr, "\n Data Blocks [%d]", state->dmr_34_rate_sf[5]);
for (short i = 1; i < 60; i++) //find way to get padding so we only go as deep as we need to! for (short i = 1; i < 56; i++) //find way to get padding so we only go as deep as we need to! changed from 60 to 56 to skip the CRC bytes
{ {
/* /*
if ( state->dmr_12_rate_sf[slot][i] == 0x0C) //Source and Destination info if ( state->dmr_12_rate_sf[slot][i] == 0x0C) //Source and Destination info
@ -1153,9 +1223,12 @@ void Process12Data(dsd_opts * opts, dsd_state * state, uint8_t info[196], uint8_
//fprintf (stderr, "-"); //fprintf (stderr, "-");
} }
fprintf (stderr, "%.5lf", (lrrplon * lon_unit) ); fprintf (stderr, "%.5lf", (lrrplon * lon_unit) );
sprintf ( state->dmr_lrrp[3], "Lat: %.5lf Lon: %.5lf", ((double)lrrplat) * lat_unit , (lrrplon * lon_unit) ); if (state->dmr_12_rate_sf[slot][i+1] & 0x80) //first bit indicates a sign, or hemisphere?
//print for easy copy/paste into browser? {
fprintf (stderr, " ("); sprintf ( state->dmr_lrrp[state->currentslot][3], "Lat: -%.5lf Lon: %.5lf ", ((double)lrrplat) * lat_unit , (lrrplon * lon_unit) );
}
else sprintf ( state->dmr_lrrp[state->currentslot][3], "Lat: %.5lf Lon: %.5lf ", ((double)lrrplat) * lat_unit , (lrrplon * lon_unit) ); //print for easy copy/paste into browser?
//fprintf (stderr, " (");
if (state->dmr_12_rate_sf[slot][i+1] & 0x80) //first bit indicates a sign, or hemisphere? if (state->dmr_12_rate_sf[slot][i+1] & 0x80) //first bit indicates a sign, or hemisphere?
{ {
fprintf (stderr, "-"); fprintf (stderr, "-");
@ -1171,13 +1244,13 @@ void Process12Data(dsd_opts * opts, dsd_state * state, uint8_t info[196], uint8_
double velocity = ( ((double)( (state->dmr_12_rate_sf[slot][i+1] ) + state->dmr_12_rate_sf[slot][i+2] )) / ( (double)128)); double velocity = ( ((double)( (state->dmr_12_rate_sf[slot][i+1] ) + state->dmr_12_rate_sf[slot][i+2] )) / ( (double)128));
//fprintf (stderr, "\n LRRP - %.4lf Meters Per Second", velocity); //fprintf (stderr, "\n LRRP - %.4lf Meters Per Second", velocity);
fprintf (stderr, "\n LRRP - %.4lf m/s %.4lf km/h %.4lf mph", velocity, (3.6 * velocity), (2.2369 * velocity) ); fprintf (stderr, "\n LRRP - %.4lf m/s %.4lf km/h %.4lf mph", velocity, (3.6 * velocity), (2.2369 * velocity) );
sprintf ( state->dmr_lrrp[1], "Vel: %.4lf kph", (3.6 * velocity)); sprintf ( state->dmr_lrrp[state->currentslot][4], "Vel: %.4lf kph ", (3.6 * velocity));
} }
if ( state->dmr_12_rate_sf[slot][i] == 0x56 ) if ( state->dmr_12_rate_sf[slot][i] == 0x56 )
{ {
//check for appropriate terminology here - Heading, bearing, course, or track? //check for appropriate terminology here - Heading, bearing, course, or track?
fprintf (stderr, "\n LRRP - Direction %d Degrees", state->dmr_12_rate_sf[slot][i+1] * 2); fprintf (stderr, "\n LRRP - Direction %d Degrees", state->dmr_12_rate_sf[slot][i+1] * 2);
sprintf ( state->dmr_lrrp[2], "Dir: %d Deg", state->dmr_12_rate_sf[slot][i+1] * 2); sprintf ( state->dmr_lrrp[state->currentslot][5], "Dir: %d Deg ", state->dmr_12_rate_sf[slot][i+1] * 2);
} }
} }
} }
@ -1595,17 +1668,35 @@ void ProcessDmrPIHeader(dsd_opts * opts, dsd_state * state, uint8_t info[196], u
DmrDataBit[j + 7] = (DmrDataByte[i] >> 0) & 0x01; DmrDataBit[j + 7] = (DmrDataByte[i] >> 0) & 0x01;
} }
if (state->currentslot == 0)
state->payload_algid = DmrDataByte[0];
state->payload_keyid = DmrDataByte[2];
state->payload_mi = ( ((DmrDataByte[3]) << 24) + ((DmrDataByte[4]) << 16) + ((DmrDataByte[5]) << 8) + (DmrDataByte[6]) );
if (1 == 1) //have it always print?
{ {
fprintf (stderr, "%s ", KYEL); state->payload_algid = DmrDataByte[0];
fprintf (stderr, "\n DMR PI Header ALG ID: 0x%02X KEY ID: 0x%02X MI: 0x%08X", state->payload_algid, state->payload_keyid, state->payload_mi); state->payload_keyid = DmrDataByte[2];
fprintf (stderr, "%s ", KNRM); state->payload_mi = ( ((DmrDataByte[3]) << 24) + ((DmrDataByte[4]) << 16) + ((DmrDataByte[5]) << 8) + (DmrDataByte[6]) );
if (1 == 1) //have it always print?
{
fprintf (stderr, "%s ", KYEL);
fprintf (stderr, "\n Slot 1");
fprintf (stderr, " DMR PI Header ALG ID: 0x%02X KEY ID: 0x%02X MI: 0x%08X", state->payload_algid, state->payload_keyid, state->payload_mi);
fprintf (stderr, "%s ", KNRM);
}
} }
if (state->currentslot == 1)
{
state->payload_algidR = DmrDataByte[0];
state->payload_keyidR = DmrDataByte[2];
state->payload_miR = ( ((DmrDataByte[3]) << 24) + ((DmrDataByte[4]) << 16) + ((DmrDataByte[5]) << 8) + (DmrDataByte[6]) );
if (1 == 1) //have it always print?
{
fprintf (stderr, "%s ", KYEL);
fprintf (stderr, "\n Slot 2");
fprintf (stderr, " DMR PI Header ALG ID: 0x%02X KEY ID: 0x%02X MI: 0x%08X", state->payload_algidR, state->payload_keyidR, state->payload_miR);
fprintf (stderr, "%s ", KNRM);
}
}
//test //test
if((IrrecoverableErrors == 0) && CRCCorrect) if((IrrecoverableErrors == 0) && CRCCorrect)
{ {
@ -2005,11 +2096,24 @@ void ProcessDmrTerminaisonLC(dsd_opts * opts, dsd_state * state, uint8_t info[19
TSVoiceSupFrame->FullLC.FullLinkControlOpcode != 0x07 ) //work out why amateur sets sourceid on other codes, but pro only does on whatever TSVoiceSupFrame->FullLC.FullLinkControlOpcode != 0x07 ) //work out why amateur sets sourceid on other codes, but pro only does on whatever
*/ */
{ {
state->lasttg = TSVoiceSupFrame->FullLC.GroupAddress; if (state->currentslot == 0)
state->lastsrc = TSVoiceSupFrame->FullLC.SourceAddress; {
//state->dmr_color_code = state->color_code; //state->lasttg = TSVoiceSupFrame->FullLC.GroupAddress;
state->dmr_fid = TSVoiceSupFrame->FullLC.FeatureSetID; //state->lastsrc = TSVoiceSupFrame->FullLC.SourceAddress;
state->dmr_so = TSVoiceSupFrame->FullLC.ServiceOptions; //state->dmr_color_code = state->color_code;
state->dmr_fid = TSVoiceSupFrame->FullLC.FeatureSetID;
state->dmr_so = TSVoiceSupFrame->FullLC.ServiceOptions;
}
if (state->currentslot == 1)
{
//state->lasttgR = TSVoiceSupFrame->FullLC.GroupAddress;
//state->lastsrcR = TSVoiceSupFrame->FullLC.SourceAddress;
//state->dmr_color_code = state->color_code;
state->dmr_fidR = TSVoiceSupFrame->FullLC.FeatureSetID;
state->dmr_soR = TSVoiceSupFrame->FullLC.ServiceOptions;
}
} }
//only set on good CRC value or corrected values //only set on good CRC value or corrected values
//state->lasttg = TSVoiceSupFrame->FullLC.GroupAddress; //state->lasttg = TSVoiceSupFrame->FullLC.GroupAddress;
@ -2035,11 +2139,22 @@ void ProcessDmrTerminaisonLC(dsd_opts * opts, dsd_state * state, uint8_t info[19
TSVoiceSupFrame->FullLC.FullLinkControlOpcode != 0x07 ) //work out why amateur sets sourceid on other codes, but pro only does on whatever TSVoiceSupFrame->FullLC.FullLinkControlOpcode != 0x07 ) //work out why amateur sets sourceid on other codes, but pro only does on whatever
*/ */
{ {
state->lasttg = TSVoiceSupFrame->FullLC.GroupAddress; if (state->currentslot == 0)
state->lastsrc = TSVoiceSupFrame->FullLC.SourceAddress; {
//state->dmr_color_code = state->color_code; //state->lasttg = TSVoiceSupFrame->FullLC.GroupAddress;
state->dmr_fid = TSVoiceSupFrame->FullLC.FeatureSetID; //state->lastsrc = TSVoiceSupFrame->FullLC.SourceAddress;
state->dmr_so = TSVoiceSupFrame->FullLC.ServiceOptions; //state->dmr_color_code = state->color_code;
state->dmr_fid = TSVoiceSupFrame->FullLC.FeatureSetID;
state->dmr_so = TSVoiceSupFrame->FullLC.ServiceOptions;
}
if (state->currentslot == 1)
{
//state->lasttgR = TSVoiceSupFrame->FullLC.GroupAddress;
//state->lastsrcR = TSVoiceSupFrame->FullLC.SourceAddress;
//state->dmr_color_code = state->color_code;
state->dmr_fidR = TSVoiceSupFrame->FullLC.FeatureSetID;
state->dmr_soR = TSVoiceSupFrame->FullLC.ServiceOptions;
}
} }
//only set on good CRC value or corrected values //only set on good CRC value or corrected values
//state->lasttg = TSVoiceSupFrame->FullLC.GroupAddress; //state->lasttg = TSVoiceSupFrame->FullLC.GroupAddress;
@ -2224,41 +2339,43 @@ void ProcessVoiceBurstSync(dsd_opts * opts, dsd_state * state)
// let's assume that something has to indicate end of valid characters? // let's assume that something has to indicate end of valid characters?
//Embedded Alias //Embedded Alias
if ( TSVoiceSupFrame->FullLC.FullLinkControlOpcode > 0x03 && TSVoiceSupFrame->FullLC.FullLinkControlOpcode < 0x08 && opts->payload == 1) if ( TSVoiceSupFrame->FullLC.FullLinkControlOpcode > 0x03 && TSVoiceSupFrame->FullLC.FullLinkControlOpcode < 0x08)
{ {
sprintf (state->dmr_callsign[TSVoiceSupFrame->FullLC.FullLinkControlOpcode - 3], ""); //blank here so it doesn't grow out of control? sprintf (state->dmr_callsign[state->currentslot][TSVoiceSupFrame->FullLC.FullLinkControlOpcode - 3], ""); //blank here so it doesn't grow out of control?
for (i = 0; i < 10; i++) for (i = 0; i < 10; i++)
{ {
//full range of alphanumerical characters? //full range of alphanumerical characters?
if ( (LC_DataBytes[i] > 0x19 && LC_DataBytes[i] < 0x7F) ) if ( (LC_DataBytes[i] > 0x19 && LC_DataBytes[i] < 0x7F) )
{ {
sprintf ( state->dmr_callsign[TSVoiceSupFrame->FullLC.FullLinkControlOpcode - 3] + sprintf ( state->dmr_callsign[state->currentslot][TSVoiceSupFrame->FullLC.FullLinkControlOpcode - 3] +
strlen(state->dmr_callsign[TSVoiceSupFrame->FullLC.FullLinkControlOpcode - 3]) , "%c", LC_DataBytes[i]); strlen(state->dmr_callsign[state->currentslot][TSVoiceSupFrame->FullLC.FullLinkControlOpcode - 3]) , "%c", LC_DataBytes[i]);
} }
} }
if (opts->use_ncurses_terminal == 1) if (opts->use_ncurses_terminal == 1)
{ {
fprintf (stderr, "%s", KCYN); fprintf (stderr, "%s", KMAG);
if (state->dmr_stereo == 0) if (state->dmr_stereo == 0)
{ {
fprintf(stderr, "\n"); fprintf(stderr, "\n");
} }
fprintf (stderr, " SLOT %d", state->currentslot+1); fprintf (stderr, " SLOT %d", state->currentslot+1);
fprintf (stderr, " Embedded Alias Header and Blocks: [%s%s%s%s%s]", state->dmr_callsign[0], state->dmr_callsign[1], state->dmr_callsign[2], state->dmr_callsign[3], state->dmr_callsign[4] ); fprintf (stderr, " Embedded Alias Header and Blocks: [%s%s%s%s%s]", state->dmr_callsign[state->currentslot][0],
state->dmr_callsign[state->currentslot][1], state->dmr_callsign[state->currentslot][2],
state->dmr_callsign[state->currentslot][3], state->dmr_callsign[state->currentslot][4] );
fprintf (stderr, "%s ", KNRM); fprintf (stderr, "%s ", KNRM);
} }
} }
if ( TSVoiceSupFrame->FullLC.FullLinkControlOpcode == 0x08 && opts->payload == 1) //Embedded GPS if ( TSVoiceSupFrame->FullLC.FullLinkControlOpcode == 0x08 && opts->payload == 1) //Embedded GPS
{ {
sprintf (state->dmr_callsign[TSVoiceSupFrame->FullLC.FullLinkControlOpcode - 3], ""); //blank here so it doesn't grow out of control? sprintf (state->dmr_callsign[state->currentslot][TSVoiceSupFrame->FullLC.FullLinkControlOpcode - 3], ""); //blank here so it doesn't grow out of control?
for (i = 0; i < 10; i++) for (i = 0; i < 10; i++)
{ {
//full range of alphanumerical characters? //full range of alphanumerical characters?
if ( (LC_DataBytes[i] > 0x19 && LC_DataBytes[i] < 0x7F) ) if ( (LC_DataBytes[i] > 0x19 && LC_DataBytes[i] < 0x7F) )
{ {
sprintf ( state->dmr_callsign[TSVoiceSupFrame->FullLC.FullLinkControlOpcode - 3] + sprintf ( state->dmr_callsign[state->currentslot][TSVoiceSupFrame->FullLC.FullLinkControlOpcode - 3] +
strlen(state->dmr_callsign[TSVoiceSupFrame->FullLC.FullLinkControlOpcode - 3]) , "%c", LC_DataBytes[i]); strlen(state->dmr_callsign[state->currentslot][TSVoiceSupFrame->FullLC.FullLinkControlOpcode - 3]) , "%c", LC_DataBytes[i]);
} }
} }
if (opts->use_ncurses_terminal == 1) if (opts->use_ncurses_terminal == 1)
@ -2269,7 +2386,7 @@ void ProcessVoiceBurstSync(dsd_opts * opts, dsd_state * state)
fprintf(stderr, "\n"); fprintf(stderr, "\n");
} }
fprintf (stderr, " SLOT %d", state->currentslot+1); fprintf (stderr, " SLOT %d", state->currentslot+1);
fprintf (stderr, " Embedded GPS: [%s]", state->dmr_callsign[5] ); fprintf (stderr, " Embedded GPS: [%s]", state->dmr_callsign[state->currentslot][5] );
fprintf (stderr, "%s ", KNRM); fprintf (stderr, "%s ", KNRM);
} }
} }
@ -2277,7 +2394,7 @@ void ProcessVoiceBurstSync(dsd_opts * opts, dsd_state * state)
/* Print the destination ID (TG) and the source ID */ /* Print the destination ID (TG) and the source ID */
if((IrrecoverableErrors == 0) && CRCCorrect) if((IrrecoverableErrors == 0) && CRCCorrect)
{ {
if (TSVoiceSupFrame->FullLC.FullLinkControlOpcode < 0x04 || TSVoiceSupFrame->FullLC.FullLinkControlOpcode > 0x09) //other opcodes may convey callsigns, names, etc. was > 0x07 if (TSVoiceSupFrame->FullLC.FullLinkControlOpcode < 0x04 || TSVoiceSupFrame->FullLC.FullLinkControlOpcode > 0x08) //other opcodes may convey callsigns, names, etc. was > 0x07
{ {
fprintf (stderr, "%s", KGRN); fprintf (stderr, "%s", KGRN);
if (state->dmr_stereo == 0) if (state->dmr_stereo == 0)
@ -2289,16 +2406,30 @@ void ProcessVoiceBurstSync(dsd_opts * opts, dsd_state * state)
fprintf(stderr, "FID=0x%02X ", TSVoiceSupFrame->FullLC.FeatureSetID); fprintf(stderr, "FID=0x%02X ", TSVoiceSupFrame->FullLC.FeatureSetID);
fprintf (stderr, "%s ", KNRM); fprintf (stderr, "%s ", KNRM);
//fprintf(stderr, "(CRC OK ) "); //fprintf(stderr, "(CRC OK ) ");
state->lasttg = TSVoiceSupFrame->FullLC.GroupAddress; if (state->currentslot == 0)
state->lastsrc = TSVoiceSupFrame->FullLC.SourceAddress; {
state->lasttg = TSVoiceSupFrame->FullLC.GroupAddress;
state->lastsrc = TSVoiceSupFrame->FullLC.SourceAddress;
//state->dmr_color_code = state->color_code;
state->dmr_fid = TSVoiceSupFrame->FullLC.FeatureSetID;
state->dmr_so = TSVoiceSupFrame->FullLC.ServiceOptions;
}
if (state->currentslot == 1)
{
state->lasttgR = TSVoiceSupFrame->FullLC.GroupAddress;
state->lastsrcR = TSVoiceSupFrame->FullLC.SourceAddress;
//state->dmr_color_code = state->color_code;
state->dmr_fidR = TSVoiceSupFrame->FullLC.FeatureSetID;
state->dmr_soR = TSVoiceSupFrame->FullLC.ServiceOptions;
}
//state->dmr_color_code = state->color_code; //state->dmr_color_code = state->color_code;
//state->dmr_fid = TSVoiceSupFrame->FullLC.FeatureSetID; //state->dmr_fid = TSVoiceSupFrame->FullLC.FeatureSetID;
//state->dmr_so = TSVoiceSupFrame->FullLC.ServiceOptions; //state->dmr_so = TSVoiceSupFrame->FullLC.ServiceOptions;
} }
//state->lasttg = TSVoiceSupFrame->FullLC.GroupAddress; //state->lasttg = TSVoiceSupFrame->FullLC.GroupAddress;
//state->lastsrc = TSVoiceSupFrame->FullLC.SourceAddress; //state->lastsrc = TSVoiceSupFrame->FullLC.SourceAddress;
state->dmr_fid = TSVoiceSupFrame->FullLC.FeatureSetID; //state->dmr_fid = TSVoiceSupFrame->FullLC.FeatureSetID;
state->dmr_so = TSVoiceSupFrame->FullLC.ServiceOptions; //state->dmr_so = TSVoiceSupFrame->FullLC.ServiceOptions;
//state->dmr_color_code = state->color_code; //state->dmr_color_code = state->color_code;
} }
else if(IrrecoverableErrors == 0) else if(IrrecoverableErrors == 0)
@ -2307,7 +2438,7 @@ void ProcessVoiceBurstSync(dsd_opts * opts, dsd_state * state)
//fprintf(stderr, "FID=0x%02X ", TSVoiceSupFrame->FullLC.FeatureSetID); //fprintf(stderr, "FID=0x%02X ", TSVoiceSupFrame->FullLC.FeatureSetID);
//fprintf(stderr, "RAS (FEC OK/CRC ERR)"); //voice burst //fprintf(stderr, "RAS (FEC OK/CRC ERR)"); //voice burst
//or set if was corrected //or set if was corrected
if (TSVoiceSupFrame->FullLC.FullLinkControlOpcode < 0x04 || TSVoiceSupFrame->FullLC.FullLinkControlOpcode > 0x07) if (TSVoiceSupFrame->FullLC.FullLinkControlOpcode < 0x04 || TSVoiceSupFrame->FullLC.FullLinkControlOpcode > 0x08) //7, or 8?
{ {
fprintf (stderr, "%s", KGRN); fprintf (stderr, "%s", KGRN);
if (state->dmr_stereo == 0) if (state->dmr_stereo == 0)
@ -2320,16 +2451,30 @@ void ProcessVoiceBurstSync(dsd_opts * opts, dsd_state * state)
fprintf (stderr, "%s ", KRED); fprintf (stderr, "%s ", KRED);
fprintf(stderr, "RAS (FEC OK/CRC ERR) "); fprintf(stderr, "RAS (FEC OK/CRC ERR) ");
fprintf (stderr, "%s ", KNRM); fprintf (stderr, "%s ", KNRM);
state->lasttg = TSVoiceSupFrame->FullLC.GroupAddress; if (state->currentslot == 0)
state->lastsrc = TSVoiceSupFrame->FullLC.SourceAddress; {
state->lasttg = TSVoiceSupFrame->FullLC.GroupAddress;
state->lastsrc = TSVoiceSupFrame->FullLC.SourceAddress;
//state->dmr_color_code = state->color_code;
state->dmr_fid = TSVoiceSupFrame->FullLC.FeatureSetID;
state->dmr_so = TSVoiceSupFrame->FullLC.ServiceOptions;
}
if (state->currentslot == 1)
{
state->lasttgR = TSVoiceSupFrame->FullLC.GroupAddress;
state->lastsrcR = TSVoiceSupFrame->FullLC.SourceAddress;
//state->dmr_color_code = state->color_code;
state->dmr_fidR = TSVoiceSupFrame->FullLC.FeatureSetID;
state->dmr_soR = TSVoiceSupFrame->FullLC.ServiceOptions;
}
//state->dmr_color_code = state->color_code; //state->dmr_color_code = state->color_code;
//state->dmr_fid = TSVoiceSupFrame->FullLC.FeatureSetID; //state->dmr_fid = TSVoiceSupFrame->FullLC.FeatureSetID;
//state->dmr_so = TSVoiceSupFrame->FullLC.ServiceOptions; //state->dmr_so = TSVoiceSupFrame->FullLC.ServiceOptions;
} }
//state->lasttg = TSVoiceSupFrame->FullLC.GroupAddress; //state->lasttg = TSVoiceSupFrame->FullLC.GroupAddress;
//state->lastsrc = TSVoiceSupFrame->FullLC.SourceAddress; //state->lastsrc = TSVoiceSupFrame->FullLC.SourceAddress;
state->dmr_fid = TSVoiceSupFrame->FullLC.FeatureSetID; //state->dmr_fid = TSVoiceSupFrame->FullLC.FeatureSetID;
state->dmr_so = TSVoiceSupFrame->FullLC.ServiceOptions; //state->dmr_so = TSVoiceSupFrame->FullLC.ServiceOptions;
//state->dmr_color_code = state->color_code; //state->dmr_color_code = state->color_code;
} }
else {} //fprintf(stderr, "\n(FEC FAIL/CRC ERR)"); else {} //fprintf(stderr, "\n(FEC FAIL/CRC ERR)");

9
src/dmr_voice.c
View File

@ -129,6 +129,15 @@ void processDMRvoice (dsd_opts * opts, dsd_state * state)
} }
cachdata[12] = 0; cachdata[12] = 0;
//set state-dmrburstL and R here to a value for ncurses
if (state->currentslot == 0)
{
state->dmrburstL = 16; //use 16 for Voice?
}
if (state->currentslot == 1)
{
state->dmrburstR = 16; //Use 16 for Voice?
}
#ifdef DMR_DUMP #ifdef DMR_DUMP
k = 0; k = 0;

7
src/dsd_frame.c
View File

@ -177,9 +177,12 @@ processFrame (dsd_opts * opts, dsd_state * state)
//Start DMR Types //Start DMR Types
else if ((state->synctype >= 10) && (state->synctype <= 13) || (state->synctype == 32) || (state->synctype == 33) || (state->synctype == 34) ) //32-34 DMR MS and RC else if ((state->synctype >= 10) && (state->synctype <= 13) || (state->synctype == 32) || (state->synctype == 33) || (state->synctype == 34) ) //32-34 DMR MS and RC
{ {
//disable so radio id doesn't blink in and out during ncurses and aggressive_framesync
state->nac = 0; state->nac = 0;
state->lastsrc = 0; //state->lastsrc = 0;
state->lasttg = 0; //state->lasttg = 0;
//state->lastsrcR = 0;
//state->lasttgR = 0;
if (opts->errorbars == 1) if (opts->errorbars == 1)
{ {
if (opts->verbose > 0) if (opts->verbose > 0)

124
src/dsd_main.c
View File

@ -93,8 +93,11 @@ noCarrier (dsd_opts * opts, dsd_state * state)
sprintf (state->ftype, " "); sprintf (state->ftype, " ");
state->errs = 0; state->errs = 0;
state->errs2 = 0; state->errs2 = 0;
//should I disable this or not?
state->lasttg = 0; state->lasttg = 0;
state->lastsrc = 0; state->lastsrc = 0;
state->lasttgR = 0;
state->lastsrcR = 0;
state->lastp25type = 0; state->lastp25type = 0;
state->repeat = 0; state->repeat = 0;
state->nac = 0; state->nac = 0;
@ -213,7 +216,8 @@ initOpts (dsd_opts * opts)
opts->EncryptionMode = MODE_UNENCRYPTED; opts->EncryptionMode = MODE_UNENCRYPTED;
opts->inverted_dpmr = 0; opts->inverted_dpmr = 0;
opts->dmr_stereo = 0; //change currently only in dsd_frame.c opts->dmr_stereo = 0;
opts->aggressive_framesync = 1; //more aggressive to combat wonk wonk voice decoding
} }
void void
@ -346,25 +350,51 @@ initState (dsd_state * state)
state->dpmr_caller_id = 0; state->dpmr_caller_id = 0;
state->dpmr_target_id = 0; state->dpmr_target_id = 0;
state->payload_mi = 0; state->payload_mi = 0;
state->payload_miR = 0;
state->payload_mfid = 0; state->payload_mfid = 0;
state->payload_mfidR = 0;
state->payload_algid = 0; state->payload_algid = 0;
state->payload_algidR = 0;
state->payload_keyid = 0; state->payload_keyid = 0;
state->payload_keyidR = 0;
sprintf (state->dmr_branding, " "); sprintf (state->dmr_branding, " ");
sprintf (state->dmr_callsign[0], ""); sprintf (state->dmr_callsign[0][0], "");
sprintf (state->dmr_callsign[1], ""); sprintf (state->dmr_callsign[0][1], "");
sprintf (state->dmr_callsign[2], ""); sprintf (state->dmr_callsign[0][2], "");
sprintf (state->dmr_callsign[3], ""); sprintf (state->dmr_callsign[0][3], "");
sprintf (state->dmr_lrrp[0], ""); sprintf (state->dmr_callsign[0][4], "");
sprintf (state->dmr_lrrp[1], ""); sprintf (state->dmr_callsign[0][5], "");
sprintf (state->dmr_lrrp[2], ""); sprintf (state->dmr_callsign[1][0], "");
sprintf (state->dmr_lrrp[3], ""); sprintf (state->dmr_callsign[1][1], "");
sprintf (state->dmr_lrrp[4], ""); sprintf (state->dmr_callsign[1][2], "");
sprintf (state->dmr_lrrp[5], ""); sprintf (state->dmr_callsign[1][3], "");
sprintf (state->dmr_callsign[1][4], "");
sprintf (state->dmr_callsign[1][5], "");
sprintf (state->dmr_lrrp[0][0], "");
sprintf (state->dmr_lrrp[0][1], "");
sprintf (state->dmr_lrrp[0][2], "");
sprintf (state->dmr_lrrp[0][3], "");
sprintf (state->dmr_lrrp[0][4], "");
sprintf (state->dmr_lrrp[0][5], "");
sprintf (state->dmr_lrrp[1][0], "");
sprintf (state->dmr_lrrp[1][1], "");
sprintf (state->dmr_lrrp[1][2], "");
sprintf (state->dmr_lrrp[1][3], "");
sprintf (state->dmr_lrrp[1][4], "");
sprintf (state->dmr_lrrp[1][5], "");
state->K = 0; state->K = 0;
state->dmr_stereo = 0; state->dmr_stereo = 0;
state->dmrburstL = 17; //initialize at higher value than possible
state->dmrburstR = 17; //17 in char array is set for ERR
state->dmr_so = 0;
state->dmr_soR = 0;
state->dmr_fid = 0;
state->dmr_fidR = 0;
memset(state->dstarradioheader, 0, 41);
#ifdef TRACE_DSD #ifdef TRACE_DSD
state->debug_sample_index = 0; state->debug_sample_index = 0;
@ -452,11 +482,14 @@ usage ()
fprintf (stderr," -M <num> Min/Max buffer size for QPSK decision point tracking\n"); fprintf (stderr," -M <num> Min/Max buffer size for QPSK decision point tracking\n");
fprintf (stderr," (default=15)\n"); fprintf (stderr," (default=15)\n");
fprintf (stderr," -n Reset P25 Heuristics and initState variables on mixed signal decoding\n"); fprintf (stderr," -n Reset P25 Heuristics and initState variables on mixed signal decoding\n");
fprintf (stderr," Helps when decoding mixed signal types at same time\n"); fprintf (stderr," Helps when decoding mixed signal types (P25P1) at same time\n");
fprintf (stderr," (WiP! May Cause Slow Memory Leak - Experimental)\n"); fprintf (stderr," (WiP! May Cause Slow Memory Leak or System Hang - Experimental)\n");
fprintf (stderr," -T Enable DMR TDMA Stereo Voice (Two Slot Dual Voices)\n"); fprintf (stderr," -T Enable DMR TDMA Stereo Voice (Two Slot Dual Voices)\n");
fprintf (stderr," This feature will open two streams for slot 1 voice and slot 2 voice\n"); fprintf (stderr," This feature will open two streams for slot 1 voice and slot 2 voice\n");
fprintf (stderr," (WiP! May Cause DMR sync break resync issues)\n"); fprintf (stderr," May Cause Skipping or sync issues if bad signal/errors\n");
fprintf (stderr," -F Enable DMR TDMA Stereo Passive Frame Sync\n");
fprintf (stderr," This feature will attempt to resync less often due to excessive voice errors\n");
fprintf (stderr," Use if skipping occurs, but may cuase wonky audio due to loss of good sync\n");
fprintf (stderr," -Z Log MBE Payload to console\n"); fprintf (stderr," -Z Log MBE Payload to console\n");
fprintf (stderr,"\n"); fprintf (stderr,"\n");
fprintf (stderr,"Report bugs to: https://github.com/lwvmobile/dsd-fme/issues \n"); fprintf (stderr,"Report bugs to: https://github.com/lwvmobile/dsd-fme/issues \n");
@ -697,12 +730,12 @@ main (int argc, char **argv)
initOpts (&opts); initOpts (&opts);
initState (&state); initState (&state);
InitAllFecFunction(); //HERE InitAllFecFunction();
exitflag = 0; exitflag = 0;
signal (SIGINT, sigfun); signal (SIGINT, sigfun);
while ((c = getopt (argc, argv, "haep:P:qstv:z:i:o:d:c:g:nw:B:C:R:f:m:u:x:A:S:M:G:D:L:V:U:Y:K:NWrlZT")) != -1) while ((c = getopt (argc, argv, "haep:P:qstv:z:i:o:d:c:g:nw:B:C:R:f:m:u:x:A:S:M:G:D:L:V:U:Y:K:NWrlZTF")) != -1)
{ {
opterr = 0; opterr = 0;
switch (c) switch (c)
@ -824,6 +857,14 @@ main (int argc, char **argv)
fprintf (stderr, "%s", KRED); fprintf (stderr, "%s", KRED);
fprintf (stderr,"Experimental DMR Stereo Sync and Functionality. WIP!\n"); fprintf (stderr,"Experimental DMR Stereo Sync and Functionality. WIP!\n");
fprintf (stderr,"DMR Stereo will disable WAV and MBE file saving!\n"); fprintf (stderr,"DMR Stereo will disable WAV and MBE file saving!\n");
fprintf (stderr,"Also consider using -F if playback is too choppy!\n");
fprintf (stderr, "%s", KNRM);
break;
case 'F':
opts.aggressive_framesync = 0;
fprintf (stderr, "%s", KRED);
fprintf (stderr,"DMR Stereo Aggressive Resync Disabled!\n");
fprintf (stderr, "%s", KNRM); fprintf (stderr, "%s", KNRM);
break; break;
@ -878,8 +919,9 @@ main (int argc, char **argv)
opts.reset_state = 1; opts.reset_state = 1;
fprintf (stderr, "%s", KRED); fprintf (stderr, "%s", KRED);
fprintf (stderr,"Enabling Automatic Reset of P25 states\n"); fprintf (stderr,"Enabling Automatic Reset of P25 states\n");
fprintf (stderr," -Helps with multiple signal type decoding\n"); //fprintf (stderr," -Helps with multiple signal type decoding\n");
fprintf (stderr," -(WiP! May cause slow memory leak)\n"); //fprintf (stderr," -(WiP! May cause slow memory leak)\n");
fprintf (stderr," -(Disabled until memory leak issues can be resolved!)\n");
fprintf (stderr, "%s", KNRM); fprintf (stderr, "%s", KNRM);
break; break;
case 'w': case 'w':
@ -968,9 +1010,9 @@ main (int argc, char **argv)
opts.frame_dmr = 0; opts.frame_dmr = 0;
opts.frame_dpmr = 0; opts.frame_dpmr = 0;
opts.frame_provoice = 0; opts.frame_provoice = 0;
opts.mod_gfsk = 0;
opts.mod_c4fm = 1; opts.mod_c4fm = 1;
opts.mod_qpsk = 0; opts.mod_qpsk = 0;
opts.mod_gfsk = 0;
state.rf_mod = 0; // state.rf_mod = 0; //
sprintf (opts.output_name, "P25P1"); sprintf (opts.output_name, "P25P1");
fprintf (stderr,"Decoding only P25 Phase 1 frames.\n"); fprintf (stderr,"Decoding only P25 Phase 1 frames.\n");
@ -997,27 +1039,27 @@ main (int argc, char **argv)
fprintf (stderr,"Setting symbol rate to 2400 / second\n"); fprintf (stderr,"Setting symbol rate to 2400 / second\n");
fprintf (stderr,"Decoding only NXDN 4800 baud frames.\n"); fprintf (stderr,"Decoding only NXDN 4800 baud frames.\n");
} }
else if (optarg[0] == 'y') else if (optarg[0] == 'y')
{ {
opts.frame_dstar = 0; opts.frame_dstar = 0;
opts.frame_x2tdma = 0; opts.frame_x2tdma = 0;
opts.frame_p25p1 = 0; opts.frame_p25p1 = 0;
opts.frame_nxdn48 = 0; opts.frame_nxdn48 = 0;
opts.frame_nxdn96 = 0; opts.frame_nxdn96 = 0;
opts.frame_dmr = 0; opts.frame_dmr = 0;
opts.frame_dpmr = 0; opts.frame_dpmr = 0;
opts.frame_provoice = 0; opts.frame_provoice = 0;
opts.frame_ysf = 1; opts.frame_ysf = 1;
state.samplesPerSymbol = 10; state.samplesPerSymbol = 10;
//state.symbolCenter = 10; //state.symbolCenter = 10;
opts.mod_c4fm = 1; opts.mod_c4fm = 1;
opts.mod_qpsk = 0; opts.mod_qpsk = 0;
opts.mod_gfsk = 0; opts.mod_gfsk = 0;
state.rf_mod = 0; state.rf_mod = 0;
sprintf (opts.output_name, "YSF"); sprintf (opts.output_name, "YSF");
//opts.symboltiming = 2400; //NXDN48 uses 2400 symbol rate //opts.symboltiming = 2400; //NXDN48 uses 2400 symbol rate
fprintf (stderr,"Setting symbol rate to 2400 / second\n"); fprintf (stderr,"Setting symbol rate to 2400 / second\n");
fprintf (stderr,"Decoding only YSF frames.\nNot working yet!\n"); fprintf (stderr,"Decoding only YSF frames.\nNot working yet!\n");
} }
else if (optarg[0] == 'n') else if (optarg[0] == 'n')
{ {

888
src/dsd_ncurses.c
View File

File diff suppressed because it is too large Load Diff

9
src/dsd_reset.c
View File

@ -96,12 +96,7 @@ resetState (dsd_state * state)
state->nxdn_last_ran = 0; state->nxdn_last_ran = 0;
//#ifdef TRACE_DSD //each time you run this, it increses memory use by 4MB, massive memory leak
// state->debug_sample_index = 0; //need to revisit this sometime and look into only resetting only the necesary items to let P25 switch between signals (C4FM or Wide) without needing a restart
// state->debug_label_file = NULL;
// state->debug_label_dibit_file = NULL;
// state->debug_label_imbe_file = NULL;
//#endif
initialize_p25_heuristics(&state->p25_heuristics); //see if we want to re-init this or not, currently seems to cause memory leak when running over and over, mitigated with a reset flag initialize_p25_heuristics(&state->p25_heuristics); //see if we want to re-init this or not, currently seems to cause memory leak when running over and over, mitigated with a reset flag
} }

30
src/dstar.c
View File

@ -39,6 +39,9 @@ void processDSTAR(dsd_opts * opts, dsd_state * state) {
unsigned int bitbuffer = 0; unsigned int bitbuffer = 0;
const int *w, *x; const int *w, *x;
//set carrier to 1 so ncurses will light up green
state->carrier = 1;
if (opts->errorbars == 1) { if (opts->errorbars == 1) {
fprintf (stderr, "e:"); fprintf (stderr, "e:");
} }
@ -56,7 +59,7 @@ void processDSTAR(dsd_opts * opts, dsd_state * state) {
} else { } else {
framecount = 1; //just saw a sync frame; there should be 20 not 21 till the next framecount = 1; //just saw a sync frame; there should be 20 not 21 till the next
} }
//why is this running in a loop for?
while (sync_missed < 3) { while (sync_missed < 3) {
memset(ambe_fr, 0, 96); memset(ambe_fr, 0, 96);
@ -86,6 +89,7 @@ void processDSTAR(dsd_opts * opts, dsd_state * state) {
ambe_fr[*w][*x] = (1 & dibit); ambe_fr[*w][*x] = (1 & dibit);
w++; w++;
x++; x++;
} }
@ -128,14 +132,30 @@ void processDSTAR(dsd_opts * opts, dsd_state * state) {
slowdata[0] ^= 0x70; slowdata[0] ^= 0x70;
slowdata[1] ^= 0x4f; slowdata[1] ^= 0x4f;
slowdata[2] ^= 0x93; slowdata[2] ^= 0x93;
//fprintf (stderr, "unscrambled- %c%c%c \n", slowdata[0], slowdata[1], slowdata[2] ); //fprintf (stderr, "unscrambled- %02X %02X %02X %02X \n", slowdata[0], slowdata[1], slowdata[2], slowdata[3] );
} else if (framecount == 0) { } else if (framecount == 0) {
//fprintf (stderr, "never scrambled-%c\n",slowdata); //fprintf (stderr, "never scrambled-%c\n",slowdata);
//fprintf (stderr, "never scrambled- %c%c%c \n", slowdata[0], slowdata[1], slowdata[2] ); //fprintf (stderr, "never scrambled- %02X %02X %02X %02X \n", slowdata[0], slowdata[1], slowdata[2], slowdata[3] );
}
}
for (short int i = 0; i < 4; i++)
{
if (slowdata[i] <= 0x7E && slowdata[i] >=0x20)
{
//fprintf (stderr, "%c", slowdata[i]);
}
//else fprintf (stderr, ".");
}
//fprintf (stderr, "\n");
framecount++; framecount++;
//since we are in a while loop, run ncursesPrinter here.
if (opts->use_ncurses_terminal == 1)
{
ncursesPrinter(opts, state);
}
} //end while loop } //end while loop
end: if (opts->errorbars == 1) { end: if (opts->errorbars == 1) {
@ -154,7 +174,7 @@ void processDSTAR_HD(dsd_opts * opts, dsd_state * state) {
// Note: These routines contain GPLed code. Remove if you object to that. // Note: These routines contain GPLed code. Remove if you object to that.
// Due to this, they are in a separate source file. // Due to this, they are in a separate source file.
dstar_header_decode(radioheaderbuffer); dstar_header_decode(state, radioheaderbuffer);
//We officially have sync now, so just pass on to the above routine: //We officially have sync now, so just pass on to the above routine:

12
src/dstar_header.c
View File

@ -19,8 +19,9 @@
#include "fcs.h" #include "fcs.h"
#include "descramble.h" #include "descramble.h"
#include "dstar_header.h" #include "dstar_header.h"
#include "dsd.h"
void dstar_header_decode(int radioheaderbuffer[660]) { void dstar_header_decode(dsd_state * state, int radioheaderbuffer[660]) {
int radioheaderbuffer2[660]; int radioheaderbuffer2[660];
unsigned char radioheader[41]; unsigned char radioheader[41];
int octetcount, bitcount, loop; int octetcount, bitcount, loop;
@ -33,6 +34,7 @@ void dstar_header_decode(int radioheaderbuffer[660]) {
deinterleave(radioheaderbuffer2, radioheaderbuffer); deinterleave(radioheaderbuffer2, radioheaderbuffer);
len = FECdecoder(radioheaderbuffer, radioheaderbuffer2); len = FECdecoder(radioheaderbuffer, radioheaderbuffer2);
memset(radioheader, 0, 41); memset(radioheader, 0, 41);
//memset(state->dstarradioheader, 0, 41);
// note we receive 330 bits, but we only use 328 of them (41 octets) // note we receive 330 bits, but we only use 328 of them (41 octets)
// bits 329 and 330 are unused // bits 329 and 330 are unused
octetcount = 0; octetcount = 0;
@ -48,6 +50,14 @@ void dstar_header_decode(int radioheaderbuffer[660]) {
bitcount = 0; bitcount = 0;
} }
} }
//state->dstarradioheader = radioheader;
for (short i = 0; i < 41; i++)
{
state->dstarradioheader[i] = radioheader[i];
}
// print header // print header
fprintf (stderr, "\nDSTAR HEADER: "); fprintf (stderr, "\nDSTAR HEADER: ");
//fprintf (stderr, "FLAG1: %02X - FLAG2: %02X - FLAG3: %02X\n", radioheader[0], //fprintf (stderr, "FLAG1: %02X - FLAG2: %02X - FLAG3: %02X\n", radioheader[0],

4
src/p25p1_hdu.c
View File

@ -469,10 +469,10 @@ processHDU(dsd_opts* opts, dsd_state* state)
mihex3 = (unsigned long long int)ConvertBitIntoBytes(&mi[64], 8); mihex3 = (unsigned long long int)ConvertBitIntoBytes(&mi[64], 8);
} }
if (opts->payload == 1) //print on payload == 1 if (1 == 1) //print on payload == 1
{ {
fprintf (stderr, "%s", KYEL); fprintf (stderr, "%s", KYEL);
fprintf (stderr, " HDU ALG ID: 0x%X KEY ID: 0x%X MI: 0x%08llX%08llX%02llX MFID: 0x%02X \n", algidhex, kidhex, mihex1, mihex2, mihex3, state->payload_mfid); fprintf (stderr, " HDU ALG ID: 0x%02X KEY ID: 0x%02X MI: 0x%08llX%08llX%02llX MFID: 0x%02X \n", algidhex, kidhex, mihex1, mihex2, mihex3, state->payload_mfid);
fprintf (stderr, "%s", KNRM); fprintf (stderr, "%s", KNRM);
} }

4
src/p25p1_ldu2.c
View File

@ -375,10 +375,10 @@ processLDU2 (dsd_opts * opts, dsd_state * state)
mihex3 = (unsigned long long int)ConvertBitIntoBytes(&mi[64], 8); mihex3 = (unsigned long long int)ConvertBitIntoBytes(&mi[64], 8);
} }
if (opts->payload == 1) //print on payload == 1 if (1 == 1) //print on payload == 1
{ {
fprintf (stderr, "%s", KYEL); fprintf (stderr, "%s", KYEL);
fprintf (stderr, " LDU2 ALG ID: 0x%X KEY ID: 0x%X MI: 0x%08llX%08llX%02llX\n", algidhex, kidhex, mihex1, mihex2, mihex3); fprintf (stderr, " LDU2 ALG ID: 0x%02X KEY ID: 0x%02X MI: 0x%08llX%08llX%02llX\n", algidhex, kidhex, mihex1, mihex2, mihex3);
fprintf (stderr, "%s", KNRM); fprintf (stderr, "%s", KNRM);
} }