ua1zbe
/
PiFmRds
mirror of https://github.com/ChristopheJacquet/PiFmRds
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #10 from Stealthii/float-ppm 

Have ppm use float precision
This commit is contained in:
ChristopheJacquet 2014-09-21 12:06:28 +02:00
parent a985b7db02 16c9f1aed8
commit 0bf57f9ce0
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/pi_fm_rds.c
View File

@ -269,7 +269,7 @@ map_peripheral(uint32_t base, uint32_t len)
#define DATA_SIZE 5000 #define DATA_SIZE 5000
int tx(uint32_t carrier_freq, char *audio_file, uint16_t pi, char *ps, char *rt, int16_t ppm, char *control_pipe) { int tx(uint32_t carrier_freq, char *audio_file, uint16_t pi, char *ps, char *rt, float ppm, char *control_pipe) {
int i, fd, pid; int i, fd, pid;
char pagemap_fn[64]; char pagemap_fn[64];
@ -380,7 +380,7 @@ int tx(uint32_t carrier_freq, char *audio_file, uint16_t pi, char *ps, char *rt,
uint32_t idivider = (uint32_t) divider; uint32_t idivider = (uint32_t) divider;
uint32_t fdivider = (uint32_t) ((divider - idivider)*pow(2, 12)); uint32_t fdivider = (uint32_t) ((divider - idivider)*pow(2, 12));
printf("ppm corr is %d, divider is %.4f (%d + %d*2^-12) [nominal 1096.4912]\n", printf("ppm corr is %.4f, divider is %.4f (%d + %d*2^-12) [nominal 1096.4912]\n",
ppm, divider, idivider, fdivider); ppm, divider, idivider, fdivider);
pwm_reg[PWM_CTL] = 0; pwm_reg[PWM_CTL] = 0;
@ -520,7 +520,7 @@ int main(int argc, char **argv) {
char *ps = NULL; char *ps = NULL;
char *rt = "PiFmRds: live FM-RDS transmission from the RaspberryPi"; char *rt = "PiFmRds: live FM-RDS transmission from the RaspberryPi";
uint16_t pi = 0x1234; uint16_t pi = 0x1234;
int16_t ppm = 0; float ppm = 0;
// Parse command-line arguments // Parse command-line arguments
@ -549,7 +549,7 @@ int main(int argc, char **argv) {
rt = param; rt = param;
} else if(strcmp("-ppm", arg)==0 && param != NULL) { } else if(strcmp("-ppm", arg)==0 && param != NULL) {
i++; i++;
ppm = atoi(param); ppm = atof(param);
} else if(strcmp("-ctl", arg)==0 && param != NULL) { } else if(strcmp("-ctl", arg)==0 && param != NULL) {
i++; i++;
control_pipe = param; control_pipe = param;
@ -561,4 +561,4 @@ int main(int argc, char **argv) {
} }
tx(carrier_freq, audio_file, pi, ps, rt, ppm, control_pipe); tx(carrier_freq, audio_file, pi, ps, rt, ppm, control_pipe);
} }