X-Git-Url: http://git.harvie.cz/?a=blobdiff_plain;f=c%2Fgoertzel%2Fgoertzel.c;h=a6070ca312c2369987b5eb4f008682f6075f8fa1;hb=19a509d14a28519397f352f3cd0570c9becf7c47;hp=96458a5b83c7cc2cacf5bd4536276df77c17221c;hpb=8f751717d8307e3aa09fdfee19bed9478b7b16be;p=mirrors%2FPrograms.git

diff --git a/c/goertzel/goertzel.c b/c/goertzel/goertzel.c
index 96458a5..a6070ca 100644
--- a/c/goertzel/goertzel.c
+++ b/c/goertzel/goertzel.c
@@ -70,9 +70,15 @@ void print_help(char ** argv) {
 		"\t-f <freq>\tAdd frequency in Hz to detect (use multiple times, if no added 440 Hz will be...)\n"
 		"\n"
 		"\t-t <treshold>\tSet treshold (used to hide magnitudes lower than treshold) (defaults -1)\n"
-		"\t-n\t\tPrint integers rather than floats\n"
-		"\t-l\t\tDo not repeat values while still over treshold\n"
-		"\t-b\t\tDo not print first value that will fall under treshold\n"
+		"\t-n <format>\tSet output format\n"
+		"\t\tf: float (default)\n"
+		"\t\ti: integer\n"
+		"\t\tb: binary (0|1)\n"
+		"\t\tB: Boolean (false|true)\n"
+		"\t-l <filter>\tSet filter\n"
+		"\t\tf: Falldown: print only when over treshold or just falled under (default)\n"
+		"\t\tt: Treshold: print only when over treshold\n"
+		"\t\tc: Crossed: print only when treshold crossed\n"
 		"\t-q\t\tQuiet mode: print only values\n"
 		"\n"
 		"\t-?\t\tPrint help\n"
@@ -105,14 +111,13 @@ int main(int argc, char ** argv) {
 	int samplerate = 8000;
 	int samplecount = 4000;
 	int treshold = -1;
-	char noreturn = 0;
-	char repeat = 1;
-	char integers=0;
+	char filter = 0;
+	char format=0;
 	char verbose=1;
 	int freqs[argc+1]; freqs[0]=-1;
 
 	int opt;
-	while ((opt = getopt(argc, argv, "?i:o:a:r:c:d:f:t:nlbq")) != -1) {
+	while ((opt = getopt(argc, argv, "?i:o:a:r:c:d:f:t:n:l:q")) != -1) {
 		switch (opt) {
 			case 'i':
 				freopen(optarg, "r", stdin);
@@ -139,13 +144,10 @@ int main(int argc, char ** argv) {
 				treshold = atoi(optarg);
 				break;
 			case 'n':
-				integers = 1;
+				format = optarg[0];
 				break;
 			case 'l':
-				repeat = 0;
-				break;
-			case 'b':
-				noreturn = 1;
+				filter = optarg[0];
 				break;
 			case 'q':
 				verbose = 0;
@@ -178,9 +180,10 @@ int main(int argc, char ** argv) {
 		puts("");
 	}
 
-	char print=0, printnow=0, printlast = 0;
+	int i;
+	char print=0, printnow=0;
+	char laststate[argc]; for(i=0;freqs[i]!=-1;i++) laststate[i]=-1;
 	while(!feof(stdin)) {
-		int i;
 
 		//Sample data
 		for(i=0;i<samplecount && !feof(stdin);i++) {
@@ -196,11 +199,20 @@ int main(int argc, char ** argv) {
 		for(i=0;freqs[i]!=-1;i++) {
 			power[i] = goertzel_mag(samplecount, freqs[i], samplerate, samples);
 
-			//Set print true if over treshold or if changed to false (print for the last time after going under treshold)
-			printnow = power[i] > treshold;
-			print = !(!repeat && printlast && !(!printnow)) && (print || printnow || (printlast && !noreturn));
+			//Decide if we will print
+			printnow = power[i] > treshold; //Is over treshold?
+			switch(filter) {
+				case 'c': //Print if treshold crossed
+					print = print || (laststate[i] != printnow);
+					break;
+				default:
+				case 'f': //Print if over treshold or falled down
+					print = print || (laststate[i] != printnow);
+				case 't': //Print if over treshold
+					print = print || printnow;
+			}
+			laststate[i] = printnow; //Store last state
 		}
-		printlast = printnow;
 		fflush(stdout);
 
 		//Print data
@@ -208,10 +220,21 @@ int main(int argc, char ** argv) {
 			printf("%8.2f", position);
 			for(i=0;freqs[i]!=-1;i++) {
 				printf("\t");
-				if(integers)
-					printf("%d",(int)power[i]);
-				else
-					printf("%.4f",power[i]);
+				switch(format) {
+					case 'i':
+						printf("%d",(int)power[i]);
+						break;
+					case 'b':
+						printf("%d",power[i]>treshold);
+						break;
+					case 'B':
+						if(power[i]>treshold) printf("true");
+							else printf("false");
+						break;
+					case 'f':
+					default:
+						printf("%.4f",power[i]);
+				}
 			}
 			puts("");
 			fflush(stdout);