mirror of
https://github.com/lwvmobile/dsd-fme.git
synced 2026-11-21 13:15:40 -05:00
M17 - Implement RRC Filtering;
This commit is contained in:
@@ -1,7 +1,7 @@
|
|||||||
//M17 Filter -- RRC Alpha = 0.5 S/s 48000 with 81 taps
|
//M17 Filter -- RRC Alpha = 0.5 S/s 48000 with 81 taps
|
||||||
#define M17ZEROS 80 //ONLY SEE 79 THOUGH
|
#define M17ZEROS 80
|
||||||
float m17gain = 6.92820323f; //sqrt of 48 //10.0f
|
float m17gain = 3.16227766f; //sqrt of 10.0f
|
||||||
static float m17xv[M17ZEROS+1];
|
static float m17xv[81];
|
||||||
|
|
||||||
//sample RRC filter for 48kHz sample rate
|
//sample RRC filter for 48kHz sample rate
|
||||||
//alpha=0.5, span=8, sps=10, gain=sqrt(sps)
|
//alpha=0.5, span=8, sps=10, gain=sqrt(sps)
|
||||||
|
|||||||
@@ -2428,6 +2428,9 @@ main (int argc, char **argv)
|
|||||||
sprintf (opts.output_name, "M17");
|
sprintf (opts.output_name, "M17");
|
||||||
fprintf(stderr, "Notice: M17 cannot autodetect polarity. \n Use -xz option if Inverted Signal expected.\n");
|
fprintf(stderr, "Notice: M17 cannot autodetect polarity. \n Use -xz option if Inverted Signal expected.\n");
|
||||||
fprintf(stderr, "Decoding only M17 frames.\n");
|
fprintf(stderr, "Decoding only M17 frames.\n");
|
||||||
|
|
||||||
|
//disable RRC filter for now
|
||||||
|
opts.use_cosine_filter = 0;
|
||||||
}
|
}
|
||||||
else if (optarg[0] == 'Z') //Captial Z to Run the M17 STR encoder
|
else if (optarg[0] == 'Z') //Captial Z to Run the M17 STR encoder
|
||||||
{
|
{
|
||||||
@@ -3046,6 +3049,9 @@ main (int argc, char **argv)
|
|||||||
|
|
||||||
else if (opts.m17encoder == 1)
|
else if (opts.m17encoder == 1)
|
||||||
{
|
{
|
||||||
|
//disable RRC filter for now
|
||||||
|
opts.use_cosine_filter = 0;
|
||||||
|
|
||||||
opts.pulse_digi_rate_out = 8000;
|
opts.pulse_digi_rate_out = 8000;
|
||||||
|
|
||||||
//open any inputs, if not alread opened, OSS input and output already handled
|
//open any inputs, if not alread opened, OSS input and output already handled
|
||||||
@@ -3075,6 +3081,9 @@ main (int argc, char **argv)
|
|||||||
|
|
||||||
else if (opts.m17encoderpkt == 1)
|
else if (opts.m17encoderpkt == 1)
|
||||||
{
|
{
|
||||||
|
//disable RRC filter for now
|
||||||
|
opts.use_cosine_filter = 0;
|
||||||
|
|
||||||
opts.pulse_digi_rate_out = 8000;
|
opts.pulse_digi_rate_out = 8000;
|
||||||
//open any outputs, if not already opened
|
//open any outputs, if not already opened
|
||||||
if (opts.audio_out_type == 0) openPulseOutput(&opts);
|
if (opts.audio_out_type == 0) openPulseOutput(&opts);
|
||||||
|
|||||||
@@ -379,7 +379,7 @@ getSymbol (dsd_opts * opts, dsd_state * state, int have_sync)
|
|||||||
|
|
||||||
else if (state->lastsynctype == 8 || state->lastsynctype == 9 ||state->lastsynctype == 16 || state->lastsynctype == 17)
|
else if (state->lastsynctype == 8 || state->lastsynctype == 9 ||state->lastsynctype == 16 || state->lastsynctype == 17)
|
||||||
{
|
{
|
||||||
// sample = m17_filter(sample); //disable, not working as expected
|
sample = m17_filter(sample);
|
||||||
}
|
}
|
||||||
|
|
||||||
else if (
|
else if (
|
||||||
|
|||||||
76
src/m17.c
76
src/m17.c
@@ -1087,6 +1087,39 @@ void simple_conv_encoder (uint8_t * input, uint8_t * output, int len)
|
|||||||
//dibits-symbols map
|
//dibits-symbols map
|
||||||
const int8_t symbol_map[4] = {+1, +3, -1, -3};
|
const int8_t symbol_map[4] = {+1, +3, -1, -3};
|
||||||
|
|
||||||
|
//sample RRC filter for 48kHz sample rate
|
||||||
|
//alpha=0.5, span=8, sps=10, gain=sqrt(sps)
|
||||||
|
float m17_rrc[81] =
|
||||||
|
{
|
||||||
|
-0.003195702904062073f, -0.002930279157647190f, -0.001940667871554463f,
|
||||||
|
-0.000356087678023658f, 0.001547011339077758f, 0.003389554791179751f,
|
||||||
|
0.004761898604225673f, 0.005310860846138910f, 0.004824746306020221f,
|
||||||
|
0.003297923526848786f, 0.000958710871218619f, -0.001749908029791816f,
|
||||||
|
-0.004238694106631223f, -0.005881783042101693f, -0.006150256456781309f,
|
||||||
|
-0.004745376707651645f, -0.001704189656473565f, 0.002547854551539951f,
|
||||||
|
0.007215575568844704f, 0.011231038205363532f, 0.013421952197060707f,
|
||||||
|
0.012730475385624438f, 0.008449554307303753f, 0.000436744366018287f,
|
||||||
|
-0.010735380379191660f, -0.023726883538258272f, -0.036498030780605324f,
|
||||||
|
-0.046500883189991064f, -0.050979050575999614f, -0.047340680079891187f,
|
||||||
|
-0.033554880492651755f, -0.008513823955725943f, 0.027696543159614194f,
|
||||||
|
0.073664520037517042f, 0.126689053778116234f, 0.182990955139333916f,
|
||||||
|
0.238080025892859704f, 0.287235637987091563f, 0.326040247765297220f,
|
||||||
|
0.350895727088112619f, 0.359452932027607974f, 0.350895727088112619f,
|
||||||
|
0.326040247765297220f, 0.287235637987091563f, 0.238080025892859704f,
|
||||||
|
0.182990955139333916f, 0.126689053778116234f, 0.073664520037517042f,
|
||||||
|
0.027696543159614194f, -0.008513823955725943f, -0.033554880492651755f,
|
||||||
|
-0.047340680079891187f, -0.050979050575999614f, -0.046500883189991064f,
|
||||||
|
-0.036498030780605324f, -0.023726883538258272f, -0.010735380379191660f,
|
||||||
|
0.000436744366018287f, 0.008449554307303753f, 0.012730475385624438f,
|
||||||
|
0.013421952197060707f, 0.011231038205363532f, 0.007215575568844704f,
|
||||||
|
0.002547854551539951f, -0.001704189656473565f, -0.004745376707651645f,
|
||||||
|
-0.006150256456781309f, -0.005881783042101693f, -0.004238694106631223f,
|
||||||
|
-0.001749908029791816f, 0.000958710871218619f, 0.003297923526848786f,
|
||||||
|
0.004824746306020221f, 0.005310860846138910f, 0.004761898604225673f,
|
||||||
|
0.003389554791179751f, 0.001547011339077758f, -0.000356087678023658f,
|
||||||
|
-0.001940667871554463f, -0.002930279157647190f, -0.003195702904062073f
|
||||||
|
};
|
||||||
|
|
||||||
//convert bit array into symbols and RF/Audio
|
//convert bit array into symbols and RF/Audio
|
||||||
void encodeM17RF (dsd_opts * opts, dsd_state * state, uint8_t * input, int type)
|
void encodeM17RF (dsd_opts * opts, dsd_state * state, uint8_t * input, int type)
|
||||||
{
|
{
|
||||||
@@ -1095,7 +1128,7 @@ void encodeM17RF (dsd_opts * opts, dsd_state * state, uint8_t * input, int type)
|
|||||||
//Single Digit numbers 1,2,3,4 are LSF, STR, PKT, and BRT
|
//Single Digit numbers 1,2,3,4 are LSF, STR, PKT, and BRT
|
||||||
//Double Digit numbers 11,33,55,99 are preamble, EOT, or Dead Air
|
//Double Digit numbers 11,33,55,99 are preamble, EOT, or Dead Air
|
||||||
|
|
||||||
int i, j;
|
int i, j, k, x;
|
||||||
|
|
||||||
//Preamble A - 0x7777 (+3, -3, +3, -3, +3, -3, +3, -3)
|
//Preamble A - 0x7777 (+3, -3, +3, -3, +3, -3, +3, -3)
|
||||||
uint8_t m17_preamble_a[16] = {0,1,1,1, 0,1,1,1, 0,1,1,1, 0,1,1,1};
|
uint8_t m17_preamble_a[16] = {0,1,1,1, 0,1,1,1, 0,1,1,1, 0,1,1,1};
|
||||||
@@ -1205,12 +1238,45 @@ void encodeM17RF (dsd_opts * opts, dsd_state * state, uint8_t * input, int type)
|
|||||||
// fprintf (stderr, " %d", output_up[i]);
|
// fprintf (stderr, " %d", output_up[i]);
|
||||||
// }
|
// }
|
||||||
|
|
||||||
//craft baseband with gain + filter //m17_filter not working as expected, so disabling here and for OTA demodulation
|
//craft baseband with deviation + filter
|
||||||
short baseband[1920]; memset (baseband, 0, 1920*sizeof(short));
|
short baseband[1920]; memset (baseband, 0, 1920*sizeof(short));
|
||||||
for (i = 0; i < 1920; i++)
|
|
||||||
|
//simple, no filtering
|
||||||
|
if (opts->use_cosine_filter == 0)
|
||||||
{
|
{
|
||||||
baseband[i] = output_up[i] * 7168.0f; //optimal value?
|
for (i = 0; i < 1920; i++)
|
||||||
// baseband[i] = m17_filter(baseband[i]); //(find/make suitable replacement)
|
baseband[i] = output_up[i] * 7168.0f;
|
||||||
|
}
|
||||||
|
|
||||||
|
//version w/ filtering lifted from M17_Implementations / libM17
|
||||||
|
else if (opts->use_cosine_filter == 1)
|
||||||
|
{
|
||||||
|
float mem[81]; memset (mem, 0.0f, 81*sizeof(float));
|
||||||
|
float mac = 0.0f;
|
||||||
|
x = 0;
|
||||||
|
for (i = 0; i < 192; i++)
|
||||||
|
{
|
||||||
|
mem[0] = (float)output_symbols[i] * 7168.0f;
|
||||||
|
|
||||||
|
for (j = 0; j < 10; j++)
|
||||||
|
{
|
||||||
|
|
||||||
|
mac = 0.0f;
|
||||||
|
|
||||||
|
//calc the sum of products
|
||||||
|
for (k = 0; k < 81; k++)
|
||||||
|
mac += mem[k]*m17_rrc[k]*sqrtf(10.0);
|
||||||
|
|
||||||
|
//shift the delay line right by 1
|
||||||
|
for (k = 80; k > 0; k--)
|
||||||
|
mem[k] = mem[k-1];
|
||||||
|
|
||||||
|
mem[0] = 0.0f;
|
||||||
|
|
||||||
|
baseband[x++] = (short)mac;
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
//debug baseband
|
//debug baseband
|
||||||
|
|||||||
Reference in New Issue
Block a user