[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Commit-gnuradio] r4010 - in gnuradio/branches/developers/trondeau/digit
|
From: |
trondeau |
|
Subject: |
[Commit-gnuradio] r4010 - in gnuradio/branches/developers/trondeau/digital-wip: . config dtools/bin gnuradio-core/doc gnuradio-core/src/lib/general gnuradio-core/src/lib/omnithread gnuradio-core/src/python/gnuradio/blksimpl gnuradio-examples/python/usrp gr-howto-write-a-block usrp/fpga/toplevel/usrp_std usrp/host/lib |
|
Date: |
Tue, 21 Nov 2006 10:31:06 -0700 (MST) |
Author: trondeau
Date: 2006-11-21 10:31:05 -0700 (Tue, 21 Nov 2006)
New Revision: 4010
Modified:
gnuradio/branches/developers/trondeau/digital-wip/Makefile.am
gnuradio/branches/developers/trondeau/digital-wip/config/grc_ezdop.m4
gnuradio/branches/developers/trondeau/digital-wip/dtools/bin/make-upload
gnuradio/branches/developers/trondeau/digital-wip/gnuradio-core/doc/Makefile.am
gnuradio/branches/developers/trondeau/digital-wip/gnuradio-core/src/lib/general/Makefile.am
gnuradio/branches/developers/trondeau/digital-wip/gnuradio-core/src/lib/omnithread/nt.cc
gnuradio/branches/developers/trondeau/digital-wip/gnuradio-core/src/python/gnuradio/blksimpl/dbpsk.py
gnuradio/branches/developers/trondeau/digital-wip/gnuradio-core/src/python/gnuradio/blksimpl/dqpsk.py
gnuradio/branches/developers/trondeau/digital-wip/gnuradio-examples/python/usrp/usrp_siggen.py
gnuradio/branches/developers/trondeau/digital-wip/gr-howto-write-a-block/README
gnuradio/branches/developers/trondeau/digital-wip/usrp/fpga/toplevel/usrp_std/usrp_std.qsf
gnuradio/branches/developers/trondeau/digital-wip/usrp/host/lib/usrp_prims.cc
Log:
getting local branch up to date with trunk
Modified: gnuradio/branches/developers/trondeau/digital-wip/Makefile.am
===================================================================
--- gnuradio/branches/developers/trondeau/digital-wip/Makefile.am
2006-11-21 17:21:15 UTC (rev 4009)
+++ gnuradio/branches/developers/trondeau/digital-wip/Makefile.am
2006-11-21 17:31:05 UTC (rev 4010)
@@ -25,7 +25,8 @@
bootstrap \
configure \
config.h.in \
- run_tests.sh.in
+ run_tests.sh.in \
+ README.hacking
SUBDIRS = @build_dirs@
DIST_SUBDIRS = @build_dirs@ @skipped_dirs@
Modified: gnuradio/branches/developers/trondeau/digital-wip/config/grc_ezdop.m4
===================================================================
--- gnuradio/branches/developers/trondeau/digital-wip/config/grc_ezdop.m4
2006-11-21 17:21:15 UTC (rev 4009)
+++ gnuradio/branches/developers/trondeau/digital-wip/config/grc_ezdop.m4
2006-11-21 17:31:05 UTC (rev 4010)
@@ -33,6 +33,9 @@
passed=yes
+ # See ticket:96 in trac
+ AM_PROG_CC_C_O
+
# Firmware build requires Atmel AVR microcontroller port of GCC
AC_PATH_PROG([AVRGCC], [avr-gcc -v], [no])
if test x$AVRGCC = xno; then
Modified:
gnuradio/branches/developers/trondeau/digital-wip/dtools/bin/make-upload
===================================================================
--- gnuradio/branches/developers/trondeau/digital-wip/dtools/bin/make-upload
2006-11-21 17:21:15 UTC (rev 4009)
+++ gnuradio/branches/developers/trondeau/digital-wip/dtools/bin/make-upload
2006-11-21 17:31:05 UTC (rev 4010)
@@ -4,9 +4,13 @@
for file in "$@"
do
- echo "directory: gnuradio" > $file.directive
- echo "$passphrase" | gpg --passphrase-fd 0 --clearsign $file.directive
- rm $file.directive
- echo "$passphrase" | gpg --passphrase-fd 0 -b $file
+ (
+ echo "version: 1.1"
+ echo "directory: gnuradio"
+ echo "filename: $file"
+ )> $file.directive
+ echo "$passphrase" | gpg --passphrase-fd 0 --clearsign $file.directive
+ rm $file.directive
+ echo "$passphrase" | gpg --passphrase-fd 0 -b $file
done
passphrase="XYZabcdefhghakdsj;lasjdf;ajfdiuiwjr;lajv;laoisfuaoieurlkajdsflkajsdfoiuew"
Modified:
gnuradio/branches/developers/trondeau/digital-wip/gnuradio-core/doc/Makefile.am
===================================================================
---
gnuradio/branches/developers/trondeau/digital-wip/gnuradio-core/doc/Makefile.am
2006-11-21 17:21:15 UTC (rev 4009)
+++
gnuradio/branches/developers/trondeau/digital-wip/gnuradio-core/doc/Makefile.am
2006-11-21 17:31:05 UTC (rev 4010)
@@ -54,14 +54,14 @@
install-data-local:
$(mkinstalldirs) $(DESTDIR)$(docdir)
- @for i in $(top_srcdir)/README $(top_srcdir)/README.hacking
$(top_srcdir)/ChangeLog; do \
+ @for i in $(top_srcdir)/README $(top_srcdir)/README.hacking; do \
echo "$(INSTALL_DATA) $$i $(DESTDIR)$(docdir)"; \
$(INSTALL_DATA) $$i $(DESTDIR)$(docdir); \
done
cp -r html $(DESTDIR)$(docdir)
uninstall-local:
- @for i in README README.hacking ChangeLog; do \
+ @for i in README README.hacking; do \
echo "$(RM) $(DESTDIR)$(docdir)/$$i;"; \
$(RM) $(DESTDIR)$(docdir)/$$i; \
done
Modified:
gnuradio/branches/developers/trondeau/digital-wip/gnuradio-core/src/lib/general/Makefile.am
===================================================================
---
gnuradio/branches/developers/trondeau/digital-wip/gnuradio-core/src/lib/general/Makefile.am
2006-11-21 17:21:15 UTC (rev 4009)
+++
gnuradio/branches/developers/trondeau/digital-wip/gnuradio-core/src/lib/general/Makefile.am
2006-11-21 17:31:05 UTC (rev 4010)
@@ -37,9 +37,15 @@
gr_add_const_XX.cc.t \
gr_add_const_XX.h.t \
gr_add_const_XX.i.t \
- gr_chunks_to_symbols_XX.cc.t \
- gr_chunks_to_symbols_XX.h.t \
- gr_chunks_to_symbols_XX.i.t \
+ gr_add_vXX.cc.t \
+ gr_add_vXX.h.t \
+ gr_add_vXX.i.t \
+ gr_add_const_vXX.cc.t \
+ gr_add_const_vXX.h.t \
+ gr_add_const_vXX.i.t \
+ gr_chunks_to_symbols_XX.cc.t \
+ gr_chunks_to_symbols_XX.h.t \
+ gr_chunks_to_symbols_XX.i.t \
gr_divide_XX.cc.t \
gr_divide_XX.h.t \
gr_divide_XX.i.t \
@@ -49,6 +55,12 @@
gr_multiply_const_XX.cc.t \
gr_multiply_const_XX.h.t \
gr_multiply_const_XX.i.t \
+ gr_multiply_vXX.cc.t \
+ gr_multiply_vXX.h.t \
+ gr_multiply_vXX.i.t \
+ gr_multiply_const_vXX.cc.t \
+ gr_multiply_const_vXX.h.t \
+ gr_multiply_const_vXX.i.t \
gr_mute_XX.cc.t \
gr_mute_XX.h.t \
gr_mute_XX.i.t \
Modified:
gnuradio/branches/developers/trondeau/digital-wip/gnuradio-core/src/lib/omnithread/nt.cc
===================================================================
---
gnuradio/branches/developers/trondeau/digital-wip/gnuradio-core/src/lib/omnithread/nt.cc
2006-11-21 17:21:15 UTC (rev 4009)
+++
gnuradio/branches/developers/trondeau/digital-wip/gnuradio-core/src/lib/omnithread/nt.cc
2006-11-21 17:31:05 UTC (rev 4010)
@@ -32,6 +32,7 @@
#include <stdlib.h>
#include <errno.h>
+#include <WinError.h>
#include <omnithread.h>
#include <process.h>
@@ -385,7 +386,8 @@
void
omni_semaphore::post(void)
{
- if (!ReleaseSemaphore(nt_sem, 1, NULL))
+ if (!ReleaseSemaphore(nt_sem, 1, NULL)
+ && GetLastError() != ERROR_TOO_MANY_POSTS ) // MinGW fix--see
ticket:95 in trac
throw omni_thread_fatal(GetLastError());
}
Modified:
gnuradio/branches/developers/trondeau/digital-wip/gnuradio-core/src/python/gnuradio/blksimpl/dbpsk.py
===================================================================
---
gnuradio/branches/developers/trondeau/digital-wip/gnuradio-core/src/python/gnuradio/blksimpl/dbpsk.py
2006-11-21 17:21:15 UTC (rev 4009)
+++
gnuradio/branches/developers/trondeau/digital-wip/gnuradio-core/src/python/gnuradio/blksimpl/dbpsk.py
2006-11-21 17:31:05 UTC (rev 4010)
@@ -39,7 +39,7 @@
_def_verbose = False
_def_log = False
-_def_costas_alpha = 0.00
+_def_costas_alpha = None
_def_gain_mu = 0.03
_def_mu = 0.05
_def_omega_relative_limit = 0.005
@@ -242,8 +242,8 @@
# Costas loop (carrier tracking)
# The Costas loop is not needed for BPSK, though it can help. Turn the
Costas loop on
- # by setting an alpha value of something greater than 0 (e.g., 0.1)
- if self._costas_alpha > 0.0:
+ # by setting an alpha value not None.
+ if self._costas_alpha is not None:
costas_order = 2
beta = .25 * self._costas_alpha * self._costas_alpha
self.costas_loop = gr.costas_loop_cc(self._costas_alpha, beta,
0.002, -0.002, costas_order)
@@ -291,7 +291,7 @@
self._setup_logging()
# Connect and Initialize base class
- if self._costas_alpha > 0.0: # With Costas Loop
+ if self._costas_alpha is not None: # With Costas Loop
self._fg.connect(self.pre_scaler, self.agc, self.costas_loop,
self.rrc_filter, self.clock_recovery,
self.diffdec,
self.slicer, self.symbol_mapper, self.unpack)
@@ -313,7 +313,10 @@
print "bits per symbol = %d" % self.bits_per_symbol()
print "Gray code = %s" % self._gray_code
print "RRC roll-off factor = %.2f" % self._excess_bw
- print "Costas Loop alpha = %.5f" % self._costas_alpha
+ if self._costas_alpha is not None:
+ print "Costas Loop alpha = %.5f" % self._costas_alpha
+ else:
+ print "Costas Loop is turned off"
print "M&M symbol sync gain = %.5f" % self._gain_mu
print "M&M symbol sync mu = %.5f" % self._mu
print "M&M omega relative limit = %.5f" % self._omega_relative_limit
@@ -324,7 +327,7 @@
gr.file_sink(gr.sizeof_gr_complex, "prescaler.dat"))
self._fg.connect(self.agc,
gr.file_sink(gr.sizeof_gr_complex, "agc.dat"))
- if self._costas_alpha > 0.0:
+ if self._costas_alpha is not None:
self._fg.connect(self.costas_loop,
gr.file_sink(gr.sizeof_gr_complex,
"costas_loop.dat"))
self._fg.connect((self.costas_loop,1),
Modified:
gnuradio/branches/developers/trondeau/digital-wip/gnuradio-core/src/python/gnuradio/blksimpl/dqpsk.py
===================================================================
---
gnuradio/branches/developers/trondeau/digital-wip/gnuradio-core/src/python/gnuradio/blksimpl/dqpsk.py
2006-11-21 17:21:15 UTC (rev 4009)
+++
gnuradio/branches/developers/trondeau/digital-wip/gnuradio-core/src/python/gnuradio/blksimpl/dqpsk.py
2006-11-21 17:31:05 UTC (rev 4010)
@@ -39,7 +39,7 @@
_def_verbose = False
_def_log = False
-_def_costas_alpha = 0.0
+_def_costas_alpha = None
_def_gain_mu = 0.03
_def_mu = 0.05
_def_omega_relative_limit = 0.005
@@ -238,14 +238,14 @@
self.agc = gr.feedforward_agc_cc(16, 1.0)
# Costas loop (carrier tracking)
- if self._costas_alpha == 0.0: # If no alpha value was specified by
the user
- alpha_dir = {2:0.075, 3:0.075, 4:0.105, 5:0.105, 6:0.125, 7:0.130}
+ if self._costas_alpha is None: # If no alpha value was specified by
the user
+ alpha_dir = {2:0.075, 3:0.09, 4:0.09, 5:0.095, 6:0.10, 7:0.105}
self._costas_alpha = alpha_dir[self._samples_per_symbol]
costas_order = 4
- # The value of beta is now set to be overdamped; this value can have a
huge impact on the
+ # The value of beta is now set to be underdamped; this value can have
a huge impact on the
# performance of QPSK. Set to 0.25 for critically damped or higher for
underdamped responses.
- beta = .15 * self._costas_alpha * self._costas_alpha
+ beta = .5 0 * self._costas_alpha * self._costas_alpha
self.costas_loop = gr.costas_loop_cc(self._costas_alpha, beta, 0.02,
-0.02, costas_order)
# RRC data filter
Modified:
gnuradio/branches/developers/trondeau/digital-wip/gnuradio-examples/python/usrp/usrp_siggen.py
===================================================================
---
gnuradio/branches/developers/trondeau/digital-wip/gnuradio-examples/python/usrp/usrp_siggen.py
2006-11-21 17:21:15 UTC (rev 4009)
+++
gnuradio/branches/developers/trondeau/digital-wip/gnuradio-examples/python/usrp/usrp_siggen.py
2006-11-21 17:31:05 UTC (rev 4010)
@@ -118,7 +118,7 @@
parser.add_option ("-f", "--rf-freq", type="eng_float", default=None,
help="set RF center frequency to FREQ")
parser.add_option ("-i", "--interp", type="int", default=64,
- help="set fgpa interpolation rate to INTERP")
+ help="set fgpa interpolation rate to INTERP
[default=%default]")
parser.add_option ("--sine", dest="type", action="store_const",
const=gr.GR_SIN_WAVE,
help="generate a complex sinusoid [default]",
default=gr.GR_SIN_WAVE)
@@ -130,11 +130,11 @@
help="generate Uniform random output")
parser.add_option ("-w", "--waveform-freq", type="eng_float",
default=100e3,
- help="set waveform frequency to FREQ")
+ help="set waveform frequency to FREQ
[default=%default]")
parser.add_option ("-a", "--amplitude", type="eng_float", default=16e3,
- help="set waveform amplitude to AMPLITUDE",
metavar="AMPL")
+ help="set waveform amplitude to AMPLITUDE
[default=%default]", metavar="AMPL")
parser.add_option ("-o", "--offset", type="eng_float", default=0,
- help="set waveform offset to OFFSET")
+ help="set waveform offset to OFFSET [default=%default]")
(options, args) = parser.parse_args ()
if len(args) != 0:
Modified:
gnuradio/branches/developers/trondeau/digital-wip/gr-howto-write-a-block/README
===================================================================
---
gnuradio/branches/developers/trondeau/digital-wip/gr-howto-write-a-block/README
2006-11-21 17:21:15 UTC (rev 4009)
+++
gnuradio/branches/developers/trondeau/digital-wip/gr-howto-write-a-block/README
2006-11-21 17:31:05 UTC (rev 4010)
@@ -19,9 +19,12 @@
# Boston, MA 02110-1301, USA.
#
-This tarball contains a build tree with examples, Makefiles, etc that
-demonstrate how to write signal processing blocks for the GNU Radio
-system.
+This directory (and the resulting tarball) contains a build tree with
+examples, Makefiles, etc that demonstrate how to write signal
+processing blocks for the GNU Radio system. This directory is
+intentionally distributed separately from the unified tarball of the
+rest of GNU Radio in order to avoid problems for people who have begun
+to write blocks with a modified copy of gr-howto-write-a-block.
This package requires that gnuradio-core is already installed. It
also depends on some GNU Radio prerequisites, such as boost.
Modified:
gnuradio/branches/developers/trondeau/digital-wip/usrp/fpga/toplevel/usrp_std/usrp_std.qsf
===================================================================
---
gnuradio/branches/developers/trondeau/digital-wip/usrp/fpga/toplevel/usrp_std/usrp_std.qsf
2006-11-21 17:21:15 UTC (rev 4009)
+++
gnuradio/branches/developers/trondeau/digital-wip/usrp/fpga/toplevel/usrp_std/usrp_std.qsf
2006-11-21 17:31:05 UTC (rev 4010)
@@ -27,7 +27,7 @@
# ========================
set_global_assignment -name ORIGINAL_QUARTUS_VERSION 3.0
set_global_assignment -name PROJECT_CREATION_TIME_DATE "00:14:04 JULY 13,
2003"
-set_global_assignment -name LAST_QUARTUS_VERSION "5.1 SP2"
+set_global_assignment -name LAST_QUARTUS_VERSION "6.0 SP1"
# Pin & Location Assignments
# ==========================
Modified:
gnuradio/branches/developers/trondeau/digital-wip/usrp/host/lib/usrp_prims.cc
===================================================================
---
gnuradio/branches/developers/trondeau/digital-wip/usrp/host/lib/usrp_prims.cc
2006-11-21 17:21:15 UTC (rev 4009)
+++
gnuradio/branches/developers/trondeau/digital-wip/usrp/host/lib/usrp_prims.cc
2006-11-21 17:31:05 UTC (rev 4010)
@@ -1344,7 +1344,7 @@
std::string
usrp_serial_number(struct usb_dev_handle *udh)
{
- u_int8_t iserial = usb_device(udh)->descriptor.iSerialNumber;
+ unsigned char iserial = usb_device(udh)->descriptor.iSerialNumber;
if (iserial == 0)
return "";
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Commit-gnuradio] r4010 - in gnuradio/branches/developers/trondeau/digital-wip: . config dtools/bin gnuradio-core/doc gnuradio-core/src/lib/general gnuradio-core/src/lib/omnithread gnuradio-core/src/python/gnuradio/blksimpl gnuradio-examples/python/usrp gr-howto-write-a-block usrp/fpga/toplevel/usrp_std usrp/host/lib,
trondeau <=