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

fsk: floating point band_width

Browse Source
This commit is contained in:
Kamal Mostafa 2011-06-21 20:27:51 -07:00
parent 8ba07cb81a
commit 243af5da56
3 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/fsk.c
View File

@ -34,7 +34,6 @@ fsk_plan_new(
fskp->sample_rate = sample_rate; fskp->sample_rate = sample_rate;
fskp->f_mark = f_mark; fskp->f_mark = f_mark;
fskp->f_space = f_space; fskp->f_space = f_space;
fskp->filter_bw = filter_bw;
fskp->n_data_bits = n_data_bits; fskp->n_data_bits = n_data_bits;
/* 1 prev_stop + n_data_bits + 1 start + 1 stop == n_data_bits + 3 */ /* 1 prev_stop + n_data_bits + 1 start + 1 stop == n_data_bits + 3 */
@ -43,7 +42,7 @@ fsk_plan_new(
#ifdef USE_FFT #ifdef USE_FFT
fskp->band_width = filter_bw; fskp->band_width = filter_bw;
float fft_half_bw = (float)fskp->band_width / 2.0; float fft_half_bw = fskp->band_width / 2.0;
fskp->fftsize = (sample_rate + fft_half_bw) / fskp->band_width; fskp->fftsize = (sample_rate + fft_half_bw) / fskp->band_width;
fskp->nbands = fskp->fftsize / 2 + 1; fskp->nbands = fskp->fftsize / 2 + 1;

2
src/fsk.h
View File

@ -28,7 +28,7 @@ struct fsk_plan {
#ifdef USE_FFT #ifdef USE_FFT
int fftsize; int fftsize;
unsigned int nbands; unsigned int nbands;
unsigned int band_width; float band_width;
unsigned int b_mark; unsigned int b_mark;
unsigned int b_space; unsigned int b_space;
fftwf_plan fftplan; fftwf_plan fftplan;

15
src/minimodem.c
View File

@ -163,7 +163,7 @@ main( int argc, char*argv[] )
{ {
char *modem_mode = NULL; char *modem_mode = NULL;
int TX_mode = -1; int TX_mode = -1;
unsigned int 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;
unsigned int bfsk_n_data_bits = 0; unsigned int bfsk_n_data_bits = 0;
@ -221,8 +221,7 @@ main( int argc, char*argv[] )
bfsk_n_data_bits = 5; bfsk_n_data_bits = 5;
break; break;
case 'b': case 'b':
// FIXME make band_width float? band_width = atof(optarg);
band_width = atoi(optarg);
assert( band_width != 0 ); assert( band_width != 0 );
break; break;
case 'M': case 'M':
@ -323,6 +322,10 @@ main( int argc, char*argv[] )
} }
} }
/* restrict band_width to <= data rate (FIXME?) */
if ( band_width > bfsk_data_rate )
band_width = bfsk_data_rate;
/* /*
* Handle transmit mode * Handle transmit mode
@ -501,7 +504,7 @@ main( int argc, char*argv[] )
continue; continue;
} }
debug_log("### TONE freq=%u ###\n", debug_log("### TONE freq=%.1f ###\n",
carrier_band * fskp->band_width); carrier_band * fskp->band_width);
fsk_set_tones_by_bandshift(fskp, /*b_mark*/carrier_band, b_shift); fsk_set_tones_by_bandshift(fskp, /*b_mark*/carrier_band, b_shift);
@ -571,11 +574,11 @@ main( int argc, char*argv[] )
if ( !carrier ) { if ( !carrier ) {
if ( bfsk_data_rate >= 100 ) if ( bfsk_data_rate >= 100 )
fprintf(stderr, "### CARRIER %u @ %u Hz ###\n", fprintf(stderr, "### CARRIER %u @ %.1f Hz ###\n",
(unsigned int)(bfsk_data_rate + 0.5), (unsigned int)(bfsk_data_rate + 0.5),
fskp->b_mark * fskp->band_width); fskp->b_mark * fskp->band_width);
else else
fprintf(stderr, "### CARRIER %.2f @ %u Hz ###\n", fprintf(stderr, "### CARRIER %.2f @ %.1f Hz ###\n",
bfsk_data_rate, bfsk_data_rate,
fskp->b_mark * fskp->band_width); fskp->b_mark * fskp->band_width);
carrier = 1; carrier = 1;