From 96b35880089ccd61ca846922706048a9e5501775 Mon Sep 17 00:00:00 2001 From: Margely Cornelissen <134381864+MaCuinea@users.noreply.github.com> Date: Mon, 20 Jan 2025 11:48:02 +0100 Subject: [PATCH 1/5] Update sequence_1_10_ch.py Remove not implemented warning --- .../interleaved_example/sequences/sequence_1_10_ch.py | 1 - 1 file changed, 1 deletion(-) diff --git a/standalone_driving_system_software/interleaved_example/sequences/sequence_1_10_ch.py b/standalone_driving_system_software/interleaved_example/sequences/sequence_1_10_ch.py index 74485b7..27069e6 100644 --- a/standalone_driving_system_software/interleaved_example/sequences/sequence_1_10_ch.py +++ b/standalone_driving_system_software/interleaved_example/sequences/sequence_1_10_ch.py @@ -80,7 +80,6 @@ def create_sequence_collection(logger): # based on the set focus. seq1.dephasing_degree = None # [degrees]: None, [120] or [0, 135, 239, 90] - # THE FEATURE IS NOT ENABLED YET! Use amplitude only for now # either set maximum pressure in free water [MPa], voltage [V] or amplitude [%] seq1.press = 0.5 # [MPa], maximum pressure in free water # seq1.volt = 0 # [V], voltage per channel From f8a2e1ca9d2da124fbfe7dca788e1d32b62266b4 Mon Sep 17 00:00:00 2001 From: Margely Cornelissen <134381864+MaCuinea@users.noreply.github.com> Date: Mon, 20 Jan 2025 11:48:35 +0100 Subject: [PATCH 2/5] Update sequence_17_26_ch.py Remove not implemented warning --- .../interleaved_example/sequences/sequence_17_26_ch.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/standalone_driving_system_software/interleaved_example/sequences/sequence_17_26_ch.py b/standalone_driving_system_software/interleaved_example/sequences/sequence_17_26_ch.py index d074ccc..c055023 100644 --- a/standalone_driving_system_software/interleaved_example/sequences/sequence_17_26_ch.py +++ b/standalone_driving_system_software/interleaved_example/sequences/sequence_17_26_ch.py @@ -79,7 +79,6 @@ def create_sequence_collection(logger): # based on the set focus. seq3.dephasing_degree = None # [degrees]: None, [120] or [0, 135, 239, 90] - # THE FEATURE IS NOT ENABLED YET! Use amplitude only for now # either set maximum pressure in free water [MPa], voltage [V] or amplitude [%] seq3.press = 0 # [MPa], maximum pressure in free water # seq3.volt = 0 # [V], voltage per channel @@ -119,7 +118,6 @@ def create_sequence_collection(logger): # based on the set focus. seq4.dephasing_degree = None # [degrees]: None, [120] or [0, 135, 239, 90] - # THE FEATURE IS NOT ENABLED YET! Use amplitude only for now # either set maximum pressure in free water [MPa], voltage [V] or amplitude [%] seq4.press = 0.5 # [MPa], maximum pressure in free water # seq4.volt = 0 # [V], voltage per channel From 3af74f5d76040937c62de2eed5fb8f7f13faf670 Mon Sep 17 00:00:00 2001 From: Margely Cornelissen <134381864+MaCuinea@users.noreply.github.com> Date: Mon, 20 Jan 2025 11:49:04 +0100 Subject: [PATCH 3/5] Update sequence_1_10_ch.py Remove not implemented warning --- .../interleaved_example/sequences/sequence_1_10_ch.py | 1 - 1 file changed, 1 deletion(-) diff --git a/standalone_driving_system_software/interleaved_example/sequences/sequence_1_10_ch.py b/standalone_driving_system_software/interleaved_example/sequences/sequence_1_10_ch.py index 27069e6..f7e6f6f 100644 --- a/standalone_driving_system_software/interleaved_example/sequences/sequence_1_10_ch.py +++ b/standalone_driving_system_software/interleaved_example/sequences/sequence_1_10_ch.py @@ -119,7 +119,6 @@ def create_sequence_collection(logger): # based on the set focus. seq2.dephasing_degree = None # [degrees]: None, [120] or [0, 135, 239, 90] - # THE FEATURE IS NOT ENABLED YET! Use amplitude only for now # either set maximum pressure in free water [MPa], voltage [V] or amplitude [%] seq2.press = 0 # [MPa], maximum pressure in free water # seq2.volt = 0 # [V], voltage per channel From a6cda26483cf381f1df149a134784327ce8d987a Mon Sep 17 00:00:00 2001 From: Margely Cornelissen <134381864+MaCuinea@users.noreply.github.com> Date: Thu, 20 Feb 2025 12:07:19 +0100 Subject: [PATCH 4/5] Wrong unit caused unresponsive system --- fus_ds_package/fus_driving_systems/igt/igt_ds.py | 2 ++ fus_ds_package/fus_driving_systems/sequence.py | 6 +++--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/fus_ds_package/fus_driving_systems/igt/igt_ds.py b/fus_ds_package/fus_driving_systems/igt/igt_ds.py index 9743561..5fb04a0 100644 --- a/fus_ds_package/fus_driving_systems/igt/igt_ds.py +++ b/fus_ds_package/fus_driving_systems/igt/igt_ds.py @@ -117,6 +117,8 @@ def register_sent_sequence(self, seq_num, seq, n_pulse_train_rep, pulse_train_de self.sent_seqs[seq_num]['total_sequence_duration_ms'] = total_sequence_duration_ms + 100 + logger.debug(f"Stored sequence {seq_num}: {self.sent_seqs[seq_num]}") + def connect(self, connect_info, log_dir='C:\\Temp', log_name='standalone_igt', attempt=0): """ Connects to the IGT ultrasound driving system. diff --git a/fus_ds_package/fus_driving_systems/sequence.py b/fus_ds_package/fus_driving_systems/sequence.py index 76d8f43..9fa44ee 100644 --- a/fus_ds_package/fus_driving_systems/sequence.py +++ b/fus_ds_package/fus_driving_systems/sequence.py @@ -498,12 +498,12 @@ def n_triggers(self, n_triggers): True, True, True, False) if is_validated: self._n_triggers = n_triggers - + # set temporarily the pulse train repetition parameters equal to - # the pulse train duration to prevent default being lower than + # the pulse train duration to prevent default being lower than # pulse train duration self.pulse_train_rep_int = self.pulse_train_dur - self.pulse_train_rep_dur = self.pulse_train_dur + self.pulse_train_rep_dur = self.pulse_train_dur / 1e3 # convert from ms to s @property def transducer(self): From 93090d053c1c0ff686d58af1f2fabf929b7ffa31 Mon Sep 17 00:00:00 2001 From: Margely Cornelissen <134381864+MaCuinea@users.noreply.github.com> Date: Thu, 20 Feb 2025 12:08:53 +0100 Subject: [PATCH 5/5] Update igt_ds.py --- fus_ds_package/fus_driving_systems/igt/igt_ds.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fus_ds_package/fus_driving_systems/igt/igt_ds.py b/fus_ds_package/fus_driving_systems/igt/igt_ds.py index 5fb04a0..f34c7b1 100644 --- a/fus_ds_package/fus_driving_systems/igt/igt_ds.py +++ b/fus_ds_package/fus_driving_systems/igt/igt_ds.py @@ -117,7 +117,7 @@ def register_sent_sequence(self, seq_num, seq, n_pulse_train_rep, pulse_train_de self.sent_seqs[seq_num]['total_sequence_duration_ms'] = total_sequence_duration_ms + 100 - logger.debug(f"Stored sequence {seq_num}: {self.sent_seqs[seq_num]}") + logger.info(f"Stored sequence {seq_num}: {self.sent_seqs[seq_num]}") def connect(self, connect_info, log_dir='C:\\Temp', log_name='standalone_igt', attempt=0): """