aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDimitri Stolnikov <horiz0n@gmx.net>2017-06-11 23:55:17 +0200
committerDimitri Stolnikov <horiz0n@gmx.net>2017-06-11 23:55:17 +0200
commitb7aab458ed706387cd34bc2c08c65f7562aee51b (patch)
treea175af14566f4de685fbbd1fc06d3b1782d5f595
parent1693e4e9d802b8420c022b7c64a7d40551d37884 (diff)
freesrp: whitespace fixes
-rw-r--r--lib/freesrp/freesrp_common.cc266
1 files changed, 133 insertions, 133 deletions
diff --git a/lib/freesrp/freesrp_common.cc b/lib/freesrp/freesrp_common.cc
index cbbf1c3..d60fbb8 100644
--- a/lib/freesrp/freesrp_common.cc
+++ b/lib/freesrp/freesrp_common.cc
@@ -15,185 +15,185 @@ boost::shared_ptr<::FreeSRP::FreeSRP> freesrp_common::_srp;
freesrp_common::freesrp_common(const string &args)
{
- dict_t dict = params_to_dict(args);
+ dict_t dict = params_to_dict(args);
- if(!_srp)
+ if(!_srp)
+ {
+ try
{
- try
+ string serial = "";
+
+ if(dict.count("freesrp"))
+ {
+ serial = dict["freesrp"];
+ }
+
+ if(dict.count("fx3"))
+ {
+ if(Util::find_fx3())
+ {
+ // Upload firmware to FX3
+ string firmware_path = string(getenv("HOME")) + "/.freesrp/fx3.img";
+ if(dict["fx3"].length() > 0)
+ {
+ firmware_path = dict["fx3"];
+ }
+ Util::find_fx3(true, firmware_path);
+ cout << "FX3 programmed with '" << firmware_path << "'" << endl;
+ // Give FX3 time to re-enumerate
+ this_thread::sleep_for(chrono::milliseconds(600));
+ }
+ else
+ {
+ cout << "No FX3 in bootloader mode found" << endl;
+ }
+ }
+
+ _srp.reset(new ::FreeSRP::FreeSRP(serial));
+
+ if(dict.count("fpga") || !_srp->fpga_loaded())
+ {
+ string bitstream_path = string(getenv("HOME")) + "/.freesrp/fpga.bin";
+ if(dict["fpga"].length() > 0)
+ {
+ bitstream_path = dict["fpga"];
+ }
+ fpga_status stat = _srp->load_fpga(bitstream_path);
+ switch(stat)
{
- string serial = "";
-
- if(dict.count("freesrp"))
- {
- serial = dict["freesrp"];
- }
-
- if(dict.count("fx3"))
- {
- if(Util::find_fx3())
- {
- // Upload firmware to FX3
- string firmware_path = string(getenv("HOME")) + "/.freesrp/fx3.img";
- if(dict["fx3"].length() > 0)
- {
- firmware_path = dict["fx3"];
- }
- Util::find_fx3(true, firmware_path);
- cout << "FX3 programmed with '" << firmware_path << "'" << endl;
- // Give FX3 time to re-enumerate
- this_thread::sleep_for(chrono::milliseconds(600));
- }
- else
- {
- cout << "No FX3 in bootloader mode found" << endl;
- }
- }
-
- _srp.reset(new ::FreeSRP::FreeSRP(serial));
-
- if(dict.count("fpga") || !_srp->fpga_loaded())
- {
- string bitstream_path = string(getenv("HOME")) + "/.freesrp/fpga.bin";
- if(dict["fpga"].length() > 0)
- {
- bitstream_path = dict["fpga"];
- }
- fpga_status stat = _srp->load_fpga(bitstream_path);
- switch(stat)
- {
- case FPGA_CONFIG_ERROR:
- throw runtime_error("Could not load FPGA configuration!");
- case FPGA_CONFIG_SKIPPED:
- cout << "FPGA already configured. Restart the FreeSRP to load a new bitstream." << endl;
- break;
- case FPGA_CONFIG_DONE:
- cout << "FPGA configured with '" << bitstream_path << "'" << endl;
- break;
- }
- }
-
- cout << "Connected to FreeSRP" << endl;
-
- if(dict.count("loopback"))
- {
- response res = _srp->send_cmd({SET_LOOPBACK_EN, 1});
- if(res.error == CMD_OK)
- {
- cout << "AD9364 in loopback mode" << endl;
- }
- else
- {
- throw runtime_error("Could not put AD9364 into loopback mode!");
- }
- }
- else
- {
- response res = _srp->send_cmd({SET_LOOPBACK_EN, 0});
- if(res.error != CMD_OK)
- {
- throw runtime_error("Error disabling AD9364 loopback mode!");
- }
- }
-
- if(dict.count("ignore_overflow"))
- {
- _ignore_overflow = true;
- }
- else
- {
- _ignore_overflow = false;
- }
+ case FPGA_CONFIG_ERROR:
+ throw runtime_error("Could not load FPGA configuration!");
+ case FPGA_CONFIG_SKIPPED:
+ cout << "FPGA already configured. Restart the FreeSRP to load a new bitstream." << endl;
+ break;
+ case FPGA_CONFIG_DONE:
+ cout << "FPGA configured with '" << bitstream_path << "'" << endl;
+ break;
}
- catch(const runtime_error& e)
+ }
+
+ cout << "Connected to FreeSRP" << endl;
+
+ if(dict.count("loopback"))
+ {
+ response res = _srp->send_cmd({SET_LOOPBACK_EN, 1});
+ if(res.error == CMD_OK)
+ {
+ cout << "AD9364 in loopback mode" << endl;
+ }
+ else
+ {
+ throw runtime_error("Could not put AD9364 into loopback mode!");
+ }
+ }
+ else
+ {
+ response res = _srp->send_cmd({SET_LOOPBACK_EN, 0});
+ if(res.error != CMD_OK)
{
- cerr << "FreeSRP Error: " << e.what() << endl;
- throw runtime_error(e.what());
+ throw runtime_error("Error disabling AD9364 loopback mode!");
}
+ }
+
+ if(dict.count("ignore_overflow"))
+ {
+ _ignore_overflow = true;
+ }
+ else
+ {
+ _ignore_overflow = false;
+ }
+ }
+ catch(const runtime_error& e)
+ {
+ cerr << "FreeSRP Error: " << e.what() << endl;
+ throw runtime_error(e.what());
}
+ }
}
vector<string> freesrp_common::get_devices()
{
- vector<string> devices;
+ vector<string> devices;
- vector<string> serial_numbers = ::FreeSRP::FreeSRP::list_connected();
+ vector<string> serial_numbers = ::FreeSRP::FreeSRP::list_connected();
- int index = 0;
+ int index = 0;
- for(string &serial : serial_numbers)
- {
- index++;
+ for(string &serial : serial_numbers)
+ {
+ index++;
- string str;
- str = "freesrp=" + serial + ",label='FreeSRP " + to_string(index) + "'";
+ string str;
+ str = "freesrp=" + serial + ",label='FreeSRP " + to_string(index) + "'";
- devices.push_back(str);
- }
+ devices.push_back(str);
+ }
- return devices;
+ return devices;
}
size_t freesrp_common::get_num_channels( void )
{
- return 1;
+ return 1;
}
osmosdr::meta_range_t freesrp_common::get_sample_rates( void )
{
- osmosdr::meta_range_t range;
-
- // Any sample rate between 1e6 and 61.44e6 can be requested.
- // This list of some integer values is used instead of
- // range += osmosdr::range_t(1e6, 61.44e6);
- // because SoapyOsmo seems to handle the range object differently.
- range += osmosdr::range_t(1e6);
- range += osmosdr::range_t(8e6);
- range += osmosdr::range_t(16e6);
- range += osmosdr::range_t(20e6);
- range += osmosdr::range_t(40e6);
- range += osmosdr::range_t(50e6);
- range += osmosdr::range_t(61.44e6);
-
- return range;
+ osmosdr::meta_range_t range;
+
+ // Any sample rate between 1e6 and 61.44e6 can be requested.
+ // This list of some integer values is used instead of
+ // range += osmosdr::range_t(1e6, 61.44e6);
+ // because SoapyOsmo seems to handle the range object differently.
+ range += osmosdr::range_t(1e6);
+ range += osmosdr::range_t(8e6);
+ range += osmosdr::range_t(16e6);
+ range += osmosdr::range_t(20e6);
+ range += osmosdr::range_t(40e6);
+ range += osmosdr::range_t(50e6);
+ range += osmosdr::range_t(61.44e6);
+
+ return range;
}
osmosdr::freq_range_t freesrp_common::get_freq_range(size_t chan)
{
- osmosdr::meta_range_t freq_ranges;
+ osmosdr::meta_range_t freq_ranges;
- freq_ranges.push_back(osmosdr::range_t(7e7, 6e9, 2.4));
+ freq_ranges.push_back(osmosdr::range_t(7e7, 6e9, 2.4));
- return freq_ranges;
+ return freq_ranges;
}
osmosdr::freq_range_t freesrp_common::get_bandwidth_range(size_t chan)
{
- osmosdr::meta_range_t range;
+ osmosdr::meta_range_t range;
- //range += osmosdr::range_t(2e5, 56e6);
+ //range += osmosdr::range_t(2e5, 56e6);
- range += osmosdr::range_t(2e5);
- range += osmosdr::range_t(1e6);
- range += osmosdr::range_t(8e6);
- range += osmosdr::range_t(16e6);
- range += osmosdr::range_t(20e6);
- range += osmosdr::range_t(40e6);
- range += osmosdr::range_t(50e6);
- range += osmosdr::range_t(56e6);
+ range += osmosdr::range_t(2e5);
+ range += osmosdr::range_t(1e6);
+ range += osmosdr::range_t(8e6);
+ range += osmosdr::range_t(16e6);
+ range += osmosdr::range_t(20e6);
+ range += osmosdr::range_t(40e6);
+ range += osmosdr::range_t(50e6);
+ range += osmosdr::range_t(56e6);
- return range;
+ return range;
}
double freesrp_common::set_freq_corr( double ppm, size_t chan )
{
- // TODO: Set DCXO tuning
- return 0;
+ // TODO: Set DCXO tuning
+ return 0;
}
double freesrp_common::get_freq_corr( size_t chan )
{
- // TODO: Get DCXO tuning
- return 0;
+ // TODO: Get DCXO tuning
+ return 0;
}