Added current probe degauss support

ngscopeclient · Nov 8, 2023 · d254f46 · d254f46
1 parent eac6836
commit d254f46
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 1 deletion.
diff --git a/lib b/lib
diff --git a/src/ngscopeclient/ChannelPropertiesDialog.cpp b/src/ngscopeclient/ChannelPropertiesDialog.cpp
@@ -182,6 +182,8 @@ void ChannelPropertiesDialog::RefreshInputSettings(Oscilloscope* scope, size_t n
 	//Probe type
 	m_probe = scope->GetProbeName(nchan);
 	m_canAutoZero = scope->CanAutoZero(nchan);
+	m_canDegauss = scope->CanDegauss(nchan);
+	m_shouldDegauss = scope->ShouldDegauss(nchan);
 }
 
 ChannelPropertiesDialog::~ChannelPropertiesDialog()
@@ -421,6 +423,20 @@ bool ChannelPropertiesDialog::DoRender()
 					"Check probe documentation to see whether input signal must be removed before zeroing."
 					);
 			}
+
+			//If the probe supports degaussing, show a button for it
+			if(m_canDegauss)
+			{
+				string caption = "Degauss";
+				if(m_shouldDegauss)
+					caption += "*";
+				if(ImGui::Button(caption.c_str()))
+					m_channel->Degauss();
+				HelpMarker(
+					"Click to automatically degauss current probe.\n\n"
+					"Check probe documentation to see whether input signal must be removed before degaussing."
+					);
+			}
 		}
 	}
 

diff --git a/src/ngscopeclient/ChannelPropertiesDialog.h b/src/ngscopeclient/ChannelPropertiesDialog.h
@@ -85,6 +85,8 @@ class ChannelPropertiesDialog : public EmbeddableDialog
 
 	std::string m_probe;
 	bool m_canAutoZero;
+	bool m_canDegauss;
+	bool m_shouldDegauss;
 };
 
 #endif
+14 −0		scopehal/Oscilloscope.cpp
+23 −0		scopehal/Oscilloscope.h
+14 −0		scopehal/OscilloscopeChannel.cpp
+2 −0		scopehal/OscilloscopeChannel.h
+256 −30		scopehal/TektronixOscilloscope.cpp
+28 −20		scopehal/TektronixOscilloscope.h
+1 −1		scopehal/Unit.h