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

minimodem: calculate frame_bits_{mask,shift}

This commit is contained in:
Kamal Mostafa 2012-08-31 20:42:05 -07:00
parent f16e318ae4
commit a7d1602c9d
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/minimodem.c
View File

@ -900,11 +900,6 @@ main( int argc, char*argv[] )
char expect_bits_string[33] = "10dddddddddddddddddddddddddddddd";
expect_bits_string[bfsk_n_data_bits + 2] = '1';
expect_bits_string[bfsk_n_data_bits + 3] = 0;
unsigned int frame_bits_shift = 2; // prev_stop + start
// FIXME - weird hardcode:
unsigned int frame_bits_mask = 0xFF;
if ( bfsk_n_data_bits == 5 )
frame_bits_mask = 0x1F;
unsigned int expect_n_bits = strlen(expect_bits_string);
unsigned int expect_nsamples = nsamples_per_bit * expect_n_bits;
@ -966,9 +961,6 @@ main( int argc, char*argv[] )
confidence, amplitude, track_amplitude );
}
// chop off framing bits
bits = ( bits >> frame_bits_shift ) & frame_bits_mask;
#define FSK_MAX_NOCONFIDENCE_BITS 20
if ( confidence <= fsk_confidence_threshold ) {
@ -1043,12 +1035,21 @@ main( int argc, char*argv[] )
nsamples_per_bit, bfsk_n_data_bits,
frame_start_sample, advance);
// chop off the prev_stop bit
if ( bfsk_nstopbits != 0.0 )
bits = bits >> 1;
/*
* Send the raw data frame bits to the backend frame processor
* for final conversion to output data bytes.
*/
// chop off framing bits
unsigned int frame_bits_shift = (int)bfsk_nstartbits;
unsigned int frame_bits_mask = (int)(1<<bfsk_n_data_bits) - 1;
bits = ( bits >> frame_bits_shift ) & frame_bits_mask;
unsigned int dataout_size = 4096;
char dataoutbuf[4096];
unsigned int dataout_nbytes = 0;