From 45f5b676bd2c8172ab8bd94159f57ad18eba93cd Mon Sep 17 00:00:00 2001 From: Oliver Silvester Date: Thu, 19 Sep 2024 11:41:37 +0100 Subject: [PATCH] Revert "increase panda pulse width" This reverts commit 6b5f1a76b921264de387ddb03f3ed0eac5773829. --- src/mx_bluesky/hyperion/device_setup_plans/setup_panda.py | 3 ++- .../unit_tests/hyperion/device_setup_plans/test_setup_panda.py | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/mx_bluesky/hyperion/device_setup_plans/setup_panda.py b/src/mx_bluesky/hyperion/device_setup_plans/setup_panda.py index 6efdc4810..df8e93602 100644 --- a/src/mx_bluesky/hyperion/device_setup_plans/setup_panda.py +++ b/src/mx_bluesky/hyperion/device_setup_plans/setup_panda.py @@ -22,7 +22,6 @@ MM_TO_ENCODER_COUNTS = 200000 GENERAL_TIMEOUT = 60 TICKS_PER_MS = 1000 # Panda sequencer prescaler will be set to us -PULSE_WIDTH_US = 50 class Enabled(Enum): @@ -79,6 +78,8 @@ def _get_seq_table( delay_between_pulses = time_between_steps_ms * TICKS_PER_MS + PULSE_WIDTH_US = 1 + assert delay_between_pulses > PULSE_WIDTH_US # BITA_1 trigger wired from TTLIN1, this is the trigger input diff --git a/tests/unit_tests/hyperion/device_setup_plans/test_setup_panda.py b/tests/unit_tests/hyperion/device_setup_plans/test_setup_panda.py index aaba74180..3c347fd38 100644 --- a/tests/unit_tests/hyperion/device_setup_plans/test_setup_panda.py +++ b/tests/unit_tests/hyperion/device_setup_plans/test_setup_panda.py @@ -13,7 +13,6 @@ from mx_bluesky.hyperion.device_setup_plans.setup_panda import ( MM_TO_ENCODER_COUNTS, - PULSE_WIDTH_US, disarm_panda_for_gridscan, set_panda_directory, setup_panda_for_flyscan, @@ -140,6 +139,8 @@ def test_setup_panda_correctly_configures_table( ][0] table = table_msg.args[0] + + PULSE_WIDTH_US = 1 SPACE_WIDTH_US = int(time_between_x_steps_ms * 1000 - PULSE_WIDTH_US) expected_seq_rows: list[SeqRow] = [ SeqRow(1, SeqTrigger.BITA_1, 0, 0, 0, 1, 0),