ngscopeclient · Mar 21, 2020 · Mar 21, 2020
Showing with 22 additions and 10 deletions.

+7 −7 scopehal/ProtocolDecoder.cpp

+13 −3 scopeprotocols/ParallelBusDecoder.cpp

+2 −0 scopeprotocols/ParallelBusDecoder.h
diff --git a/scopehal/ProtocolDecoder.cpp b/scopehal/ProtocolDecoder.cpp
@@ -221,7 +221,7 @@ bool ProtocolDecoder::IsOverlay()
 ProtocolDecoderParameter& ProtocolDecoder::GetParameter(string s)
 {
 	if(m_parameters.find(s) == m_parameters.end())
-		LogError("Invalid parameter name");
+		LogError("Invalid parameter name\n");
 
 	return m_parameters[s];
 }
@@ -237,7 +237,7 @@ string ProtocolDecoder::GetInputName(size_t i)
 		return m_signalNames[i];
 	else
 	{
-		LogError("Invalid channel index");
+		LogError("Invalid channel index\n");
 		return "";
 	}
 }
@@ -253,13 +253,13 @@ void ProtocolDecoder::SetInput(size_t i, OscilloscopeChannel* channel)
 		}
 		if(!ValidateChannel(i, channel))
 		{
-			LogError("Invalid channel format");
+			LogError("Invalid channel format\n");
 		}
 		m_channels[i] = channel;
 	}
 	else
 	{
-		LogError("Invalid channel index");
+		LogError("Invalid channel index\n");
 	}
 }
 
@@ -276,7 +276,7 @@ void ProtocolDecoder::SetInput(string name, OscilloscopeChannel* channel)
 	}
 
 	//Not found
-	LogError("Invalid channel name");
+	LogError("Invalid channel name\n");
 }
 
 OscilloscopeChannel* ProtocolDecoder::GetInput(size_t i)
@@ -285,7 +285,7 @@ OscilloscopeChannel* ProtocolDecoder::GetInput(size_t i)
 		return m_channels[i];
 	else
 	{
-		LogError("Invalid channel index");
+		LogError("Invalid channel index\n");
 		return NULL;
 	}
 }
@@ -334,7 +334,7 @@ ProtocolDecoder* ProtocolDecoder::CreateDecoder(string protocol, string color)
 	if(m_createprocs.find(protocol) != m_createprocs.end())
 		return m_createprocs[protocol](color);
 
-	LogError("Invalid decoder name");
+	LogError("Invalid decoder name\n");
 	return NULL;
 }
 

diff --git a/scopeprotocols/ParallelBusDecoder.cpp b/scopeprotocols/ParallelBusDecoder.cpp
@@ -95,17 +95,27 @@ bool ParallelBusDecoder::IsOverlay()
 	return false;
 }
 
+////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+// Serialization
+
+void ParallelBusDecoder::LoadConfiguration(const YAML::Node& node, IDTable& table)
+{
+	ProtocolDecoder::LoadConfiguration(node, table);
+
+	m_width = m_parameters[m_widthname].GetIntVal();
+}
+
 ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 // Actual decoder logic
 
 void ParallelBusDecoder::Refresh()
 {
 	//Figure out how wide our input is
-	int width = m_parameters[m_widthname].GetIntVal();
+	m_width = m_parameters[m_widthname].GetIntVal();
 
 	//Make sure we have an input for each channel in use
 	vector<DigitalCapture*> inputs;
-	for(int i=0; i<width; i++)
+	for(int i=0; i<m_width; i++)
 	{
 		if(m_channels[i] == NULL)
 		{
@@ -137,7 +147,7 @@ void ParallelBusDecoder::Refresh()
 	{
 		vector<bool> data;
 		bool end = false;
-		for(int j=0; j<width; j++)
+		for(int j=0; j<m_width; j++)
 		{
 			if(inputs[j]->GetDepth() <= i)
 			{

diff --git a/scopeprotocols/ParallelBusDecoder.h b/scopeprotocols/ParallelBusDecoder.h
@@ -53,6 +53,8 @@ class ParallelBusDecoder : public ProtocolDecoder
 
 	virtual bool ValidateChannel(size_t i, OscilloscopeChannel* channel);
 
+	virtual void LoadConfiguration(const YAML::Node& node, IDTable& table);
+
 	PROTOCOL_DECODER_INITPROC(ParallelBusDecoder)
 
 protected: