[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Commit-gnuradio] r5978 - gnuradio/branches/features/pager/gr-pager/src
From: |
jcorgan |
Subject: |
[Commit-gnuradio] r5978 - gnuradio/branches/features/pager/gr-pager/src |
Date: |
Sun, 15 Jul 2007 23:08:44 -0600 (MDT) |
Author: jcorgan
Date: 2007-07-15 23:08:43 -0600 (Sun, 15 Jul 2007)
New Revision: 5978
Modified:
gnuradio/branches/features/pager/gr-pager/src/flex_demod.py
gnuradio/branches/features/pager/gr-pager/src/pager_slicer_fb.cc
gnuradio/branches/features/pager/gr-pager/src/pager_slicer_fb.h
gnuradio/branches/features/pager/gr-pager/src/pageri_flex_modes.cc
gnuradio/branches/features/pager/gr-pager/src/pageri_flex_modes.h
Log:
Cleanup before trunk merge.
Modified: gnuradio/branches/features/pager/gr-pager/src/flex_demod.py
===================================================================
--- gnuradio/branches/features/pager/gr-pager/src/flex_demod.py 2007-07-16
04:35:06 UTC (rev 5977)
+++ gnuradio/branches/features/pager/gr-pager/src/flex_demod.py 2007-07-16
05:08:43 UTC (rev 5978)
@@ -30,18 +30,6 @@
This block demodulates a band-limited, complex down-converted baseband
channel into FLEX protocol frames.
- Flow graph:
-
- QUAD - Quadrature demodulator converts FSK to baseband amplitudes
- RSAMP - Resample to 16000 sps
- SLICER - Converts input to one of four symbols (0, 1, 2, 3)
- SYNC - Converts symbol stream to four phases of FLEX blocks
- DEINTx - Deinterleaves FLEX blocks into datawords
- PARSEx - Parse a single FLEX phase worth of data words into pages
- ---
-
- @param fg: flowgraph
- @type sample_rate: integer
"""
def __init__(self, queue, freq=0.0, verbose=False, log=False):
Modified: gnuradio/branches/features/pager/gr-pager/src/pager_slicer_fb.cc
===================================================================
--- gnuradio/branches/features/pager/gr-pager/src/pager_slicer_fb.cc
2007-07-16 04:35:06 UTC (rev 5977)
+++ gnuradio/branches/features/pager/gr-pager/src/pager_slicer_fb.cc
2007-07-16 05:08:43 UTC (rev 5978)
@@ -1,5 +1,5 @@
/*
- * Copyright 2004,2006 Free Software Foundation, Inc.
+ * Copyright 2004,2006,2007 Free Software Foundation, Inc.
*
* This file is part of GNU Radio
*
@@ -37,6 +37,7 @@
gr_make_io_signature (1, 1, sizeof(unsigned char)))
{
d_alpha = alpha;
+ d_beta = 1.0-alpha;
d_avg = 0.0;
}
@@ -48,7 +49,7 @@
unsigned char decision;
// Update DC level and remove
- d_avg = d_avg*(1.0-d_alpha)+sample*d_alpha;
+ d_avg = d_avg*d_beta+sample*d_alpha;
sample -= d_avg;
if (sample > 0) {
Modified: gnuradio/branches/features/pager/gr-pager/src/pager_slicer_fb.h
===================================================================
--- gnuradio/branches/features/pager/gr-pager/src/pager_slicer_fb.h
2007-07-16 04:35:06 UTC (rev 5977)
+++ gnuradio/branches/features/pager/gr-pager/src/pager_slicer_fb.h
2007-07-16 05:08:43 UTC (rev 5978)
@@ -1,5 +1,5 @@
/*
- * Copyright 2006 Free Software Foundation, Inc.
+ * Copyright 2006,2007 Free Software Foundation, Inc.
*
* This file is part of GNU Radio
*
@@ -41,7 +41,8 @@
unsigned char slice(float sample);
- float d_alpha; // Attack constant
+ float d_alpha; // DC removal time constant
+ float d_beta; // 1.0-d_alpha
float d_avg; // Average value for DC offset subtraction
public:
Modified: gnuradio/branches/features/pager/gr-pager/src/pageri_flex_modes.cc
===================================================================
--- gnuradio/branches/features/pager/gr-pager/src/pageri_flex_modes.cc
2007-07-16 04:35:06 UTC (rev 5977)
+++ gnuradio/branches/features/pager/gr-pager/src/pageri_flex_modes.cc
2007-07-16 05:08:43 UTC (rev 5978)
@@ -1,5 +1,5 @@
/*
- * Copyright 2006 Free Software Foundation, Inc.
+ * Copyright 2006,2007 Free Software Foundation, Inc.
*
* This file is part of GNU Radio
*
Modified: gnuradio/branches/features/pager/gr-pager/src/pageri_flex_modes.h
===================================================================
--- gnuradio/branches/features/pager/gr-pager/src/pageri_flex_modes.h
2007-07-16 04:35:06 UTC (rev 5977)
+++ gnuradio/branches/features/pager/gr-pager/src/pageri_flex_modes.h
2007-07-16 05:08:43 UTC (rev 5978)
@@ -1,5 +1,5 @@
/*
- * Copyright 2006 Free Software Foundation, Inc.
+ * Copyright 2006,2007 Free Software Foundation, Inc.
*
* This file is part of GNU Radio
*
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Commit-gnuradio] r5978 - gnuradio/branches/features/pager/gr-pager/src,
jcorgan <=