ua1zbe
/
rpitx2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update pi_fm_rds.cpp

This commit is contained in:
Kuba 2023-10-21 18:33:23 +02:00 committed by GitHub
parent b8ccf2934e
commit e76618e504
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/pifmrds/pi_fm_rds.cpp
View File

@ -87,7 +87,7 @@ static volatile void *map_peripheral(uint32_t base, uint32_t len)
return vaddr; return vaddr;
} }
int tx(uint32_t carrier_freq, char *audio_file, uint16_t pi, char *ps, char *rt, float ppm, char *control_pipe, int pty, int *af_array, int raw, int drds, double preemp, int power, int rawSampleRate, int rawChannels, int deviation, int ta, int tp) { int tx(uint32_t carrier_freq, char *audio_file, uint16_t pi, char *ps, char *rt, float ppm, char *control_pipe, int pty, int *af_array, int raw, int drds, double preemp, int power, int rawSampleRate, int rawChannels, int deviation, int ta, int tp, float cutoff_freq) {
// Catch all signals possible - it is vital we kill the DMA engine // Catch all signals possible - it is vital we kill the DMA engine
// on process exit! // on process exit!
for (int i = 0; i < 64; i++) { for (int i = 0; i < 64; i++) {
@ -110,7 +110,7 @@ int tx(uint32_t carrier_freq, char *audio_file, uint16_t pi, char *ps, char *rt,
int data_index = 0; int data_index = 0;
// Initialize the baseband generator // Initialize the baseband generator
if(fm_mpx_open(audio_file, DATA_SIZE, raw, preemp, rawSampleRate, rawChannels) < 0) return 1; if(fm_mpx_open(audio_file, DATA_SIZE, raw, preemp, rawSampleRate, rawChannels, cutoff_freq) < 0) return 1;
// Initialize the RDS modulator // Initialize the RDS modulator
char myps[9] = {0}; char myps[9] = {0};
@ -230,6 +230,7 @@ int main(int argc, char **argv) {
float ppm = 0; float ppm = 0;
int bypassfreqrange = 0; int bypassfreqrange = 0;
int custom_deviation = 0; int custom_deviation = 0;
float cutofffreq = 15700;
// Parse command-line arguments // Parse command-line arguments
for(int i=1; i<argc; i++) { for(int i=1; i<argc; i++) {
char *arg = argv[i]; char *arg = argv[i];
@ -297,6 +298,9 @@ int main(int argc, char **argv) {
} else if(strcmp("-rawsamplerate", arg)==0 && param != NULL) { } else if(strcmp("-rawsamplerate", arg)==0 && param != NULL) {
i++; i++;
rawSampleRate = atoi(param); rawSampleRate = atoi(param);
} else if(strcmp("-cutofffreq", arg)==0 && param != NULL) {
i++;
cutofffreq = atoi(param);
} else if(strcmp("-power", arg)==0 && param != NULL) { } else if(strcmp("-power", arg)==0 && param != NULL) {
i++; i++;
int tpower = atoi(param); int tpower = atoi(param);
@ -339,6 +343,6 @@ int main(int argc, char **argv) {
alternative_freq[0] = af_size; alternative_freq[0] = af_size;
int FifoSize=DATA_SIZE*2; int FifoSize=DATA_SIZE*2;
fmmod=new ngfmdmasync(carrier_freq,228000,14,FifoSize, false, gpiopin); fmmod=new ngfmdmasync(carrier_freq,228000,14,FifoSize, false, gpiopin);
int errcode = tx(carrier_freq, audio_file, pi, ps, rt, ppm, control_pipe, pty, alternative_freq, raw, drds, preemp, power, rawSampleRate, rawChannels, deviation, ta, tp); int errcode = tx(carrier_freq, audio_file, pi, ps, rt, ppm, control_pipe, pty, alternative_freq, raw, drds, preemp, power, rawSampleRate, rawChannels, deviation, ta, tp, cutofffreq);
terminate(errcode); terminate(errcode);
} }