X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fdata%2Fdecodesignal.cpp;h=01d5f27831263af5461c7c423e303af24d67fe6a;hp=9decbe302fe5892864b9c083ad36e28d37d0f3ff;hb=HEAD;hpb=30cdef99af65a04ee8c55ab816044c32f7e955ad
diff --git a/pv/data/decodesignal.cpp b/pv/data/decodesignal.cpp
index 9decbe30..9c695a1b 100644
--- a/pv/data/decodesignal.cpp
+++ b/pv/data/decodesignal.cpp
@@ -17,11 +17,16 @@
* along with this program; if not, see .
*/
+#include "config.h"
+
#include
#include
#include
#include
+#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
+#include
+#endif
#include "logic.hpp"
#include "logicsegment.hpp"
@@ -68,6 +73,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 >& DecodeSignal::decoder_stack() const
{
return stack_;
@@ -168,6 +187,10 @@ void DecodeSignal::reset_decode(bool shutting_down)
current_segment_id_ = 0;
segments_.clear();
+ for (const shared_ptr& dec : stack_)
+ if (dec->has_logic_output())
+ output_logic_[dec->get_srd_decoder()]->clear();
+
logic_mux_data_.reset();
logic_mux_data_invalid_ = true;
@@ -286,7 +309,11 @@ void DecodeSignal::auto_assign_signals(const shared_ptr 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 match;
for (const shared_ptr& s : session_.signalbases()) {
@@ -294,7 +321,11 @@ void DecodeSignal::auto_assign_signals(const shared_ptr 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)))) {
@@ -380,11 +411,12 @@ void DecodeSignal::update_output_signals()
if (!ch_exists) {
shared_ptr logic_data = make_shared(logic_channels.size());
- logic_data->set_samplerate(first_ch.samplerate);
+ logic_data->set_samplerate(get_samplerate());
output_logic_[dec->get_srd_decoder()] = logic_data;
+ output_logic_muxed_data_[dec->get_srd_decoder()] = vector();
shared_ptr logic_segment = make_shared(
- *logic_data, 0, (logic_data->num_channels() + 7) / 8, first_ch.samplerate);
+ *logic_data, 0, (logic_data->num_channels() + 7) / 8, get_samplerate());
logic_data->push_segment(logic_segment);
uint index = 0;
@@ -392,20 +424,27 @@ void DecodeSignal::update_output_signals()
shared_ptr signal =
make_shared(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);
session_.add_generated_signal(signal);
index++;
}
+ } else {
+ shared_ptr logic_data = output_logic_[dec->get_srd_decoder()];
+ logic_data->set_samplerate(get_samplerate());
+ for (shared_ptr& segment : logic_data->logic_segments())
+ segment->set_samplerate(get_samplerate());
}
}
}
- // TODO Delete signals that no longer have a corresponding decoder (also from session)
- // TODO Check whether all sample rates are the same as the session's
- // TODO Set colors to the same as the decoder's background color
+ for (shared_ptr 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
}
void DecodeSignal::set_initial_pin_state(const uint16_t channel_id, const int init_state)
@@ -719,7 +758,11 @@ void DecodeSignal::save_settings(QSettings &settings) const
for (const shared_ptr& 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
@@ -1347,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_++;
@@ -1417,6 +1468,9 @@ void DecodeSignal::start_srd_session()
return;
}
+ // Update the samplerates for the output logic channels
+ update_output_signals();
+
// Create the session
srd_session_new(&srd_session_);
assert(srd_session_);
@@ -1467,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
@@ -1723,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 output_logic = ds->output_logic_.at(decc);
vector< shared_ptr > segments = output_logic->segments();
@@ -1733,16 +1797,37 @@ void DecodeSignal::logic_output_callback(srd_proto_data *pdata, void *decode_sig
last_segment = dynamic_pointer_cast(segments.back());
else {
// Happens when the data was cleared - all segments are gone then
+ // segment_id is always 0 as it's the first segment
last_segment = make_shared(
*output_logic, 0, (output_logic->num_channels() + 7) / 8, output_logic->get_samplerate());
output_logic->push_segment(last_segment);
}
- last_segment->append_subsignal_payload(pdl->logic_class, (void*)pdl->data, pdl->size);
-
- qInfo() << "Received" << pdl->size << "bytes /" << pdl->size \
- << "samples of logic output for class" << pdl->logic_class << "from decoder" \
- << QString::fromUtf8(decc->name);
+ if (pdata->start_sample < pdata->end_sample) {
+ vector 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)