From d68c7dfa5adafbcbcdc913fc7778336958eb35c9 Mon Sep 17 00:00:00 2001 From: Martin Braun Date: Fri, 2 Jun 2017 15:04:54 -0700 Subject: eiscat: Made more functions return status values instead of None/void --- host/lib/usrp/dboard/eiscat/eiscat_radio_ctrl_impl.cpp | 8 ++++---- mpm/python/usrp_mpm/dboard_manager/eiscat.py | 2 ++ 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("db_0_init_adcs_and_deframers"); + rpcc->request_with_token("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("db_0_check_deframer_status"); + rpcc->request_with_token("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): """ -- cgit v1.2.3