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

Little Tweaks 

Little Tweaks
This commit is contained in:
lwvmobile 2022-02-22 08:49:46 -05:00 committed by GitHub
parent 5b4d624bb2
commit 670e4e7bec
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/dsd.h
View File

@ -239,6 +239,7 @@ typedef struct
pa_simple *pulse_digi_dev_out; pa_simple *pulse_digi_dev_out;
int use_ncurses_terminal; int use_ncurses_terminal;
int reset_state; int reset_state;
int payload;
} dsd_opts; } dsd_opts;

10
src/dsd_file.c
View File

@ -16,7 +16,7 @@
*/ */
#include "dsd.h" #include "dsd.h"
int payload = 0;
void void
saveImbe4400Data (dsd_opts * opts, dsd_state * state, char *imbe_d) saveImbe4400Data (dsd_opts * opts, dsd_state * state, char *imbe_d)
{ {
@ -28,7 +28,7 @@ saveImbe4400Data (dsd_opts * opts, dsd_state * state, char *imbe_d)
fputc (err, opts->mbe_out_f); fputc (err, opts->mbe_out_f);
k = 0; k = 0;
if (payload == 1) //make opt variable later on to toggle this if (opts->payload == 1) //make opt variable later on to toggle this
{ {
fprintf(stderr, "\n"); fprintf(stderr, "\n");
} }
@ -43,7 +43,7 @@ saveImbe4400Data (dsd_opts * opts, dsd_state * state, char *imbe_d)
b = b + imbe_d[k]; b = b + imbe_d[k];
k++; k++;
} }
if (payload == 1) //make opt variable later on to toggle this if (opts->payload == 1) //make opt variable later on to toggle this
{ {
fprintf (stderr, "[%2X] ", b); fprintf (stderr, "[%2X] ", b);
} }
@ -64,7 +64,7 @@ saveAmbe2450Data (dsd_opts * opts, dsd_state * state, char *ambe_d)
fputc (err, opts->mbe_out_f); fputc (err, opts->mbe_out_f);
k = 0; k = 0;
if (payload == 1) //make opt variable later on to toggle this if (opts->payload == 1) //make opt variable later on to toggle this
{ {
fprintf(stderr, "\n"); fprintf(stderr, "\n");
} }
@ -78,7 +78,7 @@ saveAmbe2450Data (dsd_opts * opts, dsd_state * state, char *ambe_d)
b = b + ambe_d[k]; b = b + ambe_d[k];
k++; k++;
} }
if (payload == 1) //make opt variable later on to toggle this if (opts->payload == 1) //make opt variable later on to toggle this
{ {
fprintf (stderr, "[%2X] ", b); fprintf (stderr, "[%2X] ", b);
} }

8
src/dsd_main.c
View File

@ -384,6 +384,7 @@ usage ()
fprintf (stderr," -n Reset P25 Heuristics and initState variables on mixed decoding signal\n"); fprintf (stderr," -n Reset P25 Heuristics and initState variables on mixed decoding signal\n");
fprintf (stderr," Helps when decoding multiple signal types at same time\n"); fprintf (stderr," Helps when decoding multiple signal types at same time\n");
fprintf (stderr," (WiP! May Cause Slow Memory Leak - Experimental)\n"); fprintf (stderr," (WiP! May Cause Slow Memory Leak - Experimental)\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");
exit (0); exit (0);
@ -622,7 +623,7 @@ main (int argc, char **argv)
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:NWrl")) != -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:NWrlZ")) != -1)
{ {
opterr = 0; opterr = 0;
switch (c) switch (c)
@ -721,6 +722,11 @@ main (int argc, char **argv)
fprintf (stderr," - may need to issue 'reset' command in terminal after use\n"); fprintf (stderr," - may need to issue 'reset' command in terminal after use\n");
break; break;
case 'Z':
opts.payload = 1;
fprintf (stderr,"Logging MBE Payload to console\n");
break;
case 'z': case 'z':
sscanf (optarg, "%d", &opts.scoperate); sscanf (optarg, "%d", &opts.scoperate);
opts.errorbars = 0; opts.errorbars = 0;

2
src/dsd_ncurses.c
View File

@ -160,7 +160,7 @@ ncursesPrinter (dsd_opts * opts, dsd_state * state)
printw ("------------------------------------------------------------------------------\n"); printw ("------------------------------------------------------------------------------\n");
if ( (lls == 14 || lls == 15) && (time(NULL) - call_matrix[9][5] > 5) ) //honestly have no idea how to do this for pV, just going time based? if ( (lls == 14 || lls == 15) && (time(NULL) - call_matrix[9][5] > 5) && state->carrier == 1) //honestly have no idea how to do this for pV, just going time based? only update on carrier == 1.
{ {
for (short int k = 0; k < 9; k++) for (short int k = 0; k < 9; k++)
{ {