trigger + buffer flush

.gitignore

@@ -0,0 +1,2 @@
+
+*.bak

scopehal/CMakeLists.txt

@@ -198,6 +198,7 @@ set(SCOPEHAL_SOURCES
 	RohdeSchwarzHMC804xPowerSupply.cpp
 	RidenPowerSupply.cpp
 	KuaiquPowerSupply.cpp
+    WattWaveX4.cpp
 
 	StandardColors.cpp
 	Filter.cpp

scopehal/SCPIUARTTransport.cpp

@@ -171,3 +171,14 @@ bool SCPIUARTTransport::IsCommandBatchingSupported()
 {
 	return false;
 }
+
+void SCPIUARTTransport::FlushRXBuffer()
+{
+	if (!IsConnected())
+		return;
+	unsigned char buf[1024];
+	//ibclr(m_handle);
+	while (ReadRawData(1024, buf) != 0) {}
+	//do nothing
+	return;
+}

scopehal/SCPIUARTTransport.h

@@ -56,7 +56,7 @@ class SCPIUARTTransport : public SCPITransport
 	virtual std::string ReadReply(bool endOnSemicolon = true, std::function<void(float)> progress = nullptr) override;
 	virtual size_t ReadRawData(size_t len, unsigned char* buf, std::function<void(float)> progress = nullptr) override;
 	virtual void SendRawData(size_t len, const unsigned char* buf) override;
-
+	virtual void FlushRXBuffer(void) override;  
 	virtual bool IsCommandBatchingSupported() override;
 	virtual bool IsConnected() override;
 

scopehal/Trigger.cpp

@@ -53,6 +53,7 @@ Trigger::Trigger(Oscilloscope* scope)
 	, m_level(m_parameters["Lower Level"])
 {
 	m_level = FilterParameter(FilterParameter::TYPE_FLOAT, Unit(Unit::UNIT_VOLTS));
+	m_level.MarkHidden();
 }
 
 Trigger::~Trigger()