DecodeSignal: Support unitsize > 1 for logic output

[pulseview.git] / pv / data / decodesignal.cpp

diff --git a/pv/data/decodesignal.cpp b/pv/data/decodesignal.cpp
index 24059f9e3af0d83bfa53f08e5bba7f92e5477ce0..2e23b1ceac8aeef02a67a6640ba50126973ccadf 100644 (file)
--- a/pv/data/decodesignal.cpp
+++ b/pv/data/decodesignal.cpp
@@ -68,6 +68,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_;
@@ -397,7 +411,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);
@@ -413,9 +426,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)
@@ -1736,6 +1752,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();
@@ -1752,15 +1775,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(), 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;
+       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)