From: PA3GSB Date: Sat, 18 Feb 2017 09:41:21 +0000 (+0100) Subject: now first update from pihpsdr X-Git-Url: https://git.rkrishnan.org/uri/%3C?a=commitdiff_plain;h=0ba601b9321cbd9ccc57f006f5b22a17593079e7;p=pihpsdr.git now first update from pihpsdr --- diff --git a/Makefile b/Makefile index 68b6a6f..f285db9 100644 --- a/Makefile +++ b/Makefile @@ -7,7 +7,7 @@ GIT_VERSION := $(shell git describe --abbrev=0 --tags) GPIO_INCLUDE=GPIO # uncomment the line below to include USB Ozy support -USBOZY_INCLUDE=USBOZY +# USBOZY_INCLUDE=USBOZY # uncomment the line below to include support for psk31 #PSK_INCLUDE=PSK @@ -52,7 +52,7 @@ endif #LIMESDR_INCLUDE=LIMESDR # uncomment the line below when Radioberry radio cape is plugged in -RADIOBERRY_INCLUDE=RADIOBERRY +#RADIOBERRY_INCLUDE=RADIOBERRY ifeq ($(RADIOBERRY_INCLUDE),RADIOBERRY) RADIOBERRY_OPTIONS=-D RADIOBERRY @@ -155,7 +155,7 @@ GTKLIBS=`pkg-config --libs gtk+-3.0` AUDIO_LIBS=-lasound #AUDIO_LIBS=-lsoundio -OPTIONS=-g -Wno-deprecated-declarations -D $(UNAME_N) $(USBOZY_OPTIONS) $(I2C_OPTIONS) $(GPIO_OPTIONS) $(LIMESDR_OPTIONS) $(FREEDV_OPTIONS) $(LOCALCW_OPTIONS) $(PSK_OPTIONS) $(SHORT_FRAMES) -D GIT_DATE='"$(GIT_DATE)"' -D GIT_VERSION='"$(GIT_VERSION)"' $(DEBUG_OPTION) -O3 +OPTIONS=-g -Wno-deprecated-declarations -D $(UNAME_N) $(RADIOBERRY_OPTIONS) $(USBOZY_OPTIONS) $(I2C_OPTIONS) $(GPIO_OPTIONS) $(LIMESDR_OPTIONS) $(FREEDV_OPTIONS) $(LOCALCW_OPTIONS) $(PSK_OPTIONS) $(SHORT_FRAMES) -D GIT_DATE='"$(GIT_DATE)"' -D GIT_VERSION='"$(GIT_VERSION)"' $(DEBUG_OPTION) -O3 LIBS=-lrt -lm -lwdsp -lpthread $(AUDIO_LIBS) $(USBOZY_LIBS) $(PSKLIBS) $(GTKLIBS) $(GPIO_LIBS) $(SOAPYSDRLIBS) $(FREEDVLIBS) INCLUDES=$(GTKINCLUDES) @@ -351,13 +351,13 @@ store.o \ store_menu.o \ memory.o -all: prebuild $(PROGRAM) $(HEADERS) $(USBOZY_HEADERS) $(LIMESDR_HEADERS) $(FREEDV_HEADERS) $(LOCALCW_HEADERS) $(I2C_HEADERS) $(GPIO_HEADERS) $(PSK_HEADERS) $(SOURCES) $(USBOZY_SOURCES) $(LIMESDR_SOURCES) $(FREEDV_SOURCES) $(I2C_SOURCES) $(GPIO_SOURCES) $(PSK_SOURCES) +all: prebuild $(PROGRAM) $(HEADERS) $(RADIOBERRY_HEADERS) $(USBOZY_HEADERS) $(LIMESDR_HEADERS) $(FREEDV_HEADERS) $(LOCALCW_HEADERS) $(I2C_HEADERS) $(GPIO_HEADERS) $(PSK_HEADERS) $(SOURCES) $(USBOZY_SOURCES) $(LIMESDR_SOURCES) $(FREEDV_SOURCES) $(I2C_SOURCES) $(GPIO_SOURCES) $(PSK_SOURCES) $(RADIOBERRY_SOURCES) prebuild: rm -f version.o -$(PROGRAM): $(OBJS) $(USBOZY_OBJS) $(LIMESDR_OBJS) $(FREEDV_OBJS) $(LOCALCW_OBJS) $(I2C_OBJS) $(GPIO_OBJS) $(PSK_OBJS) - $(LINK) -o $(PROGRAM) $(OBJS) $(USBOZY_OBJS) $(I2C_OBJS) $(GPIO_OBJS) $(LIMESDR_OBJS) $(FREEDV_OBJS) $(LOCALCW_OBJS) $(PSK_OBJS) $(LIBS) +$(PROGRAM): $(OBJS) $(USBOZY_OBJS) $(LIMESDR_OBJS) $(FREEDV_OBJS) $(LOCALCW_OBJS) $(I2C_OBJS) $(GPIO_OBJS) $(PSK_OBJS) $(RADIOBERRY_OBJS) + $(LINK) -o $(PROGRAM) $(OBJS) $(USBOZY_OBJS) $(I2C_OBJS) $(GPIO_OBJS) $(LIMESDR_OBJS) $(FREEDV_OBJS) $(LOCALCW_OBJS) $(PSK_OBJS) $(LIBS) $(RADIOBERRY_OBJS) .c.o: $(COMPILE) -c -o $@ $< diff --git a/discovery.c b/discovery.c index 3fc509d..21d814e 100644 --- a/discovery.c +++ b/discovery.c @@ -35,6 +35,12 @@ #ifdef USBOZY #include "ozyio.h" #endif +#ifdef RADIOBERRY +#include "radioberry_discovery.h" +#endif +#ifdef RADIOBERRY +#include "radioberry.h" +#endif static GtkWidget *discovery_dialog; static DISCOVERED *d; @@ -104,6 +110,11 @@ fprintf(stderr,"discovery\n"); lime_discovery(); #endif +#ifdef RADIOBERRY + splash_status("Radioberry SDR ... Discovering Device"); + radioberry_discovery(); +#endif + if(devices==0) { gdk_window_set_cursor(gtk_widget_get_window(top_window),gdk_cursor_new(GDK_ARROW)); @@ -211,6 +222,11 @@ fprintf(stderr,"%p protocol=%d name=%s\n",d,d->protocol,d->name); sprintf(text,"%s\n", d->name); break; +#endif +#ifdef RADIOBERRY + case RADIOBERRY_PROTOCOL: + sprintf(text,"%s\n",d->name); + break; #endif } diff --git a/radio.c b/radio.c index 0ecb731..3d1a29a 100644 --- a/radio.c +++ b/radio.c @@ -738,9 +738,9 @@ void setFrequency(long long f) { #ifdef RADIOBERRY case RADIOBERRY_PROTOCOL: #endif - if(ctun) { - long long minf=entry->frequencyA-(long long)(sample_rate/2); - long long maxf=entry->frequencyA+(long long)(sample_rate/2); + if(vfo[v].ctun) { + long long minf=vfo[v].frequency-(long long)(active_receiver->sample_rate/2); + long long maxf=vfo[v].frequency+(long long)(active_receiver->sample_rate/2); if(fmaxf) f=maxf; vfo[v].offset=f-vfo[v].frequency; diff --git a/vfo.c b/vfo.c index 551df1b..b308f8a 100644 --- a/vfo.c +++ b/vfo.c @@ -556,27 +556,8 @@ int vfo_update(void *data) { sprintf(version,"%d.%d", radio->software_version/10, radio->software_version%10); - - switch(radio->protocol) { - case ORIGINAL_PROTOCOL: -#ifdef RADIOBERRY - case RADIOBERRY_PROTOCOL: -#endif - sprintf(version,"%d.%d", - radio->software_version/10, - radio->software_version%10); - break; - case NEW_PROTOCOL: -#ifdef LIMESDR - case LIMESDR_PROTOCOL: -#endif - sprintf(version,"%d.%d.%d", - radio->software_version/100, - (radio->software_version%100)/10, - radio->software_version%10); - break; - } - + } + switch(radio->protocol) { case ORIGINAL_PROTOCOL: switch(radio->device) { @@ -603,11 +584,6 @@ int vfo_update(void *data) { case LIMESDR_PROTOCOL: sprintf(text,"%s", radio->name); break; -#endif -#ifdef RADIOBERRY - case RADIOBERRY_PROTOCOL: - sprintf(text,"%s\n", radio->name); - break; #endif } cairo_set_source_rgb(cr, 0.7, 0.7, 0.7); @@ -658,7 +634,15 @@ int vfo_update(void *data) { cairo_set_font_size(cr, 12); cairo_show_text(cr, temp_text); - cairo_move_to(cr, 210, 15); + cairo_move_to(cr, 190, 15); + if(vox_enabled) { + cairo_set_source_rgb(cr, 1, 0, 0); + } else { + cairo_set_source_rgb(cr, 0.7, 0.7, 0.7); + } + cairo_show_text(cr, "VOX"); + + cairo_move_to(cr, 220, 15); if(locked) { cairo_set_source_rgb(cr, 1, 0, 0); } else { @@ -846,4 +830,4 @@ fprintf(stderr,"vfo_init: width=%d height=%d\n", width, height); | GDK_SCROLL_MASK); return vfo_panel; -} +} \ No newline at end of file