aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Braun <martin.braun@ettus.com>2017-06-02 15:04:54 -0700
committerMartin Braun <martin.braun@ettus.com>2017-12-22 15:03:58 -0800
commitd68c7dfa5adafbcbcdc913fc7778336958eb35c9 (patch)
tree9eda503326043181279821e75cf58774e1a9999f
parent664f471baf4478b664566a13e81e847dac8a2041 (diff)
downloaduhd-d68c7dfa5adafbcbcdc913fc7778336958eb35c9.tar.gz
uhd-d68c7dfa5adafbcbcdc913fc7778336958eb35c9.tar.bz2
uhd-d68c7dfa5adafbcbcdc913fc7778336958eb35c9.zip
eiscat: Made more functions return status values instead of None/void
-rw-r--r--host/lib/usrp/dboard/eiscat/eiscat_radio_ctrl_impl.cpp8
-rw-r--r--mpm/python/usrp_mpm/dboard_manager/eiscat.py2
2 files changed, 6 insertions, 4 deletions
diff --git a/host/lib/usrp/dboard/eiscat/eiscat_radio_ctrl_impl.cpp b/host/lib/usrp/dboard/eiscat/eiscat_radio_ctrl_impl.cpp
index 1be41dd84..5a7a5907f 100644
--- a/host/lib/usrp/dboard/eiscat/eiscat_radio_ctrl_impl.cpp
+++ b/host/lib/usrp/dboard/eiscat/eiscat_radio_ctrl_impl.cpp
@@ -408,12 +408,12 @@ void eiscat_radio_ctrl_impl::set_rpc_client(
"Finalizing dboard initialization using internal PPS"
);
send_sysref();
- rpcc->notify_with_token("db_0_init_adcs_and_deframers");
- rpcc->notify_with_token("db_1_init_adcs_and_deframers");
+ rpcc->request_with_token<bool>("db_0_init_adcs_and_deframers");
+ rpcc->request_with_token<bool>("db_1_init_adcs_and_deframers");
send_sysref();
std::this_thread::sleep_for(std::chrono::milliseconds(500));
- rpcc->notify_with_token("db_0_check_deframer_status");
- rpcc->notify_with_token("db_1_check_deframer_status");
+ rpcc->request_with_token<bool>("db_0_check_deframer_status");
+ rpcc->request_with_token<bool>("db_1_check_deframer_status");
}
/****************************************************************************
diff --git a/mpm/python/usrp_mpm/dboard_manager/eiscat.py b/mpm/python/usrp_mpm/dboard_manager/eiscat.py
index b3d70673d..dc4ee1cac 100644
--- a/mpm/python/usrp_mpm/dboard_manager/eiscat.py
+++ b/mpm/python/usrp_mpm/dboard_manager/eiscat.py
@@ -558,6 +558,7 @@ class EISCAT(DboardManagerBase):
self.log.info("ADC Initialization Complete!")
for jesd_core in self.jesd_cores:
jesd_core.init_deframer()
+ return True
def check_deframer_status(self):
"""
@@ -577,6 +578,7 @@ class EISCAT(DboardManagerBase):
)
self.log.info("JESD Core Initialized, link up! (woohoo!)")
self.initialized = True
+ return self.initialized
def shutdown(self):
"""