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

Minor Cleanup and Tweaks;

This commit is contained in:
lwvmobile 2022-11-16 17:00:26 -05:00
parent 532c1cc3b6
commit eefe1bac5e
4 changed files with 34 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
include/dsd.h
View File

@ -32,7 +32,7 @@
#include <stdlib.h>
#include <signal.h>
#include <string.h>
//#define __USE_XOPEN //compiler warning on this, need to rewrite dsd_file so it doesn't use strptime
#include <time.h>
#include <sys/time.h>
#include <sys/types.h>
@ -484,10 +484,10 @@ typedef struct
// Last dibit read
int last_dibit;
// Heuristics state data for +P5 signals
// Heuristics state data for +P25 signals
P25Heuristics p25_heuristics;
// Heuristics state data for -P5 signals
// Heuristics state data for -P25 signals
P25Heuristics inv_p25_heuristics;
//input sample buffer for monitoring Input
@ -852,7 +852,13 @@ void NXDN_decode_VCALL_IV(dsd_opts * opts, dsd_state * state, uint8_t * Message)
char * NXDN_Call_Type_To_Str(uint8_t CallType);
void NXDN_Voice_Call_Option_To_Str(uint8_t VoiceCallOption, uint8_t * Duplex, uint8_t * TransmissionMode);
char * NXDN_Cipher_Type_To_Str(uint8_t CipherType);
//added these
void NXDN_decode_Alias(dsd_opts * opts, dsd_state * state, uint8_t * Message);
void NXDN_decode_VCALL_ASSGN(dsd_opts * opts, dsd_state * state, uint8_t * Message);
void NXDN_decode_cch_info(dsd_opts * opts, dsd_state * state, uint8_t * Message);
void NXDN_decode_srv_info(dsd_opts * opts, dsd_state * state, uint8_t * Message);
void NXDN_decode_site_info(dsd_opts * opts, dsd_state * state, uint8_t * Message);
void nxdn_location_id_handler (dsd_state * state, uint32_t location_id);
void dPMRVoiceFrameProcess(dsd_opts * opts, dsd_state * state);
void printdPMRAmbeVoiceSample(dsd_opts * opts, dsd_state * state);
@ -956,6 +962,9 @@ void process_FACCH_MAC_PDU (dsd_opts * opts, dsd_state * state, int payload[156]
//P25 Channel to Frequency
long int process_channel_to_freq (dsd_opts * opts, dsd_state * state, int channel);
//NXDN Channel to Frequency, Courtesy of IcomIcR20 on RR Forums
long int nxdn_channel_to_frequency (dsd_opts * opts, uint16_t channel);
//rigctl functions and TCP/UDP functions
void error(char *msg);
int Connect (char *hostname, int portno);

2
src/dsd_filters.c
View File

@ -196,7 +196,7 @@ dsd_input_filter(short sample, int mode)
for (i = 0; i < zeros; i++)
v[i] = v[i+1];
v[zeros] = sample; // unfiltered sample in
v[zeros] = (float)sample; // unfiltered sample in
sum = 0.0f;
for (i = 0; i <= zeros; i++)

66
src/dsd_frame_sync.c
View File

@ -18,10 +18,10 @@
#include "dsd.h"
#include <locale.h>
//borrowed from DSDcc for 'improved NXDN sync detection'
//borrowed from LEH/DSDcc for 'improved NXDN sync detection'
int strncmperr(const char *s1, const char *s2, size_t size, int MaxErr)
{
//MaxErr = 0; //force to zero for NXDN testing
int Compare = -1;
size_t i = 0;
int err = 0;
@ -169,13 +169,15 @@ getFrameSync (dsd_opts * opts, dsd_state * state)
//check that we have a non zero value first, then tune next frequency
if (state->trunk_lcn_freq[state->lcn_freq_roll] != 0)
{
//do condition here, in future, will allow us to use tuning methods as well, or rtl_udp as well
//rigctl
if (opts->use_rigctl == 1)
{
SetModulation(opts->rigctl_sockfd, 12500); //may not use this here, not sure yet
//may or may not use setmod here, let user control it instead?
if (opts->frame_nxdn48 == 1) SetModulation(opts->rigctl_sockfd, 6250);
else SetModulation(opts->rigctl_sockfd, 12500);
SetFreq(opts->rigctl_sockfd, state->trunk_lcn_freq[state->lcn_freq_roll]);
}
//rtludp
if (opts->audio_in_type == 3)
{
rtl_udp_tune (opts, state, state->trunk_lcn_freq[state->lcn_freq_roll]);
@ -211,7 +213,7 @@ getFrameSync (dsd_opts * opts, dsd_state * state)
{
t_max = 10;
}
//else if dPMR, need condition here when we can test what it'll need
//else if dPMR
else if (opts->frame_dpmr == 1)
{
t_max = 12; //based on Frame_Sync_2 pattern
@ -256,7 +258,7 @@ getFrameSync (dsd_opts * opts, dsd_state * state)
if ((opts->symboltiming == 1) && (state->carrier == 1))
{
fprintf (stderr,"\nSymbol Timing:\n");
//fprintf (stderr,"\nSymbol Timing:\n");
//printw("\nSymbol Timing:\n");
}
while (sync == 0)
@ -335,9 +337,7 @@ getFrameSync (dsd_opts * opts, dsd_state * state)
dibit = 51; // '3'
}
//this is needed to capture dibits and convert them to appropriate format for a symbol bin
//HERE HERE i REMOVED THE SYMBOL != 0 BIT, IF THAT CAUSES ISSUES, THEN PUT IT BACK!!!!!
if (opts->symbol_out == 1 && dibit != 0) //is 0 a valid symbol from dsd? //&& symbol != 0 //&& symbol != 0
if (opts->symbol_out == 1 && dibit != 0)
{
int csymbol = 0;
if (dibit == 49)
@ -353,10 +353,12 @@ getFrameSync (dsd_opts * opts, dsd_state * state)
}
//digitize test for storing dibits in buffer correctly for dmr recovery
if (state->dmr_payload_p > state->dmr_payload_buf + 900000)
{
state->dmr_payload_p = state->dmr_payload_buf + 200;
}
if (1 == 1)
{
if (symbol > state->center)
@ -382,35 +384,7 @@ getFrameSync (dsd_opts * opts, dsd_state * state)
}
}
}
//if this part were working, we shouldn't have to worry about flipping dibits in dmr, just pull them right off the buffer
//but that has caused issues due to various reasons, probably forgot to flip something somehwere else, so just leave it Disabled
//since we can get the same result by flipping them later on
if (0 == 1)
{
if (symbol > state->center)
{
if (symbol > state->umid)
{
*state->dmr_payload_p = 3; // +3
}
else
{
*state->dmr_payload_p = 2; // +1
}
}
else
{
if (symbol < state->lmid)
{
*state->dmr_payload_p = 1; // -3
}
else
{
*state->dmr_payload_p = 0; // -1
}
}
}
state->dmr_payload_p++;
// end digitize and dmr buffer testing
@ -1173,9 +1147,6 @@ getFrameSync (dsd_opts * opts, dsd_state * state)
state->lastsynctype = 15;
return (15);
}
//had error in return type, apparently, local EDACS site is indeed pos polarity,
//so had to flip return syncs
//fixed edacs sync on bin files, was only converting symbols on synctype > 0, didn't need to do that
else if ( strcmp (synctest48, EDACS_SYNC) == 0)
{
state->last_cc_sync_time = time(NULL);
@ -1184,7 +1155,7 @@ getFrameSync (dsd_opts * opts, dsd_state * state)
state->max = ((state->max) + lmax) / 2;
state->min = ((state->min) + lmin) / 2;
printFrameSync (opts, state, "-EDACS", synctest_pos + 1, modulation);
state->lastsynctype = 38; //14
state->lastsynctype = 38;
return (38);
}
else if ( strcmp (synctest48, INV_EDACS_SYNC) == 0)
@ -1195,7 +1166,7 @@ getFrameSync (dsd_opts * opts, dsd_state * state)
state->max = ((state->max) + lmax) / 2;
state->min = ((state->min) + lmin) / 2;
printFrameSync (opts, state, "+EDACS", synctest_pos + 1, modulation);
state->lastsynctype = 37; //15
state->lastsynctype = 37;
return (37);
}
@ -1282,13 +1253,11 @@ getFrameSync (dsd_opts * opts, dsd_state * state)
}
//Testing NXDN FSW sync and handling - moved to very bottom of sync stack for falsing sanity
//move printframesync to inside of new nxdn handling when its set up, only run when not bad lich, etc
//NXDN FSW sync and handling - moved to very bottom of sync stack for falsing sanity
else if ((opts->frame_nxdn96 == 1) || (opts->frame_nxdn48 == 1))
{
strncpy (synctest10, (synctest_p - 9), 10);
if ( (strncmperr (synctest10, NXDN_FSW, 10, 1) == 0) )
//if (strcmp (synctest10, NXDN_FSW) == 0) //this seems to work well on some samples
{
state->carrier = 1;
state->offset = synctest_pos;
@ -1305,7 +1274,6 @@ getFrameSync (dsd_opts * opts, dsd_state * state)
}
if ( (strncmperr (synctest10, INV_NXDN_FSW, 10, 1) == 0) )
//if (strcmp (synctest10, INV_NXDN_FSW) == 0) //not so well on others though
{
state->carrier = 1;
state->offset = synctest_pos;
@ -1352,7 +1320,7 @@ getFrameSync (dsd_opts * opts, dsd_state * state)
if ((opts->errorbars == 1) && (opts->verbose > 1) && (state->carrier == 1))
{
fprintf (stderr,"Sync: no sync\n");
fprintf (stderr,"Press CTRL + C to close.\n"); //Kindly remind user to double tap CTRL + C
fprintf (stderr,"Press CTRL + C to close.\n");
}
noCarrier (opts, state);

6
src/dsd_main.c
View File

@ -84,7 +84,9 @@ noCarrier (dsd_opts * opts, dsd_state * state)
{
if (opts->use_rigctl == 1) //rigctl tuning
{
SetModulation(opts->rigctl_sockfd, 12500);
//may or may not use setmod here, let user control it instead?
if (opts->frame_nxdn48 == 1) SetModulation(opts->rigctl_sockfd, 6250);
else SetModulation(opts->rigctl_sockfd, 12500);
SetFreq(opts->rigctl_sockfd, state->p25_cc_freq);
}
@ -747,7 +749,7 @@ usage ()
printf (" filename.wav for 48K/1 wav files (SDR++, GQRX)\n");
printf (" filename.wav -s 96000 for 96K/1 wav files (DSDPlus)\n");
printf (" (Use single quotes '/directory/audio file.wav' when directories/spaces are present)\n");
printf (" filename.bin for OP25/FME capture bin files\n");
//printf (" filename.bin for OP25/FME capture bin files\n");
printf (" -s <rate> Sample Rate of wav input files (usually 48000 or 96000) Mono only!\n");
printf (" -o <device> Audio output device (default is pulse audio)(null for no audio output)\n");
printf (" -d <dir> Create mbe data files, use this directory\n");