diff options
| author | FreeArtMan <dos21h@gmail.com> | 2015-12-23 18:02:26 +0000 |
|---|---|---|
| committer | FreeArtMan <dos21h@gmail.com> | 2015-12-23 18:02:26 +0000 |
| commit | 704f47c888ad33e2064a0bd1ec740a6a1823411d (patch) | |
| tree | 63e1a517813ce1c96d14d8283d84ea8f0eeb0316 | |
| parent | 509c6f05b2ae770b9bee253621fad7be442fac1e (diff) | |
| download | radiola-704f47c888ad33e2064a0bd1ec740a6a1823411d.tar.gz radiola-704f47c888ad33e2064a0bd1ec740a6a1823411d.zip | |
Removed some constanst that appears in c11
| -rw-r--r-- | test/Makefile.bsd | 2 | ||||
| -rw-r--r-- | test/sdr_fm.c | 6 | ||||
| -rw-r--r-- | test/ui_tui_waterfall.c | 3 |
3 files changed, 6 insertions, 5 deletions
diff --git a/test/Makefile.bsd b/test/Makefile.bsd index 0befdba..00fbd47 100644 --- a/test/Makefile.bsd +++ b/test/Makefile.bsd @@ -1,5 +1,5 @@ CC=gcc -CFLAGS=-std=gnu11 -I../ +CFLAGS=-I../ #LDFLAGS= `pkg-config --libs libusb` -L../../../r820t -lr820t -Wl,-rpath=../../../r820t LDFLAGS=`pkg-config --libs libusb` -lrtlsdr -lm ../radiola.o SOURCE = get_device_list.c read_samples.c sdr_fm.c ui_tui_waterfall.c diff --git a/test/sdr_fm.c b/test/sdr_fm.c index 80df657..a7f5551 100644 --- a/test/sdr_fm.c +++ b/test/sdr_fm.c @@ -177,13 +177,13 @@ float to_float(uint8_t x) { //float ph_ch( uint8_t i1, uint8_t q1, uint8_t i2, uint8_t q2) float ph_ch( uint8_t i1, uint8_t q1 ) { - static float complex last=CMPLXF(0.0f, 0.0f); + static float complex last=0.0+0.0i; float out; float complex xy,c1; //float c2; - //c1 = to_float(i1) + I*to_float(q1); - c1 = CMPLXF( to_float(i1), to_float(q1) ); + c1 = to_float(i1) + I*to_float(q1); + //c1 = CMPLXF( to_float(i1), to_float(q1) ); //c2 = to_float(i2) + I*to_float(q2); //c2 = CMPLXF( to_float(i2), to_float(q2) ); xy = conjf(last)*c1; diff --git a/test/ui_tui_waterfall.c b/test/ui_tui_waterfall.c index 355751f..cc63fc3 100644 --- a/test/ui_tui_waterfall.c +++ b/test/ui_tui_waterfall.c @@ -1,7 +1,7 @@ -#include <math.h> #include <stdio.h> #include <stdlib.h> #include <unistd.h> +#include <math.h> //radiola #include <draw/tui.h> @@ -56,6 +56,7 @@ int normalise( uint8_t *ibuf, int ilen, uint8_t *obuf, int olen ) void sine_table(int size) { + int i; double d; LOG2_N_WAVE = size; |