#include <pv/globalsettings.hpp>
#include <pv/session.hpp>
+using std::dynamic_pointer_cast;
using std::lock_guard;
using std::make_shared;
using std::min;
stack_config_changed_ = true;
auto_assign_signals(dec);
commit_decoder_channels();
+ update_output_signals();
decoder_stacked((void*)dec.get());
[](decode::DecodeChannel ch) { return ch.assigned_signal.get(); });
}
+void DecodeSignal::update_output_signals()
+{
+ for (const shared_ptr<decode::Decoder>& dec : stack_) {
+ assert(dec);
+
+ if (dec->has_logic_output()) {
+ const vector<decode::DecoderLogicOutputChannel> 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<SignalBase>& signal : output_signals_)
+ if (signal->internal_name() == first_ch.id)
+ ch_exists = true;
+
+ if (!ch_exists) {
+ shared_ptr<Logic> logic_data = make_shared<Logic>(logic_channels.size());
+ logic_data->set_samplerate(first_ch.samplerate);
+ output_logic_[dec->get_srd_decoder()] = logic_data;
+
+ shared_ptr<LogicSegment> logic_segment = make_shared<data::LogicSegment>(
+ *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<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);
+ 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_)
return rows;
}
-
uint64_t DecodeSignal::get_annotation_count(const Row* row, uint32_t segment_id) const
{
if (segment_id >= segments_.size())
settings.endGroup();
}
+
+ // TODO Save logic output signal settings
}
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();
}
// Logic mux data is being updated
logic_mux_data_invalid_ = false;
- connect_input_segment_notifiers(segment_id);
-
uint64_t samples_to_process;
do {
do {
if (segment_id < get_input_segment_count() - 1) {
- disconnect_input_segment_notifiers(segment_id);
-
// Process next segment
segment_id++;
logic_mux_data_->push_segment(output_segment);
output_segment->set_samplerate(get_input_samplerate(segment_id));
-
- connect_input_segment_notifiers(segment_id);
} else {
// Wait for more input data if we're processing the currently last segment
unique_lock<mutex> logic_mux_lock(logic_mux_mutex_);
}
}
} while (!logic_mux_interrupt_);
-
- disconnect_input_segment_notifiers(segment_id);
}
void DecodeSignal::decode_data(
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
if (!ch.assigned_signal)
continue;
const data::SignalBase *signal = ch.assigned_signal.get();
+
connect(signal, SIGNAL(samples_cleared()),
- this, SLOT(on_data_cleared()));
+ this, SLOT(on_data_cleared()), Qt::UniqueConnection);
connect(signal, SIGNAL(samples_added(uint64_t, uint64_t, uint64_t)),
- this, SLOT(on_data_received()));
+ 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);
}
}
const data::SignalBase *signal = ch.assigned_signal.get();
disconnect(signal, nullptr, this, SLOT(on_data_cleared()));
disconnect(signal, nullptr, this, SLOT(on_data_received()));
- }
-}
-
-void DecodeSignal::connect_input_segment_notifiers(uint32_t segment_id)
-{
- for (decode::DecodeChannel& ch : channels_)
- if (ch.assigned_signal) {
- const shared_ptr<Logic> logic_data = ch.assigned_signal->logic_data();
-
- shared_ptr<const LogicSegment> segment;
- if (segment_id < logic_data->logic_segments().size()) {
- segment = logic_data->logic_segments().at(segment_id)->get_shared_ptr();
- } else {
- qWarning() << "Signal" << name() << ":" << ch.assigned_signal->name() \
- << "has no logic segment, can't connect notifier" << segment_id;
- continue;
- }
-
- if (!segment)
- continue;
-
- connect(segment.get(), SIGNAL(completed()), this, SLOT(on_input_segment_completed()));
- }
-}
-
-void DecodeSignal::disconnect_input_segment_notifiers(uint32_t segment_id)
-{
- for (decode::DecodeChannel& ch : channels_)
- if (ch.assigned_signal) {
- const shared_ptr<Logic> logic_data = ch.assigned_signal->logic_data();
-
- shared_ptr<const LogicSegment> segment;
- if (segment_id < logic_data->logic_segments().size()) {
- segment = logic_data->logic_segments().at(segment_id)->get_shared_ptr();
- } else {
- continue;
- }
-
- if (!segment)
- continue;
- disconnect(segment.get(), SIGNAL(completed()), this, SLOT(on_input_segment_completed()));
- }
+ if (signal->logic_data())
+ disconnect(signal->logic_data().get(), nullptr, this, SLOT(on_input_segment_completed()));
+ }
}
void DecodeSignal::create_decode_segment()
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<mutex> 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<Logic> output_logic = ds->output_logic_.at(decc);
+
+ vector< shared_ptr<Segment> > segments = output_logic->segments();
+
+ shared_ptr<LogicSegment> last_segment;
+
+ if (!segments.empty())
+ last_segment = dynamic_pointer_cast<LogicSegment>(segments.back());
+ else {
+ // Happens when the data was cleared - all segments are gone then
+ last_segment = make_shared<data::LogicSegment>(
+ *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);
+}
+
void DecodeSignal::on_capture_state_changed(int state)
{
// If a new acquisition was started, we need to start decoding from scratch
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())