Skip to content

Updated trigger and flush buffer #822

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
Open

Updated trigger and flush buffer #822

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
2bdb8d4
Added SCPI UART Flush
rapzak Feb 4, 2025
6f03d12
update
rapzak Feb 4, 2025
198ef5c
trigger
rapzak Feb 26, 2025
ec9229a
Update lib
rapzak Feb 26, 2025
f095f81
added update
rapzak Feb 26, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,3 +5,5 @@ analysis-build
asan-build
release-nodebug-build
debug-noopt-build
project/
*.bak
2 changes: 1 addition & 1 deletion lib
Open in desktop
Submodule lib updated 8 files
+2 −0 .gitignore
+1 −0 scopehal/CMakeLists.txt
+11 −0 scopehal/SCPIUARTTransport.cpp
+1 −1 scopehal/SCPIUARTTransport.h
+1 −0 scopehal/Trigger.cpp
+746 −0 scopehal/WattWaveX4.cpp
+209 −0 scopehal/WattWaveX4.h
+2 −0 scopehal/scopehal.cpp
3 changes: 3 additions & 0 deletions src/ngscopeclient/ChannelPropertiesDialog.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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();
}
}
}
Expand Down
6 changes: 5 additions & 1 deletion src/ngscopeclient/TriggerPropertiesDialog.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,8 @@ void TriggerPropertiesPage::Render(bool graphEditorMode)
m_committedTriggerOffset,
fs))
{
m_scope->SetTriggerOffset(off);
m_scope->SetTriggerOffset(/*off*/m_committedTriggerOffset);
updated = true;
}

Dialog::HelpMarker(
Expand Down Expand Up @@ -249,6 +250,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;
Expand Down