diff options
113 files changed, 30148 insertions, 11513 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 935669d6d6..c94116e5ce 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -41,7 +41,7 @@ list(APPEND CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/Modules) # Set the version information here set(VERSION_INFO_MAJOR_VERSION 3) set(VERSION_INFO_API_COMPAT 7) -set(VERSION_INFO_MINOR_VERSION 4) +set(VERSION_INFO_MINOR_VERSION 5) set(VERSION_INFO_MAINT_VERSION git) include(GrVersion) #setup version info @@ -86,7 +86,7 @@ endif(CMAKE_COMPILER_IS_GNUCXX) if(MSVC) include_directories(${CMAKE_SOURCE_DIR}/cmake/msvc) #missing headers - add_definitions(-D_WIN32_WINNT=0x0501) #minimum version required is windows xp + add_definitions(-D_WIN32_WINNT=0x0502) #Minimum version: "Windows Server 2003 with SP1, Windows XP with SP2" add_definitions(-DNOMINMAX) #disables stupidity and enables std::min and std::max add_definitions( #stop all kinds of compatibility warnings -D_SCL_SECURE_NO_WARNINGS diff --git a/cmake/Modules/FindZeroMQ.cmake b/cmake/Modules/FindZeroMQ.cmake index c1155c4cc5..62a1c6b969 100644 --- a/cmake/Modules/FindZeroMQ.cmake +++ b/cmake/Modules/FindZeroMQ.cmake @@ -2,7 +2,7 @@ INCLUDE(FindPkgConfig) PKG_CHECK_MODULES(PC_ZEROMQ "libzmq") FIND_PATH(ZEROMQ_INCLUDE_DIRS - NAMES zmq.h + NAMES zmq.hpp HINTS ${PC_ZEROMQ_INCLUDE_DIR} ${CMAKE_INSTALL_PREFIX}/include PATHS diff --git a/gnuradio-runtime/include/gnuradio/rpcregisterhelpers.h b/gnuradio-runtime/include/gnuradio/rpcregisterhelpers.h index 86650a741c..0999dea747 100644 --- a/gnuradio-runtime/include/gnuradio/rpcregisterhelpers.h +++ b/gnuradio-runtime/include/gnuradio/rpcregisterhelpers.h @@ -30,6 +30,11 @@ #include <gnuradio/rpcmanager.h> #include <gnuradio/rpcserver_selector.h> #include <gnuradio/rpcserver_base.h> + +// Fixes circular dependency issue before including block_registry.h +class rpcbasic_base; +typedef boost::shared_ptr<rpcbasic_base> rpcbasic_sptr; + #include <gnuradio/block_registry.h> @@ -585,9 +590,6 @@ public: }; -typedef boost::shared_ptr<rpcbasic_base> rpcbasic_sptr; - - /********************************************************************* * RPC Register Set Classes diff --git a/gnuradio-runtime/lib/block.cc b/gnuradio-runtime/lib/block.cc index 6309bca9b1..b5bfbdaab3 100644 --- a/gnuradio-runtime/lib/block.cc +++ b/gnuradio-runtime/lib/block.cc @@ -30,7 +30,6 @@ #include <gnuradio/buffer.h> #include <gnuradio/prefs.h> #include <gnuradio/config.h> -#include <gnuradio/rpcregisterhelpers.h> #include <stdexcept> #include <iostream> @@ -796,6 +795,7 @@ namespace gr { { d_pc_rpc_set = true; #if defined(GR_CTRLPORT) && defined(GR_PERFORMANCE_COUNTERS) +#include <gnuradio/rpcregisterhelpers.h> d_rpc_vars.push_back( rpcbasic_sptr(new rpcbasic_register_trigger<block>( alias(), "reset_perf_counters", &block::reset_perf_counters, diff --git a/gnuradio-runtime/lib/math/qa_fast_atan2f.cc b/gnuradio-runtime/lib/math/qa_fast_atan2f.cc index 2ec4ecb182..b704756798 100644 --- a/gnuradio-runtime/lib/math/qa_fast_atan2f.cc +++ b/gnuradio-runtime/lib/math/qa_fast_atan2f.cc @@ -30,6 +30,12 @@ #include <cmath> #include <limits> +#ifdef _MSC_VER +#define isnan _isnan +#else +using std::isnan; +#endif + void qa_fast_atan2f::t1() { @@ -92,7 +98,7 @@ qa_fast_atan2f::t2() x = inf; y = inf; gr_atan2f = gr::fast_atan2f(x, y); - CPPUNIT_ASSERT(std::isnan(gr_atan2f)); + CPPUNIT_ASSERT(isnan(gr_atan2f)); /* Test x as NAN */ @@ -123,11 +129,11 @@ qa_fast_atan2f::t2() x = inf; y = nan; gr_atan2f = gr::fast_atan2f(x, y); - CPPUNIT_ASSERT(std::isnan(gr_atan2f)); + CPPUNIT_ASSERT(isnan(gr_atan2f)); x = nan; y = inf; gr_atan2f = gr::fast_atan2f(x, y); - CPPUNIT_ASSERT(std::isnan(gr_atan2f)); + CPPUNIT_ASSERT(isnan(gr_atan2f)); } diff --git a/gnuradio-runtime/lib/thread/thread.cc b/gnuradio-runtime/lib/thread/thread.cc index e393ae5438..483dfed493 100644 --- a/gnuradio-runtime/lib/thread/thread.cc +++ b/gnuradio-runtime/lib/thread/thread.cc @@ -120,21 +120,14 @@ namespace gr { DWORD dwFlags; // Reserved for future use, must be zero } THREADNAME_INFO; #pragma pack(pop) - void - set_thread_name(gr_thread_t thread, std::string name) + static void + _set_thread_name(gr_thread_t thread, const char* name, DWORD dwThreadId) { const DWORD SET_THREAD_NAME_EXCEPTION = 0x406D1388; - DWORD dwThreadId = GetThreadId(thread); - if (dwThreadId == 0) - return; - - if (name.empty()) - name = boost::str(boost::format("thread %lu") % dwThreadId); - THREADNAME_INFO info; info.dwType = 0x1000; - info.szName = name.c_str(); + info.szName = name; info.dwThreadID = dwThreadId; info.dwFlags = 0; @@ -147,6 +140,19 @@ namespace gr { } } + void + set_thread_name(gr_thread_t thread, std::string name) + { + DWORD dwThreadId = GetThreadId(thread); + if (dwThreadId == 0) + return; + + if (name.empty()) + name = boost::str(boost::format("thread %lu") % dwThreadId); + + _set_thread_name(thread, name.c_str(), dwThreadId); + } + } /* namespace thread */ } /* namespace gr */ diff --git a/gnuradio-runtime/lib/tpb_thread_body.cc b/gnuradio-runtime/lib/tpb_thread_body.cc index d2f0fce833..d80ab860fa 100644 --- a/gnuradio-runtime/lib/tpb_thread_body.cc +++ b/gnuradio-runtime/lib/tpb_thread_body.cc @@ -37,7 +37,12 @@ namespace gr { { //std::cerr << "tpb_thread_body: " << block << std::endl; +#ifdef _MSC_VER + #include <Windows.h> + thread::set_thread_name(GetCurrentThread(), boost::str(boost::format("%s%d") % block->name() % block->unique_id())); +#else thread::set_thread_name(pthread_self(), boost::str(boost::format("%s%d") % block->name() % block->unique_id())); +#endif block_detail *d = block->detail().get(); block_executor::state s; diff --git a/gr-audio/examples/grc/cvsd_sweep.grc b/gr-audio/examples/grc/cvsd_sweep.grc index 00da399da1..a4eddfb1b0 100644 --- a/gr-audio/examples/grc/cvsd_sweep.grc +++ b/gr-audio/examples/grc/cvsd_sweep.grc @@ -1,6 +1,165 @@ <?xml version='1.0' encoding='ASCII'?> <flow_graph> - <timestamp>Sat Nov 10 15:10:11 2012</timestamp> + <timestamp>Sat Jul 12 14:30:30 2014</timestamp> + <block> + <key>variable</key> + <param> + <key>id</key> + <value>resample</value> + </param> + <param> + <key>_enabled</key> + <value>True</value> + </param> + <param> + <key>value</key> + <value>8</value> + </param> + <param> + <key>alias</key> + <value></value> + </param> + <param> + <key>_coordinate</key> + <value>(356, 0)</value> + </param> + <param> + <key>_rotation</key> + <value>0</value> + </param> + </block> + <block> + <key>variable</key> + <param> + <key>id</key> + <value>audio_rate</value> + </param> + <param> + <key>_enabled</key> + <value>True</value> + </param> + <param> + <key>value</key> + <value>8000</value> + </param> + <param> + <key>alias</key> + <value></value> + </param> + <param> + <key>_coordinate</key> + <value>(260, 0)</value> + </param> + <param> + <key>_rotation</key> + <value>0</value> + </param> + </block> + <block> + <key>variable</key> + <param> + <key>id</key> + <value>bw</value> + </param> + <param> + <key>_enabled</key> + <value>True</value> + </param> + <param> + <key>value</key> + <value>0.5</value> + </param> + <param> + <key>alias</key> + <value></value> + </param> + <param> + <key>_coordinate</key> + <value>(449, 0)</value> + </param> + <param> + <key>_rotation</key> + <value>0</value> + </param> + </block> + <block> + <key>import</key> + <param> + <key>id</key> + <value>import_0</value> + </param> + <param> + <key>_enabled</key> + <value>True</value> + </param> + <param> + <key>import</key> + <value>import math</value> + </param> + <param> + <key>alias</key> + <value></value> + </param> + <param> + <key>_coordinate</key> + <value>(157, 0)</value> + </param> + <param> + <key>_rotation</key> + <value>0</value> + </param> + </block> + <block> + <key>qtgui_tab_widget</key> + <param> + <key>id</key> + <value>displays</value> + </param> + <param> + <key>_enabled</key> + <value>True</value> + </param> + <param> + <key>num_tabs</key> + <value>3</value> + </param> + <param> + <key>label0</key> + <value>Original</value> + </param> + <param> + <key>label1</key> + <value>Encoded</value> + </param> + <param> + <key>label2</key> + <value>Decoded</value> + </param> + <param> + <key>label3</key> + <value>Tab 3</value> + </param> + <param> + <key>label4</key> + <value>Tab 4</value> + </param> + <param> + <key>gui_hint</key> + <value></value> + </param> + <param> + <key>alias</key> + <value></value> + </param> + <param> + <key>_coordinate</key> + <value>(0, 89)</value> + </param> + <param> + <key>_rotation</key> + <value>0</value> + </param> + </block> <block> <key>options</key> <param> @@ -29,7 +188,7 @@ </param> <param> <key>generate_options</key> - <value>wx_gui</value> + <value>qt_gui</value> </param> <param> <key>category</key> @@ -52,8 +211,12 @@ <value></value> </param> <param> + <key>alias</key> + <value></value> + </param> + <param> <key>_coordinate</key> - <value>(10, 10)</value> + <value>(-1, 0)</value> </param> <param> <key>_rotation</key> @@ -61,22 +224,334 @@ </param> </block> <block> - <key>import</key> + <key>qtgui_time_sink_x</key> <param> <key>id</key> - <value>import_0</value> + <value>qtgui_time_sink_x_0_1</value> </param> <param> <key>_enabled</key> <value>True</value> </param> <param> - <key>import</key> - <value>import math</value> + <key>type</key> + <value>float</value> + </param> + <param> + <key>name</key> + <value>Decoded Waveform</value> + </param> + <param> + <key>size</key> + <value>1024</value> + </param> + <param> + <key>srate</key> + <value>audio_rate</value> + </param> + <param> + <key>autoscale</key> + <value>False</value> + </param> + <param> + <key>ymin</key> + <value>-1</value> + </param> + <param> + <key>ymax</key> + <value>1</value> + </param> + <param> + <key>nconnections</key> + <value>1</value> + </param> + <param> + <key>update_time</key> + <value>0.10</value> + </param> + <param> + <key>entags</key> + <value>True</value> + </param> + <param> + <key>gui_hint</key> + <value>displays@2:1,0,1,1</value> + </param> + <param> + <key>tr_mode</key> + <value>qtgui.TRIG_MODE_FREE</value> + </param> + <param> + <key>tr_slope</key> + <value>qtgui.TRIG_SLOPE_POS</value> + </param> + <param> + <key>tr_level</key> + <value>0.0</value> + </param> + <param> + <key>tr_delay</key> + <value>0</value> + </param> + <param> + <key>tr_chan</key> + <value>0</value> + </param> + <param> + <key>tr_tag</key> + <value>""</value> + </param> + <param> + <key>label1</key> + <value></value> + </param> + <param> + <key>width1</key> + <value>1</value> + </param> + <param> + <key>color1</key> + <value>"blue"</value> + </param> + <param> + <key>style1</key> + <value>1</value> + </param> + <param> + <key>marker1</key> + <value>-1</value> + </param> + <param> + <key>alpha1</key> + <value>1.0</value> + </param> + <param> + <key>label2</key> + <value></value> + </param> + <param> + <key>width2</key> + <value>1</value> + </param> + <param> + <key>color2</key> + <value>"red"</value> + </param> + <param> + <key>style2</key> + <value>1</value> + </param> + <param> + <key>marker2</key> + <value>-1</value> + </param> + <param> + <key>alpha2</key> + <value>1.0</value> + </param> + <param> + <key>label3</key> + <value></value> + </param> + <param> + <key>width3</key> + <value>1</value> + </param> + <param> + <key>color3</key> + <value>"green"</value> + </param> + <param> + <key>style3</key> + <value>1</value> + </param> + <param> + <key>marker3</key> + <value>-1</value> + </param> + <param> + <key>alpha3</key> + <value>1.0</value> + </param> + <param> + <key>label4</key> + <value></value> + </param> + <param> + <key>width4</key> + <value>1</value> + </param> + <param> + <key>color4</key> + <value>"black"</value> + </param> + <param> + <key>style4</key> + <value>1</value> + </param> + <param> + <key>marker4</key> + <value>-1</value> + </param> + <param> + <key>alpha4</key> + <value>1.0</value> + </param> + <param> + <key>label5</key> + <value></value> + </param> + <param> + <key>width5</key> + <value>1</value> + </param> + <param> + <key>color5</key> + <value>"cyan"</value> + </param> + <param> + <key>style5</key> + <value>1</value> + </param> + <param> + <key>marker5</key> + <value>-1</value> + </param> + <param> + <key>alpha5</key> + <value>1.0</value> + </param> + <param> + <key>label6</key> + <value></value> + </param> + <param> + <key>width6</key> + <value>1</value> + </param> + <param> + <key>color6</key> + <value>"magenta"</value> + </param> + <param> + <key>style6</key> + <value>1</value> + </param> + <param> + <key>marker6</key> + <value>-1</value> + </param> + <param> + <key>alpha6</key> + <value>1.0</value> + </param> + <param> + <key>label7</key> + <value></value> + </param> + <param> + <key>width7</key> + <value>1</value> + </param> + <param> + <key>color7</key> + <value>"yellow"</value> + </param> + <param> + <key>style7</key> + <value>1</value> + </param> + <param> + <key>marker7</key> + <value>-1</value> + </param> + <param> + <key>alpha7</key> + <value>1.0</value> + </param> + <param> + <key>label8</key> + <value></value> + </param> + <param> + <key>width8</key> + <value>1</value> + </param> + <param> + <key>color8</key> + <value>"dark red"</value> + </param> + <param> + <key>style8</key> + <value>1</value> + </param> + <param> + <key>marker8</key> + <value>-1</value> + </param> + <param> + <key>alpha8</key> + <value>1.0</value> + </param> + <param> + <key>label9</key> + <value></value> + </param> + <param> + <key>width9</key> + <value>1</value> + </param> + <param> + <key>color9</key> + <value>"dark green"</value> + </param> + <param> + <key>style9</key> + <value>1</value> + </param> + <param> + <key>marker9</key> + <value>-1</value> + </param> + <param> + <key>alpha9</key> + <value>1.0</value> + </param> + <param> + <key>label10</key> + <value></value> + </param> + <param> + <key>width10</key> + <value>1</value> + </param> + <param> + <key>color10</key> + <value>"blue"</value> + </param> + <param> + <key>style10</key> + <value>1</value> + </param> + <param> + <key>marker10</key> + <value>-1</value> + </param> + <param> + <key>alpha10</key> + <value>1.0</value> + </param> + <param> + <key>alias</key> + <value></value> + </param> + <param> + <key>affinity</key> + <value></value> </param> <param> <key>_coordinate</key> - <value>(157, 11)</value> + <value>(1114, 319)</value> </param> <param> <key>_rotation</key> @@ -102,8 +577,24 @@ <value>bw</value> </param> <param> + <key>alias</key> + <value></value> + </param> + <param> + <key>affinity</key> + <value></value> + </param> + <param> + <key>minoutbuf</key> + <value>0</value> + </param> + <param> + <key>maxoutbuf</key> + <value>0</value> + </param> + <param> <key>_coordinate</key> - <value>(887, 340)</value> + <value>(868, 225)</value> </param> <param> <key>_rotation</key> @@ -111,30 +602,573 @@ </param> </block> <block> - <key>blocks_vco_f</key> + <key>qtgui_time_sink_x</key> <param> <key>id</key> - <value>vco</value> + <value>qtgui_time_sink_x_0</value> </param> <param> <key>_enabled</key> <value>True</value> </param> <param> - <key>samp_rate</key> + <key>type</key> + <value>float</value> + </param> + <param> + <key>name</key> + <value>Original Waveform</value> + </param> + <param> + <key>size</key> + <value>1024</value> + </param> + <param> + <key>srate</key> <value>audio_rate</value> </param> <param> - <key>sensitivity</key> - <value>audio_rate*2*math.pi</value> + <key>autoscale</key> + <value>False</value> </param> <param> - <key>amplitude</key> - <value>0.9</value> + <key>ymin</key> + <value>-1</value> + </param> + <param> + <key>ymax</key> + <value>1</value> + </param> + <param> + <key>nconnections</key> + <value>1</value> + </param> + <param> + <key>update_time</key> + <value>0.10</value> + </param> + <param> + <key>entags</key> + <value>True</value> + </param> + <param> + <key>gui_hint</key> + <value>displays@0:1,0,1,1</value> + </param> + <param> + <key>tr_mode</key> + <value>qtgui.TRIG_MODE_FREE</value> + </param> + <param> + <key>tr_slope</key> + <value>qtgui.TRIG_SLOPE_POS</value> + </param> + <param> + <key>tr_level</key> + <value>0.0</value> + </param> + <param> + <key>tr_delay</key> + <value>0</value> + </param> + <param> + <key>tr_chan</key> + <value>0</value> + </param> + <param> + <key>tr_tag</key> + <value>""</value> + </param> + <param> + <key>label1</key> + <value></value> + </param> + <param> + <key>width1</key> + <value>1</value> + </param> + <param> + <key>color1</key> + <value>"blue"</value> + </param> + <param> + <key>style1</key> + <value>1</value> + </param> + <param> + <key>marker1</key> + <value>-1</value> + </param> + <param> + <key>alpha1</key> + <value>1.0</value> + </param> + <param> + <key>label2</key> + <value></value> + </param> + <param> + <key>width2</key> + <value>1</value> + </param> + <param> + <key>color2</key> + <value>"red"</value> + </param> + <param> + <key>style2</key> + <value>1</value> + </param> + <param> + <key>marker2</key> + <value>-1</value> + </param> + <param> + <key>alpha2</key> + <value>1.0</value> + </param> + <param> + <key>label3</key> + <value></value> + </param> + <param> + <key>width3</key> + <value>1</value> + </param> + <param> + <key>color3</key> + <value>"green"</value> + </param> + <param> + <key>style3</key> + <value>1</value> + </param> + <param> + <key>marker3</key> + <value>-1</value> + </param> + <param> + <key>alpha3</key> + <value>1.0</value> + </param> + <param> + <key>label4</key> + <value></value> + </param> + <param> + <key>width4</key> + <value>1</value> + </param> + <param> + <key>color4</key> + <value>"black"</value> + </param> + <param> + <key>style4</key> + <value>1</value> + </param> + <param> + <key>marker4</key> + <value>-1</value> + </param> + <param> + <key>alpha4</key> + <value>1.0</value> + </param> + <param> + <key>label5</key> + <value></value> + </param> + <param> + <key>width5</key> + <value>1</value> + </param> + <param> + <key>color5</key> + <value>"cyan"</value> + </param> + <param> + <key>style5</key> + <value>1</value> + </param> + <param> + <key>marker5</key> + <value>-1</value> + </param> + <param> + <key>alpha5</key> + <value>1.0</value> + </param> + <param> + <key>label6</key> + <value></value> + </param> + <param> + <key>width6</key> + <value>1</value> + </param> + <param> + <key>color6</key> + <value>"magenta"</value> + </param> + <param> + <key>style6</key> + <value>1</value> + </param> + <param> + <key>marker6</key> + <value>-1</value> + </param> + <param> + <key>alpha6</key> + <value>1.0</value> + </param> + <param> + <key>label7</key> + <value></value> + </param> + <param> + <key>width7</key> + <value>1</value> + </param> + <param> + <key>color7</key> + <value>"yellow"</value> + </param> + <param> + <key>style7</key> + <value>1</value> + </param> + <param> + <key>marker7</key> + <value>-1</value> + </param> + <param> + <key>alpha7</key> + <value>1.0</value> + </param> + <param> + <key>label8</key> + <value></value> + </param> + <param> + <key>width8</key> + <value>1</value> + </param> + <param> + <key>color8</key> + <value>"dark red"</value> + </param> + <param> + <key>style8</key> + <value>1</value> + </param> + <param> + <key>marker8</key> + <value>-1</value> + </param> + <param> + <key>alpha8</key> + <value>1.0</value> + </param> + <param> + <key>label9</key> + <value></value> + </param> + <param> + <key>width9</key> + <value>1</value> + </param> + <param> + <key>color9</key> + <value>"dark green"</value> + </param> + <param> + <key>style9</key> + <value>1</value> + </param> + <param> + <key>marker9</key> + <value>-1</value> + </param> + <param> + <key>alpha9</key> + <value>1.0</value> + </param> + <param> + <key>label10</key> + <value></value> + </param> + <param> + <key>width10</key> + <value>1</value> + </param> + <param> + <key>color10</key> + <value>"blue"</value> + </param> + <param> + <key>style10</key> + <value>1</value> + </param> + <param> + <key>marker10</key> + <value>-1</value> + </param> + <param> + <key>alpha10</key> + <value>1.0</value> + </param> + <param> + <key>alias</key> + <value></value> + </param> + <param> + <key>affinity</key> + <value></value> </param> <param> <key>_coordinate</key> - <value>(427, 332)</value> + <value>(388, 315)</value> + </param> + <param> + <key>_rotation</key> + <value>180</value> + </param> + </block> + <block> + <key>qtgui_freq_sink_x</key> + <param> + <key>id</key> + <value>qtgui_freq_sink_x_0_1</value> + </param> + <param> + <key>_enabled</key> + <value>True</value> + </param> + <param> + <key>type</key> + <value>float</value> + </param> + <param> + <key>name</key> + <value>Decoded Spectrum</value> + </param> + <param> + <key>fftsize</key> + <value>1024</value> + </param> + <param> + <key>wintype</key> + <value>firdes.WIN_BLACKMAN_hARRIS</value> + </param> + <param> + <key>fc</key> + <value>0</value> + </param> + <param> + <key>bw</key> + <value>audio_rate</value> + </param> + <param> + <key>autoscale</key> + <value>True</value> + </param> + <param> + <key>average</key> + <value>1.0</value> + </param> + <param> + <key>ymin</key> + <value>-140</value> + </param> + <param> + <key>ymax</key> + <value>10</value> + </param> + <param> + <key>nconnections</key> + <value>1</value> + </param> + <param> + <key>update_time</key> + <value>0.10</value> + </param> + <param> + <key>gui_hint</key> + <value>displays@2:0,0,1,1</value> + </param> + <param> + <key>label1</key> + <value></value> + </param> + <param> + <key>width1</key> + <value>1</value> + </param> + <param> + <key>color1</key> + <value>"blue"</value> + </param> + <param> + <key>alpha1</key> + <value>1.0</value> + </param> + <param> + <key>label2</key> + <value></value> + </param> + <param> + <key>width2</key> + <value>1</value> + </param> + <param> + <key>color2</key> + <value>"red"</value> + </param> + <param> + <key>alpha2</key> + <value>1.0</value> + </param> + <param> + <key>label3</key> + <value></value> + </param> + <param> + <key>width3</key> + <value>1</value> + </param> + <param> + <key>color3</key> + <value>"green"</value> + </param> + <param> + <key>alpha3</key> + <value>1.0</value> + </param> + <param> + <key>label4</key> + <value></value> + </param> + <param> + <key>width4</key> + <value>1</value> + </param> + <param> + <key>color4</key> + <value>"black"</value> + </param> + <param> + <key>alpha4</key> + <value>1.0</value> + </param> + <param> + <key>label5</key> + <value></value> + </param> + <param> + <key>width5</key> + <value>1</value> + </param> + <param> + <key>color5</key> + <value>"cyan"</value> + </param> + <param> + <key>alpha5</key> + <value>1.0</value> + </param> + <param> + <key>label6</key> + <value></value> + </param> + <param> + <key>width6</key> + <value>1</value> + </param> + <param> + <key>color6</key> + <value>"magenta"</value> + </param> + <param> + <key>alpha6</key> + <value>1.0</value> + </param> + <param> + <key>label7</key> + <value></value> + </param> + <param> + <key>width7</key> + <value>1</value> + </param> + <param> + <key>color7</key> + <value>"yellow"</value> + </param> + <param> + <key>alpha7</key> + <value>1.0</value> + </param> + <param> + <key>label8</key> + <value></value> + </param> + <param> + <key>width8</key> + <value>1</value> + </param> + <param> + <key>color8</key> + <value>"dark red"</value> + </param> + <param> + <key>alpha8</key> + <value>1.0</value> + </param> + <param> + <key>label9</key> + <value></value> + </param> + <param> + <key>width9</key> + <value>1</value> + </param> + <param> + <key>color9</key> + <value>"dark green"</value> + </param> + <param> + <key>alpha9</key> + <value>1.0</value> + </param> + <param> + <key>label10</key> + <value></value> + </param> + <param> + <key>width10</key> + <value>1</value> + </param> + <param> + <key>color10</key> + <value>"dark blue"</value> + </param> + <param> + <key>alpha10</key> + <value>1.0</value> + </param> + <param> + <key>alias</key> + <value></value> + </param> + <param> + <key>affinity</key> + <value></value> + </param> + <param> + <key>_coordinate</key> + <value>(1122, 90)</value> </param> <param> <key>_rotation</key> @@ -160,8 +1194,24 @@ <value>bw</value> </param> <param> + <key>alias</key> + <value></value> + </param> + <param> + <key>affinity</key> + <value></value> + </param> + <param> + <key>minoutbuf</key> + <value>0</value> + </param> + <param> + <key>maxoutbuf</key> + <value>0</value> + </param> + <param> <key>_coordinate</key> - <value>(655, 340)</value> + <value>(636, 226)</value> </param> <param> <key>_rotation</key> @@ -195,8 +1245,24 @@ <value>1</value> </param> <param> + <key>alias</key> + <value></value> + </param> + <param> + <key>affinity</key> + <value></value> + </param> + <param> + <key>minoutbuf</key> + <value>0</value> + </param> + <param> + <key>maxoutbuf</key> + <value>0</value> + </param> + <param> <key>_coordinate</key> - <value>(648, 415)</value> + <value>(629, 301)</value> </param> <param> <key>_rotation</key> @@ -204,26 +1270,50 @@ </param> </block> <block> - <key>blocks_char_to_float</key> + <key>blocks_throttle</key> <param> <key>id</key> - <value>c2f</value> + <value>throttle</value> </param> <param> <key>_enabled</key> <value>True</value> </param> <param> + <key>type</key> + <value>float</value> + </param> + <param> + <key>samples_per_second</key> + <value>audio_rate</value> + </param> + <param> <key>vlen</key> <value>1</value> </param> <param> - <key>scale</key> - <value>1</value> + <key>ignoretag</key> + <value>True</value> + </param> + <param> + <key>alias</key> + <value></value> + </param> + <param> + <key>affinity</key> + <value></value> + </param> + <param> + <key>minoutbuf</key> + <value>0</value> + </param> + <param> + <key>maxoutbuf</key> + <value>0</value> </param> <param> <key>_coordinate</key> - <value>(676, 483)</value> + <value>(219, 234)</value> </param> <param> <key>_rotation</key> @@ -231,57 +1321,58 @@ </param> </block> <block> - <key>audio_sink</key> + <key>analog_sig_source_x</key> <param> <key>id</key> - <value>audio_sink</value> + <value>analog_sig_source_x_0</value> </param> <param> <key>_enabled</key> <value>True</value> </param> <param> + <key>type</key> + <value>float</value> + </param> + <param> <key>samp_rate</key> <value>audio_rate</value> </param> <param> - <key>device_name</key> - <value>plughw:0,0</value> + <key>waveform</key> + <value>analog.GR_TRI_WAVE</value> </param> <param> - <key>ok_to_block</key> - <value>True</value> + <key>freq</key> + <value>0.05</value> </param> <param> - <key>num_inputs</key> - <value>1</value> + <key>amp</key> + <value>0.5</value> </param> <param> - <key>_coordinate</key> - <value>(1127, 340)</value> + <key>offset</key> + <value>0</value> </param> <param> - <key>_rotation</key> - <value>0</value> + <key>alias</key> + <value></value> </param> - </block> - <block> - <key>variable</key> <param> - <key>id</key> - <value>audio_rate</value> + <key>affinity</key> + <value></value> </param> <param> - <key>_enabled</key> - <value>True</value> + <key>minoutbuf</key> + <value>0</value> </param> <param> - <key>value</key> - <value>8000</value> + <key>maxoutbuf</key> + <value>0</value> </param> <param> <key>_coordinate</key> - <value>(251, 10)</value> + <value>(17, 202)</value> </param> <param> <key>_rotation</key> @@ -289,45 +1380,46 @@ </param> </block> <block> - <key>variable</key> + <key>blocks_vco_f</key> <param> <key>id</key> - <value>resample</value> + <value>vco</value> </param> <param> <key>_enabled</key> <value>True</value> </param> <param> - <key>value</key> - <value>8</value> + <key>samp_rate</key> + <value>audio_rate</value> </param> <param> - <key>_coordinate</key> - <value>(344, 11)</value> + <key>sensitivity</key> + <value>audio_rate*2*math.pi</value> </param> <param> - <key>_rotation</key> - <value>0</value> + <key>amplitude</key> + <value>0.9</value> </param> - </block> - <block> - <key>variable</key> <param> - <key>id</key> - <value>bw</value> + <key>alias</key> + <value></value> </param> <param> - <key>_enabled</key> - <value>True</value> + <key>affinity</key> + <value></value> </param> <param> - <key>value</key> - <value>0.5</value> + <key>minoutbuf</key> + <value>0</value> + </param> + <param> + <key>maxoutbuf</key> + <value>0</value> </param> <param> <key>_coordinate</key> - <value>(431, 11)</value> + <value>(398, 218)</value> </param> <param> <key>_rotation</key> @@ -335,34 +1427,42 @@ </param> </block> <block> - <key>notebook</key> + <key>blocks_char_to_float</key> <param> <key>id</key> - <value>displays</value> + <value>c2f</value> </param> <param> <key>_enabled</key> <value>True</value> </param> <param> - <key>style</key> - <value>wx.NB_TOP</value> + <key>vlen</key> + <value>1</value> </param> <param> - <key>labels</key> - <value>['Original','Encoded','Decoded']</value> + <key>scale</key> + <value>1</value> </param> <param> - <key>grid_pos</key> + <key>alias</key> <value></value> </param> <param> - <key>notebook</key> + <key>affinity</key> <value></value> </param> <param> + <key>minoutbuf</key> + <value>0</value> + </param> + <param> + <key>maxoutbuf</key> + <value>0</value> + </param> + <param> <key>_coordinate</key> - <value>(12, 106)</value> + <value>(657, 369)</value> </param> <param> <key>_rotation</key> @@ -370,10 +1470,10 @@ </param> </block> <block> - <key>wxgui_fftsink2</key> + <key>qtgui_freq_sink_x</key> <param> <key>id</key> - <value>orig_fft</value> + <value>qtgui_freq_sink_x_0_0</value> </param> <param> <key>_enabled</key> @@ -384,151 +1484,224 @@ <value>float</value> </param> <param> - <key>title</key> - <value>Original Spectrum</value> + <key>name</key> + <value>Encoded Spectrum</value> </param> <param> - <key>samp_rate</key> - <value>audio_rate</value> + <key>fftsize</key> + <value>1024</value> </param> <param> - <key>baseband_freq</key> + <key>wintype</key> + <value>firdes.WIN_BLACKMAN_hARRIS</value> + </param> + <param> + <key>fc</key> <value>0</value> </param> <param> - <key>y_per_div</key> - <value>10</value> + <key>bw</key> + <value>audio_rate</value> + </param> + <param> + <key>autoscale</key> + <value>True</value> + </param> + <param> + <key>average</key> + <value>1.0</value> + </param> + <param> + <key>ymin</key> + <value>-140</value> </param> <param> - <key>y_divs</key> + <key>ymax</key> <value>10</value> </param> <param> - <key>ref_level</key> - <value>0</value> + <key>nconnections</key> + <value>1</value> </param> <param> - <key>ref_scale</key> - <value>2.0</value> + <key>update_time</key> + <value>0.10</value> </param> <param> - <key>fft_size</key> - <value>1024</value> + <key>gui_hint</key> + <value>displays@1:0,0,1,1</value> </param> <param> - <key>fft_rate</key> - <value>30</value> + <key>label1</key> + <value></value> </param> <param> - <key>peak_hold</key> - <value>False</value> + <key>width1</key> + <value>1</value> </param> <param> - <key>average</key> - <value>False</value> + <key>color1</key> + <value>"blue"</value> </param> <param> - <key>avg_alpha</key> - <value>0</value> + <key>alpha1</key> + <value>1.0</value> </param> <param> - <key>win</key> - <value>None</value> + <key>label2</key> + <value></value> + </param> + <param> + <key>width2</key> + <value>1</value> + </param> + <param> + <key>color2</key> + <value>"red"</value> + </param> + <param> + <key>alpha2</key> + <value>1.0</value> </param> <param> - <key>win_size</key> + <key>label3</key> <value></value> </param> <param> - <key>grid_pos</key> - <value>0, 0, 1, 1</value> + <key>width3</key> + <value>1</value> </param> <param> - <key>notebook</key> - <value>displays, 0</value> + <key>color3</key> + <value>"green"</value> </param> <param> - <key>freqvar</key> - <value>None</value> + <key>alpha3</key> + <value>1.0</value> </param> <param> - <key>_coordinate</key> - <value>(415, 97)</value> + <key>label4</key> + <value></value> </param> <param> - <key>_rotation</key> - <value>180</value> + <key>width4</key> + <value>1</value> </param> - </block> - <block> - <key>wxgui_scopesink2</key> <param> - <key>id</key> - <value>orig_scope</value> + <key>color4</key> + <value>"black"</value> </param> <param> - <key>_enabled</key> - <value>True</value> + <key>alpha4</key> + <value>1.0</value> </param> <param> - <key>type</key> - <value>float</value> + <key>label5</key> + <value></value> </param> <param> - <key>title</key> - <value>Original Waveform</value> + <key>width5</key> + <value>1</value> </param> <param> - <key>samp_rate</key> - <value>audio_rate</value> + <key>color5</key> + <value>"cyan"</value> </param> <param> - <key>v_scale</key> - <value>0</value> + <key>alpha5</key> + <value>1.0</value> </param> <param> - <key>v_offset</key> - <value>0</value> + <key>label6</key> + <value></value> </param> <param> - <key>t_scale</key> - <value>0</value> + <key>width6</key> + <value>1</value> </param> <param> - <key>ac_couple</key> - <value>False</value> + <key>color6</key> + <value>"magenta"</value> </param> <param> - <key>xy_mode</key> - <value>False</value> + <key>alpha6</key> + <value>1.0</value> </param> <param> - <key>num_inputs</key> + <key>label7</key> + <value></value> + </param> + <param> + <key>width7</key> <value>1</value> </param> <param> - <key>win_size</key> + <key>color7</key> + <value>"yellow"</value> + </param> + <param> + <key>alpha7</key> + <value>1.0</value> + </param> + <param> + <key>label8</key> <value></value> </param> <param> - <key>grid_pos</key> - <value>1, 0, 1, 1</value> + <key>width8</key> + <value>1</value> + </param> + <param> + <key>color8</key> + <value>"dark red"</value> </param> <param> - <key>notebook</key> - <value>displays, 0</value> + <key>alpha8</key> + <value>1.0</value> </param> <param> - <key>trig_mode</key> - <value>wxgui.TRIG_MODE_AUTO</value> + <key>label9</key> + <value></value> + </param> + <param> + <key>width9</key> + <value>1</value> </param> <param> - <key>y_axis_label</key> - <value>Counts</value> + <key>color9</key> + <value>"dark green"</value> + </param> + <param> + <key>alpha9</key> + <value>1.0</value> + </param> + <param> + <key>label10</key> + <value></value> + </param> + <param> + <key>width10</key> + <value>1</value> + </param> + <param> + <key>color10</key> + <value>"dark blue"</value> + </param> + <param> + <key>alpha10</key> + <value>1.0</value> + </param> + <param> + <key>alias</key> + <value></value> + </param> + <param> + <key>affinity</key> + <value></value> </param> <param> <key>_coordinate</key> - <value>(414, 425)</value> + <value>(508, 444)</value> </param> <param> <key>_rotation</key> @@ -536,10 +1709,10 @@ </param> </block> <block> - <key>wxgui_scopesink2</key> + <key>qtgui_time_sink_x</key> <param> <key>id</key> - <value>enc_scope</value> + <value>qtgui_time_sink_x_0_0</value> </param> <param> <key>_enabled</key> @@ -550,237 +1723,331 @@ <value>float</value> </param> <param> - <key>title</key> + <key>name</key> <value>Encoded Waveform</value> </param> <param> - <key>samp_rate</key> - <value>audio_rate*resample</value> + <key>size</key> + <value>1024</value> </param> <param> - <key>v_scale</key> - <value>0.5</value> + <key>srate</key> + <value>audio_rate</value> + </param> + <param> + <key>autoscale</key> + <value>False</value> + </param> + <param> + <key>ymin</key> + <value>-1</value> + </param> + <param> + <key>ymax</key> + <value>1</value> + </param> + <param> + <key>nconnections</key> + <value>1</value> + </param> + <param> + <key>update_time</key> + <value>0.10</value> + </param> + <param> + <key>entags</key> + <value>True</value> </param> <param> - <key>v_offset</key> + <key>gui_hint</key> + <value>displays@1:1,0,1,1</value> + </param> + <param> + <key>tr_mode</key> + <value>qtgui.TRIG_MODE_FREE</value> + </param> + <param> + <key>tr_slope</key> + <value>qtgui.TRIG_SLOPE_POS</value> + </param> + <param> + <key>tr_level</key> + <value>0.0</value> + </param> + <param> + <key>tr_delay</key> <value>0</value> </param> <param> - <key>t_scale</key> - <value>20.0/(audio_rate*resample)</value> + <key>tr_chan</key> + <value>0</value> </param> <param> - <key>ac_couple</key> - <value>False</value> + <key>tr_tag</key> + <value>""</value> </param> <param> - <key>xy_mode</key> - <value>False</value> + <key>label1</key> + <value></value> </param> <param> - <key>num_inputs</key> + <key>width1</key> + <value>1</value> + </param> + <param> + <key>color1</key> + <value>"blue"</value> + </param> + <param> + <key>style1</key> <value>1</value> </param> <param> - <key>win_size</key> + <key>marker1</key> + <value>-1</value> + </param> + <param> + <key>alpha1</key> + <value>1.0</value> + </param> + <param> + <key>label2</key> <value></value> </param> <param> - <key>grid_pos</key> - <value>0, 0, 1, 1</value> + <key>width2</key> + <value>1</value> </param> <param> - <key>notebook</key> - <value>displays, 1</value> + <key>color2</key> + <value>"red"</value> </param> <param> - <key>trig_mode</key> - <value>wxgui.TRIG_MODE_AUTO</value> + <key>style2</key> + <value>1</value> </param> <param> - <key>y_axis_label</key> - <value>Counts</value> + <key>marker2</key> + <value>-1</value> </param> <param> - <key>_coordinate</key> - <value>(858, 591)</value> + <key>alpha2</key> + <value>1.0</value> </param> <param> - <key>_rotation</key> - <value>0</value> + <key>label3</key> + <value></value> </param> - </block> - <block> - <key>wxgui_fftsink2</key> <param> - <key>id</key> - <value>dec_fft</value> + <key>width3</key> + <value>1</value> </param> <param> - <key>_enabled</key> - <value>True</value> + <key>color3</key> + <value>"green"</value> </param> <param> - <key>type</key> - <value>float</value> + <key>style3</key> + <value>1</value> </param> <param> - <key>title</key> - <value>Decoded Spectrum</value> + <key>marker3</key> + <value>-1</value> </param> <param> - <key>samp_rate</key> - <value>audio_rate</value> + <key>alpha3</key> + <value>1.0</value> </param> <param> - <key>baseband_freq</key> - <value>0</value> + <key>label4</key> + <value></value> </param> <param> - <key>y_per_div</key> - <value>5</value> + <key>width4</key> + <value>1</value> </param> <param> - <key>y_divs</key> - <value>10</value> + <key>color4</key> + <value>"black"</value> </param> <param> - <key>ref_level</key> - <value>10</value> + <key>style4</key> + <value>1</value> </param> <param> - <key>ref_scale</key> - <value>0.1</value> + <key>marker4</key> + <value>-1</value> </param> <param> - <key>fft_size</key> - <value>1024</value> + <key>alpha4</key> + <value>1.0</value> </param> <param> - <key>fft_rate</key> - <value>30</value> + <key>label5</key> + <value></value> </param> <param> - <key>peak_hold</key> - <value>False</value> + <key>width5</key> + <value>1</value> </param> <param> - <key>average</key> - <value>False</value> + <key>color5</key> + <value>"cyan"</value> </param> <param> - <key>avg_alpha</key> - <value>0</value> + <key>style5</key> + <value>1</value> </param> <param> - <key>win</key> - <value>None</value> + <key>marker5</key> + <value>-1</value> </param> <param> - <key>win_size</key> + <key>alpha5</key> + <value>1.0</value> + </param> + <param> + <key>label6</key> <value></value> </param> <param> - <key>grid_pos</key> - <value>0, 0, 1, 1</value> + <key>width6</key> + <value>1</value> </param> <param> - <key>notebook</key> - <value>displays, 2</value> + <key>color6</key> + <value>"magenta"</value> </param> <param> - <key>freqvar</key> - <value>None</value> + <key>style6</key> + <value>1</value> </param> <param> - <key>_coordinate</key> - <value>(891, 98)</value> + <key>marker6</key> + <value>-1</value> </param> <param> - <key>_rotation</key> - <value>180</value> + <key>alpha6</key> + <value>1.0</value> </param> - </block> - <block> - <key>wxgui_scopesink2</key> <param> - <key>id</key> - <value>dec_scope</value> + <key>label7</key> + <value></value> </param> <param> - <key>_enabled</key> - <value>True</value> + <key>width7</key> + <value>1</value> </param> <param> - <key>type</key> - <value>float</value> + <key>color7</key> + <value>"yellow"</value> </param> <param> - <key>title</key> - <value>Decoded Waveform</value> + <key>style7</key> + <value>1</value> </param> <param> - <key>samp_rate</key> - <value>audio_rate</value> + <key>marker7</key> + <value>-1</value> </param> <param> - <key>v_scale</key> - <value>0</value> + <key>alpha7</key> + <value>1.0</value> </param> <param> - <key>v_offset</key> - <value>0</value> + <key>label8</key> + <value></value> </param> <param> - <key>t_scale</key> - <value>0</value> + <key>width8</key> + <value>1</value> </param> <param> - <key>ac_couple</key> - <value>False</value> + <key>color8</key> + <value>"dark red"</value> </param> <param> - <key>xy_mode</key> - <value>False</value> + <key>style8</key> + <value>1</value> </param> <param> - <key>num_inputs</key> + <key>marker8</key> + <value>-1</value> + </param> + <param> + <key>alpha8</key> + <value>1.0</value> + </param> + <param> + <key>label9</key> + <value></value> + </param> + <param> + <key>width9</key> <value>1</value> </param> <param> - <key>win_size</key> + <key>color9</key> + <value>"dark green"</value> + </param> + <param> + <key>style9</key> + <value>1</value> + </param> + <param> + <key>marker9</key> + <value>-1</value> + </param> + <param> + <key>alpha9</key> + <value>1.0</value> + </param> + <param> + <key>label10</key> <value></value> </param> <param> - <key>grid_pos</key> - <value>1, 0, 1, 1</value> + <key>width10</key> + <value>1</value> + </param> + <param> + <key>color10</key> + <value>"blue"</value> + </param> + <param> + <key>style10</key> + <value>1</value> + </param> + <param> + <key>marker10</key> + <value>-1</value> </param> <param> - <key>notebook</key> - <value>displays, 2</value> + <key>alpha10</key> + <value>1.0</value> </param> <param> - <key>trig_mode</key> - <value>wxgui.TRIG_MODE_AUTO</value> + <key>alias</key> + <value></value> </param> <param> - <key>y_axis_label</key> - <value>Counts</value> + <key>affinity</key> + <value></value> </param> <param> <key>_coordinate</key> - <value>(889, 422)</value> + <value>(826, 444)</value> </param> <param> <key>_rotation</key> - <value>180</value> + <value>0</value> </param> </block> <block> - <key>blocks_throttle</key> + <key>qtgui_freq_sink_x</key> <param> <key>id</key> - <value>throttle</value> + <value>qtgui_freq_sink_x_0</value> </param> <param> <key>_enabled</key> @@ -791,159 +2058,276 @@ <value>float</value> </param> <param> - <key>samples_per_second</key> - <value>audio_rate</value> + <key>name</key> + <value>Original Spectrum</value> </param> <param> - <key>vlen</key> - <value>1</value> + <key>fftsize</key> + <value>1024</value> </param> <param> - <key>_coordinate</key> - <value>(238, 348)</value> + <key>wintype</key> + <value>firdes.WIN_BLACKMAN_hARRIS</value> </param> <param> - <key>_rotation</key> + <key>fc</key> <value>0</value> </param> - </block> - <block> - <key>analog_sig_source_x</key> <param> - <key>id</key> - <value>analog_sig_source_x_0</value> + <key>bw</key> + <value>audio_rate</value> </param> <param> - <key>_enabled</key> + <key>autoscale</key> <value>True</value> </param> <param> - <key>type</key> - <value>float</value> + <key>average</key> + <value>1.0</value> </param> <param> - <key>samp_rate</key> - <value>audio_rate</value> + <key>ymin</key> + <value>-140</value> </param> <param> - <key>waveform</key> - <value>analog.GR_TRI_WAVE</value> + <key>ymax</key> + <value>10</value> </param> <param> - <key>freq</key> - <value>0.05</value> + <key>nconnections</key> + <value>1</value> </param> <param> - <key>amp</key> - <value>0.5</value> + <key>update_time</key> + <value>0.10</value> </param> <param> - <key>offset</key> - <value>0</value> + <key>gui_hint</key> + <value>displays@0:0,0,1,1</value> </param> <param> - <key>_coordinate</key> - <value>(29, 316)</value> + <key>label1</key> + <value></value> </param> <param> - <key>_rotation</key> - <value>0</value> + <key>width1</key> + <value>1</value> </param> - </block> - <block> - <key>wxgui_fftsink2</key> <param> - <key>id</key> - <value>enc_fft</value> + <key>color1</key> + <value>"blue"</value> </param> <param> - <key>_enabled</key> - <value>True</value> + <key>alpha1</key> + <value>1.0</value> </param> <param> - <key>type</key> - <value>float</value> + <key>label2</key> + <value></value> </param> <param> - <key>title</key> - <value>Encoded Spectrum</value> + <key>width2</key> + <value>1</value> </param> <param> - <key>samp_rate</key> - <value>audio_rate*resample</value> + <key>color2</key> + <value>"red"</value> </param> <param> - <key>baseband_freq</key> - <value>0</value> + <key>alpha2</key> + <value>1.0</value> </param> <param> - <key>y_per_div</key> - <value>10</value> + <key>label3</key> + <value></value> </param> <param> - <key>y_divs</key> - <value>8</value> + <key>width3</key> + <value>1</value> </param> <param> - <key>ref_level</key> - <value>10</value> + <key>color3</key> + <value>"green"</value> </param> <param> - <key>ref_scale</key> - <value>2.0</value> + <key>alpha3</key> + <value>1.0</value> </param> <param> - <key>fft_size</key> - <value>1024</value> + <key>label4</key> + <value></value> </param> <param> - <key>fft_rate</key> - <value>30</value> + <key>width4</key> + <value>1</value> </param> <param> - <key>peak_hold</key> - <value>False</value> + <key>color4</key> + <value>"black"</value> </param> <param> - <key>average</key> - <value>False</value> + <key>alpha4</key> + <value>1.0</value> </param> <param> - <key>avg_alpha</key> - <value>0</value> + <key>label5</key> + <value></value> + </param> + <param> + <key>width5</key> + <value>1</value> + </param> + <param> + <key>color5</key> + <value>"cyan"</value> + </param> + <param> + <key>alpha5</key> + <value>1.0</value> + </param> + <param> + <key>label6</key> + <value></value> + </param> + <param> + <key>width6</key> + <value>1</value> + </param> + <param> + <key>color6</key> + <value>"magenta"</value> + </param> + <param> + <key>alpha6</key> + <value>1.0</value> + </param> + <param> + <key>label7</key> + <value></value> + </param> + <param> + <key>width7</key> + <value>1</value> + </param> + <param> + <key>color7</key> + <value>"yellow"</value> + </param> + <param> + <key>alpha7</key> + <value>1.0</value> + </param> + <param> + <key>label8</key> + <value></value> + </param> + <param> + <key>width8</key> + <value>1</value> + </param> + <param> + <key>color8</key> + <value>"dark red"</value> + </param> + <param> + <key>alpha8</key> + <value>1.0</value> + </param> + <param> + <key>label9</key> + <value></value> + </param> + <param> + <key>width9</key> + <value>1</value> </param> <param> - <key>win</key> - <value>None</value> + <key>color9</key> + <value>"dark green"</value> </param> <param> - <key>win_size</key> + <key>alpha9</key> + <value>1.0</value> + </param> + <param> + <key>label10</key> <value></value> </param> <param> - <key>grid_pos</key> - <value>1, 0, 1, 1</value> + <key>width10</key> + <value>1</value> + </param> + <param> + <key>color10</key> + <value>"dark blue"</value> </param> <param> - <key>notebook</key> - <value>displays, 1</value> + <key>alpha10</key> + <value>1.0</value> </param> <param> - <key>freqvar</key> - <value>None</value> + <key>alias</key> + <value></value> + </param> + <param> + <key>affinity</key> + <value></value> </param> <param> <key>_coordinate</key> - <value>(610, 559)</value> + <value>(385, 95)</value> </param> <param> <key>_rotation</key> <value>180</value> </param> </block> + <block> + <key>audio_sink</key> + <param> + <key>id</key> + <value>audio_sink</value> + </param> + <param> + <key>_enabled</key> + <value>True</value> + </param> + <param> + <key>samp_rate</key> + <value>audio_rate</value> + </param> + <param> + <key>device_name</key> + <value></value> + </param> + <param> + <key>ok_to_block</key> + <value>True</value> + </param> + <param> + <key>num_inputs</key> + <value>1</value> + </param> + <param> + <key>alias</key> + <value></value> + </param> + <param> + <key>affinity</key> + <value></value> + </param> + <param> + <key>_coordinate</key> + <value>(1110, 225)</value> + </param> + <param> + <key>_rotation</key> + <value>0</value> + </param> + </block> <connection> - <source_block_id>vco</source_block_id> - <sink_block_id>orig_fft</sink_block_id> + <source_block_id>vocoder_cvsd_decode_bf_0</source_block_id> + <sink_block_id>qtgui_time_sink_x_0_1</sink_block_id> <source_key>0</source_key> <sink_key>0</sink_key> </connection> @@ -966,56 +2350,56 @@ <sink_key>0</sink_key> </connection> <connection> - <source_block_id>vco</source_block_id> - <sink_block_id>orig_scope</sink_block_id> + <source_block_id>vocoder_cvsd_decode_bf_0</source_block_id> + <sink_block_id>audio_sink</sink_block_id> <source_key>0</source_key> <sink_key>0</sink_key> </connection> <connection> - <source_block_id>vocoder_cvsd_decode_bf_0</source_block_id> - <sink_block_id>dec_fft</sink_block_id> + <source_block_id>enc</source_block_id> + <sink_block_id>p2u</sink_block_id> <source_key>0</source_key> <sink_key>0</sink_key> </connection> <connection> - <source_block_id>vocoder_cvsd_decode_bf_0</source_block_id> - <sink_block_id>dec_scope</sink_block_id> + <source_block_id>p2u</source_block_id> + <sink_block_id>c2f</sink_block_id> <source_key>0</source_key> <sink_key>0</sink_key> </connection> <connection> - <source_block_id>vocoder_cvsd_decode_bf_0</source_block_id> - <sink_block_id>audio_sink</sink_block_id> + <source_block_id>analog_sig_source_x_0</source_block_id> + <sink_block_id>throttle</sink_block_id> <source_key>0</source_key> <sink_key>0</sink_key> </connection> <connection> - <source_block_id>enc</source_block_id> - <sink_block_id>p2u</sink_block_id> + <source_block_id>vco</source_block_id> + <sink_block_id>qtgui_freq_sink_x_0</sink_block_id> <source_key>0</source_key> <sink_key>0</sink_key> </connection> <connection> - <source_block_id>p2u</source_block_id> - <sink_block_id>c2f</sink_block_id> + <source_block_id>vco</source_block_id> + <sink_block_id>qtgui_time_sink_x_0</sink_block_id> <source_key>0</source_key> <sink_key>0</sink_key> </connection> <connection> <source_block_id>c2f</source_block_id> - <sink_block_id>enc_fft</sink_block_id> + <sink_block_id>qtgui_time_sink_x_0_0</sink_block_id> <source_key>0</source_key> <sink_key>0</sink_key> </connection> <connection> <source_block_id>c2f</source_block_id> - <sink_block_id>enc_scope</sink_block_id> + <sink_block_id>qtgui_freq_sink_x_0_0</sink_block_id> <source_key>0</source_key> <sink_key>0</sink_key> </connection> <connection> - <source_block_id>analog_sig_source_x_0</source_block_id> - <sink_block_id>throttle</sink_block_id> + <source_block_id>vocoder_cvsd_decode_bf_0</source_block_id> + <sink_block_id>qtgui_freq_sink_x_0_1</sink_block_id> <source_key>0</source_key> <sink_key>0</sink_key> </connection> diff --git a/gr-audio/examples/grc/dial_tone.grc b/gr-audio/examples/grc/dial_tone.grc index 2503fed640..74ee4fcb35 100644 --- a/gr-audio/examples/grc/dial_tone.grc +++ b/gr-audio/examples/grc/dial_tone.grc @@ -1,6 +1,6 @@ <?xml version='1.0' encoding='ASCII'?> <flow_graph> - <timestamp>Sat Nov 10 15:10:08 2012</timestamp> + <timestamp>Sat Jul 12 14:32:31 2014</timestamp> <block> <key>options</key> <param> @@ -29,7 +29,7 @@ </param> <param> <key>generate_options</key> - <value>wx_gui</value> + <value>qt_gui</value> </param> <param> <key>category</key> @@ -52,8 +52,12 @@ <value></value> </param> <param> + <key>alias</key> + <value></value> + </param> + <param> <key>_coordinate</key> - <value>(10, 10)</value> + <value>(0, -1)</value> </param> <param> <key>_rotation</key> @@ -61,34 +65,26 @@ </param> </block> <block> - <key>audio_sink</key> + <key>variable</key> <param> <key>id</key> - <value>audio_sink</value> + <value>samp_rate</value> </param> <param> <key>_enabled</key> <value>True</value> </param> <param> - <key>samp_rate</key> + <key>value</key> <value>32000</value> </param> <param> - <key>device_name</key> + <key>alias</key> <value></value> </param> <param> - <key>ok_to_block</key> - <value>True</value> - </param> - <param> - <key>num_inputs</key> - <value>1</value> - </param> - <param> <key>_coordinate</key> - <value>(699, 112)</value> + <value>(188, 0)</value> </param> <param> <key>_rotation</key> @@ -96,54 +92,46 @@ </param> </block> <block> - <key>variable_slider</key> + <key>blocks_add_xx</key> <param> <key>id</key> - <value>ampl</value> + <value>blocks_add_xx</value> </param> <param> <key>_enabled</key> <value>True</value> </param> <param> - <key>label</key> - <value>Volume</value> - </param> - <param> - <key>value</key> - <value>.4</value> - </param> - <param> - <key>min</key> - <value>0</value> + <key>type</key> + <value>float</value> </param> <param> - <key>max</key> - <value>.5</value> + <key>num_inputs</key> + <value>3</value> </param> <param> - <key>num_steps</key> - <value>100</value> + <key>vlen</key> + <value>1</value> </param> <param> - <key>style</key> - <value>wx.SL_HORIZONTAL</value> + <key>alias</key> + <value></value> </param> <param> - <key>converver</key> - <value>float_converter</value> + <key>affinity</key> + <value></value> </param> <param> - <key>grid_pos</key> - <value>0, 0, 1, 2</value> + <key>minoutbuf</key> + <value>0</value> </param> <param> - <key>notebook</key> - <value></value> + <key>maxoutbuf</key> + <value>0</value> </param> <param> <key>_coordinate</key> - <value>(634, 413)</value> + <value>(584, 118)</value> </param> <param> <key>_rotation</key> @@ -151,54 +139,50 @@ </param> </block> <block> - <key>variable_slider</key> + <key>analog_noise_source_x</key> <param> <key>id</key> - <value>noise</value> + <value>analog_noise_source_x_0</value> </param> <param> <key>_enabled</key> <value>True</value> </param> <param> - <key>label</key> - <value>Noise</value> - </param> - <param> - <key>value</key> - <value>.005</value> + <key>type</key> + <value>float</value> </param> <param> - <key>min</key> - <value>0</value> + <key>noise_type</key> + <value>analog.GR_GAUSSIAN</value> </param> <param> - <key>max</key> - <value>.2</value> + <key>amp</key> + <value>noise</value> </param> <param> - <key>num_steps</key> - <value>100</value> + <key>seed</key> + <value>-42</value> </param> <param> - <key>style</key> - <value>wx.SL_HORIZONTAL</value> + <key>alias</key> + <value></value> </param> <param> - <key>converver</key> - <value>float_converter</value> + <key>affinity</key> + <value></value> </param> <param> - <key>grid_pos</key> - <value>1, 0, 1, 2</value> + <key>minoutbuf</key> + <value>0</value> </param> <param> - <key>notebook</key> - <value></value> + <key>maxoutbuf</key> + <value>0</value> </param> <param> <key>_coordinate</key> - <value>(443, 412)</value> + <value>(298, 247)</value> </param> <param> <key>_rotation</key> @@ -206,53 +190,58 @@ </param> </block> <block> - <key>variable</key> + <key>analog_sig_source_x</key> <param> <key>id</key> - <value>samp_rate</value> + <value>analog_sig_source_x_1</value> </param> <param> <key>_enabled</key> <value>True</value> </param> <param> - <key>value</key> - <value>32000</value> + <key>type</key> + <value>float</value> </param> <param> - <key>_coordinate</key> - <value>(11, 171)</value> + <key>samp_rate</key> + <value>samp_rate</value> </param> <param> - <key>_rotation</key> - <value>0</value> + <key>waveform</key> + <value>analog.GR_COS_WAVE</value> </param> - </block> - <block> - <key>blocks_add_xx</key> <param> - <key>id</key> - <value>blocks_add_xx</value> + <key>freq</key> + <value>440</value> </param> <param> - <key>_enabled</key> - <value>True</value> + <key>amp</key> + <value>ampl</value> </param> <param> - <key>type</key> - <value>float</value> + <key>offset</key> + <value>0</value> </param> <param> - <key>num_inputs</key> - <value>3</value> + <key>alias</key> + <value></value> </param> <param> - <key>vlen</key> - <value>1</value> + <key>affinity</key> + <value></value> + </param> + <param> + <key>minoutbuf</key> + <value>0</value> + </param> + <param> + <key>maxoutbuf</key> + <value>0</value> </param> <param> <key>_coordinate</key> - <value>(513, 277)</value> + <value>(303, 119)</value> </param> <param> <key>_rotation</key> @@ -294,8 +283,24 @@ <value>0</value> </param> <param> + <key>alias</key> + <value></value> + </param> + <param> + <key>affinity</key> + <value></value> + </param> + <param> + <key>minoutbuf</key> + <value>0</value> + </param> + <param> + <key>maxoutbuf</key> + <value>0</value> + </param> + <param> <key>_coordinate</key> - <value>(251, 100)</value> + <value>(304, 5)</value> </param> <param> <key>_rotation</key> @@ -303,42 +308,101 @@ </param> </block> <block> - <key>analog_sig_source_x</key> + <key>audio_sink</key> <param> <key>id</key> - <value>analog_sig_source_x_1</value> + <value>audio_sink</value> </param> <param> <key>_enabled</key> <value>True</value> </param> <param> - <key>type</key> - <value>float</value> + <key>samp_rate</key> + <value>32000</value> </param> <param> - <key>samp_rate</key> - <value>samp_rate</value> + <key>device_name</key> + <value></value> </param> <param> - <key>waveform</key> - <value>analog.GR_COS_WAVE</value> + <key>ok_to_block</key> + <value>True</value> </param> <param> - <key>freq</key> - <value>440</value> + <key>num_inputs</key> + <value>1</value> </param> <param> - <key>amp</key> - <value>ampl</value> + <key>alias</key> + <value></value> </param> <param> - <key>offset</key> + <key>affinity</key> + <value></value> + </param> + <param> + <key>_coordinate</key> + <value>(783, 146)</value> + </param> + <param> + <key>_rotation</key> + <value>0</value> + </param> + </block> + <block> + <key>variable_qtgui_range</key> + <param> + <key>id</key> + <value>noise</value> + </param> + <param> + <key>_enabled</key> + <value>True</value> + </param> + <param> + <key>label</key> + <value>Noise Amplitude</value> + </param> + <param> + <key>value</key> + <value>0.005</value> + </param> + <param> + <key>start</key> <value>0</value> </param> <param> + <key>stop</key> + <value>.2</value> + </param> + <param> + <key>step</key> + <value>.001</value> + </param> + <param> + <key>widget</key> + <value>counter_slider</value> + </param> + <param> + <key>orient</key> + <value>Qt.Horizontal</value> + </param> + <param> + <key>min_len</key> + <value>200</value> + </param> + <param> + <key>gui_hint</key> + <value>1, 0, 1, 2</value> + </param> + <param> + <key>alias</key> + <value></value> + </param> + <param> <key>_coordinate</key> - <value>(250, 214)</value> + <value>(661, 0)</value> </param> <param> <key>_rotation</key> @@ -346,34 +410,58 @@ </param> </block> <block> - <key>analog_noise_source_x</key> + <key>variable_qtgui_range</key> <param> <key>id</key> - <value>analog_noise_source_x_0</value> + <value>ampl</value> </param> <param> <key>_enabled</key> <value>True</value> </param> <param> - <key>type</key> - <value>float</value> + <key>label</key> + <value>Volume</value> </param> <param> - <key>noise_type</key> - <value>analog.GR_GAUSSIAN</value> + <key>value</key> + <value>.4</value> </param> <param> - <key>amp</key> - <value>noise</value> + <key>start</key> + <value>0</value> </param> <param> - <key>seed</key> - <value>-42</value> + <key>stop</key> + <value>.5</value> + </param> + <param> + <key>step</key> + <value>.001</value> + </param> + <param> + <key>widget</key> + <value>counter_slider</value> + </param> + <param> + <key>orient</key> + <value>Qt.Horizontal</value> + </param> + <param> + <key>min_len</key> + <value>200</value> + </param> + <param> + <key>gui_hint</key> + <value>0, 0, 1, 2</value> + </param> + <param> + <key>alias</key> + <value></value> </param> <param> <key>_coordinate</key> - <value>(245, 342)</value> + <value>(803, 0)</value> </param> <param> <key>_rotation</key> @@ -381,16 +469,10 @@ </param> </block> <connection> - <source_block_id>blocks_add_xx</source_block_id> - <sink_block_id>audio_sink</sink_block_id> - <source_key>0</source_key> - <sink_key>0</sink_key> - </connection> - <connection> - <source_block_id>analog_sig_source_x_0</source_block_id> + <source_block_id>analog_noise_source_x_0</source_block_id> <sink_block_id>blocks_add_xx</sink_block_id> <source_key>0</source_key> - <sink_key>0</sink_key> + <sink_key>2</sink_key> </connection> <connection> <source_block_id>analog_sig_source_x_1</source_block_id> @@ -399,9 +481,15 @@ <sink_key>1</sink_key> </connection> <connection> - <source_block_id>analog_noise_source_x_0</source_block_id> + <source_block_id>analog_sig_source_x_0</source_block_id> <sink_block_id>blocks_add_xx</sink_block_id> <source_key>0</source_key> - <sink_key>2</sink_key> + <sink_key>0</sink_key> + </connection> + <connection> + <source_block_id>blocks_add_xx</source_block_id> + <sink_block_id>audio_sink</sink_block_id> + <source_key>0</source_key> + <sink_key>0</sink_key> </connection> </flow_graph> diff --git a/gr-blocks/examples/ctrlport/pfb_sync_test-qt.grc b/gr-blocks/examples/ctrlport/pfb_sync_test-qt.grc deleted file mode 100644 index 0c397351cc..0000000000 --- a/gr-blocks/examples/ctrlport/pfb_sync_test-qt.grc +++ /dev/null @@ -1,854 +0,0 @@ -<?xml version='1.0' encoding='ASCII'?> -<flow_graph> - <timestamp>Sun Mar 17 21:00:28 2013</timestamp> - <block> - <key>options</key> - <param> - <key>id</key> - <value>pfb_sync_test_qt</value> - </param> - <param> - <key>_enabled</key> - <value>True</value> - </param> - <param> - <key>title</key> - <value></value> - </param> - <param> - <key>author</key> - <value></value> - </param> - <param> - <key>description</key> - <value></value> - </param> - <param> - <key>window_size</key> - <value>1280,1024</value> - </param> - <param> - <key>generate_options</key> - <value>qt_gui</value> - </param> - <param> - <key>category</key> - <value>Custom</value> - </param> - <param> - <key>run_options</key> - <value>prompt</value> - </param> - <param> - <key>run</key> - <value>True</value> - </param> - <param> - <key>max_nouts</key> - <value>0</value> - </param> - <param> - <key>realtime_scheduling</key> - <value></value> - </param> - <param> - <key>_coordinate</key> - <value>(10, 10)</value> - </param> - <param> - <key>_rotation</key> - <value>0</value> - </param> - </block> - <block> - <key>variable</key> - <param> - <key>id</key> - <value>sps</value> - </param> - <param> - <key>_enabled</key> - <value>True</value> - </param> - <param> - <key>value</key> - <value>2</value> - </param> - <param> - <key>_coordinate</key> - <value>(105, 126)</value> - </param> - <param> - <key>_rotation</key> - <value>0</value> - </param> - </block> - <block> - <key>variable</key> - <param> - <key>id</key> - <value>samp_rate</value> - </param> - <param> - <key>_enabled</key> - <value>True</value> - </param> - <param> - <key>value</key> - <value>300000</value> - </param> - <param> - <key>_coordinate</key> - <value>(14, 124)</value> - </param> - <param> - <key>_rotation</key> - <value>0</value> - </param> - </block> - <block> - <key>import</key> - <param> - <key>id</key> - <value>import_0</value> - </param> - <param> - <key>_enabled</key> - <value>True</value> - </param> - <param> - <key>import</key> - <value>import random, math, cmath</value> - </param> - <param> - <key>_coordinate</key> - <value>(14, 77)</value> - </param> - <param> - <key>_rotation</key> - <value>0</value> - </param> - </block> - <block> - <key>blocks_packed_to_unpacked_xx</key> - <param> - <key>id</key> - <value>blocks_packed_to_unpacked_xx_0</value> - </param> - <param> - <key>_enabled</key> - <value>True</value> - </param> - <param> - <key>type</key> - <value>byte</value> - </param> - <param> - <key>bits_per_chunk</key> - <value>8</value> - </param> - <param> - <key>endianness</key> - <value>gr.GR_MSB_FIRST</value> - </param> - <param> - <key>num_ports</key> - <value>1</value> - </param> - <param> - <key>_coordinate</key> - <value>(419, 10)</value> - </param> - <param> - <key>_rotation</key> - <value>0</value> - </param> - </block> - <block> - <key>blocks_throttle</key> - <param> - <key>id</key> - <value>blocks_throttle_0</value> - </param> - <param> - <key>_enabled</key> - <value>True</value> - </param> - <param> - <key>type</key> - <value>byte</value> - </param> - <param> - <key>samples_per_second</key> - <value>samp_rate</value> - </param> - <param> - <key>vlen</key> - <value>1</value> - </param> - <param> - <key>_coordinate</key> - <value>(436, 97)</value> - </param> - <param> - <key>_rotation</key> - <value>0</value> - </param> - </block> - <block> - <key>digital_psk_mod</key> - <param> - <key>id</key> - <value>digital_psk_mod_0</value> - </param> - <param> - <key>_enabled</key> - <value>True</value> - </param> - <param> - <key>constellation_points</key> - <value>4</value> - </param> - <param> - <key>mod_code</key> - <value>"gray"</value> - </param> - <param> - <key>differential</key> - <value>True</value> - </param> - <param> - <key>samples_per_symbol</key> - <value>sps</value> - </param> - <param> - <key>excess_bw</key> - <value>0.35</value> - </param> - <param> - <key>verbose</key> - <value>False</value> - </param> - <param> - <key>log</key> - <value>False</value> - </param> - <param> - <key>_coordinate</key> - <value>(627, 65)</value> - </param> - <param> - <key>_rotation</key> - <value>0</value> - </param> - </block> - <block> - <key>digital_pfb_clock_sync_xxx</key> - <param> - <key>id</key> - <value>digital_pfb_clock_sync_xxx_0</value> - </param> - <param> - <key>_enabled</key> - <value>True</value> - </param> - <param> - <key>type</key> - <value>ccf</value> - </param> - <param> - <key>sps</key> - <value>sps</value> - </param> - <param> - <key>loop_bw</key> - <value>2*3.14/100.0</value> - </param> - <param> - <key>taps</key> - <value>firdes.root_raised_cosine(nfilts, nfilts,1.0/sps, 0.35, int(22*sps*nfilts))</value> - </param> - <param> - <key>filter_size</key> - <value>nfilts</value> - </param> - <param> - <key>init_phase</key> - <value>nfilts/2</value> - </param> - <param> - <key>max_dev</key> - <value>1.5</value> - </param> - <param> - <key>osps</key> - <value>1</value> - </param> - <param> - <key>_coordinate</key> - <value>(339, 195)</value> - </param> - <param> - <key>_rotation</key> - <value>0</value> - </param> - </block> - <block> - <key>variable</key> - <param> - <key>id</key> - <value>nfilts</value> - </param> - <param> - <key>_enabled</key> - <value>True</value> - </param> - <param> - <key>value</key> - <value>32</value> - </param> - <param> - <key>_coordinate</key> - <value>(74, 390)</value> - </param> - <param> - <key>_rotation</key> - <value>0</value> - </param> - </block> - <block> - <key>variable</key> - <param> - <key>id</key> - <value>amps</value> - </param> - <param> - <key>_enabled</key> - <value>True</value> - </param> - <param> - <key>value</key> - <value>[1]</value> - </param> - <param> - <key>_coordinate</key> - <value>(7, 390)</value> - </param> - <param> - <key>_rotation</key> - <value>0</value> - </param> - </block> - <block> - <key>variable</key> - <param> - <key>id</key> - <value>graymap</value> - </param> - <param> - <key>_enabled</key> - <value>True</value> - </param> - <param> - <key>value</key> - <value>[[3,1,0,2]]</value> - </param> - <param> - <key>_coordinate</key> - <value>(7, 326)</value> - </param> - <param> - <key>_rotation</key> - <value>0</value> - </param> - </block> - <block> - <key>qtgui_const_sink_x</key> - <param> - <key>id</key> - <value>qtgui_const_sink_x_0</value> - </param> - <param> - <key>_enabled</key> - <value>True</value> - </param> - <param> - <key>type</key> - <value>complex</value> - </param> - <param> - <key>name</key> - <value></value> - </param> - <param> - <key>size</key> - <value>1024</value> - </param> - <param> - <key>ymin</key> - <value>-2</value> - </param> - <param> - <key>ymax</key> - <value>2</value> - </param> - <param> - <key>xmin</key> - <value>-2</value> - </param> - <param> - <key>xmax</key> - <value>2</value> - </param> - <param> - <key>nconnections</key> - <value>2</value> - </param> - <param> - <key>update_time</key> - <value>0.10</value> - </param> - <param> - <key>gui_hint</key> - <value></value> - </param> - <param> - <key>_coordinate</key> - <value>(752, 196)</value> - </param> - <param> - <key>_rotation</key> - <value>0</value> - </param> - </block> - <block> - <key>channels_channel_model</key> - <param> - <key>id</key> - <value>channels_channel_model_0</value> - </param> - <param> - <key>_enabled</key> - <value>True</value> - </param> - <param> - <key>noise_voltage</key> - <value>noise</value> - </param> - <param> - <key>freq_offset</key> - <value>0.0</value> - </param> - <param> - <key>epsilon</key> - <value>1.0</value> - </param> - <param> - <key>taps</key> - <value>cmath.exp(1j*phase)</value> - </param> - <param> - <key>seed</key> - <value>0</value> - </param> - <param> - <key>_coordinate</key> - <value>(68, 211)</value> - </param> - <param> - <key>_rotation</key> - <value>0</value> - </param> - </block> - <block> - <key>blocks_ctrlport_probe2_c</key> - <param> - <key>id</key> - <value>received_probe2</value> - </param> - <param> - <key>_enabled</key> - <value>True</value> - </param> - <param> - <key>name</key> - <value>received</value> - </param> - <param> - <key>desc</key> - <value>Constellation Points</value> - </param> - <param> - <key>len</key> - <value>1024</value> - </param> - <param> - <key>_coordinate</key> - <value>(195, 519)</value> - </param> - <param> - <key>_rotation</key> - <value>0</value> - </param> - </block> - <block> - <key>variable_qtgui_range</key> - <param> - <key>id</key> - <value>phase</value> - </param> - <param> - <key>_enabled</key> - <value>True</value> - </param> - <param> - <key>label</key> - <value>Phase</value> - </param> - <param> - <key>value</key> - <value>0.5</value> - </param> - <param> - <key>start</key> - <value>0</value> - </param> - <param> - <key>stop</key> - <value>2</value> - </param> - <param> - <key>step</key> - <value>0.01</value> - </param> - <param> - <key>widget</key> - <value>counter_slider</value> - </param> - <param> - <key>orient</key> - <value>Qt.Horizontal</value> - </param> - <param> - <key>min_len</key> - <value>200</value> - </param> - <param> - <key>gui_hint</key> - <value></value> - </param> - <param> - <key>_coordinate</key> - <value>(266, 344)</value> - </param> - <param> - <key>_rotation</key> - <value>0</value> - </param> - </block> - <block> - <key>blocks_ctrlport_probe2_c</key> - <param> - <key>id</key> - <value>time_probe2</value> - </param> - <param> - <key>_enabled</key> - <value>True</value> - </param> - <param> - <key>name</key> - <value>time locked</value> - </param> - <param> - <key>desc</key> - <value>Constellation Points</value> - </param> - <param> - <key>len</key> - <value>1024</value> - </param> - <param> - <key>_coordinate</key> - <value>(447, 440)</value> - </param> - <param> - <key>_rotation</key> - <value>0</value> - </param> - </block> - <block> - <key>variable_qtgui_range</key> - <param> - <key>id</key> - <value>noise</value> - </param> - <param> - <key>_enabled</key> - <value>True</value> - </param> - <param> - <key>label</key> - <value>Noise</value> - </param> - <param> - <key>value</key> - <value>0.050</value> - </param> - <param> - <key>start</key> - <value>0.0001</value> - </param> - <param> - <key>stop</key> - <value>2</value> - </param> - <param> - <key>step</key> - <value>0.01</value> - </param> - <param> - <key>widget</key> - <value>counter_slider</value> - </param> - <param> - <key>orient</key> - <value>Qt.Horizontal</value> - </param> - <param> - <key>min_len</key> - <value>200</value> - </param> - <param> - <key>gui_hint</key> - <value></value> - </param> - <param> - <key>_coordinate</key> - <value>(7, 455)</value> - </param> - <param> - <key>_rotation</key> - <value>0</value> - </param> - </block> - <block> - <key>digital_costas_loop_cc</key> - <param> - <key>id</key> - <value>digital_costas_loop_cc_0</value> - </param> - <param> - <key>_enabled</key> - <value>True</value> - </param> - <param> - <key>w</key> - <value>6.28/100.0</value> - </param> - <param> - <key>order</key> - <value>4</value> - </param> - <param> - <key>_coordinate</key> - <value>(610, 279)</value> - </param> - <param> - <key>_rotation</key> - <value>0</value> - </param> - </block> - <block> - <key>blocks_null_sink</key> - <param> - <key>id</key> - <value>blocks_null_sink_0</value> - </param> - <param> - <key>_enabled</key> - <value>True</value> - </param> - <param> - <key>type</key> - <value>complex</value> - </param> - <param> - <key>vlen</key> - <value>1</value> - </param> - <param> - <key>_coordinate</key> - <value>(859, 279)</value> - </param> - <param> - <key>_rotation</key> - <value>0</value> - </param> - </block> - <block> - <key>blocks_ctrlport_probe2_c</key> - <param> - <key>id</key> - <value>phase_probe2</value> - </param> - <param> - <key>_enabled</key> - <value>True</value> - </param> - <param> - <key>name</key> - <value>phase locked</value> - </param> - <param> - <key>desc</key> - <value>Constellation Points</value> - </param> - <param> - <key>len</key> - <value>1024</value> - </param> - <param> - <key>_coordinate</key> - <value>(681, 379)</value> - </param> - <param> - <key>_rotation</key> - <value>0</value> - </param> - </block> - <block> - <key>blocks_vector_source_x</key> - <param> - <key>id</key> - <value>blocks_vector_source_x_0</value> - </param> - <param> - <key>_enabled</key> - <value>True</value> - </param> - <param> - <key>type</key> - <value>byte</value> - </param> - <param> - <key>vector</key> - <value>(0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50)</value> - </param> - <param> - <key>tags</key> - <value>[]</value> - </param> - <param> - <key>repeat</key> - <value>True</value> - </param> - <param> - <key>vlen</key> - <value>1</value> - </param> - <param> - <key>_coordinate</key> - <value>(190, 71)</value> - </param> - <param> - <key>_rotation</key> - <value>0</value> - </param> - </block> - <block> - <key>blocks_ctrlport_monitor</key> - <param> - <key>id</key> - <value>blocks_ctrlport_monitor_0</value> - </param> - <param> - <key>_enabled</key> - <value>True</value> - </param> - <param> - <key>en</key> - <value>True</value> - </param> - <param> - <key>_coordinate</key> - <value>(193, 7)</value> - </param> - <param> - <key>_rotation</key> - <value>0</value> - </param> - </block> - <connection> - <source_block_id>blocks_throttle_0</source_block_id> - <sink_block_id>digital_psk_mod_0</sink_block_id> - <source_key>0</source_key> - <sink_key>0</sink_key> - </connection> - <connection> - <source_block_id>digital_pfb_clock_sync_xxx_0</source_block_id> - <sink_block_id>qtgui_const_sink_x_0</sink_block_id> - <source_key>0</source_key> - <sink_key>0</sink_key> - </connection> - <connection> - <source_block_id>digital_costas_loop_cc_0</source_block_id> - <sink_block_id>qtgui_const_sink_x_0</sink_block_id> - <source_key>0</source_key> - <sink_key>1</sink_key> - </connection> - <connection> - <source_block_id>digital_costas_loop_cc_0</source_block_id> - <sink_block_id>blocks_null_sink_0</sink_block_id> - <source_key>0</source_key> - <sink_key>0</sink_key> - </connection> - <connection> - <source_block_id>channels_channel_model_0</source_block_id> - <sink_block_id>digital_pfb_clock_sync_xxx_0</sink_block_id> - <source_key>0</source_key> - <sink_key>0</sink_key> - </connection> - <connection> - <source_block_id>digital_psk_mod_0</source_block_id> - <sink_block_id>channels_channel_model_0</sink_block_id> - <source_key>0</source_key> - <sink_key>0</sink_key> - </connection> - <connection> - <source_block_id>digital_costas_loop_cc_0</source_block_id> - <sink_block_id>phase_probe2</sink_block_id> - <source_key>0</source_key> - <sink_key>0</sink_key> - </connection> - <connection> - <source_block_id>blocks_packed_to_unpacked_xx_0</source_block_id> - <sink_block_id>blocks_throttle_0</sink_block_id> - <source_key>0</source_key> - <sink_key>0</sink_key> - </connection> - <connection> - <source_block_id>blocks_vector_source_x_0</source_block_id> - <sink_block_id>blocks_packed_to_unpacked_xx_0</sink_block_id> - <source_key>0</source_key> - <sink_key>0</sink_key> - </connection> - <connection> - <source_block_id>channels_channel_model_0</source_block_id> - <sink_block_id>received_probe2</sink_block_id> - <source_key>0</source_key> - <sink_key>0</sink_key> - </connection> - <connection> - <source_block_id>digital_pfb_clock_sync_xxx_0</source_block_id> - <sink_block_id>time_probe2</sink_block_id> - <source_key>0</source_key> - <sink_key>0</sink_key> - </connection> - <connection> - <source_block_id>digital_pfb_clock_sync_xxx_0</source_block_id> - <sink_block_id>digital_costas_loop_cc_0</sink_block_id> - <source_key>0</source_key> - <sink_key>0</sink_key> - </connection> -</flow_graph> diff --git a/gr-blocks/examples/ctrlport/pfb_sync_test.grc b/gr-blocks/examples/ctrlport/pfb_sync_test.grc index 06692aad46..0c397351cc 100644 --- a/gr-blocks/examples/ctrlport/pfb_sync_test.grc +++ b/gr-blocks/examples/ctrlport/pfb_sync_test.grc @@ -1,11 +1,11 @@ <?xml version='1.0' encoding='ASCII'?> <flow_graph> - <timestamp>Sun Mar 17 21:01:36 2013</timestamp> + <timestamp>Sun Mar 17 21:00:28 2013</timestamp> <block> <key>options</key> <param> <key>id</key> - <value>pfb_sync_test</value> + <value>pfb_sync_test_qt</value> </param> <param> <key>_enabled</key> @@ -25,11 +25,11 @@ </param> <param> <key>window_size</key> - <value>1280, 1024</value> + <value>1280,1024</value> </param> <param> <key>generate_options</key> - <value>wx_gui</value> + <value>qt_gui</value> </param> <param> <key>category</key> @@ -61,22 +61,22 @@ </param> </block> <block> - <key>import</key> + <key>variable</key> <param> <key>id</key> - <value>import_0</value> + <value>sps</value> </param> <param> <key>_enabled</key> <value>True</value> </param> <param> - <key>import</key> - <value>import random, math, cmath</value> + <key>value</key> + <value>2</value> </param> <param> <key>_coordinate</key> - <value>(14, 77)</value> + <value>(105, 126)</value> </param> <param> <key>_rotation</key> @@ -107,22 +107,22 @@ </param> </block> <block> - <key>variable</key> + <key>import</key> <param> <key>id</key> - <value>graymap</value> + <value>import_0</value> </param> <param> <key>_enabled</key> <value>True</value> </param> <param> - <key>value</key> - <value>[[3,1,0,2]]</value> + <key>import</key> + <value>import random, math, cmath</value> </param> <param> <key>_coordinate</key> - <value>(32, 387)</value> + <value>(14, 77)</value> </param> <param> <key>_rotation</key> @@ -130,22 +130,34 @@ </param> </block> <block> - <key>variable</key> + <key>blocks_packed_to_unpacked_xx</key> <param> <key>id</key> - <value>amps</value> + <value>blocks_packed_to_unpacked_xx_0</value> </param> <param> <key>_enabled</key> <value>True</value> </param> <param> - <key>value</key> - <value>[1]</value> + <key>type</key> + <value>byte</value> + </param> + <param> + <key>bits_per_chunk</key> + <value>8</value> + </param> + <param> + <key>endianness</key> + <value>gr.GR_MSB_FIRST</value> + </param> + <param> + <key>num_ports</key> + <value>1</value> </param> <param> <key>_coordinate</key> - <value>(32, 451)</value> + <value>(419, 10)</value> </param> <param> <key>_rotation</key> @@ -153,22 +165,30 @@ </param> </block> <block> - <key>variable</key> + <key>blocks_throttle</key> <param> <key>id</key> - <value>nfilts</value> + <value>blocks_throttle_0</value> </param> <param> <key>_enabled</key> <value>True</value> </param> <param> - <key>value</key> - <value>32</value> + <key>type</key> + <value>byte</value> + </param> + <param> + <key>samples_per_second</key> + <value>samp_rate</value> + </param> + <param> + <key>vlen</key> + <value>1</value> </param> <param> <key>_coordinate</key> - <value>(99, 451)</value> + <value>(436, 97)</value> </param> <param> <key>_rotation</key> @@ -176,49 +196,46 @@ </param> </block> <block> - <key>digital_costas_loop_cc</key> + <key>digital_psk_mod</key> <param> <key>id</key> - <value>digital_costas_loop_cc_0</value> + <value>digital_psk_mod_0</value> </param> <param> <key>_enabled</key> <value>True</value> </param> <param> - <key>w</key> - <value>6.28/100.0</value> - </param> - <param> - <key>order</key> + <key>constellation_points</key> <value>4</value> </param> <param> - <key>_coordinate</key> - <value>(626, 223)</value> + <key>mod_code</key> + <value>"gray"</value> </param> <param> - <key>_rotation</key> - <value>0</value> + <key>differential</key> + <value>True</value> </param> - </block> - <block> - <key>variable</key> <param> - <key>id</key> + <key>samples_per_symbol</key> <value>sps</value> </param> <param> - <key>_enabled</key> - <value>True</value> + <key>excess_bw</key> + <value>0.35</value> </param> <param> - <key>value</key> - <value>2</value> + <key>verbose</key> + <value>False</value> + </param> + <param> + <key>log</key> + <value>False</value> </param> <param> <key>_coordinate</key> - <value>(105, 126)</value> + <value>(627, 65)</value> </param> <param> <key>_rotation</key> @@ -226,10 +243,10 @@ </param> </block> <block> - <key>blocks_null_sink</key> + <key>digital_pfb_clock_sync_xxx</key> <param> <key>id</key> - <value>blocks_null_sink_0</value> + <value>digital_pfb_clock_sync_xxx_0</value> </param> <param> <key>_enabled</key> @@ -237,15 +254,39 @@ </param> <param> <key>type</key> - <value>complex</value> + <value>ccf</value> </param> <param> - <key>vlen</key> + <key>sps</key> + <value>sps</value> + </param> + <param> + <key>loop_bw</key> + <value>2*3.14/100.0</value> + </param> + <param> + <key>taps</key> + <value>firdes.root_raised_cosine(nfilts, nfilts,1.0/sps, 0.35, int(22*sps*nfilts))</value> + </param> + <param> + <key>filter_size</key> + <value>nfilts</value> + </param> + <param> + <key>init_phase</key> + <value>nfilts/2</value> + </param> + <param> + <key>max_dev</key> + <value>1.5</value> + </param> + <param> + <key>osps</key> <value>1</value> </param> <param> <key>_coordinate</key> - <value>(964, 200)</value> + <value>(339, 195)</value> </param> <param> <key>_rotation</key> @@ -253,54 +294,68 @@ </param> </block> <block> - <key>variable_slider</key> + <key>variable</key> <param> <key>id</key> - <value>noise</value> + <value>nfilts</value> </param> <param> <key>_enabled</key> <value>True</value> </param> <param> - <key>label</key> - <value></value> + <key>value</key> + <value>32</value> </param> <param> - <key>value</key> - <value>0.05</value> + <key>_coordinate</key> + <value>(74, 390)</value> </param> <param> - <key>min</key> - <value>0.00000001</value> + <key>_rotation</key> + <value>0</value> </param> + </block> + <block> + <key>variable</key> <param> - <key>max</key> - <value>2</value> + <key>id</key> + <value>amps</value> </param> <param> - <key>num_steps</key> - <value>100</value> + <key>_enabled</key> + <value>True</value> </param> <param> - <key>style</key> - <value>wx.SL_HORIZONTAL</value> + <key>value</key> + <value>[1]</value> </param> <param> - <key>converver</key> - <value>float_converter</value> + <key>_coordinate</key> + <value>(7, 390)</value> </param> <param> - <key>grid_pos</key> - <value></value> + <key>_rotation</key> + <value>0</value> </param> + </block> + <block> + <key>variable</key> <param> - <key>notebook</key> - <value></value> + <key>id</key> + <value>graymap</value> + </param> + <param> + <key>_enabled</key> + <value>True</value> + </param> + <param> + <key>value</key> + <value>[[3,1,0,2]]</value> </param> <param> <key>_coordinate</key> - <value>(281, 406)</value> + <value>(7, 326)</value> </param> <param> <key>_rotation</key> @@ -308,54 +363,58 @@ </param> </block> <block> - <key>variable_slider</key> + <key>qtgui_const_sink_x</key> <param> <key>id</key> - <value>phase</value> + <value>qtgui_const_sink_x_0</value> </param> <param> <key>_enabled</key> <value>True</value> </param> <param> - <key>label</key> + <key>type</key> + <value>complex</value> + </param> + <param> + <key>name</key> <value></value> </param> <param> - <key>value</key> - <value>0</value> + <key>size</key> + <value>1024</value> </param> <param> - <key>min</key> - <value>0</value> + <key>ymin</key> + <value>-2</value> </param> <param> - <key>max</key> + <key>ymax</key> <value>2</value> </param> <param> - <key>num_steps</key> - <value>100</value> + <key>xmin</key> + <value>-2</value> </param> <param> - <key>style</key> - <value>wx.SL_HORIZONTAL</value> + <key>xmax</key> + <value>2</value> </param> <param> - <key>converver</key> - <value>float_converter</value> + <key>nconnections</key> + <value>2</value> </param> <param> - <key>grid_pos</key> - <value></value> + <key>update_time</key> + <value>0.10</value> </param> <param> - <key>notebook</key> + <key>gui_hint</key> <value></value> </param> <param> <key>_coordinate</key> - <value>(167, 405)</value> + <value>(752, 196)</value> </param> <param> <key>_rotation</key> @@ -363,50 +422,69 @@ </param> </block> <block> - <key>digital_pfb_clock_sync_xxx</key> + <key>channels_channel_model</key> <param> <key>id</key> - <value>digital_pfb_clock_sync_xxx_0</value> + <value>channels_channel_model_0</value> </param> <param> <key>_enabled</key> <value>True</value> </param> <param> - <key>type</key> - <value>ccf</value> + <key>noise_voltage</key> + <value>noise</value> </param> <param> - <key>sps</key> - <value>sps</value> + <key>freq_offset</key> + <value>0.0</value> </param> <param> - <key>loop_bw</key> - <value>2*3.14/100.0</value> + <key>epsilon</key> + <value>1.0</value> </param> <param> <key>taps</key> - <value>firdes.root_raised_cosine(nfilts, nfilts,1.0/sps, 0.35, int(22*sps*nfilts))</value> + <value>cmath.exp(1j*phase)</value> </param> <param> - <key>filter_size</key> - <value>nfilts</value> + <key>seed</key> + <value>0</value> </param> <param> - <key>init_phase</key> - <value>nfilts/2</value> + <key>_coordinate</key> + <value>(68, 211)</value> </param> <param> - <key>max_dev</key> - <value>1.5</value> + <key>_rotation</key> + <value>0</value> </param> + </block> + <block> + <key>blocks_ctrlport_probe2_c</key> <param> - <key>osps</key> - <value>1</value> + <key>id</key> + <value>received_probe2</value> + </param> + <param> + <key>_enabled</key> + <value>True</value> + </param> + <param> + <key>name</key> + <value>received</value> + </param> + <param> + <key>desc</key> + <value>Constellation Points</value> + </param> + <param> + <key>len</key> + <value>1024</value> </param> <param> <key>_coordinate</key> - <value>(322, 231)</value> + <value>(195, 519)</value> </param> <param> <key>_rotation</key> @@ -414,46 +492,54 @@ </param> </block> <block> - <key>digital_psk_mod</key> + <key>variable_qtgui_range</key> <param> <key>id</key> - <value>digital_psk_mod_0</value> + <value>phase</value> </param> <param> <key>_enabled</key> <value>True</value> </param> <param> - <key>constellation_points</key> - <value>4</value> + <key>label</key> + <value>Phase</value> </param> <param> - <key>mod_code</key> - <value>"gray"</value> + <key>value</key> + <value>0.5</value> </param> <param> - <key>differential</key> - <value>True</value> + <key>start</key> + <value>0</value> </param> <param> - <key>samples_per_symbol</key> - <value>sps</value> + <key>stop</key> + <value>2</value> </param> <param> - <key>excess_bw</key> - <value>0.35</value> + <key>step</key> + <value>0.01</value> </param> <param> - <key>verbose</key> - <value>False</value> + <key>widget</key> + <value>counter_slider</value> </param> <param> - <key>log</key> - <value>False</value> + <key>orient</key> + <value>Qt.Horizontal</value> + </param> + <param> + <key>min_len</key> + <value>200</value> + </param> + <param> + <key>gui_hint</key> + <value></value> </param> <param> <key>_coordinate</key> - <value>(846, 32)</value> + <value>(266, 344)</value> </param> <param> <key>_rotation</key> @@ -461,38 +547,85 @@ </param> </block> <block> - <key>channels_channel_model</key> + <key>blocks_ctrlport_probe2_c</key> <param> <key>id</key> - <value>channels_channel_model_0</value> + <value>time_probe2</value> </param> <param> <key>_enabled</key> <value>True</value> </param> <param> - <key>noise_voltage</key> - <value>noise</value> + <key>name</key> + <value>time locked</value> </param> <param> - <key>freq_offset</key> - <value>0.0</value> + <key>desc</key> + <value>Constellation Points</value> </param> <param> - <key>epsilon</key> - <value>1.0</value> + <key>len</key> + <value>1024</value> </param> <param> - <key>taps</key> - <value>cmath.exp(1j*phase)</value> + <key>_coordinate</key> + <value>(447, 440)</value> </param> <param> - <key>seed</key> + <key>_rotation</key> <value>0</value> </param> + </block> + <block> + <key>variable_qtgui_range</key> + <param> + <key>id</key> + <value>noise</value> + </param> + <param> + <key>_enabled</key> + <value>True</value> + </param> + <param> + <key>label</key> + <value>Noise</value> + </param> + <param> + <key>value</key> + <value>0.050</value> + </param> + <param> + <key>start</key> + <value>0.0001</value> + </param> + <param> + <key>stop</key> + <value>2</value> + </param> + <param> + <key>step</key> + <value>0.01</value> + </param> + <param> + <key>widget</key> + <value>counter_slider</value> + </param> + <param> + <key>orient</key> + <value>Qt.Horizontal</value> + </param> + <param> + <key>min_len</key> + <value>200</value> + </param> + <param> + <key>gui_hint</key> + <value></value> + </param> <param> <key>_coordinate</key> - <value>(73, 247)</value> + <value>(7, 455)</value> </param> <param> <key>_rotation</key> @@ -500,34 +633,53 @@ </param> </block> <block> - <key>blocks_file_source</key> + <key>digital_costas_loop_cc</key> <param> <key>id</key> - <value>blocks_file_source_0</value> + <value>digital_costas_loop_cc_0</value> </param> <param> <key>_enabled</key> <value>True</value> </param> <param> - <key>file</key> - <value>/dev/urandom</value> + <key>w</key> + <value>6.28/100.0</value> </param> <param> - <key>type</key> - <value>byte</value> + <key>order</key> + <value>4</value> </param> <param> - <key>repeat</key> + <key>_coordinate</key> + <value>(610, 279)</value> + </param> + <param> + <key>_rotation</key> + <value>0</value> + </param> + </block> + <block> + <key>blocks_null_sink</key> + <param> + <key>id</key> + <value>blocks_null_sink_0</value> + </param> + <param> + <key>_enabled</key> <value>True</value> </param> <param> + <key>type</key> + <value>complex</value> + </param> + <param> <key>vlen</key> <value>1</value> </param> <param> <key>_coordinate</key> - <value>(229, 56)</value> + <value>(859, 279)</value> </param> <param> <key>_rotation</key> @@ -535,30 +687,30 @@ </param> </block> <block> - <key>blocks_throttle</key> + <key>blocks_ctrlport_probe2_c</key> <param> <key>id</key> - <value>blocks_throttle_0</value> + <value>phase_probe2</value> </param> <param> <key>_enabled</key> <value>True</value> </param> <param> - <key>type</key> - <value>byte</value> + <key>name</key> + <value>phase locked</value> </param> <param> - <key>samples_per_second</key> - <value>samp_rate</value> + <key>desc</key> + <value>Constellation Points</value> </param> <param> - <key>vlen</key> - <value>1</value> + <key>len</key> + <value>1024</value> </param> <param> <key>_coordinate</key> - <value>(623, 64)</value> + <value>(681, 379)</value> </param> <param> <key>_rotation</key> @@ -566,10 +718,10 @@ </param> </block> <block> - <key>blocks_packed_to_unpacked_xx</key> + <key>blocks_vector_source_x</key> <param> <key>id</key> - <value>blocks_packed_to_unpacked_xx_0</value> + <value>blocks_vector_source_x_0</value> </param> <param> <key>_enabled</key> @@ -580,20 +732,24 @@ <value>byte</value> </param> <param> - <key>bits_per_chunk</key> - <value>8</value> + <key>vector</key> + <value>(0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50)</value> </param> <param> - <key>endianness</key> - <value>gr.GR_MSB_FIRST</value> + <key>tags</key> + <value>[]</value> </param> <param> - <key>num_ports</key> + <key>repeat</key> + <value>True</value> + </param> + <param> + <key>vlen</key> <value>1</value> </param> <param> <key>_coordinate</key> - <value>(415, 56)</value> + <value>(190, 71)</value> </param> <param> <key>_rotation</key> @@ -616,7 +772,7 @@ </param> <param> <key>_coordinate</key> - <value>(229, 7)</value> + <value>(193, 7)</value> </param> <param> <key>_rotation</key> @@ -631,12 +787,18 @@ </connection> <connection> <source_block_id>digital_pfb_clock_sync_xxx_0</source_block_id> - <sink_block_id>digital_costas_loop_cc_0</sink_block_id> + <sink_block_id>qtgui_const_sink_x_0</sink_block_id> <source_key>0</source_key> <sink_key>0</sink_key> </connection> <connection> <source_block_id>digital_costas_loop_cc_0</source_block_id> + <sink_block_id>qtgui_const_sink_x_0</sink_block_id> + <source_key>0</source_key> + <sink_key>1</sink_key> + </connection> + <connection> + <source_block_id>digital_costas_loop_cc_0</source_block_id> <sink_block_id>blocks_null_sink_0</sink_block_id> <source_key>0</source_key> <sink_key>0</sink_key> @@ -654,8 +816,8 @@ <sink_key>0</sink_key> </connection> <connection> - <source_block_id>blocks_file_source_0</source_block_id> - <sink_block_id>blocks_packed_to_unpacked_xx_0</sink_block_id> + <source_block_id>digital_costas_loop_cc_0</source_block_id> + <sink_block_id>phase_probe2</sink_block_id> <source_key>0</source_key> <sink_key>0</sink_key> </connection> @@ -665,4 +827,28 @@ <source_key>0</source_key> <sink_key>0</sink_key> </connection> + <connection> + <source_block_id>blocks_vector_source_x_0</source_block_id> + <sink_block_id>blocks_packed_to_unpacked_xx_0</sink_block_id> + <source_key>0</source_key> + <sink_key>0</sink_key> + </connection> + <connection> + <source_block_id>channels_channel_model_0</source_block_id> + <sink_block_id>received_probe2</sink_block_id> + <source_key>0</source_key> + <sink_key>0</sink_key> + </connection> + <connection> + <source_block_id>digital_pfb_clock_sync_xxx_0</source_block_id> + <sink_block_id>time_probe2</sink_block_id> + <source_key>0</source_key> + <sink_key>0</sink_key> + </connection> + <connection> + <source_block_id>digital_pfb_clock_sync_xxx_0</source_block_id> + <sink_block_id>digital_costas_loop_cc_0</sink_block_id> + <source_key>0</source_key> + <sink_key>0</sink_key> + </connection> </flow_graph> diff --git a/gr-blocks/grc/blocks_copy.xml b/gr-blocks/grc/blocks_copy.xml index 4d505d9e7f..6192937cd8 100644 --- a/gr-blocks/grc/blocks_copy.xml +++ b/gr-blocks/grc/blocks_copy.xml @@ -5,76 +5,100 @@ ################################################### --> <block> - <name>Copy</name> - <key>blocks_copy</key> - <import>from gnuradio import blocks</import> - <make>blocks.copy($type.size*$vlen) + <name>Copy</name> + <key>blocks_copy</key> + <import>from gnuradio import blocks</import> + <make>blocks.copy($type.size*$vlen) self.$(id).set_enabled($enabled)</make> - <callback>set_enabled($enabled)</callback> - <param> - <name>Type</name> - <key>type</key> - <type>enum</type> - <option> - <name>Complex</name> - <key>complex</key> - <opt>size:gr.sizeof_gr_complex</opt> - </option> - <option> - <name>Float</name> - <key>float</key> - <opt>size:gr.sizeof_float</opt> - </option> - <option> - <name>Int</name> - <key>int</key> - <opt>size:gr.sizeof_int</opt> - </option> - <option> - <name>Short</name> - <key>short</key> - <opt>size:gr.sizeof_short</opt> - </option> - <option> - <name>Byte</name> - <key>byte</key> - <opt>size:gr.sizeof_char</opt> - </option> - </param> - <param> - <name>Enabled</name> - <key>enabled</key> - <value>True</value> - <type>bool</type> - <option> - <name>Enabled</name> - <key>True</key> - </option> - <option> - <name>Disabled</name> - <key>False</key> - </option> - </param> - <param> - <name>Vec Length</name> - <key>vlen</key> - <value>1</value> - <type>int</type> - </param> - <check>$vlen > 0</check> - <sink> - <name>in</name> - <type>$type</type> - <vlen>$vlen</vlen> - </sink> - <sink> - <name>en</name> - <type>message</type> - <optional>1</optional> - </sink> - <source> - <name>out</name> - <type>$type</type> - <vlen>$vlen</vlen> - </source> + <callback>set_enabled($enabled)</callback> + + <param> + <name>Type</name> + <key>type</key> + <type>enum</type> + <option> + <name>Complex</name> + <key>complex</key> + <opt>size:gr.sizeof_gr_complex</opt> + </option> + <option> + <name>Float</name> + <key>float</key> + <opt>size:gr.sizeof_float</opt> + </option> + <option> + <name>Int</name> + <key>int</key> + <opt>size:gr.sizeof_int</opt> + </option> + <option> + <name>Short</name> + <key>short</key> + <opt>size:gr.sizeof_short</opt> + </option> + <option> + <name>Byte</name> + <key>byte</key> + <opt>size:gr.sizeof_char</opt> + </option> + </param> + + <param> + <name>Enabled</name> + <key>enabled</key> + <value>True</value> + <type>bool</type> + <option> + <name>Enabled</name> + <key>True</key> + </option> + <option> + <name>Disabled</name> + <key>False</key> + </option> + </param> + + <param> + <name>Vec Length</name> + <key>vlen</key> + <value>1</value> + <type>int</type> + </param> + + <param> + <name>Show Msg Ports</name> + <key>showports</key> + <value>True</value> + <type>enum</type> + <hide>part</hide> + <option> + <name>Yes</name> + <key>False</key> + </option> + <option> + <name>No</name> + <key>True</key> + </option> + </param> + + <check>$vlen > 0</check> + + <sink> + <name>in</name> + <type>$type</type> + <vlen>$vlen</vlen> + </sink> + + <sink> + <name>en</name> + <type>message</type> + <optional>1</optional> + <hide>$showports</hide> + </sink> + + <source> + <name>out</name> + <type>$type</type> + <vlen>$vlen</vlen> + </source> </block> diff --git a/gr-channels/examples/demo_spec_an.grc b/gr-channels/examples/demo_spec_an.grc index 572ded6e67..0a13f64369 100644 --- a/gr-channels/examples/demo_spec_an.grc +++ b/gr-channels/examples/demo_spec_an.grc @@ -1,39 +1,90 @@ <?xml version='1.0' encoding='ASCII'?> <flow_graph> - <timestamp>Thu Aug 1 13:13:07 2013</timestamp> + <timestamp>Wed Jul 9 15:47:18 2014</timestamp> <block> - <key>blocks_add_xx</key> + <key>options</key> <param> <key>id</key> - <value>blocks_add_xx_0</value> + <value>demo_spec_an</value> </param> <param> <key>_enabled</key> <value>True</value> </param> <param> - <key>type</key> - <value>complex</value> + <key>title</key> + <value></value> </param> <param> - <key>num_inputs</key> - <value>2</value> + <key>author</key> + <value>mettus</value> </param> <param> - <key>vlen</key> - <value>1</value> + <key>description</key> + <value></value> </param> <param> - <key>affinity</key> + <key>window_size</key> + <value>1280, 1024</value> + </param> + <param> + <key>generate_options</key> + <value>qt_gui</value> + </param> + <param> + <key>category</key> + <value>Custom</value> + </param> + <param> + <key>run_options</key> + <value>prompt</value> + </param> + <param> + <key>run</key> + <value>True</value> + </param> + <param> + <key>max_nouts</key> + <value>0</value> + </param> + <param> + <key>realtime_scheduling</key> <value></value> </param> <param> - <key>minoutbuf</key> + <key>alias</key> + <value></value> + </param> + <param> + <key>_coordinate</key> + <value>(0, -1)</value> + </param> + <param> + <key>_rotation</key> <value>0</value> </param> + </block> + <block> + <key>variable</key> + <param> + <key>id</key> + <value>samp_rate</value> + </param> + <param> + <key>_enabled</key> + <value>True</value> + </param> + <param> + <key>value</key> + <value>100000</value> + </param> + <param> + <key>alias</key> + <value></value> + </param> <param> <key>_coordinate</key> - <value>(251, 344)</value> + <value>(234, 0)</value> </param> <param> <key>_rotation</key> @@ -55,8 +106,12 @@ <value>1000</value> </param> <param> + <key>alias</key> + <value></value> + </param> + <param> <key>_coordinate</key> - <value>(17, 84)</value> + <value>(151, 0)</value> </param> <param> <key>_rotation</key> @@ -64,22 +119,42 @@ </param> </block> <block> - <key>variable</key> + <key>blocks_rms_xx</key> <param> <key>id</key> - <value>samp_rate</value> + <value>blocks_rms_xx_0</value> </param> <param> <key>_enabled</key> <value>True</value> </param> <param> - <key>value</key> - <value>100000</value> + <key>type</key> + <value>complex</value> + </param> + <param> + <key>alpha</key> + <value>.0001</value> + </param> + <param> + <key>alias</key> + <value></value> + </param> + <param> + <key>affinity</key> + <value></value> + </param> + <param> + <key>minoutbuf</key> + <value>0</value> + </param> + <param> + <key>maxoutbuf</key> + <value>0</value> </param> <param> <key>_coordinate</key> - <value>(10, 170)</value> + <value>(491, 138)</value> </param> <param> <key>_rotation</key> @@ -101,8 +176,12 @@ <value>import math</value> </param> <param> + <key>alias</key> + <value></value> + </param> + <param> <key>_coordinate</key> - <value>(238, 60)</value> + <value>(-1, 77)</value> </param> <param> <key>_rotation</key> @@ -110,10 +189,10 @@ </param> </block> <block> - <key>analog_noise_source_x</key> + <key>blocks_rms_xx</key> <param> <key>id</key> - <value>analog_noise_source_x_0</value> + <value>blocks_rms_xx_0_0</value> </param> <param> <key>_enabled</key> @@ -124,16 +203,12 @@ <value>complex</value> </param> <param> - <key>noise_type</key> - <value>analog.GR_GAUSSIAN</value> - </param> - <param> - <key>amp</key> - <value>math.pow(10.0,snr/20.0)/math.sqrt(2.0)</value> + <key>alpha</key> + <value>.0001</value> </param> <param> - <key>seed</key> - <value>42</value> + <key>alias</key> + <value></value> </param> <param> <key>affinity</key> @@ -144,8 +219,12 @@ <value>0</value> </param> <param> + <key>maxoutbuf</key> + <value>0</value> + </param> + <param> <key>_coordinate</key> - <value>(16, 295)</value> + <value>(458, 301)</value> </param> <param> <key>_rotation</key> @@ -153,54 +232,46 @@ </param> </block> <block> - <key>variable_slider</key> + <key>blocks_add_xx</key> <param> <key>id</key> - <value>freq_offset</value> + <value>blocks_add_xx_0</value> </param> <param> <key>_enabled</key> <value>True</value> </param> <param> - <key>label</key> - <value>Freq_offset</value> - </param> - <param> - <key>value</key> - <value>0</value> - </param> - <param> - <key>min</key> - <value>-5*samp_rate/fft_size</value> + <key>type</key> + <value>complex</value> </param> <param> - <key>max</key> - <value>5*samp_rate/fft_size</value> + <key>num_inputs</key> + <value>2</value> </param> <param> - <key>num_steps</key> - <value>200</value> + <key>vlen</key> + <value>1</value> </param> <param> - <key>style</key> - <value>wx.SL_HORIZONTAL</value> + <key>alias</key> + <value></value> </param> <param> - <key>converver</key> - <value>float_converter</value> + <key>affinity</key> + <value></value> </param> <param> - <key>grid_pos</key> - <value></value> + <key>minoutbuf</key> + <value>0</value> </param> <param> - <key>notebook</key> - <value></value> + <key>maxoutbuf</key> + <value>0</value> </param> <param> <key>_coordinate</key> - <value>(314, 514)</value> + <value>(244, 187)</value> </param> <param> <key>_rotation</key> @@ -208,10 +279,10 @@ </param> </block> <block> - <key>analog_sig_source_x</key> + <key>analog_noise_source_x</key> <param> <key>id</key> - <value>analog_sig_source_x_0</value> + <value>analog_noise_source_x_0</value> </param> <param> <key>_enabled</key> @@ -222,24 +293,20 @@ <value>complex</value> </param> <param> - <key>samp_rate</key> - <value>samp_rate</value> - </param> - <param> - <key>waveform</key> - <value>analog.GR_COS_WAVE</value> + <key>noise_type</key> + <value>analog.GR_GAUSSIAN</value> </param> <param> - <key>freq</key> - <value>float(samp_rate)/float(fft_size)*26+freq_offset</value> + <key>amp</key> + <value>math.pow(10.0,snr/20.0)/math.sqrt(2.0)</value> </param> <param> - <key>amp</key> - <value>1.0</value> + <key>seed</key> + <value>42</value> </param> <param> - <key>offset</key> - <value>0</value> + <key>alias</key> + <value></value> </param> <param> <key>affinity</key> @@ -250,8 +317,12 @@ <value>0</value> </param> <param> + <key>maxoutbuf</key> + <value>0</value> + </param> + <param> <key>_coordinate</key> - <value>(16, 386)</value> + <value>(11, 138)</value> </param> <param> <key>_rotation</key> @@ -281,6 +352,14 @@ <value>1</value> </param> <param> + <key>ignoretag</key> + <value>True</value> + </param> + <param> + <key>alias</key> + <value></value> + </param> + <param> <key>affinity</key> <value></value> </param> @@ -289,8 +368,12 @@ <value>0</value> </param> <param> + <key>maxoutbuf</key> + <value>0</value> + </param> + <param> <key>_coordinate</key> - <value>(370, 357)</value> + <value>(363, 200)</value> </param> <param> <key>_rotation</key> @@ -298,124 +381,334 @@ </param> </block> <block> - <key>variable_slider</key> + <key>qtgui_time_sink_x</key> <param> <key>id</key> - <value>snr</value> + <value>qtgui_time_sink_x_0</value> </param> <param> <key>_enabled</key> + <value>False</value> + </param> + <param> + <key>type</key> + <value>complex</value> + </param> + <param> + <key>name</key> + <value>Scope Plot</value> + </param> + <param> + <key>size</key> + <value>1024</value> + </param> + <param> + <key>srate</key> + <value>samp_rate</value> + </param> + <param> + <key>autoscale</key> + <value>False</value> + </param> + <param> + <key>ymin</key> + <value>-1</value> + </param> + <param> + <key>ymax</key> + <value>1</value> + </param> + <param> + <key>nconnections</key> + <value>1</value> + </param> + <param> + <key>update_time</key> + <value>0.10</value> + </param> + <param> + <key>entags</key> <value>True</value> </param> <param> - <key>label</key> - <value>"Noise Level"</value> + <key>gui_hint</key> + <value></value> </param> <param> - <key>value</key> + <key>tr_mode</key> + <value>qtgui.TRIG_MODE_FREE</value> + </param> + <param> + <key>tr_slope</key> + <value>qtgui.TRIG_SLOPE_POS</value> + </param> + <param> + <key>tr_level</key> + <value>0.0</value> + </param> + <param> + <key>tr_delay</key> <value>0</value> </param> <param> - <key>min</key> - <value>-100</value> + <key>tr_chan</key> + <value>0</value> </param> <param> - <key>max</key> - <value>100</value> + <key>tr_tag</key> + <value>""</value> </param> <param> - <key>num_steps</key> - <value>200</value> + <key>label1</key> + <value></value> + </param> + <param> + <key>width1</key> + <value>1</value> + </param> + <param> + <key>color1</key> + <value>"blue"</value> + </param> + <param> + <key>style1</key> + <value>1</value> </param> <param> - <key>style</key> - <value>wx.SL_HORIZONTAL</value> + <key>marker1</key> + <value>-1</value> </param> <param> - <key>converver</key> - <value>float_converter</value> + <key>alpha1</key> + <value>1.0</value> </param> <param> - <key>grid_pos</key> + <key>label2</key> <value></value> </param> <param> - <key>notebook</key> + <key>width2</key> + <value>1</value> + </param> + <param> + <key>color2</key> + <value>"red"</value> + </param> + <param> + <key>style2</key> + <value>1</value> + </param> + <param> + <key>marker2</key> + <value>-1</value> + </param> + <param> + <key>alpha2</key> + <value>1.0</value> + </param> + <param> + <key>label3</key> <value></value> </param> <param> - <key>_coordinate</key> - <value>(167, 510)</value> + <key>width3</key> + <value>1</value> </param> <param> - <key>_rotation</key> - <value>0</value> + <key>color3</key> + <value>"green"</value> </param> - </block> - <block> - <key>blocks_rms_xx</key> <param> - <key>id</key> - <value>blocks_rms_xx_0</value> + <key>style3</key> + <value>1</value> </param> <param> - <key>_enabled</key> - <value>True</value> + <key>marker3</key> + <value>-1</value> </param> <param> - <key>type</key> - <value>complex</value> + <key>alpha3</key> + <value>1.0</value> </param> <param> - <key>alpha</key> - <value>.0001</value> + <key>label4</key> + <value></value> </param> <param> - <key>affinity</key> + <key>width4</key> + <value>1</value> + </param> + <param> + <key>color4</key> + <value>"black"</value> + </param> + <param> + <key>style4</key> + <value>1</value> + </param> + <param> + <key>marker4</key> + <value>-1</value> + </param> + <param> + <key>alpha4</key> + <value>1.0</value> + </param> + <param> + <key>label5</key> <value></value> </param> <param> - <key>minoutbuf</key> - <value>0</value> + <key>width5</key> + <value>1</value> </param> <param> - <key>_coordinate</key> - <value>(491, 138)</value> + <key>color5</key> + <value>"cyan"</value> </param> <param> - <key>_rotation</key> - <value>0</value> + <key>style5</key> + <value>1</value> </param> - </block> - <block> - <key>blocks_rms_xx</key> <param> - <key>id</key> - <value>blocks_rms_xx_0_0</value> + <key>marker5</key> + <value>-1</value> </param> <param> - <key>_enabled</key> - <value>True</value> + <key>alpha5</key> + <value>1.0</value> </param> <param> - <key>type</key> - <value>complex</value> + <key>label6</key> + <value></value> </param> <param> - <key>alpha</key> - <value>.0001</value> + <key>width6</key> + <value>1</value> </param> <param> - <key>affinity</key> + <key>color6</key> + <value>"magenta"</value> + </param> + <param> + <key>style6</key> + <value>1</value> + </param> + <param> + <key>marker6</key> + <value>-1</value> + </param> + <param> + <key>alpha6</key> + <value>1.0</value> + </param> + <param> + <key>label7</key> <value></value> </param> <param> - <key>minoutbuf</key> - <value>0</value> + <key>width7</key> + <value>1</value> + </param> + <param> + <key>color7</key> + <value>"yellow"</value> + </param> + <param> + <key>style7</key> + <value>1</value> + </param> + <param> + <key>marker7</key> + <value>-1</value> + </param> + <param> + <key>alpha7</key> + <value>1.0</value> + </param> + <param> + <key>label8</key> + <value></value> + </param> + <param> + <key>width8</key> + <value>1</value> + </param> + <param> + <key>color8</key> + <value>"dark red"</value> + </param> + <param> + <key>style8</key> + <value>1</value> + </param> + <param> + <key>marker8</key> + <value>-1</value> + </param> + <param> + <key>alpha8</key> + <value>1.0</value> + </param> + <param> + <key>label9</key> + <value></value> + </param> + <param> + <key>width9</key> + <value>1</value> + </param> + <param> + <key>color9</key> + <value>"dark green"</value> + </param> + <param> + <key>style9</key> + <value>1</value> + </param> + <param> + <key>marker9</key> + <value>-1</value> + </param> + <param> + <key>alpha9</key> + <value>1.0</value> + </param> + <param> + <key>label10</key> + <value></value> + </param> + <param> + <key>width10</key> + <value>1</value> + </param> + <param> + <key>color10</key> + <value>"blue"</value> + </param> + <param> + <key>style10</key> + <value>1</value> + </param> + <param> + <key>marker10</key> + <value>-1</value> + </param> + <param> + <key>alpha10</key> + <value>1.0</value> + </param> + <param> + <key>alias</key> + <value></value> + </param> + <param> + <key>affinity</key> + <value></value> </param> <param> <key>_coordinate</key> - <value>(465, 458)</value> + <value>(853, 100)</value> </param> <param> <key>_rotation</key> @@ -445,6 +738,10 @@ <value>2</value> </param> <param> + <key>alias</key> + <value></value> + </param> + <param> <key>affinity</key> <value></value> </param> @@ -453,8 +750,12 @@ <value>0</value> </param> <param> + <key>maxoutbuf</key> + <value>0</value> + </param> + <param> <key>_coordinate</key> - <value>(680, 630)</value> + <value>(665, 388)</value> </param> <param> <key>_rotation</key> @@ -484,6 +785,10 @@ <value>1</value> </param> <param> + <key>alias</key> + <value></value> + </param> + <param> <key>affinity</key> <value></value> </param> @@ -492,8 +797,12 @@ <value>0</value> </param> <param> + <key>maxoutbuf</key> + <value>0</value> + </param> + <param> <key>_coordinate</key> - <value>(813, 640)</value> + <value>(814, 393)</value> </param> <param> <key>_rotation</key> @@ -501,81 +810,159 @@ </param> </block> <block> - <key>wxgui_numbersink2</key> + <key>variable_qtgui_range</key> <param> <key>id</key> - <value>snr_disp</value> + <value>snr</value> </param> <param> <key>_enabled</key> <value>True</value> </param> <param> - <key>type</key> - <value>float</value> + <key>label</key> + <value>Noise Level</value> </param> <param> - <key>title</key> - <value>SNR</value> + <key>value</key> + <value>0</value> </param> <param> - <key>units</key> - <value>dB</value> + <key>start</key> + <value>-100</value> </param> <param> - <key>samp_rate</key> - <value>samp_rate</value> + <key>stop</key> + <value>100</value> </param> <param> - <key>min_value</key> - <value>-100</value> + <key>step</key> + <value>1</value> </param> <param> - <key>max_value</key> - <value>100</value> + <key>widget</key> + <value>counter_slider</value> </param> <param> - <key>factor</key> - <value>1.0</value> + <key>orient</key> + <value>Qt.Horizontal</value> + </param> + <param> + <key>min_len</key> + <value>200</value> </param> <param> - <key>decimal_places</key> - <value>5</value> + <key>gui_hint</key> + <value></value> </param> <param> - <key>ref_level</key> + <key>alias</key> + <value></value> + </param> + <param> + <key>_coordinate</key> + <value>(348, 0)</value> + </param> + <param> + <key>_rotation</key> <value>0</value> </param> + </block> + <block> + <key>variable_qtgui_range</key> <param> - <key>number_rate</key> - <value>15</value> + <key>id</key> + <value>freq_offset</value> </param> <param> - <key>peak_hold</key> - <value>False</value> + <key>_enabled</key> + <value>True</value> </param> <param> - <key>average</key> - <value>False</value> + <key>label</key> + <value>Frequency Offset</value> </param> <param> - <key>avg_alpha</key> + <key>value</key> <value>0</value> </param> <param> - <key>show_gauge</key> - <value>False</value> + <key>start</key> + <value>-5*samp_rate/fft_size</value> + </param> + <param> + <key>stop</key> + <value>5*samp_rate/fft_size</value> + </param> + <param> + <key>step</key> + <value>1</value> + </param> + <param> + <key>widget</key> + <value>counter_slider</value> + </param> + <param> + <key>orient</key> + <value>Qt.Horizontal</value> </param> <param> - <key>win_size</key> + <key>min_len</key> + <value>200</value> + </param> + <param> + <key>gui_hint</key> <value></value> </param> <param> - <key>grid_pos</key> + <key>alias</key> <value></value> </param> <param> - <key>notebook</key> + <key>_coordinate</key> + <value>(487, 0)</value> + </param> + <param> + <key>_rotation</key> + <value>0</value> + </param> + </block> + <block> + <key>analog_sig_source_x</key> + <param> + <key>id</key> + <value>analog_sig_source_x_0</value> + </param> + <param> + <key>_enabled</key> + <value>True</value> + </param> + <param> + <key>type</key> + <value>complex</value> + </param> + <param> + <key>samp_rate</key> + <value>samp_rate</value> + </param> + <param> + <key>waveform</key> + <value>analog.GR_COS_WAVE</value> + </param> + <param> + <key>freq</key> + <value>float(samp_rate)/float(fft_size)*26+freq_offset</value> + </param> + <param> + <key>amp</key> + <value>1.0</value> + </param> + <param> + <key>offset</key> + <value>0</value> + </param> + <param> + <key>alias</key> <value></value> </param> <param> @@ -583,8 +970,16 @@ <value></value> </param> <param> + <key>minoutbuf</key> + <value>0</value> + </param> + <param> + <key>maxoutbuf</key> + <value>0</value> + </param> + <param> <key>_coordinate</key> - <value>(907, 654)</value> + <value>(12, 228)</value> </param> <param> <key>_rotation</key> @@ -592,10 +987,10 @@ </param> </block> <block> - <key>wxgui_numbersink2</key> + <key>qtgui_number_sink</key> <param> <key>id</key> - <value>wxgui_numbersink2_0</value> + <value>qtgui_number_sink_snr</value> </param> <param> <key>_enabled</key> @@ -606,67 +1001,119 @@ <value>float</value> </param> <param> - <key>title</key> - <value>Noise Amplitude</value> + <key>autoscale</key> + <value>True</value> + </param> + <param> + <key>avg</key> + <value>0</value> + </param> + <param> + <key>graph_type</key> + <value>qtgui.NUM_GRAPH_HORIZ</value> + </param> + <param> + <key>nconnections</key> + <value>1</value> + </param> + <param> + <key>min</key> + <value>-1</value> </param> <param> - <key>units</key> + <key>max</key> + <value>1</value> + </param> + <param> + <key>update_time</key> + <value>0.10</value> + </param> + <param> + <key>gui_hint</key> <value></value> </param> <param> - <key>samp_rate</key> - <value>samp_rate</value> + <key>label1</key> + <value>SNR</value> </param> <param> - <key>min_value</key> - <value>-100</value> + <key>color1</key> + <value>("black", "black")</value> </param> <param> - <key>max_value</key> - <value>100</value> + <key>label2</key> + <value></value> </param> <param> - <key>factor</key> - <value>1.0</value> + <key>color2</key> + <value>("black", "black")</value> </param> <param> - <key>decimal_places</key> - <value>5</value> + <key>label3</key> + <value></value> </param> <param> - <key>ref_level</key> - <value>0</value> + <key>color3</key> + <value>("black", "black")</value> </param> <param> - <key>number_rate</key> - <value>15</value> + <key>label4</key> + <value></value> </param> <param> - <key>peak_hold</key> - <value>False</value> + <key>color4</key> + <value>("black", "black")</value> </param> <param> - <key>average</key> - <value>False</value> + <key>label5</key> + <value></value> </param> <param> - <key>avg_alpha</key> - <value>0</value> + <key>color5</key> + <value>("black", "black")</value> </param> <param> - <key>show_gauge</key> - <value>False</value> + <key>label6</key> + <value></value> + </param> + <param> + <key>color6</key> + <value>("black", "black")</value> + </param> + <param> + <key>label7</key> + <value></value> + </param> + <param> + <key>color7</key> + <value>("black", "black")</value> + </param> + <param> + <key>label8</key> + <value></value> + </param> + <param> + <key>color8</key> + <value>("black", "black")</value> </param> <param> - <key>win_size</key> + <key>label9</key> <value></value> </param> <param> - <key>grid_pos</key> + <key>color9</key> + <value>("black", "black")</value> + </param> + <param> + <key>label10</key> <value></value> </param> <param> - <key>notebook</key> + <key>color10</key> + <value>("black", "black")</value> + </param> + <param> + <key>alias</key> <value></value> </param> <param> @@ -675,7 +1122,7 @@ </param> <param> <key>_coordinate</key> - <value>(774, 46)</value> + <value>(948, 385)</value> </param> <param> <key>_rotation</key> @@ -683,10 +1130,10 @@ </param> </block> <block> - <key>wxgui_numbersink2</key> + <key>qtgui_freq_sink_x</key> <param> <key>id</key> - <value>wxgui_numbersink2_0_0</value> + <value>qtgui_freq_sink_x_0</value> </param> <param> <key>_enabled</key> @@ -694,150 +1141,219 @@ </param> <param> <key>type</key> - <value>float</value> + <value>complex</value> </param> <param> - <key>title</key> - <value>Signal Amplitude</value> + <key>name</key> + <value>FFT Plot</value> </param> <param> - <key>units</key> - <value></value> + <key>fftsize</key> + <value>1024</value> </param> <param> - <key>samp_rate</key> - <value>samp_rate</value> + <key>wintype</key> + <value>firdes.WIN_FLATTOP</value> </param> <param> - <key>min_value</key> - <value>-100</value> + <key>fc</key> + <value>0</value> </param> <param> - <key>max_value</key> - <value>100</value> + <key>bw</key> + <value>1.0</value> </param> <param> - <key>factor</key> + <key>autoscale</key> + <value>True</value> + </param> + <param> + <key>average</key> <value>1.0</value> </param> <param> - <key>decimal_places</key> - <value>5</value> + <key>ymin</key> + <value>-140</value> </param> <param> - <key>ref_level</key> - <value>0</value> + <key>ymax</key> + <value>10</value> </param> <param> - <key>number_rate</key> - <value>15</value> + <key>nconnections</key> + <value>1</value> </param> <param> - <key>peak_hold</key> - <value>False</value> + <key>update_time</key> + <value>0.10</value> </param> <param> - <key>average</key> - <value>False</value> + <key>gui_hint</key> + <value></value> </param> <param> - <key>avg_alpha</key> - <value>0</value> + <key>label1</key> + <value></value> </param> <param> - <key>show_gauge</key> - <value>False</value> + <key>width1</key> + <value>1</value> </param> <param> - <key>win_size</key> - <value></value> + <key>color1</key> + <value>"blue"</value> </param> <param> - <key>grid_pos</key> + <key>alpha1</key> + <value>1.0</value> + </param> + <param> + <key>label2</key> <value></value> </param> <param> - <key>notebook</key> + <key>width2</key> + <value>1</value> + </param> + <param> + <key>color2</key> + <value>"red"</value> + </param> + <param> + <key>alpha2</key> + <value>1.0</value> + </param> + <param> + <key>label3</key> <value></value> </param> <param> - <key>affinity</key> + <key>width3</key> + <value>1</value> + </param> + <param> + <key>color3</key> + <value>"green"</value> + </param> + <param> + <key>alpha3</key> + <value>1.0</value> + </param> + <param> + <key>label4</key> <value></value> </param> <param> - <key>_coordinate</key> - <value>(774, 452)</value> + <key>width4</key> + <value>1</value> </param> <param> - <key>_rotation</key> - <value>0</value> + <key>color4</key> + <value>"black"</value> </param> - </block> - <block> - <key>wxgui_scopesink2</key> <param> - <key>id</key> - <value>wxgui_scopesink2_0</value> + <key>alpha4</key> + <value>1.0</value> </param> <param> - <key>_enabled</key> - <value>False</value> + <key>label5</key> + <value></value> </param> <param> - <key>type</key> - <value>complex</value> + <key>width5</key> + <value>1</value> </param> <param> - <key>title</key> - <value>Scope Plot</value> + <key>color5</key> + <value>"cyan"</value> </param> <param> - <key>samp_rate</key> - <value>samp_rate</value> + <key>alpha5</key> + <value>1.0</value> </param> <param> - <key>v_scale</key> - <value>0</value> + <key>label6</key> + <value></value> </param> <param> - <key>v_offset</key> - <value>0</value> + <key>width6</key> + <value>1</value> </param> <param> - <key>t_scale</key> - <value>0</value> + <key>color6</key> + <value>"magenta"</value> </param> <param> - <key>ac_couple</key> - <value>False</value> + <key>alpha6</key> + <value>1.0</value> </param> <param> - <key>xy_mode</key> - <value>False</value> + <key>label7</key> + <value></value> </param> <param> - <key>num_inputs</key> + <key>width7</key> <value>1</value> </param> <param> - <key>win_size</key> + <key>color7</key> + <value>"yellow"</value> + </param> + <param> + <key>alpha7</key> + <value>1.0</value> + </param> + <param> + <key>label8</key> <value></value> </param> <param> - <key>grid_pos</key> + <key>width8</key> + <value>1</value> + </param> + <param> + <key>color8</key> + <value>"dark red"</value> + </param> + <param> + <key>alpha8</key> + <value>1.0</value> + </param> + <param> + <key>label9</key> <value></value> </param> <param> - <key>notebook</key> + <key>width9</key> + <value>1</value> + </param> + <param> + <key>color9</key> + <value>"dark green"</value> + </param> + <param> + <key>alpha9</key> + <value>1.0</value> + </param> + <param> + <key>label10</key> <value></value> </param> <param> - <key>trig_mode</key> - <value>wxgui.TRIG_MODE_AUTO</value> + <key>width10</key> + <value>1</value> + </param> + <param> + <key>color10</key> + <value>"dark blue"</value> </param> <param> - <key>y_axis_label</key> - <value>Counts</value> + <key>alpha10</key> + <value>1.0</value> + </param> + <param> + <key>alias</key> + <value></value> </param> <param> <key>affinity</key> @@ -845,7 +1361,7 @@ </param> <param> <key>_coordinate</key> - <value>(696, 244)</value> + <value>(853, 219)</value> </param> <param> <key>_rotation</key> @@ -853,10 +1369,10 @@ </param> </block> <block> - <key>wxgui_fftsink2</key> + <key>qtgui_number_sink</key> <param> <key>id</key> - <value>wxgui_fftsink2_0</value> + <value>qtgui_number_sink_signal_amplitude</value> </param> <param> <key>_enabled</key> @@ -864,75 +1380,123 @@ </param> <param> <key>type</key> - <value>complex</value> + <value>float</value> </param> <param> - <key>title</key> - <value>FFT Plot</value> + <key>autoscale</key> + <value>False</value> </param> <param> - <key>samp_rate</key> - <value>samp_rate</value> + <key>avg</key> + <value>0</value> + </param> + <param> + <key>graph_type</key> + <value>qtgui.NUM_GRAPH_HORIZ</value> </param> <param> - <key>baseband_freq</key> + <key>nconnections</key> + <value>1</value> + </param> + <param> + <key>min</key> <value>0</value> </param> <param> - <key>y_per_div</key> - <value>10</value> + <key>max</key> + <value>2</value> </param> <param> - <key>y_divs</key> - <value>15</value> + <key>update_time</key> + <value>0.10</value> </param> <param> - <key>ref_level</key> - <value>0</value> + <key>gui_hint</key> + <value></value> + </param> + <param> + <key>label1</key> + <value>Signal Amplitude</value> </param> <param> - <key>ref_scale</key> - <value>2.0</value> + <key>color1</key> + <value>("black", "black")</value> </param> <param> - <key>fft_size</key> - <value>fft_size</value> + <key>label2</key> + <value></value> </param> <param> - <key>fft_rate</key> - <value>20</value> + <key>color2</key> + <value>("black", "black")</value> </param> <param> - <key>peak_hold</key> - <value>False</value> + <key>label3</key> + <value></value> </param> <param> - <key>average</key> - <value>False</value> + <key>color3</key> + <value>("black", "black")</value> </param> <param> - <key>avg_alpha</key> - <value>0</value> + <key>label4</key> + <value></value> + </param> + <param> + <key>color4</key> + <value>("black", "black")</value> + </param> + <param> + <key>label5</key> + <value></value> + </param> + <param> + <key>color5</key> + <value>("black", "black")</value> + </param> + <param> + <key>label6</key> + <value></value> + </param> + <param> + <key>color6</key> + <value>("black", "black")</value> + </param> + <param> + <key>label7</key> + <value></value> </param> <param> - <key>win</key> - <value>window.flattop</value> + <key>color7</key> + <value>("black", "black")</value> </param> <param> - <key>win_size</key> + <key>label8</key> <value></value> </param> <param> - <key>grid_pos</key> + <key>color8</key> + <value>("black", "black")</value> + </param> + <param> + <key>label9</key> <value></value> </param> <param> - <key>notebook</key> + <key>color9</key> + <value>("black", "black")</value> + </param> + <param> + <key>label10</key> <value></value> </param> <param> - <key>freqvar</key> - <value>None</value> + <key>color10</key> + <value>("black", "black")</value> + </param> + <param> + <key>alias</key> + <value></value> </param> <param> <key>affinity</key> @@ -940,7 +1504,7 @@ </param> <param> <key>_coordinate</key> - <value>(894, 271)</value> + <value>(660, 286)</value> </param> <param> <key>_rotation</key> @@ -948,58 +1512,142 @@ </param> </block> <block> - <key>options</key> + <key>qtgui_number_sink</key> <param> <key>id</key> - <value>demo_spec_an</value> + <value>qtgui_number_sink_0</value> </param> <param> <key>_enabled</key> <value>True</value> </param> <param> - <key>title</key> + <key>type</key> + <value>float</value> + </param> + <param> + <key>autoscale</key> + <value>False</value> + </param> + <param> + <key>avg</key> + <value>0</value> + </param> + <param> + <key>graph_type</key> + <value>qtgui.NUM_GRAPH_HORIZ</value> + </param> + <param> + <key>nconnections</key> + <value>1</value> + </param> + <param> + <key>min</key> + <value>0</value> + </param> + <param> + <key>max</key> + <value>100</value> + </param> + <param> + <key>update_time</key> + <value>0.10</value> + </param> + <param> + <key>gui_hint</key> <value></value> </param> <param> - <key>author</key> - <value>mettus</value> + <key>label1</key> + <value>Noise Amplitude</value> </param> <param> - <key>description</key> + <key>color1</key> + <value>("black", "black")</value> + </param> + <param> + <key>label2</key> <value></value> </param> <param> - <key>window_size</key> - <value>1280, 1024</value> + <key>color2</key> + <value>("black", "black")</value> </param> <param> - <key>generate_options</key> - <value>wx_gui</value> + <key>label3</key> + <value></value> </param> <param> - <key>category</key> - <value>Custom</value> + <key>color3</key> + <value>("black", "black")</value> </param> <param> - <key>run_options</key> - <value>prompt</value> + <key>label4</key> + <value></value> </param> <param> - <key>run</key> - <value>True</value> + <key>color4</key> + <value>("black", "black")</value> </param> <param> - <key>max_nouts</key> - <value>0</value> + <key>label5</key> + <value></value> </param> <param> - <key>realtime_scheduling</key> + <key>color5</key> + <value>("black", "black")</value> + </param> + <param> + <key>label6</key> + <value></value> + </param> + <param> + <key>color6</key> + <value>("black", "black")</value> + </param> + <param> + <key>label7</key> + <value></value> + </param> + <param> + <key>color7</key> + <value>("black", "black")</value> + </param> + <param> + <key>label8</key> + <value></value> + </param> + <param> + <key>color8</key> + <value>("black", "black")</value> + </param> + <param> + <key>label9</key> + <value></value> + </param> + <param> + <key>color9</key> + <value>("black", "black")</value> + </param> + <param> + <key>label10</key> + <value></value> + </param> + <param> + <key>color10</key> + <value>("black", "black")</value> + </param> + <param> + <key>alias</key> + <value></value> + </param> + <param> + <key>affinity</key> <value></value> </param> <param> <key>_coordinate</key> - <value>(10, 10)</value> + <value>(733, 2)</value> </param> <param> <key>_rotation</key> @@ -1007,38 +1655,38 @@ </param> </block> <connection> - <source_block_id>analog_sig_source_x_0</source_block_id> - <sink_block_id>blocks_add_xx_0</sink_block_id> + <source_block_id>blocks_divide_xx_0</source_block_id> + <sink_block_id>blocks_nlog10_ff_0</sink_block_id> <source_key>0</source_key> - <sink_key>1</sink_key> + <sink_key>0</sink_key> </connection> <connection> - <source_block_id>analog_noise_source_x_0</source_block_id> - <sink_block_id>blocks_add_xx_0</sink_block_id> + <source_block_id>blocks_rms_xx_0</source_block_id> + <sink_block_id>blocks_divide_xx_0</sink_block_id> <source_key>0</source_key> - <sink_key>0</sink_key> + <sink_key>1</sink_key> </connection> <connection> - <source_block_id>blocks_add_xx_0</source_block_id> - <sink_block_id>blocks_throttle_0</sink_block_id> + <source_block_id>blocks_rms_xx_0_0</source_block_id> + <sink_block_id>blocks_divide_xx_0</sink_block_id> <source_key>0</source_key> <sink_key>0</sink_key> </connection> <connection> - <source_block_id>blocks_throttle_0</source_block_id> - <sink_block_id>wxgui_fftsink2_0</sink_block_id> + <source_block_id>blocks_rms_xx_0</source_block_id> + <sink_block_id>qtgui_number_sink_0</sink_block_id> <source_key>0</source_key> <sink_key>0</sink_key> </connection> <connection> - <source_block_id>analog_noise_source_x_0</source_block_id> - <sink_block_id>blocks_rms_xx_0</sink_block_id> + <source_block_id>blocks_rms_xx_0_0</source_block_id> + <sink_block_id>qtgui_number_sink_signal_amplitude</sink_block_id> <source_key>0</source_key> <sink_key>0</sink_key> </connection> <connection> - <source_block_id>blocks_rms_xx_0</source_block_id> - <sink_block_id>wxgui_numbersink2_0</sink_block_id> + <source_block_id>blocks_throttle_0</source_block_id> + <sink_block_id>qtgui_freq_sink_x_0</sink_block_id> <source_key>0</source_key> <sink_key>0</sink_key> </connection> @@ -1049,38 +1697,38 @@ <sink_key>0</sink_key> </connection> <connection> - <source_block_id>blocks_rms_xx_0_0</source_block_id> - <sink_block_id>wxgui_numbersink2_0_0</sink_block_id> + <source_block_id>analog_noise_source_x_0</source_block_id> + <sink_block_id>blocks_rms_xx_0</sink_block_id> <source_key>0</source_key> <sink_key>0</sink_key> </connection> <connection> - <source_block_id>blocks_nlog10_ff_0</source_block_id> - <sink_block_id>snr_disp</sink_block_id> + <source_block_id>blocks_add_xx_0</source_block_id> + <sink_block_id>blocks_throttle_0</sink_block_id> <source_key>0</source_key> <sink_key>0</sink_key> </connection> <connection> - <source_block_id>blocks_divide_xx_0</source_block_id> - <sink_block_id>blocks_nlog10_ff_0</sink_block_id> + <source_block_id>analog_noise_source_x_0</source_block_id> + <sink_block_id>blocks_add_xx_0</sink_block_id> <source_key>0</source_key> <sink_key>0</sink_key> </connection> <connection> - <source_block_id>blocks_rms_xx_0</source_block_id> - <sink_block_id>blocks_divide_xx_0</sink_block_id> + <source_block_id>analog_sig_source_x_0</source_block_id> + <sink_block_id>blocks_add_xx_0</sink_block_id> <source_key>0</source_key> <sink_key>1</sink_key> </connection> <connection> - <source_block_id>blocks_rms_xx_0_0</source_block_id> - <sink_block_id>blocks_divide_xx_0</sink_block_id> + <source_block_id>blocks_throttle_0</source_block_id> + <sink_block_id>qtgui_time_sink_x_0</sink_block_id> <source_key>0</source_key> <sink_key>0</sink_key> </connection> <connection> - <source_block_id>blocks_throttle_0</source_block_id> - <sink_block_id>wxgui_scopesink2_0</sink_block_id> + <source_block_id>blocks_nlog10_ff_0</source_block_id> + <sink_block_id>qtgui_number_sink_snr</sink_block_id> <source_key>0</source_key> <sink_key>0</sink_key> </connection> diff --git a/gr-digital/examples/demod/ber_simulation.grc b/gr-digital/examples/demod/ber_simulation.grc index 72d52d3730..8f9351fe1a 100644 --- a/gr-digital/examples/demod/ber_simulation.grc +++ b/gr-digital/examples/demod/ber_simulation.grc @@ -1,6 +1,6 @@ <?xml version='1.0' encoding='ASCII'?> <flow_graph> - <timestamp>Mon Jan 14 11:20:53 2013</timestamp> + <timestamp>Sat Jul 12 13:50:53 2014</timestamp> <block> <key>options</key> <param> @@ -29,7 +29,7 @@ </param> <param> <key>generate_options</key> - <value>wx_gui</value> + <value>qt_gui</value> </param> <param> <key>category</key> @@ -52,6 +52,10 @@ <value></value> </param> <param> + <key>alias</key> + <value></value> + </param> + <param> <key>_coordinate</key> <value>(16, 10)</value> </param> @@ -61,30 +65,26 @@ </param> </block> <block> - <key>blocks_throttle</key> + <key>variable</key> <param> <key>id</key> - <value>blocks_throttle</value> + <value>const_type</value> </param> <param> <key>_enabled</key> <value>True</value> </param> <param> - <key>type</key> - <value>byte</value> - </param> - <param> - <key>samples_per_second</key> - <value>samp_rate</value> + <key>value</key> + <value>1</value> </param> <param> - <key>vlen</key> - <value>1</value> + <key>alias</key> + <value></value> </param> <param> <key>_coordinate</key> - <value>(284, 24)</value> + <value>(18, 428)</value> </param> <param> <key>_rotation</key> @@ -92,30 +92,53 @@ </param> </block> <block> - <key>blocks_add_xx</key> + <key>variable</key> <param> <key>id</key> - <value>blocks_add_xx</value> + <value>const</value> </param> <param> <key>_enabled</key> <value>True</value> </param> <param> - <key>type</key> - <value>complex</value> + <key>value</key> + <value>(digital.constellation_bpsk(), digital.constellation_qpsk(), digital.constellation_8psk())</value> </param> <param> - <key>num_inputs</key> - <value>2</value> + <key>alias</key> + <value></value> </param> <param> - <key>vlen</key> - <value>1</value> + <key>_coordinate</key> + <value>(116, 310)</value> + </param> + <param> + <key>_rotation</key> + <value>0</value> + </param> + </block> + <block> + <key>variable</key> + <param> + <key>id</key> + <value>samp_rate</value> + </param> + <param> + <key>_enabled</key> + <value>True</value> + </param> + <param> + <key>value</key> + <value>100e3</value> + </param> + <param> + <key>alias</key> + <value></value> </param> <param> <key>_coordinate</key> - <value>(486, 151)</value> + <value>(16, 308)</value> </param> <param> <key>_rotation</key> @@ -123,10 +146,10 @@ </param> </block> <block> - <key>wxgui_numbersink2</key> + <key>blocks_throttle</key> <param> <key>id</key> - <value>wxgui_numbersink2</value> + <value>blocks_throttle</value> </param> <param> <key>_enabled</key> @@ -134,98 +157,172 @@ </param> <param> <key>type</key> - <value>float</value> + <value>byte</value> </param> <param> - <key>title</key> - <value>BER</value> + <key>samples_per_second</key> + <value>samp_rate</value> </param> <param> - <key>units</key> - <value>%</value> + <key>vlen</key> + <value>1</value> </param> <param> - <key>samp_rate</key> - <value>samp_rate</value> + <key>ignoretag</key> + <value>True</value> </param> <param> - <key>min_value</key> - <value>0.0</value> + <key>alias</key> + <value></value> </param> <param> - <key>max_value</key> - <value>1.0</value> + <key>affinity</key> + <value></value> + </param> + <param> + <key>minoutbuf</key> + <value>0</value> + </param> + <param> + <key>maxoutbuf</key> + <value>0</value> + </param> + <param> + <key>_coordinate</key> + <value>(284, 24)</value> </param> <param> - <key>factor</key> - <value>100</value> + <key>_rotation</key> + <value>0</value> + </param> + </block> + <block> + <key>import</key> + <param> + <key>id</key> + <value>import</value> + </param> + <param> + <key>_enabled</key> + <value>True</value> + </param> + <param> + <key>import</key> + <value>import math</value> + </param> + <param> + <key>alias</key> + <value></value> </param> <param> - <key>decimal_places</key> - <value>4</value> + <key>_coordinate</key> + <value>(18, 373)</value> </param> <param> - <key>ref_level</key> + <key>_rotation</key> <value>0</value> </param> + </block> + <block> + <key>analog_random_source_x</key> <param> - <key>number_rate</key> - <value>15</value> + <key>id</key> + <value>analog_random_source_x</value> </param> <param> - <key>peak_hold</key> - <value>False</value> + <key>_enabled</key> + <value>True</value> </param> <param> - <key>average</key> - <value>False</value> + <key>type</key> + <value>byte</value> </param> <param> - <key>avg_alpha</key> + <key>min</key> <value>0</value> </param> <param> - <key>show_gauge</key> - <value>False</value> + <key>max</key> + <value>const[const_type].arity()</value> </param> <param> - <key>win_size</key> - <value></value> + <key>num_samps</key> + <value>10000000</value> + </param> + <param> + <key>repeat</key> + <value>True</value> </param> <param> - <key>grid_pos</key> - <value>1, 0, 1, 1</value> + <key>alias</key> + <value></value> </param> <param> - <key>notebook</key> + <key>affinity</key> <value></value> </param> <param> + <key>minoutbuf</key> + <value>0</value> + </param> + <param> + <key>maxoutbuf</key> + <value>0</value> + </param> + <param> <key>_coordinate</key> - <value>(791, 228)</value> + <value>(17, 125)</value> </param> <param> <key>_rotation</key> - <value>180</value> + <value>0</value> </param> </block> <block> - <key>import</key> + <key>analog_noise_source_x</key> <param> <key>id</key> - <value>import</value> + <value>analog_noise_source_x</value> </param> <param> <key>_enabled</key> <value>True</value> </param> <param> - <key>import</key> - <value>import math</value> + <key>type</key> + <value>complex</value> + </param> + <param> + <key>noise_type</key> + <value>analog.GR_GAUSSIAN</value> + </param> + <param> + <key>amp</key> + <value>1.0 / math.sqrt(2.0 * const[const_type].bits_per_symbol() * 10**(EbN0/10))</value> + </param> + <param> + <key>seed</key> + <value>42</value> + </param> + <param> + <key>alias</key> + <value></value> + </param> + <param> + <key>affinity</key> + <value></value> + </param> + <param> + <key>minoutbuf</key> + <value>0</value> + </param> + <param> + <key>maxoutbuf</key> + <value>0</value> </param> <param> <key>_coordinate</key> - <value>(18, 373)</value> + <value>(16, 224)</value> </param> <param> <key>_rotation</key> @@ -233,54 +330,54 @@ </param> </block> <block> - <key>variable_slider</key> + <key>digital_chunks_to_symbols_xx</key> <param> <key>id</key> - <value>EbN0</value> + <value>digital_chunks_to_symbols_xx</value> </param> <param> <key>_enabled</key> <value>True</value> </param> <param> - <key>label</key> - <value>Eb/N0 (dB)</value> + <key>in_type</key> + <value>byte</value> </param> <param> - <key>value</key> - <value>10</value> + <key>out_type</key> + <value>complex</value> </param> <param> - <key>min</key> - <value>-10</value> + <key>symbol_table</key> + <value>const[const_type].points()</value> </param> <param> - <key>max</key> - <value>200</value> + <key>dimension</key> + <value>1</value> </param> <param> - <key>num_steps</key> - <value>211</value> + <key>num_ports</key> + <value>1</value> </param> <param> - <key>style</key> - <value>wx.SL_HORIZONTAL</value> + <key>alias</key> + <value></value> </param> <param> - <key>converver</key> - <value>float_converter</value> + <key>affinity</key> + <value></value> </param> <param> - <key>grid_pos</key> - <value></value> + <key>minoutbuf</key> + <value>0</value> </param> <param> - <key>notebook</key> - <value></value> + <key>maxoutbuf</key> + <value>0</value> </param> <param> <key>_coordinate</key> - <value>(311, 309)</value> + <value>(240, 140)</value> </param> <param> <key>_rotation</key> @@ -288,22 +385,38 @@ </param> </block> <block> - <key>variable</key> + <key>digital_constellation_decoder_cb</key> <param> <key>id</key> - <value>const</value> + <value>digital_constellation_decoder_cb_0</value> </param> <param> <key>_enabled</key> <value>True</value> </param> <param> - <key>value</key> - <value>(digital.constellation_bpsk(), digital.constellation_qpsk(), digital.constellation_8psk())</value> + <key>constellation</key> + <value>const[const_type].base()</value> + </param> + <param> + <key>alias</key> + <value></value> + </param> + <param> + <key>affinity</key> + <value></value> + </param> + <param> + <key>minoutbuf</key> + <value>0</value> + </param> + <param> + <key>maxoutbuf</key> + <value>0</value> </param> <param> <key>_coordinate</key> - <value>(116, 310)</value> + <value>(618, 164)</value> </param> <param> <key>_rotation</key> @@ -311,38 +424,58 @@ </param> </block> <block> - <key>analog_random_source_x</key> + <key>variable_qtgui_range</key> <param> <key>id</key> - <value>analog_random_source_x</value> + <value>EbN0</value> </param> <param> <key>_enabled</key> <value>True</value> </param> <param> - <key>type</key> - <value>byte</value> + <key>label</key> + <value>Eb / N0 (dB)</value> </param> <param> - <key>min</key> - <value>0</value> + <key>value</key> + <value>10</value> </param> <param> - <key>max</key> - <value>const[const_type].arity()</value> + <key>start</key> + <value>-10</value> </param> <param> - <key>num_samps</key> - <value>10000000</value> + <key>stop</key> + <value>200</value> </param> <param> - <key>repeat</key> - <value>True</value> + <key>step</key> + <value>1</value> + </param> + <param> + <key>widget</key> + <value>counter_slider</value> + </param> + <param> + <key>orient</key> + <value>Qt.Horizontal</value> + </param> + <param> + <key>min_len</key> + <value>200</value> + </param> + <param> + <key>gui_hint</key> + <value></value> + </param> + <param> + <key>alias</key> + <value></value> </param> <param> <key>_coordinate</key> - <value>(17, 125)</value> + <value>(317, 281)</value> </param> <param> <key>_rotation</key> @@ -350,34 +483,42 @@ </param> </block> <block> - <key>analog_noise_source_x</key> + <key>variable_qtgui_label</key> <param> <key>id</key> - <value>analog_noise_source_x</value> + <value>variable_qtgui_label_0</value> </param> <param> <key>_enabled</key> <value>True</value> </param> <param> + <key>label</key> + <value>Constellation Type</value> + </param> + <param> <key>type</key> - <value>complex</value> + <value>string</value> </param> <param> - <key>noise_type</key> - <value>analog.GR_GAUSSIAN</value> + <key>value</key> + <value>{0: 'BPSK', 1: 'QPSK', 2: '8-PSK'}[const_type] + " - Change const_type for different constellation types!"</value> </param> <param> - <key>amp</key> - <value>1.0 / math.sqrt(2.0 * const[const_type].bits_per_symbol() * 10**(EbN0/10))</value> + <key>formatter</key> + <value>None</value> </param> <param> - <key>seed</key> - <value>42</value> + <key>gui_hint</key> + <value></value> + </param> + <param> + <key>alias</key> + <value></value> </param> <param> <key>_coordinate</key> - <value>(16, 224)</value> + <value>(294, 413)</value> </param> <param> <key>_rotation</key> @@ -385,38 +526,46 @@ </param> </block> <block> - <key>digital_chunks_to_symbols_xx</key> + <key>blocks_add_xx</key> <param> <key>id</key> - <value>digital_chunks_to_symbols_xx</value> + <value>blocks_add_xx</value> </param> <param> <key>_enabled</key> <value>True</value> </param> <param> - <key>in_type</key> - <value>byte</value> - </param> - <param> - <key>out_type</key> + <key>type</key> <value>complex</value> </param> <param> - <key>symbol_table</key> - <value>const[const_type].points()</value> + <key>num_inputs</key> + <value>2</value> </param> <param> - <key>dimension</key> + <key>vlen</key> <value>1</value> </param> <param> - <key>num_ports</key> - <value>1</value> + <key>alias</key> + <value></value> + </param> + <param> + <key>affinity</key> + <value></value> + </param> + <param> + <key>minoutbuf</key> + <value>0</value> + </param> + <param> + <key>maxoutbuf</key> + <value>0</value> </param> <param> <key>_coordinate</key> - <value>(240, 140)</value> + <value>(486, 151)</value> </param> <param> <key>_rotation</key> @@ -446,6 +595,22 @@ <value>const[const_type].bits_per_symbol()</value> </param> <param> + <key>alias</key> + <value></value> + </param> + <param> + <key>affinity</key> + <value></value> + </param> + <param> + <key>minoutbuf</key> + <value>0</value> + </param> + <param> + <key>maxoutbuf</key> + <value>0</value> + </param> + <param> <key>_coordinate</key> <value>(720, 25)</value> </param> @@ -455,143 +620,334 @@ </param> </block> <block> - <key>digital_constellation_decoder_cb</key> + <key>qtgui_const_sink_x</key> <param> <key>id</key> - <value>digital_constellation_decoder_cb_0</value> + <value>qtgui_const_sink_x_0</value> </param> <param> <key>_enabled</key> <value>True</value> </param> <param> - <key>constellation</key> - <value>const[const_type].base()</value> + <key>type</key> + <value>complex</value> </param> <param> - <key>_coordinate</key> - <value>(618, 164)</value> + <key>name</key> + <value>"foo"</value> </param> <param> - <key>_rotation</key> - <value>0</value> + <key>size</key> + <value>1024</value> </param> - </block> - <block> - <key>wxgui_scopesink2</key> <param> - <key>id</key> - <value>wxgui_scopesink2_0</value> + <key>grid</key> + <value>False</value> </param> <param> - <key>_enabled</key> - <value>True</value> + <key>autoscale</key> + <value>False</value> </param> <param> - <key>type</key> - <value>complex</value> + <key>ymin</key> + <value>-2</value> </param> <param> - <key>title</key> + <key>ymax</key> + <value>2</value> + </param> + <param> + <key>xmin</key> + <value>-2</value> + </param> + <param> + <key>xmax</key> + <value>2</value> + </param> + <param> + <key>nconnections</key> + <value>1</value> + </param> + <param> + <key>update_time</key> + <value>0.10</value> + </param> + <param> + <key>gui_hint</key> + <value>2,0,1,1</value> + </param> + <param> + <key>tr_mode</key> + <value>qtgui.TRIG_MODE_FREE</value> + </param> + <param> + <key>tr_slope</key> + <value>qtgui.TRIG_SLOPE_POS</value> + </param> + <param> + <key>tr_level</key> + <value>0.0</value> + </param> + <param> + <key>tr_chan</key> + <value>0</value> + </param> + <param> + <key>tr_tag</key> + <value>""</value> + </param> + <param> + <key>label1</key> <value>"Constellation: "+str(const[const_type].arity()) + "-PSK"</value> </param> <param> - <key>samp_rate</key> - <value>samp_rate</value> + <key>width1</key> + <value>1</value> + </param> + <param> + <key>color1</key> + <value>"blue"</value> + </param> + <param> + <key>style1</key> + <value>0</value> </param> <param> - <key>v_scale</key> + <key>marker1</key> <value>0</value> </param> <param> - <key>v_offset</key> + <key>alpha1</key> + <value>0.6</value> + </param> + <param> + <key>label2</key> + <value></value> + </param> + <param> + <key>width2</key> + <value>1</value> + </param> + <param> + <key>color2</key> + <value>"red"</value> + </param> + <param> + <key>style2</key> <value>0</value> </param> <param> - <key>t_scale</key> + <key>marker2</key> <value>0</value> </param> <param> - <key>ac_couple</key> - <value>False</value> + <key>alpha2</key> + <value>1.0</value> </param> <param> - <key>xy_mode</key> - <value>True</value> + <key>label3</key> + <value></value> </param> <param> - <key>num_inputs</key> + <key>width3</key> <value>1</value> </param> <param> - <key>win_size</key> + <key>color3</key> + <value>"red"</value> + </param> + <param> + <key>style3</key> + <value>0</value> + </param> + <param> + <key>marker3</key> + <value>0</value> + </param> + <param> + <key>alpha3</key> + <value>1.0</value> + </param> + <param> + <key>label4</key> <value></value> </param> <param> - <key>grid_pos</key> - <value>2, 0, 1, 1</value> + <key>width4</key> + <value>1</value> + </param> + <param> + <key>color4</key> + <value>"red"</value> </param> <param> - <key>notebook</key> + <key>style4</key> + <value>0</value> + </param> + <param> + <key>marker4</key> + <value>0</value> + </param> + <param> + <key>alpha4</key> + <value>1.0</value> + </param> + <param> + <key>label5</key> <value></value> </param> <param> - <key>trig_mode</key> - <value>wxgui.TRIG_MODE_AUTO</value> + <key>width5</key> + <value>1</value> </param> <param> - <key>y_axis_label</key> - <value>Counts</value> + <key>color5</key> + <value>"red"</value> </param> <param> - <key>_coordinate</key> - <value>(623, 228)</value> + <key>style5</key> + <value>0</value> </param> <param> - <key>_rotation</key> + <key>marker5</key> <value>0</value> </param> - </block> - <block> - <key>variable</key> <param> - <key>id</key> - <value>samp_rate</value> + <key>alpha5</key> + <value>1.0</value> </param> <param> - <key>_enabled</key> - <value>True</value> + <key>label6</key> + <value></value> </param> <param> - <key>value</key> - <value>100e3</value> + <key>width6</key> + <value>1</value> </param> <param> - <key>_coordinate</key> - <value>(16, 308)</value> + <key>color6</key> + <value>"red"</value> </param> <param> - <key>_rotation</key> + <key>style6</key> <value>0</value> </param> - </block> - <block> - <key>variable</key> <param> - <key>id</key> - <value>const_type</value> + <key>marker6</key> + <value>0</value> </param> <param> - <key>_enabled</key> - <value>True</value> + <key>alpha6</key> + <value>1.0</value> </param> <param> - <key>value</key> + <key>label7</key> + <value></value> + </param> + <param> + <key>width7</key> <value>1</value> </param> <param> + <key>color7</key> + <value>"red"</value> + </param> + <param> + <key>style7</key> + <value>0</value> + </param> + <param> + <key>marker7</key> + <value>0</value> + </param> + <param> + <key>alpha7</key> + <value>1.0</value> + </param> + <param> + <key>label8</key> + <value></value> + </param> + <param> + <key>width8</key> + <value>1</value> + </param> + <param> + <key>color8</key> + <value>"red"</value> + </param> + <param> + <key>style8</key> + <value>0</value> + </param> + <param> + <key>marker8</key> + <value>0</value> + </param> + <param> + <key>alpha8</key> + <value>1.0</value> + </param> + <param> + <key>label9</key> + <value></value> + </param> + <param> + <key>width9</key> + <value>1</value> + </param> + <param> + <key>color9</key> + <value>"red"</value> + </param> + <param> + <key>style9</key> + <value>0</value> + </param> + <param> + <key>marker9</key> + <value>0</value> + </param> + <param> + <key>alpha9</key> + <value>1.0</value> + </param> + <param> + <key>label10</key> + <value></value> + </param> + <param> + <key>width10</key> + <value>1</value> + </param> + <param> + <key>color10</key> + <value>"red"</value> + </param> + <param> + <key>style10</key> + <value>0</value> + </param> + <param> + <key>marker10</key> + <value>0</value> + </param> + <param> + <key>alpha10</key> + <value>1.0</value> + </param> + <param> + <key>alias</key> + <value></value> + </param> + <param> + <key>affinity</key> + <value></value> + </param> + <param> <key>_coordinate</key> - <value>(18, 428)</value> + <value>(603, 253)</value> </param> <param> <key>_rotation</key> @@ -599,42 +955,226 @@ </param> </block> <block> - <key>variable_static_text</key> + <key>qtgui_number_sink</key> <param> <key>id</key> - <value>variable_static_text_0</value> + <value>qtgui_number_sink_0</value> </param> <param> <key>_enabled</key> <value>True</value> </param> <param> - <key>label</key> - <value>Constellation Type</value> + <key>name</key> + <value>""</value> </param> <param> - <key>value</key> - <value>{0: 'BPSK', 1: 'QPSK', 2: '8-PSK'}[const_type] + " - Change const_type for different constellation types!"</value> + <key>type</key> + <value>float</value> </param> <param> - <key>converver</key> - <value>str_converter</value> + <key>autoscale</key> + <value>True</value> </param> <param> - <key>formatter</key> - <value>None</value> + <key>avg</key> + <value>0</value> + </param> + <param> + <key>graph_type</key> + <value>qtgui.NUM_GRAPH_HORIZ</value> + </param> + <param> + <key>nconnections</key> + <value>1</value> + </param> + <param> + <key>min</key> + <value>0</value> + </param> + <param> + <key>max</key> + <value>1</value> + </param> + <param> + <key>update_time</key> + <value>0.10</value> + </param> + <param> + <key>gui_hint</key> + <value>1,0,1,1</value> + </param> + <param> + <key>label1</key> + <value>BER</value> </param> <param> - <key>grid_pos</key> + <key>unit1</key> + <value>x10^-6</value> + </param> + <param> + <key>color1</key> + <value>("black", "black")</value> + </param> + <param> + <key>factor1</key> + <value>1e6</value> + </param> + <param> + <key>label2</key> + <value></value> + </param> + <param> + <key>unit2</key> + <value></value> + </param> + <param> + <key>color2</key> + <value>("black", "black")</value> + </param> + <param> + <key>factor2</key> + <value>1</value> + </param> + <param> + <key>label3</key> + <value></value> + </param> + <param> + <key>unit3</key> + <value></value> + </param> + <param> + <key>color3</key> + <value>("black", "black")</value> + </param> + <param> + <key>factor3</key> + <value>1</value> + </param> + <param> + <key>label4</key> <value></value> </param> <param> - <key>notebook</key> + <key>unit4</key> + <value></value> + </param> + <param> + <key>color4</key> + <value>("black", "black")</value> + </param> + <param> + <key>factor4</key> + <value>1</value> + </param> + <param> + <key>label5</key> + <value></value> + </param> + <param> + <key>unit5</key> + <value></value> + </param> + <param> + <key>color5</key> + <value>("black", "black")</value> + </param> + <param> + <key>factor5</key> + <value>1</value> + </param> + <param> + <key>label6</key> + <value></value> + </param> + <param> + <key>unit6</key> + <value></value> + </param> + <param> + <key>color6</key> + <value>("black", "black")</value> + </param> + <param> + <key>factor6</key> + <value>1</value> + </param> + <param> + <key>label7</key> + <value></value> + </param> + <param> + <key>unit7</key> + <value></value> + </param> + <param> + <key>color7</key> + <value>("black", "black")</value> + </param> + <param> + <key>factor7</key> + <value>1</value> + </param> + <param> + <key>label8</key> + <value></value> + </param> + <param> + <key>unit8</key> + <value></value> + </param> + <param> + <key>color8</key> + <value>("black", "black")</value> + </param> + <param> + <key>factor8</key> + <value>1</value> + </param> + <param> + <key>label9</key> + <value></value> + </param> + <param> + <key>unit9</key> + <value></value> + </param> + <param> + <key>color9</key> + <value>("black", "black")</value> + </param> + <param> + <key>factor9</key> + <value>1</value> + </param> + <param> + <key>label10</key> + <value></value> + </param> + <param> + <key>unit10</key> + <value></value> + </param> + <param> + <key>color10</key> + <value>("black", "black")</value> + </param> + <param> + <key>factor10</key> + <value>1</value> + </param> + <param> + <key>alias</key> + <value></value> + </param> + <param> + <key>affinity</key> <value></value> </param> <param> <key>_coordinate</key> - <value>(422, 311)</value> + <value>(940, 26)</value> </param> <param> <key>_rotation</key> @@ -642,12 +1182,6 @@ </param> </block> <connection> - <source_block_id>blks2_error_rate</source_block_id> - <sink_block_id>wxgui_numbersink2</sink_block_id> - <source_key>0</source_key> - <sink_key>0</sink_key> - </connection> - <connection> <source_block_id>blocks_throttle</source_block_id> <sink_block_id>blks2_error_rate</sink_block_id> <source_key>0</source_key> @@ -678,12 +1212,6 @@ <sink_key>0</sink_key> </connection> <connection> - <source_block_id>blocks_add_xx</source_block_id> - <sink_block_id>wxgui_scopesink2_0</sink_block_id> - <source_key>0</source_key> - <sink_key>0</sink_key> - </connection> - <connection> <source_block_id>digital_constellation_decoder_cb_0</source_block_id> <sink_block_id>blks2_error_rate</sink_block_id> <source_key>0</source_key> @@ -695,4 +1223,16 @@ <source_key>0</source_key> <sink_key>0</sink_key> </connection> + <connection> + <source_block_id>blocks_add_xx</source_block_id> + <sink_block_id>qtgui_const_sink_x_0</sink_block_id> + <source_key>0</source_key> + <sink_key>0</sink_key> + </connection> + <connection> + <source_block_id>blks2_error_rate</source_block_id> + <sink_block_id>qtgui_number_sink_0</sink_block_id> + <source_key>0</source_key> + <sink_key>0</sink_key> + </connection> </flow_graph> diff --git a/gr-digital/examples/demod/digital_freq_lock.grc b/gr-digital/examples/demod/digital_freq_lock.grc index 399d6a8e01..a75f8b640d 100644 --- a/gr-digital/examples/demod/digital_freq_lock.grc +++ b/gr-digital/examples/demod/digital_freq_lock.grc @@ -1,6 +1,6 @@ <?xml version='1.0' encoding='ASCII'?> <flow_graph> - <timestamp>Tue Jan 15 14:17:18 2013</timestamp> + <timestamp>Sat Jul 12 13:47:40 2014</timestamp> <block> <key>options</key> <param> @@ -29,7 +29,7 @@ </param> <param> <key>generate_options</key> - <value>wx_gui</value> + <value>qt_gui</value> </param> <param> <key>category</key> @@ -52,6 +52,10 @@ <value></value> </param> <param> + <key>alias</key> + <value></value> + </param> + <param> <key>_coordinate</key> <value>(-1, 0)</value> </param> @@ -64,7 +68,7 @@ <key>variable</key> <param> <key>id</key> - <value>sps</value> + <value>samp_rate</value> </param> <param> <key>_enabled</key> @@ -72,11 +76,15 @@ </param> <param> <key>value</key> - <value>4</value> + <value>32000</value> + </param> + <param> + <key>alias</key> + <value></value> </param> <param> <key>_coordinate</key> - <value>(166, -2)</value> + <value>(311, -1)</value> </param> <param> <key>_rotation</key> @@ -98,8 +106,12 @@ <value>0.35</value> </param> <param> + <key>alias</key> + <value></value> + </param> + <param> <key>_coordinate</key> - <value>(231, 0)</value> + <value>(223, 0)</value> </param> <param> <key>_rotation</key> @@ -110,7 +122,7 @@ <key>variable</key> <param> <key>id</key> - <value>samp_rate</value> + <value>sps</value> </param> <param> <key>_enabled</key> @@ -118,11 +130,15 @@ </param> <param> <key>value</key> - <value>32000</value> + <value>4</value> + </param> + <param> + <key>alias</key> + <value></value> </param> <param> <key>_coordinate</key> - <value>(439, -1)</value> + <value>(154, 0)</value> </param> <param> <key>_rotation</key> @@ -130,54 +146,62 @@ </param> </block> <block> - <key>variable_slider</key> + <key>digital_psk_mod</key> <param> <key>id</key> - <value>freq_offset</value> + <value>digital_psk_mod_0</value> </param> <param> <key>_enabled</key> <value>True</value> </param> <param> - <key>label</key> - <value>Frequency Offset</value> + <key>constellation_points</key> + <value>2</value> </param> <param> - <key>value</key> - <value>0</value> + <key>mod_code</key> + <value>"gray"</value> </param> <param> - <key>min</key> - <value>-0.5</value> + <key>differential</key> + <value>False</value> </param> <param> - <key>max</key> - <value>0.5</value> + <key>samples_per_symbol</key> + <value>sps</value> </param> <param> - <key>num_steps</key> - <value>1000</value> + <key>excess_bw</key> + <value>rolloff</value> </param> <param> - <key>style</key> - <value>wx.SL_HORIZONTAL</value> + <key>verbose</key> + <value>False</value> </param> <param> - <key>converver</key> - <value>float_converter</value> + <key>log</key> + <value>False</value> </param> <param> - <key>grid_pos</key> + <key>alias</key> <value></value> </param> <param> - <key>notebook</key> + <key>affinity</key> <value></value> </param> <param> + <key>minoutbuf</key> + <value>0</value> + </param> + <param> + <key>maxoutbuf</key> + <value>0</value> + </param> + <param> <key>_coordinate</key> - <value>(673, -1)</value> + <value>(202, 142)</value> </param> <param> <key>_rotation</key> @@ -185,10 +209,10 @@ </param> </block> <block> - <key>wxgui_scopesink2</key> + <key>analog_random_source_x</key> <param> <key>id</key> - <value>wxgui_scopesink2_0_0</value> + <value>analog_random_source_x</value> </param> <param> <key>_enabled</key> @@ -196,63 +220,102 @@ </param> <param> <key>type</key> - <value>complex</value> + <value>byte</value> </param> <param> - <key>title</key> - <value>Frequency Corrected Signal</value> + <key>min</key> + <value>0</value> </param> <param> - <key>samp_rate</key> - <value>samp_rate</value> + <key>max</key> + <value>256</value> + </param> + <param> + <key>num_samps</key> + <value>10000000</value> + </param> + <param> + <key>repeat</key> + <value>True</value> + </param> + <param> + <key>alias</key> + <value></value> + </param> + <param> + <key>affinity</key> + <value></value> </param> <param> - <key>v_scale</key> + <key>minoutbuf</key> <value>0</value> </param> <param> - <key>v_offset</key> + <key>maxoutbuf</key> <value>0</value> </param> <param> - <key>t_scale</key> + <key>_coordinate</key> + <value>(8, 150)</value> + </param> + <param> + <key>_rotation</key> <value>0</value> </param> + </block> + <block> + <key>channels_channel_model</key> <param> - <key>ac_couple</key> - <value>False</value> + <key>id</key> + <value>channels_channel_model_0</value> </param> <param> - <key>xy_mode</key> - <value>False</value> + <key>_enabled</key> + <value>True</value> </param> <param> - <key>num_inputs</key> - <value>1</value> + <key>noise_voltage</key> + <value>noise_amp</value> </param> <param> - <key>win_size</key> - <value></value> + <key>freq_offset</key> + <value>freq_offset</value> + </param> + <param> + <key>epsilon</key> + <value>1.0</value> + </param> + <param> + <key>taps</key> + <value>1.0</value> + </param> + <param> + <key>seed</key> + <value>42</value> + </param> + <param> + <key>block_tags</key> + <value>False</value> </param> <param> - <key>grid_pos</key> + <key>alias</key> <value></value> </param> <param> - <key>notebook</key> - <value>notebook_0,1</value> + <key>affinity</key> + <value></value> </param> <param> - <key>trig_mode</key> - <value>wxgui.TRIG_MODE_AUTO</value> + <key>minoutbuf</key> + <value>0</value> </param> <param> - <key>y_axis_label</key> - <value>Counts</value> + <key>maxoutbuf</key> + <value>0</value> </param> <param> <key>_coordinate</key> - <value>(439, 289)</value> + <value>(681, 142)</value> </param> <param> <key>_rotation</key> @@ -260,10 +323,10 @@ </param> </block> <block> - <key>wxgui_fftsink2</key> + <key>blocks_throttle</key> <param> <key>id</key> - <value>wxgui_fftsink2_0_0</value> + <value>blocks_throttle_0</value> </param> <param> <key>_enabled</key> @@ -274,76 +337,91 @@ <value>complex</value> </param> <param> - <key>title</key> - <value>Frequency Corrected Signal</value> + <key>samples_per_second</key> + <value>samp_rate</value> </param> <param> - <key>samp_rate</key> - <value>samp_rate</value> + <key>vlen</key> + <value>1</value> + </param> + <param> + <key>ignoretag</key> + <value>True</value> </param> <param> - <key>baseband_freq</key> + <key>alias</key> + <value></value> + </param> + <param> + <key>affinity</key> + <value></value> + </param> + <param> + <key>minoutbuf</key> <value>0</value> </param> <param> - <key>y_per_div</key> - <value>10</value> + <key>maxoutbuf</key> + <value>0</value> </param> <param> - <key>y_divs</key> - <value>10</value> + <key>_coordinate</key> + <value>(469, 172)</value> </param> <param> - <key>ref_level</key> - <value>10</value> + <key>_rotation</key> + <value>0</value> </param> + </block> + <block> + <key>digital_fll_band_edge_cc</key> <param> - <key>ref_scale</key> - <value>2.0</value> + <key>id</key> + <value>digital_fll_band_edge_cc_0</value> </param> <param> - <key>fft_size</key> - <value>1024</value> + <key>_enabled</key> + <value>True</value> </param> <param> - <key>fft_rate</key> - <value>30</value> + <key>type</key> + <value>cc</value> </param> <param> - <key>peak_hold</key> - <value>False</value> + <key>samps_per_sym</key> + <value>sps</value> </param> <param> - <key>average</key> - <value>False</value> + <key>rolloff</key> + <value>rolloff</value> </param> <param> - <key>avg_alpha</key> - <value>0</value> + <key>filter_size</key> + <value>44</value> </param> <param> - <key>win</key> - <value>None</value> + <key>w</key> + <value>freq_bw</value> </param> <param> - <key>win_size</key> + <key>alias</key> <value></value> </param> <param> - <key>grid_pos</key> + <key>affinity</key> <value></value> </param> <param> - <key>notebook</key> - <value>notebook_0,0</value> + <key>minoutbuf</key> + <value>0</value> </param> <param> - <key>freqvar</key> - <value>None</value> + <key>maxoutbuf</key> + <value>0</value> </param> <param> <key>_coordinate</key> - <value>(439, 423)</value> + <value>(583, 286)</value> </param> <param> <key>_rotation</key> @@ -351,10 +429,10 @@ </param> </block> <block> - <key>variable_slider</key> + <key>variable_qtgui_range</key> <param> <key>id</key> - <value>freq_bw</value> + <value>noise_amp</value> </param> <param> <key>_enabled</key> @@ -362,43 +440,47 @@ </param> <param> <key>label</key> - <value>FLL Loop Bandwidth</value> + <value>Channel Noise</value> </param> <param> <key>value</key> <value>0</value> </param> <param> - <key>min</key> + <key>start</key> <value>0</value> </param> <param> - <key>max</key> - <value>0.1</value> + <key>stop</key> + <value>1</value> </param> <param> - <key>num_steps</key> - <value>1000</value> + <key>step</key> + <value>0.01</value> </param> <param> - <key>style</key> - <value>wx.SL_HORIZONTAL</value> + <key>widget</key> + <value>counter_slider</value> </param> <param> - <key>converver</key> - <value>float_converter</value> + <key>orient</key> + <value>Qt.Horizontal</value> </param> <param> - <key>grid_pos</key> - <value></value> + <key>min_len</key> + <value>200</value> + </param> + <param> + <key>gui_hint</key> + <value>0, 0, 1, 1</value> </param> <param> - <key>notebook</key> + <key>alias</key> <value></value> </param> <param> <key>_coordinate</key> - <value>(74, 436)</value> + <value>(498, 0)</value> </param> <param> <key>_rotation</key> @@ -406,34 +488,254 @@ </param> </block> <block> - <key>notebook</key> + <key>qtgui_freq_sink_x</key> <param> <key>id</key> - <value>notebook_0</value> + <value>qtgui_freq_sink_x_0</value> </param> <param> <key>_enabled</key> <value>True</value> </param> <param> - <key>style</key> - <value>wx.NB_TOP</value> + <key>type</key> + <value>complex</value> + </param> + <param> + <key>name</key> + <value>Signal into Receiver</value> + </param> + <param> + <key>fftsize</key> + <value>1024</value> + </param> + <param> + <key>wintype</key> + <value>firdes.WIN_BLACKMAN_hARRIS</value> + </param> + <param> + <key>fc</key> + <value>0</value> + </param> + <param> + <key>bw</key> + <value>samp_rate</value> + </param> + <param> + <key>grid</key> + <value>False</value> + </param> + <param> + <key>autoscale</key> + <value>False</value> + </param> + <param> + <key>average</key> + <value>0.1</value> + </param> + <param> + <key>ymin</key> + <value>-120</value> + </param> + <param> + <key>ymax</key> + <value>-20</value> + </param> + <param> + <key>nconnections</key> + <value>1</value> + </param> + <param> + <key>update_time</key> + <value>0.10</value> + </param> + <param> + <key>gui_hint</key> + <value>notebook@0</value> + </param> + <param> + <key>showports</key> + <value>True</value> + </param> + <param> + <key>label1</key> + <value></value> + </param> + <param> + <key>width1</key> + <value>1</value> + </param> + <param> + <key>color1</key> + <value>"blue"</value> + </param> + <param> + <key>alpha1</key> + <value>1.0</value> + </param> + <param> + <key>label2</key> + <value></value> + </param> + <param> + <key>width2</key> + <value>1</value> + </param> + <param> + <key>color2</key> + <value>"red"</value> + </param> + <param> + <key>alpha2</key> + <value>1.0</value> + </param> + <param> + <key>label3</key> + <value></value> + </param> + <param> + <key>width3</key> + <value>1</value> + </param> + <param> + <key>color3</key> + <value>"green"</value> + </param> + <param> + <key>alpha3</key> + <value>1.0</value> + </param> + <param> + <key>label4</key> + <value></value> + </param> + <param> + <key>width4</key> + <value>1</value> + </param> + <param> + <key>color4</key> + <value>"black"</value> + </param> + <param> + <key>alpha4</key> + <value>1.0</value> + </param> + <param> + <key>label5</key> + <value></value> + </param> + <param> + <key>width5</key> + <value>1</value> + </param> + <param> + <key>color5</key> + <value>"cyan"</value> + </param> + <param> + <key>alpha5</key> + <value>1.0</value> + </param> + <param> + <key>label6</key> + <value></value> + </param> + <param> + <key>width6</key> + <value>1</value> + </param> + <param> + <key>color6</key> + <value>"magenta"</value> + </param> + <param> + <key>alpha6</key> + <value>1.0</value> + </param> + <param> + <key>label7</key> + <value></value> + </param> + <param> + <key>width7</key> + <value>1</value> + </param> + <param> + <key>color7</key> + <value>"yellow"</value> + </param> + <param> + <key>alpha7</key> + <value>1.0</value> + </param> + <param> + <key>label8</key> + <value></value> + </param> + <param> + <key>width8</key> + <value>1</value> + </param> + <param> + <key>color8</key> + <value>"dark red"</value> + </param> + <param> + <key>alpha8</key> + <value>1.0</value> + </param> + <param> + <key>label9</key> + <value></value> + </param> + <param> + <key>width9</key> + <value>1</value> + </param> + <param> + <key>color9</key> + <value>"dark green"</value> + </param> + <param> + <key>alpha9</key> + <value>1.0</value> + </param> + <param> + <key>label10</key> + <value></value> + </param> + <param> + <key>width10</key> + <value>1</value> + </param> + <param> + <key>color10</key> + <value>"dark blue"</value> </param> <param> - <key>labels</key> - <value>['Freq', 'Time']</value> + <key>alpha10</key> + <value>1.0</value> </param> <param> - <key>grid_pos</key> + <key>alias</key> <value></value> </param> <param> - <key>notebook</key> + <key>affinity</key> <value></value> </param> <param> + <key>minoutbuf</key> + <value>0</value> + </param> + <param> + <key>maxoutbuf</key> + <value>0</value> + </param> + <param> <key>_coordinate</key> - <value>(108, 568)</value> + <value>(931, 200)</value> </param> <param> <key>_rotation</key> @@ -441,38 +743,58 @@ </param> </block> <block> - <key>digital_fll_band_edge_cc</key> + <key>variable_qtgui_range</key> <param> <key>id</key> - <value>digital_fll_band_edge_cc_0</value> + <value>freq_offset</value> </param> <param> <key>_enabled</key> <value>True</value> </param> <param> - <key>type</key> - <value>cc</value> + <key>label</key> + <value>Frequency Offset</value> </param> <param> - <key>samps_per_sym</key> - <value>sps</value> + <key>value</key> + <value>0</value> </param> <param> - <key>rolloff</key> - <value>rolloff</value> + <key>start</key> + <value>-.5</value> </param> <param> - <key>filter_size</key> - <value>44</value> + <key>stop</key> + <value>.5</value> </param> <param> - <key>w</key> - <value>freq_bw</value> + <key>step</key> + <value>0.01</value> + </param> + <param> + <key>widget</key> + <value>counter_slider</value> + </param> + <param> + <key>orient</key> + <value>Qt.Horizontal</value> + </param> + <param> + <key>min_len</key> + <value>200</value> + </param> + <param> + <key>gui_hint</key> + <value>0, 1, 1, 1</value> + </param> + <param> + <key>alias</key> + <value></value> </param> <param> <key>_coordinate</key> - <value>(75, 295)</value> + <value>(624, 0)</value> </param> <param> <key>_rotation</key> @@ -480,90 +802,109 @@ </param> </block> <block> - <key>wxgui_fftsink2</key> + <key>variable_qtgui_range</key> <param> <key>id</key> - <value>wxgui_fftsink2_0</value> + <value>freq_bw</value> </param> <param> <key>_enabled</key> <value>True</value> </param> <param> - <key>type</key> - <value>complex</value> - </param> - <param> - <key>title</key> - <value>Signal into Receiver</value> + <key>label</key> + <value></value> </param> <param> - <key>samp_rate</key> - <value>samp_rate</value> + <key>value</key> + <value>0</value> </param> <param> - <key>baseband_freq</key> + <key>start</key> <value>0</value> </param> <param> - <key>y_per_div</key> - <value>10</value> + <key>stop</key> + <value>0.1</value> </param> <param> - <key>y_divs</key> - <value>10</value> + <key>step</key> + <value>0.001</value> </param> <param> - <key>ref_level</key> - <value>10</value> + <key>widget</key> + <value>counter_slider</value> </param> <param> - <key>ref_scale</key> - <value>2.0</value> + <key>orient</key> + <value>Qt.Horizontal</value> </param> <param> - <key>fft_size</key> - <value>1024</value> + <key>min_len</key> + <value>200</value> </param> <param> - <key>fft_rate</key> - <value>30</value> + <key>gui_hint</key> + <value>1, 0, 1, 2</value> </param> <param> - <key>peak_hold</key> - <value>False</value> + <key>alias</key> + <value></value> </param> <param> - <key>average</key> - <value>False</value> + <key>_coordinate</key> + <value>(399, 290)</value> </param> <param> - <key>avg_alpha</key> + <key>_rotation</key> <value>0</value> </param> + </block> + <block> + <key>qtgui_tab_widget</key> + <param> + <key>id</key> + <value>notebook</value> + </param> <param> - <key>win</key> - <value>None</value> + <key>_enabled</key> + <value>True</value> </param> <param> - <key>win_size</key> - <value></value> + <key>num_tabs</key> + <value>2</value> </param> <param> - <key>grid_pos</key> - <value></value> + <key>label0</key> + <value>Frequency</value> + </param> + <param> + <key>label1</key> + <value>Time</value> + </param> + <param> + <key>label2</key> + <value>Tab 2</value> + </param> + <param> + <key>label3</key> + <value>Tab 3</value> + </param> + <param> + <key>label4</key> + <value>Tab 4</value> </param> <param> - <key>notebook</key> - <value>notebook_0,0</value> + <key>gui_hint</key> + <value>2, 0, 1, 2</value> </param> <param> - <key>freqvar</key> - <value>None</value> + <key>alias</key> + <value></value> </param> <param> <key>_coordinate</key> - <value>(918, 107)</value> + <value>(0, 69)</value> </param> <param> <key>_rotation</key> @@ -571,10 +912,10 @@ </param> </block> <block> - <key>wxgui_scopesink2</key> + <key>qtgui_time_sink_x</key> <param> <key>id</key> - <value>wxgui_scopesink2_0</value> + <value>qtgui_time_sink_x_0_0</value> </param> <param> <key>_enabled</key> @@ -585,107 +926,332 @@ <value>complex</value> </param> <param> - <key>title</key> + <key>name</key> <value>Signal into Receiver</value> </param> <param> - <key>samp_rate</key> + <key>ylabel</key> + <value>Amplitude</value> + </param> + <param> + <key>yunit</key> + <value>""</value> + </param> + <param> + <key>size</key> + <value>1024</value> + </param> + <param> + <key>srate</key> <value>samp_rate</value> </param> <param> - <key>v_scale</key> - <value>0</value> + <key>grid</key> + <value>False</value> + </param> + <param> + <key>autoscale</key> + <value>True</value> + </param> + <param> + <key>ymin</key> + <value>-1</value> + </param> + <param> + <key>ymax</key> + <value>1</value> + </param> + <param> + <key>nconnections</key> + <value>1</value> + </param> + <param> + <key>update_time</key> + <value>0.10</value> + </param> + <param> + <key>entags</key> + <value>True</value> + </param> + <param> + <key>gui_hint</key> + <value>notebook@1</value> </param> <param> - <key>v_offset</key> + <key>tr_mode</key> + <value>qtgui.TRIG_MODE_FREE</value> + </param> + <param> + <key>tr_slope</key> + <value>qtgui.TRIG_SLOPE_POS</value> + </param> + <param> + <key>tr_level</key> + <value>0.0</value> + </param> + <param> + <key>tr_delay</key> <value>0</value> </param> <param> - <key>t_scale</key> + <key>tr_chan</key> <value>0</value> </param> <param> - <key>ac_couple</key> - <value>False</value> + <key>tr_tag</key> + <value>""</value> </param> <param> - <key>xy_mode</key> - <value>False</value> + <key>label1</key> + <value></value> </param> <param> - <key>num_inputs</key> + <key>width1</key> <value>1</value> </param> <param> - <key>win_size</key> + <key>color1</key> + <value>"blue"</value> + </param> + <param> + <key>style1</key> + <value>1</value> + </param> + <param> + <key>marker1</key> + <value>-1</value> + </param> + <param> + <key>alpha1</key> + <value>1.0</value> + </param> + <param> + <key>label2</key> <value></value> </param> <param> - <key>grid_pos</key> + <key>width2</key> + <value>1</value> + </param> + <param> + <key>color2</key> + <value>"red"</value> + </param> + <param> + <key>style2</key> + <value>1</value> + </param> + <param> + <key>marker2</key> + <value>-1</value> + </param> + <param> + <key>alpha2</key> + <value>1.0</value> + </param> + <param> + <key>label3</key> <value></value> </param> <param> - <key>notebook</key> - <value>notebook_0,1</value> + <key>width3</key> + <value>1</value> </param> <param> - <key>trig_mode</key> - <value>wxgui.TRIG_MODE_AUTO</value> + <key>color3</key> + <value>"green"</value> </param> <param> - <key>y_axis_label</key> - <value>Counts</value> + <key>style3</key> + <value>1</value> </param> <param> - <key>_coordinate</key> - <value>(918, 0)</value> + <key>marker3</key> + <value>-1</value> </param> <param> - <key>_rotation</key> - <value>0</value> + <key>alpha3</key> + <value>1.0</value> </param> - </block> - <block> - <key>digital_psk_mod</key> <param> - <key>id</key> - <value>digital_psk_mod_0</value> + <key>label4</key> + <value></value> </param> <param> - <key>_enabled</key> - <value>True</value> + <key>width4</key> + <value>1</value> </param> <param> - <key>constellation_points</key> - <value>2</value> + <key>color4</key> + <value>"black"</value> </param> <param> - <key>mod_code</key> - <value>"gray"</value> + <key>style4</key> + <value>1</value> </param> <param> - <key>differential</key> - <value>False</value> + <key>marker4</key> + <value>-1</value> </param> <param> - <key>samples_per_symbol</key> - <value>sps</value> + <key>alpha4</key> + <value>1.0</value> </param> <param> - <key>excess_bw</key> - <value>rolloff</value> + <key>label5</key> + <value></value> </param> <param> - <key>verbose</key> - <value>False</value> + <key>width5</key> + <value>1</value> </param> <param> - <key>log</key> - <value>False</value> + <key>color5</key> + <value>"cyan"</value> + </param> + <param> + <key>style5</key> + <value>1</value> + </param> + <param> + <key>marker5</key> + <value>-1</value> + </param> + <param> + <key>alpha5</key> + <value>1.0</value> + </param> + <param> + <key>label6</key> + <value></value> + </param> + <param> + <key>width6</key> + <value>1</value> + </param> + <param> + <key>color6</key> + <value>"magenta"</value> + </param> + <param> + <key>style6</key> + <value>1</value> + </param> + <param> + <key>marker6</key> + <value>-1</value> + </param> + <param> + <key>alpha6</key> + <value>1.0</value> + </param> + <param> + <key>label7</key> + <value></value> + </param> + <param> + <key>width7</key> + <value>1</value> + </param> + <param> + <key>color7</key> + <value>"yellow"</value> + </param> + <param> + <key>style7</key> + <value>1</value> + </param> + <param> + <key>marker7</key> + <value>-1</value> + </param> + <param> + <key>alpha7</key> + <value>1.0</value> + </param> + <param> + <key>label8</key> + <value></value> + </param> + <param> + <key>width8</key> + <value>1</value> + </param> + <param> + <key>color8</key> + <value>"dark red"</value> + </param> + <param> + <key>style8</key> + <value>1</value> + </param> + <param> + <key>marker8</key> + <value>-1</value> + </param> + <param> + <key>alpha8</key> + <value>1.0</value> + </param> + <param> + <key>label9</key> + <value></value> + </param> + <param> + <key>width9</key> + <value>1</value> + </param> + <param> + <key>color9</key> + <value>"dark green"</value> + </param> + <param> + <key>style9</key> + <value>1</value> + </param> + <param> + <key>marker9</key> + <value>-1</value> + </param> + <param> + <key>alpha9</key> + <value>1.0</value> + </param> + <param> + <key>label10</key> + <value></value> + </param> + <param> + <key>width10</key> + <value>1</value> + </param> + <param> + <key>color10</key> + <value>"blue"</value> + </param> + <param> + <key>style10</key> + <value>1</value> + </param> + <param> + <key>marker10</key> + <value>-1</value> + </param> + <param> + <key>alpha10</key> + <value>1.0</value> + </param> + <param> + <key>alias</key> + <value></value> + </param> + <param> + <key>affinity</key> + <value></value> </param> <param> <key>_coordinate</key> - <value>(202, 142)</value> + <value>(928, 41)</value> </param> <param> <key>_rotation</key> @@ -693,10 +1259,10 @@ </param> </block> <block> - <key>analog_random_source_x</key> + <key>qtgui_time_sink_x</key> <param> <key>id</key> - <value>analog_random_source_x</value> + <value>qtgui_time_sink_x_0</value> </param> <param> <key>_enabled</key> @@ -704,66 +1270,335 @@ </param> <param> <key>type</key> - <value>byte</value> + <value>complex</value> </param> <param> - <key>min</key> - <value>0</value> + <key>name</key> + <value>Frequency Corrected Signal</value> </param> <param> - <key>max</key> - <value>256</value> + <key>ylabel</key> + <value>Amplitude</value> </param> <param> - <key>num_samps</key> - <value>10000000</value> + <key>yunit</key> + <value>""</value> </param> <param> - <key>repeat</key> + <key>size</key> + <value>1024</value> + </param> + <param> + <key>srate</key> + <value>samp_rate</value> + </param> + <param> + <key>grid</key> + <value>False</value> + </param> + <param> + <key>autoscale</key> <value>True</value> </param> <param> - <key>_coordinate</key> - <value>(8, 150)</value> + <key>ymin</key> + <value>-1</value> </param> <param> - <key>_rotation</key> - <value>0</value> + <key>ymax</key> + <value>1</value> </param> - </block> - <block> - <key>channels_channel_model</key> <param> - <key>id</key> - <value>channels_channel_model_0</value> + <key>nconnections</key> + <value>1</value> </param> <param> - <key>_enabled</key> + <key>update_time</key> + <value>0.10</value> + </param> + <param> + <key>entags</key> <value>True</value> </param> <param> - <key>noise_voltage</key> - <value>noise_amp</value> + <key>gui_hint</key> + <value>notebook@1</value> </param> <param> - <key>freq_offset</key> - <value>freq_offset</value> + <key>tr_mode</key> + <value>qtgui.TRIG_MODE_FREE</value> </param> <param> - <key>epsilon</key> + <key>tr_slope</key> + <value>qtgui.TRIG_SLOPE_POS</value> + </param> + <param> + <key>tr_level</key> + <value>0.0</value> + </param> + <param> + <key>tr_delay</key> + <value>0</value> + </param> + <param> + <key>tr_chan</key> + <value>0</value> + </param> + <param> + <key>tr_tag</key> + <value>""</value> + </param> + <param> + <key>label1</key> + <value></value> + </param> + <param> + <key>width1</key> + <value>1</value> + </param> + <param> + <key>color1</key> + <value>"blue"</value> + </param> + <param> + <key>style1</key> + <value>1</value> + </param> + <param> + <key>marker1</key> + <value>-1</value> + </param> + <param> + <key>alpha1</key> <value>1.0</value> </param> <param> - <key>taps</key> + <key>label2</key> + <value></value> + </param> + <param> + <key>width2</key> + <value>1</value> + </param> + <param> + <key>color2</key> + <value>"red"</value> + </param> + <param> + <key>style2</key> + <value>1</value> + </param> + <param> + <key>marker2</key> + <value>-1</value> + </param> + <param> + <key>alpha2</key> <value>1.0</value> </param> <param> - <key>seed</key> - <value>42</value> + <key>label3</key> + <value></value> + </param> + <param> + <key>width3</key> + <value>1</value> + </param> + <param> + <key>color3</key> + <value>"green"</value> + </param> + <param> + <key>style3</key> + <value>1</value> + </param> + <param> + <key>marker3</key> + <value>-1</value> + </param> + <param> + <key>alpha3</key> + <value>1.0</value> + </param> + <param> + <key>label4</key> + <value></value> + </param> + <param> + <key>width4</key> + <value>1</value> + </param> + <param> + <key>color4</key> + <value>"black"</value> + </param> + <param> + <key>style4</key> + <value>1</value> + </param> + <param> + <key>marker4</key> + <value>-1</value> + </param> + <param> + <key>alpha4</key> + <value>1.0</value> + </param> + <param> + <key>label5</key> + <value></value> + </param> + <param> + <key>width5</key> + <value>1</value> + </param> + <param> + <key>color5</key> + <value>"cyan"</value> + </param> + <param> + <key>style5</key> + <value>1</value> + </param> + <param> + <key>marker5</key> + <value>-1</value> + </param> + <param> + <key>alpha5</key> + <value>1.0</value> + </param> + <param> + <key>label6</key> + <value></value> + </param> + <param> + <key>width6</key> + <value>1</value> + </param> + <param> + <key>color6</key> + <value>"magenta"</value> + </param> + <param> + <key>style6</key> + <value>1</value> + </param> + <param> + <key>marker6</key> + <value>-1</value> + </param> + <param> + <key>alpha6</key> + <value>1.0</value> + </param> + <param> + <key>label7</key> + <value></value> + </param> + <param> + <key>width7</key> + <value>1</value> + </param> + <param> + <key>color7</key> + <value>"yellow"</value> + </param> + <param> + <key>style7</key> + <value>1</value> + </param> + <param> + <key>marker7</key> + <value>-1</value> + </param> + <param> + <key>alpha7</key> + <value>1.0</value> + </param> + <param> + <key>label8</key> + <value></value> + </param> + <param> + <key>width8</key> + <value>1</value> + </param> + <param> + <key>color8</key> + <value>"dark red"</value> + </param> + <param> + <key>style8</key> + <value>1</value> + </param> + <param> + <key>marker8</key> + <value>-1</value> + </param> + <param> + <key>alpha8</key> + <value>1.0</value> + </param> + <param> + <key>label9</key> + <value></value> + </param> + <param> + <key>width9</key> + <value>1</value> + </param> + <param> + <key>color9</key> + <value>"dark green"</value> + </param> + <param> + <key>style9</key> + <value>1</value> + </param> + <param> + <key>marker9</key> + <value>-1</value> + </param> + <param> + <key>alpha9</key> + <value>1.0</value> + </param> + <param> + <key>label10</key> + <value></value> + </param> + <param> + <key>width10</key> + <value>1</value> + </param> + <param> + <key>color10</key> + <value>"blue"</value> + </param> + <param> + <key>style10</key> + <value>1</value> + </param> + <param> + <key>marker10</key> + <value>-1</value> + </param> + <param> + <key>alpha10</key> + <value>1.0</value> + </param> + <param> + <key>alias</key> + <value></value> + </param> + <param> + <key>affinity</key> + <value></value> </param> <param> <key>_coordinate</key> - <value>(681, 142)</value> + <value>(930, 324)</value> </param> <param> <key>_rotation</key> @@ -771,10 +1606,10 @@ </param> </block> <block> - <key>blocks_throttle</key> + <key>qtgui_freq_sink_x</key> <param> <key>id</key> - <value>blocks_throttle_0</value> + <value>qtgui_freq_sink_x_1</value> </param> <param> <key>_enabled</key> @@ -785,71 +1620,240 @@ <value>complex</value> </param> <param> - <key>samples_per_second</key> - <value>samp_rate</value> + <key>name</key> + <value>Frequency Corrected Signal</value> </param> <param> - <key>vlen</key> - <value>1</value> + <key>fftsize</key> + <value>1024</value> </param> <param> - <key>_coordinate</key> - <value>(487, 174)</value> + <key>wintype</key> + <value>firdes.WIN_BLACKMAN_hARRIS</value> </param> <param> - <key>_rotation</key> + <key>fc</key> <value>0</value> </param> - </block> - <block> - <key>variable_slider</key> <param> - <key>id</key> - <value>noise_amp</value> + <key>bw</key> + <value>samp_rate</value> </param> <param> - <key>_enabled</key> + <key>grid</key> + <value>False</value> + </param> + <param> + <key>autoscale</key> + <value>False</value> + </param> + <param> + <key>average</key> + <value>0.1</value> + </param> + <param> + <key>ymin</key> + <value>-120</value> + </param> + <param> + <key>ymax</key> + <value>-20</value> + </param> + <param> + <key>nconnections</key> + <value>1</value> + </param> + <param> + <key>update_time</key> + <value>0.10</value> + </param> + <param> + <key>gui_hint</key> + <value>notebook@0</value> + </param> + <param> + <key>showports</key> <value>True</value> </param> <param> - <key>label</key> - <value>Channel Noise</value> + <key>label1</key> + <value></value> </param> <param> - <key>value</key> - <value>0</value> + <key>width1</key> + <value>1</value> </param> <param> - <key>min</key> - <value>0</value> + <key>color1</key> + <value>"blue"</value> </param> <param> - <key>max</key> + <key>alpha1</key> + <value>1.0</value> + </param> + <param> + <key>label2</key> + <value></value> + </param> + <param> + <key>width2</key> + <value>1</value> + </param> + <param> + <key>color2</key> + <value>"red"</value> + </param> + <param> + <key>alpha2</key> + <value>1.0</value> + </param> + <param> + <key>label3</key> + <value></value> + </param> + <param> + <key>width3</key> + <value>1</value> + </param> + <param> + <key>color3</key> + <value>"green"</value> + </param> + <param> + <key>alpha3</key> + <value>1.0</value> + </param> + <param> + <key>label4</key> + <value></value> + </param> + <param> + <key>width4</key> + <value>1</value> + </param> + <param> + <key>color4</key> + <value>"black"</value> + </param> + <param> + <key>alpha4</key> + <value>1.0</value> + </param> + <param> + <key>label5</key> + <value></value> + </param> + <param> + <key>width5</key> + <value>1</value> + </param> + <param> + <key>color5</key> + <value>"cyan"</value> + </param> + <param> + <key>alpha5</key> <value>1.0</value> </param> <param> - <key>num_steps</key> - <value>1000</value> + <key>label6</key> + <value></value> + </param> + <param> + <key>width6</key> + <value>1</value> </param> <param> - <key>style</key> - <value>wx.SL_HORIZONTAL</value> + <key>color6</key> + <value>"magenta"</value> </param> <param> - <key>converver</key> - <value>float_converter</value> + <key>alpha6</key> + <value>1.0</value> </param> <param> - <key>grid_pos</key> + <key>label7</key> <value></value> </param> <param> - <key>notebook</key> + <key>width7</key> + <value>1</value> + </param> + <param> + <key>color7</key> + <value>"yellow"</value> + </param> + <param> + <key>alpha7</key> + <value>1.0</value> + </param> + <param> + <key>label8</key> <value></value> </param> <param> + <key>width8</key> + <value>1</value> + </param> + <param> + <key>color8</key> + <value>"dark red"</value> + </param> + <param> + <key>alpha8</key> + <value>1.0</value> + </param> + <param> + <key>label9</key> + <value></value> + </param> + <param> + <key>width9</key> + <value>1</value> + </param> + <param> + <key>color9</key> + <value>"dark green"</value> + </param> + <param> + <key>alpha9</key> + <value>1.0</value> + </param> + <param> + <key>label10</key> + <value></value> + </param> + <param> + <key>width10</key> + <value>1</value> + </param> + <param> + <key>color10</key> + <value>"dark blue"</value> + </param> + <param> + <key>alpha10</key> + <value>1.0</value> + </param> + <param> + <key>alias</key> + <value></value> + </param> + <param> + <key>affinity</key> + <value></value> + </param> + <param> + <key>minoutbuf</key> + <value>0</value> + </param> + <param> + <key>maxoutbuf</key> + <value>0</value> + </param> + <param> <key>_coordinate</key> - <value>(549, 0)</value> + <value>(929, 436)</value> </param> <param> <key>_rotation</key> @@ -857,50 +1861,50 @@ </param> </block> <connection> - <source_block_id>channels_channel_model_0</source_block_id> - <sink_block_id>wxgui_scopesink2_0</sink_block_id> + <source_block_id>analog_random_source_x</source_block_id> + <sink_block_id>digital_psk_mod_0</sink_block_id> <source_key>0</source_key> <sink_key>0</sink_key> </connection> <connection> - <source_block_id>channels_channel_model_0</source_block_id> - <sink_block_id>wxgui_fftsink2_0</sink_block_id> + <source_block_id>digital_psk_mod_0</source_block_id> + <sink_block_id>blocks_throttle_0</sink_block_id> <source_key>0</source_key> <sink_key>0</sink_key> </connection> <connection> - <source_block_id>analog_random_source_x</source_block_id> - <sink_block_id>digital_psk_mod_0</sink_block_id> + <source_block_id>blocks_throttle_0</source_block_id> + <sink_block_id>channels_channel_model_0</sink_block_id> <source_key>0</source_key> <sink_key>0</sink_key> </connection> <connection> - <source_block_id>digital_psk_mod_0</source_block_id> - <sink_block_id>blocks_throttle_0</sink_block_id> + <source_block_id>channels_channel_model_0</source_block_id> + <sink_block_id>digital_fll_band_edge_cc_0</sink_block_id> <source_key>0</source_key> <sink_key>0</sink_key> </connection> <connection> - <source_block_id>blocks_throttle_0</source_block_id> - <sink_block_id>channels_channel_model_0</sink_block_id> + <source_block_id>channels_channel_model_0</source_block_id> + <sink_block_id>qtgui_freq_sink_x_0</sink_block_id> <source_key>0</source_key> <sink_key>0</sink_key> </connection> <connection> <source_block_id>channels_channel_model_0</source_block_id> - <sink_block_id>digital_fll_band_edge_cc_0</sink_block_id> + <sink_block_id>qtgui_time_sink_x_0_0</sink_block_id> <source_key>0</source_key> <sink_key>0</sink_key> </connection> <connection> <source_block_id>digital_fll_band_edge_cc_0</source_block_id> - <sink_block_id>wxgui_scopesink2_0_0</sink_block_id> + <sink_block_id>qtgui_time_sink_x_0</sink_block_id> <source_key>0</source_key> <sink_key>0</sink_key> </connection> <connection> <source_block_id>digital_fll_band_edge_cc_0</source_block_id> - <sink_block_id>wxgui_fftsink2_0_0</sink_block_id> + <sink_block_id>qtgui_freq_sink_x_1</sink_block_id> <source_key>0</source_key> <sink_key>0</sink_key> </connection> diff --git a/gr-digital/examples/demod/dpsk_loopback.grc b/gr-digital/examples/demod/dpsk_loopback.grc index daa076c47b..c0ad423a5b 100644 --- a/gr-digital/examples/demod/dpsk_loopback.grc +++ b/gr-digital/examples/demod/dpsk_loopback.grc @@ -1,59 +1,51 @@ <?xml version='1.0' encoding='ASCII'?> <flow_graph> - <timestamp>Sat Nov 10 15:13:23 2012</timestamp> + <timestamp>Tue Jul 8 23:26:29 2014</timestamp> <block> - <key>options</key> + <key>blocks_throttle</key> <param> <key>id</key> - <value>dpsk_loopback</value> + <value>blocks_throttle_0_0</value> </param> <param> <key>_enabled</key> <value>True</value> </param> <param> - <key>title</key> - <value>DPSK Loopback</value> - </param> - <param> - <key>author</key> - <value>GNU Radio</value> - </param> - <param> - <key>description</key> - <value>Encode a signal into a packet, modulate, demodulate, decode and show it's the same data.</value> + <key>type</key> + <value>float</value> </param> <param> - <key>window_size</key> - <value>1280, 1024</value> + <key>samples_per_second</key> + <value>samp_rate</value> </param> <param> - <key>generate_options</key> - <value>wx_gui</value> + <key>vlen</key> + <value>1</value> </param> <param> - <key>category</key> - <value>Custom</value> + <key>ignoretag</key> + <value>True</value> </param> <param> - <key>run_options</key> - <value>prompt</value> + <key>alias</key> + <value></value> </param> <param> - <key>run</key> - <value>True</value> + <key>affinity</key> + <value></value> </param> <param> - <key>max_nouts</key> + <key>minoutbuf</key> <value>0</value> </param> <param> - <key>realtime_scheduling</key> - <value></value> + <key>maxoutbuf</key> + <value>0</value> </param> <param> <key>_coordinate</key> - <value>(10, 10)</value> + <value>(381, 51)</value> </param> <param> <key>_rotation</key> @@ -75,63 +67,12 @@ <value>10000</value> </param> <param> - <key>_coordinate</key> - <value>(11, 120)</value> - </param> - <param> - <key>_rotation</key> - <value>0</value> - </param> - </block> - <block> - <key>variable_slider</key> - <param> - <key>id</key> - <value>freq</value> - </param> - <param> - <key>_enabled</key> - <value>True</value> - </param> - <param> - <key>label</key> - <value>Frequency (Hz)</value> - </param> - <param> - <key>value</key> - <value>500</value> - </param> - <param> - <key>min</key> - <value>0</value> - </param> - <param> - <key>max</key> - <value>samp_rate/2</value> - </param> - <param> - <key>num_steps</key> - <value>100</value> - </param> - <param> - <key>style</key> - <value>wx.SL_HORIZONTAL</value> - </param> - <param> - <key>converver</key> - <value>float_converter</value> - </param> - <param> - <key>grid_pos</key> - <value></value> - </param> - <param> - <key>notebook</key> + <key>alias</key> <value></value> </param> <param> <key>_coordinate</key> - <value>(13, 188)</value> + <value>(5, 115)</value> </param> <param> <key>_rotation</key> @@ -139,10 +80,10 @@ </param> </block> <block> - <key>blocks_throttle</key> + <key>blks2_packet_encoder</key> <param> <key>id</key> - <value>blocks_throttle_0_0</value> + <value>blks2_packet_encoder_0</value> </param> <param> <key>_enabled</key> @@ -153,54 +94,43 @@ <value>float</value> </param> <param> - <key>samples_per_second</key> - <value>samp_rate</value> + <key>samples_per_symbol</key> + <value>2</value> </param> <param> - <key>vlen</key> + <key>bits_per_symbol</key> <value>1</value> </param> <param> - <key>_coordinate</key> - <value>(381, 51)</value> - </param> - <param> - <key>_rotation</key> - <value>0</value> + <key>preamble</key> + <value></value> </param> - </block> - <block> - <key>blks2_packet_encoder</key> <param> - <key>id</key> - <value>blks2_packet_encoder_0</value> + <key>access_code</key> + <value></value> </param> <param> - <key>_enabled</key> + <key>pad_for_usrp</key> <value>True</value> </param> <param> - <key>type</key> - <value>float</value> - </param> - <param> - <key>samples_per_symbol</key> - <value>2</value> + <key>payload_length</key> + <value>0</value> </param> <param> - <key>bits_per_symbol</key> - <value>1</value> + <key>alias</key> + <value></value> </param> <param> - <key>access_code</key> + <key>affinity</key> <value></value> </param> <param> - <key>pad_for_usrp</key> - <value>True</value> + <key>minoutbuf</key> + <value>0</value> </param> <param> - <key>payload_length</key> + <key>maxoutbuf</key> <value>0</value> </param> <param> @@ -247,6 +177,22 @@ <value>False</value> </param> <param> + <key>alias</key> + <value></value> + </param> + <param> + <key>affinity</key> + <value></value> + </param> + <param> + <key>minoutbuf</key> + <value>0</value> + </param> + <param> + <key>maxoutbuf</key> + <value>0</value> + </param> + <param> <key>_coordinate</key> <value>(806, 27)</value> </param> @@ -306,6 +252,22 @@ <value>False</value> </param> <param> + <key>alias</key> + <value></value> + </param> + <param> + <key>affinity</key> + <value></value> + </param> + <param> + <key>minoutbuf</key> + <value>0</value> + </param> + <param> + <key>maxoutbuf</key> + <value>0</value> + </param> + <param> <key>_coordinate</key> <value>(745, 139)</value> </param> @@ -315,10 +277,10 @@ </param> </block> <block> - <key>wxgui_scopesink2</key> + <key>blks2_packet_decoder</key> <param> <key>id</key> - <value>wxgui_scopesink2_0</value> + <value>blks2_packet_decoder_0</value> </param> <param> <key>_enabled</key> @@ -329,60 +291,367 @@ <value>float</value> </param> <param> - <key>title</key> - <value>Scope Plot</value> + <key>access_code</key> + <value></value> </param> <param> - <key>samp_rate</key> - <value>samp_rate</value> + <key>threshold</key> + <value>-1</value> + </param> + <param> + <key>alias</key> + <value></value> + </param> + <param> + <key>affinity</key> + <value></value> </param> <param> - <key>v_scale</key> + <key>minoutbuf</key> <value>0</value> </param> <param> - <key>v_offset</key> + <key>maxoutbuf</key> <value>0</value> </param> <param> - <key>t_scale</key> - <value>1./freq</value> + <key>_coordinate</key> + <value>(545, 187)</value> </param> <param> - <key>ac_couple</key> - <value>False</value> + <key>_rotation</key> + <value>180</value> + </param> + </block> + <block> + <key>qtgui_time_sink_x</key> + <param> + <key>id</key> + <value>qtgui_time_sink_x_0</value> + </param> + <param> + <key>_enabled</key> + <value>True</value> </param> <param> - <key>xy_mode</key> + <key>type</key> + <value>float</value> + </param> + <param> + <key>name</key> + <value>QT GUI Plot</value> + </param> + <param> + <key>size</key> + <value>1024</value> + </param> + <param> + <key>srate</key> + <value>samp_rate</value> + </param> + <param> + <key>autoscale</key> <value>False</value> </param> <param> - <key>num_inputs</key> + <key>ymin</key> + <value>-1.1</value> + </param> + <param> + <key>ymax</key> + <value>1.1</value> + </param> + <param> + <key>nconnections</key> + <value>1</value> + </param> + <param> + <key>update_time</key> + <value>0.10</value> + </param> + <param> + <key>entags</key> + <value>True</value> + </param> + <param> + <key>gui_hint</key> + <value></value> + </param> + <param> + <key>tr_mode</key> + <value>qtgui.TRIG_MODE_FREE</value> + </param> + <param> + <key>tr_slope</key> + <value>qtgui.TRIG_SLOPE_POS</value> + </param> + <param> + <key>tr_level</key> + <value>0.0</value> + </param> + <param> + <key>tr_delay</key> + <value>0</value> + </param> + <param> + <key>tr_chan</key> + <value>0</value> + </param> + <param> + <key>tr_tag</key> + <value>""</value> + </param> + <param> + <key>label1</key> + <value></value> + </param> + <param> + <key>width1</key> + <value>1</value> + </param> + <param> + <key>color1</key> + <value>"blue"</value> + </param> + <param> + <key>style1</key> + <value>1</value> + </param> + <param> + <key>marker1</key> + <value>-1</value> + </param> + <param> + <key>alpha1</key> + <value>1.0</value> + </param> + <param> + <key>label2</key> + <value></value> + </param> + <param> + <key>width2</key> + <value>1</value> + </param> + <param> + <key>color2</key> + <value>"red"</value> + </param> + <param> + <key>style2</key> + <value>1</value> + </param> + <param> + <key>marker2</key> + <value>-1</value> + </param> + <param> + <key>alpha2</key> + <value>1.0</value> + </param> + <param> + <key>label3</key> + <value></value> + </param> + <param> + <key>width3</key> + <value>1</value> + </param> + <param> + <key>color3</key> + <value>"green"</value> + </param> + <param> + <key>style3</key> + <value>1</value> + </param> + <param> + <key>marker3</key> + <value>-1</value> + </param> + <param> + <key>alpha3</key> + <value>1.0</value> + </param> + <param> + <key>label4</key> + <value></value> + </param> + <param> + <key>width4</key> + <value>1</value> + </param> + <param> + <key>color4</key> + <value>"black"</value> + </param> + <param> + <key>style4</key> + <value>1</value> + </param> + <param> + <key>marker4</key> + <value>-1</value> + </param> + <param> + <key>alpha4</key> + <value>1.0</value> + </param> + <param> + <key>label5</key> + <value></value> + </param> + <param> + <key>width5</key> + <value>1</value> + </param> + <param> + <key>color5</key> + <value>"cyan"</value> + </param> + <param> + <key>style5</key> + <value>1</value> + </param> + <param> + <key>marker5</key> + <value>-1</value> + </param> + <param> + <key>alpha5</key> + <value>1.0</value> + </param> + <param> + <key>label6</key> + <value></value> + </param> + <param> + <key>width6</key> + <value>1</value> + </param> + <param> + <key>color6</key> + <value>"magenta"</value> + </param> + <param> + <key>style6</key> + <value>1</value> + </param> + <param> + <key>marker6</key> + <value>-1</value> + </param> + <param> + <key>alpha6</key> + <value>1.0</value> + </param> + <param> + <key>label7</key> + <value></value> + </param> + <param> + <key>width7</key> <value>1</value> </param> <param> - <key>win_size</key> + <key>color7</key> + <value>"yellow"</value> + </param> + <param> + <key>style7</key> + <value>1</value> + </param> + <param> + <key>marker7</key> + <value>-1</value> + </param> + <param> + <key>alpha7</key> + <value>1.0</value> + </param> + <param> + <key>label8</key> <value></value> </param> <param> - <key>grid_pos</key> + <key>width8</key> + <value>1</value> + </param> + <param> + <key>color8</key> + <value>"dark red"</value> + </param> + <param> + <key>style8</key> + <value>1</value> + </param> + <param> + <key>marker8</key> + <value>-1</value> + </param> + <param> + <key>alpha8</key> + <value>1.0</value> + </param> + <param> + <key>label9</key> <value></value> </param> <param> - <key>notebook</key> + <key>width9</key> + <value>1</value> + </param> + <param> + <key>color9</key> + <value>"dark green"</value> + </param> + <param> + <key>style9</key> + <value>1</value> + </param> + <param> + <key>marker9</key> + <value>-1</value> + </param> + <param> + <key>alpha9</key> + <value>1.0</value> + </param> + <param> + <key>label10</key> <value></value> </param> <param> - <key>trig_mode</key> - <value>wxgui.TRIG_MODE_AUTO</value> + <key>width10</key> + <value>1</value> + </param> + <param> + <key>color10</key> + <value>"blue"</value> </param> <param> - <key>y_axis_label</key> - <value>Counts</value> + <key>style10</key> + <value>1</value> + </param> + <param> + <key>marker10</key> + <value>-1</value> + </param> + <param> + <key>alpha10</key> + <value>1.0</value> + </param> + <param> + <key>alias</key> + <value></value> + </param> + <param> + <key>affinity</key> + <value></value> </param> <param> <key>_coordinate</key> - <value>(184, 163)</value> + <value>(249, 172)</value> </param> <param> <key>_rotation</key> @@ -390,42 +659,121 @@ </param> </block> <block> - <key>analog_sig_source_x</key> + <key>variable_qtgui_range</key> <param> <key>id</key> - <value>analog_sig_source_x_0</value> + <value>freq</value> </param> <param> <key>_enabled</key> <value>True</value> </param> <param> - <key>type</key> - <value>float</value> + <key>label</key> + <value></value> </param> <param> - <key>samp_rate</key> - <value>samp_rate</value> + <key>value</key> + <value>500</value> </param> <param> - <key>waveform</key> - <value>analog.GR_COS_WAVE</value> + <key>start</key> + <value>0</value> </param> <param> - <key>freq</key> - <value>freq</value> + <key>stop</key> + <value>5000</value> </param> <param> - <key>amp</key> + <key>step</key> <value>1</value> </param> <param> - <key>offset</key> + <key>widget</key> + <value>counter_slider</value> + </param> + <param> + <key>orient</key> + <value>Qt.Horizontal</value> + </param> + <param> + <key>min_len</key> + <value>200</value> + </param> + <param> + <key>gui_hint</key> + <value></value> + </param> + <param> + <key>alias</key> + <value></value> + </param> + <param> + <key>_coordinate</key> + <value>(0, 187)</value> + </param> + <param> + <key>_rotation</key> <value>0</value> </param> + </block> + <block> + <key>options</key> + <param> + <key>id</key> + <value>dpsk_loopback</value> + </param> + <param> + <key>_enabled</key> + <value>True</value> + </param> + <param> + <key>title</key> + <value>DPSK Loopback</value> + </param> + <param> + <key>author</key> + <value>GNU Radio</value> + </param> + <param> + <key>description</key> + <value>Encode a signal into a packet, modulate, demodulate, decode and show it's the same data.</value> + </param> + <param> + <key>window_size</key> + <value>1280, 1024</value> + </param> + <param> + <key>generate_options</key> + <value>qt_gui</value> + </param> + <param> + <key>category</key> + <value>Custom</value> + </param> + <param> + <key>run_options</key> + <value>prompt</value> + </param> + <param> + <key>run</key> + <value>True</value> + </param> + <param> + <key>max_nouts</key> + <value>0</value> + </param> + <param> + <key>realtime_scheduling</key> + <value></value> + </param> + <param> + <key>alias</key> + <value></value> + </param> <param> <key>_coordinate</key> - <value>(190, 19)</value> + <value>(0, -1)</value> </param> <param> <key>_rotation</key> @@ -433,10 +781,10 @@ </param> </block> <block> - <key>blks2_packet_decoder</key> + <key>analog_sig_source_x</key> <param> <key>id</key> - <value>blks2_packet_decoder_0</value> + <value>analog_sig_source_x_0</value> </param> <param> <key>_enabled</key> @@ -447,29 +795,51 @@ <value>float</value> </param> <param> - <key>access_code</key> + <key>samp_rate</key> + <value>samp_rate</value> + </param> + <param> + <key>waveform</key> + <value>analog.GR_COS_WAVE</value> + </param> + <param> + <key>freq</key> + <value>freq</value> + </param> + <param> + <key>amp</key> + <value>1</value> + </param> + <param> + <key>offset</key> + <value>0</value> + </param> + <param> + <key>alias</key> <value></value> </param> <param> - <key>threshold</key> - <value>-1</value> + <key>affinity</key> + <value></value> + </param> + <param> + <key>minoutbuf</key> + <value>0</value> + </param> + <param> + <key>maxoutbuf</key> + <value>0</value> </param> <param> <key>_coordinate</key> - <value>(545, 187)</value> + <value>(188, 23)</value> </param> <param> <key>_rotation</key> - <value>180</value> + <value>0</value> </param> </block> <connection> - <source_block_id>blks2_packet_decoder_0</source_block_id> - <sink_block_id>wxgui_scopesink2_0</sink_block_id> - <source_key>0</source_key> - <sink_key>0</sink_key> - </connection> - <connection> <source_block_id>blks2_packet_encoder_0</source_block_id> <sink_block_id>digital_dxpsk_mod_1</sink_block_id> <source_key>0</source_key> @@ -499,4 +869,10 @@ <source_key>0</source_key> <sink_key>0</sink_key> </connection> + <connection> + <source_block_id>blks2_packet_decoder_0</source_block_id> + <sink_block_id>qtgui_time_sink_x_0</sink_block_id> + <source_key>0</source_key> + <sink_key>0</sink_key> + </connection> </flow_graph> diff --git a/gr-digital/examples/demod/mpsk_demod.grc b/gr-digital/examples/demod/mpsk_demod.grc index f1f0e2fd6d..3c1c2e8726 100644 --- a/gr-digital/examples/demod/mpsk_demod.grc +++ b/gr-digital/examples/demod/mpsk_demod.grc @@ -1,6 +1,6 @@ <?xml version='1.0' encoding='ASCII'?> <flow_graph> - <timestamp>Sun Mar 17 21:08:14 2013</timestamp> + <timestamp>Sat Jul 12 13:49:08 2014</timestamp> <block> <key>options</key> <param> @@ -52,6 +52,10 @@ <value></value> </param> <param> + <key>alias</key> + <value></value> + </param> + <param> <key>_coordinate</key> <value>(10, 10)</value> </param> @@ -75,6 +79,10 @@ <value>32000</value> </param> <param> + <key>alias</key> + <value></value> + </param> + <param> <key>_coordinate</key> <value>(10, 170)</value> </param> @@ -84,6 +92,33 @@ </param> </block> <block> + <key>variable</key> + <param> + <key>id</key> + <value>samps_per_sym</value> + </param> + <param> + <key>_enabled</key> + <value>True</value> + </param> + <param> + <key>value</key> + <value>4</value> + </param> + <param> + <key>alias</key> + <value></value> + </param> + <param> + <key>_coordinate</key> + <value>(12, 99)</value> + </param> + <param> + <key>_rotation</key> + <value>0</value> + </param> + </block> + <block> <key>analog_random_source_x</key> <param> <key>id</key> @@ -114,6 +149,22 @@ <value>True</value> </param> <param> + <key>alias</key> + <value></value> + </param> + <param> + <key>affinity</key> + <value></value> + </param> + <param> + <key>minoutbuf</key> + <value>0</value> + </param> + <param> + <key>maxoutbuf</key> + <value>0</value> + </param> + <param> <key>_coordinate</key> <value>(161, 119)</value> </param> @@ -123,234 +174,330 @@ </param> </block> <block> - <key>variable</key> + <key>qtgui_const_sink_x</key> <param> <key>id</key> - <value>samps_per_sym</value> + <value>qtgui_const_sink_x_0</value> </param> <param> <key>_enabled</key> <value>True</value> </param> <param> - <key>value</key> - <value>4</value> + <key>type</key> + <value>complex</value> </param> <param> - <key>_coordinate</key> - <value>(12, 99)</value> + <key>name</key> + <value></value> </param> <param> - <key>_rotation</key> - <value>0</value> + <key>size</key> + <value>1024</value> </param> - </block> - <block> - <key>variable_qtgui_range</key> <param> - <key>id</key> - <value>freq_off</value> + <key>grid</key> + <value>False</value> </param> <param> - <key>_enabled</key> - <value>True</value> + <key>autoscale</key> + <value>False</value> </param> <param> - <key>label</key> - <value>Freq. Offset</value> + <key>ymin</key> + <value>-2</value> </param> <param> - <key>value</key> + <key>ymax</key> + <value>2</value> + </param> + <param> + <key>xmin</key> + <value>-2</value> + </param> + <param> + <key>xmax</key> + <value>2</value> + </param> + <param> + <key>nconnections</key> + <value>1</value> + </param> + <param> + <key>update_time</key> + <value>0.10</value> + </param> + <param> + <key>gui_hint</key> + <value>notebook@0</value> + </param> + <param> + <key>tr_mode</key> + <value>qtgui.TRIG_MODE_FREE</value> + </param> + <param> + <key>tr_slope</key> + <value>qtgui.TRIG_SLOPE_POS</value> + </param> + <param> + <key>tr_level</key> + <value>0.0</value> + </param> + <param> + <key>tr_chan</key> <value>0</value> </param> <param> - <key>start</key> - <value>-0.5</value> + <key>tr_tag</key> + <value>""</value> </param> <param> - <key>stop</key> - <value>0.5</value> + <key>label1</key> + <value></value> </param> <param> - <key>step</key> - <value>0.01</value> + <key>width1</key> + <value>1</value> </param> <param> - <key>widget</key> - <value>counter_slider</value> + <key>color1</key> + <value>"blue"</value> </param> <param> - <key>orient</key> - <value>Qt.Horizontal</value> + <key>style1</key> + <value>0</value> </param> <param> - <key>min_len</key> - <value>200</value> + <key>marker1</key> + <value>0</value> </param> <param> - <key>gui_hint</key> + <key>alpha1</key> + <value>1.0</value> + </param> + <param> + <key>label2</key> <value></value> </param> <param> - <key>_coordinate</key> - <value>(17, 260)</value> + <key>width2</key> + <value>1</value> </param> <param> - <key>_rotation</key> + <key>color2</key> + <value>"red"</value> + </param> + <param> + <key>style2</key> <value>0</value> </param> - </block> - <block> - <key>variable_qtgui_range</key> <param> - <key>id</key> - <value>noise</value> + <key>marker2</key> + <value>0</value> </param> <param> - <key>_enabled</key> - <value>True</value> + <key>alpha2</key> + <value>1.0</value> </param> <param> - <key>label</key> - <value>Noise</value> + <key>label3</key> + <value></value> </param> <param> - <key>value</key> - <value>0.1</value> + <key>width3</key> + <value>1</value> </param> <param> - <key>start</key> + <key>color3</key> + <value>"red"</value> + </param> + <param> + <key>style3</key> <value>0</value> </param> <param> - <key>stop</key> + <key>marker3</key> + <value>0</value> + </param> + <param> + <key>alpha3</key> + <value>1.0</value> + </param> + <param> + <key>label4</key> + <value></value> + </param> + <param> + <key>width4</key> <value>1</value> </param> <param> - <key>step</key> - <value>0.01</value> + <key>color4</key> + <value>"red"</value> </param> <param> - <key>widget</key> - <value>counter_slider</value> + <key>style4</key> + <value>0</value> </param> <param> - <key>orient</key> - <value>Qt.Horizontal</value> + <key>marker4</key> + <value>0</value> </param> <param> - <key>min_len</key> - <value>200</value> + <key>alpha4</key> + <value>1.0</value> </param> <param> - <key>gui_hint</key> + <key>label5</key> <value></value> </param> <param> - <key>_coordinate</key> - <value>(146, 262)</value> + <key>width5</key> + <value>1</value> </param> <param> - <key>_rotation</key> + <key>color5</key> + <value>"red"</value> + </param> + <param> + <key>style5</key> <value>0</value> </param> - </block> - <block> - <key>qtgui_tab_widget</key> <param> - <key>id</key> - <value>notebook</value> + <key>marker5</key> + <value>0</value> </param> <param> - <key>_enabled</key> - <value>True</value> + <key>alpha5</key> + <value>1.0</value> </param> <param> - <key>num_tabs</key> - <value>2</value> + <key>label6</key> + <value></value> </param> <param> - <key>label0</key> - <value>Constellation</value> + <key>width6</key> + <value>1</value> </param> <param> - <key>label1</key> - <value>Spectrum</value> + <key>color6</key> + <value>"red"</value> </param> <param> - <key>label2</key> - <value>Tab 2</value> + <key>style6</key> + <value>0</value> </param> <param> - <key>label3</key> - <value>Tab 3</value> + <key>marker6</key> + <value>0</value> </param> <param> - <key>label4</key> - <value>Tab 4</value> + <key>alpha6</key> + <value>1.0</value> </param> <param> - <key>gui_hint</key> + <key>label7</key> <value></value> </param> <param> - <key>_coordinate</key> - <value>(21, 394)</value> + <key>width7</key> + <value>1</value> </param> <param> - <key>_rotation</key> + <key>color7</key> + <value>"red"</value> + </param> + <param> + <key>style7</key> <value>0</value> </param> - </block> - <block> - <key>qtgui_const_sink_x</key> <param> - <key>id</key> - <value>qtgui_const_sink_x_0</value> + <key>marker7</key> + <value>0</value> </param> <param> - <key>_enabled</key> - <value>True</value> + <key>alpha7</key> + <value>1.0</value> </param> <param> - <key>type</key> - <value>complex</value> + <key>label8</key> + <value></value> </param> <param> - <key>name</key> + <key>width8</key> + <value>1</value> + </param> + <param> + <key>color8</key> + <value>"red"</value> + </param> + <param> + <key>style8</key> + <value>0</value> + </param> + <param> + <key>marker8</key> + <value>0</value> + </param> + <param> + <key>alpha8</key> + <value>1.0</value> + </param> + <param> + <key>label9</key> <value></value> </param> <param> - <key>size</key> - <value>1024</value> + <key>width9</key> + <value>1</value> </param> <param> - <key>ymin</key> - <value>-2</value> + <key>color9</key> + <value>"red"</value> </param> <param> - <key>ymax</key> - <value>2</value> + <key>style9</key> + <value>0</value> </param> <param> - <key>xmin</key> - <value>-2</value> + <key>marker9</key> + <value>0</value> </param> <param> - <key>xmax</key> - <value>2</value> + <key>alpha9</key> + <value>1.0</value> </param> <param> - <key>nconnections</key> + <key>label10</key> + <value></value> + </param> + <param> + <key>width10</key> <value>1</value> </param> <param> - <key>update_time</key> - <value>0.10</value> + <key>color10</key> + <value>"red"</value> </param> <param> - <key>gui_hint</key> - <value>notebook@0</value> + <key>style10</key> + <value>0</value> + </param> + <param> + <key>marker10</key> + <value>0</value> + </param> + <param> + <key>alpha10</key> + <value>1.0</value> + </param> + <param> + <key>alias</key> + <value></value> + </param> + <param> + <key>affinity</key> + <value></value> </param> <param> <key>_coordinate</key> @@ -396,6 +543,18 @@ <value>samp_rate</value> </param> <param> + <key>grid</key> + <value>False</value> + </param> + <param> + <key>autoscale</key> + <value>False</value> + </param> + <param> + <key>average</key> + <value>1.0</value> + </param> + <param> <key>ymin</key> <value>-140</value> </param> @@ -416,6 +575,186 @@ <value>notebook@1</value> </param> <param> + <key>showports</key> + <value>True</value> + </param> + <param> + <key>label1</key> + <value></value> + </param> + <param> + <key>width1</key> + <value>1</value> + </param> + <param> + <key>color1</key> + <value>"blue"</value> + </param> + <param> + <key>alpha1</key> + <value>1.0</value> + </param> + <param> + <key>label2</key> + <value></value> + </param> + <param> + <key>width2</key> + <value>1</value> + </param> + <param> + <key>color2</key> + <value>"red"</value> + </param> + <param> + <key>alpha2</key> + <value>1.0</value> + </param> + <param> + <key>label3</key> + <value></value> + </param> + <param> + <key>width3</key> + <value>1</value> + </param> + <param> + <key>color3</key> + <value>"green"</value> + </param> + <param> + <key>alpha3</key> + <value>1.0</value> + </param> + <param> + <key>label4</key> + <value></value> + </param> + <param> + <key>width4</key> + <value>1</value> + </param> + <param> + <key>color4</key> + <value>"black"</value> + </param> + <param> + <key>alpha4</key> + <value>1.0</value> + </param> + <param> + <key>label5</key> + <value></value> + </param> + <param> + <key>width5</key> + <value>1</value> + </param> + <param> + <key>color5</key> + <value>"cyan"</value> + </param> + <param> + <key>alpha5</key> + <value>1.0</value> + </param> + <param> + <key>label6</key> + <value></value> + </param> + <param> + <key>width6</key> + <value>1</value> + </param> + <param> + <key>color6</key> + <value>"magenta"</value> + </param> + <param> + <key>alpha6</key> + <value>1.0</value> + </param> + <param> + <key>label7</key> + <value></value> + </param> + <param> + <key>width7</key> + <value>1</value> + </param> + <param> + <key>color7</key> + <value>"yellow"</value> + </param> + <param> + <key>alpha7</key> + <value>1.0</value> + </param> + <param> + <key>label8</key> + <value></value> + </param> + <param> + <key>width8</key> + <value>1</value> + </param> + <param> + <key>color8</key> + <value>"dark red"</value> + </param> + <param> + <key>alpha8</key> + <value>1.0</value> + </param> + <param> + <key>label9</key> + <value></value> + </param> + <param> + <key>width9</key> + <value>1</value> + </param> + <param> + <key>color9</key> + <value>"dark green"</value> + </param> + <param> + <key>alpha9</key> + <value>1.0</value> + </param> + <param> + <key>label10</key> + <value></value> + </param> + <param> + <key>width10</key> + <value>1</value> + </param> + <param> + <key>color10</key> + <value>"dark blue"</value> + </param> + <param> + <key>alpha10</key> + <value>1.0</value> + </param> + <param> + <key>alias</key> + <value></value> + </param> + <param> + <key>affinity</key> + <value></value> + </param> + <param> + <key>minoutbuf</key> + <value>0</value> + </param> + <param> + <key>maxoutbuf</key> + <value>0</value> + </param> + <param> <key>_coordinate</key> <value>(810, 65)</value> </param> @@ -459,6 +798,22 @@ <value>False</value> </param> <param> + <key>alias</key> + <value></value> + </param> + <param> + <key>affinity</key> + <value></value> + </param> + <param> + <key>minoutbuf</key> + <value>0</value> + </param> + <param> + <key>maxoutbuf</key> + <value>0</value> + </param> + <param> <key>_coordinate</key> <value>(361, 119)</value> </param> @@ -490,6 +845,26 @@ <value>1</value> </param> <param> + <key>ignoretag</key> + <value>True</value> + </param> + <param> + <key>alias</key> + <value></value> + </param> + <param> + <key>affinity</key> + <value></value> + </param> + <param> + <key>minoutbuf</key> + <value>0</value> + </param> + <param> + <key>maxoutbuf</key> + <value>0</value> + </param> + <param> <key>_coordinate</key> <value>(597, 142)</value> </param> @@ -529,6 +904,26 @@ <value>0</value> </param> <param> + <key>block_tags</key> + <value>False</value> + </param> + <param> + <key>alias</key> + <value></value> + </param> + <param> + <key>affinity</key> + <value></value> + </param> + <param> + <key>minoutbuf</key> + <value>0</value> + </param> + <param> + <key>maxoutbuf</key> + <value>0</value> + </param> + <param> <key>_coordinate</key> <value>(494, 263)</value> </param> @@ -537,6 +932,175 @@ <value>0</value> </param> </block> + <block> + <key>variable_qtgui_range</key> + <param> + <key>id</key> + <value>freq_off</value> + </param> + <param> + <key>_enabled</key> + <value>True</value> + </param> + <param> + <key>label</key> + <value>Freq. Offset</value> + </param> + <param> + <key>value</key> + <value>0</value> + </param> + <param> + <key>start</key> + <value>-0.5</value> + </param> + <param> + <key>stop</key> + <value>0.5</value> + </param> + <param> + <key>step</key> + <value>0.01</value> + </param> + <param> + <key>widget</key> + <value>counter_slider</value> + </param> + <param> + <key>orient</key> + <value>Qt.Horizontal</value> + </param> + <param> + <key>min_len</key> + <value>200</value> + </param> + <param> + <key>gui_hint</key> + <value>1,1,1,1</value> + </param> + <param> + <key>alias</key> + <value></value> + </param> + <param> + <key>_coordinate</key> + <value>(17, 260)</value> + </param> + <param> + <key>_rotation</key> + <value>0</value> + </param> + </block> + <block> + <key>variable_qtgui_range</key> + <param> + <key>id</key> + <value>noise</value> + </param> + <param> + <key>_enabled</key> + <value>True</value> + </param> + <param> + <key>label</key> + <value>Noise</value> + </param> + <param> + <key>value</key> + <value>0.1</value> + </param> + <param> + <key>start</key> + <value>0</value> + </param> + <param> + <key>stop</key> + <value>1</value> + </param> + <param> + <key>step</key> + <value>0.01</value> + </param> + <param> + <key>widget</key> + <value>counter_slider</value> + </param> + <param> + <key>orient</key> + <value>Qt.Horizontal</value> + </param> + <param> + <key>min_len</key> + <value>200</value> + </param> + <param> + <key>gui_hint</key> + <value>1,0,1,1</value> + </param> + <param> + <key>alias</key> + <value></value> + </param> + <param> + <key>_coordinate</key> + <value>(146, 262)</value> + </param> + <param> + <key>_rotation</key> + <value>0</value> + </param> + </block> + <block> + <key>qtgui_tab_widget</key> + <param> + <key>id</key> + <value>notebook</value> + </param> + <param> + <key>_enabled</key> + <value>True</value> + </param> + <param> + <key>num_tabs</key> + <value>2</value> + </param> + <param> + <key>label0</key> + <value>Constellation</value> + </param> + <param> + <key>label1</key> + <value>Spectrum</value> + </param> + <param> + <key>label2</key> + <value>Tab 2</value> + </param> + <param> + <key>label3</key> + <value>Tab 3</value> + </param> + <param> + <key>label4</key> + <value>Tab 4</value> + </param> + <param> + <key>gui_hint</key> + <value>0,0,1,2</value> + </param> + <param> + <key>alias</key> + <value></value> + </param> + <param> + <key>_coordinate</key> + <value>(21, 394)</value> + </param> + <param> + <key>_rotation</key> + <value>0</value> + </param> + </block> <connection> <source_block_id>analog_random_source_x_0</source_block_id> <sink_block_id>digital_dxpsk_mod_0</sink_block_id> diff --git a/gr-digital/examples/demod/pam_sync.grc b/gr-digital/examples/demod/pam_sync.grc index 98b4d4a63d..e3de4296e2 100644 --- a/gr-digital/examples/demod/pam_sync.grc +++ b/gr-digital/examples/demod/pam_sync.grc @@ -1,59 +1,54 @@ <?xml version='1.0' encoding='ASCII'?> <flow_graph> - <timestamp>Sun Mar 17 21:08:58 2013</timestamp> + <timestamp>Wed Jul 9 12:32:34 2014</timestamp> <block> - <key>options</key> + <key>variable</key> <param> <key>id</key> - <value>pam_sync</value> + <value>sig_amp</value> </param> <param> <key>_enabled</key> <value>True</value> </param> <param> - <key>title</key> - <value></value> - </param> - <param> - <key>author</key> - <value></value> + <key>value</key> + <value>1.0</value> </param> <param> - <key>description</key> + <key>alias</key> <value></value> </param> <param> - <key>window_size</key> - <value>1280, 1024</value> - </param> - <param> - <key>generate_options</key> - <value>wx_gui</value> + <key>_coordinate</key> + <value>(887, -1)</value> </param> <param> - <key>category</key> - <value>Custom</value> + <key>_rotation</key> + <value>0</value> </param> + </block> + <block> + <key>variable</key> <param> - <key>run_options</key> - <value>prompt</value> + <key>id</key> + <value>const</value> </param> <param> - <key>run</key> + <key>_enabled</key> <value>True</value> </param> <param> - <key>max_nouts</key> - <value>0</value> + <key>value</key> + <value>digital.qpsk_constellation()</value> </param> <param> - <key>realtime_scheduling</key> + <key>alias</key> <value></value> </param> <param> <key>_coordinate</key> - <value>(-1, 0)</value> + <value>(336, -2)</value> </param> <param> <key>_rotation</key> @@ -64,7 +59,7 @@ <key>variable</key> <param> <key>id</key> - <value>const</value> + <value>samp_rate</value> </param> <param> <key>_enabled</key> @@ -72,11 +67,15 @@ </param> <param> <key>value</key> - <value>digital.qpsk_constellation()</value> + <value>128000</value> + </param> + <param> + <key>alias</key> + <value></value> </param> <param> <key>_coordinate</key> - <value>(336, -2)</value> + <value>(193, -1)</value> </param> <param> <key>_rotation</key> @@ -84,22 +83,26 @@ </param> </block> <block> - <key>virtual_sink</key> + <key>variable</key> <param> <key>id</key> - <value>virtual_sink_0</value> + <value>spb</value> </param> <param> <key>_enabled</key> <value>True</value> </param> <param> - <key>stream_id</key> - <value>input_signal_probe</value> + <key>value</key> + <value>4.0</value> + </param> + <param> + <key>alias</key> + <value></value> </param> <param> <key>_coordinate</key> - <value>(330, 183)</value> + <value>(513, -1)</value> </param> <param> <key>_rotation</key> @@ -110,7 +113,7 @@ <key>variable</key> <param> <key>id</key> - <value>samp_rate</value> + <value>rolloff</value> </param> <param> <key>_enabled</key> @@ -118,11 +121,15 @@ </param> <param> <key>value</key> - <value>128000</value> + <value>0.35</value> + </param> + <param> + <key>alias</key> + <value></value> </param> <param> <key>_coordinate</key> - <value>(193, -1)</value> + <value>(578, -1)</value> </param> <param> <key>_rotation</key> @@ -130,38 +137,53 @@ </param> </block> <block> - <key>analog_random_source_x</key> + <key>variable</key> <param> <key>id</key> - <value>analog_random_source_x</value> + <value>rrctaps</value> </param> <param> <key>_enabled</key> <value>True</value> </param> <param> - <key>type</key> - <value>byte</value> + <key>value</key> + <value>firdes.root_raised_cosine(nfilts,1.0,1.0/(nfilts*spb), rolloff, int(11*spb*nfilts))</value> </param> <param> - <key>min</key> - <value>0</value> + <key>alias</key> + <value></value> </param> <param> - <key>max</key> - <value>const.arity()</value> + <key>_coordinate</key> + <value>(660, 0)</value> </param> <param> - <key>num_samps</key> - <value>10000000</value> + <key>_rotation</key> + <value>0</value> </param> + </block> + <block> + <key>variable</key> <param> - <key>repeat</key> + <key>id</key> + <value>nfilts</value> + </param> + <param> + <key>_enabled</key> <value>True</value> </param> <param> + <key>value</key> + <value>32</value> + </param> + <param> + <key>alias</key> + <value></value> + </param> + <param> <key>_coordinate</key> - <value>(0, 72)</value> + <value>(816, 0)</value> </param> <param> <key>_rotation</key> @@ -169,74 +191,77 @@ </param> </block> <block> - <key>wxgui_scopesink2</key> + <key>virtual_sink</key> <param> <key>id</key> - <value>wxgui_scopesink2_0_0_1</value> + <value>virtual_sink_0</value> </param> <param> <key>_enabled</key> <value>True</value> </param> <param> - <key>type</key> - <value>complex</value> + <key>stream_id</key> + <value>input_signal_probe</value> </param> <param> - <key>title</key> - <value>Pre-sync Signal</value> + <key>_coordinate</key> + <value>(330, 183)</value> </param> <param> - <key>samp_rate</key> - <value>samp_rate</value> + <key>_rotation</key> + <value>0</value> </param> + </block> + <block> + <key>analog_random_source_x</key> <param> - <key>v_scale</key> - <value>.5</value> + <key>id</key> + <value>analog_random_source_x</value> </param> <param> - <key>v_offset</key> - <value>0</value> + <key>_enabled</key> + <value>True</value> </param> <param> - <key>t_scale</key> - <value>0</value> + <key>type</key> + <value>byte</value> </param> <param> - <key>ac_couple</key> - <value>False</value> + <key>min</key> + <value>0</value> </param> <param> - <key>xy_mode</key> - <value>False</value> + <key>max</key> + <value>const.arity()</value> </param> <param> - <key>num_inputs</key> - <value>1</value> + <key>num_samps</key> + <value>10000000</value> </param> <param> - <key>win_size</key> - <value></value> + <key>repeat</key> + <value>True</value> </param> <param> - <key>grid_pos</key> + <key>alias</key> <value></value> </param> <param> - <key>notebook</key> - <value>notebook_0,1</value> + <key>affinity</key> + <value></value> </param> <param> - <key>trig_mode</key> - <value>wxgui.TRIG_MODE_AUTO</value> + <key>minoutbuf</key> + <value>0</value> </param> <param> - <key>y_axis_label</key> - <value>Counts</value> + <key>maxoutbuf</key> + <value>0</value> </param> <param> <key>_coordinate</key> - <value>(1081, 439)</value> + <value>(0, 72)</value> </param> <param> <key>_rotation</key> @@ -244,90 +269,121 @@ </param> </block> <block> - <key>wxgui_fftsink2</key> + <key>digital_chunks_to_symbols_xx</key> <param> <key>id</key> - <value>wxgui_fftsink2_0</value> + <value>digital_chunks_to_symbols_xx</value> </param> <param> <key>_enabled</key> <value>True</value> </param> <param> - <key>type</key> + <key>in_type</key> + <value>byte</value> + </param> + <param> + <key>out_type</key> <value>complex</value> </param> <param> - <key>title</key> - <value>Received spectrum</value> + <key>symbol_table</key> + <value>const.points()</value> </param> <param> - <key>samp_rate</key> - <value>samp_rate</value> + <key>dimension</key> + <value>1</value> + </param> + <param> + <key>num_ports</key> + <value>1</value> + </param> + <param> + <key>alias</key> + <value></value> </param> <param> - <key>baseband_freq</key> + <key>affinity</key> + <value></value> + </param> + <param> + <key>minoutbuf</key> <value>0</value> </param> <param> - <key>y_per_div</key> - <value>10</value> + <key>maxoutbuf</key> + <value>0</value> </param> <param> - <key>y_divs</key> - <value>10</value> + <key>_coordinate</key> + <value>(178, 87)</value> </param> <param> - <key>ref_level</key> - <value>10</value> + <key>_rotation</key> + <value>0</value> </param> + </block> + <block> + <key>digital_pfb_clock_sync_xxx</key> <param> - <key>ref_scale</key> - <value>2.0</value> + <key>id</key> + <value>digital_pfb_clock_sync_xxx_0</value> </param> <param> - <key>fft_size</key> - <value>1024</value> + <key>_enabled</key> + <value>True</value> </param> <param> - <key>fft_rate</key> - <value>30</value> + <key>type</key> + <value>ccf</value> </param> <param> - <key>peak_hold</key> - <value>False</value> + <key>sps</key> + <value>spb</value> </param> <param> - <key>average</key> - <value>False</value> + <key>loop_bw</key> + <value>time_bw</value> </param> <param> - <key>avg_alpha</key> - <value>0</value> + <key>taps</key> + <value>rrctaps</value> + </param> + <param> + <key>filter_size</key> + <value>nfilts</value> + </param> + <param> + <key>init_phase</key> + <value>16</value> </param> <param> - <key>win</key> - <value>None</value> + <key>max_dev</key> + <value>1.5</value> + </param> + <param> + <key>osps</key> + <value>1</value> </param> <param> - <key>win_size</key> + <key>alias</key> <value></value> </param> <param> - <key>grid_pos</key> + <key>affinity</key> <value></value> </param> <param> - <key>notebook</key> - <value>notebook_0,1</value> + <key>minoutbuf</key> + <value>0</value> </param> <param> - <key>freqvar</key> - <value>None</value> + <key>maxoutbuf</key> + <value>0</value> </param> <param> <key>_coordinate</key> - <value>(1081, 563)</value> + <value>(598, 241)</value> </param> <param> <key>_rotation</key> @@ -335,54 +391,58 @@ </param> </block> <block> - <key>variable_slider</key> + <key>channels_channel_model</key> <param> <key>id</key> - <value>phase_bw</value> + <value>channels_channel_model_0</value> </param> <param> <key>_enabled</key> <value>True</value> </param> <param> - <key>label</key> - <value>Costas Loop (Phase) Bandwidth</value> + <key>noise_voltage</key> + <value>noise_amp</value> </param> <param> - <key>value</key> - <value>0</value> + <key>freq_offset</key> + <value>freq_offset</value> </param> <param> - <key>min</key> - <value>0</value> + <key>epsilon</key> + <value>interpratio</value> </param> <param> - <key>max</key> - <value>0.1</value> + <key>taps</key> + <value>1.0</value> + </param> + <param> + <key>seed</key> + <value>42</value> </param> <param> - <key>num_steps</key> - <value>1000</value> + <key>block_tags</key> + <value>False</value> </param> <param> - <key>style</key> - <value>wx.SL_HORIZONTAL</value> + <key>alias</key> + <value></value> </param> <param> - <key>converver</key> - <value>float_converter</value> + <key>affinity</key> + <value></value> </param> <param> - <key>grid_pos</key> - <value>(7,2,1,1)</value> + <key>minoutbuf</key> + <value>0</value> </param> <param> - <key>notebook</key> - <value></value> + <key>maxoutbuf</key> + <value>0</value> </param> <param> <key>_coordinate</key> - <value>(866, 313)</value> + <value>(59, 184)</value> </param> <param> <key>_rotation</key> @@ -390,61 +450,46 @@ </param> </block> <block> - <key>digital_chunks_to_symbols_xx</key> + <key>blocks_multiply_const_vxx</key> <param> <key>id</key> - <value>digital_chunks_to_symbols_xx</value> + <value>blocks_multiply_const_vxx_0</value> </param> <param> <key>_enabled</key> <value>True</value> </param> <param> - <key>in_type</key> - <value>byte</value> - </param> - <param> - <key>out_type</key> + <key>type</key> <value>complex</value> </param> <param> - <key>symbol_table</key> - <value>const.points()</value> + <key>const</key> + <value>sig_amp</value> </param> <param> - <key>dimension</key> + <key>vlen</key> <value>1</value> </param> <param> - <key>num_ports</key> - <value>1</value> + <key>alias</key> + <value></value> </param> <param> - <key>_coordinate</key> - <value>(178, 87)</value> + <key>affinity</key> + <value></value> </param> <param> - <key>_rotation</key> + <key>minoutbuf</key> <value>0</value> </param> - </block> - <block> - <key>variable</key> - <param> - <key>id</key> - <value>spb</value> - </param> <param> - <key>_enabled</key> - <value>True</value> - </param> - <param> - <key>value</key> - <value>4.0</value> + <key>maxoutbuf</key> + <value>0</value> </param> <param> <key>_coordinate</key> - <value>(513, -1)</value> + <value>(807, 95)</value> </param> <param> <key>_rotation</key> @@ -452,45 +497,50 @@ </param> </block> <block> - <key>variable</key> + <key>blocks_throttle</key> <param> <key>id</key> - <value>rolloff</value> + <value>blocks_throttle_0</value> </param> <param> <key>_enabled</key> <value>True</value> </param> <param> - <key>value</key> - <value>0.35</value> + <key>type</key> + <value>complex</value> </param> <param> - <key>_coordinate</key> - <value>(578, -1)</value> + <key>samples_per_second</key> + <value>samp_rate</value> </param> <param> - <key>_rotation</key> - <value>0</value> + <key>vlen</key> + <value>1</value> </param> - </block> - <block> - <key>variable</key> <param> - <key>id</key> - <value>rrctaps</value> + <key>ignoretag</key> + <value>True</value> </param> <param> - <key>_enabled</key> - <value>True</value> + <key>alias</key> + <value></value> </param> <param> - <key>value</key> - <value>firdes.root_raised_cosine(nfilts,1.0,1.0/(nfilts*spb), rolloff, int(11*spb*nfilts))</value> + <key>affinity</key> + <value></value> + </param> + <param> + <key>minoutbuf</key> + <value>0</value> + </param> + <param> + <key>maxoutbuf</key> + <value>0</value> </param> <param> <key>_coordinate</key> - <value>(660, 0)</value> + <value>(987, 95)</value> </param> <param> <key>_rotation</key> @@ -498,45 +548,58 @@ </param> </block> <block> - <key>variable</key> + <key>pfb_arb_resampler_xxx</key> <param> <key>id</key> - <value>sig_amp</value> + <value>pfb_arb_resampler_xxx_0</value> </param> <param> <key>_enabled</key> <value>True</value> </param> <param> - <key>value</key> - <value>1.0</value> + <key>type</key> + <value>ccf</value> </param> <param> - <key>_coordinate</key> - <value>(887, -1)</value> + <key>rrate</key> + <value>spb</value> </param> <param> - <key>_rotation</key> + <key>taps</key> + <value>firdes.root_raised_cosine(nfilts, 1.0, 1.0/nfilts, rolloff, int(11*spb*nfilts))</value> + </param> + <param> + <key>nfilts</key> + <value>32</value> + </param> + <param> + <key>atten</key> + <value>100</value> + </param> + <param> + <key>samp_delay</key> <value>0</value> </param> - </block> - <block> - <key>variable</key> <param> - <key>id</key> - <value>nfilts</value> + <key>alias</key> + <value></value> </param> <param> - <key>_enabled</key> - <value>True</value> + <key>affinity</key> + <value></value> </param> <param> - <key>value</key> - <value>32</value> + <key>minoutbuf</key> + <value>0</value> + </param> + <param> + <key>maxoutbuf</key> + <value>0</value> </param> <param> <key>_coordinate</key> - <value>(816, 0)</value> + <value>(455, 72)</value> </param> <param> <key>_rotation</key> @@ -544,50 +607,58 @@ </param> </block> <block> - <key>digital_pfb_clock_sync_xxx</key> + <key>variable_qtgui_range</key> <param> <key>id</key> - <value>digital_pfb_clock_sync_xxx_0</value> + <value>interpratio</value> </param> <param> <key>_enabled</key> <value>True</value> </param> <param> - <key>type</key> - <value>ccf</value> + <key>label</key> + <value>Timing Offset</value> </param> <param> - <key>sps</key> - <value>spb</value> + <key>value</key> + <value>1</value> </param> <param> - <key>loop_bw</key> - <value>time_bw</value> + <key>start</key> + <value>.99</value> </param> <param> - <key>taps</key> - <value>rrctaps</value> + <key>stop</key> + <value>1.01</value> </param> <param> - <key>filter_size</key> - <value>nfilts</value> + <key>step</key> + <value>0.0001</value> </param> <param> - <key>init_phase</key> - <value>16</value> + <key>widget</key> + <value>counter_slider</value> </param> <param> - <key>max_dev</key> - <value>1.5</value> + <key>orient</key> + <value>Qt.Horizontal</value> </param> <param> - <key>osps</key> - <value>1</value> + <key>min_len</key> + <value>200</value> + </param> + <param> + <key>gui_hint</key> + <value>3,2,1,1</value> + </param> + <param> + <key>alias</key> + <value></value> </param> <param> <key>_coordinate</key> - <value>(598, 241)</value> + <value>(0, 452)</value> </param> <param> <key>_rotation</key> @@ -595,38 +666,58 @@ </param> </block> <block> - <key>pfb_arb_resampler_xxx</key> + <key>variable_qtgui_range</key> <param> <key>id</key> - <value>pfb_arb_resampler_xxx_0</value> + <value>noise_amp</value> </param> <param> <key>_enabled</key> <value>True</value> </param> <param> - <key>type</key> - <value>ccf</value> + <key>label</key> + <value>Channel Noise</value> </param> <param> - <key>rrate</key> - <value>spb</value> + <key>value</key> + <value>0</value> </param> <param> - <key>taps</key> - <value>firdes.root_raised_cosine(nfilts, 1.0, 1.0/nfilts, rolloff, int(11*spb*nfilts))</value> + <key>start</key> + <value>0</value> </param> <param> - <key>nfilts</key> - <value>32</value> + <key>stop</key> + <value>1</value> </param> <param> - <key>atten</key> - <value>100</value> + <key>step</key> + <value>.001</value> + </param> + <param> + <key>widget</key> + <value>counter_slider</value> + </param> + <param> + <key>orient</key> + <value>Qt.Horizontal</value> + </param> + <param> + <key>min_len</key> + <value>200</value> + </param> + <param> + <key>gui_hint</key> + <value>1,2,1,1</value> + </param> + <param> + <key>alias</key> + <value></value> </param> <param> <key>_coordinate</key> - <value>(503, 63)</value> + <value>(136, 317)</value> </param> <param> <key>_rotation</key> @@ -634,7 +725,7 @@ </param> </block> <block> - <key>variable_slider</key> + <key>variable_qtgui_range</key> <param> <key>id</key> <value>freq_offset</value> @@ -652,36 +743,40 @@ <value>0</value> </param> <param> - <key>min</key> - <value>-0.5</value> + <key>start</key> + <value>-.5</value> </param> <param> - <key>max</key> - <value>0.5</value> + <key>stop</key> + <value>.5</value> + </param> + <param> + <key>step</key> + <value>.01</value> </param> <param> - <key>num_steps</key> - <value>1000</value> + <key>widget</key> + <value>counter_slider</value> </param> <param> - <key>style</key> - <value>wx.SL_HORIZONTAL</value> + <key>orient</key> + <value>Qt.Horizontal</value> </param> <param> - <key>converver</key> - <value>float_converter</value> + <key>min_len</key> + <value>200</value> </param> <param> - <key>grid_pos</key> - <value>(2,2,1,1)</value> + <key>gui_hint</key> + <value>2,2,1,1</value> </param> <param> - <key>notebook</key> + <key>alias</key> <value></value> </param> <param> <key>_coordinate</key> - <value>(8, 314)</value> + <value>(-1, 317)</value> </param> <param> <key>_rotation</key> @@ -689,54 +784,50 @@ </param> </block> <block> - <key>variable_slider</key> + <key>qtgui_tab_widget</key> <param> <key>id</key> - <value>noise_amp</value> + <value>notebook</value> </param> <param> <key>_enabled</key> <value>True</value> </param> <param> - <key>label</key> - <value>Channel Noise</value> + <key>num_tabs</key> + <value>2</value> </param> <param> - <key>value</key> - <value>0</value> + <key>label0</key> + <value>Synched Signal</value> </param> <param> - <key>min</key> - <value>0</value> + <key>label1</key> + <value>Received Signal</value> </param> <param> - <key>max</key> - <value>1.0</value> + <key>label2</key> + <value>Tab 2</value> </param> <param> - <key>num_steps</key> - <value>1000</value> + <key>label3</key> + <value>Tab 3</value> </param> <param> - <key>style</key> - <value>wx.SL_HORIZONTAL</value> + <key>label4</key> + <value>Tab 4</value> </param> <param> - <key>converver</key> - <value>float_converter</value> + <key>gui_hint</key> + <value>1,1,8,1</value> </param> <param> - <key>grid_pos</key> - <value>(1,2,1,1)</value> - </param> - <param> - <key>notebook</key> + <key>alias</key> <value></value> </param> <param> <key>_coordinate</key> - <value>(136, 314)</value> + <value>(150, 492)</value> </param> <param> <key>_rotation</key> @@ -744,38 +835,58 @@ </param> </block> <block> - <key>channels_channel_model</key> + <key>variable_qtgui_range</key> <param> <key>id</key> - <value>channels_channel_model_0</value> + <value>freq_bw</value> </param> <param> <key>_enabled</key> <value>True</value> </param> <param> - <key>noise_voltage</key> - <value>noise_amp</value> + <key>label</key> + <value>FLL Bandwidth</value> </param> <param> - <key>freq_offset</key> - <value>freq_offset</value> + <key>value</key> + <value>0</value> </param> <param> - <key>epsilon</key> - <value>interpratio</value> + <key>start</key> + <value>0</value> </param> <param> - <key>taps</key> - <value>1.0</value> + <key>stop</key> + <value>.05</value> </param> <param> - <key>seed</key> - <value>42</value> + <key>step</key> + <value>.001</value> + </param> + <param> + <key>widget</key> + <value>counter_slider</value> + </param> + <param> + <key>orient</key> + <value>Qt.Horizontal</value> + </param> + <param> + <key>min_len</key> + <value>200</value> + </param> + <param> + <key>gui_hint</key> + <value>4,2,1,1</value> + </param> + <param> + <key>alias</key> + <value></value> </param> <param> <key>_coordinate</key> - <value>(59, 184)</value> + <value>(331, 383)</value> </param> <param> <key>_rotation</key> @@ -813,8 +924,24 @@ <value>freq_bw</value> </param> <param> + <key>alias</key> + <value></value> + </param> + <param> + <key>affinity</key> + <value></value> + </param> + <param> + <key>minoutbuf</key> + <value>0</value> + </param> + <param> + <key>maxoutbuf</key> + <value>0</value> + </param> + <param> <key>_coordinate</key> - <value>(331, 238)</value> + <value>(331, 237)</value> </param> <param> <key>_rotation</key> @@ -822,145 +949,238 @@ </param> </block> <block> - <key>variable_slider</key> + <key>qtgui_freq_sink_x</key> <param> <key>id</key> - <value>freq_bw</value> + <value>qtgui_freq_sink_x_0</value> </param> <param> <key>_enabled</key> <value>True</value> </param> <param> - <key>label</key> - <value>FLL Bandwidth</value> + <key>type</key> + <value>complex</value> </param> <param> - <key>value</key> + <key>name</key> + <value>Post-sync Spectrum</value> + </param> + <param> + <key>fftsize</key> + <value>1024</value> + </param> + <param> + <key>wintype</key> + <value>firdes.WIN_BLACKMAN_hARRIS</value> + </param> + <param> + <key>fc</key> <value>0</value> </param> <param> - <key>min</key> - <value>0.0</value> + <key>bw</key> + <value>samp_rate</value> </param> <param> - <key>max</key> - <value>0.05</value> + <key>autoscale</key> + <value>True</value> + </param> + <param> + <key>average</key> + <value>0.2</value> </param> <param> - <key>num_steps</key> - <value>1000</value> + <key>ymin</key> + <value>-140</value> </param> <param> - <key>style</key> - <value>wx.SL_HORIZONTAL</value> + <key>ymax</key> + <value>10</value> + </param> + <param> + <key>nconnections</key> + <value>1</value> </param> <param> - <key>converver</key> - <value>float_converter</value> + <key>update_time</key> + <value>0.10</value> </param> <param> - <key>grid_pos</key> - <value>(4,2,1,1)</value> + <key>gui_hint</key> + <value>notebook@0</value> </param> <param> - <key>notebook</key> + <key>label1</key> <value></value> </param> <param> - <key>_coordinate</key> - <value>(335, 379)</value> + <key>width1</key> + <value>1</value> </param> <param> - <key>_rotation</key> - <value>180</value> + <key>color1</key> + <value>"blue"</value> </param> - </block> - <block> - <key>wxgui_fftsink2</key> <param> - <key>id</key> - <value>wxgui_fftsink2_0_0</value> + <key>alpha1</key> + <value>1.0</value> </param> <param> - <key>_enabled</key> - <value>True</value> + <key>label2</key> + <value></value> </param> <param> - <key>type</key> - <value>complex</value> + <key>width2</key> + <value>1</value> </param> <param> - <key>title</key> - <value>Post-sync spectrum</value> + <key>color2</key> + <value>"red"</value> </param> <param> - <key>samp_rate</key> - <value>samp_rate</value> + <key>alpha2</key> + <value>1.0</value> </param> <param> - <key>baseband_freq</key> - <value>0</value> + <key>label3</key> + <value></value> </param> <param> - <key>y_per_div</key> - <value>10</value> + <key>width3</key> + <value>1</value> </param> <param> - <key>y_divs</key> - <value>10</value> + <key>color3</key> + <value>"green"</value> </param> <param> - <key>ref_level</key> - <value>10</value> + <key>alpha3</key> + <value>1.0</value> </param> <param> - <key>ref_scale</key> - <value>2.0</value> + <key>label4</key> + <value></value> </param> <param> - <key>fft_size</key> - <value>1024</value> + <key>width4</key> + <value>1</value> </param> <param> - <key>fft_rate</key> - <value>30</value> + <key>color4</key> + <value>"black"</value> </param> <param> - <key>peak_hold</key> - <value>False</value> + <key>alpha4</key> + <value>1.0</value> </param> <param> - <key>average</key> - <value>False</value> + <key>label5</key> + <value></value> </param> <param> - <key>avg_alpha</key> - <value>0</value> + <key>width5</key> + <value>1</value> + </param> + <param> + <key>color5</key> + <value>"cyan"</value> + </param> + <param> + <key>alpha5</key> + <value>1.0</value> + </param> + <param> + <key>label6</key> + <value></value> + </param> + <param> + <key>width6</key> + <value>1</value> + </param> + <param> + <key>color6</key> + <value>"magenta"</value> + </param> + <param> + <key>alpha6</key> + <value>1.0</value> + </param> + <param> + <key>label7</key> + <value></value> + </param> + <param> + <key>width7</key> + <value>1</value> + </param> + <param> + <key>color7</key> + <value>"yellow"</value> + </param> + <param> + <key>alpha7</key> + <value>1.0</value> + </param> + <param> + <key>label8</key> + <value></value> + </param> + <param> + <key>width8</key> + <value>1</value> + </param> + <param> + <key>color8</key> + <value>"dark red"</value> </param> <param> - <key>win</key> - <value>None</value> + <key>alpha8</key> + <value>1.0</value> </param> <param> - <key>win_size</key> + <key>label9</key> <value></value> </param> <param> - <key>grid_pos</key> + <key>width9</key> + <value>1</value> + </param> + <param> + <key>color9</key> + <value>"dark green"</value> + </param> + <param> + <key>alpha9</key> + <value>1.0</value> + </param> + <param> + <key>label10</key> <value></value> </param> <param> - <key>notebook</key> - <value>notebook_0,0</value> + <key>width10</key> + <value>1</value> + </param> + <param> + <key>color10</key> + <value>"dark blue"</value> + </param> + <param> + <key>alpha10</key> + <value>1.0</value> + </param> + <param> + <key>alias</key> + <value></value> </param> <param> - <key>freqvar</key> - <value>None</value> + <key>affinity</key> + <value></value> </param> <param> <key>_coordinate</key> - <value>(337, 523)</value> + <value>(337, 519)</value> </param> <param> <key>_rotation</key> @@ -986,6 +1206,22 @@ <value>const.arity()</value> </param> <param> + <key>alias</key> + <value></value> + </param> + <param> + <key>affinity</key> + <value></value> + </param> + <param> + <key>minoutbuf</key> + <value>0</value> + </param> + <param> + <key>maxoutbuf</key> + <value>0</value> + </param> + <param> <key>_coordinate</key> <value>(871, 225)</value> </param> @@ -995,10 +1231,10 @@ </param> </block> <block> - <key>wxgui_scopesink2</key> + <key>qtgui_time_sink_x</key> <param> <key>id</key> - <value>wxgui_scopesink2_0</value> + <value>qtgui_time_sink_x_0</value> </param> <param> <key>_enabled</key> @@ -1009,60 +1245,320 @@ <value>complex</value> </param> <param> - <key>title</key> + <key>name</key> <value>Post-sync Signal</value> </param> <param> - <key>samp_rate</key> + <key>size</key> + <value>1024</value> + </param> + <param> + <key>srate</key> <value>samp_rate</value> </param> <param> - <key>v_scale</key> - <value>0</value> + <key>autoscale</key> + <value>True</value> + </param> + <param> + <key>ymin</key> + <value>-1</value> + </param> + <param> + <key>ymax</key> + <value>1</value> + </param> + <param> + <key>nconnections</key> + <value>1</value> + </param> + <param> + <key>update_time</key> + <value>0.10</value> + </param> + <param> + <key>entags</key> + <value>True</value> + </param> + <param> + <key>gui_hint</key> + <value>notebook@0</value> + </param> + <param> + <key>tr_mode</key> + <value>qtgui.TRIG_MODE_FREE</value> + </param> + <param> + <key>tr_slope</key> + <value>qtgui.TRIG_SLOPE_POS</value> + </param> + <param> + <key>tr_level</key> + <value>0.0</value> </param> <param> - <key>v_offset</key> + <key>tr_delay</key> <value>0</value> </param> <param> - <key>t_scale</key> + <key>tr_chan</key> <value>0</value> </param> <param> - <key>ac_couple</key> - <value>False</value> + <key>tr_tag</key> + <value>""</value> </param> <param> - <key>xy_mode</key> - <value>True</value> + <key>label1</key> + <value></value> + </param> + <param> + <key>width1</key> + <value>1</value> + </param> + <param> + <key>color1</key> + <value>"blue"</value> + </param> + <param> + <key>style1</key> + <value>1</value> + </param> + <param> + <key>marker1</key> + <value>-1</value> + </param> + <param> + <key>alpha1</key> + <value>1.0</value> + </param> + <param> + <key>label2</key> + <value></value> + </param> + <param> + <key>width2</key> + <value>1</value> + </param> + <param> + <key>color2</key> + <value>"red"</value> + </param> + <param> + <key>style2</key> + <value>1</value> + </param> + <param> + <key>marker2</key> + <value>-1</value> + </param> + <param> + <key>alpha2</key> + <value>1.0</value> + </param> + <param> + <key>label3</key> + <value></value> + </param> + <param> + <key>width3</key> + <value>1</value> + </param> + <param> + <key>color3</key> + <value>"green"</value> </param> <param> - <key>num_inputs</key> + <key>style3</key> <value>1</value> </param> <param> - <key>win_size</key> + <key>marker3</key> + <value>-1</value> + </param> + <param> + <key>alpha3</key> + <value>1.0</value> + </param> + <param> + <key>label4</key> + <value></value> + </param> + <param> + <key>width4</key> + <value>1</value> + </param> + <param> + <key>color4</key> + <value>"black"</value> + </param> + <param> + <key>style4</key> + <value>1</value> + </param> + <param> + <key>marker4</key> + <value>-1</value> + </param> + <param> + <key>alpha4</key> + <value>1.0</value> + </param> + <param> + <key>label5</key> <value></value> </param> <param> - <key>grid_pos</key> + <key>width5</key> + <value>1</value> + </param> + <param> + <key>color5</key> + <value>"cyan"</value> + </param> + <param> + <key>style5</key> + <value>1</value> + </param> + <param> + <key>marker5</key> + <value>-1</value> + </param> + <param> + <key>alpha5</key> + <value>1.0</value> + </param> + <param> + <key>label6</key> <value></value> </param> <param> - <key>notebook</key> - <value>notebook_0,0</value> + <key>width6</key> + <value>1</value> + </param> + <param> + <key>color6</key> + <value>"magenta"</value> </param> <param> - <key>trig_mode</key> - <value>wxgui.TRIG_MODE_AUTO</value> + <key>style6</key> + <value>1</value> </param> <param> - <key>y_axis_label</key> - <value>Counts</value> + <key>marker6</key> + <value>-1</value> + </param> + <param> + <key>alpha6</key> + <value>1.0</value> + </param> + <param> + <key>label7</key> + <value></value> + </param> + <param> + <key>width7</key> + <value>1</value> + </param> + <param> + <key>color7</key> + <value>"yellow"</value> + </param> + <param> + <key>style7</key> + <value>1</value> + </param> + <param> + <key>marker7</key> + <value>-1</value> + </param> + <param> + <key>alpha7</key> + <value>1.0</value> + </param> + <param> + <key>label8</key> + <value></value> + </param> + <param> + <key>width8</key> + <value>1</value> + </param> + <param> + <key>color8</key> + <value>"dark red"</value> + </param> + <param> + <key>style8</key> + <value>1</value> + </param> + <param> + <key>marker8</key> + <value>-1</value> + </param> + <param> + <key>alpha8</key> + <value>1.0</value> + </param> + <param> + <key>label9</key> + <value></value> + </param> + <param> + <key>width9</key> + <value>1</value> + </param> + <param> + <key>color9</key> + <value>"dark green"</value> + </param> + <param> + <key>style9</key> + <value>1</value> + </param> + <param> + <key>marker9</key> + <value>-1</value> + </param> + <param> + <key>alpha9</key> + <value>1.0</value> + </param> + <param> + <key>label10</key> + <value></value> + </param> + <param> + <key>width10</key> + <value>1</value> + </param> + <param> + <key>color10</key> + <value>"blue"</value> + </param> + <param> + <key>style10</key> + <value>1</value> + </param> + <param> + <key>marker10</key> + <value>-1</value> + </param> + <param> + <key>alpha10</key> + <value>1.0</value> + </param> + <param> + <key>alias</key> + <value></value> + </param> + <param> + <key>affinity</key> + <value></value> </param> <param> <key>_coordinate</key> - <value>(1103, 196)</value> + <value>(1096, 198)</value> </param> <param> <key>_rotation</key> @@ -1070,22 +1566,58 @@ </param> </block> <block> - <key>virtual_source</key> + <key>variable_qtgui_range</key> <param> <key>id</key> - <value>virtual_source_0</value> + <value>time_bw</value> </param> <param> <key>_enabled</key> <value>True</value> </param> <param> - <key>stream_id</key> - <value>input_signal_probe</value> + <key>label</key> + <value>Timing Loop BW</value> + </param> + <param> + <key>value</key> + <value>0</value> + </param> + <param> + <key>start</key> + <value>0</value> + </param> + <param> + <key>stop</key> + <value>.1</value> + </param> + <param> + <key>step</key> + <value>.001</value> + </param> + <param> + <key>widget</key> + <value>counter_slider</value> + </param> + <param> + <key>orient</key> + <value>Qt.Horizontal</value> + </param> + <param> + <key>min_len</key> + <value>200</value> + </param> + <param> + <key>gui_hint</key> + <value>5,2,1,1</value> + </param> + <param> + <key>alias</key> + <value></value> </param> <param> <key>_coordinate</key> - <value>(828, 562)</value> + <value>(586, 402)</value> </param> <param> <key>_rotation</key> @@ -1093,30 +1625,58 @@ </param> </block> <block> - <key>blocks_multiply_const_vxx</key> + <key>variable_qtgui_range</key> <param> <key>id</key> - <value>blocks_multiply_const_vxx_0</value> + <value>phase_bw</value> </param> <param> <key>_enabled</key> <value>True</value> </param> <param> - <key>type</key> - <value>complex</value> + <key>label</key> + <value>Costas Loop (Phase) Bandwidth</value> </param> <param> - <key>const</key> - <value>sig_amp</value> + <key>value</key> + <value>0</value> </param> <param> - <key>vlen</key> - <value>1</value> + <key>start</key> + <value>0</value> + </param> + <param> + <key>stop</key> + <value>.1</value> + </param> + <param> + <key>step</key> + <value>.001</value> + </param> + <param> + <key>widget</key> + <value>counter_slider</value> + </param> + <param> + <key>orient</key> + <value>Qt.Horizontal</value> + </param> + <param> + <key>min_len</key> + <value>200</value> + </param> + <param> + <key>gui_hint</key> + <value>7,2,1,1</value> + </param> + <param> + <key>alias</key> + <value></value> </param> <param> <key>_coordinate</key> - <value>(807, 95)</value> + <value>(844, 325)</value> </param> <param> <key>_rotation</key> @@ -1124,10 +1684,10 @@ </param> </block> <block> - <key>blocks_throttle</key> + <key>qtgui_freq_sink_x</key> <param> <key>id</key> - <value>blocks_throttle_0</value> + <value>qtgui_freq_sink_x_1</value> </param> <param> <key>_enabled</key> @@ -1138,16 +1698,224 @@ <value>complex</value> </param> <param> - <key>samples_per_second</key> + <key>name</key> + <value>Received Spectrum</value> + </param> + <param> + <key>fftsize</key> + <value>1024</value> + </param> + <param> + <key>wintype</key> + <value>firdes.WIN_BLACKMAN_hARRIS</value> + </param> + <param> + <key>fc</key> + <value>0</value> + </param> + <param> + <key>bw</key> <value>samp_rate</value> </param> <param> - <key>vlen</key> + <key>autoscale</key> + <value>True</value> + </param> + <param> + <key>average</key> + <value>0.2</value> + </param> + <param> + <key>ymin</key> + <value>-140</value> + </param> + <param> + <key>ymax</key> + <value>10</value> + </param> + <param> + <key>nconnections</key> + <value>1</value> + </param> + <param> + <key>update_time</key> + <value>0.10</value> + </param> + <param> + <key>gui_hint</key> + <value>notebook@1</value> + </param> + <param> + <key>label1</key> + <value></value> + </param> + <param> + <key>width1</key> + <value>1</value> + </param> + <param> + <key>color1</key> + <value>"blue"</value> + </param> + <param> + <key>alpha1</key> + <value>1.0</value> + </param> + <param> + <key>label2</key> + <value></value> + </param> + <param> + <key>width2</key> + <value>1</value> + </param> + <param> + <key>color2</key> + <value>"red"</value> + </param> + <param> + <key>alpha2</key> + <value>1.0</value> + </param> + <param> + <key>label3</key> + <value></value> + </param> + <param> + <key>width3</key> + <value>1</value> + </param> + <param> + <key>color3</key> + <value>"green"</value> + </param> + <param> + <key>alpha3</key> + <value>1.0</value> + </param> + <param> + <key>label4</key> + <value></value> + </param> + <param> + <key>width4</key> <value>1</value> </param> <param> + <key>color4</key> + <value>"black"</value> + </param> + <param> + <key>alpha4</key> + <value>1.0</value> + </param> + <param> + <key>label5</key> + <value></value> + </param> + <param> + <key>width5</key> + <value>1</value> + </param> + <param> + <key>color5</key> + <value>"cyan"</value> + </param> + <param> + <key>alpha5</key> + <value>1.0</value> + </param> + <param> + <key>label6</key> + <value></value> + </param> + <param> + <key>width6</key> + <value>1</value> + </param> + <param> + <key>color6</key> + <value>"magenta"</value> + </param> + <param> + <key>alpha6</key> + <value>1.0</value> + </param> + <param> + <key>label7</key> + <value></value> + </param> + <param> + <key>width7</key> + <value>1</value> + </param> + <param> + <key>color7</key> + <value>"yellow"</value> + </param> + <param> + <key>alpha7</key> + <value>1.0</value> + </param> + <param> + <key>label8</key> + <value></value> + </param> + <param> + <key>width8</key> + <value>1</value> + </param> + <param> + <key>color8</key> + <value>"dark red"</value> + </param> + <param> + <key>alpha8</key> + <value>1.0</value> + </param> + <param> + <key>label9</key> + <value></value> + </param> + <param> + <key>width9</key> + <value>1</value> + </param> + <param> + <key>color9</key> + <value>"dark green"</value> + </param> + <param> + <key>alpha9</key> + <value>1.0</value> + </param> + <param> + <key>label10</key> + <value></value> + </param> + <param> + <key>width10</key> + <value>1</value> + </param> + <param> + <key>color10</key> + <value>"dark blue"</value> + </param> + <param> + <key>alpha10</key> + <value>1.0</value> + </param> + <param> + <key>alias</key> + <value></value> + </param> + <param> + <key>affinity</key> + <value></value> + </param> + <param> <key>_coordinate</key> - <value>(987, 95)</value> + <value>(1101, 481)</value> </param> <param> <key>_rotation</key> @@ -1155,144 +1923,420 @@ </param> </block> <block> - <key>variable_slider</key> + <key>virtual_source</key> <param> <key>id</key> - <value>time_bw</value> + <value>virtual_source_0</value> </param> <param> <key>_enabled</key> <value>True</value> </param> <param> - <key>label</key> - <value>Timing Loop BW</value> + <key>stream_id</key> + <value>input_signal_probe</value> </param> <param> - <key>value</key> + <key>_coordinate</key> + <value>(836, 476)</value> + </param> + <param> + <key>_rotation</key> <value>0</value> </param> + </block> + <block> + <key>qtgui_time_sink_x</key> <param> - <key>min</key> + <key>id</key> + <value>qtgui_time_sink_x_0_0</value> + </param> + <param> + <key>_enabled</key> + <value>True</value> + </param> + <param> + <key>type</key> + <value>complex</value> + </param> + <param> + <key>name</key> + <value>Pre-sync Signal</value> + </param> + <param> + <key>size</key> + <value>1024</value> + </param> + <param> + <key>srate</key> + <value>samp_rate</value> + </param> + <param> + <key>autoscale</key> + <value>True</value> + </param> + <param> + <key>ymin</key> + <value>-1</value> + </param> + <param> + <key>ymax</key> + <value>1</value> + </param> + <param> + <key>nconnections</key> + <value>1</value> + </param> + <param> + <key>update_time</key> + <value>0.10</value> + </param> + <param> + <key>entags</key> + <value>True</value> + </param> + <param> + <key>gui_hint</key> + <value>notebook@1</value> + </param> + <param> + <key>tr_mode</key> + <value>qtgui.TRIG_MODE_FREE</value> + </param> + <param> + <key>tr_slope</key> + <value>qtgui.TRIG_SLOPE_POS</value> + </param> + <param> + <key>tr_level</key> + <value>0.0</value> + </param> + <param> + <key>tr_delay</key> <value>0</value> </param> <param> - <key>max</key> - <value>0.1</value> + <key>tr_chan</key> + <value>0</value> + </param> + <param> + <key>tr_tag</key> + <value>""</value> + </param> + <param> + <key>label1</key> + <value></value> + </param> + <param> + <key>width1</key> + <value>1</value> </param> <param> - <key>num_steps</key> - <value>1000</value> + <key>color1</key> + <value>"blue"</value> </param> <param> - <key>style</key> - <value>wx.SL_HORIZONTAL</value> + <key>style1</key> + <value>1</value> </param> <param> - <key>converver</key> - <value>float_converter</value> + <key>marker1</key> + <value>-1</value> </param> <param> - <key>grid_pos</key> - <value>(5,2,1,1)</value> + <key>alpha1</key> + <value>1.0</value> </param> <param> - <key>notebook</key> + <key>label2</key> <value></value> </param> <param> - <key>_coordinate</key> - <value>(598, 388)</value> + <key>width2</key> + <value>1</value> </param> <param> - <key>_rotation</key> - <value>0</value> + <key>color2</key> + <value>"red"</value> </param> - </block> - <block> - <key>variable_slider</key> <param> - <key>id</key> - <value>interpratio</value> + <key>style2</key> + <value>1</value> </param> <param> - <key>_enabled</key> - <value>True</value> + <key>marker2</key> + <value>-1</value> </param> <param> - <key>label</key> - <value>Timing Offset</value> + <key>alpha2</key> + <value>1.0</value> </param> <param> - <key>value</key> - <value>1.00</value> + <key>label3</key> + <value></value> </param> <param> - <key>min</key> - <value>0.99</value> + <key>width3</key> + <value>1</value> </param> <param> - <key>max</key> - <value>1.01</value> + <key>color3</key> + <value>"green"</value> + </param> + <param> + <key>style3</key> + <value>1</value> + </param> + <param> + <key>marker3</key> + <value>-1</value> + </param> + <param> + <key>alpha3</key> + <value>1.0</value> + </param> + <param> + <key>label4</key> + <value></value> + </param> + <param> + <key>width4</key> + <value>1</value> + </param> + <param> + <key>color4</key> + <value>"black"</value> + </param> + <param> + <key>style4</key> + <value>1</value> + </param> + <param> + <key>marker4</key> + <value>-1</value> + </param> + <param> + <key>alpha4</key> + <value>1.0</value> + </param> + <param> + <key>label5</key> + <value></value> </param> <param> - <key>num_steps</key> - <value>1000</value> + <key>width5</key> + <value>1</value> + </param> + <param> + <key>color5</key> + <value>"cyan"</value> + </param> + <param> + <key>style5</key> + <value>1</value> + </param> + <param> + <key>marker5</key> + <value>-1</value> + </param> + <param> + <key>alpha5</key> + <value>1.0</value> + </param> + <param> + <key>label6</key> + <value></value> + </param> + <param> + <key>width6</key> + <value>1</value> + </param> + <param> + <key>color6</key> + <value>"magenta"</value> + </param> + <param> + <key>style6</key> + <value>1</value> + </param> + <param> + <key>marker6</key> + <value>-1</value> + </param> + <param> + <key>alpha6</key> + <value>1.0</value> + </param> + <param> + <key>label7</key> + <value></value> + </param> + <param> + <key>width7</key> + <value>1</value> + </param> + <param> + <key>color7</key> + <value>"yellow"</value> + </param> + <param> + <key>style7</key> + <value>1</value> + </param> + <param> + <key>marker7</key> + <value>-1</value> + </param> + <param> + <key>alpha7</key> + <value>1.0</value> + </param> + <param> + <key>label8</key> + <value></value> + </param> + <param> + <key>width8</key> + <value>1</value> + </param> + <param> + <key>color8</key> + <value>"dark red"</value> + </param> + <param> + <key>style8</key> + <value>1</value> + </param> + <param> + <key>marker8</key> + <value>-1</value> + </param> + <param> + <key>alpha8</key> + <value>1.0</value> + </param> + <param> + <key>label9</key> + <value></value> + </param> + <param> + <key>width9</key> + <value>1</value> + </param> + <param> + <key>color9</key> + <value>"dark green"</value> + </param> + <param> + <key>style9</key> + <value>1</value> + </param> + <param> + <key>marker9</key> + <value>-1</value> + </param> + <param> + <key>alpha9</key> + <value>1.0</value> + </param> + <param> + <key>label10</key> + <value></value> + </param> + <param> + <key>width10</key> + <value>1</value> + </param> + <param> + <key>color10</key> + <value>"blue"</value> + </param> + <param> + <key>style10</key> + <value>1</value> </param> <param> - <key>style</key> - <value>wx.SL_HORIZONTAL</value> + <key>marker10</key> + <value>-1</value> </param> <param> - <key>converver</key> - <value>float_converter</value> + <key>alpha10</key> + <value>1.0</value> </param> <param> - <key>grid_pos</key> - <value>(3,2,1,1)</value> + <key>alias</key> + <value></value> </param> <param> - <key>notebook</key> + <key>affinity</key> <value></value> </param> <param> <key>_coordinate</key> - <value>(42, 459)</value> + <value>(1104, 349)</value> </param> <param> <key>_rotation</key> - <value>180</value> + <value>0</value> </param> </block> <block> - <key>notebook</key> + <key>options</key> <param> <key>id</key> - <value>notebook_0</value> + <value>pam_sync</value> </param> <param> <key>_enabled</key> <value>True</value> </param> <param> - <key>style</key> - <value>wx.NB_TOP</value> + <key>title</key> + <value></value> + </param> + <param> + <key>author</key> + <value></value> + </param> + <param> + <key>description</key> + <value></value> + </param> + <param> + <key>window_size</key> + <value>1280, 1024</value> + </param> + <param> + <key>generate_options</key> + <value>qt_gui</value> + </param> + <param> + <key>category</key> + <value>Custom</value> </param> <param> - <key>labels</key> - <value>['Synched Signal', 'Received Signal']</value> + <key>run_options</key> + <value>prompt</value> </param> <param> - <key>grid_pos</key> - <value>(1,1,8,1)</value> + <key>run</key> + <value>True</value> </param> <param> - <key>notebook</key> + <key>max_nouts</key> + <value>0</value> + </param> + <param> + <key>realtime_scheduling</key> + <value></value> + </param> + <param> + <key>alias</key> <value></value> </param> <param> <key>_coordinate</key> - <value>(9, 601)</value> + <value>(-1, 0)</value> </param> <param> <key>_rotation</key> @@ -1318,12 +2362,6 @@ <sink_key>0</sink_key> </connection> <connection> - <source_block_id>digital_costas_loop_cc_0</source_block_id> - <sink_block_id>wxgui_scopesink2_0</sink_block_id> - <source_key>0</source_key> - <sink_key>0</sink_key> - </connection> - <connection> <source_block_id>pfb_arb_resampler_xxx_0</source_block_id> <sink_block_id>blocks_multiply_const_vxx_0</sink_block_id> <source_key>0</source_key> @@ -1336,44 +2374,50 @@ <sink_key>0</sink_key> </connection> <connection> - <source_block_id>digital_fll_band_edge_cc_0</source_block_id> - <sink_block_id>wxgui_fftsink2_0_0</sink_block_id> + <source_block_id>analog_random_source_x</source_block_id> + <sink_block_id>digital_chunks_to_symbols_xx</sink_block_id> <source_key>0</source_key> <sink_key>0</sink_key> </connection> <connection> - <source_block_id>virtual_source_0</source_block_id> - <sink_block_id>wxgui_fftsink2_0</sink_block_id> + <source_block_id>blocks_throttle_0</source_block_id> + <sink_block_id>channels_channel_model_0</sink_block_id> <source_key>0</source_key> <sink_key>0</sink_key> </connection> <connection> - <source_block_id>virtual_source_0</source_block_id> - <sink_block_id>wxgui_scopesink2_0_0_1</sink_block_id> + <source_block_id>blocks_multiply_const_vxx_0</source_block_id> + <sink_block_id>blocks_throttle_0</sink_block_id> <source_key>0</source_key> <sink_key>0</sink_key> </connection> <connection> - <source_block_id>analog_random_source_x</source_block_id> - <sink_block_id>digital_chunks_to_symbols_xx</sink_block_id> + <source_block_id>digital_chunks_to_symbols_xx</source_block_id> + <sink_block_id>pfb_arb_resampler_xxx_0</sink_block_id> <source_key>0</source_key> <sink_key>0</sink_key> </connection> <connection> - <source_block_id>blocks_throttle_0</source_block_id> - <sink_block_id>channels_channel_model_0</sink_block_id> + <source_block_id>digital_fll_band_edge_cc_0</source_block_id> + <sink_block_id>qtgui_freq_sink_x_0</sink_block_id> <source_key>0</source_key> <sink_key>0</sink_key> </connection> <connection> - <source_block_id>blocks_multiply_const_vxx_0</source_block_id> - <sink_block_id>blocks_throttle_0</sink_block_id> + <source_block_id>digital_costas_loop_cc_0</source_block_id> + <sink_block_id>qtgui_time_sink_x_0</sink_block_id> <source_key>0</source_key> <sink_key>0</sink_key> </connection> <connection> - <source_block_id>digital_chunks_to_symbols_xx</source_block_id> - <sink_block_id>pfb_arb_resampler_xxx_0</sink_block_id> + <source_block_id>virtual_source_0</source_block_id> + <sink_block_id>qtgui_freq_sink_x_1</sink_block_id> + <source_key>0</source_key> + <sink_key>0</sink_key> + </connection> + <connection> + <source_block_id>virtual_source_0</source_block_id> + <sink_block_id>qtgui_time_sink_x_0_0</sink_block_id> <source_key>0</source_key> <sink_key>0</sink_key> </connection> diff --git a/gr-digital/examples/demod/pam_timing.grc b/gr-digital/examples/demod/pam_timing.grc index 0e4dd4933a..cb1f1ad981 100644 --- a/gr-digital/examples/demod/pam_timing.grc +++ b/gr-digital/examples/demod/pam_timing.grc @@ -1,6 +1,6 @@ <?xml version='1.0' encoding='ASCII'?> <flow_graph> - <timestamp>Tue Jan 15 15:21:46 2013</timestamp> + <timestamp>Sat Jul 12 13:50:56 2014</timestamp> <block> <key>options</key> <param> @@ -29,7 +29,7 @@ </param> <param> <key>generate_options</key> - <value>wx_gui</value> + <value>qt_gui</value> </param> <param> <key>category</key> @@ -52,6 +52,10 @@ <value></value> </param> <param> + <key>alias</key> + <value></value> + </param> + <param> <key>_coordinate</key> <value>(-1, 0)</value> </param> @@ -61,38 +65,53 @@ </param> </block> <block> - <key>analog_random_source_x</key> + <key>variable</key> <param> <key>id</key> - <value>analog_random_source_x</value> + <value>const</value> </param> <param> <key>_enabled</key> <value>True</value> </param> <param> - <key>type</key> - <value>byte</value> + <key>value</key> + <value>digital.qpsk_constellation()</value> </param> <param> - <key>min</key> - <value>0</value> + <key>alias</key> + <value></value> </param> <param> - <key>max</key> - <value>const.arity()</value> + <key>_coordinate</key> + <value>(206, 116)</value> </param> <param> - <key>num_samps</key> - <value>10000000</value> + <key>_rotation</key> + <value>0</value> </param> + </block> + <block> + <key>variable</key> <param> - <key>repeat</key> + <key>id</key> + <value>sig_amp</value> + </param> + <param> + <key>_enabled</key> <value>True</value> </param> <param> + <key>value</key> + <value>1</value> + </param> + <param> + <key>alias</key> + <value></value> + </param> + <param> <key>_coordinate</key> - <value>(-1, 163)</value> + <value>(791, 46)</value> </param> <param> <key>_rotation</key> @@ -100,38 +119,53 @@ </param> </block> <block> - <key>digital_chunks_to_symbols_xx</key> + <key>variable</key> <param> <key>id</key> - <value>digital_chunks_to_symbols_xx</value> + <value>samp_rate</value> </param> <param> <key>_enabled</key> <value>True</value> </param> <param> - <key>in_type</key> - <value>byte</value> + <key>value</key> + <value>32000</value> </param> <param> - <key>out_type</key> - <value>complex</value> + <key>alias</key> + <value></value> </param> <param> - <key>symbol_table</key> - <value>const.points()</value> + <key>_coordinate</key> + <value>(267, 357)</value> </param> <param> - <key>dimension</key> - <value>1</value> + <key>_rotation</key> + <value>0</value> </param> + </block> + <block> + <key>variable</key> <param> - <key>num_ports</key> - <value>1</value> + <key>id</key> + <value>spb</value> + </param> + <param> + <key>_enabled</key> + <value>True</value> + </param> + <param> + <key>value</key> + <value>4.2563</value> + </param> + <param> + <key>alias</key> + <value></value> </param> <param> <key>_coordinate</key> - <value>(203, 178)</value> + <value>(300, 0)</value> </param> <param> <key>_rotation</key> @@ -142,7 +176,7 @@ <key>variable</key> <param> <key>id</key> - <value>const</value> + <value>rolloff</value> </param> <param> <key>_enabled</key> @@ -150,11 +184,15 @@ </param> <param> <key>value</key> - <value>digital.qpsk_constellation()</value> + <value>.35</value> + </param> + <param> + <key>alias</key> + <value></value> </param> <param> <key>_coordinate</key> - <value>(206, 116)</value> + <value>(482, 335)</value> </param> <param> <key>_rotation</key> @@ -162,22 +200,26 @@ </param> </block> <block> - <key>import</key> + <key>variable</key> <param> <key>id</key> - <value>import_0</value> + <value>nfilts</value> </param> <param> <key>_enabled</key> <value>True</value> </param> <param> - <key>import</key> - <value>from gnuradio import digital</value> + <key>value</key> + <value>32</value> + </param> + <param> + <key>alias</key> + <value></value> </param> <param> <key>_coordinate</key> - <value>(-1, 61)</value> + <value>(562, 334)</value> </param> <param> <key>_rotation</key> @@ -185,22 +227,54 @@ </param> </block> <block> - <key>variable</key> + <key>analog_random_source_x</key> <param> <key>id</key> - <value>spb</value> + <value>analog_random_source_x</value> </param> <param> <key>_enabled</key> <value>True</value> </param> <param> - <key>value</key> - <value>4.2563</value> + <key>type</key> + <value>byte</value> + </param> + <param> + <key>min</key> + <value>0</value> + </param> + <param> + <key>max</key> + <value>const.arity()</value> + </param> + <param> + <key>num_samps</key> + <value>10000000</value> + </param> + <param> + <key>repeat</key> + <value>True</value> + </param> + <param> + <key>alias</key> + <value></value> + </param> + <param> + <key>affinity</key> + <value></value> + </param> + <param> + <key>minoutbuf</key> + <value>0</value> + </param> + <param> + <key>maxoutbuf</key> + <value>0</value> </param> <param> <key>_coordinate</key> - <value>(300, 0)</value> + <value>(-1, 163)</value> </param> <param> <key>_rotation</key> @@ -208,22 +282,54 @@ </param> </block> <block> - <key>variable</key> + <key>digital_chunks_to_symbols_xx</key> <param> <key>id</key> - <value>sig_amp</value> + <value>digital_chunks_to_symbols_xx</value> </param> <param> <key>_enabled</key> <value>True</value> </param> <param> - <key>value</key> + <key>in_type</key> + <value>byte</value> + </param> + <param> + <key>out_type</key> + <value>complex</value> + </param> + <param> + <key>symbol_table</key> + <value>const.points()</value> + </param> + <param> + <key>dimension</key> + <value>1</value> + </param> + <param> + <key>num_ports</key> <value>1</value> </param> <param> + <key>alias</key> + <value></value> + </param> + <param> + <key>affinity</key> + <value></value> + </param> + <param> + <key>minoutbuf</key> + <value>0</value> + </param> + <param> + <key>maxoutbuf</key> + <value>0</value> + </param> + <param> <key>_coordinate</key> - <value>(791, 46)</value> + <value>(203, 178)</value> </param> <param> <key>_rotation</key> @@ -253,6 +359,26 @@ <value>1</value> </param> <param> + <key>ignoretag</key> + <value>True</value> + </param> + <param> + <key>alias</key> + <value></value> + </param> + <param> + <key>affinity</key> + <value></value> + </param> + <param> + <key>minoutbuf</key> + <value>0</value> + </param> + <param> + <key>maxoutbuf</key> + <value>0</value> + </param> + <param> <key>_coordinate</key> <value>(258, 431)</value> </param> @@ -292,6 +418,26 @@ <value>42</value> </param> <param> + <key>block_tags</key> + <value>False</value> + </param> + <param> + <key>alias</key> + <value></value> + </param> + <param> + <key>affinity</key> + <value></value> + </param> + <param> + <key>minoutbuf</key> + <value>0</value> + </param> + <param> + <key>maxoutbuf</key> + <value>0</value> + </param> + <param> <key>_coordinate</key> <value>(57, 401)</value> </param> @@ -301,22 +447,58 @@ </param> </block> <block> - <key>variable</key> + <key>pfb_arb_resampler_xxx</key> <param> <key>id</key> - <value>samp_rate</value> + <value>pfb_arb_resampler_xxx_0</value> </param> <param> <key>_enabled</key> <value>True</value> </param> <param> - <key>value</key> - <value>32000</value> + <key>type</key> + <value>ccf</value> + </param> + <param> + <key>rrate</key> + <value>spb</value> + </param> + <param> + <key>taps</key> + <value>firdes.root_raised_cosine(nfilts, nfilts, 1.0, rolloff, 44*nfilts)</value> + </param> + <param> + <key>nfilts</key> + <value>32</value> + </param> + <param> + <key>atten</key> + <value>100</value> + </param> + <param> + <key>samp_delay</key> + <value>0</value> + </param> + <param> + <key>alias</key> + <value></value> + </param> + <param> + <key>affinity</key> + <value></value> + </param> + <param> + <key>minoutbuf</key> + <value>0</value> + </param> + <param> + <key>maxoutbuf</key> + <value>0</value> </param> <param> <key>_coordinate</key> - <value>(267, 357)</value> + <value>(458, 179)</value> </param> <param> <key>_rotation</key> @@ -324,22 +506,26 @@ </param> </block> <block> - <key>variable</key> + <key>import</key> <param> <key>id</key> - <value>rolloff</value> + <value>import_0</value> </param> <param> <key>_enabled</key> <value>True</value> </param> <param> - <key>value</key> - <value>.35</value> + <key>import</key> + <value>from gnuradio import digital</value> + </param> + <param> + <key>alias</key> + <value></value> </param> <param> <key>_coordinate</key> - <value>(482, 335)</value> + <value>(-1, 61)</value> </param> <param> <key>_rotation</key> @@ -347,22 +533,46 @@ </param> </block> <block> - <key>variable</key> + <key>blocks_multiply_const_vxx</key> <param> <key>id</key> - <value>nfilts</value> + <value>blocks_multiply_const_vxx_0</value> </param> <param> <key>_enabled</key> <value>True</value> </param> <param> - <key>value</key> - <value>32</value> + <key>type</key> + <value>complex</value> + </param> + <param> + <key>const</key> + <value>sig_amp</value> + </param> + <param> + <key>vlen</key> + <value>1</value> + </param> + <param> + <key>alias</key> + <value></value> + </param> + <param> + <key>affinity</key> + <value></value> + </param> + <param> + <key>minoutbuf</key> + <value>0</value> + </param> + <param> + <key>maxoutbuf</key> + <value>0</value> </param> <param> <key>_coordinate</key> - <value>(562, 335)</value> + <value>(760, 159)</value> </param> <param> <key>_rotation</key> @@ -370,10 +580,10 @@ </param> </block> <block> - <key>digital_pfb_clock_sync_xxx</key> + <key>qtgui_time_sink_x</key> <param> <key>id</key> - <value>digital_pfb_clock_sync_xxx_0</value> + <value>qtgui_time_sink_x_0</value> </param> <param> <key>_enabled</key> @@ -381,39 +591,335 @@ </param> <param> <key>type</key> - <value>ccf</value> + <value>complex</value> </param> <param> - <key>sps</key> - <value>spb</value> + <key>name</key> + <value>Error</value> </param> <param> - <key>loop_bw</key> - <value>time_bw</value> + <key>ylabel</key> + <value>Amplitude</value> </param> <param> - <key>taps</key> - <value>firdes.root_raised_cosine(nfilts, nfilts*spb, 1.0, rolloff, 44*nfilts)</value> + <key>yunit</key> + <value>""</value> </param> <param> - <key>filter_size</key> - <value>nfilts</value> + <key>size</key> + <value>1024</value> </param> <param> - <key>init_phase</key> - <value>16</value> + <key>srate</key> + <value>samp_rate</value> </param> <param> - <key>max_dev</key> - <value>1.5</value> + <key>grid</key> + <value>False</value> </param> <param> - <key>osps</key> + <key>autoscale</key> + <value>False</value> + </param> + <param> + <key>ymin</key> + <value>-1</value> + </param> + <param> + <key>ymax</key> + <value>1</value> + </param> + <param> + <key>nconnections</key> + <value>1</value> + </param> + <param> + <key>update_time</key> + <value>0.10</value> + </param> + <param> + <key>entags</key> + <value>True</value> + </param> + <param> + <key>gui_hint</key> + <value>notebook@3</value> + </param> + <param> + <key>tr_mode</key> + <value>qtgui.TRIG_MODE_FREE</value> + </param> + <param> + <key>tr_slope</key> + <value>qtgui.TRIG_SLOPE_POS</value> + </param> + <param> + <key>tr_level</key> + <value>0.0</value> + </param> + <param> + <key>tr_delay</key> + <value>0</value> + </param> + <param> + <key>tr_chan</key> + <value>0</value> + </param> + <param> + <key>tr_tag</key> + <value>""</value> + </param> + <param> + <key>label1</key> + <value></value> + </param> + <param> + <key>width1</key> + <value>1</value> + </param> + <param> + <key>color1</key> + <value>"blue"</value> + </param> + <param> + <key>style1</key> + <value>1</value> + </param> + <param> + <key>marker1</key> + <value>-1</value> + </param> + <param> + <key>alpha1</key> + <value>1.0</value> + </param> + <param> + <key>label2</key> + <value></value> + </param> + <param> + <key>width2</key> + <value>1</value> + </param> + <param> + <key>color2</key> + <value>"red"</value> + </param> + <param> + <key>style2</key> + <value>1</value> + </param> + <param> + <key>marker2</key> + <value>-1</value> + </param> + <param> + <key>alpha2</key> + <value>1.0</value> + </param> + <param> + <key>label3</key> + <value></value> + </param> + <param> + <key>width3</key> + <value>1</value> + </param> + <param> + <key>color3</key> + <value>"green"</value> + </param> + <param> + <key>style3</key> + <value>1</value> + </param> + <param> + <key>marker3</key> + <value>-1</value> + </param> + <param> + <key>alpha3</key> + <value>1.0</value> + </param> + <param> + <key>label4</key> + <value></value> + </param> + <param> + <key>width4</key> + <value>1</value> + </param> + <param> + <key>color4</key> + <value>"black"</value> + </param> + <param> + <key>style4</key> + <value>1</value> + </param> + <param> + <key>marker4</key> + <value>-1</value> + </param> + <param> + <key>alpha4</key> + <value>1.0</value> + </param> + <param> + <key>label5</key> + <value></value> + </param> + <param> + <key>width5</key> + <value>1</value> + </param> + <param> + <key>color5</key> + <value>"cyan"</value> + </param> + <param> + <key>style5</key> + <value>1</value> + </param> + <param> + <key>marker5</key> + <value>-1</value> + </param> + <param> + <key>alpha5</key> + <value>1.0</value> + </param> + <param> + <key>label6</key> + <value></value> + </param> + <param> + <key>width6</key> + <value>1</value> + </param> + <param> + <key>color6</key> + <value>"magenta"</value> + </param> + <param> + <key>style6</key> + <value>1</value> + </param> + <param> + <key>marker6</key> + <value>-1</value> + </param> + <param> + <key>alpha6</key> + <value>1.0</value> + </param> + <param> + <key>label7</key> + <value></value> + </param> + <param> + <key>width7</key> + <value>1</value> + </param> + <param> + <key>color7</key> + <value>"yellow"</value> + </param> + <param> + <key>style7</key> + <value>1</value> + </param> + <param> + <key>marker7</key> + <value>-1</value> + </param> + <param> + <key>alpha7</key> + <value>1.0</value> + </param> + <param> + <key>label8</key> + <value></value> + </param> + <param> + <key>width8</key> + <value>1</value> + </param> + <param> + <key>color8</key> + <value>"dark red"</value> + </param> + <param> + <key>style8</key> + <value>1</value> + </param> + <param> + <key>marker8</key> + <value>-1</value> + </param> + <param> + <key>alpha8</key> + <value>1.0</value> + </param> + <param> + <key>label9</key> + <value></value> + </param> + <param> + <key>width9</key> + <value>1</value> + </param> + <param> + <key>color9</key> + <value>"dark green"</value> + </param> + <param> + <key>style9</key> + <value>1</value> + </param> + <param> + <key>marker9</key> + <value>-1</value> + </param> + <param> + <key>alpha9</key> + <value>1.0</value> + </param> + <param> + <key>label10</key> + <value></value> + </param> + <param> + <key>width10</key> <value>1</value> </param> <param> + <key>color10</key> + <value>"blue"</value> + </param> + <param> + <key>style10</key> + <value>1</value> + </param> + <param> + <key>marker10</key> + <value>-1</value> + </param> + <param> + <key>alpha10</key> + <value>1.0</value> + </param> + <param> + <key>alias</key> + <value></value> + </param> + <param> + <key>affinity</key> + <value></value> + </param> + <param> <key>_coordinate</key> - <value>(467, 403)</value> + <value>(1020, 128)</value> </param> <param> <key>_rotation</key> @@ -421,38 +927,50 @@ </param> </block> <block> - <key>pfb_arb_resampler_xxx</key> + <key>qtgui_tab_widget</key> <param> <key>id</key> - <value>pfb_arb_resampler_xxx_0</value> + <value>notebook</value> </param> <param> <key>_enabled</key> <value>True</value> </param> <param> - <key>type</key> - <value>ccf</value> + <key>num_tabs</key> + <value>4</value> </param> <param> - <key>rrate</key> - <value>spb</value> + <key>label0</key> + <value>Error</value> </param> <param> - <key>taps</key> - <value>firdes.root_raised_cosine(nfilts, nfilts, 1.0, rolloff, 44*nfilts)</value> + <key>label1</key> + <value>Phase</value> </param> <param> - <key>nfilts</key> - <value>32</value> + <key>label2</key> + <value>Freq</value> </param> <param> - <key>atten</key> - <value>100</value> + <key>label3</key> + <value>Resampled Signal</value> + </param> + <param> + <key>label4</key> + <value>Tab 4</value> + </param> + <param> + <key>gui_hint</key> + <value>1,1,5,1</value> + </param> + <param> + <key>alias</key> + <value></value> </param> <param> <key>_coordinate</key> - <value>(458, 179)</value> + <value>(485, 554)</value> </param> <param> <key>_rotation</key> @@ -460,74 +978,176 @@ </param> </block> <block> - <key>wxgui_scopesink2</key> + <key>variable_qtgui_range</key> <param> <key>id</key> - <value>wxgui_scopesink2_0_0_1</value> + <value>interpratio</value> </param> <param> <key>_enabled</key> <value>True</value> </param> <param> - <key>type</key> - <value>complex</value> + <key>label</key> + <value>Timing Offset</value> </param> <param> - <key>title</key> - <value>Error</value> + <key>value</key> + <value>1</value> </param> <param> - <key>samp_rate</key> - <value>samp_rate</value> + <key>start</key> + <value>.99</value> </param> <param> - <key>v_scale</key> - <value>.5</value> + <key>stop</key> + <value>1.01</value> </param> <param> - <key>v_offset</key> - <value>0</value> + <key>step</key> + <value>0.0001</value> + </param> + <param> + <key>widget</key> + <value>counter_slider</value> + </param> + <param> + <key>orient</key> + <value>Qt.Horizontal</value> + </param> + <param> + <key>min_len</key> + <value>200</value> + </param> + <param> + <key>gui_hint</key> + <value>2,2,1,1</value> + </param> + <param> + <key>alias</key> + <value></value> + </param> + <param> + <key>_coordinate</key> + <value>(6, 526)</value> </param> <param> - <key>t_scale</key> + <key>_rotation</key> <value>0</value> </param> + </block> + <block> + <key>variable_qtgui_range</key> <param> - <key>ac_couple</key> - <value>False</value> + <key>id</key> + <value>noise_amp</value> </param> <param> - <key>xy_mode</key> - <value>False</value> + <key>_enabled</key> + <value>True</value> + </param> + <param> + <key>label</key> + <value>Channel Noise</value> </param> <param> - <key>num_inputs</key> + <key>value</key> + <value>0</value> + </param> + <param> + <key>start</key> + <value>0</value> + </param> + <param> + <key>stop</key> <value>1</value> </param> <param> - <key>win_size</key> - <value></value> + <key>step</key> + <value>.001</value> </param> <param> - <key>grid_pos</key> + <key>widget</key> + <value>counter_slider</value> + </param> + <param> + <key>orient</key> + <value>Qt.Horizontal</value> + </param> + <param> + <key>min_len</key> + <value>200</value> + </param> + <param> + <key>gui_hint</key> + <value>3,2,1,1</value> + </param> + <param> + <key>alias</key> <value></value> </param> <param> - <key>notebook</key> - <value>notebook_0,3</value> + <key>_coordinate</key> + <value>(130, 528)</value> + </param> + <param> + <key>_rotation</key> + <value>0</value> + </param> + </block> + <block> + <key>variable_qtgui_range</key> + <param> + <key>id</key> + <value>freq_offset</value> + </param> + <param> + <key>_enabled</key> + <value>True</value> + </param> + <param> + <key>label</key> + <value>Frequency Offset</value> + </param> + <param> + <key>value</key> + <value>0</value> + </param> + <param> + <key>start</key> + <value>-.5</value> + </param> + <param> + <key>stop</key> + <value>.5</value> + </param> + <param> + <key>step</key> + <value>.01</value> + </param> + <param> + <key>widget</key> + <value>counter_slider</value> + </param> + <param> + <key>orient</key> + <value>Qt.Horizontal</value> + </param> + <param> + <key>min_len</key> + <value>200</value> </param> <param> - <key>trig_mode</key> - <value>wxgui.TRIG_MODE_AUTO</value> + <key>gui_hint</key> + <value>4,2,1,1</value> </param> <param> - <key>y_axis_label</key> - <value>Counts</value> + <key>alias</key> + <value></value> </param> <param> <key>_coordinate</key> - <value>(961, 84)</value> + <value>(268, 527)</value> </param> <param> <key>_rotation</key> @@ -535,10 +1155,10 @@ </param> </block> <block> - <key>wxgui_scopesink2</key> + <key>qtgui_time_sink_x</key> <param> <key>id</key> - <value>wxgui_scopesink2_0_0_0</value> + <value>qtgui_time_sink_x_1_1</value> </param> <param> <key>_enabled</key> @@ -549,60 +1169,332 @@ <value>float</value> </param> <param> - <key>title</key> - <value>Scope Plot</value> + <key>name</key> + <value>Phase</value> </param> <param> - <key>samp_rate</key> + <key>ylabel</key> + <value>Amplitude</value> + </param> + <param> + <key>yunit</key> + <value>""</value> + </param> + <param> + <key>size</key> + <value>1024</value> + </param> + <param> + <key>srate</key> <value>samp_rate</value> </param> <param> - <key>v_scale</key> - <value>9</value> + <key>grid</key> + <value>False</value> + </param> + <param> + <key>autoscale</key> + <value>True</value> + </param> + <param> + <key>ymin</key> + <value>-1</value> + </param> + <param> + <key>ymax</key> + <value>1</value> + </param> + <param> + <key>nconnections</key> + <value>1</value> + </param> + <param> + <key>update_time</key> + <value>0.10</value> + </param> + <param> + <key>entags</key> + <value>True</value> + </param> + <param> + <key>gui_hint</key> + <value>notebook@1</value> + </param> + <param> + <key>tr_mode</key> + <value>qtgui.TRIG_MODE_FREE</value> + </param> + <param> + <key>tr_slope</key> + <value>qtgui.TRIG_SLOPE_POS</value> + </param> + <param> + <key>tr_level</key> + <value>0.0</value> </param> <param> - <key>v_offset</key> + <key>tr_delay</key> <value>0</value> </param> <param> - <key>t_scale</key> + <key>tr_chan</key> <value>0</value> </param> <param> - <key>ac_couple</key> - <value>False</value> + <key>tr_tag</key> + <value>""</value> </param> <param> - <key>xy_mode</key> - <value>False</value> + <key>label1</key> + <value></value> + </param> + <param> + <key>width1</key> + <value>1</value> + </param> + <param> + <key>color1</key> + <value>"blue"</value> + </param> + <param> + <key>style1</key> + <value>1</value> + </param> + <param> + <key>marker1</key> + <value>-1</value> + </param> + <param> + <key>alpha1</key> + <value>1.0</value> + </param> + <param> + <key>label2</key> + <value></value> + </param> + <param> + <key>width2</key> + <value>1</value> + </param> + <param> + <key>color2</key> + <value>"red"</value> + </param> + <param> + <key>style2</key> + <value>1</value> + </param> + <param> + <key>marker2</key> + <value>-1</value> + </param> + <param> + <key>alpha2</key> + <value>1.0</value> + </param> + <param> + <key>label3</key> + <value></value> + </param> + <param> + <key>width3</key> + <value>1</value> + </param> + <param> + <key>color3</key> + <value>"green"</value> + </param> + <param> + <key>style3</key> + <value>1</value> + </param> + <param> + <key>marker3</key> + <value>-1</value> + </param> + <param> + <key>alpha3</key> + <value>1.0</value> + </param> + <param> + <key>label4</key> + <value></value> + </param> + <param> + <key>width4</key> + <value>1</value> </param> <param> - <key>num_inputs</key> + <key>color4</key> + <value>"black"</value> + </param> + <param> + <key>style4</key> + <value>1</value> + </param> + <param> + <key>marker4</key> + <value>-1</value> + </param> + <param> + <key>alpha4</key> + <value>1.0</value> + </param> + <param> + <key>label5</key> + <value></value> + </param> + <param> + <key>width5</key> + <value>1</value> + </param> + <param> + <key>color5</key> + <value>"cyan"</value> + </param> + <param> + <key>style5</key> + <value>1</value> + </param> + <param> + <key>marker5</key> + <value>-1</value> + </param> + <param> + <key>alpha5</key> + <value>1.0</value> + </param> + <param> + <key>label6</key> + <value></value> + </param> + <param> + <key>width6</key> + <value>1</value> + </param> + <param> + <key>color6</key> + <value>"magenta"</value> + </param> + <param> + <key>style6</key> + <value>1</value> + </param> + <param> + <key>marker6</key> + <value>-1</value> + </param> + <param> + <key>alpha6</key> + <value>1.0</value> + </param> + <param> + <key>label7</key> + <value></value> + </param> + <param> + <key>width7</key> + <value>1</value> + </param> + <param> + <key>color7</key> + <value>"yellow"</value> + </param> + <param> + <key>style7</key> + <value>1</value> + </param> + <param> + <key>marker7</key> + <value>-1</value> + </param> + <param> + <key>alpha7</key> + <value>1.0</value> + </param> + <param> + <key>label8</key> + <value></value> + </param> + <param> + <key>width8</key> + <value>1</value> + </param> + <param> + <key>color8</key> + <value>"dark red"</value> + </param> + <param> + <key>style8</key> <value>1</value> </param> <param> - <key>win_size</key> + <key>marker8</key> + <value>-1</value> + </param> + <param> + <key>alpha8</key> + <value>1.0</value> + </param> + <param> + <key>label9</key> <value></value> </param> <param> - <key>grid_pos</key> + <key>width9</key> + <value>1</value> + </param> + <param> + <key>color9</key> + <value>"dark green"</value> + </param> + <param> + <key>style9</key> + <value>1</value> + </param> + <param> + <key>marker9</key> + <value>-1</value> + </param> + <param> + <key>alpha9</key> + <value>1.0</value> + </param> + <param> + <key>label10</key> <value></value> </param> <param> - <key>notebook</key> - <value>notebook_0,1</value> + <key>width10</key> + <value>1</value> + </param> + <param> + <key>color10</key> + <value>"blue"</value> + </param> + <param> + <key>style10</key> + <value>1</value> + </param> + <param> + <key>marker10</key> + <value>-1</value> </param> <param> - <key>trig_mode</key> - <value>wxgui.TRIG_MODE_AUTO</value> + <key>alpha10</key> + <value>1.0</value> </param> <param> - <key>y_axis_label</key> - <value>Counts</value> + <key>alias</key> + <value></value> + </param> + <param> + <key>affinity</key> + <value></value> </param> <param> <key>_coordinate</key> - <value>(991, 592)</value> + <value>(1014, 622)</value> </param> <param> <key>_rotation</key> @@ -610,10 +1502,10 @@ </param> </block> <block> - <key>wxgui_scopesink2</key> + <key>qtgui_time_sink_x</key> <param> <key>id</key> - <value>wxgui_scopesink2_0</value> + <value>qtgui_time_sink_x_1_0</value> </param> <param> <key>_enabled</key> @@ -621,63 +1513,335 @@ </param> <param> <key>type</key> - <value>complex</value> + <value>float</value> </param> <param> - <key>title</key> - <value>Scope Plot</value> + <key>name</key> + <value>Rate</value> + </param> + <param> + <key>ylabel</key> + <value>Amplitude</value> + </param> + <param> + <key>yunit</key> + <value>""</value> </param> <param> - <key>samp_rate</key> + <key>size</key> + <value>1024</value> + </param> + <param> + <key>srate</key> <value>samp_rate</value> </param> <param> - <key>v_scale</key> - <value>0</value> + <key>grid</key> + <value>False</value> + </param> + <param> + <key>autoscale</key> + <value>True</value> + </param> + <param> + <key>ymin</key> + <value>-1</value> + </param> + <param> + <key>ymax</key> + <value>1</value> + </param> + <param> + <key>nconnections</key> + <value>1</value> + </param> + <param> + <key>update_time</key> + <value>0.10</value> + </param> + <param> + <key>entags</key> + <value>True</value> + </param> + <param> + <key>gui_hint</key> + <value>notebook@2</value> + </param> + <param> + <key>tr_mode</key> + <value>qtgui.TRIG_MODE_FREE</value> + </param> + <param> + <key>tr_slope</key> + <value>qtgui.TRIG_SLOPE_POS</value> + </param> + <param> + <key>tr_level</key> + <value>0.0</value> </param> <param> - <key>v_offset</key> + <key>tr_delay</key> <value>0</value> </param> <param> - <key>t_scale</key> + <key>tr_chan</key> <value>0</value> </param> <param> - <key>ac_couple</key> - <value>False</value> + <key>tr_tag</key> + <value>""</value> </param> <param> - <key>xy_mode</key> - <value>False</value> + <key>label1</key> + <value></value> + </param> + <param> + <key>width1</key> + <value>1</value> + </param> + <param> + <key>color1</key> + <value>"blue"</value> + </param> + <param> + <key>style1</key> + <value>1</value> + </param> + <param> + <key>marker1</key> + <value>-1</value> + </param> + <param> + <key>alpha1</key> + <value>1.0</value> + </param> + <param> + <key>label2</key> + <value></value> + </param> + <param> + <key>width2</key> + <value>1</value> + </param> + <param> + <key>color2</key> + <value>"red"</value> + </param> + <param> + <key>style2</key> + <value>1</value> + </param> + <param> + <key>marker2</key> + <value>-1</value> + </param> + <param> + <key>alpha2</key> + <value>1.0</value> + </param> + <param> + <key>label3</key> + <value></value> + </param> + <param> + <key>width3</key> + <value>1</value> + </param> + <param> + <key>color3</key> + <value>"green"</value> + </param> + <param> + <key>style3</key> + <value>1</value> </param> <param> - <key>num_inputs</key> + <key>marker3</key> + <value>-1</value> + </param> + <param> + <key>alpha3</key> + <value>1.0</value> + </param> + <param> + <key>label4</key> + <value></value> + </param> + <param> + <key>width4</key> + <value>1</value> + </param> + <param> + <key>color4</key> + <value>"black"</value> + </param> + <param> + <key>style4</key> + <value>1</value> + </param> + <param> + <key>marker4</key> + <value>-1</value> + </param> + <param> + <key>alpha4</key> + <value>1.0</value> + </param> + <param> + <key>label5</key> + <value></value> + </param> + <param> + <key>width5</key> + <value>1</value> + </param> + <param> + <key>color5</key> + <value>"cyan"</value> + </param> + <param> + <key>style5</key> + <value>1</value> + </param> + <param> + <key>marker5</key> + <value>-1</value> + </param> + <param> + <key>alpha5</key> + <value>1.0</value> + </param> + <param> + <key>label6</key> + <value></value> + </param> + <param> + <key>width6</key> + <value>1</value> + </param> + <param> + <key>color6</key> + <value>"magenta"</value> + </param> + <param> + <key>style6</key> + <value>1</value> + </param> + <param> + <key>marker6</key> + <value>-1</value> + </param> + <param> + <key>alpha6</key> + <value>1.0</value> + </param> + <param> + <key>label7</key> + <value></value> + </param> + <param> + <key>width7</key> + <value>1</value> + </param> + <param> + <key>color7</key> + <value>"yellow"</value> + </param> + <param> + <key>style7</key> <value>1</value> </param> <param> - <key>win_size</key> + <key>marker7</key> + <value>-1</value> + </param> + <param> + <key>alpha7</key> + <value>1.0</value> + </param> + <param> + <key>label8</key> <value></value> </param> <param> - <key>grid_pos</key> + <key>width8</key> + <value>1</value> + </param> + <param> + <key>color8</key> + <value>"dark red"</value> + </param> + <param> + <key>style8</key> + <value>1</value> + </param> + <param> + <key>marker8</key> + <value>-1</value> + </param> + <param> + <key>alpha8</key> + <value>1.0</value> + </param> + <param> + <key>label9</key> <value></value> </param> <param> - <key>notebook</key> + <key>width9</key> + <value>1</value> + </param> + <param> + <key>color9</key> + <value>"dark green"</value> + </param> + <param> + <key>style9</key> + <value>1</value> + </param> + <param> + <key>marker9</key> + <value>-1</value> + </param> + <param> + <key>alpha9</key> + <value>1.0</value> + </param> + <param> + <key>label10</key> <value></value> </param> <param> - <key>trig_mode</key> - <value>wxgui.TRIG_MODE_AUTO</value> + <key>width10</key> + <value>1</value> + </param> + <param> + <key>color10</key> + <value>"blue"</value> + </param> + <param> + <key>style10</key> + <value>1</value> + </param> + <param> + <key>marker10</key> + <value>-1</value> + </param> + <param> + <key>alpha10</key> + <value>1.0</value> </param> <param> - <key>y_axis_label</key> - <value>Counts</value> + <key>alias</key> + <value></value> + </param> + <param> + <key>affinity</key> + <value></value> </param> <param> <key>_coordinate</key> - <value>(1029, 243)</value> + <value>(1018, 503)</value> </param> <param> <key>_rotation</key> @@ -685,10 +1849,10 @@ </param> </block> <block> - <key>wxgui_scopesink2</key> + <key>qtgui_time_sink_x</key> <param> <key>id</key> - <value>wxgui_scopesink2_0_0</value> + <value>qtgui_time_sink_x_1</value> </param> <param> <key>_enabled</key> @@ -699,60 +1863,332 @@ <value>float</value> </param> <param> - <key>title</key> + <key>name</key> <value>Error</value> </param> <param> - <key>samp_rate</key> + <key>ylabel</key> + <value>Amplitude</value> + </param> + <param> + <key>yunit</key> + <value>""</value> + </param> + <param> + <key>size</key> + <value>1024</value> + </param> + <param> + <key>srate</key> <value>samp_rate</value> </param> <param> - <key>v_scale</key> - <value>3</value> + <key>grid</key> + <value>False</value> + </param> + <param> + <key>autoscale</key> + <value>True</value> + </param> + <param> + <key>ymin</key> + <value>-1</value> + </param> + <param> + <key>ymax</key> + <value>1</value> + </param> + <param> + <key>nconnections</key> + <value>1</value> + </param> + <param> + <key>update_time</key> + <value>0.10</value> + </param> + <param> + <key>entags</key> + <value>True</value> + </param> + <param> + <key>gui_hint</key> + <value>notebook@0</value> + </param> + <param> + <key>tr_mode</key> + <value>qtgui.TRIG_MODE_FREE</value> </param> <param> - <key>v_offset</key> + <key>tr_slope</key> + <value>qtgui.TRIG_SLOPE_POS</value> + </param> + <param> + <key>tr_level</key> + <value>0.0</value> + </param> + <param> + <key>tr_delay</key> <value>0</value> </param> <param> - <key>t_scale</key> + <key>tr_chan</key> <value>0</value> </param> <param> - <key>ac_couple</key> - <value>False</value> + <key>tr_tag</key> + <value>""</value> </param> <param> - <key>xy_mode</key> - <value>False</value> + <key>label1</key> + <value></value> + </param> + <param> + <key>width1</key> + <value>1</value> + </param> + <param> + <key>color1</key> + <value>"blue"</value> + </param> + <param> + <key>style1</key> + <value>1</value> + </param> + <param> + <key>marker1</key> + <value>-1</value> + </param> + <param> + <key>alpha1</key> + <value>1.0</value> + </param> + <param> + <key>label2</key> + <value></value> + </param> + <param> + <key>width2</key> + <value>1</value> + </param> + <param> + <key>color2</key> + <value>"red"</value> + </param> + <param> + <key>style2</key> + <value>1</value> + </param> + <param> + <key>marker2</key> + <value>-1</value> + </param> + <param> + <key>alpha2</key> + <value>1.0</value> + </param> + <param> + <key>label3</key> + <value></value> + </param> + <param> + <key>width3</key> + <value>1</value> + </param> + <param> + <key>color3</key> + <value>"green"</value> + </param> + <param> + <key>style3</key> + <value>1</value> + </param> + <param> + <key>marker3</key> + <value>-1</value> + </param> + <param> + <key>alpha3</key> + <value>1.0</value> + </param> + <param> + <key>label4</key> + <value></value> + </param> + <param> + <key>width4</key> + <value>1</value> + </param> + <param> + <key>color4</key> + <value>"black"</value> + </param> + <param> + <key>style4</key> + <value>1</value> + </param> + <param> + <key>marker4</key> + <value>-1</value> + </param> + <param> + <key>alpha4</key> + <value>1.0</value> + </param> + <param> + <key>label5</key> + <value></value> + </param> + <param> + <key>width5</key> + <value>1</value> + </param> + <param> + <key>color5</key> + <value>"cyan"</value> + </param> + <param> + <key>style5</key> + <value>1</value> + </param> + <param> + <key>marker5</key> + <value>-1</value> + </param> + <param> + <key>alpha5</key> + <value>1.0</value> + </param> + <param> + <key>label6</key> + <value></value> + </param> + <param> + <key>width6</key> + <value>1</value> + </param> + <param> + <key>color6</key> + <value>"magenta"</value> + </param> + <param> + <key>style6</key> + <value>1</value> + </param> + <param> + <key>marker6</key> + <value>-1</value> + </param> + <param> + <key>alpha6</key> + <value>1.0</value> + </param> + <param> + <key>label7</key> + <value></value> + </param> + <param> + <key>width7</key> + <value>1</value> + </param> + <param> + <key>color7</key> + <value>"yellow"</value> + </param> + <param> + <key>style7</key> + <value>1</value> + </param> + <param> + <key>marker7</key> + <value>-1</value> + </param> + <param> + <key>alpha7</key> + <value>1.0</value> + </param> + <param> + <key>label8</key> + <value></value> + </param> + <param> + <key>width8</key> + <value>1</value> + </param> + <param> + <key>color8</key> + <value>"dark red"</value> </param> <param> - <key>num_inputs</key> + <key>style8</key> <value>1</value> </param> <param> - <key>win_size</key> + <key>marker8</key> + <value>-1</value> + </param> + <param> + <key>alpha8</key> + <value>1.0</value> + </param> + <param> + <key>label9</key> <value></value> </param> <param> - <key>grid_pos</key> + <key>width9</key> + <value>1</value> + </param> + <param> + <key>color9</key> + <value>"dark green"</value> + </param> + <param> + <key>style9</key> + <value>1</value> + </param> + <param> + <key>marker9</key> + <value>-1</value> + </param> + <param> + <key>alpha9</key> + <value>1.0</value> + </param> + <param> + <key>label10</key> <value></value> </param> <param> - <key>notebook</key> - <value>notebook_0,0</value> + <key>width10</key> + <value>1</value> + </param> + <param> + <key>color10</key> + <value>"blue"</value> + </param> + <param> + <key>style10</key> + <value>1</value> + </param> + <param> + <key>marker10</key> + <value>-1</value> + </param> + <param> + <key>alpha10</key> + <value>1.0</value> </param> <param> - <key>trig_mode</key> - <value>wxgui.TRIG_MODE_AUTO</value> + <key>alias</key> + <value></value> </param> <param> - <key>y_axis_label</key> - <value>Counts</value> + <key>affinity</key> + <value></value> </param> <param> <key>_coordinate</key> - <value>(1029, 335)</value> + <value>(1017, 378)</value> </param> <param> <key>_rotation</key> @@ -760,10 +2196,10 @@ </param> </block> <block> - <key>wxgui_scopesink2</key> + <key>qtgui_time_sink_x</key> <param> <key>id</key> - <value>wxgui_scopesink2_0_0_0_0</value> + <value>qtgui_time_sink_x_0_0</value> </param> <param> <key>_enabled</key> @@ -771,259 +2207,335 @@ </param> <param> <key>type</key> - <value>float</value> + <value>complex</value> </param> <param> - <key>title</key> + <key>name</key> <value>Scope Plot</value> </param> <param> - <key>samp_rate</key> - <value>samp_rate</value> + <key>ylabel</key> + <value>Amplitude</value> </param> <param> - <key>v_scale</key> - <value>1.25</value> + <key>yunit</key> + <value>""</value> </param> <param> - <key>v_offset</key> - <value>0</value> + <key>size</key> + <value>1024</value> </param> <param> - <key>t_scale</key> - <value>0</value> + <key>srate</key> + <value>samp_rate</value> </param> <param> - <key>ac_couple</key> + <key>grid</key> <value>False</value> </param> <param> - <key>xy_mode</key> + <key>autoscale</key> <value>False</value> </param> <param> - <key>num_inputs</key> + <key>ymin</key> + <value>-1</value> + </param> + <param> + <key>ymax</key> <value>1</value> </param> <param> - <key>win_size</key> - <value></value> + <key>nconnections</key> + <value>1</value> + </param> + <param> + <key>update_time</key> + <value>0.10</value> </param> <param> - <key>grid_pos</key> + <key>entags</key> + <value>True</value> + </param> + <param> + <key>gui_hint</key> <value></value> </param> <param> - <key>notebook</key> - <value>notebook_0,2</value> + <key>tr_mode</key> + <value>qtgui.TRIG_MODE_FREE</value> </param> <param> - <key>trig_mode</key> - <value>wxgui.TRIG_MODE_AUTO</value> + <key>tr_slope</key> + <value>qtgui.TRIG_SLOPE_POS</value> </param> <param> - <key>y_axis_label</key> - <value>Counts</value> + <key>tr_level</key> + <value>0.0</value> </param> <param> - <key>_coordinate</key> - <value>(1024, 462)</value> + <key>tr_delay</key> + <value>0</value> </param> <param> - <key>_rotation</key> + <key>tr_chan</key> <value>0</value> </param> - </block> - <block> - <key>blocks_multiply_const_vxx</key> <param> - <key>id</key> - <value>blocks_multiply_const_vxx_0</value> + <key>tr_tag</key> + <value>""</value> </param> <param> - <key>_enabled</key> - <value>True</value> + <key>label1</key> + <value></value> </param> <param> - <key>type</key> - <value>complex</value> + <key>width1</key> + <value>1</value> </param> <param> - <key>const</key> - <value>sig_amp</value> + <key>color1</key> + <value>"blue"</value> </param> <param> - <key>vlen</key> + <key>style1</key> <value>1</value> </param> <param> - <key>_coordinate</key> - <value>(760, 159)</value> + <key>marker1</key> + <value>-1</value> </param> <param> - <key>_rotation</key> - <value>0</value> + <key>alpha1</key> + <value>1.0</value> </param> - </block> - <block> - <key>variable_slider</key> <param> - <key>id</key> - <value>interpratio</value> + <key>label2</key> + <value></value> </param> <param> - <key>_enabled</key> - <value>True</value> + <key>width2</key> + <value>1</value> </param> <param> - <key>label</key> - <value>Timing Offset</value> + <key>color2</key> + <value>"red"</value> </param> <param> - <key>value</key> - <value>1.00</value> + <key>style2</key> + <value>1</value> </param> <param> - <key>min</key> - <value>0.99</value> + <key>marker2</key> + <value>-1</value> </param> <param> - <key>max</key> - <value>1.01</value> + <key>alpha2</key> + <value>1.0</value> + </param> + <param> + <key>label3</key> + <value></value> + </param> + <param> + <key>width3</key> + <value>1</value> + </param> + <param> + <key>color3</key> + <value>"green"</value> </param> <param> - <key>num_steps</key> - <value>1000</value> + <key>style3</key> + <value>1</value> + </param> + <param> + <key>marker3</key> + <value>-1</value> + </param> + <param> + <key>alpha3</key> + <value>1.0</value> + </param> + <param> + <key>label4</key> + <value></value> + </param> + <param> + <key>width4</key> + <value>1</value> + </param> + <param> + <key>color4</key> + <value>"black"</value> </param> <param> - <key>style</key> - <value>wx.SL_HORIZONTAL</value> + <key>style4</key> + <value>1</value> </param> <param> - <key>converver</key> - <value>float_converter</value> + <key>marker4</key> + <value>-1</value> </param> <param> - <key>grid_pos</key> - <value>(2,2,1,1)</value> + <key>alpha4</key> + <value>1.0</value> </param> <param> - <key>notebook</key> + <key>label5</key> <value></value> </param> <param> - <key>_coordinate</key> - <value>(4, 530)</value> + <key>width5</key> + <value>1</value> </param> <param> - <key>_rotation</key> - <value>180</value> + <key>color5</key> + <value>"cyan"</value> </param> - </block> - <block> - <key>variable_slider</key> <param> - <key>id</key> - <value>time_bw</value> + <key>style5</key> + <value>1</value> </param> <param> - <key>_enabled</key> - <value>True</value> + <key>marker5</key> + <value>-1</value> </param> <param> - <key>label</key> - <value>Timing Loop BW</value> + <key>alpha5</key> + <value>1.0</value> </param> <param> - <key>value</key> - <value>0</value> + <key>label6</key> + <value></value> </param> <param> - <key>min</key> - <value>0</value> + <key>width6</key> + <value>1</value> </param> <param> - <key>max</key> - <value>0.1</value> + <key>color6</key> + <value>"magenta"</value> + </param> + <param> + <key>style6</key> + <value>1</value> + </param> + <param> + <key>marker6</key> + <value>-1</value> + </param> + <param> + <key>alpha6</key> + <value>1.0</value> </param> <param> - <key>num_steps</key> - <value>1000</value> + <key>label7</key> + <value></value> + </param> + <param> + <key>width7</key> + <value>1</value> </param> <param> - <key>style</key> - <value>wx.SL_HORIZONTAL</value> + <key>color7</key> + <value>"yellow"</value> </param> <param> - <key>converver</key> - <value>float_converter</value> + <key>style7</key> + <value>1</value> </param> <param> - <key>grid_pos</key> - <value>(1,2,1,1)</value> + <key>marker7</key> + <value>-1</value> </param> <param> - <key>notebook</key> + <key>alpha7</key> + <value>1.0</value> + </param> + <param> + <key>label8</key> <value></value> </param> <param> - <key>_coordinate</key> - <value>(552, 4)</value> + <key>width8</key> + <value>1</value> </param> <param> - <key>_rotation</key> - <value>0</value> + <key>color8</key> + <value>"dark red"</value> </param> - </block> - <block> - <key>variable_slider</key> <param> - <key>id</key> - <value>noise_amp</value> + <key>style8</key> + <value>1</value> </param> <param> - <key>_enabled</key> - <value>True</value> + <key>marker8</key> + <value>-1</value> </param> <param> - <key>label</key> - <value>Channel Noise</value> + <key>alpha8</key> + <value>1.0</value> </param> <param> - <key>value</key> - <value>0</value> + <key>label9</key> + <value></value> </param> <param> - <key>min</key> - <value>0</value> + <key>width9</key> + <value>1</value> </param> <param> - <key>max</key> + <key>color9</key> + <value>"dark green"</value> + </param> + <param> + <key>style9</key> + <value>1</value> + </param> + <param> + <key>marker9</key> + <value>-1</value> + </param> + <param> + <key>alpha9</key> <value>1.0</value> </param> <param> - <key>num_steps</key> - <value>1000</value> + <key>label10</key> + <value></value> + </param> + <param> + <key>width10</key> + <value>1</value> + </param> + <param> + <key>color10</key> + <value>"blue"</value> + </param> + <param> + <key>style10</key> + <value>1</value> </param> <param> - <key>style</key> - <value>wx.SL_HORIZONTAL</value> + <key>marker10</key> + <value>-1</value> </param> <param> - <key>converver</key> - <value>float_converter</value> + <key>alpha10</key> + <value>1.0</value> </param> <param> - <key>grid_pos</key> - <value>(3,2,1,1)</value> + <key>alias</key> + <value></value> </param> <param> - <key>notebook</key> + <key>affinity</key> <value></value> </param> <param> <key>_coordinate</key> - <value>(149, 530)</value> + <value>(1029, 281)</value> </param> <param> <key>_rotation</key> @@ -1031,10 +2543,10 @@ </param> </block> <block> - <key>variable_slider</key> + <key>variable_qtgui_range</key> <param> <key>id</key> - <value>freq_offset</value> + <value>time_bw</value> </param> <param> <key>_enabled</key> @@ -1042,43 +2554,47 @@ </param> <param> <key>label</key> - <value>Frequency Offset</value> + <value>Timing Loop BW</value> </param> <param> <key>value</key> <value>0</value> </param> <param> - <key>min</key> - <value>-0.5</value> + <key>start</key> + <value>0</value> </param> <param> - <key>max</key> - <value>0.5</value> + <key>stop</key> + <value>.1</value> + </param> + <param> + <key>step</key> + <value>.001</value> </param> <param> - <key>num_steps</key> - <value>1000</value> + <key>widget</key> + <value>counter_slider</value> </param> <param> - <key>style</key> - <value>wx.SL_HORIZONTAL</value> + <key>orient</key> + <value>Qt.Horizontal</value> </param> <param> - <key>converver</key> - <value>float_converter</value> + <key>min_len</key> + <value>200</value> </param> <param> - <key>grid_pos</key> - <value>(4,2,1,1)</value> + <key>gui_hint</key> + <value>1,2,1,1</value> </param> <param> - <key>notebook</key> + <key>alias</key> <value></value> </param> <param> <key>_coordinate</key> - <value>(293, 530)</value> + <value>(451, 0)</value> </param> <param> <key>_rotation</key> @@ -1086,34 +2602,66 @@ </param> </block> <block> - <key>notebook</key> + <key>digital_pfb_clock_sync_xxx</key> <param> <key>id</key> - <value>notebook_0</value> + <value>digital_pfb_clock_sync_xxx_0</value> </param> <param> <key>_enabled</key> <value>True</value> </param> <param> - <key>style</key> - <value>wx.NB_TOP</value> + <key>type</key> + <value>ccf</value> + </param> + <param> + <key>sps</key> + <value>spb</value> + </param> + <param> + <key>loop_bw</key> + <value>time_bw</value> + </param> + <param> + <key>taps</key> + <value>firdes.root_raised_cosine(nfilts, nfilts*spb, 1.0, rolloff, 44*nfilts)</value> + </param> + <param> + <key>filter_size</key> + <value>nfilts</value> + </param> + <param> + <key>init_phase</key> + <value>16</value> </param> <param> - <key>labels</key> - <value>['error', 'phase', 'freq', 'Resampled Signal']</value> + <key>max_dev</key> + <value>1.5</value> </param> <param> - <key>grid_pos</key> - <value>(1,1,5,1)</value> + <key>osps</key> + <value>1</value> </param> <param> - <key>notebook</key> + <key>alias</key> <value></value> </param> <param> + <key>affinity</key> + <value></value> + </param> + <param> + <key>minoutbuf</key> + <value>0</value> + </param> + <param> + <key>maxoutbuf</key> + <value>0</value> + </param> + <param> <key>_coordinate</key> - <value>(443, 577)</value> + <value>(467, 403)</value> </param> <param> <key>_rotation</key> @@ -1127,63 +2675,63 @@ <sink_key>0</sink_key> </connection> <connection> - <source_block_id>digital_pfb_clock_sync_xxx_0</source_block_id> - <sink_block_id>wxgui_scopesink2_0_0_0_0</sink_block_id> - <source_key>2</source_key> + <source_block_id>pfb_arb_resampler_xxx_0</source_block_id> + <sink_block_id>blocks_multiply_const_vxx_0</sink_block_id> + <source_key>0</source_key> <sink_key>0</sink_key> </connection> <connection> - <source_block_id>blocks_multiply_const_vxx_0</source_block_id> - <sink_block_id>wxgui_scopesink2_0_0_1</sink_block_id> + <source_block_id>digital_chunks_to_symbols_xx</source_block_id> + <sink_block_id>pfb_arb_resampler_xxx_0</sink_block_id> <source_key>0</source_key> <sink_key>0</sink_key> </connection> <connection> - <source_block_id>pfb_arb_resampler_xxx_0</source_block_id> - <sink_block_id>blocks_multiply_const_vxx_0</sink_block_id> + <source_block_id>analog_random_source_x</source_block_id> + <sink_block_id>digital_chunks_to_symbols_xx</sink_block_id> <source_key>0</source_key> <sink_key>0</sink_key> </connection> <connection> - <source_block_id>digital_chunks_to_symbols_xx</source_block_id> - <sink_block_id>pfb_arb_resampler_xxx_0</sink_block_id> + <source_block_id>channels_channel_model_0</source_block_id> + <sink_block_id>blocks_throttle_0</sink_block_id> <source_key>0</source_key> <sink_key>0</sink_key> </connection> <connection> - <source_block_id>analog_random_source_x</source_block_id> - <sink_block_id>digital_chunks_to_symbols_xx</sink_block_id> + <source_block_id>blocks_multiply_const_vxx_0</source_block_id> + <sink_block_id>channels_channel_model_0</sink_block_id> <source_key>0</source_key> <sink_key>0</sink_key> </connection> <connection> - <source_block_id>digital_pfb_clock_sync_xxx_0</source_block_id> - <sink_block_id>wxgui_scopesink2_0_0_0</sink_block_id> - <source_key>3</source_key> + <source_block_id>blocks_multiply_const_vxx_0</source_block_id> + <sink_block_id>qtgui_time_sink_x_0</sink_block_id> + <source_key>0</source_key> <sink_key>0</sink_key> </connection> <connection> <source_block_id>digital_pfb_clock_sync_xxx_0</source_block_id> - <sink_block_id>wxgui_scopesink2_0_0</sink_block_id> - <source_key>1</source_key> + <sink_block_id>qtgui_time_sink_x_0_0</sink_block_id> + <source_key>0</source_key> <sink_key>0</sink_key> </connection> <connection> <source_block_id>digital_pfb_clock_sync_xxx_0</source_block_id> - <sink_block_id>wxgui_scopesink2_0</sink_block_id> - <source_key>0</source_key> + <sink_block_id>qtgui_time_sink_x_1</sink_block_id> + <source_key>1</source_key> <sink_key>0</sink_key> </connection> <connection> - <source_block_id>channels_channel_model_0</source_block_id> - <sink_block_id>blocks_throttle_0</sink_block_id> - <source_key>0</source_key> + <source_block_id>digital_pfb_clock_sync_xxx_0</source_block_id> + <sink_block_id>qtgui_time_sink_x_1_1</sink_block_id> + <source_key>3</source_key> <sink_key>0</sink_key> </connection> <connection> - <source_block_id>blocks_multiply_const_vxx_0</source_block_id> - <sink_block_id>channels_channel_model_0</sink_block_id> - <source_key>0</source_key> + <source_block_id>digital_pfb_clock_sync_xxx_0</source_block_id> + <sink_block_id>qtgui_time_sink_x_1_0</sink_block_id> + <source_key>2</source_key> <sink_key>0</sink_key> </connection> </flow_graph> diff --git a/gr-digital/examples/demod/test_corr_and_sync.grc b/gr-digital/examples/demod/test_corr_and_sync.grc index 71dca83c9a..91e09dd203 100644 --- a/gr-digital/examples/demod/test_corr_and_sync.grc +++ b/gr-digital/examples/demod/test_corr_and_sync.grc @@ -1,6 +1,6 @@ <?xml version='1.0' encoding='ASCII'?> <flow_graph> - <timestamp>Thu Apr 24 14:08:23 2014</timestamp> + <timestamp>Fri Jul 11 16:54:10 2014</timestamp> <block> <key>options</key> <param> @@ -52,6 +52,10 @@ <value></value> </param> <param> + <key>alias</key> + <value></value> + </param> + <param> <key>_coordinate</key> <value>(10, 10)</value> </param> @@ -64,7 +68,7 @@ <key>variable</key> <param> <key>id</key> - <value>rrc_taps</value> + <value>samp_rate</value> </param> <param> <key>_enabled</key> @@ -72,11 +76,15 @@ </param> <param> <key>value</key> - <value>firdes.root_raised_cosine(nfilts, nfilts, 1.0/float(sps), eb, 5*sps*nfilts)</value> + <value>100000</value> + </param> + <param> + <key>alias</key> + <value></value> </param> <param> <key>_coordinate</key> - <value>(1075, 73)</value> + <value>(11, 72)</value> </param> <param> <key>_rotation</key> @@ -87,7 +95,7 @@ <key>variable</key> <param> <key>id</key> - <value>nfilts</value> + <value>eb</value> </param> <param> <key>_enabled</key> @@ -95,11 +103,15 @@ </param> <param> <key>value</key> - <value>32</value> + <value>0.35</value> + </param> + <param> + <key>alias</key> + <value></value> </param> <param> <key>_coordinate</key> - <value>(1074, 9)</value> + <value>(346, 72)</value> </param> <param> <key>_rotation</key> @@ -110,7 +122,7 @@ <key>variable</key> <param> <key>id</key> - <value>payload_size</value> + <value>matched_filter</value> </param> <param> <key>_enabled</key> @@ -118,11 +130,15 @@ </param> <param> <key>value</key> - <value>992</value> + <value>firdes.root_raised_cosine(nfilts, nfilts, 1, eb, int(11*sps*nfilts))</value> + </param> + <param> + <key>alias</key> + <value></value> </param> <param> <key>_coordinate</key> - <value>(101, 73)</value> + <value>(429, 72)</value> </param> <param> <key>_rotation</key> @@ -133,7 +149,7 @@ <key>variable</key> <param> <key>id</key> - <value>gap</value> + <value>preamble</value> </param> <param> <key>_enabled</key> @@ -141,11 +157,15 @@ </param> <param> <key>value</key> - <value>20000</value> + <value>[1,-1,1,-1,1,1,-1,-1,1,1,-1,1,1,1,-1,1,1,-1,1,-1,-1,1,-1,-1,1,1,1,-1,-1,-1,1,-1,1,1,1,1,-1,-1,1,-1,1,-1,-1,-1,1,1,-1,-1,-1,-1,1,-1,-1,-1,-1,-1,1,1,1,1,1,1,-1,-1]</value> + </param> + <param> + <key>alias</key> + <value></value> </param> <param> <key>_coordinate</key> - <value>(202, 72)</value> + <value>(279, 8)</value> </param> <param> <key>_rotation</key> @@ -156,7 +176,7 @@ <key>variable</key> <param> <key>id</key> - <value>bb_filter</value> + <value>sps</value> </param> <param> <key>_enabled</key> @@ -164,11 +184,15 @@ </param> <param> <key>value</key> - <value>firdes.root_raised_cosine(sps, sps, 1, eb, 101)</value> + <value>4</value> + </param> + <param> + <key>alias</key> + <value></value> </param> <param> <key>_coordinate</key> - <value>(429, 8)</value> + <value>(278, 72)</value> </param> <param> <key>_rotation</key> @@ -179,7 +203,7 @@ <key>variable</key> <param> <key>id</key> - <value>sps</value> + <value>bb_filter</value> </param> <param> <key>_enabled</key> @@ -187,11 +211,15 @@ </param> <param> <key>value</key> - <value>4</value> + <value>firdes.root_raised_cosine(sps, sps, 1, eb, 101)</value> + </param> + <param> + <key>alias</key> + <value></value> </param> <param> <key>_coordinate</key> - <value>(278, 72)</value> + <value>(429, 8)</value> </param> <param> <key>_rotation</key> @@ -202,7 +230,7 @@ <key>variable</key> <param> <key>id</key> - <value>preamble</value> + <value>gap</value> </param> <param> <key>_enabled</key> @@ -210,11 +238,15 @@ </param> <param> <key>value</key> - <value>[1,-1,1,-1,1,1,-1,-1,1,1,-1,1,1,1,-1,1,1,-1,1,-1,-1,1,-1,-1,1,1,1,-1,-1,-1,1,-1,1,1,1,1,-1,-1,1,-1,1,-1,-1,-1,1,1,-1,-1,-1,-1,1,-1,-1,-1,-1,-1,1,1,1,1,1,1,-1,-1]</value> + <value>20000</value> + </param> + <param> + <key>alias</key> + <value></value> </param> <param> <key>_coordinate</key> - <value>(279, 8)</value> + <value>(202, 72)</value> </param> <param> <key>_rotation</key> @@ -225,7 +257,7 @@ <key>variable</key> <param> <key>id</key> - <value>matched_filter</value> + <value>payload_size</value> </param> <param> <key>_enabled</key> @@ -233,11 +265,15 @@ </param> <param> <key>value</key> - <value>firdes.root_raised_cosine(nfilts, nfilts, 1, eb, int(11*sps*nfilts))</value> + <value>992</value> + </param> + <param> + <key>alias</key> + <value></value> </param> <param> <key>_coordinate</key> - <value>(429, 72)</value> + <value>(101, 73)</value> </param> <param> <key>_rotation</key> @@ -248,7 +284,7 @@ <key>variable</key> <param> <key>id</key> - <value>eb</value> + <value>nfilts</value> </param> <param> <key>_enabled</key> @@ -256,11 +292,15 @@ </param> <param> <key>value</key> - <value>0.35</value> + <value>32</value> + </param> + <param> + <key>alias</key> + <value></value> </param> <param> <key>_coordinate</key> - <value>(346, 72)</value> + <value>(1074, 9)</value> </param> <param> <key>_rotation</key> @@ -271,7 +311,7 @@ <key>variable</key> <param> <key>id</key> - <value>samp_rate</value> + <value>rrc_taps</value> </param> <param> <key>_enabled</key> @@ -279,11 +319,15 @@ </param> <param> <key>value</key> - <value>100000</value> + <value>firdes.root_raised_cosine(nfilts, nfilts, 1.0/float(sps), eb, 5*sps*nfilts)</value> + </param> + <param> + <key>alias</key> + <value></value> </param> <param> <key>_coordinate</key> - <value>(11, 72)</value> + <value>(1075, 73)</value> </param> <param> <key>_rotation</key> @@ -305,6 +349,10 @@ <value>1</value> </param> <param> + <key>alias</key> + <value></value> + </param> + <param> <key>affinity</key> <value></value> </param> @@ -340,6 +388,10 @@ <value>1</value> </param> <param> + <key>alias</key> + <value></value> + </param> + <param> <key>affinity</key> <value></value> </param> @@ -383,6 +435,10 @@ <value>sps</value> </param> <param> + <key>alias</key> + <value></value> + </param> + <param> <key>affinity</key> <value></value> </param> @@ -438,6 +494,10 @@ <value>False</value> </param> <param> + <key>alias</key> + <value></value> + </param> + <param> <key>affinity</key> <value></value> </param> @@ -485,6 +545,10 @@ <value>True</value> </param> <param> + <key>alias</key> + <value></value> + </param> + <param> <key>affinity</key> <value></value> </param> @@ -536,6 +600,10 @@ <value>1</value> </param> <param> + <key>alias</key> + <value></value> + </param> + <param> <key>affinity</key> <value></value> </param> @@ -591,6 +659,10 @@ <value>False</value> </param> <param> + <key>alias</key> + <value></value> + </param> + <param> <key>affinity</key> <value></value> </param> @@ -638,6 +710,10 @@ <value>1</value> </param> <param> + <key>alias</key> + <value></value> + </param> + <param> <key>affinity</key> <value></value> </param> @@ -685,6 +761,10 @@ <value>[[0,],]</value> </param> <param> + <key>alias</key> + <value></value> + </param> + <param> <key>affinity</key> <value></value> </param> @@ -720,6 +800,10 @@ <value>import scipy</value> </param> <param> + <key>alias</key> + <value></value> + </param> + <param> <key>_coordinate</key> <value>(181, 16)</value> </param> @@ -775,6 +859,10 @@ <value>3,1,1,1</value> </param> <param> + <key>alias</key> + <value></value> + </param> + <param> <key>_coordinate</key> <value>(692, 7)</value> </param> @@ -830,6 +918,10 @@ <value>4,0,1,1</value> </param> <param> + <key>alias</key> + <value></value> + </param> + <param> <key>_coordinate</key> <value>(808, 7)</value> </param> @@ -885,6 +977,10 @@ <value>4,1,1,1</value> </param> <param> + <key>alias</key> + <value></value> + </param> + <param> <key>_coordinate</key> <value>(950, 8)</value> </param> @@ -940,6 +1036,10 @@ <value>3,0,1,1</value> </param> <param> + <key>alias</key> + <value></value> + </param> + <param> <key>_coordinate</key> <value>(584, 7)</value> </param> @@ -991,6 +1091,10 @@ <value>1</value> </param> <param> + <key>alias</key> + <value></value> + </param> + <param> <key>affinity</key> <value></value> </param> @@ -1042,6 +1146,10 @@ <value>True</value> </param> <param> + <key>alias</key> + <value></value> + </param> + <param> <key>affinity</key> <value></value> </param> @@ -1077,6 +1185,10 @@ <value>8</value> </param> <param> + <key>alias</key> + <value></value> + </param> + <param> <key>affinity</key> <value></value> </param> @@ -1124,6 +1236,10 @@ <value>1</value> </param> <param> + <key>alias</key> + <value></value> + </param> + <param> <key>affinity</key> <value></value> </param> @@ -1155,10 +1271,6 @@ <value>True</value> </param> <param> - <key>value</key> - <value>"ok"</value> - </param> - <param> <key>sym_map</key> <value>[0,1]</value> </param> @@ -1183,6 +1295,10 @@ <value>None</value> </param> <param> + <key>alias</key> + <value></value> + </param> + <param> <key>_coordinate</key> <value>(1237, 27)</value> </param> @@ -1214,6 +1330,10 @@ <value>2</value> </param> <param> + <key>alias</key> + <value></value> + </param> + <param> <key>affinity</key> <value></value> </param> @@ -1281,6 +1401,10 @@ <value>5,0,1,2</value> </param> <param> + <key>alias</key> + <value></value> + </param> + <param> <key>_coordinate</key> <value>(875, 571)</value> </param> @@ -1308,6 +1432,10 @@ <value>1</value> </param> <param> + <key>alias</key> + <value></value> + </param> + <param> <key>affinity</key> <value></value> </param> @@ -1343,6 +1471,10 @@ <value>8</value> </param> <param> + <key>alias</key> + <value></value> + </param> + <param> <key>affinity</key> <value></value> </param> @@ -1390,6 +1522,10 @@ <value>1</value> </param> <param> + <key>alias</key> + <value></value> + </param> + <param> <key>affinity</key> <value></value> </param> @@ -1437,6 +1573,10 @@ <value>[[0,],]</value> </param> <param> + <key>alias</key> + <value></value> + </param> + <param> <key>affinity</key> <value></value> </param> @@ -1484,6 +1624,10 @@ <value>1</value> </param> <param> + <key>alias</key> + <value></value> + </param> + <param> <key>affinity</key> <value></value> </param> @@ -1523,6 +1667,10 @@ <value>1</value> </param> <param> + <key>alias</key> + <value></value> + </param> + <param> <key>affinity</key> <value></value> </param> @@ -1562,6 +1710,14 @@ <value></value> </param> <param> + <key>ylabel</key> + <value>Amplitude</value> + </param> + <param> + <key>yunit</key> + <value>""</value> + </param> + <param> <key>size</key> <value>20000</value> </param> @@ -1570,6 +1726,10 @@ <value>samp_rate</value> </param> <param> + <key>grid</key> + <value>False</value> + </param> + <param> <key>autoscale</key> <value>False</value> </param> @@ -1862,6 +2022,10 @@ <value>1.0</value> </param> <param> + <key>alias</key> + <value></value> + </param> + <param> <key>affinity</key> <value></value> </param> @@ -1889,6 +2053,10 @@ <value>constel</value> </param> <param> + <key>alias</key> + <value></value> + </param> + <param> <key>affinity</key> <value></value> </param> @@ -1928,6 +2096,14 @@ <value></value> </param> <param> + <key>ylabel</key> + <value>Amplitude</value> + </param> + <param> + <key>yunit</key> + <value>""</value> + </param> + <param> <key>size</key> <value>80000</value> </param> @@ -1936,6 +2112,10 @@ <value>samp_rate</value> </param> <param> + <key>grid</key> + <value>False</value> + </param> + <param> <key>autoscale</key> <value>False</value> </param> @@ -2228,6 +2408,10 @@ <value>1.0</value> </param> <param> + <key>alias</key> + <value></value> + </param> + <param> <key>affinity</key> <value></value> </param> @@ -2241,10 +2425,53 @@ </param> </block> <block> - <key>qtgui_time_sink_x</key> + <key>digital_costas_loop_cc</key> <param> <key>id</key> - <value>qtgui_time_sink_x_0</value> + <value>digital_costas_loop_cc_0</value> + </param> + <param> + <key>_enabled</key> + <value>True</value> + </param> + <param> + <key>w</key> + <value>1*3.14/50.0</value> + </param> + <param> + <key>order</key> + <value>2</value> + </param> + <param> + <key>alias</key> + <value></value> + </param> + <param> + <key>affinity</key> + <value></value> + </param> + <param> + <key>minoutbuf</key> + <value>0</value> + </param> + <param> + <key>maxoutbuf</key> + <value>0</value> + </param> + <param> + <key>_coordinate</key> + <value>(1091, 303)</value> + </param> + <param> + <key>_rotation</key> + <value>0</value> + </param> + </block> + <block> + <key>qtgui_const_sink_x</key> + <param> + <key>id</key> + <value>qtgui_const_sink_x_0</value> </param> <param> <key>_enabled</key> @@ -2260,11 +2487,11 @@ </param> <param> <key>size</key> - <value>50000</value> + <value>1000</value> </param> <param> - <key>srate</key> - <value>samp_rate</value> + <key>grid</key> + <value>False</value> </param> <param> <key>autoscale</key> @@ -2279,6 +2506,14 @@ <value>2</value> </param> <param> + <key>xmin</key> + <value>-2</value> + </param> + <param> + <key>xmax</key> + <value>2</value> + </param> + <param> <key>nconnections</key> <value>1</value> </param> @@ -2287,12 +2522,8 @@ <value>0.10</value> </param> <param> - <key>entags</key> - <value>True</value> - </param> - <param> <key>gui_hint</key> - <value>0,0,1,1</value> + <value>0,1,1,1</value> </param> <param> <key>tr_mode</key> @@ -2304,11 +2535,7 @@ </param> <param> <key>tr_level</key> - <value>1</value> - </param> - <param> - <key>tr_delay</key> - <value>0.1</value> + <value>0</value> </param> <param> <key>tr_chan</key> @@ -2332,11 +2559,11 @@ </param> <param> <key>style1</key> - <value>1</value> + <value>0</value> </param> <param> <key>marker1</key> - <value>-1</value> + <value>0</value> </param> <param> <key>alpha1</key> @@ -2356,11 +2583,11 @@ </param> <param> <key>style2</key> - <value>1</value> + <value>0</value> </param> <param> <key>marker2</key> - <value>-1</value> + <value>0</value> </param> <param> <key>alpha2</key> @@ -2376,15 +2603,15 @@ </param> <param> <key>color3</key> - <value>"green"</value> + <value>"red"</value> </param> <param> <key>style3</key> - <value>1</value> + <value>0</value> </param> <param> <key>marker3</key> - <value>-1</value> + <value>0</value> </param> <param> <key>alpha3</key> @@ -2400,15 +2627,15 @@ </param> <param> <key>color4</key> - <value>"black"</value> + <value>"red"</value> </param> <param> <key>style4</key> - <value>1</value> + <value>0</value> </param> <param> <key>marker4</key> - <value>-1</value> + <value>0</value> </param> <param> <key>alpha4</key> @@ -2424,15 +2651,15 @@ </param> <param> <key>color5</key> - <value>"cyan"</value> + <value>"red"</value> </param> <param> <key>style5</key> - <value>1</value> + <value>0</value> </param> <param> <key>marker5</key> - <value>-1</value> + <value>0</value> </param> <param> <key>alpha5</key> @@ -2448,15 +2675,15 @@ </param> <param> <key>color6</key> - <value>"magenta"</value> + <value>"red"</value> </param> <param> <key>style6</key> - <value>1</value> + <value>0</value> </param> <param> <key>marker6</key> - <value>-1</value> + <value>0</value> </param> <param> <key>alpha6</key> @@ -2472,15 +2699,15 @@ </param> <param> <key>color7</key> - <value>"yellow"</value> + <value>"red"</value> </param> <param> <key>style7</key> - <value>1</value> + <value>0</value> </param> <param> <key>marker7</key> - <value>-1</value> + <value>0</value> </param> <param> <key>alpha7</key> @@ -2496,15 +2723,15 @@ </param> <param> <key>color8</key> - <value>"dark red"</value> + <value>"red"</value> </param> <param> <key>style8</key> - <value>1</value> + <value>0</value> </param> <param> <key>marker8</key> - <value>-1</value> + <value>0</value> </param> <param> <key>alpha8</key> @@ -2520,15 +2747,15 @@ </param> <param> <key>color9</key> - <value>"dark green"</value> + <value>"red"</value> </param> <param> <key>style9</key> - <value>1</value> + <value>0</value> </param> <param> <key>marker9</key> - <value>-1</value> + <value>0</value> </param> <param> <key>alpha9</key> @@ -2544,27 +2771,31 @@ </param> <param> <key>color10</key> - <value>"blue"</value> + <value>"red"</value> </param> <param> <key>style10</key> - <value>1</value> + <value>0</value> </param> <param> <key>marker10</key> - <value>-1</value> + <value>0</value> </param> <param> <key>alpha10</key> <value>1.0</value> </param> <param> + <key>alias</key> + <value></value> + </param> + <param> <key>affinity</key> - <value>0</value> + <value></value> </param> <param> <key>_coordinate</key> - <value>(1398, 370)</value> + <value>(1399, 283)</value> </param> <param> <key>_rotation</key> @@ -2572,65 +2803,42 @@ </param> </block> <block> - <key>digital_costas_loop_cc</key> + <key>qtgui_time_sink_x</key> <param> <key>id</key> - <value>digital_costas_loop_cc_0</value> + <value>qtgui_time_sink_x_0</value> </param> <param> <key>_enabled</key> <value>True</value> </param> <param> - <key>w</key> - <value>1*3.14/50.0</value> - </param> - <param> - <key>order</key> - <value>2</value> + <key>type</key> + <value>complex</value> </param> <param> - <key>affinity</key> + <key>name</key> <value></value> </param> <param> - <key>minoutbuf</key> - <value>0</value> - </param> - <param> - <key>maxoutbuf</key> - <value>0</value> - </param> - <param> - <key>_coordinate</key> - <value>(1091, 303)</value> - </param> - <param> - <key>_rotation</key> - <value>0</value> - </param> - </block> - <block> - <key>qtgui_const_sink_x</key> - <param> - <key>id</key> - <value>qtgui_const_sink_x_0</value> + <key>ylabel</key> + <value>Amplitude</value> </param> <param> - <key>_enabled</key> - <value>True</value> + <key>yunit</key> + <value>""</value> </param> <param> - <key>type</key> - <value>complex</value> + <key>size</key> + <value>50000</value> </param> <param> - <key>name</key> - <value></value> + <key>srate</key> + <value>samp_rate</value> </param> <param> - <key>size</key> - <value>1000</value> + <key>grid</key> + <value>False</value> </param> <param> <key>autoscale</key> @@ -2645,14 +2853,6 @@ <value>2</value> </param> <param> - <key>xmin</key> - <value>-2</value> - </param> - <param> - <key>xmax</key> - <value>2</value> - </param> - <param> <key>nconnections</key> <value>1</value> </param> @@ -2661,8 +2861,12 @@ <value>0.10</value> </param> <param> + <key>entags</key> + <value>True</value> + </param> + <param> <key>gui_hint</key> - <value>0,1,1,1</value> + <value>0,0,1,1</value> </param> <param> <key>tr_mode</key> @@ -2674,7 +2878,11 @@ </param> <param> <key>tr_level</key> - <value>0</value> + <value>1</value> + </param> + <param> + <key>tr_delay</key> + <value>0.1</value> </param> <param> <key>tr_chan</key> @@ -2698,11 +2906,11 @@ </param> <param> <key>style1</key> - <value>0</value> + <value>1</value> </param> <param> <key>marker1</key> - <value>0</value> + <value>-1</value> </param> <param> <key>alpha1</key> @@ -2722,11 +2930,11 @@ </param> <param> <key>style2</key> - <value>0</value> + <value>1</value> </param> <param> <key>marker2</key> - <value>0</value> + <value>-1</value> </param> <param> <key>alpha2</key> @@ -2742,15 +2950,15 @@ </param> <param> <key>color3</key> - <value>"red"</value> + <value>"green"</value> </param> <param> <key>style3</key> - <value>0</value> + <value>1</value> </param> <param> <key>marker3</key> - <value>0</value> + <value>-1</value> </param> <param> <key>alpha3</key> @@ -2766,15 +2974,15 @@ </param> <param> <key>color4</key> - <value>"red"</value> + <value>"black"</value> </param> <param> <key>style4</key> - <value>0</value> + <value>1</value> </param> <param> <key>marker4</key> - <value>0</value> + <value>-1</value> </param> <param> <key>alpha4</key> @@ -2790,15 +2998,15 @@ </param> <param> <key>color5</key> - <value>"red"</value> + <value>"cyan"</value> </param> <param> <key>style5</key> - <value>0</value> + <value>1</value> </param> <param> <key>marker5</key> - <value>0</value> + <value>-1</value> </param> <param> <key>alpha5</key> @@ -2814,15 +3022,15 @@ </param> <param> <key>color6</key> - <value>"red"</value> + <value>"magenta"</value> </param> <param> <key>style6</key> - <value>0</value> + <value>1</value> </param> <param> <key>marker6</key> - <value>0</value> + <value>-1</value> </param> <param> <key>alpha6</key> @@ -2838,15 +3046,15 @@ </param> <param> <key>color7</key> - <value>"red"</value> + <value>"yellow"</value> </param> <param> <key>style7</key> - <value>0</value> + <value>1</value> </param> <param> <key>marker7</key> - <value>0</value> + <value>-1</value> </param> <param> <key>alpha7</key> @@ -2862,15 +3070,15 @@ </param> <param> <key>color8</key> - <value>"red"</value> + <value>"dark red"</value> </param> <param> <key>style8</key> - <value>0</value> + <value>1</value> </param> <param> <key>marker8</key> - <value>0</value> + <value>-1</value> </param> <param> <key>alpha8</key> @@ -2886,15 +3094,15 @@ </param> <param> <key>color9</key> - <value>"red"</value> + <value>"dark green"</value> </param> <param> <key>style9</key> - <value>0</value> + <value>1</value> </param> <param> <key>marker9</key> - <value>0</value> + <value>-1</value> </param> <param> <key>alpha9</key> @@ -2910,27 +3118,31 @@ </param> <param> <key>color10</key> - <value>"red"</value> + <value>"blue"</value> </param> <param> <key>style10</key> - <value>0</value> + <value>1</value> </param> <param> <key>marker10</key> - <value>0</value> + <value>-1</value> </param> <param> <key>alpha10</key> <value>1.0</value> </param> <param> - <key>affinity</key> + <key>alias</key> <value></value> </param> <param> + <key>affinity</key> + <value>0</value> + </param> + <param> <key>_coordinate</key> - <value>(1399, 283)</value> + <value>(1398, 370)</value> </param> <param> <key>_rotation</key> diff --git a/gr-digital/examples/ofdm/ofdm_loopback.grc b/gr-digital/examples/ofdm/ofdm_loopback.grc index a2c93145c4..fbb26cae92 100644 --- a/gr-digital/examples/ofdm/ofdm_loopback.grc +++ b/gr-digital/examples/ofdm/ofdm_loopback.grc @@ -1,59 +1,27 @@ <?xml version='1.0' encoding='ASCII'?> <flow_graph> - <timestamp>Sun Nov 3 19:13:00 2013</timestamp> + <timestamp>Wed Jul 9 15:53:31 2014</timestamp> <block> - <key>options</key> + <key>variable</key> <param> <key>id</key> - <value>ofdm_loopback_example</value> + <value>len_tag_key</value> </param> <param> <key>_enabled</key> <value>True</value> </param> <param> - <key>title</key> - <value>OFDM Loopback Example</value> - </param> - <param> - <key>author</key> - <value></value> - </param> - <param> - <key>description</key> - <value>Transmit a pre-defined signal (a complex sine) as OFDM packets.</value> - </param> - <param> - <key>window_size</key> - <value>1280, 1024</value> - </param> - <param> - <key>generate_options</key> - <value>wx_gui</value> - </param> - <param> - <key>category</key> - <value>Custom</value> - </param> - <param> - <key>run_options</key> - <value>prompt</value> - </param> - <param> - <key>run</key> - <value>True</value> - </param> - <param> - <key>max_nouts</key> - <value>0</value> + <key>value</key> + <value>"packet_len"</value> </param> <param> - <key>realtime_scheduling</key> + <key>alias</key> <value></value> </param> <param> <key>_coordinate</key> - <value>(0, -1)</value> + <value>(283, 6)</value> </param> <param> <key>_rotation</key> @@ -75,6 +43,10 @@ <value>100000</value> </param> <param> + <key>alias</key> + <value></value> + </param> + <param> <key>_coordinate</key> <value>(493, 7)</value> </param> @@ -98,31 +70,12 @@ <value>64</value> </param> <param> - <key>_coordinate</key> - <value>(403, 8)</value> - </param> - <param> - <key>_rotation</key> - <value>0</value> - </param> - </block> - <block> - <key>variable</key> - <param> - <key>id</key> - <value>len_tag_key</value> - </param> - <param> - <key>_enabled</key> - <value>True</value> - </param> - <param> - <key>value</key> - <value>"packet_len"</value> + <key>alias</key> + <value></value> </param> <param> <key>_coordinate</key> - <value>(283, 6)</value> + <value>(403, 8)</value> </param> <param> <key>_rotation</key> @@ -144,6 +97,10 @@ <value>50</value> </param> <param> + <key>alias</key> + <value></value> + </param> + <param> <key>_coordinate</key> <value>(182, 6)</value> </param> @@ -183,6 +140,10 @@ <value>1</value> </param> <param> + <key>alias</key> + <value></value> + </param> + <param> <key>affinity</key> <value></value> </param> @@ -191,6 +152,10 @@ <value>0</value> </param> <param> + <key>maxoutbuf</key> + <value>0</value> + </param> + <param> <key>_coordinate</key> <value>(5, 124)</value> </param> @@ -200,10 +165,10 @@ </param> </block> <block> - <key>wxgui_fftsink2</key> + <key>blocks_tag_debug</key> <param> <key>id</key> - <value>wxgui_fftsink2_0</value> + <value>blocks_tag_debug_0</value> </param> <param> <key>_enabled</key> @@ -211,83 +176,90 @@ </param> <param> <key>type</key> - <value>complex</value> + <value>byte</value> </param> <param> - <key>title</key> - <value>Rx Spectrum</value> + <key>name</key> + <value>Rx Packets</value> </param> <param> - <key>samp_rate</key> - <value>100e3</value> + <key>filter</key> + <value>""</value> </param> <param> - <key>baseband_freq</key> - <value>0</value> + <key>num_inputs</key> + <value>1</value> </param> <param> - <key>y_per_div</key> - <value>10</value> + <key>vlen</key> + <value>1</value> </param> <param> - <key>y_divs</key> - <value>10</value> + <key>display</key> + <value>True</value> </param> <param> - <key>ref_level</key> - <value>0</value> + <key>alias</key> + <value></value> </param> <param> - <key>ref_scale</key> - <value>2.0</value> + <key>affinity</key> + <value></value> </param> <param> - <key>fft_size</key> - <value>1024</value> + <key>_coordinate</key> + <value>(325, 483)</value> </param> <param> - <key>fft_rate</key> - <value>15</value> + <key>_rotation</key> + <value>0</value> </param> + </block> + <block> + <key>blocks_stream_to_tagged_stream</key> <param> - <key>peak_hold</key> - <value>False</value> + <key>id</key> + <value>blocks_stream_to_tagged_stream_0</value> </param> <param> - <key>average</key> - <value>False</value> + <key>_enabled</key> + <value>True</value> </param> <param> - <key>avg_alpha</key> - <value>0</value> + <key>type</key> + <value>byte</value> </param> <param> - <key>win</key> - <value>None</value> + <key>vlen</key> + <value>1</value> </param> <param> - <key>win_size</key> - <value></value> + <key>packet_len</key> + <value>packet_len</value> + </param> + <param> + <key>len_tag_key</key> + <value>len_tag_key</value> </param> <param> - <key>grid_pos</key> + <key>alias</key> <value></value> </param> <param> - <key>notebook</key> + <key>affinity</key> <value></value> </param> <param> - <key>freqvar</key> - <value>None</value> + <key>minoutbuf</key> + <value>0</value> </param> <param> - <key>affinity</key> - <value></value> + <key>maxoutbuf</key> + <value>0</value> </param> <param> <key>_coordinate</key> - <value>(51, 500)</value> + <value>(282, 132)</value> </param> <param> <key>_rotation</key> @@ -295,73 +267,66 @@ </param> </block> <block> - <key>blocks_tag_debug</key> + <key>digital_ofdm_rx</key> <param> <key>id</key> - <value>blocks_tag_debug_0</value> + <value>digital_ofdm_rx_0</value> </param> <param> <key>_enabled</key> <value>True</value> </param> <param> - <key>type</key> - <value>byte</value> - </param> - <param> - <key>name</key> - <value>Rx Packets</value> + <key>fft_len</key> + <value>fft_len</value> </param> <param> - <key>num_inputs</key> - <value>1</value> + <key>cp_len</key> + <value>fft_len/4</value> </param> <param> - <key>vlen</key> - <value>1</value> + <key>packet_len_key</key> + <value>"rx_len"</value> </param> <param> - <key>display</key> - <value>True</value> + <key>occupied_carriers</key> + <value>()</value> </param> <param> - <key>affinity</key> - <value></value> + <key>pilot_carriers</key> + <value>()</value> </param> <param> - <key>_coordinate</key> - <value>(325, 483)</value> + <key>pilot_symbols</key> + <value>()</value> </param> <param> - <key>_rotation</key> - <value>0</value> + <key>sync_word1</key> + <value>()</value> </param> - </block> - <block> - <key>blocks_stream_to_tagged_stream</key> <param> - <key>id</key> - <value>blocks_stream_to_tagged_stream_0</value> + <key>sync_word2</key> + <value>()</value> </param> <param> - <key>_enabled</key> - <value>True</value> + <key>header_mod</key> + <value>"BPSK"</value> </param> <param> - <key>type</key> - <value>byte</value> + <key>payload_mod</key> + <value>"QPSK"</value> </param> <param> - <key>vlen</key> - <value>1</value> + <key>scramble_bits</key> + <value>False</value> </param> <param> - <key>packet_len</key> - <value>packet_len</value> + <key>log</key> + <value>False</value> </param> <param> - <key>len_tag_key</key> - <value>len_tag_key</value> + <key>alias</key> + <value></value> </param> <param> <key>affinity</key> @@ -372,8 +337,12 @@ <value>0</value> </param> <param> + <key>maxoutbuf</key> + <value>0</value> + </param> + <param> <key>_coordinate</key> - <value>(282, 132)</value> + <value>(52, 374)</value> </param> <param> <key>_rotation</key> @@ -381,10 +350,10 @@ </param> </block> <block> - <key>digital_ofdm_rx</key> + <key>digital_ofdm_tx</key> <param> <key>id</key> - <value>digital_ofdm_rx_0</value> + <value>digital_ofdm_tx_0</value> </param> <param> <key>_enabled</key> @@ -400,7 +369,7 @@ </param> <param> <key>packet_len_key</key> - <value>"rx_len"</value> + <value>len_tag_key</value> </param> <param> <key>occupied_carriers</key> @@ -431,6 +400,10 @@ <value>"QPSK"</value> </param> <param> + <key>rolloff</key> + <value>0</value> + </param> + <param> <key>scramble_bits</key> <value>False</value> </param> @@ -439,6 +412,10 @@ <value>False</value> </param> <param> + <key>alias</key> + <value></value> + </param> + <param> <key>affinity</key> <value></value> </param> @@ -447,8 +424,12 @@ <value>0</value> </param> <param> + <key>maxoutbuf</key> + <value>0</value> + </param> + <param> <key>_coordinate</key> - <value>(52, 374)</value> + <value>(557, 94)</value> </param> <param> <key>_rotation</key> @@ -456,16 +437,44 @@ </param> </block> <block> - <key>blocks_uchar_to_float</key> + <key>channels_channel_model</key> <param> <key>id</key> - <value>blocks_uchar_to_float_0</value> + <value>channels_channel_model_0</value> </param> <param> <key>_enabled</key> <value>True</value> </param> <param> + <key>noise_voltage</key> + <value>noise_voltage</value> + </param> + <param> + <key>freq_offset</key> + <value>freq_offset * 1.0/fft_len</value> + </param> + <param> + <key>epsilon</key> + <value>1.0</value> + </param> + <param> + <key>taps</key> + <value>1.0 + 1.0j</value> + </param> + <param> + <key>seed</key> + <value>0</value> + </param> + <param> + <key>block_tags</key> + <value>True</value> + </param> + <param> + <key>alias</key> + <value></value> + </param> + <param> <key>affinity</key> <value></value> </param> @@ -474,19 +483,23 @@ <value>0</value> </param> <param> + <key>maxoutbuf</key> + <value>0</value> + </param> + <param> <key>_coordinate</key> - <value>(326, 408)</value> + <value>(453, 244)</value> </param> <param> <key>_rotation</key> - <value>0</value> + <value>180</value> </param> </block> <block> - <key>wxgui_scopesink2</key> + <key>blocks_throttle</key> <param> <key>id</key> - <value>wxgui_scopesink2_0</value> + <value>blocks_throttle_0</value> </param> <param> <key>_enabled</key> @@ -494,59 +507,270 @@ </param> <param> <key>type</key> - <value>float</value> + <value>complex</value> </param> <param> - <key>title</key> - <value>Scope Plot</value> + <key>samples_per_second</key> + <value>samp_rate</value> </param> <param> - <key>samp_rate</key> - <value>1.0</value> + <key>vlen</key> + <value>1</value> + </param> + <param> + <key>ignoretag</key> + <value>True</value> + </param> + <param> + <key>alias</key> + <value></value> </param> <param> - <key>v_scale</key> + <key>affinity</key> + <value></value> + </param> + <param> + <key>minoutbuf</key> <value>0</value> </param> <param> - <key>v_offset</key> + <key>maxoutbuf</key> <value>0</value> </param> <param> - <key>t_scale</key> + <key>_coordinate</key> + <value>(177, 281)</value> + </param> + <param> + <key>_rotation</key> + <value>180</value> + </param> + </block> + <block> + <key>qtgui_freq_sink_x</key> + <param> + <key>id</key> + <value>qtgui_freq_sink_x_0</value> + </param> + <param> + <key>_enabled</key> + <value>True</value> + </param> + <param> + <key>type</key> + <value>complex</value> + </param> + <param> + <key>name</key> + <value>Rx Spectrum</value> + </param> + <param> + <key>fftsize</key> + <value>1024</value> + </param> + <param> + <key>wintype</key> + <value>firdes.WIN_BLACKMAN_hARRIS</value> + </param> + <param> + <key>fc</key> <value>0</value> </param> <param> - <key>ac_couple</key> - <value>False</value> + <key>bw</key> + <value>samp_rate</value> </param> <param> - <key>xy_mode</key> + <key>autoscale</key> <value>False</value> </param> <param> - <key>num_inputs</key> + <key>average</key> + <value>1.0</value> + </param> + <param> + <key>ymin</key> + <value>-140</value> + </param> + <param> + <key>ymax</key> + <value>10</value> + </param> + <param> + <key>nconnections</key> + <value>1</value> + </param> + <param> + <key>update_time</key> + <value>0.10</value> + </param> + <param> + <key>gui_hint</key> + <value></value> + </param> + <param> + <key>label1</key> + <value>Rx Spectrum</value> + </param> + <param> + <key>width1</key> + <value>1</value> + </param> + <param> + <key>color1</key> + <value>"blue"</value> + </param> + <param> + <key>alpha1</key> + <value>1.0</value> + </param> + <param> + <key>label2</key> + <value></value> + </param> + <param> + <key>width2</key> + <value>1</value> + </param> + <param> + <key>color2</key> + <value>"red"</value> + </param> + <param> + <key>alpha2</key> + <value>1.0</value> + </param> + <param> + <key>label3</key> + <value></value> + </param> + <param> + <key>width3</key> + <value>1</value> + </param> + <param> + <key>color3</key> + <value>"green"</value> + </param> + <param> + <key>alpha3</key> + <value>1.0</value> + </param> + <param> + <key>label4</key> + <value></value> + </param> + <param> + <key>width4</key> + <value>1</value> + </param> + <param> + <key>color4</key> + <value>"black"</value> + </param> + <param> + <key>alpha4</key> + <value>1.0</value> + </param> + <param> + <key>label5</key> + <value></value> + </param> + <param> + <key>width5</key> + <value>1</value> + </param> + <param> + <key>color5</key> + <value>"cyan"</value> + </param> + <param> + <key>alpha5</key> + <value>1.0</value> + </param> + <param> + <key>label6</key> + <value></value> + </param> + <param> + <key>width6</key> + <value>1</value> + </param> + <param> + <key>color6</key> + <value>"magenta"</value> + </param> + <param> + <key>alpha6</key> + <value>1.0</value> + </param> + <param> + <key>label7</key> + <value></value> + </param> + <param> + <key>width7</key> <value>1</value> </param> <param> - <key>win_size</key> + <key>color7</key> + <value>"yellow"</value> + </param> + <param> + <key>alpha7</key> + <value>1.0</value> + </param> + <param> + <key>label8</key> <value></value> </param> <param> - <key>grid_pos</key> + <key>width8</key> + <value>1</value> + </param> + <param> + <key>color8</key> + <value>"dark red"</value> + </param> + <param> + <key>alpha8</key> + <value>1.0</value> + </param> + <param> + <key>label9</key> <value></value> </param> <param> - <key>notebook</key> + <key>width9</key> + <value>1</value> + </param> + <param> + <key>color9</key> + <value>"dark green"</value> + </param> + <param> + <key>alpha9</key> + <value>1.0</value> + </param> + <param> + <key>label10</key> <value></value> </param> <param> - <key>trig_mode</key> - <value>wxgui.TRIG_MODE_AUTO</value> + <key>width10</key> + <value>1</value> + </param> + <param> + <key>color10</key> + <value>"dark blue"</value> + </param> + <param> + <key>alpha10</key> + <value>1.0</value> </param> <param> - <key>y_axis_label</key> - <value>Counts</value> + <key>alias</key> + <value></value> </param> <param> <key>affinity</key> @@ -554,7 +778,7 @@ </param> <param> <key>_coordinate</key> - <value>(530, 382)</value> + <value>(52, 527)</value> </param> <param> <key>_rotation</key> @@ -562,78 +786,117 @@ </param> </block> <block> - <key>digital_ofdm_tx</key> + <key>variable_qtgui_range</key> <param> <key>id</key> - <value>digital_ofdm_tx_0</value> + <value>freq_offset</value> </param> <param> <key>_enabled</key> <value>True</value> </param> <param> - <key>fft_len</key> - <value>fft_len</value> + <key>label</key> + <value>Frequency Offset (Multiples of Sub-carrier spacing)</value> </param> <param> - <key>cp_len</key> - <value>fft_len/4</value> + <key>value</key> + <value>0</value> </param> <param> - <key>packet_len_key</key> - <value>len_tag_key</value> + <key>start</key> + <value>-3</value> </param> <param> - <key>occupied_carriers</key> - <value>()</value> + <key>stop</key> + <value>3</value> </param> <param> - <key>pilot_carriers</key> - <value>()</value> + <key>step</key> + <value>.01</value> </param> <param> - <key>pilot_symbols</key> - <value>()</value> + <key>widget</key> + <value>counter_slider</value> </param> <param> - <key>sync_word1</key> - <value>()</value> + <key>orient</key> + <value>Qt.Horizontal</value> </param> <param> - <key>sync_word2</key> - <value>()</value> + <key>min_len</key> + <value>200</value> </param> <param> - <key>header_mod</key> - <value>"BPSK"</value> + <key>gui_hint</key> + <value></value> </param> <param> - <key>payload_mod</key> - <value>"QPSK"</value> + <key>alias</key> + <value></value> </param> <param> - <key>rolloff</key> + <key>_coordinate</key> + <value>(458, 518)</value> + </param> + <param> + <key>_rotation</key> <value>0</value> </param> + </block> + <block> + <key>variable_qtgui_range</key> <param> - <key>scramble_bits</key> - <value>False</value> + <key>id</key> + <value>noise_voltage</value> </param> <param> - <key>log</key> - <value>False</value> + <key>_enabled</key> + <value>True</value> </param> <param> - <key>affinity</key> - <value></value> + <key>label</key> + <value>Noise Amplitude</value> </param> <param> - <key>minoutbuf</key> + <key>value</key> + <value>0.1</value> + </param> + <param> + <key>start</key> <value>0</value> </param> <param> + <key>stop</key> + <value>1</value> + </param> + <param> + <key>step</key> + <value>.01</value> + </param> + <param> + <key>widget</key> + <value>counter_slider</value> + </param> + <param> + <key>orient</key> + <value>Qt.Horizontal</value> + </param> + <param> + <key>min_len</key> + <value>200</value> + </param> + <param> + <key>gui_hint</key> + <value></value> + </param> + <param> + <key>alias</key> + <value></value> + </param> + <param> <key>_coordinate</key> - <value>(557, 94)</value> + <value>(652, 501)</value> </param> <param> <key>_rotation</key> @@ -641,40 +904,83 @@ </param> </block> <block> - <key>channels_channel_model</key> + <key>options</key> <param> <key>id</key> - <value>channels_channel_model_0</value> + <value>ofdm_loopback_example</value> </param> <param> <key>_enabled</key> <value>True</value> </param> <param> - <key>noise_voltage</key> - <value>noise_voltage</value> + <key>title</key> + <value>OFDM Loopback Example</value> </param> <param> - <key>freq_offset</key> - <value>freq_offset * 1.0/fft_len</value> + <key>author</key> + <value></value> </param> <param> - <key>epsilon</key> - <value>1.0</value> + <key>description</key> + <value>Transmit a pre-defined signal (a complex sine) as OFDM packets.</value> </param> <param> - <key>taps</key> - <value>1.0 + 1.0j</value> + <key>window_size</key> + <value>1280, 1024</value> </param> <param> - <key>seed</key> + <key>generate_options</key> + <value>qt_gui</value> + </param> + <param> + <key>category</key> + <value>Custom</value> + </param> + <param> + <key>run_options</key> + <value>prompt</value> + </param> + <param> + <key>run</key> + <value>True</value> + </param> + <param> + <key>max_nouts</key> <value>0</value> </param> <param> - <key>block_tags</key> + <key>realtime_scheduling</key> + <value></value> + </param> + <param> + <key>alias</key> + <value></value> + </param> + <param> + <key>_coordinate</key> + <value>(0, -1)</value> + </param> + <param> + <key>_rotation</key> + <value>0</value> + </param> + </block> + <block> + <key>blocks_uchar_to_float</key> + <param> + <key>id</key> + <value>blocks_uchar_to_float_0</value> + </param> + <param> + <key>_enabled</key> <value>True</value> </param> <param> + <key>alias</key> + <value></value> + </param> + <param> <key>affinity</key> <value></value> </param> @@ -683,19 +989,23 @@ <value>0</value> </param> <param> + <key>maxoutbuf</key> + <value>0</value> + </param> + <param> <key>_coordinate</key> - <value>(453, 244)</value> + <value>(326, 408)</value> </param> <param> <key>_rotation</key> - <value>180</value> + <value>0</value> </param> </block> <block> - <key>blocks_throttle</key> + <key>qtgui_time_sink_x</key> <param> <key>id</key> - <value>blocks_throttle_0</value> + <value>qtgui_time_sink_x_0</value> </param> <param> <key>_enabled</key> @@ -703,137 +1013,323 @@ </param> <param> <key>type</key> - <value>complex</value> + <value>float</value> </param> <param> - <key>samples_per_second</key> + <key>name</key> + <value>Scope Plot</value> + </param> + <param> + <key>size</key> + <value>1024</value> + </param> + <param> + <key>srate</key> <value>samp_rate</value> </param> <param> - <key>vlen</key> + <key>autoscale</key> + <value>True</value> + </param> + <param> + <key>ymin</key> + <value>-1</value> + </param> + <param> + <key>ymax</key> <value>1</value> </param> <param> - <key>affinity</key> + <key>nconnections</key> + <value>1</value> + </param> + <param> + <key>update_time</key> + <value>0.10</value> + </param> + <param> + <key>entags</key> + <value>True</value> + </param> + <param> + <key>gui_hint</key> <value></value> </param> <param> - <key>minoutbuf</key> + <key>tr_mode</key> + <value>qtgui.TRIG_MODE_FREE</value> + </param> + <param> + <key>tr_slope</key> + <value>qtgui.TRIG_SLOPE_POS</value> + </param> + <param> + <key>tr_level</key> + <value>0.0</value> + </param> + <param> + <key>tr_delay</key> <value>0</value> </param> <param> - <key>_coordinate</key> - <value>(177, 281)</value> + <key>tr_chan</key> + <value>0</value> </param> <param> - <key>_rotation</key> - <value>180</value> + <key>tr_tag</key> + <value>""</value> </param> - </block> - <block> - <key>variable_slider</key> <param> - <key>id</key> - <value>freq_offset</value> + <key>label1</key> + <value></value> </param> <param> - <key>_enabled</key> - <value>True</value> + <key>width1</key> + <value>1</value> </param> <param> - <key>label</key> - <value>Frequency Offset (Multiples of Sub-carrier spacing)</value> + <key>color1</key> + <value>"blue"</value> </param> <param> - <key>value</key> - <value>0</value> + <key>style1</key> + <value>1</value> </param> <param> - <key>min</key> - <value>-3</value> + <key>marker1</key> + <value>-1</value> </param> <param> - <key>max</key> - <value>3</value> + <key>alpha1</key> + <value>1.0</value> + </param> + <param> + <key>label2</key> + <value></value> </param> <param> - <key>num_steps</key> - <value>100</value> + <key>width2</key> + <value>1</value> + </param> + <param> + <key>color2</key> + <value>"red"</value> + </param> + <param> + <key>style2</key> + <value>1</value> </param> <param> - <key>style</key> - <value>wx.SL_HORIZONTAL</value> + <key>marker2</key> + <value>-1</value> </param> <param> - <key>converver</key> - <value>float_converter</value> + <key>alpha2</key> + <value>1.0</value> </param> <param> - <key>grid_pos</key> + <key>label3</key> <value></value> </param> <param> - <key>notebook</key> + <key>width3</key> + <value>1</value> + </param> + <param> + <key>color3</key> + <value>"green"</value> + </param> + <param> + <key>style3</key> + <value>1</value> + </param> + <param> + <key>marker3</key> + <value>-1</value> + </param> + <param> + <key>alpha3</key> + <value>1.0</value> + </param> + <param> + <key>label4</key> <value></value> </param> <param> - <key>_coordinate</key> - <value>(466, 508)</value> + <key>width4</key> + <value>1</value> </param> <param> - <key>_rotation</key> - <value>0</value> + <key>color4</key> + <value>"black"</value> </param> - </block> - <block> - <key>variable_slider</key> <param> - <key>id</key> - <value>noise_voltage</value> + <key>style4</key> + <value>1</value> </param> <param> - <key>_enabled</key> - <value>True</value> + <key>marker4</key> + <value>-1</value> </param> <param> - <key>label</key> - <value>Noise Amplitude</value> + <key>alpha4</key> + <value>1.0</value> </param> <param> - <key>value</key> - <value>0.01</value> + <key>label5</key> + <value></value> </param> <param> - <key>min</key> - <value>0</value> + <key>width5</key> + <value>1</value> + </param> + <param> + <key>color5</key> + <value>"cyan"</value> + </param> + <param> + <key>style5</key> + <value>1</value> + </param> + <param> + <key>marker5</key> + <value>-1</value> + </param> + <param> + <key>alpha5</key> + <value>1.0</value> + </param> + <param> + <key>label6</key> + <value></value> + </param> + <param> + <key>width6</key> + <value>1</value> + </param> + <param> + <key>color6</key> + <value>"magenta"</value> + </param> + <param> + <key>style6</key> + <value>1</value> + </param> + <param> + <key>marker6</key> + <value>-1</value> + </param> + <param> + <key>alpha6</key> + <value>1.0</value> + </param> + <param> + <key>label7</key> + <value></value> </param> <param> - <key>max</key> + <key>width7</key> <value>1</value> </param> <param> - <key>num_steps</key> - <value>100</value> + <key>color7</key> + <value>"yellow"</value> + </param> + <param> + <key>style7</key> + <value>1</value> </param> <param> - <key>style</key> - <value>wx.SL_HORIZONTAL</value> + <key>marker7</key> + <value>-1</value> </param> <param> - <key>converver</key> - <value>float_converter</value> + <key>alpha7</key> + <value>1.0</value> </param> <param> - <key>grid_pos</key> + <key>label8</key> <value></value> </param> <param> - <key>notebook</key> + <key>width8</key> + <value>1</value> + </param> + <param> + <key>color8</key> + <value>"dark red"</value> + </param> + <param> + <key>style8</key> + <value>1</value> + </param> + <param> + <key>marker8</key> + <value>-1</value> + </param> + <param> + <key>alpha8</key> + <value>1.0</value> + </param> + <param> + <key>label9</key> + <value></value> + </param> + <param> + <key>width9</key> + <value>1</value> + </param> + <param> + <key>color9</key> + <value>"dark green"</value> + </param> + <param> + <key>style9</key> + <value>1</value> + </param> + <param> + <key>marker9</key> + <value>-1</value> + </param> + <param> + <key>alpha9</key> + <value>1.0</value> + </param> + <param> + <key>label10</key> + <value></value> + </param> + <param> + <key>width10</key> + <value>1</value> + </param> + <param> + <key>color10</key> + <value>"blue"</value> + </param> + <param> + <key>style10</key> + <value>1</value> + </param> + <param> + <key>marker10</key> + <value>-1</value> + </param> + <param> + <key>alpha10</key> + <value>1.0</value> + </param> + <param> + <key>alias</key> + <value></value> + </param> + <param> + <key>affinity</key> <value></value> </param> <param> <key>_coordinate</key> - <value>(653, 505)</value> + <value>(550, 382)</value> </param> <param> <key>_rotation</key> @@ -848,12 +1344,6 @@ </connection> <connection> <source_block_id>blocks_throttle_0</source_block_id> - <sink_block_id>wxgui_fftsink2_0</sink_block_id> - <source_key>0</source_key> - <sink_key>0</sink_key> - </connection> - <connection> - <source_block_id>blocks_throttle_0</source_block_id> <sink_block_id>digital_ofdm_rx_0</sink_block_id> <source_key>0</source_key> <sink_key>0</sink_key> @@ -883,14 +1373,20 @@ <sink_key>0</sink_key> </connection> <connection> - <source_block_id>blocks_uchar_to_float_0</source_block_id> - <sink_block_id>wxgui_scopesink2_0</sink_block_id> + <source_block_id>channels_channel_model_0</source_block_id> + <sink_block_id>blocks_throttle_0</sink_block_id> <source_key>0</source_key> <sink_key>0</sink_key> </connection> <connection> - <source_block_id>channels_channel_model_0</source_block_id> - <sink_block_id>blocks_throttle_0</sink_block_id> + <source_block_id>blocks_throttle_0</source_block_id> + <sink_block_id>qtgui_freq_sink_x_0</sink_block_id> + <source_key>0</source_key> + <sink_key>0</sink_key> + </connection> + <connection> + <source_block_id>blocks_uchar_to_float_0</source_block_id> + <sink_block_id>qtgui_time_sink_x_0</sink_block_id> <source_key>0</source_key> <sink_key>0</sink_key> </connection> diff --git a/gr-digital/examples/ofdm/rx_ofdm.grc b/gr-digital/examples/ofdm/rx_ofdm.grc index 3853853a27..0d00567712 100644 --- a/gr-digital/examples/ofdm/rx_ofdm.grc +++ b/gr-digital/examples/ofdm/rx_ofdm.grc @@ -1,59 +1,27 @@ <?xml version='1.0' encoding='ASCII'?> <flow_graph> - <timestamp>Sun Feb 2 14:07:51 2014</timestamp> + <timestamp>Wed Jul 9 15:50:17 2014</timestamp> <block> - <key>options</key> + <key>variable</key> <param> <key>id</key> - <value>rx_ofdm</value> + <value>samp_rate</value> </param> <param> <key>_enabled</key> <value>True</value> </param> <param> - <key>title</key> - <value>OFDM Rx</value> - </param> - <param> - <key>author</key> - <value></value> - </param> - <param> - <key>description</key> - <value>Example of an OFDM receiver</value> - </param> - <param> - <key>window_size</key> - <value>1280, 1024</value> - </param> - <param> - <key>generate_options</key> - <value>wx_gui</value> - </param> - <param> - <key>category</key> - <value>Custom</value> - </param> - <param> - <key>run_options</key> - <value>prompt</value> - </param> - <param> - <key>run</key> - <value>True</value> - </param> - <param> - <key>max_nouts</key> - <value>0</value> + <key>value</key> + <value>10000</value> </param> <param> - <key>realtime_scheduling</key> + <key>alias</key> <value></value> </param> <param> <key>_coordinate</key> - <value>(0, -1)</value> + <value>(170, 65)</value> </param> <param> <key>_rotation</key> @@ -64,7 +32,7 @@ <key>variable</key> <param> <key>id</key> - <value>payload_mod</value> + <value>header_formatter</value> </param> <param> <key>_enabled</key> @@ -72,11 +40,15 @@ </param> <param> <key>value</key> - <value>digital.constellation_qpsk()</value> + <value>digital.packet_header_ofdm(occupied_carriers, n_syms=1, len_tag_key=packet_length_tag_key, frame_len_tag_key=length_tag_key, bits_per_header_sym=header_mod.bits_per_symbol(), bits_per_payload_sym=payload_mod.bits_per_symbol(), scramble_header=False)</value> + </param> + <param> + <key>alias</key> + <value></value> </param> <param> <key>_coordinate</key> - <value>(663, 1)</value> + <value>(855, 0)</value> </param> <param> <key>_rotation</key> @@ -87,7 +59,7 @@ <key>variable</key> <param> <key>id</key> - <value>samp_rate</value> + <value>packet_length_tag_key</value> </param> <param> <key>_enabled</key> @@ -95,11 +67,15 @@ </param> <param> <key>value</key> - <value>10000</value> + <value>"packet_len"</value> + </param> + <param> + <key>alias</key> + <value></value> </param> <param> <key>_coordinate</key> - <value>(170, 65)</value> + <value>(1132, 0)</value> </param> <param> <key>_rotation</key> @@ -110,7 +86,7 @@ <key>variable</key> <param> <key>id</key> - <value>header_equalizer</value> + <value>length_tag_key</value> </param> <param> <key>_enabled</key> @@ -118,11 +94,15 @@ </param> <param> <key>value</key> - <value>digital.ofdm_equalizer_simpledfe(fft_len, header_mod.base(), occupied_carriers, pilot_carriers, pilot_symbols)</value> + <value>"frame_len"</value> + </param> + <param> + <key>alias</key> + <value></value> </param> <param> <key>_coordinate</key> - <value>(931, 69)</value> + <value>(367, -1)</value> </param> <param> <key>_rotation</key> @@ -133,7 +113,7 @@ <key>variable</key> <param> <key>id</key> - <value>payload_equalizer</value> + <value>occupied_carriers</value> </param> <param> <key>_enabled</key> @@ -141,11 +121,15 @@ </param> <param> <key>value</key> - <value>digital.ofdm_equalizer_simpledfe(fft_len, payload_mod.base(), occupied_carriers, pilot_carriers, pilot_symbols, 1)</value> + <value>(range(-26, -21) + range(-20, -7) + range(-6, 0) + range(1, 7) + range(8, 21) + range(22, 27),)</value> + </param> + <param> + <key>alias</key> + <value></value> </param> <param> <key>_coordinate</key> - <value>(1112, 73)</value> + <value>(541, 70)</value> </param> <param> <key>_rotation</key> @@ -156,7 +140,7 @@ <key>variable</key> <param> <key>id</key> - <value>sync_word2</value> + <value>pilot_symbols</value> </param> <param> <key>_enabled</key> @@ -164,11 +148,15 @@ </param> <param> <key>value</key> - <value>[0j, 0j, 0j, 0j, 0j, 0j, (-1+0j), (-1+0j), (-1+0j), (-1+0j), (1+0j), (1+0j), (-1+0j), (-1+0j), (-1+0j), (1+0j), (-1+0j), (1+0j), (1+0j), (1 +0j), (1+0j), (1+0j), (-1+0j), (-1+0j), (-1+0j), (-1+0j), (-1+0j), (1+0j), (-1+0j), (-1+0j), (1+0j), (-1+0j), 0j, (1+0j), (-1+0j), (1+0j), (1+0j), (1+0j), (-1+0j), (1+0j), (1+0j), (1+0j), (-1+0j), (1+0j), (1+0j), (1+0j), (1+0j), (-1+0j), (1+0j), (-1+0j), (-1+0j), (-1+0j), (1+0j), (-1+0j), (1+0j), (-1+0j), (-1+0j), (-1+0j), (-1+0j), 0j, 0j, 0j, 0j, 0j]</value> + <value>((1, 1, 1, -1,),)</value> + </param> + <param> + <key>alias</key> + <value></value> </param> <param> <key>_coordinate</key> - <value>(399, 66)</value> + <value>(813, 70)</value> </param> <param> <key>_rotation</key> @@ -179,7 +167,7 @@ <key>variable</key> <param> <key>id</key> - <value>sync_word1</value> + <value>pilot_carriers</value> </param> <param> <key>_enabled</key> @@ -187,11 +175,15 @@ </param> <param> <key>value</key> - <value>[0., 0., 0., 0., 0., 0., 0., 1.41421356, 0., -1.41421356, 0., 1.41421356, 0., -1.41421356, 0., -1.41421356, 0., -1.41421356, 0., 1.41421356, 0., -1.41421356, 0., 1.41421356, 0., -1.41421356, 0., -1.41421356, 0., -1.41421356, 0., -1.41421356, 0., 1.41421356, 0., -1.41421356, 0., 1.41421356, 0., 1.41421356, 0., 1.41421356, 0., -1.41421356, 0., 1.41421356, 0., 1.41421356, 0., 1.41421356, 0., -1.41421356, 0., 1.41421356, 0., 1.41421356, 0., 1.41421356, 0., 0., 0., 0., 0., 0.]</value> + <value>((-21, -7, 7, 21,),)</value> + </param> + <param> + <key>alias</key> + <value></value> </param> <param> <key>_coordinate</key> - <value>(255, 67)</value> + <value>(692, 70)</value> </param> <param> <key>_rotation</key> @@ -202,7 +194,7 @@ <key>variable</key> <param> <key>id</key> - <value>fft_len</value> + <value>packet_len</value> </param> <param> <key>_enabled</key> @@ -210,11 +202,15 @@ </param> <param> <key>value</key> - <value>64</value> + <value>96</value> + </param> + <param> + <key>alias</key> + <value></value> </param> <param> <key>_coordinate</key> - <value>(301, -1)</value> + <value>(1034, 0)</value> </param> <param> <key>_rotation</key> @@ -236,6 +232,10 @@ <value>digital.constellation_bpsk()</value> </param> <param> + <key>alias</key> + <value></value> + </param> + <param> <key>_coordinate</key> <value>(490, 0)</value> </param> @@ -248,7 +248,7 @@ <key>variable</key> <param> <key>id</key> - <value>packet_len</value> + <value>fft_len</value> </param> <param> <key>_enabled</key> @@ -256,34 +256,15 @@ </param> <param> <key>value</key> - <value>96</value> - </param> - <param> - <key>_coordinate</key> - <value>(1034, 0)</value> - </param> - <param> - <key>_rotation</key> - <value>0</value> - </param> - </block> - <block> - <key>variable</key> - <param> - <key>id</key> - <value>pilot_carriers</value> - </param> - <param> - <key>_enabled</key> - <value>True</value> + <value>64</value> </param> <param> - <key>value</key> - <value>((-21, -7, 7, 21,),)</value> + <key>alias</key> + <value></value> </param> <param> <key>_coordinate</key> - <value>(692, 70)</value> + <value>(301, -1)</value> </param> <param> <key>_rotation</key> @@ -294,7 +275,7 @@ <key>variable</key> <param> <key>id</key> - <value>pilot_symbols</value> + <value>sync_word1</value> </param> <param> <key>_enabled</key> @@ -302,11 +283,15 @@ </param> <param> <key>value</key> - <value>((1, 1, 1, -1,),)</value> + <value>[0., 0., 0., 0., 0., 0., 0., 1.41421356, 0., -1.41421356, 0., 1.41421356, 0., -1.41421356, 0., -1.41421356, 0., -1.41421356, 0., 1.41421356, 0., -1.41421356, 0., 1.41421356, 0., -1.41421356, 0., -1.41421356, 0., -1.41421356, 0., -1.41421356, 0., 1.41421356, 0., -1.41421356, 0., 1.41421356, 0., 1.41421356, 0., 1.41421356, 0., -1.41421356, 0., 1.41421356, 0., 1.41421356, 0., 1.41421356, 0., -1.41421356, 0., 1.41421356, 0., 1.41421356, 0., 1.41421356, 0., 0., 0., 0., 0., 0.]</value> + </param> + <param> + <key>alias</key> + <value></value> </param> <param> <key>_coordinate</key> - <value>(813, 70)</value> + <value>(255, 67)</value> </param> <param> <key>_rotation</key> @@ -317,7 +302,7 @@ <key>variable</key> <param> <key>id</key> - <value>occupied_carriers</value> + <value>sync_word2</value> </param> <param> <key>_enabled</key> @@ -325,11 +310,15 @@ </param> <param> <key>value</key> - <value>(range(-26, -21) + range(-20, -7) + range(-6, 0) + range(1, 7) + range(8, 21) + range(22, 27),)</value> + <value>[0j, 0j, 0j, 0j, 0j, 0j, (-1+0j), (-1+0j), (-1+0j), (-1+0j), (1+0j), (1+0j), (-1+0j), (-1+0j), (-1+0j), (1+0j), (-1+0j), (1+0j), (1+0j), (1 +0j), (1+0j), (1+0j), (-1+0j), (-1+0j), (-1+0j), (-1+0j), (-1+0j), (1+0j), (-1+0j), (-1+0j), (1+0j), (-1+0j), 0j, (1+0j), (-1+0j), (1+0j), (1+0j), (1+0j), (-1+0j), (1+0j), (1+0j), (1+0j), (-1+0j), (1+0j), (1+0j), (1+0j), (1+0j), (-1+0j), (1+0j), (-1+0j), (-1+0j), (-1+0j), (1+0j), (-1+0j), (1+0j), (-1+0j), (-1+0j), (-1+0j), (-1+0j), 0j, 0j, 0j, 0j, 0j]</value> + </param> + <param> + <key>alias</key> + <value></value> </param> <param> <key>_coordinate</key> - <value>(541, 70)</value> + <value>(399, 66)</value> </param> <param> <key>_rotation</key> @@ -340,7 +329,7 @@ <key>variable</key> <param> <key>id</key> - <value>length_tag_key</value> + <value>payload_equalizer</value> </param> <param> <key>_enabled</key> @@ -348,11 +337,15 @@ </param> <param> <key>value</key> - <value>"frame_len"</value> + <value>digital.ofdm_equalizer_simpledfe(fft_len, payload_mod.base(), occupied_carriers, pilot_carriers, pilot_symbols, 1)</value> + </param> + <param> + <key>alias</key> + <value></value> </param> <param> <key>_coordinate</key> - <value>(367, -1)</value> + <value>(1112, 73)</value> </param> <param> <key>_rotation</key> @@ -363,7 +356,7 @@ <key>variable</key> <param> <key>id</key> - <value>packet_length_tag_key</value> + <value>header_equalizer</value> </param> <param> <key>_enabled</key> @@ -371,11 +364,15 @@ </param> <param> <key>value</key> - <value>"packet_len"</value> + <value>digital.ofdm_equalizer_simpledfe(fft_len, header_mod.base(), occupied_carriers, pilot_carriers, pilot_symbols)</value> + </param> + <param> + <key>alias</key> + <value></value> </param> <param> <key>_coordinate</key> - <value>(1132, 0)</value> + <value>(931, 69)</value> </param> <param> <key>_rotation</key> @@ -386,7 +383,7 @@ <key>variable</key> <param> <key>id</key> - <value>header_formatter</value> + <value>payload_mod</value> </param> <param> <key>_enabled</key> @@ -394,11 +391,15 @@ </param> <param> <key>value</key> - <value>digital.packet_header_ofdm(occupied_carriers, n_syms=1, len_tag_key=packet_length_tag_key, frame_len_tag_key=length_tag_key, bits_per_header_sym=header_mod.bits_per_symbol(), bits_per_payload_sym=payload_mod.bits_per_symbol(), scramble_header=False)</value> + <value>digital.constellation_qpsk()</value> + </param> + <param> + <key>alias</key> + <value></value> </param> <param> <key>_coordinate</key> - <value>(855, 0)</value> + <value>(663, 1)</value> </param> <param> <key>_rotation</key> @@ -420,6 +421,10 @@ <value>from gnuradio.digital.utils import tagged_streams</value> </param> <param> + <key>alias</key> + <value></value> + </param> + <param> <key>_coordinate</key> <value>(163, 0)</value> </param> @@ -459,6 +464,10 @@ <value>True</value> </param> <param> + <key>alias</key> + <value></value> + </param> + <param> <key>affinity</key> <value></value> </param> @@ -494,6 +503,10 @@ <value>-2.0/fft_len</value> </param> <param> + <key>alias</key> + <value></value> + </param> + <param> <key>affinity</key> <value></value> </param> @@ -541,6 +554,10 @@ <value>True</value> </param> <param> + <key>alias</key> + <value></value> + </param> + <param> <key>affinity</key> <value></value> </param> @@ -584,6 +601,10 @@ <value>1</value> </param> <param> + <key>alias</key> + <value></value> + </param> + <param> <key>affinity</key> <value></value> </param> @@ -627,6 +648,10 @@ <value>False</value> </param> <param> + <key>alias</key> + <value></value> + </param> + <param> <key>affinity</key> <value></value> </param> @@ -662,6 +687,10 @@ <value>header_formatter.base()</value> </param> <param> + <key>alias</key> + <value></value> + </param> + <param> <key>affinity</key> <value></value> </param> @@ -697,6 +726,10 @@ <value>header_mod.base()</value> </param> <param> + <key>alias</key> + <value></value> + </param> + <param> <key>affinity</key> <value></value> </param> @@ -752,6 +785,10 @@ <value>1</value> </param> <param> + <key>alias</key> + <value></value> + </param> + <param> <key>affinity</key> <value></value> </param> @@ -822,6 +859,10 @@ <value>packet_length_tag_key</value> </param> <param> + <key>alias</key> + <value></value> + </param> + <param> <key>affinity</key> <value></value> </param> @@ -877,6 +918,10 @@ <value>False</value> </param> <param> + <key>alias</key> + <value></value> + </param> + <param> <key>affinity</key> <value></value> </param> @@ -932,6 +977,10 @@ <value>1</value> </param> <param> + <key>alias</key> + <value></value> + </param> + <param> <key>affinity</key> <value></value> </param> @@ -1056,6 +1105,10 @@ <value>1</value> </param> <param> + <key>alias</key> + <value></value> + </param> + <param> <key>affinity</key> <value></value> </param> @@ -1111,6 +1164,10 @@ <value>0</value> </param> <param> + <key>alias</key> + <value></value> + </param> + <param> <key>affinity</key> <value></value> </param> @@ -1173,6 +1230,10 @@ <value>packet_length_tag_key</value> </param> <param> + <key>alias</key> + <value></value> + </param> + <param> <key>affinity</key> <value></value> </param> @@ -1220,6 +1281,10 @@ <value>True</value> </param> <param> + <key>alias</key> + <value></value> + </param> + <param> <key>affinity</key> <value></value> </param> @@ -1255,6 +1320,10 @@ <value>payload_mod.base()</value> </param> <param> + <key>alias</key> + <value></value> + </param> + <param> <key>affinity</key> <value></value> </param> @@ -1333,6 +1402,10 @@ <value>True</value> </param> <param> + <key>alias</key> + <value></value> + </param> + <param> <key>affinity</key> <value></value> </param> @@ -1380,6 +1453,10 @@ <value>True</value> </param> <param> + <key>alias</key> + <value></value> + </param> + <param> <key>affinity</key> <value></value> </param> @@ -1463,6 +1540,10 @@ <value>True</value> </param> <param> + <key>alias</key> + <value></value> + </param> + <param> <key>affinity</key> <value></value> </param> @@ -1534,6 +1615,10 @@ <value>()</value> </param> <param> + <key>alias</key> + <value></value> + </param> + <param> <key>affinity</key> <value></value> </param> @@ -1593,6 +1678,10 @@ <value>True</value> </param> <param> + <key>alias</key> + <value></value> + </param> + <param> <key>affinity</key> <value></value> </param> @@ -1652,6 +1741,10 @@ <value>True</value> </param> <param> + <key>alias</key> + <value></value> + </param> + <param> <key>affinity</key> <value></value> </param> @@ -1699,6 +1792,10 @@ <value>1</value> </param> <param> + <key>alias</key> + <value></value> + </param> + <param> <key>affinity</key> <value></value> </param> @@ -1719,6 +1816,69 @@ <value>0</value> </param> </block> + <block> + <key>options</key> + <param> + <key>id</key> + <value>rx_ofdm</value> + </param> + <param> + <key>_enabled</key> + <value>True</value> + </param> + <param> + <key>title</key> + <value>OFDM Rx</value> + </param> + <param> + <key>author</key> + <value></value> + </param> + <param> + <key>description</key> + <value>Example of an OFDM receiver</value> + </param> + <param> + <key>window_size</key> + <value>1280, 1024</value> + </param> + <param> + <key>generate_options</key> + <value>qt_gui</value> + </param> + <param> + <key>category</key> + <value>Custom</value> + </param> + <param> + <key>run_options</key> + <value>prompt</value> + </param> + <param> + <key>run</key> + <value>True</value> + </param> + <param> + <key>max_nouts</key> + <value>0</value> + </param> + <param> + <key>realtime_scheduling</key> + <value></value> + </param> + <param> + <key>alias</key> + <value></value> + </param> + <param> + <key>_coordinate</key> + <value>(1, 0)</value> + </param> + <param> + <key>_rotation</key> + <value>0</value> + </param> + </block> <connection> <source_block_id>analog_random_source_x_0</source_block_id> <sink_block_id>blocks_stream_to_tagged_stream_0</sink_block_id> diff --git a/gr-digital/examples/ofdm/tx_ofdm.grc b/gr-digital/examples/ofdm/tx_ofdm.grc index 80d7f7f9e4..368f16bd80 100644 --- a/gr-digital/examples/ofdm/tx_ofdm.grc +++ b/gr-digital/examples/ofdm/tx_ofdm.grc @@ -1,59 +1,27 @@ <?xml version='1.0' encoding='ASCII'?> <flow_graph> - <timestamp>Sun Nov 3 18:45:28 2013</timestamp> + <timestamp>Wed Jul 9 15:49:47 2014</timestamp> <block> - <key>options</key> + <key>variable</key> <param> <key>id</key> - <value>tx_ofdm</value> + <value>sync_word2</value> </param> <param> <key>_enabled</key> <value>True</value> </param> <param> - <key>title</key> - <value>OFDM Tx</value> - </param> - <param> - <key>author</key> - <value></value> - </param> - <param> - <key>description</key> - <value>Example of an OFDM Transmitter</value> - </param> - <param> - <key>window_size</key> - <value>1280, 1024</value> - </param> - <param> - <key>generate_options</key> - <value>wx_gui</value> - </param> - <param> - <key>category</key> - <value>Custom</value> - </param> - <param> - <key>run_options</key> - <value>run</value> - </param> - <param> - <key>run</key> - <value>True</value> - </param> - <param> - <key>max_nouts</key> - <value>0</value> + <key>value</key> + <value>[0, 0, 0, 0, 0, 0, -1, -1, -1, -1, 1, 1, -1, -1, -1, 1, -1, 1, 1, 1, 1, 1, -1, -1, -1, -1, -1, 1, -1, -1, 1, -1, 0, 1, -1, 1, 1, 1, -1, 1, 1, 1, -1, 1, 1, 1, 1, -1, 1, -1, -1, -1, 1, -1, 1, -1, -1, -1, -1, 0, 0, 0, 0, 0] </value> </param> <param> - <key>realtime_scheduling</key> + <key>alias</key> <value></value> </param> <param> <key>_coordinate</key> - <value>(0, -1)</value> + <value>(496, 128)</value> </param> <param> <key>_rotation</key> @@ -64,7 +32,7 @@ <key>variable</key> <param> <key>id</key> - <value>sync_word1</value> + <value>length_tag_key</value> </param> <param> <key>_enabled</key> @@ -72,11 +40,15 @@ </param> <param> <key>value</key> - <value>[0., 0., 0., 0., 0., 0., 0., 1.41421356, 0., -1.41421356, 0., 1.41421356, 0., -1.41421356, 0., -1.41421356, 0., -1.41421356, 0., 1.41421356, 0., -1.41421356, 0., 1.41421356, 0., -1.41421356, 0., -1.41421356, 0., -1.41421356, 0., -1.41421356, 0., 1.41421356, 0., -1.41421356, 0., 1.41421356, 0., 1.41421356, 0., 1.41421356, 0., -1.41421356, 0., 1.41421356, 0., 1.41421356, 0., 1.41421356, 0., -1.41421356, 0., 1.41421356, 0., 1.41421356, 0., 1.41421356, 0., 0., 0., 0., 0., 0.]</value> + <value>"packet_len"</value> + </param> + <param> + <key>alias</key> + <value></value> </param> <param> <key>_coordinate</key> - <value>(352, 128)</value> + <value>(352, 0)</value> </param> <param> <key>_rotation</key> @@ -87,7 +59,7 @@ <key>variable</key> <param> <key>id</key> - <value>sync_word2</value> + <value>samp_rate</value> </param> <param> <key>_enabled</key> @@ -95,11 +67,15 @@ </param> <param> <key>value</key> - <value>[0, 0, 0, 0, 0, 0, -1, -1, -1, -1, 1, 1, -1, -1, -1, 1, -1, 1, 1, 1, 1, 1, -1, -1, -1, -1, -1, 1, -1, -1, 1, -1, 0, 1, -1, 1, 1, 1, -1, 1, 1, 1, -1, 1, 1, 1, 1, -1, 1, -1, -1, -1, 1, -1, 1, -1, -1, -1, -1, 0, 0, 0, 0, 0] </value> + <value>100000</value> + </param> + <param> + <key>alias</key> + <value></value> </param> <param> <key>_coordinate</key> - <value>(496, 128)</value> + <value>(255, 0)</value> </param> <param> <key>_rotation</key> @@ -110,7 +86,7 @@ <key>variable</key> <param> <key>id</key> - <value>pilot_symbols</value> + <value>rolloff</value> </param> <param> <key>_enabled</key> @@ -118,11 +94,15 @@ </param> <param> <key>value</key> - <value>((1, 1, 1, -1,),)</value> + <value>0</value> + </param> + <param> + <key>alias</key> + <value></value> </param> <param> <key>_coordinate</key> - <value>(601, 64)</value> + <value>(898, -1)</value> </param> <param> <key>_rotation</key> @@ -133,7 +113,7 @@ <key>variable</key> <param> <key>id</key> - <value>occupied_carriers</value> + <value>payload_mod</value> </param> <param> <key>_enabled</key> @@ -141,11 +121,15 @@ </param> <param> <key>value</key> - <value>(range(-26, -21) + range(-20, -7) + range(-6, 0) + range(1, 7) + range(8, 21) + range(22, 27),)</value> + <value>digital.constellation_qpsk()</value> + </param> + <param> + <key>alias</key> + <value></value> </param> <param> <key>_coordinate</key> - <value>(329, 64)</value> + <value>(734, 0)</value> </param> <param> <key>_rotation</key> @@ -156,7 +140,7 @@ <key>variable</key> <param> <key>id</key> - <value>pilot_carriers</value> + <value>header_mod</value> </param> <param> <key>_enabled</key> @@ -164,11 +148,15 @@ </param> <param> <key>value</key> - <value>((-21, -7, 7, 21,),)</value> + <value>digital.constellation_bpsk()</value> + </param> + <param> + <key>alias</key> + <value></value> </param> <param> <key>_coordinate</key> - <value>(480, 64)</value> + <value>(567, 0)</value> </param> <param> <key>_rotation</key> @@ -179,7 +167,7 @@ <key>variable</key> <param> <key>id</key> - <value>header_formatter</value> + <value>packet_len</value> </param> <param> <key>_enabled</key> @@ -187,11 +175,15 @@ </param> <param> <key>value</key> - <value>digital.packet_header_ofdm(occupied_carriers, 1, length_tag_key)</value> + <value>96</value> + </param> + <param> + <key>alias</key> + <value></value> </param> <param> <key>_coordinate</key> - <value>(708, 64)</value> + <value>(476, 0)</value> </param> <param> <key>_rotation</key> @@ -213,6 +205,10 @@ <value>64</value> </param> <param> + <key>alias</key> + <value></value> + </param> + <param> <key>_coordinate</key> <value>(181, -1)</value> </param> @@ -225,7 +221,7 @@ <key>variable</key> <param> <key>id</key> - <value>packet_len</value> + <value>header_formatter</value> </param> <param> <key>_enabled</key> @@ -233,34 +229,15 @@ </param> <param> <key>value</key> - <value>96</value> - </param> - <param> - <key>_coordinate</key> - <value>(476, 0)</value> - </param> - <param> - <key>_rotation</key> - <value>0</value> - </param> - </block> - <block> - <key>variable</key> - <param> - <key>id</key> - <value>header_mod</value> - </param> - <param> - <key>_enabled</key> - <value>True</value> + <value>digital.packet_header_ofdm(occupied_carriers, 1, length_tag_key)</value> </param> <param> - <key>value</key> - <value>digital.constellation_bpsk()</value> + <key>alias</key> + <value></value> </param> <param> <key>_coordinate</key> - <value>(567, 0)</value> + <value>(708, 64)</value> </param> <param> <key>_rotation</key> @@ -271,7 +248,7 @@ <key>variable</key> <param> <key>id</key> - <value>payload_mod</value> + <value>pilot_carriers</value> </param> <param> <key>_enabled</key> @@ -279,11 +256,15 @@ </param> <param> <key>value</key> - <value>digital.constellation_qpsk()</value> + <value>((-21, -7, 7, 21,),)</value> + </param> + <param> + <key>alias</key> + <value></value> </param> <param> <key>_coordinate</key> - <value>(734, 0)</value> + <value>(480, 64)</value> </param> <param> <key>_rotation</key> @@ -294,7 +275,7 @@ <key>variable</key> <param> <key>id</key> - <value>rolloff</value> + <value>occupied_carriers</value> </param> <param> <key>_enabled</key> @@ -302,11 +283,15 @@ </param> <param> <key>value</key> - <value>0</value> + <value>(range(-26, -21) + range(-20, -7) + range(-6, 0) + range(1, 7) + range(8, 21) + range(22, 27),)</value> + </param> + <param> + <key>alias</key> + <value></value> </param> <param> <key>_coordinate</key> - <value>(898, -1)</value> + <value>(329, 64)</value> </param> <param> <key>_rotation</key> @@ -317,7 +302,7 @@ <key>variable</key> <param> <key>id</key> - <value>samp_rate</value> + <value>pilot_symbols</value> </param> <param> <key>_enabled</key> @@ -325,11 +310,15 @@ </param> <param> <key>value</key> - <value>100000</value> + <value>((1, 1, 1, -1,),)</value> + </param> + <param> + <key>alias</key> + <value></value> </param> <param> <key>_coordinate</key> - <value>(255, 0)</value> + <value>(601, 64)</value> </param> <param> <key>_rotation</key> @@ -340,7 +329,7 @@ <key>variable</key> <param> <key>id</key> - <value>length_tag_key</value> + <value>sync_word1</value> </param> <param> <key>_enabled</key> @@ -348,11 +337,15 @@ </param> <param> <key>value</key> - <value>"packet_len"</value> + <value>[0., 0., 0., 0., 0., 0., 0., 1.41421356, 0., -1.41421356, 0., 1.41421356, 0., -1.41421356, 0., -1.41421356, 0., -1.41421356, 0., 1.41421356, 0., -1.41421356, 0., 1.41421356, 0., -1.41421356, 0., -1.41421356, 0., -1.41421356, 0., -1.41421356, 0., 1.41421356, 0., -1.41421356, 0., 1.41421356, 0., 1.41421356, 0., 1.41421356, 0., -1.41421356, 0., 1.41421356, 0., 1.41421356, 0., 1.41421356, 0., -1.41421356, 0., 1.41421356, 0., 1.41421356, 0., 1.41421356, 0., 0., 0., 0., 0., 0.]</value> + </param> + <param> + <key>alias</key> + <value></value> </param> <param> <key>_coordinate</key> - <value>(352, 0)</value> + <value>(352, 128)</value> </param> <param> <key>_rotation</key> @@ -397,6 +390,10 @@ <value>import numpy</value> </param> <param> + <key>alias</key> + <value></value> + </param> + <param> <key>_coordinate</key> <value>(237, 93)</value> </param> @@ -420,6 +417,10 @@ <value>from gnuradio.digital.utils import tagged_streams</value> </param> <param> + <key>alias</key> + <value></value> + </param> + <param> <key>_coordinate</key> <value>(99, 93)</value> </param> @@ -443,6 +444,10 @@ <value>import random</value> </param> <param> + <key>alias</key> + <value></value> + </param> + <param> <key>_coordinate</key> <value>(3, 94)</value> </param> @@ -528,6 +533,10 @@ <value>1</value> </param> <param> + <key>alias</key> + <value></value> + </param> + <param> <key>affinity</key> <value></value> </param> @@ -536,6 +545,10 @@ <value>0</value> </param> <param> + <key>maxoutbuf</key> + <value>0</value> + </param> + <param> <key>_coordinate</key> <value>(212, 450)</value> </param> @@ -625,6 +638,10 @@ <value>1</value> </param> <param> + <key>alias</key> + <value></value> + </param> + <param> <key>affinity</key> <value></value> </param> @@ -633,6 +650,10 @@ <value>0</value> </param> <param> + <key>maxoutbuf</key> + <value>0</value> + </param> + <param> <key>_coordinate</key> <value>(414, 548)</value> </param> @@ -664,6 +685,10 @@ <value>1</value> </param> <param> + <key>alias</key> + <value></value> + </param> + <param> <key>affinity</key> <value></value> </param> @@ -672,6 +697,10 @@ <value>0</value> </param> <param> + <key>maxoutbuf</key> + <value>0</value> + </param> + <param> <key>_coordinate</key> <value>(209, 747)</value> </param> @@ -711,6 +740,10 @@ <value>1</value> </param> <param> + <key>alias</key> + <value></value> + </param> + <param> <key>affinity</key> <value></value> </param> @@ -719,6 +752,10 @@ <value>0</value> </param> <param> + <key>maxoutbuf</key> + <value>0</value> + </param> + <param> <key>_coordinate</key> <value>(214, 376)</value> </param> @@ -758,6 +795,10 @@ <value>True</value> </param> <param> + <key>alias</key> + <value></value> + </param> + <param> <key>affinity</key> <value></value> </param> @@ -766,6 +807,10 @@ <value>0</value> </param> <param> + <key>maxoutbuf</key> + <value>0</value> + </param> + <param> <key>_coordinate</key> <value>(13, 220)</value> </param> @@ -805,6 +850,10 @@ <value>0</value> </param> <param> + <key>alias</key> + <value></value> + </param> + <param> <key>affinity</key> <value></value> </param> @@ -813,6 +862,10 @@ <value>0</value> </param> <param> + <key>maxoutbuf</key> + <value>0</value> + </param> + <param> <key>_coordinate</key> <value>(510, 428)</value> </param> @@ -848,6 +901,10 @@ <value>length_tag_key</value> </param> <param> + <key>alias</key> + <value></value> + </param> + <param> <key>affinity</key> <value></value> </param> @@ -856,6 +913,10 @@ <value>0</value> </param> <param> + <key>maxoutbuf</key> + <value>0</value> + </param> + <param> <key>_coordinate</key> <value>(632, 564)</value> </param> @@ -887,6 +948,10 @@ <value>False</value> </param> <param> + <key>alias</key> + <value></value> + </param> + <param> <key>affinity</key> <value></value> </param> @@ -895,6 +960,10 @@ <value>0</value> </param> <param> + <key>maxoutbuf</key> + <value>0</value> + </param> + <param> <key>_coordinate</key> <value>(372, 747)</value> </param> @@ -930,6 +999,10 @@ <value>False</value> </param> <param> + <key>alias</key> + <value></value> + </param> + <param> <key>affinity</key> <value></value> </param> @@ -938,6 +1011,10 @@ <value>0</value> </param> <param> + <key>maxoutbuf</key> + <value>0</value> + </param> + <param> <key>_coordinate</key> <value>(710, 301)</value> </param> @@ -961,6 +1038,14 @@ <value>header_formatter.formatter()</value> </param> <param> + <key>len_tag_key</key> + <value>"packet_len"</value> + </param> + <param> + <key>alias</key> + <value></value> + </param> + <param> <key>affinity</key> <value></value> </param> @@ -969,6 +1054,10 @@ <value>0</value> </param> <param> + <key>maxoutbuf</key> + <value>0</value> + </param> + <param> <key>_coordinate</key> <value>(703, 242)</value> </param> @@ -1004,6 +1093,10 @@ <value>length_tag_key</value> </param> <param> + <key>alias</key> + <value></value> + </param> + <param> <key>affinity</key> <value></value> </param> @@ -1012,6 +1105,10 @@ <value>0</value> </param> <param> + <key>maxoutbuf</key> + <value>0</value> + </param> + <param> <key>_coordinate</key> <value>(193, 235)</value> </param> @@ -1108,6 +1205,10 @@ <value>length_tag_key</value> </param> <param> + <key>alias</key> + <value></value> + </param> + <param> <key>affinity</key> <value></value> </param> @@ -1116,6 +1217,10 @@ <value>0</value> </param> <param> + <key>maxoutbuf</key> + <value>0</value> + </param> + <param> <key>_coordinate</key> <value>(430, 235)</value> </param> @@ -1159,6 +1264,10 @@ <value>length_tag_key</value> </param> <param> + <key>alias</key> + <value></value> + </param> + <param> <key>affinity</key> <value></value> </param> @@ -1167,6 +1276,10 @@ <value>0</value> </param> <param> + <key>maxoutbuf</key> + <value>0</value> + </param> + <param> <key>_coordinate</key> <value>(192, 540)</value> </param> @@ -1222,78 +1335,141 @@ </param> </block> <block> - <key>wxgui_scopesink2</key> + <key>digital_ofdm_rx</key> <param> <key>id</key> - <value>wxgui_scopesink2_0</value> + <value>digital_ofdm_rx_0</value> </param> <param> <key>_enabled</key> <value>True</value> </param> <param> - <key>type</key> - <value>complex</value> + <key>fft_len</key> + <value>fft_len</value> </param> <param> - <key>title</key> - <value>Scope Plot</value> + <key>cp_len</key> + <value>fft_len/4</value> </param> <param> - <key>samp_rate</key> - <value>samp_rate</value> + <key>packet_len_key</key> + <value>"length"</value> </param> <param> - <key>v_scale</key> - <value>0</value> + <key>occupied_carriers</key> + <value>occupied_carriers</value> </param> <param> - <key>v_offset</key> - <value>0</value> + <key>pilot_carriers</key> + <value>pilot_carriers</value> </param> <param> - <key>t_scale</key> - <value>0</value> + <key>pilot_symbols</key> + <value>pilot_symbols</value> </param> <param> - <key>ac_couple</key> - <value>False</value> + <key>sync_word1</key> + <value>sync_word1</value> + </param> + <param> + <key>sync_word2</key> + <value>sync_word2</value> + </param> + <param> + <key>header_mod</key> + <value>"BPSK"</value> + </param> + <param> + <key>payload_mod</key> + <value>"QPSK"</value> </param> <param> - <key>xy_mode</key> + <key>scramble_bits</key> <value>False</value> </param> <param> - <key>num_inputs</key> - <value>1</value> + <key>log</key> + <value>False</value> </param> <param> - <key>win_size</key> + <key>alias</key> <value></value> </param> <param> - <key>grid_pos</key> + <key>affinity</key> <value></value> </param> <param> - <key>notebook</key> - <value></value> + <key>minoutbuf</key> + <value>0</value> + </param> + <param> + <key>maxoutbuf</key> + <value>0</value> + </param> + <param> + <key>_coordinate</key> + <value>(439, 823)</value> + </param> + <param> + <key>_rotation</key> + <value>0</value> + </param> + </block> + <block> + <key>channels_channel_model</key> + <param> + <key>id</key> + <value>channels_channel_model_0</value> + </param> + <param> + <key>_enabled</key> + <value>True</value> + </param> + <param> + <key>noise_voltage</key> + <value>0.0</value> + </param> + <param> + <key>freq_offset</key> + <value>0.0</value> + </param> + <param> + <key>epsilon</key> + <value>1.0</value> + </param> + <param> + <key>taps</key> + <value>1.0 + 1.0j</value> + </param> + <param> + <key>seed</key> + <value>0</value> </param> <param> - <key>trig_mode</key> - <value>wxgui.TRIG_MODE_AUTO</value> + <key>block_tags</key> + <value>True</value> </param> <param> - <key>y_axis_label</key> - <value>Counts</value> + <key>alias</key> + <value></value> </param> <param> <key>affinity</key> <value></value> </param> <param> + <key>minoutbuf</key> + <value>0</value> + </param> + <param> + <key>maxoutbuf</key> + <value>0</value> + </param> + <param> <key>_coordinate</key> - <value>(992, 716)</value> + <value>(193, 858)</value> </param> <param> <key>_rotation</key> @@ -1301,10 +1477,10 @@ </param> </block> <block> - <key>wxgui_fftsink2</key> + <key>blocks_tag_debug</key> <param> <key>id</key> - <value>wxgui_fftsink2_0</value> + <value>blocks_tag_debug_0</value> </param> <param> <key>_enabled</key> @@ -1312,83 +1488,90 @@ </param> <param> <key>type</key> - <value>complex</value> + <value>byte</value> </param> <param> - <key>title</key> - <value>FFT Plot</value> + <key>name</key> + <value>Rx'd Packets</value> </param> <param> - <key>samp_rate</key> - <value>samp_rate</value> + <key>filter</key> + <value>""</value> </param> <param> - <key>baseband_freq</key> - <value>0</value> + <key>num_inputs</key> + <value>1</value> </param> <param> - <key>y_per_div</key> - <value>10</value> + <key>vlen</key> + <value>1</value> </param> <param> - <key>y_divs</key> - <value>10</value> + <key>display</key> + <value>True</value> </param> <param> - <key>ref_level</key> - <value>0</value> + <key>alias</key> + <value></value> </param> <param> - <key>ref_scale</key> - <value>2.0</value> + <key>affinity</key> + <value></value> </param> <param> - <key>fft_size</key> - <value>1024</value> + <key>_coordinate</key> + <value>(689, 889)</value> </param> <param> - <key>fft_rate</key> - <value>15</value> + <key>_rotation</key> + <value>0</value> </param> + </block> + <block> + <key>blocks_throttle</key> <param> - <key>peak_hold</key> - <value>False</value> + <key>id</key> + <value>blocks_throttle_0</value> </param> <param> - <key>average</key> - <value>False</value> + <key>_enabled</key> + <value>True</value> </param> <param> - <key>avg_alpha</key> - <value>0</value> + <key>type</key> + <value>complex</value> </param> <param> - <key>win</key> - <value>None</value> + <key>samples_per_second</key> + <value>samp_rate</value> </param> <param> - <key>win_size</key> - <value></value> + <key>vlen</key> + <value>1</value> </param> <param> - <key>grid_pos</key> + <key>ignoretag</key> + <value>True</value> + </param> + <param> + <key>alias</key> <value></value> </param> <param> - <key>notebook</key> + <key>affinity</key> <value></value> </param> <param> - <key>freqvar</key> - <value>None</value> + <key>minoutbuf</key> + <value>0</value> </param> <param> - <key>affinity</key> - <value></value> + <key>maxoutbuf</key> + <value>0</value> </param> <param> <key>_coordinate</key> - <value>(994, 810)</value> + <value>(559, 747)</value> </param> <param> <key>_rotation</key> @@ -1396,125 +1579,238 @@ </param> </block> <block> - <key>digital_ofdm_rx</key> + <key>qtgui_freq_sink_x</key> <param> <key>id</key> - <value>digital_ofdm_rx_0</value> + <value>qtgui_freq_sink_x_0</value> </param> <param> <key>_enabled</key> <value>True</value> </param> <param> - <key>fft_len</key> - <value>fft_len</value> + <key>type</key> + <value>complex</value> </param> <param> - <key>cp_len</key> - <value>fft_len/4</value> + <key>name</key> + <value>FFT Plot</value> </param> <param> - <key>packet_len_key</key> - <value>"length"</value> + <key>fftsize</key> + <value>1024</value> </param> <param> - <key>occupied_carriers</key> - <value>occupied_carriers</value> + <key>wintype</key> + <value>firdes.WIN_BLACKMAN_hARRIS</value> </param> <param> - <key>pilot_carriers</key> - <value>pilot_carriers</value> + <key>fc</key> + <value>0</value> </param> <param> - <key>pilot_symbols</key> - <value>pilot_symbols</value> + <key>bw</key> + <value>samp_rate</value> </param> <param> - <key>sync_word1</key> - <value>sync_word1</value> + <key>autoscale</key> + <value>True</value> </param> <param> - <key>sync_word2</key> - <value>sync_word2</value> + <key>average</key> + <value>1.0</value> </param> <param> - <key>header_mod</key> - <value>"BPSK"</value> + <key>ymin</key> + <value>-140</value> </param> <param> - <key>payload_mod</key> - <value>"QPSK"</value> + <key>ymax</key> + <value>10</value> </param> <param> - <key>scramble_bits</key> - <value>False</value> + <key>nconnections</key> + <value>1</value> </param> <param> - <key>log</key> - <value>False</value> + <key>update_time</key> + <value>0.10</value> </param> <param> - <key>affinity</key> + <key>gui_hint</key> <value></value> </param> <param> - <key>minoutbuf</key> - <value>0</value> + <key>label1</key> + <value></value> </param> <param> - <key>_coordinate</key> - <value>(439, 823)</value> + <key>width1</key> + <value>1</value> </param> <param> - <key>_rotation</key> - <value>0</value> + <key>color1</key> + <value>"blue"</value> </param> - </block> - <block> - <key>channels_channel_model</key> <param> - <key>id</key> - <value>channels_channel_model_0</value> + <key>alpha1</key> + <value>1.0</value> </param> <param> - <key>_enabled</key> - <value>True</value> + <key>label2</key> + <value></value> </param> <param> - <key>noise_voltage</key> - <value>0.0</value> + <key>width2</key> + <value>1</value> </param> <param> - <key>freq_offset</key> - <value>0.0</value> + <key>color2</key> + <value>"red"</value> </param> <param> - <key>epsilon</key> + <key>alpha2</key> <value>1.0</value> </param> <param> - <key>taps</key> - <value>1.0 + 1.0j</value> + <key>label3</key> + <value></value> </param> <param> - <key>seed</key> - <value>0</value> + <key>width3</key> + <value>1</value> </param> <param> - <key>block_tags</key> - <value>True</value> + <key>color3</key> + <value>"green"</value> </param> <param> - <key>affinity</key> + <key>alpha3</key> + <value>1.0</value> + </param> + <param> + <key>label4</key> <value></value> </param> <param> - <key>minoutbuf</key> - <value>0</value> + <key>width4</key> + <value>1</value> + </param> + <param> + <key>color4</key> + <value>"black"</value> + </param> + <param> + <key>alpha4</key> + <value>1.0</value> + </param> + <param> + <key>label5</key> + <value></value> + </param> + <param> + <key>width5</key> + <value>1</value> + </param> + <param> + <key>color5</key> + <value>"cyan"</value> + </param> + <param> + <key>alpha5</key> + <value>1.0</value> + </param> + <param> + <key>label6</key> + <value></value> + </param> + <param> + <key>width6</key> + <value>1</value> + </param> + <param> + <key>color6</key> + <value>"magenta"</value> + </param> + <param> + <key>alpha6</key> + <value>1.0</value> + </param> + <param> + <key>label7</key> + <value></value> + </param> + <param> + <key>width7</key> + <value>1</value> + </param> + <param> + <key>color7</key> + <value>"yellow"</value> + </param> + <param> + <key>alpha7</key> + <value>1.0</value> + </param> + <param> + <key>label8</key> + <value></value> + </param> + <param> + <key>width8</key> + <value>1</value> + </param> + <param> + <key>color8</key> + <value>"dark red"</value> + </param> + <param> + <key>alpha8</key> + <value>1.0</value> + </param> + <param> + <key>label9</key> + <value></value> + </param> + <param> + <key>width9</key> + <value>1</value> + </param> + <param> + <key>color9</key> + <value>"dark green"</value> + </param> + <param> + <key>alpha9</key> + <value>1.0</value> + </param> + <param> + <key>label10</key> + <value></value> + </param> + <param> + <key>width10</key> + <value>1</value> + </param> + <param> + <key>color10</key> + <value>"dark blue"</value> + </param> + <param> + <key>alpha10</key> + <value>1.0</value> + </param> + <param> + <key>alias</key> + <value></value> + </param> + <param> + <key>affinity</key> + <value></value> </param> <param> <key>_coordinate</key> - <value>(193, 858)</value> + <value>(966, 841)</value> </param> <param> <key>_rotation</key> @@ -1522,10 +1818,10 @@ </param> </block> <block> - <key>blocks_tag_debug</key> + <key>qtgui_time_sink_x</key> <param> <key>id</key> - <value>blocks_tag_debug_0</value> + <value>qtgui_time_sink_x_0</value> </param> <param> <key>_enabled</key> @@ -1533,31 +1829,323 @@ </param> <param> <key>type</key> - <value>byte</value> + <value>complex</value> </param> <param> <key>name</key> - <value>Rx'd Packets</value> + <value>Scope Plot</value> </param> <param> - <key>num_inputs</key> + <key>size</key> + <value>1024</value> + </param> + <param> + <key>srate</key> + <value>samp_rate</value> + </param> + <param> + <key>autoscale</key> + <value>True</value> + </param> + <param> + <key>ymin</key> + <value>-1</value> + </param> + <param> + <key>ymax</key> <value>1</value> </param> <param> - <key>vlen</key> + <key>nconnections</key> <value>1</value> </param> <param> - <key>display</key> + <key>update_time</key> + <value>0.10</value> + </param> + <param> + <key>entags</key> <value>True</value> </param> <param> + <key>gui_hint</key> + <value></value> + </param> + <param> + <key>tr_mode</key> + <value>qtgui.TRIG_MODE_FREE</value> + </param> + <param> + <key>tr_slope</key> + <value>qtgui.TRIG_SLOPE_POS</value> + </param> + <param> + <key>tr_level</key> + <value>0.0</value> + </param> + <param> + <key>tr_delay</key> + <value>0</value> + </param> + <param> + <key>tr_chan</key> + <value>0</value> + </param> + <param> + <key>tr_tag</key> + <value>""</value> + </param> + <param> + <key>label1</key> + <value>Scope Plot</value> + </param> + <param> + <key>width1</key> + <value>1</value> + </param> + <param> + <key>color1</key> + <value>"blue"</value> + </param> + <param> + <key>style1</key> + <value>1</value> + </param> + <param> + <key>marker1</key> + <value>-1</value> + </param> + <param> + <key>alpha1</key> + <value>1.0</value> + </param> + <param> + <key>label2</key> + <value></value> + </param> + <param> + <key>width2</key> + <value>1</value> + </param> + <param> + <key>color2</key> + <value>"red"</value> + </param> + <param> + <key>style2</key> + <value>1</value> + </param> + <param> + <key>marker2</key> + <value>-1</value> + </param> + <param> + <key>alpha2</key> + <value>1.0</value> + </param> + <param> + <key>label3</key> + <value></value> + </param> + <param> + <key>width3</key> + <value>1</value> + </param> + <param> + <key>color3</key> + <value>"green"</value> + </param> + <param> + <key>style3</key> + <value>1</value> + </param> + <param> + <key>marker3</key> + <value>-1</value> + </param> + <param> + <key>alpha3</key> + <value>1.0</value> + </param> + <param> + <key>label4</key> + <value></value> + </param> + <param> + <key>width4</key> + <value>1</value> + </param> + <param> + <key>color4</key> + <value>"black"</value> + </param> + <param> + <key>style4</key> + <value>1</value> + </param> + <param> + <key>marker4</key> + <value>-1</value> + </param> + <param> + <key>alpha4</key> + <value>1.0</value> + </param> + <param> + <key>label5</key> + <value></value> + </param> + <param> + <key>width5</key> + <value>1</value> + </param> + <param> + <key>color5</key> + <value>"cyan"</value> + </param> + <param> + <key>style5</key> + <value>1</value> + </param> + <param> + <key>marker5</key> + <value>-1</value> + </param> + <param> + <key>alpha5</key> + <value>1.0</value> + </param> + <param> + <key>label6</key> + <value></value> + </param> + <param> + <key>width6</key> + <value>1</value> + </param> + <param> + <key>color6</key> + <value>"magenta"</value> + </param> + <param> + <key>style6</key> + <value>1</value> + </param> + <param> + <key>marker6</key> + <value>-1</value> + </param> + <param> + <key>alpha6</key> + <value>1.0</value> + </param> + <param> + <key>label7</key> + <value></value> + </param> + <param> + <key>width7</key> + <value>1</value> + </param> + <param> + <key>color7</key> + <value>"yellow"</value> + </param> + <param> + <key>style7</key> + <value>1</value> + </param> + <param> + <key>marker7</key> + <value>-1</value> + </param> + <param> + <key>alpha7</key> + <value>1.0</value> + </param> + <param> + <key>label8</key> + <value></value> + </param> + <param> + <key>width8</key> + <value>1</value> + </param> + <param> + <key>color8</key> + <value>"dark red"</value> + </param> + <param> + <key>style8</key> + <value>1</value> + </param> + <param> + <key>marker8</key> + <value>-1</value> + </param> + <param> + <key>alpha8</key> + <value>1.0</value> + </param> + <param> + <key>label9</key> + <value></value> + </param> + <param> + <key>width9</key> + <value>1</value> + </param> + <param> + <key>color9</key> + <value>"dark green"</value> + </param> + <param> + <key>style9</key> + <value>1</value> + </param> + <param> + <key>marker9</key> + <value>-1</value> + </param> + <param> + <key>alpha9</key> + <value>1.0</value> + </param> + <param> + <key>label10</key> + <value></value> + </param> + <param> + <key>width10</key> + <value>1</value> + </param> + <param> + <key>color10</key> + <value>"blue"</value> + </param> + <param> + <key>style10</key> + <value>1</value> + </param> + <param> + <key>marker10</key> + <value>-1</value> + </param> + <param> + <key>alpha10</key> + <value>1.0</value> + </param> + <param> + <key>alias</key> + <value></value> + </param> + <param> <key>affinity</key> <value></value> </param> <param> <key>_coordinate</key> - <value>(689, 889)</value> + <value>(962, 714)</value> </param> <param> <key>_rotation</key> @@ -1565,38 +2153,62 @@ </param> </block> <block> - <key>blocks_throttle</key> + <key>options</key> <param> <key>id</key> - <value>blocks_throttle_0</value> + <value>tx_ofdm</value> </param> <param> <key>_enabled</key> <value>True</value> </param> <param> - <key>type</key> - <value>complex</value> + <key>title</key> + <value>OFDM Tx</value> </param> <param> - <key>samples_per_second</key> - <value>samp_rate</value> + <key>author</key> + <value></value> </param> <param> - <key>vlen</key> - <value>1</value> + <key>description</key> + <value>Example of an OFDM Transmitter</value> </param> <param> - <key>affinity</key> - <value></value> + <key>window_size</key> + <value>1280, 1024</value> </param> <param> - <key>minoutbuf</key> + <key>generate_options</key> + <value>qt_gui</value> + </param> + <param> + <key>category</key> + <value>Custom</value> + </param> + <param> + <key>run_options</key> + <value>run</value> + </param> + <param> + <key>run</key> + <value>True</value> + </param> + <param> + <key>max_nouts</key> <value>0</value> </param> <param> + <key>realtime_scheduling</key> + <value></value> + </param> + <param> + <key>alias</key> + <value></value> + </param> + <param> <key>_coordinate</key> - <value>(559, 747)</value> + <value>(1, 0)</value> </param> <param> <key>_rotation</key> @@ -1682,18 +2294,6 @@ <sink_key>0</sink_key> </connection> <connection> - <source_block_id>blocks_throttle_0</source_block_id> - <sink_block_id>wxgui_scopesink2_0</sink_block_id> - <source_key>0</source_key> - <sink_key>0</sink_key> - </connection> - <connection> - <source_block_id>blocks_throttle_0</source_block_id> - <sink_block_id>wxgui_fftsink2_0</sink_block_id> - <source_key>0</source_key> - <sink_key>0</sink_key> - </connection> - <connection> <source_block_id>blocks_stream_to_tagged_stream_0</source_block_id> <sink_block_id>digital_crc32_bb_0</sink_block_id> <source_key>0</source_key> @@ -1747,4 +2347,16 @@ <source_key>0</source_key> <sink_key>0</sink_key> </connection> + <connection> + <source_block_id>blocks_throttle_0</source_block_id> + <sink_block_id>qtgui_freq_sink_x_0</sink_block_id> + <source_key>0</source_key> + <sink_key>0</sink_key> + </connection> + <connection> + <source_block_id>blocks_throttle_0</source_block_id> + <sink_block_id>qtgui_time_sink_x_0</sink_block_id> + <source_key>0</source_key> + <sink_key>0</sink_key> + </connection> </flow_graph> diff --git a/gr-digital/grc/digital_constellation.xml b/gr-digital/grc/digital_constellation.xml index 8d2a34f1fa..4ca78984a7 100644 --- a/gr-digital/grc/digital_constellation.xml +++ b/gr-digital/grc/digital_constellation.xml @@ -7,65 +7,57 @@ ################################################### --> <block> - <name>Constellation Object</name> - <key>variable_constellation</key> - <category>Modulators</category> - <import>from gnuradio import digital</import> - <var_make>self.$(id) = $(id) = digital.constellation_calcdist($const_points, $sym_map, $rot_sym, $dims).base() + <name>Constellation Object</name> + <key>variable_constellation</key> + <category>Modulators</category> + <import>from gnuradio import digital</import> + <var_make>self.$(id) = $(id) = digital.constellation_calcdist($const_points, $sym_map, $rot_sym, $dims).base() #if str($soft_dec_lut).lower() == '"auto"' or str($soft_dec_lut).lower() == "'auto'" self.$(id).gen_soft_dec_lut($precision) #else if str($soft_dec_lut) != 'None' self.$(id).set_soft_dec_lut($soft_dec_lut, $precision) #end if </var_make> - <make></make> - <!--<callback></callback>--> + <var_value>digital.constellation_calcdist($const_points, $sym_map, $rot_sym, $dims)</var_value> + <make></make> + <!--<callback></callback>--> - <!-- Required to 'trick' GRC into using this as a proper variable--> - <param> - <name>Ignore Me</name> - <key>value</key> - <value>"ok"</value> - <type>raw</type> - <hide>all</hide> - </param> - - <param> - <name>Symbol Map</name> - <key>sym_map</key> - <value>[0, 1, 3, 2]</value> - <type>int_vector</type> - </param> - <param> - <name>Constellation Points</name> - <key>const_points</key> - <value>[-1-1j, -1+1j, 1+1j, 1-1j]</value> - <type>complex_vector</type> + <param> + <name>Symbol Map</name> + <key>sym_map</key> + <value>[0, 1, 3, 2]</value> + <type>int_vector</type> + </param> + <param> + <name>Constellation Points</name> + <key>const_points</key> + <value>[-1-1j, -1+1j, 1+1j, 1-1j]</value> + <type>complex_vector</type> </param> <param> - <name>Rotational Symmetry</name> - <key>rot_sym</key> - <value>4</value> - <type>int</type> + <name>Rotational Symmetry</name> + <key>rot_sym</key> + <value>4</value> + <type>int</type> </param> <param> - <name>Dimensionality</name> - <key>dims</key> - <value>1</value> - <type>int</type> + <name>Dimensionality</name> + <key>dims</key> + <value>1</value> + <type>int</type> </param> - <param> - <name>Soft Decisions Precision</name> - <key>precision</key> - <value>8</value> - <type>int</type> - <hide>part</hide> - </param> - <param> - <name>Soft Decisions LUT</name> - <key>soft_dec_lut</key> - <value>None</value> - <type>raw</type> - <hide>#if str($soft_dec_lut) == 'None' then 'part' else 'none'#</hide> - </param> + <param> + <name>Soft Decisions Precision</name> + <key>precision</key> + <value>8</value> + <type>int</type> + <hide>part</hide> + </param> + <param> + <name>Soft Decisions LUT</name> + <key>soft_dec_lut</key> + <value>None</value> + <type>raw</type> + <hide>#if str($soft_dec_lut) == 'None' then 'part' else 'none'#</hide> + </param> </block> diff --git a/gr-digital/grc/digital_constellation_receiver_cb.xml b/gr-digital/grc/digital_constellation_receiver_cb.xml index 134e027759..06155ecae9 100644 --- a/gr-digital/grc/digital_constellation_receiver_cb.xml +++ b/gr-digital/grc/digital_constellation_receiver_cb.xml @@ -5,69 +5,88 @@ ################################################### --> <block> - <name>Constellation Receiver</name> - <key>digital_constellation_receiver_cb</key> - <import>from gnuradio import digital</import> - <make>digital.constellation_receiver_cb($constellation, $loop_bw, $fmin, $fmax)</make> - <param> - <name>Constellation Object</name> - <key>constellation</key> - <type>raw</type> - </param> - <param> - <name>Loop Bandwidth</name> - <key>loop_bw</key> - <type>real</type> - </param> - <param> - <name>Minimum Freq Deviation</name> - <key>fmin</key> - <type>real</type> - </param> - <param> - <name>Maximum Freq Deviation</name> - <key>fmax</key> - <type>real</type> - </param> - <sink> - <name>in</name> - <type>complex</type> - </sink> + <name>Constellation Receiver</name> + <key>digital_constellation_receiver_cb</key> + <import>from gnuradio import digital</import> + <make>digital.constellation_receiver_cb($constellation, $loop_bw, $fmin, $fmax)</make> + <param> + <name>Constellation Object</name> + <key>constellation</key> + <type>raw</type> + </param> + <param> + <name>Loop Bandwidth</name> + <key>loop_bw</key> + <type>real</type> + </param> + <param> + <name>Minimum Freq Deviation</name> + <key>fmin</key> + <type>real</type> + </param> + <param> + <name>Maximum Freq Deviation</name> + <key>fmax</key> + <type>real</type> + </param> - <sink> - <name>set_constellation</name> - <type>message</type> - <optional>1</optional> - </sink> + <param> + <name>Show Msg Ports</name> + <key>showports</key> + <value>True</value> + <type>enum</type> + <hide>part</hide> + <option> + <name>Yes</name> + <key>False</key> + </option> + <option> + <name>No</name> + <key>True</key> + </option> + </param> - <sink> - <name>rotate_phase</name> - <type>message</type> - <optional>1</optional> - </sink> + <sink> + <name>in</name> + <type>complex</type> + </sink> - <source> - <name>out</name> - <type>byte</type> - </source> - <source> - <name>error</name> - <type>float</type> - <optional>1</optional> - </source> - <source> - <name>phase</name> - <type>float</type> - <optional>1</optional> - </source> - <source> - <name>frequency</name> - <type>float</type> - <optional>1</optional> - </source> - <source> - <name>symbol</name> - <type>complex</type> - <optional>1</optional> - </source> + <sink> + <name>set_constellation</name> + <type>message</type> + <optional>1</optional> + <hide>$showports</hide> + </sink> + + <sink> + <name>rotate_phase</name> + <type>message</type> + <optional>1</optional> + <hide>$showports</hide> + </sink> + + <source> + <name>out</name> + <type>byte</type> + </source> + <source> + <name>error</name> + <type>float</type> + <optional>1</optional> + </source> + <source> + <name>phase</name> + <type>float</type> + <optional>1</optional> + </source> + <source> + <name>frequency</name> + <type>float</type> + <optional>1</optional> + </source> + <source> + <name>symbol</name> + <type>complex</type> + <optional>1</optional> + </source> </block> diff --git a/gr-digital/grc/digital_constellation_rect.xml b/gr-digital/grc/digital_constellation_rect.xml index e6acc14bc4..fee750ac1f 100644 --- a/gr-digital/grc/digital_constellation_rect.xml +++ b/gr-digital/grc/digital_constellation_rect.xml @@ -9,79 +9,71 @@ <block> <name>Constellation Rect. Object</name> <key>variable_constellation_rect</key> - <category>Modulators</category> + <category>Modulators</category> <import>from gnuradio import digital</import> - <var_make>self.$(id) = $(id) = digital.constellation_rect($const_points, $sym_map, $rot_sym, $real_sect, $imag_sect, $w_real_sect, $w_imag_sect).base() + <var_make>self.$(id) = $(id) = digital.constellation_rect($const_points, $sym_map, $rot_sym, $real_sect, $imag_sect, $w_real_sect, $w_imag_sect).base() #if str($softbits_lut) != 'None' self.$(id).set_softbits($softbits_lut, $precision) #end if </var_make> - <make></make> - <!--<callback>set_softbits($softbits_lut, $precision)</callback>--> - - <!-- Required to 'trick' GRC into using this as a proper variable--> - <param> - <name>Ignore Me</name> - <key>value</key> - <value>"ok"</value> - <type>raw</type> - <hide>all</hide> - </param> + <var_value>digital.constellation_rect($const_points, $sym_map, $rot_sym, $real_sect, $imag_sect, $w_real_sect, $w_imag_sect)</var_value> + <make></make> + <!--<callback>set_softbits($softbits_lut, $precision)</callback>--> <param> - <name>Symbol Map</name> - <key>sym_map</key> - <value>[0, 1, 3, 2]</value> - <type>int_vector</type> + <name>Symbol Map</name> + <key>sym_map</key> + <value>[0, 1, 3, 2]</value> + <type>int_vector</type> </param> <param> - <name>Constellation Points</name> - <key>const_points</key> - <value>[-1-1j, -1+1j, 1+1j, 1-1j]</value> - <type>complex_vector</type> + <name>Constellation Points</name> + <key>const_points</key> + <value>[-1-1j, -1+1j, 1+1j, 1-1j]</value> + <type>complex_vector</type> </param> <param> - <name>Rotational Symmetry</name> - <key>rot_sym</key> - <value>4</value> - <type>int</type> + <name>Rotational Symmetry</name> + <key>rot_sym</key> + <value>4</value> + <type>int</type> </param> <param> - <name>Real Sectors</name> - <key>real_sect</key> - <value>2</value> - <type>int</type> + <name>Real Sectors</name> + <key>real_sect</key> + <value>2</value> + <type>int</type> </param> <param> - <name>Imaginary Sectors</name> - <key>imag_sect</key> - <value>2</value> - <type>int</type> + <name>Imaginary Sectors</name> + <key>imag_sect</key> + <value>2</value> + <type>int</type> </param> <param> - <name>Width Real Sectors</name> - <key>w_real_sect</key> - <value>1</value> - <type>int</type> + <name>Width Real Sectors</name> + <key>w_real_sect</key> + <value>1</value> + <type>int</type> </param> <param> - <name>Width Imaginary Sectors</name> - <key>w_imag_sect</key> - <value>1</value> - <type>int</type> + <name>Width Imaginary Sectors</name> + <key>w_imag_sect</key> + <value>1</value> + <type>int</type> </param> - <param> - <name>Soft bits precision</name> - <key>precision</key> - <value>8</value> - <type>int</type> - <hide>part</hide> - </param> - <param> - <name>Soft bits LUT</name> - <key>softbits_lut</key> - <value>None</value> - <type>raw</type> - <hide>#if str($softbits_lut) == 'None' then 'part' else 'none'#</hide> - </param> + <param> + <name>Soft bits precision</name> + <key>precision</key> + <value>8</value> + <type>int</type> + <hide>part</hide> + </param> + <param> + <name>Soft bits LUT</name> + <key>softbits_lut</key> + <value>None</value> + <type>raw</type> + <hide>#if str($softbits_lut) == 'None' then 'part' else 'none'#</hide> + </param> </block> diff --git a/gr-fcd/examples/grc/CMakeLists.txt b/gr-fcd/examples/grc/CMakeLists.txt index e33fdf1825..5e883e3754 100644 --- a/gr-fcd/examples/grc/CMakeLists.txt +++ b/gr-fcd/examples/grc/CMakeLists.txt @@ -19,7 +19,7 @@ INSTALL(FILES fcd_apt_rx.grc - fcd_fft_wx.grc + fcd_fft.grc fcd_nfm_rx.grc DESTINATION ${GR_PKG_FCD_EXAMPLES_DIR} COMPONENT "fcd_examples" diff --git a/gr-fcd/examples/grc/fcd_apt_rx.grc b/gr-fcd/examples/grc/fcd_apt_rx.grc index 3c88db7edd..f68d235f3e 100644 --- a/gr-fcd/examples/grc/fcd_apt_rx.grc +++ b/gr-fcd/examples/grc/fcd_apt_rx.grc @@ -1,6 +1,6 @@ <?xml version='1.0' encoding='ASCII'?> <flow_graph> - <timestamp>Mon Mar 18 10:04:36 2013</timestamp> + <timestamp>Mon Jul 14 15:02:48 2014</timestamp> <block> <key>options</key> <param> @@ -29,7 +29,7 @@ </param> <param> <key>generate_options</key> - <value>wx_gui</value> + <value>qt_gui</value> </param> <param> <key>category</key> @@ -52,6 +52,10 @@ <value></value> </param> <param> + <key>alias</key> + <value></value> + </param> + <param> <key>_coordinate</key> <value>(10, 10)</value> </param> @@ -61,42 +65,107 @@ </param> </block> <block> - <key>variable_static_text</key> + <key>variable</key> <param> <key>id</key> - <value>rec_info</value> + <value>wav_file</value> </param> <param> <key>_enabled</key> <value>True</value> </param> <param> - <key>label</key> - <value>Recording to</value> + <key>value</key> + <value>prefix + datetime.now().strftime("%Y.%m.%d.%H.%M.%S") + ".wav"</value> + </param> + <param> + <key>alias</key> + <value></value> + </param> + <param> + <key>_coordinate</key> + <value>(803, 441)</value> + </param> + <param> + <key>_rotation</key> + <value>0</value> + </param> + </block> + <block> + <key>variable</key> + <param> + <key>id</key> + <value>prefix</value> + </param> + <param> + <key>_enabled</key> + <value>True</value> </param> <param> <key>value</key> - <value>wav_file</value> + <value>"FCD_APT_REC-"</value> </param> <param> - <key>converver</key> - <value>str_converter</value> + <key>alias</key> + <value></value> </param> <param> - <key>formatter</key> - <value>None</value> + <key>_coordinate</key> + <value>(666, 442)</value> </param> <param> - <key>grid_pos</key> - <value>1,1,1,1</value> + <key>_rotation</key> + <value>0</value> + </param> + </block> + <block> + <key>variable</key> + <param> + <key>id</key> + <value>samp_rate</value> + </param> + <param> + <key>_enabled</key> + <value>True</value> + </param> + <param> + <key>value</key> + <value>96000</value> + </param> + <param> + <key>alias</key> + <value></value> + </param> + <param> + <key>_coordinate</key> + <value>(190, 11)</value> + </param> + <param> + <key>_rotation</key> + <value>0</value> + </param> + </block> + <block> + <key>variable</key> + <param> + <key>id</key> + <value>max_dev</value> + </param> + <param> + <key>_enabled</key> + <value>True</value> + </param> + <param> + <key>value</key> + <value>17000</value> </param> <param> - <key>notebook</key> + <key>alias</key> <value></value> </param> <param> <key>_coordinate</key> - <value>(641, 14)</value> + <value>(282, 11)</value> </param> <param> <key>_rotation</key> @@ -115,7 +184,7 @@ </param> <param> <key>device_name</key> - <value>hw:1</value> + <value>hw:0</value> </param> <param> <key>freq</key> @@ -150,8 +219,24 @@ <value>1.0</value> </param> <param> + <key>alias</key> + <value></value> + </param> + <param> + <key>affinity</key> + <value></value> + </param> + <param> + <key>minoutbuf</key> + <value>0</value> + </param> + <param> + <key>maxoutbuf</key> + <value>0</value> + </param> + <param> <key>_coordinate</key> - <value>(68, 215)</value> + <value>(65, 134)</value> </param> <param> <key>_rotation</key> @@ -159,50 +244,62 @@ </param> </block> <block> - <key>variable_chooser</key> + <key>analog_fm_demod_cf</key> <param> <key>id</key> - <value>fcd_lna_gain</value> + <value>analog_fm_demod_cf_0</value> </param> <param> <key>_enabled</key> <value>True</value> </param> <param> - <key>label</key> - <value>LNA gain [dB]</value> + <key>chan_rate</key> + <value>samp_rate</value> </param> <param> - <key>value</key> - <value>20.0</value> + <key>audio_decim</key> + <value>2</value> </param> <param> - <key>choices</key> - <value>[30.0, 25.0, 20.0, 17.5, 15.0, 12.5, 10.0, 7.5, 5.0, 2.5, 0.0, -2.5, -5.0]</value> + <key>deviation</key> + <value>max_dev</value> </param> <param> - <key>labels</key> - <value>[]</value> + <key>audio_pass</key> + <value>5000</value> </param> <param> - <key>type</key> - <value>drop_down</value> + <key>audio_stop</key> + <value>7000</value> </param> <param> - <key>style</key> - <value>wx.RA_HORIZONTAL</value> + <key>gain</key> + <value>1.0</value> </param> <param> - <key>grid_pos</key> - <value>2,0,1,1</value> + <key>tau</key> + <value>75e-6</value> </param> <param> - <key>notebook</key> + <key>alias</key> <value></value> </param> <param> + <key>affinity</key> + <value></value> + </param> + <param> + <key>minoutbuf</key> + <value>0</value> + </param> + <param> + <key>maxoutbuf</key> + <value>0</value> + </param> + <param> <key>_coordinate</key> - <value>(247, 405)</value> + <value>(602, 150)</value> </param> <param> <key>_rotation</key> @@ -210,50 +307,54 @@ </param> </block> <block> - <key>variable_chooser</key> + <key>rational_resampler_xxx</key> <param> <key>id</key> - <value>sat_freq</value> + <value>rational_resampler_xxx_0</value> </param> <param> <key>_enabled</key> <value>True</value> </param> <param> - <key>label</key> - <value>Satellite</value> + <key>type</key> + <value>fff</value> </param> <param> - <key>value</key> - <value>137500000</value> + <key>interp</key> + <value>11025</value> </param> <param> - <key>choices</key> - <value>[137500000,137620000,137912500,137100000]</value> + <key>decim</key> + <value>48000</value> </param> <param> - <key>labels</key> - <value>["NOAA-15","NOAA-17","NOAA-18","NOAA-19"]</value> + <key>taps</key> + <value>[]</value> </param> <param> - <key>type</key> - <value>drop_down</value> + <key>fbw</key> + <value>0</value> </param> <param> - <key>style</key> - <value>wx.RA_HORIZONTAL</value> + <key>alias</key> + <value></value> </param> <param> - <key>grid_pos</key> - <value>1,0,1,1</value> + <key>affinity</key> + <value></value> </param> <param> - <key>notebook</key> - <value></value> + <key>minoutbuf</key> + <value>0</value> + </param> + <param> + <key>maxoutbuf</key> + <value>0</value> </param> <param> <key>_coordinate</key> - <value>(58, 403)</value> + <value>(588, 342)</value> </param> <param> <key>_rotation</key> @@ -261,90 +362,112 @@ </param> </block> <block> - <key>wxgui_fftsink2</key> + <key>audio_sink</key> <param> <key>id</key> - <value>fftsink</value> + <value>audio_sink</value> </param> <param> <key>_enabled</key> <value>True</value> </param> <param> - <key>type</key> - <value>complex</value> + <key>samp_rate</key> + <value>48000</value> </param> <param> - <key>title</key> - <value>FCD Spectrum</value> + <key>device_name</key> + <value></value> </param> <param> - <key>samp_rate</key> - <value>samp_rate</value> + <key>ok_to_block</key> + <value>True</value> </param> <param> - <key>baseband_freq</key> - <value>sat_freq</value> + <key>num_inputs</key> + <value>1</value> </param> <param> - <key>y_per_div</key> - <value>10</value> + <key>alias</key> + <value></value> </param> <param> - <key>y_divs</key> - <value>10</value> + <key>affinity</key> + <value></value> </param> <param> - <key>ref_level</key> - <value>0.0</value> + <key>_coordinate</key> + <value>(831, 198)</value> </param> <param> - <key>ref_scale</key> - <value>1.0</value> + <key>_rotation</key> + <value>0</value> </param> + </block> + <block> + <key>import</key> <param> - <key>fft_size</key> - <value>512</value> + <key>id</key> + <value>import_0</value> </param> <param> - <key>fft_rate</key> - <value>15</value> + <key>_enabled</key> + <value>True</value> </param> <param> - <key>peak_hold</key> - <value>False</value> + <key>import</key> + <value>from datetime import datetime</value> </param> <param> - <key>average</key> - <value>False</value> + <key>alias</key> + <value></value> + </param> + <param> + <key>_coordinate</key> + <value>(549, 442)</value> </param> <param> - <key>avg_alpha</key> + <key>_rotation</key> <value>0</value> </param> + </block> + <block> + <key>blocks_wavfile_sink</key> <param> - <key>win</key> - <value>None</value> + <key>id</key> + <value>wavfile_sink</value> </param> <param> - <key>win_size</key> - <value></value> + <key>_enabled</key> + <value>True</value> </param> <param> - <key>grid_pos</key> - <value>0,0,1,2</value> + <key>file</key> + <value>wav_file</value> + </param> + <param> + <key>nchan</key> + <value>1</value> </param> <param> - <key>notebook</key> + <key>samp_rate</key> + <value>11025</value> + </param> + <param> + <key>bits_per_sample</key> + <value>16</value> + </param> + <param> + <key>alias</key> <value></value> </param> <param> - <key>freqvar</key> - <value>None</value> + <key>affinity</key> + <value></value> </param> <param> <key>_coordinate</key> - <value>(375, 11)</value> + <value>(842, 350)</value> </param> <param> <key>_rotation</key> @@ -352,22 +475,70 @@ </param> </block> <block> - <key>variable</key> + <key>low_pass_filter</key> <param> <key>id</key> - <value>samp_rate</value> + <value>low_pass_filter</value> </param> <param> <key>_enabled</key> <value>True</value> </param> <param> - <key>value</key> - <value>96000</value> + <key>type</key> + <value>fir_filter_ccf</value> + </param> + <param> + <key>decim</key> + <value>1</value> + </param> + <param> + <key>interp</key> + <value>1</value> + </param> + <param> + <key>gain</key> + <value>1</value> + </param> + <param> + <key>samp_rate</key> + <value>samp_rate</value> + </param> + <param> + <key>cutoff_freq</key> + <value>25000</value> + </param> + <param> + <key>width</key> + <value>5000</value> + </param> + <param> + <key>win</key> + <value>firdes.WIN_HAMMING</value> + </param> + <param> + <key>beta</key> + <value>6.76</value> + </param> + <param> + <key>alias</key> + <value></value> + </param> + <param> + <key>affinity</key> + <value></value> + </param> + <param> + <key>minoutbuf</key> + <value>0</value> + </param> + <param> + <key>maxoutbuf</key> + <value>0</value> </param> <param> <key>_coordinate</key> - <value>(190, 11)</value> + <value>(403, 150)</value> </param> <param> <key>_rotation</key> @@ -375,80 +546,98 @@ </param> </block> <block> - <key>variable</key> + <key>variable_qtgui_chooser</key> <param> <key>id</key> - <value>max_dev</value> + <value>sat_freq</value> </param> <param> <key>_enabled</key> <value>True</value> </param> <param> - <key>value</key> - <value>17000</value> + <key>label</key> + <value>Satellite</value> </param> <param> - <key>_coordinate</key> - <value>(282, 11)</value> + <key>type</key> + <value>real</value> </param> <param> - <key>_rotation</key> + <key>num_opts</key> <value>0</value> </param> - </block> - <block> - <key>blocks_wavfile_sink</key> <param> - <key>id</key> - <value>wavfile_sink</value> + <key>value</key> + <value>137500000</value> </param> <param> - <key>_enabled</key> - <value>True</value> + <key>options</key> + <value>[137500000,137620000,137912500,137100000]</value> </param> <param> - <key>file</key> - <value>wav_file</value> + <key>labels</key> + <value>["NOAA-15","NOAA-17","NOAA-18","NOAA-19"]</value> </param> <param> - <key>nchan</key> + <key>option0</key> + <value>0</value> + </param> + <param> + <key>label0</key> + <value></value> + </param> + <param> + <key>option1</key> <value>1</value> </param> <param> - <key>samp_rate</key> - <value>11025</value> + <key>label1</key> + <value></value> </param> <param> - <key>bits_per_sample</key> - <value>16</value> + <key>option2</key> + <value>2</value> </param> <param> - <key>_coordinate</key> - <value>(845, 431)</value> + <key>label2</key> + <value></value> </param> <param> - <key>_rotation</key> - <value>0</value> + <key>option3</key> + <value>3</value> </param> - </block> - <block> - <key>import</key> <param> - <key>id</key> - <value>import_0</value> + <key>label3</key> + <value></value> </param> <param> - <key>_enabled</key> - <value>True</value> + <key>option4</key> + <value>4</value> </param> <param> - <key>import</key> - <value>from datetime import datetime</value> + <key>label4</key> + <value></value> + </param> + <param> + <key>widget</key> + <value>combo_box</value> + </param> + <param> + <key>orient</key> + <value>Qt.QVBoxLayout</value> + </param> + <param> + <key>gui_hint</key> + <value>1,0,1,1</value> + </param> + <param> + <key>alias</key> + <value></value> </param> <param> <key>_coordinate</key> - <value>(552, 523)</value> + <value>(57, 360)</value> </param> <param> <key>_rotation</key> @@ -456,22 +645,42 @@ </param> </block> <block> - <key>variable</key> + <key>variable_qtgui_label</key> <param> <key>id</key> - <value>prefix</value> + <value>rec_info</value> </param> <param> <key>_enabled</key> <value>True</value> </param> <param> + <key>label</key> + <value>Recording to</value> + </param> + <param> + <key>type</key> + <value>string</value> + </param> + <param> <key>value</key> - <value>"FCD_APT_REC-"</value> + <value>wav_file</value> + </param> + <param> + <key>formatter</key> + <value>None</value> + </param> + <param> + <key>gui_hint</key> + <value>1,1,1,1</value> + </param> + <param> + <key>alias</key> + <value></value> </param> <param> <key>_coordinate</key> - <value>(669, 523)</value> + <value>(761, 20)</value> </param> <param> <key>_rotation</key> @@ -479,112 +688,254 @@ </param> </block> <block> - <key>variable</key> + <key>qtgui_freq_sink_x</key> <param> <key>id</key> - <value>wav_file</value> + <value>qtgui_freq_sink_x_0</value> </param> <param> <key>_enabled</key> <value>True</value> </param> <param> - <key>value</key> - <value>prefix + datetime.now().strftime("%Y.%m.%d.%H.%M.%S") + ".wav"</value> + <key>type</key> + <value>complex</value> </param> <param> - <key>_coordinate</key> - <value>(806, 522)</value> + <key>name</key> + <value>""</value> </param> <param> - <key>_rotation</key> - <value>0</value> + <key>fftsize</key> + <value>512</value> </param> - </block> - <block> - <key>low_pass_filter</key> <param> - <key>id</key> - <value>low_pass_filter</value> + <key>wintype</key> + <value>firdes.WIN_BLACKMAN_hARRIS</value> </param> <param> - <key>_enabled</key> + <key>fc</key> + <value>sat_freq</value> + </param> + <param> + <key>bw</key> + <value>samp_rate</value> + </param> + <param> + <key>grid</key> + <value>False</value> + </param> + <param> + <key>autoscale</key> + <value>False</value> + </param> + <param> + <key>average</key> + <value>1.0</value> + </param> + <param> + <key>ymin</key> + <value>-140</value> + </param> + <param> + <key>ymax</key> + <value>10</value> + </param> + <param> + <key>nconnections</key> + <value>1</value> + </param> + <param> + <key>update_time</key> + <value>0.10</value> + </param> + <param> + <key>gui_hint</key> + <value>0,0,1,2</value> + </param> + <param> + <key>showports</key> <value>True</value> </param> <param> - <key>type</key> - <value>fir_filter_ccf</value> + <key>label1</key> + <value></value> </param> <param> - <key>decim</key> + <key>width1</key> <value>1</value> </param> <param> - <key>interp</key> + <key>color1</key> + <value>"blue"</value> + </param> + <param> + <key>alpha1</key> + <value>1.0</value> + </param> + <param> + <key>label2</key> + <value></value> + </param> + <param> + <key>width2</key> <value>1</value> </param> <param> - <key>gain</key> + <key>color2</key> + <value>"red"</value> + </param> + <param> + <key>alpha2</key> + <value>1.0</value> + </param> + <param> + <key>label3</key> + <value></value> + </param> + <param> + <key>width3</key> <value>1</value> </param> <param> - <key>samp_rate</key> - <value>samp_rate</value> + <key>color3</key> + <value>"green"</value> </param> <param> - <key>cutoff_freq</key> - <value>25000</value> + <key>alpha3</key> + <value>1.0</value> </param> <param> - <key>width</key> - <value>5000</value> + <key>label4</key> + <value></value> </param> <param> - <key>win</key> - <value>firdes.WIN_HAMMING</value> + <key>width4</key> + <value>1</value> </param> <param> - <key>beta</key> - <value>6.76</value> + <key>color4</key> + <value>"black"</value> </param> <param> - <key>_coordinate</key> - <value>(374, 231)</value> + <key>alpha4</key> + <value>1.0</value> </param> <param> - <key>_rotation</key> - <value>0</value> + <key>label5</key> + <value></value> </param> - </block> - <block> - <key>audio_sink</key> <param> - <key>id</key> - <value>audio_sink</value> + <key>width5</key> + <value>1</value> </param> <param> - <key>_enabled</key> - <value>True</value> + <key>color5</key> + <value>"cyan"</value> </param> <param> - <key>samp_rate</key> - <value>48000</value> + <key>alpha5</key> + <value>1.0</value> </param> <param> - <key>device_name</key> + <key>label6</key> <value></value> </param> <param> - <key>ok_to_block</key> - <value>True</value> + <key>width6</key> + <value>1</value> </param> <param> - <key>num_inputs</key> + <key>color6</key> + <value>"magenta"</value> + </param> + <param> + <key>alpha6</key> + <value>1.0</value> + </param> + <param> + <key>label7</key> + <value></value> + </param> + <param> + <key>width7</key> <value>1</value> </param> <param> + <key>color7</key> + <value>"yellow"</value> + </param> + <param> + <key>alpha7</key> + <value>1.0</value> + </param> + <param> + <key>label8</key> + <value></value> + </param> + <param> + <key>width8</key> + <value>1</value> + </param> + <param> + <key>color8</key> + <value>"dark red"</value> + </param> + <param> + <key>alpha8</key> + <value>1.0</value> + </param> + <param> + <key>label9</key> + <value></value> + </param> + <param> + <key>width9</key> + <value>1</value> + </param> + <param> + <key>color9</key> + <value>"dark green"</value> + </param> + <param> + <key>alpha9</key> + <value>1.0</value> + </param> + <param> + <key>label10</key> + <value></value> + </param> + <param> + <key>width10</key> + <value>1</value> + </param> + <param> + <key>color10</key> + <value>"dark blue"</value> + </param> + <param> + <key>alpha10</key> + <value>1.0</value> + </param> + <param> + <key>alias</key> + <value></value> + </param> + <param> + <key>affinity</key> + <value></value> + </param> + <param> + <key>minoutbuf</key> + <value>0</value> + </param> + <param> + <key>maxoutbuf</key> + <value>0</value> + </param> + <param> <key>_coordinate</key> - <value>(834, 279)</value> + <value>(399, 50)</value> </param> <param> <key>_rotation</key> @@ -592,85 +943,98 @@ </param> </block> <block> - <key>rational_resampler_xxx</key> + <key>variable_qtgui_chooser</key> <param> <key>id</key> - <value>rational_resampler_xxx_0</value> + <value>fcd_lna_gain</value> </param> <param> <key>_enabled</key> <value>True</value> </param> <param> + <key>label</key> + <value>LNA Gain (dB)</value> + </param> + <param> <key>type</key> - <value>fff</value> + <value>real</value> </param> <param> - <key>interp</key> - <value>11025</value> + <key>num_opts</key> + <value>0</value> </param> <param> - <key>decim</key> - <value>48000</value> + <key>value</key> + <value>20</value> </param> <param> - <key>taps</key> + <key>options</key> + <value>[30.0, 25.0, 20.0, 17.5, 15.0, 12.5, 10.0, 7.5, 5.0, 2.5, 0.0, -2.5, -5.0]</value> + </param> + <param> + <key>labels</key> <value>[]</value> </param> <param> - <key>fbw</key> + <key>option0</key> <value>0</value> </param> <param> - <key>_coordinate</key> - <value>(591, 423)</value> + <key>label0</key> + <value></value> </param> <param> - <key>_rotation</key> - <value>0</value> + <key>option1</key> + <value>1</value> </param> - </block> - <block> - <key>analog_fm_demod_cf</key> <param> - <key>id</key> - <value>analog_fm_demod_cf_0</value> + <key>label1</key> + <value></value> </param> <param> - <key>_enabled</key> - <value>True</value> + <key>option2</key> + <value>2</value> </param> <param> - <key>chan_rate</key> - <value>samp_rate</value> + <key>label2</key> + <value></value> </param> <param> - <key>audio_decim</key> - <value>2</value> + <key>option3</key> + <value>3</value> </param> <param> - <key>deviation</key> - <value>max_dev</value> + <key>label3</key> + <value></value> </param> <param> - <key>audio_pass</key> - <value>5000</value> + <key>option4</key> + <value>4</value> </param> <param> - <key>audio_stop</key> - <value>7000</value> + <key>label4</key> + <value></value> </param> <param> - <key>gain</key> - <value>1.0</value> + <key>widget</key> + <value>combo_box</value> </param> <param> - <key>tau</key> - <value>75e-6</value> + <key>orient</key> + <value>Qt.QVBoxLayout</value> + </param> + <param> + <key>gui_hint</key> + <value>2,0,1,1</value> + </param> + <param> + <key>alias</key> + <value></value> </param> <param> <key>_coordinate</key> - <value>(605, 231)</value> + <value>(247, 363)</value> </param> <param> <key>_rotation</key> @@ -678,20 +1042,20 @@ </param> </block> <connection> - <source_block_id>rational_resampler_xxx_0</source_block_id> - <sink_block_id>wavfile_sink</sink_block_id> + <source_block_id>fcd_source_c_0</source_block_id> + <sink_block_id>qtgui_freq_sink_x_0</sink_block_id> <source_key>0</source_key> <sink_key>0</sink_key> </connection> <connection> - <source_block_id>fcd_source_c_0</source_block_id> - <sink_block_id>fftsink</sink_block_id> + <source_block_id>analog_fm_demod_cf_0</source_block_id> + <sink_block_id>rational_resampler_xxx_0</sink_block_id> <source_key>0</source_key> <sink_key>0</sink_key> </connection> <connection> - <source_block_id>fcd_source_c_0</source_block_id> - <sink_block_id>low_pass_filter</sink_block_id> + <source_block_id>analog_fm_demod_cf_0</source_block_id> + <sink_block_id>audio_sink</sink_block_id> <source_key>0</source_key> <sink_key>0</sink_key> </connection> @@ -702,14 +1066,14 @@ <sink_key>0</sink_key> </connection> <connection> - <source_block_id>analog_fm_demod_cf_0</source_block_id> - <sink_block_id>audio_sink</sink_block_id> + <source_block_id>fcd_source_c_0</source_block_id> + <sink_block_id>low_pass_filter</sink_block_id> <source_key>0</source_key> <sink_key>0</sink_key> </connection> <connection> - <source_block_id>analog_fm_demod_cf_0</source_block_id> - <sink_block_id>rational_resampler_xxx_0</sink_block_id> + <source_block_id>rational_resampler_xxx_0</source_block_id> + <sink_block_id>wavfile_sink</sink_block_id> <source_key>0</source_key> <sink_key>0</sink_key> </connection> diff --git a/gr-fcd/examples/grc/fcd_fft.grc b/gr-fcd/examples/grc/fcd_fft.grc new file mode 100644 index 0000000000..5a91fca4f4 --- /dev/null +++ b/gr-fcd/examples/grc/fcd_fft.grc @@ -0,0 +1,564 @@ +<?xml version='1.0' encoding='ASCII'?> +<flow_graph> + <timestamp>Mon Jul 14 14:53:06 2014</timestamp> + <block> + <key>options</key> + <param> + <key>id</key> + <value>fcd_fft</value> + </param> + <param> + <key>_enabled</key> + <value>True</value> + </param> + <param> + <key>title</key> + <value>Funcube Dongle FFT scope</value> + </param> + <param> + <key>author</key> + <value>Alexandru Csete OZ9AEC</value> + </param> + <param> + <key>description</key> + <value></value> + </param> + <param> + <key>window_size</key> + <value>1280, 1024</value> + </param> + <param> + <key>generate_options</key> + <value>qt_gui</value> + </param> + <param> + <key>category</key> + <value>Custom</value> + </param> + <param> + <key>run_options</key> + <value>prompt</value> + </param> + <param> + <key>run</key> + <value>True</value> + </param> + <param> + <key>max_nouts</key> + <value>0</value> + </param> + <param> + <key>realtime_scheduling</key> + <value></value> + </param> + <param> + <key>alias</key> + <value></value> + </param> + <param> + <key>_coordinate</key> + <value>(10, 10)</value> + </param> + <param> + <key>_rotation</key> + <value>0</value> + </param> + </block> + <block> + <key>variable</key> + <param> + <key>id</key> + <value>samp_rate</value> + </param> + <param> + <key>_enabled</key> + <value>True</value> + </param> + <param> + <key>value</key> + <value>96000</value> + </param> + <param> + <key>alias</key> + <value></value> + </param> + <param> + <key>_coordinate</key> + <value>(201, 11)</value> + </param> + <param> + <key>_rotation</key> + <value>0</value> + </param> + </block> + <block> + <key>variable_qtgui_entry</key> + <param> + <key>id</key> + <value>fcd_freq</value> + </param> + <param> + <key>_enabled</key> + <value>True</value> + </param> + <param> + <key>label</key> + <value>FCD Freq</value> + </param> + <param> + <key>type</key> + <value>real</value> + </param> + <param> + <key>value</key> + <value>145.5e6</value> + </param> + <param> + <key>gui_hint</key> + <value>1,0,1,1</value> + </param> + <param> + <key>alias</key> + <value></value> + </param> + <param> + <key>_coordinate</key> + <value>(299, 12)</value> + </param> + <param> + <key>_rotation</key> + <value>0</value> + </param> + </block> + <block> + <key>variable_qtgui_chooser</key> + <param> + <key>id</key> + <value>fcd_lna_gain</value> + </param> + <param> + <key>_enabled</key> + <value>True</value> + </param> + <param> + <key>label</key> + <value>LNA Gain (dB)</value> + </param> + <param> + <key>type</key> + <value>real</value> + </param> + <param> + <key>num_opts</key> + <value>0</value> + </param> + <param> + <key>value</key> + <value>20</value> + </param> + <param> + <key>options</key> + <value>[30.0, 25.0, 20.0, 17.5, 15.0, 12.5, 10.0, 7.5, 5.0, 2.5, 0.0, -2.5, -5.0]</value> + </param> + <param> + <key>labels</key> + <value>[]</value> + </param> + <param> + <key>option0</key> + <value>0</value> + </param> + <param> + <key>label0</key> + <value></value> + </param> + <param> + <key>option1</key> + <value>1</value> + </param> + <param> + <key>label1</key> + <value></value> + </param> + <param> + <key>option2</key> + <value>2</value> + </param> + <param> + <key>label2</key> + <value></value> + </param> + <param> + <key>option3</key> + <value>3</value> + </param> + <param> + <key>label3</key> + <value></value> + </param> + <param> + <key>option4</key> + <value>4</value> + </param> + <param> + <key>label4</key> + <value></value> + </param> + <param> + <key>widget</key> + <value>combo_box</value> + </param> + <param> + <key>orient</key> + <value>Qt.QVBoxLayout</value> + </param> + <param> + <key>gui_hint</key> + <value>2,0,1,1</value> + </param> + <param> + <key>alias</key> + <value></value> + </param> + <param> + <key>_coordinate</key> + <value>(439, 11)</value> + </param> + <param> + <key>_rotation</key> + <value>0</value> + </param> + </block> + <block> + <key>fcd_source_c</key> + <param> + <key>id</key> + <value>fcd_source_c_1</value> + </param> + <param> + <key>_enabled</key> + <value>True</value> + </param> + <param> + <key>device_name</key> + <value>hw:0</value> + </param> + <param> + <key>freq</key> + <value>fcd_freq</value> + </param> + <param> + <key>lna</key> + <value>fcd_lna_gain</value> + </param> + <param> + <key>mixer</key> + <value>+12</value> + </param> + <param> + <key>ppm</key> + <value>-120</value> + </param> + <param> + <key>dci</key> + <value>0.0</value> + </param> + <param> + <key>dcq</key> + <value>0.0</value> + </param> + <param> + <key>iq_phase</key> + <value>0.0</value> + </param> + <param> + <key>iq_gain</key> + <value>1.0</value> + </param> + <param> + <key>alias</key> + <value></value> + </param> + <param> + <key>affinity</key> + <value></value> + </param> + <param> + <key>minoutbuf</key> + <value>0</value> + </param> + <param> + <key>maxoutbuf</key> + <value>0</value> + </param> + <param> + <key>_coordinate</key> + <value>(13, 134)</value> + </param> + <param> + <key>_rotation</key> + <value>0</value> + </param> + </block> + <block> + <key>qtgui_freq_sink_x</key> + <param> + <key>id</key> + <value>qtgui_freq_sink_x_0</value> + </param> + <param> + <key>_enabled</key> + <value>True</value> + </param> + <param> + <key>type</key> + <value>complex</value> + </param> + <param> + <key>name</key> + <value>""</value> + </param> + <param> + <key>fftsize</key> + <value>512</value> + </param> + <param> + <key>wintype</key> + <value>firdes.WIN_BLACKMAN_hARRIS</value> + </param> + <param> + <key>fc</key> + <value>fcd_freq</value> + </param> + <param> + <key>bw</key> + <value>samp_rate</value> + </param> + <param> + <key>grid</key> + <value>False</value> + </param> + <param> + <key>autoscale</key> + <value>False</value> + </param> + <param> + <key>average</key> + <value>1.0</value> + </param> + <param> + <key>ymin</key> + <value>-140</value> + </param> + <param> + <key>ymax</key> + <value>10</value> + </param> + <param> + <key>nconnections</key> + <value>1</value> + </param> + <param> + <key>update_time</key> + <value>0.05</value> + </param> + <param> + <key>gui_hint</key> + <value>0,0,1,2</value> + </param> + <param> + <key>showports</key> + <value>True</value> + </param> + <param> + <key>label1</key> + <value></value> + </param> + <param> + <key>width1</key> + <value>1</value> + </param> + <param> + <key>color1</key> + <value>"blue"</value> + </param> + <param> + <key>alpha1</key> + <value>1.0</value> + </param> + <param> + <key>label2</key> + <value></value> + </param> + <param> + <key>width2</key> + <value>1</value> + </param> + <param> + <key>color2</key> + <value>"red"</value> + </param> + <param> + <key>alpha2</key> + <value>1.0</value> + </param> + <param> + <key>label3</key> + <value></value> + </param> + <param> + <key>width3</key> + <value>1</value> + </param> + <param> + <key>color3</key> + <value>"green"</value> + </param> + <param> + <key>alpha3</key> + <value>1.0</value> + </param> + <param> + <key>label4</key> + <value></value> + </param> + <param> + <key>width4</key> + <value>1</value> + </param> + <param> + <key>color4</key> + <value>"black"</value> + </param> + <param> + <key>alpha4</key> + <value>1.0</value> + </param> + <param> + <key>label5</key> + <value></value> + </param> + <param> + <key>width5</key> + <value>1</value> + </param> + <param> + <key>color5</key> + <value>"cyan"</value> + </param> + <param> + <key>alpha5</key> + <value>1.0</value> + </param> + <param> + <key>label6</key> + <value></value> + </param> + <param> + <key>width6</key> + <value>1</value> + </param> + <param> + <key>color6</key> + <value>"magenta"</value> + </param> + <param> + <key>alpha6</key> + <value>1.0</value> + </param> + <param> + <key>label7</key> + <value></value> + </param> + <param> + <key>width7</key> + <value>1</value> + </param> + <param> + <key>color7</key> + <value>"yellow"</value> + </param> + <param> + <key>alpha7</key> + <value>1.0</value> + </param> + <param> + <key>label8</key> + <value></value> + </param> + <param> + <key>width8</key> + <value>1</value> + </param> + <param> + <key>color8</key> + <value>"dark red"</value> + </param> + <param> + <key>alpha8</key> + <value>1.0</value> + </param> + <param> + <key>label9</key> + <value></value> + </param> + <param> + <key>width9</key> + <value>1</value> + </param> + <param> + <key>color9</key> + <value>"dark green"</value> + </param> + <param> + <key>alpha9</key> + <value>1.0</value> + </param> + <param> + <key>label10</key> + <value></value> + </param> + <param> + <key>width10</key> + <value>1</value> + </param> + <param> + <key>color10</key> + <value>"dark blue"</value> + </param> + <param> + <key>alpha10</key> + <value>1.0</value> + </param> + <param> + <key>alias</key> + <value></value> + </param> + <param> + <key>affinity</key> + <value></value> + </param> + <param> + <key>minoutbuf</key> + <value>0</value> + </param> + <param> + <key>maxoutbuf</key> + <value>0</value> + </param> + <param> + <key>_coordinate</key> + <value>(282, 182)</value> + </param> + <param> + <key>_rotation</key> + <value>0</value> + </param> + </block> + <connection> + <source_block_id>fcd_source_c_1</source_block_id> + <sink_block_id>qtgui_freq_sink_x_0</sink_block_id> + <source_key>0</source_key> + <sink_key>0</sink_key> + </connection> +</flow_graph> diff --git a/gr-fcd/examples/grc/fcd_fft_wx.grc b/gr-fcd/examples/grc/fcd_fft_wx.grc deleted file mode 100644 index c045bbfa24..0000000000 --- a/gr-fcd/examples/grc/fcd_fft_wx.grc +++ /dev/null @@ -1,320 +0,0 @@ -<?xml version='1.0' encoding='ASCII'?> -<flow_graph> - <timestamp>Sun May 8 18:02:35 2011</timestamp> - <block> - <key>options</key> - <param> - <key>id</key> - <value>fcd_fft_wx</value> - </param> - <param> - <key>_enabled</key> - <value>True</value> - </param> - <param> - <key>title</key> - <value>Funcube Dongle FFT scope</value> - </param> - <param> - <key>author</key> - <value>Alexandru Csete OZ9AEC</value> - </param> - <param> - <key>description</key> - <value></value> - </param> - <param> - <key>window_size</key> - <value>1280, 1024</value> - </param> - <param> - <key>generate_options</key> - <value>wx_gui</value> - </param> - <param> - <key>category</key> - <value>Custom</value> - </param> - <param> - <key>run_options</key> - <value>prompt</value> - </param> - <param> - <key>run</key> - <value>True</value> - </param> - <param> - <key>realtime_scheduling</key> - <value></value> - </param> - <param> - <key>_coordinate</key> - <value>(10, 10)</value> - </param> - <param> - <key>_rotation</key> - <value>0</value> - </param> - </block> - <block> - <key>variable</key> - <param> - <key>id</key> - <value>samp_rate</value> - </param> - <param> - <key>_enabled</key> - <value>True</value> - </param> - <param> - <key>value</key> - <value>96000</value> - </param> - <param> - <key>_coordinate</key> - <value>(201, 11)</value> - </param> - <param> - <key>_rotation</key> - <value>0</value> - </param> - </block> - <block> - <key>variable_text_box</key> - <param> - <key>id</key> - <value>fcd_freq</value> - </param> - <param> - <key>_enabled</key> - <value>True</value> - </param> - <param> - <key>label</key> - <value>FCD freq</value> - </param> - <param> - <key>value</key> - <value>145500000</value> - </param> - <param> - <key>converver</key> - <value>float_converter</value> - </param> - <param> - <key>formatter</key> - <value>None</value> - </param> - <param> - <key>grid_pos</key> - <value>1,0,1,1</value> - </param> - <param> - <key>notebook</key> - <value></value> - </param> - <param> - <key>_coordinate</key> - <value>(300, 11)</value> - </param> - <param> - <key>_rotation</key> - <value>0</value> - </param> - </block> - <block> - <key>variable_chooser</key> - <param> - <key>id</key> - <value>fcd_lna_gain</value> - </param> - <param> - <key>_enabled</key> - <value>True</value> - </param> - <param> - <key>label</key> - <value>LNA gain [dB]</value> - </param> - <param> - <key>value</key> - <value>20.0</value> - </param> - <param> - <key>choices</key> - <value>[30.0, 25.0, 20.0, 17.5, 15.0, 12.5, 10.0, 7.5, 5.0, 2.5, 0.0, -2.5, -5.0]</value> - </param> - <param> - <key>labels</key> - <value>[]</value> - </param> - <param> - <key>type</key> - <value>drop_down</value> - </param> - <param> - <key>style</key> - <value>wx.RA_HORIZONTAL</value> - </param> - <param> - <key>grid_pos</key> - <value>2,0,1,1</value> - </param> - <param> - <key>notebook</key> - <value></value> - </param> - <param> - <key>_coordinate</key> - <value>(446, 10)</value> - </param> - <param> - <key>_rotation</key> - <value>0</value> - </param> - </block> - <block> - <key>wxgui_fftsink2</key> - <param> - <key>id</key> - <value>wxgui_fftsink2_0</value> - </param> - <param> - <key>_enabled</key> - <value>True</value> - </param> - <param> - <key>type</key> - <value>complex</value> - </param> - <param> - <key>title</key> - <value>FCD Spectrum</value> - </param> - <param> - <key>samp_rate</key> - <value>samp_rate</value> - </param> - <param> - <key>baseband_freq</key> - <value>fcd_freq</value> - </param> - <param> - <key>y_per_div</key> - <value>10</value> - </param> - <param> - <key>y_divs</key> - <value>10</value> - </param> - <param> - <key>ref_level</key> - <value>0</value> - </param> - <param> - <key>ref_scale</key> - <value>1.0</value> - </param> - <param> - <key>fft_size</key> - <value>512</value> - </param> - <param> - <key>fft_rate</key> - <value>15</value> - </param> - <param> - <key>peak_hold</key> - <value>False</value> - </param> - <param> - <key>average</key> - <value>False</value> - </param> - <param> - <key>avg_alpha</key> - <value>0</value> - </param> - <param> - <key>win</key> - <value>None</value> - </param> - <param> - <key>win_size</key> - <value></value> - </param> - <param> - <key>grid_pos</key> - <value>0,0,1,2</value> - </param> - <param> - <key>notebook</key> - <value></value> - </param> - <param> - <key>_coordinate</key> - <value>(442, 176)</value> - </param> - <param> - <key>_rotation</key> - <value>0</value> - </param> - </block> - <block> - <key>fcd_source_c</key> - <param> - <key>id</key> - <value>fcd_source_c_1</value> - </param> - <param> - <key>_enabled</key> - <value>True</value> - </param> - <param> - <key>device_name</key> - <value>hw:1</value> - </param> - <param> - <key>freq</key> - <value>fcd_freq</value> - </param> - <param> - <key>lna</key> - <value>fcd_lna_gain</value> - </param> - <param> - <key>ppm</key> - <value>-120</value> - </param> - <param> - <key>dci</key> - <value>0.0</value> - </param> - <param> - <key>dcq</key> - <value>0.0</value> - </param> - <param> - <key>iq_phase</key> - <value>0.0</value> - </param> - <param> - <key>iq_gain</key> - <value>1.0</value> - </param> - <param> - <key>_coordinate</key> - <value>(95, 192)</value> - </param> - <param> - <key>_rotation</key> - <value>0</value> - </param> - </block> - <connection> - <source_block_id>fcd_source_c_1</source_block_id> - <sink_block_id>wxgui_fftsink2_0</sink_block_id> - <source_key>0</source_key> - <sink_key>0</sink_key> - </connection> -</flow_graph> diff --git a/gr-fcd/examples/grc/fcd_nfm_rx.grc b/gr-fcd/examples/grc/fcd_nfm_rx.grc index afe343a834..af56c4f28e 100644 --- a/gr-fcd/examples/grc/fcd_nfm_rx.grc +++ b/gr-fcd/examples/grc/fcd_nfm_rx.grc @@ -1,6 +1,6 @@ <?xml version='1.0' encoding='ASCII'?> <flow_graph> - <timestamp>Mon Mar 18 10:11:39 2013</timestamp> + <timestamp>Mon Jul 14 15:02:45 2014</timestamp> <block> <key>options</key> <param> @@ -29,7 +29,7 @@ </param> <param> <key>generate_options</key> - <value>wx_gui</value> + <value>qt_gui</value> </param> <param> <key>category</key> @@ -52,6 +52,10 @@ <value></value> </param> <param> + <key>alias</key> + <value></value> + </param> + <param> <key>_coordinate</key> <value>(10, 10)</value> </param> @@ -61,42 +65,53 @@ </param> </block> <block> - <key>variable_static_text</key> + <key>variable</key> <param> <key>id</key> - <value>rx_freq</value> + <value>xlate_filter_taps</value> </param> <param> <key>_enabled</key> <value>True</value> </param> <param> - <key>label</key> - <value>Receive</value> + <key>value</key> + <value>firdes.low_pass(1, samp_rate, 48000, 5000, firdes.WIN_HAMMING, 6.76)</value> </param> <param> - <key>value</key> - <value>freq+(offset_coarse+offset_fine)</value> + <key>alias</key> + <value></value> </param> <param> - <key>converver</key> - <value>float_converter</value> + <key>_coordinate</key> + <value>(428, 294)</value> </param> <param> - <key>formatter</key> - <value>None</value> + <key>_rotation</key> + <value>0</value> + </param> + </block> + <block> + <key>variable</key> + <param> + <key>id</key> + <value>samp_rate</value> </param> <param> - <key>grid_pos</key> - <value>5,3,1,1</value> + <key>_enabled</key> + <value>True</value> + </param> + <param> + <key>value</key> + <value>96000</value> </param> <param> - <key>notebook</key> + <key>alias</key> <value></value> </param> <param> <key>_coordinate</key> - <value>(491, 10)</value> + <value>(182, 11)</value> </param> <param> <key>_rotation</key> @@ -104,54 +119,70 @@ </param> </block> <block> - <key>variable_slider</key> + <key>low_pass_filter</key> <param> <key>id</key> - <value>offset_fine</value> + <value>low_pass_filter</value> </param> <param> <key>_enabled</key> <value>True</value> </param> <param> - <key>label</key> - <value>Fine tune</value> + <key>type</key> + <value>fir_filter_ccf</value> </param> <param> - <key>value</key> - <value>0</value> + <key>decim</key> + <value>1</value> </param> <param> - <key>min</key> - <value>-1000</value> + <key>interp</key> + <value>1</value> </param> <param> - <key>max</key> - <value>1000</value> + <key>gain</key> + <value>1</value> </param> <param> - <key>num_steps</key> - <value>400</value> + <key>samp_rate</key> + <value>samp_rate</value> </param> <param> - <key>style</key> - <value>wx.SL_HORIZONTAL</value> + <key>cutoff_freq</key> + <value>width/2</value> </param> <param> - <key>converver</key> - <value>float_converter</value> + <key>width</key> + <value>trans</value> </param> <param> - <key>grid_pos</key> - <value>6,0,1,2</value> + <key>win</key> + <value>firdes.WIN_HAMMING</value> + </param> + <param> + <key>beta</key> + <value>6.76</value> + </param> + <param> + <key>alias</key> + <value></value> </param> <param> - <key>notebook</key> + <key>affinity</key> <value></value> </param> <param> + <key>minoutbuf</key> + <value>0</value> + </param> + <param> + <key>maxoutbuf</key> + <value>0</value> + </param> + <param> <key>_coordinate</key> - <value>(9, 279)</value> + <value>(742, 266)</value> </param> <param> <key>_rotation</key> @@ -159,54 +190,70 @@ </param> </block> <block> - <key>variable_slider</key> + <key>fcd_source_c</key> <param> <key>id</key> - <value>offset_coarse</value> + <value>fcd_source_c_1</value> </param> <param> <key>_enabled</key> <value>True</value> </param> <param> - <key>label</key> - <value>Coarse tune</value> + <key>device_name</key> + <value>hw:0</value> </param> <param> - <key>value</key> - <value>0</value> + <key>freq</key> + <value>freq</value> </param> <param> - <key>min</key> - <value>-48000</value> + <key>lna</key> + <value>rf_gain</value> </param> <param> - <key>max</key> - <value>48000</value> + <key>mixer</key> + <value>+12</value> </param> <param> - <key>num_steps</key> - <value>960</value> + <key>ppm</key> + <value>-120</value> </param> <param> - <key>style</key> - <value>wx.SL_HORIZONTAL</value> + <key>dci</key> + <value>0.0</value> </param> <param> - <key>converver</key> - <value>float_converter</value> + <key>dcq</key> + <value>0.0</value> </param> <param> - <key>grid_pos</key> - <value>6,2,1,2</value> + <key>iq_phase</key> + <value>0.0</value> </param> <param> - <key>notebook</key> + <key>iq_gain</key> + <value>1.0</value> + </param> + <param> + <key>alias</key> + <value></value> + </param> + <param> + <key>affinity</key> <value></value> </param> <param> + <key>minoutbuf</key> + <value>0</value> + </param> + <param> + <key>maxoutbuf</key> + <value>0</value> + </param> + <param> <key>_coordinate</key> - <value>(10, 130)</value> + <value>(165, 157)</value> </param> <param> <key>_rotation</key> @@ -214,54 +261,54 @@ </param> </block> <block> - <key>variable_slider</key> + <key>freq_xlating_fir_filter_xxx</key> <param> <key>id</key> - <value>width</value> + <value>freq_xlating_fir_filter_xxx_0</value> </param> <param> <key>_enabled</key> <value>True</value> </param> <param> - <key>label</key> - <value>Filter</value> + <key>type</key> + <value>ccc</value> </param> <param> - <key>value</key> - <value>10000</value> + <key>decim</key> + <value>1</value> </param> <param> - <key>min</key> - <value>2000</value> + <key>taps</key> + <value>xlate_filter_taps</value> </param> <param> - <key>max</key> - <value>40000</value> + <key>center_freq</key> + <value>-(offset_coarse+offset_fine)</value> </param> <param> - <key>num_steps</key> - <value>760</value> + <key>samp_rate</key> + <value>samp_rate</value> </param> <param> - <key>style</key> - <value>wx.SL_HORIZONTAL</value> + <key>alias</key> + <value></value> </param> <param> - <key>converver</key> - <value>float_converter</value> + <key>affinity</key> + <value></value> </param> <param> - <key>grid_pos</key> - <value>7,0,1,1</value> + <key>minoutbuf</key> + <value>0</value> </param> <param> - <key>notebook</key> - <value></value> + <key>maxoutbuf</key> + <value>0</value> </param> <param> <key>_coordinate</key> - <value>(9, 431)</value> + <value>(422, 173)</value> </param> <param> <key>_rotation</key> @@ -269,144 +316,254 @@ </param> </block> <block> - <key>variable_slider</key> + <key>qtgui_freq_sink_x</key> <param> <key>id</key> - <value>trans</value> + <value>qtgui_freq_sink_x_0</value> </param> <param> <key>_enabled</key> <value>True</value> </param> <param> - <key>label</key> - <value>Trans</value> + <key>type</key> + <value>complex</value> </param> <param> - <key>value</key> - <value>1500</value> + <key>name</key> + <value>""</value> </param> <param> - <key>min</key> - <value>500</value> + <key>fftsize</key> + <value>512</value> </param> <param> - <key>max</key> - <value>5000</value> + <key>wintype</key> + <value>firdes.WIN_BLACKMAN_hARRIS</value> + </param> + <param> + <key>fc</key> + <value>rx_freq*display_selector</value> </param> <param> - <key>num_steps</key> - <value>900</value> + <key>bw</key> + <value>samp_rate</value> </param> <param> - <key>style</key> - <value>wx.SL_HORIZONTAL</value> + <key>grid</key> + <value>False</value> </param> <param> - <key>converver</key> - <value>float_converter</value> + <key>autoscale</key> + <value>False</value> </param> <param> - <key>grid_pos</key> - <value>8,0,1,1</value> + <key>average</key> + <value>1.0</value> </param> <param> - <key>notebook</key> - <value></value> + <key>ymin</key> + <value>-140</value> </param> <param> - <key>_coordinate</key> - <value>(10, 577)</value> + <key>ymax</key> + <value>10</value> </param> <param> - <key>_rotation</key> - <value>0</value> + <key>nconnections</key> + <value>1</value> </param> - </block> - <block> - <key>variable_slider</key> <param> - <key>id</key> - <value>af_gain</value> + <key>update_time</key> + <value>0.05</value> </param> <param> - <key>_enabled</key> + <key>gui_hint</key> + <value>0,0,5,4</value> + </param> + <param> + <key>showports</key> <value>True</value> </param> <param> - <key>label</key> - <value>VOL</value> + <key>label1</key> + <value></value> </param> <param> - <key>value</key> + <key>width1</key> <value>1</value> </param> <param> - <key>min</key> - <value>0</value> + <key>color1</key> + <value>"blue"</value> </param> <param> - <key>max</key> - <value>5</value> + <key>alpha1</key> + <value>1.0</value> </param> <param> - <key>num_steps</key> - <value>50</value> + <key>label2</key> + <value></value> </param> <param> - <key>style</key> - <value>wx.SL_HORIZONTAL</value> + <key>width2</key> + <value>1</value> </param> <param> - <key>converver</key> - <value>float_converter</value> + <key>color2</key> + <value>"red"</value> </param> <param> - <key>grid_pos</key> - <value>8,1,1,1</value> + <key>alpha2</key> + <value>1.0</value> </param> <param> - <key>notebook</key> + <key>label3</key> <value></value> </param> <param> - <key>_coordinate</key> - <value>(168, 726)</value> + <key>width3</key> + <value>1</value> </param> <param> - <key>_rotation</key> - <value>0</value> + <key>color3</key> + <value>"green"</value> </param> - </block> - <block> - <key>audio_sink</key> <param> - <key>id</key> - <value>audio_sink</value> + <key>alpha3</key> + <value>1.0</value> </param> <param> - <key>_enabled</key> - <value>True</value> + <key>label4</key> + <value></value> </param> <param> - <key>samp_rate</key> - <value>48000</value> + <key>width4</key> + <value>1</value> </param> <param> - <key>device_name</key> + <key>color4</key> + <value>"black"</value> + </param> + <param> + <key>alpha4</key> + <value>1.0</value> + </param> + <param> + <key>label5</key> <value></value> </param> <param> - <key>ok_to_block</key> - <value>True</value> + <key>width5</key> + <value>1</value> </param> <param> - <key>num_inputs</key> - <value>2</value> + <key>color5</key> + <value>"cyan"</value> + </param> + <param> + <key>alpha5</key> + <value>1.0</value> + </param> + <param> + <key>label6</key> + <value></value> + </param> + <param> + <key>width6</key> + <value>1</value> + </param> + <param> + <key>color6</key> + <value>"magenta"</value> + </param> + <param> + <key>alpha6</key> + <value>1.0</value> + </param> + <param> + <key>label7</key> + <value></value> + </param> + <param> + <key>width7</key> + <value>1</value> + </param> + <param> + <key>color7</key> + <value>"yellow"</value> + </param> + <param> + <key>alpha7</key> + <value>1.0</value> + </param> + <param> + <key>label8</key> + <value></value> + </param> + <param> + <key>width8</key> + <value>1</value> + </param> + <param> + <key>color8</key> + <value>"dark red"</value> + </param> + <param> + <key>alpha8</key> + <value>1.0</value> + </param> + <param> + <key>label9</key> + <value></value> + </param> + <param> + <key>width9</key> + <value>1</value> + </param> + <param> + <key>color9</key> + <value>"dark green"</value> + </param> + <param> + <key>alpha9</key> + <value>1.0</value> + </param> + <param> + <key>label10</key> + <value></value> + </param> + <param> + <key>width10</key> + <value>1</value> + </param> + <param> + <key>color10</key> + <value>"dark blue"</value> + </param> + <param> + <key>alpha10</key> + <value>1.0</value> + </param> + <param> + <key>alias</key> + <value></value> + </param> + <param> + <key>affinity</key> + <value></value> + </param> + <param> + <key>minoutbuf</key> + <value>0</value> + </param> + <param> + <key>maxoutbuf</key> + <value>0</value> </param> <param> <key>_coordinate</key> - <value>(882, 511)</value> + <value>(732, 165)</value> </param> <param> <key>_rotation</key> @@ -414,22 +571,38 @@ </param> </block> <block> - <key>variable</key> + <key>variable_qtgui_entry</key> <param> <key>id</key> - <value>samp_rate</value> + <value>freq</value> </param> <param> <key>_enabled</key> <value>True</value> </param> <param> + <key>label</key> + <value>FCD Freq</value> + </param> + <param> + <key>type</key> + <value>real</value> + </param> + <param> <key>value</key> - <value>96000</value> + <value>144.47e6</value> + </param> + <param> + <key>gui_hint</key> + <value>5,1,1,1</value> + </param> + <param> + <key>alias</key> + <value></value> </param> <param> <key>_coordinate</key> - <value>(210, 12)</value> + <value>(282, 10)</value> </param> <param> <key>_rotation</key> @@ -437,10 +610,10 @@ </param> </block> <block> - <key>variable_slider</key> + <key>variable_qtgui_label</key> <param> <key>id</key> - <value>sql_lev</value> + <value>rx_freq</value> </param> <param> <key>_enabled</key> @@ -448,43 +621,74 @@ </param> <param> <key>label</key> - <value>SQL</value> + <value>Receive</value> + </param> + <param> + <key>type</key> + <value>real</value> </param> <param> <key>value</key> - <value>-100</value> + <value>freq+(offset_coarse+offset_fine)</value> </param> <param> - <key>min</key> - <value>-100</value> + <key>formatter</key> + <value>None</value> </param> <param> - <key>max</key> + <key>gui_hint</key> + <value>4,3,1,1</value> + </param> + <param> + <key>alias</key> + <value></value> + </param> + <param> + <key>_coordinate</key> + <value>(430, 10)</value> + </param> + <param> + <key>_rotation</key> <value>0</value> </param> + </block> + <block> + <key>analog_simple_squelch_cc</key> + <param> + <key>id</key> + <value>analog_simple_squelch_cc_0</value> + </param> <param> - <key>num_steps</key> - <value>500</value> + <key>_enabled</key> + <value>True</value> </param> <param> - <key>style</key> - <value>wx.SL_HORIZONTAL</value> + <key>threshold</key> + <value>sql_lev</value> </param> <param> - <key>converver</key> - <value>float_converter</value> + <key>alpha</key> + <value>1</value> </param> <param> - <key>grid_pos</key> - <value>7,2,1,1</value> + <key>alias</key> + <value></value> </param> <param> - <key>notebook</key> + <key>affinity</key> <value></value> </param> <param> + <key>minoutbuf</key> + <value>0</value> + </param> + <param> + <key>maxoutbuf</key> + <value>0</value> + </param> + <param> <key>_coordinate</key> - <value>(328, 728)</value> + <value>(199, 498)</value> </param> <param> <key>_rotation</key> @@ -492,22 +696,50 @@ </param> </block> <block> - <key>variable</key> + <key>analog_nbfm_rx</key> <param> <key>id</key> - <value>xlate_filter_taps</value> + <value>analog_nbfm_rx_0</value> </param> <param> <key>_enabled</key> <value>True</value> </param> <param> - <key>value</key> - <value>firdes.low_pass(1, samp_rate, 48000, 5000, firdes.WIN_HAMMING, 6.76)</value> + <key>audio_rate</key> + <value>48000</value> + </param> + <param> + <key>quad_rate</key> + <value>96000</value> + </param> + <param> + <key>tau</key> + <value>75e-6</value> + </param> + <param> + <key>max_dev</key> + <value>5e3</value> + </param> + <param> + <key>alias</key> + <value></value> + </param> + <param> + <key>affinity</key> + <value></value> + </param> + <param> + <key>minoutbuf</key> + <value>0</value> + </param> + <param> + <key>maxoutbuf</key> + <value>0</value> </param> <param> <key>_coordinate</key> - <value>(428, 294)</value> + <value>(391, 482)</value> </param> <param> <key>_rotation</key> @@ -515,50 +747,46 @@ </param> </block> <block> - <key>variable_chooser</key> + <key>blocks_multiply_const_vxx</key> <param> <key>id</key> - <value>display_selector</value> + <value>blocks_multiply_const_vxx_1</value> </param> <param> <key>_enabled</key> <value>True</value> </param> <param> - <key>label</key> - <value>Spectrum</value> - </param> - <param> - <key>value</key> - <value>0</value> + <key>type</key> + <value>float</value> </param> <param> - <key>choices</key> - <value>[0, 1]</value> + <key>const</key> + <value>af_gain</value> </param> <param> - <key>labels</key> - <value>['Baseband','RF']</value> + <key>vlen</key> + <value>1</value> </param> <param> - <key>type</key> - <value>drop_down</value> + <key>alias</key> + <value></value> </param> <param> - <key>style</key> - <value>wx.RA_HORIZONTAL</value> + <key>affinity</key> + <value></value> </param> <param> - <key>grid_pos</key> - <value>5,0,1,1</value> + <key>minoutbuf</key> + <value>0</value> </param> <param> - <key>notebook</key> - <value></value> + <key>maxoutbuf</key> + <value>0</value> </param> <param> <key>_coordinate</key> - <value>(481, 728)</value> + <value>(580, 506)</value> </param> <param> <key>_rotation</key> @@ -566,42 +794,42 @@ </param> </block> <block> - <key>variable_text_box</key> + <key>audio_sink</key> <param> <key>id</key> - <value>freq</value> + <value>audio_sink</value> </param> <param> <key>_enabled</key> <value>True</value> </param> <param> - <key>label</key> - <value>FCD Freq</value> + <key>samp_rate</key> + <value>48000</value> </param> <param> - <key>value</key> - <value>144470000</value> + <key>device_name</key> + <value></value> </param> <param> - <key>converver</key> - <value>float_converter</value> + <key>ok_to_block</key> + <value>True</value> </param> <param> - <key>formatter</key> - <value>None</value> + <key>num_inputs</key> + <value>2</value> </param> <param> - <key>grid_pos</key> - <value>5,1,1,1</value> + <key>alias</key> + <value></value> </param> <param> - <key>notebook</key> + <key>affinity</key> <value></value> </param> <param> <key>_coordinate</key> - <value>(339, 9)</value> + <value>(757, 510)</value> </param> <param> <key>_rotation</key> @@ -609,10 +837,10 @@ </param> </block> <block> - <key>variable_slider</key> + <key>variable_qtgui_range</key> <param> <key>id</key> - <value>rf_gain</value> + <value>offset_coarse</value> </param> <param> <key>_enabled</key> @@ -620,43 +848,47 @@ </param> <param> <key>label</key> - <value>RF</value> + <value>Coarse Tune</value> </param> <param> <key>value</key> - <value>20</value> + <value>0</value> </param> <param> - <key>min</key> - <value>-5</value> + <key>start</key> + <value>-48000</value> </param> <param> - <key>max</key> - <value>30</value> + <key>stop</key> + <value>48000</value> </param> <param> - <key>num_steps</key> - <value>35</value> + <key>step</key> + <value>100</value> </param> <param> - <key>style</key> - <value>wx.SL_HORIZONTAL</value> + <key>widget</key> + <value>counter</value> </param> <param> - <key>converver</key> - <value>float_converter</value> + <key>orient</key> + <value>Qt.Horizontal</value> </param> <param> - <key>grid_pos</key> - <value>7,1,1,1</value> + <key>min_len</key> + <value>200</value> + </param> + <param> + <key>gui_hint</key> + <value>6,2,1,2</value> </param> <param> - <key>notebook</key> + <key>alias</key> <value></value> </param> <param> <key>_coordinate</key> - <value>(11, 725)</value> + <value>(11, 123)</value> </param> <param> <key>_rotation</key> @@ -664,54 +896,58 @@ </param> </block> <block> - <key>fcd_source_c</key> + <key>variable_qtgui_range</key> <param> <key>id</key> - <value>fcd_source_c_1</value> + <value>offset_fine</value> </param> <param> <key>_enabled</key> <value>True</value> </param> <param> - <key>device_name</key> - <value>hw:1</value> + <key>label</key> + <value>Fine Tune</value> </param> <param> - <key>freq</key> - <value>freq</value> + <key>value</key> + <value>0</value> </param> <param> - <key>lna</key> - <value>rf_gain</value> + <key>start</key> + <value>-1000</value> </param> <param> - <key>mixer</key> - <value>+12</value> + <key>stop</key> + <value>1000</value> </param> <param> - <key>ppm</key> - <value>-120</value> + <key>step</key> + <value>1</value> </param> <param> - <key>dci</key> - <value>0.0</value> + <key>widget</key> + <value>counter</value> </param> <param> - <key>dcq</key> - <value>0.0</value> + <key>orient</key> + <value>Qt.Horizontal</value> </param> <param> - <key>iq_phase</key> - <value>0.0</value> + <key>min_len</key> + <value>200</value> </param> <param> - <key>iq_gain</key> - <value>1.0</value> + <key>gui_hint</key> + <value>6,0,1,2</value> + </param> + <param> + <key>alias</key> + <value></value> </param> <param> <key>_coordinate</key> - <value>(165, 157)</value> + <value>(11, 250)</value> </param> <param> <key>_rotation</key> @@ -719,90 +955,117 @@ </param> </block> <block> - <key>wxgui_fftsink2</key> + <key>variable_qtgui_range</key> <param> <key>id</key> - <value>fftsink</value> + <value>width</value> </param> <param> <key>_enabled</key> <value>True</value> </param> <param> - <key>type</key> - <value>complex</value> + <key>label</key> + <value>Filter</value> </param> <param> - <key>title</key> - <value></value> + <key>value</key> + <value>10000</value> </param> <param> - <key>samp_rate</key> - <value>samp_rate</value> + <key>start</key> + <value>2000</value> </param> <param> - <key>baseband_freq</key> - <value>rx_freq*display_selector</value> + <key>stop</key> + <value>40000</value> </param> <param> - <key>y_per_div</key> - <value>10</value> + <key>step</key> + <value>100</value> </param> <param> - <key>y_divs</key> - <value>10</value> + <key>widget</key> + <value>counter</value> </param> <param> - <key>ref_level</key> - <value>0</value> + <key>orient</key> + <value>Qt.Horizontal</value> </param> <param> - <key>ref_scale</key> - <value>1.0</value> + <key>min_len</key> + <value>200</value> </param> <param> - <key>fft_size</key> - <value>512</value> + <key>gui_hint</key> + <value>7,0,1,1</value> </param> <param> - <key>fft_rate</key> - <value>15</value> + <key>alias</key> + <value></value> </param> <param> - <key>peak_hold</key> - <value>False</value> + <key>_coordinate</key> + <value>(11, 377)</value> </param> <param> - <key>average</key> + <key>_rotation</key> + <value>0</value> + </param> + </block> + <block> + <key>variable_qtgui_range</key> + <param> + <key>id</key> + <value>trans</value> + </param> + <param> + <key>_enabled</key> <value>True</value> </param> <param> - <key>avg_alpha</key> - <value>0.5</value> + <key>label</key> + <value>Trans</value> </param> <param> - <key>win</key> - <value>None</value> + <key>value</key> + <value>1500</value> </param> <param> - <key>win_size</key> - <value>800,300</value> + <key>start</key> + <value>500</value> </param> <param> - <key>grid_pos</key> - <value>0,0,5,4</value> + <key>stop</key> + <value>5000</value> </param> <param> - <key>notebook</key> - <value></value> + <key>step</key> + <value>1</value> </param> <param> - <key>freqvar</key> - <value>None</value> + <key>widget</key> + <value>counter</value> + </param> + <param> + <key>orient</key> + <value>Qt.Horizontal</value> + </param> + <param> + <key>min_len</key> + <value>200</value> + </param> + <param> + <key>gui_hint</key> + <value>8,0,1,1</value> + </param> + <param> + <key>alias</key> + <value></value> </param> <param> <key>_coordinate</key> - <value>(742, 24)</value> + <value>(10, 504)</value> </param> <param> <key>_rotation</key> @@ -810,38 +1073,58 @@ </param> </block> <block> - <key>freq_xlating_fir_filter_xxx</key> + <key>variable_qtgui_range</key> <param> <key>id</key> - <value>freq_xlating_fir_filter_xxx_0</value> + <value>rf_gain</value> </param> <param> <key>_enabled</key> <value>True</value> </param> <param> - <key>type</key> - <value>ccc</value> + <key>label</key> + <value>RF</value> </param> <param> - <key>decim</key> + <key>value</key> + <value>20</value> + </param> + <param> + <key>start</key> + <value>-5</value> + </param> + <param> + <key>stop</key> + <value>30</value> + </param> + <param> + <key>step</key> <value>1</value> </param> <param> - <key>taps</key> - <value>xlate_filter_taps</value> + <key>widget</key> + <value>counter</value> </param> <param> - <key>center_freq</key> - <value>-(offset_coarse+offset_fine)</value> + <key>orient</key> + <value>Qt.Horizontal</value> </param> <param> - <key>samp_rate</key> - <value>samp_rate</value> + <key>min_len</key> + <value>200</value> + </param> + <param> + <key>gui_hint</key> + <value>7,1,1,1</value> + </param> + <param> + <key>alias</key> + <value></value> </param> <param> <key>_coordinate</key> - <value>(422, 173)</value> + <value>(10, 632)</value> </param> <param> <key>_rotation</key> @@ -849,54 +1132,58 @@ </param> </block> <block> - <key>low_pass_filter</key> + <key>variable_qtgui_range</key> <param> <key>id</key> - <value>low_pass_filter</value> + <value>af_gain</value> </param> <param> <key>_enabled</key> <value>True</value> </param> <param> - <key>type</key> - <value>fir_filter_ccf</value> + <key>label</key> + <value>VOL</value> </param> <param> - <key>decim</key> + <key>value</key> <value>1</value> </param> <param> - <key>interp</key> - <value>1</value> + <key>start</key> + <value>0</value> </param> <param> - <key>gain</key> - <value>1</value> + <key>stop</key> + <value>5</value> </param> <param> - <key>samp_rate</key> - <value>samp_rate</value> + <key>step</key> + <value>0.1</value> </param> <param> - <key>cutoff_freq</key> - <value>width/2</value> + <key>widget</key> + <value>counter</value> </param> <param> - <key>width</key> - <value>trans</value> + <key>orient</key> + <value>Qt.Horizontal</value> </param> <param> - <key>win</key> - <value>firdes.WIN_HAMMING</value> + <key>min_len</key> + <value>200</value> </param> <param> - <key>beta</key> - <value>6.76</value> + <key>gui_hint</key> + <value>8,1,1,1</value> + </param> + <param> + <key>alias</key> + <value></value> </param> <param> <key>_coordinate</key> - <value>(742, 266)</value> + <value>(124, 632)</value> </param> <param> <key>_rotation</key> @@ -904,26 +1191,58 @@ </param> </block> <block> - <key>analog_simple_squelch_cc</key> + <key>variable_qtgui_range</key> <param> <key>id</key> - <value>analog_simple_squelch_cc_0</value> + <value>sql_lev</value> </param> <param> <key>_enabled</key> <value>True</value> </param> <param> - <key>threshold</key> - <value>sql_lev</value> + <key>label</key> + <value>SQL</value> </param> <param> - <key>alpha</key> + <key>value</key> + <value>-100</value> + </param> + <param> + <key>start</key> + <value>-100</value> + </param> + <param> + <key>stop</key> + <value>0</value> + </param> + <param> + <key>step</key> <value>1</value> </param> <param> + <key>widget</key> + <value>counter</value> + </param> + <param> + <key>orient</key> + <value>Qt.Horizontal</value> + </param> + <param> + <key>min_len</key> + <value>200</value> + </param> + <param> + <key>gui_hint</key> + <value>7,2,1,1</value> + </param> + <param> + <key>alias</key> + <value></value> + </param> + <param> <key>_coordinate</key> - <value>(227, 499)</value> + <value>(232, 632)</value> </param> <param> <key>_rotation</key> @@ -931,65 +1250,98 @@ </param> </block> <block> - <key>blocks_multiply_const_vxx</key> + <key>variable_qtgui_chooser</key> <param> <key>id</key> - <value>blocks_multiply_const_vxx_1</value> + <value>display_selector</value> </param> <param> <key>_enabled</key> <value>True</value> </param> <param> + <key>label</key> + <value>Spectrum</value> + </param> + <param> <key>type</key> - <value>float</value> + <value>real</value> </param> <param> - <key>const</key> - <value>af_gain</value> + <key>num_opts</key> + <value>0</value> </param> <param> - <key>vlen</key> - <value>1</value> + <key>value</key> + <value>0</value> </param> <param> - <key>_coordinate</key> - <value>(674, 507)</value> + <key>options</key> + <value>[0,1]</value> </param> <param> - <key>_rotation</key> + <key>labels</key> + <value>['Baseband','RF']</value> + </param> + <param> + <key>option0</key> <value>0</value> </param> - </block> - <block> - <key>analog_nbfm_rx</key> <param> - <key>id</key> - <value>analog_nbfm_rx_0</value> + <key>label0</key> + <value></value> </param> <param> - <key>_enabled</key> - <value>True</value> + <key>option1</key> + <value>1</value> </param> <param> - <key>audio_rate</key> - <value>48000</value> + <key>label1</key> + <value></value> </param> <param> - <key>quad_rate</key> - <value>96000</value> + <key>option2</key> + <value>2</value> </param> <param> - <key>tau</key> - <value>75e-6</value> + <key>label2</key> + <value></value> </param> <param> - <key>max_dev</key> - <value>5e3</value> + <key>option3</key> + <value>3</value> + </param> + <param> + <key>label3</key> + <value></value> + </param> + <param> + <key>option4</key> + <value>4</value> + </param> + <param> + <key>label4</key> + <value></value> + </param> + <param> + <key>widget</key> + <value>combo_box</value> + </param> + <param> + <key>orient</key> + <value>Qt.QVBoxLayout</value> + </param> + <param> + <key>gui_hint</key> + <value>5,0,1,1</value> + </param> + <param> + <key>alias</key> + <value></value> </param> <param> <key>_coordinate</key> - <value>(440, 483)</value> + <value>(356, 632)</value> </param> <param> <key>_rotation</key> @@ -1016,12 +1368,6 @@ </connection> <connection> <source_block_id>freq_xlating_fir_filter_xxx_0</source_block_id> - <sink_block_id>fftsink</sink_block_id> - <source_key>0</source_key> - <sink_key>0</sink_key> - </connection> - <connection> - <source_block_id>freq_xlating_fir_filter_xxx_0</source_block_id> <sink_block_id>low_pass_filter</sink_block_id> <source_key>0</source_key> <sink_key>0</sink_key> @@ -1044,4 +1390,10 @@ <source_key>0</source_key> <sink_key>0</sink_key> </connection> + <connection> + <source_block_id>freq_xlating_fir_filter_xxx_0</source_block_id> + <sink_block_id>qtgui_freq_sink_x_0</sink_block_id> + <source_key>0</source_key> + <sink_key>0</sink_key> + </connection> </flow_graph> diff --git a/gr-fec/lib/ber_tools.cc b/gr-fec/lib/ber_tools.cc index 675932a690..043fbef216 100644 --- a/gr-fec/lib/ber_tools.cc +++ b/gr-fec/lib/ber_tools.cc @@ -20,6 +20,12 @@ * Boston, MA 02110-1301, USA. */ +#include <cstdlib> +#ifdef _MSC_VER +#define _USE_MATH_DEFINES +#include <cmath> +#endif + #include "ber_tools.h" inline int @@ -35,8 +41,13 @@ gaussnoise(float *inbuffer, int buffsize, float sigma) float udrn1=0.0, udrn2=0.0, noise=0.0; for(i = 0; i < buffsize;i++) { + #ifdef _MSC_VER + while((udrn1 = (float)(std::rand())) < 0.0000001); + udrn2 = (float)(std::rand()); + #else while((udrn1 = (float)drand48()) < 0.0000001); udrn2 = (float)drand48(); + #endif noise = sigma*sqrt(-2*log(udrn1))*cos(2*M_PI*udrn2); inbuffer[i] += noise; } diff --git a/gr-filter/examples/resampler_demo.grc b/gr-filter/examples/resampler_demo.grc index 62ebdd34cd..17875f67bb 100644 --- a/gr-filter/examples/resampler_demo.grc +++ b/gr-filter/examples/resampler_demo.grc @@ -1,6 +1,6 @@ <?xml version='1.0' encoding='ASCII'?> <flow_graph> - <timestamp>Sun Feb 24 19:43:22 2013</timestamp> + <timestamp>Sat Jul 12 13:34:43 2014</timestamp> <block> <key>options</key> <param> @@ -29,7 +29,7 @@ </param> <param> <key>generate_options</key> - <value>wx_gui</value> + <value>qt_gui</value> </param> <param> <key>category</key> @@ -52,8 +52,12 @@ <value></value> </param> <param> + <key>alias</key> + <value></value> + </param> + <param> <key>_coordinate</key> - <value>(10, 10)</value> + <value>(-2, 0)</value> </param> <param> <key>_rotation</key> @@ -64,7 +68,7 @@ <key>variable</key> <param> <key>id</key> - <value>rs_taps</value> + <value>nphases</value> </param> <param> <key>_enabled</key> @@ -72,11 +76,15 @@ </param> <param> <key>value</key> - <value>firdes.low_pass(nphases, nphases, frac_bw, 0.5-frac_bw)</value> + <value>32</value> + </param> + <param> + <key>alias</key> + <value></value> </param> <param> <key>_coordinate</key> - <value>(273, 154)</value> + <value>(653, -1)</value> </param> <param> <key>_rotation</key> @@ -87,7 +95,7 @@ <key>variable</key> <param> <key>id</key> - <value>nphases</value> + <value>rs_taps</value> </param> <param> <key>_enabled</key> @@ -95,11 +103,15 @@ </param> <param> <key>value</key> - <value>32</value> + <value>firdes.low_pass(nphases, nphases, frac_bw, 0.5-frac_bw)</value> + </param> + <param> + <key>alias</key> + <value></value> </param> <param> <key>_coordinate</key> - <value>(185, 153)</value> + <value>(741, -1)</value> </param> <param> <key>_rotation</key> @@ -107,10 +119,37 @@ </param> </block> <block> - <key>variable_static_text</key> + <key>import</key> <param> <key>id</key> - <value>samp_rate</value> + <value>import_0</value> + </param> + <param> + <key>_enabled</key> + <value>True</value> + </param> + <param> + <key>import</key> + <value>import math</value> + </param> + <param> + <key>alias</key> + <value></value> + </param> + <param> + <key>_coordinate</key> + <value>(0, 74)</value> + </param> + <param> + <key>_rotation</key> + <value>0</value> + </param> + </block> + <block> + <key>variable_qtgui_label</key> + <param> + <key>id</key> + <value>new_rate</value> </param> <param> <key>_enabled</key> @@ -118,31 +157,31 @@ </param> <param> <key>label</key> - <value>Sample Rate</value> + <value>Resampling Rate</value> </param> <param> - <key>value</key> - <value>44100</value> + <key>type</key> + <value>real</value> </param> <param> - <key>converver</key> - <value>float_converter</value> + <key>value</key> + <value>48000</value> </param> <param> <key>formatter</key> <value>None</value> </param> <param> - <key>grid_pos</key> - <value>0, 0, 1, 1</value> + <key>gui_hint</key> + <value>0,1,1,1</value> </param> <param> - <key>notebook</key> + <key>alias</key> <value></value> </param> <param> <key>_coordinate</key> - <value>(179, 14)</value> + <value>(291, 0)</value> </param> <param> <key>_rotation</key> @@ -150,42 +189,58 @@ </param> </block> <block> - <key>variable_static_text</key> + <key>analog_sig_source_x</key> <param> <key>id</key> - <value>new_rate</value> + <value>analog_sig_source_x_0</value> </param> <param> <key>_enabled</key> <value>True</value> </param> <param> - <key>label</key> - <value>Resampled Rate</value> + <key>type</key> + <value>float</value> </param> <param> - <key>value</key> - <value>48000</value> + <key>samp_rate</key> + <value>samp_rate</value> </param> <param> - <key>converver</key> - <value>float_converter</value> + <key>waveform</key> + <value>analog.GR_TRI_WAVE</value> </param> <param> - <key>formatter</key> - <value>None</value> + <key>freq</key> + <value>0.05</value> </param> <param> - <key>grid_pos</key> - <value>0, 1, 1, 1</value> + <key>amp</key> + <value>2</value> + </param> + <param> + <key>offset</key> + <value>0</value> + </param> + <param> + <key>alias</key> + <value></value> </param> <param> - <key>notebook</key> + <key>affinity</key> <value></value> </param> <param> + <key>minoutbuf</key> + <value>0</value> + </param> + <param> + <key>maxoutbuf</key> + <value>0</value> + </param> + <param> <key>_coordinate</key> - <value>(328, 15)</value> + <value>(4, 137)</value> </param> <param> <key>_rotation</key> @@ -193,7 +248,7 @@ </param> </block> <block> - <key>variable_static_text</key> + <key>variable_qtgui_label</key> <param> <key>id</key> <value>frac_bw</value> @@ -207,28 +262,28 @@ <value>Fractional Bandwidth</value> </param> <param> - <key>value</key> - <value>0.45</value> + <key>type</key> + <value>real</value> </param> <param> - <key>converver</key> - <value>float_converter</value> + <key>value</key> + <value>.45</value> </param> <param> <key>formatter</key> <value>lambda x: "%0.2f"%x</value> </param> <param> - <key>grid_pos</key> + <key>gui_hint</key> <value>0,2,1,1</value> </param> <param> - <key>notebook</key> + <key>alias</key> <value></value> </param> <param> <key>_coordinate</key> - <value>(473, 14)</value> + <value>(431, -1)</value> </param> <param> <key>_rotation</key> @@ -236,10 +291,10 @@ </param> </block> <block> - <key>pfb_arb_resampler_xxx</key> + <key>blocks_add_const_vxx</key> <param> <key>id</key> - <value>pfb_arb_resampler_xxx_0</value> + <value>adder</value> </param> <param> <key>_enabled</key> @@ -247,27 +302,86 @@ </param> <param> <key>type</key> - <value>ccf</value> + <value>float</value> </param> <param> - <key>rrate</key> - <value>float(new_rate)/samp_rate</value> + <key>const</key> + <value>-1.0</value> </param> <param> - <key>taps</key> - <value>rs_taps</value> + <key>vlen</key> + <value>1</value> </param> <param> - <key>nfilts</key> - <value>nphases</value> + <key>alias</key> + <value></value> </param> <param> - <key>atten</key> - <value>100</value> + <key>affinity</key> + <value></value> + </param> + <param> + <key>minoutbuf</key> + <value>0</value> + </param> + <param> + <key>maxoutbuf</key> + <value>0</value> </param> <param> <key>_coordinate</key> - <value>(649, 469)</value> + <value>(175, 169)</value> + </param> + <param> + <key>_rotation</key> + <value>0</value> + </param> + </block> + <block> + <key>blocks_throttle</key> + <param> + <key>id</key> + <value>throttle</value> + </param> + <param> + <key>_enabled</key> + <value>True</value> + </param> + <param> + <key>type</key> + <value>float</value> + </param> + <param> + <key>samples_per_second</key> + <value>samp_rate</value> + </param> + <param> + <key>vlen</key> + <value>1</value> + </param> + <param> + <key>ignoretag</key> + <value>True</value> + </param> + <param> + <key>alias</key> + <value></value> + </param> + <param> + <key>affinity</key> + <value></value> + </param> + <param> + <key>minoutbuf</key> + <value>0</value> + </param> + <param> + <key>maxoutbuf</key> + <value>0</value> + </param> + <param> + <key>_coordinate</key> + <value>(307, 169)</value> </param> <param> <key>_rotation</key> @@ -289,8 +403,24 @@ <value>math.pi</value> </param> <param> + <key>alias</key> + <value></value> + </param> + <param> + <key>affinity</key> + <value></value> + </param> + <param> + <key>minoutbuf</key> + <value>0</value> + </param> + <param> + <key>maxoutbuf</key> + <value>0</value> + </param> + <param> <key>_coordinate</key> - <value>(429, 501)</value> + <value>(478, 169)</value> </param> <param> <key>_rotation</key> @@ -298,101 +428,112 @@ </param> </block> <block> - <key>wxgui_fftsink2</key> + <key>variable_qtgui_label</key> <param> <key>id</key> - <value>orig_fft</value> + <value>samp_rate</value> </param> <param> <key>_enabled</key> <value>True</value> </param> <param> + <key>label</key> + <value>Sampling Rate</value> + </param> + <param> <key>type</key> - <value>complex</value> + <value>real</value> </param> <param> - <key>title</key> - <value>Original Spectrum</value> + <key>value</key> + <value>44100</value> </param> <param> - <key>samp_rate</key> - <value>samp_rate</value> + <key>formatter</key> + <value>None</value> </param> <param> - <key>baseband_freq</key> - <value>0</value> + <key>gui_hint</key> + <value>0,0,1,1</value> </param> <param> - <key>y_per_div</key> - <value>10</value> + <key>alias</key> + <value></value> </param> <param> - <key>y_divs</key> - <value>10</value> + <key>_coordinate</key> + <value>(162, 0)</value> </param> <param> - <key>ref_level</key> - <value>30</value> + <key>_rotation</key> + <value>0</value> </param> + </block> + <block> + <key>pfb_arb_resampler_xxx</key> <param> - <key>ref_scale</key> - <value>2.0</value> + <key>id</key> + <value>pfb_arb_resampler_xxx_0</value> </param> <param> - <key>fft_size</key> - <value>1024</value> + <key>_enabled</key> + <value>True</value> </param> <param> - <key>fft_rate</key> - <value>30</value> + <key>type</key> + <value>ccf</value> </param> <param> - <key>peak_hold</key> - <value>False</value> + <key>rrate</key> + <value>float(new_rate)/samp_rate</value> </param> <param> - <key>average</key> - <value>False</value> + <key>taps</key> + <value>rs_taps</value> </param> <param> - <key>avg_alpha</key> - <value>0</value> + <key>nfilts</key> + <value>nphases</value> </param> <param> - <key>win</key> - <value>None</value> + <key>atten</key> + <value>100</value> </param> <param> - <key>win_size</key> - <value></value> + <key>samp_delay</key> + <value>0</value> </param> <param> - <key>grid_pos</key> - <value>1, 0, 1, 3</value> + <key>alias</key> + <value></value> </param> <param> - <key>notebook</key> + <key>affinity</key> <value></value> </param> <param> - <key>freqvar</key> - <value>None</value> + <key>minoutbuf</key> + <value>0</value> + </param> + <param> + <key>maxoutbuf</key> + <value>0</value> </param> <param> <key>_coordinate</key> - <value>(414, 279)</value> + <value>(343, 253)</value> </param> <param> <key>_rotation</key> - <value>180</value> + <value>0</value> </param> </block> <block> - <key>wxgui_fftsink2</key> + <key>qtgui_freq_sink_x</key> <param> <key>id</key> - <value>resamp_fft</value> + <value>qtgui_freq_sink_x_0</value> </param> <param> <key>_enabled</key> @@ -403,150 +544,240 @@ <value>complex</value> </param> <param> - <key>title</key> - <value>Resampled Spectrum</value> + <key>name</key> + <value>Original Spectrum</value> </param> <param> - <key>samp_rate</key> - <value>new_rate</value> + <key>fftsize</key> + <value>1024</value> + </param> + <param> + <key>wintype</key> + <value>firdes.WIN_BLACKMAN_hARRIS</value> </param> <param> - <key>baseband_freq</key> + <key>fc</key> <value>0</value> </param> <param> - <key>y_per_div</key> - <value>10</value> + <key>bw</key> + <value>samp_rate</value> </param> <param> - <key>y_divs</key> - <value>10</value> + <key>grid</key> + <value>False</value> </param> <param> - <key>ref_level</key> - <value>30</value> + <key>autoscale</key> + <value>False</value> </param> <param> - <key>ref_scale</key> - <value>2.0</value> + <key>average</key> + <value>1.0</value> </param> <param> - <key>fft_size</key> - <value>1024</value> + <key>ymin</key> + <value>-140</value> + </param> + <param> + <key>ymax</key> + <value>10</value> + </param> + <param> + <key>nconnections</key> + <value>1</value> + </param> + <param> + <key>update_time</key> + <value>0.10</value> </param> <param> - <key>fft_rate</key> - <value>30</value> + <key>gui_hint</key> + <value>1,0,1,3</value> </param> <param> - <key>peak_hold</key> + <key>showports</key> <value>True</value> </param> <param> - <key>average</key> - <value>False</value> + <key>label1</key> + <value>Original Spectrum</value> </param> <param> - <key>avg_alpha</key> - <value>0</value> + <key>width1</key> + <value>1</value> </param> <param> - <key>win</key> - <value>None</value> + <key>color1</key> + <value>"blue"</value> + </param> + <param> + <key>alpha1</key> + <value>1.0</value> + </param> + <param> + <key>label2</key> + <value>Resampled Spectrum</value> + </param> + <param> + <key>width2</key> + <value>1</value> + </param> + <param> + <key>color2</key> + <value>"red"</value> </param> <param> - <key>win_size</key> + <key>alpha2</key> + <value>1.0</value> + </param> + <param> + <key>label3</key> <value></value> </param> <param> - <key>grid_pos</key> - <value>2, 0, 1, 3</value> + <key>width3</key> + <value>1</value> + </param> + <param> + <key>color3</key> + <value>"green"</value> + </param> + <param> + <key>alpha3</key> + <value>1.0</value> </param> <param> - <key>notebook</key> + <key>label4</key> <value></value> </param> <param> - <key>freqvar</key> - <value>None</value> + <key>width4</key> + <value>1</value> </param> <param> - <key>_coordinate</key> - <value>(645, 241)</value> + <key>color4</key> + <value>"black"</value> </param> <param> - <key>_rotation</key> - <value>180</value> + <key>alpha4</key> + <value>1.0</value> </param> - </block> - <block> - <key>blocks_add_const_vxx</key> <param> - <key>id</key> - <value>adder</value> + <key>label5</key> + <value></value> </param> <param> - <key>_enabled</key> - <value>True</value> + <key>width5</key> + <value>1</value> </param> <param> - <key>type</key> - <value>float</value> + <key>color5</key> + <value>"cyan"</value> </param> <param> - <key>const</key> - <value>-1.0</value> + <key>alpha5</key> + <value>1.0</value> </param> <param> - <key>vlen</key> + <key>label6</key> + <value></value> + </param> + <param> + <key>width6</key> <value>1</value> </param> <param> - <key>_coordinate</key> - <value>(227, 303)</value> + <key>color6</key> + <value>"magenta"</value> </param> <param> - <key>_rotation</key> - <value>0</value> + <key>alpha6</key> + <value>1.0</value> </param> - </block> - <block> - <key>analog_sig_source_x</key> <param> - <key>id</key> - <value>analog_sig_source_x_0</value> + <key>label7</key> + <value></value> </param> <param> - <key>_enabled</key> - <value>True</value> + <key>width7</key> + <value>1</value> </param> <param> - <key>type</key> - <value>float</value> + <key>color7</key> + <value>"yellow"</value> </param> <param> - <key>samp_rate</key> - <value>samp_rate</value> + <key>alpha7</key> + <value>1.0</value> </param> <param> - <key>waveform</key> - <value>analog.GR_TRI_WAVE</value> + <key>label8</key> + <value></value> </param> <param> - <key>freq</key> - <value>0.05</value> + <key>width8</key> + <value>1</value> </param> <param> - <key>amp</key> - <value>2</value> + <key>color8</key> + <value>"dark red"</value> </param> <param> - <key>offset</key> + <key>alpha8</key> + <value>1.0</value> + </param> + <param> + <key>label9</key> + <value></value> + </param> + <param> + <key>width9</key> + <value>1</value> + </param> + <param> + <key>color9</key> + <value>"dark green"</value> + </param> + <param> + <key>alpha9</key> + <value>1.0</value> + </param> + <param> + <key>label10</key> + <value></value> + </param> + <param> + <key>width10</key> + <value>1</value> + </param> + <param> + <key>color10</key> + <value>"dark blue"</value> + </param> + <param> + <key>alpha10</key> + <value>1.0</value> + </param> + <param> + <key>alias</key> + <value></value> + </param> + <param> + <key>affinity</key> + <value></value> + </param> + <param> + <key>minoutbuf</key> + <value>0</value> + </param> + <param> + <key>maxoutbuf</key> <value>0</value> </param> <param> <key>_coordinate</key> - <value>(36, 271)</value> + <value>(660, 135)</value> </param> <param> <key>_rotation</key> @@ -554,53 +785,254 @@ </param> </block> <block> - <key>import</key> + <key>qtgui_freq_sink_x</key> <param> <key>id</key> - <value>import_0</value> + <value>qtgui_freq_sink_x_0_0</value> </param> <param> <key>_enabled</key> <value>True</value> </param> <param> - <key>import</key> - <value>import math</value> + <key>type</key> + <value>complex</value> </param> <param> - <key>_coordinate</key> - <value>(11, 75)</value> + <key>name</key> + <value>Resampled Spectrum</value> </param> <param> - <key>_rotation</key> + <key>fftsize</key> + <value>1024</value> + </param> + <param> + <key>wintype</key> + <value>firdes.WIN_BLACKMAN_hARRIS</value> + </param> + <param> + <key>fc</key> <value>0</value> </param> - </block> - <block> - <key>blocks_throttle</key> <param> - <key>id</key> - <value>throttle</value> + <key>bw</key> + <value>new_rate</value> </param> <param> - <key>_enabled</key> + <key>grid</key> + <value>False</value> + </param> + <param> + <key>autoscale</key> + <value>False</value> + </param> + <param> + <key>average</key> + <value>1.0</value> + </param> + <param> + <key>ymin</key> + <value>-140</value> + </param> + <param> + <key>ymax</key> + <value>10</value> + </param> + <param> + <key>nconnections</key> + <value>1</value> + </param> + <param> + <key>update_time</key> + <value>0.10</value> + </param> + <param> + <key>gui_hint</key> + <value>2,0,1,3</value> + </param> + <param> + <key>showports</key> <value>True</value> </param> <param> - <key>type</key> - <value>float</value> + <key>label1</key> + <value>Original Spectrum</value> </param> <param> - <key>samples_per_second</key> - <value>samp_rate</value> + <key>width1</key> + <value>1</value> </param> <param> - <key>vlen</key> + <key>color1</key> + <value>"blue"</value> + </param> + <param> + <key>alpha1</key> + <value>1.0</value> + </param> + <param> + <key>label2</key> + <value>Resampled Spectrum</value> + </param> + <param> + <key>width2</key> + <value>1</value> + </param> + <param> + <key>color2</key> + <value>"red"</value> + </param> + <param> + <key>alpha2</key> + <value>1.0</value> + </param> + <param> + <key>label3</key> + <value></value> + </param> + <param> + <key>width3</key> + <value>1</value> + </param> + <param> + <key>color3</key> + <value>"green"</value> + </param> + <param> + <key>alpha3</key> + <value>1.0</value> + </param> + <param> + <key>label4</key> + <value></value> + </param> + <param> + <key>width4</key> + <value>1</value> + </param> + <param> + <key>color4</key> + <value>"black"</value> + </param> + <param> + <key>alpha4</key> + <value>1.0</value> + </param> + <param> + <key>label5</key> + <value></value> + </param> + <param> + <key>width5</key> + <value>1</value> + </param> + <param> + <key>color5</key> + <value>"cyan"</value> + </param> + <param> + <key>alpha5</key> + <value>1.0</value> + </param> + <param> + <key>label6</key> + <value></value> + </param> + <param> + <key>width6</key> + <value>1</value> + </param> + <param> + <key>color6</key> + <value>"magenta"</value> + </param> + <param> + <key>alpha6</key> + <value>1.0</value> + </param> + <param> + <key>label7</key> + <value></value> + </param> + <param> + <key>width7</key> + <value>1</value> + </param> + <param> + <key>color7</key> + <value>"yellow"</value> + </param> + <param> + <key>alpha7</key> + <value>1.0</value> + </param> + <param> + <key>label8</key> + <value></value> + </param> + <param> + <key>width8</key> + <value>1</value> + </param> + <param> + <key>color8</key> + <value>"dark red"</value> + </param> + <param> + <key>alpha8</key> + <value>1.0</value> + </param> + <param> + <key>label9</key> + <value></value> + </param> + <param> + <key>width9</key> + <value>1</value> + </param> + <param> + <key>color9</key> + <value>"dark green"</value> + </param> + <param> + <key>alpha9</key> + <value>1.0</value> + </param> + <param> + <key>label10</key> + <value></value> + </param> + <param> + <key>width10</key> <value>1</value> </param> <param> + <key>color10</key> + <value>"dark blue"</value> + </param> + <param> + <key>alpha10</key> + <value>1.0</value> + </param> + <param> + <key>alias</key> + <value></value> + </param> + <param> + <key>affinity</key> + <value></value> + </param> + <param> + <key>minoutbuf</key> + <value>0</value> + </param> + <param> + <key>maxoutbuf</key> + <value>0</value> + </param> + <param> <key>_coordinate</key> - <value>(227, 492)</value> + <value>(636, 253)</value> </param> <param> <key>_rotation</key> @@ -608,38 +1040,38 @@ </param> </block> <connection> - <source_block_id>adder</source_block_id> - <sink_block_id>throttle</sink_block_id> + <source_block_id>throttle</source_block_id> + <sink_block_id>analog_frequency_modulator_fc_0</sink_block_id> <source_key>0</source_key> <sink_key>0</sink_key> </connection> <connection> - <source_block_id>pfb_arb_resampler_xxx_0</source_block_id> - <sink_block_id>resamp_fft</sink_block_id> + <source_block_id>analog_frequency_modulator_fc_0</source_block_id> + <sink_block_id>pfb_arb_resampler_xxx_0</sink_block_id> <source_key>0</source_key> <sink_key>0</sink_key> </connection> <connection> - <source_block_id>throttle</source_block_id> - <sink_block_id>analog_frequency_modulator_fc_0</sink_block_id> + <source_block_id>analog_frequency_modulator_fc_0</source_block_id> + <sink_block_id>qtgui_freq_sink_x_0</sink_block_id> <source_key>0</source_key> <sink_key>0</sink_key> </connection> <connection> - <source_block_id>analog_frequency_modulator_fc_0</source_block_id> - <sink_block_id>pfb_arb_resampler_xxx_0</sink_block_id> + <source_block_id>analog_sig_source_x_0</source_block_id> + <sink_block_id>adder</sink_block_id> <source_key>0</source_key> <sink_key>0</sink_key> </connection> <connection> - <source_block_id>analog_frequency_modulator_fc_0</source_block_id> - <sink_block_id>orig_fft</sink_block_id> + <source_block_id>adder</source_block_id> + <sink_block_id>throttle</sink_block_id> <source_key>0</source_key> <sink_key>0</sink_key> </connection> <connection> - <source_block_id>analog_sig_source_x_0</source_block_id> - <sink_block_id>adder</sink_block_id> + <source_block_id>pfb_arb_resampler_xxx_0</source_block_id> + <sink_block_id>qtgui_freq_sink_x_0_0</sink_block_id> <source_key>0</source_key> <sink_key>0</sink_key> </connection> diff --git a/gr-filter/lib/freq_xlating_fir_filter_XXX_impl.cc.t b/gr-filter/lib/freq_xlating_fir_filter_XXX_impl.cc.t index 57fa47f935..a9e70e7b45 100644 --- a/gr-filter/lib/freq_xlating_fir_filter_XXX_impl.cc.t +++ b/gr-filter/lib/freq_xlating_fir_filter_XXX_impl.cc.t @@ -132,7 +132,7 @@ namespace gr { pmt::pmt_t x = pmt::cdr(msg); if(pmt::is_real(x)) { double freq = pmt::to_double(x); - set_center_freq(freq*d_sampling_freq); + set_center_freq(freq); } } } diff --git a/gr-filter/lib/pfb_channelizer_ccf_impl.cc b/gr-filter/lib/pfb_channelizer_ccf_impl.cc index fe1966bc3f..c439353505 100644 --- a/gr-filter/lib/pfb_channelizer_ccf_impl.cc +++ b/gr-filter/lib/pfb_channelizer_ccf_impl.cc @@ -28,6 +28,10 @@ #include <gnuradio/io_signature.h> #include <stdio.h> +#ifdef _MSC_VER +#define round(number) number < 0.0 ? ceil(number - 0.5) : floor(number + 0.5) +#endif + namespace gr { namespace filter { diff --git a/gr-filter/python/filter/qa_freq_xlating_fft_filter.py b/gr-filter/python/filter/qa_freq_xlating_fft_filter.py index d0e18fc17f..d5c7d41dd9 100755 --- a/gr-filter/python/filter/qa_freq_xlating_fft_filter.py +++ b/gr-filter/python/filter/qa_freq_xlating_fft_filter.py @@ -75,7 +75,7 @@ class test_freq_xlating_filter(gr_unittest.TestCase): def assert_fft_ok(self, expected_result, result_data): expected_result = expected_result[:len(result_data)] self.assertComplexTuplesAlmostEqual2 (expected_result, result_data, - abs_eps=1e-9, rel_eps=1.2e-3) + abs_eps=1e-9, rel_eps=1.5e-3) def test_fft_filter_ccf_001(self): diff --git a/gr-noaa/examples/file_rx_hrpt.grc b/gr-noaa/examples/file_rx_hrpt.grc index 3a7caaed71..93a39d1f5d 100644 --- a/gr-noaa/examples/file_rx_hrpt.grc +++ b/gr-noaa/examples/file_rx_hrpt.grc @@ -1,69 +1,63 @@ <?xml version='1.0' encoding='ASCII'?> <flow_graph> - <timestamp>Thu Oct 27 13:48:25 2011</timestamp> + <timestamp>Sat Jul 12 11:18:29 2014</timestamp> <block> - <key>variable</key> + <key>options</key> <param> <key>id</key> - <value>max_carrier_offset</value> + <value>file_rx_hrpt</value> </param> <param> <key>_enabled</key> <value>True</value> </param> <param> - <key>value</key> - <value>2*math.pi*100e3/sample_rate</value> + <key>title</key> + <value>USRP HRPT Receiver</value> </param> <param> - <key>_coordinate</key> - <value>(575, 19)</value> + <key>author</key> + <value></value> </param> <param> - <key>_rotation</key> - <value>0</value> + <key>description</key> + <value></value> </param> - </block> - <block> - <key>variable</key> <param> - <key>id</key> - <value>sym_rate</value> + <key>window_size</key> + <value>4096,4096</value> </param> <param> - <key>_enabled</key> - <value>True</value> + <key>generate_options</key> + <value>no_gui</value> </param> <param> - <key>value</key> - <value>600*1109</value> + <key>category</key> + <value>Custom</value> </param> <param> - <key>_coordinate</key> - <value>(301, 19)</value> + <key>run_options</key> + <value>prompt</value> </param> <param> - <key>_rotation</key> - <value>0</value> + <key>run</key> + <value>True</value> </param> - </block> - <block> - <key>variable</key> <param> - <key>id</key> - <value>sps</value> + <key>max_nouts</key> + <value>0</value> </param> <param> - <key>_enabled</key> - <value>True</value> + <key>realtime_scheduling</key> + <value></value> </param> <param> - <key>value</key> - <value>sample_rate/sym_rate</value> + <key>alias</key> + <value></value> </param> <param> <key>_coordinate</key> - <value>(397, 19)</value> + <value>(10, 10)</value> </param> <param> <key>_rotation</key> @@ -74,7 +68,7 @@ <key>variable</key> <param> <key>id</key> - <value>hs</value> + <value>sample_rate</value> </param> <param> <key>_enabled</key> @@ -82,11 +76,15 @@ </param> <param> <key>value</key> - <value>int(sps/2.0)</value> + <value>4e6</value> + </param> + <param> + <key>alias</key> + <value></value> </param> <param> <key>_coordinate</key> - <value>(499, 19)</value> + <value>(198, 17)</value> </param> <param> <key>_rotation</key> @@ -97,7 +95,7 @@ <key>variable</key> <param> <key>id</key> - <value>max_clock_offset</value> + <value>config_filename</value> </param> <param> <key>_enabled</key> @@ -105,11 +103,15 @@ </param> <param> <key>value</key> - <value>100e-6</value> + <value>os.environ['HOME']+'/.gnuradio/config.conf'</value> + </param> + <param> + <key>alias</key> + <value></value> </param> <param> <key>_coordinate</key> - <value>(705, 19)</value> + <value>(13, 168)</value> </param> <param> <key>_rotation</key> @@ -117,22 +119,26 @@ </param> </block> <block> - <key>import</key> + <key>variable</key> <param> <key>id</key> - <value>import_0</value> + <value>max_clock_offset</value> </param> <param> <key>_enabled</key> <value>True</value> </param> <param> - <key>import</key> - <value>import math, os</value> + <key>value</key> + <value>100e-6</value> + </param> + <param> + <key>alias</key> + <value></value> </param> <param> <key>_coordinate</key> - <value>(9, 106)</value> + <value>(705, 19)</value> </param> <param> <key>_rotation</key> @@ -143,7 +149,7 @@ <key>variable</key> <param> <key>id</key> - <value>config_filename</value> + <value>hs</value> </param> <param> <key>_enabled</key> @@ -151,11 +157,15 @@ </param> <param> <key>value</key> - <value>os.environ['HOME']+'/.gnuradio/config.conf'</value> + <value>int(sps/2.0)</value> + </param> + <param> + <key>alias</key> + <value></value> </param> <param> <key>_coordinate</key> - <value>(13, 168)</value> + <value>(499, 19)</value> </param> <param> <key>_rotation</key> @@ -166,7 +176,7 @@ <key>variable</key> <param> <key>id</key> - <value>sample_rate</value> + <value>sps</value> </param> <param> <key>_enabled</key> @@ -174,11 +184,15 @@ </param> <param> <key>value</key> - <value>4e6</value> + <value>sample_rate/sym_rate</value> + </param> + <param> + <key>alias</key> + <value></value> </param> <param> <key>_coordinate</key> - <value>(198, 17)</value> + <value>(397, 19)</value> </param> <param> <key>_rotation</key> @@ -186,42 +200,26 @@ </param> </block> <block> - <key>digital_clock_recovery_mm_xx</key> + <key>variable</key> <param> <key>id</key> - <value>digital_clock_recovery_mm_xx_0</value> + <value>sym_rate</value> </param> <param> <key>_enabled</key> <value>True</value> </param> <param> - <key>type</key> - <value>float</value> - </param> - <param> - <key>omega</key> - <value>sps/2.0</value> - </param> - <param> - <key>gain_omega</key> - <value>clock_alpha**2/4.0</value> - </param> - <param> - <key>mu</key> - <value>0.5</value> - </param> - <param> - <key>gain_mu</key> - <value>clock_alpha</value> + <key>value</key> + <value>600*1109</value> </param> <param> - <key>omega_relative_limit</key> - <value>max_clock_offset</value> + <key>alias</key> + <value></value> </param> <param> <key>_coordinate</key> - <value>(897, 341)</value> + <value>(301, 19)</value> </param> <param> <key>_rotation</key> @@ -229,22 +227,26 @@ </param> </block> <block> - <key>virtual_sink</key> + <key>variable</key> <param> <key>id</key> - <value>virtual_sink_0</value> + <value>max_carrier_offset</value> </param> <param> <key>_enabled</key> <value>True</value> </param> <param> - <key>stream_id</key> - <value>baseband</value> + <key>value</key> + <value>2*math.pi*100e3/sample_rate</value> + </param> + <param> + <key>alias</key> + <value></value> </param> <param> <key>_coordinate</key> - <value>(1139, 373)</value> + <value>(575, 19)</value> </param> <param> <key>_rotation</key> @@ -252,30 +254,26 @@ </param> </block> <block> - <key>noaa_hrpt_pll_cf</key> + <key>import</key> <param> <key>id</key> - <value>pll</value> + <value>import_0</value> </param> <param> <key>_enabled</key> <value>True</value> </param> <param> - <key>alpha</key> - <value>pll_alpha</value> - </param> - <param> - <key>beta</key> - <value>pll_alpha**2/4.0</value> + <key>import</key> + <value>import math, os</value> </param> <param> - <key>max_offset</key> - <value>max_carrier_offset</value> + <key>alias</key> + <value></value> </param> <param> <key>_coordinate</key> - <value>(470, 357)</value> + <value>(9, 106)</value> </param> <param> <key>_rotation</key> @@ -283,10 +281,10 @@ </param> </block> <block> - <key>blocks_moving_average_xx</key> + <key>digital_clock_recovery_mm_xx</key> <param> <key>id</key> - <value>blocks_moving_average_xx_0</value> + <value>digital_clock_recovery_mm_xx_0</value> </param> <param> <key>_enabled</key> @@ -297,55 +295,44 @@ <value>float</value> </param> <param> - <key>length</key> - <value>hs</value> - </param> - <param> - <key>scale</key> - <value>1.0/hs</value> - </param> - <param> - <key>max_iter</key> - <value>4000</value> + <key>omega</key> + <value>sps/2.0</value> </param> <param> - <key>_coordinate</key> - <value>(683, 357)</value> + <key>gain_omega</key> + <value>clock_alpha**2/4.0</value> </param> <param> - <key>_rotation</key> - <value>0</value> + <key>mu</key> + <value>0.5</value> </param> - </block> - <block> - <key>blocks_file_sink</key> <param> - <key>id</key> - <value>frame_sink</value> + <key>gain_mu</key> + <value>clock_alpha</value> </param> <param> - <key>_enabled</key> - <value>True</value> + <key>omega_relative_limit</key> + <value>max_clock_offset</value> </param> <param> - <key>file</key> - <value>output_filename</value> + <key>alias</key> + <value></value> </param> <param> - <key>type</key> - <value>short</value> + <key>affinity</key> + <value></value> </param> <param> - <key>vlen</key> - <value>1</value> + <key>minoutbuf</key> + <value>0</value> </param> <param> - <key>unbuffered</key> - <value>False</value> + <key>maxoutbuf</key> + <value>0</value> </param> <param> <key>_coordinate</key> - <value>(809, 595)</value> + <value>(897, 341)</value> </param> <param> <key>_rotation</key> @@ -353,26 +340,22 @@ </param> </block> <block> - <key>noaa_hrpt_decoder</key> + <key>virtual_sink</key> <param> <key>id</key> - <value>decoder</value> + <value>virtual_sink_0</value> </param> <param> <key>_enabled</key> <value>True</value> </param> <param> - <key>verbose</key> - <value>True</value> - </param> - <param> - <key>output</key> - <value>True</value> + <key>stream_id</key> + <value>baseband</value> </param> <param> <key>_coordinate</key> - <value>(810, 496)</value> + <value>(1139, 373)</value> </param> <param> <key>_rotation</key> @@ -380,10 +363,10 @@ </param> </block> <block> - <key>gr_agc_xx</key> + <key>blocks_moving_average_xx</key> <param> <key>id</key> - <value>agc</value> + <value>blocks_moving_average_xx_0</value> </param> <param> <key>_enabled</key> @@ -391,46 +374,39 @@ </param> <param> <key>type</key> - <value>complex</value> + <value>float</value> </param> <param> - <key>rate</key> - <value>1e-6</value> + <key>length</key> + <value>hs</value> </param> <param> - <key>reference</key> - <value>1.0</value> + <key>scale</key> + <value>1.0/hs</value> </param> <param> - <key>gain</key> - <value>1.0</value> + <key>max_iter</key> + <value>4000</value> </param> <param> - <key>max_gain</key> - <value>1.0</value> + <key>alias</key> + <value></value> </param> <param> - <key>_coordinate</key> - <value>(302, 349)</value> + <key>affinity</key> + <value></value> </param> <param> - <key>_rotation</key> + <key>minoutbuf</key> <value>0</value> </param> - </block> - <block> - <key>blocks_interleaved_short_to_complex</key> - <param> - <key>id</key> - <value>blocks_interleaved_short_to_complex_0</value> - </param> <param> - <key>_enabled</key> - <value>True</value> + <key>maxoutbuf</key> + <value>0</value> </param> <param> <key>_coordinate</key> - <value>(92, 377)</value> + <value>(683, 357)</value> </param> <param> <key>_rotation</key> @@ -438,65 +414,81 @@ </param> </block> <block> - <key>blocks_throttle</key> + <key>blocks_file_sink</key> <param> <key>id</key> - <value>throttle</value> + <value>frame_sink</value> </param> <param> <key>_enabled</key> <value>True</value> </param> <param> - <key>type</key> - <value>short</value> + <key>file</key> + <value>output_filename</value> </param> <param> - <key>samples_per_second</key> - <value>2*sample_rate</value> + <key>type</key> + <value>short</value> </param> <param> <key>vlen</key> <value>1</value> </param> <param> + <key>unbuffered</key> + <value>False</value> + </param> + <param> + <key>append</key> + <value>False</value> + </param> + <param> + <key>alias</key> + <value></value> + </param> + <param> + <key>affinity</key> + <value></value> + </param> + <param> <key>_coordinate</key> - <value>(94, 323)</value> + <value>(809, 595)</value> </param> <param> <key>_rotation</key> - <value>180</value> + <value>0</value> </param> </block> <block> - <key>blocks_file_source</key> + <key>noaa_hrpt_decoder</key> <param> <key>id</key> - <value>blocks_file_source_0</value> + <value>decoder</value> </param> <param> <key>_enabled</key> <value>True</value> </param> <param> - <key>file</key> - <value>input_filename</value> + <key>verbose</key> + <value>True</value> </param> <param> - <key>type</key> - <value>short</value> + <key>output</key> + <value>True</value> </param> <param> - <key>repeat</key> - <value>False</value> + <key>alias</key> + <value></value> </param> <param> - <key>vlen</key> - <value>1</value> + <key>affinity</key> + <value></value> </param> <param> <key>_coordinate</key> - <value>(95, 257)</value> + <value>(810, 496)</value> </param> <param> <key>_rotation</key> @@ -538,6 +530,10 @@ <value>freq</value> </param> <param> + <key>alias</key> + <value></value> + </param> + <param> <key>_coordinate</key> <value>(218, 104)</value> </param> @@ -581,6 +577,10 @@ <value>gain</value> </param> <param> + <key>alias</key> + <value></value> + </param> + <param> <key>_coordinate</key> <value>(375, 105)</value> </param> @@ -624,6 +624,10 @@ <value>pll_alpha</value> </param> <param> + <key>alias</key> + <value></value> + </param> + <param> <key>_coordinate</key> <value>(534, 104)</value> </param> @@ -667,6 +671,10 @@ <value>clock_alpha</value> </param> <param> + <key>alias</key> + <value></value> + </param> + <param> <key>_coordinate</key> <value>(692, 104)</value> </param> @@ -710,6 +718,10 @@ <value>output_filename</value> </param> <param> + <key>alias</key> + <value></value> + </param> + <param> <key>_coordinate</key> <value>(850, 105)</value> </param> @@ -729,6 +741,22 @@ <value>True</value> </param> <param> + <key>alias</key> + <value></value> + </param> + <param> + <key>affinity</key> + <value></value> + </param> + <param> + <key>minoutbuf</key> + <value>0</value> + </param> + <param> + <key>maxoutbuf</key> + <value>0</value> + </param> + <param> <key>_coordinate</key> <value>(598, 546)</value> </param> @@ -771,6 +799,22 @@ <value>True</value> </param> <param> + <key>alias</key> + <value></value> + </param> + <param> + <key>affinity</key> + <value></value> + </param> + <param> + <key>minoutbuf</key> + <value>0</value> + </param> + <param> + <key>maxoutbuf</key> + <value>0</value> + </param> + <param> <key>_coordinate</key> <value>(332, 546)</value> </param> @@ -780,54 +824,246 @@ </param> </block> <block> - <key>options</key> + <key>noaa_hrpt_pll_cf</key> <param> <key>id</key> - <value>file_rx_hrpt</value> + <value>pll</value> </param> <param> <key>_enabled</key> <value>True</value> </param> <param> - <key>title</key> - <value>USRP HRPT Receiver</value> + <key>alpha</key> + <value>pll_alpha</value> </param> <param> - <key>author</key> + <key>beta</key> + <value>pll_alpha**2/4.0</value> + </param> + <param> + <key>max_offset</key> + <value>max_carrier_offset</value> + </param> + <param> + <key>alias</key> <value></value> </param> <param> - <key>description</key> + <key>affinity</key> <value></value> </param> <param> - <key>window_size</key> - <value>4096,4096</value> + <key>minoutbuf</key> + <value>0</value> </param> <param> - <key>generate_options</key> - <value>no_gui</value> + <key>maxoutbuf</key> + <value>0</value> </param> <param> - <key>category</key> - <value>Custom</value> + <key>_coordinate</key> + <value>(470, 357)</value> </param> <param> - <key>run_options</key> - <value>prompt</value> + <key>_rotation</key> + <value>0</value> </param> + </block> + <block> + <key>blocks_interleaved_short_to_complex</key> <param> - <key>run</key> + <key>id</key> + <value>blocks_interleaved_short_to_complex_0</value> + </param> + <param> + <key>_enabled</key> <value>True</value> </param> <param> - <key>realtime_scheduling</key> + <key>vector_input</key> + <value>False</value> + </param> + <param> + <key>swap</key> + <value>False</value> + </param> + <param> + <key>alias</key> + <value></value> + </param> + <param> + <key>affinity</key> <value></value> </param> <param> + <key>minoutbuf</key> + <value>0</value> + </param> + <param> + <key>maxoutbuf</key> + <value>0</value> + </param> + <param> <key>_coordinate</key> - <value>(10, 10)</value> + <value>(99, 373)</value> + </param> + <param> + <key>_rotation</key> + <value>0</value> + </param> + </block> + <block> + <key>blocks_file_source</key> + <param> + <key>id</key> + <value>blocks_file_source_0</value> + </param> + <param> + <key>_enabled</key> + <value>True</value> + </param> + <param> + <key>file</key> + <value>input_filename</value> + </param> + <param> + <key>type</key> + <value>short</value> + </param> + <param> + <key>repeat</key> + <value>False</value> + </param> + <param> + <key>vlen</key> + <value>1</value> + </param> + <param> + <key>alias</key> + <value></value> + </param> + <param> + <key>affinity</key> + <value></value> + </param> + <param> + <key>minoutbuf</key> + <value>0</value> + </param> + <param> + <key>maxoutbuf</key> + <value>0</value> + </param> + <param> + <key>_coordinate</key> + <value>(102, 253)</value> + </param> + <param> + <key>_rotation</key> + <value>0</value> + </param> + </block> + <block> + <key>blocks_throttle</key> + <param> + <key>id</key> + <value>throttle</value> + </param> + <param> + <key>_enabled</key> + <value>True</value> + </param> + <param> + <key>type</key> + <value>short</value> + </param> + <param> + <key>samples_per_second</key> + <value>2*sample_rate</value> + </param> + <param> + <key>vlen</key> + <value>1</value> + </param> + <param> + <key>ignoretag</key> + <value>True</value> + </param> + <param> + <key>alias</key> + <value></value> + </param> + <param> + <key>affinity</key> + <value></value> + </param> + <param> + <key>minoutbuf</key> + <value>0</value> + </param> + <param> + <key>maxoutbuf</key> + <value>0</value> + </param> + <param> + <key>_coordinate</key> + <value>(101, 319)</value> + </param> + <param> + <key>_rotation</key> + <value>180</value> + </param> + </block> + <block> + <key>analog_agc_xx</key> + <param> + <key>id</key> + <value>analog_agc_xx_0</value> + </param> + <param> + <key>_enabled</key> + <value>True</value> + </param> + <param> + <key>type</key> + <value>complex</value> + </param> + <param> + <key>rate</key> + <value>1e-6</value> + </param> + <param> + <key>reference</key> + <value>1.0</value> + </param> + <param> + <key>gain</key> + <value>1.0</value> + </param> + <param> + <key>max_gain</key> + <value>65536</value> + </param> + <param> + <key>alias</key> + <value></value> + </param> + <param> + <key>affinity</key> + <value></value> + </param> + <param> + <key>minoutbuf</key> + <value>0</value> + </param> + <param> + <key>maxoutbuf</key> + <value>0</value> + </param> + <param> + <key>_coordinate</key> + <value>(285, 349)</value> </param> <param> <key>_rotation</key> @@ -853,50 +1089,50 @@ <sink_key>0</sink_key> </connection> <connection> - <source_block_id>agc</source_block_id> - <sink_block_id>pll</sink_block_id> + <source_block_id>deframer</source_block_id> + <sink_block_id>decoder</sink_block_id> <source_key>0</source_key> <sink_key>0</sink_key> </connection> <connection> <source_block_id>deframer</source_block_id> - <sink_block_id>decoder</sink_block_id> + <sink_block_id>frame_sink</sink_block_id> <source_key>0</source_key> <sink_key>0</sink_key> </connection> <connection> - <source_block_id>deframer</source_block_id> - <sink_block_id>frame_sink</sink_block_id> + <source_block_id>throttle</source_block_id> + <sink_block_id>blocks_interleaved_short_to_complex_0</sink_block_id> <source_key>0</source_key> <sink_key>0</sink_key> </connection> <connection> - <source_block_id>blocks_interleaved_short_to_complex_0</source_block_id> - <sink_block_id>agc</sink_block_id> + <source_block_id>virtual_source_0</source_block_id> + <sink_block_id>digital_binary_slicer_fb_0</sink_block_id> <source_key>0</source_key> <sink_key>0</sink_key> </connection> <connection> - <source_block_id>throttle</source_block_id> - <sink_block_id>blocks_interleaved_short_to_complex_0</sink_block_id> + <source_block_id>digital_binary_slicer_fb_0</source_block_id> + <sink_block_id>deframer</sink_block_id> <source_key>0</source_key> <sink_key>0</sink_key> </connection> <connection> - <source_block_id>blocks_file_source_0</source_block_id> - <sink_block_id>throttle</sink_block_id> + <source_block_id>analog_agc_xx_0</source_block_id> + <sink_block_id>pll</sink_block_id> <source_key>0</source_key> <sink_key>0</sink_key> </connection> <connection> - <source_block_id>virtual_source_0</source_block_id> - <sink_block_id>digital_binary_slicer_fb_0</sink_block_id> + <source_block_id>blocks_interleaved_short_to_complex_0</source_block_id> + <sink_block_id>analog_agc_xx_0</sink_block_id> <source_key>0</source_key> <sink_key>0</sink_key> </connection> <connection> - <source_block_id>digital_binary_slicer_fb_0</source_block_id> - <sink_block_id>deframer</sink_block_id> + <source_block_id>blocks_file_source_0</source_block_id> + <sink_block_id>throttle</sink_block_id> <source_key>0</source_key> <sink_key>0</sink_key> </connection> diff --git a/gr-noaa/examples/hrpt_demod.grc b/gr-noaa/examples/hrpt_demod.grc index 1400f5ed1f..cbb02d83ca 100644 --- a/gr-noaa/examples/hrpt_demod.grc +++ b/gr-noaa/examples/hrpt_demod.grc @@ -1,6 +1,6 @@ <?xml version='1.0' encoding='ASCII'?> <flow_graph> - <timestamp>Thu Oct 27 13:51:57 2011</timestamp> + <timestamp>Sat Jul 12 11:19:23 2014</timestamp> <block> <key>options</key> <param> @@ -44,10 +44,18 @@ <value>True</value> </param> <param> + <key>max_nouts</key> + <value>0</value> + </param> + <param> <key>realtime_scheduling</key> <value></value> </param> <param> + <key>alias</key> + <value></value> + </param> + <param> <key>_coordinate</key> <value>(10, 10)</value> </param> @@ -71,6 +79,10 @@ <value>2*math.pi*100e3/sample_rate</value> </param> <param> + <key>alias</key> + <value></value> + </param> + <param> <key>_coordinate</key> <value>(575, 19)</value> </param> @@ -94,6 +106,10 @@ <value>int(sps/2.0)</value> </param> <param> + <key>alias</key> + <value></value> + </param> + <param> <key>_coordinate</key> <value>(499, 19)</value> </param> @@ -103,22 +119,26 @@ </param> </block> <block> - <key>import</key> + <key>variable</key> <param> <key>id</key> - <value>import_0</value> + <value>max_clock_offset</value> </param> <param> <key>_enabled</key> <value>True</value> </param> <param> - <key>import</key> - <value>import math, os</value> + <key>value</key> + <value>100e-6</value> + </param> + <param> + <key>alias</key> + <value></value> </param> <param> <key>_coordinate</key> - <value>(11, 103)</value> + <value>(710, 17)</value> </param> <param> <key>_rotation</key> @@ -126,34 +146,26 @@ </param> </block> <block> - <key>parameter</key> + <key>variable</key> <param> <key>id</key> - <value>input_filename</value> + <value>sym_rate</value> </param> <param> <key>_enabled</key> <value>True</value> </param> <param> - <key>label</key> - <value>input_filename</value> - </param> - <param> <key>value</key> - <value>usrp.dat</value> - </param> - <param> - <key>type</key> - <value>string</value> + <value>600*1109</value> </param> <param> - <key>short_id</key> - <value>F</value> + <key>alias</key> + <value></value> </param> <param> <key>_coordinate</key> - <value>(618, 102)</value> + <value>(307, 18)</value> </param> <param> <key>_rotation</key> @@ -161,69 +173,53 @@ </param> </block> <block> - <key>parameter</key> + <key>variable</key> <param> <key>id</key> - <value>output_filename</value> + <value>sps</value> </param> <param> <key>_enabled</key> <value>True</value> </param> <param> - <key>label</key> - <value>output_filename</value> - </param> - <param> <key>value</key> - <value>frames.dat</value> - </param> - <param> - <key>type</key> - <value>string</value> + <value>sample_rate/sym_rate</value> </param> <param> - <key>short_id</key> - <value>o</value> + <key>alias</key> + <value></value> </param> <param> <key>_coordinate</key> - <value>(726, 102)</value> + <value>(400, 17)</value> </param> <param> <key>_rotation</key> - <value>180</value> + <value>0</value> </param> </block> <block> - <key>blocks_file_source</key> + <key>variable</key> <param> <key>id</key> - <value>file_source</value> + <value>sample_rate</value> </param> <param> <key>_enabled</key> <value>True</value> </param> <param> - <key>file</key> - <value>input_filename</value> - </param> - <param> - <key>type</key> - <value>short</value> - </param> - <param> - <key>repeat</key> - <value>False</value> + <key>value</key> + <value>4e6</value> </param> <param> - <key>vlen</key> - <value>1</value> + <key>alias</key> + <value></value> </param> <param> <key>_coordinate</key> - <value>(63, 277)</value> + <value>(198, 17)</value> </param> <param> <key>_rotation</key> @@ -231,18 +227,26 @@ </param> </block> <block> - <key>blocks_interleaved_short_to_complex</key> + <key>import</key> <param> <key>id</key> - <value>cs2cf</value> + <value>import_0</value> </param> <param> <key>_enabled</key> <value>True</value> </param> <param> + <key>import</key> + <value>import math, os</value> + </param> + <param> + <key>alias</key> + <value></value> + </param> + <param> <key>_coordinate</key> - <value>(275, 289)</value> + <value>(11, 103)</value> </param> <param> <key>_rotation</key> @@ -250,38 +254,38 @@ </param> </block> <block> - <key>gr_agc_xx</key> + <key>parameter</key> <param> <key>id</key> - <value>agc</value> + <value>input_filename</value> </param> <param> <key>_enabled</key> <value>True</value> </param> <param> - <key>type</key> - <value>complex</value> + <key>label</key> + <value>input_filename</value> </param> <param> - <key>rate</key> - <value>1e-5</value> + <key>value</key> + <value>usrp.dat</value> </param> <param> - <key>reference</key> - <value>1.0</value> + <key>type</key> + <value>string</value> </param> <param> - <key>gain</key> - <value>1.0/32768.0</value> + <key>short_id</key> + <value>F</value> </param> <param> - <key>max_gain</key> - <value>1.0</value> + <key>alias</key> + <value></value> </param> <param> <key>_coordinate</key> - <value>(117, 394)</value> + <value>(618, 102)</value> </param> <param> <key>_rotation</key> @@ -289,99 +293,89 @@ </param> </block> <block> - <key>noaa_hrpt_pll_cf</key> + <key>parameter</key> <param> <key>id</key> - <value>pll</value> + <value>output_filename</value> </param> <param> <key>_enabled</key> <value>True</value> </param> <param> - <key>alpha</key> - <value>pll_alpha</value> + <key>label</key> + <value>output_filename</value> </param> <param> - <key>beta</key> - <value>pll_alpha**2/4.0</value> + <key>value</key> + <value>frames.dat</value> </param> <param> - <key>max_offset</key> - <value>max_carrier_offset</value> + <key>type</key> + <value>string</value> + </param> + <param> + <key>short_id</key> + <value>o</value> + </param> + <param> + <key>alias</key> + <value></value> </param> <param> <key>_coordinate</key> - <value>(292, 402)</value> + <value>(726, 102)</value> </param> <param> <key>_rotation</key> - <value>0</value> + <value>180</value> </param> </block> <block> - <key>variable</key> + <key>blocks_file_source</key> <param> <key>id</key> - <value>max_clock_offset</value> + <value>file_source</value> </param> <param> <key>_enabled</key> <value>True</value> </param> <param> - <key>value</key> - <value>100e-6</value> - </param> - <param> - <key>_coordinate</key> - <value>(710, 17)</value> + <key>file</key> + <value>input_filename</value> </param> <param> - <key>_rotation</key> - <value>0</value> + <key>type</key> + <value>short</value> </param> - </block> - <block> - <key>variable</key> <param> - <key>id</key> - <value>sym_rate</value> + <key>repeat</key> + <value>False</value> </param> <param> - <key>_enabled</key> - <value>True</value> + <key>vlen</key> + <value>1</value> </param> <param> - <key>value</key> - <value>600*1109</value> + <key>alias</key> + <value></value> </param> <param> - <key>_coordinate</key> - <value>(307, 18)</value> + <key>affinity</key> + <value></value> </param> <param> - <key>_rotation</key> + <key>minoutbuf</key> <value>0</value> </param> - </block> - <block> - <key>variable</key> <param> - <key>id</key> - <value>sps</value> - </param> - <param> - <key>_enabled</key> - <value>True</value> - </param> - <param> - <key>value</key> - <value>sample_rate/sym_rate</value> + <key>maxoutbuf</key> + <value>0</value> </param> <param> <key>_coordinate</key> - <value>(400, 17)</value> + <value>(63, 277)</value> </param> <param> <key>_rotation</key> @@ -415,6 +409,10 @@ <value>d</value> </param> <param> + <key>alias</key> + <value></value> + </param> + <param> <key>_coordinate</key> <value>(202, 102)</value> </param> @@ -450,6 +448,10 @@ <value>p</value> </param> <param> + <key>alias</key> + <value></value> + </param> + <param> <key>_coordinate</key> <value>(294, 101)</value> </param> @@ -485,6 +487,10 @@ <value>s</value> </param> <param> + <key>alias</key> + <value></value> + </param> + <param> <key>_coordinate</key> <value>(395, 101)</value> </param> @@ -512,6 +518,14 @@ <value>False</value> </param> <param> + <key>alias</key> + <value></value> + </param> + <param> + <key>affinity</key> + <value></value> + </param> + <param> <key>_coordinate</key> <value>(1150, 341)</value> </param> @@ -547,6 +561,18 @@ <value>False</value> </param> <param> + <key>append</key> + <value>False</value> + </param> + <param> + <key>alias</key> + <value></value> + </param> + <param> + <key>affinity</key> + <value></value> + </param> + <param> <key>_coordinate</key> <value>(1144, 489)</value> </param> @@ -582,31 +608,24 @@ <value>4000</value> </param> <param> - <key>_coordinate</key> - <value>(504, 402)</value> - </param> - <param> - <key>_rotation</key> - <value>0</value> + <key>alias</key> + <value></value> </param> - </block> - <block> - <key>variable</key> <param> - <key>id</key> - <value>sample_rate</value> + <key>affinity</key> + <value></value> </param> <param> - <key>_enabled</key> - <value>True</value> + <key>minoutbuf</key> + <value>0</value> </param> <param> - <key>value</key> - <value>4e6</value> + <key>maxoutbuf</key> + <value>0</value> </param> <param> <key>_coordinate</key> - <value>(198, 17)</value> + <value>(504, 402)</value> </param> <param> <key>_rotation</key> @@ -648,6 +667,22 @@ <value>max_clock_offset</value> </param> <param> + <key>alias</key> + <value></value> + </param> + <param> + <key>affinity</key> + <value></value> + </param> + <param> + <key>minoutbuf</key> + <value>0</value> + </param> + <param> + <key>maxoutbuf</key> + <value>0</value> + </param> + <param> <key>_coordinate</key> <value>(704, 386)</value> </param> @@ -667,6 +702,22 @@ <value>True</value> </param> <param> + <key>alias</key> + <value></value> + </param> + <param> + <key>affinity</key> + <value></value> + </param> + <param> + <key>minoutbuf</key> + <value>0</value> + </param> + <param> + <key>maxoutbuf</key> + <value>0</value> + </param> + <param> <key>_coordinate</key> <value>(1142, 422)</value> </param> @@ -686,6 +737,22 @@ <value>True</value> </param> <param> + <key>alias</key> + <value></value> + </param> + <param> + <key>affinity</key> + <value></value> + </param> + <param> + <key>minoutbuf</key> + <value>0</value> + </param> + <param> + <key>maxoutbuf</key> + <value>0</value> + </param> + <param> <key>_coordinate</key> <value>(957, 422)</value> </param> @@ -694,6 +761,151 @@ <value>0</value> </param> </block> + <block> + <key>blocks_interleaved_short_to_complex</key> + <param> + <key>id</key> + <value>cs2cf</value> + </param> + <param> + <key>_enabled</key> + <value>True</value> + </param> + <param> + <key>vector_input</key> + <value>False</value> + </param> + <param> + <key>swap</key> + <value>False</value> + </param> + <param> + <key>alias</key> + <value></value> + </param> + <param> + <key>affinity</key> + <value></value> + </param> + <param> + <key>minoutbuf</key> + <value>0</value> + </param> + <param> + <key>maxoutbuf</key> + <value>0</value> + </param> + <param> + <key>_coordinate</key> + <value>(275, 289)</value> + </param> + <param> + <key>_rotation</key> + <value>0</value> + </param> + </block> + <block> + <key>noaa_hrpt_pll_cf</key> + <param> + <key>id</key> + <value>pll</value> + </param> + <param> + <key>_enabled</key> + <value>True</value> + </param> + <param> + <key>alpha</key> + <value>pll_alpha</value> + </param> + <param> + <key>beta</key> + <value>pll_alpha**2/4.0</value> + </param> + <param> + <key>max_offset</key> + <value>max_carrier_offset</value> + </param> + <param> + <key>alias</key> + <value></value> + </param> + <param> + <key>affinity</key> + <value></value> + </param> + <param> + <key>minoutbuf</key> + <value>0</value> + </param> + <param> + <key>maxoutbuf</key> + <value>0</value> + </param> + <param> + <key>_coordinate</key> + <value>(292, 402)</value> + </param> + <param> + <key>_rotation</key> + <value>0</value> + </param> + </block> + <block> + <key>analog_agc_xx</key> + <param> + <key>id</key> + <value>analog_agc_xx_0</value> + </param> + <param> + <key>_enabled</key> + <value>True</value> + </param> + <param> + <key>type</key> + <value>complex</value> + </param> + <param> + <key>rate</key> + <value>1e-5</value> + </param> + <param> + <key>reference</key> + <value>1.0</value> + </param> + <param> + <key>gain</key> + <value>1.0/32768.0</value> + </param> + <param> + <key>max_gain</key> + <value>65536</value> + </param> + <param> + <key>alias</key> + <value></value> + </param> + <param> + <key>affinity</key> + <value></value> + </param> + <param> + <key>minoutbuf</key> + <value>0</value> + </param> + <param> + <key>maxoutbuf</key> + <value>0</value> + </param> + <param> + <key>_coordinate</key> + <value>(124, 394)</value> + </param> + <param> + <key>_rotation</key> + <value>0</value> + </param> + </block> <connection> <source_block_id>file_source</source_block_id> <sink_block_id>cs2cf</sink_block_id> @@ -707,18 +919,6 @@ <sink_key>0</sink_key> </connection> <connection> - <source_block_id>cs2cf</source_block_id> - <sink_block_id>agc</sink_block_id> - <source_key>0</source_key> - <sink_key>0</sink_key> - </connection> - <connection> - <source_block_id>agc</source_block_id> - <sink_block_id>pll</sink_block_id> - <source_key>0</source_key> - <sink_key>0</sink_key> - </connection> - <connection> <source_block_id>noaa_hrpt_deframer_0</source_block_id> <sink_block_id>blocks_file_sink_0</sink_block_id> <source_key>0</source_key> @@ -748,4 +948,16 @@ <source_key>0</source_key> <sink_key>0</sink_key> </connection> + <connection> + <source_block_id>cs2cf</source_block_id> + <sink_block_id>analog_agc_xx_0</sink_block_id> + <source_key>0</source_key> + <sink_key>0</sink_key> + </connection> + <connection> + <source_block_id>analog_agc_xx_0</source_block_id> + <sink_block_id>pll</sink_block_id> + <source_key>0</source_key> + <sink_key>0</sink_key> + </connection> </flow_graph> diff --git a/gr-noaa/examples/usrp_rx_hrpt.grc b/gr-noaa/examples/usrp_rx_hrpt.grc index 56d07446bf..209bf41c56 100644 --- a/gr-noaa/examples/usrp_rx_hrpt.grc +++ b/gr-noaa/examples/usrp_rx_hrpt.grc @@ -1,6 +1,6 @@ <?xml version='1.0' encoding='ASCII'?> <flow_graph> - <timestamp>Thu Oct 27 13:26:39 2011</timestamp> + <timestamp>Sat Jul 12 11:19:58 2014</timestamp> <block> <key>options</key> <param> @@ -44,10 +44,18 @@ <value>True</value> </param> <param> + <key>max_nouts</key> + <value>0</value> + </param> + <param> <key>realtime_scheduling</key> <value></value> </param> <param> + <key>alias</key> + <value></value> + </param> + <param> <key>_coordinate</key> <value>(10, 10)</value> </param> @@ -60,7 +68,7 @@ <key>variable</key> <param> <key>id</key> - <value>max_carrier_offset</value> + <value>sample_rate</value> </param> <param> <key>_enabled</key> @@ -68,11 +76,15 @@ </param> <param> <key>value</key> - <value>2*math.pi*100e3/sample_rate</value> + <value>4e6</value> + </param> + <param> + <key>alias</key> + <value></value> </param> <param> <key>_coordinate</key> - <value>(575, 19)</value> + <value>(198, 17)</value> </param> <param> <key>_rotation</key> @@ -83,7 +95,7 @@ <key>variable</key> <param> <key>id</key> - <value>sym_rate</value> + <value>config_filename</value> </param> <param> <key>_enabled</key> @@ -91,11 +103,15 @@ </param> <param> <key>value</key> - <value>600*1109</value> + <value>os.environ['HOME']+'/.gnuradio/config.conf'</value> + </param> + <param> + <key>alias</key> + <value></value> </param> <param> <key>_coordinate</key> - <value>(301, 19)</value> + <value>(13, 168)</value> </param> <param> <key>_rotation</key> @@ -106,7 +122,7 @@ <key>variable</key> <param> <key>id</key> - <value>sps</value> + <value>max_clock_offset</value> </param> <param> <key>_enabled</key> @@ -114,11 +130,15 @@ </param> <param> <key>value</key> - <value>sample_rate/sym_rate</value> + <value>100e-6</value> + </param> + <param> + <key>alias</key> + <value></value> </param> <param> <key>_coordinate</key> - <value>(397, 19)</value> + <value>(705, 19)</value> </param> <param> <key>_rotation</key> @@ -140,6 +160,10 @@ <value>int(sps/2.0)</value> </param> <param> + <key>alias</key> + <value></value> + </param> + <param> <key>_coordinate</key> <value>(499, 19)</value> </param> @@ -149,6 +173,87 @@ </param> </block> <block> + <key>variable</key> + <param> + <key>id</key> + <value>sps</value> + </param> + <param> + <key>_enabled</key> + <value>True</value> + </param> + <param> + <key>value</key> + <value>sample_rate/sym_rate</value> + </param> + <param> + <key>alias</key> + <value></value> + </param> + <param> + <key>_coordinate</key> + <value>(397, 19)</value> + </param> + <param> + <key>_rotation</key> + <value>0</value> + </param> + </block> + <block> + <key>variable</key> + <param> + <key>id</key> + <value>sym_rate</value> + </param> + <param> + <key>_enabled</key> + <value>True</value> + </param> + <param> + <key>value</key> + <value>600*1109</value> + </param> + <param> + <key>alias</key> + <value></value> + </param> + <param> + <key>_coordinate</key> + <value>(301, 19)</value> + </param> + <param> + <key>_rotation</key> + <value>0</value> + </param> + </block> + <block> + <key>variable</key> + <param> + <key>id</key> + <value>max_carrier_offset</value> + </param> + <param> + <key>_enabled</key> + <value>True</value> + </param> + <param> + <key>value</key> + <value>2*math.pi*100e3/sample_rate</value> + </param> + <param> + <key>alias</key> + <value></value> + </param> + <param> + <key>_coordinate</key> + <value>(575, 19)</value> + </param> + <param> + <key>_rotation</key> + <value>0</value> + </param> + </block> + <block> <key>variable_slider</key> <param> <key>id</key> @@ -195,6 +300,10 @@ <value></value> </param> <param> + <key>alias</key> + <value></value> + </param> + <param> <key>_coordinate</key> <value>(340, 106)</value> </param> @@ -238,6 +347,10 @@ <value></value> </param> <param> + <key>alias</key> + <value></value> + </param> + <param> <key>_coordinate</key> <value>(199, 106)</value> </param> @@ -293,6 +406,10 @@ <value></value> </param> <param> + <key>alias</key> + <value></value> + </param> + <param> <key>_coordinate</key> <value>(479, 106)</value> </param> @@ -348,6 +465,10 @@ <value></value> </param> <param> + <key>alias</key> + <value></value> + </param> + <param> <key>_coordinate</key> <value>(618, 106)</value> </param> @@ -383,6 +504,10 @@ <value></value> </param> <param> + <key>alias</key> + <value></value> + </param> + <param> <key>_coordinate</key> <value>(12, 249)</value> </param> @@ -392,86 +517,140 @@ </param> </block> <block> - <key>wxgui_fftsink2</key> + <key>variable_config</key> <param> <key>id</key> - <value>rx_fft</value> + <value>addr</value> </param> <param> <key>_enabled</key> <value>True</value> </param> <param> + <key>value</key> + <value>""</value> + </param> + <param> <key>type</key> - <value>complex</value> + <value>string</value> </param> <param> - <key>title</key> - <value>RX Spectrum</value> + <key>config_file</key> + <value>config_filename</value> </param> <param> - <key>samp_rate</key> - <value>sample_rate</value> + <key>section</key> + <value>'usrp_rx_hrpt'</value> </param> <param> - <key>baseband_freq</key> - <value>freq</value> + <key>option</key> + <value>'addr'</value> </param> <param> - <key>y_per_div</key> - <value>5</value> + <key>writeback</key> + <value>addr</value> </param> <param> - <key>y_divs</key> - <value>8</value> + <key>alias</key> + <value></value> </param> <param> - <key>ref_level</key> - <value>-5</value> + <key>_coordinate</key> + <value>(194, 253)</value> </param> <param> - <key>ref_scale</key> - <value>2.0</value> + <key>_rotation</key> + <value>0</value> </param> + </block> + <block> + <key>variable_static_text</key> <param> - <key>fft_size</key> - <value>1024</value> + <key>id</key> + <value>addr_text</value> </param> <param> - <key>fft_rate</key> - <value>15</value> + <key>_enabled</key> + <value>True</value> </param> <param> - <key>peak_hold</key> - <value>False</value> + <key>label</key> + <value>USRP Addr</value> </param> <param> - <key>average</key> - <value>True</value> + <key>value</key> + <value>addr</value> </param> <param> - <key>avg_alpha</key> - <value>0.1</value> + <key>converver</key> + <value>str_converter</value> </param> <param> - <key>win</key> + <key>formatter</key> <value>None</value> </param> <param> - <key>win_size</key> - <value>640, 360</value> + <key>grid_pos</key> + <value>1, 0, 1, 1</value> + </param> + <param> + <key>notebook</key> + <value></value> + </param> + <param> + <key>alias</key> + <value></value> + </param> + <param> + <key>_coordinate</key> + <value>(828, 20)</value> + </param> + <param> + <key>_rotation</key> + <value>0</value> + </param> + </block> + <block> + <key>variable_static_text</key> + <param> + <key>id</key> + <value>rate_text</value> + </param> + <param> + <key>_enabled</key> + <value>True</value> + </param> + <param> + <key>label</key> + <value>Baseband Rate</value> + </param> + <param> + <key>value</key> + <value>sample_rate</value> + </param> + <param> + <key>converver</key> + <value>float_converter</value> + </param> + <param> + <key>formatter</key> + <value>None</value> </param> <param> <key>grid_pos</key> - <value>0, 0, 1, 1</value> + <value>1, 1, 1, 1</value> </param> <param> <key>notebook</key> - <value>displays, 0</value> + <value></value> + </param> + <param> + <key>alias</key> + <value></value> </param> <param> <key>_coordinate</key> - <value>(477, 457)</value> + <value>(973, 20)</value> </param> <param> <key>_rotation</key> @@ -479,22 +658,26 @@ </param> </block> <block> - <key>variable</key> + <key>import</key> <param> <key>id</key> - <value>max_clock_offset</value> + <value>import_0</value> </param> <param> <key>_enabled</key> <value>True</value> </param> <param> - <key>value</key> - <value>100e-6</value> + <key>import</key> + <value>import math, os</value> + </param> + <param> + <key>alias</key> + <value></value> </param> <param> <key>_coordinate</key> - <value>(705, 19)</value> + <value>(9, 106)</value> </param> <param> <key>_rotation</key> @@ -502,38 +685,46 @@ </param> </block> <block> - <key>gr_agc_xx</key> + <key>variable_config</key> <param> <key>id</key> - <value>agc</value> + <value>output_filename</value> </param> <param> <key>_enabled</key> <value>True</value> </param> <param> + <key>value</key> + <value>'frames.hrpt'</value> + </param> + <param> <key>type</key> - <value>complex</value> + <value>string</value> </param> <param> - <key>rate</key> - <value>1e-6</value> + <key>config_file</key> + <value>config_filename</value> </param> <param> - <key>reference</key> - <value>1.0</value> + <key>section</key> + <value>'usrp_rx_hrpt'</value> </param> <param> - <key>gain</key> - <value>1.0</value> + <key>option</key> + <value>'filename'</value> </param> <param> - <key>max_gain</key> - <value>1.0</value> + <key>writeback</key> + <value>output_filename</value> + </param> + <param> + <key>alias</key> + <value></value> </param> <param> <key>_coordinate</key> - <value>(301, 705)</value> + <value>(990, 255)</value> </param> <param> <key>_rotation</key> @@ -541,30 +732,46 @@ </param> </block> <block> - <key>noaa_hrpt_pll_cf</key> + <key>variable_config</key> <param> <key>id</key> - <value>pll</value> + <value>saved_clock_alpha</value> </param> <param> <key>_enabled</key> <value>True</value> </param> <param> - <key>alpha</key> - <value>pll_alpha</value> + <key>value</key> + <value>0.01</value> </param> <param> - <key>beta</key> - <value>pll_alpha**2/4.0</value> + <key>type</key> + <value>real</value> </param> <param> - <key>max_offset</key> - <value>max_carrier_offset</value> + <key>config_file</key> + <value>config_filename</value> + </param> + <param> + <key>section</key> + <value>'usrp_rx_hrpt'</value> + </param> + <param> + <key>option</key> + <value>'clock_alpha'</value> + </param> + <param> + <key>writeback</key> + <value>clock_alpha</value> + </param> + <param> + <key>alias</key> + <value></value> </param> <param> <key>_coordinate</key> - <value>(469, 713)</value> + <value>(832, 254)</value> </param> <param> <key>_rotation</key> @@ -575,7 +782,7 @@ <key>variable_config</key> <param> <key>id</key> - <value>addr</value> + <value>saved_pll_alpha</value> </param> <param> <key>_enabled</key> @@ -583,11 +790,11 @@ </param> <param> <key>value</key> - <value>""</value> + <value>0.01</value> </param> <param> <key>type</key> - <value>string</value> + <value>real</value> </param> <param> <key>config_file</key> @@ -599,15 +806,19 @@ </param> <param> <key>option</key> - <value>'addr'</value> + <value>'pll_alpha'</value> </param> <param> <key>writeback</key> - <value>addr</value> + <value>pll_alpha</value> + </param> + <param> + <key>alias</key> + <value></value> </param> <param> <key>_coordinate</key> - <value>(194, 253)</value> + <value>(674, 254)</value> </param> <param> <key>_rotation</key> @@ -615,1256 +826,1317 @@ </param> </block> <block> - <key>uhd_usrp_source</key> + <key>variable_config</key> <param> <key>id</key> - <value>uhd_usrp_source_0</value> + <value>saved_gain</value> </param> <param> <key>_enabled</key> <value>True</value> </param> <param> + <key>value</key> + <value>35</value> + </param> + <param> <key>type</key> - <value>complex</value> + <value>real</value> </param> <param> - <key>dev_addr</key> - <value>addr</value> + <key>config_file</key> + <value>config_filename</value> </param> <param> - <key>sync</key> - <value></value> + <key>section</key> + <value>'usrp_rx_hrpt'</value> </param> <param> - <key>clock_rate</key> - <value>0.0</value> + <key>option</key> + <value>'gain'</value> </param> <param> - <key>num_mboards</key> - <value>1</value> + <key>writeback</key> + <value>gain</value> </param> <param> - <key>ref_source0</key> + <key>alias</key> <value></value> </param> <param> - <key>sd_spec0</key> - <value></value> + <key>_coordinate</key> + <value>(515, 255)</value> </param> <param> - <key>ref_source1</key> - <value></value> + <key>_rotation</key> + <value>0</value> </param> + </block> + <block> + <key>variable_config</key> <param> - <key>sd_spec1</key> - <value></value> + <key>id</key> + <value>saved_freq</value> </param> <param> - <key>ref_source2</key> - <value></value> + <key>_enabled</key> + <value>True</value> </param> <param> - <key>sd_spec2</key> - <value></value> + <key>value</key> + <value>1698e6</value> </param> <param> - <key>ref_source3</key> - <value></value> + <key>type</key> + <value>real</value> </param> <param> - <key>sd_spec3</key> - <value></value> + <key>config_file</key> + <value>config_filename</value> </param> <param> - <key>ref_source4</key> - <value></value> + <key>section</key> + <value>'usrp_rx_hrpt'</value> </param> <param> - <key>sd_spec4</key> - <value></value> + <key>option</key> + <value>'freq'</value> </param> <param> - <key>ref_source5</key> - <value></value> + <key>writeback</key> + <value>freq</value> </param> <param> - <key>sd_spec5</key> + <key>alias</key> <value></value> </param> <param> - <key>ref_source6</key> - <value></value> + <key>_coordinate</key> + <value>(358, 254)</value> </param> <param> - <key>sd_spec6</key> - <value></value> + <key>_rotation</key> + <value>0</value> </param> + </block> + <block> + <key>wxgui_scopesink2</key> <param> - <key>ref_source7</key> - <value></value> + <key>id</key> + <value>demod_scope</value> </param> <param> - <key>sd_spec7</key> - <value></value> + <key>_enabled</key> + <value>True</value> </param> <param> - <key>nchan</key> - <value>1</value> + <key>type</key> + <value>float</value> + </param> + <param> + <key>title</key> + <value>Post-Demod</value> </param> <param> <key>samp_rate</key> - <value>sample_rate</value> + <value>sym_rate*2.0</value> </param> <param> - <key>center_freq0</key> - <value>freq</value> + <key>v_scale</key> + <value>0.5</value> </param> <param> - <key>gain0</key> + <key>v_offset</key> <value>0</value> </param> <param> - <key>ant0</key> - <value></value> + <key>t_scale</key> + <value>10.0/sym_rate</value> </param> <param> - <key>bw0</key> - <value>0</value> + <key>ac_couple</key> + <value>False</value> </param> <param> - <key>center_freq1</key> - <value>0</value> + <key>xy_mode</key> + <value>False</value> </param> <param> - <key>gain1</key> - <value>0</value> + <key>num_inputs</key> + <value>1</value> </param> <param> - <key>ant1</key> + <key>win_size</key> <value></value> </param> <param> - <key>bw1</key> - <value>0</value> + <key>grid_pos</key> + <value>0, 0, 1, 1</value> </param> <param> - <key>center_freq2</key> - <value>0</value> + <key>notebook</key> + <value>displays, 1</value> </param> <param> - <key>gain2</key> - <value>0</value> + <key>trig_mode</key> + <value>wxgui.TRIG_MODE_AUTO</value> </param> <param> - <key>ant2</key> + <key>y_axis_label</key> + <value>Counts</value> + </param> + <param> + <key>alias</key> <value></value> </param> <param> - <key>bw2</key> - <value>0</value> + <key>affinity</key> + <value></value> </param> <param> - <key>center_freq3</key> - <value>0</value> + <key>_coordinate</key> + <value>(666, 542)</value> </param> <param> - <key>gain3</key> - <value>0</value> + <key>_rotation</key> + <value>180</value> </param> + </block> + <block> + <key>blocks_moving_average_xx</key> <param> - <key>ant3</key> - <value></value> + <key>id</key> + <value>blocks_moving_average_xx_0</value> </param> <param> - <key>bw3</key> - <value>0</value> + <key>_enabled</key> + <value>True</value> </param> <param> - <key>center_freq4</key> - <value>0</value> + <key>type</key> + <value>float</value> </param> <param> - <key>gain4</key> - <value>0</value> + <key>length</key> + <value>hs</value> </param> <param> - <key>ant4</key> + <key>scale</key> + <value>1.0/hs</value> + </param> + <param> + <key>max_iter</key> + <value>4000</value> + </param> + <param> + <key>alias</key> <value></value> </param> <param> - <key>bw4</key> - <value>0</value> + <key>affinity</key> + <value></value> </param> <param> - <key>center_freq5</key> + <key>minoutbuf</key> <value>0</value> </param> <param> - <key>gain5</key> + <key>maxoutbuf</key> <value>0</value> </param> <param> - <key>ant5</key> - <value></value> + <key>_coordinate</key> + <value>(682, 713)</value> </param> <param> - <key>bw5</key> + <key>_rotation</key> <value>0</value> </param> + </block> + <block> + <key>virtual_sink</key> <param> - <key>center_freq6</key> - <value>0</value> + <key>id</key> + <value>virtual_sink_0</value> </param> <param> - <key>gain6</key> - <value>0</value> + <key>_enabled</key> + <value>True</value> </param> <param> - <key>ant6</key> - <value></value> + <key>stream_id</key> + <value>baseband</value> </param> <param> - <key>bw6</key> - <value>0</value> + <key>_coordinate</key> + <value>(1138, 729)</value> </param> <param> - <key>center_freq7</key> + <key>_rotation</key> <value>0</value> </param> + </block> + <block> + <key>digital_clock_recovery_mm_xx</key> <param> - <key>gain7</key> - <value>0</value> + <key>id</key> + <value>digital_clock_recovery_mm_xx_0</value> </param> <param> - <key>ant7</key> - <value></value> + <key>_enabled</key> + <value>True</value> </param> <param> - <key>bw7</key> - <value>0</value> + <key>type</key> + <value>float</value> </param> <param> - <key>center_freq8</key> - <value>0</value> + <key>omega</key> + <value>sps/2.0</value> </param> <param> - <key>gain8</key> - <value>0</value> + <key>gain_omega</key> + <value>clock_alpha**2/4.0</value> </param> <param> - <key>ant8</key> - <value></value> + <key>mu</key> + <value>0.5</value> </param> <param> - <key>bw8</key> - <value>0</value> + <key>gain_mu</key> + <value>clock_alpha</value> </param> <param> - <key>center_freq9</key> - <value>0</value> + <key>omega_relative_limit</key> + <value>max_clock_offset</value> </param> <param> - <key>gain9</key> - <value>0</value> + <key>alias</key> + <value></value> </param> <param> - <key>ant9</key> + <key>affinity</key> <value></value> </param> <param> - <key>bw9</key> + <key>minoutbuf</key> <value>0</value> </param> <param> - <key>center_freq10</key> + <key>maxoutbuf</key> <value>0</value> </param> <param> - <key>gain10</key> + <key>_coordinate</key> + <value>(896, 697)</value> + </param> + <param> + <key>_rotation</key> <value>0</value> </param> + </block> + <block> + <key>virtual_source</key> <param> - <key>ant10</key> - <value></value> + <key>id</key> + <value>virtual_source_0</value> </param> <param> - <key>bw10</key> - <value>0</value> + <key>_enabled</key> + <value>True</value> </param> <param> - <key>center_freq11</key> - <value>0</value> + <key>stream_id</key> + <value>baseband</value> </param> <param> - <key>gain11</key> + <key>_coordinate</key> + <value>(173, 971)</value> + </param> + <param> + <key>_rotation</key> <value>0</value> </param> + </block> + <block> + <key>digital_binary_slicer_fb</key> <param> - <key>ant11</key> + <key>id</key> + <value>digital_binary_slicer_fb_0</value> + </param> + <param> + <key>_enabled</key> + <value>True</value> + </param> + <param> + <key>alias</key> <value></value> </param> <param> - <key>bw11</key> - <value>0</value> + <key>affinity</key> + <value></value> </param> <param> - <key>center_freq12</key> + <key>minoutbuf</key> <value>0</value> </param> <param> - <key>gain12</key> + <key>maxoutbuf</key> <value>0</value> </param> <param> - <key>ant12</key> - <value></value> + <key>_coordinate</key> + <value>(423, 975)</value> </param> <param> - <key>bw12</key> + <key>_rotation</key> <value>0</value> </param> + </block> + <block> + <key>noaa_hrpt_deframer</key> <param> - <key>center_freq13</key> - <value>0</value> + <key>id</key> + <value>deframer</value> </param> <param> - <key>gain13</key> - <value>0</value> + <key>_enabled</key> + <value>True</value> </param> <param> - <key>ant13</key> + <key>alias</key> <value></value> </param> <param> - <key>bw13</key> - <value>0</value> + <key>affinity</key> + <value></value> </param> <param> - <key>center_freq14</key> + <key>minoutbuf</key> <value>0</value> </param> <param> - <key>gain14</key> + <key>maxoutbuf</key> <value>0</value> </param> <param> - <key>ant14</key> - <value></value> + <key>_coordinate</key> + <value>(762, 975)</value> </param> <param> - <key>bw14</key> + <key>_rotation</key> <value>0</value> </param> + </block> + <block> + <key>noaa_hrpt_decoder</key> <param> - <key>center_freq15</key> - <value>0</value> + <key>id</key> + <value>decoder</value> </param> <param> - <key>gain15</key> - <value>0</value> + <key>_enabled</key> + <value>True</value> </param> <param> - <key>ant15</key> + <key>verbose</key> + <value>True</value> + </param> + <param> + <key>output</key> + <value>True</value> + </param> + <param> + <key>alias</key> <value></value> </param> <param> - <key>bw15</key> - <value>0</value> + <key>affinity</key> + <value></value> </param> <param> - <key>center_freq16</key> - <value>0</value> + <key>_coordinate</key> + <value>(974, 925)</value> </param> <param> - <key>gain16</key> + <key>_rotation</key> <value>0</value> </param> + </block> + <block> + <key>blocks_file_sink</key> <param> - <key>ant16</key> - <value></value> + <key>id</key> + <value>frame_sink</value> </param> <param> - <key>bw16</key> - <value>0</value> + <key>_enabled</key> + <value>True</value> </param> <param> - <key>center_freq17</key> - <value>0</value> + <key>file</key> + <value>output_filename</value> </param> <param> - <key>gain17</key> - <value>0</value> + <key>type</key> + <value>short</value> </param> <param> - <key>ant17</key> - <value></value> + <key>vlen</key> + <value>1</value> </param> <param> - <key>bw17</key> - <value>0</value> + <key>unbuffered</key> + <value>False</value> </param> <param> - <key>center_freq18</key> - <value>0</value> + <key>append</key> + <value>False</value> </param> <param> - <key>gain18</key> - <value>0</value> + <key>alias</key> + <value></value> </param> <param> - <key>ant18</key> + <key>affinity</key> <value></value> </param> <param> - <key>bw18</key> - <value>0</value> + <key>_coordinate</key> + <value>(973, 1024)</value> </param> <param> - <key>center_freq19</key> + <key>_rotation</key> <value>0</value> </param> + </block> + <block> + <key>wxgui_fftsink2</key> <param> - <key>gain19</key> - <value>0</value> + <key>id</key> + <value>rx_fft</value> </param> <param> - <key>ant19</key> - <value></value> + <key>_enabled</key> + <value>True</value> </param> <param> - <key>bw19</key> - <value>0</value> + <key>type</key> + <value>complex</value> </param> <param> - <key>center_freq20</key> - <value>0</value> + <key>title</key> + <value>RX Spectrum</value> </param> <param> - <key>gain20</key> - <value>0</value> + <key>samp_rate</key> + <value>sample_rate</value> </param> <param> - <key>ant20</key> - <value></value> + <key>baseband_freq</key> + <value>freq</value> </param> <param> - <key>bw20</key> - <value>0</value> + <key>y_per_div</key> + <value>5</value> </param> <param> - <key>center_freq21</key> - <value>0</value> + <key>y_divs</key> + <value>8</value> </param> <param> - <key>gain21</key> - <value>0</value> + <key>ref_level</key> + <value>-5</value> </param> <param> - <key>ant21</key> - <value></value> + <key>ref_scale</key> + <value>2.0</value> </param> <param> - <key>bw21</key> - <value>0</value> + <key>fft_size</key> + <value>1024</value> </param> <param> - <key>center_freq22</key> - <value>0</value> + <key>fft_rate</key> + <value>15</value> </param> <param> - <key>gain22</key> - <value>0</value> + <key>peak_hold</key> + <value>False</value> </param> <param> - <key>ant22</key> - <value></value> + <key>average</key> + <value>True</value> </param> <param> - <key>bw22</key> - <value>0</value> + <key>avg_alpha</key> + <value>0.1</value> </param> <param> - <key>center_freq23</key> - <value>0</value> + <key>win</key> + <value>None</value> </param> <param> - <key>gain23</key> - <value>0</value> + <key>win_size</key> + <value>640, 360</value> </param> <param> - <key>ant23</key> - <value></value> + <key>grid_pos</key> + <value>0, 0, 1, 1</value> </param> <param> - <key>bw23</key> - <value>0</value> + <key>notebook</key> + <value>displays, 0</value> </param> <param> - <key>center_freq24</key> - <value>0</value> + <key>freqvar</key> + <value>None</value> </param> <param> - <key>gain24</key> - <value>0</value> + <key>alias</key> + <value></value> </param> <param> - <key>ant24</key> + <key>affinity</key> <value></value> </param> <param> - <key>bw24</key> - <value>0</value> + <key>_coordinate</key> + <value>(477, 457)</value> </param> <param> - <key>center_freq25</key> + <key>_rotation</key> <value>0</value> </param> + </block> + <block> + <key>noaa_hrpt_pll_cf</key> <param> - <key>gain25</key> - <value>0</value> + <key>id</key> + <value>pll</value> </param> <param> - <key>ant25</key> - <value></value> + <key>_enabled</key> + <value>True</value> </param> <param> - <key>bw25</key> - <value>0</value> + <key>alpha</key> + <value>pll_alpha</value> </param> <param> - <key>center_freq26</key> - <value>0</value> + <key>beta</key> + <value>pll_alpha**2/4.0</value> </param> <param> - <key>gain26</key> - <value>0</value> + <key>max_offset</key> + <value>max_carrier_offset</value> </param> <param> - <key>ant26</key> + <key>alias</key> <value></value> </param> <param> - <key>bw26</key> - <value>0</value> + <key>affinity</key> + <value></value> </param> <param> - <key>center_freq27</key> + <key>minoutbuf</key> <value>0</value> </param> <param> - <key>gain27</key> + <key>maxoutbuf</key> <value>0</value> </param> <param> - <key>ant27</key> - <value></value> + <key>_coordinate</key> + <value>(469, 713)</value> </param> <param> - <key>bw27</key> + <key>_rotation</key> <value>0</value> </param> + </block> + <block> + <key>uhd_usrp_source</key> <param> - <key>center_freq28</key> - <value>0</value> + <key>id</key> + <value>uhd_usrp_source_0</value> </param> <param> - <key>gain28</key> - <value>0</value> + <key>_enabled</key> + <value>True</value> </param> <param> - <key>ant28</key> + <key>type</key> + <value>fc32</value> + </param> + <param> + <key>otw</key> <value></value> </param> <param> - <key>bw28</key> - <value>0</value> + <key>stream_args</key> + <value></value> </param> <param> - <key>center_freq29</key> - <value>0</value> + <key>stream_chans</key> + <value>[]</value> </param> <param> - <key>gain29</key> - <value>0</value> + <key>dev_addr</key> + <value>addr</value> </param> <param> - <key>ant29</key> + <key>dev_args</key> + <value>""</value> + </param> + <param> + <key>sync</key> <value></value> </param> <param> - <key>bw29</key> - <value>0</value> + <key>clock_rate</key> + <value>0.0</value> </param> <param> - <key>center_freq30</key> - <value>0</value> + <key>num_mboards</key> + <value>1</value> </param> <param> - <key>gain30</key> - <value>0</value> + <key>clock_source0</key> + <value></value> </param> <param> - <key>ant30</key> + <key>time_source0</key> <value></value> </param> <param> - <key>bw30</key> - <value>0</value> + <key>sd_spec0</key> + <value></value> </param> <param> - <key>center_freq31</key> - <value>0</value> + <key>clock_source1</key> + <value></value> </param> <param> - <key>gain31</key> - <value>0</value> + <key>time_source1</key> + <value></value> </param> <param> - <key>ant31</key> + <key>sd_spec1</key> <value></value> </param> <param> - <key>bw31</key> - <value>0</value> + <key>clock_source2</key> + <value></value> </param> <param> - <key>_coordinate</key> - <value>(49, 713)</value> + <key>time_source2</key> + <value></value> </param> <param> - <key>_rotation</key> - <value>0</value> + <key>sd_spec2</key> + <value></value> </param> - </block> - <block> - <key>variable_static_text</key> <param> - <key>id</key> - <value>addr_text</value> + <key>clock_source3</key> + <value></value> </param> <param> - <key>_enabled</key> - <value>True</value> + <key>time_source3</key> + <value></value> </param> <param> - <key>label</key> - <value>USRP Addr</value> + <key>sd_spec3</key> + <value></value> </param> <param> - <key>value</key> - <value>addr</value> + <key>clock_source4</key> + <value></value> </param> <param> - <key>converver</key> - <value>str_converter</value> + <key>time_source4</key> + <value></value> </param> <param> - <key>formatter</key> - <value>None</value> + <key>sd_spec4</key> + <value></value> </param> <param> - <key>grid_pos</key> - <value>1, 0, 1, 1</value> + <key>clock_source5</key> + <value></value> </param> <param> - <key>notebook</key> + <key>time_source5</key> <value></value> </param> <param> - <key>_coordinate</key> - <value>(828, 20)</value> + <key>sd_spec5</key> + <value></value> </param> <param> - <key>_rotation</key> - <value>0</value> + <key>clock_source6</key> + <value></value> </param> - </block> - <block> - <key>variable_static_text</key> <param> - <key>id</key> - <value>rate_text</value> + <key>time_source6</key> + <value></value> </param> <param> - <key>_enabled</key> - <value>True</value> + <key>sd_spec6</key> + <value></value> </param> <param> - <key>label</key> - <value>Baseband Rate</value> + <key>clock_source7</key> + <value></value> </param> <param> - <key>value</key> - <value>sample_rate</value> + <key>time_source7</key> + <value></value> </param> <param> - <key>converver</key> - <value>float_converter</value> + <key>sd_spec7</key> + <value></value> </param> <param> - <key>formatter</key> - <value>None</value> + <key>nchan</key> + <value>1</value> </param> <param> - <key>grid_pos</key> - <value>1, 1, 1, 1</value> + <key>samp_rate</key> + <value>sample_rate</value> </param> <param> - <key>notebook</key> - <value></value> + <key>center_freq0</key> + <value>freq</value> </param> <param> - <key>_coordinate</key> - <value>(973, 20)</value> + <key>gain0</key> + <value>0</value> </param> <param> - <key>_rotation</key> + <key>ant0</key> + <value></value> + </param> + <param> + <key>bw0</key> <value>0</value> </param> - </block> - <block> - <key>import</key> <param> - <key>id</key> - <value>import_0</value> + <key>center_freq1</key> + <value>0</value> </param> <param> - <key>_enabled</key> - <value>True</value> + <key>gain1</key> + <value>0</value> </param> <param> - <key>import</key> - <value>import math, os</value> + <key>ant1</key> + <value></value> </param> <param> - <key>_coordinate</key> - <value>(9, 106)</value> + <key>bw1</key> + <value>0</value> </param> <param> - <key>_rotation</key> + <key>center_freq2</key> <value>0</value> </param> - </block> - <block> - <key>variable</key> <param> - <key>id</key> - <value>config_filename</value> + <key>gain2</key> + <value>0</value> </param> <param> - <key>_enabled</key> - <value>True</value> + <key>ant2</key> + <value></value> </param> <param> - <key>value</key> - <value>os.environ['HOME']+'/.gnuradio/config.conf'</value> + <key>bw2</key> + <value>0</value> </param> <param> - <key>_coordinate</key> - <value>(13, 168)</value> + <key>center_freq3</key> + <value>0</value> </param> <param> - <key>_rotation</key> + <key>gain3</key> <value>0</value> </param> - </block> - <block> - <key>variable_config</key> <param> - <key>id</key> - <value>output_filename</value> + <key>ant3</key> + <value></value> </param> <param> - <key>_enabled</key> - <value>True</value> + <key>bw3</key> + <value>0</value> </param> <param> - <key>value</key> - <value>'frames.hrpt'</value> + <key>center_freq4</key> + <value>0</value> </param> <param> - <key>type</key> - <value>string</value> + <key>gain4</key> + <value>0</value> </param> <param> - <key>config_file</key> - <value>config_filename</value> + <key>ant4</key> + <value></value> </param> <param> - <key>section</key> - <value>'usrp_rx_hrpt'</value> + <key>bw4</key> + <value>0</value> </param> <param> - <key>option</key> - <value>'filename'</value> + <key>center_freq5</key> + <value>0</value> </param> <param> - <key>writeback</key> - <value>output_filename</value> + <key>gain5</key> + <value>0</value> </param> <param> - <key>_coordinate</key> - <value>(990, 255)</value> + <key>ant5</key> + <value></value> </param> <param> - <key>_rotation</key> + <key>bw5</key> <value>0</value> </param> - </block> - <block> - <key>variable_config</key> <param> - <key>id</key> - <value>saved_clock_alpha</value> + <key>center_freq6</key> + <value>0</value> </param> <param> - <key>_enabled</key> - <value>True</value> + <key>gain6</key> + <value>0</value> </param> <param> - <key>value</key> - <value>0.01</value> + <key>ant6</key> + <value></value> </param> <param> - <key>type</key> - <value>real</value> + <key>bw6</key> + <value>0</value> </param> <param> - <key>config_file</key> - <value>config_filename</value> + <key>center_freq7</key> + <value>0</value> </param> <param> - <key>section</key> - <value>'usrp_rx_hrpt'</value> + <key>gain7</key> + <value>0</value> </param> <param> - <key>option</key> - <value>'clock_alpha'</value> + <key>ant7</key> + <value></value> </param> <param> - <key>writeback</key> - <value>clock_alpha</value> + <key>bw7</key> + <value>0</value> </param> <param> - <key>_coordinate</key> - <value>(832, 254)</value> + <key>center_freq8</key> + <value>0</value> </param> <param> - <key>_rotation</key> + <key>gain8</key> <value>0</value> </param> - </block> - <block> - <key>variable_config</key> <param> - <key>id</key> - <value>saved_pll_alpha</value> + <key>ant8</key> + <value></value> </param> <param> - <key>_enabled</key> - <value>True</value> + <key>bw8</key> + <value>0</value> </param> <param> - <key>value</key> - <value>0.01</value> + <key>center_freq9</key> + <value>0</value> </param> <param> - <key>type</key> - <value>real</value> + <key>gain9</key> + <value>0</value> </param> <param> - <key>config_file</key> - <value>config_filename</value> + <key>ant9</key> + <value></value> </param> <param> - <key>section</key> - <value>'usrp_rx_hrpt'</value> + <key>bw9</key> + <value>0</value> </param> <param> - <key>option</key> - <value>'pll_alpha'</value> + <key>center_freq10</key> + <value>0</value> </param> <param> - <key>writeback</key> - <value>pll_alpha</value> + <key>gain10</key> + <value>0</value> </param> <param> - <key>_coordinate</key> - <value>(674, 254)</value> + <key>ant10</key> + <value></value> </param> <param> - <key>_rotation</key> + <key>bw10</key> <value>0</value> </param> - </block> - <block> - <key>variable_config</key> <param> - <key>id</key> - <value>saved_gain</value> + <key>center_freq11</key> + <value>0</value> </param> <param> - <key>_enabled</key> - <value>True</value> + <key>gain11</key> + <value>0</value> </param> <param> - <key>value</key> - <value>35</value> + <key>ant11</key> + <value></value> </param> <param> - <key>type</key> - <value>real</value> + <key>bw11</key> + <value>0</value> </param> <param> - <key>config_file</key> - <value>config_filename</value> + <key>center_freq12</key> + <value>0</value> </param> <param> - <key>section</key> - <value>'usrp_rx_hrpt'</value> + <key>gain12</key> + <value>0</value> </param> <param> - <key>option</key> - <value>'gain'</value> + <key>ant12</key> + <value></value> </param> <param> - <key>writeback</key> - <value>gain</value> + <key>bw12</key> + <value>0</value> </param> <param> - <key>_coordinate</key> - <value>(515, 255)</value> + <key>center_freq13</key> + <value>0</value> </param> <param> - <key>_rotation</key> + <key>gain13</key> <value>0</value> </param> - </block> - <block> - <key>variable_config</key> <param> - <key>id</key> - <value>saved_freq</value> + <key>ant13</key> + <value></value> </param> <param> - <key>_enabled</key> - <value>True</value> + <key>bw13</key> + <value>0</value> </param> <param> - <key>value</key> - <value>1698e6</value> + <key>center_freq14</key> + <value>0</value> </param> <param> - <key>type</key> - <value>real</value> + <key>gain14</key> + <value>0</value> </param> <param> - <key>config_file</key> - <value>config_filename</value> + <key>ant14</key> + <value></value> </param> <param> - <key>section</key> - <value>'usrp_rx_hrpt'</value> + <key>bw14</key> + <value>0</value> </param> <param> - <key>option</key> - <value>'freq'</value> + <key>center_freq15</key> + <value>0</value> </param> <param> - <key>writeback</key> - <value>freq</value> + <key>gain15</key> + <value>0</value> </param> <param> - <key>_coordinate</key> - <value>(358, 254)</value> + <key>ant15</key> + <value></value> </param> <param> - <key>_rotation</key> + <key>bw15</key> <value>0</value> </param> - </block> - <block> - <key>variable</key> <param> - <key>id</key> - <value>sample_rate</value> + <key>center_freq16</key> + <value>0</value> </param> <param> - <key>_enabled</key> - <value>True</value> + <key>gain16</key> + <value>0</value> </param> <param> - <key>value</key> - <value>4e6</value> + <key>ant16</key> + <value></value> </param> <param> - <key>_coordinate</key> - <value>(198, 17)</value> + <key>bw16</key> + <value>0</value> </param> <param> - <key>_rotation</key> + <key>center_freq17</key> <value>0</value> </param> - </block> - <block> - <key>wxgui_scopesink2</key> <param> - <key>id</key> - <value>demod_scope</value> + <key>gain17</key> + <value>0</value> </param> <param> - <key>_enabled</key> - <value>True</value> + <key>ant17</key> + <value></value> </param> <param> - <key>type</key> - <value>float</value> + <key>bw17</key> + <value>0</value> </param> <param> - <key>title</key> - <value>Post-Demod</value> + <key>center_freq18</key> + <value>0</value> </param> <param> - <key>samp_rate</key> - <value>sym_rate*2.0</value> + <key>gain18</key> + <value>0</value> </param> <param> - <key>v_scale</key> - <value>0.5</value> + <key>ant18</key> + <value></value> </param> <param> - <key>v_offset</key> + <key>bw18</key> <value>0</value> </param> <param> - <key>t_scale</key> - <value>10.0/sym_rate</value> + <key>center_freq19</key> + <value>0</value> </param> <param> - <key>ac_couple</key> - <value>False</value> + <key>gain19</key> + <value>0</value> </param> <param> - <key>xy_mode</key> - <value>False</value> + <key>ant19</key> + <value></value> </param> <param> - <key>num_inputs</key> - <value>1</value> + <key>bw19</key> + <value>0</value> </param> <param> - <key>win_size</key> + <key>center_freq20</key> + <value>0</value> + </param> + <param> + <key>gain20</key> + <value>0</value> + </param> + <param> + <key>ant20</key> <value></value> </param> <param> - <key>grid_pos</key> - <value>0, 0, 1, 1</value> + <key>bw20</key> + <value>0</value> </param> <param> - <key>notebook</key> - <value>displays, 1</value> + <key>center_freq21</key> + <value>0</value> </param> <param> - <key>trig_mode</key> - <value>wxgui.TRIG_MODE_AUTO</value> + <key>gain21</key> + <value>0</value> </param> <param> - <key>y_axis_label</key> - <value>Counts</value> + <key>ant21</key> + <value></value> </param> <param> - <key>_coordinate</key> - <value>(666, 542)</value> + <key>bw21</key> + <value>0</value> </param> <param> - <key>_rotation</key> - <value>180</value> + <key>center_freq22</key> + <value>0</value> </param> - </block> - <block> - <key>blocks_moving_average_xx</key> <param> - <key>id</key> - <value>blocks_moving_average_xx_0</value> + <key>gain22</key> + <value>0</value> </param> <param> - <key>_enabled</key> - <value>True</value> + <key>ant22</key> + <value></value> </param> <param> - <key>type</key> - <value>float</value> + <key>bw22</key> + <value>0</value> </param> <param> - <key>length</key> - <value>hs</value> + <key>center_freq23</key> + <value>0</value> </param> <param> - <key>scale</key> - <value>1.0/hs</value> + <key>gain23</key> + <value>0</value> </param> <param> - <key>max_iter</key> - <value>4000</value> + <key>ant23</key> + <value></value> </param> <param> - <key>_coordinate</key> - <value>(682, 713)</value> + <key>bw23</key> + <value>0</value> </param> <param> - <key>_rotation</key> + <key>center_freq24</key> <value>0</value> </param> - </block> - <block> - <key>virtual_sink</key> <param> - <key>id</key> - <value>virtual_sink_0</value> + <key>gain24</key> + <value>0</value> </param> <param> - <key>_enabled</key> - <value>True</value> + <key>ant24</key> + <value></value> </param> <param> - <key>stream_id</key> - <value>baseband</value> + <key>bw24</key> + <value>0</value> </param> <param> - <key>_coordinate</key> - <value>(1138, 729)</value> + <key>center_freq25</key> + <value>0</value> </param> <param> - <key>_rotation</key> + <key>gain25</key> <value>0</value> </param> - </block> - <block> - <key>digital_clock_recovery_mm_xx</key> <param> - <key>id</key> - <value>digital_clock_recovery_mm_xx_0</value> + <key>ant25</key> + <value></value> </param> <param> - <key>_enabled</key> - <value>True</value> + <key>bw25</key> + <value>0</value> </param> <param> - <key>type</key> - <value>float</value> + <key>center_freq26</key> + <value>0</value> </param> <param> - <key>omega</key> - <value>sps/2.0</value> + <key>gain26</key> + <value>0</value> </param> <param> - <key>gain_omega</key> - <value>clock_alpha**2/4.0</value> + <key>ant26</key> + <value></value> </param> <param> - <key>mu</key> - <value>0.5</value> + <key>bw26</key> + <value>0</value> </param> <param> - <key>gain_mu</key> - <value>clock_alpha</value> + <key>center_freq27</key> + <value>0</value> </param> <param> - <key>omega_relative_limit</key> - <value>max_clock_offset</value> + <key>gain27</key> + <value>0</value> </param> <param> - <key>_coordinate</key> - <value>(896, 697)</value> + <key>ant27</key> + <value></value> </param> <param> - <key>_rotation</key> + <key>bw27</key> <value>0</value> </param> - </block> - <block> - <key>virtual_source</key> <param> - <key>id</key> - <value>virtual_source_0</value> + <key>center_freq28</key> + <value>0</value> </param> <param> - <key>_enabled</key> - <value>True</value> + <key>gain28</key> + <value>0</value> </param> <param> - <key>stream_id</key> - <value>baseband</value> + <key>ant28</key> + <value></value> </param> <param> - <key>_coordinate</key> - <value>(173, 971)</value> + <key>bw28</key> + <value>0</value> </param> <param> - <key>_rotation</key> + <key>center_freq29</key> <value>0</value> </param> - </block> - <block> - <key>digital_binary_slicer_fb</key> <param> - <key>id</key> - <value>digital_binary_slicer_fb_0</value> + <key>gain29</key> + <value>0</value> </param> <param> - <key>_enabled</key> - <value>True</value> + <key>ant29</key> + <value></value> </param> <param> - <key>_coordinate</key> - <value>(423, 975)</value> + <key>bw29</key> + <value>0</value> </param> <param> - <key>_rotation</key> + <key>center_freq30</key> <value>0</value> </param> - </block> - <block> - <key>noaa_hrpt_deframer</key> <param> - <key>id</key> - <value>deframer</value> + <key>gain30</key> + <value>0</value> </param> <param> - <key>_enabled</key> - <value>True</value> + <key>ant30</key> + <value></value> </param> <param> - <key>_coordinate</key> - <value>(762, 975)</value> + <key>bw30</key> + <value>0</value> </param> <param> - <key>_rotation</key> + <key>center_freq31</key> <value>0</value> </param> - </block> - <block> - <key>noaa_hrpt_decoder</key> <param> - <key>id</key> - <value>decoder</value> + <key>gain31</key> + <value>0</value> </param> <param> - <key>_enabled</key> - <value>True</value> + <key>ant31</key> + <value></value> </param> <param> - <key>verbose</key> - <value>True</value> + <key>bw31</key> + <value>0</value> </param> <param> - <key>output</key> - <value>True</value> + <key>alias</key> + <value></value> + </param> + <param> + <key>affinity</key> + <value></value> + </param> + <param> + <key>minoutbuf</key> + <value>0</value> + </param> + <param> + <key>maxoutbuf</key> + <value>0</value> </param> <param> <key>_coordinate</key> - <value>(974, 925)</value> + <value>(49, 713)</value> </param> <param> <key>_rotation</key> @@ -1872,34 +2144,54 @@ </param> </block> <block> - <key>blocks_file_sink</key> + <key>analog_agc_xx</key> <param> <key>id</key> - <value>frame_sink</value> + <value>analog_agc_xx_0</value> </param> <param> <key>_enabled</key> <value>True</value> </param> <param> - <key>file</key> - <value>output_filename</value> + <key>type</key> + <value>complex</value> </param> <param> - <key>type</key> - <value>short</value> + <key>rate</key> + <value>1e-6</value> </param> <param> - <key>vlen</key> - <value>1</value> + <key>reference</key> + <value>1.0</value> </param> <param> - <key>unbuffered</key> - <value>False</value> + <key>gain</key> + <value>1.0</value> + </param> + <param> + <key>max_gain</key> + <value>65536</value> + </param> + <param> + <key>alias</key> + <value></value> + </param> + <param> + <key>affinity</key> + <value></value> + </param> + <param> + <key>minoutbuf</key> + <value>0</value> + </param> + <param> + <key>maxoutbuf</key> + <value>0</value> </param> <param> <key>_coordinate</key> - <value>(973, 1024)</value> + <value>(276, 705)</value> </param> <param> <key>_rotation</key> @@ -1919,24 +2211,6 @@ <sink_key>0</sink_key> </connection> <connection> - <source_block_id>agc</source_block_id> - <sink_block_id>pll</sink_block_id> - <source_key>0</source_key> - <sink_key>0</sink_key> - </connection> - <connection> - <source_block_id>agc</source_block_id> - <sink_block_id>rx_fft</sink_block_id> - <source_key>0</source_key> - <sink_key>0</sink_key> - </connection> - <connection> - <source_block_id>uhd_usrp_source_0</source_block_id> - <sink_block_id>agc</sink_block_id> - <source_key>0</source_key> - <sink_key>0</sink_key> - </connection> - <connection> <source_block_id>pll</source_block_id> <sink_block_id>blocks_moving_average_xx_0</sink_block_id> <source_key>0</source_key> @@ -1972,4 +2246,22 @@ <source_key>0</source_key> <sink_key>0</sink_key> </connection> + <connection> + <source_block_id>analog_agc_xx_0</source_block_id> + <sink_block_id>rx_fft</sink_block_id> + <source_key>0</source_key> + <sink_key>0</sink_key> + </connection> + <connection> + <source_block_id>analog_agc_xx_0</source_block_id> + <sink_block_id>pll</sink_block_id> + <source_key>0</source_key> + <sink_key>0</sink_key> + </connection> + <connection> + <source_block_id>uhd_usrp_source_0</source_block_id> + <sink_block_id>analog_agc_xx_0</sink_block_id> + <source_key>0</source_key> + <sink_key>0</sink_key> + </connection> </flow_graph> diff --git a/gr-noaa/examples/usrp_rx_hrpt_nogui.grc b/gr-noaa/examples/usrp_rx_hrpt_nogui.grc index 3594ca035f..f8722fa61c 100644 --- a/gr-noaa/examples/usrp_rx_hrpt_nogui.grc +++ b/gr-noaa/examples/usrp_rx_hrpt_nogui.grc @@ -1,6 +1,6 @@ <?xml version='1.0' encoding='ASCII'?> <flow_graph> - <timestamp>Thu Oct 27 13:48:57 2011</timestamp> + <timestamp>Sat Jul 12 11:20:19 2014</timestamp> <block> <key>options</key> <param> @@ -44,10 +44,18 @@ <value>True</value> </param> <param> + <key>max_nouts</key> + <value>0</value> + </param> + <param> <key>realtime_scheduling</key> <value></value> </param> <param> + <key>alias</key> + <value></value> + </param> + <param> <key>_coordinate</key> <value>(10, 10)</value> </param> @@ -60,7 +68,7 @@ <key>variable</key> <param> <key>id</key> - <value>max_carrier_offset</value> + <value>sample_rate</value> </param> <param> <key>_enabled</key> @@ -68,11 +76,15 @@ </param> <param> <key>value</key> - <value>2*math.pi*100e3/sample_rate</value> + <value>4e6</value> + </param> + <param> + <key>alias</key> + <value></value> </param> <param> <key>_coordinate</key> - <value>(575, 19)</value> + <value>(198, 17)</value> </param> <param> <key>_rotation</key> @@ -83,7 +95,7 @@ <key>variable</key> <param> <key>id</key> - <value>sym_rate</value> + <value>config_filename</value> </param> <param> <key>_enabled</key> @@ -91,11 +103,15 @@ </param> <param> <key>value</key> - <value>600*1109</value> + <value>os.environ['HOME']+'/.gnuradio/config.conf'</value> + </param> + <param> + <key>alias</key> + <value></value> </param> <param> <key>_coordinate</key> - <value>(301, 19)</value> + <value>(13, 168)</value> </param> <param> <key>_rotation</key> @@ -106,7 +122,7 @@ <key>variable</key> <param> <key>id</key> - <value>sps</value> + <value>max_clock_offset</value> </param> <param> <key>_enabled</key> @@ -114,11 +130,15 @@ </param> <param> <key>value</key> - <value>sample_rate/sym_rate</value> + <value>100e-6</value> + </param> + <param> + <key>alias</key> + <value></value> </param> <param> <key>_coordinate</key> - <value>(397, 19)</value> + <value>(705, 19)</value> </param> <param> <key>_rotation</key> @@ -140,6 +160,10 @@ <value>int(sps/2.0)</value> </param> <param> + <key>alias</key> + <value></value> + </param> + <param> <key>_coordinate</key> <value>(499, 19)</value> </param> @@ -152,7 +176,7 @@ <key>variable</key> <param> <key>id</key> - <value>max_clock_offset</value> + <value>sps</value> </param> <param> <key>_enabled</key> @@ -160,11 +184,15 @@ </param> <param> <key>value</key> - <value>100e-6</value> + <value>sample_rate/sym_rate</value> + </param> + <param> + <key>alias</key> + <value></value> </param> <param> <key>_coordinate</key> - <value>(705, 19)</value> + <value>(397, 19)</value> </param> <param> <key>_rotation</key> @@ -172,22 +200,26 @@ </param> </block> <block> - <key>import</key> + <key>variable</key> <param> <key>id</key> - <value>import_0</value> + <value>sym_rate</value> </param> <param> <key>_enabled</key> <value>True</value> </param> <param> - <key>import</key> - <value>import math, os</value> + <key>value</key> + <value>600*1109</value> + </param> + <param> + <key>alias</key> + <value></value> </param> <param> <key>_coordinate</key> - <value>(9, 106)</value> + <value>(301, 19)</value> </param> <param> <key>_rotation</key> @@ -198,7 +230,7 @@ <key>variable</key> <param> <key>id</key> - <value>config_filename</value> + <value>max_carrier_offset</value> </param> <param> <key>_enabled</key> @@ -206,11 +238,15 @@ </param> <param> <key>value</key> - <value>os.environ['HOME']+'/.gnuradio/config.conf'</value> + <value>2*math.pi*100e3/sample_rate</value> + </param> + <param> + <key>alias</key> + <value></value> </param> <param> <key>_coordinate</key> - <value>(13, 168)</value> + <value>(575, 19)</value> </param> <param> <key>_rotation</key> @@ -218,22 +254,26 @@ </param> </block> <block> - <key>variable</key> + <key>import</key> <param> <key>id</key> - <value>sample_rate</value> + <value>import_0</value> </param> <param> <key>_enabled</key> <value>True</value> </param> <param> - <key>value</key> - <value>4e6</value> + <key>import</key> + <value>import math, os</value> + </param> + <param> + <key>alias</key> + <value></value> </param> <param> <key>_coordinate</key> - <value>(198, 17)</value> + <value>(9, 106)</value> </param> <param> <key>_rotation</key> @@ -275,6 +315,10 @@ <value>clock_alpha</value> </param> <param> + <key>alias</key> + <value></value> + </param> + <param> <key>_coordinate</key> <value>(833, 104)</value> </param> @@ -318,6 +362,10 @@ <value>pll_alpha</value> </param> <param> + <key>alias</key> + <value></value> + </param> + <param> <key>_coordinate</key> <value>(675, 104)</value> </param> @@ -361,6 +409,10 @@ <value>gain</value> </param> <param> + <key>alias</key> + <value></value> + </param> + <param> <key>_coordinate</key> <value>(516, 105)</value> </param> @@ -404,6 +456,10 @@ <value>freq</value> </param> <param> + <key>alias</key> + <value></value> + </param> + <param> <key>_coordinate</key> <value>(359, 104)</value> </param> @@ -447,6 +503,10 @@ <value>output_filename</value> </param> <param> + <key>alias</key> + <value></value> + </param> + <param> <key>_coordinate</key> <value>(991, 105)</value> </param> @@ -490,6 +550,22 @@ <value>max_clock_offset</value> </param> <param> + <key>alias</key> + <value></value> + </param> + <param> + <key>affinity</key> + <value></value> + </param> + <param> + <key>minoutbuf</key> + <value>0</value> + </param> + <param> + <key>maxoutbuf</key> + <value>0</value> + </param> + <param> <key>_coordinate</key> <value>(897, 341)</value> </param> @@ -522,6 +598,279 @@ </param> </block> <block> + <key>blocks_moving_average_xx</key> + <param> + <key>id</key> + <value>blocks_moving_average_xx_0</value> + </param> + <param> + <key>_enabled</key> + <value>True</value> + </param> + <param> + <key>type</key> + <value>float</value> + </param> + <param> + <key>length</key> + <value>hs</value> + </param> + <param> + <key>scale</key> + <value>1.0/hs</value> + </param> + <param> + <key>max_iter</key> + <value>4000</value> + </param> + <param> + <key>alias</key> + <value></value> + </param> + <param> + <key>affinity</key> + <value></value> + </param> + <param> + <key>minoutbuf</key> + <value>0</value> + </param> + <param> + <key>maxoutbuf</key> + <value>0</value> + </param> + <param> + <key>_coordinate</key> + <value>(683, 357)</value> + </param> + <param> + <key>_rotation</key> + <value>0</value> + </param> + </block> + <block> + <key>blocks_file_sink</key> + <param> + <key>id</key> + <value>frame_sink</value> + </param> + <param> + <key>_enabled</key> + <value>True</value> + </param> + <param> + <key>file</key> + <value>output_filename</value> + </param> + <param> + <key>type</key> + <value>short</value> + </param> + <param> + <key>vlen</key> + <value>1</value> + </param> + <param> + <key>unbuffered</key> + <value>False</value> + </param> + <param> + <key>append</key> + <value>False</value> + </param> + <param> + <key>alias</key> + <value></value> + </param> + <param> + <key>affinity</key> + <value></value> + </param> + <param> + <key>_coordinate</key> + <value>(809, 595)</value> + </param> + <param> + <key>_rotation</key> + <value>0</value> + </param> + </block> + <block> + <key>noaa_hrpt_deframer</key> + <param> + <key>id</key> + <value>deframer</value> + </param> + <param> + <key>_enabled</key> + <value>True</value> + </param> + <param> + <key>alias</key> + <value></value> + </param> + <param> + <key>affinity</key> + <value></value> + </param> + <param> + <key>minoutbuf</key> + <value>0</value> + </param> + <param> + <key>maxoutbuf</key> + <value>0</value> + </param> + <param> + <key>_coordinate</key> + <value>(598, 546)</value> + </param> + <param> + <key>_rotation</key> + <value>0</value> + </param> + </block> + <block> + <key>digital_binary_slicer_fb</key> + <param> + <key>id</key> + <value>digital_binary_slicer_fb_0</value> + </param> + <param> + <key>_enabled</key> + <value>True</value> + </param> + <param> + <key>alias</key> + <value></value> + </param> + <param> + <key>affinity</key> + <value></value> + </param> + <param> + <key>minoutbuf</key> + <value>0</value> + </param> + <param> + <key>maxoutbuf</key> + <value>0</value> + </param> + <param> + <key>_coordinate</key> + <value>(259, 546)</value> + </param> + <param> + <key>_rotation</key> + <value>0</value> + </param> + </block> + <block> + <key>virtual_source</key> + <param> + <key>id</key> + <value>virtual_source_0</value> + </param> + <param> + <key>_enabled</key> + <value>True</value> + </param> + <param> + <key>stream_id</key> + <value>baseband</value> + </param> + <param> + <key>_coordinate</key> + <value>(40, 542)</value> + </param> + <param> + <key>_rotation</key> + <value>0</value> + </param> + </block> + <block> + <key>noaa_hrpt_decoder</key> + <param> + <key>id</key> + <value>decoder</value> + </param> + <param> + <key>_enabled</key> + <value>True</value> + </param> + <param> + <key>verbose</key> + <value>True</value> + </param> + <param> + <key>output</key> + <value>True</value> + </param> + <param> + <key>alias</key> + <value></value> + </param> + <param> + <key>affinity</key> + <value></value> + </param> + <param> + <key>_coordinate</key> + <value>(810, 496)</value> + </param> + <param> + <key>_rotation</key> + <value>0</value> + </param> + </block> + <block> + <key>variable_config</key> + <param> + <key>id</key> + <value>addr</value> + </param> + <param> + <key>_enabled</key> + <value>True</value> + </param> + <param> + <key>value</key> + <value>""</value> + </param> + <param> + <key>type</key> + <value>string</value> + </param> + <param> + <key>config_file</key> + <value>config_filename</value> + </param> + <param> + <key>section</key> + <value>'usrp_rx_hrpt'</value> + </param> + <param> + <key>option</key> + <value>'addr'</value> + </param> + <param> + <key>writeback</key> + <value>addr</value> + </param> + <param> + <key>alias</key> + <value></value> + </param> + <param> + <key>_coordinate</key> + <value>(195, 103)</value> + </param> + <param> + <key>_rotation</key> + <value>0</value> + </param> + </block> + <block> <key>uhd_usrp_source</key> <param> <key>id</key> @@ -533,13 +882,29 @@ </param> <param> <key>type</key> - <value>complex</value> + <value>fc32</value> + </param> + <param> + <key>otw</key> + <value></value> + </param> + <param> + <key>stream_args</key> + <value></value> + </param> + <param> + <key>stream_chans</key> + <value>[]</value> </param> <param> <key>dev_addr</key> <value>addr</value> </param> <param> + <key>dev_args</key> + <value>""</value> + </param> + <param> <key>sync</key> <value></value> </param> @@ -552,7 +917,11 @@ <value>1</value> </param> <param> - <key>ref_source0</key> + <key>clock_source0</key> + <value></value> + </param> + <param> + <key>time_source0</key> <value></value> </param> <param> @@ -560,7 +929,11 @@ <value></value> </param> <param> - <key>ref_source1</key> + <key>clock_source1</key> + <value></value> + </param> + <param> + <key>time_source1</key> <value></value> </param> <param> @@ -568,7 +941,11 @@ <value></value> </param> <param> - <key>ref_source2</key> + <key>clock_source2</key> + <value></value> + </param> + <param> + <key>time_source2</key> <value></value> </param> <param> @@ -576,7 +953,11 @@ <value></value> </param> <param> - <key>ref_source3</key> + <key>clock_source3</key> + <value></value> + </param> + <param> + <key>time_source3</key> <value></value> </param> <param> @@ -584,7 +965,11 @@ <value></value> </param> <param> - <key>ref_source4</key> + <key>clock_source4</key> + <value></value> + </param> + <param> + <key>time_source4</key> <value></value> </param> <param> @@ -592,7 +977,11 @@ <value></value> </param> <param> - <key>ref_source5</key> + <key>clock_source5</key> + <value></value> + </param> + <param> + <key>time_source5</key> <value></value> </param> <param> @@ -600,7 +989,11 @@ <value></value> </param> <param> - <key>ref_source6</key> + <key>clock_source6</key> + <value></value> + </param> + <param> + <key>time_source6</key> <value></value> </param> <param> @@ -608,7 +1001,11 @@ <value></value> </param> <param> - <key>ref_source7</key> + <key>clock_source7</key> + <value></value> + </param> + <param> + <key>time_source7</key> <value></value> </param> <param> @@ -1136,113 +1533,24 @@ <value>0</value> </param> <param> - <key>_coordinate</key> - <value>(50, 357)</value> - </param> - <param> - <key>_rotation</key> - <value>0</value> - </param> - </block> - <block> - <key>noaa_hrpt_pll_cf</key> - <param> - <key>id</key> - <value>pll</value> - </param> - <param> - <key>_enabled</key> - <value>True</value> - </param> - <param> - <key>alpha</key> - <value>pll_alpha</value> - </param> - <param> - <key>beta</key> - <value>pll_alpha**2/4.0</value> - </param> - <param> - <key>max_offset</key> - <value>max_carrier_offset</value> + <key>alias</key> + <value></value> </param> <param> - <key>_coordinate</key> - <value>(470, 357)</value> + <key>affinity</key> + <value></value> </param> <param> - <key>_rotation</key> + <key>minoutbuf</key> <value>0</value> </param> - </block> - <block> - <key>gr_agc_xx</key> - <param> - <key>id</key> - <value>agc</value> - </param> <param> - <key>_enabled</key> - <value>True</value> - </param> - <param> - <key>type</key> - <value>complex</value> - </param> - <param> - <key>rate</key> - <value>1e-6</value> - </param> - <param> - <key>reference</key> - <value>1.0</value> - </param> - <param> - <key>gain</key> - <value>1.0</value> - </param> - <param> - <key>max_gain</key> - <value>1.0</value> - </param> - <param> - <key>_coordinate</key> - <value>(302, 349)</value> - </param> - <param> - <key>_rotation</key> + <key>maxoutbuf</key> <value>0</value> </param> - </block> - <block> - <key>blocks_moving_average_xx</key> - <param> - <key>id</key> - <value>blocks_moving_average_xx_0</value> - </param> - <param> - <key>_enabled</key> - <value>True</value> - </param> - <param> - <key>type</key> - <value>float</value> - </param> - <param> - <key>length</key> - <value>hs</value> - </param> - <param> - <key>scale</key> - <value>1.0/hs</value> - </param> - <param> - <key>max_iter</key> - <value>4000</value> - </param> <param> <key>_coordinate</key> - <value>(683, 357)</value> + <value>(50, 357)</value> </param> <param> <key>_rotation</key> @@ -1250,72 +1558,46 @@ </param> </block> <block> - <key>blocks_file_sink</key> + <key>noaa_hrpt_pll_cf</key> <param> <key>id</key> - <value>frame_sink</value> + <value>pll</value> </param> <param> <key>_enabled</key> <value>True</value> </param> <param> - <key>file</key> - <value>output_filename</value> + <key>alpha</key> + <value>pll_alpha</value> </param> <param> - <key>type</key> - <value>short</value> + <key>beta</key> + <value>pll_alpha**2/4.0</value> </param> <param> - <key>vlen</key> - <value>1</value> + <key>max_offset</key> + <value>max_carrier_offset</value> </param> <param> - <key>unbuffered</key> - <value>False</value> + <key>alias</key> + <value></value> </param> <param> - <key>_coordinate</key> - <value>(809, 595)</value> + <key>affinity</key> + <value></value> </param> <param> - <key>_rotation</key> + <key>minoutbuf</key> <value>0</value> </param> - </block> - <block> - <key>noaa_hrpt_deframer</key> - <param> - <key>id</key> - <value>deframer</value> - </param> - <param> - <key>_enabled</key> - <value>True</value> - </param> - <param> - <key>_coordinate</key> - <value>(598, 546)</value> - </param> <param> - <key>_rotation</key> + <key>maxoutbuf</key> <value>0</value> </param> - </block> - <block> - <key>digital_binary_slicer_fb</key> - <param> - <key>id</key> - <value>digital_binary_slicer_fb_0</value> - </param> - <param> - <key>_enabled</key> - <value>True</value> - </param> <param> <key>_coordinate</key> - <value>(259, 546)</value> + <value>(470, 357)</value> </param> <param> <key>_rotation</key> @@ -1323,92 +1605,54 @@ </param> </block> <block> - <key>virtual_source</key> + <key>analog_agc_xx</key> <param> <key>id</key> - <value>virtual_source_0</value> + <value>analog_agc_xx_0</value> </param> <param> <key>_enabled</key> <value>True</value> </param> <param> - <key>stream_id</key> - <value>baseband</value> - </param> - <param> - <key>_coordinate</key> - <value>(40, 542)</value> + <key>type</key> + <value>complex</value> </param> <param> - <key>_rotation</key> - <value>0</value> + <key>rate</key> + <value>1e-6</value> </param> - </block> - <block> - <key>noaa_hrpt_decoder</key> <param> - <key>id</key> - <value>decoder</value> + <key>reference</key> + <value>1.0</value> </param> <param> - <key>_enabled</key> - <value>True</value> + <key>gain</key> + <value>1.0</value> </param> <param> - <key>verbose</key> - <value>True</value> + <key>max_gain</key> + <value>65536</value> </param> <param> - <key>output</key> - <value>True</value> + <key>alias</key> + <value></value> </param> <param> - <key>_coordinate</key> - <value>(810, 496)</value> + <key>affinity</key> + <value></value> </param> <param> - <key>_rotation</key> + <key>minoutbuf</key> <value>0</value> </param> - </block> - <block> - <key>variable_config</key> - <param> - <key>id</key> - <value>addr</value> - </param> - <param> - <key>_enabled</key> - <value>True</value> - </param> <param> - <key>value</key> - <value>""</value> - </param> - <param> - <key>type</key> - <value>string</value> - </param> - <param> - <key>config_file</key> - <value>config_filename</value> - </param> - <param> - <key>section</key> - <value>'usrp_rx_hrpt'</value> - </param> - <param> - <key>option</key> - <value>'addr'</value> - </param> - <param> - <key>writeback</key> - <value>addr</value> + <key>maxoutbuf</key> + <value>0</value> </param> <param> <key>_coordinate</key> - <value>(195, 103)</value> + <value>(286, 349)</value> </param> <param> <key>_rotation</key> @@ -1434,18 +1678,6 @@ <sink_key>0</sink_key> </connection> <connection> - <source_block_id>uhd_usrp_source_0</source_block_id> - <sink_block_id>agc</sink_block_id> - <source_key>0</source_key> - <sink_key>0</sink_key> - </connection> - <connection> - <source_block_id>agc</source_block_id> - <sink_block_id>pll</sink_block_id> - <source_key>0</source_key> - <sink_key>0</sink_key> - </connection> - <connection> <source_block_id>digital_binary_slicer_fb_0</source_block_id> <sink_block_id>deframer</sink_block_id> <source_key>0</source_key> @@ -1469,4 +1701,16 @@ <source_key>0</source_key> <sink_key>0</sink_key> </connection> + <connection> + <source_block_id>uhd_usrp_source_0</source_block_id> + <sink_block_id>analog_agc_xx_0</sink_block_id> + <source_key>0</source_key> + <sink_key>0</sink_key> + </connection> + <connection> + <source_block_id>analog_agc_xx_0</source_block_id> + <sink_block_id>pll</sink_block_id> + <source_key>0</source_key> + <sink_key>0</sink_key> + </connection> </flow_graph> diff --git a/gr-pager/apps/usrp_rx_flex.grc b/gr-pager/apps/usrp_rx_flex.grc index b6833aa526..e806f0df9d 100644 --- a/gr-pager/apps/usrp_rx_flex.grc +++ b/gr-pager/apps/usrp_rx_flex.grc @@ -1,6 +1,6 @@ <?xml version='1.0' encoding='ASCII'?> <flow_graph> - <timestamp>Thu Oct 29 11:01:22 2009</timestamp> + <timestamp>Sat Jul 12 11:24:07 2014</timestamp> <block> <key>options</key> <param> @@ -44,10 +44,18 @@ <value>True</value> </param> <param> + <key>max_nouts</key> + <value>0</value> + </param> + <param> <key>realtime_scheduling</key> <value></value> </param> <param> + <key>alias</key> + <value></value> + </param> + <param> <key>_coordinate</key> <value>(10, 10)</value> </param> @@ -60,7 +68,7 @@ <key>variable</key> <param> <key>id</key> - <value>adc_rate</value> + <value>bb_decim</value> </param> <param> <key>_enabled</key> @@ -68,11 +76,15 @@ </param> <param> <key>value</key> - <value>64e6</value> + <value>8</value> + </param> + <param> + <key>alias</key> + <value></value> </param> <param> <key>_coordinate</key> - <value>(225, 12)</value> + <value>(1027, 864)</value> </param> <param> <key>_rotation</key> @@ -83,7 +95,7 @@ <key>variable</key> <param> <key>id</key> - <value>sample_rate</value> + <value>bb_interp</value> </param> <param> <key>_enabled</key> @@ -91,11 +103,15 @@ </param> <param> <key>value</key> - <value>adc_rate/decim</value> + <value>5</value> + </param> + <param> + <key>alias</key> + <value></value> </param> <param> <key>_coordinate</key> - <value>(382, 12)</value> + <value>(938, 862)</value> </param> <param> <key>_rotation</key> @@ -106,7 +122,7 @@ <key>variable</key> <param> <key>id</key> - <value>freq</value> + <value>ma_ntaps</value> </param> <param> <key>_enabled</key> @@ -114,11 +130,15 @@ </param> <param> <key>value</key> - <value>band_freq+(channel-61)*25e3</value> + <value>int(channel_rate/symbol_rate)</value> + </param> + <param> + <key>alias</key> + <value></value> </param> <param> <key>_coordinate</key> - <value>(480, 11)</value> + <value>(850, 863)</value> </param> <param> <key>_rotation</key> @@ -126,121 +146,80 @@ </param> </block> <block> - <key>wxgui_fftsink2</key> + <key>variable</key> <param> <key>id</key> - <value>wxgui_fftsink2_0</value> + <value>nchan_taps</value> </param> <param> <key>_enabled</key> <value>True</value> </param> <param> - <key>type</key> - <value>complex</value> - </param> - <param> - <key>title</key> - <value>FLEX Spectrum</value> - </param> - <param> - <key>samp_rate</key> - <value>sample_rate</value> - </param> - <param> - <key>baseband_freq</key> - <value>band_freq</value> + <key>value</key> + <value>len(channel_taps)</value> </param> <param> - <key>y_per_div</key> - <value>10</value> + <key>alias</key> + <value></value> </param> <param> - <key>y_divs</key> - <value>10</value> + <key>_coordinate</key> + <value>(412, 931)</value> </param> <param> - <key>ref_level</key> + <key>_rotation</key> <value>0</value> </param> + </block> + <block> + <key>variable</key> <param> - <key>ref_scale</key> - <value>65536</value> - </param> - <param> - <key>fft_size</key> - <value>1024</value> - </param> - <param> - <key>fft_rate</key> - <value>30</value> - </param> - <param> - <key>peak_hold</key> - <value>False</value> - </param> - <param> - <key>average</key> - <value>False</value> + <key>id</key> + <value>baseband_rate</value> </param> <param> - <key>avg_alpha</key> - <value>0</value> + <key>_enabled</key> + <value>True</value> </param> <param> - <key>win</key> - <value>None</value> + <key>value</key> + <value>16000</value> </param> <param> - <key>win_size</key> + <key>alias</key> <value></value> </param> <param> - <key>grid_pos</key> - <value>0,0,1,1</value> - </param> - <param> - <key>notebook</key> - <value>displays,0</value> - </param> - <param> <key>_coordinate</key> - <value>(34, 508)</value> + <value>(1019, 17)</value> </param> <param> <key>_rotation</key> - <value>180</value> + <value>0</value> </param> </block> <block> - <key>notebook</key> + <key>variable</key> <param> <key>id</key> - <value>displays</value> + <value>channel_rate</value> </param> <param> <key>_enabled</key> <value>True</value> </param> <param> - <key>style</key> - <value>wx.NB_TOP</value> - </param> - <param> - <key>labels</key> - <value>['RX Spectrum','Baseband']</value> - </param> - <param> - <key>grid_pos</key> - <value>1, 0, 1, 5</value> + <key>value</key> + <value>8*3200</value> </param> <param> - <key>notebook</key> + <key>alias</key> <value></value> </param> <param> <key>_coordinate</key> - <value>(9, 209)</value> + <value>(792, 13)</value> </param> <param> <key>_rotation</key> @@ -248,22 +227,26 @@ </param> </block> <block> - <key>import</key> + <key>variable</key> <param> <key>id</key> - <value>import_0</value> + <value>passband</value> </param> <param> <key>_enabled</key> <value>True</value> </param> <param> - <key>import</key> - <value>import os, math</value> + <key>value</key> + <value>2*(deviation+symbol_rate)</value> + </param> + <param> + <key>alias</key> + <value></value> </param> <param> <key>_coordinate</key> - <value>(10, 76)</value> + <value>(327, 930)</value> </param> <param> <key>_rotation</key> @@ -271,58 +254,53 @@ </param> </block> <block> - <key>usrp_simple_source_x</key> + <key>variable</key> <param> <key>id</key> - <value>usrp_source</value> + <value>config_filename</value> </param> <param> <key>_enabled</key> <value>True</value> </param> <param> - <key>type</key> - <value>complex</value> + <key>value</key> + <value>os.environ["HOME"]+"/.gnuradio/config.conf"</value> </param> <param> - <key>format</key> + <key>alias</key> <value></value> </param> <param> - <key>which</key> - <value>0</value> - </param> - <param> - <key>decimation</key> - <value>decim</value> - </param> - <param> - <key>frequency</key> - <value>band_freq</value> + <key>_coordinate</key> + <value>(9, 133)</value> </param> <param> - <key>lo_offset</key> - <value>float('inf')</value> + <key>_rotation</key> + <value>0</value> </param> + </block> + <block> + <key>variable</key> <param> - <key>gain</key> - <value>rx_gain</value> + <key>id</key> + <value>channel_taps</value> </param> <param> - <key>side</key> - <value>A</value> + <key>_enabled</key> + <value>True</value> </param> <param> - <key>rx_ant</key> - <value>RXA</value> + <key>value</key> + <value>firdes.low_pass(10, sample_rate, passband/2.0, (channel_rate-passband)/2.0)</value> </param> <param> - <key>hb_filters</key> + <key>alias</key> <value></value> </param> <param> <key>_coordinate</key> - <value>(32, 734)</value> + <value>(325, 857)</value> </param> <param> <key>_rotation</key> @@ -330,38 +308,26 @@ </param> </block> <block> - <key>filter_freq_xlating_fir_filter_xxx</key> + <key>variable</key> <param> <key>id</key> - <value>filter_freq_xlating_fir_filter_xxx_0</value> + <value>demod_k</value> </param> <param> <key>_enabled</key> <value>True</value> </param> <param> - <key>type</key> - <value>ccc</value> - </param> - <param> - <key>decim</key> - <value>channel_decim</value> - </param> - <param> - <key>taps</key> - <value>channel_taps</value> - </param> - <param> - <key>center_freq</key> - <value>band_freq-freq+offset</value> + <key>value</key> + <value>3*channel_rate/(2*math.pi*deviation)</value> </param> <param> - <key>samp_rate</key> - <value>sample_rate</value> + <key>alias</key> + <value></value> </param> <param> <key>_coordinate</key> - <value>(321, 750)</value> + <value>(598, 857)</value> </param> <param> <key>_rotation</key> @@ -369,90 +335,84 @@ </param> </block> <block> - <key>wxgui_fftsink2</key> + <key>variable</key> <param> <key>id</key> - <value>wxgui_fftsink2_1</value> + <value>deviation</value> </param> <param> <key>_enabled</key> <value>True</value> </param> <param> - <key>type</key> - <value>complex</value> - </param> - <param> - <key>title</key> - <value>Channel Spectrum</value> - </param> - <param> - <key>samp_rate</key> - <value>channel_rate</value> - </param> - <param> - <key>baseband_freq</key> - <value>freq</value> + <key>value</key> + <value>4800</value> </param> <param> - <key>y_per_div</key> - <value>10</value> + <key>alias</key> + <value></value> </param> <param> - <key>y_divs</key> - <value>10</value> + <key>_coordinate</key> + <value>(688, 14)</value> </param> <param> - <key>ref_level</key> + <key>_rotation</key> <value>0</value> </param> + </block> + <block> + <key>variable</key> <param> - <key>ref_scale</key> - <value>65536</value> + <key>id</key> + <value>channel_decim</value> </param> <param> - <key>fft_size</key> - <value>1024</value> + <key>_enabled</key> + <value>True</value> </param> <param> - <key>fft_rate</key> - <value>30</value> + <key>value</key> + <value>int(sample_rate/channel_rate)</value> </param> <param> - <key>peak_hold</key> - <value>False</value> + <key>alias</key> + <value></value> </param> <param> - <key>average</key> - <value>False</value> + <key>_coordinate</key> + <value>(906, 12)</value> </param> <param> - <key>avg_alpha</key> + <key>_rotation</key> <value>0</value> </param> + </block> + <block> + <key>variable</key> <param> - <key>win</key> - <value>None</value> + <key>id</key> + <value>symbol_rate</value> </param> <param> - <key>win_size</key> - <value></value> + <key>_enabled</key> + <value>True</value> </param> <param> - <key>grid_pos</key> - <value>1, 0, 1, 1</value> + <key>value</key> + <value>3200</value> </param> <param> - <key>notebook</key> - <value>displays, 0</value> + <key>alias</key> + <value></value> </param> <param> <key>_coordinate</key> - <value>(344, 511)</value> + <value>(590, 12)</value> </param> <param> <key>_rotation</key> - <value>180</value> + <value>0</value> </param> </block> <block> @@ -470,6 +430,10 @@ <value>20</value> </param> <param> + <key>alias</key> + <value></value> + </param> + <param> <key>_coordinate</key> <value>(310, 11)</value> </param> @@ -482,7 +446,7 @@ <key>variable</key> <param> <key>id</key> - <value>symbol_rate</value> + <value>freq</value> </param> <param> <key>_enabled</key> @@ -490,11 +454,15 @@ </param> <param> <key>value</key> - <value>3200</value> + <value>band_freq+(channel-61)*25e3</value> + </param> + <param> + <key>alias</key> + <value></value> </param> <param> <key>_coordinate</key> - <value>(590, 12)</value> + <value>(480, 11)</value> </param> <param> <key>_rotation</key> @@ -505,7 +473,7 @@ <key>variable</key> <param> <key>id</key> - <value>channel_decim</value> + <value>sample_rate</value> </param> <param> <key>_enabled</key> @@ -513,11 +481,15 @@ </param> <param> <key>value</key> - <value>int(sample_rate/channel_rate)</value> + <value>adc_rate/decim</value> + </param> + <param> + <key>alias</key> + <value></value> </param> <param> <key>_coordinate</key> - <value>(906, 12)</value> + <value>(382, 12)</value> </param> <param> <key>_rotation</key> @@ -528,7 +500,7 @@ <key>variable</key> <param> <key>id</key> - <value>deviation</value> + <value>adc_rate</value> </param> <param> <key>_enabled</key> @@ -536,11 +508,15 @@ </param> <param> <key>value</key> - <value>4800</value> + <value>64e6</value> + </param> + <param> + <key>alias</key> + <value></value> </param> <param> <key>_coordinate</key> - <value>(688, 14)</value> + <value>(225, 12)</value> </param> <param> <key>_rotation</key> @@ -548,45 +524,38 @@ </param> </block> <block> - <key>variable</key> + <key>notebook</key> <param> <key>id</key> - <value>demod_k</value> + <value>displays</value> </param> <param> <key>_enabled</key> <value>True</value> </param> <param> - <key>value</key> - <value>3*channel_rate/(2*math.pi*deviation)</value> - </param> - <param> - <key>_coordinate</key> - <value>(598, 857)</value> + <key>style</key> + <value>wx.NB_TOP</value> </param> <param> - <key>_rotation</key> - <value>0</value> + <key>labels</key> + <value>['RX Spectrum','Baseband']</value> </param> - </block> - <block> - <key>variable</key> <param> - <key>id</key> - <value>channel_taps</value> + <key>grid_pos</key> + <value>1, 0, 1, 5</value> </param> <param> - <key>_enabled</key> - <value>True</value> + <key>notebook</key> + <value></value> </param> <param> - <key>value</key> - <value>firdes.low_pass(10, sample_rate, passband/2.0, (channel_rate-passband)/2.0)</value> + <key>alias</key> + <value></value> </param> <param> <key>_coordinate</key> - <value>(325, 857)</value> + <value>(9, 209)</value> </param> <param> <key>_rotation</key> @@ -594,22 +563,26 @@ </param> </block> <block> - <key>variable</key> + <key>import</key> <param> <key>id</key> - <value>config_filename</value> + <value>import_0</value> </param> <param> <key>_enabled</key> <value>True</value> </param> <param> - <key>value</key> - <value>os.environ["HOME"]+"/.gnuradio/config.conf"</value> + <key>import</key> + <value>import os, math</value> + </param> + <param> + <key>alias</key> + <value></value> </param> <param> <key>_coordinate</key> - <value>(9, 133)</value> + <value>(10, 76)</value> </param> <param> <key>_rotation</key> @@ -651,6 +624,10 @@ <value>band_freq</value> </param> <param> + <key>alias</key> + <value></value> + </param> + <param> <key>_coordinate</key> <value>(228, 311)</value> </param> @@ -694,6 +671,10 @@ <value>channel</value> </param> <param> + <key>alias</key> + <value></value> + </param> + <param> <key>_coordinate</key> <value>(387, 312)</value> </param> @@ -737,6 +718,10 @@ <value>offset</value> </param> <param> + <key>alias</key> + <value></value> + </param> + <param> <key>_coordinate</key> <value>(547, 312)</value> </param> @@ -780,6 +765,10 @@ <value>rx_gain</value> </param> <param> + <key>alias</key> + <value></value> + </param> + <param> <key>_coordinate</key> <value>(706, 312)</value> </param> @@ -823,6 +812,10 @@ <value></value> </param> <param> + <key>alias</key> + <value></value> + </param> + <param> <key>_coordinate</key> <value>(225, 121)</value> </param> @@ -866,54 +859,12 @@ <value></value> </param> <param> - <key>_coordinate</key> - <value>(801, 124)</value> - </param> - <param> - <key>_rotation</key> - <value>0</value> - </param> - </block> - <block> - <key>variable</key> - <param> - <key>id</key> - <value>passband</value> - </param> - <param> - <key>_enabled</key> - <value>True</value> - </param> - <param> - <key>value</key> - <value>2*(deviation+symbol_rate)</value> - </param> - <param> - <key>_coordinate</key> - <value>(327, 930)</value> - </param> - <param> - <key>_rotation</key> - <value>0</value> - </param> - </block> - <block> - <key>variable</key> - <param> - <key>id</key> - <value>channel_rate</value> - </param> - <param> - <key>_enabled</key> - <value>True</value> - </param> - <param> - <key>value</key> - <value>8*3200</value> + <key>alias</key> + <value></value> </param> <param> <key>_coordinate</key> - <value>(792, 13)</value> + <value>(801, 124)</value> </param> <param> <key>_rotation</key> @@ -967,6 +918,10 @@ <value></value> </param> <param> + <key>alias</key> + <value></value> + </param> + <param> <key>_coordinate</key> <value>(376, 120)</value> </param> @@ -1022,6 +977,10 @@ <value></value> </param> <param> + <key>alias</key> + <value></value> + </param> + <param> <key>_coordinate</key> <value>(658, 122)</value> </param> @@ -1077,6 +1036,10 @@ <value></value> </param> <param> + <key>alias</key> + <value></value> + </param> + <param> <key>_coordinate</key> <value>(518, 118)</value> </param> @@ -1086,22 +1049,22 @@ </param> </block> <block> - <key>analog_quadrature_demod_cf</key> + <key>virtual_source</key> <param> <key>id</key> - <value>fm_demod</value> + <value>virtual_source_0</value> </param> <param> <key>_enabled</key> <value>True</value> </param> <param> - <key>gain</key> - <value>demod_k</value> + <key>stream_id</key> + <value>baseband</value> </param> <param> <key>_coordinate</key> - <value>(599, 774)</value> + <value>(79, 1186)</value> </param> <param> <key>_rotation</key> @@ -1109,22 +1072,38 @@ </param> </block> <block> - <key>variable</key> + <key>pager_slicer_fb</key> <param> <key>id</key> - <value>baseband_rate</value> + <value>pager_slicer_fb_0</value> </param> <param> <key>_enabled</key> <value>True</value> </param> <param> - <key>value</key> - <value>16000</value> + <key>alpha</key> + <value>1e-6</value> + </param> + <param> + <key>alias</key> + <value></value> + </param> + <param> + <key>affinity</key> + <value></value> + </param> + <param> + <key>minoutbuf</key> + <value>0</value> + </param> + <param> + <key>maxoutbuf</key> + <value>0</value> </param> <param> <key>_coordinate</key> - <value>(1019, 17)</value> + <value>(304, 1186)</value> </param> <param> <key>_rotation</key> @@ -1132,45 +1111,160 @@ </param> </block> <block> - <key>variable</key> + <key>wxgui_scopesink2</key> <param> <key>id</key> - <value>nchan_taps</value> + <value>wxgui_scopesink2_0</value> </param> <param> <key>_enabled</key> - <value>True</value> + <value>False</value> </param> <param> - <key>value</key> - <value>len(channel_taps)</value> + <key>type</key> + <value>float</value> + </param> + <param> + <key>title</key> + <value>Slicer Output</value> + </param> + <param> + <key>samp_rate</key> + <value>baseband_rate</value> + </param> + <param> + <key>v_scale</key> + <value>1</value> + </param> + <param> + <key>v_offset</key> + <value>0</value> + </param> + <param> + <key>t_scale</key> + <value>40.0/baseband_rate</value> + </param> + <param> + <key>ac_couple</key> + <value>False</value> + </param> + <param> + <key>xy_mode</key> + <value>False</value> + </param> + <param> + <key>num_inputs</key> + <value>1</value> + </param> + <param> + <key>win_size</key> + <value></value> + </param> + <param> + <key>grid_pos</key> + <value>1,0,1,1</value> + </param> + <param> + <key>notebook</key> + <value>displays, 1</value> + </param> + <param> + <key>trig_mode</key> + <value>wxgui.TRIG_MODE_AUTO</value> + </param> + <param> + <key>y_axis_label</key> + <value>Counts</value> + </param> + <param> + <key>alias</key> + <value></value> + </param> + <param> + <key>affinity</key> + <value></value> </param> <param> <key>_coordinate</key> - <value>(412, 931)</value> + <value>(75, 1044)</value> </param> <param> <key>_rotation</key> + <value>180</value> + </param> + </block> + <block> + <key>blocks_char_to_float</key> + <param> + <key>id</key> + <value>blocks_char_to_float_0</value> + </param> + <param> + <key>_enabled</key> + <value>False</value> + </param> + <param> + <key>vlen</key> + <value>1</value> + </param> + <param> + <key>scale</key> + <value>1</value> + </param> + <param> + <key>alias</key> + <value></value> + </param> + <param> + <key>affinity</key> + <value></value> + </param> + <param> + <key>minoutbuf</key> + <value>0</value> + </param> + <param> + <key>maxoutbuf</key> <value>0</value> </param> + <param> + <key>_coordinate</key> + <value>(325, 1088)</value> + </param> + <param> + <key>_rotation</key> + <value>180</value> + </param> </block> <block> - <key>variable</key> + <key>pager_flex_sync</key> <param> <key>id</key> - <value>ma_ntaps</value> + <value>pager_flex_sync_0</value> </param> <param> <key>_enabled</key> <value>True</value> </param> <param> - <key>value</key> - <value>int(channel_rate/symbol_rate)</value> + <key>alias</key> + <value></value> + </param> + <param> + <key>affinity</key> + <value></value> + </param> + <param> + <key>minoutbuf</key> + <value>0</value> + </param> + <param> + <key>maxoutbuf</key> + <value>0</value> </param> <param> <key>_coordinate</key> - <value>(850, 863)</value> + <value>(529, 1139)</value> </param> <param> <key>_rotation</key> @@ -1178,22 +1272,34 @@ </param> </block> <block> - <key>variable</key> + <key>pager_flex_deinterleave</key> <param> <key>id</key> - <value>bb_interp</value> + <value>pager_flex_deinterleave_0</value> </param> <param> <key>_enabled</key> <value>True</value> </param> <param> - <key>value</key> - <value>5</value> + <key>alias</key> + <value></value> + </param> + <param> + <key>affinity</key> + <value></value> + </param> + <param> + <key>minoutbuf</key> + <value>0</value> + </param> + <param> + <key>maxoutbuf</key> + <value>0</value> </param> <param> <key>_coordinate</key> - <value>(938, 862)</value> + <value>(777, 1116)</value> </param> <param> <key>_rotation</key> @@ -1201,22 +1307,42 @@ </param> </block> <block> - <key>virtual_sink</key> + <key>blocks_null_sink</key> <param> <key>id</key> - <value>virtual_sink_0</value> + <value>blocks_null_sink_0</value> </param> <param> <key>_enabled</key> <value>True</value> </param> <param> - <key>stream_id</key> - <value>baseband</value> + <key>type</key> + <value>int</value> + </param> + <param> + <key>vlen</key> + <value>1</value> + </param> + <param> + <key>num_inputs</key> + <value>1</value> + </param> + <param> + <key>bus_conns</key> + <value>[[0,],]</value> + </param> + <param> + <key>alias</key> + <value></value> + </param> + <param> + <key>affinity</key> + <value></value> </param> <param> <key>_coordinate</key> - <value>(1100, 774)</value> + <value>(1042, 1116)</value> </param> <param> <key>_rotation</key> @@ -1224,38 +1350,69 @@ </param> </block> <block> - <key>blks2_rational_resampler_xxx</key> + <key>pager_flex_deinterleave</key> <param> <key>id</key> - <value>resampler</value> + <value>pager_flex_deinterleave_0_1_0</value> </param> <param> <key>_enabled</key> <value>True</value> </param> <param> - <key>type</key> - <value>fff</value> + <key>alias</key> + <value></value> </param> <param> - <key>decim</key> - <value>bb_decim</value> + <key>affinity</key> + <value></value> </param> <param> - <key>interp</key> - <value>bb_interp</value> + <key>minoutbuf</key> + <value>0</value> </param> <param> - <key>taps</key> - <value>[1.0/ma_ntaps,]*ma_ntaps*bb_interp</value> + <key>maxoutbuf</key> + <value>0</value> + </param> + <param> + <key>_coordinate</key> + <value>(778, 1168)</value> </param> <param> - <key>fractional_bw</key> + <key>_rotation</key> + <value>0</value> + </param> + </block> + <block> + <key>pager_flex_deinterleave</key> + <param> + <key>id</key> + <value>pager_flex_deinterleave_0_1</value> + </param> + <param> + <key>_enabled</key> + <value>True</value> + </param> + <param> + <key>alias</key> + <value></value> + </param> + <param> + <key>affinity</key> + <value></value> + </param> + <param> + <key>minoutbuf</key> + <value>0</value> + </param> + <param> + <key>maxoutbuf</key> <value>0</value> </param> <param> <key>_coordinate</key> - <value>(851, 750)</value> + <value>(776, 1225)</value> </param> <param> <key>_rotation</key> @@ -1263,22 +1420,34 @@ </param> </block> <block> - <key>variable</key> + <key>pager_flex_deinterleave</key> <param> <key>id</key> - <value>bb_decim</value> + <value>pager_flex_deinterleave_0_0</value> </param> <param> <key>_enabled</key> <value>True</value> </param> <param> - <key>value</key> - <value>8</value> + <key>alias</key> + <value></value> + </param> + <param> + <key>affinity</key> + <value></value> + </param> + <param> + <key>minoutbuf</key> + <value>0</value> + </param> + <param> + <key>maxoutbuf</key> + <value>0</value> </param> <param> <key>_coordinate</key> - <value>(1027, 864)</value> + <value>(776, 1273)</value> </param> <param> <key>_rotation</key> @@ -1286,10 +1455,10 @@ </param> </block> <block> - <key>wxgui_scopesink2</key> + <key>blocks_null_sink</key> <param> <key>id</key> - <value>wxgui_scopesink2_0_0</value> + <value>blocks_null_sink_0_0</value> </param> <param> <key>_enabled</key> @@ -1297,78 +1466,117 @@ </param> <param> <key>type</key> - <value>float</value> + <value>int</value> </param> <param> - <key>title</key> - <value>Baseband</value> + <key>vlen</key> + <value>1</value> </param> <param> - <key>samp_rate</key> - <value>16e3</value> + <key>num_inputs</key> + <value>1</value> </param> <param> - <key>v_scale</key> - <value>1</value> + <key>bus_conns</key> + <value>[[0,],]</value> </param> <param> - <key>v_offset</key> + <key>alias</key> + <value></value> + </param> + <param> + <key>affinity</key> + <value></value> + </param> + <param> + <key>_coordinate</key> + <value>(1042, 1168)</value> + </param> + <param> + <key>_rotation</key> <value>0</value> </param> + </block> + <block> + <key>blocks_null_sink</key> <param> - <key>t_scale</key> - <value>40.0/16e3</value> + <key>id</key> + <value>blocks_null_sink_0_1</value> </param> <param> - <key>ac_couple</key> - <value>False</value> + <key>_enabled</key> + <value>True</value> </param> <param> - <key>xy_mode</key> - <value>False</value> + <key>type</key> + <value>int</value> + </param> + <param> + <key>vlen</key> + <value>1</value> </param> <param> <key>num_inputs</key> <value>1</value> </param> <param> - <key>win_size</key> - <value></value> + <key>bus_conns</key> + <value>[[0,],]</value> </param> <param> - <key>grid_pos</key> - <value>0, 0, 1, 1</value> + <key>alias</key> + <value></value> </param> <param> - <key>notebook</key> - <value>displays, 1</value> + <key>affinity</key> + <value></value> </param> <param> <key>_coordinate</key> - <value>(851, 586)</value> + <value>(1041, 1225)</value> </param> <param> <key>_rotation</key> - <value>180</value> + <value>0</value> </param> </block> <block> - <key>virtual_source</key> + <key>blocks_null_sink</key> <param> <key>id</key> - <value>virtual_source_0</value> + <value>blocks_null_sink_0_2</value> </param> <param> <key>_enabled</key> <value>True</value> </param> <param> - <key>stream_id</key> - <value>baseband</value> + <key>type</key> + <value>int</value> + </param> + <param> + <key>vlen</key> + <value>1</value> + </param> + <param> + <key>num_inputs</key> + <value>1</value> + </param> + <param> + <key>bus_conns</key> + <value>[[0,],]</value> + </param> + <param> + <key>alias</key> + <value></value> + </param> + <param> + <key>affinity</key> + <value></value> </param> <param> <key>_coordinate</key> - <value>(79, 1186)</value> + <value>(1040, 1273)</value> </param> <param> <key>_rotation</key> @@ -1376,22 +1584,22 @@ </param> </block> <block> - <key>pager_slicer_fb</key> + <key>virtual_sink</key> <param> <key>id</key> - <value>pager_slicer_fb_0</value> + <value>virtual_sink_0</value> </param> <param> <key>_enabled</key> <value>True</value> </param> <param> - <key>alpha</key> - <value>1e-6</value> + <key>stream_id</key> + <value>baseband</value> </param> <param> <key>_coordinate</key> - <value>(304, 1186)</value> + <value>(1100, 774)</value> </param> <param> <key>_rotation</key> @@ -1402,11 +1610,11 @@ <key>wxgui_scopesink2</key> <param> <key>id</key> - <value>wxgui_scopesink2_0</value> + <value>wxgui_scopesink2_0_0</value> </param> <param> <key>_enabled</key> - <value>False</value> + <value>True</value> </param> <param> <key>type</key> @@ -1414,11 +1622,11 @@ </param> <param> <key>title</key> - <value>Slicer Output</value> + <value>Baseband</value> </param> <param> <key>samp_rate</key> - <value>baseband_rate</value> + <value>16e3</value> </param> <param> <key>v_scale</key> @@ -1430,7 +1638,7 @@ </param> <param> <key>t_scale</key> - <value>40.0/baseband_rate</value> + <value>40.0/16e3</value> </param> <param> <key>ac_couple</key> @@ -1450,34 +1658,31 @@ </param> <param> <key>grid_pos</key> - <value>1,0,1,1</value> + <value>0, 0, 1, 1</value> </param> <param> <key>notebook</key> <value>displays, 1</value> </param> <param> - <key>_coordinate</key> - <value>(75, 1044)</value> + <key>trig_mode</key> + <value>wxgui.TRIG_MODE_AUTO</value> </param> <param> - <key>_rotation</key> - <value>180</value> + <key>y_axis_label</key> + <value>Counts</value> </param> - </block> - <block> - <key>blocks_char_to_float</key> <param> - <key>id</key> - <value>blocks_char_to_float_0</value> + <key>alias</key> + <value></value> </param> <param> - <key>_enabled</key> - <value>False</value> + <key>affinity</key> + <value></value> </param> <param> <key>_coordinate</key> - <value>(325, 1088)</value> + <value>(851, 586)</value> </param> <param> <key>_rotation</key> @@ -1485,37 +1690,54 @@ </param> </block> <block> - <key>pager_flex_sync</key> + <key>rational_resampler_xxx</key> <param> <key>id</key> - <value>pager_flex_sync_0</value> + <value>rational_resampler_xxx_0</value> </param> <param> <key>_enabled</key> <value>True</value> </param> <param> - <key>_coordinate</key> - <value>(529, 1139)</value> + <key>type</key> + <value>fff</value> </param> <param> - <key>_rotation</key> + <key>interp</key> + <value>bb_decim</value> + </param> + <param> + <key>decim</key> + <value>bb_interp</value> + </param> + <param> + <key>taps</key> + <value>[1.0/ma_ntaps,]*ma_ntaps*bb_interp</value> + </param> + <param> + <key>fbw</key> <value>0</value> </param> - </block> - <block> - <key>pager_flex_deinterleave</key> <param> - <key>id</key> - <value>pager_flex_deinterleave_0</value> + <key>alias</key> + <value></value> </param> <param> - <key>_enabled</key> - <value>True</value> + <key>affinity</key> + <value></value> + </param> + <param> + <key>minoutbuf</key> + <value>0</value> + </param> + <param> + <key>maxoutbuf</key> + <value>0</value> </param> <param> <key>_coordinate</key> - <value>(777, 1116)</value> + <value>(831, 750)</value> </param> <param> <key>_rotation</key> @@ -1523,26 +1745,38 @@ </param> </block> <block> - <key>blocks_null_sink</key> + <key>analog_quadrature_demod_cf</key> <param> <key>id</key> - <value>blocks_null_sink_0</value> + <value>fm_demod</value> </param> <param> <key>_enabled</key> <value>True</value> </param> <param> - <key>type</key> - <value>int</value> + <key>gain</key> + <value>demod_k</value> </param> <param> - <key>vlen</key> - <value>1</value> + <key>alias</key> + <value></value> + </param> + <param> + <key>affinity</key> + <value></value> + </param> + <param> + <key>minoutbuf</key> + <value>0</value> + </param> + <param> + <key>maxoutbuf</key> + <value>0</value> </param> <param> <key>_coordinate</key> - <value>(1042, 1116)</value> + <value>(599, 774)</value> </param> <param> <key>_rotation</key> @@ -1550,67 +1784,109 @@ </param> </block> <block> - <key>pager_flex_deinterleave</key> + <key>wxgui_fftsink2</key> <param> <key>id</key> - <value>pager_flex_deinterleave_0_1_0</value> + <value>wxgui_fftsink2_1</value> </param> <param> <key>_enabled</key> <value>True</value> </param> <param> - <key>_coordinate</key> - <value>(778, 1168)</value> + <key>type</key> + <value>complex</value> </param> <param> - <key>_rotation</key> + <key>title</key> + <value>Channel Spectrum</value> + </param> + <param> + <key>samp_rate</key> + <value>channel_rate</value> + </param> + <param> + <key>baseband_freq</key> + <value>freq</value> + </param> + <param> + <key>y_per_div</key> + <value>10</value> + </param> + <param> + <key>y_divs</key> + <value>10</value> + </param> + <param> + <key>ref_level</key> <value>0</value> </param> - </block> - <block> - <key>pager_flex_deinterleave</key> <param> - <key>id</key> - <value>pager_flex_deinterleave_0_1</value> + <key>ref_scale</key> + <value>65536</value> </param> <param> - <key>_enabled</key> - <value>True</value> + <key>fft_size</key> + <value>1024</value> </param> <param> - <key>_coordinate</key> - <value>(776, 1225)</value> + <key>fft_rate</key> + <value>30</value> </param> <param> - <key>_rotation</key> + <key>peak_hold</key> + <value>False</value> + </param> + <param> + <key>average</key> + <value>False</value> + </param> + <param> + <key>avg_alpha</key> <value>0</value> </param> - </block> - <block> - <key>pager_flex_deinterleave</key> <param> - <key>id</key> - <value>pager_flex_deinterleave_0_0</value> + <key>win</key> + <value>None</value> </param> <param> - <key>_enabled</key> - <value>True</value> + <key>win_size</key> + <value></value> + </param> + <param> + <key>grid_pos</key> + <value>1, 0, 1, 1</value> + </param> + <param> + <key>notebook</key> + <value>displays, 0</value> + </param> + <param> + <key>freqvar</key> + <value>None</value> + </param> + <param> + <key>alias</key> + <value></value> + </param> + <param> + <key>affinity</key> + <value></value> </param> <param> <key>_coordinate</key> - <value>(776, 1273)</value> + <value>(344, 511)</value> </param> <param> <key>_rotation</key> - <value>0</value> + <value>180</value> </param> </block> <block> - <key>blocks_null_sink</key> + <key>wxgui_fftsink2</key> <param> <key>id</key> - <value>blocks_null_sink_0_0</value> + <value>wxgui_fftsink2_0</value> </param> <param> <key>_enabled</key> @@ -1618,26 +1894,98 @@ </param> <param> <key>type</key> - <value>int</value> + <value>complex</value> </param> <param> - <key>vlen</key> - <value>1</value> + <key>title</key> + <value>FLEX Spectrum</value> + </param> + <param> + <key>samp_rate</key> + <value>sample_rate</value> + </param> + <param> + <key>baseband_freq</key> + <value>band_freq</value> + </param> + <param> + <key>y_per_div</key> + <value>10</value> + </param> + <param> + <key>y_divs</key> + <value>10</value> + </param> + <param> + <key>ref_level</key> + <value>0</value> + </param> + <param> + <key>ref_scale</key> + <value>65536</value> + </param> + <param> + <key>fft_size</key> + <value>1024</value> + </param> + <param> + <key>fft_rate</key> + <value>30</value> + </param> + <param> + <key>peak_hold</key> + <value>False</value> + </param> + <param> + <key>average</key> + <value>False</value> + </param> + <param> + <key>avg_alpha</key> + <value>0</value> + </param> + <param> + <key>win</key> + <value>None</value> + </param> + <param> + <key>win_size</key> + <value></value> + </param> + <param> + <key>grid_pos</key> + <value>0,0,1,1</value> + </param> + <param> + <key>notebook</key> + <value>displays,0</value> + </param> + <param> + <key>freqvar</key> + <value>None</value> + </param> + <param> + <key>alias</key> + <value></value> + </param> + <param> + <key>affinity</key> + <value></value> </param> <param> <key>_coordinate</key> - <value>(1042, 1168)</value> + <value>(34, 508)</value> </param> <param> <key>_rotation</key> - <value>0</value> + <value>180</value> </param> </block> <block> - <key>blocks_null_sink</key> + <key>freq_xlating_fir_filter_xxx</key> <param> <key>id</key> - <value>blocks_null_sink_0_1</value> + <value>freq_xlating_fir_filter_xxx_0</value> </param> <param> <key>_enabled</key> @@ -1645,15 +1993,43 @@ </param> <param> <key>type</key> - <value>int</value> + <value>ccc</value> </param> <param> - <key>vlen</key> - <value>1</value> + <key>decim</key> + <value>channel_decim</value> + </param> + <param> + <key>taps</key> + <value>channel_taps</value> + </param> + <param> + <key>center_freq</key> + <value>band_freq-freq+offset</value> + </param> + <param> + <key>samp_rate</key> + <value>sample_rate</value> + </param> + <param> + <key>alias</key> + <value></value> + </param> + <param> + <key>affinity</key> + <value></value> + </param> + <param> + <key>minoutbuf</key> + <value>0</value> + </param> + <param> + <key>maxoutbuf</key> + <value>0</value> </param> <param> <key>_coordinate</key> - <value>(1041, 1225)</value> + <value>(339, 741)</value> </param> <param> <key>_rotation</key> @@ -1661,10 +2037,10 @@ </param> </block> <block> - <key>blocks_null_sink</key> + <key>uhd_usrp_source</key> <param> <key>id</key> - <value>blocks_null_sink_0_2</value> + <value>uhd_usrp_source_0</value> </param> <param> <key>_enabled</key> @@ -1672,15 +2048,675 @@ </param> <param> <key>type</key> - <value>int</value> + <value>fc32</value> </param> <param> - <key>vlen</key> + <key>otw</key> + <value>sc16</value> + </param> + <param> + <key>stream_args</key> + <value></value> + </param> + <param> + <key>stream_chans</key> + <value>[]</value> + </param> + <param> + <key>dev_addr</key> + <value>""</value> + </param> + <param> + <key>dev_args</key> + <value>""</value> + </param> + <param> + <key>sync</key> + <value></value> + </param> + <param> + <key>clock_rate</key> + <value>0.0</value> + </param> + <param> + <key>num_mboards</key> + <value>1</value> + </param> + <param> + <key>clock_source0</key> + <value></value> + </param> + <param> + <key>time_source0</key> + <value></value> + </param> + <param> + <key>sd_spec0</key> + <value></value> + </param> + <param> + <key>clock_source1</key> + <value></value> + </param> + <param> + <key>time_source1</key> + <value></value> + </param> + <param> + <key>sd_spec1</key> + <value></value> + </param> + <param> + <key>clock_source2</key> + <value></value> + </param> + <param> + <key>time_source2</key> + <value></value> + </param> + <param> + <key>sd_spec2</key> + <value></value> + </param> + <param> + <key>clock_source3</key> + <value></value> + </param> + <param> + <key>time_source3</key> + <value></value> + </param> + <param> + <key>sd_spec3</key> + <value></value> + </param> + <param> + <key>clock_source4</key> + <value></value> + </param> + <param> + <key>time_source4</key> + <value></value> + </param> + <param> + <key>sd_spec4</key> + <value></value> + </param> + <param> + <key>clock_source5</key> + <value></value> + </param> + <param> + <key>time_source5</key> + <value></value> + </param> + <param> + <key>sd_spec5</key> + <value></value> + </param> + <param> + <key>clock_source6</key> + <value></value> + </param> + <param> + <key>time_source6</key> + <value></value> + </param> + <param> + <key>sd_spec6</key> + <value></value> + </param> + <param> + <key>clock_source7</key> + <value></value> + </param> + <param> + <key>time_source7</key> + <value></value> + </param> + <param> + <key>sd_spec7</key> + <value></value> + </param> + <param> + <key>nchan</key> <value>1</value> </param> <param> + <key>samp_rate</key> + <value>sample_rate</value> + </param> + <param> + <key>center_freq0</key> + <value>band_freq</value> + </param> + <param> + <key>gain0</key> + <value>rx_gain</value> + </param> + <param> + <key>ant0</key> + <value>RX2</value> + </param> + <param> + <key>bw0</key> + <value>0</value> + </param> + <param> + <key>center_freq1</key> + <value>0</value> + </param> + <param> + <key>gain1</key> + <value>0</value> + </param> + <param> + <key>ant1</key> + <value></value> + </param> + <param> + <key>bw1</key> + <value>0</value> + </param> + <param> + <key>center_freq2</key> + <value>0</value> + </param> + <param> + <key>gain2</key> + <value>0</value> + </param> + <param> + <key>ant2</key> + <value></value> + </param> + <param> + <key>bw2</key> + <value>0</value> + </param> + <param> + <key>center_freq3</key> + <value>0</value> + </param> + <param> + <key>gain3</key> + <value>0</value> + </param> + <param> + <key>ant3</key> + <value></value> + </param> + <param> + <key>bw3</key> + <value>0</value> + </param> + <param> + <key>center_freq4</key> + <value>0</value> + </param> + <param> + <key>gain4</key> + <value>0</value> + </param> + <param> + <key>ant4</key> + <value></value> + </param> + <param> + <key>bw4</key> + <value>0</value> + </param> + <param> + <key>center_freq5</key> + <value>0</value> + </param> + <param> + <key>gain5</key> + <value>0</value> + </param> + <param> + <key>ant5</key> + <value></value> + </param> + <param> + <key>bw5</key> + <value>0</value> + </param> + <param> + <key>center_freq6</key> + <value>0</value> + </param> + <param> + <key>gain6</key> + <value>0</value> + </param> + <param> + <key>ant6</key> + <value></value> + </param> + <param> + <key>bw6</key> + <value>0</value> + </param> + <param> + <key>center_freq7</key> + <value>0</value> + </param> + <param> + <key>gain7</key> + <value>0</value> + </param> + <param> + <key>ant7</key> + <value></value> + </param> + <param> + <key>bw7</key> + <value>0</value> + </param> + <param> + <key>center_freq8</key> + <value>0</value> + </param> + <param> + <key>gain8</key> + <value>0</value> + </param> + <param> + <key>ant8</key> + <value></value> + </param> + <param> + <key>bw8</key> + <value>0</value> + </param> + <param> + <key>center_freq9</key> + <value>0</value> + </param> + <param> + <key>gain9</key> + <value>0</value> + </param> + <param> + <key>ant9</key> + <value></value> + </param> + <param> + <key>bw9</key> + <value>0</value> + </param> + <param> + <key>center_freq10</key> + <value>0</value> + </param> + <param> + <key>gain10</key> + <value>0</value> + </param> + <param> + <key>ant10</key> + <value></value> + </param> + <param> + <key>bw10</key> + <value>0</value> + </param> + <param> + <key>center_freq11</key> + <value>0</value> + </param> + <param> + <key>gain11</key> + <value>0</value> + </param> + <param> + <key>ant11</key> + <value></value> + </param> + <param> + <key>bw11</key> + <value>0</value> + </param> + <param> + <key>center_freq12</key> + <value>0</value> + </param> + <param> + <key>gain12</key> + <value>0</value> + </param> + <param> + <key>ant12</key> + <value></value> + </param> + <param> + <key>bw12</key> + <value>0</value> + </param> + <param> + <key>center_freq13</key> + <value>0</value> + </param> + <param> + <key>gain13</key> + <value>0</value> + </param> + <param> + <key>ant13</key> + <value></value> + </param> + <param> + <key>bw13</key> + <value>0</value> + </param> + <param> + <key>center_freq14</key> + <value>0</value> + </param> + <param> + <key>gain14</key> + <value>0</value> + </param> + <param> + <key>ant14</key> + <value></value> + </param> + <param> + <key>bw14</key> + <value>0</value> + </param> + <param> + <key>center_freq15</key> + <value>0</value> + </param> + <param> + <key>gain15</key> + <value>0</value> + </param> + <param> + <key>ant15</key> + <value></value> + </param> + <param> + <key>bw15</key> + <value>0</value> + </param> + <param> + <key>center_freq16</key> + <value>0</value> + </param> + <param> + <key>gain16</key> + <value>0</value> + </param> + <param> + <key>ant16</key> + <value></value> + </param> + <param> + <key>bw16</key> + <value>0</value> + </param> + <param> + <key>center_freq17</key> + <value>0</value> + </param> + <param> + <key>gain17</key> + <value>0</value> + </param> + <param> + <key>ant17</key> + <value></value> + </param> + <param> + <key>bw17</key> + <value>0</value> + </param> + <param> + <key>center_freq18</key> + <value>0</value> + </param> + <param> + <key>gain18</key> + <value>0</value> + </param> + <param> + <key>ant18</key> + <value></value> + </param> + <param> + <key>bw18</key> + <value>0</value> + </param> + <param> + <key>center_freq19</key> + <value>0</value> + </param> + <param> + <key>gain19</key> + <value>0</value> + </param> + <param> + <key>ant19</key> + <value></value> + </param> + <param> + <key>bw19</key> + <value>0</value> + </param> + <param> + <key>center_freq20</key> + <value>0</value> + </param> + <param> + <key>gain20</key> + <value>0</value> + </param> + <param> + <key>ant20</key> + <value></value> + </param> + <param> + <key>bw20</key> + <value>0</value> + </param> + <param> + <key>center_freq21</key> + <value>0</value> + </param> + <param> + <key>gain21</key> + <value>0</value> + </param> + <param> + <key>ant21</key> + <value></value> + </param> + <param> + <key>bw21</key> + <value>0</value> + </param> + <param> + <key>center_freq22</key> + <value>0</value> + </param> + <param> + <key>gain22</key> + <value>0</value> + </param> + <param> + <key>ant22</key> + <value></value> + </param> + <param> + <key>bw22</key> + <value>0</value> + </param> + <param> + <key>center_freq23</key> + <value>0</value> + </param> + <param> + <key>gain23</key> + <value>0</value> + </param> + <param> + <key>ant23</key> + <value></value> + </param> + <param> + <key>bw23</key> + <value>0</value> + </param> + <param> + <key>center_freq24</key> + <value>0</value> + </param> + <param> + <key>gain24</key> + <value>0</value> + </param> + <param> + <key>ant24</key> + <value></value> + </param> + <param> + <key>bw24</key> + <value>0</value> + </param> + <param> + <key>center_freq25</key> + <value>0</value> + </param> + <param> + <key>gain25</key> + <value>0</value> + </param> + <param> + <key>ant25</key> + <value></value> + </param> + <param> + <key>bw25</key> + <value>0</value> + </param> + <param> + <key>center_freq26</key> + <value>0</value> + </param> + <param> + <key>gain26</key> + <value>0</value> + </param> + <param> + <key>ant26</key> + <value></value> + </param> + <param> + <key>bw26</key> + <value>0</value> + </param> + <param> + <key>center_freq27</key> + <value>0</value> + </param> + <param> + <key>gain27</key> + <value>0</value> + </param> + <param> + <key>ant27</key> + <value></value> + </param> + <param> + <key>bw27</key> + <value>0</value> + </param> + <param> + <key>center_freq28</key> + <value>0</value> + </param> + <param> + <key>gain28</key> + <value>0</value> + </param> + <param> + <key>ant28</key> + <value></value> + </param> + <param> + <key>bw28</key> + <value>0</value> + </param> + <param> + <key>center_freq29</key> + <value>0</value> + </param> + <param> + <key>gain29</key> + <value>0</value> + </param> + <param> + <key>ant29</key> + <value></value> + </param> + <param> + <key>bw29</key> + <value>0</value> + </param> + <param> + <key>center_freq30</key> + <value>0</value> + </param> + <param> + <key>gain30</key> + <value>0</value> + </param> + <param> + <key>ant30</key> + <value></value> + </param> + <param> + <key>bw30</key> + <value>0</value> + </param> + <param> + <key>center_freq31</key> + <value>0</value> + </param> + <param> + <key>gain31</key> + <value>0</value> + </param> + <param> + <key>ant31</key> + <value></value> + </param> + <param> + <key>bw31</key> + <value>0</value> + </param> + <param> + <key>alias</key> + <value></value> + </param> + <param> + <key>affinity</key> + <value></value> + </param> + <param> + <key>minoutbuf</key> + <value>0</value> + </param> + <param> + <key>maxoutbuf</key> + <value>0</value> + </param> + <param> <key>_coordinate</key> - <value>(1040, 1273)</value> + <value>(20, 735)</value> </param> <param> <key>_rotation</key> @@ -1688,48 +2724,6 @@ </param> </block> <connection> - <source_block_id>filter_freq_xlating_fir_filter_xxx_0</source_block_id> - <sink_block_id>wxgui_fftsink2_1</sink_block_id> - <source_key>0</source_key> - <sink_key>0</sink_key> - </connection> - <connection> - <source_block_id>usrp_source</source_block_id> - <sink_block_id>filter_freq_xlating_fir_filter_xxx_0</sink_block_id> - <source_key>0</source_key> - <sink_key>0</sink_key> - </connection> - <connection> - <source_block_id>usrp_source</source_block_id> - <sink_block_id>wxgui_fftsink2_0</sink_block_id> - <source_key>0</source_key> - <sink_key>0</sink_key> - </connection> - <connection> - <source_block_id>filter_freq_xlating_fir_filter_xxx_0</source_block_id> - <sink_block_id>fm_demod</sink_block_id> - <source_key>0</source_key> - <sink_key>0</sink_key> - </connection> - <connection> - <source_block_id>resampler</source_block_id> - <sink_block_id>wxgui_scopesink2_0_0</sink_block_id> - <source_key>0</source_key> - <sink_key>0</sink_key> - </connection> - <connection> - <source_block_id>fm_demod</source_block_id> - <sink_block_id>resampler</sink_block_id> - <source_key>0</source_key> - <sink_key>0</sink_key> - </connection> - <connection> - <source_block_id>resampler</source_block_id> - <sink_block_id>virtual_sink_0</sink_block_id> - <source_key>0</source_key> - <sink_key>0</sink_key> - </connection> - <connection> <source_block_id>pager_slicer_fb_0</source_block_id> <sink_block_id>pager_flex_sync_0</sink_block_id> <source_key>0</source_key> @@ -1801,4 +2795,46 @@ <source_key>0</source_key> <sink_key>0</sink_key> </connection> + <connection> + <source_block_id>fm_demod</source_block_id> + <sink_block_id>rational_resampler_xxx_0</sink_block_id> + <source_key>0</source_key> + <sink_key>0</sink_key> + </connection> + <connection> + <source_block_id>rational_resampler_xxx_0</source_block_id> + <sink_block_id>virtual_sink_0</sink_block_id> + <source_key>0</source_key> + <sink_key>0</sink_key> + </connection> + <connection> + <source_block_id>rational_resampler_xxx_0</source_block_id> + <sink_block_id>wxgui_scopesink2_0_0</sink_block_id> + <source_key>0</source_key> + <sink_key>0</sink_key> + </connection> + <connection> + <source_block_id>freq_xlating_fir_filter_xxx_0</source_block_id> + <sink_block_id>fm_demod</sink_block_id> + <source_key>0</source_key> + <sink_key>0</sink_key> + </connection> + <connection> + <source_block_id>freq_xlating_fir_filter_xxx_0</source_block_id> + <sink_block_id>wxgui_fftsink2_1</sink_block_id> + <source_key>0</source_key> + <sink_key>0</sink_key> + </connection> + <connection> + <source_block_id>uhd_usrp_source_0</source_block_id> + <sink_block_id>wxgui_fftsink2_0</sink_block_id> + <source_key>0</source_key> + <sink_key>0</sink_key> + </connection> + <connection> + <source_block_id>uhd_usrp_source_0</source_block_id> + <sink_block_id>freq_xlating_fir_filter_xxx_0</sink_block_id> + <source_key>0</source_key> + <sink_key>0</sink_key> + </connection> </flow_graph> diff --git a/gr-qtgui/grc/qtgui_const_sink_x.xml b/gr-qtgui/grc/qtgui_const_sink_x.xml index 0062bcaba8..a6fb2af840 100644 --- a/gr-qtgui/grc/qtgui_const_sink_x.xml +++ b/gr-qtgui/grc/qtgui_const_sink_x.xml @@ -21,6 +21,7 @@ self.$(id).set_y_axis($ymin, $ymax) self.$(id).set_x_axis($xmin, $xmax) self.$(id).set_trigger_mode($tr_mode, $tr_slope, $tr_level, $tr_chan, $tr_tag) self.$(id).enable_autoscale($autoscale) +self.$(id).enable_grid($grid) labels = [$label1, $label2, $label3, $label4, $label5, $label6, $label7, $label8, $label9, $label10] @@ -83,6 +84,22 @@ $(gui_hint()($win))</make> </param> <param> + <name>Grid</name> + <key>grid</key> + <value>False</value> + <type>enum</type> + <hide>part</hide> + <option> + <name>Yes</name> + <key>True</key> + </option> + <option> + <name>No</name> + <key>False</key> + </option> + </param> + + <param> <name>Autoscale</name> <key>autoscale</key> <value>False</value> diff --git a/gr-qtgui/grc/qtgui_freq_sink_x.xml b/gr-qtgui/grc/qtgui_freq_sink_x.xml index beed7fa921..94989f5c68 100644 --- a/gr-qtgui/grc/qtgui_freq_sink_x.xml +++ b/gr-qtgui/grc/qtgui_freq_sink_x.xml @@ -23,6 +23,7 @@ qtgui.$(type.fcn)( self.$(id).set_update_time($update_time) self.$(id).set_y_axis($ymin, $ymax) self.$(id).enable_autoscale($autoscale) +self.$(id).enable_grid($grid) self.$(id).set_fft_average($average) labels = [$label1, $label2, $label3, $label4, $label5, @@ -72,59 +73,77 @@ $(gui_hint()($win))</make> <hide>#if len($name()) > 0 then 'none' else 'part'#</hide> </param> - <param> - <name>FFT Size</name> - <key>fftsize</key> - <value>1024</value> - <type>int</type> - </param> - <param> - <name>Window Type</name> - <key>wintype</key> - <value>firdes.WIN_BLACKMAN_hARRIS</value> - <type>enum</type> - <hide>part</hide> - <option> - <name>Blackman-harris</name> - <key>firdes.WIN_BLACKMAN_hARRIS</key> - </option> - <option> - <name>Hamming</name> - <key>firdes.WIN_HAMMING</key> - </option> - <option> - <name>Hann</name> - <key>firdes.WIN_HANN</key> - </option> - <option> - <name>Blackman</name> - <key>firdes.WIN_BLACKMAN</key> - </option> - <option> - <name>Rectangular</name> - <key>firdes.WIN_RECTANGULAR</key> - </option> - <option> - <name>Kaiser</name> - <key>firdes.WIN_KAISER</key> - </option> - <option> - <name>Flat-top</name> - <key>firdes.WIN_FLATTOP</key> - </option> - </param> - <param> - <name>Center Frequency (Hz)</name> - <key>fc</key> - <value>0</value> - <type>real</type> - </param> - <param> - <name>Bandwidth (Hz)</name> - <key>bw</key> - <value>samp_rate</value> - <type>real</type> - </param> + <param> + <name>FFT Size</name> + <key>fftsize</key> + <value>1024</value> + <type>int</type> + </param> + + <param> + <name>Window Type</name> + <key>wintype</key> + <value>firdes.WIN_BLACKMAN_hARRIS</value> + <type>enum</type> + <hide>part</hide> + <option> + <name>Blackman-harris</name> + <key>firdes.WIN_BLACKMAN_hARRIS</key> + </option> + <option> + <name>Hamming</name> + <key>firdes.WIN_HAMMING</key> + </option> + <option> + <name>Hann</name> + <key>firdes.WIN_HANN</key> + </option> + <option> + <name>Blackman</name> + <key>firdes.WIN_BLACKMAN</key> + </option> + <option> + <name>Rectangular</name> + <key>firdes.WIN_RECTANGULAR</key> + </option> + <option> + <name>Kaiser</name> + <key>firdes.WIN_KAISER</key> + </option> + <option> + <name>Flat-top</name> + <key>firdes.WIN_FLATTOP</key> + </option> + </param> + + <param> + <name>Center Frequency (Hz)</name> + <key>fc</key> + <value>0</value> + <type>real</type> + </param> + <param> + <name>Bandwidth (Hz)</name> + <key>bw</key> + <value>samp_rate</value> + <type>real</type> + </param> + + <param> + <name>Grid</name> + <key>grid</key> + <value>False</value> + <type>enum</type> + <hide>part</hide> + <option> + <name>Yes</name> + <key>True</key> + </option> + <option> + <name>No</name> + <key>False</key> + </option> + </param> <param> <name>Autoscale</name> @@ -202,6 +221,21 @@ $(gui_hint()($win))</make> <hide>part</hide> </param> + <param> + <name>Show Msg Ports</name> + <key>showports</key> + <value>True</value> + <type>enum</type> + <hide>part</hide> + <option> + <name>Yes</name> + <key>False</key> + </option> + <option> + <name>No</name> + <key>True</key> + </option> + </param> <param> <name>Line 1 Label</name> @@ -558,12 +592,14 @@ $(gui_hint()($win))</make> <name>freq</name> <type>message</type> <optional>1</optional> + <hide>$showports</hide> </sink> <source> <name>freq</name> <type>message</type> <optional>1</optional> + <hide>$showports</hide> </source> <doc> diff --git a/gr-qtgui/grc/qtgui_histogram_sink_x.xml b/gr-qtgui/grc/qtgui_histogram_sink_x.xml index a7137ac6a1..7165fb8421 100644 --- a/gr-qtgui/grc/qtgui_histogram_sink_x.xml +++ b/gr-qtgui/grc/qtgui_histogram_sink_x.xml @@ -5,12 +5,12 @@ ################################################### --> <block> - <name>QT GUI Histogram Sink</name> - <key>qtgui_histogram_sink_x</key> - <import>from PyQt4 import Qt</import> - <import>from gnuradio import qtgui</import> - <import>import sip</import> - <make>#set $win = 'self._%s_win'%$id + <name>QT GUI Histogram Sink</name> + <key>qtgui_histogram_sink_x</key> + <import>from PyQt4 import Qt</import> + <import>from gnuradio import qtgui</import> + <import>import sip</import> + <make>#set $win = 'self._%s_win'%$id qtgui.histogram_sink_f( $size, $bins, @@ -23,6 +23,7 @@ qtgui.histogram_sink_f( self.$(id).set_update_time($update_time) self.$(id).enable_autoscale($autoscale) self.$(id).enable_accumulate($accum) +self.$(id).enable_grid($grid) labels = [$label1, $label2, $label3, $label4, $label5, $label6, $label7, $label8, $label9, $label10] @@ -48,104 +49,125 @@ for i in xrange($nconnections): self.$(id).set_line_alpha(i, alphas[i]) self._$(id)_win = sip.wrapinstance(self.$(id).pyqwidget(), Qt.QWidget) -$(gui_hint()($win))</make> - <callback>set_update_time($update_time)</callback> - <callback>set_title($which, $title)</callback> - <callback>set_color($which, $color)</callback> - <callback>set_bins($bins)</callback> - <callback>set_bins($bins)</callback> - <callback>set_x_axis($xmin, $xmax)</callback> - - <param_tab_order> - <tab>General</tab> - <tab>Config</tab> - </param_tab_order> - - <param> - <name>Name</name> - <key>name</key> - <value>""</value> - <type>string</type> - <hide>#if len($name()) > 0 then 'none' else 'part'#</hide> - </param> - - <param> - <name>Number of Points</name> - <key>size</key> - <value>1024</value> - <type>int</type> - </param> - <param> - <name>Number of Bins</name> - <key>bins</key> - <value>100</value> - <type>int</type> - </param> - - <param> - <name>Autoscale</name> - <key>autoscale</key> - <value>True</value> - <type>enum</type> - <option> - <name>Yes</name> - <key>True</key> - </option> - <option> - <name>No</name> - <key>False</key> - </option> - </param> - - <param> - <name>Accumulate</name> - <key>accum</key> - <value>False</value> - <type>enum</type> - <option> - <name>Yes</name> - <key>True</key> - </option> - <option> - <name>No</name> - <key>False</key> - </option> - </param> - - <param> - <name>Min x-axis</name> - <key>xmin</key> - <value>-1</value> - <type>real</type> - </param> - <param> - <name>Max x-axis</name> - <key>xmax</key> - <value>1</value> - <type>real</type> - </param> - <param> - <name>Number of Inputs</name> - <key>nconnections</key> - <value>1</value> - <type>int</type> - <hide>part</hide> - </param> - <param> - <name>Update Period</name> - <key>update_time</key> - <value>0.10</value> - <type>float</type> - <hide>part</hide> - </param> - <param> - <name>GUI Hint</name> - <key>gui_hint</key> - <value></value> - <type>gui_hint</type> - <hide>part</hide> - </param> +$(gui_hint()($win)) + </make> + <callback>set_update_time($update_time)</callback> + <callback>set_title($which, $title)</callback> + <callback>set_color($which, $color)</callback> + <callback>set_bins($bins)</callback> + <callback>set_bins($bins)</callback> + <callback>set_x_axis($xmin, $xmax)</callback> + + <param_tab_order> + <tab>General</tab> + <tab>Config</tab> + </param_tab_order> + + <param> + <name>Name</name> + <key>name</key> + <value>""</value> + <type>string</type> + <hide>#if len($name()) > 0 then 'none' else 'part'#</hide> + </param> + + <param> + <name>Number of Points</name> + <key>size</key> + <value>1024</value> + <type>int</type> + </param> + + <param> + <name>Number of Bins</name> + <key>bins</key> + <value>100</value> + <type>int</type> + </param> + + <param> + <name>Grid</name> + <key>grid</key> + <value>False</value> + <type>enum</type> + <hide>part</hide> + <option> + <name>Yes</name> + <key>True</key> + </option> + <option> + <name>No</name> + <key>False</key> + </option> + </param> + <param> + <name>Autoscale</name> + <key>autoscale</key> + <value>True</value> + <type>enum</type> + <option> + <name>Yes</name> + <key>True</key> + </option> + <option> + <name>No</name> + <key>False</key> + </option> + </param> + + <param> + <name>Accumulate</name> + <key>accum</key> + <value>False</value> + <type>enum</type> + <option> + <name>Yes</name> + <key>True</key> + </option> + <option> + <name>No</name> + <key>False</key> + </option> + </param> + + <param> + <name>Min x-axis</name> + <key>xmin</key> + <value>-1</value> + <type>real</type> + </param> + + <param> + <name>Max x-axis</name> + <key>xmax</key> + <value>1</value> + <type>real</type> + </param> + + <param> + <name>Number of Inputs</name> + <key>nconnections</key> + <value>1</value> + <type>int</type> + <hide>part</hide> + </param> + + <param> + <name>Update Period</name> + <key>update_time</key> + <value>0.10</value> + <type>float</type> + <hide>part</hide> + </param> + + <param> + <name>GUI Hint</name> + <key>gui_hint</key> + <value></value> + <type>gui_hint</type> + <hide>part</hide> + </param> <param> <name>Line 1 Label</name> diff --git a/gr-qtgui/grc/qtgui_label.xml b/gr-qtgui/grc/qtgui_label.xml index 40cf3859a3..0d844a1ab4 100644 --- a/gr-qtgui/grc/qtgui_label.xml +++ b/gr-qtgui/grc/qtgui_label.xml @@ -5,61 +5,83 @@ ## a gui static text form ################################################### --> + <block> - <name>QT GUI Label</name> - <key>variable_qtgui_label</key> - <import>from PyQt4 import Qt</import> - <import>from gnuradio import eng_notation</import> - <var_make>self.$(id) = $(id) = $value</var_make> - <make>#set $win = 'self._%s_tool_bar'%$id + <name>QT GUI Label</name> + <key>variable_qtgui_label</key> + <import>from PyQt4 import Qt</import> + <import>from gnuradio import eng_notation</import> + <var_make>self.$(id) = $(id) = $value</var_make> + <make>#set $win = 'self._%s_tool_bar'%$id $win = Qt.QToolBar(self) #if not $label() #set $label = '"%s"'%$id #end if + +if $(formatter): + self._$(id)_formatter = $formatter +else: + self._$(id)_formatter = lambda x: x + $(win).addWidget(Qt.QLabel($label+": ")) -self._$(id)_label = Qt.QLabel(str(self.$id)) +self._$(id)_label = Qt.QLabel(str(self._$(id)_formatter(self.$id))) self._$(id)_tool_bar.addWidget(self._$(id)_label) -$(gui_hint()($win))</make> - <callback>self.set_$(id)($value)</callback> - <callback>Qt.QMetaObject.invokeMethod(self._$(id)_label, "setText", Qt.Q_ARG("QString", $(type.str)($id)))</callback> - <param> - <name>Label</name> - <key>label</key> - <value></value> - <type>string</type> - <hide>#if $label() then 'none' else 'part'#</hide> - </param> - <param> - <name>Type</name> - <key>type</key> - <value>int</value> - <type>enum</type> - <hide>part</hide> - <option><name>Float</name><key>real</key><opt>conv:eng_notation.str_to_num</opt><opt>str:eng_notation.num_to_str</opt></option> - <option><name>Integer</name><key>int</key><opt>conv:int</opt><opt>str:str</opt></option> - <option><name>String</name><key>string</key><opt>conv:str</opt><opt>str:str</opt></option> - <option><name>Boolean</name><key>bool</key><opt>conv:bool</opt><opt>str:str</opt></option> - <option><name>Any</name><key>raw</key><opt>conv:eval</opt><opt>str:repr</opt></option> - </param> - <param> - <name>Default Value</name> - <key>value</key> - <value>0</value> - <type>$type</type> - </param> - <param> - <name>GUI Hint</name> - <key>gui_hint</key> - <value></value> - <type>gui_hint</type> - <hide>part</hide> - </param> - <doc> +$(gui_hint()($win)) + </make> + + <callback>self.set_$(id)(self._$(id)_formatter($value))</callback> + <callback>Qt.QMetaObject.invokeMethod(self._$(id)_label, "setText", Qt.Q_ARG("QString", $(type.str)($id)))</callback> + + <param> + <name>Label</name> + <key>label</key> + <value></value> + <type>string</type> + <hide>#if $label() then 'none' else 'part'#</hide> + </param> + + <param> + <name>Type</name> + <key>type</key> + <value>int</value> + <type>enum</type> + <hide>part</hide> + <option><name>Float</name><key>real</key><opt>conv:eng_notation.str_to_num</opt><opt>str:eng_notation.num_to_str</opt></option> + <option><name>Integer</name><key>int</key><opt>conv:int</opt><opt>str:str</opt></option> + <option><name>String</name><key>string</key><opt>conv:str</opt><opt>str:str</opt></option> + <option><name>Boolean</name><key>bool</key><opt>conv:bool</opt><opt>str:str</opt></option> + <option><name>Any</name><key>raw</key><opt>conv:eval</opt><opt>str:repr</opt></option> + </param> + + <param> + <name>Default Value</name> + <key>value</key> + <value>0</value> + <type>$type</type> + </param> + + <param> + <name>Formatter</name> + <key>formatter</key> + <value>None</value> + <type>raw</type> + <hide>part</hide> + </param> + + <param> + <name>GUI Hint</name> + <key>gui_hint</key> + <value></value> + <type>gui_hint</type> + <hide>part</hide> + </param> + + <doc> This block creates a variable with a label widget for text. \ Leave the label blank to use the variable id as the label. The GUI hint can be used to position the widget within the application. \ The hint is of the form [tab_id@tab_index]: [row, col, row_span, col_span]. \ Both the tab specification and the grid position are optional. - </doc> + </doc> </block> diff --git a/gr-qtgui/grc/qtgui_number_sink.xml b/gr-qtgui/grc/qtgui_number_sink.xml index af74bca0bf..e7b232e36f 100644 --- a/gr-qtgui/grc/qtgui_number_sink.xml +++ b/gr-qtgui/grc/qtgui_number_sink.xml @@ -18,11 +18,16 @@ qtgui.number_sink( $nconnections ) self.$(id).set_update_time($update_time) +self.$(id).set_title($name) labels = [$label1, $label2, $label3, $label4, $label5, $label6, $label7, $label8, $label9, $label10] +units = [$unit1, $unit2, $unit3, $unit4, $unit5, + $unit6, $unit7, $unit8, $unit9, $unit10] colors = [$color1, $color2, $color3, $color4, $color5, $color6, $color7, $color8, $color9, $color10] +factor = [$factor1, $factor2, $factor3, $factor4, $factor5, + $factor6, $factor7, $factor8, $factor9, $factor10] for i in xrange($nconnections): self.$(id).set_min(i, $min) self.$(id).set_max(i, $max) @@ -31,6 +36,8 @@ for i in xrange($nconnections): self.$(id).set_label(i, "Data {0}".format(i)) else: self.$(id).set_label(i, labels[i]) + self.$(id).set_unit(i, units[i]) + self.$(id).set_factor(i, factor[i]) self.$(id).enable_autoscale($autoscale) self._$(id)_win = sip.wrapinstance(self.$(id).pyqwidget(), Qt.QWidget) @@ -43,6 +50,14 @@ $(gui_hint()($win))</make> </param_tab_order> <param> + <name>Name</name> + <key>name</key> + <value>""</value> + <type>string</type> + <hide>#if len($name()) > 0 then 'none' else 'part'#</hide> + </param> + + <param> <name>Input Type</name> <key>type</key> <type>enum</type> @@ -162,6 +177,14 @@ $(gui_hint()($win))</make> </param> <param> + <name>Line 1 Unit</name> + <key>unit1</key> + <type>string</type> + <hide>#if int($nconnections()) >= 1 then 'part' else 'all'#</hide> + <tab>Config</tab> + </param> + + <param> <name>Line 1 Color</name> <key>color1</key> <type>enum</type> @@ -189,6 +212,15 @@ $(gui_hint()($win))</make> <tab>Config</tab> </param> + <param> + <name>Line 1 Factor</name> + <key>factor1</key> + <value>1</value> + <type>float</type> + <hide>#if int($nconnections()) >= 1 then 'part' else 'all'#</hide> + <tab>Config</tab> + </param> + <param> <base_key>label1</base_key> @@ -198,12 +230,26 @@ $(gui_hint()($win))</make> </param> <param> + <base_key>unit1</base_key> + <name>Line 2 Unit</name> + <key>unit2</key> + <hide>#if int($nconnections()) >= 2 then 'part' else 'all'#</hide> + </param> + + <param> <base_key>color1</base_key> <name>Line 2 Color</name> <key>color2</key> <hide>#if int($nconnections()) >= 2 then 'part' else 'all'#</hide> </param> + <param> + <base_key>factor1</base_key> + <name>Line 2 Factor</name> + <key>factor2</key> + <hide>#if int($nconnections()) >= 2 then 'part' else 'all'#</hide> + </param> + <param> <base_key>label1</base_key> @@ -213,12 +259,26 @@ $(gui_hint()($win))</make> </param> <param> + <base_key>unit1</base_key> + <name>Line 3 Unit</name> + <key>unit3</key> + <hide>#if int($nconnections()) >= 3 then 'part' else 'all'#</hide> + </param> + + <param> <base_key>color1</base_key> <name>Line 3 Color</name> <key>color3</key> <hide>#if int($nconnections()) >= 3 then 'part' else 'all'#</hide> </param> + <param> + <base_key>factor1</base_key> + <name>Line 3 Factor</name> + <key>factor3</key> + <hide>#if int($nconnections()) >= 3 then 'part' else 'all'#</hide> + </param> + <param> <base_key>label1</base_key> @@ -228,12 +288,26 @@ $(gui_hint()($win))</make> </param> <param> + <base_key>unit1</base_key> + <name>Line 4 Unit</name> + <key>unit4</key> + <hide>#if int($nconnections()) >= 4 then 'part' else 'all'#</hide> + </param> + + <param> <base_key>color1</base_key> <name>Line 4 Color</name> <key>color4</key> <hide>#if int($nconnections()) >= 4 then 'part' else 'all'#</hide> </param> + <param> + <base_key>factor1</base_key> + <name>Line 4 Factor</name> + <key>factor4</key> + <hide>#if int($nconnections()) >= 4 then 'part' else 'all'#</hide> + </param> + <param> <base_key>label1</base_key> @@ -243,12 +317,26 @@ $(gui_hint()($win))</make> </param> <param> + <base_key>unit1</base_key> + <name>Line 5 Unit</name> + <key>unit5</key> + <hide>#if int($nconnections()) >= 5 then 'part' else 'all'#</hide> + </param> + + <param> <base_key>color1</base_key> <name>Line 5 Color</name> <key>color5</key> <hide>#if int($nconnections()) >= 5 then 'part' else 'all'#</hide> </param> + <param> + <base_key>factor1</base_key> + <name>Line 5 Factor</name> + <key>factor5</key> + <hide>#if int($nconnections()) >= 5 then 'part' else 'all'#</hide> + </param> + <param> <base_key>label1</base_key> @@ -258,12 +346,26 @@ $(gui_hint()($win))</make> </param> <param> + <base_key>unit1</base_key> + <name>Line 6 Unit</name> + <key>unit6</key> + <hide>#if int($nconnections()) >= 6 then 'part' else 'all'#</hide> + </param> + + <param> <base_key>color1</base_key> <name>Line 6 Color</name> <key>color6</key> <hide>#if int($nconnections()) >= 6 then 'part' else 'all'#</hide> </param> + <param> + <base_key>factor1</base_key> + <name>Line 6 Factor</name> + <key>factor6</key> + <hide>#if int($nconnections()) >= 6 then 'part' else 'all'#</hide> + </param> + <param> <base_key>label1</base_key> @@ -273,12 +375,26 @@ $(gui_hint()($win))</make> </param> <param> + <base_key>unit1</base_key> + <name>Line 7 Unit</name> + <key>unit7</key> + <hide>#if int($nconnections()) >= 7 then 'part' else 'all'#</hide> + </param> + + <param> <base_key>color1</base_key> <name>Line 7 Color</name> <key>color7</key> <hide>#if int($nconnections()) >= 7 then 'part' else 'all'#</hide> </param> + <param> + <base_key>factor1</base_key> + <name>Line 7 Factor</name> + <key>factor7</key> + <hide>#if int($nconnections()) >= 7 then 'part' else 'all'#</hide> + </param> + <param> <base_key>label1</base_key> @@ -288,12 +404,26 @@ $(gui_hint()($win))</make> </param> <param> + <base_key>unit1</base_key> + <name>Line 8 Unit</name> + <key>unit8</key> + <hide>#if int($nconnections()) >= 8 then 'part' else 'all'#</hide> + </param> + + <param> <base_key>color1</base_key> <name>Line 8 Color</name> <key>color8</key> <hide>#if int($nconnections()) >= 8 then 'part' else 'all'#</hide> </param> + <param> + <base_key>factor1</base_key> + <name>Line 8 Factor</name> + <key>factor8</key> + <hide>#if int($nconnections()) >= 8 then 'part' else 'all'#</hide> + </param> + <param> <base_key>label1</base_key> @@ -303,12 +433,26 @@ $(gui_hint()($win))</make> </param> <param> + <base_key>unit1</base_key> + <name>Line 9 Unit</name> + <key>unit9</key> + <hide>#if int($nconnections()) >= 9 then 'part' else 'all'#</hide> + </param> + + <param> <base_key>color1</base_key> <name>Line 9 Color</name> <key>color9</key> <hide>#if int($nconnections()) >= 9 then 'part' else 'all'#</hide> </param> + <param> + <base_key>factor1</base_key> + <name>Line 9 Factor</name> + <key>factor9</key> + <hide>#if int($nconnections()) >= 9 then 'part' else 'all'#</hide> + </param> + <param> <base_key>label1</base_key> @@ -318,12 +462,26 @@ $(gui_hint()($win))</make> </param> <param> + <base_key>unit1</base_key> + <name>Line 10 Unit</name> + <key>unit10</key> + <hide>#if int($nconnections()) >= 10 then 'part' else 'all'#</hide> + </param> + + <param> <base_key>color1</base_key> <name>Line 10 Color</name> <key>color10</key> <hide>#if int($nconnections()) >= 10 then 'part' else 'all'#</hide> </param> + <param> + <base_key>factor1</base_key> + <name>Line 10 Factor</name> + <key>factor10</key> + <hide>#if int($nconnections()) >= 10 then 'part' else 'all'#</hide> + </param> + <sink> <name>in</name> diff --git a/gr-qtgui/grc/qtgui_sink_x.xml b/gr-qtgui/grc/qtgui_sink_x.xml index 618973ed59..7488ea59d8 100644 --- a/gr-qtgui/grc/qtgui_sink_x.xml +++ b/gr-qtgui/grc/qtgui_sink_x.xml @@ -5,13 +5,13 @@ ################################################### --> <block> - <name>QT GUI Sink</name> - <key>qtgui_sink_x</key> - <import>from PyQt4 import Qt</import> - <import>from gnuradio import qtgui</import> - <import>from gnuradio.filter import firdes</import> - <import>import sip</import> - <make>#set $win = 'self._%s_win'%$id + <name>QT GUI Sink</name> + <key>qtgui_sink_x</key> + <import>from PyQt4 import Qt</import> + <import>from gnuradio import qtgui</import> + <import>from gnuradio.filter import firdes</import> + <import>import sip</import> + <make>#set $win = 'self._%s_win'%$id qtgui.$(type.fcn)( $fftsize, \#fftsize $wintype, \#wintype @@ -36,162 +36,192 @@ def $(id)_callback(p, num): Qt.QObject.connect(self._$(id)_win, Qt.SIGNAL("plotPointSelected(QPointF, int)"), $(id)_callback ) #end if -</make> - <callback>set_frequency_range($fc, $bw)</callback> - <param> - <name>Type</name> - <key>type</key> - <value>complex</value> - <type>enum</type> - <option><name>Complex</name><key>complex</key><opt>fcn:sink_c</opt></option> - <option><name>Float</name><key>float</key><opt>fcn:sink_f</opt></option> - </param> - <param> - <name>Name</name> - <key>name</key> - <value>""</value> - <type>string</type> - <hide>#if len($name()) > 0 then 'none' else 'part'#</hide> - </param> - <param> - <name>FFT Size</name> - <key>fftsize</key> - <value>1024</value> - <type>int</type> - </param> - <param> - <name>Window Type</name> - <key>wintype</key> - <value>firdes.WIN_BLACKMAN_hARRIS</value> - <type>int</type> - <hide>part</hide> - <option> - <name>Blackman-harris</name> - <key>firdes.WIN_BLACKMAN_hARRIS</key> - </option> - <option> - <name>Hamming</name> - <key>firdes.WIN_HAMMING</key> - </option> - <option> - <name>Hann</name> - <key>firdes.WIN_HANN</key> - </option> - <option> - <name>Blackman</name> - <key>firdes.WIN_BLACKMAN</key> - </option> - <option> - <name>Rectangular</name> - <key>firdes.WIN_RECTANGULAR</key> - </option> - <option> - <name>Kaiser</name> - <key>firdes.WIN_KAISER</key> - </option> - </param> - <param> - <name>Center Frequency (Hz)</name> - <key>fc</key> - <value>0</value> - <type>real</type> - </param> - <param> - <name>Bandwidth (Hz)</name> - <key>bw</key> - <value>samp_rate</value> - <type>real</type> - </param> - <param> - <name>Update Rate</name> - <key>rate</key> - <value>10</value> - <type>real</type> - </param> - - <param> - <name>Show RF Freq</name> - <key>showrf</key> - <value>False</value> - <type>enum</type> - <hide>part</hide> - <option> - <name>Yes</name> - <key>True</key> - </option> - <option> - <name>No</name> - <key>False</key> - </option> - </param> - - <param> - <name>Plot Frequency</name> - <key>plotfreq</key> - <value>True</value> - <type>bool</type> - <hide>part</hide> - <option><name>On</name><key>True</key></option> - <option><name>Off</name><key>False</key></option> - </param> - <param> - <name>Plot Waterfall</name> - <key>plotwaterfall</key> - <value>True</value> - <type>bool</type> - <hide>part</hide> - <option><name>On</name><key>True</key></option> - <option><name>Off</name><key>False</key></option> - </param> - <param> - <name>Plot Time</name> - <key>plottime</key> - <value>True</value> - <type>bool</type> - <hide>part</hide> - <option><name>On</name><key>True</key></option> - <option><name>Off</name><key>False</key></option> - </param> - <param> - <name>Plot Const</name> - <key>plotconst</key> - <value>True</value> - <type>bool</type> - <hide>part</hide> - <option><name>On</name><key>True</key></option> - <option><name>Off</name><key>False</key></option> - </param> - <param> - <name>GUI Hint</name> - <key>gui_hint</key> - <value></value> - <type>gui_hint</type> - <hide>part</hide> - </param> - <param> - <name>Clicked freq variable</name> - <key>freqchangevar</key> - <value>None</value> - <type>raw</type> - <hide>part</hide> - </param> - - <sink> - <name>in</name> - <type>$type</type> - <nports>$num_inputs</nports> - </sink> + </make> + <callback>set_frequency_range($fc, $bw)</callback> + + <param> + <name>Type</name> + <key>type</key> + <value>complex</value> + <type>enum</type> + <option><name>Complex</name><key>complex</key><opt>fcn:sink_c</opt></option> + <option><name>Float</name><key>float</key><opt>fcn:sink_f</opt></option> + </param> + + <param> + <name>Name</name> + <key>name</key> + <value>""</value> + <type>string</type> + <hide>#if len($name()) > 0 then 'none' else 'part'#</hide> + </param> + + <param> + <name>FFT Size</name> + <key>fftsize</key> + <value>1024</value> + <type>int</type> + </param> + + <param> + <name>Window Type</name> + <key>wintype</key> + <value>firdes.WIN_BLACKMAN_hARRIS</value> + <type>int</type> + <hide>part</hide> + <option> + <name>Blackman-harris</name> + <key>firdes.WIN_BLACKMAN_hARRIS</key> + </option> + <option> + <name>Hamming</name> + <key>firdes.WIN_HAMMING</key> + </option> + <option> + <name>Hann</name> + <key>firdes.WIN_HANN</key> + </option> + <option> + <name>Blackman</name> + <key>firdes.WIN_BLACKMAN</key> + </option> + <option> + <name>Rectangular</name> + <key>firdes.WIN_RECTANGULAR</key> + </option> + <option> + <name>Kaiser</name> + <key>firdes.WIN_KAISER</key> + </option> + </param> + + <param> + <name>Center Frequency (Hz)</name> + <key>fc</key> + <value>0</value> + <type>real</type> + </param> + + <param> + <name>Bandwidth (Hz)</name> + <key>bw</key> + <value>samp_rate</value> + <type>real</type> + </param> + + <param> + <name>Update Rate</name> + <key>rate</key> + <value>10</value> + <type>real</type> + </param> + + <param> + <name>Show RF Freq</name> + <key>showrf</key> + <value>False</value> + <type>enum</type> + <hide>part</hide> + <option> + <name>Yes</name> + <key>True</key> + </option> + <option> + <name>No</name> + <key>False</key> + </option> + </param> + + <param> + <name>Plot Frequency</name> + <key>plotfreq</key> + <value>True</value> + <type>bool</type> + <hide>part</hide> + <option><name>On</name><key>True</key></option> + <option><name>Off</name><key>False</key></option> + </param> + + <param> + <name>Plot Waterfall</name> + <key>plotwaterfall</key> + <value>True</value> + <type>bool</type> + <hide>part</hide> + <option><name>On</name><key>True</key></option> + <option><name>Off</name><key>False</key></option> + </param> + + <param> + <name>Plot Time</name> + <key>plottime</key> + <value>True</value> + <type>bool</type> + <hide>part</hide> + <option><name>On</name><key>True</key></option> + <option><name>Off</name><key>False</key></option> + </param> + + <param> + <name>Plot Const</name> + <key>plotconst</key> + <value>True</value> + <type>bool</type> + <hide>part</hide> + <option><name>On</name><key>True</key></option> + <option><name>Off</name><key>False</key></option> + </param> + + <param> + <name>GUI Hint</name> + <key>gui_hint</key> + <value></value> + <type>gui_hint</type> + <hide>part</hide> + </param> + + <param> + <name>Clicked freq variable</name> + <key>freqchangevar</key> + <value>None</value> + <type>raw</type> + <hide>part</hide> + </param> + + <param> + <name>Show Msg Ports</name> + <key>showports</key> + <value>True</value> + <type>enum</type> + <hide>part</hide> + <option> + <name>Yes</name> + <key>False</key> + </option> + <option> + <name>No</name> + <key>True</key> + </option> + </param> + + <sink> + <name>in</name> + <type>$type</type> + <nports>$num_inputs</nports> + </sink> <sink> <name>freq</name> <type>message</type> <optional>1</optional> + <hide>$showports</hide> </sink> <source> <name>freq</name> <type>message</type> <optional>1</optional> + <hide>$showports</hide> </source> <doc> diff --git a/gr-qtgui/grc/qtgui_time_raster_x.xml b/gr-qtgui/grc/qtgui_time_raster_x.xml index d303e7f42a..16619cb1e9 100644 --- a/gr-qtgui/grc/qtgui_time_raster_x.xml +++ b/gr-qtgui/grc/qtgui_time_raster_x.xml @@ -5,12 +5,12 @@ ################################################### --> <block> - <name>QT GUI Time Raster Sink</name> - <key>qtgui_time_raster_sink_x</key> - <import>from PyQt4 import Qt</import> - <import>from gnuradio import qtgui</import> - <import>import sip</import> - <make>#set $win = 'self._%s_win'%$id + <name>QT GUI Time Raster Sink</name> + <key>qtgui_time_raster_sink_x</key> + <import>from PyQt4 import Qt</import> + <import>from gnuradio import qtgui</import> + <import>import sip</import> + <make>#set $win = 'self._%s_win'%$id qtgui.$(type.fcn)( $samp_rate, $nrows, @@ -22,6 +22,8 @@ qtgui.$(type.fcn)( ) self.$(id).set_update_time($update_time) +self.$(id).set_intensity_range($zmin, $zmax) +self.$(id).enable_grid($grid) labels = [$label1, $label2, $label3, $label4, $label5, $label6, $label7, $label8, $label9, $label10] @@ -39,87 +41,126 @@ for i in xrange($nconnections): self._$(id)_win = sip.wrapinstance(self.$(id).pyqwidget(), Qt.QWidget) $(gui_hint()($win))</make> - <callback>set_num_rows($nrows)</callback> - <callback>set_num_cols($ncols)</callback> - <callback>set_multiplier($mult)</callback> - <callback>set_offset($offset)</callback> - <callback>set_update_time($update_time)</callback> - <callback>set_title($which, $title)</callback> - <callback>set_color($which, $color)</callback> - - <param_tab_order> - <tab>General</tab> - <tab>Config</tab> - </param_tab_order> - - <param> - <name>Type</name> - <key>type</key> - <value>complex</value> - <type>enum</type> - <option><name>Byte</name><key>byte</key><opt>fcn:time_raster_sink_b</opt></option> - <option><name>Float</name><key>float</key><opt>fcn:time_raster_sink_f</opt></option> - </param> - - <param> - <name>Name</name> - <key>name</key> - <value>""</value> - <type>string</type> - <hide>#if len($name()) > 0 then 'none' else 'part'#</hide> - </param> - - <param> - <name>Sample Rate</name> - <key>samp_rate</key> - <value>samp_rate</value> - <type>real</type> - </param> - <param> - <name>Num. Rows</name> - <key>nrows</key> - <type>int</type> - </param> - <param> - <name>Num. Cols</name> - <key>ncols</key> - <type>int</type> - </param> - <param> - <name>Multiplier</name> - <key>mult</key> - <value>[]</value> - <type>real_vector</type> - <hide>part</hide> - </param> - <param> - <name>Offset</name> - <key>offset</key> - <value>[]</value> - <type>real_vector</type> - <hide>part</hide> - </param> - <param> - <name>Number of Inputs</name> - <key>nconnections</key> - <value>1</value> - <type>int</type> - <hide>part</hide> - </param> - <param> - <name>Update Period</name> - <key>update_time</key> - <value>0.10</value> - <type>real</type> - <hide>part</hide> - </param> - <param> - <name>GUI Hint</name> - <key>gui_hint</key> - <value></value> - <type>gui_hint</type> - <hide>part</hide> - </param> + <callback>set_num_rows($nrows)</callback> + <callback>set_num_cols($ncols)</callback> + <callback>set_multiplier($mult)</callback> + <callback>set_offset($offset)</callback> + <callback>set_update_time($update_time)</callback> + <callback>set_title($which, $title)</callback> + <callback>set_color($which, $color)</callback> + + <param_tab_order> + <tab>General</tab> + <tab>Config</tab> + </param_tab_order> + + <param> + <name>Type</name> + <key>type</key> + <value>complex</value> + <type>enum</type> + <option><name>Byte</name><key>byte</key><opt>fcn:time_raster_sink_b</opt></option> + <option><name>Float</name><key>float</key><opt>fcn:time_raster_sink_f</opt></option> + </param> + + <param> + <name>Name</name> + <key>name</key> + <value>""</value> + <type>string</type> + <hide>#if len($name()) > 0 then 'none' else 'part'#</hide> + </param> + + <param> + <name>Sample Rate</name> + <key>samp_rate</key> + <value>samp_rate</value> + <type>real</type> + </param> + + <param> + <name>Num. Rows</name> + <key>nrows</key> + <type>int</type> + </param> + + <param> + <name>Num. Cols</name> + <key>ncols</key> + <type>int</type> + </param> + + <param> + <name>Grid</name> + <key>grid</key> + <value>False</value> + <type>enum</type> + <hide>part</hide> + <option> + <name>Yes</name> + <key>True</key> + </option> + <option> + <name>No</name> + <key>False</key> + </option> + </param> + + <param> + <name>Int. min</name> + <key>zmin</key> + <value>-1</value> + <type>real</type> + <hide>part</hide> + </param> + + <param> + <name>Int. max</name> + <key>zmax</key> + <value>1</value> + <type>real</type> + <hide>part</hide> + </param> + + <param> + <name>Multiplier</name> + <key>mult</key> + <value>[]</value> + <type>real_vector</type> + <hide>part</hide> + </param> + + <param> + <name>Offset</name> + <key>offset</key> + <value>[]</value> + <type>real_vector</type> + <hide>part</hide> + </param> + + <param> + <name>Number of Inputs</name> + <key>nconnections</key> + <value>1</value> + <type>int</type> + <hide>part</hide> + </param> + + <param> + <name>Update Period</name> + <key>update_time</key> + <value>0.10</value> + <type>real</type> + <hide>part</hide> + </param> + + <param> + <name>GUI Hint</name> + <key>gui_hint</key> + <value></value> + <type>gui_hint</type> + <hide>part</hide> + </param> <param> diff --git a/gr-qtgui/grc/qtgui_time_sink_x.xml b/gr-qtgui/grc/qtgui_time_sink_x.xml index f40487e61f..2d1cc6552e 100644 --- a/gr-qtgui/grc/qtgui_time_sink_x.xml +++ b/gr-qtgui/grc/qtgui_time_sink_x.xml @@ -20,9 +20,13 @@ qtgui.$(type.fcn)( ) self.$(id).set_update_time($update_time) self.$(id).set_y_axis($ymin, $ymax) + +self.$(id).set_y_label($ylabel, $yunit) + self.$(id).enable_tags(-1, $entags) self.$(id).set_trigger_mode($tr_mode, $tr_slope, $tr_level, $tr_delay, $tr_chan, $tr_tag) self.$(id).enable_autoscale($autoscale) +self.$(id).enable_grid($grid) labels = [$label1, $label2, $label3, $label4, $label5, $label6, $label7, $label8, $label9, $label10] @@ -97,6 +101,22 @@ $(gui_hint()($win))</make> </param> <param> + <name>Y Axis Label</name> + <key>ylabel</key> + <value>Amplitude</value> + <type>string</type> + <hide>part</hide> + </param> + + <param> + <name>Y Axis Unit</name> + <key>yunit</key> + <value>""</value> + <type>string</type> + <hide>part</hide> + </param> + + <param> <name>Number of Points</name> <key>size</key> <value>1024</value> @@ -110,6 +130,22 @@ $(gui_hint()($win))</make> </param> <param> + <name>Grid</name> + <key>grid</key> + <value>False</value> + <type>enum</type> + <hide>part</hide> + <option> + <name>Yes</name> + <key>True</key> + </option> + <option> + <name>No</name> + <key>False</key> + </option> + </param> + + <param> <name>Autoscale</name> <key>autoscale</key> <value>False</value> diff --git a/gr-qtgui/grc/qtgui_waterfall_sink_x.xml b/gr-qtgui/grc/qtgui_waterfall_sink_x.xml index 36df704a3e..d6e0f5911b 100644 --- a/gr-qtgui/grc/qtgui_waterfall_sink_x.xml +++ b/gr-qtgui/grc/qtgui_waterfall_sink_x.xml @@ -21,6 +21,7 @@ qtgui.$(type.fcn)( $nconnections \#number of inputs ) self.$(id).set_update_time($update_time) +self.$(id).enable_grid($grid) labels = [$label1, $label2, $label3, $label4, $label5, $label6, $label7, $label8, $label9, $label10] @@ -51,115 +52,150 @@ $(gui_hint()($win))</make> <tab>Config</tab> </param_tab_order> - <param> - <name>Type</name> - <key>type</key> - <value>complex</value> - <type>enum</type> - <option><name>Complex</name><key>complex</key><opt>fcn:waterfall_sink_c</opt></option> - <option><name>Float</name><key>float</key><opt>fcn:waterfall_sink_f</opt></option> - </param> - - <param> - <name>Name</name> - <key>name</key> - <value>""</value> - <type>string</type> - <hide>#if len($name()) > 0 then 'none' else 'part'#</hide> - </param> - - <param> - <name>FFT Size</name> - <key>fftsize</key> - <value>1024</value> - <type>int</type> - </param> - <param> - <name>Window Type</name> - <key>wintype</key> - <value>firdes.WIN_BLACKMAN_hARRIS</value> - <type>int</type> - <hide>part</hide> - <option> - <name>Blackman-harris</name> - <key>firdes.WIN_BLACKMAN_hARRIS</key> - </option> - <option> - <name>Hamming</name> - <key>firdes.WIN_HAMMING</key> - </option> - <option> - <name>Hann</name> - <key>firdes.WIN_HANN</key> - </option> - <option> - <name>Blackman</name> - <key>firdes.WIN_BLACKMAN</key> - </option> - <option> - <name>Rectangular</name> + <param> + <name>Type</name> + <key>type</key> + <value>complex</value> + <type>enum</type> + <option><name>Complex</name><key>complex</key><opt>fcn:waterfall_sink_c</opt></option> + <option><name>Float</name><key>float</key><opt>fcn:waterfall_sink_f</opt></option> + </param> + + <param> + <name>Name</name> + <key>name</key> + <value>""</value> + <type>string</type> + <hide>#if len($name()) > 0 then 'none' else 'part'#</hide> + </param> + + <param> + <name>FFT Size</name> + <key>fftsize</key> + <value>1024</value> + <type>int</type> + </param> + + <param> + <name>Window Type</name> + <key>wintype</key> + <value>firdes.WIN_BLACKMAN_hARRIS</value> + <type>int</type> + <hide>part</hide> + <option> + <name>Blackman-harris</name> + <key>firdes.WIN_BLACKMAN_hARRIS</key> + </option> + <option> + <name>Hamming</name> + <key>firdes.WIN_HAMMING</key> + </option> + <option> + <name>Hann</name> + <key>firdes.WIN_HANN</key> + </option> + <option> + <name>Blackman</name> + <key>firdes.WIN_BLACKMAN</key> + </option> + <option> + <name>Rectangular</name> <key>firdes.WIN_RECTANGULAR</key> - </option> - <option> - <name>Kaiser</name> - <key>firdes.WIN_KAISER</key> - </option> - <option> - <name>Flat-top</name> - <key>firdes.WIN_FLATTOP</key> - </option> - </param> - <param> - <name>Center Frequency (Hz)</name> - <key>fc</key> - <value>0</value> - <type>real</type> - </param> - <param> - <name>Bandwidth (Hz)</name> - <key>bw</key> - <value>samp_rate</value> - <type>real</type> - </param> - - <param> - <name>Intensity Min</name> - <key>int_min</key> - <value>-140</value> - <type>float</type> - <hide>part</hide> - </param> - - <param> - <name>Intensity Max</name> - <key>int_max</key> - <value>10</value> - <type>float</type> - <hide>part</hide> - </param> - - <param> - <name>Number of Inputs</name> - <key>nconnections</key> - <value>1</value> - <type>int</type> - <hide>part</hide> - </param> - <param> - <name>Update Period</name> - <key>update_time</key> - <value>0.10</value> - <type>real</type> - <hide>part</hide> - </param> - <param> - <name>GUI Hint</name> - <key>gui_hint</key> - <value></value> - <type>gui_hint</type> - <hide>part</hide> - </param> + </option> + <option> + <name>Kaiser</name> + <key>firdes.WIN_KAISER</key> + </option> + <option> + <name>Flat-top</name> + <key>firdes.WIN_FLATTOP</key> + </option> + </param> + + <param> + <name>Center Frequency (Hz)</name> + <key>fc</key> + <value>0</value> + <type>real</type> + </param> + + <param> + <name>Bandwidth (Hz)</name> + <key>bw</key> + <value>samp_rate</value> + <type>real</type> + </param> + + <param> + <name>Intensity Min</name> + <key>int_min</key> + <value>-140</value> + <type>float</type> + <hide>part</hide> + </param> + + <param> + <name>Intensity Max</name> + <key>int_max</key> + <value>10</value> + <type>float</type> + <hide>part</hide> + </param> + + <param> + <name>Grid</name> + <key>grid</key> + <value>False</value> + <type>enum</type> + <hide>part</hide> + <option> + <name>Yes</name> + <key>True</key> + </option> + <option> + <name>No</name> + <key>False</key> + </option> + </param> + + <param> + <name>Number of Inputs</name> + <key>nconnections</key> + <value>1</value> + <type>int</type> + <hide>part</hide> + </param> + + <param> + <name>Update Period</name> + <key>update_time</key> + <value>0.10</value> + <type>real</type> + <hide>part</hide> + </param> + <param> + <name>GUI Hint</name> + <key>gui_hint</key> + <value></value> + <type>gui_hint</type> + <hide>part</hide> + </param> + <param> + <name>Show Msg Ports</name> + <key>showports</key> + <value>True</value> + <type>enum</type> + <hide>part</hide> + <option> + <name>Yes</name> + <key>False</key> + </option> + <option> + <name>No</name> + <key>True</key> + </option> + </param> <param> @@ -420,12 +456,14 @@ $(gui_hint()($win))</make> <name>freq</name> <type>message</type> <optional>1</optional> + <hide>$showports</hide> </sink> <source> <name>freq</name> <type>message</type> <optional>1</optional> + <hide>$showports</hide> </source> <doc> diff --git a/gr-qtgui/include/gnuradio/qtgui/FrequencyDisplayPlot.h b/gr-qtgui/include/gnuradio/qtgui/FrequencyDisplayPlot.h index f5e8f0f7ad..ac7dfe8b6d 100644 --- a/gr-qtgui/include/gnuradio/qtgui/FrequencyDisplayPlot.h +++ b/gr-qtgui/include/gnuradio/qtgui/FrequencyDisplayPlot.h @@ -76,6 +76,8 @@ public: void replot(); void setYaxis(double min, double max); + double getYMin() const; + double getYMax() const; void setTraceColour (QColor); void setBGColour (QColor c); diff --git a/gr-qtgui/include/gnuradio/qtgui/TimeDomainDisplayPlot.h b/gr-qtgui/include/gnuradio/qtgui/TimeDomainDisplayPlot.h index 8874a7e6cc..81601cee97 100644 --- a/gr-qtgui/include/gnuradio/qtgui/TimeDomainDisplayPlot.h +++ b/gr-qtgui/include/gnuradio/qtgui/TimeDomainDisplayPlot.h @@ -63,6 +63,9 @@ public slots: void enableTagMarker(int which, bool en); + void setYLabel(const std::string &label, + const std::string &unit=""); + private: void _resetXAxisPoints(); void _autoScale(double bottom, double top); diff --git a/gr-qtgui/include/gnuradio/qtgui/const_sink_c.h b/gr-qtgui/include/gnuradio/qtgui/const_sink_c.h index 84f9a87891..b942032d51 100644 --- a/gr-qtgui/include/gnuradio/qtgui/const_sink_c.h +++ b/gr-qtgui/include/gnuradio/qtgui/const_sink_c.h @@ -132,6 +132,7 @@ namespace gr { virtual void enable_menu(bool en=true) = 0; virtual void enable_autoscale(bool en) = 0; + virtual void enable_grid(bool en) = 0; virtual int nsamps() const = 0; virtual void reset() = 0; diff --git a/gr-qtgui/include/gnuradio/qtgui/form_menus.h b/gr-qtgui/include/gnuradio/qtgui/form_menus.h index d22577ef67..77834062de 100644 --- a/gr-qtgui/include/gnuradio/qtgui/form_menus.h +++ b/gr-qtgui/include/gnuradio/qtgui/form_menus.h @@ -1542,4 +1542,68 @@ private: /********************************************************************/ +class ItemFloatAct: public QAction +{ + Q_OBJECT + +public: + ItemFloatAct(int which, QString title, QWidget *parent) + : QAction(title, parent), d_which(which) + { + d_diag = new QDialog(parent); + d_diag->setWindowTitle(title); + d_diag->setModal(true); + + d_text = new QLineEdit(); + + QGridLayout *layout = new QGridLayout(d_diag); + QPushButton *btn_ok = new QPushButton(tr("OK")); + QPushButton *btn_cancel = new QPushButton(tr("Cancel")); + + layout->addWidget(d_text, 0, 0, 1, 2); + layout->addWidget(btn_ok, 1, 0); + layout->addWidget(btn_cancel, 1, 1); + + connect(btn_ok, SIGNAL(clicked()), this, SLOT(getText())); + connect(btn_cancel, SIGNAL(clicked()), d_diag, SLOT(close())); + + connect(this, SIGNAL(triggered()), this, SLOT(getTextDiag())); + } + + ~ItemFloatAct() + {} + + void setText(float f) + { + d_text->setText(QString("%1").arg(f)); + } + + +signals: + void whichTrigger(int which, float data); + +public slots: + void getTextDiag() + { + d_diag->show(); + } + +private slots: + void getText() + { + emit whichTrigger(d_which, d_text->text().toFloat()); + d_diag->accept(); + } + +private: + int d_which; + QDialog *d_diag; + QLineEdit *d_text; +}; + + + +/********************************************************************/ + + #endif /* FORM_MENUS_H */ diff --git a/gr-qtgui/include/gnuradio/qtgui/freqdisplayform.h b/gr-qtgui/include/gnuradio/qtgui/freqdisplayform.h index c0cd36ef23..7cd077e6f8 100644 --- a/gr-qtgui/include/gnuradio/qtgui/freqdisplayform.h +++ b/gr-qtgui/include/gnuradio/qtgui/freqdisplayform.h @@ -66,6 +66,8 @@ public slots: void setFrequencyRange(const double centerfreq, const double bandwidth); void setYaxis(double min, double max); + void setYMax(const QString &m); + void setYMin(const QString &m); void autoScale(bool en); void clearMaxHold(); void clearMinHold(); diff --git a/gr-qtgui/include/gnuradio/qtgui/number_sink.h b/gr-qtgui/include/gnuradio/qtgui/number_sink.h index a34eab38a5..c814100844 100644 --- a/gr-qtgui/include/gnuradio/qtgui/number_sink.h +++ b/gr-qtgui/include/gnuradio/qtgui/number_sink.h @@ -85,6 +85,9 @@ namespace gr { virtual void set_label(int which, const std::string &label) = 0; virtual void set_min(int which, float min) = 0; virtual void set_max(int which, float max) = 0; + virtual void set_title(const std::string &title) = 0; + virtual void set_unit(int which, const std::string &unit) = 0; + virtual void set_factor(int which, float factor) = 0; virtual float average() const = 0; virtual graph_t graph_type() const = 0; @@ -93,6 +96,9 @@ namespace gr { virtual std::string label(int which) const = 0; virtual float min(int which) const = 0; virtual float max(int which) const = 0; + virtual std::string title() const = 0; + virtual std::string unit(int which) const = 0; + virtual float factor(int which) const = 0; virtual void enable_menu(bool en=true) = 0; virtual void enable_autoscale(bool en=true) = 0; diff --git a/gr-qtgui/include/gnuradio/qtgui/numberdisplayform.h b/gr-qtgui/include/gnuradio/qtgui/numberdisplayform.h index c33f9b455f..6f90766903 100644 --- a/gr-qtgui/include/gnuradio/qtgui/numberdisplayform.h +++ b/gr-qtgui/include/gnuradio/qtgui/numberdisplayform.h @@ -51,6 +51,9 @@ class NumberDisplayForm : public QWidget float updateTime() const; int scaleMin(int which); int scaleMax(int which); + std::string title() const; + std::string unit(int which) const; + float factor(int which) const; public slots: void mousePressEvent(QMouseEvent * e); @@ -71,6 +74,9 @@ public slots: void setScaleMin(int which, int min); void setScaleMax(int which, int max); void autoScale(bool on); + void setTitle(const std::string &title); + void setUnit(int which, const std::string &unit); + void setFactor(int which, float factor); private slots: void newData(const QEvent*); @@ -93,6 +99,7 @@ private: QAction *d_stop_act; QList<QMenu*> d_label_menu; std::vector<LineTitleAction*> d_label_act; + std::vector<ItemFloatAct*> d_factor_act; FFTAverageMenu *d_avg_menu; NumberLayoutMenu *d_layout_menu; std::vector<NumberColorMapMenu*> d_color_menu; @@ -100,6 +107,10 @@ private: QAction *d_autoscale_act; PopupMenu *d_update_time_menu; QAction *d_save_act; + + QLabel *d_title; + std::vector<std::string> d_unit; + std::vector<float> d_factor; }; #endif /* NUMBER_DISPLAY_FORM_H */ diff --git a/gr-qtgui/include/gnuradio/qtgui/time_sink_c.h b/gr-qtgui/include/gnuradio/qtgui/time_sink_c.h index 8ce6e2e84a..84a8a4dd5a 100644 --- a/gr-qtgui/include/gnuradio/qtgui/time_sink_c.h +++ b/gr-qtgui/include/gnuradio/qtgui/time_sink_c.h @@ -78,6 +78,8 @@ namespace gr { #endif virtual void set_y_axis(double min, double max) = 0; + virtual void set_y_label(const std::string &label, + const std::string &unit="") = 0; virtual void set_update_time(double t) = 0; virtual void set_title(const std::string &title) = 0; virtual void set_line_label(int which, const std::string &label) = 0; diff --git a/gr-qtgui/include/gnuradio/qtgui/time_sink_f.h b/gr-qtgui/include/gnuradio/qtgui/time_sink_f.h index 1a0949247f..b39c898e66 100644 --- a/gr-qtgui/include/gnuradio/qtgui/time_sink_f.h +++ b/gr-qtgui/include/gnuradio/qtgui/time_sink_f.h @@ -76,6 +76,8 @@ namespace gr { #endif virtual void set_y_axis(double min, double max) = 0; + virtual void set_y_label(const std::string &label, + const std::string &unit="") = 0; virtual void set_update_time(double t) = 0; virtual void set_title(const std::string &title) = 0; virtual void set_line_label(int which, const std::string &line) = 0; diff --git a/gr-qtgui/include/gnuradio/qtgui/timedisplayform.h b/gr-qtgui/include/gnuradio/qtgui/timedisplayform.h index 7e09e3c428..e52e28c3d6 100644 --- a/gr-qtgui/include/gnuradio/qtgui/timedisplayform.h +++ b/gr-qtgui/include/gnuradio/qtgui/timedisplayform.h @@ -58,6 +58,8 @@ public slots: void setSampleRate(const double samprate); void setSampleRate(const QString &samprate); void setYaxis(double min, double max); + void setYLabel(const std::string &label, + const std::string &unit=""); void setNPoints(const int); void setStem(bool en); void autoScale(bool en); diff --git a/gr-qtgui/include/gnuradio/qtgui/timerasterdisplayform.h b/gr-qtgui/include/gnuradio/qtgui/timerasterdisplayform.h index dff2986cc8..1abc6ebe16 100644 --- a/gr-qtgui/include/gnuradio/qtgui/timerasterdisplayform.h +++ b/gr-qtgui/include/gnuradio/qtgui/timerasterdisplayform.h @@ -72,6 +72,8 @@ public slots: void setIntensityRange(const double minIntensity, const double maxIntensity); + void setMaxIntensity(const QString &m); + void setMinIntensity(const QString &m); void setColorMap(int which, const int newType, @@ -86,8 +88,8 @@ private slots: void newData(const QEvent *updateEvent); private: - double d_min_val; - double d_max_val; + double d_min_val, d_cur_min_val; + double d_max_val, d_cur_max_val; }; #endif /* TIMERASTER_DISPLAY_FORM_H */ diff --git a/gr-qtgui/include/gnuradio/qtgui/waterfalldisplayform.h b/gr-qtgui/include/gnuradio/qtgui/waterfalldisplayform.h index 5af2680b8a..8017d5ce8f 100644 --- a/gr-qtgui/include/gnuradio/qtgui/waterfalldisplayform.h +++ b/gr-qtgui/include/gnuradio/qtgui/waterfalldisplayform.h @@ -75,6 +75,8 @@ public slots: void setIntensityRange(const double minIntensity, const double maxIntensity); + void setMaxIntensity(const QString &m); + void setMinIntensity(const QString &m); void setAlpha(int which, int alpha); @@ -101,8 +103,8 @@ private: bool d_clicked; double d_clicked_freq; - double d_min_val; - double d_max_val; + double d_min_val, d_cur_min_val; + double d_max_val, d_cur_max_val; FFTSizeMenu *d_sizemenu; FFTAverageMenu *d_avgmenu; diff --git a/gr-qtgui/lib/FrequencyDisplayPlot.cc b/gr-qtgui/lib/FrequencyDisplayPlot.cc index 19ebac1a82..12835bcd27 100644 --- a/gr-qtgui/lib/FrequencyDisplayPlot.cc +++ b/gr-qtgui/lib/FrequencyDisplayPlot.cc @@ -262,6 +262,18 @@ FrequencyDisplayPlot::setYaxis(double min, double max) d_zoomer->setZoomBase(); } +double +FrequencyDisplayPlot::getYMin() const +{ + return d_ymin; +} + +double +FrequencyDisplayPlot::getYMax() const +{ + return d_ymax; +} + void FrequencyDisplayPlot::setFrequencyRange(const double centerfreq, const double bandwidth, @@ -438,7 +450,9 @@ void FrequencyDisplayPlot::_autoScale(double bottom, double top) { // Auto scale the y-axis with a margin of 10 dB on either side. - setYaxis(bottom - 10, top + 10); + d_ymin = bottom-10; + d_ymax = top+10; + setYaxis(d_ymin, d_ymax); } void diff --git a/gr-qtgui/lib/TimeDomainDisplayPlot.cc b/gr-qtgui/lib/TimeDomainDisplayPlot.cc index 8c0601a5b5..3fc592481f 100644 --- a/gr-qtgui/lib/TimeDomainDisplayPlot.cc +++ b/gr-qtgui/lib/TimeDomainDisplayPlot.cc @@ -66,7 +66,7 @@ public: #else /* QWT_VERSION < 0x060100 */ TimeDomainDisplayZoomer(QWidget* canvas, const unsigned int timePrecision) #endif /* QWT_VERSION < 0x060100 */ - : QwtPlotZoomer(canvas),TimePrecisionClass(timePrecision) + : QwtPlotZoomer(canvas),TimePrecisionClass(timePrecision),d_yUnitType("V") { setTrackerMode(QwtPicker::AlwaysOn); } @@ -85,23 +85,30 @@ public: d_unitType = type; } + void setYUnitType(const std::string &type) + { + d_yUnitType = type; + } + protected: using QwtPlotZoomer::trackerText; virtual QwtText trackerText( const QPoint& p ) const { QwtText t; QwtDoublePoint dp = QwtPlotZoomer::invTransform(p); - if((dp.y() > 0.0001) && (dp.y() < 10000)) { - t.setText(QString("%1 %2, %3 V"). + if((fabs(dp.y()) > 0.0001) && (fabs(dp.y()) < 10000)) { + t.setText(QString("%1 %2, %3 %4"). arg(dp.x(), 0, 'f', getTimePrecision()). arg(d_unitType.c_str()). - arg(dp.y(), 0, 'f', 4)); + arg(dp.y(), 0, 'f', 4). + arg(d_yUnitType.c_str())); } else { - t.setText(QString("%1 %2, %3 V"). + t.setText(QString("%1 %2, %3 %4"). arg(dp.x(), 0, 'f', getTimePrecision()). arg(d_unitType.c_str()). - arg(dp.y(), 0, 'e', 4)); + arg(dp.y(), 0, 'e', 4). + arg(d_yUnitType.c_str())); } return t; @@ -109,6 +116,7 @@ protected: private: std::string d_unitType; + std::string d_yUnitType; }; @@ -550,4 +558,15 @@ TimeDomainDisplayPlot::enableTagMarker(int which, bool en) throw std::runtime_error("TimeDomainDisplayPlot: enabled tag marker does not exist.\n"); } +void +TimeDomainDisplayPlot::setYLabel(const std::string &label, + const std::string &unit) +{ + std::string l = label; + if(unit.length() > 0) + l += " (" + unit + ")"; + setAxisTitle(QwtPlot::yLeft, QString(l.c_str())); + ((TimeDomainDisplayZoomer*)d_zoomer)->setYUnitType(unit); +} + #endif /* TIME_DOMAIN_DISPLAY_PLOT_C */ diff --git a/gr-qtgui/lib/ber_sink_b_impl.cc b/gr-qtgui/lib/ber_sink_b_impl.cc index bcbe146e80..61dec2573a 100644 --- a/gr-qtgui/lib/ber_sink_b_impl.cc +++ b/gr-qtgui/lib/ber_sink_b_impl.cc @@ -21,11 +21,11 @@ */ #include "ber_sink_b_impl.h" +#include <boost/math/special_functions/erf.hpp> #include <gnuradio/io_signature.h> #include <gnuradio/math.h> #include <gnuradio/fft/fft.h> #include <volk/volk.h> -//#include <math.h> #ifdef HAVE_CONFIG_H #include <config.h> @@ -90,7 +90,7 @@ namespace gr { for(size_t i = 0; i < esnos.size(); i++) { double e = pow(10.0, esnos[i]/10.0); d_esno_buffers[curves][i] = esnos[i]; - d_ber_buffers[curves][i] = log10(erfc(sqrt(e))); + d_ber_buffers[curves][i] = log10(boost::math::erfc(sqrt(e))); } diff --git a/gr-qtgui/lib/const_sink_c_impl.cc b/gr-qtgui/lib/const_sink_c_impl.cc index 93986d84c7..2da1c213b4 100644 --- a/gr-qtgui/lib/const_sink_c_impl.cc +++ b/gr-qtgui/lib/const_sink_c_impl.cc @@ -351,6 +351,12 @@ namespace gr { } void + const_sink_c_impl::enable_grid(bool en) + { + d_main_gui->setGrid(en); + } + + void const_sink_c_impl::reset() { gr::thread::scoped_lock lock(d_mutex); diff --git a/gr-qtgui/lib/const_sink_c_impl.h b/gr-qtgui/lib/const_sink_c_impl.h index 0f1540de7e..964759b447 100644 --- a/gr-qtgui/lib/const_sink_c_impl.h +++ b/gr-qtgui/lib/const_sink_c_impl.h @@ -117,6 +117,7 @@ namespace gr { int nsamps() const; void enable_menu(bool en); void enable_autoscale(bool en); + void enable_grid(bool en); void reset(); int work(int noutput_items, diff --git a/gr-qtgui/lib/freqdisplayform.cc b/gr-qtgui/lib/freqdisplayform.cc index e9968df0b2..ccc7fe9e07 100644 --- a/gr-qtgui/lib/freqdisplayform.cc +++ b/gr-qtgui/lib/freqdisplayform.cc @@ -55,6 +55,16 @@ FreqDisplayForm::FreqDisplayForm(int nplots, QWidget* parent) connect(d_winmenu, SIGNAL(whichTrigger(gr::filter::firdes::win_type)), this, SLOT(setFFTWindowType(const gr::filter::firdes::win_type))); + PopupMenu *maxymenu = new PopupMenu("Y Max", this); + d_menu->addAction(maxymenu); + connect(maxymenu, SIGNAL(whichTrigger(QString)), + this, SLOT(setYMax(QString))); + + PopupMenu *minymenu = new PopupMenu("Y Min", this); + d_menu->addAction(minymenu); + connect(minymenu, SIGNAL(whichTrigger(QString)), + this, SLOT(setYMin(QString))); + d_clearmax_act = new QAction("Clear Max", this); d_menu->addAction(d_clearmax_act); connect(d_clearmax_act, SIGNAL(triggered()), @@ -179,6 +189,24 @@ FreqDisplayForm::setYaxis(double min, double max) } void +FreqDisplayForm::setYMax(const QString &m) +{ + double new_max = m.toDouble(); + double cur_ymin = getPlot()->getYMin(); + if(new_max > cur_ymin) + setYaxis(cur_ymin, new_max); +} + +void +FreqDisplayForm::setYMin(const QString &m) +{ + double new_min = m.toDouble(); + double cur_ymax = getPlot()->getYMax(); + if(new_min < cur_ymax) + setYaxis(new_min, cur_ymax); +} + +void FreqDisplayForm::autoScale(bool en) { if(en) { diff --git a/gr-qtgui/lib/number_sink_impl.cc b/gr-qtgui/lib/number_sink_impl.cc index abfb8725f4..e5966ac203 100644 --- a/gr-qtgui/lib/number_sink_impl.cc +++ b/gr-qtgui/lib/number_sink_impl.cc @@ -196,7 +196,25 @@ namespace gr { void number_sink_impl::set_max(int which, float max) { - return d_main_gui->setScaleMax(which, max); + d_main_gui->setScaleMax(which, max); + } + + void + number_sink_impl::set_title(const std::string &title) + { + d_main_gui->setTitle(title); + } + + void + number_sink_impl::set_unit(int which, const std::string &unit) + { + d_main_gui->setUnit(which, unit); + } + + void + number_sink_impl::set_factor(int which, float factor) + { + d_main_gui->setFactor(which, factor); } float @@ -241,6 +259,24 @@ namespace gr { return d_main_gui->scaleMax(which); } + std::string + number_sink_impl::title() const + { + return d_main_gui->title(); + } + + std::string + number_sink_impl::unit(int which) const + { + return d_main_gui->unit(which); + } + + float + number_sink_impl::factor(int which) const + { + return d_main_gui->factor(which); + } + void number_sink_impl::enable_menu(bool en) { diff --git a/gr-qtgui/lib/number_sink_impl.h b/gr-qtgui/lib/number_sink_impl.h index 0f4fd48262..7c8a084d3c 100644 --- a/gr-qtgui/lib/number_sink_impl.h +++ b/gr-qtgui/lib/number_sink_impl.h @@ -92,6 +92,9 @@ namespace gr { void set_label(int which, const std::string &label); void set_min(int which, float min); void set_max(int which, float max); + void set_title(const std::string &title); + void set_unit(int which, const std::string &unit); + void set_factor(int which, float factor); float average() const; graph_t graph_type() const; @@ -100,6 +103,9 @@ namespace gr { std::string label(int which) const; float min(int which) const; float max(int which) const; + std::string title() const; + std::string unit(int which) const; + float factor(int which) const; void enable_menu(bool en); void enable_autoscale(bool en=true); diff --git a/gr-qtgui/lib/numberdisplayform.cc b/gr-qtgui/lib/numberdisplayform.cc index b2b3fe453a..0dd433c62b 100644 --- a/gr-qtgui/lib/numberdisplayform.cc +++ b/gr-qtgui/lib/numberdisplayform.cc @@ -32,11 +32,15 @@ NumberDisplayForm::NumberDisplayForm(int nplots, gr::qtgui::graph_t type, : QWidget(parent) { d_nplots = nplots; + d_graph_type = type; + d_title = new QLabel(QString("")); d_layout = new QGridLayout(this); for(int i = 0; i < d_nplots; i++) { d_min.push_back(+1e32); d_max.push_back(-1e32); d_label.push_back(new QLabel(QString("Data %1").arg(i))); + d_unit.push_back(""); + d_factor.push_back(1); d_text_box.push_back(new QLabel(QString("0"))); d_indicator.push_back(new QwtThermo()); @@ -105,6 +109,11 @@ NumberDisplayForm::NumberDisplayForm(int nplots, gr::qtgui::graph_t type, this, SLOT(setColor(int, const QColor&, const QColor&))); d_label_menu[i]->addMenu(d_color_menu[i]); + d_factor_act.push_back(new ItemFloatAct(i, "Factor", this)); + connect(d_factor_act[i], SIGNAL(whichTrigger(int, float)), + this, SLOT(setFactor(int, float))); + d_label_menu[i]->addAction(d_factor_act[i]); + d_menu->addMenu(d_label_menu[i]); } @@ -230,10 +239,12 @@ NumberDisplayForm::newData(const QEvent* updateEvent) const std::vector<float> samples = tevent->getSamples(); for(int i = 0; i < d_nplots; i++) { - d_text_box[i]->setText(QString("%1").arg(samples[i], 4, ' ')); - d_indicator[i]->setValue(samples[i]); - d_min[i] = std::min(d_min[i], samples[i]); - d_max[i] = std::max(d_max[i], samples[i]); + float f = d_factor[i]*samples[i]; + d_text_box[i]->setText(QString("%1 %2").arg(f, 4, ' ').\ + arg(QString(d_unit[i].c_str()))); + d_indicator[i]->setValue(f); + d_min[i] = std::min(d_min[i], f); + d_max[i] = std::max(d_max[i], f); if(d_autoscale_state) { d_indicator[i]->setScale(d_min[i], d_max[i]); @@ -254,12 +265,23 @@ NumberDisplayForm::customEvent(QEvent * e) void NumberDisplayForm::setGraphType(const gr::qtgui::graph_t type) { + int off = 0; + + // Remove all widgets from the layout + QLayoutItem *item; + while((item = d_layout->takeAt(0)) != NULL) { + d_layout->removeItem(item); + } + + // If we have a title, add it at the 0,0 grid point (top left) + // set off = 1 to offset the rest of the widgets + if(d_title->text().length() > 0) { + d_layout->addWidget(d_title, 0, 0); + off = 1; + } + d_graph_type = type; for(int i = 0; i < d_nplots; i++) { - d_layout->removeWidget(d_indicator[i]); - d_layout->removeWidget(d_label[i]); - d_layout->removeWidget(d_text_box[i]); - switch(d_graph_type) { case(gr::qtgui::NUM_GRAPH_HORIZ): #if QWT_VERSION < 0x060100 @@ -268,9 +290,9 @@ NumberDisplayForm::setGraphType(const gr::qtgui::graph_t type) d_indicator[i]->setOrientation(Qt::Horizontal); #endif /* if QWT_VERSION < 0x060100 */ d_indicator[i]->setVisible(true); - d_layout->addWidget(d_label[i], 2*i, 0); - d_layout->addWidget(d_text_box[i], 2*i, 1); - d_layout->addWidget(d_indicator[i], 2*i+1, 1); + d_layout->addWidget(d_label[i], 2*i+off, 0); + d_layout->addWidget(d_text_box[i], 2*i+off, 1); + d_layout->addWidget(d_indicator[i], 2*i+1+off, 1); break; case(gr::qtgui::NUM_GRAPH_VERT): #if QWT_VERSION < 0x060100 @@ -279,15 +301,15 @@ NumberDisplayForm::setGraphType(const gr::qtgui::graph_t type) d_indicator[i]->setOrientation(Qt::Vertical); #endif /* if QWT_VERSION < 0x060100 */ d_indicator[i]->setVisible(true); - d_layout->addWidget(d_label[i], 0, i); - d_layout->addWidget(d_text_box[i], 1, i); - d_layout->addWidget(d_indicator[i], 2, i); + d_layout->addWidget(d_label[i], 0+off, i); + d_layout->addWidget(d_text_box[i], 1+off, i); + d_layout->addWidget(d_indicator[i], 2+off, i); break; case(gr::qtgui::NUM_GRAPH_NONE): default: d_indicator[i]->setVisible(false); - d_layout->addWidget(d_label[i], 0, i); - d_layout->addWidget(d_text_box[i], 1, i); + d_layout->addWidget(d_label[i], 0+off, i); + d_layout->addWidget(d_text_box[i], 1+off, i); break; } } @@ -435,7 +457,59 @@ NumberDisplayForm::autoScale(bool on) // Reset the autoscale limits for(int i = 0; i < d_nplots; i++) { - d_min.push_back(+1e32); - d_max.push_back(-1e32); + d_min[i] = +1e32; + d_max[i] = -1e32; } } + +std::string +NumberDisplayForm::title() const +{ + return d_title->text().toStdString(); +} + +void +NumberDisplayForm::setTitle(const std::string &title) +{ + std::string t = title; + if(t.length() > 0) + t = "<b><FONT SIZE=4>" + title + "</b>"; + d_title->setText(QString(t.c_str())); + setGraphType(d_graph_type); +} + +std::string +NumberDisplayForm::unit(int which) const +{ + if(static_cast<size_t>(which) >= d_unit.size()) + throw std::runtime_error("NumberDisplayForm::units: invalid 'which'.\n"); + + return d_unit[which]; +} + +void +NumberDisplayForm::setUnit(int which, const std::string &unit) +{ + if(static_cast<size_t>(which) >= d_unit.size()) + throw std::runtime_error("NumberDisplayForm::setUnits: invalid 'which'.\n"); + + d_unit[which] = unit; +} + +float +NumberDisplayForm::factor(int which) const +{ + if(static_cast<size_t>(which) >= d_factor.size()) + throw std::runtime_error("NumberDisplayForm::factor: invalid 'which'.\n"); + + return d_factor[which]; +} + +void +NumberDisplayForm::setFactor(int which, float factor) +{ + if(static_cast<size_t>(which) >= d_factor.size()) + throw std::runtime_error("NumberDisplayForm::setFactor: invalid 'which'.\n"); + + d_factor[which] = factor; +} diff --git a/gr-qtgui/lib/time_sink_c_impl.cc b/gr-qtgui/lib/time_sink_c_impl.cc index e053806fd2..8653f7179a 100644 --- a/gr-qtgui/lib/time_sink_c_impl.cc +++ b/gr-qtgui/lib/time_sink_c_impl.cc @@ -171,6 +171,13 @@ namespace gr { } void + time_sink_c_impl::set_y_label(const std::string &label, + const std::string &unit) + { + d_main_gui->setYLabel(label, unit); + } + + void time_sink_c_impl::set_update_time(double t) { //convert update time to ticks diff --git a/gr-qtgui/lib/time_sink_c_impl.h b/gr-qtgui/lib/time_sink_c_impl.h index c3c5bde5e9..a793df53e5 100644 --- a/gr-qtgui/lib/time_sink_c_impl.h +++ b/gr-qtgui/lib/time_sink_c_impl.h @@ -93,6 +93,8 @@ namespace gr { #endif void set_y_axis(double min, double max); + void set_y_label(const std::string &label, + const std::string &unit=""); void set_update_time(double t); void set_title(const std::string &title); void set_line_label(int which, const std::string &label); diff --git a/gr-qtgui/lib/time_sink_f_impl.cc b/gr-qtgui/lib/time_sink_f_impl.cc index 8424702bc1..30e6df1c2a 100644 --- a/gr-qtgui/lib/time_sink_f_impl.cc +++ b/gr-qtgui/lib/time_sink_f_impl.cc @@ -173,6 +173,13 @@ namespace gr { } void + time_sink_f_impl::set_y_label(const std::string &label, + const std::string &unit) + { + d_main_gui->setYLabel(label, unit); + } + + void time_sink_f_impl::set_update_time(double t) { //convert update time to ticks diff --git a/gr-qtgui/lib/time_sink_f_impl.h b/gr-qtgui/lib/time_sink_f_impl.h index 32e860a89c..7f56fa0685 100644 --- a/gr-qtgui/lib/time_sink_f_impl.h +++ b/gr-qtgui/lib/time_sink_f_impl.h @@ -93,6 +93,8 @@ namespace gr { #endif void set_y_axis(double min, double max); + void set_y_label(const std::string &label, + const std::string &unit=""); void set_update_time(double t); void set_title(const std::string &title); void set_line_label(int which, const std::string &label); diff --git a/gr-qtgui/lib/timedisplayform.cc b/gr-qtgui/lib/timedisplayform.cc index f6669465e3..6d1deba05f 100644 --- a/gr-qtgui/lib/timedisplayform.cc +++ b/gr-qtgui/lib/timedisplayform.cc @@ -186,6 +186,13 @@ TimeDisplayForm::setYaxis(double min, double max) getPlot()->setYaxis(min, max); } +void +TimeDisplayForm::setYLabel(const std::string &label, + const std::string &unit) +{ + getPlot()->setYLabel(label, unit); +} + int TimeDisplayForm::getNPoints() const { @@ -362,4 +369,3 @@ TimeDisplayForm::getTriggerTagKey() const { return d_trig_tag_key; } - diff --git a/gr-qtgui/lib/timerasterdisplayform.cc b/gr-qtgui/lib/timerasterdisplayform.cc index 382e91607c..eb5405d112 100644 --- a/gr-qtgui/lib/timerasterdisplayform.cc +++ b/gr-qtgui/lib/timerasterdisplayform.cc @@ -91,6 +91,16 @@ TimeRasterDisplayForm::TimeRasterDisplayForm(int nplots, connect(rowsmenu, SIGNAL(whichTrigger(QString)), this, SLOT(setNumRows(QString))); + PopupMenu *maxintmenu = new PopupMenu("Int. Max", this); + d_menu->addAction(maxintmenu); + connect(maxintmenu, SIGNAL(whichTrigger(QString)), + this, SLOT(setMaxIntensity(QString))); + + PopupMenu *minintmenu = new PopupMenu("Int. Min", this); + d_menu->addAction(minintmenu); + connect(minintmenu, SIGNAL(whichTrigger(QString)), + this, SLOT(setMinIntensity(QString))); + getPlot()->setIntensityRange(0, zmax); Reset(); @@ -155,8 +165,6 @@ TimeRasterDisplayForm::newData(const QEvent *updateEvent) const std::vector<double*> dataPoints = event->getPoints(); const uint64_t numDataPoints = event->getNumDataPoints(); - d_min_val = 10; - d_max_val = -10; for(size_t i=0; i < dataPoints.size(); i++) { double *min_val = std::min_element(&dataPoints[i][0], &dataPoints[i][numDataPoints-1]); double *max_val = std::max_element(&dataPoints[i][0], &dataPoints[i][numDataPoints-1]); @@ -239,18 +247,36 @@ TimeRasterDisplayForm::setAlpha(int which, int alpha) void TimeRasterDisplayForm::setIntensityRange(const double minIntensity, - const double maxIntensity) + const double maxIntensity) { + // reset max and min values + d_min_val = 10; + d_max_val = -10; + + d_cur_min_val = minIntensity; + d_cur_max_val = maxIntensity; getPlot()->setIntensityRange(minIntensity, maxIntensity); getPlot()->replot(); } void -TimeRasterDisplayForm::autoScale(bool en) +TimeRasterDisplayForm::setMaxIntensity(const QString &m) { - double min_int = d_min_val; - double max_int = d_max_val; + double new_max = m.toDouble(); + if(new_max > d_cur_min_val) + setIntensityRange(d_cur_min_val, new_max); +} - getPlot()->setIntensityRange(min_int, max_int); - getPlot()->replot(); +void +TimeRasterDisplayForm::setMinIntensity(const QString &m) +{ + double new_min = m.toDouble(); + if(new_min < d_cur_max_val) + setIntensityRange(new_min, d_cur_max_val); +} + +void +TimeRasterDisplayForm::autoScale(bool en) +{ + setIntensityRange(d_min_val, d_max_val); } diff --git a/gr-qtgui/lib/waterfalldisplayform.cc b/gr-qtgui/lib/waterfalldisplayform.cc index 51f518f375..fdf09d9180 100644 --- a/gr-qtgui/lib/waterfalldisplayform.cc +++ b/gr-qtgui/lib/waterfalldisplayform.cc @@ -91,6 +91,16 @@ WaterfallDisplayForm::WaterfallDisplayForm(int nplots, QWidget* parent) connect(d_winmenu, SIGNAL(whichTrigger(gr::filter::firdes::win_type)), this, SLOT(setFFTWindowType(const gr::filter::firdes::win_type))); + PopupMenu *maxintmenu = new PopupMenu("Int. Max", this); + d_menu->addAction(maxintmenu); + connect(maxintmenu, SIGNAL(whichTrigger(QString)), + this, SLOT(setMaxIntensity(QString))); + + PopupMenu *minintmenu = new PopupMenu("Int. Min", this); + d_menu->addAction(minintmenu); + connect(minintmenu, SIGNAL(whichTrigger(QString)), + this, SLOT(setMinIntensity(QString))); + Reset(); connect(d_display_plot, SIGNAL(plotPointSelected(const QPointF)), @@ -119,8 +129,6 @@ WaterfallDisplayForm::newData(const QEvent *updateEvent) const uint64_t numDataPoints = event->getNumDataPoints(); const gr::high_res_timer_type dataTimestamp = event->getDataTimestamp(); - d_min_val = 1000; - d_max_val = -1000; for(size_t i=0; i < dataPoints.size(); i++) { double *min_val = std::min_element(&dataPoints[i][0], &dataPoints[i][numDataPoints-1]); double *max_val = std::max_element(&dataPoints[i][0], &dataPoints[i][numDataPoints-1]); @@ -257,18 +265,39 @@ void WaterfallDisplayForm::setIntensityRange(const double minIntensity, const double maxIntensity) { + // reset max and min values + d_min_val = 1000; + d_max_val = -1000; + + d_cur_min_val = minIntensity; + d_cur_max_val = maxIntensity; getPlot()->setIntensityRange(minIntensity, maxIntensity); getPlot()->replot(); } void +WaterfallDisplayForm::setMaxIntensity(const QString &m) +{ + double new_max = m.toDouble(); + if(new_max > d_cur_min_val) + setIntensityRange(d_cur_min_val, new_max); +} + +void +WaterfallDisplayForm::setMinIntensity(const QString &m) +{ + double new_min = m.toDouble(); + if(new_min < d_cur_max_val) + setIntensityRange(new_min, d_cur_max_val); +} + +void WaterfallDisplayForm::autoScale(bool en) { double min_int = d_min_val - 5; double max_int = d_max_val + 10; - getPlot()->setIntensityRange(min_int, max_int); - getPlot()->replot(); + setIntensityRange(min_int, max_int); } void diff --git a/gr-trellis/examples/grc/interference_cancellation.grc b/gr-trellis/examples/grc/interference_cancellation.grc index 1c42a72f37..ef011c5205 100644 --- a/gr-trellis/examples/grc/interference_cancellation.grc +++ b/gr-trellis/examples/grc/interference_cancellation.grc @@ -1,6 +1,6 @@ <?xml version='1.0' encoding='ASCII'?> <flow_graph> - <timestamp>Sat Nov 10 15:39:57 2012</timestamp> + <timestamp>Sat Jul 12 17:33:47 2014</timestamp> <block> <key>options</key> <param> @@ -29,7 +29,7 @@ </param> <param> <key>generate_options</key> - <value>wx_gui</value> + <value>qt_gui</value> </param> <param> <key>category</key> @@ -52,8 +52,12 @@ <value></value> </param> <param> + <key>alias</key> + <value></value> + </param> + <param> <key>_coordinate</key> - <value>(10, 10)</value> + <value>(0, 0)</value> </param> <param> <key>_rotation</key> @@ -61,54 +65,26 @@ </param> </block> <block> - <key>variable_slider</key> + <key>variable</key> <param> <key>id</key> - <value>alpha</value> + <value>prefix</value> </param> <param> <key>_enabled</key> <value>True</value> </param> <param> - <key>label</key> - <value>P1/P</value> - </param> - <param> <key>value</key> - <value>0.6</value> - </param> - <param> - <key>min</key> - <value>0</value> - </param> - <param> - <key>max</key> - <value>1.0</value> - </param> - <param> - <key>num_steps</key> - <value>100</value> - </param> - <param> - <key>style</key> - <value>wx.SL_HORIZONTAL</value> - </param> - <param> - <key>converver</key> - <value>float_converter</value> - </param> - <param> - <key>grid_pos</key> - <value></value> + <value>"~/src/gnuradio/"</value> </param> <param> - <key>notebook</key> + <key>alias</key> <value></value> </param> <param> <key>_coordinate</key> - <value>(243, 11)</value> + <value>(871, 14)</value> </param> <param> <key>_rotation</key> @@ -116,54 +92,26 @@ </param> </block> <block> - <key>variable_slider</key> + <key>variable</key> <param> <key>id</key> - <value>snr_db</value> + <value>noisevar</value> </param> <param> <key>_enabled</key> <value>True</value> </param> <param> - <key>label</key> - <value>P/sigma^2 (dB)</value> - </param> - <param> <key>value</key> - <value>16</value> - </param> - <param> - <key>min</key> - <value>0</value> - </param> - <param> - <key>max</key> - <value>20</value> - </param> - <param> - <key>num_steps</key> - <value>100</value> - </param> - <param> - <key>style</key> - <value>wx.SL_HORIZONTAL</value> - </param> - <param> - <key>converver</key> - <value>float_converter</value> - </param> - <param> - <key>grid_pos</key> - <value></value> + <value>10**(-snr_db/10)</value> </param> <param> - <key>notebook</key> + <key>alias</key> <value></value> </param> <param> <key>_coordinate</key> - <value>(447, 14)</value> + <value>(637, 13)</value> </param> <param> <key>_rotation</key> @@ -174,7 +122,7 @@ <key>variable</key> <param> <key>id</key> - <value>noisevar</value> + <value>R</value> </param> <param> <key>_enabled</key> @@ -182,11 +130,15 @@ </param> <param> <key>value</key> - <value>10**(-snr_db/10)</value> + <value>100e3</value> + </param> + <param> + <key>alias</key> + <value></value> </param> <param> <key>_coordinate</key> - <value>(637, 13)</value> + <value>(748, 12)</value> </param> <param> <key>_rotation</key> @@ -224,6 +176,22 @@ <value>True</value> </param> <param> + <key>alias</key> + <value></value> + </param> + <param> + <key>affinity</key> + <value></value> + </param> + <param> + <key>minoutbuf</key> + <value>0</value> + </param> + <param> + <key>maxoutbuf</key> + <value>0</value> + </param> + <param> <key>_coordinate</key> <value>(21, 170)</value> </param> @@ -263,6 +231,22 @@ <value>True</value> </param> <param> + <key>alias</key> + <value></value> + </param> + <param> + <key>affinity</key> + <value></value> + </param> + <param> + <key>minoutbuf</key> + <value>0</value> + </param> + <param> + <key>maxoutbuf</key> + <value>0</value> + </param> + <param> <key>_coordinate</key> <value>(25, 291)</value> </param> @@ -275,7 +259,7 @@ <key>blocks_sub_xx</key> <param> <key>id</key> - <value>blocks_sub_xx_0</value> + <value>blocks_sub_xx_3</value> </param> <param> <key>_enabled</key> @@ -294,8 +278,24 @@ <value>2</value> </param> <param> + <key>alias</key> + <value></value> + </param> + <param> + <key>affinity</key> + <value></value> + </param> + <param> + <key>minoutbuf</key> + <value>0</value> + </param> + <param> + <key>maxoutbuf</key> + <value>0</value> + </param> + <param> <key>_coordinate</key> - <value>(536, 529)</value> + <value>(535, 792)</value> </param> <param> <key>_rotation</key> @@ -306,7 +306,7 @@ <key>blocks_multiply_xx</key> <param> <key>id</key> - <value>blocks_multiply_xx_0</value> + <value>blocks_multiply_xx_1</value> </param> <param> <key>_enabled</key> @@ -325,8 +325,24 @@ <value>1</value> </param> <param> + <key>alias</key> + <value></value> + </param> + <param> + <key>affinity</key> + <value></value> + </param> + <param> + <key>minoutbuf</key> + <value>0</value> + </param> + <param> + <key>maxoutbuf</key> + <value>0</value> + </param> + <param> <key>_coordinate</key> - <value>(771, 525)</value> + <value>(785, 779)</value> </param> <param> <key>_rotation</key> @@ -334,26 +350,46 @@ </param> </block> <block> - <key>blocks_short_to_float</key> + <key>blocks_sub_xx</key> <param> <key>id</key> - <value>blocks_short_to_float_0</value> + <value>blocks_sub_xx_2</value> </param> <param> <key>_enabled</key> <value>True</value> </param> <param> + <key>type</key> + <value>complex</value> + </param> + <param> <key>vlen</key> <value>1</value> </param> <param> - <key>scale</key> - <value>1</value> + <key>num_inputs</key> + <value>2</value> + </param> + <param> + <key>alias</key> + <value></value> + </param> + <param> + <key>affinity</key> + <value></value> + </param> + <param> + <key>minoutbuf</key> + <value>0</value> + </param> + <param> + <key>maxoutbuf</key> + <value>0</value> </param> <param> <key>_coordinate</key> - <value>(994, 545)</value> + <value>(944, 978)</value> </param> <param> <key>_rotation</key> @@ -364,7 +400,7 @@ <key>blocks_sub_xx</key> <param> <key>id</key> - <value>blocks_sub_xx_3</value> + <value>blocks_sub_xx_1</value> </param> <param> <key>_enabled</key> @@ -383,8 +419,24 @@ <value>2</value> </param> <param> + <key>alias</key> + <value></value> + </param> + <param> + <key>affinity</key> + <value></value> + </param> + <param> + <key>minoutbuf</key> + <value>0</value> + </param> + <param> + <key>maxoutbuf</key> + <value>0</value> + </param> + <param> <key>_coordinate</key> - <value>(535, 792)</value> + <value>(540, 1141)</value> </param> <param> <key>_rotation</key> @@ -392,10 +444,10 @@ </param> </block> <block> - <key>blocks_multiply_xx</key> + <key>blocks_sub_xx</key> <param> <key>id</key> - <value>blocks_multiply_xx_1</value> + <value>blocks_sub_xx_2_0</value> </param> <param> <key>_enabled</key> @@ -403,19 +455,82 @@ </param> <param> <key>type</key> - <value>short</value> + <value>complex</value> + </param> + <param> + <key>vlen</key> + <value>1</value> </param> <param> <key>num_inputs</key> <value>2</value> </param> <param> + <key>alias</key> + <value></value> + </param> + <param> + <key>affinity</key> + <value></value> + </param> + <param> + <key>minoutbuf</key> + <value>0</value> + </param> + <param> + <key>maxoutbuf</key> + <value>0</value> + </param> + <param> + <key>_coordinate</key> + <value>(975, 1342)</value> + </param> + <param> + <key>_rotation</key> + <value>0</value> + </param> + </block> + <block> + <key>blocks_sub_xx</key> + <param> + <key>id</key> + <value>blocks_sub_xx_1_0</value> + </param> + <param> + <key>_enabled</key> + <value>True</value> + </param> + <param> + <key>type</key> + <value>short</value> + </param> + <param> <key>vlen</key> <value>1</value> </param> <param> + <key>num_inputs</key> + <value>2</value> + </param> + <param> + <key>alias</key> + <value></value> + </param> + <param> + <key>affinity</key> + <value></value> + </param> + <param> + <key>minoutbuf</key> + <value>0</value> + </param> + <param> + <key>maxoutbuf</key> + <value>0</value> + </param> + <param> <key>_coordinate</key> - <value>(785, 779)</value> + <value>(559, 1536)</value> </param> <param> <key>_rotation</key> @@ -423,26 +538,46 @@ </param> </block> <block> - <key>blocks_short_to_float</key> + <key>blocks_multiply_xx</key> <param> <key>id</key> - <value>blocks_short_to_float_2</value> + <value>blocks_multiply_xx_2_0</value> </param> <param> <key>_enabled</key> <value>True</value> </param> <param> + <key>type</key> + <value>short</value> + </param> + <param> + <key>num_inputs</key> + <value>2</value> + </param> + <param> <key>vlen</key> <value>1</value> </param> <param> - <key>scale</key> - <value>1</value> + <key>alias</key> + <value></value> + </param> + <param> + <key>affinity</key> + <value></value> + </param> + <param> + <key>minoutbuf</key> + <value>0</value> + </param> + <param> + <key>maxoutbuf</key> + <value>0</value> </param> <param> <key>_coordinate</key> - <value>(1005, 798)</value> + <value>(771, 1530)</value> </param> <param> <key>_rotation</key> @@ -450,10 +585,10 @@ </param> </block> <block> - <key>blocks_sub_xx</key> + <key>blocks_add_xx</key> <param> <key>id</key> - <value>blocks_sub_xx_2</value> + <value>blocks_add_xx_0</value> </param> <param> <key>_enabled</key> @@ -464,16 +599,32 @@ <value>complex</value> </param> <param> + <key>num_inputs</key> + <value>2</value> + </param> + <param> <key>vlen</key> <value>1</value> </param> <param> - <key>num_inputs</key> - <value>2</value> + <key>alias</key> + <value></value> + </param> + <param> + <key>affinity</key> + <value></value> + </param> + <param> + <key>minoutbuf</key> + <value>0</value> + </param> + <param> + <key>maxoutbuf</key> + <value>0</value> </param> <param> <key>_coordinate</key> - <value>(944, 978)</value> + <value>(1224, 245)</value> </param> <param> <key>_rotation</key> @@ -481,10 +632,10 @@ </param> </block> <block> - <key>blocks_sub_xx</key> + <key>analog_noise_source_x</key> <param> <key>id</key> - <value>blocks_sub_xx_1</value> + <value>analog_noise_source_x_0</value> </param> <param> <key>_enabled</key> @@ -492,19 +643,39 @@ </param> <param> <key>type</key> - <value>short</value> + <value>complex</value> </param> <param> - <key>vlen</key> - <value>1</value> + <key>noise_type</key> + <value>analog.GR_GAUSSIAN</value> </param> <param> - <key>num_inputs</key> - <value>2</value> + <key>amp</key> + <value>noisevar</value> + </param> + <param> + <key>seed</key> + <value>-42</value> + </param> + <param> + <key>alias</key> + <value></value> + </param> + <param> + <key>affinity</key> + <value></value> + </param> + <param> + <key>minoutbuf</key> + <value>0</value> + </param> + <param> + <key>maxoutbuf</key> + <value>0</value> </param> <param> <key>_coordinate</key> - <value>(540, 1141)</value> + <value>(1178, 321)</value> </param> <param> <key>_rotation</key> @@ -512,10 +683,10 @@ </param> </block> <block> - <key>blocks_multiply_xx</key> + <key>blocks_throttle</key> <param> <key>id</key> - <value>blocks_multiply_xx_2</value> + <value>blocks_throttle_0</value> </param> <param> <key>_enabled</key> @@ -526,16 +697,36 @@ <value>short</value> </param> <param> - <key>num_inputs</key> - <value>2</value> + <key>samples_per_second</key> + <value>R</value> </param> <param> <key>vlen</key> <value>1</value> </param> <param> + <key>ignoretag</key> + <value>True</value> + </param> + <param> + <key>alias</key> + <value></value> + </param> + <param> + <key>affinity</key> + <value></value> + </param> + <param> + <key>minoutbuf</key> + <value>0</value> + </param> + <param> + <key>maxoutbuf</key> + <value>0</value> + </param> + <param> <key>_coordinate</key> - <value>(796, 1136)</value> + <value>(579, 143)</value> </param> <param> <key>_rotation</key> @@ -543,26 +734,46 @@ </param> </block> <block> - <key>blocks_short_to_float</key> + <key>blocks_multiply_const_vxx</key> <param> <key>id</key> - <value>blocks_short_to_float_1</value> + <value>blocks_multiply_const_vxx_0</value> </param> <param> <key>_enabled</key> <value>True</value> </param> <param> + <key>type</key> + <value>complex</value> + </param> + <param> + <key>const</key> + <value>alpha**0.5</value> + </param> + <param> <key>vlen</key> <value>1</value> </param> <param> - <key>scale</key> - <value>1</value> + <key>alias</key> + <value></value> + </param> + <param> + <key>affinity</key> + <value></value> + </param> + <param> + <key>minoutbuf</key> + <value>0</value> + </param> + <param> + <key>maxoutbuf</key> + <value>0</value> </param> <param> <key>_coordinate</key> - <value>(1009, 1156)</value> + <value>(988, 196)</value> </param> <param> <key>_rotation</key> @@ -570,30 +781,54 @@ </param> </block> <block> - <key>blocks_sub_xx</key> + <key>digital_chunks_to_symbols_xx</key> <param> <key>id</key> - <value>blocks_sub_xx_2_0</value> + <value>digital_chunks_to_symbols_xx_0</value> </param> <param> <key>_enabled</key> <value>True</value> </param> <param> - <key>type</key> + <key>in_type</key> + <value>short</value> + </param> + <param> + <key>out_type</key> <value>complex</value> </param> <param> - <key>vlen</key> + <key>symbol_table</key> + <value>1,1j,-1j,-1</value> + </param> + <param> + <key>dimension</key> <value>1</value> </param> <param> - <key>num_inputs</key> - <value>2</value> + <key>num_ports</key> + <value>1</value> + </param> + <param> + <key>alias</key> + <value></value> + </param> + <param> + <key>affinity</key> + <value></value> + </param> + <param> + <key>minoutbuf</key> + <value>0</value> + </param> + <param> + <key>maxoutbuf</key> + <value>0</value> </param> <param> <key>_coordinate</key> - <value>(975, 1342)</value> + <value>(703, 211)</value> </param> <param> <key>_rotation</key> @@ -601,10 +836,10 @@ </param> </block> <block> - <key>blocks_sub_xx</key> + <key>blocks_multiply_const_vxx</key> <param> <key>id</key> - <value>blocks_sub_xx_1_0</value> + <value>blocks_multiply_const_vxx_1</value> </param> <param> <key>_enabled</key> @@ -612,19 +847,35 @@ </param> <param> <key>type</key> - <value>short</value> + <value>complex</value> + </param> + <param> + <key>const</key> + <value>(1-alpha)**0.5</value> </param> <param> <key>vlen</key> <value>1</value> </param> <param> - <key>num_inputs</key> - <value>2</value> + <key>alias</key> + <value></value> + </param> + <param> + <key>affinity</key> + <value></value> + </param> + <param> + <key>minoutbuf</key> + <value>0</value> + </param> + <param> + <key>maxoutbuf</key> + <value>0</value> </param> <param> <key>_coordinate</key> - <value>(559, 1536)</value> + <value>(994, 319)</value> </param> <param> <key>_rotation</key> @@ -632,30 +883,54 @@ </param> </block> <block> - <key>blocks_multiply_xx</key> + <key>digital_chunks_to_symbols_xx</key> <param> <key>id</key> - <value>blocks_multiply_xx_2_0</value> + <value>digital_chunks_to_symbols_xx_0_0</value> </param> <param> <key>_enabled</key> <value>True</value> </param> <param> - <key>type</key> + <key>in_type</key> <value>short</value> </param> <param> - <key>num_inputs</key> - <value>2</value> + <key>out_type</key> + <value>complex</value> </param> <param> - <key>vlen</key> + <key>symbol_table</key> + <value>1,1j,-1j,-1</value> + </param> + <param> + <key>dimension</key> <value>1</value> </param> <param> + <key>num_ports</key> + <value>1</value> + </param> + <param> + <key>alias</key> + <value></value> + </param> + <param> + <key>affinity</key> + <value></value> + </param> + <param> + <key>minoutbuf</key> + <value>0</value> + </param> + <param> + <key>maxoutbuf</key> + <value>0</value> + </param> + <param> <key>_coordinate</key> - <value>(771, 1530)</value> + <value>(703, 311)</value> </param> <param> <key>_rotation</key> @@ -663,26 +938,54 @@ </param> </block> <block> - <key>blocks_short_to_float</key> + <key>digital_chunks_to_symbols_xx</key> <param> <key>id</key> - <value>blocks_short_to_float_1_0</value> + <value>digital_chunks_to_symbols_xx_0_0_0</value> </param> <param> <key>_enabled</key> <value>True</value> </param> <param> - <key>vlen</key> + <key>in_type</key> + <value>short</value> + </param> + <param> + <key>out_type</key> + <value>complex</value> + </param> + <param> + <key>symbol_table</key> + <value>1,1j,-1j,-1</value> + </param> + <param> + <key>dimension</key> <value>1</value> </param> <param> - <key>scale</key> + <key>num_ports</key> <value>1</value> </param> <param> + <key>alias</key> + <value></value> + </param> + <param> + <key>affinity</key> + <value></value> + </param> + <param> + <key>minoutbuf</key> + <value>0</value> + </param> + <param> + <key>maxoutbuf</key> + <value>0</value> + </param> + <param> <key>_coordinate</key> - <value>(1010, 1551)</value> + <value>(418, 1000)</value> </param> <param> <key>_rotation</key> @@ -690,10 +993,10 @@ </param> </block> <block> - <key>trellis_viterbi_combined_xx</key> + <key>blocks_multiply_const_vxx</key> <param> <key>id</key> - <value>trellis_viterbi_combined_xx_1</value> + <value>blocks_multiply_const_vxx_2</value> </param> <param> <key>_enabled</key> @@ -701,43 +1004,82 @@ </param> <param> <key>type</key> - <value>c</value> + <value>complex</value> </param> <param> - <key>out_type</key> - <value>s</value> + <key>const</key> + <value>alpha**0.5</value> </param> <param> - <key>fsm_args</key> - <value>prefix+"gr-trellis/src/examples/fsm_files/awgn1o2_16.fsm"</value> + <key>vlen</key> + <value>1</value> </param> <param> - <key>block_size</key> - <value>1000</value> + <key>alias</key> + <value></value> </param> <param> - <key>init_state</key> - <value>-1</value> + <key>affinity</key> + <value></value> </param> <param> - <key>final_state</key> - <value>-1</value> + <key>minoutbuf</key> + <value>0</value> </param> <param> - <key>dim</key> + <key>maxoutbuf</key> + <value>0</value> + </param> + <param> + <key>_coordinate</key> + <value>(710, 1008)</value> + </param> + <param> + <key>_rotation</key> + <value>0</value> + </param> + </block> + <block> + <key>blocks_multiply_const_vxx</key> + <param> + <key>id</key> + <value>blocks_multiply_const_vxx_2_0</value> + </param> + <param> + <key>_enabled</key> + <value>True</value> + </param> + <param> + <key>type</key> + <value>complex</value> + </param> + <param> + <key>const</key> + <value>(1-alpha)**0.5</value> + </param> + <param> + <key>vlen</key> <value>1</value> </param> <param> - <key>table</key> - <value>alpha**0.5*1,alpha**0.5*1j,alpha**0.5*(-1j),alpha**0.5*(-1)</value> + <key>alias</key> + <value></value> </param> <param> - <key>metric_type</key> - <value>digital.TRELLIS_EUCLIDEAN</value> + <key>affinity</key> + <value></value> + </param> + <param> + <key>minoutbuf</key> + <value>0</value> + </param> + <param> + <key>maxoutbuf</key> + <value>0</value> </param> <param> <key>_coordinate</key> - <value>(79, 501)</value> + <value>(733, 1374)</value> </param> <param> <key>_rotation</key> @@ -745,54 +1087,54 @@ </param> </block> <block> - <key>trellis_viterbi_combined_xx</key> + <key>digital_chunks_to_symbols_xx</key> <param> <key>id</key> - <value>trellis_viterbi_combined_xx_2</value> + <value>digital_chunks_to_symbols_xx_0_0_1</value> </param> <param> <key>_enabled</key> <value>True</value> </param> <param> - <key>type</key> - <value>c</value> + <key>in_type</key> + <value>short</value> </param> <param> <key>out_type</key> - <value>s</value> + <value>complex</value> </param> <param> - <key>fsm_args</key> - <value>prefix+"gr-trellis/src/examples/fsm_files/awgn1o2_16.fsm"</value> + <key>symbol_table</key> + <value>1,1j,-1j,-1</value> </param> <param> - <key>block_size</key> - <value>1000</value> + <key>dimension</key> + <value>1</value> </param> <param> - <key>init_state</key> - <value>-1</value> + <key>num_ports</key> + <value>1</value> </param> <param> - <key>final_state</key> - <value>-1</value> + <key>alias</key> + <value></value> </param> <param> - <key>dim</key> - <value>1</value> + <key>affinity</key> + <value></value> </param> <param> - <key>table</key> - <value>(1-alpha)**0.5*1,(1-alpha)**0.5*1j,(1-alpha)**0.5*(-1j),(1-alpha)**0.5*(-1)</value> + <key>minoutbuf</key> + <value>0</value> </param> <param> - <key>metric_type</key> - <value>digital.TRELLIS_EUCLIDEAN</value> + <key>maxoutbuf</key> + <value>0</value> </param> <param> <key>_coordinate</key> - <value>(82, 766)</value> + <value>(420, 1366)</value> </param> <param> <key>_rotation</key> @@ -803,7 +1145,7 @@ <key>trellis_viterbi_combined_xx</key> <param> <key>id</key> - <value>trellis_viterbi_combined_xx_0</value> + <value>trellis_viterbi_combined_xx_1</value> </param> <param> <key>_enabled</key> @@ -819,7 +1161,7 @@ </param> <param> <key>fsm_args</key> - <value>prefix+"gr-trellis/src/examples/fsm_files/awgn1o2_16.fsm"</value> + <value>prefix+"gr-trellis/examples/python/fsm_files/awgn1o2_16.fsm"</value> </param> <param> <key>block_size</key> @@ -839,15 +1181,31 @@ </param> <param> <key>table</key> - <value>(1-alpha)**0.5*1,(1-alpha)**0.5*1j,(1-alpha)**0.5*(-1j),(1-alpha)**0.5*(-1)</value> + <value>alpha**0.5*1,alpha**0.5*1j,alpha**0.5*(-1j),alpha**0.5*(-1)</value> </param> <param> <key>metric_type</key> <value>digital.TRELLIS_EUCLIDEAN</value> </param> <param> + <key>alias</key> + <value></value> + </param> + <param> + <key>affinity</key> + <value></value> + </param> + <param> + <key>minoutbuf</key> + <value>0</value> + </param> + <param> + <key>maxoutbuf</key> + <value>0</value> + </param> + <param> <key>_coordinate</key> - <value>(83, 1111)</value> + <value>(80, 501)</value> </param> <param> <key>_rotation</key> @@ -858,7 +1216,7 @@ <key>trellis_viterbi_combined_xx</key> <param> <key>id</key> - <value>trellis_viterbi_combined_xx_0_0</value> + <value>trellis_viterbi_combined_xx_2</value> </param> <param> <key>_enabled</key> @@ -874,7 +1232,7 @@ </param> <param> <key>fsm_args</key> - <value>prefix+"gr-trellis/src/examples/fsm_files/awgn1o2_16.fsm"</value> + <value>prefix+"gr-trellis/examples/python/fsm_files/awgn1o2_16.fsm"</value> </param> <param> <key>block_size</key> @@ -894,15 +1252,31 @@ </param> <param> <key>table</key> - <value>alpha**0.5*1,alpha**0.5*1j,alpha**0.5*(-1j),alpha**0.5*(-1)</value> + <value>(1-alpha)**0.5*1,(1-alpha)**0.5*1j,(1-alpha)**0.5*(-1j),(1-alpha)**0.5*(-1)</value> </param> <param> <key>metric_type</key> <value>digital.TRELLIS_EUCLIDEAN</value> </param> <param> + <key>alias</key> + <value></value> + </param> + <param> + <key>affinity</key> + <value></value> + </param> + <param> + <key>minoutbuf</key> + <value>0</value> + </param> + <param> + <key>maxoutbuf</key> + <value>0</value> + </param> + <param> <key>_coordinate</key> - <value>(75, 1495)</value> + <value>(82, 766)</value> </param> <param> <key>_rotation</key> @@ -910,10 +1284,10 @@ </param> </block> <block> - <key>wxgui_scopesink2</key> + <key>trellis_encoder_xx</key> <param> <key>id</key> - <value>wxgui_scopesink2_0</value> + <value>trellis_encoder_xx_0</value> </param> <param> <key>_enabled</key> @@ -921,63 +1295,82 @@ </param> <param> <key>type</key> - <value>complex</value> + <value>ss</value> </param> <param> - <key>title</key> - <value>Scope Plot</value> + <key>fsm_args</key> + <value>prefix+"gr-trellis/examples/python/fsm_files/awgn1o2_16.fsm"</value> </param> <param> - <key>samp_rate</key> - <value>R</value> + <key>init_state</key> + <value>0</value> + </param> + <param> + <key>alias</key> + <value></value> + </param> + <param> + <key>affinity</key> + <value></value> </param> <param> - <key>v_scale</key> + <key>minoutbuf</key> <value>0</value> </param> <param> - <key>v_offset</key> + <key>maxoutbuf</key> <value>0</value> </param> <param> - <key>t_scale</key> + <key>_coordinate</key> + <value>(340, 187)</value> + </param> + <param> + <key>_rotation</key> <value>0</value> </param> + </block> + <block> + <key>trellis_encoder_xx</key> <param> - <key>ac_couple</key> - <value>False</value> + <key>id</key> + <value>trellis_encoder_xx_1</value> </param> <param> - <key>xy_mode</key> + <key>_enabled</key> <value>True</value> </param> <param> - <key>num_inputs</key> - <value>1</value> + <key>type</key> + <value>ss</value> </param> <param> - <key>win_size</key> - <value></value> + <key>fsm_args</key> + <value>prefix+"gr-trellis/examples/python/fsm_files/awgn1o2_16.fsm"</value> </param> <param> - <key>grid_pos</key> + <key>init_state</key> + <value>0</value> + </param> + <param> + <key>alias</key> <value></value> </param> <param> - <key>notebook</key> + <key>affinity</key> <value></value> </param> <param> - <key>trig_mode</key> - <value>wxgui.TRIG_MODE_AUTO</value> + <key>minoutbuf</key> + <value>0</value> </param> <param> - <key>y_axis_label</key> - <value>Counts</value> + <key>maxoutbuf</key> + <value>0</value> </param> <param> <key>_coordinate</key> - <value>(1533, 149)</value> + <value>(336, 311)</value> </param> <param> <key>_rotation</key> @@ -985,22 +1378,46 @@ </param> </block> <block> - <key>variable</key> + <key>trellis_encoder_xx</key> <param> <key>id</key> - <value>prefix</value> + <value>trellis_encoder_xx_2</value> </param> <param> <key>_enabled</key> <value>True</value> </param> <param> - <key>value</key> - <value>"/n/harrisville/x/anastas/gnuradio_trunk/"</value> + <key>type</key> + <value>ss</value> + </param> + <param> + <key>fsm_args</key> + <value>prefix+"gr-trellis/examples/python/fsm_files/awgn1o2_16.fsm"</value> + </param> + <param> + <key>init_state</key> + <value>0</value> + </param> + <param> + <key>alias</key> + <value></value> + </param> + <param> + <key>affinity</key> + <value></value> + </param> + <param> + <key>minoutbuf</key> + <value>0</value> + </param> + <param> + <key>maxoutbuf</key> + <value>0</value> </param> <param> <key>_coordinate</key> - <value>(871, 14)</value> + <value>(89, 1000)</value> </param> <param> <key>_rotation</key> @@ -1011,7 +1428,7 @@ <key>trellis_encoder_xx</key> <param> <key>id</key> - <value>trellis_encoder_xx_0</value> + <value>trellis_encoder_xx_2_0</value> </param> <param> <key>_enabled</key> @@ -1023,15 +1440,31 @@ </param> <param> <key>fsm_args</key> - <value>prefix+"gr-trellis/src/examples/fsm_files/awgn1o2_16.fsm"</value> + <value>prefix+"gr-trellis/examples/python/fsm_files/awgn1o2_16.fsm"</value> </param> <param> <key>init_state</key> <value>0</value> </param> <param> + <key>alias</key> + <value></value> + </param> + <param> + <key>affinity</key> + <value></value> + </param> + <param> + <key>minoutbuf</key> + <value>0</value> + </param> + <param> + <key>maxoutbuf</key> + <value>0</value> + </param> + <param> <key>_coordinate</key> - <value>(340, 187)</value> + <value>(103, 1366)</value> </param> <param> <key>_rotation</key> @@ -1039,22 +1472,70 @@ </param> </block> <block> - <key>variable</key> + <key>trellis_viterbi_combined_xx</key> <param> <key>id</key> - <value>R</value> + <value>trellis_viterbi_combined_xx_0_0</value> </param> <param> <key>_enabled</key> <value>True</value> </param> <param> - <key>value</key> - <value>100e3</value> + <key>type</key> + <value>c</value> + </param> + <param> + <key>out_type</key> + <value>s</value> + </param> + <param> + <key>fsm_args</key> + <value>prefix+"gr-trellis/examples/python/fsm_files/awgn1o2_16.fsm"</value> + </param> + <param> + <key>block_size</key> + <value>1000</value> + </param> + <param> + <key>init_state</key> + <value>-1</value> + </param> + <param> + <key>final_state</key> + <value>-1</value> + </param> + <param> + <key>dim</key> + <value>1</value> + </param> + <param> + <key>table</key> + <value>alpha**0.5*1,alpha**0.5*1j,alpha**0.5*(-1j),alpha**0.5*(-1)</value> + </param> + <param> + <key>metric_type</key> + <value>digital.TRELLIS_EUCLIDEAN</value> + </param> + <param> + <key>alias</key> + <value></value> + </param> + <param> + <key>affinity</key> + <value></value> + </param> + <param> + <key>minoutbuf</key> + <value>0</value> + </param> + <param> + <key>maxoutbuf</key> + <value>0</value> </param> <param> <key>_coordinate</key> - <value>(748, 12)</value> + <value>(75, 1494)</value> </param> <param> <key>_rotation</key> @@ -1062,10 +1543,10 @@ </param> </block> <block> - <key>wxgui_numbersink2</key> + <key>trellis_viterbi_combined_xx</key> <param> <key>id</key> - <value>wxgui_numbersink2_0</value> + <value>trellis_viterbi_combined_xx_0</value> </param> <param> <key>_enabled</key> @@ -1073,75 +1554,106 @@ </param> <param> <key>type</key> - <value>float</value> + <value>c</value> </param> <param> - <key>title</key> - <value>BER 1 (raw)</value> + <key>out_type</key> + <value>s</value> </param> <param> - <key>units</key> - <value>BER</value> + <key>fsm_args</key> + <value>prefix+"gr-trellis/examples/python/fsm_files/awgn1o2_16.fsm"</value> </param> <param> - <key>samp_rate</key> - <value>R</value> + <key>block_size</key> + <value>1000</value> </param> <param> - <key>min_value</key> - <value>0</value> + <key>init_state</key> + <value>-1</value> + </param> + <param> + <key>final_state</key> + <value>-1</value> </param> <param> - <key>max_value</key> + <key>dim</key> <value>1</value> </param> <param> - <key>factor</key> - <value>1.0</value> + <key>table</key> + <value>(1-alpha)**0.5*1,(1-alpha)**0.5*1j,(1-alpha)**0.5*(-1j),(1-alpha)**0.5*(-1)</value> </param> <param> - <key>decimal_places</key> - <value>6</value> + <key>metric_type</key> + <value>digital.TRELLIS_EUCLIDEAN</value> + </param> + <param> + <key>alias</key> + <value></value> + </param> + <param> + <key>affinity</key> + <value></value> </param> <param> - <key>ref_level</key> + <key>minoutbuf</key> <value>0</value> </param> <param> - <key>number_rate</key> - <value>15</value> + <key>maxoutbuf</key> + <value>0</value> </param> <param> - <key>peak_hold</key> - <value>False</value> + <key>_coordinate</key> + <value>(83, 1111)</value> </param> <param> - <key>average</key> - <value>True</value> + <key>_rotation</key> + <value>0</value> </param> + </block> + <block> + <key>blocks_add_xx</key> <param> - <key>avg_alpha</key> - <value>0.001</value> + <key>id</key> + <value>blocks_add_xx_1</value> </param> <param> - <key>show_gauge</key> + <key>_enabled</key> <value>True</value> </param> <param> - <key>win_size</key> - <value></value> + <key>type</key> + <value>complex</value> </param> <param> - <key>grid_pos</key> - <value>0,0,1,1</value> + <key>num_inputs</key> + <value>2</value> + </param> + <param> + <key>vlen</key> + <value>1</value> </param> <param> - <key>notebook</key> + <key>alias</key> <value></value> </param> <param> + <key>affinity</key> + <value></value> + </param> + <param> + <key>minoutbuf</key> + <value>0</value> + </param> + <param> + <key>maxoutbuf</key> + <value>0</value> + </param> + <param> <key>_coordinate</key> - <value>(1267, 410)</value> + <value>(1400, 262)</value> </param> <param> <key>_rotation</key> @@ -1149,10 +1661,10 @@ </param> </block> <block> - <key>wxgui_numbersink2</key> + <key>qtgui_const_sink_x</key> <param> <key>id</key> - <value>wxgui_numbersink2_2</value> + <value>qtgui_const_sink_x_0</value> </param> <param> <key>_enabled</key> @@ -1160,249 +1672,319 @@ </param> <param> <key>type</key> - <value>float</value> + <value>complex</value> </param> <param> - <key>title</key> - <value>BER 2 (raw)</value> + <key>name</key> + <value>Constellation</value> </param> <param> - <key>units</key> - <value>BER</value> + <key>size</key> + <value>1024</value> </param> <param> - <key>samp_rate</key> - <value>R</value> + <key>autoscale</key> + <value>False</value> </param> <param> - <key>min_value</key> - <value>0</value> + <key>ymin</key> + <value>-2</value> </param> <param> - <key>max_value</key> - <value>1.0</value> + <key>ymax</key> + <value>2</value> </param> <param> - <key>factor</key> - <value>1.0</value> + <key>xmin</key> + <value>-2</value> </param> <param> - <key>decimal_places</key> - <value>6</value> + <key>xmax</key> + <value>2</value> </param> <param> - <key>ref_level</key> - <value>0</value> + <key>nconnections</key> + <value>1</value> </param> <param> - <key>number_rate</key> - <value>15</value> + <key>update_time</key> + <value>0.10</value> </param> <param> - <key>peak_hold</key> - <value>False</value> + <key>gui_hint</key> + <value></value> </param> <param> - <key>average</key> - <value>True</value> + <key>tr_mode</key> + <value>qtgui.TRIG_MODE_FREE</value> </param> <param> - <key>avg_alpha</key> - <value>0.001</value> + <key>tr_slope</key> + <value>qtgui.TRIG_SLOPE_POS</value> </param> <param> - <key>show_gauge</key> - <value>True</value> + <key>tr_level</key> + <value>0.0</value> </param> <param> - <key>win_size</key> - <value></value> + <key>tr_chan</key> + <value>0</value> </param> <param> - <key>grid_pos</key> - <value>0,1,1,1</value> + <key>tr_tag</key> + <value>""</value> </param> <param> - <key>notebook</key> + <key>label1</key> <value></value> </param> <param> - <key>_coordinate</key> - <value>(1260, 659)</value> + <key>width1</key> + <value>1</value> </param> <param> - <key>_rotation</key> + <key>color1</key> + <value>"blue"</value> + </param> + <param> + <key>style1</key> <value>0</value> </param> - </block> - <block> - <key>wxgui_numbersink2</key> <param> - <key>id</key> - <value>wxgui_numbersink2_3</value> + <key>marker1</key> + <value>0</value> </param> <param> - <key>_enabled</key> - <value>True</value> + <key>alpha1</key> + <value>1.0</value> </param> <param> - <key>type</key> - <value>float</value> + <key>label2</key> + <value></value> </param> <param> - <key>title</key> - <value>BER 2 (after cancelling user 1)</value> + <key>width2</key> + <value>1</value> </param> <param> - <key>units</key> - <value>BER</value> + <key>color2</key> + <value>"red"</value> </param> <param> - <key>samp_rate</key> - <value>R</value> + <key>style2</key> + <value>0</value> </param> <param> - <key>min_value</key> + <key>marker2</key> <value>0</value> </param> <param> - <key>max_value</key> + <key>alpha2</key> <value>1.0</value> </param> <param> - <key>factor</key> - <value>1.0</value> + <key>label3</key> + <value></value> + </param> + <param> + <key>width3</key> + <value>1</value> </param> <param> - <key>decimal_places</key> - <value>6</value> + <key>color3</key> + <value>"red"</value> </param> <param> - <key>ref_level</key> + <key>style3</key> <value>0</value> </param> <param> - <key>number_rate</key> - <value>15</value> + <key>marker3</key> + <value>0</value> </param> <param> - <key>peak_hold</key> - <value>False</value> + <key>alpha3</key> + <value>1.0</value> </param> <param> - <key>average</key> - <value>True</value> + <key>label4</key> + <value></value> </param> <param> - <key>avg_alpha</key> - <value>0.001</value> + <key>width4</key> + <value>1</value> </param> <param> - <key>show_gauge</key> - <value>True</value> + <key>color4</key> + <value>"red"</value> </param> <param> - <key>win_size</key> - <value></value> + <key>style4</key> + <value>0</value> </param> <param> - <key>grid_pos</key> - <value>1,1,1,1</value> + <key>marker4</key> + <value>0</value> </param> <param> - <key>notebook</key> + <key>alpha4</key> + <value>1.0</value> + </param> + <param> + <key>label5</key> <value></value> </param> <param> - <key>_coordinate</key> - <value>(1262, 1020)</value> + <key>width5</key> + <value>1</value> </param> <param> - <key>_rotation</key> + <key>color5</key> + <value>"red"</value> + </param> + <param> + <key>style5</key> <value>0</value> </param> - </block> - <block> - <key>wxgui_numbersink2</key> <param> - <key>id</key> - <value>wxgui_numbersink2_3_0</value> + <key>marker5</key> + <value>0</value> </param> <param> - <key>_enabled</key> - <value>True</value> + <key>alpha5</key> + <value>1.0</value> </param> <param> - <key>type</key> - <value>float</value> + <key>label6</key> + <value></value> </param> <param> - <key>title</key> - <value>BER 1 (after cancelling user 2)</value> + <key>width6</key> + <value>1</value> </param> <param> - <key>units</key> - <value>BER</value> + <key>color6</key> + <value>"red"</value> </param> <param> - <key>samp_rate</key> - <value>R</value> + <key>style6</key> + <value>0</value> </param> <param> - <key>min_value</key> + <key>marker6</key> <value>0</value> </param> <param> - <key>max_value</key> + <key>alpha6</key> <value>1.0</value> </param> <param> - <key>factor</key> + <key>label7</key> + <value></value> + </param> + <param> + <key>width7</key> + <value>1</value> + </param> + <param> + <key>color7</key> + <value>"red"</value> + </param> + <param> + <key>style7</key> + <value>0</value> + </param> + <param> + <key>marker7</key> + <value>0</value> + </param> + <param> + <key>alpha7</key> <value>1.0</value> </param> <param> - <key>decimal_places</key> - <value>6</value> + <key>label8</key> + <value></value> </param> <param> - <key>ref_level</key> + <key>width8</key> + <value>1</value> + </param> + <param> + <key>color8</key> + <value>"red"</value> + </param> + <param> + <key>style8</key> <value>0</value> </param> <param> - <key>number_rate</key> - <value>15</value> + <key>marker8</key> + <value>0</value> </param> <param> - <key>peak_hold</key> - <value>False</value> + <key>alpha8</key> + <value>1.0</value> </param> <param> - <key>average</key> - <value>True</value> + <key>label9</key> + <value></value> </param> <param> - <key>avg_alpha</key> - <value>0.001</value> + <key>width9</key> + <value>1</value> </param> <param> - <key>show_gauge</key> - <value>True</value> + <key>color9</key> + <value>"red"</value> + </param> + <param> + <key>style9</key> + <value>0</value> + </param> + <param> + <key>marker9</key> + <value>0</value> </param> <param> - <key>win_size</key> + <key>alpha9</key> + <value>1.0</value> + </param> + <param> + <key>label10</key> <value></value> </param> <param> - <key>grid_pos</key> - <value>1,0,1,1</value> + <key>width10</key> + <value>1</value> </param> <param> - <key>notebook</key> + <key>color10</key> + <value>"red"</value> + </param> + <param> + <key>style10</key> + <value>0</value> + </param> + <param> + <key>marker10</key> + <value>0</value> + </param> + <param> + <key>alpha10</key> + <value>1.0</value> + </param> + <param> + <key>alias</key> + <value></value> + </param> + <param> + <key>affinity</key> <value></value> </param> <param> <key>_coordinate</key> - <value>(1269, 1417)</value> + <value>(1523, 255)</value> </param> <param> <key>_rotation</key> @@ -1410,10 +1992,10 @@ </param> </block> <block> - <key>blocks_add_xx</key> + <key>blocks_sub_xx</key> <param> <key>id</key> - <value>blocks_add_xx_1</value> + <value>blocks_sub_xx_0</value> </param> <param> <key>_enabled</key> @@ -1421,19 +2003,35 @@ </param> <param> <key>type</key> - <value>complex</value> + <value>short</value> + </param> + <param> + <key>vlen</key> + <value>1</value> </param> <param> <key>num_inputs</key> <value>2</value> </param> <param> - <key>vlen</key> - <value>1</value> + <key>alias</key> + <value></value> + </param> + <param> + <key>affinity</key> + <value></value> + </param> + <param> + <key>minoutbuf</key> + <value>0</value> + </param> + <param> + <key>maxoutbuf</key> + <value>0</value> </param> <param> <key>_coordinate</key> - <value>(1400, 262)</value> + <value>(554, 464)</value> </param> <param> <key>_rotation</key> @@ -1441,10 +2039,10 @@ </param> </block> <block> - <key>blocks_add_xx</key> + <key>blocks_multiply_xx</key> <param> <key>id</key> - <value>blocks_add_xx_0</value> + <value>blocks_multiply_xx_0</value> </param> <param> <key>_enabled</key> @@ -1452,7 +2050,7 @@ </param> <param> <key>type</key> - <value>complex</value> + <value>short</value> </param> <param> <key>num_inputs</key> @@ -1463,8 +2061,24 @@ <value>1</value> </param> <param> + <key>alias</key> + <value></value> + </param> + <param> + <key>affinity</key> + <value></value> + </param> + <param> + <key>minoutbuf</key> + <value>0</value> + </param> + <param> + <key>maxoutbuf</key> + <value>0</value> + </param> + <param> <key>_coordinate</key> - <value>(1224, 245)</value> + <value>(773, 473)</value> </param> <param> <key>_rotation</key> @@ -1472,34 +2086,42 @@ </param> </block> <block> - <key>analog_noise_source_x</key> + <key>blocks_short_to_float</key> <param> <key>id</key> - <value>analog_noise_source_x_0</value> + <value>blocks_short_to_float_0</value> </param> <param> <key>_enabled</key> <value>True</value> </param> <param> - <key>type</key> - <value>complex</value> + <key>vlen</key> + <value>1</value> </param> <param> - <key>noise_type</key> - <value>analog.GR_GAUSSIAN</value> + <key>scale</key> + <value>1</value> </param> <param> - <key>amp</key> - <value>noisevar</value> + <key>alias</key> + <value></value> </param> <param> - <key>seed</key> - <value>-42</value> + <key>affinity</key> + <value></value> + </param> + <param> + <key>minoutbuf</key> + <value>0</value> + </param> + <param> + <key>maxoutbuf</key> + <value>0</value> </param> <param> <key>_coordinate</key> - <value>(1178, 321)</value> + <value>(925, 486)</value> </param> <param> <key>_rotation</key> @@ -1507,30 +2129,42 @@ </param> </block> <block> - <key>blocks_throttle</key> + <key>blocks_short_to_float</key> <param> <key>id</key> - <value>blocks_throttle_0</value> + <value>blocks_short_to_float_2</value> </param> <param> <key>_enabled</key> <value>True</value> </param> <param> - <key>type</key> - <value>short</value> + <key>vlen</key> + <value>1</value> </param> <param> - <key>samples_per_second</key> - <value>R</value> + <key>scale</key> + <value>1</value> </param> <param> - <key>vlen</key> - <value>1</value> + <key>alias</key> + <value></value> + </param> + <param> + <key>affinity</key> + <value></value> + </param> + <param> + <key>minoutbuf</key> + <value>0</value> + </param> + <param> + <key>maxoutbuf</key> + <value>0</value> </param> <param> <key>_coordinate</key> - <value>(579, 143)</value> + <value>(1010, 769)</value> </param> <param> <key>_rotation</key> @@ -1538,10 +2172,10 @@ </param> </block> <block> - <key>blocks_multiply_const_vxx</key> + <key>qtgui_number_sink</key> <param> <key>id</key> - <value>blocks_multiply_const_vxx_0</value> + <value>qtgui_number_sink_0</value> </param> <param> <key>_enabled</key> @@ -1549,58 +2183,131 @@ </param> <param> <key>type</key> - <value>complex</value> + <value>float</value> </param> <param> - <key>const</key> - <value>alpha**0.5</value> + <key>autoscale</key> + <value>False</value> </param> <param> - <key>vlen</key> + <key>avg</key> + <value>0.001</value> + </param> + <param> + <key>graph_type</key> + <value>qtgui.NUM_GRAPH_HORIZ</value> + </param> + <param> + <key>nconnections</key> <value>1</value> </param> <param> - <key>_coordinate</key> - <value>(988, 196)</value> + <key>min</key> + <value>-1</value> </param> <param> - <key>_rotation</key> - <value>0</value> + <key>max</key> + <value>1</value> </param> - </block> - <block> - <key>digital_chunks_to_symbols_xx</key> <param> - <key>id</key> - <value>digital_chunks_to_symbols_xx_0</value> + <key>update_time</key> + <value>0.10</value> </param> <param> - <key>_enabled</key> - <value>True</value> + <key>gui_hint</key> + <value>0,0,1,1</value> </param> <param> - <key>in_type</key> - <value>short</value> + <key>label1</key> + <value>BER 1 (raw)</value> </param> <param> - <key>out_type</key> - <value>complex</value> + <key>color1</key> + <value>("black", "black")</value> </param> <param> - <key>symbol_table</key> - <value>1,1j,-1j,-1</value> + <key>label2</key> + <value></value> </param> <param> - <key>dimension</key> - <value>1</value> + <key>color2</key> + <value>("black", "black")</value> </param> <param> - <key>num_ports</key> - <value>1</value> + <key>label3</key> + <value></value> + </param> + <param> + <key>color3</key> + <value>("black", "black")</value> + </param> + <param> + <key>label4</key> + <value></value> + </param> + <param> + <key>color4</key> + <value>("black", "black")</value> + </param> + <param> + <key>label5</key> + <value></value> + </param> + <param> + <key>color5</key> + <value>("black", "black")</value> + </param> + <param> + <key>label6</key> + <value></value> + </param> + <param> + <key>color6</key> + <value>("black", "black")</value> + </param> + <param> + <key>label7</key> + <value></value> + </param> + <param> + <key>color7</key> + <value>("black", "black")</value> + </param> + <param> + <key>label8</key> + <value></value> + </param> + <param> + <key>color8</key> + <value>("black", "black")</value> + </param> + <param> + <key>label9</key> + <value></value> + </param> + <param> + <key>color9</key> + <value>("black", "black")</value> + </param> + <param> + <key>label10</key> + <value></value> + </param> + <param> + <key>color10</key> + <value>("black", "black")</value> + </param> + <param> + <key>alias</key> + <value></value> + </param> + <param> + <key>affinity</key> + <value></value> </param> <param> <key>_coordinate</key> - <value>(703, 211)</value> + <value>(1153, 436)</value> </param> <param> <key>_rotation</key> @@ -1608,10 +2315,10 @@ </param> </block> <block> - <key>blocks_multiply_const_vxx</key> + <key>qtgui_number_sink</key> <param> <key>id</key> - <value>blocks_multiply_const_vxx_1</value> + <value>qtgui_number_sink_0_0</value> </param> <param> <key>_enabled</key> @@ -1619,50 +2326,131 @@ </param> <param> <key>type</key> - <value>complex</value> + <value>float</value> </param> <param> - <key>const</key> - <value>(1-alpha)**0.5</value> + <key>autoscale</key> + <value>False</value> </param> <param> - <key>vlen</key> + <key>avg</key> + <value>0.001</value> + </param> + <param> + <key>graph_type</key> + <value>qtgui.NUM_GRAPH_HORIZ</value> + </param> + <param> + <key>nconnections</key> <value>1</value> </param> <param> - <key>_coordinate</key> - <value>(994, 319)</value> + <key>min</key> + <value>-1</value> </param> <param> - <key>_rotation</key> - <value>0</value> + <key>max</key> + <value>1</value> </param> - </block> - <block> - <key>trellis_encoder_xx</key> <param> - <key>id</key> - <value>trellis_encoder_xx_1</value> + <key>update_time</key> + <value>0.10</value> </param> <param> - <key>_enabled</key> - <value>True</value> + <key>gui_hint</key> + <value>0,1,1,1</value> </param> <param> - <key>type</key> - <value>ss</value> + <key>label1</key> + <value>BER 2 (raw)</value> </param> <param> - <key>fsm_args</key> - <value>prefix+"gr-trellis/src/examples/fsm_files/awgn1o2_16.fsm"</value> + <key>color1</key> + <value>("black", "black")</value> </param> <param> - <key>init_state</key> - <value>0</value> + <key>label2</key> + <value></value> + </param> + <param> + <key>color2</key> + <value>("black", "black")</value> + </param> + <param> + <key>label3</key> + <value></value> + </param> + <param> + <key>color3</key> + <value>("black", "black")</value> + </param> + <param> + <key>label4</key> + <value></value> + </param> + <param> + <key>color4</key> + <value>("black", "black")</value> + </param> + <param> + <key>label5</key> + <value></value> + </param> + <param> + <key>color5</key> + <value>("black", "black")</value> + </param> + <param> + <key>label6</key> + <value></value> + </param> + <param> + <key>color6</key> + <value>("black", "black")</value> + </param> + <param> + <key>label7</key> + <value></value> + </param> + <param> + <key>color7</key> + <value>("black", "black")</value> + </param> + <param> + <key>label8</key> + <value></value> + </param> + <param> + <key>color8</key> + <value>("black", "black")</value> + </param> + <param> + <key>label9</key> + <value></value> + </param> + <param> + <key>color9</key> + <value>("black", "black")</value> + </param> + <param> + <key>label10</key> + <value></value> + </param> + <param> + <key>color10</key> + <value>("black", "black")</value> + </param> + <param> + <key>alias</key> + <value></value> + </param> + <param> + <key>affinity</key> + <value></value> </param> <param> <key>_coordinate</key> - <value>(336, 311)</value> + <value>(1260, 719)</value> </param> <param> <key>_rotation</key> @@ -1670,38 +2458,142 @@ </param> </block> <block> - <key>digital_chunks_to_symbols_xx</key> + <key>qtgui_number_sink</key> <param> <key>id</key> - <value>digital_chunks_to_symbols_xx_0_0</value> + <value>qtgui_number_sink_0_0_0</value> </param> <param> <key>_enabled</key> <value>True</value> </param> <param> - <key>in_type</key> - <value>short</value> + <key>type</key> + <value>float</value> </param> <param> - <key>out_type</key> - <value>complex</value> + <key>autoscale</key> + <value>False</value> </param> <param> - <key>symbol_table</key> - <value>1,1j,-1j,-1</value> + <key>avg</key> + <value>0.001</value> </param> <param> - <key>dimension</key> + <key>graph_type</key> + <value>qtgui.NUM_GRAPH_HORIZ</value> + </param> + <param> + <key>nconnections</key> <value>1</value> </param> <param> - <key>num_ports</key> + <key>min</key> + <value>-1</value> + </param> + <param> + <key>max</key> <value>1</value> </param> <param> + <key>update_time</key> + <value>0.10</value> + </param> + <param> + <key>gui_hint</key> + <value>1,1,1,1</value> + </param> + <param> + <key>label1</key> + <value>BER 2 (after cancelling user 1)</value> + </param> + <param> + <key>color1</key> + <value>("black", "black")</value> + </param> + <param> + <key>label2</key> + <value></value> + </param> + <param> + <key>color2</key> + <value>("black", "black")</value> + </param> + <param> + <key>label3</key> + <value></value> + </param> + <param> + <key>color3</key> + <value>("black", "black")</value> + </param> + <param> + <key>label4</key> + <value></value> + </param> + <param> + <key>color4</key> + <value>("black", "black")</value> + </param> + <param> + <key>label5</key> + <value></value> + </param> + <param> + <key>color5</key> + <value>("black", "black")</value> + </param> + <param> + <key>label6</key> + <value></value> + </param> + <param> + <key>color6</key> + <value>("black", "black")</value> + </param> + <param> + <key>label7</key> + <value></value> + </param> + <param> + <key>color7</key> + <value>("black", "black")</value> + </param> + <param> + <key>label8</key> + <value></value> + </param> + <param> + <key>color8</key> + <value>("black", "black")</value> + </param> + <param> + <key>label9</key> + <value></value> + </param> + <param> + <key>color9</key> + <value>("black", "black")</value> + </param> + <param> + <key>label10</key> + <value></value> + </param> + <param> + <key>color10</key> + <value>("black", "black")</value> + </param> + <param> + <key>alias</key> + <value></value> + </param> + <param> + <key>affinity</key> + <value></value> + </param> + <param> <key>_coordinate</key> - <value>(703, 311)</value> + <value>(1221, 1116)</value> </param> <param> <key>_rotation</key> @@ -1709,38 +2601,42 @@ </param> </block> <block> - <key>digital_chunks_to_symbols_xx</key> + <key>blocks_short_to_float</key> <param> <key>id</key> - <value>digital_chunks_to_symbols_xx_0_0_0</value> + <value>blocks_short_to_float_1</value> </param> <param> <key>_enabled</key> <value>True</value> </param> <param> - <key>in_type</key> - <value>short</value> + <key>vlen</key> + <value>1</value> </param> <param> - <key>out_type</key> - <value>complex</value> + <key>scale</key> + <value>1</value> </param> <param> - <key>symbol_table</key> - <value>1,1j,-1j,-1</value> + <key>alias</key> + <value></value> </param> <param> - <key>dimension</key> - <value>1</value> + <key>affinity</key> + <value></value> </param> <param> - <key>num_ports</key> - <value>1</value> + <key>minoutbuf</key> + <value>0</value> + </param> + <param> + <key>maxoutbuf</key> + <value>0</value> </param> <param> <key>_coordinate</key> - <value>(418, 1000)</value> + <value>(1006, 1153)</value> </param> <param> <key>_rotation</key> @@ -1748,10 +2644,10 @@ </param> </block> <block> - <key>blocks_multiply_const_vxx</key> + <key>blocks_multiply_xx</key> <param> <key>id</key> - <value>blocks_multiply_const_vxx_2</value> + <value>blocks_multiply_xx_2</value> </param> <param> <key>_enabled</key> @@ -1759,19 +2655,35 @@ </param> <param> <key>type</key> - <value>complex</value> + <value>short</value> </param> <param> - <key>const</key> - <value>alpha**0.5</value> + <key>num_inputs</key> + <value>2</value> </param> <param> <key>vlen</key> <value>1</value> </param> <param> + <key>alias</key> + <value></value> + </param> + <param> + <key>affinity</key> + <value></value> + </param> + <param> + <key>minoutbuf</key> + <value>0</value> + </param> + <param> + <key>maxoutbuf</key> + <value>0</value> + </param> + <param> <key>_coordinate</key> - <value>(710, 1008)</value> + <value>(796, 1136)</value> </param> <param> <key>_rotation</key> @@ -1779,30 +2691,42 @@ </param> </block> <block> - <key>trellis_encoder_xx</key> + <key>blocks_short_to_float</key> <param> <key>id</key> - <value>trellis_encoder_xx_2</value> + <value>blocks_short_to_float_1_0</value> </param> <param> <key>_enabled</key> <value>True</value> </param> <param> - <key>type</key> - <value>ss</value> + <key>vlen</key> + <value>1</value> </param> <param> - <key>fsm_args</key> - <value>prefix+"gr-trellis/src/examples/fsm_files/awgn1o2_16.fsm"</value> + <key>scale</key> + <value>1</value> </param> <param> - <key>init_state</key> + <key>alias</key> + <value></value> + </param> + <param> + <key>affinity</key> + <value></value> + </param> + <param> + <key>minoutbuf</key> + <value>0</value> + </param> + <param> + <key>maxoutbuf</key> <value>0</value> </param> <param> <key>_coordinate</key> - <value>(89, 1000)</value> + <value>(1008, 1549)</value> </param> <param> <key>_rotation</key> @@ -1810,10 +2734,10 @@ </param> </block> <block> - <key>blocks_multiply_const_vxx</key> + <key>qtgui_number_sink</key> <param> <key>id</key> - <value>blocks_multiply_const_vxx_2_0</value> + <value>qtgui_number_sink_0_0_0_0</value> </param> <param> <key>_enabled</key> @@ -1821,19 +2745,131 @@ </param> <param> <key>type</key> - <value>complex</value> + <value>float</value> </param> <param> - <key>const</key> - <value>(1-alpha)**0.5</value> + <key>autoscale</key> + <value>False</value> </param> <param> - <key>vlen</key> + <key>avg</key> + <value>0.001</value> + </param> + <param> + <key>graph_type</key> + <value>qtgui.NUM_GRAPH_HORIZ</value> + </param> + <param> + <key>nconnections</key> + <value>1</value> + </param> + <param> + <key>min</key> + <value>-1</value> + </param> + <param> + <key>max</key> <value>1</value> </param> <param> + <key>update_time</key> + <value>0.10</value> + </param> + <param> + <key>gui_hint</key> + <value>1,0,1,1</value> + </param> + <param> + <key>label1</key> + <value>BER 1 (after cancelling user 2)</value> + </param> + <param> + <key>color1</key> + <value>("black", "black")</value> + </param> + <param> + <key>label2</key> + <value></value> + </param> + <param> + <key>color2</key> + <value>("black", "black")</value> + </param> + <param> + <key>label3</key> + <value></value> + </param> + <param> + <key>color3</key> + <value>("black", "black")</value> + </param> + <param> + <key>label4</key> + <value></value> + </param> + <param> + <key>color4</key> + <value>("black", "black")</value> + </param> + <param> + <key>label5</key> + <value></value> + </param> + <param> + <key>color5</key> + <value>("black", "black")</value> + </param> + <param> + <key>label6</key> + <value></value> + </param> + <param> + <key>color6</key> + <value>("black", "black")</value> + </param> + <param> + <key>label7</key> + <value></value> + </param> + <param> + <key>color7</key> + <value>("black", "black")</value> + </param> + <param> + <key>label8</key> + <value></value> + </param> + <param> + <key>color8</key> + <value>("black", "black")</value> + </param> + <param> + <key>label9</key> + <value></value> + </param> + <param> + <key>color9</key> + <value>("black", "black")</value> + </param> + <param> + <key>label10</key> + <value></value> + </param> + <param> + <key>color10</key> + <value>("black", "black")</value> + </param> + <param> + <key>alias</key> + <value></value> + </param> + <param> + <key>affinity</key> + <value></value> + </param> + <param> <key>_coordinate</key> - <value>(733, 1374)</value> + <value>(1271, 1507)</value> </param> <param> <key>_rotation</key> @@ -1841,30 +2877,58 @@ </param> </block> <block> - <key>trellis_encoder_xx</key> + <key>variable_qtgui_range</key> <param> <key>id</key> - <value>trellis_encoder_xx_2_0</value> + <value>alpha</value> </param> <param> <key>_enabled</key> <value>True</value> </param> <param> - <key>type</key> - <value>ss</value> + <key>label</key> + <value>P2/P</value> </param> <param> - <key>fsm_args</key> - <value>prefix+"gr-trellis/src/examples/fsm_files/awgn1o2_16.fsm"</value> + <key>value</key> + <value>.6</value> </param> <param> - <key>init_state</key> + <key>start</key> <value>0</value> </param> <param> + <key>stop</key> + <value>1</value> + </param> + <param> + <key>step</key> + <value>.01</value> + </param> + <param> + <key>widget</key> + <value>counter_slider</value> + </param> + <param> + <key>orient</key> + <value>Qt.Horizontal</value> + </param> + <param> + <key>min_len</key> + <value>200</value> + </param> + <param> + <key>gui_hint</key> + <value></value> + </param> + <param> + <key>alias</key> + <value></value> + </param> + <param> <key>_coordinate</key> - <value>(103, 1366)</value> + <value>(164, 0)</value> </param> <param> <key>_rotation</key> @@ -1872,38 +2936,58 @@ </param> </block> <block> - <key>digital_chunks_to_symbols_xx</key> + <key>variable_qtgui_range</key> <param> <key>id</key> - <value>digital_chunks_to_symbols_xx_0_0_1</value> + <value>snr_db</value> </param> <param> <key>_enabled</key> <value>True</value> </param> <param> - <key>in_type</key> - <value>short</value> + <key>label</key> + <value>P/sigma^2 (dB)</value> </param> <param> - <key>out_type</key> - <value>complex</value> + <key>value</key> + <value>16</value> </param> <param> - <key>symbol_table</key> - <value>1,1j,-1j,-1</value> + <key>start</key> + <value>0</value> </param> <param> - <key>dimension</key> - <value>1</value> + <key>stop</key> + <value>20</value> </param> <param> - <key>num_ports</key> + <key>step</key> <value>1</value> </param> <param> + <key>widget</key> + <value>counter_slider</value> + </param> + <param> + <key>orient</key> + <value>Qt.Horizontal</value> + </param> + <param> + <key>min_len</key> + <value>200</value> + </param> + <param> + <key>gui_hint</key> + <value></value> + </param> + <param> + <key>alias</key> + <value></value> + </param> + <param> <key>_coordinate</key> - <value>(420, 1366)</value> + <value>(310, 0)</value> </param> <param> <key>_rotation</key> @@ -1953,12 +3037,6 @@ <sink_key>0</sink_key> </connection> <connection> - <source_block_id>blocks_short_to_float_0</source_block_id> - <sink_block_id>wxgui_numbersink2_0</sink_block_id> - <source_key>0</source_key> - <sink_key>0</sink_key> - </connection> - <connection> <source_block_id>blocks_multiply_xx_2</source_block_id> <sink_block_id>blocks_short_to_float_1</sink_block_id> <source_key>0</source_key> @@ -1971,12 +3049,6 @@ <sink_key>0</sink_key> </connection> <connection> - <source_block_id>blocks_add_xx_1</source_block_id> - <sink_block_id>trellis_viterbi_combined_xx_1</sink_block_id> - <source_key>0</source_key> - <sink_key>0</sink_key> - </connection> - <connection> <source_block_id>analog_random_source_x_0</source_block_id> <sink_block_id>blocks_sub_xx_0</sink_block_id> <source_key>0</source_key> @@ -2007,12 +3079,6 @@ <sink_key>0</sink_key> </connection> <connection> - <source_block_id>blocks_sub_xx_1</source_block_id> - <sink_block_id>blocks_multiply_xx_2</sink_block_id> - <source_key>0</source_key> - <sink_key>1</sink_key> - </connection> - <connection> <source_block_id>blocks_sub_xx_2</source_block_id> <sink_block_id>trellis_viterbi_combined_xx_0</sink_block_id> <source_key>0</source_key> @@ -2043,12 +3109,6 @@ <sink_key>0</sink_key> </connection> <connection> - <source_block_id>blocks_short_to_float_2</source_block_id> - <sink_block_id>wxgui_numbersink2_2</sink_block_id> - <source_key>0</source_key> - <sink_key>0</sink_key> - </connection> - <connection> <source_block_id>trellis_viterbi_combined_xx_2</source_block_id> <sink_block_id>blocks_sub_xx_3</sink_block_id> <source_key>0</source_key> @@ -2067,24 +3127,12 @@ <sink_key>1</sink_key> </connection> <connection> - <source_block_id>blocks_add_xx_1</source_block_id> - <sink_block_id>trellis_viterbi_combined_xx_2</sink_block_id> - <source_key>0</source_key> - <sink_key>0</sink_key> - </connection> - <connection> <source_block_id>analog_random_source_x_1</source_block_id> <sink_block_id>blocks_sub_xx_3</sink_block_id> <source_key>0</source_key> <sink_key>0</sink_key> </connection> <connection> - <source_block_id>blocks_short_to_float_1</source_block_id> - <sink_block_id>wxgui_numbersink2_3</sink_block_id> - <source_key>0</source_key> - <sink_key>0</sink_key> - </connection> - <connection> <source_block_id>trellis_viterbi_combined_xx_2</source_block_id> <sink_block_id>trellis_encoder_xx_2_0</sink_block_id> <source_key>0</source_key> @@ -2121,12 +3169,6 @@ <sink_key>0</sink_key> </connection> <connection> - <source_block_id>blocks_short_to_float_1_0</source_block_id> - <sink_block_id>wxgui_numbersink2_3_0</sink_block_id> - <source_key>0</source_key> - <sink_key>0</sink_key> - </connection> - <connection> <source_block_id>blocks_add_xx_1</source_block_id> <sink_block_id>blocks_sub_xx_2_0</sink_block_id> <source_key>0</source_key> @@ -2145,12 +3187,6 @@ <sink_key>1</sink_key> </connection> <connection> - <source_block_id>blocks_add_xx_1</source_block_id> - <sink_block_id>wxgui_scopesink2_0</sink_block_id> - <source_key>0</source_key> - <sink_key>0</sink_key> - </connection> - <connection> <source_block_id>trellis_encoder_xx_0</source_block_id> <sink_block_id>blocks_throttle_0</sink_block_id> <source_key>0</source_key> @@ -2210,4 +3246,52 @@ <source_key>0</source_key> <sink_key>0</sink_key> </connection> + <connection> + <source_block_id>blocks_add_xx_1</source_block_id> + <sink_block_id>trellis_viterbi_combined_xx_1</sink_block_id> + <source_key>0</source_key> + <sink_key>0</sink_key> + </connection> + <connection> + <source_block_id>blocks_add_xx_1</source_block_id> + <sink_block_id>qtgui_const_sink_x_0</sink_block_id> + <source_key>0</source_key> + <sink_key>0</sink_key> + </connection> + <connection> + <source_block_id>blocks_add_xx_1</source_block_id> + <sink_block_id>trellis_viterbi_combined_xx_2</sink_block_id> + <source_key>0</source_key> + <sink_key>0</sink_key> + </connection> + <connection> + <source_block_id>blocks_short_to_float_0</source_block_id> + <sink_block_id>qtgui_number_sink_0</sink_block_id> + <source_key>0</source_key> + <sink_key>0</sink_key> + </connection> + <connection> + <source_block_id>blocks_short_to_float_2</source_block_id> + <sink_block_id>qtgui_number_sink_0_0</sink_block_id> + <source_key>0</source_key> + <sink_key>0</sink_key> + </connection> + <connection> + <source_block_id>blocks_short_to_float_1</source_block_id> + <sink_block_id>qtgui_number_sink_0_0_0</sink_block_id> + <source_key>0</source_key> + <sink_key>0</sink_key> + </connection> + <connection> + <source_block_id>blocks_sub_xx_1</source_block_id> + <sink_block_id>blocks_multiply_xx_2</sink_block_id> + <source_key>0</source_key> + <sink_key>1</sink_key> + </connection> + <connection> + <source_block_id>blocks_short_to_float_1_0</source_block_id> + <sink_block_id>qtgui_number_sink_0_0_0_0</sink_block_id> + <source_key>0</source_key> + <sink_key>0</sink_key> + </connection> </flow_graph> diff --git a/gr-trellis/examples/grc/pccc.grc b/gr-trellis/examples/grc/pccc.grc index 3563f2fe56..f95d8ae28b 100644 --- a/gr-trellis/examples/grc/pccc.grc +++ b/gr-trellis/examples/grc/pccc.grc @@ -1,6 +1,6 @@ <?xml version='1.0' encoding='ASCII'?> <flow_graph> - <timestamp>Thu Dec 27 13:49:53 2012</timestamp> + <timestamp>Sat Jul 12 17:37:36 2014</timestamp> <block> <key>options</key> <param> @@ -52,6 +52,10 @@ <value></value> </param> <param> + <key>alias</key> + <value></value> + </param> + <param> <key>_coordinate</key> <value>(10, 10)</value> </param> @@ -64,7 +68,7 @@ <key>variable</key> <param> <key>id</key> - <value>noisevar</value> + <value>prefix</value> </param> <param> <key>_enabled</key> @@ -72,11 +76,15 @@ </param> <param> <key>value</key> - <value>10**(-snr_db/10)</value> + <value>"/home/mbant/src/gnuradio/"</value> + </param> + <param> + <key>alias</key> + <value></value> </param> <param> <key>_coordinate</key> - <value>(389, 15)</value> + <value>(590, 15)</value> </param> <param> <key>_rotation</key> @@ -87,7 +95,7 @@ <key>variable</key> <param> <key>id</key> - <value>prefix</value> + <value>R</value> </param> <param> <key>_enabled</key> @@ -95,11 +103,15 @@ </param> <param> <key>value</key> - <value>"/n/harrisville/x/anastas/gnuradio_trunk/"</value> + <value>100e3</value> + </param> + <param> + <key>alias</key> + <value></value> </param> <param> <key>_coordinate</key> - <value>(590, 15)</value> + <value>(482, 17)</value> </param> <param> <key>_rotation</key> @@ -121,6 +133,10 @@ <value>1000</value> </param> <param> + <key>alias</key> + <value></value> + </param> + <param> <key>_coordinate</key> <value>(764, 16)</value> </param> @@ -130,6 +146,33 @@ </param> </block> <block> + <key>variable</key> + <param> + <key>id</key> + <value>noisevar</value> + </param> + <param> + <key>_enabled</key> + <value>True</value> + </param> + <param> + <key>value</key> + <value>10**(-snr_db/10)</value> + </param> + <param> + <key>alias</key> + <value></value> + </param> + <param> + <key>_coordinate</key> + <value>(389, 15)</value> + </param> + <param> + <key>_rotation</key> + <value>0</value> + </param> + </block> + <block> <key>variable_slider</key> <param> <key>id</key> @@ -176,6 +219,10 @@ <value></value> </param> <param> + <key>alias</key> + <value></value> + </param> + <param> <key>_coordinate</key> <value>(229, 13)</value> </param> @@ -207,35 +254,24 @@ <value>1</value> </param> <param> - <key>_coordinate</key> - <value>(392, 591)</value> - </param> - <param> - <key>_rotation</key> - <value>0</value> - </param> - </block> - <block> - <key>blocks_short_to_float</key> - <param> - <key>id</key> - <value>blocks_short_to_float_1_0</value> + <key>alias</key> + <value></value> </param> <param> - <key>_enabled</key> - <value>True</value> + <key>affinity</key> + <value></value> </param> <param> - <key>vlen</key> - <value>1</value> + <key>minoutbuf</key> + <value>0</value> </param> <param> - <key>scale</key> - <value>1</value> + <key>maxoutbuf</key> + <value>0</value> </param> <param> <key>_coordinate</key> - <value>(535, 609)</value> + <value>(392, 591)</value> </param> <param> <key>_rotation</key> @@ -243,86 +279,42 @@ </param> </block> <block> - <key>wxgui_numbersink2</key> + <key>blocks_short_to_float</key> <param> <key>id</key> - <value>wxgui_numbersink2_3_0</value> + <value>blocks_short_to_float_1_0</value> </param> <param> <key>_enabled</key> <value>True</value> </param> <param> - <key>type</key> - <value>float</value> + <key>vlen</key> + <value>1</value> </param> <param> - <key>title</key> - <value>BER</value> + <key>scale</key> + <value>1</value> </param> <param> - <key>units</key> - <value>BER</value> + <key>alias</key> + <value></value> </param> <param> - <key>samp_rate</key> - <value>R</value> + <key>affinity</key> + <value></value> </param> <param> - <key>min_value</key> + <key>minoutbuf</key> <value>0</value> </param> <param> - <key>max_value</key> - <value>1.0</value> - </param> - <param> - <key>factor</key> - <value>1.0</value> - </param> - <param> - <key>decimal_places</key> - <value>6</value> - </param> - <param> - <key>ref_level</key> + <key>maxoutbuf</key> <value>0</value> </param> <param> - <key>number_rate</key> - <value>15</value> - </param> - <param> - <key>peak_hold</key> - <value>False</value> - </param> - <param> - <key>average</key> - <value>True</value> - </param> - <param> - <key>avg_alpha</key> - <value>0.001</value> - </param> - <param> - <key>show_gauge</key> - <value>True</value> - </param> - <param> - <key>win_size</key> - <value></value> - </param> - <param> - <key>grid_pos</key> - <value>1,0,1,1</value> - </param> - <param> - <key>notebook</key> - <value></value> - </param> - <param> <key>_coordinate</key> - <value>(713, 426)</value> + <value>(535, 609)</value> </param> <param> <key>_rotation</key> @@ -396,6 +388,14 @@ <value>Counts</value> </param> <param> + <key>alias</key> + <value></value> + </param> + <param> + <key>affinity</key> + <value></value> + </param> + <param> <key>_coordinate</key> <value>(952, 73)</value> </param> @@ -435,6 +435,22 @@ <value>True</value> </param> <param> + <key>alias</key> + <value></value> + </param> + <param> + <key>affinity</key> + <value></value> + </param> + <param> + <key>minoutbuf</key> + <value>0</value> + </param> + <param> + <key>maxoutbuf</key> + <value>0</value> + </param> + <param> <key>_coordinate</key> <value>(21, 170)</value> </param> @@ -444,10 +460,10 @@ </param> </block> <block> - <key>trellis_pccc_encoder_xx</key> + <key>blocks_sub_xx</key> <param> <key>id</key> - <value>trellis_pccc_encoder_xx_0</value> + <value>blocks_sub_xx_0</value> </param> <param> <key>_enabled</key> @@ -455,35 +471,35 @@ </param> <param> <key>type</key> - <value>ss</value> + <value>short</value> </param> <param> - <key>o_fsm_args</key> - <value>prefix+"gr-trellis/src/examples/fsm_files/awgn1o2_4.fsm"</value> + <key>vlen</key> + <value>1</value> </param> <param> - <key>o_init_state</key> - <value>0</value> + <key>num_inputs</key> + <value>2</value> </param> <param> - <key>i_fsm_args</key> - <value>prefix+"gr-trellis/src/examples/fsm_files/awgn1o2_4.fsm"</value> + <key>alias</key> + <value></value> </param> <param> - <key>i_init_state</key> - <value>0</value> + <key>affinity</key> + <value></value> </param> <param> - <key>interleaver_args</key> - <value>trellis.interleaver(block,666)</value> + <key>minoutbuf</key> + <value>0</value> </param> <param> - <key>bl</key> - <value>block</value> + <key>maxoutbuf</key> + <value>0</value> </param> <param> <key>_coordinate</key> - <value>(236, 147)</value> + <value>(217, 597)</value> </param> <param> <key>_rotation</key> @@ -491,22 +507,50 @@ </param> </block> <block> - <key>variable</key> + <key>analog_noise_source_x</key> <param> <key>id</key> - <value>R</value> + <value>analog_noise_source_x_0</value> </param> <param> <key>_enabled</key> <value>True</value> </param> <param> - <key>value</key> - <value>100e3</value> + <key>type</key> + <value>float</value> + </param> + <param> + <key>noise_type</key> + <value>analog.GR_GAUSSIAN</value> + </param> + <param> + <key>amp</key> + <value>noisevar</value> + </param> + <param> + <key>seed</key> + <value>-42</value> + </param> + <param> + <key>alias</key> + <value></value> + </param> + <param> + <key>affinity</key> + <value></value> + </param> + <param> + <key>minoutbuf</key> + <value>0</value> + </param> + <param> + <key>maxoutbuf</key> + <value>0</value> </param> <param> <key>_coordinate</key> - <value>(482, 17)</value> + <value>(584, 259)</value> </param> <param> <key>_rotation</key> @@ -514,10 +558,10 @@ </param> </block> <block> - <key>trellis_pccc_decoder_combined_xx</key> + <key>blocks_throttle</key> <param> <key>id</key> - <value>trellis_pccc_decoder_combined_xx_0</value> + <value>blocks_throttle_0</value> </param> <param> <key>_enabled</key> @@ -525,71 +569,94 @@ </param> <param> <key>type</key> - <value>f</value> + <value>short</value> </param> <param> - <key>out_type</key> - <value>s</value> + <key>samples_per_second</key> + <value>R</value> </param> <param> - <key>o_fsm_args</key> - <value>prefix+"gr-trellis/src/examples/fsm_files/awgn1o2_4.fsm"</value> + <key>vlen</key> + <value>1</value> </param> <param> - <key>o_init_state</key> + <key>ignoretag</key> + <value>True</value> + </param> + <param> + <key>alias</key> + <value></value> + </param> + <param> + <key>affinity</key> + <value></value> + </param> + <param> + <key>minoutbuf</key> <value>0</value> </param> <param> - <key>o_final_state</key> - <value>-1</value> + <key>maxoutbuf</key> + <value>0</value> </param> <param> - <key>i_fsm_args</key> - <value>prefix+"gr-trellis/src/examples/fsm_files/awgn1o2_4.fsm"</value> + <key>_coordinate</key> + <value>(517, 103)</value> </param> <param> - <key>i_init_state</key> + <key>_rotation</key> <value>0</value> </param> + </block> + <block> + <key>digital_chunks_to_symbols_xx</key> <param> - <key>i_final_state</key> - <value>-1</value> + <key>id</key> + <value>digital_chunks_to_symbols_xx_0</value> </param> <param> - <key>interleaver</key> - <value>trellis.interleaver(block,666)</value> + <key>_enabled</key> + <value>True</value> </param> <param> - <key>block_size</key> - <value>block</value> + <key>in_type</key> + <value>short</value> </param> <param> - <key>iterations</key> - <value>10</value> + <key>out_type</key> + <value>float</value> </param> <param> - <key>dim</key> + <key>symbol_table</key> + <value>-7,0,-5,0,-3,0,-1,0,1,0,3,0,5,0,7,0,-7,0,-5,0,-3,0,-1,0,1,0,3,0,5,0,7</value> + </param> + <param> + <key>dimension</key> <value>2</value> </param> <param> - <key>table</key> - <value>-7,0, -5,0, -3,0, -1,0, 1,0, 3,0, 5,0, 7,0, 0,-7,0, -5,0, -3,0, -1,0, 1,0, 3,0, 5,0, 7</value> + <key>num_ports</key> + <value>1</value> </param> <param> - <key>metric_type</key> - <value>digital.TRELLIS_EUCLIDEAN</value> + <key>alias</key> + <value></value> </param> <param> - <key>siso_type</key> - <value>trellis.TRELLIS_MIN_SUM</value> + <key>affinity</key> + <value></value> </param> <param> - <key>scaling</key> - <value>1.0</value> + <key>minoutbuf</key> + <value>0</value> + </param> + <param> + <key>maxoutbuf</key> + <value>0</value> </param> <param> <key>_coordinate</key> - <value>(196, 274)</value> + <value>(559, 180)</value> </param> <param> <key>_rotation</key> @@ -597,10 +664,10 @@ </param> </block> <block> - <key>blocks_sub_xx</key> + <key>blocks_add_xx</key> <param> <key>id</key> - <value>blocks_sub_xx_0</value> + <value>blocks_add_xx_1</value> </param> <param> <key>_enabled</key> @@ -608,19 +675,35 @@ </param> <param> <key>type</key> - <value>short</value> + <value>float</value> + </param> + <param> + <key>num_inputs</key> + <value>2</value> </param> <param> <key>vlen</key> <value>1</value> </param> <param> - <key>num_inputs</key> - <value>2</value> + <key>alias</key> + <value></value> + </param> + <param> + <key>affinity</key> + <value></value> + </param> + <param> + <key>minoutbuf</key> + <value>0</value> + </param> + <param> + <key>maxoutbuf</key> + <value>0</value> </param> <param> <key>_coordinate</key> - <value>(217, 597)</value> + <value>(951, 256)</value> </param> <param> <key>_rotation</key> @@ -628,10 +711,10 @@ </param> </block> <block> - <key>analog_noise_source_x</key> + <key>trellis_pccc_encoder_xx</key> <param> <key>id</key> - <value>analog_noise_source_x_0</value> + <value>trellis_pccc_encoder_xx_0</value> </param> <param> <key>_enabled</key> @@ -639,23 +722,51 @@ </param> <param> <key>type</key> - <value>float</value> + <value>ss</value> </param> <param> - <key>noise_type</key> - <value>analog.GR_GAUSSIAN</value> + <key>o_fsm_args</key> + <value>prefix+"gr-trellis/examples/python/fsm_files/awgn1o2_4.fsm"</value> </param> <param> - <key>amp</key> - <value>noisevar</value> + <key>o_init_state</key> + <value>0</value> </param> <param> - <key>seed</key> - <value>-42</value> + <key>i_fsm_args</key> + <value>prefix+"gr-trellis/examples/python/fsm_files/awgn1o2_4.fsm"</value> + </param> + <param> + <key>i_init_state</key> + <value>0</value> + </param> + <param> + <key>interleaver_args</key> + <value>trellis.interleaver(block,666)</value> + </param> + <param> + <key>bl</key> + <value>block</value> + </param> + <param> + <key>alias</key> + <value></value> + </param> + <param> + <key>affinity</key> + <value></value> + </param> + <param> + <key>minoutbuf</key> + <value>0</value> + </param> + <param> + <key>maxoutbuf</key> + <value>0</value> </param> <param> <key>_coordinate</key> - <value>(584, 259)</value> + <value>(236, 147)</value> </param> <param> <key>_rotation</key> @@ -663,10 +774,10 @@ </param> </block> <block> - <key>blocks_throttle</key> + <key>wxgui_numbersink2</key> <param> <key>id</key> - <value>blocks_throttle_0</value> + <value>wxgui_numbersink2_3_0</value> </param> <param> <key>_enabled</key> @@ -674,58 +785,83 @@ </param> <param> <key>type</key> - <value>short</value> + <value>float</value> </param> <param> - <key>samples_per_second</key> + <key>title</key> + <value>BER</value> + </param> + <param> + <key>units</key> + <value>BER</value> + </param> + <param> + <key>samp_rate</key> <value>R</value> </param> <param> - <key>vlen</key> - <value>1</value> + <key>min_value</key> + <value>0</value> </param> <param> - <key>_coordinate</key> - <value>(517, 103)</value> + <key>max_value</key> + <value>1.0</value> </param> <param> - <key>_rotation</key> + <key>factor</key> + <value>1.0</value> + </param> + <param> + <key>decimal_places</key> + <value>6</value> + </param> + <param> + <key>ref_level</key> <value>0</value> </param> - </block> - <block> - <key>digital_chunks_to_symbols_xx</key> <param> - <key>id</key> - <value>digital_chunks_to_symbols_xx_0</value> + <key>number_rate</key> + <value>15</value> </param> <param> - <key>_enabled</key> + <key>peak_hold</key> + <value>False</value> + </param> + <param> + <key>average</key> <value>True</value> </param> <param> - <key>in_type</key> - <value>short</value> + <key>avg_alpha</key> + <value>0.001</value> </param> <param> - <key>out_type</key> - <value>float</value> + <key>show_gauge</key> + <value>True</value> </param> <param> - <key>symbol_table</key> - <value>-7,0,-5,0,-3,0,-1,0,1,0,3,0,5,0,7,0,-7,0,-5,0,-3,0,-1,0,1,0,3,0,5,0,7</value> + <key>win_size</key> + <value></value> </param> <param> - <key>dimension</key> - <value>2</value> + <key>grid_pos</key> + <value>1,0,1,1</value> </param> <param> - <key>num_ports</key> - <value>1</value> + <key>notebook</key> + <value></value> + </param> + <param> + <key>alias</key> + <value></value> + </param> + <param> + <key>affinity</key> + <value></value> </param> <param> <key>_coordinate</key> - <value>(559, 180)</value> + <value>(719, 462)</value> </param> <param> <key>_rotation</key> @@ -733,10 +869,10 @@ </param> </block> <block> - <key>blocks_add_xx</key> + <key>trellis_pccc_decoder_combined_xx</key> <param> <key>id</key> - <value>blocks_add_xx_1</value> + <value>trellis_pccc_decoder_combined_xx_0</value> </param> <param> <key>_enabled</key> @@ -744,23 +880,91 @@ </param> <param> <key>type</key> - <value>float</value> + <value>f</value> </param> <param> - <key>num_inputs</key> + <key>out_type</key> + <value>s</value> + </param> + <param> + <key>o_fsm_args</key> + <value>prefix+"gr-trellis/examples/python/fsm_files/awgn1o2_4.fsm"</value> + </param> + <param> + <key>o_init_state</key> + <value>0</value> + </param> + <param> + <key>o_final_state</key> + <value>-1</value> + </param> + <param> + <key>i_fsm_args</key> + <value>prefix+"gr-trellis/examples/python/fsm_files/awgn1o2_4.fsm"</value> + </param> + <param> + <key>i_init_state</key> + <value>0</value> + </param> + <param> + <key>i_final_state</key> + <value>-1</value> + </param> + <param> + <key>interleaver</key> + <value>trellis.interleaver(block,666)</value> + </param> + <param> + <key>block_size</key> + <value>block</value> + </param> + <param> + <key>iterations</key> + <value>10</value> + </param> + <param> + <key>dim</key> <value>2</value> </param> <param> - <key>vlen</key> - <value>1</value> + <key>table</key> + <value>-7,0, -5,0, -3,0, -1,0, 1,0, 3,0, 5,0, 7,0, 0,-7,0, -5,0, -3,0, -1,0, 1,0, 3,0, 5,0, 7</value> + </param> + <param> + <key>metric_type</key> + <value>digital.TRELLIS_EUCLIDEAN</value> + </param> + <param> + <key>siso_type</key> + <value>trellis.TRELLIS_MIN_SUM</value> + </param> + <param> + <key>scaling</key> + <value>1.0</value> + </param> + <param> + <key>alias</key> + <value></value> + </param> + <param> + <key>affinity</key> + <value></value> + </param> + <param> + <key>minoutbuf</key> + <value>0</value> + </param> + <param> + <key>maxoutbuf</key> + <value>0</value> </param> <param> <key>_coordinate</key> - <value>(951, 256)</value> + <value>(309, 307)</value> </param> <param> <key>_rotation</key> - <value>0</value> + <value>180</value> </param> </block> <connection> diff --git a/gr-trellis/examples/grc/sccc.grc b/gr-trellis/examples/grc/sccc.grc index 3c10d0cece..962f37a87c 100644 --- a/gr-trellis/examples/grc/sccc.grc +++ b/gr-trellis/examples/grc/sccc.grc @@ -1,6 +1,6 @@ <?xml version='1.0' encoding='ASCII'?> <flow_graph> - <timestamp>Sat Nov 10 15:34:26 2012</timestamp> + <timestamp>Sat Jul 12 17:38:15 2014</timestamp> <block> <key>options</key> <param> @@ -52,6 +52,10 @@ <value></value> </param> <param> + <key>alias</key> + <value></value> + </param> + <param> <key>_coordinate</key> <value>(10, 10)</value> </param> @@ -64,7 +68,7 @@ <key>variable</key> <param> <key>id</key> - <value>noisevar</value> + <value>prefix</value> </param> <param> <key>_enabled</key> @@ -72,11 +76,15 @@ </param> <param> <key>value</key> - <value>10**(-snr_db/10)</value> + <value>"/home/mbant/src/gnuradio/"</value> + </param> + <param> + <key>alias</key> + <value></value> </param> <param> <key>_coordinate</key> - <value>(389, 15)</value> + <value>(572, 9)</value> </param> <param> <key>_rotation</key> @@ -84,38 +92,53 @@ </param> </block> <block> - <key>analog_random_source_x</key> + <key>variable</key> <param> <key>id</key> - <value>analog_random_source_x_0</value> + <value>R</value> </param> <param> <key>_enabled</key> <value>True</value> </param> <param> - <key>type</key> - <value>short</value> + <key>value</key> + <value>10e3</value> </param> <param> - <key>min</key> + <key>alias</key> + <value></value> + </param> + <param> + <key>_coordinate</key> + <value>(482, 17)</value> + </param> + <param> + <key>_rotation</key> <value>0</value> </param> + </block> + <block> + <key>variable</key> + <param> + <key>id</key> + <value>block</value> + </param> <param> - <key>max</key> - <value>2</value> + <key>_enabled</key> + <value>True</value> </param> <param> - <key>num_samps</key> + <key>value</key> <value>1000</value> </param> <param> - <key>repeat</key> - <value>True</value> + <key>alias</key> + <value></value> </param> <param> <key>_coordinate</key> - <value>(21, 170)</value> + <value>(764, 16)</value> </param> <param> <key>_rotation</key> @@ -126,7 +149,7 @@ <key>variable</key> <param> <key>id</key> - <value>prefix</value> + <value>noisevar</value> </param> <param> <key>_enabled</key> @@ -134,11 +157,15 @@ </param> <param> <key>value</key> - <value>"/n/harrisville/x/anastas/gnuradio_trunk/"</value> + <value>10**(-snr_db/10)</value> + </param> + <param> + <key>alias</key> + <value></value> </param> <param> <key>_coordinate</key> - <value>(590, 15)</value> + <value>(389, 15)</value> </param> <param> <key>_rotation</key> @@ -146,22 +173,54 @@ </param> </block> <block> - <key>variable</key> + <key>analog_random_source_x</key> <param> <key>id</key> - <value>block</value> + <value>analog_random_source_x_0</value> </param> <param> <key>_enabled</key> <value>True</value> </param> <param> - <key>value</key> + <key>type</key> + <value>short</value> + </param> + <param> + <key>min</key> + <value>0</value> + </param> + <param> + <key>max</key> + <value>2</value> + </param> + <param> + <key>num_samps</key> <value>1000</value> </param> <param> + <key>repeat</key> + <value>True</value> + </param> + <param> + <key>alias</key> + <value></value> + </param> + <param> + <key>affinity</key> + <value></value> + </param> + <param> + <key>minoutbuf</key> + <value>0</value> + </param> + <param> + <key>maxoutbuf</key> + <value>0</value> + </param> + <param> <key>_coordinate</key> - <value>(764, 16)</value> + <value>(21, 170)</value> </param> <param> <key>_rotation</key> @@ -191,6 +250,22 @@ <value>2</value> </param> <param> + <key>alias</key> + <value></value> + </param> + <param> + <key>affinity</key> + <value></value> + </param> + <param> + <key>minoutbuf</key> + <value>0</value> + </param> + <param> + <key>maxoutbuf</key> + <value>0</value> + </param> + <param> <key>_coordinate</key> <value>(445, 517)</value> </param> @@ -222,6 +297,22 @@ <value>1</value> </param> <param> + <key>alias</key> + <value></value> + </param> + <param> + <key>affinity</key> + <value></value> + </param> + <param> + <key>minoutbuf</key> + <value>0</value> + </param> + <param> + <key>maxoutbuf</key> + <value>0</value> + </param> + <param> <key>_coordinate</key> <value>(228.25, 798.39170361874085)</value> </param> @@ -249,6 +340,22 @@ <value>1</value> </param> <param> + <key>alias</key> + <value></value> + </param> + <param> + <key>affinity</key> + <value></value> + </param> + <param> + <key>minoutbuf</key> + <value>0</value> + </param> + <param> + <key>maxoutbuf</key> + <value>0</value> + </param> + <param> <key>_coordinate</key> <value>(416, 815)</value> </param> @@ -304,31 +411,12 @@ <value></value> </param> <param> - <key>_coordinate</key> - <value>(229, 13)</value> - </param> - <param> - <key>_rotation</key> - <value>0</value> - </param> - </block> - <block> - <key>variable</key> - <param> - <key>id</key> - <value>R</value> - </param> - <param> - <key>_enabled</key> - <value>True</value> - </param> - <param> - <key>value</key> - <value>10e3</value> + <key>alias</key> + <value></value> </param> <param> <key>_coordinate</key> - <value>(482, 17)</value> + <value>(229, 13)</value> </param> <param> <key>_rotation</key> @@ -402,55 +490,16 @@ <value>Counts</value> </param> <param> - <key>_coordinate</key> - <value>(952, 73)</value> - </param> - <param> - <key>_rotation</key> - <value>0</value> - </param> - </block> - <block> - <key>trellis_sccc_encoder_xx</key> - <param> - <key>id</key> - <value>trellis_sccc_encoder_xx_0</value> - </param> - <param> - <key>_enabled</key> - <value>True</value> - </param> - <param> - <key>type</key> - <value>ss</value> - </param> - <param> - <key>o_fsm_args</key> - <value>prefix+"gr-trellis/src/examples/fsm_files/awgn1o2_4.fsm"</value> - </param> - <param> - <key>o_init_state</key> - <value>0</value> - </param> - <param> - <key>i_fsm_args</key> - <value>prefix+"gr-trellis/src/examples/fsm_files/awgn2o3_4.fsm"</value> - </param> - <param> - <key>i_init_state</key> - <value>0</value> - </param> - <param> - <key>interleaver_args</key> - <value>trellis.interleaver(block,666)</value> + <key>alias</key> + <value></value> </param> <param> - <key>bl</key> - <value>block</value> + <key>affinity</key> + <value></value> </param> <param> <key>_coordinate</key> - <value>(242, 154)</value> + <value>(952, 73)</value> </param> <param> <key>_rotation</key> @@ -536,6 +585,14 @@ <value></value> </param> <param> + <key>alias</key> + <value></value> + </param> + <param> + <key>affinity</key> + <value></value> + </param> + <param> <key>_coordinate</key> <value>(688, 572)</value> </param> @@ -545,10 +602,10 @@ </param> </block> <block> - <key>trellis_sccc_decoder_combined_xx</key> + <key>blocks_throttle</key> <param> <key>id</key> - <value>trellis_sccc_decoder_combined_xx_0</value> + <value>blocks_throttle_0</value> </param> <param> <key>_enabled</key> @@ -556,71 +613,86 @@ </param> <param> <key>type</key> - <value>c</value> + <value>short</value> </param> <param> - <key>out_type</key> - <value>s</value> + <key>samples_per_second</key> + <value>R</value> </param> <param> - <key>o_fsm_args</key> - <value>prefix+"gr-trellis/src/examples/fsm_files/awgn1o2_4.fsm"</value> + <key>vlen</key> + <value>1</value> </param> <param> - <key>o_init_state</key> - <value>0</value> + <key>ignoretag</key> + <value>True</value> </param> <param> - <key>o_final_state</key> - <value>-1</value> + <key>alias</key> + <value></value> </param> <param> - <key>i_fsm_args</key> - <value>prefix+"gr-trellis/src/examples/fsm_files/awgn2o3_4.fsm"</value> + <key>affinity</key> + <value></value> </param> <param> - <key>i_init_state</key> + <key>minoutbuf</key> <value>0</value> </param> <param> - <key>i_final_state</key> - <value>-1</value> + <key>maxoutbuf</key> + <value>0</value> </param> <param> - <key>interleaver</key> - <value>trellis.interleaver(block,666)</value> + <key>_coordinate</key> + <value>(514, 105)</value> </param> <param> - <key>block_size</key> - <value>block</value> + <key>_rotation</key> + <value>0</value> </param> + </block> + <block> + <key>blocks_add_xx</key> <param> - <key>iterations</key> - <value>5</value> + <key>id</key> + <value>blocks_add_xx_1</value> </param> <param> - <key>dim</key> + <key>_enabled</key> + <value>True</value> + </param> + <param> + <key>type</key> + <value>complex</value> + </param> + <param> + <key>num_inputs</key> <value>2</value> </param> <param> - <key>table</key> - <value>1,0,1j,0,-1j,0,-1,0, 0,1,0,1j,0,-1j,0,-1</value> + <key>vlen</key> + <value>1</value> </param> <param> - <key>metric_type</key> - <value>digital.TRELLIS_EUCLIDEAN</value> + <key>alias</key> + <value></value> </param> <param> - <key>siso_type</key> - <value>trellis.TRELLIS_SUM_PRODUCT</value> + <key>affinity</key> + <value></value> </param> <param> - <key>scaling</key> - <value>1.0</value> + <key>minoutbuf</key> + <value>0</value> + </param> + <param> + <key>maxoutbuf</key> + <value>0</value> </param> <param> <key>_coordinate</key> - <value>(159, 335)</value> + <value>(951, 256)</value> </param> <param> <key>_rotation</key> @@ -628,30 +700,54 @@ </param> </block> <block> - <key>blocks_throttle</key> + <key>digital_chunks_to_symbols_xx</key> <param> <key>id</key> - <value>blocks_throttle_0</value> + <value>digital_chunks_to_symbols_xx_0</value> </param> <param> <key>_enabled</key> <value>True</value> </param> <param> - <key>type</key> + <key>in_type</key> <value>short</value> </param> <param> - <key>samples_per_second</key> - <value>R</value> + <key>out_type</key> + <value>complex</value> </param> <param> - <key>vlen</key> + <key>symbol_table</key> + <value>1,0,1j,0,-1j,0,-1,0,0,1,0,1j,0,-1j,0,01</value> + </param> + <param> + <key>dimension</key> + <value>2</value> + </param> + <param> + <key>num_ports</key> <value>1</value> </param> <param> + <key>alias</key> + <value></value> + </param> + <param> + <key>affinity</key> + <value></value> + </param> + <param> + <key>minoutbuf</key> + <value>0</value> + </param> + <param> + <key>maxoutbuf</key> + <value>0</value> + </param> + <param> <key>_coordinate</key> - <value>(514, 105)</value> + <value>(551, 181)</value> </param> <param> <key>_rotation</key> @@ -659,10 +755,10 @@ </param> </block> <block> - <key>blocks_add_xx</key> + <key>analog_noise_source_x</key> <param> <key>id</key> - <value>blocks_add_xx_1</value> + <value>analog_noise_source_x_0</value> </param> <param> <key>_enabled</key> @@ -673,16 +769,36 @@ <value>complex</value> </param> <param> - <key>num_inputs</key> - <value>2</value> + <key>noise_type</key> + <value>analog.GR_GAUSSIAN</value> </param> <param> - <key>vlen</key> - <value>1</value> + <key>amp</key> + <value>noisevar</value> + </param> + <param> + <key>seed</key> + <value>-42</value> + </param> + <param> + <key>alias</key> + <value></value> + </param> + <param> + <key>affinity</key> + <value></value> + </param> + <param> + <key>minoutbuf</key> + <value>0</value> + </param> + <param> + <key>maxoutbuf</key> + <value>0</value> </param> <param> <key>_coordinate</key> - <value>(951, 256)</value> + <value>(651, 270)</value> </param> <param> <key>_rotation</key> @@ -690,49 +806,109 @@ </param> </block> <block> - <key>digital_chunks_to_symbols_xx</key> + <key>trellis_sccc_decoder_combined_xx</key> <param> <key>id</key> - <value>digital_chunks_to_symbols_xx_0</value> + <value>trellis_sccc_decoder_combined_xx_0</value> </param> <param> <key>_enabled</key> <value>True</value> </param> <param> - <key>in_type</key> - <value>short</value> + <key>type</key> + <value>c</value> </param> <param> <key>out_type</key> - <value>complex</value> + <value>s</value> </param> <param> - <key>symbol_table</key> - <value>1,0,1j,0,-1j,0,-1,0,0,1,0,1j,0,-1j,0,01</value> + <key>o_fsm_args</key> + <value>prefix+"gr-trellis/examples/python/fsm_files/awgn1o2_4.fsm"</value> </param> <param> - <key>dimension</key> + <key>o_init_state</key> + <value>0</value> + </param> + <param> + <key>o_final_state</key> + <value>-1</value> + </param> + <param> + <key>i_fsm_args</key> + <value>prefix+"gr-trellis/examples/python/fsm_files/awgn1o2_4.fsm"</value> + </param> + <param> + <key>i_init_state</key> + <value>0</value> + </param> + <param> + <key>i_final_state</key> + <value>-1</value> + </param> + <param> + <key>interleaver</key> + <value>trellis.interleaver(block,666)</value> + </param> + <param> + <key>block_size</key> + <value>block</value> + </param> + <param> + <key>iterations</key> + <value>5</value> + </param> + <param> + <key>dim</key> <value>2</value> </param> <param> - <key>num_ports</key> - <value>1</value> + <key>table</key> + <value>1,0,1j,0,-1j,0,-1,0, 0,1,0,1j,0,-1j,0,-1</value> + </param> + <param> + <key>metric_type</key> + <value>digital.TRELLIS_EUCLIDEAN</value> + </param> + <param> + <key>siso_type</key> + <value>trellis.TRELLIS_SUM_PRODUCT</value> + </param> + <param> + <key>scaling</key> + <value>1.0</value> + </param> + <param> + <key>alias</key> + <value></value> + </param> + <param> + <key>affinity</key> + <value></value> + </param> + <param> + <key>minoutbuf</key> + <value>0</value> + </param> + <param> + <key>maxoutbuf</key> + <value>0</value> </param> <param> <key>_coordinate</key> - <value>(551, 181)</value> + <value>(388, 263)</value> </param> <param> <key>_rotation</key> - <value>0</value> + <value>180</value> </param> </block> <block> - <key>analog_noise_source_x</key> + <key>trellis_sccc_encoder_xx</key> <param> <key>id</key> - <value>analog_noise_source_x_0</value> + <value>trellis_sccc_encoder_xx_0</value> </param> <param> <key>_enabled</key> @@ -740,23 +916,51 @@ </param> <param> <key>type</key> - <value>complex</value> + <value>ss</value> </param> <param> - <key>noise_type</key> - <value>analog.GR_GAUSSIAN</value> + <key>o_fsm_args</key> + <value>prefix+"gr-trellis/examples/python/fsm_files/awgn1o2_4.fsm"</value> </param> <param> - <key>amp</key> - <value>noisevar</value> + <key>o_init_state</key> + <value>0</value> </param> <param> - <key>seed</key> - <value>-42</value> + <key>i_fsm_args</key> + <value>prefix+"gr-trellis/examples/python/fsm_files/awgn1o2_4.fsm"</value> + </param> + <param> + <key>i_init_state</key> + <value>0</value> + </param> + <param> + <key>interleaver_args</key> + <value>trellis.interleaver(block,666)</value> + </param> + <param> + <key>bl</key> + <value>block</value> + </param> + <param> + <key>alias</key> + <value></value> + </param> + <param> + <key>affinity</key> + <value></value> + </param> + <param> + <key>minoutbuf</key> + <value>0</value> + </param> + <param> + <key>maxoutbuf</key> + <value>0</value> </param> <param> <key>_coordinate</key> - <value>(651, 270)</value> + <value>(207, 175)</value> </param> <param> <key>_rotation</key> diff --git a/gr-uhd/examples/grc/uhd_const_wave.grc b/gr-uhd/examples/grc/uhd_const_wave.grc index 46596109de..dfbbea6e88 100644 --- a/gr-uhd/examples/grc/uhd_const_wave.grc +++ b/gr-uhd/examples/grc/uhd_const_wave.grc @@ -1,6 +1,6 @@ <?xml version='1.0' encoding='ASCII'?> <flow_graph> - <timestamp>Mon Mar 18 11:04:05 2013</timestamp> + <timestamp>Sat Jul 12 14:52:24 2014</timestamp> <block> <key>options</key> <param> @@ -29,7 +29,7 @@ </param> <param> <key>generate_options</key> - <value>wx_gui</value> + <value>qt_gui</value> </param> <param> <key>category</key> @@ -52,208 +52,12 @@ <value></value> </param> <param> - <key>_coordinate</key> - <value>(10, 10)</value> - </param> - <param> - <key>_rotation</key> - <value>0</value> - </param> - </block> - <block> - <key>variable_slider</key> - <param> - <key>id</key> - <value>ampl</value> - </param> - <param> - <key>_enabled</key> - <value>True</value> - </param> - <param> - <key>label</key> - <value>Amplitude</value> - </param> - <param> - <key>value</key> - <value>.1</value> - </param> - <param> - <key>min</key> - <value>0</value> - </param> - <param> - <key>max</key> - <value>1</value> - </param> - <param> - <key>num_steps</key> - <value>100</value> - </param> - <param> - <key>style</key> - <value>wx.SL_HORIZONTAL</value> - </param> - <param> - <key>converver</key> - <value>float_converter</value> - </param> - <param> - <key>grid_pos</key> - <value></value> - </param> - <param> - <key>notebook</key> - <value></value> - </param> - <param> - <key>_coordinate</key> - <value>(174, 313)</value> - </param> - <param> - <key>_rotation</key> - <value>0</value> - </param> - </block> - <block> - <key>variable_slider</key> - <param> - <key>id</key> - <value>tun_gain</value> - </param> - <param> - <key>_enabled</key> - <value>True</value> - </param> - <param> - <key>label</key> - <value>UHD Gain</value> - </param> - <param> - <key>value</key> - <value>gain</value> - </param> - <param> - <key>min</key> - <value>0</value> - </param> - <param> - <key>max</key> - <value>20</value> - </param> - <param> - <key>num_steps</key> - <value>100</value> - </param> - <param> - <key>style</key> - <value>wx.SL_HORIZONTAL</value> - </param> - <param> - <key>converver</key> - <value>float_converter</value> - </param> - <param> - <key>grid_pos</key> - <value></value> - </param> - <param> - <key>notebook</key> + <key>alias</key> <value></value> </param> <param> <key>_coordinate</key> - <value>(318, 314)</value> - </param> - <param> - <key>_rotation</key> - <value>0</value> - </param> - </block> - <block> - <key>variable_slider</key> - <param> - <key>id</key> - <value>tun_freq</value> - </param> - <param> - <key>_enabled</key> - <value>True</value> - </param> - <param> - <key>label</key> - <value>UHD Freq (Hz)</value> - </param> - <param> - <key>value</key> - <value>freq</value> - </param> - <param> - <key>min</key> - <value>2.4e9</value> - </param> - <param> - <key>max</key> - <value>2.5e9</value> - </param> - <param> - <key>num_steps</key> - <value>100</value> - </param> - <param> - <key>style</key> - <value>wx.SL_HORIZONTAL</value> - </param> - <param> - <key>converver</key> - <value>float_converter</value> - </param> - <param> - <key>grid_pos</key> - <value></value> - </param> - <param> - <key>notebook</key> - <value></value> - </param> - <param> - <key>_coordinate</key> - <value>(24, 315)</value> - </param> - <param> - <key>_rotation</key> - <value>0</value> - </param> - </block> - <block> - <key>parameter</key> - <param> - <key>id</key> - <value>address</value> - </param> - <param> - <key>_enabled</key> - <value>True</value> - </param> - <param> - <key>label</key> - <value>IP Address</value> - </param> - <param> - <key>value</key> - <value>addr=192.168.11.2</value> - </param> - <param> - <key>type</key> - <value>string</value> - </param> - <param> - <key>short_id</key> - <value>a</value> - </param> - <param> - <key>_coordinate</key> - <value>(188, 12)</value> + <value>(10, 9)</value> </param> <param> <key>_rotation</key> @@ -287,6 +91,10 @@ <value>s</value> </param> <param> + <key>alias</key> + <value></value> + </param> + <param> <key>_coordinate</key> <value>(342, 14)</value> </param> @@ -322,6 +130,10 @@ <value>f</value> </param> <param> + <key>alias</key> + <value></value> + </param> + <param> <key>_coordinate</key> <value>(468, 14)</value> </param> @@ -357,6 +169,10 @@ <value>g</value> </param> <param> + <key>alias</key> + <value></value> + </param> + <param> <key>_coordinate</key> <value>(616, 13)</value> </param> @@ -388,10 +204,18 @@ <value></value> </param> <param> + <key>stream_chans</key> + <value>[]</value> + </param> + <param> <key>dev_addr</key> <value>address</value> </param> <param> + <key>dev_args</key> + <value>""</value> + </param> + <param> <key>sync</key> <value></value> </param> @@ -1020,6 +844,18 @@ <value>0</value> </param> <param> + <key>len_tag_name</key> + <value></value> + </param> + <param> + <key>alias</key> + <value></value> + </param> + <param> + <key>affinity</key> + <value></value> + </param> + <param> <key>_coordinate</key> <value>(308, 169)</value> </param> @@ -1047,6 +883,22 @@ <value>ampl</value> </param> <param> + <key>alias</key> + <value></value> + </param> + <param> + <key>affinity</key> + <value></value> + </param> + <param> + <key>minoutbuf</key> + <value>0</value> + </param> + <param> + <key>maxoutbuf</key> + <value>0</value> + </param> + <param> <key>_coordinate</key> <value>(74, 193)</value> </param> @@ -1055,6 +907,222 @@ <value>0</value> </param> </block> + <block> + <key>variable_qtgui_range</key> + <param> + <key>id</key> + <value>ampl</value> + </param> + <param> + <key>_enabled</key> + <value>True</value> + </param> + <param> + <key>label</key> + <value>Amplitude</value> + </param> + <param> + <key>value</key> + <value>0.1</value> + </param> + <param> + <key>start</key> + <value>0</value> + </param> + <param> + <key>stop</key> + <value>1</value> + </param> + <param> + <key>step</key> + <value>0.01</value> + </param> + <param> + <key>widget</key> + <value>counter_slider</value> + </param> + <param> + <key>orient</key> + <value>Qt.Horizontal</value> + </param> + <param> + <key>min_len</key> + <value>200</value> + </param> + <param> + <key>gui_hint</key> + <value></value> + </param> + <param> + <key>alias</key> + <value></value> + </param> + <param> + <key>_coordinate</key> + <value>(170, 314)</value> + </param> + <param> + <key>_rotation</key> + <value>0</value> + </param> + </block> + <block> + <key>variable_qtgui_range</key> + <param> + <key>id</key> + <value>tun_freq</value> + </param> + <param> + <key>_enabled</key> + <value>True</value> + </param> + <param> + <key>label</key> + <value>UHD Freq (Hz)</value> + </param> + <param> + <key>value</key> + <value>2.45e9</value> + </param> + <param> + <key>start</key> + <value>2.4e9</value> + </param> + <param> + <key>stop</key> + <value>2.5e9</value> + </param> + <param> + <key>step</key> + <value>1</value> + </param> + <param> + <key>widget</key> + <value>counter_slider</value> + </param> + <param> + <key>orient</key> + <value>Qt.Horizontal</value> + </param> + <param> + <key>min_len</key> + <value>200</value> + </param> + <param> + <key>gui_hint</key> + <value></value> + </param> + <param> + <key>alias</key> + <value></value> + </param> + <param> + <key>_coordinate</key> + <value>(31, 317)</value> + </param> + <param> + <key>_rotation</key> + <value>0</value> + </param> + </block> + <block> + <key>variable_qtgui_range</key> + <param> + <key>id</key> + <value>tun_gain</value> + </param> + <param> + <key>_enabled</key> + <value>True</value> + </param> + <param> + <key>label</key> + <value>UHD Gain</value> + </param> + <param> + <key>value</key> + <value>0</value> + </param> + <param> + <key>start</key> + <value>0</value> + </param> + <param> + <key>stop</key> + <value>20</value> + </param> + <param> + <key>step</key> + <value>1</value> + </param> + <param> + <key>widget</key> + <value>counter_slider</value> + </param> + <param> + <key>orient</key> + <value>Qt.Horizontal</value> + </param> + <param> + <key>min_len</key> + <value>200</value> + </param> + <param> + <key>gui_hint</key> + <value></value> + </param> + <param> + <key>alias</key> + <value></value> + </param> + <param> + <key>_coordinate</key> + <value>(302, 307)</value> + </param> + <param> + <key>_rotation</key> + <value>0</value> + </param> + </block> + <block> + <key>parameter</key> + <param> + <key>id</key> + <value>address</value> + </param> + <param> + <key>_enabled</key> + <value>True</value> + </param> + <param> + <key>label</key> + <value>IP Address</value> + </param> + <param> + <key>value</key> + <value>addr=192.168.10.2</value> + </param> + <param> + <key>type</key> + <value>string</value> + </param> + <param> + <key>short_id</key> + <value>a</value> + </param> + <param> + <key>alias</key> + <value></value> + </param> + <param> + <key>_coordinate</key> + <value>(188, 12)</value> + </param> + <param> + <key>_rotation</key> + <value>0</value> + </param> + </block> <connection> <source_block_id>analog_const_source_x_0</source_block_id> <sink_block_id>uhd_usrp_sink_0</sink_block_id> diff --git a/gr-uhd/examples/grc/uhd_dpsk_mod.grc b/gr-uhd/examples/grc/uhd_dpsk_mod.grc index 1e5bfd5ddb..be6ec55b01 100644 --- a/gr-uhd/examples/grc/uhd_dpsk_mod.grc +++ b/gr-uhd/examples/grc/uhd_dpsk_mod.grc @@ -1,6 +1,6 @@ <?xml version='1.0' encoding='ASCII'?> <flow_graph> - <timestamp>Sat Oct 8 14:44:48 2011</timestamp> + <timestamp>Sat Jul 12 15:58:18 2014</timestamp> <block> <key>options</key> <param> @@ -29,7 +29,7 @@ </param> <param> <key>generate_options</key> - <value>wx_gui</value> + <value>qt_gui</value> </param> <param> <key>category</key> @@ -44,12 +44,20 @@ <value>True</value> </param> <param> + <key>max_nouts</key> + <value>0</value> + </param> + <param> <key>realtime_scheduling</key> <value></value> </param> <param> + <key>alias</key> + <value></value> + </param> + <param> <key>_coordinate</key> - <value>(10, 10)</value> + <value>(-5, -2)</value> </param> <param> <key>_rotation</key> @@ -71,8 +79,12 @@ <value>8</value> </param> <param> + <key>alias</key> + <value></value> + </param> + <param> <key>_coordinate</key> - <value>(33, 280)</value> + <value>(743, 124)</value> </param> <param> <key>_rotation</key> @@ -80,86 +92,92 @@ </param> </block> <block> - <key>wxgui_fftsink2</key> + <key>variable</key> <param> <key>id</key> - <value>wxgui_fftsink2_0</value> + <value>rolloff</value> </param> <param> <key>_enabled</key> <value>True</value> </param> <param> - <key>type</key> - <value>complex</value> + <key>value</key> + <value>.35</value> </param> <param> - <key>title</key> - <value>FFT Plot</value> + <key>alias</key> + <value></value> </param> <param> - <key>samp_rate</key> - <value>samp_rate</value> + <key>_coordinate</key> + <value>(566, 548)</value> </param> <param> - <key>baseband_freq</key> - <value>tun_freq</value> + <key>_rotation</key> + <value>0</value> </param> + </block> + <block> + <key>variable</key> <param> - <key>y_per_div</key> - <value>10</value> + <key>id</key> + <value>nfilts</value> </param> <param> - <key>y_divs</key> - <value>10</value> + <key>_enabled</key> + <value>True</value> </param> <param> - <key>ref_level</key> - <value>10</value> + <key>value</key> + <value>32</value> </param> <param> - <key>ref_scale</key> - <value>2.0</value> + <key>alias</key> + <value></value> </param> <param> - <key>fft_size</key> - <value>1024</value> + <key>_coordinate</key> + <value>(653, 548)</value> </param> <param> - <key>fft_rate</key> - <value>30</value> + <key>_rotation</key> + <value>0</value> </param> + </block> + <block> + <key>parameter</key> <param> - <key>peak_hold</key> - <value>False</value> + <key>id</key> + <value>tx_gain</value> </param> <param> - <key>average</key> - <value>False</value> + <key>_enabled</key> + <value>True</value> </param> <param> - <key>avg_alpha</key> - <value>0</value> + <key>label</key> + <value>Default TX Gain</value> </param> <param> - <key>win</key> - <value>None</value> + <key>value</key> + <value>0</value> </param> <param> - <key>win_size</key> - <value></value> + <key>type</key> + <value>eng_float</value> </param> <param> - <key>grid_pos</key> + <key>short_id</key> <value></value> </param> <param> - <key>notebook</key> + <key>alias</key> <value></value> </param> <param> <key>_coordinate</key> - <value>(697, 248)</value> + <value>(968, 0)</value> </param> <param> <key>_rotation</key> @@ -167,74 +185,77 @@ </param> </block> <block> - <key>wxgui_scopesink2</key> + <key>parameter</key> <param> <key>id</key> - <value>wxgui_scopesink2_0</value> + <value>freq</value> </param> <param> <key>_enabled</key> - <value>False</value> + <value>True</value> </param> <param> - <key>type</key> - <value>complex</value> + <key>label</key> + <value>Default Frequency</value> </param> <param> - <key>title</key> - <value>Scope Plot</value> + <key>value</key> + <value>2.45e9</value> </param> <param> - <key>samp_rate</key> - <value>samp_rate</value> + <key>type</key> + <value>eng_float</value> </param> <param> - <key>v_scale</key> - <value>0</value> + <key>short_id</key> + <value>f</value> </param> <param> - <key>v_offset</key> - <value>0</value> + <key>alias</key> + <value></value> </param> <param> - <key>t_scale</key> - <value>1e-6</value> + <key>_coordinate</key> + <value>(634, 0)</value> </param> <param> - <key>ac_couple</key> - <value>False</value> + <key>_rotation</key> + <value>0</value> </param> + </block> + <block> + <key>parameter</key> <param> - <key>xy_mode</key> - <value>True</value> + <key>id</key> + <value>samp_rate</value> </param> <param> - <key>num_inputs</key> - <value>1</value> + <key>_enabled</key> + <value>True</value> </param> <param> - <key>win_size</key> - <value></value> + <key>label</key> + <value>Sample Rate</value> </param> <param> - <key>grid_pos</key> - <value></value> + <key>value</key> + <value>1e6</value> </param> <param> - <key>notebook</key> - <value></value> + <key>type</key> + <value>eng_float</value> </param> <param> - <key>trig_mode</key> - <value>wxgui.TRIG_MODE_AUTO</value> + <key>short_id</key> + <value>s</value> </param> <param> - <key>y_axis_label</key> - <value>Counts</value> + <key>alias</key> + <value></value> </param> <param> <key>_coordinate</key> - <value>(469, 355)</value> + <value>(508, 0)</value> </param> <param> <key>_rotation</key> @@ -242,38 +263,38 @@ </param> </block> <block> - <key>analog_random_source_x</key> + <key>parameter</key> <param> <key>id</key> - <value>analog_random_source_x_0</value> + <value>address0</value> </param> <param> <key>_enabled</key> <value>True</value> </param> <param> - <key>type</key> - <value>byte</value> + <key>label</key> + <value>IP Address, Dev 0</value> </param> <param> - <key>min</key> - <value>0</value> + <key>value</key> + <value>addr=192.168.10.2</value> </param> <param> - <key>max</key> - <value>256</value> + <key>type</key> + <value>string</value> </param> <param> - <key>num_samps</key> - <value>1000</value> + <key>short_id</key> + <value></value> </param> <param> - <key>repeat</key> - <value>True</value> + <key>alias</key> + <value></value> </param> <param> <key>_coordinate</key> - <value>(245, 139)</value> + <value>(162, 0)</value> </param> <param> <key>_rotation</key> @@ -281,30 +302,38 @@ </param> </block> <block> - <key>blocks_multiply_const_vxx</key> + <key>parameter</key> <param> <key>id</key> - <value>blocks_multiply_const_vxx_0</value> + <value>freq_offset</value> </param> <param> <key>_enabled</key> <value>True</value> </param> <param> + <key>label</key> + <value>Rx Frequency Offset</value> + </param> + <param> + <key>value</key> + <value>0</value> + </param> + <param> <key>type</key> - <value>complex</value> + <value>eng_float</value> </param> <param> - <key>const</key> - <value>ampl</value> + <key>short_id</key> + <value>o</value> </param> <param> - <key>vlen</key> - <value>1</value> + <key>alias</key> + <value></value> </param> <param> <key>_coordinate</key> - <value>(647, 163)</value> + <value>(789, 0)</value> </param> <param> <key>_rotation</key> @@ -312,10 +341,10 @@ </param> </block> <block> - <key>variable_slider</key> + <key>parameter</key> <param> <key>id</key> - <value>tun_rx_gain</value> + <value>rx_gain</value> </param> <param> <key>_enabled</key> @@ -323,43 +352,27 @@ </param> <param> <key>label</key> - <value>UHD RX Gain</value> + <value>Default RX Gain</value> </param> <param> <key>value</key> - <value>rx_gain</value> - </param> - <param> - <key>min</key> <value>0</value> </param> <param> - <key>max</key> - <value>20</value> - </param> - <param> - <key>num_steps</key> - <value>100</value> - </param> - <param> - <key>style</key> - <value>wx.SL_HORIZONTAL</value> - </param> - <param> - <key>converver</key> - <value>float_converter</value> + <key>type</key> + <value>eng_float</value> </param> <param> - <key>grid_pos</key> + <key>short_id</key> <value></value> </param> <param> - <key>notebook</key> + <key>alias</key> <value></value> </param> <param> <key>_coordinate</key> - <value>(477, 509)</value> + <value>(1102, 0)</value> </param> <param> <key>_rotation</key> @@ -367,54 +380,73 @@ </param> </block> <block> - <key>variable_slider</key> + <key>import</key> <param> <key>id</key> - <value>rx_freq_off</value> + <value>import_0</value> </param> <param> <key>_enabled</key> <value>True</value> </param> <param> - <key>label</key> - <value>RX Freq Offset (Hz)</value> + <key>import</key> + <value>from gnuradio import digital</value> </param> <param> - <key>value</key> - <value>freq_offset</value> + <key>alias</key> + <value></value> </param> <param> - <key>min</key> - <value>-50e3</value> + <key>_coordinate</key> + <value>(169, 93)</value> </param> <param> - <key>max</key> - <value>+50e3</value> + <key>_rotation</key> + <value>0</value> </param> + </block> + <block> + <key>blocks_multiply_const_vxx</key> <param> - <key>num_steps</key> - <value>100</value> + <key>id</key> + <value>blocks_multiply_const_vxx_0</value> </param> <param> - <key>style</key> - <value>wx.SL_HORIZONTAL</value> + <key>_enabled</key> + <value>True</value> </param> <param> - <key>converver</key> - <value>float_converter</value> + <key>type</key> + <value>complex</value> </param> <param> - <key>grid_pos</key> + <key>const</key> + <value>ampl</value> + </param> + <param> + <key>vlen</key> + <value>1</value> + </param> + <param> + <key>alias</key> <value></value> </param> <param> - <key>notebook</key> + <key>affinity</key> <value></value> </param> <param> + <key>minoutbuf</key> + <value>0</value> + </param> + <param> + <key>maxoutbuf</key> + <value>0</value> + </param> + <param> <key>_coordinate</key> - <value>(190, 507)</value> + <value>(396, 161)</value> </param> <param> <key>_rotation</key> @@ -422,10 +454,10 @@ </param> </block> <block> - <key>parameter</key> + <key>variable_qtgui_range</key> <param> <key>id</key> - <value>rx_gain</value> + <value>ampl</value> </param> <param> <key>_enabled</key> @@ -433,23 +465,47 @@ </param> <param> <key>label</key> - <value>Default RX Gain</value> + <value>Amplitude</value> </param> <param> <key>value</key> + <value>0.1</value> + </param> + <param> + <key>start</key> <value>0</value> </param> <param> - <key>type</key> - <value>eng_float</value> + <key>stop</key> + <value>1</value> </param> <param> - <key>short_id</key> + <key>step</key> + <value>0.01</value> + </param> + <param> + <key>widget</key> + <value>counter_slider</value> + </param> + <param> + <key>orient</key> + <value>Qt.Horizontal</value> + </param> + <param> + <key>min_len</key> + <value>200</value> + </param> + <param> + <key>gui_hint</key> + <value></value> + </param> + <param> + <key>alias</key> <value></value> </param> <param> <key>_coordinate</key> - <value>(1137, 8)</value> + <value>(916, 115)</value> </param> <param> <key>_rotation</key> @@ -460,7 +516,7 @@ <key>parameter</key> <param> <key>id</key> - <value>freq_offset</value> + <value>address1</value> </param> <param> <key>_enabled</key> @@ -468,23 +524,27 @@ </param> <param> <key>label</key> - <value>Rx Frequency Offset</value> + <value>IP Address, Dev 1</value> </param> <param> <key>value</key> - <value>0</value> + <value>addr=192.168.10.2</value> </param> <param> <key>type</key> - <value>eng_float</value> + <value>string</value> </param> <param> <key>short_id</key> - <value>o</value> + <value></value> + </param> + <param> + <key>alias</key> + <value></value> </param> <param> <key>_coordinate</key> - <value>(824, 8)</value> + <value>(322, 0)</value> </param> <param> <key>_rotation</key> @@ -492,10 +552,10 @@ </param> </block> <block> - <key>uhd_usrp_source</key> + <key>uhd_usrp_sink</key> <param> <key>id</key> - <value>uhd_usrp_source_0</value> + <value>uhd_usrp_sink_0</value> </param> <param> <key>_enabled</key> @@ -503,11 +563,27 @@ </param> <param> <key>type</key> - <value>complex</value> + <value>fc32</value> + </param> + <param> + <key>otw</key> + <value></value> + </param> + <param> + <key>stream_args</key> + <value></value> + </param> + <param> + <key>stream_chans</key> + <value>[]</value> </param> <param> <key>dev_addr</key> - <value>address1</value> + <value>address0</value> + </param> + <param> + <key>dev_args</key> + <value>""</value> </param> <param> <key>sync</key> @@ -522,15 +598,23 @@ <value>1</value> </param> <param> - <key>ref_source0</key> + <key>clock_source0</key> + <value></value> + </param> + <param> + <key>time_source0</key> <value></value> </param> <param> <key>sd_spec0</key> + <value>B:0</value> + </param> + <param> + <key>clock_source1</key> <value></value> </param> <param> - <key>ref_source1</key> + <key>time_source1</key> <value></value> </param> <param> @@ -538,7 +622,11 @@ <value></value> </param> <param> - <key>ref_source2</key> + <key>clock_source2</key> + <value></value> + </param> + <param> + <key>time_source2</key> <value></value> </param> <param> @@ -546,7 +634,11 @@ <value></value> </param> <param> - <key>ref_source3</key> + <key>clock_source3</key> + <value></value> + </param> + <param> + <key>time_source3</key> <value></value> </param> <param> @@ -554,7 +646,11 @@ <value></value> </param> <param> - <key>ref_source4</key> + <key>clock_source4</key> + <value></value> + </param> + <param> + <key>time_source4</key> <value></value> </param> <param> @@ -562,7 +658,11 @@ <value></value> </param> <param> - <key>ref_source5</key> + <key>clock_source5</key> + <value></value> + </param> + <param> + <key>time_source5</key> <value></value> </param> <param> @@ -570,7 +670,11 @@ <value></value> </param> <param> - <key>ref_source6</key> + <key>clock_source6</key> + <value></value> + </param> + <param> + <key>time_source6</key> <value></value> </param> <param> @@ -578,7 +682,11 @@ <value></value> </param> <param> - <key>ref_source7</key> + <key>clock_source7</key> + <value></value> + </param> + <param> + <key>time_source7</key> <value></value> </param> <param> @@ -595,7 +703,7 @@ </param> <param> <key>center_freq0</key> - <value>tun_freq+rx_freq_off</value> + <value>tun_freq</value> </param> <param> <key>gain0</key> @@ -1106,8 +1214,20 @@ <value>0</value> </param> <param> + <key>len_tag_name</key> + <value></value> + </param> + <param> + <key>alias</key> + <value></value> + </param> + <param> + <key>affinity</key> + <value></value> + </param> + <param> <key>_coordinate</key> - <value>(216, 288)</value> + <value>(576, 131)</value> </param> <param> <key>_rotation</key> @@ -1115,187 +1235,341 @@ </param> </block> <block> - <key>wxgui_constellationsink2</key> + <key>qtgui_const_sink_x</key> <param> <key>id</key> - <value>wxgui_constellationsink2_0</value> + <value>qtgui_const_sink_x_0</value> </param> <param> <key>_enabled</key> - <value>True</value> + <value>False</value> </param> <param> - <key>title</key> - <value>Constellation Plot</value> + <key>type</key> + <value>complex</value> </param> <param> - <key>samp_rate</key> - <value>samp_rate</value> + <key>name</key> + <value>""</value> </param> <param> - <key>frame_rate</key> - <value>5</value> + <key>size</key> + <value>1024</value> </param> <param> - <key>const_size</key> - <value>2048</value> + <key>autoscale</key> + <value>False</value> </param> <param> - <key>M</key> - <value>4</value> + <key>ymin</key> + <value>-2</value> </param> <param> - <key>theta</key> + <key>ymax</key> + <value>2</value> + </param> + <param> + <key>xmin</key> + <value>-2</value> + </param> + <param> + <key>xmax</key> + <value>2</value> + </param> + <param> + <key>nconnections</key> + <value>1</value> + </param> + <param> + <key>update_time</key> + <value>0.10</value> + </param> + <param> + <key>gui_hint</key> + <value></value> + </param> + <param> + <key>tr_mode</key> + <value>qtgui.TRIG_MODE_FREE</value> + </param> + <param> + <key>tr_slope</key> + <value>qtgui.TRIG_SLOPE_POS</value> + </param> + <param> + <key>tr_level</key> + <value>0.0</value> + </param> + <param> + <key>tr_chan</key> <value>0</value> </param> <param> - <key>loop_bw</key> - <value>6.28/100.0</value> + <key>tr_tag</key> + <value>""</value> + </param> + <param> + <key>label1</key> + <value></value> + </param> + <param> + <key>width1</key> + <value>1</value> + </param> + <param> + <key>color1</key> + <value>"blue"</value> + </param> + <param> + <key>style1</key> + <value>0</value> + </param> + <param> + <key>marker1</key> + <value>0</value> + </param> + <param> + <key>alpha1</key> + <value>1.0</value> + </param> + <param> + <key>label2</key> + <value></value> + </param> + <param> + <key>width2</key> + <value>1</value> + </param> + <param> + <key>color2</key> + <value>"red"</value> + </param> + <param> + <key>style2</key> + <value>0</value> + </param> + <param> + <key>marker2</key> + <value>0</value> + </param> + <param> + <key>alpha2</key> + <value>1.0</value> </param> <param> - <key>fmax</key> - <value>0.06</value> + <key>label3</key> + <value></value> + </param> + <param> + <key>width3</key> + <value>1</value> </param> <param> - <key>mu</key> - <value>0.5</value> + <key>color3</key> + <value>"red"</value> </param> <param> - <key>gain_mu</key> - <value>0.005</value> + <key>style3</key> + <value>0</value> </param> <param> - <key>symbol_rate</key> - <value>samp_rate/samps_per_sym</value> + <key>marker3</key> + <value>0</value> </param> <param> - <key>omega_limit</key> - <value>0.005</value> + <key>alpha3</key> + <value>1.0</value> </param> <param> - <key>win_size</key> + <key>label4</key> <value></value> </param> <param> - <key>grid_pos</key> + <key>width4</key> + <value>1</value> + </param> + <param> + <key>color4</key> + <value>"red"</value> + </param> + <param> + <key>style4</key> + <value>0</value> + </param> + <param> + <key>marker4</key> + <value>0</value> + </param> + <param> + <key>alpha4</key> + <value>1.0</value> + </param> + <param> + <key>label5</key> <value></value> </param> <param> - <key>notebook</key> + <key>width5</key> + <value>1</value> + </param> + <param> + <key>color5</key> + <value>"red"</value> + </param> + <param> + <key>style5</key> + <value>0</value> + </param> + <param> + <key>marker5</key> + <value>0</value> + </param> + <param> + <key>alpha5</key> + <value>1.0</value> + </param> + <param> + <key>label6</key> <value></value> </param> <param> - <key>_coordinate</key> - <value>(862, 336)</value> + <key>width6</key> + <value>1</value> </param> <param> - <key>_rotation</key> + <key>color6</key> + <value>"red"</value> + </param> + <param> + <key>style6</key> <value>0</value> </param> - </block> - <block> - <key>digital_dxpsk_mod</key> <param> - <key>id</key> - <value>digital_dxpsk_mod_0</value> + <key>marker6</key> + <value>0</value> </param> <param> - <key>_enabled</key> - <value>True</value> + <key>alpha6</key> + <value>1.0</value> </param> <param> - <key>type</key> - <value>dqpsk</value> + <key>label7</key> + <value></value> </param> <param> - <key>samples_per_symbol</key> - <value>samps_per_sym</value> + <key>width7</key> + <value>1</value> </param> <param> - <key>excess_bw</key> - <value>0.35</value> + <key>color7</key> + <value>"red"</value> </param> <param> - <key>gray_coded</key> - <value>True</value> + <key>style7</key> + <value>0</value> </param> <param> - <key>verbose</key> - <value>False</value> + <key>marker7</key> + <value>0</value> </param> <param> - <key>log</key> - <value>False</value> + <key>alpha7</key> + <value>1.0</value> </param> <param> - <key>_coordinate</key> - <value>(426, 139)</value> + <key>label8</key> + <value></value> </param> <param> - <key>_rotation</key> + <key>width8</key> + <value>1</value> + </param> + <param> + <key>color8</key> + <value>"red"</value> + </param> + <param> + <key>style8</key> <value>0</value> </param> - </block> - <block> - <key>variable_slider</key> <param> - <key>id</key> - <value>ampl</value> + <key>marker8</key> + <value>0</value> </param> <param> - <key>_enabled</key> - <value>True</value> + <key>alpha8</key> + <value>1.0</value> </param> <param> - <key>label</key> - <value>Amplitude</value> + <key>label9</key> + <value></value> </param> <param> - <key>value</key> - <value>.1</value> + <key>width9</key> + <value>1</value> + </param> + <param> + <key>color9</key> + <value>"red"</value> + </param> + <param> + <key>style9</key> + <value>0</value> </param> <param> - <key>min</key> + <key>marker9</key> <value>0</value> </param> <param> - <key>max</key> + <key>alpha9</key> + <value>1.0</value> + </param> + <param> + <key>label10</key> + <value></value> + </param> + <param> + <key>width10</key> <value>1</value> </param> <param> - <key>num_steps</key> - <value>100</value> + <key>color10</key> + <value>"red"</value> </param> <param> - <key>style</key> - <value>wx.SL_HORIZONTAL</value> + <key>style10</key> + <value>0</value> </param> <param> - <key>converver</key> - <value>float_converter</value> + <key>marker10</key> + <value>0</value> </param> <param> - <key>grid_pos</key> + <key>alpha10</key> + <value>1.0</value> + </param> + <param> + <key>alias</key> <value></value> </param> <param> - <key>notebook</key> + <key>affinity</key> <value></value> </param> <param> <key>_coordinate</key> - <value>(33, 353)</value> + <value>(1, 367)</value> </param> <param> <key>_rotation</key> - <value>0</value> + <value>180</value> </param> </block> <block> - <key>uhd_usrp_sink</key> + <key>uhd_usrp_source</key> <param> <key>id</key> - <value>uhd_usrp_sink_0</value> + <value>uhd_usrp_source_0</value> </param> <param> <key>_enabled</key> @@ -1303,11 +1577,27 @@ </param> <param> <key>type</key> - <value>complex</value> + <value>fc32</value> + </param> + <param> + <key>otw</key> + <value></value> + </param> + <param> + <key>stream_args</key> + <value></value> + </param> + <param> + <key>stream_chans</key> + <value>[]</value> </param> <param> <key>dev_addr</key> - <value>address0</value> + <value>address1</value> + </param> + <param> + <key>dev_args</key> + <value>""</value> </param> <param> <key>sync</key> @@ -1322,15 +1612,23 @@ <value>1</value> </param> <param> - <key>ref_source0</key> + <key>clock_source0</key> + <value></value> + </param> + <param> + <key>time_source0</key> <value></value> </param> <param> <key>sd_spec0</key> + <value>A:0</value> + </param> + <param> + <key>clock_source1</key> <value></value> </param> <param> - <key>ref_source1</key> + <key>time_source1</key> <value></value> </param> <param> @@ -1338,7 +1636,11 @@ <value></value> </param> <param> - <key>ref_source2</key> + <key>clock_source2</key> + <value></value> + </param> + <param> + <key>time_source2</key> <value></value> </param> <param> @@ -1346,7 +1648,11 @@ <value></value> </param> <param> - <key>ref_source3</key> + <key>clock_source3</key> + <value></value> + </param> + <param> + <key>time_source3</key> <value></value> </param> <param> @@ -1354,7 +1660,11 @@ <value></value> </param> <param> - <key>ref_source4</key> + <key>clock_source4</key> + <value></value> + </param> + <param> + <key>time_source4</key> <value></value> </param> <param> @@ -1362,7 +1672,11 @@ <value></value> </param> <param> - <key>ref_source5</key> + <key>clock_source5</key> + <value></value> + </param> + <param> + <key>time_source5</key> <value></value> </param> <param> @@ -1370,7 +1684,11 @@ <value></value> </param> <param> - <key>ref_source6</key> + <key>clock_source6</key> + <value></value> + </param> + <param> + <key>time_source6</key> <value></value> </param> <param> @@ -1378,7 +1696,11 @@ <value></value> </param> <param> - <key>ref_source7</key> + <key>clock_source7</key> + <value></value> + </param> + <param> + <key>time_source7</key> <value></value> </param> <param> @@ -1395,7 +1717,7 @@ </param> <param> <key>center_freq0</key> - <value>tun_freq</value> + <value>tun_freq+rx_freq_off</value> </param> <param> <key>gain0</key> @@ -1906,8 +2228,24 @@ <value>0</value> </param> <param> + <key>alias</key> + <value></value> + </param> + <param> + <key>affinity</key> + <value></value> + </param> + <param> + <key>minoutbuf</key> + <value>0</value> + </param> + <param> + <key>maxoutbuf</key> + <value>0</value> + </param> + <param> <key>_coordinate</key> - <value>(838, 139)</value> + <value>(-1, 242)</value> </param> <param> <key>_rotation</key> @@ -1915,54 +2253,113 @@ </param> </block> <block> - <key>variable_slider</key> + <key>digital_dxpsk_mod</key> <param> <key>id</key> - <value>tun_tx_gain</value> + <value>digital_dxpsk_mod_0</value> </param> <param> <key>_enabled</key> <value>True</value> </param> <param> - <key>label</key> - <value>UHD TX Gain</value> + <key>type</key> + <value>dqpsk</value> </param> <param> - <key>value</key> - <value>tx_gain</value> + <key>samples_per_symbol</key> + <value>samps_per_sym</value> + </param> + <param> + <key>excess_bw</key> + <value>0.35</value> </param> <param> - <key>min</key> + <key>mod_code</key> + <value>"gray"</value> + </param> + <param> + <key>verbose</key> + <value>False</value> + </param> + <param> + <key>log</key> + <value>False</value> + </param> + <param> + <key>alias</key> + <value></value> + </param> + <param> + <key>affinity</key> + <value></value> + </param> + <param> + <key>minoutbuf</key> + <value>0</value> + </param> + <param> + <key>maxoutbuf</key> + <value>0</value> + </param> + <param> + <key>_coordinate</key> + <value>(204, 138)</value> + </param> + <param> + <key>_rotation</key> <value>0</value> </param> + </block> + <block> + <key>blocks_vector_source_x</key> <param> - <key>max</key> - <value>20</value> + <key>id</key> + <value>blocks_vector_source_x_0</value> </param> <param> - <key>num_steps</key> - <value>100</value> + <key>_enabled</key> + <value>True</value> </param> <param> - <key>style</key> - <value>wx.SL_HORIZONTAL</value> + <key>type</key> + <value>byte</value> + </param> + <param> + <key>vector</key> + <value>range(256)</value> </param> <param> - <key>converver</key> - <value>float_converter</value> + <key>tags</key> + <value>[]</value> </param> <param> - <key>grid_pos</key> + <key>repeat</key> + <value>True</value> + </param> + <param> + <key>vlen</key> + <value>1</value> + </param> + <param> + <key>alias</key> <value></value> </param> <param> - <key>notebook</key> + <key>affinity</key> <value></value> </param> <param> + <key>minoutbuf</key> + <value>0</value> + </param> + <param> + <key>maxoutbuf</key> + <value>0</value> + </param> + <param> <key>_coordinate</key> - <value>(351, 508)</value> + <value>(6, 142)</value> </param> <param> <key>_rotation</key> @@ -1970,10 +2367,345 @@ </param> </block> <block> - <key>parameter</key> + <key>qtgui_time_sink_x</key> <param> <key>id</key> - <value>address0</value> + <value>qtgui_time_sink_x_0</value> + </param> + <param> + <key>_enabled</key> + <value>True</value> + </param> + <param> + <key>type</key> + <value>complex</value> + </param> + <param> + <key>name</key> + <value>Rx Time Signal</value> + </param> + <param> + <key>size</key> + <value>1024</value> + </param> + <param> + <key>srate</key> + <value>samp_rate</value> + </param> + <param> + <key>autoscale</key> + <value>True</value> + </param> + <param> + <key>ymin</key> + <value>-1</value> + </param> + <param> + <key>ymax</key> + <value>1</value> + </param> + <param> + <key>nconnections</key> + <value>1</value> + </param> + <param> + <key>update_time</key> + <value>0.10</value> + </param> + <param> + <key>entags</key> + <value>True</value> + </param> + <param> + <key>gui_hint</key> + <value></value> + </param> + <param> + <key>tr_mode</key> + <value>qtgui.TRIG_MODE_FREE</value> + </param> + <param> + <key>tr_slope</key> + <value>qtgui.TRIG_SLOPE_POS</value> + </param> + <param> + <key>tr_level</key> + <value>0.0</value> + </param> + <param> + <key>tr_delay</key> + <value>0</value> + </param> + <param> + <key>tr_chan</key> + <value>0</value> + </param> + <param> + <key>tr_tag</key> + <value>""</value> + </param> + <param> + <key>label1</key> + <value></value> + </param> + <param> + <key>width1</key> + <value>1</value> + </param> + <param> + <key>color1</key> + <value>"blue"</value> + </param> + <param> + <key>style1</key> + <value>1</value> + </param> + <param> + <key>marker1</key> + <value>-1</value> + </param> + <param> + <key>alpha1</key> + <value>1.0</value> + </param> + <param> + <key>label2</key> + <value></value> + </param> + <param> + <key>width2</key> + <value>1</value> + </param> + <param> + <key>color2</key> + <value>"red"</value> + </param> + <param> + <key>style2</key> + <value>1</value> + </param> + <param> + <key>marker2</key> + <value>-1</value> + </param> + <param> + <key>alpha2</key> + <value>1.0</value> + </param> + <param> + <key>label3</key> + <value></value> + </param> + <param> + <key>width3</key> + <value>1</value> + </param> + <param> + <key>color3</key> + <value>"green"</value> + </param> + <param> + <key>style3</key> + <value>1</value> + </param> + <param> + <key>marker3</key> + <value>-1</value> + </param> + <param> + <key>alpha3</key> + <value>1.0</value> + </param> + <param> + <key>label4</key> + <value></value> + </param> + <param> + <key>width4</key> + <value>1</value> + </param> + <param> + <key>color4</key> + <value>"black"</value> + </param> + <param> + <key>style4</key> + <value>1</value> + </param> + <param> + <key>marker4</key> + <value>-1</value> + </param> + <param> + <key>alpha4</key> + <value>1.0</value> + </param> + <param> + <key>label5</key> + <value></value> + </param> + <param> + <key>width5</key> + <value>1</value> + </param> + <param> + <key>color5</key> + <value>"cyan"</value> + </param> + <param> + <key>style5</key> + <value>1</value> + </param> + <param> + <key>marker5</key> + <value>-1</value> + </param> + <param> + <key>alpha5</key> + <value>1.0</value> + </param> + <param> + <key>label6</key> + <value></value> + </param> + <param> + <key>width6</key> + <value>1</value> + </param> + <param> + <key>color6</key> + <value>"magenta"</value> + </param> + <param> + <key>style6</key> + <value>1</value> + </param> + <param> + <key>marker6</key> + <value>-1</value> + </param> + <param> + <key>alpha6</key> + <value>1.0</value> + </param> + <param> + <key>label7</key> + <value></value> + </param> + <param> + <key>width7</key> + <value>1</value> + </param> + <param> + <key>color7</key> + <value>"yellow"</value> + </param> + <param> + <key>style7</key> + <value>1</value> + </param> + <param> + <key>marker7</key> + <value>-1</value> + </param> + <param> + <key>alpha7</key> + <value>1.0</value> + </param> + <param> + <key>label8</key> + <value></value> + </param> + <param> + <key>width8</key> + <value>1</value> + </param> + <param> + <key>color8</key> + <value>"dark red"</value> + </param> + <param> + <key>style8</key> + <value>1</value> + </param> + <param> + <key>marker8</key> + <value>-1</value> + </param> + <param> + <key>alpha8</key> + <value>1.0</value> + </param> + <param> + <key>label9</key> + <value></value> + </param> + <param> + <key>width9</key> + <value>1</value> + </param> + <param> + <key>color9</key> + <value>"dark green"</value> + </param> + <param> + <key>style9</key> + <value>1</value> + </param> + <param> + <key>marker9</key> + <value>-1</value> + </param> + <param> + <key>alpha9</key> + <value>1.0</value> + </param> + <param> + <key>label10</key> + <value></value> + </param> + <param> + <key>width10</key> + <value>1</value> + </param> + <param> + <key>color10</key> + <value>"blue"</value> + </param> + <param> + <key>style10</key> + <value>1</value> + </param> + <param> + <key>marker10</key> + <value>-1</value> + </param> + <param> + <key>alpha10</key> + <value>1.0</value> + </param> + <param> + <key>alias</key> + <value></value> + </param> + <param> + <key>affinity</key> + <value></value> + </param> + <param> + <key>_coordinate</key> + <value>(294, 265)</value> + </param> + <param> + <key>_rotation</key> + <value>0</value> + </param> + </block> + <block> + <key>variable_qtgui_range</key> + <param> + <key>id</key> + <value>tun_freq</value> </param> <param> <key>_enabled</key> @@ -1981,23 +2713,47 @@ </param> <param> <key>label</key> - <value>IP Address, Dev 0</value> + <value>UHD Freq (Hz)</value> </param> <param> <key>value</key> - <value>addr=192.168.10.2</value> + <value>1.982e9</value> </param> <param> - <key>type</key> - <value>string</value> + <key>start</key> + <value>1.9e9</value> </param> <param> - <key>short_id</key> + <key>stop</key> + <value>2.5e9</value> + </param> + <param> + <key>step</key> + <value>1</value> + </param> + <param> + <key>widget</key> + <value>counter_slider</value> + </param> + <param> + <key>orient</key> + <value>Qt.Horizontal</value> + </param> + <param> + <key>min_len</key> + <value>200</value> + </param> + <param> + <key>gui_hint</key> + <value></value> + </param> + <param> + <key>alias</key> <value></value> </param> <param> <key>_coordinate</key> - <value>(197, 11)</value> + <value>(5, 545)</value> </param> <param> <key>_rotation</key> @@ -2005,10 +2761,10 @@ </param> </block> <block> - <key>parameter</key> + <key>variable_qtgui_range</key> <param> <key>id</key> - <value>address1</value> + <value>tun_rx_gain</value> </param> <param> <key>_enabled</key> @@ -2016,23 +2772,47 @@ </param> <param> <key>label</key> - <value>IP Address, Dev 1</value> + <value>UHD Rx Gain</value> </param> <param> <key>value</key> - <value>addr=192.168.11.2</value> + <value>0</value> </param> <param> - <key>type</key> - <value>string</value> + <key>start</key> + <value>0</value> </param> <param> - <key>short_id</key> + <key>stop</key> + <value>30</value> + </param> + <param> + <key>step</key> + <value>1</value> + </param> + <param> + <key>widget</key> + <value>counter_slider</value> + </param> + <param> + <key>orient</key> + <value>Qt.Horizontal</value> + </param> + <param> + <key>min_len</key> + <value>200</value> + </param> + <param> + <key>gui_hint</key> + <value></value> + </param> + <param> + <key>alias</key> <value></value> </param> <param> <key>_coordinate</key> - <value>(357, 11)</value> + <value>(391, 546)</value> </param> <param> <key>_rotation</key> @@ -2040,10 +2820,10 @@ </param> </block> <block> - <key>parameter</key> + <key>variable_qtgui_range</key> <param> <key>id</key> - <value>samp_rate</value> + <value>tun_tx_gain</value> </param> <param> <key>_enabled</key> @@ -2051,23 +2831,47 @@ </param> <param> <key>label</key> - <value>Sample Rate</value> + <value>UHD Tx Gain</value> </param> <param> <key>value</key> - <value>1e6</value> + <value>0</value> </param> <param> - <key>type</key> - <value>eng_float</value> + <key>start</key> + <value>0</value> </param> <param> - <key>short_id</key> - <value>s</value> + <key>stop</key> + <value>30</value> + </param> + <param> + <key>step</key> + <value>1</value> + </param> + <param> + <key>widget</key> + <value>counter_slider</value> + </param> + <param> + <key>orient</key> + <value>Qt.Horizontal</value> + </param> + <param> + <key>min_len</key> + <value>200</value> + </param> + <param> + <key>gui_hint</key> + <value></value> + </param> + <param> + <key>alias</key> + <value></value> </param> <param> <key>_coordinate</key> - <value>(543, 8)</value> + <value>(277, 546)</value> </param> <param> <key>_rotation</key> @@ -2075,10 +2879,10 @@ </param> </block> <block> - <key>parameter</key> + <key>variable_qtgui_range</key> <param> <key>id</key> - <value>freq</value> + <value>rx_freq_off</value> </param> <param> <key>_enabled</key> @@ -2086,23 +2890,122 @@ </param> <param> <key>label</key> - <value>Default Frequency</value> + <value>Rx Freq Offset (Hz)</value> </param> <param> <key>value</key> - <value>2.45e9</value> + <value>0</value> + </param> + <param> + <key>start</key> + <value>-50e3</value> + </param> + <param> + <key>stop</key> + <value>50e3</value> + </param> + <param> + <key>step</key> + <value>1</value> + </param> + <param> + <key>widget</key> + <value>counter_slider</value> + </param> + <param> + <key>orient</key> + <value>Qt.Horizontal</value> + </param> + <param> + <key>min_len</key> + <value>200</value> + </param> + <param> + <key>gui_hint</key> + <value></value> + </param> + <param> + <key>alias</key> + <value></value> + </param> + <param> + <key>_coordinate</key> + <value>(130, 547)</value> + </param> + <param> + <key>_rotation</key> + <value>0</value> + </param> + </block> + <block> + <key>digital_dxpsk_demod</key> + <param> + <key>id</key> + <value>digital_dxpsk_demod_0</value> + </param> + <param> + <key>_enabled</key> + <value>True</value> </param> <param> <key>type</key> - <value>eng_float</value> + <value>dqpsk</value> </param> <param> - <key>short_id</key> - <value>f</value> + <key>samples_per_symbol</key> + <value>samps_per_sym</value> + </param> + <param> + <key>excess_bw</key> + <value>0.35</value> + </param> + <param> + <key>freq_bw</key> + <value>6.28/100.0</value> + </param> + <param> + <key>phase_bw</key> + <value>6.28/100.0</value> + </param> + <param> + <key>timing_bw</key> + <value>6.28/100.0</value> + </param> + <param> + <key>mod_code</key> + <value>"gray"</value> + </param> + <param> + <key>verbose</key> + <value>False</value> + </param> + <param> + <key>log</key> + <value>False</value> + </param> + <param> + <key>sync_out</key> + <value>True</value> + </param> + <param> + <key>alias</key> + <value></value> + </param> + <param> + <key>affinity</key> + <value></value> + </param> + <param> + <key>minoutbuf</key> + <value>0</value> + </param> + <param> + <key>maxoutbuf</key> + <value>0</value> </param> <param> <key>_coordinate</key> - <value>(669, 8)</value> + <value>(294, 375)</value> </param> <param> <key>_rotation</key> @@ -2110,34 +3013,420 @@ </param> </block> <block> - <key>parameter</key> + <key>blocks_unpacked_to_packed_xx</key> <param> <key>id</key> - <value>tx_gain</value> + <value>blocks_unpacked_to_packed_xx_0</value> </param> <param> <key>_enabled</key> <value>True</value> </param> <param> - <key>label</key> - <value>Default TX Gain</value> + <key>type</key> + <value>byte</value> </param> <param> - <key>value</key> + <key>bits_per_chunk</key> + <value>1</value> + </param> + <param> + <key>endianness</key> + <value>gr.GR_LSB_FIRST</value> + </param> + <param> + <key>num_ports</key> + <value>1</value> + </param> + <param> + <key>alias</key> + <value></value> + </param> + <param> + <key>affinity</key> + <value></value> + </param> + <param> + <key>minoutbuf</key> + <value>0</value> + </param> + <param> + <key>maxoutbuf</key> <value>0</value> </param> <param> + <key>_coordinate</key> + <value>(542, 420)</value> + </param> + <param> + <key>_rotation</key> + <value>0</value> + </param> + </block> + <block> + <key>blocks_uchar_to_float</key> + <param> + <key>id</key> + <value>blocks_uchar_to_float_0</value> + </param> + <param> + <key>_enabled</key> + <value>True</value> + </param> + <param> + <key>alias</key> + <value></value> + </param> + <param> + <key>affinity</key> + <value></value> + </param> + <param> + <key>minoutbuf</key> + <value>0</value> + </param> + <param> + <key>maxoutbuf</key> + <value>0</value> + </param> + <param> + <key>_coordinate</key> + <value>(747, 431)</value> + </param> + <param> + <key>_rotation</key> + <value>0</value> + </param> + </block> + <block> + <key>qtgui_time_sink_x</key> + <param> + <key>id</key> + <value>qtgui_time_sink_x_1</value> + </param> + <param> + <key>_enabled</key> + <value>True</value> + </param> + <param> <key>type</key> - <value>eng_float</value> + <value>float</value> </param> <param> - <key>short_id</key> + <key>name</key> + <value>Received Data</value> + </param> + <param> + <key>size</key> + <value>1024</value> + </param> + <param> + <key>srate</key> + <value>samp_rate</value> + </param> + <param> + <key>autoscale</key> + <value>True</value> + </param> + <param> + <key>ymin</key> + <value>-1</value> + </param> + <param> + <key>ymax</key> + <value>1</value> + </param> + <param> + <key>nconnections</key> + <value>1</value> + </param> + <param> + <key>update_time</key> + <value>0.10</value> + </param> + <param> + <key>entags</key> + <value>True</value> + </param> + <param> + <key>gui_hint</key> + <value></value> + </param> + <param> + <key>tr_mode</key> + <value>qtgui.TRIG_MODE_FREE</value> + </param> + <param> + <key>tr_slope</key> + <value>qtgui.TRIG_SLOPE_POS</value> + </param> + <param> + <key>tr_level</key> + <value>0.0</value> + </param> + <param> + <key>tr_delay</key> + <value>0</value> + </param> + <param> + <key>tr_chan</key> + <value>0</value> + </param> + <param> + <key>tr_tag</key> + <value>""</value> + </param> + <param> + <key>label1</key> + <value></value> + </param> + <param> + <key>width1</key> + <value>1</value> + </param> + <param> + <key>color1</key> + <value>"blue"</value> + </param> + <param> + <key>style1</key> + <value>1</value> + </param> + <param> + <key>marker1</key> + <value>-1</value> + </param> + <param> + <key>alpha1</key> + <value>1.0</value> + </param> + <param> + <key>label2</key> + <value></value> + </param> + <param> + <key>width2</key> + <value>1</value> + </param> + <param> + <key>color2</key> + <value>"red"</value> + </param> + <param> + <key>style2</key> + <value>1</value> + </param> + <param> + <key>marker2</key> + <value>-1</value> + </param> + <param> + <key>alpha2</key> + <value>1.0</value> + </param> + <param> + <key>label3</key> + <value></value> + </param> + <param> + <key>width3</key> + <value>1</value> + </param> + <param> + <key>color3</key> + <value>"green"</value> + </param> + <param> + <key>style3</key> + <value>1</value> + </param> + <param> + <key>marker3</key> + <value>-1</value> + </param> + <param> + <key>alpha3</key> + <value>1.0</value> + </param> + <param> + <key>label4</key> + <value></value> + </param> + <param> + <key>width4</key> + <value>1</value> + </param> + <param> + <key>color4</key> + <value>"black"</value> + </param> + <param> + <key>style4</key> + <value>1</value> + </param> + <param> + <key>marker4</key> + <value>-1</value> + </param> + <param> + <key>alpha4</key> + <value>1.0</value> + </param> + <param> + <key>label5</key> + <value></value> + </param> + <param> + <key>width5</key> + <value>1</value> + </param> + <param> + <key>color5</key> + <value>"cyan"</value> + </param> + <param> + <key>style5</key> + <value>1</value> + </param> + <param> + <key>marker5</key> + <value>-1</value> + </param> + <param> + <key>alpha5</key> + <value>1.0</value> + </param> + <param> + <key>label6</key> + <value></value> + </param> + <param> + <key>width6</key> + <value>1</value> + </param> + <param> + <key>color6</key> + <value>"magenta"</value> + </param> + <param> + <key>style6</key> + <value>1</value> + </param> + <param> + <key>marker6</key> + <value>-1</value> + </param> + <param> + <key>alpha6</key> + <value>1.0</value> + </param> + <param> + <key>label7</key> + <value></value> + </param> + <param> + <key>width7</key> + <value>1</value> + </param> + <param> + <key>color7</key> + <value>"yellow"</value> + </param> + <param> + <key>style7</key> + <value>1</value> + </param> + <param> + <key>marker7</key> + <value>-1</value> + </param> + <param> + <key>alpha7</key> + <value>1.0</value> + </param> + <param> + <key>label8</key> + <value></value> + </param> + <param> + <key>width8</key> + <value>1</value> + </param> + <param> + <key>color8</key> + <value>"dark red"</value> + </param> + <param> + <key>style8</key> + <value>1</value> + </param> + <param> + <key>marker8</key> + <value>-1</value> + </param> + <param> + <key>alpha8</key> + <value>1.0</value> + </param> + <param> + <key>label9</key> + <value></value> + </param> + <param> + <key>width9</key> + <value>1</value> + </param> + <param> + <key>color9</key> + <value>"dark green"</value> + </param> + <param> + <key>style9</key> + <value>1</value> + </param> + <param> + <key>marker9</key> + <value>-1</value> + </param> + <param> + <key>alpha9</key> + <value>1.0</value> + </param> + <param> + <key>label10</key> + <value></value> + </param> + <param> + <key>width10</key> + <value>1</value> + </param> + <param> + <key>color10</key> + <value>"blue"</value> + </param> + <param> + <key>style10</key> + <value>1</value> + </param> + <param> + <key>marker10</key> + <value>-1</value> + </param> + <param> + <key>alpha10</key> + <value>1.0</value> + </param> + <param> + <key>alias</key> + <value></value> + </param> + <param> + <key>affinity</key> <value></value> </param> <param> <key>_coordinate</key> - <value>(1003, 8)</value> + <value>(923, 405)</value> </param> <param> <key>_rotation</key> @@ -2145,54 +3434,238 @@ </param> </block> <block> - <key>variable_slider</key> + <key>qtgui_freq_sink_x</key> <param> <key>id</key> - <value>tun_freq</value> + <value>qtgui_freq_sink_x_0</value> </param> <param> <key>_enabled</key> <value>True</value> </param> <param> - <key>label</key> - <value>Freq (Hz)</value> + <key>type</key> + <value>complex</value> </param> <param> - <key>value</key> - <value>freq</value> + <key>name</key> + <value>Received Spectrum</value> </param> <param> - <key>min</key> - <value>2.4e9</value> + <key>fftsize</key> + <value>1024</value> </param> <param> - <key>max</key> - <value>2.5e9</value> + <key>wintype</key> + <value>firdes.WIN_BLACKMAN_hARRIS</value> + </param> + <param> + <key>fc</key> + <value>tun_freq+rx_freq_off</value> + </param> + <param> + <key>bw</key> + <value>samp_rate</value> + </param> + <param> + <key>autoscale</key> + <value>False</value> + </param> + <param> + <key>average</key> + <value>1.0</value> + </param> + <param> + <key>ymin</key> + <value>-140</value> + </param> + <param> + <key>ymax</key> + <value>10</value> + </param> + <param> + <key>nconnections</key> + <value>1</value> + </param> + <param> + <key>update_time</key> + <value>0.10</value> + </param> + <param> + <key>gui_hint</key> + <value></value> + </param> + <param> + <key>label1</key> + <value>Received Spectrum</value> + </param> + <param> + <key>width1</key> + <value>1</value> + </param> + <param> + <key>color1</key> + <value>"blue"</value> + </param> + <param> + <key>alpha1</key> + <value>1.0</value> + </param> + <param> + <key>label2</key> + <value></value> </param> <param> - <key>num_steps</key> - <value>100</value> + <key>width2</key> + <value>1</value> </param> <param> - <key>style</key> - <value>wx.SL_HORIZONTAL</value> + <key>color2</key> + <value>"red"</value> </param> <param> - <key>converver</key> - <value>float_converter</value> + <key>alpha2</key> + <value>1.0</value> </param> <param> - <key>grid_pos</key> + <key>label3</key> <value></value> </param> <param> - <key>notebook</key> + <key>width3</key> + <value>1</value> + </param> + <param> + <key>color3</key> + <value>"green"</value> + </param> + <param> + <key>alpha3</key> + <value>1.0</value> + </param> + <param> + <key>label4</key> + <value></value> + </param> + <param> + <key>width4</key> + <value>1</value> + </param> + <param> + <key>color4</key> + <value>"black"</value> + </param> + <param> + <key>alpha4</key> + <value>1.0</value> + </param> + <param> + <key>label5</key> + <value></value> + </param> + <param> + <key>width5</key> + <value>1</value> + </param> + <param> + <key>color5</key> + <value>"cyan"</value> + </param> + <param> + <key>alpha5</key> + <value>1.0</value> + </param> + <param> + <key>label6</key> + <value></value> + </param> + <param> + <key>width6</key> + <value>1</value> + </param> + <param> + <key>color6</key> + <value>"magenta"</value> + </param> + <param> + <key>alpha6</key> + <value>1.0</value> + </param> + <param> + <key>label7</key> + <value></value> + </param> + <param> + <key>width7</key> + <value>1</value> + </param> + <param> + <key>color7</key> + <value>"yellow"</value> + </param> + <param> + <key>alpha7</key> + <value>1.0</value> + </param> + <param> + <key>label8</key> + <value></value> + </param> + <param> + <key>width8</key> + <value>1</value> + </param> + <param> + <key>color8</key> + <value>"dark red"</value> + </param> + <param> + <key>alpha8</key> + <value>1.0</value> + </param> + <param> + <key>label9</key> + <value></value> + </param> + <param> + <key>width9</key> + <value>1</value> + </param> + <param> + <key>color9</key> + <value>"dark green"</value> + </param> + <param> + <key>alpha9</key> + <value>1.0</value> + </param> + <param> + <key>label10</key> + <value></value> + </param> + <param> + <key>width10</key> + <value>1</value> + </param> + <param> + <key>color10</key> + <value>"dark blue"</value> + </param> + <param> + <key>alpha10</key> + <value>1.0</value> + </param> + <param> + <key>alias</key> + <value></value> + </param> + <param> + <key>affinity</key> <value></value> </param> <param> <key>_coordinate</key> - <value>(35, 506)</value> + <value>(610, 254)</value> </param> <param> <key>_rotation</key> @@ -2201,19 +3674,19 @@ </block> <connection> <source_block_id>uhd_usrp_source_0</source_block_id> - <sink_block_id>wxgui_fftsink2_0</sink_block_id> + <sink_block_id>qtgui_const_sink_x_0</sink_block_id> <source_key>0</source_key> <sink_key>0</sink_key> </connection> <connection> <source_block_id>uhd_usrp_source_0</source_block_id> - <sink_block_id>wxgui_constellationsink2_0</sink_block_id> + <sink_block_id>qtgui_freq_sink_x_0</sink_block_id> <source_key>0</source_key> <sink_key>0</sink_key> </connection> <connection> - <source_block_id>uhd_usrp_source_0</source_block_id> - <sink_block_id>wxgui_scopesink2_0</sink_block_id> + <source_block_id>digital_dxpsk_mod_0</source_block_id> + <sink_block_id>blocks_multiply_const_vxx_0</sink_block_id> <source_key>0</source_key> <sink_key>0</sink_key> </connection> @@ -2224,14 +3697,38 @@ <sink_key>0</sink_key> </connection> <connection> - <source_block_id>analog_random_source_x_0</source_block_id> + <source_block_id>uhd_usrp_source_0</source_block_id> + <sink_block_id>digital_dxpsk_demod_0</sink_block_id> + <source_key>0</source_key> + <sink_key>0</sink_key> + </connection> + <connection> + <source_block_id>uhd_usrp_source_0</source_block_id> + <sink_block_id>qtgui_time_sink_x_0</sink_block_id> + <source_key>0</source_key> + <sink_key>0</sink_key> + </connection> + <connection> + <source_block_id>blocks_vector_source_x_0</source_block_id> <sink_block_id>digital_dxpsk_mod_0</sink_block_id> <source_key>0</source_key> <sink_key>0</sink_key> </connection> <connection> - <source_block_id>digital_dxpsk_mod_0</source_block_id> - <sink_block_id>blocks_multiply_const_vxx_0</sink_block_id> + <source_block_id>digital_dxpsk_demod_0</source_block_id> + <sink_block_id>blocks_unpacked_to_packed_xx_0</sink_block_id> + <source_key>0</source_key> + <sink_key>0</sink_key> + </connection> + <connection> + <source_block_id>blocks_unpacked_to_packed_xx_0</source_block_id> + <sink_block_id>blocks_uchar_to_float_0</sink_block_id> + <source_key>0</source_key> + <sink_key>0</sink_key> + </connection> + <connection> + <source_block_id>blocks_uchar_to_float_0</source_block_id> + <sink_block_id>qtgui_time_sink_x_1</sink_block_id> <source_key>0</source_key> <sink_key>0</sink_key> </connection> diff --git a/gr-uhd/examples/grc/uhd_fft.grc b/gr-uhd/examples/grc/uhd_fft.grc index 08e5f70edb..13271cae74 100644 --- a/gr-uhd/examples/grc/uhd_fft.grc +++ b/gr-uhd/examples/grc/uhd_fft.grc @@ -1,6 +1,6 @@ <?xml version='1.0' encoding='ASCII'?> <flow_graph> - <timestamp>Mon Mar 18 15:42:27 2013</timestamp> + <timestamp>Sat Jul 12 16:12:28 2014</timestamp> <block> <key>options</key> <param> @@ -29,7 +29,7 @@ </param> <param> <key>generate_options</key> - <value>wx_gui</value> + <value>qt_gui</value> </param> <param> <key>category</key> @@ -52,8 +52,12 @@ <value></value> </param> <param> + <key>alias</key> + <value></value> + </param> + <param> <key>_coordinate</key> - <value>(15, 15)</value> + <value>(-1, -3)</value> </param> <param> <key>_rotation</key> @@ -61,22 +65,38 @@ </param> </block> <block> - <key>import</key> + <key>parameter</key> <param> <key>id</key> - <value>import_0</value> + <value>param_gain</value> </param> <param> <key>_enabled</key> <value>True</value> </param> <param> - <key>import</key> - <value>import numpy</value> + <key>label</key> + <value>Default Gain</value> + </param> + <param> + <key>value</key> + <value>0</value> + </param> + <param> + <key>type</key> + <value>eng_float</value> + </param> + <param> + <key>short_id</key> + <value>g</value> + </param> + <param> + <key>alias</key> + <value></value> </param> <param> <key>_coordinate</key> - <value>(15, 121)</value> + <value>(642, 0)</value> </param> <param> <key>_rotation</key> @@ -110,8 +130,12 @@ <value>s</value> </param> <param> + <key>alias</key> + <value></value> + </param> + <param> <key>_coordinate</key> - <value>(358, 14)</value> + <value>(328, 0)</value> </param> <param> <key>_rotation</key> @@ -145,8 +169,39 @@ <value>f</value> </param> <param> + <key>alias</key> + <value></value> + </param> + <param> + <key>_coordinate</key> + <value>(478, 0)</value> + </param> + <param> + <key>_rotation</key> + <value>0</value> + </param> + </block> + <block> + <key>import</key> + <param> + <key>id</key> + <value>import_0</value> + </param> + <param> + <key>_enabled</key> + <value>True</value> + </param> + <param> + <key>import</key> + <value>import numpy</value> + </param> + <param> + <key>alias</key> + <value></value> + </param> + <param> <key>_coordinate</key> - <value>(508, 14)</value> + <value>(4, 105)</value> </param> <param> <key>_rotation</key> @@ -157,7 +212,7 @@ <key>parameter</key> <param> <key>id</key> - <value>param_gain</value> + <value>address</value> </param> <param> <key>_enabled</key> @@ -165,23 +220,78 @@ </param> <param> <key>label</key> - <value>Default Gain</value> + <value>IP Address</value> </param> <param> <key>value</key> - <value>0</value> + <value>addr=192.168.10.2</value> </param> <param> <key>type</key> - <value>eng_float</value> + <value>string</value> </param> <param> <key>short_id</key> - <value>g</value> + <value>a</value> + </param> + <param> + <key>alias</key> + <value></value> + </param> + <param> + <key>_coordinate</key> + <value>(160, 0)</value> + </param> + <param> + <key>_rotation</key> + <value>0</value> + </param> + </block> + <block> + <key>qtgui_tab_widget</key> + <param> + <key>id</key> + <value>display</value> + </param> + <param> + <key>_enabled</key> + <value>True</value> + </param> + <param> + <key>num_tabs</key> + <value>3</value> + </param> + <param> + <key>label0</key> + <value>Spectrum</value> + </param> + <param> + <key>label1</key> + <value>Waterfall</value> + </param> + <param> + <key>label2</key> + <value>Scope</value> + </param> + <param> + <key>label3</key> + <value>Tab 3</value> + </param> + <param> + <key>label4</key> + <value>Tab 4</value> + </param> + <param> + <key>gui_hint</key> + <value>2,0,1,4</value> + </param> + <param> + <key>alias</key> + <value></value> </param> <param> <key>_coordinate</key> - <value>(672, 13)</value> + <value>(6, 178)</value> </param> <param> <key>_rotation</key> @@ -189,10 +299,348 @@ </param> </block> <block> - <key>wxgui_scopesink2</key> + <key>variable_qtgui_range</key> <param> <key>id</key> - <value>wxgui_scopesink2_0</value> + <value>gain</value> + </param> + <param> + <key>_enabled</key> + <value>True</value> + </param> + <param> + <key>label</key> + <value>RX Gain</value> + </param> + <param> + <key>value</key> + <value>15</value> + </param> + <param> + <key>start</key> + <value>0</value> + </param> + <param> + <key>stop</key> + <value>31.5</value> + </param> + <param> + <key>step</key> + <value>.5</value> + </param> + <param> + <key>widget</key> + <value>counter_slider</value> + </param> + <param> + <key>orient</key> + <value>Qt.Horizontal</value> + </param> + <param> + <key>min_len</key> + <value>200</value> + </param> + <param> + <key>gui_hint</key> + <value>1,2,1,2</value> + </param> + <param> + <key>alias</key> + <value></value> + </param> + <param> + <key>_coordinate</key> + <value>(694, 216)</value> + </param> + <param> + <key>_rotation</key> + <value>0</value> + </param> + </block> + <block> + <key>variable_qtgui_range</key> + <param> + <key>id</key> + <value>freq</value> + </param> + <param> + <key>_enabled</key> + <value>True</value> + </param> + <param> + <key>label</key> + <value>RX Tune Frequency</value> + </param> + <param> + <key>value</key> + <value>2.45e9</value> + </param> + <param> + <key>start</key> + <value>50e6</value> + </param> + <param> + <key>stop</key> + <value>6e9</value> + </param> + <param> + <key>step</key> + <value>100e3</value> + </param> + <param> + <key>widget</key> + <value>counter_slider</value> + </param> + <param> + <key>orient</key> + <value>Qt.Horizontal</value> + </param> + <param> + <key>min_len</key> + <value>200</value> + </param> + <param> + <key>gui_hint</key> + <value>1,0,1,2</value> + </param> + <param> + <key>alias</key> + <value></value> + </param> + <param> + <key>_coordinate</key> + <value>(538, 214)</value> + </param> + <param> + <key>_rotation</key> + <value>0</value> + </param> + </block> + <block> + <key>variable_qtgui_chooser</key> + <param> + <key>id</key> + <value>ant</value> + </param> + <param> + <key>_enabled</key> + <value>True</value> + </param> + <param> + <key>label</key> + <value>Antenna</value> + </param> + <param> + <key>type</key> + <value>string</value> + </param> + <param> + <key>num_opts</key> + <value>4</value> + </param> + <param> + <key>value</key> + <value>RX2</value> + </param> + <param> + <key>options</key> + <value>[0, 1, 2]</value> + </param> + <param> + <key>labels</key> + <value>[]</value> + </param> + <param> + <key>option0</key> + <value>RX2</value> + </param> + <param> + <key>label0</key> + <value>RX2</value> + </param> + <param> + <key>option1</key> + <value>TX/RX</value> + </param> + <param> + <key>label1</key> + <value>TX/RX</value> + </param> + <param> + <key>option2</key> + <value>J1</value> + </param> + <param> + <key>label2</key> + <value>J1</value> + </param> + <param> + <key>option3</key> + <value>J2</value> + </param> + <param> + <key>label3</key> + <value>J2</value> + </param> + <param> + <key>option4</key> + <value>4</value> + </param> + <param> + <key>label4</key> + <value></value> + </param> + <param> + <key>widget</key> + <value>combo_box</value> + </param> + <param> + <key>orient</key> + <value>Qt.QVBoxLayout</value> + </param> + <param> + <key>gui_hint</key> + <value>0,2,1,2</value> + </param> + <param> + <key>alias</key> + <value></value> + </param> + <param> + <key>_coordinate</key> + <value>(810, 124)</value> + </param> + <param> + <key>_rotation</key> + <value>0</value> + </param> + </block> + <block> + <key>variable_qtgui_label</key> + <param> + <key>id</key> + <value>lo_locked_probe</value> + </param> + <param> + <key>_enabled</key> + <value>True</value> + </param> + <param> + <key>label</key> + <value>LO locked</value> + </param> + <param> + <key>type</key> + <value>bool</value> + </param> + <param> + <key>value</key> + <value>chan0_lo_locked.to_bool()</value> + </param> + <param> + <key>gui_hint</key> + <value>0,1,1,1</value> + </param> + <param> + <key>alias</key> + <value></value> + </param> + <param> + <key>_coordinate</key> + <value>(662, 127)</value> + </param> + <param> + <key>_rotation</key> + <value>0</value> + </param> + </block> + <block> + <key>variable_qtgui_label</key> + <param> + <key>id</key> + <value>samp_rate</value> + </param> + <param> + <key>_enabled</key> + <value>True</value> + </param> + <param> + <key>label</key> + <value>Sample Rate</value> + </param> + <param> + <key>type</key> + <value>real</value> + </param> + <param> + <key>value</key> + <value>1e6</value> + </param> + <param> + <key>gui_hint</key> + <value>0,0,1,1</value> + </param> + <param> + <key>alias</key> + <value></value> + </param> + <param> + <key>_coordinate</key> + <value>(543, 128)</value> + </param> + <param> + <key>_rotation</key> + <value>0</value> + </param> + </block> + <block> + <key>variable_function_probe</key> + <param> + <key>id</key> + <value>chan0_lo_locked</value> + </param> + <param> + <key>_enabled</key> + <value>True</value> + </param> + <param> + <key>value</key> + <value>uhd.sensor_value("", False, "")</value> + </param> + <param> + <key>block_id</key> + <value>uhd_usrp_source_0</value> + </param> + <param> + <key>function_name</key> + <value>get_sensor</value> + </param> + <param> + <key>function_args</key> + <value>"'lo_locked'"</value> + </param> + <param> + <key>poll_rate</key> + <value>10</value> + </param> + <param> + <key>alias</key> + <value></value> + </param> + <param> + <key>_coordinate</key> + <value>(1014, 164)</value> + </param> + <param> + <key>_rotation</key> + <value>0</value> + </param> + </block> + <block> + <key>qtgui_waterfall_sink_x</key> + <param> + <key>id</key> + <value>qtgui_waterfall_sink_x_0</value> </param> <param> <key>_enabled</key> @@ -203,60 +651,407 @@ <value>complex</value> </param> <param> - <key>title</key> - <value>Scope Plot</value> + <key>name</key> + <value>Scope</value> </param> <param> - <key>samp_rate</key> + <key>fftsize</key> + <value>1024</value> + </param> + <param> + <key>wintype</key> + <value>firdes.WIN_BLACKMAN_hARRIS</value> + </param> + <param> + <key>fc</key> + <value>freq</value> + </param> + <param> + <key>bw</key> <value>samp_rate</value> </param> <param> - <key>v_scale</key> + <key>nconnections</key> + <value>1</value> + </param> + <param> + <key>update_time</key> + <value>0.10</value> + </param> + <param> + <key>gui_hint</key> + <value>display@1:3,0,1,4</value> + </param> + <param> + <key>label1</key> + <value></value> + </param> + <param> + <key>color1</key> + <value>0</value> + </param> + <param> + <key>alpha1</key> + <value>1.0</value> + </param> + <param> + <key>label2</key> + <value></value> + </param> + <param> + <key>color2</key> + <value>0</value> + </param> + <param> + <key>alpha2</key> + <value>1.0</value> + </param> + <param> + <key>label3</key> + <value></value> + </param> + <param> + <key>color3</key> + <value>0</value> + </param> + <param> + <key>alpha3</key> + <value>1.0</value> + </param> + <param> + <key>label4</key> + <value></value> + </param> + <param> + <key>color4</key> + <value>0</value> + </param> + <param> + <key>alpha4</key> + <value>1.0</value> + </param> + <param> + <key>label5</key> + <value></value> + </param> + <param> + <key>color5</key> + <value>0</value> + </param> + <param> + <key>alpha5</key> + <value>1.0</value> + </param> + <param> + <key>label6</key> + <value></value> + </param> + <param> + <key>color6</key> + <value>0</value> + </param> + <param> + <key>alpha6</key> + <value>1.0</value> + </param> + <param> + <key>label7</key> + <value></value> + </param> + <param> + <key>color7</key> + <value>0</value> + </param> + <param> + <key>alpha7</key> + <value>1.0</value> + </param> + <param> + <key>label8</key> + <value></value> + </param> + <param> + <key>color8</key> + <value>0</value> + </param> + <param> + <key>alpha8</key> + <value>1.0</value> + </param> + <param> + <key>label9</key> + <value></value> + </param> + <param> + <key>color9</key> <value>0</value> </param> <param> - <key>v_offset</key> + <key>alpha9</key> + <value>1.0</value> + </param> + <param> + <key>label10</key> + <value></value> + </param> + <param> + <key>color10</key> <value>0</value> </param> <param> - <key>t_scale</key> + <key>alpha10</key> + <value>1.0</value> + </param> + <param> + <key>alias</key> + <value></value> + </param> + <param> + <key>affinity</key> + <value></value> + </param> + <param> + <key>_coordinate</key> + <value>(325, 328)</value> + </param> + <param> + <key>_rotation</key> <value>0</value> </param> + </block> + <block> + <key>qtgui_freq_sink_x</key> + <param> + <key>id</key> + <value>qtgui_freq_sink_x_0</value> + </param> + <param> + <key>_enabled</key> + <value>True</value> + </param> + <param> + <key>type</key> + <value>complex</value> + </param> + <param> + <key>name</key> + <value>Spectrum</value> + </param> + <param> + <key>fftsize</key> + <value>1024</value> + </param> + <param> + <key>wintype</key> + <value>firdes.WIN_BLACKMAN_hARRIS</value> + </param> + <param> + <key>fc</key> + <value>freq</value> + </param> + <param> + <key>bw</key> + <value>samp_rate</value> + </param> + <param> + <key>autoscale</key> + <value>True</value> + </param> + <param> + <key>average</key> + <value>1.0</value> + </param> + <param> + <key>ymin</key> + <value>-140</value> + </param> + <param> + <key>ymax</key> + <value>10</value> + </param> + <param> + <key>nconnections</key> + <value>1</value> + </param> + <param> + <key>update_time</key> + <value>0.10</value> + </param> + <param> + <key>gui_hint</key> + <value>display@0:3,0,1,4</value> + </param> + <param> + <key>label1</key> + <value></value> + </param> + <param> + <key>width1</key> + <value>1</value> + </param> + <param> + <key>color1</key> + <value>"blue"</value> + </param> + <param> + <key>alpha1</key> + <value>1.0</value> + </param> + <param> + <key>label2</key> + <value></value> + </param> + <param> + <key>width2</key> + <value>1</value> + </param> + <param> + <key>color2</key> + <value>"red"</value> + </param> + <param> + <key>alpha2</key> + <value>1.0</value> + </param> + <param> + <key>label3</key> + <value></value> + </param> <param> - <key>ac_couple</key> - <value>False</value> + <key>width3</key> + <value>1</value> + </param> + <param> + <key>color3</key> + <value>"green"</value> + </param> + <param> + <key>alpha3</key> + <value>1.0</value> + </param> + <param> + <key>label4</key> + <value></value> + </param> + <param> + <key>width4</key> + <value>1</value> + </param> + <param> + <key>color4</key> + <value>"black"</value> + </param> + <param> + <key>alpha4</key> + <value>1.0</value> </param> <param> - <key>xy_mode</key> - <value>False</value> + <key>label5</key> + <value></value> </param> <param> - <key>num_inputs</key> + <key>width5</key> <value>1</value> </param> <param> - <key>win_size</key> + <key>color5</key> + <value>"cyan"</value> + </param> + <param> + <key>alpha5</key> + <value>1.0</value> + </param> + <param> + <key>label6</key> <value></value> </param> <param> - <key>grid_pos</key> + <key>width6</key> + <value>1</value> + </param> + <param> + <key>color6</key> + <value>"magenta"</value> + </param> + <param> + <key>alpha6</key> + <value>1.0</value> + </param> + <param> + <key>label7</key> <value></value> </param> <param> - <key>notebook</key> - <value>nb0, 2</value> + <key>width7</key> + <value>1</value> </param> <param> - <key>trig_mode</key> - <value>wxgui.TRIG_MODE_AUTO</value> + <key>color7</key> + <value>"yellow"</value> </param> <param> - <key>y_axis_label</key> - <value>Counts</value> + <key>alpha7</key> + <value>1.0</value> + </param> + <param> + <key>label8</key> + <value></value> + </param> + <param> + <key>width8</key> + <value>1</value> + </param> + <param> + <key>color8</key> + <value>"dark red"</value> + </param> + <param> + <key>alpha8</key> + <value>1.0</value> + </param> + <param> + <key>label9</key> + <value></value> + </param> + <param> + <key>width9</key> + <value>1</value> + </param> + <param> + <key>color9</key> + <value>"dark green"</value> + </param> + <param> + <key>alpha9</key> + <value>1.0</value> + </param> + <param> + <key>label10</key> + <value></value> + </param> + <param> + <key>width10</key> + <value>1</value> + </param> + <param> + <key>color10</key> + <value>"dark blue"</value> + </param> + <param> + <key>alpha10</key> + <value>1.0</value> + </param> + <param> + <key>alias</key> + <value></value> + </param> + <param> + <key>affinity</key> + <value></value> </param> <param> <key>_coordinate</key> - <value>(314, 250)</value> + <value>(311, 217)</value> </param> <param> <key>_rotation</key> @@ -286,10 +1081,18 @@ <value></value> </param> <param> + <key>stream_chans</key> + <value>[]</value> + </param> + <param> <key>dev_addr</key> <value>address</value> </param> <param> + <key>dev_args</key> + <value>""</value> + </param> + <param> <key>sync</key> <value></value> </param> @@ -918,176 +1721,24 @@ <value>0</value> </param> <param> - <key>_coordinate</key> - <value>(37, 394)</value> - </param> - <param> - <key>_rotation</key> - <value>0</value> - </param> - </block> - <block> - <key>variable_function_probe</key> - <param> - <key>id</key> - <value>chan0_lo_locked</value> - </param> - <param> - <key>_enabled</key> - <value>True</value> - </param> - <param> - <key>value</key> - <value>uhd.sensor_value("", False, "")</value> - </param> - <param> - <key>block_id</key> - <value>uhd_usrp_source_0</value> - </param> - <param> - <key>function_name</key> - <value>get_sensor</value> - </param> - <param> - <key>function_args</key> - <value>"'lo_locked'"</value> - </param> - <param> - <key>poll_rate</key> - <value>10</value> - </param> - <param> - <key>_coordinate</key> - <value>(583, 432)</value> - </param> - <param> - <key>_rotation</key> - <value>0</value> - </param> - </block> - <block> - <key>notebook</key> - <param> - <key>id</key> - <value>nb0</value> - </param> - <param> - <key>_enabled</key> - <value>True</value> - </param> - <param> - <key>style</key> - <value>wx.NB_TOP</value> - </param> - <param> - <key>labels</key> - <value>['FFT', 'Waterfall', 'Scope']</value> - </param> - <param> - <key>grid_pos</key> - <value>0, 0, 1, 8</value> - </param> - <param> - <key>notebook</key> + <key>alias</key> <value></value> </param> <param> - <key>_coordinate</key> - <value>(15, 172)</value> - </param> - <param> - <key>_rotation</key> - <value>0</value> - </param> - </block> - <block> - <key>variable_chooser</key> - <param> - <key>id</key> - <value>ant_xcvr</value> - </param> - <param> - <key>_enabled</key> - <value>False</value> - </param> - <param> - <key>label</key> - <value>Antenna</value> - </param> - <param> - <key>value</key> - <value>"J2"</value> - </param> - <param> - <key>choices</key> - <value>["J2","J1"]</value> - </param> - <param> - <key>labels</key> - <value>["J2","J1"]</value> - </param> - <param> - <key>type</key> - <value>radio_buttons</value> - </param> - <param> - <key>style</key> - <value>wx.RA_HORIZONTAL</value> - </param> - <param> - <key>grid_pos</key> - <value></value> - </param> - <param> - <key>notebook</key> + <key>affinity</key> <value></value> </param> <param> - <key>_coordinate</key> - <value>(830, 278)</value> - </param> - <param> - <key>_rotation</key> + <key>minoutbuf</key> <value>0</value> </param> - </block> - <block> - <key>variable_static_text</key> - <param> - <key>id</key> - <value>lo_locked_probe</value> - </param> - <param> - <key>_enabled</key> - <value>True</value> - </param> - <param> - <key>label</key> - <value>LO Locked</value> - </param> <param> - <key>value</key> - <value>chan0_lo_locked.to_bool()</value> - </param> - <param> - <key>converver</key> - <value>str_converter</value> - </param> - <param> - <key>formatter</key> - <value>lambda x: x and "True" or "False"</value> - </param> - <param> - <key>grid_pos</key> - <value>1, 7, 1, 1</value> - </param> - <param> - <key>notebook</key> - <value></value> + <key>maxoutbuf</key> + <value>0</value> </param> <param> <key>_coordinate</key> - <value>(583, 314)</value> + <value>(33, 295)</value> </param> <param> <key>_rotation</key> @@ -1095,412 +1746,334 @@ </param> </block> <block> - <key>variable_chooser</key> + <key>qtgui_time_sink_x</key> <param> <key>id</key> - <value>ant</value> + <value>qtgui_time_sink_x_0</value> </param> <param> <key>_enabled</key> <value>True</value> </param> <param> - <key>label</key> - <value>Antenna</value> - </param> - <param> - <key>value</key> - <value>"RX2"</value> - </param> - <param> - <key>choices</key> - <value>["RX2","TX/RX"]</value> - </param> - <param> - <key>labels</key> - <value>["RX2","TX/RX"]</value> - </param> - <param> <key>type</key> - <value>radio_buttons</value> - </param> - <param> - <key>style</key> - <value>wx.RA_HORIZONTAL</value> - </param> - <param> - <key>grid_pos</key> - <value>1, 4, 1, 2</value> - </param> - <param> - <key>notebook</key> - <value></value> + <value>complex</value> </param> <param> - <key>_coordinate</key> - <value>(830, 130)</value> + <key>name</key> + <value>QT GUI Plot</value> </param> <param> - <key>_rotation</key> - <value>0</value> + <key>size</key> + <value>1024</value> </param> - </block> - <block> - <key>wxgui_fftsink2</key> <param> - <key>id</key> - <value>fft</value> + <key>srate</key> + <value>samp_rate</value> </param> <param> - <key>_enabled</key> + <key>autoscale</key> <value>True</value> </param> <param> - <key>type</key> - <value>complex</value> - </param> - <param> - <key>title</key> - <value>FFT Plot</value> - </param> - <param> - <key>samp_rate</key> - <value>samp_rate</value> + <key>ymin</key> + <value>-1</value> </param> <param> - <key>baseband_freq</key> - <value>freq</value> - </param> - <param> - <key>y_per_div</key> - <value>10</value> + <key>ymax</key> + <value>1</value> </param> <param> - <key>y_divs</key> - <value>15</value> + <key>nconnections</key> + <value>1</value> </param> <param> - <key>ref_level</key> - <value>0</value> + <key>update_time</key> + <value>0.10</value> </param> <param> - <key>ref_scale</key> - <value>2.0</value> + <key>entags</key> + <value>True</value> </param> <param> - <key>fft_size</key> - <value>1024</value> + <key>gui_hint</key> + <value>display@2:3,0,1,4</value> </param> <param> - <key>fft_rate</key> - <value>15</value> + <key>tr_mode</key> + <value>qtgui.TRIG_MODE_FREE</value> </param> <param> - <key>peak_hold</key> - <value>False</value> + <key>tr_slope</key> + <value>qtgui.TRIG_SLOPE_POS</value> </param> <param> - <key>average</key> - <value>False</value> + <key>tr_level</key> + <value>0.0</value> </param> <param> - <key>avg_alpha</key> + <key>tr_delay</key> <value>0</value> </param> <param> - <key>win</key> - <value>None</value> + <key>tr_chan</key> + <value>0</value> </param> <param> - <key>win_size</key> - <value>(-1, 400)</value> + <key>tr_tag</key> + <value>""</value> </param> <param> - <key>grid_pos</key> + <key>label1</key> <value></value> </param> <param> - <key>notebook</key> - <value>nb0, 0</value> - </param> - <param> - <key>freqvar</key> - <value>None</value> - </param> - <param> - <key>_coordinate</key> - <value>(314, 359)</value> + <key>width1</key> + <value>1</value> </param> <param> - <key>_rotation</key> - <value>0</value> + <key>color1</key> + <value>"blue"</value> </param> - </block> - <block> - <key>wxgui_waterfallsink2</key> <param> - <key>id</key> - <value>wxgui_waterfallsink2_0</value> + <key>style1</key> + <value>1</value> </param> <param> - <key>_enabled</key> - <value>True</value> + <key>marker1</key> + <value>-1</value> </param> <param> - <key>type</key> - <value>complex</value> + <key>alpha1</key> + <value>1.0</value> </param> <param> - <key>title</key> - <value>Waterfall Plot</value> + <key>label2</key> + <value></value> </param> <param> - <key>samp_rate</key> - <value>samp_rate</value> + <key>width2</key> + <value>1</value> </param> <param> - <key>baseband_freq</key> - <value>0</value> + <key>color2</key> + <value>"red"</value> </param> <param> - <key>dynamic_range</key> - <value>100</value> + <key>style2</key> + <value>1</value> </param> <param> - <key>ref_level</key> - <value>0</value> + <key>marker2</key> + <value>-1</value> </param> <param> - <key>ref_scale</key> - <value>2.0</value> + <key>alpha2</key> + <value>1.0</value> </param> <param> - <key>fft_size</key> - <value>512</value> + <key>label3</key> + <value></value> </param> <param> - <key>fft_rate</key> - <value>15</value> + <key>width3</key> + <value>1</value> </param> <param> - <key>average</key> - <value>False</value> + <key>color3</key> + <value>"green"</value> </param> <param> - <key>avg_alpha</key> - <value>0</value> + <key>style3</key> + <value>1</value> </param> <param> - <key>win</key> - <value>None</value> + <key>marker3</key> + <value>-1</value> </param> <param> - <key>win_size</key> - <value>(-1, 400)</value> + <key>alpha3</key> + <value>1.0</value> </param> <param> - <key>grid_pos</key> + <key>label4</key> <value></value> </param> <param> - <key>notebook</key> - <value>nb0, 1</value> + <key>width4</key> + <value>1</value> </param> <param> - <key>freqvar</key> - <value>None</value> + <key>color4</key> + <value>"black"</value> </param> <param> - <key>_coordinate</key> - <value>(313, 573)</value> + <key>style4</key> + <value>1</value> </param> <param> - <key>_rotation</key> - <value>0</value> + <key>marker4</key> + <value>-1</value> </param> - </block> - <block> - <key>variable_text_box</key> <param> - <key>id</key> - <value>samp_rate</value> + <key>alpha4</key> + <value>1.0</value> </param> <param> - <key>_enabled</key> - <value>True</value> + <key>label5</key> + <value></value> </param> <param> - <key>label</key> - <value>Sample Rate</value> + <key>width5</key> + <value>1</value> </param> <param> - <key>value</key> - <value>param_samp_rate</value> + <key>color5</key> + <value>"cyan"</value> </param> <param> - <key>converver</key> - <value>float_converter</value> + <key>style5</key> + <value>1</value> </param> <param> - <key>formatter</key> - <value>None</value> + <key>marker5</key> + <value>-1</value> </param> <param> - <key>grid_pos</key> - <value>1, 0, 1, 3</value> + <key>alpha5</key> + <value>1.0</value> </param> <param> - <key>notebook</key> + <key>label6</key> <value></value> </param> <param> - <key>_coordinate</key> - <value>(358, 129)</value> - </param> - <param> - <key>_rotation</key> - <value>0</value> + <key>width6</key> + <value>1</value> </param> - </block> - <block> - <key>variable_slider</key> <param> - <key>id</key> - <value>freq</value> + <key>color6</key> + <value>"magenta"</value> </param> <param> - <key>_enabled</key> - <value>True</value> + <key>style6</key> + <value>1</value> </param> <param> - <key>label</key> - <value>RX Tune Frequency</value> + <key>marker6</key> + <value>-1</value> </param> <param> - <key>value</key> - <value>param_freq</value> + <key>alpha6</key> + <value>1.0</value> </param> <param> - <key>min</key> - <value>50e6</value> + <key>label7</key> + <value></value> </param> <param> - <key>max</key> - <value>6e9</value> + <key>width7</key> + <value>1</value> </param> <param> - <key>num_steps</key> - <value>1000</value> + <key>color7</key> + <value>"yellow"</value> </param> <param> - <key>style</key> - <value>wx.SL_HORIZONTAL</value> + <key>style7</key> + <value>1</value> </param> <param> - <key>converver</key> - <value>float_converter</value> + <key>marker7</key> + <value>-1</value> </param> <param> - <key>grid_pos</key> - <value>3, 0, 1, 8</value> + <key>alpha7</key> + <value>1.0</value> </param> <param> - <key>notebook</key> + <key>label8</key> <value></value> </param> <param> - <key>_coordinate</key> - <value>(510, 128)</value> - </param> - <param> - <key>_rotation</key> - <value>0</value> + <key>width8</key> + <value>1</value> </param> - </block> - <block> - <key>variable_slider</key> <param> - <key>id</key> - <value>gain</value> + <key>color8</key> + <value>"dark red"</value> </param> <param> - <key>_enabled</key> - <value>True</value> + <key>style8</key> + <value>1</value> </param> <param> - <key>label</key> - <value>RX Gain</value> + <key>marker8</key> + <value>-1</value> </param> <param> - <key>value</key> - <value>param_gain</value> + <key>alpha8</key> + <value>1.0</value> </param> <param> - <key>min</key> - <value>0</value> + <key>label9</key> + <value></value> </param> <param> - <key>max</key> - <value>31.5</value> + <key>width9</key> + <value>1</value> </param> <param> - <key>num_steps</key> - <value>63</value> + <key>color9</key> + <value>"dark green"</value> </param> <param> - <key>style</key> - <value>wx.SL_HORIZONTAL</value> + <key>style9</key> + <value>1</value> </param> <param> - <key>converver</key> - <value>float_converter</value> + <key>marker9</key> + <value>-1</value> </param> <param> - <key>grid_pos</key> - <value>2, 0, 1, 8</value> + <key>alpha9</key> + <value>1.0</value> </param> <param> - <key>notebook</key> + <key>label10</key> <value></value> </param> <param> - <key>_coordinate</key> - <value>(679, 130)</value> + <key>width10</key> + <value>1</value> </param> <param> - <key>_rotation</key> - <value>0</value> + <key>color10</key> + <value>"blue"</value> </param> - </block> - <block> - <key>parameter</key> <param> - <key>id</key> - <value>address</value> - </param> - <param> - <key>_enabled</key> - <value>True</value> + <key>style10</key> + <value>1</value> </param> <param> - <key>label</key> - <value>IP Address</value> + <key>marker10</key> + <value>-1</value> </param> <param> - <key>value</key> - <value>addr=192.168.11.2</value> + <key>alpha10</key> + <value>1.0</value> </param> <param> - <key>type</key> - <value>string</value> + <key>alias</key> + <value></value> </param> <param> - <key>short_id</key> - <value>a</value> + <key>affinity</key> + <value></value> </param> <param> <key>_coordinate</key> - <value>(190, 15)</value> + <value>(333, 436)</value> </param> <param> <key>_rotation</key> @@ -1509,19 +2082,19 @@ </block> <connection> <source_block_id>uhd_usrp_source_0</source_block_id> - <sink_block_id>wxgui_scopesink2_0</sink_block_id> + <sink_block_id>qtgui_time_sink_x_0</sink_block_id> <source_key>0</source_key> <sink_key>0</sink_key> </connection> <connection> <source_block_id>uhd_usrp_source_0</source_block_id> - <sink_block_id>wxgui_waterfallsink2_0</sink_block_id> + <sink_block_id>qtgui_waterfall_sink_x_0</sink_block_id> <source_key>0</source_key> <sink_key>0</sink_key> </connection> <connection> <source_block_id>uhd_usrp_source_0</source_block_id> - <sink_block_id>fft</sink_block_id> + <sink_block_id>qtgui_freq_sink_x_0</sink_block_id> <source_key>0</source_key> <sink_key>0</sink_key> </connection> diff --git a/gr-uhd/examples/grc/uhd_rx_dpsk.grc b/gr-uhd/examples/grc/uhd_rx_dpsk.grc index 8a9faa4b73..96b92c4484 100644 --- a/gr-uhd/examples/grc/uhd_rx_dpsk.grc +++ b/gr-uhd/examples/grc/uhd_rx_dpsk.grc @@ -1,6 +1,6 @@ <?xml version='1.0' encoding='ASCII'?> <flow_graph> - <timestamp>Mon Mar 18 11:10:25 2013</timestamp> + <timestamp>Sat Jul 12 15:58:45 2014</timestamp> <block> <key>options</key> <param> @@ -29,7 +29,7 @@ </param> <param> <key>generate_options</key> - <value>wx_gui</value> + <value>qt_gui</value> </param> <param> <key>category</key> @@ -52,31 +52,12 @@ <value></value> </param> <param> - <key>_coordinate</key> - <value>(12, 9)</value> - </param> - <param> - <key>_rotation</key> - <value>0</value> - </param> - </block> - <block> - <key>variable</key> - <param> - <key>id</key> - <value>samps_per_sym</value> - </param> - <param> - <key>_enabled</key> - <value>True</value> - </param> - <param> - <key>value</key> - <value>4</value> + <key>alias</key> + <value></value> </param> <param> <key>_coordinate</key> - <value>(12, 88)</value> + <value>(-1, 0)</value> </param> <param> <key>_rotation</key> @@ -84,34 +65,26 @@ </param> </block> <block> - <key>parameter</key> + <key>variable</key> <param> <key>id</key> - <value>samp_rate</value> + <value>rolloff</value> </param> <param> <key>_enabled</key> <value>True</value> </param> <param> - <key>label</key> - <value>Sample Rate</value> - </param> - <param> <key>value</key> - <value>1e6</value> + <value>.35</value> </param> <param> - <key>type</key> - <value>eng_float</value> - </param> - <param> - <key>short_id</key> - <value>s</value> + <key>alias</key> + <value></value> </param> <param> <key>_coordinate</key> - <value>(339, 11)</value> + <value>(570, 579)</value> </param> <param> <key>_rotation</key> @@ -119,34 +92,26 @@ </param> </block> <block> - <key>parameter</key> + <key>variable</key> <param> <key>id</key> - <value>freq</value> + <value>samps_per_sym</value> </param> <param> <key>_enabled</key> <value>True</value> </param> <param> - <key>label</key> - <value>Default Frequency</value> - </param> - <param> <key>value</key> - <value>2.45e9</value> - </param> - <param> - <key>type</key> - <value>eng_float</value> + <value>4</value> </param> <param> - <key>short_id</key> - <value>f</value> + <key>alias</key> + <value></value> </param> <param> <key>_coordinate</key> - <value>(466, 11)</value> + <value>(881, -1)</value> </param> <param> <key>_rotation</key> @@ -154,34 +119,26 @@ </param> </block> <block> - <key>parameter</key> + <key>variable</key> <param> <key>id</key> - <value>gain</value> + <value>nfilts</value> </param> <param> <key>_enabled</key> <value>True</value> </param> <param> - <key>label</key> - <value>Default Gain</value> - </param> - <param> <key>value</key> - <value>0</value> - </param> - <param> - <key>type</key> - <value>eng_float</value> + <value>32</value> </param> <param> - <key>short_id</key> - <value>g</value> + <key>alias</key> + <value></value> </param> <param> <key>_coordinate</key> - <value>(624, 14)</value> + <value>(657, 579)</value> </param> <param> <key>_rotation</key> @@ -215,8 +172,12 @@ <value>a</value> </param> <param> + <key>alias</key> + <value></value> + </param> + <param> <key>_coordinate</key> - <value>(186, 10)</value> + <value>(158, 0)</value> </param> <param> <key>_rotation</key> @@ -227,7 +188,7 @@ <key>parameter</key> <param> <key>id</key> - <value>freq_offset</value> + <value>gain</value> </param> <param> <key>_enabled</key> @@ -235,7 +196,7 @@ </param> <param> <key>label</key> - <value>Rx Frequency Offset</value> + <value>Default Gain</value> </param> <param> <key>value</key> @@ -247,93 +208,15 @@ </param> <param> <key>short_id</key> - <value>o</value> - </param> - <param> - <key>_coordinate</key> - <value>(748, 15)</value> - </param> - <param> - <key>_rotation</key> - <value>0</value> - </param> - </block> - <block> - <key>variable_slider</key> - <param> - <key>id</key> - <value>tun_freq</value> - </param> - <param> - <key>_enabled</key> - <value>True</value> - </param> - <param> - <key>label</key> - <value>Freq (Hz)</value> - </param> - <param> - <key>value</key> - <value>freq</value> - </param> - <param> - <key>min</key> - <value>2.4e9</value> - </param> - <param> - <key>max</key> - <value>2.5e9</value> - </param> - <param> - <key>num_steps</key> - <value>100</value> - </param> - <param> - <key>style</key> - <value>wx.SL_HORIZONTAL</value> - </param> - <param> - <key>converver</key> - <value>float_converter</value> - </param> - <param> - <key>grid_pos</key> - <value></value> + <value>g</value> </param> <param> - <key>notebook</key> + <key>alias</key> <value></value> </param> <param> <key>_coordinate</key> - <value>(12, 436)</value> - </param> - <param> - <key>_rotation</key> - <value>0</value> - </param> - </block> - <block> - <key>blocks_null_sink</key> - <param> - <key>id</key> - <value>blocks_null_sink_0</value> - </param> - <param> - <key>_enabled</key> - <value>True</value> - </param> - <param> - <key>type</key> - <value>byte</value> - </param> - <param> - <key>vlen</key> - <value>1</value> - </param> - <param> - <key>_coordinate</key> - <value>(615, 144)</value> + <value>(596, 0)</value> </param> <param> <key>_rotation</key> @@ -341,10 +224,10 @@ </param> </block> <block> - <key>variable_slider</key> + <key>parameter</key> <param> <key>id</key> - <value>timing_bw</value> + <value>freq</value> </param> <param> <key>_enabled</key> @@ -352,43 +235,27 @@ </param> <param> <key>label</key> - <value>Timing Loop BW</value> + <value>Default Frequency</value> </param> <param> <key>value</key> - <value>6.28/100.0</value> - </param> - <param> - <key>min</key> - <value>0</value> - </param> - <param> - <key>max</key> - <value>1</value> - </param> - <param> - <key>num_steps</key> - <value>100</value> - </param> - <param> - <key>style</key> - <value>wx.SL_HORIZONTAL</value> + <value>2.45e9</value> </param> <param> - <key>converver</key> - <value>float_converter</value> + <key>type</key> + <value>eng_float</value> </param> <param> - <key>grid_pos</key> - <value></value> + <key>short_id</key> + <value>f</value> </param> <param> - <key>notebook</key> + <key>alias</key> <value></value> </param> <param> <key>_coordinate</key> - <value>(604, 436)</value> + <value>(438, 0)</value> </param> <param> <key>_rotation</key> @@ -396,10 +263,10 @@ </param> </block> <block> - <key>variable_slider</key> + <key>parameter</key> <param> <key>id</key> - <value>phase_bw</value> + <value>samp_rate</value> </param> <param> <key>_enabled</key> @@ -407,43 +274,27 @@ </param> <param> <key>label</key> - <value>Phase Loop BW</value> + <value>Sample Rate</value> </param> <param> <key>value</key> - <value>6.28/100.0</value> - </param> - <param> - <key>min</key> - <value>0</value> - </param> - <param> - <key>max</key> - <value>1.0</value> - </param> - <param> - <key>num_steps</key> - <value>100</value> - </param> - <param> - <key>style</key> - <value>wx.SL_HORIZONTAL</value> + <value>1e6</value> </param> <param> - <key>converver</key> - <value>float_converter</value> + <key>type</key> + <value>eng_float</value> </param> <param> - <key>grid_pos</key> - <value></value> + <key>short_id</key> + <value>s</value> </param> <param> - <key>notebook</key> + <key>alias</key> <value></value> </param> <param> <key>_coordinate</key> - <value>(461, 436)</value> + <value>(311, 0)</value> </param> <param> <key>_rotation</key> @@ -451,78 +302,38 @@ </param> </block> <block> - <key>wxgui_constellationsink2</key> + <key>parameter</key> <param> <key>id</key> - <value>wxgui_constellationsink2_0</value> + <value>freq_offset</value> </param> <param> <key>_enabled</key> <value>True</value> </param> <param> - <key>title</key> - <value>Constellation Plot</value> - </param> - <param> - <key>samp_rate</key> - <value>samp_rate</value> - </param> - <param> - <key>frame_rate</key> - <value>5</value> - </param> - <param> - <key>const_size</key> - <value>2048</value> - </param> - <param> - <key>M</key> - <value>4</value> + <key>label</key> + <value>Rx Frequency Offset</value> </param> <param> - <key>theta</key> + <key>value</key> <value>0</value> </param> <param> - <key>loop_bw</key> - <value>6.28/100.0</value> - </param> - <param> - <key>fmax</key> - <value>0.06</value> - </param> - <param> - <key>mu</key> - <value>0.5</value> - </param> - <param> - <key>gain_mu</key> - <value>0.005</value> - </param> - <param> - <key>symbol_rate</key> - <value>samp_rate/samps_per_sym</value> - </param> - <param> - <key>omega_limit</key> - <value>0.005</value> - </param> - <param> - <key>win_size</key> - <value></value> + <key>type</key> + <value>eng_float</value> </param> <param> - <key>grid_pos</key> - <value></value> + <key>short_id</key> + <value>o</value> </param> <param> - <key>notebook</key> + <key>alias</key> <value></value> </param> <param> <key>_coordinate</key> - <value>(931, 313)</value> + <value>(720, 0)</value> </param> <param> <key>_rotation</key> @@ -530,90 +341,58 @@ </param> </block> <block> - <key>wxgui_fftsink2</key> + <key>variable_qtgui_range</key> <param> <key>id</key> - <value>wxgui_fftsink2_0</value> + <value>tun_freq</value> </param> <param> <key>_enabled</key> <value>True</value> </param> <param> - <key>type</key> - <value>complex</value> - </param> - <param> - <key>title</key> - <value>FFT Plot</value> - </param> - <param> - <key>samp_rate</key> - <value>samp_rate</value> - </param> - <param> - <key>baseband_freq</key> - <value>tun_freq</value> - </param> - <param> - <key>y_per_div</key> - <value>10</value> - </param> - <param> - <key>y_divs</key> - <value>10</value> - </param> - <param> - <key>ref_level</key> - <value>10</value> - </param> - <param> - <key>ref_scale</key> - <value>2.0</value> + <key>label</key> + <value>UHD Freq (Hz)</value> </param> <param> - <key>fft_size</key> - <value>1024</value> + <key>value</key> + <value>2.45e9</value> </param> <param> - <key>fft_rate</key> - <value>30</value> + <key>start</key> + <value>2.4e9</value> </param> <param> - <key>peak_hold</key> - <value>False</value> + <key>stop</key> + <value>2.5e9</value> </param> <param> - <key>average</key> - <value>False</value> + <key>step</key> + <value>1</value> </param> <param> - <key>avg_alpha</key> - <value>0</value> + <key>widget</key> + <value>counter_slider</value> </param> <param> - <key>win</key> - <value>None</value> + <key>orient</key> + <value>Qt.Horizontal</value> </param> <param> - <key>win_size</key> - <value></value> + <key>min_len</key> + <value>200</value> </param> <param> - <key>grid_pos</key> + <key>gui_hint</key> <value></value> </param> <param> - <key>notebook</key> + <key>alias</key> <value></value> </param> <param> - <key>freqvar</key> - <value>None</value> - </param> - <param> <key>_coordinate</key> - <value>(710, 236)</value> + <value>(6, 448)</value> </param> <param> <key>_rotation</key> @@ -621,66 +400,7 @@ </param> </block> <block> - <key>digital_dxpsk_demod</key> - <param> - <key>id</key> - <value>digital_dxpsk_demod_0</value> - </param> - <param> - <key>_enabled</key> - <value>True</value> - </param> - <param> - <key>type</key> - <value>dqpsk</value> - </param> - <param> - <key>samples_per_symbol</key> - <value>samps_per_sym</value> - </param> - <param> - <key>excess_bw</key> - <value>0.35</value> - </param> - <param> - <key>freq_bw</key> - <value>6.28/100.0</value> - </param> - <param> - <key>phase_bw</key> - <value>6.28/100.0</value> - </param> - <param> - <key>timing_bw</key> - <value>6.28/100.0</value> - </param> - <param> - <key>mod_code</key> - <value>"gray"</value> - </param> - <param> - <key>verbose</key> - <value>False</value> - </param> - <param> - <key>log</key> - <value>False</value> - </param> - <param> - <key>sync_out</key> - <value>False</value> - </param> - <param> - <key>_coordinate</key> - <value>(303, 154)</value> - </param> - <param> - <key>_rotation</key> - <value>0</value> - </param> - </block> - <block> - <key>variable_slider</key> + <key>variable_qtgui_range</key> <param> <key>id</key> <value>rx_freq_off</value> @@ -691,43 +411,47 @@ </param> <param> <key>label</key> - <value>RX Freq Offset (Hz)</value> + <value>Rx Freq Offset (Hz)</value> </param> <param> <key>value</key> - <value>freq_offset</value> + <value>0</value> </param> <param> - <key>min</key> + <key>start</key> <value>-100e3</value> </param> <param> - <key>max</key> - <value>+100e3</value> + <key>stop</key> + <value>100e3</value> </param> <param> - <key>num_steps</key> - <value>100</value> + <key>step</key> + <value>1</value> + </param> + <param> + <key>widget</key> + <value>counter_slider</value> </param> <param> - <key>style</key> - <value>wx.SL_HORIZONTAL</value> + <key>orient</key> + <value>Qt.Horizontal</value> </param> <param> - <key>converver</key> - <value>float_converter</value> + <key>min_len</key> + <value>200</value> </param> <param> - <key>grid_pos</key> + <key>gui_hint</key> <value></value> </param> <param> - <key>notebook</key> + <key>alias</key> <value></value> </param> <param> <key>_coordinate</key> - <value>(149, 437)</value> + <value>(134, 448)</value> </param> <param> <key>_rotation</key> @@ -735,7 +459,7 @@ </param> </block> <block> - <key>variable_slider</key> + <key>variable_qtgui_range</key> <param> <key>id</key> <value>tun_gain</value> @@ -746,43 +470,47 @@ </param> <param> <key>label</key> - <value>UHD Gain</value> + <value>UHD Tx Gain</value> </param> <param> <key>value</key> - <value>gain</value> + <value>0</value> </param> <param> - <key>min</key> + <key>start</key> <value>0</value> </param> <param> - <key>max</key> + <key>stop</key> <value>20</value> </param> <param> - <key>num_steps</key> - <value>100</value> + <key>step</key> + <value>1</value> + </param> + <param> + <key>widget</key> + <value>counter_slider</value> </param> <param> - <key>style</key> - <value>wx.SL_HORIZONTAL</value> + <key>orient</key> + <value>Qt.Horizontal</value> </param> <param> - <key>converver</key> - <value>float_converter</value> + <key>min_len</key> + <value>200</value> </param> <param> - <key>grid_pos</key> + <key>gui_hint</key> <value></value> </param> <param> - <key>notebook</key> + <key>alias</key> <value></value> </param> <param> <key>_coordinate</key> - <value>(306, 438)</value> + <value>(286, 447)</value> </param> <param> <key>_rotation</key> @@ -812,10 +540,18 @@ <value></value> </param> <param> + <key>stream_chans</key> + <value>[]</value> + </param> + <param> <key>dev_addr</key> <value>address</value> </param> <param> + <key>dev_args</key> + <value>""</value> + </param> + <param> <key>sync</key> <value></value> </param> @@ -1444,8 +1180,381 @@ <value>0</value> </param> <param> + <key>alias</key> + <value></value> + </param> + <param> + <key>affinity</key> + <value></value> + </param> + <param> + <key>minoutbuf</key> + <value>0</value> + </param> + <param> + <key>maxoutbuf</key> + <value>0</value> + </param> + <param> + <key>_coordinate</key> + <value>(0, 143)</value> + </param> + <param> + <key>_rotation</key> + <value>0</value> + </param> + </block> + <block> + <key>blocks_null_sink</key> + <param> + <key>id</key> + <value>blocks_null_sink_0</value> + </param> + <param> + <key>_enabled</key> + <value>True</value> + </param> + <param> + <key>type</key> + <value>byte</value> + </param> + <param> + <key>vlen</key> + <value>1</value> + </param> + <param> + <key>num_inputs</key> + <value>1</value> + </param> + <param> + <key>bus_conns</key> + <value>[[0,],]</value> + </param> + <param> + <key>alias</key> + <value></value> + </param> + <param> + <key>affinity</key> + <value></value> + </param> + <param> + <key>_coordinate</key> + <value>(620, 168)</value> + </param> + <param> + <key>_rotation</key> + <value>0</value> + </param> + </block> + <block> + <key>digital_dxpsk_demod</key> + <param> + <key>id</key> + <value>digital_dxpsk_demod_0</value> + </param> + <param> + <key>_enabled</key> + <value>True</value> + </param> + <param> + <key>type</key> + <value>dqpsk</value> + </param> + <param> + <key>samples_per_symbol</key> + <value>samps_per_sym</value> + </param> + <param> + <key>excess_bw</key> + <value>0.35</value> + </param> + <param> + <key>freq_bw</key> + <value>6.28/100.0</value> + </param> + <param> + <key>phase_bw</key> + <value>6.28/100.0</value> + </param> + <param> + <key>timing_bw</key> + <value>6.28/100.0</value> + </param> + <param> + <key>mod_code</key> + <value>"gray"</value> + </param> + <param> + <key>verbose</key> + <value>False</value> + </param> + <param> + <key>log</key> + <value>False</value> + </param> + <param> + <key>sync_out</key> + <value>False</value> + </param> + <param> + <key>alias</key> + <value></value> + </param> + <param> + <key>affinity</key> + <value></value> + </param> + <param> + <key>minoutbuf</key> + <value>0</value> + </param> + <param> + <key>maxoutbuf</key> + <value>0</value> + </param> + <param> + <key>_coordinate</key> + <value>(325, 112)</value> + </param> + <param> + <key>_rotation</key> + <value>0</value> + </param> + </block> + <block> + <key>qtgui_freq_sink_x</key> + <param> + <key>id</key> + <value>qtgui_freq_sink_x_0</value> + </param> + <param> + <key>_enabled</key> + <value>True</value> + </param> + <param> + <key>type</key> + <value>complex</value> + </param> + <param> + <key>name</key> + <value>""</value> + </param> + <param> + <key>fftsize</key> + <value>1024</value> + </param> + <param> + <key>wintype</key> + <value>firdes.WIN_BLACKMAN_hARRIS</value> + </param> + <param> + <key>fc</key> + <value>tun_freq</value> + </param> + <param> + <key>bw</key> + <value>samp_rate</value> + </param> + <param> + <key>autoscale</key> + <value>False</value> + </param> + <param> + <key>average</key> + <value>1.0</value> + </param> + <param> + <key>ymin</key> + <value>-140</value> + </param> + <param> + <key>ymax</key> + <value>10</value> + </param> + <param> + <key>nconnections</key> + <value>1</value> + </param> + <param> + <key>update_time</key> + <value>0.10</value> + </param> + <param> + <key>gui_hint</key> + <value></value> + </param> + <param> + <key>label1</key> + <value></value> + </param> + <param> + <key>width1</key> + <value>1</value> + </param> + <param> + <key>color1</key> + <value>"blue"</value> + </param> + <param> + <key>alpha1</key> + <value>1.0</value> + </param> + <param> + <key>label2</key> + <value></value> + </param> + <param> + <key>width2</key> + <value>1</value> + </param> + <param> + <key>color2</key> + <value>"red"</value> + </param> + <param> + <key>alpha2</key> + <value>1.0</value> + </param> + <param> + <key>label3</key> + <value></value> + </param> + <param> + <key>width3</key> + <value>1</value> + </param> + <param> + <key>color3</key> + <value>"green"</value> + </param> + <param> + <key>alpha3</key> + <value>1.0</value> + </param> + <param> + <key>label4</key> + <value></value> + </param> + <param> + <key>width4</key> + <value>1</value> + </param> + <param> + <key>color4</key> + <value>"black"</value> + </param> + <param> + <key>alpha4</key> + <value>1.0</value> + </param> + <param> + <key>label5</key> + <value></value> + </param> + <param> + <key>width5</key> + <value>1</value> + </param> + <param> + <key>color5</key> + <value>"cyan"</value> + </param> + <param> + <key>alpha5</key> + <value>1.0</value> + </param> + <param> + <key>label6</key> + <value></value> + </param> + <param> + <key>width6</key> + <value>1</value> + </param> + <param> + <key>color6</key> + <value>"magenta"</value> + </param> + <param> + <key>alpha6</key> + <value>1.0</value> + </param> + <param> + <key>label7</key> + <value></value> + </param> + <param> + <key>width7</key> + <value>1</value> + </param> + <param> + <key>color7</key> + <value>"yellow"</value> + </param> + <param> + <key>alpha7</key> + <value>1.0</value> + </param> + <param> + <key>label8</key> + <value></value> + </param> + <param> + <key>width8</key> + <value>1</value> + </param> + <param> + <key>color8</key> + <value>"dark red"</value> + </param> + <param> + <key>alpha8</key> + <value>1.0</value> + </param> + <param> + <key>label9</key> + <value></value> + </param> + <param> + <key>width9</key> + <value>1</value> + </param> + <param> + <key>color9</key> + <value>"dark green"</value> + </param> + <param> + <key>alpha9</key> + <value>1.0</value> + </param> + <param> + <key>label10</key> + <value></value> + </param> + <param> + <key>width10</key> + <value>1</value> + </param> + <param> + <key>color10</key> + <value>"dark blue"</value> + </param> + <param> + <key>alpha10</key> + <value>1.0</value> + </param> + <param> + <key>alias</key> + <value></value> + </param> + <param> + <key>affinity</key> + <value></value> + </param> + <param> <key>_coordinate</key> - <value>(18, 276)</value> + <value>(340, 283)</value> </param> <param> <key>_rotation</key> @@ -1466,13 +1575,7 @@ </connection> <connection> <source_block_id>uhd_usrp_source_0</source_block_id> - <sink_block_id>wxgui_constellationsink2_0</sink_block_id> - <source_key>0</source_key> - <sink_key>0</sink_key> - </connection> - <connection> - <source_block_id>uhd_usrp_source_0</source_block_id> - <sink_block_id>wxgui_fftsink2_0</sink_block_id> + <sink_block_id>qtgui_freq_sink_x_0</sink_block_id> <source_key>0</source_key> <sink_key>0</sink_key> </connection> diff --git a/gr-uhd/examples/grc/uhd_two_tone_loopback.grc b/gr-uhd/examples/grc/uhd_two_tone_loopback.grc index 1884dd3ebf..f164d8522a 100644 --- a/gr-uhd/examples/grc/uhd_two_tone_loopback.grc +++ b/gr-uhd/examples/grc/uhd_two_tone_loopback.grc @@ -1,6 +1,6 @@ <?xml version='1.0' encoding='ASCII'?> <flow_graph> - <timestamp>Sat Nov 10 14:55:26 2012</timestamp> + <timestamp>Sat Jul 12 14:48:02 2014</timestamp> <block> <key>options</key> <param> @@ -29,7 +29,7 @@ </param> <param> <key>generate_options</key> - <value>wx_gui</value> + <value>qt_gui</value> </param> <param> <key>category</key> @@ -52,8 +52,12 @@ <value></value> </param> <param> + <key>alias</key> + <value></value> + </param> + <param> <key>_coordinate</key> - <value>(10, 10)</value> + <value>(1, 0)</value> </param> <param> <key>_rotation</key> @@ -64,7 +68,7 @@ <key>parameter</key> <param> <key>id</key> - <value>tx_gain</value> + <value>samp_rate</value> </param> <param> <key>_enabled</key> @@ -72,7 +76,46 @@ </param> <param> <key>label</key> - <value>Default TX Gain</value> + <value>Sample Rate</value> + </param> + <param> + <key>value</key> + <value>500e3</value> + </param> + <param> + <key>type</key> + <value>eng_float</value> + </param> + <param> + <key>short_id</key> + <value>s</value> + </param> + <param> + <key>alias</key> + <value></value> + </param> + <param> + <key>_coordinate</key> + <value>(523, 0)</value> + </param> + <param> + <key>_rotation</key> + <value>0</value> + </param> + </block> + <block> + <key>parameter</key> + <param> + <key>id</key> + <value>rx_gain</value> + </param> + <param> + <key>_enabled</key> + <value>True</value> + </param> + <param> + <key>label</key> + <value>Default RX Gain</value> </param> <param> <key>value</key> @@ -87,8 +130,51 @@ <value></value> </param> <param> + <key>alias</key> + <value></value> + </param> + <param> <key>_coordinate</key> - <value>(999, 11)</value> + <value>(1123, 0)</value> + </param> + <param> + <key>_rotation</key> + <value>0</value> + </param> + </block> + <block> + <key>parameter</key> + <param> + <key>id</key> + <value>freq_offset</value> + </param> + <param> + <key>_enabled</key> + <value>True</value> + </param> + <param> + <key>label</key> + <value>Rx Frequency Offset</value> + </param> + <param> + <key>value</key> + <value>0</value> + </param> + <param> + <key>type</key> + <value>eng_float</value> + </param> + <param> + <key>short_id</key> + <value>o</value> + </param> + <param> + <key>alias</key> + <value></value> + </param> + <param> + <key>_coordinate</key> + <value>(804, 0)</value> </param> <param> <key>_rotation</key> @@ -122,8 +208,12 @@ <value>f</value> </param> <param> + <key>alias</key> + <value></value> + </param> + <param> <key>_coordinate</key> - <value>(665, 11)</value> + <value>(649, 0)</value> </param> <param> <key>_rotation</key> @@ -134,7 +224,7 @@ <key>parameter</key> <param> <key>id</key> - <value>freq_offset</value> + <value>tx_gain</value> </param> <param> <key>_enabled</key> @@ -142,7 +232,7 @@ </param> <param> <key>label</key> - <value>Rx Frequency Offset</value> + <value>Default TX Gain</value> </param> <param> <key>value</key> @@ -154,11 +244,15 @@ </param> <param> <key>short_id</key> - <value>o</value> + <value></value> + </param> + <param> + <key>alias</key> + <value></value> </param> <param> <key>_coordinate</key> - <value>(820, 11)</value> + <value>(983, 0)</value> </param> <param> <key>_rotation</key> @@ -169,7 +263,7 @@ <key>parameter</key> <param> <key>id</key> - <value>address1</value> + <value>address0</value> </param> <param> <key>_enabled</key> @@ -177,11 +271,11 @@ </param> <param> <key>label</key> - <value>IP Address, Dev 1</value> + <value>IP Address, Dev 0</value> </param> <param> <key>value</key> - <value>addr=192.168.11.2</value> + <value>addr=192.168.10.2</value> </param> <param> <key>type</key> @@ -192,8 +286,12 @@ <value></value> </param> <param> + <key>alias</key> + <value></value> + </param> + <param> <key>_coordinate</key> - <value>(353, 14)</value> + <value>(177, 0)</value> </param> <param> <key>_rotation</key> @@ -204,7 +302,7 @@ <key>parameter</key> <param> <key>id</key> - <value>address0</value> + <value>address1</value> </param> <param> <key>_enabled</key> @@ -212,7 +310,7 @@ </param> <param> <key>label</key> - <value>IP Address, Dev 0</value> + <value>IP Address, Dev 1</value> </param> <param> <key>value</key> @@ -227,8 +325,12 @@ <value></value> </param> <param> + <key>alias</key> + <value></value> + </param> + <param> <key>_coordinate</key> - <value>(193, 14)</value> + <value>(337, 0)</value> </param> <param> <key>_rotation</key> @@ -236,10 +338,10 @@ </param> </block> <block> - <key>uhd_usrp_sink</key> + <key>uhd_usrp_source</key> <param> <key>id</key> - <value>uhd_usrp_sink_0</value> + <value>uhd_usrp_source_0</value> </param> <param> <key>_enabled</key> @@ -258,8 +360,16 @@ <value></value> </param> <param> + <key>stream_chans</key> + <value>[]</value> + </param> + <param> <key>dev_addr</key> - <value>address0</value> + <value>address1</value> + </param> + <param> + <key>dev_args</key> + <value>""</value> </param> <param> <key>sync</key> @@ -283,7 +393,7 @@ </param> <param> <key>sd_spec0</key> - <value></value> + <value>B:0</value> </param> <param> <key>clock_source1</key> @@ -890,8 +1000,24 @@ <value>0</value> </param> <param> + <key>alias</key> + <value></value> + </param> + <param> + <key>affinity</key> + <value></value> + </param> + <param> + <key>minoutbuf</key> + <value>0</value> + </param> + <param> + <key>maxoutbuf</key> + <value>0</value> + </param> + <param> <key>_coordinate</key> - <value>(669, 178)</value> + <value>(813, 281)</value> </param> <param> <key>_rotation</key> @@ -899,34 +1025,50 @@ </param> </block> <block> - <key>parameter</key> + <key>analog_noise_source_x</key> <param> <key>id</key> - <value>rx_gain</value> + <value>analog_noise_source_x_0</value> </param> <param> <key>_enabled</key> <value>True</value> </param> <param> - <key>label</key> - <value>Default RX Gain</value> + <key>type</key> + <value>complex</value> </param> <param> - <key>value</key> - <value>0</value> + <key>noise_type</key> + <value>analog.GR_GAUSSIAN</value> </param> <param> - <key>type</key> - <value>eng_float</value> + <key>amp</key> + <value>noise_ampl</value> </param> <param> - <key>short_id</key> + <key>seed</key> + <value>-42</value> + </param> + <param> + <key>alias</key> <value></value> </param> <param> + <key>affinity</key> + <value></value> + </param> + <param> + <key>minoutbuf</key> + <value>0</value> + </param> + <param> + <key>maxoutbuf</key> + <value>0</value> + </param> + <param> <key>_coordinate</key> - <value>(1139, 12)</value> + <value>(551, 324)</value> </param> <param> <key>_rotation</key> @@ -934,54 +1076,58 @@ </param> </block> <block> - <key>variable_slider</key> + <key>analog_sig_source_x</key> <param> <key>id</key> - <value>tone1</value> + <value>analog_sig_source_x_0</value> </param> <param> <key>_enabled</key> <value>True</value> </param> <param> - <key>label</key> - <value>Tone 1</value> + <key>type</key> + <value>complex</value> </param> <param> - <key>value</key> - <value>50e3</value> + <key>samp_rate</key> + <value>samp_rate</value> </param> <param> - <key>min</key> - <value>-samp_rate/2</value> + <key>waveform</key> + <value>analog.GR_COS_WAVE</value> </param> <param> - <key>max</key> - <value>samp_rate/2</value> + <key>freq</key> + <value>tone1</value> + </param> + <param> + <key>amp</key> + <value>tone_ampl</value> </param> <param> - <key>num_steps</key> - <value>100</value> + <key>offset</key> + <value>0</value> </param> <param> - <key>style</key> - <value>wx.SL_HORIZONTAL</value> + <key>alias</key> + <value></value> </param> <param> - <key>converver</key> - <value>float_converter</value> + <key>affinity</key> + <value></value> </param> <param> - <key>grid_pos</key> - <value>0, 0, 1, 4</value> + <key>minoutbuf</key> + <value>0</value> </param> <param> - <key>notebook</key> - <value></value> + <key>maxoutbuf</key> + <value>0</value> </param> <param> <key>_coordinate</key> - <value>(161, 484)</value> + <value>(541, 98)</value> </param> <param> <key>_rotation</key> @@ -989,54 +1135,58 @@ </param> </block> <block> - <key>variable_slider</key> + <key>analog_sig_source_x</key> <param> <key>id</key> - <value>tone2</value> + <value>analog_sig_source_x_1</value> </param> <param> <key>_enabled</key> <value>True</value> </param> <param> - <key>label</key> - <value>Tone 2</value> + <key>type</key> + <value>complex</value> </param> <param> - <key>value</key> - <value>75e3</value> + <key>samp_rate</key> + <value>samp_rate</value> </param> <param> - <key>min</key> - <value>-samp_rate/2</value> + <key>waveform</key> + <value>analog.GR_COS_WAVE</value> </param> <param> - <key>max</key> - <value>samp_rate/2</value> + <key>freq</key> + <value>tone2</value> </param> <param> - <key>num_steps</key> - <value>100</value> + <key>amp</key> + <value>tone_ampl</value> </param> <param> - <key>style</key> - <value>wx.SL_HORIZONTAL</value> + <key>offset</key> + <value>0</value> </param> <param> - <key>converver</key> - <value>float_converter</value> + <key>alias</key> + <value></value> </param> <param> - <key>grid_pos</key> - <value>0, 4, 1, 4</value> + <key>affinity</key> + <value></value> </param> <param> - <key>notebook</key> - <value></value> + <key>minoutbuf</key> + <value>0</value> + </param> + <param> + <key>maxoutbuf</key> + <value>0</value> </param> <param> <key>_coordinate</key> - <value>(308, 483)</value> + <value>(542, 209)</value> </param> <param> <key>_rotation</key> @@ -1044,54 +1194,46 @@ </param> </block> <block> - <key>variable_slider</key> + <key>blocks_add_xx</key> <param> <key>id</key> - <value>tun_tx_gain</value> + <value>blocks_add_xx</value> </param> <param> <key>_enabled</key> <value>True</value> </param> <param> - <key>label</key> - <value>UHD TX Gain</value> - </param> - <param> - <key>value</key> - <value>tx_gain</value> - </param> - <param> - <key>min</key> - <value>0</value> + <key>type</key> + <value>complex</value> </param> <param> - <key>max</key> - <value>20</value> + <key>num_inputs</key> + <value>3</value> </param> <param> - <key>num_steps</key> - <value>100</value> + <key>vlen</key> + <value>1</value> </param> <param> - <key>style</key> - <value>wx.SL_HORIZONTAL</value> + <key>alias</key> + <value></value> </param> <param> - <key>converver</key> - <value>float_converter</value> + <key>affinity</key> + <value></value> </param> <param> - <key>grid_pos</key> - <value></value> + <key>minoutbuf</key> + <value>0</value> </param> <param> - <key>notebook</key> - <value></value> + <key>maxoutbuf</key> + <value>0</value> </param> <param> <key>_coordinate</key> - <value>(655, 486)</value> + <value>(806, 134)</value> </param> <param> <key>_rotation</key> @@ -1099,109 +1241,238 @@ </param> </block> <block> - <key>variable_slider</key> + <key>qtgui_freq_sink_x</key> <param> <key>id</key> - <value>tun_freq</value> + <value>qtgui_freq_sink_x_0</value> </param> <param> <key>_enabled</key> <value>True</value> </param> <param> - <key>label</key> - <value>Freq (Hz)</value> + <key>type</key> + <value>complex</value> </param> <param> - <key>value</key> - <value>freq</value> + <key>name</key> + <value>""</value> </param> <param> - <key>min</key> - <value>2.4e9</value> + <key>fftsize</key> + <value>1024</value> </param> <param> - <key>max</key> - <value>2.5e9</value> + <key>wintype</key> + <value>firdes.WIN_BLACKMAN_hARRIS</value> + </param> + <param> + <key>fc</key> + <value>0</value> + </param> + <param> + <key>bw</key> + <value>samp_rate</value> + </param> + <param> + <key>autoscale</key> + <value>False</value> + </param> + <param> + <key>average</key> + <value>1.0</value> </param> <param> - <key>num_steps</key> - <value>100</value> + <key>ymin</key> + <value>-140</value> </param> <param> - <key>style</key> - <value>wx.SL_HORIZONTAL</value> + <key>ymax</key> + <value>10</value> + </param> + <param> + <key>nconnections</key> + <value>1</value> </param> <param> - <key>converver</key> - <value>float_converter</value> + <key>update_time</key> + <value>0.10</value> </param> <param> - <key>grid_pos</key> + <key>gui_hint</key> + <value>2,0,1,4</value> + </param> + <param> + <key>label1</key> <value></value> </param> <param> - <key>notebook</key> + <key>width1</key> + <value>1</value> + </param> + <param> + <key>color1</key> + <value>"blue"</value> + </param> + <param> + <key>alpha1</key> + <value>1.0</value> + </param> + <param> + <key>label2</key> <value></value> </param> <param> - <key>_coordinate</key> - <value>(514, 487)</value> + <key>width2</key> + <value>1</value> </param> <param> - <key>_rotation</key> - <value>0</value> + <key>color2</key> + <value>"red"</value> </param> - </block> - <block> - <key>variable_slider</key> <param> - <key>id</key> - <value>tun_rx_gain</value> + <key>alpha2</key> + <value>1.0</value> </param> <param> - <key>_enabled</key> - <value>True</value> + <key>label3</key> + <value></value> </param> <param> - <key>label</key> - <value>UHD RX Gain</value> + <key>width3</key> + <value>1</value> </param> <param> - <key>value</key> - <value>rx_gain</value> + <key>color3</key> + <value>"green"</value> </param> <param> - <key>min</key> - <value>0</value> + <key>alpha3</key> + <value>1.0</value> </param> <param> - <key>max</key> - <value>20</value> + <key>label4</key> + <value></value> + </param> + <param> + <key>width4</key> + <value>1</value> + </param> + <param> + <key>color4</key> + <value>"black"</value> + </param> + <param> + <key>alpha4</key> + <value>1.0</value> + </param> + <param> + <key>label5</key> + <value></value> + </param> + <param> + <key>width5</key> + <value>1</value> + </param> + <param> + <key>color5</key> + <value>"cyan"</value> + </param> + <param> + <key>alpha5</key> + <value>1.0</value> + </param> + <param> + <key>label6</key> + <value></value> </param> <param> - <key>num_steps</key> - <value>100</value> + <key>width6</key> + <value>1</value> + </param> + <param> + <key>color6</key> + <value>"magenta"</value> + </param> + <param> + <key>alpha6</key> + <value>1.0</value> + </param> + <param> + <key>label7</key> + <value></value> + </param> + <param> + <key>width7</key> + <value>1</value> </param> <param> - <key>style</key> - <value>wx.SL_HORIZONTAL</value> + <key>color7</key> + <value>"yellow"</value> </param> <param> - <key>converver</key> - <value>float_converter</value> + <key>alpha7</key> + <value>1.0</value> </param> <param> - <key>grid_pos</key> + <key>label8</key> <value></value> </param> <param> - <key>notebook</key> + <key>width8</key> + <value>1</value> + </param> + <param> + <key>color8</key> + <value>"dark red"</value> + </param> + <param> + <key>alpha8</key> + <value>1.0</value> + </param> + <param> + <key>label9</key> + <value></value> + </param> + <param> + <key>width9</key> + <value>1</value> + </param> + <param> + <key>color9</key> + <value>"dark green"</value> + </param> + <param> + <key>alpha9</key> + <value>1.0</value> + </param> + <param> + <key>label10</key> + <value></value> + </param> + <param> + <key>width10</key> + <value>1</value> + </param> + <param> + <key>color10</key> + <value>"dark blue"</value> + </param> + <param> + <key>alpha10</key> + <value>1.0</value> + </param> + <param> + <key>alias</key> + <value></value> + </param> + <param> + <key>affinity</key> <value></value> </param> <param> <key>_coordinate</key> - <value>(781, 487)</value> + <value>(1086, 281)</value> </param> <param> <key>_rotation</key> @@ -1209,10 +1480,10 @@ </param> </block> <block> - <key>uhd_usrp_source</key> + <key>uhd_usrp_sink</key> <param> <key>id</key> - <value>uhd_usrp_source_0</value> + <value>uhd_usrp_sink_0</value> </param> <param> <key>_enabled</key> @@ -1231,8 +1502,16 @@ <value></value> </param> <param> + <key>stream_chans</key> + <value>[]</value> + </param> + <param> <key>dev_addr</key> - <value>address1</value> + <value>address0</value> + </param> + <param> + <key>dev_args</key> + <value>""</value> </param> <param> <key>sync</key> @@ -1256,7 +1535,7 @@ </param> <param> <key>sd_spec0</key> - <value></value> + <value>A:0</value> </param> <param> <key>clock_source1</key> @@ -1863,8 +2142,20 @@ <value>0</value> </param> <param> + <key>len_tag_name</key> + <value></value> + </param> + <param> + <key>alias</key> + <value></value> + </param> + <param> + <key>affinity</key> + <value></value> + </param> + <param> <key>_coordinate</key> - <value>(672, 320)</value> + <value>(949, 140)</value> </param> <param> <key>_rotation</key> @@ -1872,10 +2163,10 @@ </param> </block> <block> - <key>variable_slider</key> + <key>variable_qtgui_range</key> <param> <key>id</key> - <value>tone_ampl</value> + <value>tun_freq</value> </param> <param> <key>_enabled</key> @@ -1883,43 +2174,47 @@ </param> <param> <key>label</key> - <value>Tone Ampl</value> + <value>UHD Freq (Hz)</value> </param> <param> <key>value</key> - <value>0.15</value> + <value>2.45e9</value> </param> <param> - <key>min</key> - <value>0</value> + <key>start</key> + <value>2.4e9</value> + </param> + <param> + <key>stop</key> + <value>2.5e9</value> </param> <param> - <key>max</key> + <key>step</key> <value>1</value> </param> <param> - <key>num_steps</key> - <value>100</value> + <key>widget</key> + <value>counter_slider</value> </param> <param> - <key>style</key> - <value>wx.SL_VERTICAL</value> + <key>orient</key> + <value>Qt.Horizontal</value> </param> <param> - <key>converver</key> - <value>float_converter</value> + <key>min_len</key> + <value>200</value> </param> <param> - <key>grid_pos</key> - <value>1, 0, 2, 1</value> + <key>gui_hint</key> + <value>3,0,1,4</value> </param> <param> - <key>notebook</key> + <key>alias</key> <value></value> </param> <param> <key>_coordinate</key> - <value>(14, 485)</value> + <value>(80, 431)</value> </param> <param> <key>_rotation</key> @@ -1927,10 +2222,10 @@ </param> </block> <block> - <key>variable_slider</key> + <key>variable_qtgui_range</key> <param> <key>id</key> - <value>noise_ampl</value> + <value>tone1</value> </param> <param> <key>_enabled</key> @@ -1938,43 +2233,47 @@ </param> <param> <key>label</key> - <value>Noise Ampl</value> + <value>Tone 1</value> </param> <param> <key>value</key> - <value>0.1</value> + <value>samp_rate/4</value> </param> <param> - <key>min</key> - <value>0</value> + <key>start</key> + <value>-samp_rate/2</value> + </param> + <param> + <key>stop</key> + <value>samp_rate/2</value> </param> <param> - <key>max</key> + <key>step</key> <value>1</value> </param> <param> - <key>num_steps</key> - <value>100</value> + <key>widget</key> + <value>counter_slider</value> </param> <param> - <key>style</key> - <value>wx.SL_VERTICAL</value> + <key>orient</key> + <value>Qt.Horizontal</value> </param> <param> - <key>converver</key> - <value>float_converter</value> + <key>min_len</key> + <value>200</value> </param> <param> - <key>grid_pos</key> - <value>1, 1, 2, 1</value> + <key>gui_hint</key> + <value>0,0,1,2</value> </param> <param> - <key>notebook</key> + <key>alias</key> <value></value> </param> <param> <key>_coordinate</key> - <value>(15, 335)</value> + <value>(1, 131)</value> </param> <param> <key>_rotation</key> @@ -1982,125 +2281,117 @@ </param> </block> <block> - <key>wxgui_fftsink2</key> + <key>variable_qtgui_range</key> <param> <key>id</key> - <value>wxgui_fftsink2</value> + <value>noise_ampl</value> </param> <param> <key>_enabled</key> <value>True</value> </param> <param> - <key>type</key> - <value>complex</value> - </param> - <param> - <key>title</key> - <value>FFT Plot</value> + <key>label</key> + <value>Noise Amplitude</value> </param> <param> - <key>samp_rate</key> - <value>samp_rate</value> + <key>value</key> + <value>0.1</value> </param> <param> - <key>baseband_freq</key> + <key>start</key> <value>0</value> </param> <param> - <key>y_per_div</key> - <value>10</value> + <key>stop</key> + <value>1</value> </param> <param> - <key>y_divs</key> - <value>10</value> + <key>step</key> + <value>.001</value> </param> <param> - <key>ref_level</key> - <value>0</value> + <key>widget</key> + <value>counter_slider</value> </param> <param> - <key>ref_scale</key> - <value>2.0</value> + <key>orient</key> + <value>Qt.Horizontal</value> </param> <param> - <key>fft_size</key> - <value>512*2</value> + <key>min_len</key> + <value>200</value> </param> <param> - <key>fft_rate</key> - <value>15</value> + <key>gui_hint</key> + <value>1,0,1,2</value> </param> <param> - <key>peak_hold</key> - <value>False</value> + <key>alias</key> + <value></value> </param> <param> - <key>average</key> - <value>False</value> + <key>_coordinate</key> + <value>(0, 283)</value> </param> <param> - <key>avg_alpha</key> + <key>_rotation</key> <value>0</value> </param> + </block> + <block> + <key>variable_qtgui_range</key> <param> - <key>win</key> - <value>window.blackmanharris</value> - </param> - <param> - <key>win_size</key> - <value></value> + <key>id</key> + <value>tun_tx_gain</value> </param> <param> - <key>grid_pos</key> - <value>1, 2, 2, 4</value> + <key>_enabled</key> + <value>True</value> </param> <param> - <key>notebook</key> - <value></value> + <key>label</key> + <value>UHD Tx Gain</value> </param> <param> - <key>freqvar</key> - <value>None</value> + <key>value</key> + <value>0</value> </param> <param> - <key>_coordinate</key> - <value>(1114, 264)</value> + <key>start</key> + <value>0</value> </param> <param> - <key>_rotation</key> - <value>0</value> + <key>stop</key> + <value>20</value> </param> - </block> - <block> - <key>parameter</key> <param> - <key>id</key> - <value>samp_rate</value> + <key>step</key> + <value>1</value> </param> <param> - <key>_enabled</key> - <value>True</value> + <key>widget</key> + <value>counter_slider</value> </param> <param> - <key>label</key> - <value>Sample Rate</value> + <key>orient</key> + <value>Qt.Horizontal</value> </param> <param> - <key>value</key> - <value>500e3</value> + <key>min_len</key> + <value>200</value> </param> <param> - <key>type</key> - <value>eng_float</value> + <key>gui_hint</key> + <value>4,0,1,2</value> </param> <param> - <key>short_id</key> - <value>s</value> + <key>alias</key> + <value></value> </param> <param> <key>_coordinate</key> - <value>(539, 11)</value> + <value>(-1, 573)</value> </param> <param> <key>_rotation</key> @@ -2108,42 +2399,58 @@ </param> </block> <block> - <key>analog_sig_source_x</key> + <key>variable_qtgui_range</key> <param> <key>id</key> - <value>analog_sig_source_x_0</value> + <value>tone2</value> </param> <param> <key>_enabled</key> <value>True</value> </param> <param> - <key>type</key> - <value>complex</value> + <key>label</key> + <value>Tone 2</value> </param> <param> - <key>samp_rate</key> - <value>samp_rate</value> + <key>value</key> + <value>samp_rate/5</value> </param> <param> - <key>waveform</key> - <value>analog.GR_COS_WAVE</value> + <key>start</key> + <value>-samp_rate/2</value> </param> <param> - <key>freq</key> - <value>tone1</value> + <key>stop</key> + <value>samp_rate/2</value> </param> <param> - <key>amp</key> - <value>tone_ampl</value> + <key>step</key> + <value>1</value> </param> <param> - <key>offset</key> - <value>0</value> + <key>widget</key> + <value>counter_slider</value> + </param> + <param> + <key>orient</key> + <value>Qt.Horizontal</value> + </param> + <param> + <key>min_len</key> + <value>200</value> + </param> + <param> + <key>gui_hint</key> + <value>0,2,1,2</value> + </param> + <param> + <key>alias</key> + <value></value> </param> <param> <key>_coordinate</key> - <value>(264, 136)</value> + <value>(126, 132)</value> </param> <param> <key>_rotation</key> @@ -2151,42 +2458,58 @@ </param> </block> <block> - <key>analog_sig_source_x</key> + <key>variable_qtgui_range</key> <param> <key>id</key> - <value>analog_sig_source_x_1</value> + <value>tone_ampl</value> </param> <param> <key>_enabled</key> <value>True</value> </param> <param> - <key>type</key> - <value>complex</value> + <key>label</key> + <value>Tone Amplitude</value> </param> <param> - <key>samp_rate</key> - <value>samp_rate</value> + <key>value</key> + <value>0.15</value> </param> <param> - <key>waveform</key> - <value>analog.GR_COS_WAVE</value> + <key>start</key> + <value>0</value> </param> <param> - <key>freq</key> - <value>tone2</value> + <key>stop</key> + <value>1</value> </param> <param> - <key>amp</key> - <value>tone_ampl</value> + <key>step</key> + <value>.001</value> </param> <param> - <key>offset</key> - <value>0</value> + <key>widget</key> + <value>counter_slider</value> + </param> + <param> + <key>orient</key> + <value>Qt.Horizontal</value> + </param> + <param> + <key>min_len</key> + <value>200</value> + </param> + <param> + <key>gui_hint</key> + <value>1,2,1,2</value> + </param> + <param> + <key>alias</key> + <value></value> </param> <param> <key>_coordinate</key> - <value>(265, 247)</value> + <value>(152, 286)</value> </param> <param> <key>_rotation</key> @@ -2194,65 +2517,58 @@ </param> </block> <block> - <key>blocks_add_xx</key> + <key>variable_qtgui_range</key> <param> <key>id</key> - <value>blocks_add_xx</value> + <value>tun_rx_gain</value> </param> <param> <key>_enabled</key> <value>True</value> </param> <param> - <key>type</key> - <value>complex</value> - </param> - <param> - <key>num_inputs</key> - <value>3</value> + <key>label</key> + <value>UHD Rx Gain</value> </param> <param> - <key>vlen</key> - <value>1</value> + <key>value</key> + <value>0</value> </param> <param> - <key>_coordinate</key> - <value>(529, 172)</value> + <key>start</key> + <value>0</value> </param> <param> - <key>_rotation</key> - <value>0</value> + <key>stop</key> + <value>20</value> </param> - </block> - <block> - <key>analog_noise_source_x</key> <param> - <key>id</key> - <value>analog_noise_source_x_0</value> + <key>step</key> + <value>1</value> </param> <param> - <key>_enabled</key> - <value>True</value> + <key>widget</key> + <value>counter_slider</value> </param> <param> - <key>type</key> - <value>complex</value> + <key>orient</key> + <value>Qt.Horizontal</value> </param> <param> - <key>noise_type</key> - <value>analog.GR_GAUSSIAN</value> + <key>min_len</key> + <value>200</value> </param> <param> - <key>amp</key> - <value>noise_ampl</value> + <key>gui_hint</key> + <value>4,2,1,2</value> </param> <param> - <key>seed</key> - <value>-42</value> + <key>alias</key> + <value></value> </param> <param> <key>_coordinate</key> - <value>(288, 359)</value> + <value>(120, 571)</value> </param> <param> <key>_rotation</key> @@ -2260,14 +2576,8 @@ </param> </block> <connection> - <source_block_id>blocks_add_xx</source_block_id> - <sink_block_id>uhd_usrp_sink_0</sink_block_id> - <source_key>0</source_key> - <sink_key>0</sink_key> - </connection> - <connection> <source_block_id>uhd_usrp_source_0</source_block_id> - <sink_block_id>wxgui_fftsink2</sink_block_id> + <sink_block_id>qtgui_freq_sink_x_0</sink_block_id> <source_key>0</source_key> <sink_key>0</sink_key> </connection> @@ -2289,4 +2599,10 @@ <source_key>0</source_key> <sink_key>2</sink_key> </connection> + <connection> + <source_block_id>blocks_add_xx</source_block_id> + <sink_block_id>uhd_usrp_sink_0</sink_block_id> + <source_key>0</source_key> + <sink_key>0</sink_key> + </connection> </flow_graph> diff --git a/gr-uhd/examples/grc/uhd_tx_dpsk.grc b/gr-uhd/examples/grc/uhd_tx_dpsk.grc index 5d57617673..815d87b742 100644 --- a/gr-uhd/examples/grc/uhd_tx_dpsk.grc +++ b/gr-uhd/examples/grc/uhd_tx_dpsk.grc @@ -1,6 +1,6 @@ <?xml version='1.0' encoding='ASCII'?> <flow_graph> - <timestamp>Mon Mar 18 11:11:06 2013</timestamp> + <timestamp>Sat Jul 12 14:07:03 2014</timestamp> <block> <key>options</key> <param> @@ -29,7 +29,7 @@ </param> <param> <key>generate_options</key> - <value>wx_gui</value> + <value>qt_gui</value> </param> <param> <key>category</key> @@ -52,8 +52,12 @@ <value></value> </param> <param> + <key>alias</key> + <value></value> + </param> + <param> <key>_coordinate</key> - <value>(10, 10)</value> + <value>(-1, 0)</value> </param> <param> <key>_rotation</key> @@ -75,8 +79,12 @@ <value>4</value> </param> <param> + <key>alias</key> + <value></value> + </param> + <param> <key>_coordinate</key> - <value>(10, 100)</value> + <value>(-1, 84)</value> </param> <param> <key>_rotation</key> @@ -84,10 +92,10 @@ </param> </block> <block> - <key>variable_slider</key> + <key>parameter</key> <param> <key>id</key> - <value>ampl</value> + <value>gain</value> </param> <param> <key>_enabled</key> @@ -95,43 +103,66 @@ </param> <param> <key>label</key> - <value>Amplitude</value> + <value>Default Gain</value> </param> <param> <key>value</key> - <value>.1</value> + <value>0</value> </param> <param> - <key>min</key> + <key>type</key> + <value>eng_float</value> + </param> + <param> + <key>short_id</key> + <value>g</value> + </param> + <param> + <key>alias</key> + <value></value> + </param> + <param> + <key>_coordinate</key> + <value>(589, 0)</value> + </param> + <param> + <key>_rotation</key> <value>0</value> </param> + </block> + <block> + <key>parameter</key> <param> - <key>max</key> - <value>1</value> + <key>id</key> + <value>freq</value> </param> <param> - <key>num_steps</key> - <value>100</value> + <key>_enabled</key> + <value>True</value> </param> <param> - <key>style</key> - <value>wx.SL_HORIZONTAL</value> + <key>label</key> + <value>Default Frequency</value> </param> <param> - <key>converver</key> - <value>float_converter</value> + <key>value</key> + <value>2.45e9</value> </param> <param> - <key>grid_pos</key> - <value></value> + <key>type</key> + <value>eng_float</value> + </param> + <param> + <key>short_id</key> + <value>f</value> </param> <param> - <key>notebook</key> + <key>alias</key> <value></value> </param> <param> <key>_coordinate</key> - <value>(7, 299)</value> + <value>(433, 1)</value> </param> <param> <key>_rotation</key> @@ -165,8 +196,12 @@ <value>s</value> </param> <param> + <key>alias</key> + <value></value> + </param> + <param> <key>_coordinate</key> - <value>(334, 15)</value> + <value>(304, 0)</value> </param> <param> <key>_rotation</key> @@ -177,7 +212,7 @@ <key>parameter</key> <param> <key>id</key> - <value>freq</value> + <value>address</value> </param> <param> <key>_enabled</key> @@ -185,23 +220,27 @@ </param> <param> <key>label</key> - <value>Default Frequency</value> + <value>IP Address</value> </param> <param> <key>value</key> - <value>2.45e9</value> + <value>addr=192.168.10.2</value> </param> <param> <key>type</key> - <value>eng_float</value> + <value>string</value> </param> <param> <key>short_id</key> - <value>f</value> + <value>a</value> + </param> + <param> + <key>alias</key> + <value></value> </param> <param> <key>_coordinate</key> - <value>(463, 17)</value> + <value>(147, 0)</value> </param> <param> <key>_rotation</key> @@ -209,10 +248,10 @@ </param> </block> <block> - <key>variable_slider</key> + <key>variable_qtgui_range</key> <param> <key>id</key> - <value>tun_gain</value> + <value>ampl</value> </param> <param> <key>_enabled</key> @@ -220,43 +259,47 @@ </param> <param> <key>label</key> - <value>UHD Gain</value> + <value>Amplitude</value> </param> <param> <key>value</key> - <value>gain</value> + <value>0.1</value> </param> <param> - <key>min</key> + <key>start</key> <value>0</value> </param> <param> - <key>max</key> - <value>20</value> + <key>stop</key> + <value>1</value> + </param> + <param> + <key>step</key> + <value>0.01</value> </param> <param> - <key>num_steps</key> - <value>100</value> + <key>widget</key> + <value>counter_slider</value> </param> <param> - <key>style</key> - <value>wx.SL_HORIZONTAL</value> + <key>orient</key> + <value>Qt.Horizontal</value> </param> <param> - <key>converver</key> - <value>float_converter</value> + <key>min_len</key> + <value>200</value> </param> <param> - <key>grid_pos</key> + <key>gui_hint</key> <value></value> </param> <param> - <key>notebook</key> + <key>alias</key> <value></value> </param> <param> <key>_coordinate</key> - <value>(151, 441)</value> + <value>(-1, 307)</value> </param> <param> <key>_rotation</key> @@ -264,7 +307,7 @@ </param> </block> <block> - <key>variable_slider</key> + <key>variable_qtgui_range</key> <param> <key>id</key> <value>tun_freq</value> @@ -275,43 +318,47 @@ </param> <param> <key>label</key> - <value>Freq (Hz)</value> + <value>UHD Freq (Hz)</value> </param> <param> <key>value</key> - <value>freq</value> + <value>2.45e9</value> </param> <param> - <key>min</key> + <key>start</key> <value>2.4e9</value> </param> <param> - <key>max</key> + <key>stop</key> <value>2.5e9</value> </param> <param> - <key>num_steps</key> - <value>100</value> + <key>step</key> + <value>1</value> + </param> + <param> + <key>widget</key> + <value>counter_slider</value> </param> <param> - <key>style</key> - <value>wx.SL_HORIZONTAL</value> + <key>orient</key> + <value>Qt.Horizontal</value> </param> <param> - <key>converver</key> - <value>float_converter</value> + <key>min_len</key> + <value>200</value> </param> <param> - <key>grid_pos</key> + <key>gui_hint</key> <value></value> </param> <param> - <key>notebook</key> + <key>alias</key> <value></value> </param> <param> <key>_coordinate</key> - <value>(7, 441)</value> + <value>(0, 436)</value> </param> <param> <key>_rotation</key> @@ -319,38 +366,58 @@ </param> </block> <block> - <key>analog_random_source_x</key> + <key>variable_qtgui_range</key> <param> <key>id</key> - <value>analog_random_source_x_0</value> + <value>tun_gain</value> </param> <param> <key>_enabled</key> <value>True</value> </param> <param> - <key>type</key> - <value>byte</value> + <key>label</key> + <value>UHD Tx Gain</value> </param> <param> - <key>min</key> + <key>value</key> <value>0</value> </param> <param> - <key>max</key> - <value>2**8</value> + <key>start</key> + <value>0</value> </param> <param> - <key>num_samps</key> - <value>1000</value> + <key>stop</key> + <value>20</value> </param> <param> - <key>repeat</key> - <value>True</value> + <key>step</key> + <value>1</value> + </param> + <param> + <key>widget</key> + <value>counter_slider</value> + </param> + <param> + <key>orient</key> + <value>Qt.Horizontal</value> + </param> + <param> + <key>min_len</key> + <value>200</value> + </param> + <param> + <key>gui_hint</key> + <value></value> + </param> + <param> + <key>alias</key> + <value></value> </param> <param> <key>_coordinate</key> - <value>(177, 162)</value> + <value>(137, 435)</value> </param> <param> <key>_rotation</key> @@ -358,10 +425,10 @@ </param> </block> <block> - <key>digital_dxpsk_mod</key> + <key>analog_random_source_x</key> <param> <key>id</key> - <value>digital_dxpsk_mod_0</value> + <value>analog_random_source_x_0</value> </param> <param> <key>_enabled</key> @@ -369,31 +436,43 @@ </param> <param> <key>type</key> - <value>dqpsk</value> + <value>byte</value> </param> <param> - <key>samples_per_symbol</key> - <value>samps_per_sym</value> + <key>min</key> + <value>0</value> </param> <param> - <key>excess_bw</key> - <value>0.35</value> + <key>max</key> + <value>2**8</value> </param> <param> - <key>mod_code</key> - <value>"gray"</value> + <key>num_samps</key> + <value>1000</value> </param> <param> - <key>verbose</key> - <value>False</value> + <key>repeat</key> + <value>True</value> </param> <param> - <key>log</key> - <value>False</value> + <key>alias</key> + <value></value> + </param> + <param> + <key>affinity</key> + <value></value> + </param> + <param> + <key>minoutbuf</key> + <value>0</value> + </param> + <param> + <key>maxoutbuf</key> + <value>0</value> </param> <param> <key>_coordinate</key> - <value>(366, 162)</value> + <value>(-1, 171)</value> </param> <param> <key>_rotation</key> @@ -401,69 +480,58 @@ </param> </block> <block> - <key>parameter</key> + <key>digital_dxpsk_mod</key> <param> <key>id</key> - <value>gain</value> + <value>digital_dxpsk_mod_0</value> </param> <param> <key>_enabled</key> <value>True</value> </param> <param> - <key>label</key> - <value>Default Gain</value> - </param> - <param> - <key>value</key> - <value>0</value> - </param> - <param> <key>type</key> - <value>eng_float</value> + <value>dqpsk</value> </param> <param> - <key>short_id</key> - <value>g</value> + <key>samples_per_symbol</key> + <value>samps_per_sym</value> </param> <param> - <key>_coordinate</key> - <value>(619, 15)</value> + <key>excess_bw</key> + <value>0.35</value> </param> <param> - <key>_rotation</key> - <value>0</value> + <key>mod_code</key> + <value>"gray"</value> </param> - </block> - <block> - <key>parameter</key> <param> - <key>id</key> - <value>address</value> + <key>verbose</key> + <value>False</value> </param> <param> - <key>_enabled</key> - <value>True</value> + <key>log</key> + <value>False</value> </param> <param> - <key>label</key> - <value>IP Address</value> + <key>alias</key> + <value></value> </param> <param> - <key>value</key> - <value>addr=192.168.10.2</value> + <key>affinity</key> + <value></value> </param> <param> - <key>type</key> - <value>string</value> + <key>minoutbuf</key> + <value>0</value> </param> <param> - <key>short_id</key> - <value>a</value> + <key>maxoutbuf</key> + <value>0</value> </param> <param> <key>_coordinate</key> - <value>(177, 14)</value> + <value>(190, 171)</value> </param> <param> <key>_rotation</key> @@ -493,10 +561,18 @@ <value></value> </param> <param> + <key>stream_chans</key> + <value>[]</value> + </param> + <param> <key>dev_addr</key> <value>address</value> </param> <param> + <key>dev_args</key> + <value>""</value> + </param> + <param> <key>sync</key> <value></value> </param> @@ -1125,8 +1201,20 @@ <value>0</value> </param> <param> + <key>len_tag_name</key> + <value></value> + </param> + <param> + <key>alias</key> + <value></value> + </param> + <param> + <key>affinity</key> + <value></value> + </param> + <param> <key>_coordinate</key> - <value>(783, 162)</value> + <value>(617, 163)</value> </param> <param> <key>_rotation</key> @@ -1156,8 +1244,24 @@ <value>1</value> </param> <param> + <key>alias</key> + <value></value> + </param> + <param> + <key>affinity</key> + <value></value> + </param> + <param> + <key>minoutbuf</key> + <value>0</value> + </param> + <param> + <key>maxoutbuf</key> + <value>0</value> + </param> + <param> <key>_coordinate</key> - <value>(566, 186)</value> + <value>(388, 193)</value> </param> <param> <key>_rotation</key> @@ -1165,10 +1269,10 @@ </param> </block> <block> - <key>wxgui_fftsink2</key> + <key>qtgui_freq_sink_x</key> <param> <key>id</key> - <value>wxgui_fftsink2_0</value> + <value>qtgui_freq_sink_x_0</value> </param> <param> <key>_enabled</key> @@ -1179,76 +1283,224 @@ <value>complex</value> </param> <param> - <key>title</key> + <key>name</key> <value>Transmit Spectrum</value> </param> <param> - <key>samp_rate</key> - <value>samp_rate</value> + <key>fftsize</key> + <value>1024</value> </param> <param> - <key>baseband_freq</key> + <key>wintype</key> + <value>firdes.WIN_BLACKMAN_hARRIS</value> + </param> + <param> + <key>fc</key> <value>tun_freq</value> </param> <param> - <key>y_per_div</key> - <value>10</value> + <key>bw</key> + <value>samp_rate</value> + </param> + <param> + <key>autoscale</key> + <value>True</value> + </param> + <param> + <key>average</key> + <value>1.0</value> </param> <param> - <key>y_divs</key> + <key>ymin</key> + <value>-140</value> + </param> + <param> + <key>ymax</key> <value>10</value> </param> <param> - <key>ref_level</key> - <value>0</value> + <key>nconnections</key> + <value>1</value> </param> <param> - <key>ref_scale</key> - <value>2</value> + <key>update_time</key> + <value>0.10</value> </param> <param> - <key>fft_size</key> - <value>1024</value> + <key>gui_hint</key> + <value></value> </param> <param> - <key>fft_rate</key> - <value>20</value> + <key>label1</key> + <value></value> </param> <param> - <key>peak_hold</key> - <value>False</value> + <key>width1</key> + <value>1</value> </param> <param> - <key>average</key> - <value>False</value> + <key>color1</key> + <value>"blue"</value> </param> <param> - <key>avg_alpha</key> - <value>0</value> + <key>alpha1</key> + <value>1.0</value> + </param> + <param> + <key>label2</key> + <value></value> + </param> + <param> + <key>width2</key> + <value>1</value> + </param> + <param> + <key>color2</key> + <value>"red"</value> </param> <param> - <key>win</key> - <value>None</value> + <key>alpha2</key> + <value>1.0</value> </param> <param> - <key>win_size</key> + <key>label3</key> <value></value> </param> <param> - <key>grid_pos</key> + <key>width3</key> + <value>1</value> + </param> + <param> + <key>color3</key> + <value>"green"</value> + </param> + <param> + <key>alpha3</key> + <value>1.0</value> + </param> + <param> + <key>label4</key> + <value></value> + </param> + <param> + <key>width4</key> + <value>1</value> + </param> + <param> + <key>color4</key> + <value>"black"</value> + </param> + <param> + <key>alpha4</key> + <value>1.0</value> + </param> + <param> + <key>label5</key> + <value></value> + </param> + <param> + <key>width5</key> + <value>1</value> + </param> + <param> + <key>color5</key> + <value>"cyan"</value> + </param> + <param> + <key>alpha5</key> + <value>1.0</value> + </param> + <param> + <key>label6</key> <value></value> </param> <param> - <key>notebook</key> + <key>width6</key> + <value>1</value> + </param> + <param> + <key>color6</key> + <value>"magenta"</value> + </param> + <param> + <key>alpha6</key> + <value>1.0</value> + </param> + <param> + <key>label7</key> <value></value> </param> <param> - <key>freqvar</key> - <value>None</value> + <key>width7</key> + <value>1</value> + </param> + <param> + <key>color7</key> + <value>"yellow"</value> + </param> + <param> + <key>alpha7</key> + <value>1.0</value> + </param> + <param> + <key>label8</key> + <value></value> + </param> + <param> + <key>width8</key> + <value>1</value> + </param> + <param> + <key>color8</key> + <value>"dark red"</value> + </param> + <param> + <key>alpha8</key> + <value>1.0</value> + </param> + <param> + <key>label9</key> + <value></value> + </param> + <param> + <key>width9</key> + <value>1</value> + </param> + <param> + <key>color9</key> + <value>"dark green"</value> + </param> + <param> + <key>alpha9</key> + <value>1.0</value> + </param> + <param> + <key>label10</key> + <value></value> + </param> + <param> + <key>width10</key> + <value>1</value> + </param> + <param> + <key>color10</key> + <value>"dark blue"</value> + </param> + <param> + <key>alpha10</key> + <value>1.0</value> + </param> + <param> + <key>alias</key> + <value></value> + </param> + <param> + <key>affinity</key> + <value></value> </param> <param> <key>_coordinate</key> - <value>(827, 299)</value> + <value>(619, 285)</value> </param> <param> <key>_rotation</key> @@ -1263,19 +1515,19 @@ </connection> <connection> <source_block_id>blocks_multiply_const_vxx_0</source_block_id> - <sink_block_id>wxgui_fftsink2_0</sink_block_id> + <sink_block_id>uhd_usrp_sink_0</sink_block_id> <source_key>0</source_key> <sink_key>0</sink_key> </connection> <connection> - <source_block_id>blocks_multiply_const_vxx_0</source_block_id> - <sink_block_id>uhd_usrp_sink_0</sink_block_id> + <source_block_id>digital_dxpsk_mod_0</source_block_id> + <sink_block_id>blocks_multiply_const_vxx_0</sink_block_id> <source_key>0</source_key> <sink_key>0</sink_key> </connection> <connection> - <source_block_id>digital_dxpsk_mod_0</source_block_id> - <sink_block_id>blocks_multiply_const_vxx_0</sink_block_id> + <source_block_id>blocks_multiply_const_vxx_0</source_block_id> + <sink_block_id>qtgui_freq_sink_x_0</sink_block_id> <source_key>0</source_key> <sink_key>0</sink_key> </connection> diff --git a/gr-uhd/examples/grc/uhd_wbfm_receive.grc b/gr-uhd/examples/grc/uhd_wbfm_receive.grc index e19015a790..153dbd94f3 100644 --- a/gr-uhd/examples/grc/uhd_wbfm_receive.grc +++ b/gr-uhd/examples/grc/uhd_wbfm_receive.grc @@ -1,6 +1,6 @@ <?xml version='1.0' encoding='ASCII'?> <flow_graph> - <timestamp>Mon Mar 18 11:13:02 2013</timestamp> + <timestamp>Sat Jul 12 14:40:24 2014</timestamp> <block> <key>options</key> <param> @@ -29,7 +29,7 @@ </param> <param> <key>generate_options</key> - <value>wx_gui</value> + <value>qt_gui</value> </param> <param> <key>category</key> @@ -52,8 +52,39 @@ <value></value> </param> <param> + <key>alias</key> + <value></value> + </param> + <param> + <key>_coordinate</key> + <value>(-2, 0)</value> + </param> + <param> + <key>_rotation</key> + <value>0</value> + </param> + </block> + <block> + <key>variable</key> + <param> + <key>id</key> + <value>audio_decim</value> + </param> + <param> + <key>_enabled</key> + <value>True</value> + </param> + <param> + <key>value</key> + <value>10</value> + </param> + <param> + <key>alias</key> + <value></value> + </param> + <param> <key>_coordinate</key> - <value>(10, 10)</value> + <value>(607, 192)</value> </param> <param> <key>_rotation</key> @@ -64,7 +95,7 @@ <key>parameter</key> <param> <key>id</key> - <value>gain</value> + <value>address</value> </param> <param> <key>_enabled</key> @@ -72,23 +103,66 @@ </param> <param> <key>label</key> - <value>Default Gain</value> + <value>IP Address</value> </param> <param> <key>value</key> + <value>addr=192.168.10.2</value> + </param> + <param> + <key>type</key> + <value>string</value> + </param> + <param> + <key>short_id</key> + <value>a</value> + </param> + <param> + <key>alias</key> + <value></value> + </param> + <param> + <key>_coordinate</key> + <value>(162, 0)</value> + </param> + <param> + <key>_rotation</key> <value>0</value> </param> + </block> + <block> + <key>parameter</key> + <param> + <key>id</key> + <value>samp_rate</value> + </param> + <param> + <key>_enabled</key> + <value>True</value> + </param> + <param> + <key>label</key> + <value>Sample Rate</value> + </param> + <param> + <key>value</key> + <value>400e3</value> + </param> <param> <key>type</key> <value>eng_float</value> </param> <param> <key>short_id</key> - <value>g</value> + <value>s</value> + </param> + <param> + <key>alias</key> + <value></value> </param> <param> <key>_coordinate</key> - <value>(631, 15)</value> + <value>(315, 0)</value> </param> <param> <key>_rotation</key> @@ -99,7 +173,7 @@ <key>parameter</key> <param> <key>id</key> - <value>freq</value> + <value>gain</value> </param> <param> <key>_enabled</key> @@ -107,11 +181,11 @@ </param> <param> <key>label</key> - <value>Default Frequency</value> + <value>Default Gain</value> </param> <param> <key>value</key> - <value>93.3e6</value> + <value>0</value> </param> <param> <key>type</key> @@ -119,11 +193,15 @@ </param> <param> <key>short_id</key> - <value>f</value> + <value>g</value> + </param> + <param> + <key>alias</key> + <value></value> </param> <param> <key>_coordinate</key> - <value>(479, 15)</value> + <value>(594, 0)</value> </param> <param> <key>_rotation</key> @@ -131,10 +209,10 @@ </param> </block> <block> - <key>variable_slider</key> + <key>parameter</key> <param> <key>id</key> - <value>tun_freq</value> + <value>audio_output</value> </param> <param> <key>_enabled</key> @@ -142,43 +220,70 @@ </param> <param> <key>label</key> - <value>Freq (Hz)</value> + <value>Audio Output Device</value> </param> <param> <key>value</key> - <value>freq</value> + <value></value> </param> <param> - <key>min</key> - <value>87.9e6</value> + <key>type</key> + <value>string</value> </param> <param> - <key>max</key> - <value>108.1e6</value> + <key>short_id</key> + <value>O</value> </param> <param> - <key>num_steps</key> - <value>100</value> + <key>alias</key> + <value></value> </param> <param> - <key>style</key> - <value>wx.SL_HORIZONTAL</value> + <key>_coordinate</key> + <value>(732, 0)</value> + </param> + <param> + <key>_rotation</key> + <value>0</value> + </param> + </block> + <block> + <key>analog_wfm_rcv</key> + <param> + <key>id</key> + <value>analog_wfm_rcv</value> </param> <param> - <key>converver</key> - <value>float_converter</value> + <key>_enabled</key> + <value>True</value> </param> <param> - <key>grid_pos</key> + <key>quad_rate</key> + <value>samp_rate</value> + </param> + <param> + <key>audio_decimation</key> + <value>audio_decim</value> + </param> + <param> + <key>alias</key> <value></value> </param> <param> - <key>notebook</key> + <key>affinity</key> <value></value> </param> <param> + <key>minoutbuf</key> + <value>0</value> + </param> + <param> + <key>maxoutbuf</key> + <value>0</value> + </param> + <param> <key>_coordinate</key> - <value>(15, 441)</value> + <value>(597, 127)</value> </param> <param> <key>_rotation</key> @@ -186,54 +291,89 @@ </param> </block> <block> - <key>variable_slider</key> + <key>audio_sink</key> <param> <key>id</key> - <value>fine</value> + <value>audio_sink</value> </param> <param> <key>_enabled</key> <value>True</value> </param> <param> - <key>label</key> - <value>Fine Freq (MHz)</value> + <key>samp_rate</key> + <value>int(samp_rate/audio_decim)</value> </param> <param> - <key>value</key> + <key>device_name</key> + <value>audio_output</value> + </param> + <param> + <key>ok_to_block</key> + <value>True</value> + </param> + <param> + <key>num_inputs</key> + <value>1</value> + </param> + <param> + <key>alias</key> + <value></value> + </param> + <param> + <key>affinity</key> + <value></value> + </param> + <param> + <key>_coordinate</key> + <value>(995, 135)</value> + </param> + <param> + <key>_rotation</key> <value>0</value> </param> + </block> + <block> + <key>blocks_multiply_const_vxx</key> <param> - <key>min</key> - <value>-.1</value> + <key>id</key> + <value>blocks_multiply_const_vxx</value> </param> <param> - <key>max</key> - <value>.1</value> + <key>_enabled</key> + <value>True</value> </param> <param> - <key>num_steps</key> - <value>100</value> + <key>type</key> + <value>float</value> </param> <param> - <key>style</key> - <value>wx.SL_HORIZONTAL</value> + <key>const</key> + <value>volume</value> </param> <param> - <key>converver</key> - <value>float_converter</value> + <key>vlen</key> + <value>1</value> </param> <param> - <key>grid_pos</key> - <value>0, 2, 1, 2</value> + <key>alias</key> + <value></value> </param> <param> - <key>notebook</key> + <key>affinity</key> <value></value> </param> <param> + <key>minoutbuf</key> + <value>0</value> + </param> + <param> + <key>maxoutbuf</key> + <value>0</value> + </param> + <param> <key>_coordinate</key> - <value>(277, 444)</value> + <value>(808, 135)</value> </param> <param> <key>_rotation</key> @@ -241,54 +381,70 @@ </param> </block> <block> - <key>variable_slider</key> + <key>low_pass_filter</key> <param> <key>id</key> - <value>tun_gain</value> + <value>low_pass_filter_0</value> </param> <param> <key>_enabled</key> <value>True</value> </param> <param> - <key>label</key> - <value>UHD Gain</value> + <key>type</key> + <value>fir_filter_ccf</value> </param> <param> - <key>value</key> - <value>gain</value> + <key>decim</key> + <value>1</value> </param> <param> - <key>min</key> - <value>0</value> + <key>interp</key> + <value>1</value> </param> <param> - <key>max</key> - <value>20</value> + <key>gain</key> + <value>1</value> + </param> + <param> + <key>samp_rate</key> + <value>samp_rate</value> + </param> + <param> + <key>cutoff_freq</key> + <value>115e3</value> </param> <param> - <key>num_steps</key> - <value>100</value> + <key>width</key> + <value>30e3</value> </param> <param> - <key>style</key> - <value>wx.SL_HORIZONTAL</value> + <key>win</key> + <value>firdes.WIN_HANN</value> </param> <param> - <key>converver</key> - <value>float_converter</value> + <key>beta</key> + <value>6.76</value> </param> <param> - <key>grid_pos</key> + <key>alias</key> <value></value> </param> <param> - <key>notebook</key> + <key>affinity</key> <value></value> </param> <param> + <key>minoutbuf</key> + <value>0</value> + </param> + <param> + <key>maxoutbuf</key> + <value>0</value> + </param> + <param> <key>_coordinate</key> - <value>(158, 440)</value> + <value>(261, 116)</value> </param> <param> <key>_rotation</key> @@ -296,7 +452,7 @@ </param> </block> <block> - <key>variable_slider</key> + <key>variable_qtgui_range</key> <param> <key>id</key> <value>volume</value> @@ -314,36 +470,40 @@ <value>1</value> </param> <param> - <key>min</key> + <key>start</key> <value>0</value> </param> <param> - <key>max</key> + <key>stop</key> <value>10</value> </param> <param> - <key>num_steps</key> - <value>100</value> + <key>step</key> + <value>0.1</value> + </param> + <param> + <key>widget</key> + <value>counter_slider</value> </param> <param> - <key>style</key> - <value>wx.SL_HORIZONTAL</value> + <key>orient</key> + <value>Qt.Horizontal</value> </param> <param> - <key>converver</key> - <value>float_converter</value> + <key>min_len</key> + <value>200</value> </param> <param> - <key>grid_pos</key> + <key>gui_hint</key> <value>1, 0, 1, 4</value> </param> <param> - <key>notebook</key> + <key>alias</key> <value></value> </param> <param> <key>_coordinate</key> - <value>(436, 446)</value> + <value>(802, 188)</value> </param> <param> <key>_rotation</key> @@ -351,30 +511,117 @@ </param> </block> <block> - <key>blocks_multiply_const_vxx</key> + <key>variable_qtgui_range</key> <param> <key>id</key> - <value>blocks_multiply_const_vxx</value> + <value>fine</value> </param> <param> <key>_enabled</key> <value>True</value> </param> <param> - <key>type</key> - <value>float</value> + <key>label</key> + <value>Fine Freq (MHz)</value> </param> <param> - <key>const</key> - <value>volume</value> + <key>value</key> + <value>0</value> </param> <param> - <key>vlen</key> + <key>start</key> + <value>-.1</value> + </param> + <param> + <key>stop</key> + <value>.1</value> + </param> + <param> + <key>step</key> + <value>.01</value> + </param> + <param> + <key>widget</key> + <value>counter_slider</value> + </param> + <param> + <key>orient</key> + <value>Qt.Horizontal</value> + </param> + <param> + <key>min_len</key> + <value>200</value> + </param> + <param> + <key>gui_hint</key> + <value>0,2,1,2</value> + </param> + <param> + <key>alias</key> + <value></value> + </param> + <param> + <key>_coordinate</key> + <value>(253, 277)</value> + </param> + <param> + <key>_rotation</key> + <value>0</value> + </param> + </block> + <block> + <key>variable_qtgui_range</key> + <param> + <key>id</key> + <value>tun_gain</value> + </param> + <param> + <key>_enabled</key> + <value>True</value> + </param> + <param> + <key>label</key> + <value>UHD Gain</value> + </param> + <param> + <key>value</key> + <value>10</value> + </param> + <param> + <key>start</key> + <value>0</value> + </param> + <param> + <key>stop</key> + <value>20</value> + </param> + <param> + <key>step</key> <value>1</value> </param> <param> + <key>widget</key> + <value>counter_slider</value> + </param> + <param> + <key>orient</key> + <value>Qt.Horizontal</value> + </param> + <param> + <key>min_len</key> + <value>200</value> + </param> + <param> + <key>gui_hint</key> + <value></value> + </param> + <param> + <key>alias</key> + <value></value> + </param> + <param> <key>_coordinate</key> - <value>(836, 161)</value> + <value>(141, 275)</value> </param> <param> <key>_rotation</key> @@ -404,10 +651,18 @@ <value></value> </param> <param> + <key>stream_chans</key> + <value>[]</value> + </param> + <param> <key>dev_addr</key> <value>address</value> </param> <param> + <key>dev_args</key> + <value>""</value> + </param> + <param> <key>sync</key> <value></value> </param> @@ -525,7 +780,7 @@ </param> <param> <key>center_freq0</key> - <value>tun_freq+fine</value> + <value>(tun_freq+fine)*1e6</value> </param> <param> <key>gain0</key> @@ -1036,43 +1291,24 @@ <value>0</value> </param> <param> - <key>_coordinate</key> - <value>(14, 165)</value> - </param> - <param> - <key>_rotation</key> - <value>0</value> - </param> - </block> - <block> - <key>parameter</key> - <param> - <key>id</key> - <value>samp_rate</value> - </param> - <param> - <key>_enabled</key> - <value>True</value> - </param> - <param> - <key>label</key> - <value>Sample Rate</value> + <key>alias</key> + <value></value> </param> <param> - <key>value</key> - <value>400e3</value> + <key>affinity</key> + <value></value> </param> <param> - <key>type</key> - <value>eng_float</value> + <key>minoutbuf</key> + <value>0</value> </param> <param> - <key>short_id</key> - <value>s</value> + <key>maxoutbuf</key> + <value>0</value> </param> <param> <key>_coordinate</key> - <value>(352, 15)</value> + <value>(0, 139)</value> </param> <param> <key>_rotation</key> @@ -1080,238 +1316,238 @@ </param> </block> <block> - <key>parameter</key> + <key>qtgui_freq_sink_x</key> <param> <key>id</key> - <value>audio_output</value> + <value>qtgui_freq_sink_x_0</value> </param> <param> <key>_enabled</key> <value>True</value> </param> <param> - <key>label</key> - <value>Audio Output Device</value> + <key>type</key> + <value>complex</value> </param> <param> - <key>value</key> - <value></value> + <key>name</key> + <value>FFT Plot</value> </param> <param> - <key>type</key> - <value>string</value> + <key>fftsize</key> + <value>512</value> </param> <param> - <key>short_id</key> - <value>O</value> + <key>wintype</key> + <value>firdes.WIN_BLACKMAN_hARRIS</value> </param> <param> - <key>_coordinate</key> - <value>(769, 13)</value> + <key>fc</key> + <value>(tun_freq+fine)*1e6</value> </param> <param> - <key>_rotation</key> - <value>0</value> + <key>bw</key> + <value>samp_rate</value> </param> - </block> - <block> - <key>audio_sink</key> <param> - <key>id</key> - <value>audio_sink</value> + <key>autoscale</key> + <value>False</value> </param> <param> - <key>_enabled</key> - <value>True</value> + <key>average</key> + <value>1.0</value> </param> <param> - <key>samp_rate</key> - <value>int(samp_rate/audio_decim)</value> + <key>ymin</key> + <value>-140</value> </param> <param> - <key>device_name</key> - <value>audio_output</value> + <key>ymax</key> + <value>10</value> </param> <param> - <key>ok_to_block</key> - <value>True</value> + <key>nconnections</key> + <value>1</value> </param> <param> - <key>num_inputs</key> - <value>1</value> + <key>update_time</key> + <value>0.10</value> </param> <param> - <key>_coordinate</key> - <value>(1023, 161)</value> + <key>gui_hint</key> + <value>2,0,2,4</value> </param> <param> - <key>_rotation</key> - <value>0</value> + <key>label1</key> + <value></value> </param> - </block> - <block> - <key>low_pass_filter</key> <param> - <key>id</key> - <value>low_pass_filter_0</value> + <key>width1</key> + <value>1</value> </param> <param> - <key>_enabled</key> - <value>True</value> + <key>color1</key> + <value>"blue"</value> </param> <param> - <key>type</key> - <value>fir_filter_ccf</value> + <key>alpha1</key> + <value>1.0</value> </param> <param> - <key>decim</key> - <value>1</value> + <key>label2</key> + <value></value> </param> <param> - <key>interp</key> + <key>width2</key> <value>1</value> </param> <param> - <key>gain</key> - <value>1</value> + <key>color2</key> + <value>"red"</value> </param> <param> - <key>samp_rate</key> - <value>samp_rate</value> + <key>alpha2</key> + <value>1.0</value> </param> <param> - <key>cutoff_freq</key> - <value>115e3</value> + <key>label3</key> + <value></value> </param> <param> - <key>width</key> - <value>30e3</value> + <key>width3</key> + <value>1</value> </param> <param> - <key>win</key> - <value>firdes.WIN_HANN</value> + <key>color3</key> + <value>"green"</value> </param> <param> - <key>beta</key> - <value>6.76</value> + <key>alpha3</key> + <value>1.0</value> </param> <param> - <key>_coordinate</key> - <value>(326, 141)</value> + <key>label4</key> + <value></value> </param> <param> - <key>_rotation</key> - <value>0</value> + <key>width4</key> + <value>1</value> </param> - </block> - <block> - <key>variable</key> <param> - <key>id</key> - <value>audio_decim</value> + <key>color4</key> + <value>"black"</value> </param> <param> - <key>_enabled</key> - <value>True</value> + <key>alpha4</key> + <value>1.0</value> </param> <param> - <key>value</key> - <value>10</value> + <key>label5</key> + <value></value> </param> <param> - <key>_coordinate</key> - <value>(19, 351)</value> + <key>width5</key> + <value>1</value> </param> <param> - <key>_rotation</key> - <value>0</value> + <key>color5</key> + <value>"cyan"</value> </param> - </block> - <block> - <key>wxgui_fftsink2</key> <param> - <key>id</key> - <value>wxgui_fftsink2</value> + <key>alpha5</key> + <value>1.0</value> </param> <param> - <key>_enabled</key> - <value>True</value> + <key>label6</key> + <value></value> </param> <param> - <key>type</key> - <value>complex</value> + <key>width6</key> + <value>1</value> </param> <param> - <key>title</key> - <value>FFT Plot</value> + <key>color6</key> + <value>"magenta"</value> </param> <param> - <key>samp_rate</key> - <value>samp_rate</value> + <key>alpha6</key> + <value>1.0</value> </param> <param> - <key>baseband_freq</key> - <value>(freq+fine)</value> + <key>label7</key> + <value></value> </param> <param> - <key>y_per_div</key> - <value>10</value> + <key>width7</key> + <value>1</value> </param> <param> - <key>y_divs</key> - <value>10</value> + <key>color7</key> + <value>"yellow"</value> </param> <param> - <key>ref_level</key> - <value>0</value> + <key>alpha7</key> + <value>1.0</value> </param> <param> - <key>ref_scale</key> - <value>2.0</value> + <key>label8</key> + <value></value> </param> <param> - <key>fft_size</key> - <value>512</value> + <key>width8</key> + <value>1</value> </param> <param> - <key>fft_rate</key> - <value>15</value> + <key>color8</key> + <value>"dark red"</value> </param> <param> - <key>peak_hold</key> - <value>False</value> + <key>alpha8</key> + <value>1.0</value> </param> <param> - <key>average</key> - <value>False</value> + <key>label9</key> + <value></value> </param> <param> - <key>avg_alpha</key> - <value>0</value> + <key>width9</key> + <value>1</value> </param> <param> - <key>win</key> - <value>None</value> + <key>color9</key> + <value>"dark green"</value> + </param> + <param> + <key>alpha9</key> + <value>1.0</value> </param> <param> - <key>win_size</key> + <key>label10</key> <value></value> </param> <param> - <key>grid_pos</key> - <value>2, 0, 2, 4</value> + <key>width10</key> + <value>1</value> + </param> + <param> + <key>color10</key> + <value>"dark blue"</value> </param> <param> - <key>notebook</key> + <key>alpha10</key> + <value>1.0</value> + </param> + <param> + <key>alias</key> <value></value> </param> <param> - <key>freqvar</key> - <value>None</value> + <key>affinity</key> + <value></value> </param> <param> <key>_coordinate</key> - <value>(624, 278)</value> + <value>(598, 272)</value> </param> <param> <key>_rotation</key> @@ -1319,26 +1555,38 @@ </param> </block> <block> - <key>analog_wfm_rcv</key> + <key>parameter</key> <param> <key>id</key> - <value>analog_wfm_rcv</value> + <value>freq</value> </param> <param> <key>_enabled</key> <value>True</value> </param> <param> - <key>quad_rate</key> - <value>samp_rate</value> + <key>label</key> + <value>Default Frequency</value> </param> <param> - <key>audio_decimation</key> - <value>audio_decim</value> + <key>value</key> + <value>93.3e6</value> + </param> + <param> + <key>type</key> + <value>eng_float</value> + </param> + <param> + <key>short_id</key> + <value>f</value> + </param> + <param> + <key>alias</key> + <value></value> </param> <param> <key>_coordinate</key> - <value>(625, 153)</value> + <value>(442, 0)</value> </param> <param> <key>_rotation</key> @@ -1346,10 +1594,10 @@ </param> </block> <block> - <key>parameter</key> + <key>variable_qtgui_range</key> <param> <key>id</key> - <value>address</value> + <value>tun_freq</value> </param> <param> <key>_enabled</key> @@ -1357,23 +1605,47 @@ </param> <param> <key>label</key> - <value>IP Address</value> + <value>UHD Freq (MHz)</value> </param> <param> <key>value</key> - <value>addr=192.168.10.2</value> + <value>freq/1e6</value> </param> <param> - <key>type</key> - <value>string</value> + <key>start</key> + <value>87.9</value> </param> <param> - <key>short_id</key> - <value>a</value> + <key>stop</key> + <value>108.1</value> + </param> + <param> + <key>step</key> + <value>1</value> + </param> + <param> + <key>widget</key> + <value>counter_slider</value> + </param> + <param> + <key>orient</key> + <value>Qt.Horizontal</value> + </param> + <param> + <key>min_len</key> + <value>200</value> + </param> + <param> + <key>gui_hint</key> + <value>0,0,1,2</value> + </param> + <param> + <key>alias</key> + <value></value> </param> <param> <key>_coordinate</key> - <value>(199, 14)</value> + <value>(6, 276)</value> </param> <param> <key>_rotation</key> @@ -1381,14 +1653,14 @@ </param> </block> <connection> - <source_block_id>blocks_multiply_const_vxx</source_block_id> - <sink_block_id>audio_sink</sink_block_id> + <source_block_id>low_pass_filter_0</source_block_id> + <sink_block_id>qtgui_freq_sink_x_0</sink_block_id> <source_key>0</source_key> <sink_key>0</sink_key> </connection> <connection> - <source_block_id>analog_wfm_rcv</source_block_id> - <sink_block_id>blocks_multiply_const_vxx</sink_block_id> + <source_block_id>uhd_usrp_source_0</source_block_id> + <sink_block_id>low_pass_filter_0</sink_block_id> <source_key>0</source_key> <sink_key>0</sink_key> </connection> @@ -1399,14 +1671,14 @@ <sink_key>0</sink_key> </connection> <connection> - <source_block_id>uhd_usrp_source_0</source_block_id> - <sink_block_id>low_pass_filter_0</sink_block_id> + <source_block_id>analog_wfm_rcv</source_block_id> + <sink_block_id>blocks_multiply_const_vxx</sink_block_id> <source_key>0</source_key> <sink_key>0</sink_key> </connection> <connection> - <source_block_id>low_pass_filter_0</source_block_id> - <sink_block_id>wxgui_fftsink2</sink_block_id> + <source_block_id>blocks_multiply_const_vxx</source_block_id> + <sink_block_id>audio_sink</sink_block_id> <source_key>0</source_key> <sink_key>0</sink_key> </connection> diff --git a/gr-uhd/include/gnuradio/uhd/usrp_sink.h b/gr-uhd/include/gnuradio/uhd/usrp_sink.h index 2afe634865..ce8b18ba44 100644 --- a/gr-uhd/include/gnuradio/uhd/usrp_sink.h +++ b/gr-uhd/include/gnuradio/uhd/usrp_sink.h @@ -1,6 +1,6 @@ /* -*- c++ -*- */ /* - * Copyright 2010-2013 Free Software Foundation, Inc. + * Copyright 2010-2014 Free Software Foundation, Inc. * * This file is part of GNU Radio * @@ -522,6 +522,8 @@ namespace gr { /*! * Get access to the underlying uhd device object. + * + * NOTE: This function is only available in C++. * \return the multi usrp device object */ virtual ::uhd::usrp::multi_usrp::sptr get_device(void) = 0; diff --git a/gr-uhd/include/gnuradio/uhd/usrp_source.h b/gr-uhd/include/gnuradio/uhd/usrp_source.h index 699d028969..75e8f8b844 100644 --- a/gr-uhd/include/gnuradio/uhd/usrp_source.h +++ b/gr-uhd/include/gnuradio/uhd/usrp_source.h @@ -1,6 +1,6 @@ /* -*- c++ -*- */ /* - * Copyright 2010-2013 Free Software Foundation, Inc. + * Copyright 2010-2014 Free Software Foundation, Inc. * * This file is part of GNU Radio * @@ -517,6 +517,8 @@ namespace gr { /*! * Get access to the underlying uhd device object. + * + * NOTE: This function is only available in C++. * \return the multi usrp device object */ virtual ::uhd::usrp::multi_usrp::sptr get_device(void) = 0; diff --git a/gr-uhd/lib/CMakeLists.txt b/gr-uhd/lib/CMakeLists.txt index 9121dd41b8..f926b81332 100644 --- a/gr-uhd/lib/CMakeLists.txt +++ b/gr-uhd/lib/CMakeLists.txt @@ -76,3 +76,16 @@ list(APPEND uhd_libs add_library(gnuradio-uhd SHARED ${gr_uhd_sources}) target_link_libraries(gnuradio-uhd ${uhd_libs}) GR_LIBRARY_FOO(gnuradio-uhd RUNTIME_COMPONENT "uhd_runtime" DEVEL_COMPONENT "uhd_devel") + +if(ENABLE_STATIC_LIBS) + add_library(gnuradio-uhd_static STATIC ${uhd_sources}) + + if(NOT WIN32) + set_target_properties(gnuradio-uhd_static + PROPERTIES OUTPUT_NAME gnuradio-uhd) + endif(NOT WIN32) + + install(TARGETS gnuradio-uhd_static + ARCHIVE DESTINATION lib${LIB_SUFFIX} COMPONENT "uhd_devel" # .lib file + ) +endif(ENABLE_STATIC_LIBS)
\ No newline at end of file diff --git a/gr-uhd/swig/uhd_swig.i b/gr-uhd/swig/uhd_swig.i index 4eaef9112d..a4b1528439 100644 --- a/gr-uhd/swig/uhd_swig.i +++ b/gr-uhd/swig/uhd_swig.i @@ -1,6 +1,6 @@ /* -*- c++ -*- */ /* - * Copyright 2010-2013 Free Software Foundation, Inc. + * Copyright 2010-2014 Free Software Foundation, Inc. * * This file is part of GNU Radio * @@ -40,6 +40,12 @@ %include "uhd_swig_doc.i" //////////////////////////////////////////////////////////////////////// +// SWIG should not see the uhd::usrp::multi_usrp class +//////////////////////////////////////////////////////////////////////// +%ignore gr::uhd::usrp_sink::get_device; +%ignore gr::uhd::usrp_source::get_device; + +//////////////////////////////////////////////////////////////////////// // block headers //////////////////////////////////////////////////////////////////////// %{ diff --git a/gr-vocoder/lib/codec2/fdmdv.c b/gr-vocoder/lib/codec2/fdmdv.c index 6af1cf4c6d..8855f76ae5 100644 --- a/gr-vocoder/lib/codec2/fdmdv.c +++ b/gr-vocoder/lib/codec2/fdmdv.c @@ -25,6 +25,10 @@ along with this program; if not, see <http://www.gnu.org/licenses/>. */ +#ifdef _MSC_VER +#define round(number) number < 0.0 ? ceil(number - 0.5) : floor(number + 0.5) +#endif + /*---------------------------------------------------------------------------*\ INCLUDES diff --git a/gr-zeromq/examples/zeromq_pubsub.grc b/gr-zeromq/examples/zeromq_pubsub.grc index 2b50b9f617..1c047eb55d 100644 --- a/gr-zeromq/examples/zeromq_pubsub.grc +++ b/gr-zeromq/examples/zeromq_pubsub.grc @@ -1,55 +1,63 @@ <?xml version='1.0' encoding='ASCII'?> <flow_graph> - <timestamp>Tue May 13 13:09:21 2014</timestamp> + <timestamp>Mon Jul 14 14:44:33 2014</timestamp> <block> - <key>analog_sig_source_x</key> + <key>options</key> <param> <key>id</key> - <value>analog_sig_source_x_0</value> + <value>zeromq_pubsub</value> </param> <param> <key>_enabled</key> <value>True</value> </param> <param> - <key>type</key> - <value>complex</value> + <key>title</key> + <value></value> </param> <param> - <key>samp_rate</key> - <value>samp_rate</value> + <key>author</key> + <value></value> </param> <param> - <key>waveform</key> - <value>analog.GR_TRI_WAVE</value> + <key>description</key> + <value></value> </param> <param> - <key>freq</key> - <value>2000</value> + <key>window_size</key> + <value>1280, 1024</value> </param> <param> - <key>amp</key> - <value>1</value> + <key>generate_options</key> + <value>qt_gui</value> </param> <param> - <key>offset</key> - <value>0</value> + <key>category</key> + <value>Custom</value> </param> <param> - <key>affinity</key> - <value></value> + <key>run_options</key> + <value>prompt</value> </param> <param> - <key>minoutbuf</key> - <value>0</value> + <key>run</key> + <value>True</value> </param> <param> - <key>maxoutbuf</key> + <key>max_nouts</key> <value>0</value> </param> <param> + <key>realtime_scheduling</key> + <value></value> + </param> + <param> + <key>alias</key> + <value></value> + </param> + <param> <key>_coordinate</key> - <value>(170, 78)</value> + <value>(10, 10)</value> </param> <param> <key>_rotation</key> @@ -71,6 +79,10 @@ <value>32000</value> </param> <param> + <key>alias</key> + <value></value> + </param> + <param> <key>_coordinate</key> <value>(10, 170)</value> </param> @@ -80,6 +92,65 @@ </param> </block> <block> + <key>analog_sig_source_x</key> + <param> + <key>id</key> + <value>analog_sig_source_x_0</value> + </param> + <param> + <key>_enabled</key> + <value>True</value> + </param> + <param> + <key>type</key> + <value>complex</value> + </param> + <param> + <key>samp_rate</key> + <value>samp_rate</value> + </param> + <param> + <key>waveform</key> + <value>analog.GR_TRI_WAVE</value> + </param> + <param> + <key>freq</key> + <value>2000</value> + </param> + <param> + <key>amp</key> + <value>1</value> + </param> + <param> + <key>offset</key> + <value>0</value> + </param> + <param> + <key>alias</key> + <value></value> + </param> + <param> + <key>affinity</key> + <value></value> + </param> + <param> + <key>minoutbuf</key> + <value>0</value> + </param> + <param> + <key>maxoutbuf</key> + <value>0</value> + </param> + <param> + <key>_coordinate</key> + <value>(170, 78)</value> + </param> + <param> + <key>_rotation</key> + <value>0</value> + </param> + </block> + <block> <key>blocks_add_xx</key> <param> <key>id</key> @@ -102,6 +173,10 @@ <value>1</value> </param> <param> + <key>alias</key> + <value></value> + </param> + <param> <key>affinity</key> <value></value> </param> @@ -149,6 +224,10 @@ <value>True</value> </param> <param> + <key>alias</key> + <value></value> + </param> + <param> <key>affinity</key> <value></value> </param> @@ -196,6 +275,10 @@ <value>100</value> </param> <param> + <key>alias</key> + <value></value> + </param> + <param> <key>affinity</key> <value></value> </param> @@ -239,6 +322,10 @@ <value>8192</value> </param> <param> + <key>alias</key> + <value></value> + </param> + <param> <key>affinity</key> <value></value> </param> @@ -286,6 +373,10 @@ <value>100</value> </param> <param> + <key>alias</key> + <value></value> + </param> + <param> <key>affinity</key> <value></value> </param> @@ -307,10 +398,10 @@ </param> </block> <block> - <key>wxgui_scopesink2</key> + <key>qtgui_time_sink_x</key> <param> <key>id</key> - <value>wxgui_scopesink2_0</value> + <value>qtgui_time_sink_x_0</value> </param> <param> <key>_enabled</key> @@ -321,123 +412,332 @@ <value>complex</value> </param> <param> - <key>title</key> - <value>Scope Plot</value> + <key>name</key> + <value>""</value> </param> <param> - <key>samp_rate</key> + <key>ylabel</key> + <value>Amplitude</value> + </param> + <param> + <key>yunit</key> + <value>""</value> + </param> + <param> + <key>size</key> + <value>100</value> + </param> + <param> + <key>srate</key> <value>samp_rate</value> </param> <param> - <key>v_scale</key> - <value>0</value> + <key>grid</key> + <value>False</value> + </param> + <param> + <key>autoscale</key> + <value>False</value> + </param> + <param> + <key>ymin</key> + <value>-1</value> + </param> + <param> + <key>ymax</key> + <value>2</value> + </param> + <param> + <key>nconnections</key> + <value>1</value> + </param> + <param> + <key>update_time</key> + <value>0.10</value> </param> <param> - <key>v_offset</key> + <key>entags</key> + <value>True</value> + </param> + <param> + <key>gui_hint</key> + <value></value> + </param> + <param> + <key>tr_mode</key> + <value>qtgui.TRIG_MODE_AUTO</value> + </param> + <param> + <key>tr_slope</key> + <value>qtgui.TRIG_SLOPE_POS</value> + </param> + <param> + <key>tr_level</key> + <value>0.0</value> + </param> + <param> + <key>tr_delay</key> <value>0</value> </param> <param> - <key>t_scale</key> + <key>tr_chan</key> <value>0</value> </param> <param> - <key>ac_couple</key> - <value>False</value> + <key>tr_tag</key> + <value>""</value> </param> <param> - <key>xy_mode</key> - <value>False</value> + <key>label1</key> + <value></value> </param> <param> - <key>num_inputs</key> + <key>width1</key> <value>1</value> </param> <param> - <key>win_size</key> + <key>color1</key> + <value>"blue"</value> + </param> + <param> + <key>style1</key> + <value>1</value> + </param> + <param> + <key>marker1</key> + <value>-1</value> + </param> + <param> + <key>alpha1</key> + <value>1.0</value> + </param> + <param> + <key>label2</key> <value></value> </param> <param> - <key>grid_pos</key> + <key>width2</key> + <value>1</value> + </param> + <param> + <key>color2</key> + <value>"red"</value> + </param> + <param> + <key>style2</key> + <value>1</value> + </param> + <param> + <key>marker2</key> + <value>-1</value> + </param> + <param> + <key>alpha2</key> + <value>1.0</value> + </param> + <param> + <key>label3</key> <value></value> </param> <param> - <key>notebook</key> + <key>width3</key> + <value>1</value> + </param> + <param> + <key>color3</key> + <value>"green"</value> + </param> + <param> + <key>style3</key> + <value>1</value> + </param> + <param> + <key>marker3</key> + <value>-1</value> + </param> + <param> + <key>alpha3</key> + <value>1.0</value> + </param> + <param> + <key>label4</key> <value></value> </param> <param> - <key>trig_mode</key> - <value>wxgui.TRIG_MODE_AUTO</value> + <key>width4</key> + <value>1</value> </param> <param> - <key>y_axis_label</key> - <value>Counts</value> + <key>color4</key> + <value>"black"</value> </param> <param> - <key>affinity</key> + <key>style4</key> + <value>1</value> + </param> + <param> + <key>marker4</key> + <value>-1</value> + </param> + <param> + <key>alpha4</key> + <value>1.0</value> + </param> + <param> + <key>label5</key> <value></value> </param> <param> - <key>_coordinate</key> - <value>(444, 319)</value> + <key>width5</key> + <value>1</value> </param> <param> - <key>_rotation</key> - <value>0</value> + <key>color5</key> + <value>"cyan"</value> </param> - </block> - <block> - <key>options</key> <param> - <key>id</key> - <value>zeromq_pubsub</value> + <key>style5</key> + <value>1</value> </param> <param> - <key>_enabled</key> - <value>True</value> + <key>marker5</key> + <value>-1</value> </param> <param> - <key>title</key> + <key>alpha5</key> + <value>1.0</value> + </param> + <param> + <key>label6</key> <value></value> </param> <param> - <key>author</key> + <key>width6</key> + <value>1</value> + </param> + <param> + <key>color6</key> + <value>"magenta"</value> + </param> + <param> + <key>style6</key> + <value>1</value> + </param> + <param> + <key>marker6</key> + <value>-1</value> + </param> + <param> + <key>alpha6</key> + <value>1.0</value> + </param> + <param> + <key>label7</key> <value></value> </param> <param> - <key>description</key> + <key>width7</key> + <value>1</value> + </param> + <param> + <key>color7</key> + <value>"yellow"</value> + </param> + <param> + <key>style7</key> + <value>1</value> + </param> + <param> + <key>marker7</key> + <value>-1</value> + </param> + <param> + <key>alpha7</key> + <value>1.0</value> + </param> + <param> + <key>label8</key> <value></value> </param> <param> - <key>window_size</key> - <value>1280, 1024</value> + <key>width8</key> + <value>1</value> </param> <param> - <key>generate_options</key> - <value>wx_gui</value> + <key>color8</key> + <value>"dark red"</value> </param> <param> - <key>category</key> - <value>Custom</value> + <key>style8</key> + <value>1</value> </param> <param> - <key>run_options</key> - <value>prompt</value> + <key>marker8</key> + <value>-1</value> </param> <param> - <key>run</key> - <value>True</value> + <key>alpha8</key> + <value>1.0</value> </param> <param> - <key>max_nouts</key> - <value>0</value> + <key>label9</key> + <value></value> </param> <param> - <key>realtime_scheduling</key> + <key>width9</key> + <value>1</value> + </param> + <param> + <key>color9</key> + <value>"dark green"</value> + </param> + <param> + <key>style9</key> + <value>1</value> + </param> + <param> + <key>marker9</key> + <value>-1</value> + </param> + <param> + <key>alpha9</key> + <value>1.0</value> + </param> + <param> + <key>label10</key> + <value></value> + </param> + <param> + <key>width10</key> + <value>1</value> + </param> + <param> + <key>color10</key> + <value>"blue"</value> + </param> + <param> + <key>style10</key> + <value>1</value> + </param> + <param> + <key>marker10</key> + <value>-1</value> + </param> + <param> + <key>alpha10</key> + <value>1.0</value> + </param> + <param> + <key>alias</key> + <value></value> + </param> + <param> + <key>affinity</key> <value></value> </param> <param> <key>_coordinate</key> - <value>(10, 10)</value> + <value>(410, 319)</value> </param> <param> <key>_rotation</key> @@ -470,7 +770,7 @@ </connection> <connection> <source_block_id>zeromq_sub_source_0</source_block_id> - <sink_block_id>wxgui_scopesink2_0</sink_block_id> + <sink_block_id>qtgui_time_sink_x_0</sink_block_id> <source_key>0</source_key> <sink_key>0</sink_key> </connection> diff --git a/gr-zeromq/examples/zeromq_pushpull.grc b/gr-zeromq/examples/zeromq_pushpull.grc index b087a513d3..25459e05c4 100644 --- a/gr-zeromq/examples/zeromq_pushpull.grc +++ b/gr-zeromq/examples/zeromq_pushpull.grc @@ -1,6 +1,6 @@ <?xml version='1.0' encoding='ASCII'?> <flow_graph> - <timestamp>Tue May 13 13:11:44 2014</timestamp> + <timestamp>Mon Jul 14 14:45:00 2014</timestamp> <block> <key>analog_sig_source_x</key> <param> @@ -36,6 +36,10 @@ <value>0</value> </param> <param> + <key>alias</key> + <value></value> + </param> + <param> <key>affinity</key> <value></value> </param> @@ -71,6 +75,10 @@ <value>32000</value> </param> <param> + <key>alias</key> + <value></value> + </param> + <param> <key>_coordinate</key> <value>(10, 170)</value> </param> @@ -102,6 +110,10 @@ <value>1</value> </param> <param> + <key>alias</key> + <value></value> + </param> + <param> <key>affinity</key> <value></value> </param> @@ -149,6 +161,10 @@ <value>True</value> </param> <param> + <key>alias</key> + <value></value> + </param> + <param> <key>affinity</key> <value></value> </param> @@ -170,58 +186,97 @@ </param> </block> <block> - <key>options</key> + <key>zeromq_push_sink</key> <param> <key>id</key> - <value>zeromq_pushpull</value> + <value>zeromq_push_sink_0</value> </param> <param> <key>_enabled</key> <value>True</value> </param> <param> - <key>title</key> - <value></value> + <key>type</key> + <value>complex</value> </param> <param> - <key>author</key> - <value></value> + <key>vlen</key> + <value>1</value> </param> <param> - <key>description</key> + <key>address</key> + <value>tcp://127.0.0.1:5555</value> + </param> + <param> + <key>timeout</key> + <value>100</value> + </param> + <param> + <key>alias</key> <value></value> </param> <param> - <key>window_size</key> - <value>1280, 1024</value> + <key>affinity</key> + <value></value> </param> <param> - <key>generate_options</key> - <value>wx_gui</value> + <key>_coordinate</key> + <value>(722, 141)</value> </param> <param> - <key>category</key> - <value>Custom</value> + <key>_rotation</key> + <value>0</value> </param> + </block> + <block> + <key>analog_fastnoise_source_x</key> <param> - <key>run_options</key> - <value>prompt</value> + <key>id</key> + <value>analog_fastnoise_source_x_0</value> </param> <param> - <key>run</key> + <key>_enabled</key> <value>True</value> </param> <param> - <key>max_nouts</key> + <key>type</key> + <value>complex</value> + </param> + <param> + <key>noise_type</key> + <value>analog.GR_GAUSSIAN</value> + </param> + <param> + <key>amp</key> + <value>0.1</value> + </param> + <param> + <key>seed</key> <value>0</value> </param> <param> - <key>realtime_scheduling</key> + <key>samples</key> + <value>8192</value> + </param> + <param> + <key>alias</key> <value></value> </param> <param> + <key>affinity</key> + <value></value> + </param> + <param> + <key>minoutbuf</key> + <value>0</value> + </param> + <param> + <key>maxoutbuf</key> + <value>0</value> + </param> + <param> <key>_coordinate</key> - <value>(10, 10)</value> + <value>(169, 196)</value> </param> <param> <key>_rotation</key> @@ -229,10 +284,10 @@ </param> </block> <block> - <key>zeromq_push_sink</key> + <key>zeromq_pull_source</key> <param> <key>id</key> - <value>zeromq_push_sink_0</value> + <value>zeromq_pull_source_0</value> </param> <param> <key>_enabled</key> @@ -255,12 +310,24 @@ <value>100</value> </param> <param> + <key>alias</key> + <value></value> + </param> + <param> <key>affinity</key> <value></value> </param> <param> + <key>minoutbuf</key> + <value>0</value> + </param> + <param> + <key>maxoutbuf</key> + <value>0</value> + </param> + <param> <key>_coordinate</key> - <value>(722, 141)</value> + <value>(167, 308)</value> </param> <param> <key>_rotation</key> @@ -268,46 +335,62 @@ </param> </block> <block> - <key>zeromq_pull_source</key> + <key>options</key> <param> <key>id</key> - <value>zeromq_pull_source_0</value> + <value>zeromq_pushpull</value> </param> <param> <key>_enabled</key> <value>True</value> </param> <param> - <key>type</key> - <value>complex</value> + <key>title</key> + <value></value> </param> <param> - <key>vlen</key> - <value>1</value> + <key>author</key> + <value></value> </param> <param> - <key>address</key> - <value>tcp://127.0.0.1:5555</value> + <key>description</key> + <value></value> </param> <param> - <key>timeout</key> - <value>100</value> + <key>window_size</key> + <value>1280, 1024</value> </param> <param> - <key>affinity</key> - <value></value> + <key>generate_options</key> + <value>qt_gui</value> </param> <param> - <key>minoutbuf</key> - <value>0</value> + <key>category</key> + <value>Custom</value> </param> <param> - <key>maxoutbuf</key> + <key>run_options</key> + <value>prompt</value> + </param> + <param> + <key>run</key> + <value>True</value> + </param> + <param> + <key>max_nouts</key> <value>0</value> </param> <param> + <key>realtime_scheduling</key> + <value></value> + </param> + <param> + <key>alias</key> + <value></value> + </param> + <param> <key>_coordinate</key> - <value>(167, 308)</value> + <value>(10, 10)</value> </param> <param> <key>_rotation</key> @@ -315,10 +398,10 @@ </param> </block> <block> - <key>wxgui_scopesink2</key> + <key>qtgui_time_sink_x</key> <param> <key>id</key> - <value>wxgui_scopesink2_0</value> + <value>qtgui_time_sink_x_0</value> </param> <param> <key>_enabled</key> @@ -329,115 +412,332 @@ <value>complex</value> </param> <param> - <key>title</key> - <value>Scope Plot</value> + <key>name</key> + <value>""</value> </param> <param> - <key>samp_rate</key> + <key>ylabel</key> + <value>Amplitude</value> + </param> + <param> + <key>yunit</key> + <value>""</value> + </param> + <param> + <key>size</key> + <value>100</value> + </param> + <param> + <key>srate</key> <value>samp_rate</value> </param> <param> - <key>v_scale</key> - <value>0</value> + <key>grid</key> + <value>False</value> + </param> + <param> + <key>autoscale</key> + <value>False</value> + </param> + <param> + <key>ymin</key> + <value>-1</value> + </param> + <param> + <key>ymax</key> + <value>2</value> </param> <param> - <key>v_offset</key> + <key>nconnections</key> + <value>1</value> + </param> + <param> + <key>update_time</key> + <value>0.10</value> + </param> + <param> + <key>entags</key> + <value>True</value> + </param> + <param> + <key>gui_hint</key> + <value></value> + </param> + <param> + <key>tr_mode</key> + <value>qtgui.TRIG_MODE_AUTO</value> + </param> + <param> + <key>tr_slope</key> + <value>qtgui.TRIG_SLOPE_POS</value> + </param> + <param> + <key>tr_level</key> + <value>0.0</value> + </param> + <param> + <key>tr_delay</key> <value>0</value> </param> <param> - <key>t_scale</key> + <key>tr_chan</key> <value>0</value> </param> <param> - <key>ac_couple</key> - <value>False</value> + <key>tr_tag</key> + <value>""</value> </param> <param> - <key>xy_mode</key> - <value>False</value> + <key>label1</key> + <value></value> </param> <param> - <key>num_inputs</key> + <key>width1</key> <value>1</value> </param> <param> - <key>win_size</key> + <key>color1</key> + <value>"blue"</value> + </param> + <param> + <key>style1</key> + <value>1</value> + </param> + <param> + <key>marker1</key> + <value>-1</value> + </param> + <param> + <key>alpha1</key> + <value>1.0</value> + </param> + <param> + <key>label2</key> <value></value> </param> <param> - <key>grid_pos</key> + <key>width2</key> + <value>1</value> + </param> + <param> + <key>color2</key> + <value>"red"</value> + </param> + <param> + <key>style2</key> + <value>1</value> + </param> + <param> + <key>marker2</key> + <value>-1</value> + </param> + <param> + <key>alpha2</key> + <value>1.0</value> + </param> + <param> + <key>label3</key> <value></value> </param> <param> - <key>notebook</key> + <key>width3</key> + <value>1</value> + </param> + <param> + <key>color3</key> + <value>"green"</value> + </param> + <param> + <key>style3</key> + <value>1</value> + </param> + <param> + <key>marker3</key> + <value>-1</value> + </param> + <param> + <key>alpha3</key> + <value>1.0</value> + </param> + <param> + <key>label4</key> <value></value> </param> <param> - <key>trig_mode</key> - <value>wxgui.TRIG_MODE_AUTO</value> + <key>width4</key> + <value>1</value> </param> <param> - <key>y_axis_label</key> - <value>Counts</value> + <key>color4</key> + <value>"black"</value> </param> <param> - <key>affinity</key> + <key>style4</key> + <value>1</value> + </param> + <param> + <key>marker4</key> + <value>-1</value> + </param> + <param> + <key>alpha4</key> + <value>1.0</value> + </param> + <param> + <key>label5</key> <value></value> </param> <param> - <key>_coordinate</key> - <value>(422, 300)</value> + <key>width5</key> + <value>1</value> </param> <param> - <key>_rotation</key> - <value>0</value> + <key>color5</key> + <value>"cyan"</value> </param> - </block> - <block> - <key>analog_fastnoise_source_x</key> <param> - <key>id</key> - <value>analog_fastnoise_source_x_0</value> + <key>style5</key> + <value>1</value> </param> <param> - <key>_enabled</key> - <value>True</value> + <key>marker5</key> + <value>-1</value> </param> <param> - <key>type</key> - <value>complex</value> + <key>alpha5</key> + <value>1.0</value> </param> <param> - <key>noise_type</key> - <value>analog.GR_GAUSSIAN</value> + <key>label6</key> + <value></value> </param> <param> - <key>amp</key> - <value>0.1</value> + <key>width6</key> + <value>1</value> </param> <param> - <key>seed</key> - <value>0</value> + <key>color6</key> + <value>"magenta"</value> </param> <param> - <key>samples</key> - <value>8192</value> + <key>style6</key> + <value>1</value> </param> <param> - <key>affinity</key> + <key>marker6</key> + <value>-1</value> + </param> + <param> + <key>alpha6</key> + <value>1.0</value> + </param> + <param> + <key>label7</key> <value></value> </param> <param> - <key>minoutbuf</key> - <value>0</value> + <key>width7</key> + <value>1</value> </param> <param> - <key>maxoutbuf</key> - <value>0</value> + <key>color7</key> + <value>"yellow"</value> + </param> + <param> + <key>style7</key> + <value>1</value> + </param> + <param> + <key>marker7</key> + <value>-1</value> + </param> + <param> + <key>alpha7</key> + <value>1.0</value> + </param> + <param> + <key>label8</key> + <value></value> + </param> + <param> + <key>width8</key> + <value>1</value> + </param> + <param> + <key>color8</key> + <value>"dark red"</value> + </param> + <param> + <key>style8</key> + <value>1</value> + </param> + <param> + <key>marker8</key> + <value>-1</value> + </param> + <param> + <key>alpha8</key> + <value>1.0</value> + </param> + <param> + <key>label9</key> + <value></value> + </param> + <param> + <key>width9</key> + <value>1</value> + </param> + <param> + <key>color9</key> + <value>"dark green"</value> + </param> + <param> + <key>style9</key> + <value>1</value> + </param> + <param> + <key>marker9</key> + <value>-1</value> + </param> + <param> + <key>alpha9</key> + <value>1.0</value> + </param> + <param> + <key>label10</key> + <value></value> + </param> + <param> + <key>width10</key> + <value>1</value> + </param> + <param> + <key>color10</key> + <value>"blue"</value> + </param> + <param> + <key>style10</key> + <value>1</value> + </param> + <param> + <key>marker10</key> + <value>-1</value> + </param> + <param> + <key>alpha10</key> + <value>1.0</value> + </param> + <param> + <key>alias</key> + <value></value> + </param> + <param> + <key>affinity</key> + <value></value> </param> <param> <key>_coordinate</key> - <value>(169, 196)</value> + <value>(381, 300)</value> </param> <param> <key>_rotation</key> @@ -451,12 +751,6 @@ <sink_key>0</sink_key> </connection> <connection> - <source_block_id>zeromq_pull_source_0</source_block_id> - <sink_block_id>wxgui_scopesink2_0</sink_block_id> - <source_key>0</source_key> - <sink_key>0</sink_key> - </connection> - <connection> <source_block_id>analog_sig_source_x_0</source_block_id> <sink_block_id>blocks_add_xx_0</sink_block_id> <source_key>0</source_key> @@ -474,4 +768,10 @@ <source_key>0</source_key> <sink_key>0</sink_key> </connection> + <connection> + <source_block_id>zeromq_pull_source_0</source_block_id> + <sink_block_id>qtgui_time_sink_x_0</sink_block_id> + <source_key>0</source_key> + <sink_key>0</sink_key> + </connection> </flow_graph> diff --git a/gr-zeromq/examples/zeromq_reqrep.grc b/gr-zeromq/examples/zeromq_reqrep.grc index ede0e1b08a..6c299dd801 100644 --- a/gr-zeromq/examples/zeromq_reqrep.grc +++ b/gr-zeromq/examples/zeromq_reqrep.grc @@ -1,6 +1,6 @@ <?xml version='1.0' encoding='ASCII'?> <flow_graph> - <timestamp>Tue May 13 13:12:52 2014</timestamp> + <timestamp>Mon Jul 14 14:45:22 2014</timestamp> <block> <key>analog_sig_source_x</key> <param> @@ -36,6 +36,10 @@ <value>0</value> </param> <param> + <key>alias</key> + <value></value> + </param> + <param> <key>affinity</key> <value></value> </param> @@ -71,6 +75,10 @@ <value>32000</value> </param> <param> + <key>alias</key> + <value></value> + </param> + <param> <key>_coordinate</key> <value>(10, 170)</value> </param> @@ -80,10 +88,10 @@ </param> </block> <block> - <key>zeromq_req_source</key> + <key>blocks_add_xx</key> <param> <key>id</key> - <value>zeromq_req_source_0</value> + <value>blocks_add_xx_0</value> </param> <param> <key>_enabled</key> @@ -94,16 +102,16 @@ <value>complex</value> </param> <param> - <key>vlen</key> - <value>1</value> + <key>num_inputs</key> + <value>2</value> </param> <param> - <key>address</key> - <value>tcp://127.0.0.1:5555</value> + <key>vlen</key> + <value>1</value> </param> <param> - <key>timeout</key> - <value>100</value> + <key>alias</key> + <value></value> </param> <param> <key>affinity</key> @@ -119,7 +127,7 @@ </param> <param> <key>_coordinate</key> - <value>(171, 306)</value> + <value>(411, 151)</value> </param> <param> <key>_rotation</key> @@ -127,10 +135,10 @@ </param> </block> <block> - <key>wxgui_scopesink2</key> + <key>blocks_throttle</key> <param> <key>id</key> - <value>wxgui_scopesink2_0</value> + <value>blocks_throttle_0</value> </param> <param> <key>_enabled</key> @@ -141,64 +149,134 @@ <value>complex</value> </param> <param> - <key>title</key> - <value>Scope Plot</value> + <key>samples_per_second</key> + <value>samp_rate</value> </param> <param> - <key>samp_rate</key> - <value>samp_rate</value> + <key>vlen</key> + <value>1</value> + </param> + <param> + <key>ignoretag</key> + <value>True</value> + </param> + <param> + <key>alias</key> + <value></value> + </param> + <param> + <key>affinity</key> + <value></value> </param> <param> - <key>v_scale</key> + <key>minoutbuf</key> <value>0</value> </param> <param> - <key>v_offset</key> + <key>maxoutbuf</key> <value>0</value> </param> <param> - <key>t_scale</key> + <key>_coordinate</key> + <value>(534, 164)</value> + </param> + <param> + <key>_rotation</key> <value>0</value> </param> + </block> + <block> + <key>zeromq_rep_sink</key> <param> - <key>ac_couple</key> - <value>False</value> + <key>id</key> + <value>zeromq_rep_sink_0</value> </param> <param> - <key>xy_mode</key> - <value>False</value> + <key>_enabled</key> + <value>True</value> </param> <param> - <key>num_inputs</key> + <key>type</key> + <value>complex</value> + </param> + <param> + <key>vlen</key> <value>1</value> </param> <param> - <key>win_size</key> - <value></value> + <key>address</key> + <value>tcp://127.0.0.1:5555</value> </param> <param> - <key>grid_pos</key> + <key>timeout</key> + <value>100</value> + </param> + <param> + <key>alias</key> <value></value> </param> <param> - <key>notebook</key> + <key>affinity</key> <value></value> </param> <param> - <key>trig_mode</key> - <value>wxgui.TRIG_MODE_AUTO</value> + <key>_coordinate</key> + <value>(722, 148)</value> + </param> + <param> + <key>_rotation</key> + <value>0</value> + </param> + </block> + <block> + <key>analog_fastnoise_source_x</key> + <param> + <key>id</key> + <value>analog_fastnoise_source_x_0</value> + </param> + <param> + <key>_enabled</key> + <value>True</value> + </param> + <param> + <key>type</key> + <value>complex</value> + </param> + <param> + <key>noise_type</key> + <value>analog.GR_GAUSSIAN</value> </param> <param> - <key>y_axis_label</key> - <value>Counts</value> + <key>amp</key> + <value>0.1</value> + </param> + <param> + <key>seed</key> + <value>0</value> + </param> + <param> + <key>samples</key> + <value>8192</value> + </param> + <param> + <key>alias</key> + <value></value> </param> <param> <key>affinity</key> <value></value> </param> <param> + <key>minoutbuf</key> + <value>0</value> + </param> + <param> + <key>maxoutbuf</key> + <value>0</value> + </param> + <param> <key>_coordinate</key> - <value>(450, 298)</value> + <value>(169, 196)</value> </param> <param> <key>_rotation</key> @@ -206,10 +284,10 @@ </param> </block> <block> - <key>blocks_add_xx</key> + <key>zeromq_req_source</key> <param> <key>id</key> - <value>blocks_add_xx_0</value> + <value>zeromq_req_source_0</value> </param> <param> <key>_enabled</key> @@ -220,14 +298,22 @@ <value>complex</value> </param> <param> - <key>num_inputs</key> - <value>2</value> - </param> - <param> <key>vlen</key> <value>1</value> </param> <param> + <key>address</key> + <value>tcp://127.0.0.1:5555</value> + </param> + <param> + <key>timeout</key> + <value>100</value> + </param> + <param> + <key>alias</key> + <value></value> + </param> + <param> <key>affinity</key> <value></value> </param> @@ -241,7 +327,7 @@ </param> <param> <key>_coordinate</key> - <value>(411, 151)</value> + <value>(171, 306)</value> </param> <param> <key>_rotation</key> @@ -276,7 +362,7 @@ </param> <param> <key>generate_options</key> - <value>wx_gui</value> + <value>qt_gui</value> </param> <param> <key>category</key> @@ -299,6 +385,10 @@ <value></value> </param> <param> + <key>alias</key> + <value></value> + </param> + <param> <key>_coordinate</key> <value>(10, 10)</value> </param> @@ -308,10 +398,10 @@ </param> </block> <block> - <key>blocks_throttle</key> + <key>qtgui_time_sink_x</key> <param> <key>id</key> - <value>blocks_throttle_0</value> + <value>qtgui_time_sink_x_0</value> </param> <param> <key>_enabled</key> @@ -322,122 +412,332 @@ <value>complex</value> </param> <param> - <key>samples_per_second</key> + <key>name</key> + <value>""</value> + </param> + <param> + <key>ylabel</key> + <value>Amplitude</value> + </param> + <param> + <key>yunit</key> + <value>""</value> + </param> + <param> + <key>size</key> + <value>100</value> + </param> + <param> + <key>srate</key> <value>samp_rate</value> </param> <param> - <key>vlen</key> + <key>grid</key> + <value>False</value> + </param> + <param> + <key>autoscale</key> + <value>False</value> + </param> + <param> + <key>ymin</key> + <value>-1</value> + </param> + <param> + <key>ymax</key> + <value>2</value> + </param> + <param> + <key>nconnections</key> <value>1</value> </param> <param> - <key>ignoretag</key> + <key>update_time</key> + <value>0.10</value> + </param> + <param> + <key>entags</key> <value>True</value> </param> <param> - <key>affinity</key> + <key>gui_hint</key> <value></value> </param> <param> - <key>minoutbuf</key> + <key>tr_mode</key> + <value>qtgui.TRIG_MODE_AUTO</value> + </param> + <param> + <key>tr_slope</key> + <value>qtgui.TRIG_SLOPE_POS</value> + </param> + <param> + <key>tr_level</key> + <value>0.0</value> + </param> + <param> + <key>tr_delay</key> <value>0</value> </param> <param> - <key>maxoutbuf</key> + <key>tr_chan</key> <value>0</value> </param> <param> - <key>_coordinate</key> - <value>(534, 164)</value> + <key>tr_tag</key> + <value>""</value> </param> <param> - <key>_rotation</key> - <value>0</value> + <key>label1</key> + <value></value> </param> - </block> - <block> - <key>zeromq_rep_sink</key> <param> - <key>id</key> - <value>zeromq_rep_sink_0</value> + <key>width1</key> + <value>1</value> </param> <param> - <key>_enabled</key> - <value>True</value> + <key>color1</key> + <value>"blue"</value> </param> <param> - <key>type</key> - <value>complex</value> + <key>style1</key> + <value>1</value> </param> <param> - <key>vlen</key> + <key>marker1</key> + <value>-1</value> + </param> + <param> + <key>alpha1</key> + <value>1.0</value> + </param> + <param> + <key>label2</key> + <value></value> + </param> + <param> + <key>width2</key> <value>1</value> </param> <param> - <key>address</key> - <value>tcp://127.0.0.1:5555</value> + <key>color2</key> + <value>"red"</value> </param> <param> - <key>timeout</key> - <value>100</value> + <key>style2</key> + <value>1</value> </param> <param> - <key>affinity</key> + <key>marker2</key> + <value>-1</value> + </param> + <param> + <key>alpha2</key> + <value>1.0</value> + </param> + <param> + <key>label3</key> <value></value> </param> <param> - <key>_coordinate</key> - <value>(722, 148)</value> + <key>width3</key> + <value>1</value> </param> <param> - <key>_rotation</key> - <value>0</value> + <key>color3</key> + <value>"green"</value> </param> - </block> - <block> - <key>analog_fastnoise_source_x</key> <param> - <key>id</key> - <value>analog_fastnoise_source_x_0</value> + <key>style3</key> + <value>1</value> </param> <param> - <key>_enabled</key> - <value>True</value> + <key>marker3</key> + <value>-1</value> </param> <param> - <key>type</key> - <value>complex</value> + <key>alpha3</key> + <value>1.0</value> </param> <param> - <key>noise_type</key> - <value>analog.GR_GAUSSIAN</value> + <key>label4</key> + <value></value> </param> <param> - <key>amp</key> - <value>0.1</value> + <key>width4</key> + <value>1</value> </param> <param> - <key>seed</key> - <value>0</value> + <key>color4</key> + <value>"black"</value> </param> <param> - <key>samples</key> - <value>8192</value> + <key>style4</key> + <value>1</value> </param> <param> - <key>affinity</key> + <key>marker4</key> + <value>-1</value> + </param> + <param> + <key>alpha4</key> + <value>1.0</value> + </param> + <param> + <key>label5</key> <value></value> </param> <param> - <key>minoutbuf</key> - <value>0</value> + <key>width5</key> + <value>1</value> </param> <param> - <key>maxoutbuf</key> - <value>0</value> + <key>color5</key> + <value>"cyan"</value> + </param> + <param> + <key>style5</key> + <value>1</value> + </param> + <param> + <key>marker5</key> + <value>-1</value> + </param> + <param> + <key>alpha5</key> + <value>1.0</value> + </param> + <param> + <key>label6</key> + <value></value> + </param> + <param> + <key>width6</key> + <value>1</value> + </param> + <param> + <key>color6</key> + <value>"magenta"</value> + </param> + <param> + <key>style6</key> + <value>1</value> + </param> + <param> + <key>marker6</key> + <value>-1</value> + </param> + <param> + <key>alpha6</key> + <value>1.0</value> + </param> + <param> + <key>label7</key> + <value></value> + </param> + <param> + <key>width7</key> + <value>1</value> + </param> + <param> + <key>color7</key> + <value>"yellow"</value> + </param> + <param> + <key>style7</key> + <value>1</value> + </param> + <param> + <key>marker7</key> + <value>-1</value> + </param> + <param> + <key>alpha7</key> + <value>1.0</value> + </param> + <param> + <key>label8</key> + <value></value> + </param> + <param> + <key>width8</key> + <value>1</value> + </param> + <param> + <key>color8</key> + <value>"dark red"</value> + </param> + <param> + <key>style8</key> + <value>1</value> + </param> + <param> + <key>marker8</key> + <value>-1</value> + </param> + <param> + <key>alpha8</key> + <value>1.0</value> + </param> + <param> + <key>label9</key> + <value></value> + </param> + <param> + <key>width9</key> + <value>1</value> + </param> + <param> + <key>color9</key> + <value>"dark green"</value> + </param> + <param> + <key>style9</key> + <value>1</value> + </param> + <param> + <key>marker9</key> + <value>-1</value> + </param> + <param> + <key>alpha9</key> + <value>1.0</value> + </param> + <param> + <key>label10</key> + <value></value> + </param> + <param> + <key>width10</key> + <value>1</value> + </param> + <param> + <key>color10</key> + <value>"blue"</value> + </param> + <param> + <key>style10</key> + <value>1</value> + </param> + <param> + <key>marker10</key> + <value>-1</value> + </param> + <param> + <key>alpha10</key> + <value>1.0</value> + </param> + <param> + <key>alias</key> + <value></value> + </param> + <param> + <key>affinity</key> + <value></value> </param> <param> <key>_coordinate</key> - <value>(169, 196)</value> + <value>(385, 298)</value> </param> <param> <key>_rotation</key> @@ -470,7 +770,7 @@ </connection> <connection> <source_block_id>zeromq_req_source_0</source_block_id> - <sink_block_id>wxgui_scopesink2_0</sink_block_id> + <sink_block_id>qtgui_time_sink_x_0</sink_block_id> <source_key>0</source_key> <sink_key>0</sink_key> </connection> diff --git a/grc/base/Block.py b/grc/base/Block.py index a14ffd92fc..a8a699f29d 100644 --- a/grc/base/Block.py +++ b/grc/base/Block.py @@ -77,6 +77,7 @@ class Block(Element): self._block_wrapper_path = n.find('block_wrapper_path') self._bussify_sink = n.find('bus_sink') self._bussify_source = n.find('bus_source') + self._var_value = n.find('var_value') or '$value' # get list of param tabs n_tabs = n.find('param_tab_order') or None @@ -275,8 +276,10 @@ class Block(Element): tmpl = str(tmpl) if '$' not in tmpl: return tmpl n = dict((p.get_key(), TemplateArg(p)) for p in self.get_params()) - try: return str(Template(tmpl, n)) - except Exception, e: return "-------->\n%s: %s\n<--------"%(e, tmpl) + try: + return str(Template(tmpl, n)) + except Exception as err: + return "Template error: %s\n %s" % (tmpl, err) ############################################## # Controller Modify diff --git a/grc/base/Port.py b/grc/base/Port.py index edc309bf05..34766bb4f8 100644 --- a/grc/base/Port.py +++ b/grc/base/Port.py @@ -36,6 +36,7 @@ class Port(Element): self._name = n['name'] self._key = n['key'] self._type = n['type'] + self._hide = n.find('hide') or '' self._dir = dir def validate(self): @@ -65,15 +66,17 @@ class Port(Element): def get_name(self): number = '' if self.get_type() == 'bus': - busses = filter(lambda a: a._dir == self._dir, self.get_parent().get_ports_gui()); - - number = str(busses.index(self)) + '#' + str(len(self.get_associated_ports())); + busses = filter(lambda a: a._dir == self._dir, self.get_parent().get_ports_gui()) + number = str(busses.index(self)) + '#' + str(len(self.get_associated_ports())) return self._name + number def get_key(self): return self._key def is_sink(self): return self._dir == 'sink' def is_source(self): return self._dir == 'source' def get_type(self): return self.get_parent().resolve_dependencies(self._type) + def get_hide(self): + value = self.get_parent().resolve_dependencies(self._hide).strip().lower() + return False if value in ('false', 'off', '0') else bool(value) def get_connections(self): """ @@ -97,20 +100,18 @@ class Port(Element): def get_associated_ports(self): if not self.get_type() == 'bus': - return [self]; + return [self] else: if self.is_source(): - get_p = self.get_parent().get_sources; - bus_structure = self.get_parent().current_bus_structure['source']; - direc = 'source' + get_ports = self.get_parent().get_sources + bus_structure = self.get_parent().current_bus_structure['source'] else: - get_p = self.get_parent().get_sinks; - bus_structure = self.get_parent().current_bus_structure['sink']; - direc = 'sink' + get_ports = self.get_parent().get_sinks + bus_structure = self.get_parent().current_bus_structure['sink'] - ports = [i for i in get_p() if not i.get_type() == 'bus']; + ports = [i for i in get_ports() if not i.get_type() == 'bus'] if bus_structure: - busses = [i for i in get_p() if i.get_type() == 'bus']; - bus_index = busses.index(self); - ports = filter(lambda a: ports.index(a) in bus_structure[bus_index], ports); - return ports; + busses = [i for i in get_ports() if i.get_type() == 'bus'] + bus_index = busses.index(self) + ports = filter(lambda a: ports.index(a) in bus_structure[bus_index], ports) + return ports diff --git a/grc/examples/simple/variable_config.grc b/grc/examples/simple/variable_config.grc index 0b50b1e5bb..0b60abc813 100644 --- a/grc/examples/simple/variable_config.grc +++ b/grc/examples/simple/variable_config.grc @@ -1,6 +1,6 @@ <?xml version='1.0' encoding='ASCII'?> <flow_graph> - <timestamp>Sat Nov 10 15:20:12 2012</timestamp> + <timestamp>Sat Jul 12 16:15:51 2014</timestamp> <block> <key>options</key> <param> @@ -29,7 +29,7 @@ </param> <param> <key>generate_options</key> - <value>wx_gui</value> + <value>qt_gui</value> </param> <param> <key>category</key> @@ -52,8 +52,12 @@ <value></value> </param> <param> + <key>alias</key> + <value></value> + </param> + <param> <key>_coordinate</key> - <value>(10, 10)</value> + <value>(-1, 2)</value> </param> <param> <key>_rotation</key> @@ -75,8 +79,12 @@ <value>32000</value> </param> <param> + <key>alias</key> + <value></value> + </param> + <param> <key>_coordinate</key> - <value>(10, 170)</value> + <value>(-1, 125)</value> </param> <param> <key>_rotation</key> @@ -84,42 +92,58 @@ </param> </block> <block> - <key>variable_config</key> + <key>analog_sig_source_x</key> <param> <key>id</key> - <value>freq_init</value> + <value>analog_sig_source_x_0</value> </param> <param> <key>_enabled</key> <value>True</value> </param> <param> - <key>value</key> - <value>1000</value> - </param> - <param> <key>type</key> - <value>real</value> + <value>complex</value> </param> <param> - <key>config_file</key> - <value>config.conf</value> + <key>samp_rate</key> + <value>samp_rate</value> </param> <param> - <key>section</key> - <value>main</value> + <key>waveform</key> + <value>analog.GR_COS_WAVE</value> </param> <param> - <key>option</key> + <key>freq</key> <value>freq</value> </param> <param> - <key>writeback</key> - <value>freq</value> + <key>amp</key> + <value>1</value> + </param> + <param> + <key>offset</key> + <value>0</value> + </param> + <param> + <key>alias</key> + <value></value> + </param> + <param> + <key>affinity</key> + <value></value> + </param> + <param> + <key>minoutbuf</key> + <value>0</value> + </param> + <param> + <key>maxoutbuf</key> + <value>0</value> </param> <param> <key>_coordinate</key> - <value>(255, 17)</value> + <value>(173, 201)</value> </param> <param> <key>_rotation</key> @@ -127,54 +151,50 @@ </param> </block> <block> - <key>variable_slider</key> + <key>blocks_throttle</key> <param> <key>id</key> - <value>freq</value> + <value>blocks_throttle_0</value> </param> <param> <key>_enabled</key> <value>True</value> </param> <param> - <key>label</key> - <value>Frequency (Hz)</value> - </param> - <param> - <key>value</key> - <value>freq_init</value> + <key>type</key> + <value>complex</value> </param> <param> - <key>min</key> - <value>-samp_rate/2</value> + <key>samples_per_second</key> + <value>samp_rate</value> </param> <param> - <key>max</key> - <value>samp_rate/2</value> + <key>vlen</key> + <value>1</value> </param> <param> - <key>num_steps</key> - <value>100</value> + <key>ignoretag</key> + <value>True</value> </param> <param> - <key>style</key> - <value>wx.SL_HORIZONTAL</value> + <key>alias</key> + <value></value> </param> <param> - <key>converver</key> - <value>float_converter</value> + <key>affinity</key> + <value></value> </param> <param> - <key>grid_pos</key> - <value></value> + <key>minoutbuf</key> + <value>0</value> </param> <param> - <key>notebook</key> - <value></value> + <key>maxoutbuf</key> + <value>0</value> </param> <param> <key>_coordinate</key> - <value>(429, 24)</value> + <value>(392, 233)</value> </param> <param> <key>_rotation</key> @@ -182,10 +202,10 @@ </param> </block> <block> - <key>wxgui_fftsink2</key> + <key>qtgui_freq_sink_x</key> <param> <key>id</key> - <value>wxgui_fftsink2_0</value> + <value>qtgui_freq_sink_x_0</value> </param> <param> <key>_enabled</key> @@ -196,76 +216,224 @@ <value>complex</value> </param> <param> - <key>title</key> - <value>FFT Plot</value> + <key>name</key> + <value>QT GUI Plot</value> </param> <param> - <key>samp_rate</key> - <value>samp_rate</value> + <key>fftsize</key> + <value>1024</value> + </param> + <param> + <key>wintype</key> + <value>firdes.WIN_BLACKMAN_hARRIS</value> </param> <param> - <key>baseband_freq</key> + <key>fc</key> <value>0</value> </param> <param> - <key>y_per_div</key> - <value>10</value> + <key>bw</key> + <value>samp_rate</value> + </param> + <param> + <key>autoscale</key> + <value>False</value> </param> <param> - <key>y_divs</key> + <key>average</key> + <value>1.0</value> + </param> + <param> + <key>ymin</key> + <value>-140</value> + </param> + <param> + <key>ymax</key> <value>10</value> </param> <param> - <key>ref_level</key> - <value>50</value> + <key>nconnections</key> + <value>1</value> </param> <param> - <key>ref_scale</key> - <value>2.0</value> + <key>update_time</key> + <value>0.10</value> </param> <param> - <key>fft_size</key> - <value>1024</value> + <key>gui_hint</key> + <value></value> + </param> + <param> + <key>label1</key> + <value></value> </param> <param> - <key>fft_rate</key> - <value>30</value> + <key>width1</key> + <value>1</value> </param> <param> - <key>peak_hold</key> - <value>False</value> + <key>color1</key> + <value>"blue"</value> </param> <param> - <key>average</key> - <value>False</value> + <key>alpha1</key> + <value>1.0</value> </param> <param> - <key>avg_alpha</key> - <value>0</value> + <key>label2</key> + <value></value> + </param> + <param> + <key>width2</key> + <value>1</value> + </param> + <param> + <key>color2</key> + <value>"red"</value> + </param> + <param> + <key>alpha2</key> + <value>1.0</value> + </param> + <param> + <key>label3</key> + <value></value> + </param> + <param> + <key>width3</key> + <value>1</value> + </param> + <param> + <key>color3</key> + <value>"green"</value> + </param> + <param> + <key>alpha3</key> + <value>1.0</value> + </param> + <param> + <key>label4</key> + <value></value> + </param> + <param> + <key>width4</key> + <value>1</value> + </param> + <param> + <key>color4</key> + <value>"black"</value> </param> <param> - <key>win</key> - <value>None</value> + <key>alpha4</key> + <value>1.0</value> </param> <param> - <key>win_size</key> + <key>label5</key> <value></value> </param> <param> - <key>grid_pos</key> + <key>width5</key> + <value>1</value> + </param> + <param> + <key>color5</key> + <value>"cyan"</value> + </param> + <param> + <key>alpha5</key> + <value>1.0</value> + </param> + <param> + <key>label6</key> <value></value> </param> <param> - <key>notebook</key> + <key>width6</key> + <value>1</value> + </param> + <param> + <key>color6</key> + <value>"magenta"</value> + </param> + <param> + <key>alpha6</key> + <value>1.0</value> + </param> + <param> + <key>label7</key> <value></value> </param> <param> - <key>freqvar</key> - <value>None</value> + <key>width7</key> + <value>1</value> + </param> + <param> + <key>color7</key> + <value>"yellow"</value> + </param> + <param> + <key>alpha7</key> + <value>1.0</value> + </param> + <param> + <key>label8</key> + <value></value> + </param> + <param> + <key>width8</key> + <value>1</value> + </param> + <param> + <key>color8</key> + <value>"dark red"</value> + </param> + <param> + <key>alpha8</key> + <value>1.0</value> + </param> + <param> + <key>label9</key> + <value></value> + </param> + <param> + <key>width9</key> + <value>1</value> + </param> + <param> + <key>color9</key> + <value>"dark green"</value> + </param> + <param> + <key>alpha9</key> + <value>1.0</value> + </param> + <param> + <key>label10</key> + <value></value> + </param> + <param> + <key>width10</key> + <value>1</value> + </param> + <param> + <key>color10</key> + <value>"dark blue"</value> + </param> + <param> + <key>alpha10</key> + <value>1.0</value> + </param> + <param> + <key>alias</key> + <value></value> + </param> + <param> + <key>affinity</key> + <value></value> </param> <param> <key>_coordinate</key> - <value>(671, 233)</value> + <value>(643, 221)</value> </param> <param> <key>_rotation</key> @@ -273,30 +441,58 @@ </param> </block> <block> - <key>blocks_throttle</key> + <key>variable_qtgui_range</key> <param> <key>id</key> - <value>blocks_throttle_0</value> + <value>freq</value> </param> <param> <key>_enabled</key> <value>True</value> </param> <param> - <key>type</key> - <value>complex</value> + <key>label</key> + <value>Frequency (Hz)</value> </param> <param> - <key>samples_per_second</key> - <value>samp_rate</value> + <key>value</key> + <value>1e3</value> </param> <param> - <key>vlen</key> + <key>start</key> + <value>-samp_rate/2</value> + </param> + <param> + <key>stop</key> + <value>samp_rate/2</value> + </param> + <param> + <key>step</key> <value>1</value> </param> <param> + <key>widget</key> + <value>counter_slider</value> + </param> + <param> + <key>orient</key> + <value>Qt.Horizontal</value> + </param> + <param> + <key>min_len</key> + <value>200</value> + </param> + <param> + <key>gui_hint</key> + <value></value> + </param> + <param> + <key>alias</key> + <value></value> + </param> + <param> <key>_coordinate</key> - <value>(392, 233)</value> + <value>(339, 9)</value> </param> <param> <key>_rotation</key> @@ -304,42 +500,46 @@ </param> </block> <block> - <key>analog_sig_source_x</key> + <key>variable_config</key> <param> <key>id</key> - <value>analog_sig_source_x_0</value> + <value>freq_init</value> </param> <param> <key>_enabled</key> <value>True</value> </param> <param> + <key>value</key> + <value>1000</value> + </param> + <param> <key>type</key> - <value>complex</value> + <value>real</value> </param> <param> - <key>samp_rate</key> - <value>samp_rate</value> + <key>config_file</key> + <value>/home/mbant/.gnuradio/config.conf</value> </param> <param> - <key>waveform</key> - <value>analog.GR_COS_WAVE</value> + <key>section</key> + <value>main</value> </param> <param> - <key>freq</key> + <key>option</key> <value>freq</value> </param> <param> - <key>amp</key> - <value>1</value> + <key>writeback</key> + <value>freq</value> </param> <param> - <key>offset</key> - <value>0</value> + <key>alias</key> + <value></value> </param> <param> <key>_coordinate</key> - <value>(173, 201)</value> + <value>(168, 0)</value> </param> <param> <key>_rotation</key> @@ -347,14 +547,14 @@ </param> </block> <connection> - <source_block_id>blocks_throttle_0</source_block_id> - <sink_block_id>wxgui_fftsink2_0</sink_block_id> + <source_block_id>analog_sig_source_x_0</source_block_id> + <sink_block_id>blocks_throttle_0</sink_block_id> <source_key>0</source_key> <sink_key>0</sink_key> </connection> <connection> - <source_block_id>analog_sig_source_x_0</source_block_id> - <sink_block_id>blocks_throttle_0</sink_block_id> + <source_block_id>blocks_throttle_0</source_block_id> + <sink_block_id>qtgui_freq_sink_x_0</sink_block_id> <source_key>0</source_key> <sink_key>0</sink_key> </connection> diff --git a/grc/examples/xmlrpc/xmlrpc_client.grc b/grc/examples/xmlrpc/xmlrpc_client.grc index 3bb4e7ed3b..45d8af2824 100644 --- a/grc/examples/xmlrpc/xmlrpc_client.grc +++ b/grc/examples/xmlrpc/xmlrpc_client.grc @@ -1,6 +1,6 @@ <?xml version='1.0' encoding='ASCII'?> <flow_graph> - <timestamp>Thu Jul 24 14:27:44 2008</timestamp> + <timestamp>Sat Jul 12 17:10:55 2014</timestamp> <block> <key>options</key> <param> @@ -29,15 +29,101 @@ </param> <param> <key>generate_options</key> - <value>wx_gui</value> + <value>qt_gui</value> </param> <param> <key>category</key> <value>Custom</value> </param> <param> + <key>run_options</key> + <value>prompt</value> + </param> + <param> + <key>run</key> + <value>True</value> + </param> + <param> + <key>max_nouts</key> + <value>0</value> + </param> + <param> + <key>realtime_scheduling</key> + <value></value> + </param> + <param> + <key>alias</key> + <value></value> + </param> + <param> + <key>_coordinate</key> + <value>(-2, 0)</value> + </param> + <param> + <key>_rotation</key> + <value>0</value> + </param> + </block> + <block> + <key>variable</key> + <param> + <key>id</key> + <value>samp_rate</value> + </param> + <param> + <key>_enabled</key> + <value>True</value> + </param> + <param> + <key>value</key> + <value>32000</value> + </param> + <param> + <key>alias</key> + <value></value> + </param> + <param> + <key>_coordinate</key> + <value>(13, 172)</value> + </param> + <param> + <key>_rotation</key> + <value>0</value> + </param> + </block> + <block> + <key>xmlrpc_client</key> + <param> + <key>id</key> + <value>xmlrpc_client</value> + </param> + <param> + <key>_enabled</key> + <value>True</value> + </param> + <param> + <key>addr</key> + <value>localhost</value> + </param> + <param> + <key>port</key> + <value>1234</value> + </param> + <param> + <key>callback</key> + <value>set_freq</value> + </param> + <param> + <key>variable</key> + <value>freq</value> + </param> + <param> + <key>alias</key> + <value></value> + </param> + <param> <key>_coordinate</key> - <value>(10, 10)</value> + <value>(177, 0)</value> </param> <param> <key>_rotation</key> @@ -71,8 +157,12 @@ <value>ampl</value> </param> <param> + <key>alias</key> + <value></value> + </param> + <param> <key>_coordinate</key> - <value>(409, 35)</value> + <value>(308, 0)</value> </param> <param> <key>_rotation</key> @@ -83,7 +173,7 @@ <key>xmlrpc_client</key> <param> <key>id</key> - <value>xmlrpc_client</value> + <value>xmlrpc_client1</value> </param> <param> <key>_enabled</key> @@ -99,15 +189,19 @@ </param> <param> <key>callback</key> - <value>set_freq</value> + <value>set_offset</value> </param> <param> <key>variable</key> - <value>freq</value> + <value>offset*ampl</value> + </param> + <param> + <key>alias</key> + <value></value> </param> <param> <key>_coordinate</key> - <value>(222, 34)</value> + <value>(440, 4)</value> </param> <param> <key>_rotation</key> @@ -115,7 +209,7 @@ </param> </block> <block> - <key>variable_slider</key> + <key>variable_qtgui_range</key> <param> <key>id</key> <value>freq</value> @@ -133,28 +227,40 @@ <value>1000</value> </param> <param> - <key>min</key> + <key>start</key> <value>0</value> </param> <param> - <key>max</key> - <value>5000</value> + <key>stop</key> + <value>5e3</value> + </param> + <param> + <key>step</key> + <value>1</value> </param> <param> - <key>num_steps</key> - <value>100</value> + <key>widget</key> + <value>counter_slider</value> </param> <param> - <key>slider_type</key> - <value>horizontal</value> + <key>orient</key> + <value>Qt.Horizontal</value> </param> <param> - <key>grid_pos</key> - <value>0, 0, 1, 2</value> + <key>min_len</key> + <value>200</value> + </param> + <param> + <key>gui_hint</key> + <value>0,0,1,2</value> + </param> + <param> + <key>alias</key> + <value></value> </param> <param> <key>_coordinate</key> - <value>(207, 162)</value> + <value>(209, 165)</value> </param> <param> <key>_rotation</key> @@ -162,7 +268,7 @@ </param> </block> <block> - <key>variable_slider</key> + <key>variable_qtgui_range</key> <param> <key>id</key> <value>ampl</value> @@ -180,28 +286,40 @@ <value>1</value> </param> <param> - <key>min</key> + <key>start</key> <value>0</value> </param> <param> - <key>max</key> + <key>stop</key> <value>2</value> </param> <param> - <key>num_steps</key> - <value>100</value> + <key>step</key> + <value>.1</value> + </param> + <param> + <key>widget</key> + <value>counter_slider</value> </param> <param> - <key>slider_type</key> - <value>horizontal</value> + <key>orient</key> + <value>Qt.Horizontal</value> </param> <param> - <key>grid_pos</key> - <value>1, 0, 1, 2</value> + <key>min_len</key> + <value>200</value> + </param> + <param> + <key>gui_hint</key> + <value>1,0,1,2</value> + </param> + <param> + <key>alias</key> + <value></value> </param> <param> <key>_coordinate</key> - <value>(397, 167)</value> + <value>(367, 158)</value> </param> <param> <key>_rotation</key> @@ -209,7 +327,7 @@ </param> </block> <block> - <key>variable_chooser</key> + <key>variable_qtgui_chooser</key> <param> <key>id</key> <value>offset</value> @@ -223,90 +341,88 @@ <value>Offset</value> </param> <param> - <key>value_index</key> - <value>1</value> + <key>type</key> + <value>int</value> </param> <param> - <key>choices</key> - <value>[-1, 0, 1]</value> + <key>num_opts</key> + <value>3</value> </param> <param> - <key>labels</key> - <value>["neg", "zero", "pos"]</value> + <key>value</key> + <value>0</value> </param> <param> - <key>chooser_type</key> - <value>radio_buttons_horizontal</value> + <key>options</key> + <value>[0, 1, 2]</value> </param> <param> - <key>grid_pos</key> - <value>2, 0, 1, 2</value> + <key>labels</key> + <value>[]</value> </param> <param> - <key>_coordinate</key> - <value>(596, 177)</value> + <key>option0</key> + <value>-1</value> </param> <param> - <key>_rotation</key> + <key>label0</key> + <value>neg</value> + </param> + <param> + <key>option1</key> <value>0</value> </param> - </block> - <block> - <key>xmlrpc_client</key> <param> - <key>id</key> - <value>xmlrpc_client1</value> + <key>label1</key> + <value>zero</value> </param> <param> - <key>_enabled</key> - <value>True</value> + <key>option2</key> + <value>1</value> </param> <param> - <key>addr</key> - <value>localhost</value> + <key>label2</key> + <value>pos</value> </param> <param> - <key>port</key> - <value>1234</value> + <key>option3</key> + <value>3</value> </param> <param> - <key>callback</key> - <value>set_offset</value> + <key>label3</key> + <value></value> </param> <param> - <key>variable</key> - <value>offset*ampl</value> + <key>option4</key> + <value>4</value> </param> <param> - <key>_coordinate</key> - <value>(608, 39)</value> + <key>label4</key> + <value></value> </param> <param> - <key>_rotation</key> - <value>0</value> + <key>widget</key> + <value>combo_box</value> </param> - </block> - <block> - <key>variable</key> <param> - <key>id</key> - <value>samp_rate</value> + <key>orient</key> + <value>Qt.QVBoxLayout</value> </param> <param> - <key>_enabled</key> - <value>True</value> + <key>gui_hint</key> + <value>2,0,1,2</value> </param> <param> - <key>value</key> - <value>32000</value> + <key>alias</key> + <value></value> </param> <param> <key>_coordinate</key> - <value>(13, 172)</value> + <value>(531, 145)</value> </param> <param> <key>_rotation</key> <value>0</value> </param> </block> -</flow_graph>
\ No newline at end of file +</flow_graph> diff --git a/grc/examples/xmlrpc/xmlrpc_server.grc b/grc/examples/xmlrpc/xmlrpc_server.grc index 3a133fd7c4..d210b2694e 100644 --- a/grc/examples/xmlrpc/xmlrpc_server.grc +++ b/grc/examples/xmlrpc/xmlrpc_server.grc @@ -1,6 +1,6 @@ <?xml version='1.0' encoding='ASCII'?> <flow_graph> - <timestamp>Sat Nov 10 15:20:55 2012</timestamp> + <timestamp>Sat Jul 12 17:11:40 2014</timestamp> <block> <key>options</key> <param> @@ -29,7 +29,7 @@ </param> <param> <key>generate_options</key> - <value>wx_gui</value> + <value>qt_gui</value> </param> <param> <key>category</key> @@ -52,8 +52,12 @@ <value></value> </param> <param> + <key>alias</key> + <value></value> + </param> + <param> <key>_coordinate</key> - <value>(10, 10)</value> + <value>(0, -1)</value> </param> <param> <key>_rotation</key> @@ -64,7 +68,7 @@ <key>variable</key> <param> <key>id</key> - <value>offset</value> + <value>ampl</value> </param> <param> <key>_enabled</key> @@ -72,11 +76,42 @@ </param> <param> <key>value</key> + <value>1</value> + </param> + <param> + <key>alias</key> + <value></value> + </param> + <param> + <key>_coordinate</key> + <value>(4, 291)</value> + </param> + <param> + <key>_rotation</key> <value>0</value> </param> + </block> + <block> + <key>variable</key> + <param> + <key>id</key> + <value>freq</value> + </param> + <param> + <key>_enabled</key> + <value>True</value> + </param> + <param> + <key>value</key> + <value>1000</value> + </param> + <param> + <key>alias</key> + <value></value> + </param> <param> <key>_coordinate</key> - <value>(12, 390)</value> + <value>(2, 213)</value> </param> <param> <key>_rotation</key> @@ -84,26 +119,26 @@ </param> </block> <block> - <key>xmlrpc_server</key> + <key>variable</key> <param> <key>id</key> - <value>xmlrpc_server</value> + <value>samp_rate</value> </param> <param> <key>_enabled</key> <value>True</value> </param> <param> - <key>addr</key> - <value>localhost</value> + <key>value</key> + <value>32000</value> </param> <param> - <key>port</key> - <value>1234</value> + <key>alias</key> + <value></value> </param> <param> <key>_coordinate</key> - <value>(395, 240)</value> + <value>(2, 136)</value> </param> <param> <key>_rotation</key> @@ -111,74 +146,136 @@ </param> </block> <block> - <key>wxgui_scopesink2</key> + <key>variable</key> <param> <key>id</key> - <value>wxgui_scopesink2</value> + <value>offset</value> </param> <param> <key>_enabled</key> <value>True</value> </param> <param> - <key>type</key> - <value>float</value> + <key>value</key> + <value>0</value> </param> <param> - <key>title</key> - <value>Scope Plot</value> + <key>alias</key> + <value></value> + </param> + <param> + <key>_coordinate</key> + <value>(3, 366)</value> + </param> + <param> + <key>_rotation</key> + <value>0</value> + </param> + </block> + <block> + <key>analog_sig_source_x</key> + <param> + <key>id</key> + <value>analog_sig_source_x_0</value> + </param> + <param> + <key>_enabled</key> + <value>True</value> + </param> + <param> + <key>type</key> + <value>float</value> </param> <param> <key>samp_rate</key> <value>samp_rate</value> </param> <param> - <key>v_scale</key> + <key>waveform</key> + <value>analog.GR_COS_WAVE</value> + </param> + <param> + <key>freq</key> + <value>freq</value> + </param> + <param> + <key>amp</key> + <value>ampl</value> + </param> + <param> + <key>offset</key> + <value>offset</value> + </param> + <param> + <key>alias</key> + <value></value> + </param> + <param> + <key>affinity</key> + <value></value> + </param> + <param> + <key>minoutbuf</key> <value>0</value> </param> <param> - <key>v_offset</key> + <key>maxoutbuf</key> <value>0</value> </param> <param> - <key>t_scale</key> - <value>.001</value> + <key>_coordinate</key> + <value>(175, 0)</value> </param> <param> - <key>ac_couple</key> - <value>False</value> + <key>_rotation</key> + <value>0</value> </param> + </block> + <block> + <key>blocks_throttle</key> <param> - <key>xy_mode</key> - <value>False</value> + <key>id</key> + <value>blocks_throttle</value> + </param> + <param> + <key>_enabled</key> + <value>True</value> </param> <param> - <key>num_inputs</key> + <key>type</key> + <value>float</value> + </param> + <param> + <key>samples_per_second</key> + <value>samp_rate</value> + </param> + <param> + <key>vlen</key> <value>1</value> </param> <param> - <key>win_size</key> - <value></value> + <key>ignoretag</key> + <value>True</value> </param> <param> - <key>grid_pos</key> - <value>0, 0, 2, 4</value> + <key>alias</key> + <value></value> </param> <param> - <key>notebook</key> + <key>affinity</key> <value></value> </param> <param> - <key>trig_mode</key> - <value>wxgui.TRIG_MODE_AUTO</value> + <key>minoutbuf</key> + <value>0</value> </param> <param> - <key>y_axis_label</key> - <value>Counts</value> + <key>maxoutbuf</key> + <value>0</value> </param> <param> <key>_coordinate</key> - <value>(623, 28)</value> + <value>(399, 35)</value> </param> <param> <key>_rotation</key> @@ -186,10 +283,41 @@ </param> </block> <block> - <key>wxgui_fftsink2</key> + <key>xmlrpc_server</key> <param> <key>id</key> - <value>wxgui_fftsink2</value> + <value>xmlrpc_server</value> + </param> + <param> + <key>_enabled</key> + <value>True</value> + </param> + <param> + <key>addr</key> + <value>localhost</value> + </param> + <param> + <key>port</key> + <value>1234</value> + </param> + <param> + <key>alias</key> + <value></value> + </param> + <param> + <key>_coordinate</key> + <value>(129, 137)</value> + </param> + <param> + <key>_rotation</key> + <value>0</value> + </param> + </block> + <block> + <key>qtgui_time_sink_x</key> + <param> + <key>id</key> + <value>qtgui_time_sink_x_0</value> </param> <param> <key>_enabled</key> @@ -200,176 +328,320 @@ <value>float</value> </param> <param> - <key>title</key> - <value>FFT Plot</value> + <key>name</key> + <value>Scope Plot</value> </param> <param> - <key>samp_rate</key> + <key>size</key> + <value>1024</value> + </param> + <param> + <key>srate</key> <value>samp_rate</value> </param> <param> - <key>baseband_freq</key> - <value>0</value> + <key>autoscale</key> + <value>False</value> </param> <param> - <key>y_per_div</key> - <value>10</value> + <key>ymin</key> + <value>-1</value> </param> <param> - <key>y_divs</key> - <value>8</value> + <key>ymax</key> + <value>1</value> </param> <param> - <key>ref_level</key> - <value>50</value> + <key>nconnections</key> + <value>1</value> </param> <param> - <key>ref_scale</key> - <value>2.0</value> + <key>update_time</key> + <value>0.10</value> </param> <param> - <key>fft_size</key> - <value>512</value> + <key>entags</key> + <value>True</value> </param> <param> - <key>fft_rate</key> - <value>15</value> + <key>gui_hint</key> + <value>0, 0, 2, 4</value> </param> <param> - <key>peak_hold</key> - <value>False</value> + <key>tr_mode</key> + <value>qtgui.TRIG_MODE_FREE</value> </param> <param> - <key>average</key> - <value>False</value> + <key>tr_slope</key> + <value>qtgui.TRIG_SLOPE_POS</value> </param> <param> - <key>avg_alpha</key> + <key>tr_level</key> + <value>0.0</value> + </param> + <param> + <key>tr_delay</key> <value>0</value> </param> <param> - <key>win</key> - <value>None</value> + <key>tr_chan</key> + <value>0</value> </param> <param> - <key>win_size</key> + <key>tr_tag</key> + <value>""</value> + </param> + <param> + <key>label1</key> <value></value> </param> <param> - <key>grid_pos</key> - <value>2, 0, 2, 4</value> + <key>width1</key> + <value>1</value> </param> <param> - <key>notebook</key> + <key>color1</key> + <value>"blue"</value> + </param> + <param> + <key>style1</key> + <value>1</value> + </param> + <param> + <key>marker1</key> + <value>-1</value> + </param> + <param> + <key>alpha1</key> + <value>1.0</value> + </param> + <param> + <key>label2</key> <value></value> </param> <param> - <key>freqvar</key> - <value>None</value> + <key>width2</key> + <value>1</value> </param> <param> - <key>_coordinate</key> - <value>(630, 233)</value> + <key>color2</key> + <value>"red"</value> </param> <param> - <key>_rotation</key> - <value>0</value> + <key>style2</key> + <value>1</value> </param> - </block> - <block> - <key>variable</key> <param> - <key>id</key> - <value>samp_rate</value> + <key>marker2</key> + <value>-1</value> </param> <param> - <key>_enabled</key> - <value>True</value> + <key>alpha2</key> + <value>1.0</value> </param> <param> - <key>value</key> - <value>32000</value> + <key>label3</key> + <value></value> </param> <param> - <key>_coordinate</key> - <value>(11, 160)</value> + <key>width3</key> + <value>1</value> </param> <param> - <key>_rotation</key> - <value>0</value> + <key>color3</key> + <value>"green"</value> </param> - </block> - <block> - <key>variable</key> <param> - <key>id</key> - <value>freq</value> + <key>style3</key> + <value>1</value> </param> <param> - <key>_enabled</key> - <value>True</value> + <key>marker3</key> + <value>-1</value> </param> <param> - <key>value</key> - <value>1000</value> + <key>alpha3</key> + <value>1.0</value> </param> <param> - <key>_coordinate</key> - <value>(11, 237)</value> + <key>label4</key> + <value></value> </param> <param> - <key>_rotation</key> - <value>0</value> + <key>width4</key> + <value>1</value> </param> - </block> - <block> - <key>variable</key> <param> - <key>id</key> - <value>ampl</value> + <key>color4</key> + <value>"black"</value> </param> <param> - <key>_enabled</key> - <value>True</value> + <key>style4</key> + <value>1</value> </param> <param> - <key>value</key> + <key>marker4</key> + <value>-1</value> + </param> + <param> + <key>alpha4</key> + <value>1.0</value> + </param> + <param> + <key>label5</key> + <value></value> + </param> + <param> + <key>width5</key> <value>1</value> </param> <param> - <key>_coordinate</key> - <value>(13, 315)</value> + <key>color5</key> + <value>"cyan"</value> </param> <param> - <key>_rotation</key> - <value>0</value> + <key>style5</key> + <value>1</value> </param> - </block> - <block> - <key>blocks_throttle</key> <param> - <key>id</key> - <value>blocks_throttle</value> + <key>marker5</key> + <value>-1</value> </param> <param> - <key>_enabled</key> - <value>True</value> + <key>alpha5</key> + <value>1.0</value> </param> <param> - <key>type</key> - <value>float</value> + <key>label6</key> + <value></value> </param> <param> - <key>samples_per_second</key> - <value>samp_rate</value> + <key>width6</key> + <value>1</value> </param> <param> - <key>vlen</key> + <key>color6</key> + <value>"magenta"</value> + </param> + <param> + <key>style6</key> <value>1</value> </param> <param> + <key>marker6</key> + <value>-1</value> + </param> + <param> + <key>alpha6</key> + <value>1.0</value> + </param> + <param> + <key>label7</key> + <value></value> + </param> + <param> + <key>width7</key> + <value>1</value> + </param> + <param> + <key>color7</key> + <value>"yellow"</value> + </param> + <param> + <key>style7</key> + <value>1</value> + </param> + <param> + <key>marker7</key> + <value>-1</value> + </param> + <param> + <key>alpha7</key> + <value>1.0</value> + </param> + <param> + <key>label8</key> + <value></value> + </param> + <param> + <key>width8</key> + <value>1</value> + </param> + <param> + <key>color8</key> + <value>"dark red"</value> + </param> + <param> + <key>style8</key> + <value>1</value> + </param> + <param> + <key>marker8</key> + <value>-1</value> + </param> + <param> + <key>alpha8</key> + <value>1.0</value> + </param> + <param> + <key>label9</key> + <value></value> + </param> + <param> + <key>width9</key> + <value>1</value> + </param> + <param> + <key>color9</key> + <value>"dark green"</value> + </param> + <param> + <key>style9</key> + <value>1</value> + </param> + <param> + <key>marker9</key> + <value>-1</value> + </param> + <param> + <key>alpha9</key> + <value>1.0</value> + </param> + <param> + <key>label10</key> + <value></value> + </param> + <param> + <key>width10</key> + <value>1</value> + </param> + <param> + <key>color10</key> + <value>"blue"</value> + </param> + <param> + <key>style10</key> + <value>1</value> + </param> + <param> + <key>marker10</key> + <value>-1</value> + </param> + <param> + <key>alpha10</key> + <value>1.0</value> + </param> + <param> + <key>alias</key> + <value></value> + </param> + <param> + <key>affinity</key> + <value></value> + </param> + <param> <key>_coordinate</key> - <value>(386, 93)</value> + <value>(644, 13)</value> </param> <param> <key>_rotation</key> @@ -377,10 +649,10 @@ </param> </block> <block> - <key>analog_sig_source_x</key> + <key>qtgui_freq_sink_x</key> <param> <key>id</key> - <value>analog_sig_source_x_0</value> + <value>qtgui_freq_sink_x_0</value> </param> <param> <key>_enabled</key> @@ -391,28 +663,224 @@ <value>float</value> </param> <param> - <key>samp_rate</key> + <key>name</key> + <value>Spectrum Plot</value> + </param> + <param> + <key>fftsize</key> + <value>1024</value> + </param> + <param> + <key>wintype</key> + <value>firdes.WIN_BLACKMAN_hARRIS</value> + </param> + <param> + <key>fc</key> + <value>0</value> + </param> + <param> + <key>bw</key> <value>samp_rate</value> </param> <param> - <key>waveform</key> - <value>analog.GR_COS_WAVE</value> + <key>autoscale</key> + <value>False</value> </param> <param> - <key>freq</key> - <value>freq</value> + <key>average</key> + <value>1.0</value> </param> <param> - <key>amp</key> - <value>ampl</value> + <key>ymin</key> + <value>-140</value> </param> <param> - <key>offset</key> - <value>offset</value> + <key>ymax</key> + <value>10</value> + </param> + <param> + <key>nconnections</key> + <value>1</value> + </param> + <param> + <key>update_time</key> + <value>0.10</value> + </param> + <param> + <key>gui_hint</key> + <value>2, 0, 2, 4</value> + </param> + <param> + <key>label1</key> + <value></value> + </param> + <param> + <key>width1</key> + <value>1</value> + </param> + <param> + <key>color1</key> + <value>"blue"</value> + </param> + <param> + <key>alpha1</key> + <value>1.0</value> + </param> + <param> + <key>label2</key> + <value></value> + </param> + <param> + <key>width2</key> + <value>1</value> + </param> + <param> + <key>color2</key> + <value>"red"</value> + </param> + <param> + <key>alpha2</key> + <value>1.0</value> + </param> + <param> + <key>label3</key> + <value></value> + </param> + <param> + <key>width3</key> + <value>1</value> + </param> + <param> + <key>color3</key> + <value>"green"</value> + </param> + <param> + <key>alpha3</key> + <value>1.0</value> + </param> + <param> + <key>label4</key> + <value></value> + </param> + <param> + <key>width4</key> + <value>1</value> + </param> + <param> + <key>color4</key> + <value>"black"</value> + </param> + <param> + <key>alpha4</key> + <value>1.0</value> + </param> + <param> + <key>label5</key> + <value></value> + </param> + <param> + <key>width5</key> + <value>1</value> + </param> + <param> + <key>color5</key> + <value>"cyan"</value> + </param> + <param> + <key>alpha5</key> + <value>1.0</value> + </param> + <param> + <key>label6</key> + <value></value> + </param> + <param> + <key>width6</key> + <value>1</value> + </param> + <param> + <key>color6</key> + <value>"magenta"</value> + </param> + <param> + <key>alpha6</key> + <value>1.0</value> + </param> + <param> + <key>label7</key> + <value></value> + </param> + <param> + <key>width7</key> + <value>1</value> + </param> + <param> + <key>color7</key> + <value>"yellow"</value> + </param> + <param> + <key>alpha7</key> + <value>1.0</value> + </param> + <param> + <key>label8</key> + <value></value> + </param> + <param> + <key>width8</key> + <value>1</value> + </param> + <param> + <key>color8</key> + <value>"dark red"</value> + </param> + <param> + <key>alpha8</key> + <value>1.0</value> + </param> + <param> + <key>label9</key> + <value></value> + </param> + <param> + <key>width9</key> + <value>1</value> + </param> + <param> + <key>color9</key> + <value>"dark green"</value> + </param> + <param> + <key>alpha9</key> + <value>1.0</value> + </param> + <param> + <key>label10</key> + <value></value> + </param> + <param> + <key>width10</key> + <value>1</value> + </param> + <param> + <key>color10</key> + <value>"dark blue"</value> + </param> + <param> + <key>alpha10</key> + <value>1.0</value> + </param> + <param> + <key>alias</key> + <value></value> + </param> + <param> + <key>affinity</key> + <value></value> </param> <param> <key>_coordinate</key> - <value>(164, 154)</value> + <value>(644, 126)</value> </param> <param> <key>_rotation</key> @@ -420,20 +888,20 @@ </param> </block> <connection> - <source_block_id>blocks_throttle</source_block_id> - <sink_block_id>wxgui_scopesink2</sink_block_id> + <source_block_id>analog_sig_source_x_0</source_block_id> + <sink_block_id>blocks_throttle</sink_block_id> <source_key>0</source_key> <sink_key>0</sink_key> </connection> <connection> <source_block_id>blocks_throttle</source_block_id> - <sink_block_id>wxgui_fftsink2</sink_block_id> + <sink_block_id>qtgui_time_sink_x_0</sink_block_id> <source_key>0</source_key> <sink_key>0</sink_key> </connection> <connection> - <source_block_id>analog_sig_source_x_0</source_block_id> - <sink_block_id>blocks_throttle</sink_block_id> + <source_block_id>blocks_throttle</source_block_id> + <sink_block_id>qtgui_freq_sink_x_0</sink_block_id> <source_key>0</source_key> <sink_key>0</sink_key> </connection> diff --git a/grc/gui/ActionHandler.py b/grc/gui/ActionHandler.py index 2c1c9942d7..18b7c9aee0 100644 --- a/grc/gui/ActionHandler.py +++ b/grc/gui/ActionHandler.py @@ -118,6 +118,7 @@ class ActionHandler: Actions.TYPES_WINDOW_DISPLAY, Actions.TOGGLE_BLOCKS_WINDOW, Actions.TOGGLE_REPORTS_WINDOW, Actions.TOGGLE_HIDE_DISABLED_BLOCKS, Actions.TOOLS_RUN_FDESIGN, Actions.TOGGLE_SCROLL_LOCK, Actions.CLEAR_REPORTS, + Actions.TOGGLE_AUTO_HIDE_PORT_LABELS ): action.set_sensitive(True) if ParseXML.xml_failures: Messages.send_xml_errors_if_any(ParseXML.xml_failures) @@ -136,6 +137,7 @@ class ActionHandler: Actions.TOGGLE_REPORTS_WINDOW.set_active(Preferences.reports_window_visibility()) Actions.TOGGLE_BLOCKS_WINDOW.set_active(Preferences.blocks_window_visibility()) Actions.TOGGLE_SCROLL_LOCK.set_active(Preferences.scroll_lock()) + Actions.TOGGLE_AUTO_HIDE_PORT_LABELS.set_active(Preferences.auto_hide_port_labels()) elif action == Actions.APPLICATION_QUIT: if self.main_window.close_pages(): gtk.main_quit() @@ -383,6 +385,9 @@ class ActionHandler: self.main_window.text_display.clear() elif action == Actions.TOGGLE_HIDE_DISABLED_BLOCKS: Actions.NOTHING_SELECT() + elif action == Actions.TOGGLE_AUTO_HIDE_PORT_LABELS: + Preferences.auto_hide_port_labels(action.get_active()) + self.main_window.get_flow_graph().create_shapes() ################################################## # Param Modifications ################################################## diff --git a/grc/gui/Actions.py b/grc/gui/Actions.py index a9ab41230d..484952b53a 100644 --- a/grc/gui/Actions.py +++ b/grc/gui/Actions.py @@ -242,6 +242,10 @@ TOGGLE_HIDE_DISABLED_BLOCKS = ToggleAction( stock_id=gtk.STOCK_MISSING_IMAGE, keypresses=(gtk.keysyms.d, gtk.gdk.CONTROL_MASK), ) +TOGGLE_AUTO_HIDE_PORT_LABELS = ToggleAction( + label='Auto-hide port _labels', + tooltip='Automatically hide port labels', +) BLOCK_CREATE_HIER = Action( label='C_reate Hier', tooltip='Create hier block from selected blocks', diff --git a/grc/gui/Bars.py b/grc/gui/Bars.py index 11e35c992b..8dae0f6981 100644 --- a/grc/gui/Bars.py +++ b/grc/gui/Bars.py @@ -97,6 +97,9 @@ MENU_BAR_LIST = ( Actions.TOGGLE_SCROLL_LOCK, Actions.CLEAR_REPORTS, None, + Actions.TOGGLE_HIDE_DISABLED_BLOCKS, + Actions.TOGGLE_AUTO_HIDE_PORT_LABELS, + None, Actions.ERRORS_WINDOW_DISPLAY, Actions.FIND_BLOCKS, ]), diff --git a/grc/gui/Block.py b/grc/gui/Block.py index 49c0361eb9..0afb351647 100644 --- a/grc/gui/Block.py +++ b/grc/gui/Block.py @@ -175,12 +175,19 @@ class Block(Element): #calculate width and height needed self.W = self.label_width + 2*BLOCK_LABEL_PADDING self.H = max(*( - [self.label_height+2*BLOCK_LABEL_PADDING] + [2*PORT_BORDER_SEPARATION + \ - sum([port.H + PORT_SEPARATION for port in ports]) - PORT_SEPARATION - for ports in (self.get_sources_gui(), self.get_sinks_gui())] + - [4*PORT_BORDER_SEPARATION + \ - sum([(port.H) + PORT_SEPARATION for port in ports]) - PORT_SEPARATION - for ports in ([i for i in self.get_sources_gui() if i.get_type() == 'bus'], [i for i in self.get_sinks_gui() if i.get_type() == 'bus'])] + [ # labels + self.label_height + 2 * BLOCK_LABEL_PADDING + ] + + [ # ports + 2 * PORT_BORDER_SEPARATION + + sum([port.H + PORT_SEPARATION for port in ports if not port.get_hide()]) - PORT_SEPARATION + for ports in (self.get_sources_gui(), self.get_sinks_gui()) + ] + + [ # bus ports only + 4 * PORT_BORDER_SEPARATION + + sum([port.H + PORT_SEPARATION for port in ports if port.get_type() == 'bus']) - PORT_SEPARATION + for ports in (self.get_sources_gui(), self.get_sinks_gui()) + ] )) def draw(self, gc, window): @@ -205,7 +212,8 @@ class Block(Element): window.draw_drawable(gc, self.vertical_label, 0, 0, x+(self.H-self.label_height)/2, y+BLOCK_LABEL_PADDING, -1, -1) #draw ports for port in self.get_ports_gui(): - port.draw(gc, window) + if not port.get_hide(): + port.draw(gc, window) def what_is_selected(self, coor, coor_m=None): """ diff --git a/grc/gui/Element.py b/grc/gui/Element.py index c43f0eb35c..95a4e2edab 100644 --- a/grc/gui/Element.py +++ b/grc/gui/Element.py @@ -262,3 +262,9 @@ class Element(object): if rotation not in POSSIBLE_ROTATIONS: raise Exception('"%s" is not one of the possible rotations: (%s)'%(rotation, POSSIBLE_ROTATIONS)) self.rotation = rotation + + def mouse_over(self): + pass + + def mouse_out(self): + pass diff --git a/grc/gui/FlowGraph.py b/grc/gui/FlowGraph.py index 2b3d08628a..bfe8fbfa4f 100644 --- a/grc/gui/FlowGraph.py +++ b/grc/gui/FlowGraph.py @@ -51,6 +51,8 @@ class FlowGraph(Element): #selected ports self._old_selected_port = None self._new_selected_port = None + # current mouse hover element + self.element_under_mouse = None #context menu self._context_menu = gtk.Menu() for action in [ @@ -544,35 +546,56 @@ class FlowGraph(Element): def handle_mouse_motion(self, coordinate): """ - The mouse has moved, respond to mouse dragging. + The mouse has moved, respond to mouse dragging or notify elements Move a selected element to the new coordinate. Auto-scroll the scroll bars at the boundaries. """ #to perform a movement, the mouse must be pressed # (no longer checking pending events via gtk.events_pending() - always true in Windows) - if not self.mouse_pressed: return - #perform autoscrolling - width, height = self.get_size() - x, y = coordinate - h_adj = self.get_scroll_pane().get_hadjustment() - v_adj = self.get_scroll_pane().get_vadjustment() - for pos, length, adj, adj_val, adj_len in ( - (x, width, h_adj, h_adj.get_value(), h_adj.page_size), - (y, height, v_adj, v_adj.get_value(), v_adj.page_size), - ): - #scroll if we moved near the border - if pos-adj_val > adj_len-SCROLL_PROXIMITY_SENSITIVITY and adj_val+SCROLL_DISTANCE < length-adj_len: - adj.set_value(adj_val+SCROLL_DISTANCE) - adj.emit('changed') - elif pos-adj_val < SCROLL_PROXIMITY_SENSITIVITY: - adj.set_value(adj_val-SCROLL_DISTANCE) - adj.emit('changed') - #remove the connection if selected in drag event - if len(self.get_selected_elements()) == 1 and self.get_selected_element().is_connection(): - Actions.ELEMENT_DELETE() - #move the selected elements and record the new coordinate - X, Y = self.get_coordinate() - if not self.get_ctrl_mask(): self.move_selected((int(x - X), int(y - Y))) - self.set_coordinate((x, y)) - #queue draw for animation - self.queue_draw() + if not self.mouse_pressed: + # only continue if mouse-over stuff is enabled (just the auto-hide port label stuff for now) + if not Actions.TOGGLE_AUTO_HIDE_PORT_LABELS.get_active(): return + redraw = False + for element in reversed(self.get_elements()): + over_element = element.what_is_selected(coordinate) + if not over_element: continue + if over_element != self.element_under_mouse: # over sth new + if self.element_under_mouse: + redraw |= self.element_under_mouse.mouse_out() or False + self.element_under_mouse = over_element + redraw |= over_element.mouse_over() or False + break + else: + if self.element_under_mouse: + redraw |= self.element_under_mouse.mouse_out() or False + self.element_under_mouse = None + if redraw: + #self.create_labels() + self.create_shapes() + self.queue_draw() + else: + #perform autoscrolling + width, height = self.get_size() + x, y = coordinate + h_adj = self.get_scroll_pane().get_hadjustment() + v_adj = self.get_scroll_pane().get_vadjustment() + for pos, length, adj, adj_val, adj_len in ( + (x, width, h_adj, h_adj.get_value(), h_adj.page_size), + (y, height, v_adj, v_adj.get_value(), v_adj.page_size), + ): + #scroll if we moved near the border + if pos-adj_val > adj_len-SCROLL_PROXIMITY_SENSITIVITY and adj_val+SCROLL_DISTANCE < length-adj_len: + adj.set_value(adj_val+SCROLL_DISTANCE) + adj.emit('changed') + elif pos-adj_val < SCROLL_PROXIMITY_SENSITIVITY: + adj.set_value(adj_val-SCROLL_DISTANCE) + adj.emit('changed') + #remove the connection if selected in drag event + if len(self.get_selected_elements()) == 1 and self.get_selected_element().is_connection(): + Actions.ELEMENT_DELETE() + #move the selected elements and record the new coordinate + X, Y = self.get_coordinate() + if not self.get_ctrl_mask(): self.move_selected((int(x - X), int(y - Y))) + self.set_coordinate((x, y)) + #queue draw for animation + self.queue_draw() diff --git a/grc/gui/Port.py b/grc/gui/Port.py index 8b4edfa430..b81b162f6e 100644 --- a/grc/gui/Port.py +++ b/grc/gui/Port.py @@ -23,14 +23,18 @@ from Constants import \ CONNECTOR_EXTENSION_INCREMENT, \ PORT_LABEL_PADDING, PORT_MIN_WIDTH import Utils +import Actions import Colors import pygtk pygtk.require('2.0') import gtk +PORT_HIDDEN_MARKUP_TMPL="""\ +<span foreground="black" font_desc="Sans 7.5"> </span>""" PORT_MARKUP_TMPL="""\ <span foreground="black" font_desc="Sans 7.5">$encode($port.get_name())</span>""" + class Port(Element): """The graphical port.""" @@ -40,7 +44,10 @@ class Port(Element): Create list of connector coordinates. """ Element.__init__(self) - self.connector_coordinates = dict() + self.W = self.H = self.w = self.h = 0 + self._connector_coordinate = (0,0) + self._connector_length = 0 + self._label_hidden = True def create_shapes(self): """Create new areas and labels for the port.""" @@ -52,40 +59,42 @@ class Port(Element): elif self.is_sink(): ports = self.get_parent().get_sinks_gui() #get the max width self.W = max([port.W for port in ports] + [PORT_MIN_WIDTH]) + W = self.W if not self.label_hidden() else 10 #get a numeric index for this port relative to its sibling ports try: index = ports.index(self) except: if hasattr(self, '_connector_length'): - del self._connector_length; + del self._connector_length return - length = len(ports) + length = len(filter(lambda p: not p.get_hide(), ports)) #reverse the order of ports for these rotations if rotation in (180, 270): index = length-index-1 offset = (self.get_parent().H - length*self.H - (length-1)*PORT_SEPARATION)/2 #create areas and connector coordinates if (self.is_sink() and rotation == 0) or (self.is_source() and rotation == 180): - x = -1*self.W + x = -1*W y = (PORT_SEPARATION+self.H)*index+offset - self.add_area((x, y), (self.W, self.H)) + self.add_area((x, y), (W, self.H)) self._connector_coordinate = (x-1, y+self.H/2) elif (self.is_source() and rotation == 0) or (self.is_sink() and rotation == 180): x = self.get_parent().W y = (PORT_SEPARATION+self.H)*index+offset - self.add_area((x, y), (self.W, self.H)) - self._connector_coordinate = (x+1+self.W, y+self.H/2) + self.add_area((x, y), (W, self.H)) + self._connector_coordinate = (x+1+W, y+self.H/2) elif (self.is_source() and rotation == 90) or (self.is_sink() and rotation == 270): - y = -1*self.W + y = -1*W x = (PORT_SEPARATION+self.H)*index+offset - self.add_area((x, y), (self.H, self.W)) + self.add_area((x, y), (self.H, W)) self._connector_coordinate = (x+self.H/2, y-1) elif (self.is_sink() and rotation == 90) or (self.is_source() and rotation == 270): y = self.get_parent().W x = (PORT_SEPARATION+self.H)*index+offset - self.add_area((x, y), (self.H, self.W)) - self._connector_coordinate = (x+self.H/2, y+1+self.W) + self.add_area((x, y), (self.H, W)) + self._connector_coordinate = (x+self.H/2, y+1+W) #the connector length self._connector_length = CONNECTOR_EXTENSION_MINIMAL + CONNECTOR_EXTENSION_INCREMENT*index + def modify_height(self, start_height): type_dict = {'bus':(lambda a: a * 3)}; @@ -102,8 +111,8 @@ class Port(Element): layout = gtk.DrawingArea().create_pango_layout('') layout.set_markup(Utils.parse_template(PORT_MARKUP_TMPL, port=self)) self.w, self.h = layout.get_pixel_size() - self.W, self.H = 2*PORT_LABEL_PADDING+self.w, 2*PORT_LABEL_PADDING+self.h - self.H = self.modify_height(self.H); + self.W, self.H = 2*PORT_LABEL_PADDING + self.w, 2*PORT_LABEL_PADDING+self.h + self.H = self.modify_height(self.H) #create the pixmap pixmap = self.get_parent().get_parent().new_pixmap(self.w, self.h) gc = pixmap.new_gc() @@ -129,6 +138,8 @@ class Port(Element): border_color=self.is_highlighted() and Colors.HIGHLIGHT_COLOR or self.get_parent().is_dummy_block() and Colors.MISSING_BLOCK_BORDER_COLOR or Colors.BORDER_COLOR, ) + if self.label_hidden(): + return X,Y = self.get_coordinate() (x,y),(w,h) = self._areas_list[0] #use the first area's sizes to place the labels if self.is_horizontal(): @@ -143,9 +154,9 @@ class Port(Element): Returns: the connector coordinate (x, y) tuple """ - x,y = self._connector_coordinate - X,Y = self.get_coordinate() - return (x+X, y+Y) + x, y = self._connector_coordinate + X, Y = self.get_coordinate() + return (x + X, y + Y) def get_connector_direction(self): """ @@ -222,3 +233,26 @@ class Port(Element): the parent's highlighting status """ return self.get_parent().is_highlighted() + + def label_hidden(self): + """ + Figure out if the label should be shown + + Returns: + true if the label should be hidden + """ + return self._label_hidden and Actions.TOGGLE_AUTO_HIDE_PORT_LABELS.get_active() + + def mouse_over(self): + """ + Called from flow graph on mouse-over + """ + self._label_hidden = False + return Actions.TOGGLE_AUTO_HIDE_PORT_LABELS.get_active() # only redraw if necessary + + def mouse_out(self): + """ + Called from flow graph on mouse-out + """ + self._label_hidden = True + return Actions.TOGGLE_AUTO_HIDE_PORT_LABELS.get_active() # only redraw if necessary diff --git a/grc/gui/Preferences.py b/grc/gui/Preferences.py index a6bd0d6603..d2ffc71410 100644 --- a/grc/gui/Preferences.py +++ b/grc/gui/Preferences.py @@ -101,3 +101,9 @@ def scroll_lock(visible=None): else: try: return _config_parser.getboolean('main', 'scroll_lock') except: return True + +def auto_hide_port_labels(hide=None): + if hide is not None: _config_parser.set('main', 'auto_hide_port_labels', hide) + else: + try: return _config_parser.getboolean('main', 'auto_hide_port_labels') + except: return True diff --git a/grc/python/Block.py b/grc/python/Block.py index 7a1c3a254f..9556e8f061 100644 --- a/grc/python/Block.py +++ b/grc/python/Block.py @@ -19,6 +19,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA from .. base.Block import Block as _Block from .. gui.Block import Block as _GUIBlock +from . FlowGraph import _variable_matcher import extract_docs class Block(_Block, _GUIBlock): @@ -90,6 +91,14 @@ class Block(_Block, _GUIBlock): if not self.get_parent().evaluate(check_res): self.add_error_message('Check "%s" failed.'%check) except: self.add_error_message('Check "%s" did not evaluate.'%check) + # for variables check the value (only if var_value is used + if _variable_matcher.match(self.get_key()) and self._var_value != '$value': + value = self._var_value + try: + value = self.get_var_value() + self.get_parent().evaluate(value) + except Exception as err: + self.add_error_message('Value "%s" cannot be evaluated:\n%s' % (value, err)) def rewrite(self): """ @@ -169,6 +178,7 @@ class Block(_Block, _GUIBlock): def get_make(self): return self.resolve_dependencies(self._make) def get_var_make(self): return self.resolve_dependencies(self._var_make) + def get_var_value(self): return self.resolve_dependencies(self._var_value) def get_callbacks(self): """ diff --git a/grc/python/FlowGraph.py b/grc/python/FlowGraph.py index 114f708cb2..daec2d4310 100644 --- a/grc/python/FlowGraph.py +++ b/grc/python/FlowGraph.py @@ -262,7 +262,7 @@ class FlowGraph(_FlowGraph, _GUIFlowGraph): #load variables for variable in self.get_variables(): try: - e = eval(variable.get_param('value').to_code(), n, n) + e = eval(variable.get_var_value(), n, n) n[variable.get_id()] = e except: pass #make namespace public diff --git a/grc/python/block.dtd b/grc/python/block.dtd index 18e53fda2a..576b428111 100644 --- a/grc/python/block.dtd +++ b/grc/python/block.dtd @@ -25,15 +25,15 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA Top level element. A block contains a name, ...parameters list, and list of IO ports. --> -<!ELEMENT block (name, key, category?, throttle?, import*, var_make?, make, callback*, param_tab_order?, param*, bus_sink?, bus_source?, check*, sink*, source*, bus_structure_sink?, bus_structure_source?, doc?, grc_source?)> +<!ELEMENT block (name, key, category?, throttle?, import*, var_make?, var_value?, make, callback*, param_tab_order?, param*, bus_sink?, bus_source?, check*, sink*, source*, bus_structure_sink?, bus_structure_source?, doc?, grc_source?)> <!-- Sub level elements. --> <!ELEMENT param_tab_order (tab+)> <!ELEMENT param (base_key?, name, key, value?, type?, hide?, option*, tab?)> <!ELEMENT option (name, key, opt*)> -<!ELEMENT sink (name, type, vlen?, nports?, optional?)> -<!ELEMENT source (name, type, vlen?, nports?, optional?)> +<!ELEMENT sink (name, type, vlen?, nports?, optional?, hide?)> +<!ELEMENT source (name, type, vlen?, nports?, optional?, hide?)> <!-- Bottom level elements. Character data only. @@ -57,6 +57,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA <!ELEMENT bus_structure_sink (#PCDATA)> <!ELEMENT bus_structure_source (#PCDATA)> <!ELEMENT var_make (#PCDATA)> +<!ELEMENT var_value (#PCDATA)> <!ELEMENT make (#PCDATA)> <!ELEMENT value (#PCDATA)> <!ELEMENT callback (#PCDATA)> diff --git a/volk/kernels/volk/volk_8u_x4_conv_k7_r2_8u.h b/volk/kernels/volk/volk_8u_x4_conv_k7_r2_8u.h index 7b29438b84..ece8cf0f48 100644 --- a/volk/kernels/volk/volk_8u_x4_conv_k7_r2_8u.h +++ b/volk/kernels/volk/volk_8u_x4_conv_k7_r2_8u.h @@ -8,7 +8,11 @@ typedef union { unsigned int w[64/*NUMSTATES*//32]; unsigned short s[64/*NUMSTATES*//16]; unsigned char c[64/*NUMSTATES*//8]; +#ifdef _MSC_VER +} decision_t; +#else } decision_t __attribute__ ((aligned (16))); +#endif static inline void renormalize(unsigned char* X, unsigned char threshold){ int NUMSTATES = 64; |