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 09f0d20ceff816ec97d9d758f687a33a49592c0e..2e23b1ceac8aeef02a67a6640ba50126973ccadf 100644 (file)
--- a/pv/data/decodesignal.cpp
+++ b/pv/data/decodesignal.cpp
@@ -1752,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();
@@ -1770,21 +1777,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;
 }