fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/28759 )
Change subject: trx_toolkit: simplify Transceiver.power_event_handler() ......................................................................
trx_toolkit: simplify Transceiver.power_event_handler()
Change-Id: I283f7ced0309bf823ad78c90e8006b9e9474dee7 --- M src/target/trx_toolkit/ctrl_if_trx.py M src/target/trx_toolkit/transceiver.py 2 files changed, 7 insertions(+), 19 deletions(-)
Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve laforge: Looks good to me, approved
diff --git a/src/target/trx_toolkit/ctrl_if_trx.py b/src/target/trx_toolkit/ctrl_if_trx.py index 46a55c5..2871f37 100644 --- a/src/target/trx_toolkit/ctrl_if_trx.py +++ b/src/target/trx_toolkit/ctrl_if_trx.py @@ -107,10 +107,7 @@ return -1
log.info("(%s) Starting transceiver..." % self.trx) - self.trx.running = True - - # Notify transceiver about that - self.trx.power_event_handler("POWERON") + self.trx.power_event_handler(poweron=True)
return 0
@@ -118,10 +115,7 @@ log.debug("(%s) Recv POWEROFF cmd" % self.trx)
log.info("(%s) Stopping transceiver..." % self.trx) - self.trx.running = False - - # Notify transceiver about that - self.trx.power_event_handler("POWEROFF") + self.trx.power_event_handler(poweron=False)
return 0
diff --git a/src/target/trx_toolkit/transceiver.py b/src/target/trx_toolkit/transceiver.py index 3390907..8241001 100644 --- a/src/target/trx_toolkit/transceiver.py +++ b/src/target/trx_toolkit/transceiver.py @@ -222,19 +222,13 @@ def ctrl_cmd_handler(self, request): return None
- def power_event_handler(self, event): - # Update child transceivers - for trx in self.child_trx_list.trx_list: - if event == "POWERON": - trx.running = True - elif event == "POWEROFF": - trx.running = False + def power_event_handler(self, poweron: bool) -> None: + # Update self and child transceivers + for trx in [self, *self.child_trx_list.trx_list]: + trx.running = poweron + if not poweron: trx.disable_fh()
- # Reset frequency hopping parameters - if event == "POWEROFF": - self.disable_fh() - # Trigger clock generator if required if self.clck_gen is not None: clck_links = self.clck_gen.clck_links
2 is the latest approved patch-set. No files were changed between the latest approved patch-set and the submitted one.