From 5a5512c3f0d7146822dc4d1af90a53076ce1cd97 Mon Sep 17 00:00:00 2001 From: dreamsourcelabTAI Date: Thu, 18 May 2023 14:51:19 +0800 Subject: [PATCH] fix: Trigger voltage cannot be adjusted correctly on DSO mode --- DSView/pv/view/dsosignal.cpp | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/DSView/pv/view/dsosignal.cpp b/DSView/pv/view/dsosignal.cpp index 468608ae..8418509b 100644 --- a/DSView/pv/view/dsosignal.cpp +++ b/DSView/pv/view/dsosignal.cpp @@ -453,11 +453,14 @@ void DsoSignal::set_trig_ratio(double ratio, bool delta_change) _trig_value = ratio2value(delta + 0.5); } else { + if (delta < 0.06f) + delta = 0.06f; + if (delta > 0.945f) + delta = 0.945f; + _trig_value = ratio2value(delta); } - - int margin = TrigMargin; - _trig_value = std::min(std::max(_trig_value, margin), (ratio2value(1) - margin)); + if (delta_change) _trig_delta = get_trig_vrate() - get_zero_ratio(); session->get_device()->set_config(_probe, NULL, SR_CONF_TRIGGER_VALUE,