From dd63383c3914fd276c543a1264b3f193ea516ead Mon Sep 17 00:00:00 2001 From: awe Date: Wed, 18 Feb 2026 19:09:53 +0300 Subject: [PATCH] fix timings --- laser_control/example_usage.py | 16 ++++++++-------- laser_control/protocol.py | 6 +++--- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/laser_control/example_usage.py b/laser_control/example_usage.py index df6f13c..de08fea 100644 --- a/laser_control/example_usage.py +++ b/laser_control/example_usage.py @@ -57,14 +57,14 @@ def example_variation_mode(port: str = None): ctrl.start_variation( variation_type=VariationType.CHANGE_CURRENT_LD1, params={ - 'min_value': 20.0, # mA - 'max_value': 50.0, # mA - 'step': 0.5, # mA - 'time_step': 50, # µs - 'delay_time': 5, # ms - 'static_temp1': 25.0, - 'static_temp2': 30.0, - 'static_current1': 35.0, + 'min_value': 33.0, # mA (matches firmware initial current) + 'max_value': 60.0, # mA + 'step': 0.05, # mA + 'time_step': 50, # µs (20-100), Word 6 = time_step × 100 + 'delay_time': 10, # ms (3-10), Word 10 = Tau + 'static_temp1': 28.0, + 'static_temp2': 28.9, + 'static_current1': 33.0, 'static_current2': 35.0, } ) diff --git a/laser_control/protocol.py b/laser_control/protocol.py index 9b1e6cc..367b0d7 100644 --- a/laser_control/protocol.py +++ b/laser_control/protocol.py @@ -331,7 +331,7 @@ class Protocol: data += _flipfour(_int_to_hex4(current_ma_to_n(min_value))) # Word 3 data += _flipfour(_int_to_hex4(current_ma_to_n(max_value))) # Word 4 data += _flipfour(_int_to_hex4(current_ma_to_n(step))) # Word 5 - data += _flipfour(_int_to_hex4(int(delay_time * 100))) # Word 6 + data += _flipfour(_int_to_hex4(int(time_step * 100))) # Word 6: Delta_Time_µs × 100 data += _flipfour(_int_to_hex4(temp_c_to_n(static_temp1))) # Word 7 data += _flipfour(_int_to_hex4(current_ma_to_n(static_current2)))# Word 8 data += _flipfour(_int_to_hex4(temp_c_to_n(static_temp2))) # Word 9 @@ -339,7 +339,7 @@ class Protocol: data += _flipfour(_int_to_hex4(current_ma_to_n(min_value))) # Word 3 data += _flipfour(_int_to_hex4(current_ma_to_n(max_value))) # Word 4 data += _flipfour(_int_to_hex4(int(step * 100))) # Word 5 - data += _flipfour(_int_to_hex4(int(delay_time * 100))) # Word 6 + data += _flipfour(_int_to_hex4(int(time_step * 100))) # Word 6: Delta_Time_µs × 100 data += _flipfour(_int_to_hex4(temp_c_to_n(static_temp2))) # Word 7 data += _flipfour(_int_to_hex4(current_ma_to_n(static_current1)))# Word 8 data += _flipfour(_int_to_hex4(temp_c_to_n(static_temp1))) # Word 9 @@ -348,7 +348,7 @@ class Protocol: case _: raise ValueError(f"Unsupported task type: {task_type}") - data += _flipfour(_int_to_hex4(time_step)) # Word 10 + data += _flipfour(_int_to_hex4(int(delay_time))) # Word 10: Tau in ms (3-10) data += _flipfour(_int_to_hex4(pi_coeff1_p)) # Word 11 data += _flipfour(_int_to_hex4(pi_coeff1_i)) # Word 12 data += _flipfour(_int_to_hex4(pi_coeff2_p)) # Word 13