X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=pv%2Fdata%2Fdecodesignal.cpp;h=01d5f27831263af5461c7c423e303af24d67fe6a;hb=HEAD;hp=09f0d20ceff816ec97d9d758f687a33a49592c0e;hpb=4c4f604f982caab24714508586ab4cde0c8408e2;p=pulseview.git

diff --git a/pv/data/decodesignal.cpp b/pv/data/decodesignal.cpp
index 09f0d20c..9c695a1b 100644
--- a/pv/data/decodesignal.cpp
+++ b/pv/data/decodesignal.cpp
@@ -17,11 +17,16 @@
  * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
+#include "config.h"
+
 #include <cstring>
 #include <forward_list>
 #include <limits>
 
 #include <QDebug>
+#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
+#include <QRegularExpression>
+#endif
 
 #include "logic.hpp"
 #include "logicsegment.hpp"
@@ -304,7 +309,11 @@ void DecodeSignal::auto_assign_signals(const shared_ptr<Decoder> dec)
 			continue;
 
 		QString ch_name = ch.name.toLower();
+#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
+		ch_name = ch_name.replace(QRegularExpression("[-_.]"), " ");
+#else
 		ch_name = ch_name.replace(QRegExp("[-_.]"), " ");
+#endif
 
 		shared_ptr<data::SignalBase> match;
 		for (const shared_ptr<data::SignalBase>& s : session_.signalbases()) {
@@ -312,7 +321,11 @@ void DecodeSignal::auto_assign_signals(const shared_ptr<Decoder> dec)
 				continue;
 
 			QString s_name = s->name().toLower();
+#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
+			s_name = s_name.replace(QRegularExpression("[-_.]"), " ");
+#else
 			s_name = s_name.replace(QRegExp("[-_.]"), " ");
+#endif
 
 			if (s->logic_data() &&
 				((ch_name.contains(s_name)) || (s_name.contains(ch_name)))) {
@@ -745,7 +758,11 @@ void DecodeSignal::save_settings(QSettings &settings) const
 	for (const shared_ptr<Decoder>& decoder : stack_) {
 		settings.beginGroup("decoder" + QString::number(decoder_idx++));
 
+#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
+		settings.setValue("id", (const char *)decoder->get_srd_decoder()->id);
+#else
 		settings.setValue("id", decoder->get_srd_decoder()->id);
+#endif
 		settings.setValue("visible", decoder->visible());
 
 		// Save decoder options
@@ -1373,6 +1390,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_++;
@@ -1496,6 +1521,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
@@ -1752,6 +1780,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();
@@ -1770,21 +1805,28 @@ void DecodeSignal::logic_output_callback(srd_proto_data *pdata, void *decode_sig
 
 	if (pdata->start_sample < pdata->end_sample) {
 		vector<uint8_t> data;
-		for (unsigned int i = pdata->start_sample; i < pdata->end_sample; i++)
-			data.emplace_back(*((uint8_t*)pdl->data));
-
-		if ((pdl->logic_class == 0) || ((pdl->logic_class > 0) && (data.size() <= ds->output_logic_muxed_data_.at(decc).size()))) {
-			last_segment->append_subsignal_payload(pdl->logic_class, data.data(),
-				data.size(), ds->output_logic_muxed_data_.at(decc));
-
-			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;
-		} else
-			qWarning() << "Ignoring invalid logic output state change for class" << pdl->logic_class << "from decoder" \
-				<< QString::fromUtf8(decc->name) << "from" << pdata->start_sample << "to" << pdata->end_sample;
-
+		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 class" << pdl->logic_class << "from decoder" \
+		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;
 }