From 2bdb8d4e19d32fc969d478774e1604ea95c1781c Mon Sep 17 00:00:00 2001
From: rapzak <14205873+rapzak@users.noreply.github.com>
Date: Tue, 4 Feb 2025 20:23:57 +0100
Subject: [PATCH 1/5] Added SCPI UART Flush

---
 lib | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib b/lib
index 17d9e6083..a4df9b9a0 160000
--- a/lib
+++ b/lib
@@ -1 +1 @@
-Subproject commit 17d9e6083e93c09e3c5099e1a37488debb045de1
+Subproject commit a4df9b9a03537320a10994df6d44e0b3ff4c0d61

From 6f03d123755d08d6053bca2d7b51c4943d72bc9b Mon Sep 17 00:00:00 2001
From: rapzak <14205873+rapzak@users.noreply.github.com>
Date: Tue, 4 Feb 2025 22:45:49 +0100
Subject: [PATCH 2/5] update

---
 .gitignore | 2 ++
 lib        | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/.gitignore b/.gitignore
index 439279ace..e94ff7215 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,5 @@ analysis-build
 asan-build
 release-nodebug-build
 debug-noopt-build
+project/
+*.bak
diff --git a/lib b/lib
index a4df9b9a0..398a24bf1 160000
--- a/lib
+++ b/lib
@@ -1 +1 @@
-Subproject commit a4df9b9a03537320a10994df6d44e0b3ff4c0d61
+Subproject commit 398a24bf187b9a0cca5cd14d4673ef7bf2d8427c

From 198ef5cf7c98585c7a12ca7e2e1a52a24b74411f Mon Sep 17 00:00:00 2001
From: rapzak <14205873+rapzak@users.noreply.github.com>
Date: Wed, 26 Feb 2025 18:06:51 +0100
Subject: [PATCH 3/5] trigger

---
 src/ngscopeclient/ChannelPropertiesDialog.cpp | 3 +++
 src/ngscopeclient/TriggerPropertiesDialog.cpp | 5 ++++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/ngscopeclient/ChannelPropertiesDialog.cpp b/src/ngscopeclient/ChannelPropertiesDialog.cpp
index ea582b19f..3b87c739a 100644
--- a/src/ngscopeclient/ChannelPropertiesDialog.cpp
+++ b/src/ngscopeclient/ChannelPropertiesDialog.cpp
@@ -540,6 +540,8 @@ bool ChannelPropertiesDialog::DoRender()
 		{
 			if(ImGui::CollapsingHeader(streamname.c_str()))
 			{
+				
+				ImGui::PushID(i);
 				auto unit = m_channel->GetYAxisUnits(i);
 
 				//If no change to offset in dialog, update our input value when we change offset outside the dialog
@@ -565,6 +567,7 @@ bool ChannelPropertiesDialog::DoRender()
 				ImGui::SetNextItemWidth(width);
 				if(UnitInputWithExplicitApply("Range", m_range[i], m_committedRange[i], unit))
 					ochan->SetVoltageRange(m_committedRange[i], i);
+				ImGui::PopID();
 			}
 		}
 	}
diff --git a/src/ngscopeclient/TriggerPropertiesDialog.cpp b/src/ngscopeclient/TriggerPropertiesDialog.cpp
index e05661adc..1d4e1c387 100644
--- a/src/ngscopeclient/TriggerPropertiesDialog.cpp
+++ b/src/ngscopeclient/TriggerPropertiesDialog.cpp
@@ -118,7 +118,7 @@ void TriggerPropertiesPage::Render(bool graphEditorMode)
 				m_committedTriggerOffset,
 				fs))
 			{
-				m_scope->SetTriggerOffset(off);
+				m_scope->SetTriggerOffset(/*off*/m_committedTriggerOffset);
 			}
 
 			Dialog::HelpMarker(
@@ -249,6 +249,9 @@ void TriggerPropertiesPage::Render(bool graphEditorMode)
 				//Skip trigger level as that's redundant
 				if(it->first == "Level")
 					continue;
+					
+				if(it->second.IsHidden())
+					continue;
 
 				if(FilterPropertiesDialog::DoParameter(it->second, it->first, m_paramTempValues))
 					updated = true;

From ec9229a0b08fd3c105b415dfe0f7039f3e531faf Mon Sep 17 00:00:00 2001
From: rapzak <14205873+rapzak@users.noreply.github.com>
Date: Wed, 26 Feb 2025 18:06:57 +0100
Subject: [PATCH 4/5] Update lib

---
 lib | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib b/lib
index 398a24bf1..fe3fda8d8 160000
--- a/lib
+++ b/lib
@@ -1 +1 @@
-Subproject commit 398a24bf187b9a0cca5cd14d4673ef7bf2d8427c
+Subproject commit fe3fda8d80d0e82cc323b23346dfff5a74fbebf3

From f095f819462190f4f7caba16de5bde7a7967bc8c Mon Sep 17 00:00:00 2001
From: rapzak <14205873+rapzak@users.noreply.github.com>
Date: Wed, 26 Feb 2025 19:31:11 +0100
Subject: [PATCH 5/5] added update

---
 lib                                           | 2 +-
 src/ngscopeclient/TriggerPropertiesDialog.cpp | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/lib b/lib
index fe3fda8d8..365ae6845 160000
--- a/lib
+++ b/lib
@@ -1 +1 @@
-Subproject commit fe3fda8d80d0e82cc323b23346dfff5a74fbebf3
+Subproject commit 365ae6845befac21a2b0c47f158410a67b20e7c9
diff --git a/src/ngscopeclient/TriggerPropertiesDialog.cpp b/src/ngscopeclient/TriggerPropertiesDialog.cpp
index 1d4e1c387..23b74d360 100644
--- a/src/ngscopeclient/TriggerPropertiesDialog.cpp
+++ b/src/ngscopeclient/TriggerPropertiesDialog.cpp
@@ -119,6 +119,7 @@ void TriggerPropertiesPage::Render(bool graphEditorMode)
 				fs))
 			{
 				m_scope->SetTriggerOffset(/*off*/m_committedTriggerOffset);
+				updated = true;
 			}
 
 			Dialog::HelpMarker(