Fix NXDN48/96 Modulation Type and RF_Mod

Switched to C4FM Modulation and matching RF_Mod
Not sure if this matters, seems to decode the same either way, but C4FM is correct for NXDN systems, has more to do with samplesPerSymbol than anything.
This commit is contained in:
lwvmobile 2022-02-15 10:50:58 -05:00 committed by GitHub
parent 2efd9eeccd
commit 185a75c33d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 7 deletions

View File

@ -811,11 +811,12 @@ main (int argc, char **argv)
opts.frame_provoice = 0;
state.samplesPerSymbol = 20;
state.symbolCenter = 10;
opts.mod_c4fm = 0;
opts.mod_c4fm = 1;
opts.mod_qpsk = 0;
opts.mod_gfsk = 1; //was 1 with others on zero
state.rf_mod = 2; //was 2
opts.mod_gfsk = 0; //was 1 with others on zero
state.rf_mod = 0; //was 2
//opts.symboltiming = 2400; //NXDN48 uses 2400 symbol rate
printf ("Enabling only C4FM modulation optimizations.\n");
printf ("Setting symbol rate to 2400 / second\n");
printf ("Decoding only NXDN 4800 baud frames.\n");
}
@ -828,11 +829,11 @@ main (int argc, char **argv)
opts.frame_nxdn96 = 1;
opts.frame_dmr = 0;
opts.frame_provoice = 0;
opts.mod_c4fm = 0;
opts.mod_c4fm = 1;
opts.mod_qpsk = 0;
opts.mod_gfsk = 1;
state.rf_mod = 2;
printf ("Enabling only GFSK modulation optimizations.\n");
opts.mod_gfsk = 0;
state.rf_mod = 0;
printf ("Enabling only C4FM modulation optimizations.\n");
printf ("Decoding only NXDN 9600 baud frames.\n");
}
else if (optarg[0] == 'r')