X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=pv%2Fdata%2Fdecodesignal.cpp;h=01d5f27831263af5461c7c423e303af24d67fe6a;hb=4efbe9b6675847dcf670bbdbe86f320e5321be09;hp=91bee1da35f5d022cdaf0ffbbe3c7bf48ab4a930;hpb=d023660ff07f3e1de9b0c4bca14a84fbe137e02e;p=pulseview.git
diff --git a/pv/data/decodesignal.cpp b/pv/data/decodesignal.cpp
index 91bee1da..01d5f278 100644
--- a/pv/data/decodesignal.cpp
+++ b/pv/data/decodesignal.cpp
@@ -17,6 +17,8 @@
* along with this program; if not, see .
*/
+#include "config.h"
+
#include
#include
#include
@@ -33,6 +35,7 @@
#include
#include
+using std::dynamic_pointer_cast;
using std::lock_guard;
using std::make_shared;
using std::min;
@@ -67,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 >& DecodeSignal::decoder_stack() const
{
return stack_;
@@ -95,6 +112,7 @@ void DecodeSignal::stack_decoder(const srd_decoder *decoder, bool restart_decode
stack_config_changed_ = true;
auto_assign_signals(dec);
commit_decoder_channels();
+ update_output_signals();
decoder_stacked((void*)dec.get());
@@ -166,6 +184,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;
@@ -358,6 +380,62 @@ int DecodeSignal::get_assigned_signal_count() const
[](decode::DecodeChannel ch) { return ch.assigned_signal.get(); });
}
+void DecodeSignal::update_output_signals()
+{
+ for (const shared_ptr& dec : stack_) {
+ assert(dec);
+
+ if (dec->has_logic_output()) {
+ const vector logic_channels =
+ dec->logic_output_channels();
+
+ // All signals of a decoder share the same LogicSegment, so it's
+ // sufficient to check for only the first channel
+ const decode::DecoderLogicOutputChannel& first_ch = logic_channels[0];
+
+ bool ch_exists = false;
+ for (const shared_ptr& signal : output_signals_)
+ if (signal->internal_name() == first_ch.id)
+ ch_exists = true;
+
+ if (!ch_exists) {
+ shared_ptr logic_data = make_shared(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();
+
+ shared_ptr logic_segment = make_shared(
+ *logic_data, 0, (logic_data->num_channels() + 7) / 8, get_samplerate());
+ logic_data->push_segment(logic_segment);
+
+ uint index = 0;
+ for (const decode::DecoderLogicOutputChannel& logic_ch : logic_channels) {
+ shared_ptr signal =
+ make_shared(nullptr, LogicChannel);
+ signal->set_internal_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());
+ }
+ }
+ }
+
+ 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)
{
for (decode::DecodeChannel& ch : channels_)
@@ -731,6 +809,8 @@ void DecodeSignal::save_settings(QSettings &settings) const
settings.endGroup();
}
+
+ // TODO Save logic output signal settings
}
void DecodeSignal::restore_settings(QSettings &settings)
@@ -835,6 +915,9 @@ void DecodeSignal::restore_settings(QSettings &settings)
stack_config_changed_ = true;
update_channel_list();
commit_decoder_channels();
+ update_output_signals();
+
+ // TODO Restore logic output signal settings
begin_decode();
}
@@ -1292,6 +1375,9 @@ 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
+ (void)srd_session_send_eof(srd_session_);
+#endif
if (current_segment_id_ < (logic_mux_data_->logic_segments().size() - 1)) {
// Process next segment
current_segment_id_++;
@@ -1362,6 +1448,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_);
@@ -1395,6 +1484,9 @@ void DecodeSignal::start_srd_session()
srd_pd_output_callback_add(srd_session_, SRD_OUTPUT_BINARY,
DecodeSignal::binary_callback, this);
+ srd_pd_output_callback_add(srd_session_, SRD_OUTPUT_LOGIC,
+ DecodeSignal::logic_output_callback, this);
+
srd_session_start(srd_session_);
// We just recreated the srd session, so all stack changes are applied now
@@ -1409,6 +1501,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
@@ -1644,6 +1739,77 @@ void DecodeSignal::binary_callback(srd_proto_data *pdata, void *decode_signal)
ds->new_binary_data(ds->current_segment_id_, (void*)dec, pdb->bin_class);
}
+void DecodeSignal::logic_output_callback(srd_proto_data *pdata, void *decode_signal)
+{
+ assert(pdata);
+ assert(decode_signal);
+
+ DecodeSignal *const ds = (DecodeSignal*)decode_signal;
+ assert(ds);
+
+ if (ds->decode_interrupt_)
+ return;
+
+ lock_guard lock(ds->output_mutex_);
+
+ assert(pdata->pdo);
+ assert(pdata->pdo->di);
+ const srd_decoder *const decc = pdata->pdo->di->decoder;
+ assert(decc);
+
+ 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();
+
+ shared_ptr last_segment;
+
+ if (!segments.empty())
+ 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);
+ }
+
+ 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)
{
// If a new acquisition was started, we need to start decoding from scratch