mirror
/
Hamlib
kopia lustrzana https://github.com/Hamlib/Hamlib
1
0
Forkuj 0
Kod Zgłoszenia Projekty Wydania Wiki Aktywność

some fixes for gnuradio 0.5 

git-svn-id: https://hamlib.svn.sourceforge.net/svnroot/hamlib/trunk@1201 7ae35d74-ebe9-4afe-98af-79ac388436b8
Hamlib-1.1.4
Stéphane Fillod, F8CFE 2002-10-07 21:46:43 +00:00
rodzic 03160aa72f
commit e39518da04
3 zmienionych plików z 11 dodań i 10 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

13
gnuradio/Makefile.am
Wyświetl plik

@ -1,22 +1,21 @@
INCLUDES = @INCLUDES@ @GNURADIO_FLAGS@ CPPFLAGS = @GNURADIO_CFLAGS@
lib_LTLIBRARIES = libhamlib-gnuradio.la lib_LTLIBRARIES = libhamlib-gnuradio.la
libhamlib_gnuradio_la_SOURCES = gnuradio.cc gr.c libhamlib_gnuradio_la_SOURCES = gr.c gnuradio.cc
libhamlib_gnuradio_la_LDFLAGS = -no-undefined -module -version-info 0:0:0 libhamlib_gnuradio_la_LDFLAGS = -no-undefined -module -version-info 0:0:0
# assumes we have libgnuradio, libfftw and c++ # requires libgnuradio, libfftw and c++
#libhamlib_gnuradio_la_LIBADD = ../src/libhamlib.la @GNURADIO_LIBS@ -lstdc++ libhamlib_gnuradio_la_LIBADD = ../src/libhamlib.la @GNURADIO_LIBS@ -lstdc++
libhamlib_gnuradio_la_LIBADD = ../src/libhamlib.la -L. -lgnuradio -lfftw -lrfftw -lstdc++
noinst_HEADERS = gnuradio.h gr_priv.h noinst_HEADERS = gnuradio.h gr_priv.h
noinst_PROGRAMS = testgr check_PROGRAMS = testgr
testgr_SOURCES = testgr.cc testgr_SOURCES = testgr.cc
testgr_LDADD = ../src/libhamlib.la @GNURADIO_LIBS@ testgr_LDADD = ../src/libhamlib.la @GNURADIO_LIBS@
testgr_LDFLAGS = "-dlopen libhamlib-gnuradio.la" testgr_LDFLAGS = -dlopen libhamlib-gnuradio.la
testgr_DEPENDENCIES = libhamlib-gnuradio.la ../src/libhamlib.la testgr_DEPENDENCIES = libhamlib-gnuradio.la ../src/libhamlib.la

4
gnuradio/gr_priv.h
Wyświetl plik

@ -2,7 +2,7 @@
* Hamlib GNUradio backend - gnuradio priv structure * Hamlib GNUradio backend - gnuradio priv structure
* Copyright (c) 2001,2002 by Stephane Fillod * Copyright (c) 2001,2002 by Stephane Fillod
* *
* $Id: gr_priv.h,v 1.1 2002-07-06 09:27:38 fillods Exp $ * $Id: gr_priv.h,v 1.2 2002-10-07 21:46:43 fillods Exp $
* *
* This library is free software; you can redistribute it and/or modify * This library is free software; you can redistribute it and/or modify
* it under the terms of the GNU Library General Public License as * it under the terms of the GNU Library General Public License as
@ -33,7 +33,7 @@
#include <hamlib/rig.h> #include <hamlib/rig.h>
#define IOTYPE float #define IOTYPE short
struct gnuradio_priv_data { struct gnuradio_priv_data {
/* current vfo already in rig_state ? */ /* current vfo already in rig_state ? */

4
gnuradio/testgr.cc
Wyświetl plik

@ -17,7 +17,7 @@
#include <VrSum.h> #include <VrSum.h>
#include <VrConnect.h> #include <VrConnect.h>
#include <VrMultiTask.h> #include <VrMultiTask.h>
#include "VrGUI.h" #include <VrGUI.h>
#define SAMPLING_FREQUENCY 5e6 #define SAMPLING_FREQUENCY 5e6
#define CARRIER_FREQ 1.070e6 // AM 1070 #define CARRIER_FREQ 1.070e6 // AM 1070
@ -44,6 +44,8 @@ int main(int argc, char *argv[])
printf("testgr:hello, I am your main() !\n"); printf("testgr:hello, I am your main() !\n");
rig_set_debug(RIG_DEBUG_TRACE);
my_rig = rig_init(RIG_MODEL_GNURADIO); my_rig = rig_init(RIG_MODEL_GNURADIO);
if (!my_rig) { if (!my_rig) {
fprintf(stderr,"Unknown rig num: %d\n", RIG_MODEL_GNURADIO); fprintf(stderr,"Unknown rig num: %d\n", RIG_MODEL_GNURADIO);