Commit afafb570 authored by HB9FXQ's avatar HB9FXQ

* RSP1 LNA option changed to boolean value

* const getters
* removed redundant directives
* moved rsp_dev.cc stuff to namespace gr::sdrplay for better readability
* removed surrounding [] from GRC block definition
* general cleanup
parent fb7048a3
......@@ -30,7 +30,7 @@
</param>
<param>
<key>_enabled</key>
<value>True</value>
<value>1</value>
</param>
<param>
<key>_coordinate</key>
......@@ -101,7 +101,7 @@
</param>
<param>
<key>_enabled</key>
<value>True</value>
<value>1</value>
</param>
<param>
<key>_coordinate</key>
......@@ -132,7 +132,7 @@
</param>
<param>
<key>_enabled</key>
<value>True</value>
<value>1</value>
</param>
<param>
<key>false</key>
......@@ -179,7 +179,7 @@
</param>
<param>
<key>_enabled</key>
<value>True</value>
<value>1</value>
</param>
<param>
<key>false</key>
......@@ -226,7 +226,7 @@
</param>
<param>
<key>_enabled</key>
<value>True</value>
<value>1</value>
</param>
<param>
<key>_coordinate</key>
......@@ -289,7 +289,7 @@
</param>
<param>
<key>_enabled</key>
<value>True</value>
<value>1</value>
</param>
<param>
<key>_coordinate</key>
......@@ -352,7 +352,7 @@
</param>
<param>
<key>_enabled</key>
<value>True</value>
<value>1</value>
</param>
<param>
<key>_coordinate</key>
......@@ -403,6 +403,53 @@
<value>counter_slider</value>
</param>
</block>
<block>
<key>variable_qtgui_check_box</key>
<param>
<key>comment</key>
<value></value>
</param>
<param>
<key>value</key>
<value>False</value>
</param>
<param>
<key>_enabled</key>
<value>1</value>
</param>
<param>
<key>false</key>
<value>False</value>
</param>
<param>
<key>_coordinate</key>
<value>(48, 892)</value>
</param>
<param>
<key>gui_hint</key>
<value></value>
</param>
<param>
<key>_rotation</key>
<value>0</value>
</param>
<param>
<key>id</key>
<value>var_rsp1_LNA_ON_OFF</value>
</param>
<param>
<key>label</key>
<value>RSP1 Only: LNA ON OFF</value>
</param>
<param>
<key>true</key>
<value>True</value>
</param>
<param>
<key>type</key>
<value>int</value>
</param>
</block>
<block>
<key>sdrplay_rspduo_source</key>
<param>
......@@ -534,7 +581,7 @@
</param>
<param>
<key>_enabled</key>
<value>True</value>
<value>1</value>
</param>
<param>
<key>fftsize</key>
......@@ -633,7 +680,7 @@
</param>
<param>
<key>debug_enabled</key>
<value>True</value>
<value>False</value>
</param>
<param>
<key>device_serial</key>
......@@ -641,11 +688,11 @@
</param>
<param>
<key>_enabled</key>
<value>0</value>
<value>1</value>
</param>
<param>
<key>_coordinate</key>
<value>(344, 48)</value>
<value>(296, 36)</value>
</param>
<param>
<key>_rotation</key>
......@@ -669,7 +716,7 @@
</param>
<param>
<key>lna_atten_step</key>
<value>var_lna_atten_step</value>
<value>var_rsp1_LNA_ON_OFF</value>
</param>
<param>
<key>lo_mode</key>
......@@ -740,7 +787,7 @@
</param>
<param>
<key>_enabled</key>
<value>1</value>
<value>0</value>
</param>
<param>
<key>_coordinate</key>
......@@ -799,7 +846,7 @@
</param>
<param>
<key>antenna</key>
<value>'HIGHZ'</value>
<value>'A'</value>
</param>
<param>
<key>bw</key>
......@@ -823,7 +870,7 @@
</param>
<param>
<key>debug_enabled</key>
<value>True</value>
<value>False</value>
</param>
<param>
<key>device_serial</key>
......@@ -835,7 +882,7 @@
</param>
<param>
<key>_coordinate</key>
<value>(656, 624)</value>
<value>(560, 644)</value>
</param>
<param>
<key>_rotation</key>
......
......@@ -2,7 +2,7 @@
<block>
<name>RSP1 Source</name>
<key>sdrplay_rsp1_source</key>
<category>[SDRplay]</category>
<category>SDRplay</category>
<import>import sdrplay</import>
<make>sdrplay.rsp1_source($rf_freq, $bw, $agc_enabled, $if_atten_db, $dc_offset_mode, $iq_balance_mode,
$debug_enabled, $ifType, $lo_mode, $sample_rate, $lna_atten_step, $device_serial)
......@@ -120,7 +120,7 @@
</param>
<param>
<name>DeviceIndex or Serial#</name>
<name>DeviceIndex</name>
<key>device_serial</key>
<value>'0'</value>
<type>string</type>
......@@ -134,10 +134,10 @@
</param>
<param>
<name>LNA Attenuation Step</name>
<name>LNA ON/OFF</name>
<key>lna_atten_step</key>
<value>0</value>
<type>real</type>
<type>bool</type>
</param>
<param>
......@@ -165,4 +165,7 @@
<name>out</name>
<type>complex</type>
</source>
<doc>
The SDRplay RSP1 Source block
</doc>
</block>
......@@ -2,7 +2,7 @@
<block>
<name>RSP1A Source</name>
<key>sdrplay_rsp1a_source</key>
<category>[SDRplay]</category>
<category>SDRplay</category>
<import>import sdrplay</import>
<make>sdrplay.rsp1a_source($rf_freq, $bw, $agc_enabled, $if_atten_db, $dc_offset_mode, $iq_balance_mode,
$debug_enabled, $ifType, $lo_mode, $sample_rate, $bcast_notch, $dab_notch, $lna_atten_step, $biasT,
......@@ -189,4 +189,7 @@
<name>out</name>
<type>complex</type>
</source>
<doc>
The SDRplay RSP1A Source block
</doc>
</block>
......@@ -2,7 +2,7 @@
<block>
<name>RSP2 Source</name>
<key>sdrplay_rsp2_source</key>
<category>[SDRplay]</category>
<category>SDRplay</category>
<import>import sdrplay</import>
<make>sdrplay.rsp2_source($rf_freq, $bw, $agc_enabled, $if_atten_db, $dc_offset_mode, $iq_balance_mode,
$debug_enabled, $ifType, $lo_mode, $sample_rate, $lna_atten_step, $device_serial, $antenna)
......@@ -186,4 +186,7 @@
<name>out</name>
<type>complex</type>
</source>
<doc>
The SDRplay RSP1 Source block
</doc>
</block>
......@@ -2,7 +2,7 @@
<block>
<name>RSPduo Source</name>
<key>sdrplay_rspduo_source</key>
<category>[SDRplay]</category>
<category>SDRplay</category>
<import>import sdrplay</import>
<make>sdrplay.rspduo_source($rf_freq, $bw, $agc_enabled, $if_atten_db, $dc_offset_mode, $iq_balance_mode,
$debug_enabled, $ifType, $lo_mode, $sample_rate, $bcast_notch, $dab_notch, $lna_atten_step, $biasT,
......@@ -209,4 +209,7 @@
<name>out</name>
<type>complex</type>
</source>
<doc>
The SDRplay RSPduo Source block
</doc>
</block>
......@@ -18,10 +18,6 @@
* Boston, MA 02110-1301, USA.
*/
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
#include <gnuradio/io_signature.h>
#include "rsp1_source_impl.h"
......
......@@ -18,9 +18,6 @@
* Boston, MA 02110-1301, USA.
*/
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
#include <gnuradio/io_signature.h>
#include "rsp1a_source_impl.h"
......
......@@ -18,10 +18,6 @@
* Boston, MA 02110-1301, USA.
*/
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
#include <gnuradio/io_signature.h>
#include "rsp2_source_impl.h"
......
This diff is collapsed.
......@@ -43,27 +43,27 @@ namespace gr {
double set_sample_rate(double rate);
double get_sample_rate(void);
double get_sample_rate(void) const;
double set_center_freq(double freq);
double get_center_freq();
double get_center_freq() const;
bool set_gain_mode(bool automatic);
bool get_gain_mode();
bool get_gain_mode() const;
double set_gain(double gain);
double set_gain(double gain, const std::string &name);
double get_gain();
double get_gain() const;
double get_gain(const std::string &name);
double get_gain(const std::string &name) const;
std::string set_antenna(const std::string &antenna);
std::string get_antenna();
std::string get_antenna() const;
void set_dc_offset_mode(int mode);
......@@ -73,7 +73,7 @@ namespace gr {
double set_bandwidth(double bandwidth);
double get_bandwidth();
double get_bandwidth() const;
void startStreaming(void);
......@@ -87,7 +87,7 @@ namespace gr {
void set_biasT(bool biasT);
void set_deviceIndexOrSerial(std::string deviceIndexOrSerial);
void set_deviceIndexOrSerial(const std::string &deviceIndexOrSerial);
private:
void reinitDevice(int reason);
......
......@@ -18,10 +18,6 @@
* Boston, MA 02110-1301, USA.
*/
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
#include <gnuradio/io_signature.h>
#include "rspduo_source_impl.h"
......
......@@ -21,10 +21,6 @@
* Boston, MA 02110-1301, USA.
*/
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
#include <cppunit/TextTestRunner.h>
#include <cppunit/XmlOutputter.h>
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment