GIT.Harvie.CZ
/
mirrors
/
Programs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Update winsize.c
[mirrors/Programs.git]
/
c
/
goertzel
/
goertzel.c
diff --git
a/c/goertzel/goertzel.c
b/c/goertzel/goertzel.c
index f22a1fcb1a911c011008ba7c266e279e46b6e6ef..2cde63bfe2a015ef2ec398c99c3d69a1f958b3d5 100644
(file)
--- a/
c/goertzel/goertzel.c
+++ b/
c/goertzel/goertzel.c
@@
-2,7
+2,7
@@
#include <math.h>
#include <getopt.h>
#include <math.h>
#include <getopt.h>
-float goertzel_mag(int numSamples,
in
t TARGET_FREQUENCY,int SAMPLING_RATE, float* data)
+float goertzel_mag(int numSamples,
floa
t TARGET_FREQUENCY,int SAMPLING_RATE, float* data)
{
int k,i;
float floatnumSamples;
{
int k,i;
float floatnumSamples;
@@
-11,7
+11,7
@@
float goertzel_mag(int numSamples,int TARGET_FREQUENCY,int SAMPLING_RATE, float*
float scalingFactor = numSamples / 2.0;
floatnumSamples = (float) numSamples;
float scalingFactor = numSamples / 2.0;
floatnumSamples = (float) numSamples;
- k = (int) (0.5 + ((floatnumSamples * TARGET_FREQUENCY) / SAMPLING_RATE));
+ k = (int) (0.5 + ((floatnumSamples * TARGET_FREQUENCY) /
(float)
SAMPLING_RATE));
omega = (2.0 * M_PI * k) / floatnumSamples;
sine = sin(omega);
cosine = cos(omega);
omega = (2.0 * M_PI * k) / floatnumSamples;
sine = sin(omega);
cosine = cos(omega);
@@
-103,7
+103,7
@@
void print_help(char ** argv) {
);
}
);
}
-void addfreq(
int *freqs, in
t freq) {
+void addfreq(
float *freqs, floa
t freq) {
int i = 0;
while(freqs[i]!=-1) i++;
freqs[i]=freq;
int i = 0;
while(freqs[i]!=-1) i++;
freqs[i]=freq;
@@
-121,8
+121,10
@@
int main(int argc, char ** argv) {
char format=0;
char verbose=1;
char format=0;
char verbose=1;
-
in
t freqs[argc+1]; freqs[0]=-1;
+
floa
t freqs[argc+1]; freqs[0]=-1;
+
+ float floatarg;
int opt;
while ((opt = getopt(argc, argv, "?i:o:a:r:c:d:f:t:n:l:uq")) != -1) {
switch (opt) {
int opt;
while ((opt = getopt(argc, argv, "?i:o:a:r:c:d:f:t:n:l:uq")) != -1) {
switch (opt) {
@@
-145,7
+147,8
@@
int main(int argc, char ** argv) {
samplecount = samplerate/atoi(optarg);
break;
case 'f':
samplecount = samplerate/atoi(optarg);
break;
case 'f':
- addfreq(freqs, atoi(optarg));
+ sscanf(optarg,"%f",&floatarg);
+ addfreq(freqs, floatarg);
break;
case 't':
treshold = atoi(optarg);
break;
case 't':
treshold = atoi(optarg);
@@
-175,7
+178,7
@@
int main(int argc, char ** argv) {
if(verbose) {
fprintf(stderr,
if(verbose) {
fprintf(stderr,
- "#Detected tone: %
d
Hz\n"
+ "#Detected tone: %
.2f
Hz\n"
"#Samplerate: %d Hz\n"
"#Frame lenght: %d samples\n"
"#Treshold: %d\n"
"#Samplerate: %d Hz\n"
"#Frame lenght: %d samples\n"
"#Treshold: %d\n"
@@
-185,7
+188,7
@@
int main(int argc, char ** argv) {
printf("#Position");
int i; for(i=0;freqs[i]!=-1;i++) {
printf("#Position");
int i; for(i=0;freqs[i]!=-1;i++) {
- printf("\t%2
dHz",freqs[i]);
+ printf("\t%2
.0fHz",freqs[i]); //TODO: print decimal places
}
puts("");
}
}
puts("");
}
@@
-243,7
+246,7
@@
int main(int argc, char ** argv) {
break;
case 'f':
default:
break;
case 'f':
default:
- printf("%
.4
f",power[i]);
+ printf("%
7.5
f",power[i]);
}
}
puts("");
}
}
puts("");
This page took
0.154351 seconds
and
4
git commands to generate.