Skip to content

Commit 35be346

Browse files
authored
Merge pull request #126 from auscompgeek/magicbot-setup-feedback
magicbot: Collect component feedbacks after setup
2 parents 151ed58 + 64f3119 commit 35be346

File tree

1 file changed

+5
-3
lines changed

1 file changed

+5
-3
lines changed

magicbot/magicrobot.py

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -538,7 +538,6 @@ def _create_components(self):
538538
# For each new component, perform magic injection
539539
for cname, component in components:
540540
setup_tunables(component, cname, "components")
541-
self._feedbacks += collect_feedbacks(component, cname, "components")
542541
self._setup_vars(cname, component)
543542
self._setup_reset_vars(component)
544543

@@ -554,8 +553,11 @@ def _create_components(self):
554553

555554
# Call setup functions for components
556555
for cname, component in components:
557-
if hasattr(component, "setup"):
558-
component.setup()
556+
setup = getattr(component, "setup", None)
557+
if setup is not None:
558+
setup()
559+
# ... and grab all the feedback methods
560+
self._feedbacks += collect_feedbacks(component, cname, "components")
559561

560562
# Call setup functions for autonomous modes
561563
for mode in self._automodes.modes.values():

0 commit comments

Comments
 (0)