ngscopeclient · Nov 24, 2020 · Nov 24, 2020 · Nov 24, 2020 · Nov 24, 2020 · Nov 24, 2020
Showing with 22 additions and 10 deletions.

+8 −1 scopehal/Filter.h

+1 −1 scopehal/FlowGraphNode.h

+10 −3 scopehal/MockOscilloscope.cpp

+1 −1 scopeprotocols/USB2PCSDecoder.cpp

+2 −4 scopeprotocols/USB2PacketDecoder.cpp
diff --git a/scopehal/Filter.h b/scopehal/Filter.h
@@ -90,6 +90,13 @@ class Filter	: public OscilloscopeChannel
 	static std::set<Filter*> GetAllInstances()
 	{ return m_filters; }
 
+	//Set all currently existing filters to the dirty state
+	static void SetAllFiltersDirty()
+	{
+		for(auto f : m_filters)
+			f->SetDirty();
+	}
+
 	/**
 		@brief Clears any integrated data from past triggers (e.g. eye patterns).
 
@@ -231,7 +238,7 @@ class Filter	: public OscilloscopeChannel
 	static void DoAddDecoderClass(const std::string& name, CreateProcType proc);
 
 	static void EnumProtocols(std::vector<std::string>& names);
-	static Filter* CreateFilter(const std::string& protocol, const std::string& color);
+	static Filter* CreateFilter(const std::string& protocol, const std::string& color = "#ffffff");
 
 protected:
 	//Class enumeration

diff --git a/scopehal/FlowGraphNode.h b/scopehal/FlowGraphNode.h
@@ -51,7 +51,7 @@ class StreamDescriptor
 	, m_stream(0)
 	{}
 
-	StreamDescriptor(OscilloscopeChannel* channel, size_t stream)
+	StreamDescriptor(OscilloscopeChannel* channel, size_t stream = 0)
 		: m_channel(channel)
 		, m_stream(stream)
 	{}

diff --git a/scopehal/MockOscilloscope.cpp b/scopehal/MockOscilloscope.cpp
@@ -356,7 +356,7 @@ bool MockOscilloscope::LoadCSV(const string& path)
 		return false;
 	}
 
-	map<int, AnalogWaveform*> waveforms;
+	vector<AnalogWaveform*> waveforms;
 
 	char line[1024];
 	size_t nrow = 0;
@@ -461,15 +461,22 @@ bool MockOscilloscope::LoadCSV(const string& path)
 					true);
 				AddChannel(chan);
 				chan->SetDefaultDisplayName();
+			}
+		}
 
+		//Create waveforms if needed
+		if(waveforms.empty())
+		{
+			for(size_t i=0; i<ncols; i++)
+			{
 				//Create the waveform for the channel
 				auto wfm = new AnalogWaveform;
 				wfm->m_timescale = 1;
 				wfm->m_startTimestamp = 0;
 				wfm->m_startPicoseconds = 0;
 				wfm->m_triggerPhase = 0;
-				waveforms[i] = wfm;
-				chan->SetData(wfm, 0);
+				waveforms.push_back(wfm);
+				GetChannel(i)->SetData(wfm, 0);
 			}
 		}
 

diff --git a/scopeprotocols/USB2PCSDecoder.cpp b/scopeprotocols/USB2PCSDecoder.cpp
@@ -50,7 +50,7 @@ bool USB2PCSDecoder::ValidateChannel(size_t i, StreamDescriptor stream)
 	if(stream.m_channel == NULL)
 		return false;
 
-	if( (i == 0) && (dynamic_cast<USB2PMAWaveform*>(stream.m_channel->GetData(0)) != NULL) )
+	if( (i == 0) && (dynamic_cast<USB2PMADecoder*>(stream.m_channel) != NULL) )
 		return true;
 
 	return false;

diff --git a/scopeprotocols/USB2PacketDecoder.cpp b/scopeprotocols/USB2PacketDecoder.cpp
@@ -51,7 +51,7 @@ bool USB2PacketDecoder::ValidateChannel(size_t i, StreamDescriptor stream)
 	if(stream.m_channel == NULL)
 		return false;
 
-	if( (i == 0) && (dynamic_cast<USB2PCSWaveform*>(stream.m_channel->GetData(0)) != NULL) )
+	if( (i == 0) && (dynamic_cast<USB2PCSDecoder*>(stream.m_channel) != NULL) )
 		return true;
 
 	return false;
@@ -338,10 +338,8 @@ void USB2PacketDecoder::Refresh()
 					packet_data.pop_back();
 					packet_data.pop_back();
 
-					//Calculate the CRC
+					//Verify the CRC
 					uint16_t crc16_calculated = CalculateCRC16(packet_data);
-					LogDebug("Calculated CRC16: %04x, got: %04x\n", crc16_calculated, crc16);
-
 					cap->m_durations[firstoff] += cap->m_durations[secondoff];
 					if(crc16 == crc16_calculated)
 						cap->m_samples[firstoff] = USB2PacketSymbol(USB2PacketSymbol::TYPE_CRC16_GOOD, crc16);