X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fdata%2Fdecodesignal.cpp;h=a3525922943a878b5d051fbdb724eb44a9f2100a;hp=640e58148ef751e3aa7557dca2d7af5d526c2240;hb=04b0467582d8dfa989bb38fe18bfb1be20cea456;hpb=9431e2d3d256f3602c3637847a8ec3ad3fdcd590 diff --git a/pv/data/decodesignal.cpp b/pv/data/decodesignal.cpp index 640e5814..a3525922 100644 --- a/pv/data/decodesignal.cpp +++ b/pv/data/decodesignal.cpp @@ -33,6 +33,7 @@ #include #include +using std::dynamic_pointer_cast; using std::lock_guard; using std::make_shared; using std::min; @@ -95,6 +96,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()); @@ -231,9 +233,6 @@ void DecodeSignal::begin_decode() logic_mux_data_ = make_shared(ch_count); } - // Receive notifications when new sample data is available - connect_input_notifiers(); - if (get_input_segment_count() == 0) set_error_message(tr("No input data")); @@ -274,6 +273,9 @@ void DecodeSignal::auto_assign_signals(const shared_ptr dec) { bool new_assignment = false; + // Disconnect all input signal notifications so we don't have duplicate connections + disconnect_input_notifiers(); + // Try to auto-select channels that don't have signals assigned yet for (decode::DecodeChannel& ch : channels_) { // If a decoder is given, auto-assign only its channels @@ -321,6 +323,9 @@ void DecodeSignal::auto_assign_signals(const shared_ptr dec) } if (new_assignment) { + // Receive notifications when new sample data is available + connect_input_notifiers(); + logic_mux_data_invalid_ = true; stack_config_changed_ = true; commit_decoder_channels(); @@ -330,12 +335,18 @@ void DecodeSignal::auto_assign_signals(const shared_ptr dec) void DecodeSignal::assign_signal(const uint16_t channel_id, shared_ptr signal) { + // Disconnect all input signal notifications so we don't have duplicate connections + disconnect_input_notifiers(); + for (decode::DecodeChannel& ch : channels_) if (ch.id == channel_id) { ch.assigned_signal = signal; logic_mux_data_invalid_ = true; } + // Receive notifications when new sample data is available + connect_input_notifiers(); + stack_config_changed_ = true; commit_decoder_channels(); channels_updated(); @@ -349,6 +360,53 @@ 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 the first channel only + 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()); + output_logic_[dec->get_srd_decoder()] = logic_data; + + shared_ptr logic_segment = make_shared( + *logic_data, 0, (logic_data->num_channels() + 7) / 8, first_ch.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_name(logic_ch.id); + signal->set_index(index); + signal->set_data(logic_data); + output_signals_.push_back(signal); + session_.add_generated_signal(signal); + index++; + } + } + } + } + + // 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 +} + void DecodeSignal::set_initial_pin_state(const uint16_t channel_id, const int init_state) { for (decode::DecodeChannel& ch : channels_) @@ -463,7 +521,6 @@ vector DecodeSignal::get_rows(bool visible_only) const return rows; } - uint64_t DecodeSignal::get_annotation_count(const Row* row, uint32_t segment_id) const { if (segment_id >= segments_.size()) @@ -723,6 +780,8 @@ void DecodeSignal::save_settings(QSettings &settings) const settings.endGroup(); } + + // TODO Save logic output signal settings } void DecodeSignal::restore_settings(QSettings &settings) @@ -821,10 +880,15 @@ void DecodeSignal::restore_settings(QSettings &settings) settings.endGroup(); } + connect_input_notifiers(); + // Update the internal structures stack_config_changed_ = true; update_channel_list(); commit_decoder_channels(); + update_output_signals(); + + // TODO Restore logic output signal settings begin_decode(); } @@ -1164,6 +1228,7 @@ void DecodeSignal::logic_mux_proc() output_segment->set_complete(); if (segment_id < get_input_segment_count() - 1) { + // Process next segment segment_id++; @@ -1178,6 +1243,10 @@ void DecodeSignal::logic_mux_proc() unique_lock logic_mux_lock(logic_mux_mutex_); logic_mux_cond_.wait(logic_mux_lock); } + } else { + // Input segments aren't all complete yet but samples_to_process is 0, wait for more input data + unique_lock logic_mux_lock(logic_mux_mutex_); + logic_mux_cond_.wait(logic_mux_lock); } } } while (!logic_mux_interrupt_); @@ -1308,6 +1377,10 @@ void DecodeSignal::decode_proc() unique_lock input_wait_lock(input_mutex_); decode_input_cond_.wait(input_wait_lock); } + } else { + // Input segment isn't complete yet but samples_to_process is 0, wait for more input data + unique_lock input_wait_lock(input_mutex_); + decode_input_cond_.wait(input_wait_lock); } } @@ -1376,6 +1449,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 @@ -1419,20 +1495,35 @@ void DecodeSignal::stop_srd_session() void DecodeSignal::connect_input_notifiers() { - // Disconnect the notification slot from the previous set of signals - disconnect(this, SLOT(on_data_cleared())); - disconnect(this, SLOT(on_data_received())); - // Connect the currently used signals to our slot for (decode::DecodeChannel& ch : channels_) { if (!ch.assigned_signal) continue; + const data::SignalBase *signal = ch.assigned_signal.get(); + + connect(signal, SIGNAL(samples_cleared()), + this, SLOT(on_data_cleared()), Qt::UniqueConnection); + connect(signal, SIGNAL(samples_added(uint64_t, uint64_t, uint64_t)), + this, SLOT(on_data_received()), Qt::UniqueConnection); + + if (signal->logic_data()) + connect(signal->logic_data().get(), SIGNAL(segment_completed()), + this, SLOT(on_input_segment_completed()), Qt::UniqueConnection); + } +} +void DecodeSignal::disconnect_input_notifiers() +{ + // Disconnect the notification slot from the previous set of signals + for (decode::DecodeChannel& ch : channels_) { + if (!ch.assigned_signal) + continue; const data::SignalBase *signal = ch.assigned_signal.get(); - connect(signal, &data::SignalBase::samples_cleared, - this, &DecodeSignal::on_data_cleared); - connect(signal, &data::SignalBase::samples_added, - this, &DecodeSignal::on_data_received); + disconnect(signal, nullptr, this, SLOT(on_data_cleared())); + disconnect(signal, nullptr, this, SLOT(on_data_received())); + + if (signal->logic_data()) + disconnect(signal->logic_data().get(), nullptr, this, SLOT(on_input_segment_completed())); } } @@ -1610,6 +1701,39 @@ 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); + + shared_ptr output_logic = ds->output_logic_.at(decc); + shared_ptr last_segment = + dynamic_pointer_cast(output_logic->segments().back()); + assert(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); +} + void DecodeSignal::on_capture_state_changed(int state) { // If a new acquisition was started, we need to start decoding from scratch @@ -1627,14 +1751,15 @@ void DecodeSignal::on_data_cleared() void DecodeSignal::on_data_received() { // If we detected a lack of input data when trying to start decoding, - // we have set an error message. Only try again if we now have data + // we have set an error message. Bail out if we still don't have data // to work with if ((!error_message_.isEmpty()) && (get_input_segment_count() == 0)) return; - else { + + if (!error_message_.isEmpty()) { error_message_.clear(); // TODO Emulate noquote() - qDebug().nospace() << name() << ": Error cleared"; + qDebug().nospace() << name() << ": Input data available, error cleared"; } if (!logic_mux_thread_.joinable()) @@ -1643,6 +1768,12 @@ void DecodeSignal::on_data_received() logic_mux_cond_.notify_one(); } +void DecodeSignal::on_input_segment_completed() +{ + if (!logic_mux_thread_.joinable()) + logic_mux_cond_.notify_one(); +} + void DecodeSignal::on_annotation_visibility_changed() { annotation_visibility_changed();