X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=pv%2Fdata%2Fdecodesignal.cpp;h=f4d4c7da80ed79564216efcf8fc4786914095510;hb=6daf265cd0e2a699a50ce434466881bd3b7f1d12;hp=2de6fbeedd8dff0f266d17caad65125fa0e78817;hpb=883041605ce8536ece950b1de191cfe71068dfba;p=pulseview.git

diff --git a/pv/data/decodesignal.cpp b/pv/data/decodesignal.cpp
index 2de6fbee..f4d4c7da 100644
--- a/pv/data/decodesignal.cpp
+++ b/pv/data/decodesignal.cpp
@@ -17,6 +17,8 @@
  * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
+#include "config.h"
+
 #include <cstring>
 #include <forward_list>
 #include <limits>
@@ -68,6 +70,20 @@ DecodeSignal::~DecodeSignal()
 	reset_decode(true);
 }
 
+void DecodeSignal::set_name(QString name)
+{
+	SignalBase::set_name(name);
+
+	update_output_signals();
+}
+
+void DecodeSignal::set_color(QColor color)
+{
+	SignalBase::set_color(color);
+
+	update_output_signals();
+}
+
 const vector< shared_ptr<Decoder> >& DecodeSignal::decoder_stack() const
 {
 	return stack_;
@@ -386,6 +402,7 @@ void DecodeSignal::update_output_signals()
 				shared_ptr<Logic> logic_data = make_shared<Logic>(logic_channels.size());
 				logic_data->set_samplerate(get_samplerate());
 				output_logic_[dec->get_srd_decoder()] = logic_data;
+				output_logic_muxed_data_[dec->get_srd_decoder()] = vector<uint8_t>();
 
 				shared_ptr<LogicSegment> logic_segment = make_shared<data::LogicSegment>(
 					*logic_data, 0, (logic_data->num_channels() + 7) / 8, get_samplerate());
@@ -396,7 +413,6 @@ void DecodeSignal::update_output_signals()
 					shared_ptr<data::SignalBase> signal =
 						make_shared<data::SignalBase>(nullptr, LogicChannel);
 					signal->set_internal_name(logic_ch.id);
-					signal->set_name(logic_ch.id);
 					signal->set_index(index);
 					signal->set_data(logic_data);
 					output_signals_.push_back(signal);
@@ -412,9 +428,12 @@ void DecodeSignal::update_output_signals()
 		}
 	}
 
-	// TODO Delete signals that no longer have a corresponding decoder (also from session)
+	for (shared_ptr<SignalBase> s : output_signals_) {
+		s->set_name(s->internal_name() + " (" + name() + ")");
+		s->set_color(color());
+	}
+
 	// TODO Assert that all sample rates are the same as the session's
-	// TODO Set colors to the same as the decoder's background color
 }
 
 void DecodeSignal::set_initial_pin_state(const uint16_t channel_id, const int init_state)
@@ -1356,6 +1375,14 @@ void DecodeSignal::decode_proc()
 
 			// If the input segment is complete, we've exhausted this segment
 			if (input_segment->is_complete()) {
+#if defined HAVE_SRD_SESSION_SEND_EOF && HAVE_SRD_SESSION_SEND_EOF
+				// Tell protocol decoders about the end of
+				// the input data, which may result in more
+				// annotations being emitted
+				(void)srd_session_send_eof(srd_session_);
+				new_annotations();
+#endif
+
 				if (current_segment_id_ < (logic_mux_data_->logic_segments().size() - 1)) {
 					// Process next segment
 					current_segment_id_++;
@@ -1479,6 +1506,9 @@ void DecodeSignal::terminate_srd_session()
 	// those stacks which still are processing data while the
 	// application no longer wants them to.
 	if (srd_session_) {
+#if defined HAVE_SRD_SESSION_SEND_EOF && HAVE_SRD_SESSION_SEND_EOF
+		(void)srd_session_send_eof(srd_session_);
+#endif
 		srd_session_terminate_reset(srd_session_);
 
 		// Metadata is cleared also, so re-set it
@@ -1735,6 +1765,13 @@ void DecodeSignal::logic_output_callback(srd_proto_data *pdata, void *decode_sig
 	const srd_proto_data_logic *const pdl = (const srd_proto_data_logic*)pdata->data;
 	assert(pdl);
 
+	// FIXME Only one group supported for now
+	if (pdl->logic_group > 0) {
+		qWarning() << "Received logic output state change for group" << pdl->logic_group << "from decoder" \
+			<< QString::fromUtf8(decc->name) << "but only group 0 is currently supported";
+		return;
+	}
+
 	shared_ptr<Logic> output_logic = ds->output_logic_.at(decc);
 
 	vector< shared_ptr<Segment> > segments = output_logic->segments();
@@ -1751,14 +1788,31 @@ void DecodeSignal::logic_output_callback(srd_proto_data *pdata, void *decode_sig
 		output_logic->push_segment(last_segment);
 	}
 
-	vector<uint8_t> data;
-	for (unsigned int i = pdata->start_sample; i < pdata->end_sample; i++)
-		data.emplace_back(*((uint8_t*)pdl->data));
-
-	last_segment->append_subsignal_payload(pdl->logic_class, data.data(), data.size());
-
-	qInfo() << "Received logic output state change for class" << pdl->logic_class << "from decoder" \
-		<< QString::fromUtf8(decc->name) << "from" << pdata->start_sample << "to" << pdata->end_sample;
+	if (pdata->start_sample < pdata->end_sample) {
+		vector<uint8_t> data;
+		const unsigned int unit_size = last_segment->unit_size();
+		data.resize(unit_size * (1 + pdl->repeat_count));
+
+		if (unit_size == 1)
+			for (unsigned int i = 0; i <= pdl->repeat_count; i++)
+				data.data()[i * unit_size] = *((uint8_t*)pdl->data);
+		else if (unit_size == 2)
+			for (unsigned int i = 0; i <= pdl->repeat_count; i++)
+				data.data()[i * unit_size] = *((uint16_t*)pdl->data);
+		else if (unit_size <= 4)
+			for (unsigned int i = 0; i <= pdl->repeat_count; i++)
+				data.data()[i * unit_size] = *((uint32_t*)pdl->data);
+		else if (unit_size <= 8)
+			for (unsigned int i = 0; i <= pdl->repeat_count; i++)
+				data.data()[i * unit_size] = *((uint64_t*)pdl->data);
+		else
+			for (unsigned int i = 0; i <= pdl->repeat_count; i++)
+				memcpy((void*)&data.data()[i * unit_size], (void*)pdl->data, unit_size);
+
+		last_segment->append_payload(data.data(), data.size());
+	} else
+		qWarning() << "Ignoring malformed logic output state change for group" << pdl->logic_group << "from decoder" \
+			<< QString::fromUtf8(decc->name) << "from" << pdata->start_sample << "to" << pdata->end_sample;
 }
 
 void DecodeSignal::on_capture_state_changed(int state)