yafox
/
minimodem-mirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

minimodem: --startbits; deprecate -T

This commit is contained in:
Kamal Mostafa 2012-09-01 13:33:49 -07:00
parent e2a51f093a
commit 82c72352ab
2 changed files with 34 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/minimodem.1.in
View File

@ -86,8 +86,11 @@ FLT_EPSILON. (This option applies to \-\-tx mode only).
.TP .TP
.B \-S, \-\-space {space_freq} .B \-S, \-\-space {space_freq}
.TP .TP
.B \-T, \-\-stopbits {m.n} .B \-\-startbits {n}
Sets the number of stop bits (default is 1.0, or 1.5 for rtty). Sets the number of start bits (default is 1 for most baudmodes).
.TP
.B \-\-stopbits {n.n}
Sets the number of stop bits (default is 1.0 for most baudmodes).
.TP .TP
.B \-q, \-\-quiet .B \-q, \-\-quiet
Do not report CARRIER / NOCARRIER or signal analysis metrics. Do not report CARRIER / NOCARRIER or signal analysis metrics.

41
src/minimodem.c
View File

@ -289,7 +289,8 @@ usage()
" -v, --volume {amplitude or 'E'}\n" " -v, --volume {amplitude or 'E'}\n"
" -M, --mark {mark_freq}\n" " -M, --mark {mark_freq}\n"
" -S, --space {space_freq}\n" " -S, --space {space_freq}\n"
" -T, --stopbits {m.n}\n" " --startbits {n}\n"
" --stopbits {n.n}\n"
" -q, --quiet\n" " -q, --quiet\n"
" -R, --samplerate {rate}\n" " -R, --samplerate {rate}\n"
" -V, --version\n" " -V, --version\n"
@ -316,8 +317,8 @@ main( int argc, char*argv[] )
float band_width = 0; float band_width = 0;
unsigned int bfsk_mark_f = 0; unsigned int bfsk_mark_f = 0;
unsigned int bfsk_space_f = 0; unsigned int bfsk_space_f = 0;
float bfsk_nstartbits = 1; // hardcoded default 1 start bit int bfsk_nstartbits = -1; // actually only supports 0 or 1 startbit
float bfsk_nstopbits = 0; float bfsk_nstopbits = -1;
unsigned int bfsk_n_data_bits = 0; unsigned int bfsk_n_data_bits = 0;
int autodetect_shift; int autodetect_shift;
char *filename = NULL; char *filename = NULL;
@ -369,6 +370,8 @@ main( int argc, char*argv[] )
enum { enum {
MINIMODEM_OPT_UNUSED=256, // placeholder MINIMODEM_OPT_UNUSED=256, // placeholder
MINIMODEM_OPT_STARTBITS,
MINIMODEM_OPT_STOPBITS,
MINIMODEM_OPT_LUT, MINIMODEM_OPT_LUT,
MINIMODEM_OPT_FLOAT_SAMPLES, MINIMODEM_OPT_FLOAT_SAMPLES,
MINIMODEM_OPT_RX_ONE, MINIMODEM_OPT_RX_ONE,
@ -395,7 +398,8 @@ main( int argc, char*argv[] )
{ "volume", 1, 0, 'v' }, { "volume", 1, 0, 'v' },
{ "mark", 1, 0, 'M' }, { "mark", 1, 0, 'M' },
{ "space", 1, 0, 'S' }, { "space", 1, 0, 'S' },
{ "stopbits", 1, 0, 'T' }, { "startbits", 1, 0, MINIMODEM_OPT_STARTBITS },
{ "stopbits", 1, 0, MINIMODEM_OPT_STOPBITS },
{ "quiet", 0, 0, 'q' }, { "quiet", 0, 0, 'q' },
{ "alsa", 0, 0, 'A' }, { "alsa", 0, 0, 'A' },
{ "samplerate", 1, 0, 'R' }, { "samplerate", 1, 0, 'R' },
@ -461,9 +465,13 @@ main( int argc, char*argv[] )
bfsk_space_f = atoi(optarg); bfsk_space_f = atoi(optarg);
assert( bfsk_space_f > 0 ); assert( bfsk_space_f > 0 );
break; break;
case 'T': case MINIMODEM_OPT_STARTBITS:
bfsk_nstartbits = atoi(optarg);
assert( bfsk_nstartbits == 0 || bfsk_nstartbits == 1 );
break;
case MINIMODEM_OPT_STOPBITS:
bfsk_nstopbits = atof(optarg); bfsk_nstopbits = atof(optarg);
assert( bfsk_nstopbits > 0 ); assert( bfsk_nstopbits >= 0 );
break; break;
case 'q': case 'q':
quiet_mode = 1; quiet_mode = 1;
@ -544,7 +552,7 @@ main( int argc, char*argv[] )
bfsk_data_rate = 45.45; bfsk_data_rate = 45.45;
if ( bfsk_n_data_bits == 0 ) if ( bfsk_n_data_bits == 0 )
bfsk_n_data_bits = 5; bfsk_n_data_bits = 5;
if ( bfsk_nstopbits == 0 ) if ( bfsk_nstopbits < 0 )
bfsk_nstopbits = 1.5; bfsk_nstopbits = 1.5;
} else { } else {
bfsk_data_rate = atof(modem_mode); bfsk_data_rate = atof(modem_mode);
@ -601,7 +609,10 @@ main( int argc, char*argv[] )
} }
} }
if ( bfsk_nstopbits == 0 ) // defaults: 1 start bit, 1 stop bit
if ( bfsk_nstartbits < 0 )
bfsk_nstartbits = 1;
if ( bfsk_nstopbits < 0 )
bfsk_nstopbits = 1.0; bfsk_nstopbits = 1.0;
/* restrict band_width to <= data rate (FIXME?) */ /* restrict band_width to <= data rate (FIXME?) */
@ -846,9 +857,15 @@ main( int argc, char*argv[] )
// start--v v--stop // start--v v--stop
// char *expect_bits_string = "10dddddddd1"; // char *expect_bits_string = "10dddddddd1";
// //
char expect_bits_string[33] = "10dddddddddddddddddddddddddddddd"; char expect_bits_string[33] = "dddddddddddddddddddddddddddddddd";
expect_bits_string[bfsk_n_data_bits + 2] = '1'; int j = 0;
expect_bits_string[bfsk_n_data_bits + 3] = 0; if ( bfsk_nstopbits != 0.0 )
expect_bits_string[j++] = '1';
if ( bfsk_nstartbits != 0 ) // FIXME -- sets only one start bit
expect_bits_string[j++] = '0';
if ( bfsk_nstopbits != 0.0 )
expect_bits_string[bfsk_n_data_bits + j++] = '1';
expect_bits_string[bfsk_n_data_bits + j++] = 0;
unsigned int expect_n_bits = strlen(expect_bits_string); unsigned int expect_n_bits = strlen(expect_bits_string);
unsigned int expect_nsamples = nsamples_per_bit * expect_n_bits; unsigned int expect_nsamples = nsamples_per_bit * expect_n_bits;
@ -995,7 +1012,7 @@ main( int argc, char*argv[] )
*/ */
// chop off framing bits // chop off framing bits
unsigned int frame_bits_shift = (int)bfsk_nstartbits; unsigned int frame_bits_shift = bfsk_nstartbits;
unsigned int frame_bits_mask = (int)(1<<bfsk_n_data_bits) - 1; unsigned int frame_bits_mask = (int)(1<<bfsk_n_data_bits) - 1;
bits = ( bits >> frame_bits_shift ) & frame_bits_mask; bits = ( bits >> frame_bits_shift ) & frame_bits_mask;