Skip to content

Commit

Permalink
fix pwm bug
Browse files Browse the repository at this point in the history
  • Loading branch information
kellytr committed Apr 10, 2024
1 parent b7f8f1a commit 008ff91
Showing 1 changed file with 10 additions and 1 deletion.
11 changes: 10 additions & 1 deletion pioreactor/utils/pwm.py
Original file line number Diff line number Diff line change
Expand Up @@ -178,12 +178,21 @@ def __init__(
pubsub_client: Optional[Client] = None,
logger: Optional[CustomLogger] = None,
) -> None:
<<<<<<< Updated upstream
self.unit: str = unit or get_unit_name()
self.experiment: str = experiment or get_assigned_experiment_name(unit)
=======
self.unit = unit or get_unit_name()
<<<<<<< Updated upstream
self.experiment = experiment or get_latest_experiment_name()
=======
self.experiment = experiment or get_assigned_experiment_name(self.unit)
>>>>>>> Stashed changes
>>>>>>> Stashed changes

if pubsub_client is None:
self._external_client = False
self.pubsub_client = create_client(client_id=f"pwm-{unit}-{experiment}-{pin}")
self.pubsub_client = create_client(client_id=f"pwm-{self.unit}-{experiment}-{pin}")
else:
self._external_client = True
self.pubsub_client = pubsub_client
Expand Down

0 comments on commit 008ff91

Please sign in to comment.